From ab017846b37a5fb036609cda32ae5e2334410f11 Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Fri, 24 Apr 2015 13:45:44 -0300
Subject: Remove ugly copy files around and use additional_files_needed to
 install files in proper place. Bump package version

---
 config/cron/cron.inc      |  23 +---
 config/cron/cron.php      | 208 +++++++++++++++++++++++++++++++++
 config/cron/cron.tmp      | 208 ---------------------------------
 config/cron/cron.xml      |   8 +-
 config/cron/cron_edit.php | 286 ++++++++++++++++++++++++++++++++++++++++++++++
 config/cron/cron_edit.tmp | 286 ----------------------------------------------
 6 files changed, 502 insertions(+), 517 deletions(-)
 create mode 100644 config/cron/cron.php
 delete mode 100644 config/cron/cron.tmp
 create mode 100644 config/cron/cron_edit.php
 delete mode 100644 config/cron/cron_edit.tmp

(limited to 'config/cron')

diff --git a/config/cron/cron.inc b/config/cron/cron.inc
index 2fe9cf57..a457f013 100644
--- a/config/cron/cron.inc
+++ b/config/cron/cron.inc
@@ -54,10 +54,8 @@ function cron_sync_package()
 	global $config;   
 	//synch cron tab
 	configure_cron();
-	$handle = popen("/usr/local/etc/rc.d/cron.sh stop", "r");
-	pclose($handle);
-	$handle = popen("/usr/local/etc/rc.d/cron.sh start", "r");
-	pclose($handle);
+	exec("/usr/local/etc/rc.d/cron.sh stop");
+	exec("/usr/local/etc/rc.d/cron.sh start");
 
 }
     
@@ -69,14 +67,6 @@ function cron_install_command()
 	conf_mount_rw();
 	config_lock();
 
