diff options
| -rwxr-xr-x | etc/ecl.php | 6 | ||||
| -rw-r--r-- | etc/phpshellsessions/externalconfiglocator | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/etc/ecl.php b/etc/ecl.php index d879266..9f68919 100755 --- a/etc/ecl.php +++ b/etc/ecl.php @@ -38,14 +38,14 @@ $debug = false; function get_boot_disk() { global $g, $debug; - $disk = `/sbin/mount | /usr/bin/grep "on / " | /usr/bin/cut -d'/' -f3 | /usr/bin/cut -d' ' -f1`; + $disk = exec("/sbin/mount | /usr/bin/grep \"on / \" | /usr/bin/cut -d'/' -f3 | /usr/bin/cut -d' ' -f1"); return $disk; } function get_disk_slices($disk) { global $g, $debug; $slices_array = array(); - $slices = trim(`/bin/ls /dev/{$disk}s* 2>/dev/null`); + $slices = trim(exec("/bin/ls /dev/{$disk}s* 2>/dev/null")); $slices = str_replace("/dev/", "", $slices); if($slices == "ls: No match.") return; @@ -56,7 +56,7 @@ function get_disk_slices($disk) { function get_disks() { global $g, $debug; $disks_array = array(); - $disks = `/sbin/sysctl kern.disks | cut -d':' -f2`; + $disks = exec("/sbin/sysctl kern.disks | cut -d':' -f2"); $disks_s = explode(" ", $disks); foreach($disks_s as $disk) if(trim($disk)) diff --git a/etc/phpshellsessions/externalconfiglocator b/etc/phpshellsessions/externalconfiglocator index 8a60867..84534b3 100644 --- a/etc/phpshellsessions/externalconfiglocator +++ b/etc/phpshellsessions/externalconfiglocator @@ -1,5 +1,3 @@ -global $config; -$config = parse_config(true); +include("/etc/ecl.php"); -require("/etc/ecl.php"); |
