From a95fd6971203a699352a49402b10062f3ae4de44 Mon Sep 17 00:00:00 2001 From: Matthew Lagoe Date: Fri, 25 Oct 2013 22:55:31 -0700 Subject: [PATCH] Merged in rc-botanic-webdev (pull request #1) additional fix's for AMS --- .../ryzom_ams/ams_lib/autoload/helpers.php | 2 +- .../server/ryzom_ams/www/config.default.php | 7 + .../server/ryzom_ams/www/html/css/custom.css | 16 + .../ryzom_ams/www/html/installer/libsetup.php | 784 ++++++++++++++++++ .../www/html/templates/forgot_password.tpl | 2 +- .../ryzom_ams/www/html/templates/install.tpl | 2 +- .../ryzom_ams/www/html/templates/login.tpl | 2 +- .../ryzom_ams/www/html/templates/logout.tpl | 2 +- .../ryzom_ams/www/html/templates/register.tpl | 2 +- .../www/html/templates/register_feedback.tpl | 2 +- .../www/html/templates/reset_password.tpl | 2 +- .../www/html/templates/reset_success.tpl | 2 +- 12 files changed, 816 insertions(+), 9 deletions(-) diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php index 9f8d61cbc..40a96f6c1 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php @@ -33,7 +33,7 @@ class Helpers{ $smarty -> debugging = false; // caching must be disabled for multi-language support $smarty -> caching = false; - $smarty -> cache_lifetime = 120; + $smarty -> cache_lifetime = 5; //needed by smarty. helpers :: create_folders (); diff --git a/code/ryzom/tools/server/ryzom_ams/www/config.default.php b/code/ryzom/tools/server/ryzom_ams/www/config.default.php index a091ed635..222f0eba0 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/config.default.php +++ b/code/ryzom/tools/server/ryzom_ams/www/config.default.php @@ -32,6 +32,13 @@ $cfg['db']['ring']['name'] = 'ring_open'; $cfg['db']['ring']['user'] = 'shard'; $cfg['db']['ring']['pass'] = ''; +// Variables for database access to the nel_tool database +$cfg['db']['tool']['host'] = 'localhost'; +$cfg['db']['tool']['port'] = '3306'; +$cfg['db']['tool']['name'] = 'nel_tool'; +$cfg['db']['tool']['user'] = 'shard'; +$cfg['db']['tool']['pass'] = ''; + // To connect to an IMAP server running on port 143 on the local machine, // do the following: $mbox = imap_open("{localhost:143}INBOX", "user_id", "password"); // POP3 server on port 110: $mbox = imap_open ("{localhost:110/pop3}INBOX", "user_id", "password"); diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/custom.css b/code/ryzom/tools/server/ryzom_ams/www/html/css/custom.css index 2e94ade39..425da8427 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/css/custom.css +++ b/code/ryzom/tools/server/ryzom_ams/www/html/css/custom.css @@ -1,3 +1,19 @@ +.box-content { + background: white; +} + +.box-header { + background-color: white; +} + +.top-block { + background-color: white; +} + +.row-fluid [class*="span"] { + min-height: 28px; +} + .login-header { height:190px; diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php b/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php index 9118afb76..56a9c5b24 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php @@ -13,6 +13,7 @@ error_reporting( E_ALL ); $return = array(); + $return['no_visible_elements'] = false; helpers :: loadTemplate( "install" , $return ); exit; @@ -579,6 +580,789 @@ $dbs->executeWithoutParams($sql); print "The shard database was correctly installed!
"; + //SETUP THE Nel_Tool DB + $dbn = new DBLayer("install", "tool"); + $sql = " + CREATE DATABASE IF NOT EXISTS `" . $cfg['db']['tool']['name'] ."`; + USE `". $cfg['db']['tool']['name'] . "`; + + CREATE DATABASE IF NOT EXISTS `nel_tool` DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci; + USE `nel_tool`; + + CREATE TABLE IF NOT EXISTS `neltool_annotations` ( + `annotation_id` int(11) NOT NULL AUTO_INCREMENT, + `annotation_domain_id` int(11) DEFAULT NULL, + `annotation_shard_id` int(11) DEFAULT NULL, + `annotation_data` varchar(255) NOT NULL DEFAULT '', + `annotation_user_name` varchar(32) NOT NULL DEFAULT '', + `annotation_date` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`annotation_id`), + UNIQUE KEY `annotation_shard_id` (`annotation_shard_id`), + UNIQUE KEY `annotation_domain_id` (`annotation_domain_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=13 ; + + INSERT INTO `neltool_annotations` (`annotation_id`, `annotation_domain_id`, `annotation_shard_id`, `annotation_data`, `annotation_user_name`, `annotation_date`) VALUES + (12, NULL, 106, 'Welcome to the Shard Admin Website!', 'vl', 1272378352); + + CREATE TABLE IF NOT EXISTS `neltool_applications` ( + `application_id` int(11) NOT NULL AUTO_INCREMENT, + `application_name` varchar(64) NOT NULL DEFAULT '', + `application_uri` varchar(255) NOT NULL DEFAULT '', + `application_restriction` varchar(64) NOT NULL DEFAULT '', + `application_order` int(11) NOT NULL DEFAULT '0', + `application_visible` int(11) NOT NULL DEFAULT '0', + `application_icon` varchar(128) NOT NULL DEFAULT '', + PRIMARY KEY (`application_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=40 ; + + INSERT INTO `neltool_applications` (`application_id`, `application_name`, `application_uri`, `application_restriction`, `application_order`, `application_visible`, `application_icon`) VALUES + (1, 'Main', 'index.php', '', 100, 1, 'imgs/icon_main.gif'), + (2, 'Logout', 'index.php?mode=logout', '', 999999, 1, 'imgs/icon_logout.gif'), + (3, 'Admin', 'tool_administration.php', 'tool_admin', 1500, 1, 'imgs/icon_admin.gif'), + (4, 'Prefs', 'tool_preferences.php', 'tool_preferences', 1000, 1, 'imgs/icon_preferences.gif'), + (5, 'Admin/Users', '', 'tool_admin_user', 1502, 0, ''), + (6, 'Admin/Applications', '', 'tool_admin_application', 1501, 0, ''), + (7, 'Admin/Domains', '', 'tool_admin_domain', 1504, 0, ''), + (8, 'Admin/Shards', '', 'tool_admin_shard', 1505, 0, ''), + (9, 'Admin/Groups', '', 'tool_admin_group', 1503, 0, ''), + (10, 'Admin/Logs', '', 'tool_admin_logs', 1506, 0, ''), + (11, 'Main/Start', '', 'tool_main_start', 101, 0, ''), + (12, 'Main/Stop', '', 'tool_main_stop', 102, 0, ''), + (13, 'Main/Restart', '', 'tool_main_restart', 103, 0, ''), + (14, 'Main/Kill', '', 'tool_main_kill', 104, 0, ''), + (15, 'Main/Abort', '', 'tool_main_abort', 105, 0, ''), + (16, 'Main/Execute', '', 'tool_main_execute', 108, 0, ''), + (18, 'Notes', 'tool_notes.php', 'tool_notes', 900, 1, 'imgs/icon_notes.gif'), + (19, 'Player Locator', 'tool_player_locator.php', 'tool_player_locator', 200, 1, 'imgs/icon_player_locator.gif'), + (20, 'Player Locator/Display Players', '', 'tool_player_locator_display_players', 201, 0, ''), + (21, 'Player Locator/Locate', '', 'tool_player_locator_locate', 202, 0, ''), + (22, 'Main/LockDomain', '', 'tool_main_lock_domain', 110, 0, ''), + (23, 'Main/LockShard', '', 'tool_main_lock_shard', 111, 0, ''), + (24, 'Main/WS', '', 'tool_main_ws', 112, 0, ''), + (25, 'Main/ResetCounters', '', 'tool_main_reset_counters', 113, 0, ''), + (26, 'Main/ServiceAutoStart', '', 'tool_main_service_autostart', 114, 0, ''), + (27, 'Main/ShardAutoStart', '', 'tool_main_shard_autostart', 115, 0, ''), + (28, 'Main/WS/Old', '', 'tool_main_ws_old', 112, 0, ''), + (29, 'Graphs', 'tool_graphs.php', 'tool_graph', 500, 1, 'imgs/icon_graphs.gif'), + (30, 'Notes/Global', '', 'tool_notes_global', 901, 0, ''), + (31, 'Log Analyser', 'tool_log_analyser.php', 'tool_las', 400, 1, 'imgs/icon_log_analyser.gif'), + (32, 'Guild Locator', 'tool_guild_locator.php', 'tool_guild_locator', 300, 1, 'imgs/icon_guild_locator.gif'), + (33, 'Player Locator/UserID Check', '', 'tool_player_locator_userid_check', 203, 0, ''), + (34, 'Player Locator/CSR Relocate', '', 'tool_player_locator_csr_relocate', 204, 0, ''), + (35, 'Guild Locator/Guilds Update', '', 'tool_guild_locator_manage_guild', 301, 0, ''), + (36, 'Guild Locator/Members Update', '', 'tool_guild_locator_manage_members', 302, 0, ''), + (37, 'Entities', 'tool_event_entities.php', 'tool_event_entities', 350, 1, 'imgs/icon_entity.gif'), + (38, 'Admin/Restarts', '', 'tool_admin_restart', 1507, 0, ''), + (39, 'Main/EasyRestart', '', 'tool_main_easy_restart', 116, 0, ''); + + CREATE TABLE IF NOT EXISTS `neltool_domains` ( + `domain_id` int(11) NOT NULL AUTO_INCREMENT, + `domain_name` varchar(128) NOT NULL DEFAULT '', + `domain_as_host` varchar(128) NOT NULL DEFAULT '', + `domain_as_port` int(11) NOT NULL DEFAULT '0', + `domain_rrd_path` varchar(255) NOT NULL DEFAULT '', + `domain_las_admin_path` varchar(255) NOT NULL DEFAULT '', + `domain_las_local_path` varchar(255) NOT NULL DEFAULT '', + `domain_application` varchar(128) NOT NULL DEFAULT '', + `domain_sql_string` varchar(128) NOT NULL DEFAULT '', + `domain_hd_check` int(11) NOT NULL DEFAULT '0', + `domain_mfs_web` text, + `domain_cs_sql_string` varchar(255) DEFAULT NULL, + PRIMARY KEY (`domain_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=13 ; + + INSERT INTO `neltool_domains` (`domain_id`, `domain_name`, `domain_as_host`, `domain_as_port`, `domain_rrd_path`, `domain_las_admin_path`, `domain_las_local_path`, `domain_application`, `domain_sql_string`, `domain_hd_check`, `domain_mfs_web`, `domain_cs_sql_string`) VALUES + (12, 'ryzom_open', '127.0.0.1', 46700, '/home/ryzom/code/ryzom/server/save_shard/rrd_graphs', '', '', 'ryzom_open', 'mysql://shard@127.0.0.1/ring_open', 0, '', 'mysql://shard@127.0.0.1/atrium_forums'); + + CREATE TABLE IF NOT EXISTS `neltool_groups` ( + `group_id` int(11) NOT NULL AUTO_INCREMENT, + `group_name` varchar(32) NOT NULL DEFAULT 'NewGroup', + `group_level` int(11) NOT NULL DEFAULT '0', + `group_default` int(11) NOT NULL DEFAULT '0', + `group_active` int(11) NOT NULL DEFAULT '0', + `group_default_domain_id` tinyint(3) unsigned DEFAULT NULL, + `group_default_shard_id` tinyint(3) unsigned DEFAULT NULL, + PRIMARY KEY (`group_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=12 ; + + INSERT INTO `neltool_groups` (`group_id`, `group_name`, `group_level`, `group_default`, `group_active`, `group_default_domain_id`, `group_default_shard_id`) VALUES + (1, 'AdminGroup', 0, 0, 1, 12, 106), + (2, 'NevraxGroup', 0, 1, 1, NULL, NULL), + (3, 'AdminDebugGroup', 10, 0, 1, 9, 56), + (4, 'SupportSGMGroup', 0, 0, 1, NULL, NULL), + (5, 'NevraxATSGroup', 0, 0, 1, NULL, NULL), + (6, 'SupportGMGroup', 0, 0, 1, NULL, NULL), + (7, 'SupportReadOnlyGroup', 0, 0, 1, NULL, NULL), + (8, 'NevraxLevelDesigners', 0, 0, 1, NULL, NULL), + (9, 'NevraxReadOnlyGroup', 0, 0, 1, 9, 56), + (10, 'YubDevGroup', 0, 0, 1, 12, 106), + (11, 'GuestGroup', 0, 0, 1, 12, 106); + + CREATE TABLE IF NOT EXISTS `neltool_group_applications` ( + `group_application_id` int(11) NOT NULL AUTO_INCREMENT, + `group_application_group_id` int(11) NOT NULL DEFAULT '0', + `group_application_application_id` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`group_application_id`), + KEY `group_application_group_id` (`group_application_group_id`), + KEY `group_application_application_id` (`group_application_application_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=966 ; + + INSERT INTO `neltool_group_applications` (`group_application_id`, `group_application_group_id`, `group_application_application_id`) VALUES + (879, 1, 10), + (878, 1, 8), + (877, 1, 7), + (876, 1, 9), + (875, 1, 5), + (874, 1, 6), + (873, 1, 3), + (872, 1, 4), + (871, 1, 30), + (870, 1, 18), + (869, 1, 29), + (868, 1, 31), + (867, 1, 37), + (866, 1, 36), + (865, 1, 35), + (864, 1, 32), + (863, 1, 34), + (862, 1, 33), + (861, 1, 21), + (860, 1, 20), + (859, 1, 19), + (858, 1, 39), + (857, 1, 27), + (856, 1, 26), + (843, 3, 10), + (842, 3, 8), + (841, 3, 7), + (840, 3, 9), + (839, 3, 5), + (838, 3, 6), + (837, 3, 3), + (836, 3, 4), + (835, 3, 30), + (834, 3, 18), + (833, 3, 29), + (832, 3, 31), + (831, 3, 37), + (830, 3, 36), + (829, 3, 35), + (828, 3, 32), + (827, 3, 34), + (826, 3, 33), + (825, 3, 21), + (824, 3, 20), + (823, 3, 19), + (822, 3, 39), + (821, 3, 27), + (820, 3, 26), + (597, 4, 36), + (596, 4, 35), + (595, 4, 32), + (594, 4, 21), + (593, 4, 20), + (592, 4, 19), + (591, 4, 24), + (590, 4, 23), + (589, 4, 14), + (588, 4, 12), + (632, 2, 18), + (631, 2, 37), + (630, 2, 32), + (629, 2, 21), + (628, 2, 20), + (627, 2, 19), + (626, 2, 24), + (625, 2, 23), + (624, 2, 22), + (623, 2, 16), + (622, 2, 15), + (621, 2, 14), + (620, 2, 13), + (819, 3, 25), + (855, 1, 25), + (619, 2, 12), + (818, 3, 28), + (854, 1, 28), + (817, 3, 24), + (718, 5, 18), + (717, 5, 37), + (716, 5, 32), + (715, 5, 21), + (714, 5, 20), + (713, 5, 19), + (712, 5, 27), + (711, 5, 26), + (710, 5, 24), + (709, 5, 23), + (708, 5, 22), + (707, 5, 16), + (706, 5, 15), + (705, 5, 14), + (816, 3, 23), + (609, 6, 35), + (608, 6, 32), + (607, 6, 21), + (606, 6, 20), + (605, 6, 19), + (604, 6, 24), + (603, 6, 23), + (602, 6, 14), + (601, 6, 12), + (600, 6, 11), + (815, 3, 22), + (814, 3, 16), + (853, 1, 24), + (704, 5, 13), + (703, 5, 12), + (852, 1, 23), + (587, 4, 11), + (618, 2, 11), + (702, 5, 11), + (612, 7, 19), + (851, 1, 22), + (813, 3, 15), + (812, 3, 14), + (598, 4, 18), + (599, 4, 4), + (610, 6, 18), + (611, 6, 4), + (613, 7, 20), + (614, 7, 21), + (615, 7, 32), + (616, 7, 35), + (617, 7, 4), + (633, 2, 4), + (811, 3, 13), + (810, 3, 12), + (850, 1, 16), + (849, 1, 15), + (848, 1, 14), + (847, 1, 13), + (846, 1, 12), + (719, 5, 4), + (720, 8, 11), + (721, 8, 12), + (722, 8, 13), + (723, 8, 14), + (724, 8, 15), + (725, 8, 16), + (726, 8, 22), + (727, 8, 23), + (728, 8, 24), + (729, 8, 25), + (730, 8, 26), + (731, 8, 27), + (732, 8, 19), + (733, 8, 20), + (734, 8, 21), + (735, 8, 37), + (736, 8, 4), + (737, 9, 29), + (738, 9, 4), + (809, 3, 11), + (845, 1, 11), + (844, 3, 38), + (880, 1, 38), + (909, 10, 18), + (908, 10, 29), + (907, 10, 37), + (906, 10, 36), + (905, 10, 35), + (904, 10, 32), + (903, 10, 34), + (902, 10, 33), + (901, 10, 21), + (900, 10, 20), + (899, 10, 19), + (898, 10, 23), + (897, 10, 13), + (910, 10, 30), + (965, 11, 29), + (964, 11, 37), + (963, 11, 32), + (962, 11, 34), + (961, 11, 33), + (960, 11, 21), + (959, 11, 20), + (958, 11, 19); + + CREATE TABLE IF NOT EXISTS `neltool_group_domains` ( + `group_domain_id` int(11) NOT NULL AUTO_INCREMENT, + `group_domain_group_id` int(11) NOT NULL DEFAULT '0', + `group_domain_domain_id` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`group_domain_id`), + KEY `group_domain_group_id` (`group_domain_group_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=90 ; + + INSERT INTO `neltool_group_domains` (`group_domain_id`, `group_domain_group_id`, `group_domain_domain_id`) VALUES + (79, 1, 9), + (84, 3, 3), + (78, 1, 8), + (43, 2, 1), + (20, 4, 4), + (80, 1, 1), + (77, 1, 3), + (40, 5, 4), + (21, 4, 1), + (22, 6, 1), + (42, 2, 4), + (76, 1, 12), + (83, 3, 12), + (75, 1, 2), + (41, 5, 8), + (44, 2, 8), + (82, 3, 2), + (74, 1, 4), + (73, 9, 9), + (81, 3, 4), + (85, 3, 8), + (86, 3, 9), + (87, 3, 1), + (88, 10, 12), + (89, 11, 12); + + CREATE TABLE IF NOT EXISTS `neltool_group_shards` ( + `group_shard_id` int(11) NOT NULL AUTO_INCREMENT, + `group_shard_group_id` int(11) NOT NULL DEFAULT '0', + `group_shard_shard_id` int(11) NOT NULL DEFAULT '0', + `group_shard_domain_id` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`group_shard_id`), + KEY `group_shard_group_id` (`group_shard_group_id`), + KEY `group_shard_domain_id` (`group_shard_domain_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1522 ; + + INSERT INTO `neltool_group_shards` (`group_shard_id`, `group_shard_group_id`, `group_shard_shard_id`, `group_shard_domain_id`) VALUES + (1513, 3, 43, 1), + (1473, 1, 42, 1), + (1472, 1, 2, 1), + (1471, 1, 3, 1), + (1470, 1, 1, 1), + (1512, 3, 46, 1), + (1511, 3, 45, 1), + (1510, 3, 6, 1), + (1509, 3, 5, 1), + (1508, 3, 58, 9), + (1507, 3, 102, 9), + (1506, 3, 103, 9), + (841, 2, 37, 8), + (840, 2, 36, 8), + (839, 2, 31, 8), + (838, 2, 47, 8), + (837, 2, 32, 8), + (836, 2, 30, 8), + (1469, 1, 44, 1), + (1468, 1, 43, 1), + (1467, 1, 46, 1), + (1466, 1, 45, 1), + (1465, 1, 6, 1), + (1464, 1, 5, 1), + (1463, 1, 58, 9), + (1505, 3, 104, 9), + (1504, 3, 57, 9), + (1488, 3, 10, 2), + (1487, 3, 14, 2), + (1493, 3, 54, 3), + (1486, 3, 8, 2), + (1485, 3, 13, 2), + (1503, 3, 56, 9), + (1502, 3, 40, 8), + (1501, 3, 37, 8), + (1500, 3, 36, 8), + (1499, 3, 31, 8), + (1498, 3, 47, 8), + (1497, 3, 32, 8), + (1496, 3, 30, 8), + (1462, 1, 102, 9), + (1461, 1, 103, 9), + (1492, 3, 53, 3), + (1460, 1, 104, 9), + (1459, 1, 57, 9), + (1458, 1, 56, 9), + (1457, 1, 40, 8), + (903, 5, 37, 8), + (902, 5, 36, 8), + (901, 5, 31, 8), + (900, 5, 47, 8), + (899, 5, 32, 8), + (898, 5, 30, 8), + (897, 5, 39, 8), + (1456, 1, 37, 8), + (652, 4, 26, 4), + (651, 4, 20, 4), + (650, 4, 19, 4), + (1491, 3, 15, 3), + (1455, 1, 36, 8), + (896, 5, 41, 8), + (1490, 3, 106, 12), + (1454, 1, 31, 8), + (895, 5, 18, 4), + (894, 5, 26, 4), + (893, 5, 20, 4), + (646, 4, 23, 4), + (645, 4, 22, 4), + (644, 4, 21, 4), + (835, 2, 39, 8), + (834, 2, 41, 8), + (833, 2, 4, 1), + (832, 2, 44, 1), + (831, 2, 43, 1), + (830, 2, 42, 1), + (829, 2, 2, 1), + (828, 2, 46, 1), + (827, 2, 45, 1), + (826, 2, 3, 1), + (825, 2, 1, 1), + (824, 2, 6, 1), + (892, 5, 19, 4), + (1495, 3, 39, 8), + (1484, 3, 7, 2), + (891, 5, 24, 4), + (1489, 3, 107, 12), + (1483, 3, 18, 4), + (1482, 3, 26, 4), + (1481, 3, 20, 4), + (1480, 3, 19, 4), + (1479, 3, 24, 4), + (1453, 1, 47, 8), + (1452, 1, 32, 8), + (1474, 1, 4, 1), + (887, 5, 23, 4), + (886, 5, 22, 4), + (1451, 1, 30, 8), + (1450, 1, 39, 8), + (1449, 1, 41, 8), + (1448, 1, 54, 3), + (1447, 1, 53, 3), + (885, 5, 21, 4), + (904, 5, 40, 8), + (884, 5, 17, 4), + (823, 2, 5, 1), + (822, 2, 18, 4), + (821, 2, 26, 4), + (820, 2, 20, 4), + (819, 2, 19, 4), + (818, 2, 24, 4), + (1446, 1, 15, 3), + (1385, 9, 58, 9), + (1445, 1, 106, 12), + (1444, 1, 107, 12), + (1443, 1, 10, 2), + (1478, 3, 23, 4), + (1477, 3, 22, 4), + (1494, 3, 41, 8), + (814, 2, 23, 4), + (813, 2, 22, 4), + (812, 2, 21, 4), + (653, 4, 42, 1), + (654, 4, 43, 1), + (655, 4, 44, 1), + (1384, 9, 102, 9), + (842, 2, 40, 8), + (1383, 9, 103, 9), + (1382, 9, 104, 9), + (811, 2, 17, 4), + (1381, 9, 57, 9), + (1442, 1, 14, 2), + (1476, 3, 21, 4), + (1441, 1, 8, 2), + (1440, 1, 13, 2), + (1380, 9, 56, 9), + (1439, 1, 7, 2), + (1438, 1, 18, 4), + (1437, 1, 26, 4), + (1436, 1, 20, 4), + (1435, 1, 19, 4), + (1434, 1, 24, 4), + (1433, 1, 23, 4), + (1432, 1, 22, 4), + (1431, 1, 21, 4), + (1430, 1, 17, 4), + (1475, 3, 17, 4), + (1514, 3, 44, 1), + (1515, 3, 1, 1), + (1516, 3, 3, 1), + (1517, 3, 2, 1), + (1518, 3, 42, 1), + (1519, 3, 4, 1), + (1520, 10, 106, 12), + (1521, 11, 106, 12); + + CREATE TABLE IF NOT EXISTS `neltool_locks` ( + `lock_id` int(11) NOT NULL AUTO_INCREMENT, + `lock_domain_id` int(11) DEFAULT NULL, + `lock_shard_id` int(11) DEFAULT NULL, + `lock_user_name` varchar(32) NOT NULL DEFAULT '', + `lock_date` int(11) NOT NULL DEFAULT '0', + `lock_update` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`lock_id`), + UNIQUE KEY `lock_shard_id` (`lock_shard_id`), + UNIQUE KEY `lock_domain_id` (`lock_domain_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; + + CREATE TABLE IF NOT EXISTS `neltool_logs` ( + `logs_id` int(11) NOT NULL AUTO_INCREMENT, + `logs_user_name` varchar(32) NOT NULL DEFAULT '0', + `logs_date` int(11) NOT NULL DEFAULT '0', + `logs_data` varchar(255) NOT NULL DEFAULT '', + PRIMARY KEY (`logs_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; + + CREATE TABLE IF NOT EXISTS `neltool_notes` ( + `note_id` int(11) NOT NULL AUTO_INCREMENT, + `note_user_id` int(11) NOT NULL DEFAULT '0', + `note_title` varchar(128) NOT NULL DEFAULT '', + `note_data` text NOT NULL, + `note_date` int(11) NOT NULL DEFAULT '0', + `note_active` int(11) NOT NULL DEFAULT '0', + `note_global` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`note_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=11 ; + + INSERT INTO `neltool_notes` (`note_id`, `note_user_id`, `note_title`, `note_data`, `note_date`, `note_active`, `note_global`) VALUES + (2, 27, 'Welcome', 'Welcome to the shard administration website!\r\n\r\nThis website is used to monitor and restart shards.\r\n\r\nIt also gives some player characters informations.', 1272378065, 1, 1), + (3, 27, 'Shard Start', '# At the same time : NS and TS\r\n[1 min] : all MS, you can boot them all at the same time\r\n[1 min] : IOS\r\n[3 mins] : GMPS\r\n[3 mins] : EGS\r\n[5 mins] : AI Fyros\r\n[1 min 30] : AI Zorai\r\n[1 min 30] : AI Matis\r\n[1 min 30] : AI TNP\r\n[1 min 30] : AI NPE\r\n[1 min 30] : AI Tryker\r\n[1 min 30] : All FS and SBS at the same time\r\n[30 secs] : WS (atm the WS starts in OPEN mode by default, so be fast before CSR checkage, fix for that inc soon)\r\n\r\nNOTE: you can check the uptime for those timers in the right column of the admin tool: UpTime\r\n', 1158751126, 1, 0), + (5, 27, 'shutting supplementary', 'the writing wont change when lock the ws\r\n\r\nuntick previous boxes as you shut down\r\n\r\nwait 5 between the ws and the egs ie egs is 5 past rest is 10 past', 1153395380, 1, 0), + (4, 27, 'Shard Stop', '1. Broadcast to warn players\r\n\r\n2. 10 mins before shutdown, lock the WS\r\n\r\n3. At the right time shut down WS\r\n\r\n4. Shut down EGS\r\nOnly the EGS. Wait 5 reals minutes. Goal is to give enough time to egs, in order to save all the info he has to, and letting him sending those message to all services who need it.\r\n\r\n5. Shut down the rest, et voilà, you're done.', 1153314198, 1, 0), + (6, 27, 'Start (EGS to high?)', 'If [EGS] is to high on startup:\r\n\r\n[shut down egs]\r\n[5 mins]\r\n\r\n[IOS] & [GPMS] (shut down at same time)\r\n\r\nAfter the services are down follow "UP" process with timers again.\r\n\r\nIOS\r\n[3 mins]\r\nGPMS\r\n[3 mins]\r\nEGS\r\n[5 mins]\r\nbla bla...', 1153395097, 1, 0), + (7, 27, 'opening if the egs is too high on reboot', '<kadael> here my note on admin about egs to high on startup\r\n<kadael> ---\r\n<kadael> If [EGS] is to high on startup:\r\n<kadael> [shut down egs]\r\n<kadael> [5 mins]\r\n<kadael> [IOS] & [GPMS] (at same time shut down )\r\n<kadael> after the services are down follow "UP" process with timers again.\r\n<kadael> IOS\r\n<kadael> [3 mins]\r\n<kadael> GPMS\r\n<kadael> [3 mins]\r\n<kadael> EGS\r\n<kadael> [5 mins]\r\n<kadael> bla bla...\r\n<kadael> ---', 1153395362, 1, 0), + (10, 27, 'Ring points', 'Commande pour donner tout les points ring à tout le monde :\r\n\r\nDans le DSS d'un Shard Ring entrer : DefaultCharRingAccess f7:j7:l6:d7:p13:g9:a9', 1155722296, 1, 0), + (9, 27, 'Start (EGS to high?)', 'If [EGS] is to high on startup: \r\n \r\n [shut down egs] \r\n [5 mins] \r\n \r\n [IOS] & [GPMS] (shut down at same time) \r\n \r\n After the services are down follow "UP" process with timers again. \r\n \r\n IOS \r\n [3 mins] \r\n GPMS \r\n [3 mins] \r\n EGS \r\n [5 mins] \r\n bla bla...', 1153929658, 1, 0); + + CREATE TABLE IF NOT EXISTS `neltool_restart_groups` ( + `restart_group_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `restart_group_name` varchar(50) DEFAULT NULL, + `restart_group_list` varchar(50) DEFAULT NULL, + `restart_group_order` varchar(50) DEFAULT NULL, + PRIMARY KEY (`restart_group_id`), + UNIQUE KEY `restart_group_id` (`restart_group_id`), + KEY `restart_group_id_2` (`restart_group_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=6 ; + + INSERT INTO `neltool_restart_groups` (`restart_group_id`, `restart_group_name`, `restart_group_list`, `restart_group_order`) VALUES + (1, 'Low Level', 'rns,ts,ms', '1'), + (3, 'Mid Level', 'ios,gpms,egs', '2'), + (4, 'High Level', 'ais', '3'), + (5, 'Front Level', 'fes,sbs,dss,rws', '4'); + + CREATE TABLE IF NOT EXISTS `neltool_restart_messages` ( + `restart_message_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `restart_message_name` varchar(20) DEFAULT NULL, + `restart_message_value` varchar(128) DEFAULT NULL, + `restart_message_lang` varchar(5) DEFAULT NULL, + PRIMARY KEY (`restart_message_id`), + UNIQUE KEY `restart_message_id` (`restart_message_id`), + KEY `restart_message_id_2` (`restart_message_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=11 ; + + INSERT INTO `neltool_restart_messages` (`restart_message_id`, `restart_message_name`, `restart_message_value`, `restart_message_lang`) VALUES + (5, 'reboot', 'The shard is about to go down. Please find a safe location and log out.', 'en'), + (4, 'reboot', 'Le serveur va redemarrer dans minutes. Merci de vous deconnecter en lieu sur.', 'fr'), + (6, 'reboot', 'Der Server wird heruntergefahren. Findet eine sichere Stelle und logt aus.', 'de'), + (10, 'reboot', 'Arret du serveur dans minutes', 'fr'); + + CREATE TABLE IF NOT EXISTS `neltool_restart_sequences` ( + `restart_sequence_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `restart_sequence_domain_id` int(10) unsigned NOT NULL DEFAULT '0', + `restart_sequence_shard_id` int(10) unsigned NOT NULL DEFAULT '0', + `restart_sequence_user_name` varchar(50) DEFAULT NULL, + `restart_sequence_step` int(10) unsigned NOT NULL DEFAULT '0', + `restart_sequence_date_start` int(11) DEFAULT NULL, + `restart_sequence_date_end` int(11) DEFAULT NULL, + `restart_sequence_timer` int(11) unsigned DEFAULT '0', + PRIMARY KEY (`restart_sequence_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; + + CREATE TABLE IF NOT EXISTS `neltool_shards` ( + `shard_id` int(11) NOT NULL AUTO_INCREMENT, + `shard_name` varchar(128) NOT NULL DEFAULT '', + `shard_as_id` varchar(255) NOT NULL DEFAULT '0', + `shard_domain_id` int(11) NOT NULL DEFAULT '0', + `shard_lang` char(2) NOT NULL DEFAULT 'en', + `shard_restart` int(10) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`shard_id`), + KEY `shard_domain_id` (`shard_domain_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=107 ; + + INSERT INTO `neltool_shards` (`shard_id`, `shard_name`, `shard_as_id`, `shard_domain_id`, `shard_lang`, `shard_restart`) VALUES + (106, 'Open', 'open', 12, 'en', 0); + + CREATE TABLE IF NOT EXISTS `neltool_stats_hd_datas` ( + `hd_id` int(11) NOT NULL AUTO_INCREMENT, + `hd_domain_id` int(11) NOT NULL DEFAULT '0', + `hd_server` varchar(32) NOT NULL DEFAULT '', + `hd_device` varchar(64) NOT NULL DEFAULT '', + `hd_size` varchar(16) NOT NULL DEFAULT '', + `hd_used` varchar(16) NOT NULL DEFAULT '', + `hd_free` varchar(16) NOT NULL DEFAULT '', + `hd_percent` int(11) NOT NULL DEFAULT '0', + `hd_mount` varchar(128) NOT NULL DEFAULT '', + PRIMARY KEY (`hd_id`), + KEY `hd_domain_id` (`hd_domain_id`), + KEY `hd_server` (`hd_server`) + ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; + + CREATE TABLE IF NOT EXISTS `neltool_stats_hd_times` ( + `hd_domain_id` int(11) NOT NULL DEFAULT '0', + `hd_last_time` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`hd_domain_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=latin1; + + CREATE TABLE IF NOT EXISTS `neltool_users` ( + `user_id` int(11) NOT NULL AUTO_INCREMENT, + `user_name` varchar(32) NOT NULL DEFAULT '', + `user_password` varchar(64) NOT NULL DEFAULT '', + `user_group_id` int(11) NOT NULL DEFAULT '0', + `user_created` int(11) NOT NULL DEFAULT '0', + `user_active` int(11) NOT NULL DEFAULT '0', + `user_logged_last` int(11) NOT NULL DEFAULT '0', + `user_logged_count` int(11) NOT NULL DEFAULT '0', + `user_menu_style` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`user_id`), + UNIQUE KEY `user_login` (`user_name`), + KEY `user_group_id` (`user_group_id`), + KEY `user_active` (`user_active`) + ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=33 ; + + INSERT INTO `neltool_users` (`user_id`, `user_name`, `user_password`, `user_group_id`, `user_created`, `user_active`, `user_logged_last`, `user_logged_count`, `user_menu_style`) VALUES + (27, 'admin', '084e0343a0486ff05530df6c705c8bb4', 1, 1213886454, 1, 1273158945, 382, 2), + (32, 'guest', '084e0343a0486ff05530df6c705c8bb4', 1, 1272379014, 1, 1277452380, 274, 2); + + CREATE TABLE IF NOT EXISTS `neltool_user_applications` ( + `user_application_id` int(11) NOT NULL AUTO_INCREMENT, + `user_application_user_id` int(11) NOT NULL DEFAULT '0', + `user_application_application_id` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`user_application_id`), + KEY `user_application_user_id` (`user_application_user_id`), + KEY `user_application_application_id` (`user_application_application_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=22 ; + + INSERT INTO `neltool_user_applications` (`user_application_id`, `user_application_user_id`, `user_application_application_id`) VALUES + (8, 12, 33), + (20, 6, 31), + (19, 6, 34), + (9, 12, 31), + (21, 10, 34); + + CREATE TABLE IF NOT EXISTS `neltool_user_domains` ( + `user_domain_id` int(11) NOT NULL AUTO_INCREMENT, + `user_domain_user_id` int(11) NOT NULL DEFAULT '0', + `user_domain_domain_id` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`user_domain_id`), + KEY `user_domain_user_id` (`user_domain_user_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=20 ; + + INSERT INTO `neltool_user_domains` (`user_domain_id`, `user_domain_user_id`, `user_domain_domain_id`) VALUES + (5, 6, 2), + (9, 22, 1), + (10, 23, 4), + (4, 12, 3), + (6, 6, 3), + (11, 23, 2), + (12, 23, 1), + (13, 23, 8), + (18, 15, 1), + (17, 15, 2), + (19, 31, 9); + + CREATE TABLE IF NOT EXISTS `neltool_user_shards` ( + `user_shard_id` int(11) NOT NULL AUTO_INCREMENT, + `user_shard_user_id` int(11) NOT NULL DEFAULT '0', + `user_shard_shard_id` int(11) NOT NULL DEFAULT '0', + `user_shard_domain_id` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`user_shard_id`), + KEY `user_shard_user_id` (`user_shard_user_id`), + KEY `user_shard_domain_id` (`user_shard_domain_id`) + ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=166 ; + + INSERT INTO `neltool_user_shards` (`user_shard_id`, `user_shard_user_id`, `user_shard_shard_id`, `user_shard_domain_id`) VALUES + (1, 8, 1, 1), + (2, 9, 2, 1), + (68, 7, 3, 1), + (143, 6, 4, 1), + (142, 6, 2, 1), + (141, 6, 45, 1), + (140, 6, 3, 1), + (90, 23, 26, 4), + (89, 23, 20, 4), + (13, 14, 1, 1), + (14, 14, 3, 1), + (15, 14, 2, 1), + (139, 6, 1, 1), + (74, 17, 2, 1), + (73, 17, 45, 1), + (72, 17, 3, 1), + (71, 17, 1, 1), + (70, 17, 18, 4), + (88, 23, 19, 4), + (87, 23, 24, 4), + (83, 23, 23, 4), + (82, 23, 22, 4), + (81, 23, 21, 4), + (34, 12, 15, 3), + (36, 18, 2, 1), + (138, 6, 7, 2), + (80, 23, 17, 4), + (79, 22, 45, 1), + (78, 22, 3, 1), + (77, 21, 45, 1), + (76, 21, 3, 1), + (75, 17, 4, 1), + (69, 7, 45, 1), + (146, 6, 54, 3), + (91, 23, 18, 4), + (92, 23, 7, 2), + (93, 23, 13, 2), + (94, 23, 8, 2), + (95, 23, 14, 2), + (145, 6, 53, 3), + (97, 23, 10, 2), + (144, 6, 15, 3), + (99, 23, 5, 1), + (100, 23, 6, 1), + (101, 23, 1, 1), + (102, 23, 3, 1), + (103, 23, 45, 1), + (104, 23, 46, 1), + (105, 23, 2, 1), + (106, 23, 42, 1), + (107, 23, 43, 1), + (108, 23, 44, 1), + (109, 23, 4, 1), + (110, 23, 41, 8), + (111, 23, 39, 8), + (112, 23, 30, 8), + (113, 23, 32, 8), + (114, 23, 47, 8), + (115, 23, 31, 8), + (116, 23, 36, 8), + (117, 23, 37, 8), + (118, 23, 40, 8), + (156, 15, 45, 1), + (155, 15, 3, 1), + (154, 15, 1, 1), + (153, 15, 6, 1), + (152, 15, 5, 1), + (151, 15, 10, 2), + (150, 15, 14, 2), + (149, 15, 8, 2), + (148, 15, 13, 2), + (147, 15, 7, 2), + (157, 15, 46, 1), + (158, 15, 2, 1), + (159, 15, 42, 1), + (160, 15, 43, 1), + (161, 15, 44, 1), + (162, 15, 4, 1), + (163, 31, 57, 9), + (164, 31, 104, 9), + (165, 31, 103, 9); + + GRANT ALL ON `" . $cfg['db']['tool']['name'] ."`.* TO `" . $cfg['db']['tool']['user'] ."`@localhost; + "; + $dbn->executeWithoutParams($sql); + print "The nel_tool database was correctly installed!
"; + //Now create an admin account! $hashpass = crypt("admin", Users::generateSALT()); diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/forgot_password.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/forgot_password.tpl index 9b080d42a..4ae0e60d9 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/forgot_password.tpl +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/forgot_password.tpl @@ -3,7 +3,7 @@
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/install.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/install.tpl index 46d2996d5..816a42774 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/install.tpl +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/install.tpl @@ -3,7 +3,7 @@
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/login.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/login.tpl index d003906c5..26c992d50 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/login.tpl +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/login.tpl @@ -3,7 +3,7 @@
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/logout.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/logout.tpl index a238c4606..9c6ed77e4 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/logout.tpl +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/logout.tpl @@ -3,7 +3,7 @@
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/register.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/register.tpl index 5f820e5fa..3a0a29e8a 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/register.tpl +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/register.tpl @@ -3,7 +3,7 @@
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/register_feedback.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/register_feedback.tpl index 90c40b232..dddba2264 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/register_feedback.tpl +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/register_feedback.tpl @@ -3,7 +3,7 @@
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/reset_password.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/reset_password.tpl index 6dfda9253..40ec3006d 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/reset_password.tpl +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/reset_password.tpl @@ -3,7 +3,7 @@
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/reset_success.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/reset_success.tpl index fed77e893..577c329bd 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/reset_success.tpl +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/reset_success.tpl @@ -3,7 +3,7 @@