changed sql table for standard conform themes

Author: cfoe

install/sql/incremental/upd_0034.sql

@@ -54,7 +54,7 @@ CREATE TABLE IF NOT EXISTS `aps_packages` (
 -- --------------------------------------------------------
 
 --
--- Tabellenstruktur für Tabelle `aps_settings`
+-- Table structure for table `aps_settings`
 --
 
 CREATE TABLE IF NOT EXISTS `aps_settings` (
@@ -68,28 +68,16 @@ CREATE TABLE IF NOT EXISTS `aps_settings` (
 -- --------------------------------------------------------
 
 --
--- Tabellenstruktur für Tabelle `tpl_default`
+-- Table structure for table `sys_theme`
 --
 
--- CREATE TABLE IF NOT EXISTS `tpl_default` (
---  `var_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
---  `username` varchar(64) NOT NULL,
---  `logo_url` varchar(255) NOT NULL,
---  PRIMARY KEY (`var_id`)
---) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
-
--- --------------------------------------------------------
-
---
--- Tabellenstruktur für Tabelle `tpl_default-v2`
---
-
---CREATE TABLE IF NOT EXISTS `tpl_default-v2` (
---  `var_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
---  `username` varchar(64) NOT NULL,
---  `logo_url` varchar(255) NOT NULL,
---  PRIMARY KEY (`var_id`)
---) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
+CREATE TABLE IF NOT EXISTS `sys_theme` (
+  `var_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `tpl_name` varchar(32) NOT NULL,
+  `username` varchar(64) NOT NULL,
+  `logo_url` varchar(255) NOT NULL,
+  PRIMARY KEY (`var_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
 
 -- --------------------------------------------------------
 
@@ -104,5 +92,5 @@ INSERT INTO `aps_settings` (`id`, `name`, `value`) VALUES(3, 'ignore-webserver-m
 ALTER TABLE  `client` ADD  `limit_aps` int(11) NOT NULL DEFAULT '0' AFTER  `limit_webdav_user`;
 ALTER TABLE  `client_template` ADD  `limit_aps` int(11) NOT NULL DEFAULT '0' AFTER  `limit_webdav_user`;
 
--- INSERT INTO `tpl_default` (`var_id`, `username`, `logo_url`) VALUES('', 'global', 'themes/default/images/header_logo.png');
--- INSERT INTO `tpl_default-2` (`var_id`, `username`, `logo_url`) VALUES('', 'global', 'themes/default-v2/images/header_logo.png');
+INSERT INTO `dbispconfig`.`sys_theme` (`var_id`, `tpl_name`, `username`, `logo_url`) VALUES (NULL, 'default', 'global', 'themes/default/images/header_logo.png');
+INSERT INTO `dbispconfig`.`sys_theme` (`var_id`, `tpl_name`, `username`, `logo_url`) VALUES (NULL, 'default-v2', 'global', 'themes/default-v2/images/header_logo.png');

interface/web/admin/form/tpl_default-v2.tform.php

@@ -63,8 +63,8 @@
 $form["description"] 	= "tpl_default-v2_desc_txt";
 $form["name"] 		= "tpl_default-v2";
 $form["action"]		= "tpl_default-v2.php";
-$form["db_table"]	= "default-v2";
-$form["db_table_idx"]	= "var_id";
+$form["db_table"]	= "sys_theme";
+$form["db_table_idx"]	= "id";
 $form["db_history"]	= "yes";
 $form["tab_default"]	= "basic";
 $form["list_default"]	= "system_config_edit.php";

interface/web/admin/form/tpl_default.tform.php

@@ -63,8 +63,8 @@
 $form["description"] 	= "tpl_default_desc_txt";
 $form["name"] 		= "tpl_default";
 $form["action"]		= "tpl_default.php";
-$form["db_table"]	= "default";
-$form["db_table_idx"]	= "var_id";
+$form["db_table"]	= "sys_theme";
+$form["db_table_idx"]	= "id";
 $form["db_history"]	= "yes";
 $form["tab_default"]	= "basic";
 $form["list_default"]	= "system_config_edit.php";