From 2ce10cf6dfeee820b5c8c2e274a9a84ece883ef7 Mon Sep 17 00:00:00 2001 From: Daniel Preussker Date: Wed, 9 Sep 2015 20:06:10 +0100 Subject: [PATCH 1/9] Add multiple dashboard support --- html/includes/forms/add-dashboard.inc.php | 41 +++++ html/includes/forms/delete-dashboard.inc.php | 45 ++++++ html/includes/forms/edit-dashboard.inc.php | 44 ++++++ .../forms/update-dashboard-config.inc.php | 9 +- html/pages/front/tiles.php | 142 ++++++++++++++++-- sql-schema/069.sql | 2 + 6 files changed, 264 insertions(+), 19 deletions(-) create mode 100644 html/includes/forms/add-dashboard.inc.php create mode 100644 html/includes/forms/delete-dashboard.inc.php create mode 100644 html/includes/forms/edit-dashboard.inc.php create mode 100644 sql-schema/069.sql diff --git a/html/includes/forms/add-dashboard.inc.php b/html/includes/forms/add-dashboard.inc.php new file mode 100644 index 0000000000..e34993a6eb --- /dev/null +++ b/html/includes/forms/add-dashboard.inc.php @@ -0,0 +1,41 @@ + + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + +/** + * Create Dashboards + * @author Daniel Preussker + * @copyright 2015 Daniel Preussker, QuxLabs UG + * @license GPL + * @package LibreNMS + * @subpackage Dashboards + */ + +$status = 'error'; +$message = 'unknown error'; +if (isset($_REQUEST['dashboard_name']) && ($dash_id = dbInsert(array('dashboard_name'=>$_REQUEST['dashboard_name'],'user_id'=>$_SESSION['user_id']),'dashboards'))) { + $status = 'ok'; + $message = 'Created'; +} +else { + $status = 'error'; + $message = 'ERROR: Could not create'; +} + +die(json_encode(array( + 'status' => $status, + 'message' => $message, + 'dashboard_id' => $dash_id +))); + diff --git a/html/includes/forms/delete-dashboard.inc.php b/html/includes/forms/delete-dashboard.inc.php new file mode 100644 index 0000000000..2874dec6e3 --- /dev/null +++ b/html/includes/forms/delete-dashboard.inc.php @@ -0,0 +1,45 @@ + + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + +/** + * Delete Dashboards + * @author Daniel Preussker + * @copyright 2015 Daniel Preussker, QuxLabs UG + * @license GPL + * @package LibreNMS + * @subpackage Dashboards + */ + +$status = 'error'; +$message = 'unknown error'; +if (isset($_REQUEST['dashboard_id'])) { + dbDelete('users_widgets','user_id = ? && dashboard_id = ?',array($_SESSION['user_id'],$_REQUEST['dashboard_id'])); + if (dbDelete('dashboards','user_id = ? && dashboard_id = ?',array($_SESSION['user_id'],$_REQUEST['dashboard_id']))) { + $status = 'ok'; + $message = 'Deleted dashboard'; + } + else { + $message = 'ERROR: Could not delete dashboard '.$_REQUEST['dashboard_id']; + } +} +else { + $message = 'ERROR: Not enough params'; +} + +die(json_encode(array( + 'status' => $status, + 'message' => $message, +))); + diff --git a/html/includes/forms/edit-dashboard.inc.php b/html/includes/forms/edit-dashboard.inc.php new file mode 100644 index 0000000000..7e87af0a1c --- /dev/null +++ b/html/includes/forms/edit-dashboard.inc.php @@ -0,0 +1,44 @@ + + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + +/** + * Edit Dashboards + * @author Daniel Preussker + * @copyright 2015 Daniel Preussker, QuxLabs UG + * @license GPL + * @package LibreNMS + * @subpackage Dashboards + */ + +$status = 'error'; +$message = 'unknown error'; +if (isset($_REQUEST['dashboard_id']) && isset($_REQUEST['dashboard_name'])) { + if(dbUpdate(array('dashboard_name'=>$_REQUEST['dashboard_name']),'dashboards','user_id = ? && dashboard_id = ?',array($_SESSION['user_id'],$_REQUEST['dashboard_id']))) { + $status = 'ok'; + $message = 'Updated dashboard'; + } + else { + $message = 'ERROR: Could not update dashboard '.$_REQUEST['dashboard_id']; + } +} +else { + $message = 'ERROR: Not enough params'; +} + +die(json_encode(array( + 'status' => $status, + 'message' => $message, +))); + diff --git a/html/includes/forms/update-dashboard-config.inc.php b/html/includes/forms/update-dashboard-config.inc.php index de278fd918..35168905f4 100644 --- a/html/includes/forms/update-dashboard-config.inc.php +++ b/html/includes/forms/update-dashboard-config.inc.php @@ -6,15 +6,16 @@ $message = 'Error updating user dashboard config'; $data = json_decode($_POST['data'],true); $sub_type = mres($_POST['sub_type']); $widget_id = mres($_POST['widget_id']); +$dasboard_id = mres($_POST['dashboard_id']); if ($sub_type == 'remove' && is_numeric($widget_id)) { - if ($widget_id == 0 || dbDelete('users_widgets','`user_id`=? AND `user_widget_id`=?', array($_SESSION['user_id'],$widget_id))) { + if ($widget_id == 0 || dbDelete('users_widgets','`user_id`=? AND `user_widget_id`=? AND `dashboard_id`=?', array($_SESSION['user_id'],$widget_id,$dasboard_id))) { $status = 'ok'; $message = ''; } } elseif ($sub_type == 'remove-all') { - if (dbDelete('users_widgets','`user_id`=?', array($_SESSION['user_id']))) { + if (dbDelete('users_widgets','`user_id`=? AND `dashboard_id`=?', array($_SESSION['user_id'],$dasboard_id))) { $status = 'ok'; $message = ''; } @@ -23,7 +24,7 @@ elseif ($sub_type == 'add' && is_numeric($widget_id)) { $widget = dbFetchRow('SELECT * FROM `widgets` WHERE `widget_id`=?', array($widget_id)); if (is_array($widget)) { list($x,$y) = explode(',',$widget['base_dimensions']); - $item_id = dbInsert(array('user_id'=>$_SESSION['user_id'],'widget_id'=>$widget_id, 'col'=>1,'row'=>1,'refresh'=>60,'title'=>$widget['widget_title'],'size_x'=>$x,'size_y'=>$y),'users_widgets'); + $item_id = dbInsert(array('user_id'=>$_SESSION['user_id'],'widget_id'=>$widget_id, 'col'=>1,'row'=>1,'refresh'=>60,'title'=>$widget['widget_title'],'size_x'=>$x,'size_y'=>$y,'settings'=>'','dashboard_id'=>$dasboard_id),'users_widgets'); if (is_numeric($item_id)) { $extra = array('user_widget_id'=>$item_id,'widget_id'=>$item_id,'title'=>$widget['widget_title'],'widget'=>$widget['widget'],'refresh'=>60,'size_x'=>$x,'size_y'=>$y); $status = 'ok'; @@ -38,7 +39,7 @@ else { foreach ($data as $line) { if (is_array($line)) { $update = array('col'=>$line['col'],'row'=>$line['row'],'size_x'=>$line['size_x'],'size_y'=>$line['size_y']); - dbUpdate($update, 'users_widgets', '`user_widget_id`=?', array($line['id'])); + dbUpdate($update, 'users_widgets', '`user_widget_id`=? AND `user_id`=? AND `dashboard_id`=?', array($line['id'],$_SESSION['user_id'],$dasboard_id)); } } } diff --git a/html/pages/front/tiles.php b/html/pages/front/tiles.php index 9c7c5c933e..f5999d1c6e 100644 --- a/html/pages/front/tiles.php +++ b/html/pages/front/tiles.php @@ -17,34 +17,94 @@ */ $no_refresh = true; - -foreach (dbFetchRows('SELECT user_widget_id,users_widgets.widget_id,title,widget,col,row,size_x,size_y,refresh FROM `users_widgets` LEFT JOIN `widgets` ON `widgets`.`widget_id`=`users_widgets`.`widget_id` WHERE `user_id`=?',array($_SESSION['user_id'])) as $items) { - $data[] = $items; +if (dbFetchCell('SELECT dashboard_id FROM dashboards WHERE user_id=?',array($_SESSION['user_id'])) == 0) { + $vars['dashboard'] = dbInsert(array('dashboard_name'=>'Default','user_id'=>$_SESSION['user_id']),'dashboards'); } - -if (!is_array($data)) { - $data[] = array('user_widget_id'=>'0','widget_id'=>1,'title'=>'Add a widget','widget'=>'placeholder','col'=>1,'row'=>1,'size_x'=>2,'size_y'=>2,'refresh'=>60); +if (empty($vars['dashboard'])) { + $vars['dashboard'] = dbFetchRow('select dashboard_id,dashboard_name from dashboards where user_id = ? order by dashboard_id limit 1',array($_SESSION['user_id'])); +} else { + $vars['dashboard'] = dbFetchRow('select dashboard_id,dashboard_name from dashboards where user_id = ? && dashboard_id = ? order by dashboard_id limit 1',array($_SESSION['user_id'],$vars['dashboard'])); +} +$data = array(); +foreach (dbFetchRows('SELECT user_widget_id,users_widgets.widget_id,title,widget,col,row,size_x,size_y,refresh FROM `users_widgets` LEFT JOIN `widgets` ON `widgets`.`widget_id`=`users_widgets`.`widget_id` WHERE `user_id`=? AND `dashboard_id`=?',array($_SESSION['user_id'],$vars['dashboard']['dashboard_id'])) as $items) { + $data[] = $items; } $data = serialize(json_encode($data)); $dash_config = unserialize(stripslashes($data)); +$dashboards = dbFetchRows("SELECT * FROM `dashboards` WHERE `user_id` = ?",array($_SESSION['user_id'])); + ?>
- Widgets - - + Dashboards +'.$dash['dashboard_name'].''; + if ($dash[dashboard_id] == $vars['dashboard']['dashboard_id']) { + echo ''; + } +} +?> +
-
+ +
+ +
+
+
+
+
+ + New Dashboard + + + + + +
+
+
+
+
+
+ +
+
+
+
+
+
+
+ + Dashboard Name + + + + + + +
+
+
+
+
+
+ Available Widgets + +
'. $widgets['widget_title'] .' '; + echo ''. $widgets['widget_title'] .' '; } ?> +
+
@@ -75,7 +135,7 @@ foreach (dbFetchRows("SELECT * FROM `widgets` ORDER BY `widget_title`") as $widg $.ajax({ type: 'POST', url: 'ajax_form.php', - data: {type: "update-dashboard-config", data: s}, + data: {type: "update-dashboard-config", data: s, dashboard_id: }, dataType: "json", success: function (data) { if (data.status == 'ok') { @@ -129,7 +189,7 @@ foreach (dbFetchRows("SELECT * FROM `widgets` ORDER BY `widget_title`") as $widg $.ajax({ type: 'POST', url: 'ajax_form.php', - data: {type: "update-dashboard-config", sub_type: 'remove-all'}, + data: {type: "update-dashboard-config", sub_type: 'remove-all', dashboard_id: }, dataType: "json", success: function (data) { if (data.status == 'ok') { @@ -150,7 +210,7 @@ foreach (dbFetchRows("SELECT * FROM `widgets` ORDER BY `widget_title`") as $widg $.ajax({ type: 'POST', url: 'ajax_form.php', - data: {type: "update-dashboard-config", sub_type: 'add', widget_id: widget_id}, + data: {type: "update-dashboard-config", sub_type: 'add', widget_id: widget_id, dashboard_id: }, dataType: "json", success: function (data) { if (data.status == 'ok') { @@ -172,7 +232,7 @@ foreach (dbFetchRows("SELECT * FROM `widgets` ORDER BY `widget_title`") as $widg $.ajax({ type: 'POST', url: 'ajax_form.php', - data: {type: "update-dashboard-config", sub_type: 'remove', widget_id: widget_id}, + data: {type: "update-dashboard-config", sub_type: 'remove', widget_id: widget_id, dashboard_id: }, dataType: "json", success: function (data) { if (data.status == 'ok') { @@ -201,6 +261,58 @@ foreach (dbFetchRows("SELECT * FROM `widgets` ORDER BY `widget_title`") as $widg }); + function dashboard_delete(data) { + $.ajax({ + type: 'POST', + url: 'ajax_form.php', + data: {type: 'delete-dashboard', dashboard_id: $(data).data('dashboard')}, + dataType: "json", + success: function (data) { + if( data.status == "ok" ) { + window.location.href="/overview"; + } + } + }); + } + + function dashboard_edit(data) { + datas = $(data).serializeArray(); + data = []; + for( var field in datas ) { + data[datas[field].name] = datas[field].value; + } + $.ajax({ + type: 'POST', + url: 'ajax_form.php', + data: {type: 'edit-dashboard', dashboard_name: data['dashboard_name'], dashboard_id: }, + dataType: "json", + success: function (data) { + if( data.status == "ok" ) { + window.location.href="/overview/dashboard="; + } + } + }); + } + + function dashboard_add(data) { + datas = $(data).serializeArray(); + data = []; + for( var field in datas ) { + data[datas[field].name] = datas[field].value; + } + $.ajax({ + type: 'POST', + url: 'ajax_form.php', + data: {type: 'add-dashboard', dashboard_name: data['dashboard_name']}, + dataType: "json", + success: function (data) { + if( data.status == "ok" ) { + window.location.href="/overview/dashboard="+data.dashboard_id; + } + } + }); + } + function widget_dom(data) { dom = '
  • '+ '
    '+data.title+''+ diff --git a/sql-schema/069.sql b/sql-schema/069.sql new file mode 100644 index 0000000000..739c558dd5 --- /dev/null +++ b/sql-schema/069.sql @@ -0,0 +1,2 @@ +CREATE TABLE `dashboards` ( `dashboard_id` int(11) NOT NULL AUTO_INCREMENT, `user_id` int(11) NOT NULL DEFAULT '0', `dashboard_name` varchar(255) NOT NULL, PRIMARY KEY (`dashboard_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8; +ALTER TABLE `users_widgets` ADD COLUMN `dashboard_id` int(11) NOT NULL; From 4c3b4fb5fa2333ae789f47be8caf98a59564fa95 Mon Sep 17 00:00:00 2001 From: Daniel Preussker Date: Wed, 9 Sep 2015 20:19:13 +0100 Subject: [PATCH 2/9] Add transition from old dashboard to new dashboard --- html/pages/front/tiles.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/html/pages/front/tiles.php b/html/pages/front/tiles.php index f5999d1c6e..23fd808b49 100644 --- a/html/pages/front/tiles.php +++ b/html/pages/front/tiles.php @@ -19,6 +19,9 @@ $no_refresh = true; if (dbFetchCell('SELECT dashboard_id FROM dashboards WHERE user_id=?',array($_SESSION['user_id'])) == 0) { $vars['dashboard'] = dbInsert(array('dashboard_name'=>'Default','user_id'=>$_SESSION['user_id']),'dashboards'); + if (dbFetchCell('select 1 from users_widgets where user_id = ? && dashboard_id = ?',array($_SESSION['user_id'],0)) == 1) { + dbUpdate(array('dashboard_id'=>$vars['dashboard']),'users_widgets','user_id = ? && dashboard_id = ?',array($_SESSION['user_id'],0)); + } } if (empty($vars['dashboard'])) { $vars['dashboard'] = dbFetchRow('select dashboard_id,dashboard_name from dashboards where user_id = ? order by dashboard_id limit 1',array($_SESSION['user_id'])); @@ -29,12 +32,12 @@ $data = array(); foreach (dbFetchRows('SELECT user_widget_id,users_widgets.widget_id,title,widget,col,row,size_x,size_y,refresh FROM `users_widgets` LEFT JOIN `widgets` ON `widgets`.`widget_id`=`users_widgets`.`widget_id` WHERE `user_id`=? AND `dashboard_id`=?',array($_SESSION['user_id'],$vars['dashboard']['dashboard_id'])) as $items) { $data[] = $items; } - -$data = serialize(json_encode($data)); +if (empty($data)) { + $data[] = array('user_widget_id'=>'0','widget_id'=>1,'title'=>'Add a widget','widget'=>'placeholder','col'=>1,'row'=>1,'size_x'=>2,'size_y'=>2,'refresh'=>60); +} +$data = serialize(json_encode($data)); $dash_config = unserialize(stripslashes($data)); - -$dashboards = dbFetchRows("SELECT * FROM `dashboards` WHERE `user_id` = ?",array($_SESSION['user_id'])); - +$dashboards = dbFetchRows("SELECT * FROM `dashboards` WHERE `user_id` = ?",array($_SESSION['user_id'])); ?>
    From ac6e56fa5618f86bf839e4288f3d041d5fbb7445 Mon Sep 17 00:00:00 2001 From: Daniel Preussker Date: Thu, 10 Sep 2015 17:14:36 +0100 Subject: [PATCH 3/9] changed settings icon --- html/pages/front/tiles.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/pages/front/tiles.php b/html/pages/front/tiles.php index 23fd808b49..a4d8674ca8 100644 --- a/html/pages/front/tiles.php +++ b/html/pages/front/tiles.php @@ -46,7 +46,7 @@ $dashboards = dbFetchRows("SELECT * FROM `dashboards` WHERE `user_id` = ?",arra foreach ($dashboards as $dash) { echo ' '.$dash['dashboard_name'].''; if ($dash[dashboard_id] == $vars['dashboard']['dashboard_id']) { - echo ''; + echo ''; } } ?> From cc936c34f85f308cea9769cfda4752548fd12077 Mon Sep 17 00:00:00 2001 From: Daniel Preussker Date: Thu, 10 Sep 2015 19:24:44 +0100 Subject: [PATCH 4/9] Re-arranged dashboard bar --- html/pages/front/tiles.php | 98 +++++++++++++++++++++++++++----------- 1 file changed, 69 insertions(+), 29 deletions(-) diff --git a/html/pages/front/tiles.php b/html/pages/front/tiles.php index a4d8674ca8..670a6bb583 100644 --- a/html/pages/front/tiles.php +++ b/html/pages/front/tiles.php @@ -40,31 +40,48 @@ $dash_config = unserialize(stripslashes($data)); $dashboards = dbFetchRows("SELECT * FROM `dashboards` WHERE `user_id` = ?",array($_SESSION['user_id'])); ?> -
    - Dashboards +
    +
    +
    + +
    + +
      '.$dash['dashboard_name'].''; - if ($dash[dashboard_id] == $vars['dashboard']['dashboard_id']) { - echo ''; +if (sizeof($dashboards) > 1) { + foreach ($dashboards as $dash) { + if ($dash['dashboard_id'] != $vars['dashboard']['dashboard_id']) { + echo '
    • '.$dash['dashboard_name'].'
      • '; + } } +} else { + echo '
    • No other Dashboards
      • '; } ?> - +
    +
    + + + +
    +
    -
    - -
    -
    -
    +
    +
    +
    - New Dashboard + New Dashboard - + @@ -75,18 +92,17 @@ foreach ($dashboards as $dash) {
    -
    +
    -
    -
    +
    +
    -
    +
    - Dashboard Name - + Dashboard Name - + @@ -94,18 +110,30 @@ foreach ($dashboards as $dash) {
    -
    -
    - Available Widgets - -
    +
    +
    +
    +
    +
    + Available Widgets + +
    '. $widgets['widget_title'] .' '; + echo ' '. $widgets['widget_title'] .' '; } - ?> +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    @@ -154,6 +182,7 @@ foreach (dbFetchRows("SELECT * FROM `widgets` ORDER BY `widget_title`") as $widg } $(function(){ + dashboard_collapse(); gridster = $(".gridster ul").gridster({ widget_base_dimensions: [100, 100], widget_margins: [5, 5], @@ -264,6 +293,17 @@ foreach (dbFetchRows("SELECT * FROM `widgets` ORDER BY `widget_title`") as $widg }); + function dashboard_collapse(target) { + if (target !== undefined) { + $('.dash-collapse:not('+target+')').each(function() { + $(this).fadeOut(150); + }); + $(target).fadeToggle(150); + } else { + $('.dash-collapse').fadeOut(0); + } + } + function dashboard_delete(data) { $.ajax({ type: 'POST', From f80b10bfa0f09e45edb708442a3eb18caee7c7e2 Mon Sep 17 00:00:00 2001 From: Daniel Preussker Date: Fri, 11 Sep 2015 19:20:10 +0100 Subject: [PATCH 5/9] Added Dashboard sharing. --- html/includes/forms/edit-dashboard.inc.php | 4 +- html/includes/forms/widget-settings.inc.php | 14 ++-- html/pages/front/tiles.php | 78 ++++++++++++++------- sql-schema/069.sql | 2 +- 4 files changed, 65 insertions(+), 33 deletions(-) diff --git a/html/includes/forms/edit-dashboard.inc.php b/html/includes/forms/edit-dashboard.inc.php index 7e87af0a1c..fe9d9c527d 100644 --- a/html/includes/forms/edit-dashboard.inc.php +++ b/html/includes/forms/edit-dashboard.inc.php @@ -24,8 +24,8 @@ $status = 'error'; $message = 'unknown error'; -if (isset($_REQUEST['dashboard_id']) && isset($_REQUEST['dashboard_name'])) { - if(dbUpdate(array('dashboard_name'=>$_REQUEST['dashboard_name']),'dashboards','user_id = ? && dashboard_id = ?',array($_SESSION['user_id'],$_REQUEST['dashboard_id']))) { +if (isset($_REQUEST['dashboard_id']) && isset($_REQUEST['dashboard_name']) && isset($_REQUEST['access'])) { + if(dbUpdate(array('dashboard_name'=>$_REQUEST['dashboard_name'],'access'=>$_REQUEST['access']),'dashboards','(user_id = ? || access = 2) && dashboard_id = ?',array($_SESSION['user_id'],$_REQUEST['dashboard_id']))) { $status = 'ok'; $message = 'Updated dashboard'; } diff --git a/html/includes/forms/widget-settings.inc.php b/html/includes/forms/widget-settings.inc.php index 1926d34913..fabe6c4aab 100644 --- a/html/includes/forms/widget-settings.inc.php +++ b/html/includes/forms/widget-settings.inc.php @@ -35,13 +35,19 @@ else { if (!is_array($widget_settings)) { $widget_settings = array(); } - if (dbUpdate(array('settings'=>json_encode($widget_settings)),'users_widgets','user_widget_id=?',array($widget_id))) { - $status = 'ok'; - $message = 'Updated'; + if (dbFetchCell('select 1 from users_widgets inner join dashboards on users_widgets.dashboard_id = dashboards.dashboard_id where user_widget_id = ? && (users_widgets.user_id = ? || dashboards.access = 2)',array($widget_id,$_SESSION['user_id'])) == 1) { + if (dbUpdate(array('settings'=>json_encode($widget_settings)),'users_widgets','user_widget_id=?',array($widget_id))) { + $status = 'ok'; + $message = 'Updated'; + } + else { + $status = 'error'; + $message = 'ERROR: Could not update'; + } } else { $status = 'error'; - $message = 'ERROR: Could not update'; + $message = 'ERROR: You have no write-access to this dashboard'; } } diff --git a/html/pages/front/tiles.php b/html/pages/front/tiles.php index 670a6bb583..a6d3083ce5 100644 --- a/html/pages/front/tiles.php +++ b/html/pages/front/tiles.php @@ -23,13 +23,21 @@ if (dbFetchCell('SELECT dashboard_id FROM dashboards WHERE user_id=?',array($_SE dbUpdate(array('dashboard_id'=>$vars['dashboard']),'users_widgets','user_id = ? && dashboard_id = ?',array($_SESSION['user_id'],0)); } } +if (!empty($vars['dashboard'])) { + $orig = $vars['dashboard']; + $vars['dashboard'] = dbFetchRow('select * from dashboards where user_id = ? && dashboard_id = ? order by dashboard_id limit 1',array($_SESSION['user_id'],$vars['dashboard'])); + if (empty($vars['dashboard'])) { + $vars['dashboard'] = dbFetchRow('select dashboards.*,users.username from dashboards inner join users on dashboards.user_id = users.user_id where dashboards.dashboard_id = ? && dashboards.access > 0',array($orig)); + } +} if (empty($vars['dashboard'])) { - $vars['dashboard'] = dbFetchRow('select dashboard_id,dashboard_name from dashboards where user_id = ? order by dashboard_id limit 1',array($_SESSION['user_id'])); -} else { - $vars['dashboard'] = dbFetchRow('select dashboard_id,dashboard_name from dashboards where user_id = ? && dashboard_id = ? order by dashboard_id limit 1',array($_SESSION['user_id'],$vars['dashboard'])); + $vars['dashboard'] = dbFetchRow('select * from dashboards where user_id = ? order by dashboard_id limit 1',array($_SESSION['user_id'])); + if (isset($orig)) { + $msg_box[] = array('type' => 'error', 'message' => 'Dashboard #'.$orig.' does not exist! Loaded '.$vars['dashboard']['dashboard_name'].' instead.','title' => 'Requested Dashboard Not Found!'); + } } $data = array(); -foreach (dbFetchRows('SELECT user_widget_id,users_widgets.widget_id,title,widget,col,row,size_x,size_y,refresh FROM `users_widgets` LEFT JOIN `widgets` ON `widgets`.`widget_id`=`users_widgets`.`widget_id` WHERE `user_id`=? AND `dashboard_id`=?',array($_SESSION['user_id'],$vars['dashboard']['dashboard_id'])) as $items) { +foreach (dbFetchRows('SELECT user_widget_id,users_widgets.widget_id,title,widget,col,row,size_x,size_y,refresh FROM `users_widgets` LEFT JOIN `widgets` ON `widgets`.`widget_id`=`users_widgets`.`widget_id` WHERE `dashboard_id`=?',array($vars['dashboard']['dashboard_id'])) as $items) { $data[] = $items; } if (empty($data)) { @@ -37,7 +45,7 @@ if (empty($data)) { } $data = serialize(json_encode($data)); $dash_config = unserialize(stripslashes($data)); -$dashboards = dbFetchRows("SELECT * FROM `dashboards` WHERE `user_id` = ?",array($_SESSION['user_id'])); +$dashboards = dbFetchRows("SELECT * FROM `dashboards` WHERE `user_id` = ? && `dashboard_id` != ?",array($_SESSION['user_id'],$vars['dashboard']['dashboard_id'])); ?>
    @@ -45,7 +53,7 @@ $dashboards = dbFetchRows("SELECT * FROM `dashboards` WHERE `user_id` = ?",arra
    -
      1) { +$nodash = 0; +if (sizeof($dashboards) > 0 || $vars['dashboard']['user_id'] != $_SESSION['user_id']) { foreach ($dashboards as $dash) { if ($dash['dashboard_id'] != $vars['dashboard']['dashboard_id']) { echo '
    • '.$dash['dashboard_name'].'
      • '; + $nodash = 1; } } -} else { +} +if ($nodash == 0) { echo '
    • No other Dashboards
      • '; } +$shared_dashboards = 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.dashboard_id != ?",array($_SESSION['user_id'],$vars['dashboard']['dashboard_id'])); +if (!empty($shared_dashboards)) { + echo ' '; + echo '
    • Shared Dashboards
      • '; + foreach ($shared_dashboards as $dash) { + if ($dash['dashboard_id'] != $vars['dashboard']['dashboard_id']) { + echo '
    •    '.$dash['username'].':'.$dash['dashboard_name'].($dash['access'] == 1 ? ' (Read)' : '').'
      • '; + } + } +} ?>
    @@ -71,7 +92,6 @@ if (sizeof($dashboards) > 1) {
    -
    @@ -93,17 +113,24 @@ if (sizeof($dashboards) > 1) {
    -
    -
    -
    +
    +
    +
    -
    +
    Dashboard Name - + +
    @@ -111,24 +138,23 @@ if (sizeof($dashboards) > 1) {
    -
    +
    +
    +
    -
    -
    - Available Widgets - -
    +
    + Available Widgets + +
    '. $widgets['widget_title'] .' '; + echo ' '. $widgets['widget_title'] .' '; } ?> -
    -
    @@ -296,9 +322,9 @@ foreach (dbFetchRows("SELECT * FROM `widgets` ORDER BY `widget_title`") as $widg function dashboard_collapse(target) { if (target !== undefined) { $('.dash-collapse:not('+target+')').each(function() { - $(this).fadeOut(150); + $(this).fadeOut(0); }); - $(target).fadeToggle(150); + $(target).fadeToggle(300); } else { $('.dash-collapse').fadeOut(0); } @@ -327,7 +353,7 @@ foreach (dbFetchRows("SELECT * FROM `widgets` ORDER BY `widget_title`") as $widg $.ajax({ type: 'POST', url: 'ajax_form.php', - data: {type: 'edit-dashboard', dashboard_name: data['dashboard_name'], dashboard_id: }, + data: {type: 'edit-dashboard', dashboard_name: data['dashboard_name'], dashboard_id: , access: data['access']}, dataType: "json", success: function (data) { if( data.status == "ok" ) { diff --git a/sql-schema/069.sql b/sql-schema/069.sql index 739c558dd5..a629aae3d4 100644 --- a/sql-schema/069.sql +++ b/sql-schema/069.sql @@ -1,2 +1,2 @@ -CREATE TABLE `dashboards` ( `dashboard_id` int(11) NOT NULL AUTO_INCREMENT, `user_id` int(11) NOT NULL DEFAULT '0', `dashboard_name` varchar(255) NOT NULL, PRIMARY KEY (`dashboard_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8; +CREATE TABLE `dashboards` ( `dashboard_id` int(11) NOT NULL AUTO_INCREMENT, `user_id` int(11) NOT NULL DEFAULT 0, `dashboard_name` varchar(255) NOT NULL, `access` int(1) NOT NULL DEFAULT 0, PRIMARY KEY (`dashboard_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8; ALTER TABLE `users_widgets` ADD COLUMN `dashboard_id` int(11) NOT NULL; From 26d7851539eb2a837790d1076c55f6094a863dce Mon Sep 17 00:00:00 2001 From: Daniel Preussker Date: Fri, 11 Sep 2015 20:14:37 +0100 Subject: [PATCH 6/9] Fix permissions in update-dashboard-config.inc.php --- .../forms/update-dashboard-config.inc.php | 73 ++++++++++++------- 1 file changed, 48 insertions(+), 25 deletions(-) diff --git a/html/includes/forms/update-dashboard-config.inc.php b/html/includes/forms/update-dashboard-config.inc.php index 35168905f4..e9bdb23dbc 100644 --- a/html/includes/forms/update-dashboard-config.inc.php +++ b/html/includes/forms/update-dashboard-config.inc.php @@ -9,39 +9,62 @@ $widget_id = mres($_POST['widget_id']); $dasboard_id = mres($_POST['dashboard_id']); if ($sub_type == 'remove' && is_numeric($widget_id)) { - if ($widget_id == 0 || dbDelete('users_widgets','`user_id`=? AND `user_widget_id`=? AND `dashboard_id`=?', array($_SESSION['user_id'],$widget_id,$dasboard_id))) { - $status = 'ok'; - $message = ''; - } -} -elseif ($sub_type == 'remove-all') { - if (dbDelete('users_widgets','`user_id`=? AND `dashboard_id`=?', array($_SESSION['user_id'],$dasboard_id))) { - $status = 'ok'; - $message = ''; - } -} -elseif ($sub_type == 'add' && is_numeric($widget_id)) { - $widget = dbFetchRow('SELECT * FROM `widgets` WHERE `widget_id`=?', array($widget_id)); - if (is_array($widget)) { - list($x,$y) = explode(',',$widget['base_dimensions']); - $item_id = dbInsert(array('user_id'=>$_SESSION['user_id'],'widget_id'=>$widget_id, 'col'=>1,'row'=>1,'refresh'=>60,'title'=>$widget['widget_title'],'size_x'=>$x,'size_y'=>$y,'settings'=>'','dashboard_id'=>$dasboard_id),'users_widgets'); - if (is_numeric($item_id)) { - $extra = array('user_widget_id'=>$item_id,'widget_id'=>$item_id,'title'=>$widget['widget_title'],'widget'=>$widget['widget'],'refresh'=>60,'size_x'=>$x,'size_y'=>$y); + if (dbFetchCell('select 1 from dashboards where (user_id = ? || access = 2) && dashboard_id = ?',array($_SESSION['user_id'],$dasboard_id)) == 1) { + if ($widget_id == 0 || dbDelete('users_widgets','`user_widget_id`=? AND `dashboard_id`=?', array($widget_id,$dasboard_id))) { $status = 'ok'; $message = ''; } } + else { + $status = 'error'; + $message = 'ERROR: You have no write access.'; + } +} +elseif ($sub_type == 'remove-all') { + if (dbFetchCell('select 1 from dashboards where (user_id = ? || access = 2) && dashboard_id = ?',array($_SESSION['user_id'],$dasboard_id)) == 1) { + if (dbDelete('users_widgets','`dashboard_id`=?', array($dasboard_id))) { + $status = 'ok'; + $message = ''; + } + } + else { + $status = 'error'; + $message = 'ERROR: You have no write access.'; + } +} +elseif ($sub_type == 'add' && is_numeric($widget_id)) { + if (dbFetchCell('select 1 from dashboards where (user_id = ? || access = 2) && dashboard_id = ?',array($_SESSION['user_id'],$dasboard_id)) == 1) { + $widget = dbFetchRow('SELECT * FROM `widgets` WHERE `widget_id`=?', array($widget_id)); + if (is_array($widget)) { + list($x,$y) = explode(',',$widget['base_dimensions']); + $item_id = dbInsert(array('user_id'=>$_SESSION['user_id'],'widget_id'=>$widget_id, 'col'=>1,'row'=>1,'refresh'=>60,'title'=>$widget['widget_title'],'size_x'=>$x,'size_y'=>$y,'settings'=>'','dashboard_id'=>$dasboard_id),'users_widgets'); + if (is_numeric($item_id)) { + $extra = array('user_widget_id'=>$item_id,'widget_id'=>$item_id,'title'=>$widget['widget_title'],'widget'=>$widget['widget'],'refresh'=>60,'size_x'=>$x,'size_y'=>$y); + $status = 'ok'; + $message = ''; + } + } + } + else { + $status = 'error'; + $message = 'ERROR: You have no write access.'; + } } else { - $status = 'ok'; - $message = ''; - - foreach ($data as $line) { - if (is_array($line)) { - $update = array('col'=>$line['col'],'row'=>$line['row'],'size_x'=>$line['size_x'],'size_y'=>$line['size_y']); - dbUpdate($update, 'users_widgets', '`user_widget_id`=? AND `user_id`=? AND `dashboard_id`=?', array($line['id'],$_SESSION['user_id'],$dasboard_id)); + if (dbFetchCell('select 1 from dashboards where (user_id = ? || access = 2) && dashboard_id = ?',array($_SESSION['user_id'],$dasboard_id)) == 1) { + $status = 'ok'; + $message = ''; + foreach ($data as $line) { + if (is_array($line)) { + $update = array('col'=>$line['col'],'row'=>$line['row'],'size_x'=>$line['size_x'],'size_y'=>$line['size_y']); + dbUpdate($update, 'users_widgets', '`user_widget_id`=? AND `dashboard_id`=?', array($line['id'],$dasboard_id)); + } } } + else { + $status = 'error'; + $message = 'ERROR: You have no write access.'; + } } $response = array( From 9e668e9bd7cec542727407838024123307b6c55f Mon Sep 17 00:00:00 2001 From: Daniel Preussker Date: Fri, 11 Sep 2015 21:14:25 +0100 Subject: [PATCH 7/9] Updated dashboard menu's --- html/pages/front/tiles.php | 57 +++++++++++++++++++++++++++++++------- 1 file changed, 47 insertions(+), 10 deletions(-) diff --git a/html/pages/front/tiles.php b/html/pages/front/tiles.php index a6d3083ce5..6297b0a248 100644 --- a/html/pages/front/tiles.php +++ b/html/pages/front/tiles.php @@ -93,7 +93,7 @@ if (!empty($shared_dashboards)) {
    -
    +
    @@ -103,16 +103,17 @@ if (!empty($shared_dashboards)) { - +
    +
    -
    +
    @@ -131,7 +132,7 @@ foreach (array('Private','Shared (Read)','Shared') as $k=>$v) { ?> - +
    @@ -139,32 +140,53 @@ foreach (array('Private','Shared (Read)','Shared') as $k=>$v) {
    + + +
    - Available Widgets - -
    + Add Widgets +
    + + +
    +
    + +
    - +
    +
    +
    +
    + +
    +
    +
    +
    - @@ -338,8 +360,12 @@ foreach (dbFetchRows("SELECT * FROM `widgets` ORDER BY `widget_title`") as $widg dataType: "json", success: function (data) { if( data.status == "ok" ) { + $("#message").html('
    ' + data.message + '
    '); window.location.href="/overview"; } + else { + $("#message").html('
    ' + data.message + '
    '); + } } }); } @@ -357,8 +383,12 @@ foreach (dbFetchRows("SELECT * FROM `widgets` ORDER BY `widget_title`") as $widg dataType: "json", success: function (data) { if( data.status == "ok" ) { + $("#message").html('
    ' + data.message + '
    '); window.location.href="/overview/dashboard="; } + else { + $("#message").html('
    ' + data.message + '
    '); + } } }); } @@ -376,8 +406,12 @@ foreach (dbFetchRows("SELECT * FROM `widgets` ORDER BY `widget_title`") as $widg dataType: "json", success: function (data) { if( data.status == "ok" ) { + $("#message").html('
    ' + data.message + '
    '); window.location.href="/overview/dashboard="+data.dashboard_id; } + else { + $("#message").html('
    ' + data.message + '
    '); + } } }); } @@ -422,6 +456,9 @@ foreach (dbFetchRows("SELECT * FROM `widgets` ORDER BY `widget_title`") as $widg if( data.status == "ok" ) { widget_reload(widget_id,widget_type); } + else { + $("#message").html('
    ' + data.message + '
    '); + } } }); } From 8859130949974b4de883e4e5f4214ef45c8300ed Mon Sep 17 00:00:00 2001 From: Daniel Preussker Date: Fri, 11 Sep 2015 21:17:49 +0100 Subject: [PATCH 8/9] Fix `base_url` with tailing slash --- html/pages/front/tiles.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/html/pages/front/tiles.php b/html/pages/front/tiles.php index 6297b0a248..79c0e377e1 100644 --- a/html/pages/front/tiles.php +++ b/html/pages/front/tiles.php @@ -65,7 +65,7 @@ $nodash = 0; if (sizeof($dashboards) > 0 || $vars['dashboard']['user_id'] != $_SESSION['user_id']) { foreach ($dashboards as $dash) { if ($dash['dashboard_id'] != $vars['dashboard']['dashboard_id']) { - echo '
  • '.$dash['dashboard_name'].'
    • '; + echo '
  • '.$dash['dashboard_name'].'
    • '; $nodash = 1; } } @@ -79,7 +79,7 @@ if (!empty($shared_dashboards)) { echo '
  • Shared Dashboards
    • '; foreach ($shared_dashboards as $dash) { if ($dash['dashboard_id'] != $vars['dashboard']['dashboard_id']) { - echo '
  •    '.$dash['username'].':'.$dash['dashboard_name'].($dash['access'] == 1 ? ' (Read)' : '').'
    • '; + echo '
  •    '.$dash['username'].':'.$dash['dashboard_name'].($dash['access'] == 1 ? ' (Read)' : '').'
    • '; } } } @@ -361,7 +361,7 @@ foreach (dbFetchRows("SELECT * FROM `widgets` ORDER BY `widget_title`") as $widg success: function (data) { if( data.status == "ok" ) { $("#message").html('
    ' + data.message + '
    '); - window.location.href="/overview"; + window.location.href="/overview"; } else { $("#message").html('
    ' + data.message + '
    '); @@ -384,7 +384,7 @@ foreach (dbFetchRows("SELECT * FROM `widgets` ORDER BY `widget_title`") as $widg success: function (data) { if( data.status == "ok" ) { $("#message").html('
    ' + data.message + '
    '); - window.location.href="/overview/dashboard="; + window.location.href="/overview/dashboard="; } else { $("#message").html('
    ' + data.message + '
    '); @@ -407,7 +407,7 @@ foreach (dbFetchRows("SELECT * FROM `widgets` ORDER BY `widget_title`") as $widg success: function (data) { if( data.status == "ok" ) { $("#message").html('
    ' + data.message + '
    '); - window.location.href="/overview/dashboard="+data.dashboard_id; + window.location.href="/overview/dashboard="+data.dashboard_id; } else { $("#message").html('
    ' + data.message + '
    '); From baa209ff055c184ed42db9f5a7f4a77e9bf70b7b Mon Sep 17 00:00:00 2001 From: Daniel Preussker Date: Sat, 12 Sep 2015 09:51:58 +0100 Subject: [PATCH 9/9] Fixed width of dashboard-dropdown --- html/pages/front/tiles.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/html/pages/front/tiles.php b/html/pages/front/tiles.php index 79c0e377e1..a3669f5598 100644 --- a/html/pages/front/tiles.php +++ b/html/pages/front/tiles.php @@ -51,9 +51,9 @@ $dashboards = dbFetchRows("SELECT * FROM `dashboards` WHERE `user_id` = ? && `d
    - +
    - @@ -121,7 +121,7 @@ if (!empty($shared_dashboards)) {
    - Dashboard Name + Dashboard Name