diff --git a/mojotrollz/sai/autoload.inc b/mojotrollz/sai/autoload.inc index 0298b9b..099ce6f 100644 --- a/mojotrollz/sai/autoload.inc +++ b/mojotrollz/sai/autoload.inc @@ -1,4 +1,5 @@   Mojotrollz Beta';} + public static function html_li_menu(){return '
  •   Mojotrollz Beta
    • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} public static function js(){return array(\SYSTEM\WEBPATH(new \PSAI(),'saimod_mojotrollz_beta/js/saimod_mojotrollz_beta.js'));} diff --git a/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/autoload.inc b/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/autoload.inc new file mode 100644 index 0000000..1b36213 --- /dev/null +++ b/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/autoload.inc @@ -0,0 +1,4 @@ +
  •   Vendor Template
    • ';} + public static function right_public(){return false;} + public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} + public static function js(){return array(\SYSTEM\WEBPATH(new \PSAI(),'saimod_mojotrollz_npc_vendor_template/js/saimod_mojotrollz_npc_vendor_template.js'));} + //public static function css(){return array();} +} \ No newline at end of file diff --git a/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/sql/DATA_SAIMOD_MOJOTROLLZ_NPC_VENDOR_TEMPLATE.php b/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/sql/DATA_SAIMOD_MOJOTROLLZ_NPC_VENDOR_TEMPLATE.php new file mode 100644 index 0000000..05f939d --- /dev/null +++ b/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/sql/DATA_SAIMOD_MOJOTROLLZ_NPC_VENDOR_TEMPLATE.php @@ -0,0 +1,9 @@ + + + entry + item + maxcount + incrtime + ExtendedCost + condition_id + + ${entries} + \ No newline at end of file diff --git a/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_entry.tpl b/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_entry.tpl new file mode 100644 index 0000000..1123057 --- /dev/null +++ b/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_entry.tpl @@ -0,0 +1,8 @@ + + ${entry} + ${item} + ${maxcount} + ${incrtime} + ${ExtendedCost} + ${condition_id} + \ No newline at end of file diff --git a/mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.php b/mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.php index 99a0e20..85270ef 100644 --- a/mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.php +++ b/mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.php @@ -14,7 +14,7 @@ class saimod_mojotrollz_server_handling extends \SYSTEM\SAI\SaiModule { $vars['tbc_players_online'] = self::online_tbc(); $vars['tbc_test_players_online'] = self::online_tbc_test(); return \SYSTEM\PAGE\replace::replaceFile(dirname(__FILE__).'/tpl/main.tpl', $vars);} - public static function html_li_menu(){return '
  •   Mojotrollz Server
    • ';} + public static function html_li_menu(){return '
  •   Mojotrollz Server
    • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} public static function js(){return array( diff --git a/mojotrollz/sai/saimod_mojotrollz_servers/saimod_mojotrollz_servers.php b/mojotrollz/sai/saimod_mojotrollz_servers/saimod_mojotrollz_servers.php index 833b8ba..097c8b6 100644 --- a/mojotrollz/sai/saimod_mojotrollz_servers/saimod_mojotrollz_servers.php +++ b/mojotrollz/sai/saimod_mojotrollz_servers/saimod_mojotrollz_servers.php @@ -15,7 +15,7 @@ class saimod_mojotrollz_servers extends \SYSTEM\SAI\SaiModule { $vars['content'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_mojotrollz_servers/tpl/list_entry.tpl'), $r);} $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_TIME),\SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_BASIC)); return \SYSTEM\PAGE\replace::replaceFile( \SYSTEM\WEBPATH(new \PSAI(),'saimod_mojotrollz_servers/tpl/saimod_mojotrollz_servers.tpl'),$vars);} - public static function html_li_menu(){return '
  •   Vote Servers
    • ';} + public static function html_li_menu(){return '
  •   Vote Servers
    • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} diff --git a/mojotrollz/sql/mysql/system_api.sql b/mojotrollz/sql/mysql/system_api.sql index fa7e516..6f2a328 100644 --- a/mojotrollz/sql/mysql/system_api.sql +++ b/mojotrollz/sql/mysql/system_api.sql @@ -1,11 +1,11 @@ REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (200, 0, 2, 11, 'newserver', 'address', 'STRING'); REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (205, 0, 2, 11, 'vote', 'server', 'INT'); -INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (210, 0, 2, 11, 'register', 'username', 'STRING'); -INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (211, 0, 2, 11, 'register', 'password', 'STRING'); -INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (212, 0, 2, 11, 'register', 'email', 'STRING'); -INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (213, 0, 2, 11, 'register', 'wowpassword', 'STRING'); -INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (214, 0, 3, 11, 'register', 'betakey', 'STRING'); +REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (210, 0, 2, 11, 'register', 'username', 'STRING'); +REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (211, 0, 2, 11, 'register', 'password', 'STRING'); +REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (212, 0, 2, 11, 'register', 'email', 'STRING'); +REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (213, 0, 2, 11, 'register', 'wowpassword', 'STRING'); +REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (214, 0, 3, 11, 'register', 'betakey', 'STRING'); REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (210, 1, 3, 1, 'beta', 'key', 'STRING'); REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (215, 1, 2, 1, 'article', 'id', 'STRING'); \ No newline at end of file diff --git a/mojotrollz/sql/tool_copy_db_test.sql b/mojotrollz/sql/tool_copy_db_test.sql new file mode 100644 index 0000000..17b9fe3 --- /dev/null +++ b/mojotrollz/sql/tool_copy_db_test.sql @@ -0,0 +1,18 @@ +DELETE FROM host_mojotrollz_test.system_user; +INSERT INTO host_mojotrollz_test.system_user SELECT * FROM host_mojotrollz_test_old.system_user; +DELETE FROM host_mojotrollz_test.system_user_to_rights; +INSERT INTO host_mojotrollz_test.system_user_to_rights SELECT * FROM host_mojotrollz_test_old.system_user_to_rights; +DELETE FROM host_mojotrollz_test.system_log; +INSERT INTO host_mojotrollz_test.system_log SELECT * FROM host_mojotrollz_test_old.system_log; +DELETE FROM host_mojotrollz_test.system_todo; +INSERT INTO host_mojotrollz_test.system_todo SELECT * FROM host_mojotrollz_test_old.system_todo; +DELETE FROM host_mojotrollz_test.system_todo_assign; +INSERT INTO host_mojotrollz_test.system_todo_assign SELECT * FROM host_mojotrollz_test_old.system_todo_assign; +DELETE FROM host_mojotrollz_test.mojotrollz_addon; +INSERT INTO host_mojotrollz_test.mojotrollz_addon SELECT * FROM host_mojotrollz_test_old.mojotrollz_addon; +DELETE FROM host_mojotrollz_test.mojotrollz_beta; +INSERT INTO host_mojotrollz_test.mojotrollz_beta SELECT * FROM host_mojotrollz_test_old.mojotrollz_beta; +DELETE FROM host_mojotrollz_test.mojotrollz_server; +INSERT INTO host_mojotrollz_test.mojotrollz_server SELECT * FROM host_mojotrollz_test_old.mojotrollz_server; +DELETE FROM host_mojotrollz_test.mojotrollz_vote; +INSERT INTO host_mojotrollz_test.mojotrollz_vote SELECT * FROM host_mojotrollz_test_old.mojotrollz_vote; \ No newline at end of file