webMCRex 2.1 release

WorldsOfCubes · Aug 1, 2015 · 0799975 · 0799975
2 parents 0c890ff + 8b42aed
commit 0799975
Show file tree

Hide file tree

Showing 40 changed files with 504 additions and 430 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ upload/MineCraft/tmp/skin_buffer/
 upload/main.cfg.php
 *log.txt
 log.txt
+upload/cache/*.php
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # webMCR
 
  - **Author** : NC22 (modified by WorldsOfCubes Group)
- - **Version** : 2.0
+ - **Version** : 2.1
  - **Website** : [WorldsOfCubes.NET](http://WorldsOfCubes.NET)
  - **Wiki** : [bitbucket.org/WorldsOfCubes/webmcrex/wiki](http://bitbucket.org/WorldsOfCubes/webmcrex/wiki)
 

diff --git a/README_RUS.md b/README_RUS.md
@@ -1,7 +1,7 @@
 # webMCR
 
  - **Автор** : NC22 (modified by WorldsOfCubes Group)
- - **Версия** : 2.0
+ - **Версия** : 2.1
  - **Сайт** : [WorldsOfCubes.NET](http://WorldsOfCubes.NET)
  - **Вики** : [bitbucket.org/WorldsOfCubes/webmcrex/wiki](http://bitbucket.org/WorldsOfCubes/webmcrex/wiki)
 

diff --git a/upload/action.php b/upload/action.php
@@ -6,6 +6,8 @@
 	exit;
 $method = (isset($_POST['method'])) ? $_POST['method'] : $_GET['method'];
 
+if((!isset($config['debug']) or !$config['debug']) and is_dir(MCR_ROOT.'install'))
+	exit("Please remove 'install' directory");
 switch ($method) {
 	case 'comment':
 	case 'del_com':
@@ -232,8 +234,13 @@
 
 		$mod_user = $user;
 
-		if ($user->lvl() >= 15 and !empty($_POST['user_id']))
+		if ($user->lvl() >= 15 and !empty($_POST['user_id'])) {
+
+			if(!isset($_POST['passwrd']) or ! $user->authenticate($_POST['passwrd']))
+				aExit(2, lng("WRONG_PASSWORD"));
+
 			$mod_user = new User((int)$_POST['user_id']);
+		}
 
 		if (!$mod_user->id())
 			aExit(2, lng('USER_NOT_EXIST'));

diff --git a/upload/cache/.htaccess b/upload/cache/.htaccess
@@ -0,0 +1,3 @@
+<Files *>
+Deny from all 
+</Files>
diff --git a/upload/index.php b/upload/index.php
@@ -132,7 +132,10 @@ function show_error($html, $page) {
 	$mode = $config['s_dpage'];
 if ($mode == 'users')
 	$mode = 'user';
-
+if((!isset($config['debug']) or !$config['debug']) and is_dir(MCR_ROOT.'install')){
+	$content_main = View::ShowStaticPage('remove_install.html', 'other/install/');
+	$page = lng('REMOVE_INSTALL_FOLDER');
+} else
 switch ($mode) {
 	case 'start':
 		$page = 'Начать игру';
@@ -172,13 +175,15 @@ function show_error($html, $page) {
 $content_js .= InitJS();
 if (!empty($user) and $mode != 'pm')
 	$content_side .= CheckPM();
-ob_start();
+//ob_start();
+if ($tpl_cache_info['updated'])
+	TemplateParser::UpdateCacheInfo();
 include View::Get('index.html');
-$html_page = ob_get_clean();
-loadTool("template.class.php");
-$parser = new TemplateParser();
-$html_page = $parser->parse($html_page);
-echo $html_page;
+//$html_page = ob_get_clean();
+//loadTool("template.class.php");
+//$parser = new TemplateParser();
+//$html_page = $parser->parse($html_page);
+//echo $html_page;
 if(isset($config['debug']) and $config['debug']) {
 	echo (memory_get_usage() - $mem_start)/1024 . "КБ памяти использовано";
 	echo "\n<br />SQL запросов сделано: ".$queries."\r\n";

diff --git a/upload/install/CMS/config/config_usual.php b/upload/install/CMS/config/config_usual.php
@@ -63,6 +63,7 @@
 );
 
 $site_ways = array(
+	'cache' => 'cache/',
 	'style' => 'style/',
 	'mcraft' => 'MineCraft/',
 	'skins' => 'MinecraftSkins/',

diff --git a/upload/install/CMS/config/config_wocauth.php b/upload/install/CMS/config/config_wocauth.php
diff --git a/upload/install/CMS/sql/sql_authme.php b/upload/install/CMS/sql/sql_authme.php
@@ -20,8 +20,10 @@
 
 BD($bd_alter_users."ADD `{$bd_users['deadtry']}` tinyint(1) DEFAULT 0;");
 BD($bd_alter_users."ADD `{$bd_users['female']}` tinyint(1) NOT NULL DEFAULT '2';");
+BD($bd_alter_users."ADD `wocid` bigint(20) NOT NULL DEFAULT 0;");
 BD($bd_alter_users."ADD `{$bd_users['email']}` varchar(50) DEFAULT NULL;");
 BD($bd_alter_users."ADD `{$bd_users['tmp']}` char(32) NOT NULL DEFAULT '0';");
+BD($bd_alter_users."ADD `woctoken` char(32) DEFAULT NULL;");
 BD($bd_alter_users."ADD `{$bd_users['group']}` int(10) NOT NULL DEFAULT 1;");
 BD($bd_alter_users."ADD `comments_num` int(10) NOT NULL DEFAULT 0;");
 BD($bd_alter_users."ADD `gameplay_last` datetime NOT NULL DEFAULT '0000-00-00 00:00:00';");

diff --git a/upload/install/CMS/sql/sql_common.php b/upload/install/CMS/sql/sql_common.php
@@ -194,10 +194,6 @@
 ('email-name', 'Info'),
 ('email-mail', 'noreply@noreply.ru');");
 
-if (!BD_ColumnExist($bd_names['users'], 'pass_set') && $mode == "wocauth")
-
-	BD("ALTER TABLE `{$bd_names['users']}` ADD `pass_set` tinyint(1) NOT NULL DEFAULT 0;");
-
 /* webMCR 2.05 UPDATE */
 
 if (!BD_ColumnExist($bd_names['ip_banning'], 'ban_type'))
