diff options
-rwxr-xr-x | etc/rc.php_ini_setup | 23 | ||||
-rwxr-xr-x | usr/local/www/halt.php | 2 | ||||
-rwxr-xr-x | usr/local/www/reboot.php | 2 |
3 files changed, 13 insertions, 14 deletions
diff --git a/etc/rc.php_ini_setup b/etc/rc.php_ini_setup index b654b60..fb32c32 100755 --- a/etc/rc.php_ini_setup +++ b/etc/rc.php_ini_setup @@ -28,11 +28,14 @@ # Set our operating platform PLATFORM=`cat /etc/platform` EXTENSIONSDIR="/usr/local/lib/php/20060613/" + +# Grab amount of memory that is deteceted if [ -f /var/log/dmesg.boot ]; then AVAILMEM=`cat /var/log/dmesg.boot | grep "memory" | grep "avail" | awk '{ print $5 }' | cut -d'(' -f2 | cut -d'M' -f1` else AVAILMEM=`dmesg -a | grep "memory" | grep "avail" | awk '{ print $5 }' | cut -d'(' -f2 | cut -d'M' -f1` fi + # Calculate APC SHM size according # to detected memory values if [ "$AVAILMEM" -lt "128" ]; then @@ -64,35 +67,23 @@ fi # Define php modules. Do not add .so, it will # be done automatically by the script below. PHPMODULES="apc \ - bcmath \ - bz2 \ - ctype \ curl \ date \ - json \ gettext \ ldap \ - libxml \ - mbstring \ - mhash \ - mysql \ openssl \ pcntl \ pcre \ posix \ readline \ - Reflection \ session \ shmop \ - sockets \ standard \ suhosin \ sysvmsg \ sysvsem \ sysvshm \ - sqlite \ - tokenizer \ - uploadprogress \ + libxml \ xml \ xmlreader \ zlib" @@ -126,12 +117,16 @@ html_errors = Off zlib.output_compression = On zlib.output_compression_level = 1 include_path = ".:/etc/inc:/usr/local/www:/usr/local/captiveportal:/usr/local/pkg" -uploadprogress.file.filename_template = /tmp/uploadprogress_%s.txt extension_dir=${EXTENSIONSDIR} ; Extensions EOF +if [ -d /etc/php_dynamodules ]; then + DYNA_MODULES=`ls /etc/php_dynamodules/` + PHPMODULES="$PHPMODULES $DYNA_MODULES" +fi + # Loop through and generate modules to load. # Take into account modules built into php. for EXT in $PHPMODULES; do diff --git a/usr/local/www/halt.php b/usr/local/www/halt.php index b6fdbd0..0867b60 100755 --- a/usr/local/www/halt.php +++ b/usr/local/www/halt.php @@ -43,6 +43,8 @@ ##|-PRIV require("guiconfig.inc"); +require("functions.inc"); +require("captiveportal.inc"); if ($_POST) { if ($_POST['Submit'] != " No ") { diff --git a/usr/local/www/reboot.php b/usr/local/www/reboot.php index 2205bb9..df607a7 100755 --- a/usr/local/www/reboot.php +++ b/usr/local/www/reboot.php @@ -37,6 +37,8 @@ ##|-PRIV require("guiconfig.inc"); +require("functions.inc"); +require("captiveportal.inc"); if ($_POST) { if ($_POST['Submit'] == " Yes ") { |