From 27c1c74c504b3ddcc5472e10422b00e2d85e2d1c Mon Sep 17 00:00:00 2001 From: kaetemi Date: Thu, 11 Sep 2014 09:31:59 +0200 Subject: [PATCH 1/2] Small database adjustment --- code/web/private_php/setup/sql/nel_ams_lib_00003.sql | 1 - code/web/private_php/setup/sql/nel_ams_lib_00004.sql | 1 - code/web/private_php/setup/sql/nel_ams_lib_00005.sql | 1 + code/web/private_php/setup/sql/nel_tool_00002.sql | 1 + code/web/public_php/setup/database.php | 4 ++-- code/web/public_php/setup/version.php | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 code/web/private_php/setup/sql/nel_ams_lib_00005.sql create mode 100644 code/web/private_php/setup/sql/nel_tool_00002.sql diff --git a/code/web/private_php/setup/sql/nel_ams_lib_00003.sql b/code/web/private_php/setup/sql/nel_ams_lib_00003.sql index 55ce7fc79..2dbd7838c 100644 --- a/code/web/private_php/setup/sql/nel_ams_lib_00003.sql +++ b/code/web/private_php/setup/sql/nel_ams_lib_00003.sql @@ -1,3 +1,2 @@ INSERT INTO `plugins` (`FileName`, `Name`, `Type`, `Owner`, `Permission`, `Status`, `Weight`, `Info`) VALUES ('Domain_Management', 'Domain_Management', 'Manual', '', 'admin', 1, 0, '{"PluginName":"Domain Management","Description":"Plug-in for Domain Management.","Version":"1.0.0","TemplatePath":"..\\/..\\/..\\/private_php\\/ams\\/plugins\\/Domain_Management\\/templates\\/index.tpl","Type":"Manual","":null}'); - diff --git a/code/web/private_php/setup/sql/nel_ams_lib_00004.sql b/code/web/private_php/setup/sql/nel_ams_lib_00004.sql index 33dac0523..0166c62aa 100644 --- a/code/web/private_php/setup/sql/nel_ams_lib_00004.sql +++ b/code/web/private_php/setup/sql/nel_ams_lib_00004.sql @@ -1,3 +1,2 @@ ALTER TABLE `plugins` ADD UNIQUE(`Name`); UPDATE `plugins` SET `Info` = '{"PluginName":"Achievements","Description":"Returns the achievements of a user with respect to the character","Version":"1.0.0","TemplatePath":"..\\/..\\/..\\/private_php\\/ams\\/plugins\\/Achievements\\/templates\\/index.tpl","Type":"Manual","":null}' WHERE `Name` = 'Achievements'; - diff --git a/code/web/private_php/setup/sql/nel_ams_lib_00005.sql b/code/web/private_php/setup/sql/nel_ams_lib_00005.sql new file mode 100644 index 000000000..2a2f8bcca --- /dev/null +++ b/code/web/private_php/setup/sql/nel_ams_lib_00005.sql @@ -0,0 +1 @@ +ALTER TABLE `ticket_attachments` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; diff --git a/code/web/private_php/setup/sql/nel_tool_00002.sql b/code/web/private_php/setup/sql/nel_tool_00002.sql new file mode 100644 index 000000000..aab24820a --- /dev/null +++ b/code/web/private_php/setup/sql/nel_tool_00002.sql @@ -0,0 +1 @@ +UPDATE `neltool_notes` SET `note_user_id` = '1' WHERE `note_user_id` =27; diff --git a/code/web/public_php/setup/database.php b/code/web/public_php/setup/database.php index 1510a50ae..303df57d5 100644 --- a/code/web/public_php/setup/database.php +++ b/code/web/public_php/setup/database.php @@ -2,11 +2,11 @@ // Service $db_nel = 3; -$db_nel_tool = 1; +$db_nel_tool = 2; // Support $db_nel_ams = 1; -$db_nel_ams_lib = 4; +$db_nel_ams_lib = 5; // Domain $db_ring_domain = 1; diff --git a/code/web/public_php/setup/version.php b/code/web/public_php/setup/version.php index 36b2fb2d9..3204d1e7b 100644 --- a/code/web/public_php/setup/version.php +++ b/code/web/public_php/setup/version.php @@ -1,6 +1,6 @@ Date: Thu, 11 Sep 2014 10:00:10 +0200 Subject: [PATCH 2/2] Admin web fix --- code/web/public_php/admin/config.php | 4 ++-- code/web/public_php/admin/templates/default/index.tpl | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/web/public_php/admin/config.php b/code/web/public_php/admin/config.php index 0a43d798a..5fdfd1c58 100644 --- a/code/web/public_php/admin/config.php +++ b/code/web/public_php/admin/config.php @@ -11,8 +11,8 @@ define('NELTOOL_DBNAME', $cfg['db']['tool']['name']); // site paths definitions - define('NELTOOL_SITEBASE', $_SERVER['PHP_SELF']); - define('NELTOOL_SYSTEMBASE', dirname( dirname(__FILE__) ) . '/admin/'); + define('NELTOOL_SITEBASE', dirname($_SERVER['PHP_SELF']) .'/'); + define('NELTOOL_SYSTEMBASE', dirname(__FILE__) .'/'); define('NELTOOL_LOGBASE', NELTOOL_SYSTEMBASE .'/logs/'); define('NELTOOL_IMGBASE', NELTOOL_SYSTEMBASE .'/imgs/'); diff --git a/code/web/public_php/admin/templates/default/index.tpl b/code/web/public_php/admin/templates/default/index.tpl index 7d3bc5c79..04fe742df 100644 --- a/code/web/public_php/admin/templates/default/index.tpl +++ b/code/web/public_php/admin/templates/default/index.tpl @@ -1,4 +1,3 @@ - {include file="page_header.tpl"} {literal}