aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2010-12-10 12:34:06 +0000
committerErmal <eri@pfsense.org>2010-12-10 12:34:06 +0000
commit806db0240fa060b9ceb197fbc636be8bf916d95c (patch)
tree279146ea28f467679ba011e122d17048b6122095
parentd78afeef3efb084afdd8d849f7b38a837b1cce30 (diff)
downloadpfsense-packages-806db0240fa060b9ceb197fbc636be8bf916d95c.tar.gz
pfsense-packages-806db0240fa060b9ceb197fbc636be8bf916d95c.tar.bz2
pfsense-packages-806db0240fa060b9ceb197fbc636be8bf916d95c.zip
Prepend package name to functions and use require_once instead of require.
-rw-r--r--config/cron/cron.inc4
-rw-r--r--config/cron/cron_edit.tmp4
2 files changed, 4 insertions, 4 deletions
diff --git a/config/cron/cron.inc b/config/cron/cron.inc
index 3e6b6cea..44d1fc00 100644
--- a/config/cron/cron.inc
+++ b/config/cron/cron.inc
@@ -33,7 +33,7 @@
require_once("services.inc");
-function pkg_is_service_running($servicename)
+function cron_pkg_is_service_running($servicename)
{
exec("/bin/ps ax | awk '{ print $5 }'", $psout);
array_shift($psout);
@@ -118,4 +118,4 @@ function cron_deinstall_command()
config_unlock();
}
-?> \ No newline at end of file
+?>
diff --git a/config/cron/cron_edit.tmp b/config/cron/cron_edit.tmp
index 81f4b02b..71367d24 100644
--- a/config/cron/cron_edit.tmp
+++ b/config/cron/cron_edit.tmp
@@ -28,8 +28,8 @@
POSSIBILITY OF SUCH DAMAGE.
*/
-require("guiconfig.inc");
-require("/usr/local/pkg/cron.inc");
+require_once("guiconfig.inc");
+require_once("/usr/local/pkg/cron.inc");
$a_cron = &$config['cron']['item'];