Merge branch 'feature/2021-03-debug-mode' into feature/user-roles

Author: Kristan Kenney

bin/v-list-sys-config

@@ -68,7 +68,8 @@ json_list() {
         "LOGIN_STYLE": "'$LOGIN_STYLE'",
         "INACTIVE_SESSION_TIMEOUT": "'$INACTIVE_SESSION_TIMEOUT'",
         "PHPMYADMIN_KEY": "'$PHPMYADMIN_KEY'",
-        "ENFORCE_SUBDOMAIN_OWNERSHIP": "'$ENFORCE_SUBDOMAIN_OWNERSHIP'"
+        "ENFORCE_SUBDOMAIN_OWNERSHIP": "'$ENFORCE_SUBDOMAIN_OWNERSHIP'",
+        "DEBUG_MODE": "'$DEBUG_MODE'"
     }
     }'
 }
@@ -159,6 +160,7 @@ shell_list() {
     fi
 
     echo "Release Branch:                   $RELEASE_BRANCH"
+    echo "Debug Mode:                       $DEBUG_MODE"
     echo "Theme:                            $THEME"
     echo "Updates: Notify by email:         $UPGRADE_SEND_EMAIL"
     echo "Updates: Email install log:       $UPGRADE_SEND_EMAIL_LOG"
@@ -175,7 +177,7 @@ plain_list() {
     echo -ne "$FILE_MANAGER\t$REPOSITORY\t$VERSION\t$DEMO_MODE\t$RELEASE_BRANCH\t"
     echo -ne "$SMTP_RELAY_HOST\t$SMTP_RELAY_PORT\t$SMTP_RELAY_USER\t"
     echo -ne "$UPGRADE_SEND_EMAIL\t$UPGRADE_SEND_EMAIL_LOG\t$THEME\t$LANGUAGE\t$BACKUP_GZIP\t"
-    echo -e  "$BACKUP\t$WEBMAIL_ALIAS\t$DB_PMA_URL\t$DB_PGA_URL"
+    echo -e  "$BACKUP\t$WEBMAIL_ALIAS\t$DB_PMA_URL\t$DB_PGA_URL\t$DEBUG_MODE"
 }
 
 
@@ -192,7 +194,7 @@ csv_list() {
     echo -n "'SMTP_RELAY','SMTP_RELAY_HOST','SMTP_RELAY_PORT','SMTP_RELAY_USER',"
     echo -n "'UPGRADE_SEND_EMAIL','UPGRADE_SEND_EMAIL_LOG',"
     echo -n "'THEME', 'LANGUAGE','BACKUP_GZIP','BACKUP','WEBMAIL_ALIAS',"
-    echo -n "'DB_PMA_ALIAS','DB_PGA_ALIAS'"
+    echo -n "'DB_PMA_ALIAS','DB_PGA_ALIAS','DEBUG_MODE'"
     echo
     echo -n "'$WEB_SYSTEM','$WEB_RGROUPS','$WEB_PORT','$WEB_SSL',"
     echo -n "'$WEB_SSL_PORT','$WEB_BACKEND','$PROXY_SYSTEM','$PROXY_PORT',"
@@ -203,7 +205,8 @@ csv_list() {
     echo -n "'$REPOSITORY', '$VERSION','$DEMO_MODE','$RELEASE_BRANCH',"
     echo -n "'$SMTP_RELAY','$SMTP_RELAY_HOST','$SMTP_RELAY_PORT','$SMTP_RELAY_USER',"
     echo -n "'$UPGRADE_SEND_EMAIL','$UPGRADE_SEND_EMAIL_LOG','$THEME','$LANGUAGE',"
-    echo -n "'$BACKUP_GZIP','$BACKUP','$WEBMAIL_ALIAS','$DB_PMA_URL','$DB_PGA_URL'"
+    echo -n "'$BACKUP_GZIP','$BACKUP','$WEBMAIL_ALIAS','$DB_PMA_URL','$DB_PGA_URL',"
+    echo -n "'$DEBUG_MODE'"
     echo
 }
 

func/upgrade.sh

@@ -149,6 +149,12 @@ upgrade_health_check() {
         echo "[ ! ] Adding missing variable to hestia.conf: ENFORCE_SUBDOMAIN_OWNERSHIP ('yes')"
         $BIN/v-change-sys-config-value "ENFORCE_SUBDOMAIN_OWNERSHIP" "yes"
     fi    
+
+    # Debug Mode
+    if [ -z "$DEBUG_MODE" ]; then
+        echo "[ ! ] Adding missing variable to hestia.conf: DEBUG_MODE ('false')"
+        $BIN/v-change-sys-config-value "DEBUG_MODE" "false"
+    fi
 
     echo "[ * ] Health check complete. Starting upgrade from $VERSION to $new_version..."
     echo "============================================================================="

web/edit/server/index.php

@@ -277,6 +277,17 @@
         }
     }
 
+   // Update debug mode status
+    if (empty($_SESSION['error_msg'])) {
+        if ($_POST['v_debug_mode'] != $_SESSION['DEBUG_MODE']) {
+            if ($_POST['v_debug_mode'] == 'on') { $_POST['v_debug_mode'] = 'true'; } else { $_POST['v_debug_mode'] = 'false'; }
+            exec (HESTIA_CMD."v-change-sys-config-value DEBUG_MODE ".escapeshellarg($_POST['v_debug_mode']), $output, $return_var);
+            check_return_code($return_var,$output);
+            unset($output);
+            $v_debug_mode_adv = 'yes';
+        }
+    }
+
    // Set File Manager support
     if (empty($_SESSION['error_msg'])) {
         if ((!empty($_POST['v_filemanager'])) && ($_SESSION['FILE_MANAGER'] != $_POST['v_filemanager'])) {

web/templates/admin/edit_server.html

@@ -147,6 +147,18 @@
                                         <tr>
                                         <td class="vst-text input-label">
                                                 <label><input type="checkbox" size="20" class="vst-checkbox" name="v_language_update"><?php print _('SYSTEM_SET_DEFAULT_LANGUAGE');?></label>
+                                                
+                                            </td>
+                                        </tr>
+                                        <?php if ($_SESSION['RELEASE_BRANCH'] != "release") { ?>
+                                            <tr>
+                                                <td>
+                                                    <label><input type="checkbox" size="20" class="vst-checkbox" name="v_debug_mode" <?php if ((isset($_SESSION['DEBUG_MODE'])) && (!empty($_SESSION['DEBUG_MODE'])) && ($_SESSION['DEBUG_MODE'] == "true")) echo "checked=yes" ?>><?php print _('Enable debug mode');?></label>
+                                                </td>
+                                            </tr>
+                                        <?php } ?>
+                                        <tr>
+                                            <td>
                                                 <br><br>
                                             </td>
                                         </tr>

web/templates/header.html

@@ -40,3 +40,17 @@
   </script>
 </head>
 <body class="body-<?=strtolower($TAB)?> lang-<?=$_SESSION['language']?>">
+    <?php if (($_SESSION['DEBUG_MODE']) == "true" ) {?>
+    <div style="font-size:12px !important; padding:8px;">
+        <?php
+            echo "<h3>Server Variables</h3>";
+            foreach ($_SERVER as $key=>$val)
+            echo "<b>".$key."= </b> ".$val."  ";
+        ?>
+        <?php
+            echo "<h3>Session Variables</h3>";
+            foreach ($_SESSION as $key=>$val)
+            echo "<b>".$key."= </b> ".$val."  ";
+        ?>
+    </div>
+<?php } ?>