diff options
Diffstat (limited to 'modules-available/usblockoff/page.inc.php')
| -rw-r--r-- | modules-available/usblockoff/page.inc.php | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/modules-available/usblockoff/page.inc.php b/modules-available/usblockoff/page.inc.php index d5334838..40e0ff78 100644 --- a/modules-available/usblockoff/page.inc.php +++ b/modules-available/usblockoff/page.inc.php @@ -39,7 +39,7 @@ class Page_usblockoff extends Page $this->loadConfigChooser(); } else if ($show === "edit-config") { $configid = Request::get("configid", ""); - $configName = Database::queryFirst("SELECT configname FROM `usb_configs` WHERE configid=:id", array( + $dbquery = Database::queryFirst("SELECT configname, configdesc FROM `usb_configs` WHERE configid=:id", array( 'id' => $configid )); @@ -48,7 +48,8 @@ class Page_usblockoff extends Page Render::addTemplate('usb-edit-config', array( 'configid' => $configid, - 'configName' => $configName['configname'], + 'configName' => $dbquery['configname'], + 'configDesc' => $dbquery['configdesc'], 'rulesConfigHtml' => $rulesConfigHtml, 'daemonConfigHtml' => $daemonConfigHtml )); @@ -361,11 +362,12 @@ class Page_usblockoff extends Page protected function loadConfigChooser() { - $dbquery = Database::simpleQuery("SELECT configid, configname FROM `usb_configs`"); + $dbquery = Database::simpleQuery("SELECT configid, configname, configdesc FROM `usb_configs`"); $configs = array(); while ($dbentry = $dbquery->fetch(PDO::FETCH_ASSOC)) { $config['config_id'] = $dbentry['configid']; $config['config_name'] = $dbentry['configname']; + $config['config_desc'] = $dbentry['configdesc']; $configs[] = $config; } Render::addTemplate('usb-configuration-table', array('config_list' => array_values($configs))); @@ -415,6 +417,7 @@ class Page_usblockoff extends Page $id = Request::post('id', 0, 'int'); $configname = Request::post('configName', '', 'string'); + $configdesc = Request::post('configDesc', '', 'string'); $dbquery = Database::queryFirst("SELECT * FROM `usb_configs` WHERE configid=:id", array('id' => $id)); // Load daemon.conf from db else load default @@ -442,16 +445,18 @@ class Page_usblockoff extends Page // INSERT IN DB if ($id == '0' || $result['saveAsNewConfig']) { - $dbquery = Database::exec("INSERT INTO `usb_configs` (configname, rulesconfig, daemonconfig) VALUES (:configname, :rulesconfig, :daemonconfig)", + $dbquery = Database::exec("INSERT INTO `usb_configs` (configname, rulesconfig, daemonconfig, configdesc) VALUES (:configname, :rulesconfig, :daemonconfig, :configdesc)", array('configname' => $configname, 'rulesconfig' => json_encode($result['rules']), - 'daemonconfig' => implode($newDaemonConf))); + 'daemonconfig' => implode($newDaemonConf), + 'configdesc' => $configdesc)); } else { - $dbquery = Database::exec("UPDATE `usb_configs` SET configname=:configname, rulesconfig=:rulesconfig, daemonconfig=:daemonconfig WHERE configid=:configid", + $dbquery = Database::exec("UPDATE `usb_configs` SET configname=:configname, rulesconfig=:rulesconfig, daemonconfig=:daemonconfig, configdesc=:configdesc WHERE configid=:configid", array('configid' => $id, 'configname' => $configname, 'rulesconfig' => json_encode($result['rules']), - 'daemonconfig' => implode($newDaemonConf))); + 'daemonconfig' => implode($newDaemonConf), + 'configdesc' => $configdesc)); } Message::addSuccess('config-saved'); } @@ -501,9 +506,17 @@ class Page_usblockoff extends Page $rulesArray[] = $rule; } } + + if ($configid == "new-default") { + $newConfig = true; + } else { + $newConfig = false; + } + return Render::parse('usb-rules-config', array( 'rules' => (array)$rulesArray, - 'configid' => $configid + 'configid' => $configid, + 'newConfig' => $newConfig )); } |