Code enhancements

1 files changed, 33 insertions, 36 deletions

diff --git a/include/tests_php b/include/tests_php
index 9609d077..e19c6ec4 100644
--- a/include/tests_php
+++ b/include/tests_php
@@ -25,37 +25,34 @@
     InsertSection "PHP"
 
     # Possible locations of php.ini
-    PHPINILOCS="/etc/php.ini /etc/php.ini.default \
-                /etc/php/php.ini /etc/php5.5/php.ini /etc/php5.6/php.ini /etc/php7.0/php.ini /etc/php7.1/php.ini \
-                /etc/php/cgi-php5/php.ini /etc/php/cli-php5/php.ini /etc/php/apache2-php5/php.ini \
-                /etc/php/apache2-php7.1/php.ini /etc/php/apache2-php5.5/php.ini /etc/php/apache2-php5.6/php.ini /etc/php/apache2-php7.0/php.ini \
-                /etc/php/cgi-php7.1/php.ini /etc/php/cgi-php5.5/php.ini /etc/php/cgi-php5.6/php.ini /etc/php/cgi-php7.0/php.ini \
-                /etc/php/cli-php7.1/php.ini /etc/php/cli-php5.5/php.ini /etc/php/cli-php5.6/php.ini /etc/php/cli-php7.0/php.ini \
-                /etc/php/embed-php7.1/php.ini /etc/php/embed-php5.5/php.ini /etc/php/embed-php5.6/php.ini /etc/php/embed-php7.0/php.ini \
-                /etc/php/fpm-php7.1/php.ini /etc/php/fpm-php5.5/php.ini /etc/php/fpm-php5.6/php.ini /etc/php/fpm-php7.0/php.ini \
-                /etc/php5/cgi/php.ini \
-                /etc/php5/cli/php.ini \
-                /etc/php5/cli-php5.4/php.ini /etc/php5/cli-php5.5/php.ini /etc/php5/cli-php5.6/php.ini \
-                /etc/php5/apache2/php.ini \
-                /etc/php5/fpm/php.ini \
-                /private/etc/php.ini \
-                /var/www/conf/php.ini \
-                /usr/local/etc/php.ini /usr/local/lib/php.ini \
-                /usr/local/zend/etc/php.ini \
-                /usr/pkg/etc/php.ini \
-                /opt/cpanel/ea-php54/root/etc/php.ini \
-                /opt/cpanel/ea-php55/root/etc/php.ini \
-                /opt/cpanel/ea-php56/root/etc/php.ini \
-                /opt/cpanel/ea-php70/root/etc/php.ini \
-                /opt/cpanel/ea-php71/root/etc/php.ini"
+    PHPINILOCS="${ROOTDIR}etc/php.ini ${ROOTDIR}etc/php.ini.default \
+                ${ROOTDIR}etc/php/php.ini ${ROOTDIR}etc/php5.5/php.ini ${ROOTDIR}etc/php5.6/php.ini ${ROOTDIR}etc/php7.0/php.ini ${ROOTDIR}etc/php7.1/php.ini ${ROOTDIR}etc/php7.2/php.ini \
+                ${ROOTDIR}etc/php/cgi-php5/php.ini ${ROOTDIR}etc/php/cli-php5/php.ini ${ROOTDIR}etc/php/apache2-php5/php.ini \
+                ${ROOTDIR}etc/php/apache2-php5.5/php.ini ${ROOTDIR}etc/php/apache2-php5.6/php.ini ${ROOTDIR}etc/php/apache2-php7.0/php.ini ${ROOTDIR}etc/php/apache2-php7.1/php.ini \
+                ${ROOTDIR}etc/php/cgi-php7.1/php.ini ${ROOTDIR}etc/php/apache2-php7.1/php.inietc/php/cgi-php5.5/php.ini ${ROOTDIR}etc/php/cgi-php5.6/php.ini ${ROOTDIR}etc/php/cgi-php7.0/php.ini \
+                ${ROOTDIR}etc/php/cli-php7.1/php.ini ${ROOTDIR}etc/php/cli-php5.5/php.ini ${ROOTDIR}etc/php/cli-php5.6/php.ini ${ROOTDIR}etc/php/cli-php7.0/php.ini \
+                ${ROOTDIR}etc/php/embed-php7.1/php.ini ${ROOTDIR}etc/php/embed-php5.5/php.ini ${ROOTDIR}etc/php/embed-php5.6/php.ini ${ROOTDIR}etc/php/embed-php7.0/php.ini \
+                ${ROOTDIR}etc/php/fpm-php7.1/php.ini ${ROOTDIR}etc/php/fpm-php5.5/php.ini ${ROOTDIR}etc/php/fpm-php5.6/php.ini ${ROOTDIR}etc/php/fpm-php7.0/php.ini \
+                ${ROOTDIR}etc/php5/cgi/php.ini \
+                ${ROOTDIR}etc/php5/cli/php.ini \
+                ${ROOTDIR}etc/php5/cli-php5.4/php.ini ${ROOTDIR}etc/php5/cli-php5.5/php.ini ${ROOTDIR}etc/php5/cli-php5.6/php.ini \
+                ${ROOTDIR}etc/php5/apache2/php.ini \
+                ${ROOTDIR}etc/php5/fpm/php.ini \
+                ${ROOTDIR}private/etc/php.ini \
+                ${ROOTDIR}var/www/conf/php.ini \
+                ${ROOTDIR}usr/local/etc/php.ini ${ROOTDIR}usr/local/lib/php.ini \
+                ${ROOTDIR}usr/local/zend/etc/php.ini \
+                ${ROOTDIR}usr/pkg/etc/php.ini \
+                ${ROOTDIR}opt/cpanel/ea-php54/root/etc/php.ini \
+                ${ROOTDIR}opt/cpanel/ea-php55/root/etc/php.ini \
+                ${ROOTDIR}opt/cpanel/ea-php56/root/etc/php.ini \
+                ${ROOTDIR}opt/cpanel/ea-php70/root/etc/php.ini \
+                ${ROOTDIR}opt/cpanel/ea-php71/root/etc/php.ini"
 
