X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fconfig;h=c8eb01095dcbcc4855b24d7505278f355ce8ff02;hb=4bdf99d16d2d559af3bcd7dca2b7df38b2cc7731;hp=93754a0ccb1fbe1dd32c4131930d7adddb506079;hpb=06151af93589df942af2745ac3784115c561514d;p=php5-cn.git

diff --git a/debian/config b/debian/config
index 93754a0..c8eb010 100755
--- a/debian/config
+++ b/debian/config
@@ -10,11 +10,11 @@ if [ "$1" != reconfigure ]; then
     php5_done=1
 
     for SAPI in apache2 cli; do
-	db_fget php5-cn/${SAPI} seen
-	if [ "$RET" != "true" ]; then
-	    php5_done=0
-	    break
-	fi
+        db_fget php5-cn/${SAPI} seen
+        if [ "$RET" != "true" ]; then
+            php5_done=0
+            break
+        fi
     done
 
     test $php5_done -eq 1 && exit 0
@@ -43,57 +43,64 @@ phpmemlimit () {
 #
 for SAPI in apache2 cli; do
 
-    if [ ! -d "$PHP5DIR/$SAPI" ]; then
-        continue
-    fi
-
     ini_diff=0
     ini_file="$PHP5DIR/$SAPI/php.ini"
-    
+
+    upload_max_filesize=
+    post_max_size=
+    memory_limit=
+    error_reporting=
+
     phplimit="$(phpmemlimit)M"
 
     if [ -f "$ini_file" ]; then
 
-        if egrep -q "^[[:space:]]*(upload_max_filesize|post_max_size|memory_limit)[[:space:]]*=" $ini_file; then
+        if egrep -q "^[[:space:]]*(upload_max_filesize|post_max_size|memory_limit|error_reporting)[[:space:]]*=" $ini_file; then
 
-	    upload_max_filesize=`awk '$1 == "upload_max_filesize" { print $3; exit(0) }' $ini_file`
-	    post_max_size=`awk '$1 == "post_max_size" { print $3; exit(0) }' $ini_file`
-	    memory_limit=`awk '$1 == "memory_limit" { print $3; exit(0) }' $ini_file`
+            upload_max_filesize=`awk '$1 == "upload_max_filesize" { print $3; exit(0) }' $ini_file`
+            post_max_size=`awk '$1 == "post_max_size" { print $3; exit(0) }' $ini_file`
+            memory_limit=`awk '$1 == "memory_limit" { print $3; exit(0) }' $ini_file`
+            error_reporting=`awk '$1 == "error_reporting" { print $3; exit(0) }' $ini_file`
 
-	    if [ "$upload_max_filesize" != "256M" ]; then ini_diff=1; fi
-	    if [ "$post_max_size" != "$phplimit" ]; then ini_diff=1; fi
-	    if [ "$memory_limit" != "$phplimit" ]; then ini_diff=1; fi
-	else
-	
-	    ini_diff=1
-	fi
+            if [ "$upload_max_filesize" != "256M" ]; then ini_diff=1; fi
+            if [ "$post_max_size" != "$phplimit" ]; then ini_diff=1; fi
+            if [ "$memory_limit" != "$phplimit" ]; then ini_diff=1; fi
+            if [ "$error_reporting" != "E_ERROR" ]; then ini_diff=1; fi
+        else
+
+            ini_diff=1
+        fi
     else
-    
-	ini_diff=1
+
+        ini_diff=1
     fi
-    
+
     if [ $ini_diff -eq 1 ]; then
 
-	# Configurations are not the same - ask user what to do.
-	test -z "$upload_max_filesize" && upload_max_filesize="2M"
-	test -z "$post_max_size" && post_max_size="8M"
-	test -z "$memory_limit" && memory_limit="16M"
-	
-	db_title php5-cn - konfiguracija za $(echo ${SAPI} | sed 's/a/A/;s/cli/CLI/')
-	db_subst php5-cn/${SAPI} ini_file "$ini_file"
-
-	db_subst php5-cn/${SAPI} upload_max_filesize "$upload_max_filesize"
-	db_subst php5-cn/${SAPI} post_max_size "$post_max_size"
-	db_subst php5-cn/${SAPI} memory_limit "$memory_limit"
-	
-	db_subst php5-cn/${SAPI} new_phplimit "$phplimit"
-
-	db_input critical php5-cn/${SAPI} || true
-	db_go || true
+        # Configurations are not the same - ask user what to do.
+        test -z "$upload_max_filesize" && upload_max_filesize="2M"
+        test -z "$post_max_size" && post_max_size="8M"
+        test -z "$memory_limit" && memory_limit="16M"
+        test -z "$error_reporting" && error_reporting="E_ALL & ~E_DEPRECATED"
+
+        db_title php5-cn - konfiguracija za $(echo ${SAPI} | sed 's/a/A/;s/cli/CLI/')
+        db_subst php5-cn/${SAPI} ini_file "$ini_file"
+
+        db_subst php5-cn/${SAPI} upload_max_filesize "$upload_max_filesize"
+        db_subst php5-cn/${SAPI} post_max_size "$post_max_size"
+        db_subst php5-cn/${SAPI} memory_limit "$memory_limit"
+
+        db_subst php5-cn/${SAPI} new_phplimit "$phplimit"
+
+        db_subst php5-cn/${SAPI} error_reporting "$error_reporting"
+        db_subst php5-cn/${SAPI} new_error_reporting "E_ERROR"
+
+        db_input critical php5-cn/${SAPI} || true
+        db_go || true
     else
-    
-	db_set php5-cn/${SAPI} false || true
-	db_fset php5-cn/${SAPI} seen true
+
+        db_set php5-cn/${SAPI} false || true
+        db_fset php5-cn/${SAPI} seen true
     fi
 
 done