Merge pull request #98 from Erwane/1.8

disable mushraider.com checks
st3ph · Jun 3, 2021 · 90ef048 · 90ef048
2 parents 1f2af9d + f42977a
commit 90ef048
Show file tree

Hide file tree

Showing 50 changed files with 267 additions and 233 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -17,6 +17,7 @@
 *.properties text
 *.txt text
 *.xml text
+*.svg text
 *.yml text
 .htaccess text
 
@@ -34,10 +35,16 @@
 *.mo binary
 *.pdf binary
 *.phar binary
-*.otf binary
-*.eot binary
-*.svg binary
-*.ttf binary
 *.woff binary
 *.woff2 binary
 *.mp4 binary
+*.ttf binary
+*.otf binary
+*.eot binary
+*.gz binary
+*.bz2 binary
+*.7z binary
+*.zip binary
+*.docx binary
+*.xlsx binary
+*.mmdb binary
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,9 @@
 /app/tmp/cache/views/*
 /app/webroot/files/*
 
+/storage
+/vendor
+
 # OS generated files #
 ######################
 .DS_Store
@@ -17,4 +20,28 @@
 .Trashes
 Icon?
 ehthumbs.db
-Thumbs.db
+Thumbs.db
+
+# Tool specific files #
+#######################
+# vim
+*~
+*.swp
+*.swo
+# sublime text & textmate
+*.sublime-*
+*.stTheme.cache
+*.tmlanguage.cache
+*.tmPreferences.cache
+# Eclipse
+.settings/*
+# JetBrains, aka PHPStorm, IntelliJ IDEA
+.idea/*
+# NetBeans
+nbproject/*
+# Visual Studio Code
+.vscode
+# Sass preprocessor
+.sass-cache/
+/.phpstorm.meta.php
+/.phpunit.result.cache
diff --git a/app/Config/core.php b/app/Config/core.php
@@ -38,7 +38,7 @@
 
 
 	Configure::write('debug', 0);
-	Configure::write('mushraider', array('version' => '1.7.0.4', 'date' => '2019-12-12'));
+	Configure::write('mushraider', array('version' => '1.8.0.0', 'date' => '2021-06-03'));
 
 /**
  * Configure the Error handler used to handle errors for your application. By default

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
@@ -48,8 +48,8 @@ public function beforeFilter() {
 		parent::beforeFilter();
 
         // Check conf file
-        if(!file_exists('../Config/config.ini')) {
-            file_put_contents('../Config/config.ini', '');
+        if(!file_exists(CONFIG . 'config.ini')) {
+            file_put_contents(CONFIG . 'config.ini', '');
         }
 
         Configure::config('configini', new IniReader());

diff --git a/app/Plugin/Admin/Controller/AdminAppController.php b/app/Plugin/Admin/Controller/AdminAppController.php
@@ -1,7 +1,6 @@
 <?php
 App::uses('HttpSocket', 'Network/Http');
 class AdminAppController extends AppController {
-    public $components = array('Admin.Mushstats');
     public $uses = array();
     public $helpers = array('Admin.Admin');
 
@@ -40,18 +39,23 @@ private function checkUpdate() {
             $mushraider['version'] = 0;
             $mushraider['date'] = '0000-00-00';
         }
-        $jsonUrl = 'http://medias.mushraider.com/version.json';
+
+        $jsonUrl = 'https://api.github.com/repos/st3ph/mushraider/tags?per_page=1';
         $HttpSocket = new HttpSocket(['timeout' => 1]);
 		$response = $HttpSocket->get($jsonUrl);
-		if (empty($response->body)) {
-			return;
+		if ($response->isOk()) {
+			$tag = json_decode($response->body);
+			if (!$tag) {
+				return;
+			}
+			$lastVersion = str_replace('v', '', $tag[0]->name);
+
+			// Check if version is different
+			// Be sure the server is newer than the current app
+			if(version_compare($mushraider['version'], $lastVersion, '<')) {
+				$updateMsg = __('<strong>MushRaider %s</strong> is available! <a href="https://github.com/st3ph/mushraider/tags" target="_blank">Please update now</a>', $lastVersion);
+				$this->set('updateAvailable', $updateMsg);
+			}
 		}
-        $lastVersion = json_decode($response->body);
-        // Check if version is different
-        // Be sure the server is newer than the current app
-        if(($mushraider['version'] != $lastVersion->version && $mushraider['date'] < $lastVersion->date) || ($mushraider['version'] == $lastVersion->version && $mushraider['date'] < $lastVersion->date)) {
-            $updateMsg = __('<strong>MushRaider %s</strong> is available! <a href="http://mushraider.com/download" target="_blank">Please update now</a>', $lastVersion->version);
-            $this->set('updateAvailable', $updateMsg);
-        }
     }
 }
diff --git a/app/Plugin/Admin/Controller/PatcherController.php b/app/Plugin/Admin/Controller/PatcherController.php
@@ -23,15 +23,15 @@ public function apply($patch = null) {
     	if(!empty($this->request->data['Patcher'])) {
             $db = ConnectionManager::getDataSource('default');
             $db->cacheSources = false;
-            
+
     		$error = false;
 	    	$databaseConfig = Configure::read('Database');
             $this->dbPrefix = $databaseConfig['prefix'];
 	        if(!$mysqlLink = mysqli_connect($databaseConfig['host'], $databaseConfig['login'], $databaseConfig['password'], $databaseConfig['database'], $databaseConfig['port'])) {
 	            $error = true;
 	        }
-	    	
-	    	$sqlReport = $this->Patcher->run_sql_file($mysqlLink, '../Config/Schema/sql/mushraider_patch_'.$patch.'.sql', $this->dbPrefix);
+
+	    	$sqlReport = $this->Patcher->run_sql_file($mysqlLink, CONFIG . 'Schema/sql/mushraider_patch_'.$patch.'.sql', $this->dbPrefix);
 	    	$mysqlLink = null;
 
 	        if($sqlReport['success'] != $sqlReport['total']) {
@@ -46,11 +46,11 @@ public function apply($patch = null) {
                 Cache::clear(false, '_cake_core_');
                 Cache::clear(false, '_cake_model_');
                 Cache::clear(false);
-                
+
                 $methodName = str_replace('-', '', $patch);
 	        	$methodName = str_replace('.', '', $methodName);
 	        	if(method_exists($this, $methodName)) {
-	        		$this->$methodName();	        		
+	        		$this->$methodName();
 	        	}
 
                 // Delete cache for obvious reasons :p
@@ -94,7 +94,7 @@ public function beta3() {
 				}else {
 					$toSaveCharacter['created'] = date('Y-m-d H:i:s');
 				}
-												
+
 				$this->Character->save($toSaveCharacter);
     		}
     	}
@@ -198,11 +198,11 @@ public function v15() {
 
         $this->Setting->setOption('calendar', json_encode($calendar));
 
-        // Set main characters        
+        // Set main characters
         $sql = "SELECT t.user_id, t.game_id, t.character_id, MAX(t.used) AS nb_used
                 FROM (
                     SELECT ec.user_id, e.game_id, ec.character_id, COUNT(ec.id) AS used
-                    FROM ".$this->dbPrefix."events_characters ec 
+                    FROM ".$this->dbPrefix."events_characters ec
                     JOIN ".$this->dbPrefix."users u ON ec.user_id=u.id
                     JOIN ".$this->dbPrefix."events e ON e.id=ec.event_id
                     GROUP BY ec.character_id
@@ -302,4 +302,4 @@ public function v162() {
         $notifications['comments'] = 0;
         $this->Setting->setOption('notifications', json_encode($notifications));
     }
-}
+}
diff --git a/app/Plugin/Admin/webroot/css/styles.css b/app/Plugin/Admin/webroot/css/styles.css
@@ -1225,7 +1225,7 @@ span.formTip {font-size:11px;font-style:italic;}
   webkit-transition: all 0.4s ease-out 0s;
   -moz-transition: all 0.4s ease-out 0s;
   -o-transition: all 0.4s ease-out 0s;
-  transition: all 0.4s ease-out 0s;  
+  transition: all 0.4s ease-out 0s;
 }
 #menu ul li a:hover {padding-left:15px;}
 .form-group {margin-bottom:10px;}
@@ -1254,7 +1254,7 @@ table.table-striped tbody.ui-sortable tr.sortable-placeholder td:last-child {bor
 .quick-btn .waiting {position: absolute;right: -5px;bottom: -5px;top:auto;}
 #mushInfos {margin-top:100px;}
 #mushInfos .lead {text-shadow:2px 2px #fff;}
-#mushInfos .social {text-align;:center;}
+#mushInfos .social {text-align:center;}
 #mushInfos .social li {vertical-align:top}
 #mushInfos .social li.googleplus {padding-top:2px;}
 
@@ -1296,4 +1296,4 @@ table.table-striped tbody.ui-sortable tr.sortable-placeholder td:last-child {bor
 #summary {margin-bottom:50px;}
 
 /* Widget */
