View GitHub Repository evolution

Schedule Inspection
Subscribe
Completed
Push — develop ( 75b835...a38a21 )
by Maxim
09:33 queued 04:23
created
Status
Category
Toggle Patches
manager/actions/help/version_notices/1.2.2.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -1,5 +1,5 @@
 
 block discarded – undo
1 1 
 <?php
2 
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
2 
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3 3 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4 
 }
5 5 
 ?>
Please login to merge, or discard this patch.
manager/actions/help/version_notices/1.3.2.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -1,5 +1,5 @@
 
 block discarded – undo
1 1 
 <?php
2 
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
2 
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3 3 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4 
 }
5 5 
 ?>
Please login to merge, or discard this patch.
manager/actions/help/version_notices/1.3.0.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -1,5 +1,5 @@
 
 block discarded – undo
1 1 
 <?php
2 
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
2 
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3 3 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4 
 }
5 5 
 ?>
Please login to merge, or discard this patch.
manager/actions/help/version_notices/1.3.5.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -1,5 +1,5 @@
 
 block discarded – undo
1 1 
 <?php
2 
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
2 
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3 3 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4 
 }
5 5 
 ?>
Please login to merge, or discard this patch.
manager/actions/help/version_notices/1.3.3.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -1,5 +1,5 @@
 
 block discarded – undo
1 1 
 <?php
2 
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
2 
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3 3 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4 
 }
5 5 
 ?>
Please login to merge, or discard this patch.
manager/actions/help/02Documentation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -1,5 +1,5 @@
 
 block discarded – undo
1 1 
 <?php
2 
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
2 
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3 3 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4 
 }
5 5 
 ?>
Please login to merge, or discard this patch.
install/connection.collation.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -50,12 +50,12 @@  discard block
 
 block discarded – undo