-	if (!is_dir('/usr/local/www/packages/cron/')) {
-		exec("mkdir -p /usr/local/www/packages/cron/");
-	}
-
-	//Copy PHP files from .tmp to .php - don't move or put them in /tmp or the pkg system will miss them if it gets cleared.
-	exec("cp /usr/local/pkg/cron.tmp /usr/local/www/packages/cron/cron.php");
-	exec("cp /usr/local/pkg/cron_edit.tmp /usr/local/www/packages/cron/cron_edit.php");
-
 	//write_config();
 
 	write_rcfile(array(
@@ -101,14 +91,9 @@ function cron_install_command()
 function cron_deinstall_command()
 {
 	conf_mount_rw();
-	config_lock();
-	$handle = popen("/usr/local/etc/rc.d/cron.sh stop", "r");
-	unlink_if_exists("/usr/local/pkg/cron.xml");
-	unlink_if_exists("/usr/local/www/cron.inc");
-	exec("rm -R /usr/local/www/packages/cron");
-	//unlink_if_exists("/usr/local/etc/rc.d/cron.sh");
+	exec("/usr/local/etc/rc.d/cron.sh stop");
+	unlink_if_exists("/usr/local/etc/rc.d/cron.sh");
 	conf_mount_ro();
-	config_unlock();
 }
 
 ?>
diff --git a/config/cron/cron.php b/config/cron/cron.php
new file mode 100644
index 00000000..b9666e01
--- /dev/null
+++ b/config/cron/cron.php
@@ -0,0 +1,208 @@
+<?php
+/* $Id$ */
+/*
+	cron.php
+	Copyright (C) 2008 Mark J Crane
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require_once("guiconfig.inc");
+require_once("/usr/local/pkg/cron.inc");
+
+$a_cron 	   = &$config['cron']['item'];
+
+
+if ($_GET['act'] == "del") {
+    if ($_GET['type'] == 'php') {
+        if ($a_cron[$_GET['id']]) {
+            unset($a_cron[$_GET['id']]);
+            write_config();
+            header("Location: cron.php");
+            exit;
+        }
+    }
+}
+
+$pgtitle = array(gettext("Cron"),gettext("Settings"));
+include("head.inc");
+
+?>
+
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("fbegin.inc"); ?>
+
+<div id="mainlevel">
+<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="tabs">
+<tr><td class="tabnavtbl">
+<?php
+			
+	$tab_array = array();
+	$tab_array[] = array(gettext("Settings"), true, "/packages/cron/cron.php");
+	$tab_array[] = array(gettext("Edit"), false, "/packages/cron/cron_edit.php");
+ 	display_top_tabs($tab_array);
+ 	
+?>
+</td></tr>
+</table>
+
+<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="content">
+   <tr>
+     <td class="tabcont" >
+
+<form action="cron.php" method="post" name="iform" id="iform">
+<?php 
+
+if ($config_change == 1) {
+    write_config();
+    $config_change = 0;  
+}
+
+//if ($savemsg) print_info_box($savemsg); 
+//if (file_exists($d_hostsdirty_path)): echo"<p>";
+//print_info_box_np("This is an info box.");
+//echo"<br />";
+//endif; 
+
+?>
+  	<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="title">              
+      <tr>
+        <td><p><!--<span class="vexpl"><span class="red"><strong>Cron<br></strong></span>-->
+            Cron controls the scheduling of commands.
+            <br /><br />
+            For more information see: <a href='http://www.freebsd.org/doc/en/books/handbook/configtuning-cron.html' target='_blank'>http://www.freebsd.org/doc/en/books/handbook/configtuning-cron.html</a>
+            </p></td>
+      </tr>
+    </table>
+    <br />
+    
+    <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="heading">
+    <tr>
+      <td width="5%" class="listhdrr">minute</td>
+      <td width="5%" class="listhdrr">hour</td>
+      <td width="5%" class="listhdrr">mday</td>
+      <td width="5%" class="listhdrr">month</td>
+      <td width="5%" class="listhdrr">wday</td>
+      <td width="5%" class="listhdrr">who</td>
+      <td width="60%" class="listhdr">command</td>
+      <td width="10%" class="list">
+
+        <table border="0" cellspacing="0" cellpadding="1" summary="icons">
+          <tr>
+            <td width="17"></td>
+            <td valign="middle"><a href="cron_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="edit" /></a></td>
+          </tr>
+        </table>
+
+      </td>
+	</tr>
+
+
+		<?php 
+    
+    $i = 0;
+    if (count($a_cron) > 0) {
+
+      foreach ($a_cron as $ent) {
+    
+    ?>
+
+          <tr>
+            <td class="listr" ondblclick="document.location='cron_edit.php?id=<?=$i;?>';">
+              <?=$ent['minute'];?>&nbsp;
+            </td>
+            <td class="listr" ondblclick="document.location='cron_edit.php?id=<?=$i;?>';">
+              <?=$ent['hour'];?>&nbsp;
+            </td>
+            <td class="listr" ondblclick="document.location='cron_edit.php?id=<?=$i;?>';">
+              <?=$ent['mday'];?>&nbsp;
+            </td>
+            <td class="listr" ondblclick="document.location='cron_edit.php?id=<?=$i;?>';">
+              <?=$ent['month'];?>&nbsp;
+            </td>
+            <td class="listr" ondblclick="document.location='cron_edit.php?id=<?=$i;?>';">
+              <?=$ent['wday'];?>&nbsp;
+            </td>
+            <td class="listr" ondblclick="document.location='cron_edit.php?id=<?=$i;?>';">
+              <?=$ent['who'];?>&nbsp;
+            </td>
+            <td class="listr" ondblclick="document.location='cron_edit.php?id=<?=$i;?>';">
+              <?=$ent['command'];?>&nbsp;
+            </td>
+            <td valign="middle" style="white-space:nowrap" class="list">
+              <table border="0" cellspacing="0" cellpadding="1" summary="edit delete">
+                <tr>
+                  <td valign="middle"><a href="cron_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a></td>
+                  <td><a href="cron_edit.php?type=php&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('Do you really want to delete this?')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a></td>
+                </tr>
+             </table>
+            </td>
+          </tr>
+		<?php 
+
+          $i++; 
+        }
+      }
+    ?>
+
+    <tr>
+      <td class="list" colspan="7"></td>
+      <td class="list">          
+        <table border="0" cellspacing="0" cellpadding="1" summary="add">
+          <tr>
+            <td width="17"></td>
+            <td valign="middle"><a href="cron_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td>
+          </tr>
+        </table>
+		  </td>
+     </tr>
+
+
+     <tr>
+       <td class="list" colspan="8"></td>
+       <td class="list"></td>
+     </tr>
+     </table>
+     
+</form>
+
+
+<br />
+<br />
+<br />
+<br />
+<br />
+<br />
+<br />
+<br />
+
+</td>
+</tr>
+</table>
+
+</div>
+
+
+<?php include("fend.inc"); ?>
+</body>
+</html>
diff --git a/config/cron/cron.tmp b/config/cron/cron.tmp
deleted file mode 100644
index b9666e01..00000000
--- a/config/cron/cron.tmp
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-/* $Id$ */
-/*
-	cron.php
-	Copyright (C) 2008 Mark J Crane
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require_once("guiconfig.inc");
-require_once("/usr/local/pkg/cron.inc");
-
-$a_cron 	   = &$config['cron']['item'];
-
-
-if ($_GET['act'] == "del") {
-    if ($_GET['type'] == 'php') {
-        if ($a_cron[$_GET['id']]) {
-            unset($a_cron[$_GET['id']]);
-            write_config();
-            header("Location: cron.php");
-            exit;
-        }
-    }
-}
-
-$pgtitle = array(gettext("Cron"),gettext("Settings"));
-include("head.inc");
-
-?>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php include("fbegin.inc"); ?>
-
-<div id="mainlevel">
-<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="tabs">
-<tr><td class="tabnavtbl">
-<?php
-			
-	$tab_array = array();
-	$tab_array[] = array(gettext("Settings"), true, "/packages/cron/cron.php");
-	$tab_array[] = array(gettext("Edit"), false, "/packages/cron/cron_edit.php");
- 	display_top_tabs($tab_array);
- 	
-?>
-</td></tr>
-</table>
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="content">
-   <tr>
-     <td class="tabcont" >
-
-<form action="cron.php" method="post" name="iform" id="iform">
-<?php 
-
-if ($config_change == 1) {
-    write_config();
-    $config_change = 0;  
-}
-
-//if ($savemsg) print_info_box($savemsg); 
-//if (file_exists($d_hostsdirty_path)): echo"<p>";
-//print_info_box_np("This is an info box.");
-//echo"<br />";
-//endif; 
-
-?>
-  	<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="title">              
-      <tr>
-        <td><p><!--<span class="vexpl"><span class="red"><strong>Cron<br></strong></span>-->
-            Cron controls the scheduling of commands.
-            <br /><br />
-            For more information see: <a href='http://www.freebsd.org/doc/en/books/handbook/configtuning-cron.html' target='_blank'>http://www.freebsd.org/doc/en/books/handbook/configtuning-cron.html</a>
-            </p></td>
-      </tr>
-    </table>
-    <br />
-    
-    <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="heading">
-    <tr>
-      <td width="5%" class="listhdrr">minute</td>
-      <td width="5%" class="listhdrr">hour</td>
-      <td width="5%" class="listhdrr">mday</td>
-      <td width="5%" class="listhdrr">month</td>
-      <td width="5%" class="listhdrr">wday</td>
-      <td width="5%" class="listhdrr">who</td>
-      <td width="60%" class="listhdr">command</td>
-      <td width="10%" class="list">
-
-        <table border="0" cellspacing="0" cellpadding="1" summary="icons">
-          <tr>
-            <td width="17"></td>
-            <td valign="middle"><a href="cron_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="edit" /></a></td>
-          </tr>
-        </table>
-
-      </td>
-	</tr>
-
-
-		<?php 
-    
-    $i = 0;
-    if (count($a_cron) > 0) {
-
-      foreach ($a_cron as $ent) {
-    
-    ?>
-
-          <tr>
-            <td class="listr" ondblclick="document.location='cron_edit.php?id=<?=$i;?>';">
-              <?=$ent['minute'];?>&nbsp;
-            </td>
-            <td class="listr" ondblclick="document.location='cron_edit.php?id=<?=$i;?>';">
-              <?=$ent['hour'];?>&nbsp;
-            </td>
-            <td class="listr" ondblclick="document.location='cron_edit.php?id=<?=$i;?>';">
-              <?=$ent['mday'];?>&nbsp;
-            </td>
-            <td class="listr" ondblclick="document.location='cron_edit.php?id=<?=$i;?>';">
-              <?=$ent['month'];?>&nbsp;
-            </td>
-            <td class="listr" ondblclick="document.location='cron_edit.php?id=<?=$i;?>';">
-              <?=$ent['wday'];?>&nbsp;
-            </td>
-            <td class="listr" ondblclick="document.location='cron_edit.php?id=<?=$i;?>';">
-              <?=$ent['who'];?>&nbsp;
-            </td>
-            <td class="listr" ondblclick="document.location='cron_edit.php?id=<?=$i;?>';">
-              <?=$ent['command'];?>&nbsp;
-            </td>
-            <td valign="middle" style="white-space:nowrap" class="list">
-              <table border="0" cellspacing="0" cellpadding="1" summary="edit delete">
-                <tr>
-                  <td valign="middle"><a href="cron_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" /></a></td>
-                  <td><a href="cron_edit.php?type=php&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('Do you really want to delete this?')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /></a></td>
-                </tr>
-             </table>
-            </td>
-          </tr>
-		<?php 
-
-          $i++; 
-        }
-      }
-    ?>
-
-    <tr>
-      <td class="list" colspan="7"></td>
-      <td class="list">          
-        <table border="0" cellspacing="0" cellpadding="1" summary="add">
-          <tr>
-            <td width="17"></td>
-            <td valign="middle"><a href="cron_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /></a></td>
-          </tr>
-        </table>
-		  </td>
-     </tr>
-
-
-     <tr>
-       <td class="list" colspan="8"></td>
-       <td class="list"></td>
-     </tr>
-     </table>
-     
-</form>
-
-
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-
-</td>
-</tr>
-</table>
-
-</div>
-
-
-<?php include("fend.inc"); ?>
-</body>
-</html>
diff --git a/config/cron/cron.xml b/config/cron/cron.xml
index 3376d9e0..7ca50084 100644
--- a/config/cron/cron.xml
+++ b/config/cron/cron.xml
@@ -76,14 +76,14 @@
 		<item>https://packages.pfsense.org/packages/config/cron/cron.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
+		<prefix>/usr/local/packages/cron/</prefix>
 		<chmod>0755</chmod>		
-		<item>https://packages.pfsense.org/packages/config/cron/cron.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/cron/cron.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
+		<prefix>/usr/local/packages/cron/</prefix>
 		<chmod>0755</chmod>		
-		<item>https://packages.pfsense.org/packages/config/cron/cron_edit.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/cron/cron_edit.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/packages/cron/</prefix>
diff --git a/config/cron/cron_edit.php b/config/cron/cron_edit.php
new file mode 100644
index 00000000..12fde39d
--- /dev/null
+++ b/config/cron/cron_edit.php
@@ -0,0 +1,286 @@
+<?php 
+/* $Id$ */
+/*
+
+	cron_edit.php
+	Copyright (C) 2008 Mark J Crane
+	All rights reserved.
+	
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+	
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+	
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+	
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require_once("guiconfig.inc");
+require_once("/usr/local/pkg/cron.inc");
+
+
+$a_cron 	   = &$config['cron']['item'];
+
+$id = $_GET['id'];
+if (isset($_POST['id'])) {
+	$id = $_POST['id'];
+}
+
+if ($_GET['act'] == "del") {
+  if ($_GET['type'] == 'php') {
+      if ($a_cron[$_GET['id']]) {
+          unset($a_cron[$_GET['id']]);
+          write_config();
+          cron_sync_package();
+          header("Location: cron.php");
+          exit;
+      }
+  }
+}
+
+if (isset($id) && $a_cron[$id]) {
+
+	$pconfig['minute'] = $a_cron[$id]['minute'];
+	$pconfig['hour'] = $a_cron[$id]['hour'];
+	$pconfig['mday'] = $a_cron[$id]['mday'];
+	$pconfig['month'] = $a_cron[$id]['month'];
+	$pconfig['wday'] = $a_cron[$id]['wday'];
+	$pconfig['who'] = $a_cron[$id]['who'];
+	$pconfig['command'] = $a_cron[$id]['command'];
+	
+}
+
+if ($_POST) {
+
+	unset($input_errors);
+	$pconfig = $_POST;
+  
+	if (!$input_errors) {
+
+		$ent = array();
+		$ent['minute'] = $_POST['minute'];
+		$ent['hour'] = $_POST['hour'];
+		$ent['mday'] = $_POST['mday'];
+		$ent['month'] = $_POST['month'];
+		$ent['wday'] = $_POST['wday'];
+		$ent['who'] = $_POST['who'];
+		$ent['command'] = $_POST['command'];
+
+		if (isset($id) && $a_cron[$id]) {
+		  	//update
+      		$a_cron[$id] = $ent;
+		}
+		else {
+		  	//add	  
+			$a_cron[] = $ent;
+		}
+		
+		write_config();
+		cron_sync_package();
+		
+		header("Location: cron.php");
+		exit;
+	}
+}
+
+$pgtitle = array(gettext("Cron"),gettext("Edit"));
+include("head.inc");
+
+?>
+
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+
+<script type="text/javascript">
+//<![CDATA[
+function show_advanced_config() {
+	document.getElementById("showadvancedbox").innerHTML='';
+	aodiv = document.getElementById('showadvanced');
+	aodiv.style.display = "block";
+//]]>
+</script>
+
+<?php include("fbegin.inc"); ?>
+
+<?php if ($input_errors) print_input_errors($input_errors); ?>
+
+
+<div id="mainlevel">
+<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="mainlevel">
+<tr><td class="tabnavtbl">
+<?php
+			
+	$tab_array = array();
+	$tab_array[] = array(gettext("Settings"), false, "/packages/cron/cron.php");
+	$tab_array[] = array(gettext("Edit"), true, "/packages/cron/cron_edit.php");
+	display_top_tabs($tab_array);
+ 	
+?>
+</td></tr>
+</table>
+<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="mainarea">
+   <tr>
+     <td class="tabcont" >
+
+	<!--
+  	<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="title">              
+      <tr>
+        <td><p><span class="vexpl"><span class="red"><strong>Cron<br />
+            </strong></span>
+            </p></td>
+      </tr>
+    </table>
+    -->
+    <br />
+    
+        <form action="cron_edit.php" method="post" name="iform" id="iform">
+            <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="form">
+
+
+
+		
+            <tr>
+              <td width="25%" valign="top" class="vncellreq">minute</td>
+              <td width="75%" class="vtable"> 
+                <input name="minute" type="text" class="formfld" id="minute" size="40" value="<?=htmlspecialchars($pconfig['minute']);?>" />
+              </td>
+            </tr> 
+
+            <tr>
+              <td width="25%" valign="top" class="vncellreq">hour</td>
+              <td width="75%" class="vtable">
+                <input name="hour" type="text" class="formfld" id="hour" size="40" value="<?=htmlspecialchars($pconfig['hour']);?>" />
+              </td>
+            </tr>
+
+            <tr>
+              <td width="25%" valign="top" class="vncellreq">mday</td>
+              <td width="75%" class="vtable">
+                <input name="mday" type="text" class="formfld" id="mday" size="40" value="<?=htmlspecialchars($pconfig['mday']);?>" />
+              </td>
+            </tr>
+
+            <tr>
+              <td width="25%" valign="top" class="vncellreq">month</td>
+              <td width="75%" class="vtable">
+                <input name="month" type="text" class="formfld" id="month" size="40" value="<?=htmlspecialchars($pconfig['month']);?>" />
+              </td>
+            </tr>
+
+            <tr>
+              <td width="25%" valign="top" class="vncellreq">wday</td>
+              <td width="75%" class="vtable">
+                <input name="wday" type="text" class="formfld" id="wday" size="40" value="<?=htmlspecialchars($pconfig['wday']);?>" />
+              </td>
+            </tr>
+            
+            <tr>
+              <td width="25%" valign="top" class="vncellreq">who</td>
+              <td width="75%" class="vtable">
+                <input name="who" type="text" class="formfld" id="who" size="40" value="<?=htmlspecialchars($pconfig['who']);?>" />
+              </td>
+            </tr>
+            
+            <tr>
+              <td width="25%" valign="top" class="vncellreq">command</td>
+              <td width="75%" class="vtable">
+                <!-- <input name="command" type="text" class="formfld" id="command" size="40" value="<?=htmlspecialchars($pconfig['command']);?>" /> -->
+				  <textarea rows="3" cols="68" name="command" id="command"><?=htmlspecialchars($pconfig['command']);?></textarea>
+              </td>
+            </tr>
+            <!--
+            <tr>
+              <td width="22%" valign="top" class="vncell">PHP</td>
+              <td width="78%" class="vtable">
+            -->
+              <?php
+                //echo "<textarea name=\"php\" id=\"php\" cols=\"70\" rows=\"15\" wrap=\"off\">".htmlspecialchars($pconfig['php'])."</textarea>\n";
+              ?>
+            <!--
+                <br>
+                <select name='dialplan_expression_select' id='dialplan_expression_select' onchange="document.getElementById('dialplan_expression').value += document.getElementById('dialplan_expression_select').value + '\n';" class='formfld'>
+                <option></option>                
+                <option value='snortkillsessions'>snort kill sessions</option>                               
+                </select>
+                <span class="vexpl">
+                <br />
+                </span>
+                </td>
+            </tr>
+						-->
+            <!--
+            <tr>
+              <td width="22%" valign="top" class="vncellreq">Enabled</td>
+              <td width="78%" class="vtable"> 
+                <?php                
+                echo "              <select name='enabled' class='formfld'>\n";
+                echo "                <option></option>\n";
+                switch (htmlspecialchars($pconfig['enabled'])) {
+                case "true":
+                    echo "              <option value='true' selected='selected'>true</option>\n";
+                    echo "              <option value='false'>false</option>\n";
+                    break;
+                case "false":
+                    echo "              <option value='true'>true</option>\n";
+                    echo "              <option value='false' selected='selected'>false</option>\n";
+
+                    break;
+                default:
+                    echo "              <option value='true' selected='selected'>true</option>\n";
+                    echo "              <option value='false'>false</option>\n";
+                }
+                echo "              </select>\n";
+                ?>          
+              </td>
+            </tr>
+            -->
+            <!--
+            <tr>
+              <td width="25%" valign="top" class="vncellreq">Description</td>
+              <td width="75%" class="vtable"> 
+                <input name="description" type="text" class="formfld" id="description" size="40" value="<?=htmlspecialchars($pconfig['description']);?>" />
+                <br /><span class="vexpl">Enter the description here.<br /></span>
+              </td>
+            </tr>
+            -->
+            
+            <tr>
+              <td valign="top">&nbsp;</td>
+              <td>
+                <input name="Submit" type="submit" class="formbtn" value="Save" /> <input class="formbtn" type="button" value="Cancel" onclick="history.back()" />
+                <?php if (isset($id) && $a_cron[$id]): ?>
+                  <input name="id" type="hidden" value="<?=$id;?>" />
+                <?php endif; ?>
+              </td>
+            </tr>
+            </table>
+        </form>
+
+      <br />
+      <br />
+      <br />
+      <br />
+      <br />
+      <br />
+
+     </td>
+   </tr>
+</table>
+
+</div>
+
+<?php include("fend.inc"); ?>
+</body>
+</html>
diff --git a/config/cron/cron_edit.tmp b/config/cron/cron_edit.tmp
deleted file mode 100644
index 12fde39d..00000000
--- a/config/cron/cron_edit.tmp
+++ /dev/null
@@ -1,286 +0,0 @@
-<?php 
-/* $Id$ */
-/*
-
-	cron_edit.php
-	Copyright (C) 2008 Mark J Crane
-	All rights reserved.
-	
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-	
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require_once("guiconfig.inc");
-require_once("/usr/local/pkg/cron.inc");
-
-
-$a_cron 	   = &$config['cron']['item'];
-
-$id = $_GET['id'];
-if (isset($_POST['id'])) {
-	$id = $_POST['id'];
-}
-
-if ($_GET['act'] == "del") {
-  if ($_GET['type'] == 'php') {
-      if ($a_cron[$_GET['id']]) {
-          unset($a_cron[$_GET['id']]);
-          write_config();
-          cron_sync_package();
-          header("Location: cron.php");
-          exit;
-      }
-  }
-}
-
-if (isset($id) && $a_cron[$id]) {
-
-	$pconfig['minute'] = $a_cron[$id]['minute'];
-	$pconfig['hour'] = $a_cron[$id]['hour'];
-	$pconfig['mday'] = $a_cron[$id]['mday'];
-	$pconfig['month'] = $a_cron[$id]['month'];
-	$pconfig['wday'] = $a_cron[$id]['wday'];
-	$pconfig['who'] = $a_cron[$id]['who'];
-	$pconfig['command'] = $a_cron[$id]['command'];
-	
-}
-
-if ($_POST) {
-
-	unset($input_errors);
-	$pconfig = $_POST;
-  
-	if (!$input_errors) {
-
-		$ent = array();
-		$ent['minute'] = $_POST['minute'];
-		$ent['hour'] = $_POST['hour'];
-		$ent['mday'] = $_POST['mday'];
-		$ent['month'] = $_POST['month'];
-		$ent['wday'] = $_POST['wday'];
-		$ent['who'] = $_POST['who'];
-		$ent['command'] = $_POST['command'];
-
-		if (isset($id) && $a_cron[$id]) {
-		  	//update
-      		$a_cron[$id] = $ent;
-		}
-		else {
-		  	//add	  
-			$a_cron[] = $ent;
-		}
-		
-		write_config();
-		cron_sync_package();
-		
-		header("Location: cron.php");
-		exit;
-	}
-}
-
-$pgtitle = array(gettext("Cron"),gettext("Edit"));
-include("head.inc");
-
-?>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-
-<script type="text/javascript">
-//<![CDATA[
-function show_advanced_config() {
-	document.getElementById("showadvancedbox").innerHTML='';
-	aodiv = document.getElementById('showadvanced');
-	aodiv.style.display = "block";
-//]]>
-</script>
-
-<?php include("fbegin.inc"); ?>
-
-<?php if ($input_errors) print_input_errors($input_errors); ?>
-
-
-<div id="mainlevel">
-<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="mainlevel">
-<tr><td class="tabnavtbl">
-<?php
-			
-	$tab_array = array();
-	$tab_array[] = array(gettext("Settings"), false, "/packages/cron/cron.php");
-	$tab_array[] = array(gettext("Edit"), true, "/packages/cron/cron_edit.php");
-	display_top_tabs($tab_array);
- 	
-?>
-</td></tr>
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="mainarea">
-   <tr>
-     <td class="tabcont" >
-
-	<!--
-  	<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="title">              
-      <tr>
-        <td><p><span class="vexpl"><span class="red"><strong>Cron<br />
-            </strong></span>
-            </p></td>
-      </tr>
-    </table>
-    -->
-    <br />
-    
-        <form action="cron_edit.php" method="post" name="iform" id="iform">
-            <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="form">
-
-
-
-		
-            <tr>
-              <td width="25%" valign="top" class="vncellreq">minute</td>
-              <td width="75%" class="vtable"> 
-                <input name="minute" type="text" class="formfld" id="minute" size="40" value="<?=htmlspecialchars($pconfig['minute']);?>" />
-              </td>
-            </tr> 
-
-            <tr>
-              <td width="25%" valign="top" class="vncellreq">hour</td>
-              <td width="75%" class="vtable">
-                <input name="hour" type="text" class="formfld" id="hour" size="40" value="<?=htmlspecialchars($pconfig['hour']);?>" />
-              </td>
-            </tr>
-
-            <tr>
-              <td width="25%" valign="top" class="vncellreq">mday</td>
-              <td width="75%" class="vtable">
-                <input name="mday" type="text" class="formfld" id="mday" size="40" value="<?=htmlspecialchars($pconfig['mday']);?>" />
-              </td>
-            </tr>
-
-            <tr>
-              <td width="25%" valign="top" class="vncellreq">month</td>
-              <td width="75%" class="vtable">
-                <input name="month" type="text" class="formfld" id="month" size="40" value="<?=htmlspecialchars($pconfig['month']);?>" />
-              </td>
-            </tr>
-
-            <tr>
-              <td width="25%" valign="top" class="vncellreq">wday</td>
-              <td width="75%" class="vtable">
-                <input name="wday" type="text" class="formfld" id="wday" size="40" value="<?=htmlspecialchars($pconfig['wday']);?>" />
-              </td>
-            </tr>
-            
-            <tr>
-              <td width="25%" valign="top" class="vncellreq">who</td>
-              <td width="75%" class="vtable">
-                <input name="who" type="text" class="formfld" id="who" size="40" value="<?=htmlspecialchars($pconfig['who']);?>" />
-              </td>
-            </tr>
-            
-            <tr>
-              <td width="25%" valign="top" class="vncellreq">command</td>
-              <td width="75%" class="vtable">
-                <!-- <input name="command" type="text" class="formfld" id="command" size="40" value="<?=htmlspecialchars($pconfig['command']);?>" /> -->
-				  <textarea rows="3" cols="68" name="command" id="command"><?=htmlspecialchars($pconfig['command']);?></textarea>
-              </td>
-            </tr>
-            <!--
-            <tr>
-              <td width="22%" valign="top" class="vncell">PHP</td>
-              <td width="78%" class="vtable">
-            -->
-              <?php
-                //echo "<textarea name=\"php\" id=\"php\" cols=\"70\" rows=\"15\" wrap=\"off\">".htmlspecialchars($pconfig['php'])."</textarea>\n";
-              ?>
-            <!--
-                <br>
-                <select name='dialplan_expression_select' id='dialplan_expression_select' onchange="document.getElementById('dialplan_expression').value += document.getElementById('dialplan_expression_select').value + '\n';" class='formfld'>
-                <option></option>                
-                <option value='snortkillsessions'>snort kill sessions</option>                               
-                </select>
-                <span class="vexpl">
-                <br />
-                </span>
-                </td>
-            </tr>
-						-->
-            <!--
-            <tr>
-              <td width="22%" valign="top" class="vncellreq">Enabled</td>
-              <td width="78%" class="vtable"> 
-                <?php                
-                echo "              <select name='enabled' class='formfld'>\n";
-                echo "                <option></option>\n";
-                switch (htmlspecialchars($pconfig['enabled'])) {
-                case "true":
-                    echo "              <option value='true' selected='selected'>true</option>\n";
-                    echo "              <option value='false'>false</option>\n";
-                    break;
-                case "false":
-                    echo "              <option value='true'>true</option>\n";
-                    echo "              <option value='false' selected='selected'>false</option>\n";
-
-                    break;
-                default:
-                    echo "              <option value='true' selected='selected'>true</option>\n";
-                    echo "              <option value='false'>false</option>\n";
-                }
-                echo "              </select>\n";
-                ?>          
-              </td>
-            </tr>
-            -->
-            <!--
-            <tr>
-              <td width="25%" valign="top" class="vncellreq">Description</td>
-              <td width="75%" class="vtable"> 
-                <input name="description" type="text" class="formfld" id="description" size="40" value="<?=htmlspecialchars($pconfig['description']);?>" />
-                <br /><span class="vexpl">Enter the description here.<br /></span>
-              </td>
-            </tr>
-            -->
-            
-            <tr>
-              <td valign="top">&nbsp;</td>
-              <td>
-                <input name="Submit" type="submit" class="formbtn" value="Save" /> <input class="formbtn" type="button" value="Cancel" onclick="history.back()" />
-                <?php if (isset($id) && $a_cron[$id]): ?>
-                  <input name="id" type="hidden" value="<?=$id;?>" />
-                <?php endif; ?>
-              </td>
-            </tr>
-            </table>
-        </form>
-
-      <br />
-      <br />
-      <br />
-      <br />
-      <br />
-      <br />
-
-     </td>
-   </tr>
-</table>
-
-</div>
-
-<?php include("fend.inc"); ?>
-</body>
-</html>
-- 
cgit v1.2.3