-    PHPINIDIRS="/etc/php5/conf.d \
-                /etc/php.d \
-                /opt/cpanel/ea-php54/root/etc/php.d \
-                /opt/cpanel/ea-php55/root/etc/php.d \
-                /opt/cpanel/ea-php56/root/etc/php.d \
-                /opt/cpanel/ea-php70/root/etc/php.d \
-                /opt/cpanel/ea-php71/root/etc/php.d"
+    PHPINIDIRS="${ROOTDIR}etc/php5/conf.d \
+                ${ROOTDIR}etc/php.d \
+                ${ROOTDIR}opt/cpanel/ea-php54/root/etc/php.d ${ROOTDIR}opt/cpanel/ea-php55/root/etc/php.d ${ROOTDIR}opt/cpanel/ea-php56/root/etc/php.d ${ROOTDIR}opt/cpanel/ea-php70/root/etc/php.d \
+                ${ROOTDIR}opt/cpanel/ea-php71/root/etc/php.d"
 
     PHPVERSION=""
 #
@@ -154,10 +151,10 @@
     if [ ! -z "${PHPINIFILE}" -a ! -z "${PHPVERSION}" -a ! -z "${EGREPBINARY}" ]; then
         if [ -f "${PHPINIFILE}" ]; then
             FIND=$(echo ${PHPVERSION} | ${EGREPBINARY} "^(4.|5.[0-3])")
-            if [ "${FIND}" = "" ]; then
+            if [ -z "${FIND}" ]; then
                 PREQS_MET="NO"; Debug "Found most likely PHP version 5.4.0 or higher (${PHPVERSION}) which does not use register_globals"
             else
-               PREQS_MET="YES"; Debug "Found PHP version 4 or up to 5.3 (${FIND}) which we are going to scan"
+                PREQS_MET="YES"; Debug "Found PHP version 4 or up to 5.3 (${FIND}) which we are going to scan"
             fi
         else
             Debug "File php.ini (${PHPINIFILE}) not found"
@@ -172,7 +169,7 @@
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Checking PHP register_globals option"
         FIND=$(${EGREPBINARY} -i 'register_globals.*(on|yes|1)' ${PHPINIFILE} | ${GREPBINARY} -v '^;')
-        if [ ! "${FIND}" = "" ]; then
+        if [ ! -z "${FIND}" ]; then
             Display --indent 4 --text "- Checking register_globals option" --result "${STATUS_WARNING}" --color RED
             ReportWarning ${TEST_NO} "PHP option register_globals option is turned on, which can be a risk for variable value overwriting"
             ReportSuggestion ${TEST_NO} "Change the register_globals line to: register_globals = Off"
@@ -191,7 +188,7 @@
     # Test        : PHP-2372
     # Description : Check php expose_php option
     # Notes       : Extend test to check all PHP files YYY
-    if [ ! "${PHPINIFILE}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
+    if [ ! -z "${PHPINIFILE}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
     Register --test-no PHP-2372 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check PHP expose_php option"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Checking expose_php option"
@@ -215,7 +212,7 @@
     # Test        : PHP-2374
     # Description : Check PHP enable_dl option
     # Notes       : Extend test to check all PHP files
-    if [ ! "${PHPINIFILE}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
+    if [ ! -z "${PHPINIFILE}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
     Register --test-no PHP-2374 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check PHP enable_dl option"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Checking PHP enable_dl option"
@@ -237,7 +234,7 @@
     # Test        : PHP-2376
     # Description : Check PHP allow_url_fopen option
     # Notes       : Extend test to check all PHP files YYY
-    if [ ! "${PHPINIFILE}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
+    if [ ! -z "${PHPINIFILE}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
     Register --test-no PHP-2376 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check PHP allow_url_fopen option"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Checking PHP allow_url_fopen option"