diff --git a/upload/engine/core.class.php b/upload/engine/core.class.php index f7dbfea..1ee24dc 100644 --- a/upload/engine/core.class.php +++ b/upload/engine/core.class.php @@ -32,7 +32,7 @@ if(!file_exists(MCR_LANG_PATH.$this->config->main['s_lang'].'/system.php')){ exit("Language path not found"); } // Load language package - require_once(MCR_LANG_PATH.$this->config->main['s_lang'].'/system.php'); + require(MCR_LANG_PATH.$this->config->main['s_lang'].'/system.php'); // Set language var $this->lng = $lng; @@ -444,7 +444,7 @@ return $module->content(); } - private function load_language($mod){ + public function load_language($mod){ if(!file_exists(MCR_LANG_DIR.$mod.'.php')){ return array(); } diff --git a/upload/engine/monitoring/McAPIcaPing.php b/upload/engine/monitoring/McAPIcaPing.php index 4ed1436..72de8aa 100644 --- a/upload/engine/monitoring/McAPIcaPing.php +++ b/upload/engine/monitoring/McAPIcaPing.php @@ -21,6 +21,9 @@ public $error = ''; public function connect($ip='127.0.0.1', $port=25565){ + $this->status = $this->online = $this->slots = 0; + $this->version = $this->players = $this->motd = $this->plugins = $this->map = $this->error = ''; + $this->ip = $ip; $this->port = $port; diff --git a/upload/engine/monitoring/McAPIcaQuery.php b/upload/engine/monitoring/McAPIcaQuery.php index 765e4d2..5dc97da 100644 --- a/upload/engine/monitoring/McAPIcaQuery.php +++ b/upload/engine/monitoring/McAPIcaQuery.php @@ -21,6 +21,9 @@ public $error = ''; public function connect($ip='127.0.0.1', $port=25565){ + $this->status = $this->online = $this->slots = 0; + $this->version = $this->players = $this->motd = $this->plugins = $this->map = $this->error = ''; + $this->ip = $ip; $this->port = $port; diff --git a/upload/engine/monitoring/McAPIusPing.php b/upload/engine/monitoring/McAPIusPing.php index 2af9439..800c22f 100644 --- a/upload/engine/monitoring/McAPIusPing.php +++ b/upload/engine/monitoring/McAPIusPing.php @@ -21,6 +21,9 @@ public $error = ''; public function connect($ip='127.0.0.1', $port=25565){ + $this->status = $this->online = $this->slots = 0; + $this->version = $this->players = $this->motd = $this->plugins = $this->map = $this->error = ''; + $this->ip = $ip; $this->port = $port; diff --git a/upload/engine/monitoring/MineToolsAPIPing.php b/upload/engine/monitoring/MineToolsAPIPing.php index e149656..c2163bc 100644 --- a/upload/engine/monitoring/MineToolsAPIPing.php +++ b/upload/engine/monitoring/MineToolsAPIPing.php @@ -19,6 +19,8 @@ public $error = ''; public function connect($ip='127.0.0.1', $port=25565){ + $this->status = $this->online = $this->slots = 0; + $this->version = $this->players = $this->motd = $this->plugins = $this->map = $this->error = ''; $this->ip = $ip; $this->port = $port; diff --git a/upload/engine/monitoring/MineToolsAPIQuery.php b/upload/engine/monitoring/MineToolsAPIQuery.php index 453a322..2a10f93 100644 --- a/upload/engine/monitoring/MineToolsAPIQuery.php +++ b/upload/engine/monitoring/MineToolsAPIQuery.php @@ -19,6 +19,9 @@ public $error = ''; public function connect($ip='127.0.0.1', $port=25565){ + $this->status = $this->online = $this->slots = 0; + $this->version = $this->players = $this->motd = $this->plugins = $this->map = $this->error = ''; + $this->ip = $ip; $this->port = $port; diff --git a/upload/install/tables.sql b/upload/install/tables.sql index 768932a..2534f7e 100644 --- a/upload/install/tables.sql +++ b/upload/install/tables.sql @@ -1,63 +1,67 @@ CREATE TABLE IF NOT EXISTS `mcr_comments` ( `id` int(10) NOT NULL AUTO_INCREMENT, - `nid` int(10) NOT NULL, + `nid` int(10) NOT NULL DEFAULT '0', `text_html` text NOT NULL, `text_bb` text NOT NULL, - `uid` int(10) NOT NULL, + `uid` int(10) NOT NULL DEFAULT '0', `data` text NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; + PRIMARY KEY (`id`), + KEY `nid` (`nid`), + KEY `uid` (`uid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; #line CREATE TABLE IF NOT EXISTS `mcr_files` ( `id` int(10) NOT NULL AUTO_INCREMENT, - `uniq` varchar(64) CHARACTER SET latin1 NOT NULL, - `name` varchar(255) CHARACTER SET latin1 NOT NULL, - `oldname` varchar(255) NOT NULL, - `uid` int(10) NOT NULL, + `uniq` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '', + `name` varchar(255) CHARACTER SET latin1 NOT NULL DEFAULT '', + `oldname` varchar(255) NOT NULL DEFAULT '', + `uid` int(10) NOT NULL DEFAULT '0', `data` text NOT NULL, PRIMARY KEY (`id`), - UNIQUE KEY `uniq` (`uniq`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; + UNIQUE KEY `uniq` (`uniq`), + KEY `uid` (`uid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; #line CREATE TABLE IF NOT EXISTS `mcr_groups` ( `id` int(10) NOT NULL AUTO_INCREMENT, - `title` varchar(32) NOT NULL, - `description` varchar(255) NOT NULL, - `color` varchar(24) NOT NULL, + `title` varchar(32) NOT NULL DEFAULT '', + `description` varchar(255) NOT NULL DEFAULT '', + `color` varchar(24) NOT NULL DEFAULT '', `permissions` text NOT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=4 ; #line -INSERT INTO `mcr_groups` (`id`, `title`, `description`, `permissions`) VALUES -(0, 'Заблокированный', 'Группа заблокированных пользователей', '{"sys_debug":false,"sys_max_file_size":0,"sys_max_ratio":0,"sys_monitoring":true,"sys_share":true,"sys_search":true,"sys_restore":true,"sys_register":true,"sys_profile":true,"sys_profile_del_skin":false,"sys_profile_del_cloak":false,"sys_profile_skin":false,"sys_profile_cloak":false,"sys_profile_settings":false,"sys_news_list":true,"sys_news_full":true,"sys_comment_list":false,"sys_comment_add":false,"sys_comment_edt":false,"sys_comment_edt_all":false,"sys_comment_del":false,"sys_comment_del_all":false,"sys_auth":false,"sys_adm_main":false,"sys_adm_news":false,"sys_adm_news_cats":false,"sys_adm_news_views":false,"sys_adm_news_votes":false,"sys_adm_comments":false,"sys_adm_menu":false,"sys_adm_menu_adm":false,"sys_adm_menu_groups":false,"sys_adm_menu_icons":false,"sys_adm_users":false,"sys_adm_groups":false,"sys_adm_permissions":false,"sys_adm_statics":false,"sys_adm_info":false,"sys_adm_settings":false,"sys_adm_monitoring":false,"sys_adm_modules":false,"sys_search_news":false,"sys_search_comments":false,"sys_news_like":false,"sys_adm_m_g_main":false,"sys_adm_m_g_news":false,"sys_adm_m_g_users":false,"sys_adm_m_g_menu":false,"sys_adm_m_g_settings":false,"sys_adm_m_i_news":false,"sys_adm_m_i_news_cats":false,"sys_adm_m_i_comments":false,"sys_adm_m_i_news_views":false,"sys_adm_m_i_news_votes":false,"sys_adm_m_i_users":false,"sys_adm_m_i_groups":false,"sys_adm_m_i_permissions":false,"sys_adm_m_i_menu":false,"sys_adm_m_i_menu_adm":false,"sys_adm_m_i_menu_groups_adm":false,"sys_adm_m_i_icons":false,"sys_adm_m_i_statics":false,"sys_adm_m_i_settings":false,"sys_adm_m_i_monitor":false,"sys_adm_m_i_info":false,"sys_adm_m_i_modules":false,"sys_adm_m_i_logs":false,"sys_adm_manager":false,"sys_adm_logs":false,"sys_adm_permissions_add":false,"sys_adm_permissions_edit":false,"sys_adm_permissions_delete":false,"sys_adm_comments_add":false,"sys_adm_comments_edit":false,"sys_adm_comments_delete":false,"sys_adm_groups_add":false,"sys_adm_groups_edit":false,"sys_adm_groups_delete":false,"sys_adm_menu_add":false,"sys_adm_menu_edit":false,"sys_adm_menu_delete":false,"sys_adm_menu_adm_add":false,"sys_adm_menu_adm_edit":false,"sys_adm_menu_adm_delete":false,"sys_adm_menu_groups_add":false,"sys_adm_menu_groups_edit":false,"sys_adm_menu_groups_delete":false,"sys_adm_menu_icons_add":false,"sys_adm_menu_icons_edit":false,"sys_adm_menu_icons_delete":false,"sys_adm_monitoring_add":false,"sys_adm_monitoring_edit":false,"sys_adm_monitoring_delete":false,"sys_adm_news_add":false,"sys_adm_news_edit":false,"sys_adm_news_delete":false,"sys_adm_news_cats_add":false,"sys_adm_news_cats_edit":false,"sys_adm_news_cats_delete":false,"sys_adm_statics_add":false,"sys_adm_statics_edit":false,"sys_adm_statics_delete":false,"sys_adm_users_add":false,"sys_adm_users_edit":false,"sys_adm_users_delete":false,"sys_adm_users_ban":false,"sys_adm_modules_edit":false,"sys_adm_news_views_delete":false,"sys_adm_news_votes_delete":false}'), -(1, 'Непроверенный', 'Группа непроверенных пользователей', '{"sys_debug":false,"sys_max_file_size":1024,"sys_max_ratio":0,"sys_monitoring":true,"sys_share":true,"sys_search":true,"sys_restore":true,"sys_register":true,"sys_profile":true,"sys_profile_del_skin":false,"sys_profile_del_cloak":false,"sys_profile_skin":false,"sys_profile_cloak":false,"sys_profile_settings":false,"sys_news_list":true,"sys_news_full":true,"sys_comment_list":true,"sys_comment_add":false,"sys_comment_edt":false,"sys_comment_edt_all":false,"sys_comment_del":false,"sys_comment_del_all":false,"sys_auth":true,"sys_adm_main":false,"sys_adm_news":false,"sys_adm_news_cats":false,"sys_adm_news_views":false,"sys_adm_news_votes":false,"sys_adm_comments":false,"sys_adm_menu":false,"sys_adm_menu_adm":false,"sys_adm_menu_groups":false,"sys_adm_menu_icons":false,"sys_adm_users":false,"sys_adm_groups":false,"sys_adm_permissions":false,"sys_adm_statics":false,"sys_adm_info":false,"sys_adm_settings":false,"sys_adm_monitoring":false,"sys_adm_modules":false,"sys_search_news":true,"sys_search_comments":false,"sys_news_like":false,"sys_adm_m_g_main":false,"sys_adm_m_g_news":false,"sys_adm_m_g_users":false,"sys_adm_m_g_menu":false,"sys_adm_m_g_settings":false,"sys_adm_m_i_news":false,"sys_adm_m_i_news_cats":false,"sys_adm_m_i_comments":false,"sys_adm_m_i_news_views":false,"sys_adm_m_i_news_votes":false,"sys_adm_m_i_users":false,"sys_adm_m_i_groups":false,"sys_adm_m_i_permissions":false,"sys_adm_m_i_menu":false,"sys_adm_m_i_menu_adm":false,"sys_adm_m_i_menu_groups_adm":false,"sys_adm_m_i_icons":false,"sys_adm_m_i_statics":false,"sys_adm_m_i_settings":false,"sys_adm_m_i_monitor":false,"sys_adm_m_i_info":false,"sys_adm_m_i_modules":false,"sys_adm_m_i_logs":false,"sys_adm_manager":false,"sys_adm_logs":false,"sys_adm_permissions_add":false,"sys_adm_permissions_edit":false,"sys_adm_permissions_delete":false,"sys_adm_comments_add":false,"sys_adm_comments_edit":false,"sys_adm_comments_delete":false,"sys_adm_groups_add":false,"sys_adm_groups_edit":false,"sys_adm_groups_delete":false,"sys_adm_menu_add":false,"sys_adm_menu_edit":false,"sys_adm_menu_delete":false,"sys_adm_menu_adm_add":false,"sys_adm_menu_adm_edit":false,"sys_adm_menu_adm_delete":false,"sys_adm_menu_groups_add":false,"sys_adm_menu_groups_edit":false,"sys_adm_menu_groups_delete":false,"sys_adm_menu_icons_add":false,"sys_adm_menu_icons_edit":false,"sys_adm_menu_icons_delete":false,"sys_adm_monitoring_add":false,"sys_adm_monitoring_edit":false,"sys_adm_monitoring_delete":false,"sys_adm_news_add":false,"sys_adm_news_edit":false,"sys_adm_news_delete":false,"sys_adm_news_cats_add":false,"sys_adm_news_cats_edit":false,"sys_adm_news_cats_delete":false,"sys_adm_statics_add":false,"sys_adm_statics_edit":false,"sys_adm_statics_delete":false,"sys_adm_users_add":false,"sys_adm_users_edit":false,"sys_adm_users_delete":false,"sys_adm_users_ban":false,"sys_adm_modules_edit":false,"sys_adm_news_views_delete":false,"sys_adm_news_votes_delete":false}'), -(2, 'Пользователь', 'Зарегистрированные и проверенные пользователи', '{"sys_debug":false,"sys_max_file_size":1024,"sys_max_ratio":1,"sys_monitoring":true,"sys_share":true,"sys_search":true,"sys_restore":true,"sys_register":true,"sys_profile":true,"sys_profile_del_skin":true,"sys_profile_del_cloak":true,"sys_profile_skin":true,"sys_profile_cloak":true,"sys_profile_settings":true,"sys_news_list":true,"sys_news_full":true,"sys_comment_list":true,"sys_comment_add":true,"sys_comment_edt":true,"sys_comment_edt_all":false,"sys_comment_del":false,"sys_comment_del_all":false,"sys_auth":true,"sys_adm_main":false,"sys_adm_news":false,"sys_adm_news_cats":false,"sys_adm_news_views":false,"sys_adm_news_votes":false,"sys_adm_comments":false,"sys_adm_menu":false,"sys_adm_menu_adm":false,"sys_adm_menu_groups":false,"sys_adm_menu_icons":false,"sys_adm_users":false,"sys_adm_groups":false,"sys_adm_permissions":false,"sys_adm_statics":false,"sys_adm_info":false,"sys_adm_settings":false,"sys_adm_monitoring":false,"sys_adm_modules":false,"sys_search_news":true,"sys_search_comments":true,"sys_news_like":true,"sys_adm_m_g_main":false,"sys_adm_m_g_news":false,"sys_adm_m_g_users":false,"sys_adm_m_g_menu":false,"sys_adm_m_g_settings":false,"sys_adm_m_i_news":false,"sys_adm_m_i_news_cats":false,"sys_adm_m_i_comments":false,"sys_adm_m_i_news_views":false,"sys_adm_m_i_news_votes":false,"sys_adm_m_i_users":false,"sys_adm_m_i_groups":false,"sys_adm_m_i_permissions":false,"sys_adm_m_i_menu":false,"sys_adm_m_i_menu_adm":false,"sys_adm_m_i_menu_groups_adm":false,"sys_adm_m_i_icons":false,"sys_adm_m_i_statics":false,"sys_adm_m_i_settings":false,"sys_adm_m_i_monitor":false,"sys_adm_m_i_info":false,"sys_adm_m_i_modules":false,"sys_adm_m_i_logs":false,"sys_adm_manager":false,"sys_adm_logs":false,"sys_adm_permissions_add":false,"sys_adm_permissions_edit":false,"sys_adm_permissions_delete":false,"sys_adm_comments_add":false,"sys_adm_comments_edit":false,"sys_adm_comments_delete":false,"sys_adm_groups_add":false,"sys_adm_groups_edit":false,"sys_adm_groups_delete":false,"sys_adm_menu_add":false,"sys_adm_menu_edit":false,"sys_adm_menu_delete":false,"sys_adm_menu_adm_add":false,"sys_adm_menu_adm_edit":false,"sys_adm_menu_adm_delete":false,"sys_adm_menu_groups_add":false,"sys_adm_menu_groups_edit":false,"sys_adm_menu_groups_delete":false,"sys_adm_menu_icons_add":false,"sys_adm_menu_icons_edit":false,"sys_adm_menu_icons_delete":false,"sys_adm_monitoring_add":false,"sys_adm_monitoring_edit":false,"sys_adm_monitoring_delete":false,"sys_adm_news_add":false,"sys_adm_news_edit":false,"sys_adm_news_delete":false,"sys_adm_news_cats_add":false,"sys_adm_news_cats_edit":false,"sys_adm_news_cats_delete":false,"sys_adm_statics_add":false,"sys_adm_statics_edit":false,"sys_adm_statics_delete":false,"sys_adm_users_add":false,"sys_adm_users_edit":false,"sys_adm_users_delete":false,"sys_adm_users_ban":false,"sys_adm_modules_edit":false,"sys_adm_news_views_delete":false,"sys_adm_news_votes_delete":false}'), -(3, 'Администратор', 'Группа администрации', '{"sys_debug":true,"sys_max_file_size":4096,"sys_max_ratio":32,"sys_monitoring":true,"sys_share":true,"sys_search":true,"sys_restore":true,"sys_register":true,"sys_profile":true,"sys_profile_del_skin":true,"sys_profile_del_cloak":true,"sys_profile_skin":true,"sys_profile_cloak":true,"sys_profile_settings":true,"sys_news_list":true,"sys_news_full":true,"sys_comment_list":true,"sys_comment_add":true,"sys_comment_edt":true,"sys_comment_edt_all":true,"sys_comment_del":true,"sys_comment_del_all":true,"sys_auth":true,"sys_adm_main":true,"sys_adm_news":true,"sys_adm_news_cats":true,"sys_adm_news_views":true,"sys_adm_news_votes":true,"sys_adm_comments":true,"sys_adm_menu":true,"sys_adm_menu_adm":true,"sys_adm_menu_groups":true,"sys_adm_menu_icons":true,"sys_adm_users":true,"sys_adm_groups":true,"sys_adm_permissions":true,"sys_adm_statics":true,"sys_adm_info":true,"sys_adm_settings":true,"sys_adm_monitoring":true,"sys_adm_modules":true,"sys_search_news":true,"sys_search_comments":true,"sys_news_like":true,"sys_adm_m_g_main":true,"sys_adm_m_g_news":true,"sys_adm_m_g_users":true,"sys_adm_m_g_menu":true,"sys_adm_m_g_settings":true,"sys_adm_m_i_news":true,"sys_adm_m_i_news_cats":true,"sys_adm_m_i_comments":true,"sys_adm_m_i_news_views":true,"sys_adm_m_i_news_votes":true,"sys_adm_m_i_users":true,"sys_adm_m_i_groups":true,"sys_adm_m_i_permissions":true,"sys_adm_m_i_menu":true,"sys_adm_m_i_menu_adm":true,"sys_adm_m_i_menu_groups_adm":true,"sys_adm_m_i_icons":true,"sys_adm_m_i_statics":true,"sys_adm_m_i_settings":true,"sys_adm_m_i_monitor":true,"sys_adm_m_i_info":true,"sys_adm_m_i_modules":true,"sys_adm_m_i_logs":true,"sys_adm_manager":true,"sys_adm_logs":true,"sys_adm_permissions_add":true,"sys_adm_permissions_edit":true,"sys_adm_permissions_delete":true,"sys_adm_comments_add":true,"sys_adm_comments_edit":true,"sys_adm_comments_delete":true,"sys_adm_groups_add":true,"sys_adm_groups_edit":true,"sys_adm_groups_delete":true,"sys_adm_menu_add":true,"sys_adm_menu_edit":true,"sys_adm_menu_delete":true,"sys_adm_menu_adm_add":true,"sys_adm_menu_adm_edit":true,"sys_adm_menu_adm_delete":true,"sys_adm_menu_groups_add":true,"sys_adm_menu_groups_edit":true,"sys_adm_menu_groups_delete":true,"sys_adm_menu_icons_add":true,"sys_adm_menu_icons_edit":true,"sys_adm_menu_icons_delete":true,"sys_adm_monitoring_add":true,"sys_adm_monitoring_edit":true,"sys_adm_monitoring_delete":true,"sys_adm_news_add":true,"sys_adm_news_edit":true,"sys_adm_news_delete":true,"sys_adm_news_cats_add":true,"sys_adm_news_cats_edit":true,"sys_adm_news_cats_delete":true,"sys_adm_statics_add":true,"sys_adm_statics_edit":true,"sys_adm_statics_delete":true,"sys_adm_users_add":true,"sys_adm_users_edit":true,"sys_adm_users_delete":true,"sys_adm_users_ban":true,"sys_adm_modules_edit":true,"sys_adm_news_views_delete":true,"sys_adm_news_votes_delete":true}'); +INSERT INTO `mcr_groups` (`id`, `title`, `description`, `color`, `permissions`) VALUES +(0, 'Заблокированный', 'Группа заблокированных пользователей', '', '{"sys_debug":false,"sys_max_file_size":0,"sys_max_ratio":0,"sys_monitoring":true,"sys_share":true,"sys_search":true,"sys_restore":true,"sys_register":true,"sys_profile":true,"sys_profile_del_skin":false,"sys_profile_del_cloak":false,"sys_profile_skin":false,"sys_profile_cloak":false,"sys_profile_settings":false,"sys_news_list":true,"sys_news_full":true,"sys_comment_list":false,"sys_comment_add":false,"sys_comment_edt":false,"sys_comment_edt_all":false,"sys_comment_del":false,"sys_comment_del_all":false,"sys_auth":false,"sys_adm_main":false,"sys_adm_news":false,"sys_adm_news_cats":false,"sys_adm_news_views":false,"sys_adm_news_votes":false,"sys_adm_comments":false,"sys_adm_menu":false,"sys_adm_menu_adm":false,"sys_adm_menu_groups":false,"sys_adm_menu_icons":false,"sys_adm_users":false,"sys_adm_groups":false,"sys_adm_permissions":false,"sys_adm_statics":false,"sys_adm_info":false,"sys_adm_settings":false,"sys_adm_monitoring":false,"sys_adm_modules":false,"sys_search_news":false,"sys_search_comments":false,"sys_news_like":false,"sys_adm_m_g_main":false,"sys_adm_m_g_news":false,"sys_adm_m_g_users":false,"sys_adm_m_g_menu":false,"sys_adm_m_g_settings":false,"sys_adm_m_i_news":false,"sys_adm_m_i_news_cats":false,"sys_adm_m_i_comments":false,"sys_adm_m_i_news_views":false,"sys_adm_m_i_news_votes":false,"sys_adm_m_i_users":false,"sys_adm_m_i_groups":false,"sys_adm_m_i_permissions":false,"sys_adm_m_i_menu":false,"sys_adm_m_i_menu_adm":false,"sys_adm_m_i_menu_groups_adm":false,"sys_adm_m_i_icons":false,"sys_adm_m_i_statics":false,"sys_adm_m_i_settings":false,"sys_adm_m_i_monitor":false,"sys_adm_m_i_info":false,"sys_adm_m_i_modules":false,"sys_adm_m_i_logs":false,"sys_adm_manager":false,"sys_adm_logs":false,"sys_adm_permissions_add":false,"sys_adm_permissions_edit":false,"sys_adm_permissions_delete":false,"sys_adm_comments_add":false,"sys_adm_comments_edit":false,"sys_adm_comments_delete":false,"sys_adm_groups_add":false,"sys_adm_groups_edit":false,"sys_adm_groups_delete":false,"sys_adm_menu_add":false,"sys_adm_menu_edit":false,"sys_adm_menu_delete":false,"sys_adm_menu_adm_add":false,"sys_adm_menu_adm_edit":false,"sys_adm_menu_adm_delete":false,"sys_adm_menu_groups_add":false,"sys_adm_menu_groups_edit":false,"sys_adm_menu_groups_delete":false,"sys_adm_menu_icons_add":false,"sys_adm_menu_icons_edit":false,"sys_adm_menu_icons_delete":false,"sys_adm_monitoring_add":false,"sys_adm_monitoring_edit":false,"sys_adm_monitoring_delete":false,"sys_adm_news_add":false,"sys_adm_news_edit":false,"sys_adm_news_delete":false,"sys_adm_news_cats_add":false,"sys_adm_news_cats_edit":false,"sys_adm_news_cats_delete":false,"sys_adm_statics_add":false,"sys_adm_statics_edit":false,"sys_adm_statics_delete":false,"sys_adm_users_add":false,"sys_adm_users_edit":false,"sys_adm_users_delete":false,"sys_adm_users_ban":false,"sys_adm_modules_edit":false,"sys_adm_news_views_delete":false,"sys_adm_news_votes_delete":false}'), +(1, 'Непроверенный', 'Группа непроверенных пользователей', '', '{"sys_debug":false,"sys_max_file_size":1024,"sys_max_ratio":0,"sys_monitoring":true,"sys_share":true,"sys_search":true,"sys_restore":true,"sys_register":true,"sys_profile":true,"sys_profile_del_skin":false,"sys_profile_del_cloak":false,"sys_profile_skin":false,"sys_profile_cloak":false,"sys_profile_settings":false,"sys_news_list":true,"sys_news_full":true,"sys_comment_list":true,"sys_comment_add":false,"sys_comment_edt":false,"sys_comment_edt_all":false,"sys_comment_del":false,"sys_comment_del_all":false,"sys_auth":true,"sys_adm_main":false,"sys_adm_news":false,"sys_adm_news_cats":false,"sys_adm_news_views":false,"sys_adm_news_votes":false,"sys_adm_comments":false,"sys_adm_menu":false,"sys_adm_menu_adm":false,"sys_adm_menu_groups":false,"sys_adm_menu_icons":false,"sys_adm_users":false,"sys_adm_groups":false,"sys_adm_permissions":false,"sys_adm_statics":false,"sys_adm_info":false,"sys_adm_settings":false,"sys_adm_monitoring":false,"sys_adm_modules":false,"sys_search_news":true,"sys_search_comments":false,"sys_news_like":false,"sys_adm_m_g_main":false,"sys_adm_m_g_news":false,"sys_adm_m_g_users":false,"sys_adm_m_g_menu":false,"sys_adm_m_g_settings":false,"sys_adm_m_i_news":false,"sys_adm_m_i_news_cats":false,"sys_adm_m_i_comments":false,"sys_adm_m_i_news_views":false,"sys_adm_m_i_news_votes":false,"sys_adm_m_i_users":false,"sys_adm_m_i_groups":false,"sys_adm_m_i_permissions":false,"sys_adm_m_i_menu":false,"sys_adm_m_i_menu_adm":false,"sys_adm_m_i_menu_groups_adm":false,"sys_adm_m_i_icons":false,"sys_adm_m_i_statics":false,"sys_adm_m_i_settings":false,"sys_adm_m_i_monitor":false,"sys_adm_m_i_info":false,"sys_adm_m_i_modules":false,"sys_adm_m_i_logs":false,"sys_adm_manager":false,"sys_adm_logs":false,"sys_adm_permissions_add":false,"sys_adm_permissions_edit":false,"sys_adm_permissions_delete":false,"sys_adm_comments_add":false,"sys_adm_comments_edit":false,"sys_adm_comments_delete":false,"sys_adm_groups_add":false,"sys_adm_groups_edit":false,"sys_adm_groups_delete":false,"sys_adm_menu_add":false,"sys_adm_menu_edit":false,"sys_adm_menu_delete":false,"sys_adm_menu_adm_add":false,"sys_adm_menu_adm_edit":false,"sys_adm_menu_adm_delete":false,"sys_adm_menu_groups_add":false,"sys_adm_menu_groups_edit":false,"sys_adm_menu_groups_delete":false,"sys_adm_menu_icons_add":false,"sys_adm_menu_icons_edit":false,"sys_adm_menu_icons_delete":false,"sys_adm_monitoring_add":false,"sys_adm_monitoring_edit":false,"sys_adm_monitoring_delete":false,"sys_adm_news_add":false,"sys_adm_news_edit":false,"sys_adm_news_delete":false,"sys_adm_news_cats_add":false,"sys_adm_news_cats_edit":false,"sys_adm_news_cats_delete":false,"sys_adm_statics_add":false,"sys_adm_statics_edit":false,"sys_adm_statics_delete":false,"sys_adm_users_add":false,"sys_adm_users_edit":false,"sys_adm_users_delete":false,"sys_adm_users_ban":false,"sys_adm_modules_edit":false,"sys_adm_news_views_delete":false,"sys_adm_news_votes_delete":false}'), +(2, 'Пользователь', 'Зарегистрированные и проверенные пользователи', '', '{"sys_debug":false,"sys_max_file_size":1024,"sys_max_ratio":1,"sys_monitoring":true,"sys_share":true,"sys_search":true,"sys_restore":true,"sys_register":true,"sys_profile":true,"sys_profile_del_skin":true,"sys_profile_del_cloak":true,"sys_profile_skin":true,"sys_profile_cloak":true,"sys_profile_settings":true,"sys_news_list":true,"sys_news_full":true,"sys_comment_list":true,"sys_comment_add":true,"sys_comment_edt":true,"sys_comment_edt_all":false,"sys_comment_del":false,"sys_comment_del_all":false,"sys_auth":true,"sys_adm_main":false,"sys_adm_news":false,"sys_adm_news_cats":false,"sys_adm_news_views":false,"sys_adm_news_votes":false,"sys_adm_comments":false,"sys_adm_menu":false,"sys_adm_menu_adm":false,"sys_adm_menu_groups":false,"sys_adm_menu_icons":false,"sys_adm_users":false,"sys_adm_groups":false,"sys_adm_permissions":false,"sys_adm_statics":false,"sys_adm_info":false,"sys_adm_settings":false,"sys_adm_monitoring":false,"sys_adm_modules":false,"sys_search_news":true,"sys_search_comments":true,"sys_news_like":true,"sys_adm_m_g_main":false,"sys_adm_m_g_news":false,"sys_adm_m_g_users":false,"sys_adm_m_g_menu":false,"sys_adm_m_g_settings":false,"sys_adm_m_i_news":false,"sys_adm_m_i_news_cats":false,"sys_adm_m_i_comments":false,"sys_adm_m_i_news_views":false,"sys_adm_m_i_news_votes":false,"sys_adm_m_i_users":false,"sys_adm_m_i_groups":false,"sys_adm_m_i_permissions":false,"sys_adm_m_i_menu":false,"sys_adm_m_i_menu_adm":false,"sys_adm_m_i_menu_groups_adm":false,"sys_adm_m_i_icons":false,"sys_adm_m_i_statics":false,"sys_adm_m_i_settings":false,"sys_adm_m_i_monitor":false,"sys_adm_m_i_info":false,"sys_adm_m_i_modules":false,"sys_adm_m_i_logs":false,"sys_adm_manager":false,"sys_adm_logs":false,"sys_adm_permissions_add":false,"sys_adm_permissions_edit":false,"sys_adm_permissions_delete":false,"sys_adm_comments_add":false,"sys_adm_comments_edit":false,"sys_adm_comments_delete":false,"sys_adm_groups_add":false,"sys_adm_groups_edit":false,"sys_adm_groups_delete":false,"sys_adm_menu_add":false,"sys_adm_menu_edit":false,"sys_adm_menu_delete":false,"sys_adm_menu_adm_add":false,"sys_adm_menu_adm_edit":false,"sys_adm_menu_adm_delete":false,"sys_adm_menu_groups_add":false,"sys_adm_menu_groups_edit":false,"sys_adm_menu_groups_delete":false,"sys_adm_menu_icons_add":false,"sys_adm_menu_icons_edit":false,"sys_adm_menu_icons_delete":false,"sys_adm_monitoring_add":false,"sys_adm_monitoring_edit":false,"sys_adm_monitoring_delete":false,"sys_adm_news_add":false,"sys_adm_news_edit":false,"sys_adm_news_delete":false,"sys_adm_news_cats_add":false,"sys_adm_news_cats_edit":false,"sys_adm_news_cats_delete":false,"sys_adm_statics_add":false,"sys_adm_statics_edit":false,"sys_adm_statics_delete":false,"sys_adm_users_add":false,"sys_adm_users_edit":false,"sys_adm_users_delete":false,"sys_adm_users_ban":false,"sys_adm_modules_edit":false,"sys_adm_news_views_delete":false,"sys_adm_news_votes_delete":false}'), +(3, 'Администратор', 'Группа администрации', '', '{"sys_debug":true,"sys_max_file_size":4096,"sys_max_ratio":32,"sys_monitoring":true,"sys_share":true,"sys_search":true,"sys_restore":true,"sys_register":true,"sys_profile":true,"sys_profile_del_skin":true,"sys_profile_del_cloak":true,"sys_profile_skin":true,"sys_profile_cloak":true,"sys_profile_settings":true,"sys_news_list":true,"sys_news_full":true,"sys_comment_list":true,"sys_comment_add":true,"sys_comment_edt":true,"sys_comment_edt_all":true,"sys_comment_del":true,"sys_comment_del_all":true,"sys_auth":true,"sys_adm_main":true,"sys_adm_news":true,"sys_adm_news_cats":true,"sys_adm_news_views":true,"sys_adm_news_votes":true,"sys_adm_comments":true,"sys_adm_menu":true,"sys_adm_menu_adm":true,"sys_adm_menu_groups":true,"sys_adm_menu_icons":true,"sys_adm_users":true,"sys_adm_groups":true,"sys_adm_permissions":true,"sys_adm_statics":true,"sys_adm_info":true,"sys_adm_settings":true,"sys_adm_monitoring":true,"sys_adm_modules":true,"sys_search_news":true,"sys_search_comments":true,"sys_news_like":true,"sys_adm_m_g_main":true,"sys_adm_m_g_news":true,"sys_adm_m_g_users":true,"sys_adm_m_g_menu":true,"sys_adm_m_g_settings":true,"sys_adm_m_i_news":true,"sys_adm_m_i_news_cats":true,"sys_adm_m_i_comments":true,"sys_adm_m_i_news_views":true,"sys_adm_m_i_news_votes":true,"sys_adm_m_i_users":true,"sys_adm_m_i_groups":true,"sys_adm_m_i_permissions":true,"sys_adm_m_i_menu":true,"sys_adm_m_i_menu_adm":true,"sys_adm_m_i_menu_groups_adm":true,"sys_adm_m_i_icons":true,"sys_adm_m_i_statics":true,"sys_adm_m_i_settings":true,"sys_adm_m_i_monitor":true,"sys_adm_m_i_info":true,"sys_adm_m_i_modules":true,"sys_adm_m_i_logs":true,"sys_adm_manager":true,"sys_adm_logs":true,"sys_adm_permissions_add":true,"sys_adm_permissions_edit":true,"sys_adm_permissions_delete":true,"sys_adm_comments_add":true,"sys_adm_comments_edit":true,"sys_adm_comments_delete":true,"sys_adm_groups_add":true,"sys_adm_groups_edit":true,"sys_adm_groups_delete":true,"sys_adm_menu_add":true,"sys_adm_menu_edit":true,"sys_adm_menu_delete":true,"sys_adm_menu_adm_add":true,"sys_adm_menu_adm_edit":true,"sys_adm_menu_adm_delete":true,"sys_adm_menu_groups_add":true,"sys_adm_menu_groups_edit":true,"sys_adm_menu_groups_delete":true,"sys_adm_menu_icons_add":true,"sys_adm_menu_icons_edit":true,"sys_adm_menu_icons_delete":true,"sys_adm_monitoring_add":true,"sys_adm_monitoring_edit":true,"sys_adm_monitoring_delete":true,"sys_adm_news_add":true,"sys_adm_news_edit":true,"sys_adm_news_delete":true,"sys_adm_news_cats_add":true,"sys_adm_news_cats_edit":true,"sys_adm_news_cats_delete":true,"sys_adm_statics_add":true,"sys_adm_statics_edit":true,"sys_adm_statics_delete":true,"sys_adm_users_add":true,"sys_adm_users_edit":true,"sys_adm_users_delete":true,"sys_adm_users_ban":true,"sys_adm_modules_edit":true,"sys_adm_news_views_delete":true,"sys_adm_news_votes_delete":true}'); #line CREATE TABLE IF NOT EXISTS `mcr_iconomy` ( `id` int(10) NOT NULL AUTO_INCREMENT, - `login` varchar(32) CHARACTER SET latin1 NOT NULL, + `login` varchar(32) CHARACTER SET latin1 NOT NULL DEFAULT '', `money` decimal(10,2) NOT NULL DEFAULT '0.00', `realmoney` decimal(10,2) NOT NULL DEFAULT '0.00', `bank` decimal(10,2) NOT NULL DEFAULT '0.00', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; + PRIMARY KEY (`id`), + KEY `login` (`login`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; #line CREATE TABLE IF NOT EXISTS `mcr_logs` ( `id` int(10) NOT NULL AUTO_INCREMENT, `uid` int(10) NOT NULL DEFAULT '0', - `message` varchar(255) NOT NULL, - `date` int(10) NOT NULL, + `message` varchar(255) NOT NULL DEFAULT '', + `date` int(10) NOT NULL DEFAULT '0', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; #line CREATE TABLE IF NOT EXISTS `mcr_menu` ( `id` int(10) NOT NULL AUTO_INCREMENT, - `title` varchar(32) NOT NULL, + `title` varchar(32) NOT NULL DEFAULT '', `parent` int(10) NOT NULL DEFAULT '1', - `url` varchar(255) NOT NULL, + `url` varchar(255) NOT NULL DEFAULT '', `target` varchar(10) CHARACTER SET latin1 NOT NULL DEFAULT '_self', - `permissions` varchar(255) NOT NULL, + `permissions` varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ; #line @@ -68,14 +72,15 @@ CREATE TABLE IF NOT EXISTS `mcr_menu_adm` ( `id` int(10) NOT NULL AUTO_INCREMENT, `gid` int(10) NOT NULL DEFAULT '1', - `title` varchar(24) NOT NULL, - `text` varchar(255) NOT NULL, - `url` varchar(255) NOT NULL, + `title` varchar(24) NOT NULL DEFAULT '0', + `text` varchar(255) NOT NULL DEFAULT '', + `url` varchar(255) NOT NULL DEFAULT '', `target` varchar(10) CHARACTER SET latin1 NOT NULL DEFAULT '_self', `access` text CHARACTER SET latin1 NOT NULL, `priority` int(6) NOT NULL DEFAULT '1', `icon` int(10) NOT NULL DEFAULT '1', - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `gid` (`gid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=19 ; #line INSERT INTO `mcr_menu_adm` (`id`, `gid`, `title`, `text`, `url`, `target`, `access`, `priority`, `icon`) VALUES @@ -100,9 +105,9 @@ #line CREATE TABLE IF NOT EXISTS `mcr_menu_adm_groups` ( `id` int(10) NOT NULL AUTO_INCREMENT, - `title` varchar(32) NOT NULL, - `text` varchar(255) CHARACTER SET utf8 COLLATE utf8_estonian_ci NOT NULL, - `access` varchar(64) CHARACTER SET latin1 NOT NULL, + `title` varchar(32) NOT NULL DEFAULT '', + `text` varchar(255) CHARACTER SET utf8 COLLATE utf8_estonian_ci NOT NULL DEFAULT '', + `access` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '', `priority` int(10) NOT NULL DEFAULT '1', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=6 ; @@ -116,8 +121,8 @@ #line CREATE TABLE IF NOT EXISTS `mcr_menu_adm_icons` ( `id` int(10) NOT NULL AUTO_INCREMENT, - `title` varchar(32) NOT NULL, - `img` varchar(255) NOT NULL, + `title` varchar(32) NOT NULL DEFAULT '', + `img` varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=24 ; #line @@ -148,29 +153,29 @@ #line CREATE TABLE IF NOT EXISTS `mcr_monitoring` ( `id` int(10) NOT NULL AUTO_INCREMENT, - `title` varchar(32) NOT NULL, - `text` varchar(255) NOT NULL, + `title` varchar(32) NOT NULL DEFAULT '', + `text` varchar(255) NOT NULL DEFAULT '', `ip` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '127.0.0.1', `port` int(6) NOT NULL DEFAULT '25565', `status` tinyint(1) NOT NULL DEFAULT '0', - `version` varchar(64) NOT NULL, + `version` varchar(64) NOT NULL DEFAULT '', `online` int(10) NOT NULL DEFAULT '0', `slots` int(10) NOT NULL DEFAULT '0', `players` text NOT NULL, `motd` text NOT NULL, `plugins` text NOT NULL, - `map` varchar(64) NOT NULL, + `map` varchar(64) NOT NULL DEFAULT '', `last_error` text NOT NULL, `last_update` int(10) NOT NULL DEFAULT '0', `updater` int(10) NOT NULL DEFAULT '60', `type` varchar(32) CHARACTER SET latin1 NOT NULL DEFAULT 'MineToolsAPIPing', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; #line CREATE TABLE IF NOT EXISTS `mcr_news` ( `id` int(10) NOT NULL AUTO_INCREMENT, `cid` int(10) NOT NULL DEFAULT '1' COMMENT 'ID категории', - `title` varchar(32) NOT NULL COMMENT 'Название новости', + `title` varchar(32) NOT NULL DEFAULT '' COMMENT 'Название новости', `text_bb` longtext NOT NULL COMMENT 'Текст полного описание(необработанный)', `text_html` longtext NOT NULL COMMENT 'Текст полного описание(обработанный)', `text_bb_short` text NOT NULL COMMENT 'Текст краткого описание(необработанный)', @@ -178,15 +183,19 @@ `vote` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'Активатор лайков', `discus` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'Активатор комметариев', `attach` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Активатор закрепления', - `uid` int(10) NOT NULL COMMENT 'ID добавившего пользователя', + `uid` int(10) NOT NULL DEFAULT '0' COMMENT 'ID добавившего пользователя', `data` text NOT NULL COMMENT 'Сведения о новости', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; + PRIMARY KEY (`id`), + KEY `cid` (`cid`), + KEY `uid` (`uid`), + KEY `cid_2` (`cid`), + KEY `uid_2` (`uid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; #line CREATE TABLE IF NOT EXISTS `mcr_news_cats` ( `id` int(10) NOT NULL AUTO_INCREMENT, - `title` varchar(32) NOT NULL, - `description` varchar(255) NOT NULL, + `title` varchar(32) NOT NULL DEFAULT '', + `description` varchar(255) NOT NULL DEFAULT '', `data` text NOT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ; @@ -196,35 +205,43 @@ #line CREATE TABLE IF NOT EXISTS `mcr_news_views` ( `id` int(10) NOT NULL AUTO_INCREMENT, - `nid` int(10) NOT NULL, + `nid` int(10) NOT NULL DEFAULT '0', `uid` int(10) NOT NULL DEFAULT '-1', - `ip` varchar(15) CHARACTER SET latin1 NOT NULL, - `time` int(10) NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; + `ip` varchar(15) CHARACTER SET latin1 NOT NULL DEFAULT '127.0.0.1', + `time` int(10) NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `nid` (`nid`), + KEY `uid` (`uid`), + KEY `nid_2` (`nid`), + KEY `uid_2` (`uid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; #line CREATE TABLE IF NOT EXISTS `mcr_news_votes` ( `id` int(10) NOT NULL AUTO_INCREMENT, - `nid` int(10) NOT NULL, + `nid` int(10) NOT NULL DEFAULT '0', `uid` int(10) NOT NULL DEFAULT '-1', `value` tinyint(1) NOT NULL DEFAULT '1', - `ip` varchar(15) CHARACTER SET latin1 NOT NULL, - `time` int(10) NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; + `ip` varchar(15) CHARACTER SET latin1 NOT NULL DEFAULT '127.0.0.1', + `time` int(10) NOT NULL DEFAULT '0', + PRIMARY KEY (`id`), + KEY `nid` (`nid`), + KEY `uid` (`uid`), + KEY `nid_2` (`nid`), + KEY `uid_2` (`uid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; #line CREATE TABLE IF NOT EXISTS `mcr_permissions` ( `id` int(10) NOT NULL AUTO_INCREMENT, - `title` varchar(64) NOT NULL, - `description` varchar(255) NOT NULL, - `value` varchar(32) CHARACTER SET latin1 NOT NULL, + `title` varchar(64) NOT NULL DEFAULT '', + `description` varchar(255) NOT NULL DEFAULT '', + `value` varchar(32) CHARACTER SET latin1 NOT NULL DEFAULT '', `system` tinyint(1) NOT NULL DEFAULT '0', `type` varchar(32) CHARACTER SET latin1 NOT NULL DEFAULT 'boolean', `default` varchar(32) NOT NULL DEFAULT 'false', `data` text NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `value` (`value`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=114 ; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=110 ; #line INSERT INTO `mcr_permissions` (`id`, `title`, `description`, `value`, `system`, `type`, `default`, `data`) VALUES (1, 'Доступ к отладке', 'Дает доступ к системной информации для устранения и выявления неисправностей', 'sys_debug', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'), @@ -339,34 +356,68 @@ #line CREATE TABLE IF NOT EXISTS `mcr_statics` ( `id` int(10) NOT NULL AUTO_INCREMENT, - `uniq` varchar(64) CHARACTER SET latin1 NOT NULL, - `title` varchar(64) NOT NULL, + `uniq` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '', + `title` varchar(64) NOT NULL DEFAULT '', `text_bb` longtext NOT NULL, `text_html` longtext NOT NULL, - `uid` int(10) NOT NULL, - `permissions` varchar(64) CHARACTER SET latin1 NOT NULL, + `uid` int(10) NOT NULL DEFAULT '0', + `permissions` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '', `data` text NOT NULL, PRIMARY KEY (`id`), - UNIQUE KEY `uniq` (`uniq`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; + UNIQUE KEY `uniq` (`uniq`), + KEY `uid` (`uid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; #line CREATE TABLE IF NOT EXISTS `mcr_users` ( `id` int(11) NOT NULL AUTO_INCREMENT, `gid` int(11) NOT NULL DEFAULT '1', - `login` varchar(32) CHARACTER SET latin1 NOT NULL, - `email` varchar(64) CHARACTER SET latin1 NOT NULL, - `password` varchar(255) CHARACTER SET latin1 NOT NULL, - `uuid` varchar(64) NOT NULL, - `salt` varchar(10) NOT NULL, - `tmp` varchar(32) CHARACTER SET latin1 NOT NULL, + `login` varchar(32) CHARACTER SET latin1 NOT NULL DEFAULT '', + `email` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '', + `password` varchar(128) CHARACTER SET latin1 NOT NULL DEFAULT '', + `uuid` varchar(64) NOT NULL DEFAULT '', + `salt` varchar(10) NOT NULL DEFAULT '', + `tmp` varchar(32) CHARACTER SET latin1 NOT NULL DEFAULT '', `is_skin` tinyint(1) NOT NULL DEFAULT '0', `is_cloak` tinyint(1) NOT NULL DEFAULT '0', `ip_create` varchar(15) CHARACTER SET latin1 NOT NULL DEFAULT '127.0.0.1', `ip_last` varchar(15) CHARACTER SET latin1 NOT NULL DEFAULT '127.0.0.1', - `color` varchar(24) NOT NULL, + `color` varchar(24) NOT NULL DEFAULT '', `data` text NOT NULL, `ban_server` tinyint(1) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), - UNIQUE KEY `login` (`login`,`email`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; + UNIQUE KEY `login` (`login`,`email`), + KEY `gid` (`gid`), + KEY `login_2` (`login`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; #line +ALTER TABLE `mcr_comments` + ADD CONSTRAINT `mcr_comments_ibfk_2` FOREIGN KEY (`uid`) REFERENCES `mcr_users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + ADD CONSTRAINT `mcr_comments_ibfk_1` FOREIGN KEY (`nid`) REFERENCES `mcr_news` (`id`) ON DELETE CASCADE ON UPDATE CASCADE; +#line +ALTER TABLE `mcr_files` + ADD CONSTRAINT `mcr_files_ibfk_1` FOREIGN KEY (`uid`) REFERENCES `mcr_users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE; +#line +ALTER TABLE `mcr_iconomy` + ADD CONSTRAINT `mcr_iconomy_ibfk_1` FOREIGN KEY (`login`) REFERENCES `mcr_users` (`login`) ON DELETE CASCADE ON UPDATE CASCADE; +#line +ALTER TABLE `mcr_menu_adm` + ADD CONSTRAINT `mcr_menu_adm_ibfk_1` FOREIGN KEY (`gid`) REFERENCES `mcr_menu_adm_groups` (`id`) ON DELETE CASCADE ON UPDATE CASCADE; +#line +ALTER TABLE `mcr_news` + ADD CONSTRAINT `mcr_news_ibfk_1` FOREIGN KEY (`cid`) REFERENCES `mcr_news_cats` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + ADD CONSTRAINT `mcr_news_ibfk_2` FOREIGN KEY (`uid`) REFERENCES `mcr_users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE; +#line +ALTER TABLE `mcr_news_views` + ADD CONSTRAINT `mcr_news_views_ibfk_2` FOREIGN KEY (`uid`) REFERENCES `mcr_users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + ADD CONSTRAINT `mcr_news_views_ibfk_1` FOREIGN KEY (`nid`) REFERENCES `mcr_news` (`id`) ON DELETE CASCADE ON UPDATE CASCADE; +#line +ALTER TABLE `mcr_news_votes` + ADD CONSTRAINT `mcr_news_votes_ibfk_2` FOREIGN KEY (`uid`) REFERENCES `mcr_users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + ADD CONSTRAINT `mcr_news_votes_ibfk_1` FOREIGN KEY (`nid`) REFERENCES `mcr_news` (`id`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE `mcr_statics` + ADD CONSTRAINT `mcr_statics_ibfk_1` FOREIGN KEY (`uid`) REFERENCES `mcr_users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE; +#line +ALTER TABLE `mcr_users` + ADD CONSTRAINT `mcr_users_ibfk_1` FOREIGN KEY (`gid`) REFERENCES `mcr_groups` (`id`) ON DELETE CASCADE ON UPDATE CASCADE; +#line \ No newline at end of file diff --git a/upload/language/ru_RU/admin.php b/upload/language/ru_RU/admin.php index e414637..75c4ba9 100644 --- a/upload/language/ru_RU/admin.php +++ b/upload/language/ru_RU/admin.php @@ -9,7 +9,7 @@ 'comments' => 'Комментарии', 'com_not_selected' => 'Не выбрано ни одного пункта', - 'com_del_elements' => 'Удалено элементов: комментариев', + 'com_del_elements' => 'Удалено элементов: ', 'com_without_news' => 'Без новости', 'com_add' => 'Добавление', 'com_edit' => 'Редактирование', @@ -35,8 +35,7 @@ 'groups' => 'Группы пользователей', 'grp_not_selected' => 'Не выбрано ни одного пункта', - 'grp_del_msg1' => 'Удалено элементов: групп -', - 'grp_del_msg2' => 'пользователей -', + 'grp_del_msg1' => 'Удалено элементов: ', 'grp_def_val' => 'Значение по умолчанию', 'grp_del_success' => 'Группа пользователей успешно добавлена', 'grp_add' => 'Добавление', @@ -91,7 +90,7 @@ 'menu' => 'Меню сайта', 'menu_top_lvl' => 'Верхний уровень', 'menu_not_selected' => 'Не выбрано ни одного пункта', - 'menu_del_elements' => 'Удалено элементов: пунктов меню -', + 'menu_del_elements' => 'Удалено элементов: ', 'menu_add' => 'Добавление', 'menu_edit' => 'Редактирование', 'menu_edit_btn' => 'Сохранить', @@ -120,7 +119,7 @@ 'manucp' => 'Меню ПУ', 'mcp_not_selected' => 'Не выбрано ни одного пункта', - 'mcp_del_elements' => 'Удалено элементов: пунктов меню -', + 'mcp_del_elements' => 'Удалено элементов: ', 'mcp_add' => 'Добавление', 'mcp_edit' => 'Редактирование', 'mcp_perm_not_exist' => 'Привилегия не существует', @@ -152,8 +151,7 @@ 'menugrp' => 'Группы меню ПУ', 'mgrp_not_selected' => 'Не выбрано ни одного пункта', - 'mgrp_del_elements' => 'Удалено элементов: групп меню -', - 'mgrp_del_elements1' => 'пунктов меню -', + 'mgrp_del_elements' => 'Удалено элементов: ', 'mgrp_add' => 'Добавление', 'mgrp_edit' => 'Редактирование', 'mgrp_perm_not_exist' => 'Привилегия не существует', @@ -179,8 +177,7 @@ 'menuicons' => 'Иконки', 'mi_not_selected' => 'Не выбрано ни одного пункта', - 'mi_del_elements' => 'Удалено элементов: иконок -', - 'mi_del_elements1' => 'пунктов меню -', + 'mi_del_elements' => 'Удалено элементов: ', 'mi_add' => 'Добавление', 'mi_edit' => 'Редактирование', 'mi_perm_not_exist' => 'Привилегия не существует', @@ -235,7 +232,7 @@ 'monitoring' => 'Мониторинг серверов', 'mon_not_selected' => 'Не выбрано ни одного пункта', - 'mon_del_elements' => 'Удалено элементов: серверов -', + 'mon_del_elements' => 'Удалено элементов: ', 'mon_add' => 'Добавление', 'mon_edit' => 'Редактирование', 'mon_perm_not_exist' => 'Привилегия не существует', @@ -264,9 +261,7 @@ 'news' => 'Новости', 'news_not_selected' => 'Не выбрано ни одного пункта', - 'news_del_elements' => 'Удалено элементов: новостей -', - 'news_del_elements2' => 'просмотров -', - 'news_del_elements3' => 'голосов -', + 'news_del_elements' => 'Удалено элементов: ', 'news_add' => 'Добавление', 'news_edit' => 'Редактирование', 'news_add_success' => 'Новость успешно добавлена', @@ -303,9 +298,7 @@ 'categories' => 'Категории новостей', 'cn_not_selected' => 'Не выбрано ни одного пункта', - 'cn_del_elements' => 'Удалено элементов: категорий -', - 'cn_del_elements2' => 'новостей -', - 'cn_del_elements3' => 'просмотров -', + 'cn_del_elements' => 'Удалено элементов: ', 'cn_del_elements4' => 'Выбранные элементы успешно удалены', 'cn_del_elements5' => 'голосов -', 'cn_add' => 'Добавление', @@ -330,7 +323,7 @@ 'views' => 'Просмотры', 'nv_not_selected' => 'Не выбрано ни одного пункта', 'nv_news_deleted' => 'Новость удалена', - 'nv_del_elements' => 'Удалено элементов: просмотров -', + 'nv_del_elements' => 'Удалено элементов: ', 'nv_field_news' => 'Новость', 'nv_field_user' => 'Пользователь', 'nv_field_date' => 'Дата', @@ -344,7 +337,7 @@ 'votes' => 'Голоса', 'nvt_not_selected' => 'Не выбрано ни одного пункта', 'nvt_news_deleted' => 'Новость удалена', - 'nvt_del_elements' => 'Удалено элементов: голосов -', + 'nvt_del_elements' => 'Удалено элементов: ', 'nvt_field_news' => 'Новость', 'nvt_field_user' => 'Пользователь', 'nvt_field_value' => 'Значение', @@ -358,7 +351,7 @@ 'permissions' => 'Привилегии', 'perm_not_selected' => 'Не выбрано ни одного пункта', - 'perm_del_elements' => 'Удалено элементов: привилегий -', + 'perm_del_elements' => 'Удалено элементов: ', 'perm_add' => 'Добавление', 'perm_edit' => 'Редактирование', 'perm_add_success' => 'Привилегия успешно добавлена', @@ -391,7 +384,7 @@ 'statics' => 'Статические страницы', 'stc_perm_not_exist' => 'ОТСУТСТВУЕТ', 'stc_not_selected' => 'Не выбрано ни одного пункта', - 'stc_del_elements' => 'Удалено элементов: страниц -', + 'stc_del_elements' => 'Удалено элементов: ', 'stc_add' => 'Добавление', 'stc_edit' => 'Редактирование', 'stc_add_success' => 'Статическая страница успешно добавлена', @@ -423,10 +416,7 @@ 'user_ban' => 'забанены', 'user_unban' => 'разбанены', 'user_not_selected' => 'Не выбрано ни одного пункта', - 'user_del_elements' => 'Удалено элементов: пользователей -', - 'user_del_elements2' => 'комментариев -', - 'user_del_elements3' => 'голосов -', - 'user_del_elements4' => 'просмотров -', + 'user_del_elements' => 'Удалено элементов: ', 'user_add' => 'Добавление', 'user_edit' => 'Редактирование', 'user_add_success' => 'Пользователь успешно добавлен', diff --git a/upload/language/ru_RU/ajax.php b/upload/language/ru_RU/ajax.php index a2e09a1..99b0677 100644 --- a/upload/language/ru_RU/ajax.php +++ b/upload/language/ru_RU/ajax.php @@ -33,57 +33,6 @@ 'mon_srv_offline' => 'Сервер оффлайн', 'mon_srv_success' => 'Серверы успешно получены', - 'news' => 'Новости', - 'news_not_found' => 'Новость не найдена', - - 'com_perm_add' => 'У вас нет доступа для добалвения комментариев', - 'com_perm_edit' => 'У вас нет доступа для изменения комментариев', - 'com_perm_del' => 'У вас нет прав на удаление комментариев', - 'com_disabled' => 'Комментарии отключены для данной новости', - 'com_msg_empty' => 'Не заполнено поле "Сообщение"', - 'com_wait' => 'Для повторного добовления комментария необходимо подождать', - 'com_wait1' => 'сек.', - 'com_msg_incorrect' => 'Не верно заполнено поле сообщения', - 'com_add_success' => 'Комментарий успешно добавлен', - 'com_edit_success' => 'Комментарий успешно отредактирован', - 'com_del_success' => 'Выбранный комментарий успешно удален', - 'com_load_success' => 'Комментарий успешно получен', - 'com_del_empty' => 'Ничего не удалено', - 'com_unauth' => 'Вы не авторизованы', - 'com_vote_perm' => 'У вас нет доступа для голосования', - 'com_vote_disabled' => 'Голосование для данной новости отключено', - 'com_vote_success' => 'Голос успешно учтен', - 'com_edit' => 'Редактировать', - 'com_delete' => 'Удалить', - 'com_quote' => 'Цитировать', - - 'att_attach' => 'Закрепление', - 'att_unattach' => 'Открепление', - 'att_news' => 'новости', - 'att_success' => 'Статус закрепления успешно изменен', - - 'new_success_del' => 'Новость успешно удалена', - - 'reg_e_login_regexp' => 'Логин может состоять только из латинских букв, цифр и знаков -_', - 'reg_e_email_regexp' => 'Неверный формат E-Mail адреса', - 'reg_e_exist' => 'Запрещено использовать данный логин и/или E-Mail', - 'reg_e_pass_length' => 'Пароль должен быть не менее 6-ти символов', - 'reg_e_pass_match' => 'Пароли не совпадают', - 'reg_e_rules' => 'Необходимо принять правила сайта', - "reg_e_rules" => "Для регистрации необходимо принять правила", - "reg_e_success" => "Вы успешно зарегистрировались. Теперь вы можете войти под своим логином и паролем.", - "reg_e_success_mail" => "Письмо с подтверждением регистрации отправлено на E-Mail, указанный при регистрации", - "reg_e_already" => "Вы уже зарегистрированы", - "reg_title" => "[Регистрация]", - 'reg_ok' => 'ОК', - "log_reg" => "Регистрация пользователя", - - 'log_new_del' => 'Удаление новости', - 'log_com_add' => 'Добавление комментария', - 'log_com_edit' => 'Редактирование комментария', - 'log_com_del' => 'Удаление комментария', - 'log_com_vote' => 'Голосование за новость', - 'log_change_ams' => 'Изменение статусов модулей', 'date_create' => 'Дата создания', 'time_create' => 'Время создания', diff --git a/upload/language/ru_RU/blocks/profile.php b/upload/language/ru_RU/blocks/profile.php index 8890486..6c80d20 100644 --- a/upload/language/ru_RU/blocks/profile.php +++ b/upload/language/ru_RU/blocks/profile.php @@ -8,6 +8,8 @@ 'balance' => 'Баланс', 'settings' => 'Профиль', 'logout' => 'Выход', + 'cur_game' => 'майн.', + 'cur_real' => 'руб.', 'auth' => 'Авторизация', 'remember' => 'Запомнить', 'enter' => 'Вход', diff --git a/upload/language/ru_RU/news.php b/upload/language/ru_RU/news.php index ff0e13a..4e737fc 100644 --- a/upload/language/ru_RU/news.php +++ b/upload/language/ru_RU/news.php @@ -26,6 +26,43 @@ 'add' => 'Добавить', 'disabled_by_admin' => 'Комментарии в данной новости были отключены администрацией', 'com_quote' => 'Цитировать', + + 'news' => 'Новости', + 'news_not_found' => 'Новость не найдена', + + 'com_perm_add' => 'У вас нет доступа для добалвения комментариев', + 'com_perm_edit' => 'У вас нет доступа для изменения комментариев', + 'com_perm_del' => 'У вас нет прав на удаление комментариев', + 'com_disabled' => 'Комментарии отключены для данной новости', + 'com_msg_empty' => 'Не заполнено поле "Сообщение"', + 'com_wait' => 'Для повторного добовления комментария необходимо подождать', + 'com_wait1' => 'сек.', + 'com_msg_incorrect' => 'Не верно заполнено поле сообщения', + 'com_add_success' => 'Комментарий успешно добавлен', + 'com_edit_success' => 'Комментарий успешно отредактирован', + 'com_del_success' => 'Выбранный комментарий успешно удален', + 'com_load_success' => 'Комментарий успешно получен', + 'com_del_empty' => 'Ничего не удалено', + 'com_unauth' => 'Вы не авторизованы', + 'com_vote_perm' => 'У вас нет доступа для голосования', + 'com_vote_disabled' => 'Голосование для данной новости отключено', + 'com_vote_success' => 'Голос успешно учтен', + 'com_edit' => 'Редактировать', + 'com_delete' => 'Удалить', + 'com_quote' => 'Цитировать', + + 'att_attach' => 'Закрепление', + 'att_unattach' => 'Открепление', + 'att_news' => 'новости', + 'att_success' => 'Статус закрепления успешно изменен', + + 'new_success_del' => 'Новость успешно удалена', + + 'log_new_del' => 'Удаление новости', + 'log_com_add' => 'Добавление комментария', + 'log_com_edit' => 'Редактирование комментария', + 'log_com_del' => 'Удаление комментария', + 'log_com_vote' => 'Голосование за новость', ); ?> \ No newline at end of file diff --git a/upload/language/ru_RU/register.php b/upload/language/ru_RU/register.php index 9fa3eb1..76da150 100644 --- a/upload/language/ru_RU/register.php +++ b/upload/language/ru_RU/register.php @@ -5,6 +5,15 @@ "e_already" => "Вы уже зарегистрированы", "e_accept" => "Вы успешно подтвердили регистрацию", "e_perm" => "Регистрация отключена для вашей группы пользователей", + 'e_login_regexp' => 'Логин может состоять только из латинских букв, цифр и знаков -_', + 'e_email_regexp' => 'Неверный формат E-Mail адреса', + 'e_exist' => 'Запрещено использовать данный логин и/или E-Mail', + 'e_pass_length' => 'Пароль должен быть не менее 6-ти символов', + 'e_pass_match' => 'Пароли не совпадают', + 'e_rules' => 'Необходимо принять правила сайта', + "e_rules" => "Для регистрации необходимо принять правила", + "e_success" => "Вы успешно зарегистрировались. Теперь вы можете войти под своим логином и паролем.", + "e_success_mail" => "Письмо с подтверждением регистрации отправлено на E-Mail, указанный при регистрации", "repass" => "Повторите пароль", "accept" => "Я принимаю данные правила и обязуюсь их соблюдать", "btn" => "Зарегистрироваться", @@ -13,6 +22,9 @@ "msg3" => "Для подтверждения регистрации, перейдите по ссылке ниже", "msg4" => "Если это были не вы, то проигнорируйте данное сообщение.", "msg5" => "С уважением, администрация сайта", + "msg_title" => "[Регистрация]", + 'msg_ok' => 'ОК', + "log_reg" => "Регистрация пользователя", ); ?> \ No newline at end of file diff --git a/upload/language/ru_RU/system.php b/upload/language/ru_RU/system.php index ef6e617..4801a36 100644 --- a/upload/language/ru_RU/system.php +++ b/upload/language/ru_RU/system.php @@ -101,8 +101,6 @@ "birthday" => "Дата рождения", "money" => "Игровой баланс", "realmoney" => "Реальный баланс", - 'cur_game' => 'майн.', - 'cur_real' => 'руб.', // Placeholder формы поиска "ph_search" => "Введите запрос", diff --git a/upload/modules/admin/comments.class.php b/upload/modules/admin/comments.class.php index 16cdd83..0c03a7c 100644 --- a/upload/modules/admin/comments.class.php +++ b/upload/modules/admin/comments.class.php @@ -208,7 +208,7 @@ $text_bb = $this->db->HSC($text_bb); - $text_html = $bb->parse($text_bb); + $text_html = $bb->decode($text_bb); $safe_text_html = $this->db->safesql($text_html); @@ -294,7 +294,7 @@ $text_bb = $this->db->HSC($text_bb); - $text_html = $bb->parse($text_bb); + $text_html = $bb->decode($text_bb); $safe_text_html = $this->db->safesql($text_html); diff --git a/upload/modules/admin/groups.class.php b/upload/modules/admin/groups.class.php index a2ab98d..f2814a9 100644 --- a/upload/modules/admin/groups.class.php +++ b/upload/modules/admin/groups.class.php @@ -122,17 +122,13 @@ $count = $this->db->affected_rows(); - if(!$this->db->remove_fast("mcr_users", "gid IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=groups'); } - - $count1 = $this->db->affected_rows(); - // Последнее обновление пользователя $this->db->update_user($this->user); // Лог действия $this->db->actlog($this->lng['log_del_grp']." $list ".$this->lng['log_grp'], $this->user->id); - $this->core->notify($this->core->lng["e_success"], $this->lng['grp_del_msg1']." $count, ".$this->lng['grp_del_msg2']." $count1", 3, '?mode=admin&do=groups'); + $this->core->notify($this->core->lng["e_success"], $this->lng['grp_del_msg1']." $count", 3, '?mode=admin&do=groups'); } diff --git a/upload/modules/admin/menu_groups.class.php b/upload/modules/admin/menu_groups.class.php index 3c880ae..b6adaa0 100644 --- a/upload/modules/admin/menu_groups.class.php +++ b/upload/modules/admin/menu_groups.class.php @@ -124,17 +124,13 @@ $count = $this->db->affected_rows(); - if(!$this->db->remove_fast("mcr_menu_adm", "gid IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=menu_groups'); } - - $count1 = $this->db->affected_rows(); - // Последнее обновление пользователя $this->db->update_user($this->user); // Лог действия $this->db->actlog($this->lng['log_del_mgrp']." $list ".$this->lng['log_mgrp'], $this->user->id); - $this->core->notify($this->core->lng["e_success"], $this->lng['mgrp_del_elements']." $count, ".$this->lng['mgrp_del_elements1']." $count1", 3, '?mode=admin&do=menu_groups'); + $this->core->notify($this->core->lng["e_success"], $this->lng['mgrp_del_elements']." $count", 3, '?mode=admin&do=menu_groups'); } diff --git a/upload/modules/admin/monitoring.class.php b/upload/modules/admin/monitoring.class.php index d34f1db..2c967dd 100644 --- a/upload/modules/admin/monitoring.class.php +++ b/upload/modules/admin/monitoring.class.php @@ -153,9 +153,9 @@ if(!file_exists(MCR_MON_PATH.$type.'.php')){ $type = 'MineToolsAPIPing'; } $insert = $this->db->query("INSERT INTO `mcr_monitoring` - (title, `text`, ip, `port`, `type`, updater) + (title, `text`, ip, `port`, `players`, `motd`, `plugins`, last_error, `type`, updater) VALUES - ('$title', '$text', '$ip', '$port', '$type', '$updater')"); + ('$title', '$text', '$ip', '$port', '', '', '', '', '$type', '$updater')"); if(!$insert){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=monitoring'); } $id = $this->db->insert_id(); diff --git a/upload/modules/admin/news.class.php b/upload/modules/admin/news.class.php index 84e2b47..d15bb85 100644 --- a/upload/modules/admin/news.class.php +++ b/upload/modules/admin/news.class.php @@ -123,21 +123,13 @@ $count1 = $this->db->affected_rows(); - if(!$this->db->remove_fast("mcr_news_views", "nid IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=news'); } - - $count2 = $this->db->affected_rows(); - - if(!$this->db->remove_fast("mcr_news_votes", "nid IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=news'); } - - $count3 = $this->db->affected_rows(); - // Последнее обновление пользователя $this->db->update_user($this->user); // Лог действия $this->db->actlog($this->lng['log_del_news']." $list ".$this->lng['log_news'], $this->user->id); - $this->core->notify($this->core->lng["e_success"], $this->lng['news_del_elements']." $count1, ".$this->lng['news_del_elements2']." $count2, ".$this->lng['news_del_elements3']." $count3", 3, '?mode=admin&do=news'); + $this->core->notify($this->core->lng["e_success"], $this->lng['news_del_elements']." $count1", 3, '?mode=admin&do=news'); } diff --git a/upload/modules/admin/news_cats.class.php b/upload/modules/admin/news_cats.class.php index ca31461..257a005 100644 --- a/upload/modules/admin/news_cats.class.php +++ b/upload/modules/admin/news_cats.class.php @@ -119,37 +119,13 @@ $count = $this->db->affected_rows(); - $query = $this->db->query("SELECT id FROM `mcr_news` WHERE id IN ($list)"); - - if(!$query || $this->db->num_rows($query)<=0){ - $this->core->notify($this->core->lng["e_success"], $this->lng['cn_del_elements4']." ($count)", 3, '?mode=admin&do=news_cats'); - } - - $elem = array(); - - while($ar = $this->db->fetch_assoc($query)){ $elem[] = intval($ar['id']); } - - $elements = implode(", ", $elem); - - if(!$this->db->remove_fast("mcr_news", "id IN ($elements)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=news_cats'); } - - $count2 = $this->db->affected_rows(); - - if(!$this->db->remove_fast("mcr_news_views", "nid IN ($elements)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=news_cats'); } - - $count3 = $this->db->affected_rows(); - - if(!$this->db->remove_fast("mcr_news_votes", "nid IN ($elements)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=news_cats'); } - - $count4 = $this->db->affected_rows(); - // Последнее обновление пользователя $this->db->update_user($this->user); // Лог действия $this->db->actlog($this->lng['log_del_cn']." $list ".$this->lng['log_cn'], $this->user->id); - $this->core->notify($this->core->lng["e_success"], $this->lng['cn_del_elements']." $count, ".$this->lng['cn_del_elements2']." $count2, ".$this->lng['cn_del_elements3']." $count3, ".$this->lng['cn_del_elements5']." $count4", 3, '?mode=admin&do=news_cats'); + $this->core->notify($this->core->lng["e_success"], $this->lng['cn_del_elements']." $count", 3, '?mode=admin&do=news_cats'); } diff --git a/upload/modules/admin/users.class.php b/upload/modules/admin/users.class.php index 8e5c459..0153ffb 100644 --- a/upload/modules/admin/users.class.php +++ b/upload/modules/admin/users.class.php @@ -176,18 +176,6 @@ $count = $this->db->affected_rows(); - if(!$this->db->remove_fast("mcr_news_votes", "uid IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=users'); } - - $count1 = $this->db->affected_rows(); - - if(!$this->db->remove_fast("mcr_news_views", "uid IN ($list)")){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=users'); } - - $count2 = $this->db->affected_rows(); - - if(!$this->db->remove_fast("mcr_comments", "uid IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=users'); } - - $count3 = $this->db->affected_rows(); - foreach($logins as $key => $value){ if(file_exists(MCR_SKIN_PATH.$value.'.png')){ @unlink(MCR_SKIN_PATH.$value.'.png'); } if(file_exists(MCR_SKIN_PATH.'interface/'.$value.'.png')){ @unlink(MCR_SKIN_PATH.'interface/'.$value.'.png'); } @@ -201,7 +189,7 @@ // Лог действия $this->db->actlog($this->lng['log_del_user']." $list ".$this->lng['log_user'], $this->user->id); - $this->core->notify($this->core->lng["e_success"], $this->lng['user_del_elements']." $count, ".$this->lng['user_del_elements2']." $count3, ".$this->lng['user_del_elements3']." $count1, ".$this->lng['user_del_elements4']." $count2", 3, '?mode=admin&do=users'); + $this->core->notify($this->core->lng["e_success"], $this->lng['user_del_elements']." $count", 3, '?mode=admin&do=users'); } diff --git a/upload/modules/ajax/monitoring.php b/upload/modules/ajax/monitoring.php index 6631080..62bba24 100644 --- a/upload/modules/ajax/monitoring.php +++ b/upload/modules/ajax/monitoring.php @@ -27,7 +27,11 @@ $array = $data = array(); while($r = $this->db->fetch_assoc($query)){ - if((intval($r['last_update'])+intval($r['updater']))>$time){ continue; } + + $last = intval($r['last_update']); + $next = $last+intval($r['updater']); + + if($next>$time){ continue; } $array[] = array( 'id' => intval($r['id']), @@ -51,7 +55,7 @@ $mon = $m->loading($ar['type']); } - $mon->connect($ar['ip'], $ar['port']); + $connect = $mon->connect($ar['ip'], $ar['port']); $id = intval($ar['id']); @@ -61,10 +65,13 @@ $plugins = $this->db->safesql($mon->plugins); $map = $this->db->safesql($mon->map); $error = $this->db->safesql($mon->error); + $online = intval($mon->online); + $status = intval($mon->status); + $slots = intval($mon->slots); $update = $this->db->query("UPDATE `mcr_monitoring` - SET `status`='{$mon->status}', `version`='$version', online='{$mon->online}', - slots='{$mon->slots}', players='$players', motd='$motd', map='$map', + SET `status`='$status', `version`='$version', online='$online', + slots='$slots', players='$players', motd='$motd', map='$map', plugins='$plugins', last_error='$error', last_update='$time' WHERE id='$id'"); diff --git a/upload/modules/ajax/news.php b/upload/modules/ajax/news.php index c55186c..c150213 100644 --- a/upload/modules/ajax/news.php +++ b/upload/modules/ajax/news.php @@ -10,7 +10,7 @@ $this->db = $core->db; $this->config = $core->config; $this->user = $core->user; - $this->lng = $core->lng_m; + $this->lng = $core->load_language('news'); } private function is_discus($nid=1){ diff --git a/upload/modules/ajax/news_attach.php b/upload/modules/ajax/news_attach.php index 7b2a2e1..48a9106 100644 --- a/upload/modules/ajax/news_attach.php +++ b/upload/modules/ajax/news_attach.php @@ -10,7 +10,7 @@ $this->db = $core->db; $this->config = $core->config; $this->user = $core->user; - $this->lng = $core->lng_m; + $this->lng = $core->load_language('news'); } public function content(){ diff --git a/upload/modules/ajax/news_delete.php b/upload/modules/ajax/news_delete.php index f37fa02..42277e5 100644 --- a/upload/modules/ajax/news_delete.php +++ b/upload/modules/ajax/news_delete.php @@ -10,7 +10,7 @@ $this->db = $core->db; $this->config = $core->config; $this->user = $core->user; - $this->lng = $core->lng_m; + $this->lng = $core->load_language('news'); } public function content(){ @@ -21,14 +21,7 @@ $id = intval(@$_POST['id']); - $delete = $this->db->query("DELETE FROM `mcr_news` WHERE id='$id'"); - if(!$delete){ $this->core->js_notify($this->core->lng['e_sql_critical'].' #'.__LINE__); } - - $delete = $this->db->query("DELETE FROM `mcr_news_views` WHERE nid='$id'"); - if(!$delete){ $this->core->js_notify($this->core->lng['e_sql_critical'].' #'.__LINE__); } - - $delete = $this->db->query("DELETE FROM `mcr_news_votes` WHERE id='$id'"); - if(!$delete){ $this->core->js_notify($this->core->lng['e_sql_critical'].' #'.__LINE__); } + if(!$this->db->remove_fast("mcr_news", "id='$id'")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_sql_critical'].' #'.__LINE__, 2, '?mode=admin&do=menu'); } // Последнее обновление пользователя $this->db->update_user($this->user); diff --git a/upload/modules/ajax/register.php b/upload/modules/ajax/register.php index 31d6fdb..d7363d0 100644 --- a/upload/modules/ajax/register.php +++ b/upload/modules/ajax/register.php @@ -10,26 +10,26 @@ $this->db = $core->db; $this->config = $core->config; $this->user = $core->user; - $this->lng = $core->lng_m; + $this->lng = $core->load_language('register'); } public function content(){ if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->js_notify($this->core->lng['e_hack']); } - if($this->user->is_auth){ $this->core->js_notify($this->lng['reg_e_already']); } + if($this->user->is_auth){ $this->core->js_notify($this->lng['e_already']); } $login = $this->db->safesql(@$_POST['login']); $email = $this->db->safesql(@$_POST['email']); $uuid = $this->db->safesql($this->user->logintouuid(@$_POST['login'])); $password = @$_POST['password']; - if(intval($_POST['rules'])!==1){ $this->core->js_notify($this->lng['reg_e_rules']); } + if(intval($_POST['rules'])!==1){ $this->core->js_notify($this->lng['e_rules']); } - if(!preg_match("/^[\w\-]{3,}$/i", $login)){ $this->core->js_notify($this->lng['reg_e_login_regexp']); } - if(!filter_var($email, FILTER_VALIDATE_EMAIL)){ $this->core->js_notify($this->lng['reg_e_email_regexp']); } + if(!preg_match("/^[\w\-]{3,}$/i", $login)){ $this->core->js_notify($this->lng['e_login_regexp']); } + if(!filter_var($email, FILTER_VALIDATE_EMAIL)){ $this->core->js_notify($this->lng['e_email_regexp']); } - if($login=='default'){ $this->core->js_notify($this->lng['reg_e_exist']); } + if($login=='default'){ $this->core->js_notify($this->lng['e_exist']); } $query = $this->db->query("SELECT COUNT(*) FROM `mcr_users` WHERE login='$login' OR email='$email'"); @@ -37,11 +37,11 @@ $ar = $this->db->fetch_array($query); - if($ar[0]>0){ $this->core->js_notify($this->lng['reg_e_exist']); } + if($ar[0]>0){ $this->core->js_notify($this->lng['e_exist']); } - if(mb_strlen($password, "UTF-8")<6){ $this->core->js_notify($this->lng['reg_e_pass_length']); } + if(mb_strlen($password, "UTF-8")<6){ $this->core->js_notify($this->lng['e_pass_length']); } - if($password !== @$_POST['repassword']){ $this->core->js_notify($this->lng['reg_e_pass_match']); } + if($password !== @$_POST['repassword']){ $this->core->js_notify($this->lng['e_pass_match']); } if(!$this->core->captcha_check()){ $this->core->js_notify($this->core->lng['e_captcha']); } @@ -99,12 +99,12 @@ $message = $this->core->sp(MCR_THEME_PATH."modules/register/body.mail.html", $data_mail); - if(!$this->core->send_mail($email, $this->lng['reg_title'], $message)){ $this->core->js_notify($this->core->lng['e_sql_critical']); } + if(!$this->core->send_mail($email, $this->lng['msg_title'], $message)){ $this->core->js_notify($this->core->lng['e_sql_critical']); } - $this->core->js_notify($this->lng['reg_e_success_mail'], $this->core->lng['e_success'], true); + $this->core->js_notify($this->lng['e_success_mail'], $this->core->lng['e_success'], true); } - $this->core->js_notify($this->lng['reg_e_success'], $this->core->lng['e_success'], true); + $this->core->js_notify($this->lng['e_success'], $this->core->lng['e_success'], true); } } diff --git a/upload/modules/statics.php b/upload/modules/statics.php index 82ef6a8..d172abf 100644 --- a/upload/modules/statics.php +++ b/upload/modules/statics.php @@ -22,7 +22,7 @@ public function content(){ - if(!isset($_GET['id']) || empty($_GET['id'])){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); } + if(!isset($_GET['id']) || empty($_GET['id'])){ $this->core->notify($this->core->lng['403'], $this->lng['e_403']); } $uniq = $this->db->safesql(@$_GET['id']); @@ -32,11 +32,11 @@ LEFT JOIN `mcr_users` AS `u` ON `u`.id=`s`.uid WHERE `s`.`uniq`='$uniq'"); - if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); } + if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng['403'], $this->lng['e_403']); } $ar = $this->db->fetch_assoc($query); - if(!$this->core->is_access($ar['permissions'])){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); } + if(!$this->core->is_access($ar['permissions'])){ $this->core->notify($this->core->lng['403'], $this->lng['e_403']); } $uniq = $this->db->HSC($uniq); $title = $this->db->HSC($ar['title']); diff --git a/upload/themes/default/blocks/profile/auth.html b/upload/themes/default/blocks/profile/auth.html index 0046873..52b3b06 100644 --- a/upload/themes/default/blocks/profile/auth.html +++ b/upload/themes/default/blocks/profile/auth.html @@ -10,7 +10,7 @@ diff --git a/upload/themes/default/css/global.css b/upload/themes/default/css/global.css index a32ce08..e8bd677 100644 --- a/upload/themes/default/css/global.css +++ b/upload/themes/default/css/global.css @@ -782,6 +782,10 @@ margin-bottom: 5px; } +.adm-info-modules .thumbnails .thumbnail > img { + max-height: 130px; +} + .adm-info-modules .thumbnails .title { margin: 8px 0px; } diff --git a/upload/themes/default/js/modules/admin/info-extensions.js b/upload/themes/default/js/modules/admin/info-extensions.js index 3cb303f..6859bf9 100644 --- a/upload/themes/default/js/modules/admin/info-extensions.js +++ b/upload/themes/default/js/modules/admin/info-extensions.js @@ -2,8 +2,13 @@ $.ajax({ url: "http://api.webmcr.com/?do=extensions&limit=12", - beforeSend: function(){ $(".adm-info-modules .thumbnails").html($.mcr.loader); }, dataType: "json", + type: "GET", + async: true, + cache: false, + contentType: false, + processData: false, + beforeSend: function(){ $(".adm-info-modules .thumbnails").html(mcr.loader); }, success: function(json){ $(".adm-info-modules .thumbnails").text(''); @@ -16,7 +21,7 @@ var btn_name = (ar.pay.status) ? lng_ie.buy+' ('+ar.pay.price+' р.)' : lng_ie.download; - $(".adm-info-modules .thumbnails").append('
  • img
    ' + ar.title + '
    '+lng_ie.readmore+'
    - lng_m['info_count_views']; ?>< + lng_m['info_count_views']; ?> - lng_m['info_count_votes']; ?>< + lng_m['info_count_votes']; ?> - lng_m['info_count_cats']; ?>< + lng_m['info_count_cats']; ?> - lng_m['info_count_coms']; ?>< + lng_m['info_count_coms']; ?> diff --git a/upload/uploads/tmp/sess_fu601lcrg90trvnhd3c3tbj9n3 b/upload/uploads/tmp/sess_fu601lcrg90trvnhd3c3tbj9n3 new file mode 100644 index 0000000..a4fdc6d --- /dev/null +++ b/upload/uploads/tmp/sess_fu601lcrg90trvnhd3c3tbj9n3 @@ -0,0 +1 @@ +views-new-1|b:1;add_comment|i:1464972140; \ No newline at end of file