diff options
author | phildd <ict.advisor@nepal.inf.org> | 2012-08-07 16:12:09 +0545 |
---|---|---|
committer | phildd <ict.advisor@nepal.inf.org> | 2012-08-07 16:12:09 +0545 |
commit | e9d66ed41ee92b139381c70a2dcfe5cf229cd63e (patch) | |
tree | 9ab342bb2d5934607f2f65ba07304cd60fb5f100 /etc/inc/service-utils.inc | |
parent | c59667116de9acce8c00551abe2c0f2a48ec2f3a (diff) | |
download | pfsense-e9d66ed41ee92b139381c70a2dcfe5cf229cd63e.zip pfsense-e9d66ed41ee92b139381c70a2dcfe5cf229cd63e.tar.gz |
Change rcfileprefix to a constant
Diffstat (limited to 'etc/inc/service-utils.inc')
-rw-r--r-- | etc/inc/service-utils.inc | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/etc/inc/service-utils.inc b/etc/inc/service-utils.inc index 01230a1..2a9ca99 100644 --- a/etc/inc/service-utils.inc +++ b/etc/inc/service-utils.inc @@ -38,15 +38,15 @@ pfSense_MODULE: utils */ -$rcfileprefix = "/usr/local/etc/rc.d/"; +define("RCFILEPREFIX", "/usr/local/etc/rc.d/"); function write_rcfile($params) { global $g; - global $rcfileprefix; - if (!file_exists("{$rcfileprefix}{$params['file']}") && !touch("{$rcfileprefix}{$params['file']}")) + $rcfile_fullname = RCFILEPREFIX . $params['file']; + if (!file_exists($rcfile_fullname) && !touch($rcfile_fullname)) return false; - if (!is_writable("{$rcfileprefix}{$params['file']}") || empty($params['start'])) + if (!is_writable($rcfile_fullname) || empty($params['start'])) return false; $towrite = "#!/bin/sh\n"; @@ -72,15 +72,14 @@ function write_rcfile($params) { /* begin rcfile logic */ $towrite .= "case \$1 in\n\tstart)\n\t\trc_start\n\t\t;;\n\tstop)\n\t\trc_stop\n\t\t;;\n\trestart)\n\t\trc_stop\n\t\trc_start\n\t\t;;\nesac\n\n"; - file_put_contents("{$rcfileprefix}{$params['file']}", $towrite); - @chmod("{$rcfileprefix}{$params['file']}", 0755); + file_put_contents($rcfile_fullname, $towrite); + @chmod("{$rcfile_fullname}", 0755); return; } function start_service($name) { global $config; - global $rcfileprefix; if (empty($name)) return; @@ -89,15 +88,16 @@ function start_service($name) { stop_service($name); sleep(2); - if(file_exists("{$rcfileprefix}{$name}.sh")) { - mwexec_bg("/bin/sh {$rcfileprefix}{$name}.sh start"); + $rcfile_fullname = RCFILEPREFIX . $name . '.sh'; + if(file_exists($rcfile_fullname)) { + mwexec_bg("/bin/sh {$rcfile_fullname} start"); return; } if($config['installedpackages']['service']) { foreach($config['installedpackages']['service'] as $service) { if(strtolower($service['name']) == strtolower($name)) { if($service['rcfile']) { - $prefix = $rcfileprefix; + $prefix = RCFILEPREFIX; if (!empty($service['prefix'])) { $prefix =& $service['prefix']; } @@ -115,7 +115,6 @@ function start_service($name) { function stop_service($name) { global $config; - global $rcfileprefix; if (empty($name)) return; @@ -124,7 +123,7 @@ function stop_service($name) { foreach($config['installedpackages']['service'] as $service) { if(strtolower($service['name']) == strtolower($name)) { if($service['rcfile']) { - $prefix = $rcfileprefix; + $prefix = RCFILEPREFIX; if(!empty($service['prefix'])) { $prefix =& $service['prefix']; } |