improve ajax menu and error handling

Author: Alexander Hank

LICENSE

@@ -15,44 +15,24 @@ public function user() {
             $this->view('config/user');
         }
 
-        /**
-         *
-         * Displays the lvm config menu
-         *
-         * @return      void
-         *
-         */
-        public function lvm() {
-            $result = $this->database->query('select option, value, description from config where editable_via_gui=1 and category=2');
-            $data = $this->std->fetchdata($result);
-            $this->view('config/configtable', $data);
-        }
-
-        /**
-         *
-         * Displays the ietd config menu
-         *
-         * @return      void
-         *
-         */
-        public function iet() {
-            $result = $this->database->query('select option, value, description from config where editable_via_gui=1 and category=1');
-            $data = $this->std->fetchdata($result);
-            $this->view('config/configtable', $data);
-        }
-
-        /**
-         *
-         * Displays other config options
-         *
-         * @return      void
-         *
-         */
-        public function misc() {
-            $result = $this->database->query('select option, value, description from config where editable_via_gui=1 and category=3');
-            $data = $this->std->fetchdata($result);
-            $this->view('config/configtable', $data);
+        public function show($param) {
+            if ($param == 'lvm') {
+                $data = $this->database->get_config_by_category('lvm');
+            } else if ($param == 'iet') {
+                $data = $this->database->get_config_by_category('iet');
+            } else if ($param == 'misc') {
+                $data = $this->database->get_config_by_category('misc');
+            } else if ($param == 'bin') {
+                $data = $this->database->get_config_by_category('bin');
+            } else if ($param == 'logging') {
+                $data = $this->database->get_config_by_category('logging');
+            } else {
+                $this->view('message', array('message' => 'Invalid url', 'type' => 'warning'));
+            }
 
+            if (isset($data) && !empty($data) && $data !== false) {
+                $this->view('config/configtable', $data);
+            }
         }
 
         /**

README.md

@@ -16,6 +16,10 @@ public function index() {
          *
          * Get the up2date phpietadmin version from github
          *
+         * FROM GITHUB, not the local file
+         *
+         * ToDo: Fix this
+         *
          * @return      void
          *
          */

app/.htaccess

@@ -25,26 +25,48 @@ public function __construct() {
                 $this->controller->check_loggedin($this->controllername, $this->method);
             }
 
+            // If request is no ajax, display header, menu and footer
+            if (!$this->controller->std->IsXHttpRequest() && $this->controllername !== 'auth') {
+                $this->controller->view('header', $this->controller->std->get_dashboard_data());
+                $this->controller->view('menu');
+            }
+
+            $continue = true;
             if(isset($url[1])) {
                 if(method_exists($this->controller, $url[1])) {
                     $this->method = $url[1];
                     unset($url[1]);
                 } else {
-                    echo '<h1>Method ' . htmlspecialchars($url[1]) . ' doesn\'t exist!</h1>';
-                    die();
+                    if ($this->controller->std->IsXHttpRequest() === true) {
+                        http_response_code(404);
+                        echo 'Method ' . htmlspecialchars($url[1]) . ' doesn\'t exist!';
+                    } else {
+                        echo "<div id='workspace'><div class='container'><h1 align='center'>Method " . htmlspecialchars($url[1]) . ' doesn\'t exist!</h1></div></div>';
+                    }
+                    $continue = false;
+                }
+            } else {
+                // if $url[1] is not set, the browser will most likely call the index function
+                if(method_exists($this->controller, 'index')) {
+                    $this->method = 'index';
+                } else {
+                    if ($this->controller->std->IsXHttpRequest() === true) {
+                        http_response_code(404);
+                        echo 'Method ' . htmlspecialchars($this->method) . ' doesn\'t exist!';
+                    } else {
+                        echo "<div id='workspace'><div class='container'><h1 align='center'>Method " . htmlspecialchars($this->method) . ' doesn\'t exist!</h1></div></div>';
+                    }
+                    $continue = false;
                 }
             }
 
             $this->params = $url ? array_values($url) : [];
 
-            // If request is no ajax, display header, menu and footer
-            if (!$this->controller->std->IsXHttpRequest() && $this->controllername !== 'auth') {
-                $this->controller->view('header', $this->controller->std->get_dashboard_data());
-                $this->controller->view('menu');
+            // only load the main application if no error occured
+            if ($continue === true) {
+                call_user_func_array([$this->controller, $this->method], $this->params);
             }
 
-            call_user_func_array([$this->controller, $this->method], $this->params);
-
             if (!$this->controller->std->IsXHttpRequest() && $this->controllername !== 'auth') {
                 //$this->controller->view('footer', $this->controller->std->get_service_status('iscsitarget'));
                 $this->controller->view('footer');

app/config.db

@@ -2,8 +2,6 @@
 define('dbpath', '/usr/share/phpietadmin/app/config.db');
 use Sqlite3;
 
-// use new values in config table for error handling and better usage
-
 class Database extends \SQLite3
 {
     /**
@@ -22,14 +20,81 @@ public function __construct()
         }
     }
 
+    /**
+     *
+     * Fetch value for config option
+     * If the value is a "super user binary" sudo will be prepended
+     *
+     * @param     string $option option to get the value from
+     * @return    array|bool
+     *
+     */
+    public function get_config($option) {
+        $query = $this->prepare('SELECT phpietadmin_config.option, phpietadmin_config.value, (SELECT type FROM phpietadmin_config_type WHERE phpietadmin_config_type.config_type_id = phpietadmin_config.config_type_id) as type, (SELECT category FROM phpietadmin_config_category WHERE phpietadmin_config_category.config_category_id = phpietadmin_config.config_category_id) as category, phpietadmin_config.description, phpietadmin_config.field, phpietadmin_config.editable_via_gui, phpietadmin_config.optioningui FROM phpietadmin_config WHERE phpietadmin_config.option = :option');
+        $query->bindValue('option', $option, SQLITE3_TEXT);
+        $query = $query->execute();
+        $query = $query->fetchArray(SQLITE3_ASSOC);
+
+        if (empty($query)) {
+            return false;
+        } else {
+            // if type is subin, we prepend sudo
+            if ($query['type'] == 'subin') {
+                $sudo = $this->get_config('sudo');
+                $query['value'] = $sudo['value'] . ' ' . $query['value'];
+            }
+            return $query;
+        }
+    }
+
+    public function get_config_by_category($category) {
+        $query = $this->prepare('SELECT config_category_id from phpietadmin_config_category WHERE category = :category');
+        $query->bindValue('category', $category, SQLITE3_TEXT);
+        $query = $query->execute();
+        $category = $query->fetchArray(SQLITE3_ASSOC);
+
+        if (empty($category)) {
+            return false;
+        } else {
+            $sql = <<< EOT
+            SELECT phpietadmin_config.option,
+            phpietadmin_config.value,
+            (SELECT type FROM phpietadmin_config_type WHERE phpietadmin_config_type.config_type_id = phpietadmin_config.config_type_id) as type,
+            (SELECT category FROM phpietadmin_config_category WHERE phpietadmin_config_category.config_category_id = phpietadmin_config.config_category_id) as category,
+            phpietadmin_config.description,
+            phpietadmin_config.field,
+            phpietadmin_config.editable_via_gui,
+            phpietadmin_config.optioningui FROM
+            phpietadmin_config WHERE
+            phpietadmin_config.config_category_id = :id
+EOT;
+
+            $query = $this->prepare($sql);
+            $query->bindValue('id', $category['config_category_id'], SQLITE3_INTEGER);
+            $query = $query->execute();
+
+            while ($result = $query->fetchArray(SQLITE3_ASSOC)) {
+                $data[] = $result;
+            }
+
+            if (empty($data)) {
+                return false;
+            } else {
+                return $data;
+            }
+        }
+
+    }
+
+    // Rework everything down here
+
     /**
      *
      * Adds a session to the database
      *
      * @return      int
      *
      */
-    // really necessary to pass all these parameters?
     public function add_session($timestamp)
     {
         $query = $this->prepare('INSERT INTO phpietadmin_session (session_id, username_id, login_time, source_ip, browser_agent) VALUES (:session_id, (SELECT id from phpietadmin_phpietadmin_user where username=:username), :login_time, :source_ip, :browser_agent)');
@@ -112,33 +177,6 @@ public function get_sessions_by_username($username)
         }
     }
 
-	/**
-	 *
-	 * Fetch value for config option
-	 * If the value is a "super user binary" sudo will be prepended
-	 *
-	 * @param     string $option option to get the value from
-	 * @return    array|bool
-	 *
-	 */
-	public function get_config($option) {
-		$query = $this->prepare('SELECT phpietadmin_config.option, phpietadmin_config.value, (SELECT type FROM phpietadmin_config_type WHERE phpietadmin_config_type.config_type_id = phpietadmin_config.config_type_id) as type, (SELECT category FROM phpietadmin_config_category WHERE phpietadmin_config_category.config_category_id = phpietadmin_config.config_category_id) as category, phpietadmin_config.description, phpietadmin_config.field, phpietadmin_config.editable_via_gui, phpietadmin_config.optioningui FROM phpietadmin_config WHERE phpietadmin_config.option = :option');
-		$query->bindValue('option', $option, SQLITE3_TEXT);
-		$query = $query->execute();
-		$query = $query->fetchArray(SQLITE3_ASSOC);
-
-		if (empty($query)) {
-			return false;
-		} else {
-			// if type is subin, we prepend sudo
-			if ($query['type'] == 'subin') {
-				$sudo = $this->get_config('sudo');
-				$query['value'] = $sudo['value'] . ' ' . $query['value'];
-			}
-			return $query;
-		}
-	}
-
     /**
      *
      * Fetch the ispath value from the database

app/controllers/auth.php

@@ -23,9 +23,9 @@ public function __construct() {
 
 			// log file paths
 			$this->log_dir_path = $this->database->get_config('log_base')['value'];
-			$this->action_log_file_path = $this->log_dir_path . ' ' . $this->database->get_config('action_log')['value'];
-			$this->debug_log_file_path = $this->log_dir_path . ' ' . $this->database->get_config('debug_log')['value'];
-			$this->access_log_file_path = $this->log_dir_path . ' ' . $this->database->get_config('access_log')['value'];
+			$this->action_log_file_path = $this->log_dir_path . '/' . $this->database->get_config('action_log')['value'];
+			$this->debug_log_file_path = $this->log_dir_path . '/' . $this->database->get_config('debug_log')['value'];
+			$this->access_log_file_path = $this->log_dir_path . '/' . $this->database->get_config('access_log')['value'];
 
 			// enabled logging options
 			$value = $this->database->get_config('debug_log_enabled')['value'];

app/controllers/config.php

@@ -1,4 +1,4 @@
-<div class="workspacedirect">
+<div id="workspace">
     <div class="container">
         <ol class="breadcrumb">
             <li class="active"><?php echo $data ?></li>

app/controllers/connection.php

@@ -1,4 +1,4 @@
-<div class="workspacedirect">
+<div id="workspace">
     <div class="container">
         <div class="panel panel-default">
             <ol class='panel-heading breadcrumb'>
@@ -17,13 +17,13 @@
                     <tbody>
                         <?php foreach ($data as $value) { ?>
                             <tr>
-                                <td><?php echo htmlspecialchars($value[0]); ?></td>
+                                <td><?php echo htmlspecialchars($value['optioningui']); ?></td>
                                 <td>
-                                    <input size="80" type="text" name="fname" value="<?php echo htmlspecialchars($value[1]); ?>" disabled>
-                                    <a href="#<?php echo htmlspecialchars($value[0]); ?>"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
+                                    <input size="80" type="text" name="fname" value="<?php echo htmlspecialchars($value['value']); ?>" disabled>
+                                    <a href="#<?php echo htmlspecialchars($value['optioningui']); ?>"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
                                     <span class="label label-success bestaetigung">Success</span>
                                 </td>
-                                <td><?php if (isset($value[2])) echo htmlspecialchars($value[2]) ?></td>
+                                <td><?php if (isset($value['description'])) echo htmlspecialchars($value['description']) ?></td>
                             </tr>
                         <?php } ?>
                     </tbody>

app/controllers/dashboard.php

@@ -1,4 +1,4 @@
-<div class="workspacedirect">
+<div id="workspace">
     <div class="container">
         <div class="panel panel-default">
             <ol class='panel-heading breadcrumb'>

app/controllers/ietusers.php

@@ -1,4 +1,4 @@
-<div class="workspacedirect">
+<div id="workspace">
     <div class="container">
         <div class="row">
             <div class="col-md-6">

app/controllers/log.php

@@ -1,4 +1,4 @@
-<div class="workspacedirect">
+<div id="workspace">
     <div class="container">
         <div class='panel panel-default'>
             <ol class='panel-heading breadcrumb'>
@@ -64,30 +64,14 @@
 
             </table>
         </div>
-    </div>
-    <!--
-    services mit start stop
-    interfaces
-    netzwerk usage
-    CPU Cores
-    HDD Usage
-    Network Interfaces
 
-    Service status
-    ietd
-    cron
-    ssh
-    apache2
-    rsyslog
-    drbd
-    corosync
-    pacemaker-->
-    <script>
-        require(['common'],function() {
-            require(['pages/dashboard'],function(methods) {
-                    methods.checkversion();
-                }
-            );
-        });
-    </script>
+        <script>
+            require(['common'],function() {
+                require(['pages/dashboard'],function(methods) {
+                        methods.checkversion();
+                    }
+                );
+            });
+        </script>
+    </div>
 </div>

app/controllers/lvm.php

@@ -1,4 +1,4 @@
-<div class="workspacedirect">
+<div id="workspace">
     <div class="container">
         <div class="row top-buffer">
             <div class='panel panel-default'>

app/controllers/objects.php

@@ -1,4 +1,4 @@
-<div class="workspacedirect">
+<div id="workspace">
     <div class="container">
         <div class="table-responsive">
             <table data-toggle="table" class = "table table-bordered table-striped">

app/controllers/overview.php

@@ -1,4 +1,4 @@
-<div class="workspacedirect">
+<div id="workspace">
     <!-- Inserted via ajax -->
 
     <!-- Hidden fields to store some data -->

app/controllers/permission.php

@@ -1,4 +1,4 @@
-<div class="workspacedirect">
+<div id="workspace">
     <div class = "container">
         <div class="panel panel-default">
             <ol class='panel-heading breadcrumb'>

app/controllers/service.php

@@ -1,4 +1,4 @@
-<div class="workspacedirect">
+<div id="workspace">
     <div id="leftDiv">
         <br>
         <form method="post">

app/controllers/targets.php

@@ -1,4 +1,4 @@
-<div class="workspacedirect">
+<div id="workspace">
     <div class = "container">
         <div class="panel panel-default">
             <ol class='panel-heading breadcrumb'>