50 50 
     foreach ($_ as $collation=>$selected) {
51 51 
         $collation = htmlentities($collation);
52 52 
         // if(substr($collation,0,4)!=='utf8') continue;
53 
-        if (strpos($collation, 'sjis')===0) {
53 
+        if (strpos($collation, 'sjis') === 0) {
54 54 
             continue;
55 55 
         }
56 
-        if ($collation=='recommend') {
56 
+        if ($collation == 'recommend') {
57 57 
             $output .= '<optgroup label="recommend">';
58 
-        } elseif ($collation=='unrecommend') {
58 
+        } elseif ($collation == 'unrecommend') {
59 59 
             $output .= '</optgroup><optgroup label="unrecommend">';
60 60 
         } else {
61 61 
             $output .= sprintf('<option value="%s" %s>%s</option>', $collation, $selected, $collation);
 
@@ -67,18 +67,18 @@  discard block
 
 block discarded – undo
67 67 
 echo $output;
68 68 
 exit;
69 69
70 
-function sortItem($array=array(), $order='utf8mb4,utf8')
70 
+function sortItem($array = array(), $order = 'utf8mb4,utf8')
71 71 
 {
72 72 
     $rs = array('recommend'=>'');
73 73 
     $order = explode(',', $order);
74 74 
     foreach ($order as $v) {
75 75 
         foreach ($array as $name=>$sel) {
76 
-            if (strpos($name, $v)!==false) {
76 
+            if (strpos($name, $v) !== false) {
77 77 
                 $rs[$name] = $array[$name];
78 78 
                 unset($array[$name]);
79 79 
             }
80 80 
         }
81 81 
     }
82 
-    $rs['unrecommend']='';
82 
+    $rs['unrecommend'] = '';
83 83 
     return $rs + $array;
84 84 
 }
85 85 
\ No newline at end of file
Please login to merge, or discard this patch.
install/functions.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch 
@@ -1,5 +1,5 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 
-if( ! function_exists('install_sessionCheck')) {
2 
+if (!function_exists('install_sessionCheck')) {
3 3 
     function install_sessionCheck()
4 4 
     {
5 5 
         global $_lang;
 
@@ -21,8 +21,8 @@  discard block
 
 block discarded – undo
21 21 
 </head>
22 22 
 <body>
23 23 
 	<div class="install">
24 
-		<p>' . $_lang["session_problem"] . '</p>
25 
-		<p><a href="./">' . $_lang["session_problem_try_again"] . '</a></p>
24 
+		<p>' . $_lang["session_problem"].'</p>
25 
+		<p><a href="./">' . $_lang["session_problem_try_again"].'</a></p>
26 26 
 	</div>
27 27 
 </body>
28 28 
 </html>';
 
@@ -32,11 +32,11 @@  discard block
 
 block discarded – undo
32 32 
     }
33 33 
 }
34 34
35 
-if( ! function_exists('parse')) {
35 
+if (!function_exists('parse')) {
36 36 
     function parse($src, $ph, $left = '[+', $right = '+]')
37 37 
     {
38 38 
         foreach ($ph as $k => $v) {
39 
-            $k = $left . $k . $right;
39 
+            $k = $left.$k.$right;
40 40 
             $src = str_replace($k, $v, $src);
41 41 
         }
42 42 
 
@@ -44,7 +44,7 @@  discard block
 
 block discarded – undo
44 44 
     }
45 45 
 }
46 46
47 
-if( ! function_exists('ph')) {
47 
+if (!function_exists('ph')) {
48 48 
     function ph()
49 49 
     {
50 50 
         global $_lang, $moduleName, $moduleVersion, $modx_textdir, $modx_release_date;
 
@@ -59,7 +59,7 @@  discard block
 
 block discarded – undo
59 59 
         $ph['textdir'] = $modx_textdir ? ' id="rtl"' : '';
60 60 
         $ph['help_link'] = $installmode == 0 ? $_lang['help_link_new'] : $_lang['help_link_upd'];
61 61 
         $ph['version'] = $moduleVersion;
62 
-        $ph['release_date'] = ($modx_textdir ? '&rlm;' : '') . $modx_release_date;
62 
+        $ph['release_date'] = ($modx_textdir ? '&rlm;' : '').$modx_release_date;
63 63 
         $ph['footer1'] = $_lang['modx_footer1'];
64 64 
         $ph['footer2'] = $_lang['modx_footer2'];
65 65 
         $ph['current_year'] = date('Y');
 
@@ -68,7 +68,7 @@  discard block
 
 block discarded – undo
68 68 
     }
69 69 
 }
70 70
71 
-if( ! function_exists('get_installmode')) {
71 
+if (!function_exists('get_installmode')) {
72 72 
     function get_installmode()
73 73 
     {
74 74 
         global $base_path, $database_server, $database_user, $database_password, $dbase, $table_prefix;
 
@@ -127,7 +127,7 @@  discard block
 
 block discarded – undo
127 127 
     }
128 128 
 }
129 129
130 
-if( ! function_exists('getLangs')) {
130 
+if (!function_exists('getLangs')) {
131 131 
     /**
132 132 
      * @param $install_language
133 133 
      * @return string
 
@@ -141,7 +141,7 @@  discard block
 
 block discarded – undo
141 141 
         }
142 142
143 143 
         $langs = array();
144 
-        if ($handle = opendir("../" . MGR_DIR . "/includes/lang")) {
144 
+        if ($handle = opendir("../".MGR_DIR."/includes/lang")) {
145 145 
             while (false !== ($file = readdir($handle))) {
146 146 
                 if (strpos($file, '.inc.') !== false) {
147 147 
                     $langs[] = $file;
Please login to merge, or discard this patch.
install/sqlParser.class.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch 
@@ -3,7 +3,7 @@  discard block
 
 block discarded – undo
3 3 
 // MySQL Dump Parser
4 4 
 // SNUFFKIN/ Alex 2004
5 5
6 
-class SqlParser {
6 
+class SqlParser{
7 7 
 	public $host;
8 8 
 	public $dbname;
9 9 
 	public $prefix;
 
@@ -28,7 +28,7 @@  discard block
 
 block discarded – undo
28 28 
     public $ignoreDuplicateErrors;
29 29 
     public $autoTemplateLogic;
30 30
31 
-	public function __construct($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent') {
31 
+	public function __construct($host, $user, $password, $db, $prefix = 'modx_', $adminname, $adminemail, $adminpass, $connection_charset = 'utf8', $managerlanguage = 'english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent'){
32 32 
 		$this->host = $host;
33 33 
 		$this->dbname = $db;
34 34 
 		$this->prefix = $prefix;
 
@@ -44,28 +44,28 @@  discard block
 
 block discarded – undo
44 44 
         $this->autoTemplateLogic = $auto_template_logic;
45 45 
 	}
46 46
47 
-	public function connect() {
47 
+	public function connect(){
48 48 
 		$this->conn = mysqli_connect($this->host, $this->user, $this->password);
49 49 
 		mysqli_select_db($this->conn, $this->dbname);
50 50 
 		if (function_exists('mysqli_set_charset')) mysqli_set_charset($this->conn, $this->connection_charset);
51 51
52 52 
 		$this->dbVersion = 3.23; // assume version 3.23
53 
-		if(function_exists("mysqli_get_server_info")) {
53 
+		if (function_exists("mysqli_get_server_info")) {
54 54 
 			$ver = mysqli_get_server_info($this->conn);
55 
-			$this->dbMODx 	 = version_compare($ver,"4.0.2");
55 
+			$this->dbMODx 	 = version_compare($ver, "4.0.2");
56 56 
 			$this->dbVersion = (float) $ver; // Typecasting (float) instead of floatval() [PHP < 4.2]
57 57 
 		}
58 58
59 
-        mysqli_query($this->conn,"{$this->connection_method} {$this->connection_charset}");
59 
+        mysqli_query($this->conn, "{$this->connection_method} {$this->connection_charset}");
60 60 
 	}
61 61
62 
-    public function process($filename) {
62 
+    public function process($filename){
63 63 
 	    global $custom_placeholders;
64 64
65 65 
 		// check to make sure file exists
66 66 
 		if (!file_exists($filename)) {
67 67 
 			$this->mysqlErrors[] = array("error" => "File '$filename' not found");
68 
-			$this->installFailed = true ;
68 
+			$this->installFailed = true;
69 69 
 			return false;
70 70 
 		}
71 71 
 
@@ -82,10 +82,10 @@  discard block
 
 block discarded – undo
82 82 
 		// check if in upgrade mode
83 83 
 		if ($this->mode === 'upd') {
84 84 
 			// remove non-upgradeable parts
85 
-			$s = strpos($idata,'non-upgrade-able[[');
86 
-			$e = strpos($idata,']]non-upgrade-able') + 17;
87 
-			if($s && $e) {
88 
-			    $idata = str_replace(substr($idata, $s,$e-$s),' Removed non upgradeable items', $idata);
85 
+			$s = strpos($idata, 'non-upgrade-able[[');
86 
+			$e = strpos($idata, ']]non-upgrade-able') + 17;
87 
+			if ($s && $e) {
88 
+			    $idata = str_replace(substr($idata, $s, $e - $s), ' Removed non upgradeable items', $idata);
89 89 
             }
90 90 
 		}
91 91 
 
@@ -102,7 +102,7 @@  discard block
 
 block discarded – undo
102 102 
 		/*$idata = str_replace('{VERSION}', $modx_version, $idata);*/
103 103
104 104 
 		// Replace custom placeholders
105 
-		foreach($custom_placeholders as $key=>$val) {
105 
+		foreach ($custom_placeholders as $key=>$val) {
106 106 
 			if (strpos($idata, '{'.$key.'}') !== false) {
107 107 
 				$idata = str_replace('{'.$key.'}', $val, $idata);
108 108 
 			}
 
@@ -111,14 +111,14 @@  discard block
 
 block discarded – undo
111 111 
 		$sql_array = explode("\n\n", $idata);
112 112
113 113 
 		$num = 0;
114 
-		foreach($sql_array as $sql_entry) {
114 
+		foreach ($sql_array as $sql_entry) {
115 115 
 			$sql_do = trim($sql_entry, "\r\n; ");
116 116
117 117 
 			if (preg_match('/^\#/', $sql_do)) continue;
118 118
119 119 
 			// strip out comments and \n for mysql 3.x
120 
-			if ($this->dbVersion <4.0) {
121 
-				$sql_do = preg_replace("~COMMENT.*[^']?'.*[^']?'~","",$sql_do);
120 
+			if ($this->dbVersion < 4.0) {
121 
+				$sql_do = preg_replace("~COMMENT.*[^']?'.*[^']?'~", "", $sql_do);
122 122 
 				$sql_do = str_replace('\r', "", $sql_do);
123 123 
 				$sql_do = str_replace('\n', "", $sql_do);
124 124 
 			}
 
@@ -126,10 +126,10 @@  discard block
 
 block discarded – undo
126 126
127 127 
 			$num = $num + 1;
128 128 
 			if ($sql_do) mysqli_query($this->conn, $sql_do);
129 
-			if(mysqli_error($this->conn)) {
129 
+			if (mysqli_error($this->conn)) {
130 130 
 				// Ignore duplicate and drop errors - Raymond
131 
-				if ($this->ignoreDuplicateErrors){
132 
-					if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) continue;
131 
+				if ($this->ignoreDuplicateErrors) {
132 
+					if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 || mysqli_errno($this->conn) == 1091) continue;
133 133 
 				}
134 134 
 				// End Ignore duplicate
135 135 
 				$this->mysqlErrors[] = array("error" => mysqli_error($this->conn), "sql" => $sql_do);
 
@@ -138,7 +138,7 @@  discard block
 
 block discarded – undo
138 138 
 		}
139 139 
 	}
140 140
141 
-    public function close() {
141 
+    public function close(){
142 142 
 		mysqli_close($this->conn);
143 143 
 	}
144 144 
 }
Please login to merge, or discard this patch.