@@ -285,6 +281,12 @@
 	BD("ALTER TABLE `{$bd_names['groups']}` ADD `change_prefix` SMALLINT(1) NOT NULL DEFAULT 0;");
 }
 
+/* webMCRex 2.1b4 UPDATE, fixed in 2.0b5 */
+if (!BD_ColumnExist($bd_names['users'], 'wocid')) {
+	BD("ALTER TABLE `{$bd_names['users']}` ADD `wocid` bigint(20) NOT NULL DEFAULT 0;");
+	BD("ALTER TABLE `{$bd_names['users']}` ADD `woctoken` char(32) NOT NULL DEFAULT '';");
+}
+
 BD("CREATE TABLE IF NOT EXISTS `{$bd_names['action_log']}` (
   `IP` varchar(16) NOT NULL,
   `first_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',

diff --git a/upload/install/CMS/sql/sql_usual.php b/upload/install/CMS/sql/sql_usual.php
@@ -5,11 +5,13 @@
 BD("CREATE TABLE IF NOT EXISTS `{$bd_names['users']}` (
   `{$bd_users['id']}` bigint(20) NOT NULL AUTO_INCREMENT,
   `{$bd_users['login']}` char(32) DEFAULT NULL,
+  `wocid` bigint(20) NOT NULL DEFAULT 0,
   `{$bd_users['female']}` tinyint(1) NOT NULL DEFAULT '2',
   `{$bd_users['deadtry']}` tinyint(1) DEFAULT 0,
   `{$bd_users['email']}` varchar(50) default NULL,
   `{$bd_users['password']}` char(32) DEFAULT NULL,
   `{$bd_users['tmp']}` char(32) NOT NULL DEFAULT '0',
+  `woctoken` bigint(20) NOT NULL DEFAULT 0,
   `{$bd_users['ip']}` varchar(16) DEFAULT NULL,
   `{$bd_users['group']}` int(10) NOT NULL DEFAULT 1,
   `comments_num` int(10) NOT NULL DEFAULT 0,

diff --git a/upload/install/CMS/sql/sql_wocauth.php b/upload/install/CMS/sql/sql_wocauth.php
diff --git a/upload/install/CMS/sql/sql_xauth.php b/upload/install/CMS/sql/sql_xauth.php
@@ -18,9 +18,11 @@
 
 BD($bd_alter_users."ADD `{$bd_users['deadtry']}` tinyint(1) DEFAULT 0;");
 BD($bd_alter_users."ADD `{$bd_users['session']}` varchar(255) DEFAULT NULL;");
+BD($bd_alter_users."ADD `wocid` bigint(20) NOT NULL DEFAULT 0;");
 BD($bd_alter_users."ADD `{$bd_users['clientToken']}` varchar(255) DEFAULT NULL;");
 BD($bd_alter_users."ADD `{$bd_users['server']}` varchar(255) DEFAULT NULL;");
 BD($bd_alter_users."ADD `{$bd_users['tmp']}` char(32) NOT NULL DEFAULT '0';");
+BD($bd_alter_users."ADD `woctoken` char(32) DEFAULT NULL;");
 BD($bd_alter_users."ADD `{$bd_users['female']}` tinyint(1) NOT NULL DEFAULT '0';");
 BD($bd_alter_users."ADD `{$bd_users['ip']}` varchar(16) DEFAULT NULL;");
 BD($bd_alter_users."ADD `{$bd_users['group']}` int(10) NOT NULL DEFAULT 1;");