-.integrationCode textarea {width:90%;}
+.integrationCode textarea {width:90%;}
diff --git a/app/Plugin/Install/Controller/InstallAppController.php b/app/Plugin/Install/Controller/InstallAppController.php
@@ -2,21 +2,21 @@
 App::uses('IniReader', 'Configure');
 App::uses('Controller', 'Controller');
 class InstallAppController extends Controller {
-	public function beforeFilter() {		
+	public function beforeFilter() {
 		parent::beforeFilter();
 
-        if(!file_exists('../Config/config.ini')) {
-            file_put_contents('../Config/config.ini', '');
+        if(!file_exists(CONFIG . 'config.ini')) {
+            file_put_contents(CONFIG . 'config.ini', '');
         }
-        
+
         Configure::config('configini', new IniReader());
         Configure::load('config.ini', 'configini');
 
 		// If config already set, redirect to root
-		if(file_exists('../Config/config.ini')) {
+		if(file_exists(CONFIG . 'config.ini')) {
             if(Configure::read('Settings.installed')) {
             	$this->Session->setFlash(__('MushRaider can see the database config, why do you want to install ?'), 'flash_warning');
-            	$this->redirect('/');            	
+            	$this->redirect('/');
             }
 		}
 
@@ -25,4 +25,4 @@ public function beforeFilter() {
         $languages = array('eng' => 'English', 'fra' => 'Français', 'deu' => 'Deutsch');
         $this->set('languages', $languages);
 	}
-}
+}
diff --git a/app/Plugin/Install/Controller/StepController.php b/app/Plugin/Install/Controller/StepController.php
@@ -39,11 +39,11 @@ private function step1() {
             $systemCheck['rewrite']['warning'] = true;
         }
 
-        $systemCheck['config']['passed'] = is_writable('../Config')?true:false;
+        $systemCheck['config']['passed'] = is_writable(CONFIG);
         $systemCheckPassed = $systemCheck['config']['passed']?$systemCheckPassed:false;
-        $systemCheck['tmp']['passed'] = is_writable('../tmp')?true:false;
+        $systemCheck['tmp']['passed'] = is_writable(APP . 'tmp');
         $systemCheckPassed = $systemCheck['tmp']['passed']?$systemCheckPassed:false;
-        $systemCheck['files']['passed'] = is_writable('../webroot/files')?true:false;
+        $systemCheck['files']['passed'] = is_writable(APP . 'webroot/files');
         $systemCheckPassed = $systemCheck['files']['passed']?$systemCheckPassed:false;
 
         $this->set('systemCheckPassed', $systemCheckPassed);
@@ -52,7 +52,7 @@ private function step1() {
 
     private function step2() {
         $this->Session->delete('Settings');
-        
+
         if(!empty($this->request->data['Config'])) {
             $dataSource = !empty($this->request->data['Config']['datasource']) && !empty($this->dbDatasources[$this->request->data['Config']['datasource']])?$this->dbDatasources[$this->request->data['Config']['datasource']]:'Mysql';
 
@@ -62,7 +62,7 @@ private function step2() {
             $databaseConfig['database'] = trim($this->request->data['Config']['database']);
             $databaseConfig['login'] = trim($this->request->data['Config']['login']);
             $databaseConfig['password'] = $this->request->data['Config']['password'];
-            $databaseConfig['port'] = !empty($this->request->data['Config']['port'])?trim($this->request->data['Config']['port']):ini_get("mysqli.default_port");            
+            $databaseConfig['port'] = !empty($this->request->data['Config']['port'])?trim($this->request->data['Config']['port']):ini_get("mysqli.default_port");
             $databaseConfig['prefix'] = trim($this->request->data['Config']['prefix']);
 
             if($link = @mysqli_connect($databaseConfig['host'], $databaseConfig['login'], $databaseConfig['password'], $databaseConfig['database'], $databaseConfig['port'])) {
@@ -110,12 +110,12 @@ private function step3() {
                     $error = true;
                 }
                 // Create tables
-                $sqlReport = $this->Patcher->run_sql_file($mysqlLink, '../Config/Schema/sql/mushraider.sql', $databaseConfig['prefix']);                
+                $sqlReport = $this->Patcher->run_sql_file($mysqlLink, CONFIG . 'Schema/sql/mushraider.sql', $databaseConfig['prefix']);
                 if($sqlReport['success'] != $sqlReport['total']) {
                     $error = true;
                 }
                 // Add datas
-                $sqlReport = $this->Patcher->run_sql_file($mysqlLink, '../Config/Schema/sql/mushraider_data.sql', $databaseConfig['prefix']);
+                $sqlReport = $this->Patcher->run_sql_file($mysqlLink, CONFIG . 'Schema/sql/mushraider_data.sql', $databaseConfig['prefix']);
                 if($sqlReport['success'] != $sqlReport['total']) {
                     $error = true;
                 }
@@ -180,7 +180,7 @@ public function step4() {
 
     private function postInstallData($siteTitle) {
         // Add default settings
-        $host = substr_count($_SERVER['HTTP_HOST'], '.') > 1?substr($_SERVER['HTTP_HOST'], strpos($_SERVER['HTTP_HOST'], '.') + 1):$_SERVER['HTTP_HOST'];                        
+        $host = substr_count($_SERVER['HTTP_HOST'], '.') > 1?substr($_SERVER['HTTP_HOST'], strpos($_SERVER['HTTP_HOST'], '.') + 1):$_SERVER['HTTP_HOST'];
         $host = strpos($host, ':') !== false?substr($host, 0, strpos($host, ':')):$host; // Remove port if present on unusual configurations
 
         App::uses('Setting', 'Model');
@@ -219,7 +219,7 @@ private function postInstallData($siteTitle) {
                                             'dungeonIcon' => 1
                                         ));
         $defaultSettings['timezone'] = 'Europe/Paris';
-        
+
         foreach($defaultSettings as $option => $value) {
             $settingModel->create();
             $settingModel->save(array('option' => $option, 'value' => $value));
@@ -252,4 +252,4 @@ private function postInstallData($siteTitle) {
         $RolePermissionRoleModel->__add(array('role_id' => $RoleModel->getIdByAlias('officer'), 'role_permission_id' => $RolePermissionModel->getIdByAlias('create_templates')));
         $RolePermissionRoleModel->__add(array('role_id' => $RoleModel->getIdByAlias('officer'), 'role_permission_id' => $RolePermissionModel->getIdByAlias('create_reports')));
     }
-}
+}
diff --git a/lib/Cake/Console/Command/CompletionShell.php b/lib/Cake/Console/Command/CompletionShell.php
@@ -149,7 +149,7 @@ public function getOptionParser() {
  */
 	protected function _output($options = array()) {
 		if ($options) {
-			return $this->out(implode($options, ' '));
+			return $this->out(implode(' ', $options));
 		}
 	}
 }
diff --git a/lib/Cake/Console/Command/SchemaShell.php b/lib/Cake/Console/Command/SchemaShell.php
@@ -53,7 +53,7 @@ public function startup() {
 		$this->out('Cake Schema Shell');
 		$this->hr();
 
-		Configure::write('Cache.disable', 1);
+		Configure::write('Cache.disable', true);
 
 		$name = $path = $connection = $plugin = null;
 		if (!empty($this->params['name'])) {

diff --git a/lib/Cake/Console/Command/Task/ModelTask.php b/lib/Cake/Console/Command/Task/ModelTask.php
@@ -388,7 +388,7 @@ public function initValidations() {
 		sort($options);
 		$default = 1;
 		foreach ($options as $option) {
-			if ($option{0} !== '_') {
+			if ($option[0] !== '_') {
 				$choices[$default] = $option;
 				$default++;
 			}

diff --git a/lib/Cake/Console/Command/TestShell.php b/lib/Cake/Console/Command/TestShell.php
@@ -291,8 +291,8 @@ protected function _run($runnerArgs, $options = array()) {
 	public function available() {
 		$params = $this->_parseArgs();
 		$testCases = CakeTestLoader::generateTestList($params);
-		$app = $params['app'];
-		$plugin = $params['plugin'];
+		$app = isset($params['app']) ? $params['app'] : null;
+		$plugin = isset($params['plugin']) ? $params['plugin'] : null;
 
 		$title = "Core Test Cases:";
 		$category = 'core';

diff --git a/lib/Cake/Console/Command/UpgradeShell.php b/lib/Cake/Console/Command/UpgradeShell.php
@@ -237,7 +237,7 @@ public function helpers() {
 		foreach ($helpers as $helper) {
 			$helper = preg_replace('/Helper$/', '', $helper);
 			$oldHelper = $helper;
-			$oldHelper{0} = strtolower($oldHelper{0});
+			$oldHelper[0] = strtolower($oldHelper[0]);
 			$patterns[] = array(
 				"\${$oldHelper} to \$this->{$helper}",
 				"/\\\${$oldHelper}->/",

diff --git a/lib/Cake/Console/ConsoleOptionParser.php b/lib/Cake/Console/ConsoleOptionParser.php
@@ -620,8 +620,8 @@ protected function _optionExists($name) {
 		if (substr($name, 0, 2) === '--') {
 			return isset($this->_options[substr($name, 2)]);
 		}
-		if ($name{0} === '-' && $name{1} !== '-') {
-			return isset($this->_shortOptions[$name{1}]);
+		if ($name[0] === '-' && $name[1] !== '-') {
+			return isset($this->_shortOptions[$name[1]]);
 		}
 		return false;
 	}

diff --git a/lib/Cake/Console/ConsoleOutput.php b/lib/Cake/Console/ConsoleOutput.php
@@ -265,7 +265,7 @@ protected function _replaceTags($matches) {
 				$styleInfo[] = static::$_options[$option];
 			}
 		}
-		return "\033[" . implode($styleInfo, ';') . 'm' . $matches['text'] . "\033[0m";
+		return "\033[" . implode(';', $styleInfo) . 'm' . $matches['text'] . "\033[0m";
 	}
 
 /**