From c44417f85c3981e3038dce7cce795c9e571844df Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sat, 21 Nov 2009 18:30:00 -0500
Subject: Include captiveportal for captiveportal_radius_stop_all()

---
 etc/rc.php_ini_setup | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'etc/rc.php_ini_setup')

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
-- 
cgit v1.1