From 7cc9feb0f88e569768b51965fc53a1dd7c9af93c Mon Sep 17 00:00:00 2001
From: Jonathon Koyle <jonathon.koyle@gmail.com>
Date: Wed, 19 Oct 2016 15:37:26 -0600
Subject: [PATCH 1/3] Allow regular users to set their own default dashboard
 from the preferences page

---
 html/pages/preferences.inc.php | 42 ++++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/html/pages/preferences.inc.php b/html/pages/preferences.inc.php
index 7f3278ce24..d38a93adf8 100644
--- a/html/pages/preferences.inc.php
+++ b/html/pages/preferences.inc.php
@@ -24,11 +24,15 @@ if ($_SESSION['userlevel'] == 11) {
             $changepass_message = 'Incorrect password';
         }
     }
+    if ($_POST['action'] == 'changedash') {
+        if (!empty($vars['dashboard'])) {
+            dbUpdate(array('dashboard'=>$vars['dashboard']), 'users', 'user_id = ?', array($_SESSION['user_id']));
+            print_message("User default dashboard updated");
+        }
+    }
 
     include 'includes/update-preferences-password.inc.php';
 
-    
-
     if (passwordscanchange($_SESSION['username'])) {
         echo '<h3>Change Password</h3>';
         echo '<hr>';
@@ -173,6 +177,40 @@ if ($_SESSION['userlevel'] == 11) {
     }//end if
 }//end if
 
+echo "<h3>Default Dashboard</h3>
+<hr>
+<div class='well'>";
+echo $updatedashboard_message;
+echo "
+  <form method='post' action='preferences/' class='form-horizontal' role='form'>
+    <div class='form-group'>
+      <input type=hidden name='action' value='changedash'>
+      <div class='form-group'>
+        <label for='dashboard' class='col-sm-2 control-label'>Dashboard</label>
+        <div class='col-sm-4'>
+          <select class='form-control' name='dashboard'>";
+$defdash = dbFetchCell("SELECT dashboard FROM users WHERE user_id = ?", array($_SESSION['user_id']));
+$dashoptions = dbFetchRows("SELECT dashboards.*,users.username 
+    FROM `dashboards` 
+    INNER JOIN `users` ON users.user_id = dashboards.user_id 
+    WHERE (dashboards.access > 0 && dashboards.user_id != ?) || dashboards.user_id = ?",
+    array($_SESSION['user_id'],$_SESSION['user_id'])); 
+
+foreach ($dashoptions as $dash) {
+    echo "
+            <option value='".$dash['dashboard_id']."'".($defdash == $dash['dashboard_id'] ? ' selected' : '').">".$dash['username'].':'.$dash['dashboard_name']."</option>";
+}       
+echo "  
+          </select>
+          <br>
+          <center><button type='submit' class='btn btn-default'>Update Dashboard</button></center>
+        </div>
+        <div class='col-sm-6'></div>
+      </div>
+    </div>
+  </form>
+</div>";
+
 
 echo "<h3>Device Permissions</h3>";
 echo "<hr>";

From adc08b3039fae9f6c0a749304b584c75892c3d05 Mon Sep 17 00:00:00 2001
From: Jonathon Koyle <jonathon.koyle@gmail.com>
Date: Wed, 19 Oct 2016 16:03:51 -0600
Subject: [PATCH 2/3] style fixes

---
 html/pages/preferences.inc.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/html/pages/preferences.inc.php b/html/pages/preferences.inc.php
index d38a93adf8..0c269299e1 100644
--- a/html/pages/preferences.inc.php
+++ b/html/pages/preferences.inc.php
@@ -190,17 +190,19 @@ echo "
         <div class='col-sm-4'>
           <select class='form-control' name='dashboard'>";
 $defdash = dbFetchCell("SELECT dashboard FROM users WHERE user_id = ?", array($_SESSION['user_id']));
-$dashoptions = dbFetchRows("SELECT dashboards.*,users.username 
-    FROM `dashboards` 
-    INNER JOIN `users` ON users.user_id = dashboards.user_id 
+$dashoptions = dbFetchRows(
+    "SELECT dashboards.*,users.username
+    FROM `dashboards`
+    INNER JOIN `users` ON users.user_id = dashboards.user_id
     WHERE (dashboards.access > 0 && dashboards.user_id != ?) || dashboards.user_id = ?",
-    array($_SESSION['user_id'],$_SESSION['user_id'])); 
+    array($_SESSION['user_id'],$_SESSION['user_id'])
+);
 
 foreach ($dashoptions as $dash) {
     echo "
             <option value='".$dash['dashboard_id']."'".($defdash == $dash['dashboard_id'] ? ' selected' : '').">".$dash['username'].':'.$dash['dashboard_name']."</option>";
-}       
-echo "  
+}
+echo "
           </select>
           <br>
           <center><button type='submit' class='btn btn-default'>Update Dashboard</button></center>

From d32bdd802186201b0adc5aa59453854877dc9dcf Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Sat, 22 Oct 2016 15:51:20 +0000
Subject: [PATCH 3/3] refactored some code

---
 html/pages/preferences.inc.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/html/pages/preferences.inc.php b/html/pages/preferences.inc.php
index 0c269299e1..cc72cf1945 100644
--- a/html/pages/preferences.inc.php
+++ b/html/pages/preferences.inc.php
@@ -24,10 +24,10 @@ if ($_SESSION['userlevel'] == 11) {
             $changepass_message = 'Incorrect password';
         }
     }
-    if ($_POST['action'] == 'changedash') {
+    if ($vars['action'] === 'changedash') {
         if (!empty($vars['dashboard'])) {
             dbUpdate(array('dashboard'=>$vars['dashboard']), 'users', 'user_id = ?', array($_SESSION['user_id']));
-            print_message("User default dashboard updated");
+            $updatedashboard_message = "User default dashboard updated";
         }
     }
 
@@ -180,7 +180,9 @@ if ($_SESSION['userlevel'] == 11) {
 echo "<h3>Default Dashboard</h3>
 <hr>
 <div class='well'>";
-echo $updatedashboard_message;
+if (!empty($updatedashboard_message)) {
+    print_message($updatedashboard_message);
+}
 echo "
   <form method='post' action='preferences/' class='form-horizontal' role='form'>
     <div class='form-group'>
@@ -200,7 +202,7 @@ $dashoptions = dbFetchRows(
 
 foreach ($dashoptions as $dash) {
     echo "
-            <option value='".$dash['dashboard_id']."'".($defdash == $dash['dashboard_id'] ? ' selected' : '').">".$dash['username'].':'.$dash['dashboard_name']."</option>";
+            <option value='".$dash['dashboard_id']."'".($defdash == $dash['dashboard_id'] ? ' selected' : '').">".display($dash['username']).':'.display($dash['dashboard_name'])."</option>";
 }
 echo "
           </select>