evolution-cms / evolution

install/setup.info.php

Indentation +64 added lines, -64 removed lines

@@ -170,70 +170,70 @@
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false
             );
         }
-		if (intval($params['shareparams']) || !empty($params['dependencies'])) {
-			$dependencies = explode(',', $params['dependencies']);
-			foreach ($dependencies as $dependency) {
-				$dependency = explode(':', $dependency);
-				switch (trim($dependency[0])) {
-					case 'template':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'templates',
-							'column' => 'templatename',
-							'type' => 50,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'tv':
-					case 'tmplvar':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'tmplvars',
-							'column' => 'name',
-							'type' => 60,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'chunk':
-					case 'htmlsnippet':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'htmlsnippets',
-							'column' => 'name',
-							'type' => 10,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'snippet':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'snippets',
-							'column' => 'name',
-							'type' => 40,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'plugin':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'plugins',
-							'column' => 'name',
-							'type' => 30,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'resource':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'content',
-							'column' => 'pagetitle',
-							'type' => 20,
-							'name' => trim($dependency[1])
-						);
-						break;
-				}
-			}
-		}
+        if (intval($params['shareparams']) || !empty($params['dependencies'])) {
+            $dependencies = explode(',', $params['dependencies']);
+            foreach ($dependencies as $dependency) {
+                $dependency = explode(':', $dependency);
+                switch (trim($dependency[0])) {
+                    case 'template':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'templates',
+                            'column' => 'templatename',
+                            'type' => 50,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'tv':
+                    case 'tmplvar':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'tmplvars',
+                            'column' => 'name',
+                            'type' => 60,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'chunk':
+                    case 'htmlsnippet':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'htmlsnippets',
+                            'column' => 'name',
+                            'type' => 10,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'snippet':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'snippets',
+                            'column' => 'name',
+                            'type' => 40,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'plugin':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'plugins',
+                            'column' => 'name',
+                            'type' => 30,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'resource':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'content',
+                            'column' => 'pagetitle',
+                            'type' => 20,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                }
+            }
+        }
     }
     $d->close();
 }

Braces +23 added lines, -15 removed lines

@@ -4,7 +4,9 @@ 
 if (is_file($base_path . 'assets/cache/siteManager.php')) {
     include_once($base_path . 'assets/cache/siteManager.php');
 }
-if(!defined('MGR_DIR')) define('MGR_DIR', 'manager');
+if(!defined('MGR_DIR')) {
+    define('MGR_DIR', 'manager');
+}
 
 require_once('../'.MGR_DIR.'/includes/version.inc.php');
 
@@ -19,12 +21,12 @@ 
 $mt = &$moduleTemplates;
 if(is_dir($templatePath) && is_readable($templatePath)) {
     $d = dir($templatePath);
-    while (false !== ($tplfile = $d->read()))
-    {
-        if(substr($tplfile, -4) != '.tpl') continue;
+    while (false !== ($tplfile = $d->read())) {
+        if(substr($tplfile, -4) != '.tpl') {
+            continue;
+        }
         $params = parse_docblock($templatePath, $tplfile);
-        if(is_array($params) && (count($params)>0))
-        {
+        if(is_array($params) && (count($params)>0)) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $mt[] = array
             (
@@ -48,7 +50,9 @@ 
 if(is_dir($tvPath) && is_readable($tvPath)) {
     $d = dir($tvPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') continue;
+        if(substr($tplfile, -4) != '.tpl') {
+            continue;
+        }
         $params = parse_docblock($tvPath, $tplfile);
         if(is_array($params) && (count($params)>0)) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
@@ -241,7 +245,8 @@ 
 // setup callback function
 $callBackFnc = "clean_up";
 
-function clean_up($sqlParser) {
+function clean_up($sqlParser)
+{
     $ids = array();
     $mysqlVerOk = -1;
 
@@ -259,9 +264,10 @@ 
     $ds = mysqli_query($sqlParser->conn,$sql);
     if(!$ds) {
         echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
-    }
-    else {
-        while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"];
+    } else {
+        while($r = mysqli_fetch_assoc($ds)) {
+            $ids[]=$r["id"];
+        }
         if(count($ids)>0) {
             mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ",$ids).")");
             unset($ids);
@@ -278,9 +284,10 @@ 
     $ds = mysqli_query($sqlParser->conn,$sql);
     if(!$ds) {
         echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
-    }
-    else {
-        while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"];
+    } else {
+        while($r = mysqli_fetch_assoc($ds)) {
+            $ids[]=$r["id"];
+        }
         if(count($ids)>0) {
             mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ",$ids).")");
             unset($ids);
@@ -288,7 +295,8 @@ 
     }
 }
 
-function parse_docblock($element_dir, $filename) {
+function parse_docblock($element_dir, $filename)
+{
     $params = array();
     $fullpath = $element_dir . '/' . $filename;
     if(is_readable($fullpath)) {

install/actions/action_install.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 <form name="install" id="install_form" action="index.php?action=options" method="post">
 <?php
 if ($errors == 0) {
-	// check if install folder is removeable
+    // check if install folder is removeable
     if (is_writable("../install")) { ?>
 <span id="removeinstall" style="float:left;cursor:pointer;color:#505050;line-height:18px;" onclick="var chk=document.install.rminstaller; if(chk) chk.checked=!chk.checked;"><input type="checkbox" name="rminstaller" onclick="event.cancelBubble=true;" <?php echo (empty ($errors) ? 'checked="checked"' : '') ?> style="cursor:default;" /><?php echo $_lang['remove_install_folder_auto'] ?></span>
 <?php 

install/connection.databasetest.php

Indentation +2 added lines, -2 removed lines

@@ -8,10 +8,10 @@
 $self = 'install/connection.databasetest.php';
 $base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
-	include_once("{$base_path}assets/cache/siteManager.php");
+    include_once("{$base_path}assets/cache/siteManager.php");
 }
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+    define('MGR_DIR','manager');
 }
 require_once("lang.php");
 

Braces +6 added lines, -11 removed lines

@@ -18,8 +18,7 @@ 
 $output = $_lang["status_checking_database"];
 if (!$conn = mysqli_connect($host, $uid, $pwd)) {
     $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed'].'</span>';
-}
-else {
+} else {
     $database_name = mysqli_real_escape_string($conn, $_POST['database_name']);
     $database_name = str_replace("`", "", $database_name);
     $tableprefix = mysqli_real_escape_string($conn, $_POST['tableprefix']);
@@ -31,20 +30,16 @@ 
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
         $query = "CREATE DATABASE `".$database_name."` CHARACTER SET ".$database_charset." COLLATE ".$database_collation.";";
 
-        if (! mysqli_query($conn, $query)){
+        if (! mysqli_query($conn, $query)) {
             $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_could_not_create_database'].'</span>';
-        }
-        else {
+        } else {
             $output .= '<span id="database_pass" style="color:#80c000;">'.$_lang['status_passed_database_created'].'</span>';
         }
-    }
-    elseif (($installMode == 0) && (mysqli_query($conn, "SELECT COUNT(*) FROM {$database_name}.`{$tableprefix}site_content`"))) {
+    } elseif (($installMode == 0) && (mysqli_query($conn, "SELECT COUNT(*) FROM {$database_name}.`{$tableprefix}site_content`"))) {
         $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_table_prefix_already_in_use'].'</span>';
-    }
-    elseif (($database_connection_method != 'SET NAMES') && ($rs = mysqli_query($conn, "show variables like 'collation_database'")) && ($row = mysqli_fetch_row($rs)) && ($row[1] != $database_collation)) {
+    } elseif (($database_connection_method != 'SET NAMES') && ($rs = mysqli_query($conn, "show variables like 'collation_database'")) && ($row = mysqli_fetch_row($rs)) && ($row[1] != $database_collation)) {
         $output .= '<span id="database_fail" style="color:#FF0000;">'.sprintf($_lang['status_failed_database_collation_does_not_match'], $row[1]).'</span>';
-    }
-    else {
+    } else {
         $output .= '<span id="database_pass" style="color:#80c000;">'.$_lang['status_passed'].'</span>';
     }
 }

install/functions.php

Indentation +69 added lines, -69 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 function install_sessionCheck()
 {
-	global $_lang;
+    global $_lang;
 	
-	// session loop-back tester
-	if(!isset($_GET['action']) || $_GET['action']!=='mode')
-	{
-		if(!isset($_SESSION['test']) || $_SESSION['test']!=1)
-		{
-			echo '
+    // session loop-back tester
+    if(!isset($_GET['action']) || $_GET['action']!=='mode')
+    {
+        if(!isset($_SESSION['test']) || $_SESSION['test']!=1)
+        {
+            echo '
 <html>
 <head>
 	<title>Install Problem</title>
@@ -27,86 +27,86 @@ 
 	</div>
 </body>
 </html>';
-		exit;
-		}
-	}
+        exit;
+        }
+    }
 }
 
 function parse($src,$ph,$left='[+',$right='+]')
 {
-	foreach($ph as $k=>$v)
-	{
-		$k = $left . $k . $right;
-		$src = str_replace($k,$v,$src);
-	}
-	return $src;
+    foreach($ph as $k=>$v)
+    {
+        $k = $left . $k . $right;
+        $src = str_replace($k,$v,$src);
+    }
+    return $src;
 }
 
 function ph()
 {
-	global $_lang,$moduleName,$moduleVersion,$modx_textdir,$modx_release_date;
+    global $_lang,$moduleName,$moduleVersion,$modx_textdir,$modx_release_date;
 
-	if(isset($_SESSION['installmode'])) $installmode = $_SESSION['installmode'];
-	else                                $installmode = get_installmode();
+    if(isset($_SESSION['installmode'])) $installmode = $_SESSION['installmode'];
+    else                                $installmode = get_installmode();
 
-	$ph['pagetitle']     = $_lang['modx_install'];
-	$ph['textdir']       = $modx_textdir ? ' id="rtl"':'';
-	$ph['help_link']     = $installmode == 0 ? $_lang['help_link_new'] : $_lang['help_link_upd'];
-	$ph['version']       = $moduleVersion;
-	$ph['release_date']  = ($modx_textdir ? '&rlm;':'') . $modx_release_date;
-	$ph['footer1']       = $_lang['modx_footer1'];
-	$ph['footer2']       = $_lang['modx_footer2'];
-	$ph['current_year']  = date('Y');
-	return $ph;
+    $ph['pagetitle']     = $_lang['modx_install'];
+    $ph['textdir']       = $modx_textdir ? ' id="rtl"':'';
+    $ph['help_link']     = $installmode == 0 ? $_lang['help_link_new'] : $_lang['help_link_upd'];
+    $ph['version']       = $moduleVersion;
+    $ph['release_date']  = ($modx_textdir ? '&rlm;':'') . $modx_release_date;
+    $ph['footer1']       = $_lang['modx_footer1'];
+    $ph['footer2']       = $_lang['modx_footer2'];
+    $ph['current_year']  = date('Y');
+    return $ph;
 }
 
 function get_installmode()
 {
-	global $base_path,$database_server, $database_user, $database_password, $dbase, $table_prefix;
+    global $base_path,$database_server, $database_user, $database_password, $dbase, $table_prefix;
 	
-	$conf_path = "{$base_path}manager/includes/config.inc.php";
-	if (!is_file($conf_path)) $installmode = 0;
-	elseif(isset($_POST['installmode'])) $installmode = $_POST['installmode'];
-	else
-	{
-		include_once("{$base_path}manager/includes/config.inc.php");
+    $conf_path = "{$base_path}manager/includes/config.inc.php";
+    if (!is_file($conf_path)) $installmode = 0;
+    elseif(isset($_POST['installmode'])) $installmode = $_POST['installmode'];
+    else
+    {
+        include_once("{$base_path}manager/includes/config.inc.php");
 		
-		if(!isset($dbase) || empty($dbase)) $installmode = 0;
-		else
-		{
-			$conn = mysqli_connect($database_server, $database_user, $database_password);
-			if($conn)
-			{
-				$_SESSION['database_server']   = $database_server;
-				$_SESSION['database_user']     = $database_user;
-				$_SESSION['database_password'] = $database_password;
+        if(!isset($dbase) || empty($dbase)) $installmode = 0;
+        else
+        {
+            $conn = mysqli_connect($database_server, $database_user, $database_password);
+            if($conn)
+            {
+                $_SESSION['database_server']   = $database_server;
+                $_SESSION['database_user']     = $database_user;
+                $_SESSION['database_password'] = $database_password;
 				
-				$dbase = trim($dbase, '`');
-				$rs = mysqli_select_db($conn, $dbase);
-			}
-			else $rs = false;
+                $dbase = trim($dbase, '`');
+                $rs = mysqli_select_db($conn, $dbase);
+            }
+            else $rs = false;
 			
-			if($rs)
-			{
-				$_SESSION['dbase']                      = $dbase;
-				$_SESSION['table_prefix']               = $table_prefix;
-				$_SESSION['database_collation']         = 'utf8_general_ci';
-				$_SESSION['database_connection_method'] = 'SET CHARACTER SET';
+            if($rs)
+            {
+                $_SESSION['dbase']                      = $dbase;
+                $_SESSION['table_prefix']               = $table_prefix;
+                $_SESSION['database_collation']         = 'utf8_general_ci';
+                $_SESSION['database_connection_method'] = 'SET CHARACTER SET';
 				
-				$tbl_system_settings = "`{$dbase}`.`{$table_prefix}system_settings`";
-				$rs = mysqli_query($conn, "SELECT setting_value FROM {$tbl_system_settings} WHERE setting_name='settings_version'");
-				if($rs)
-				{
-					$row = mysqli_fetch_assoc($rs);
-					$settings_version = $row['setting_value'];
-				}
-				else $settings_version = '';
+                $tbl_system_settings = "`{$dbase}`.`{$table_prefix}system_settings`";
+                $rs = mysqli_query($conn, "SELECT setting_value FROM {$tbl_system_settings} WHERE setting_name='settings_version'");
+                if($rs)
+                {
+                    $row = mysqli_fetch_assoc($rs);
+                    $settings_version = $row['setting_value'];
+                }
+                else $settings_version = '';
 				
-				if (empty($settings_version)) $installmode = 0;
-				else                          $installmode = 1;
-			}
-			else $installmode = 1;
-		}
-	}
-	return $installmode;
+                if (empty($settings_version)) $installmode = 0;
+                else                          $installmode = 1;
+            }
+            else $installmode = 1;
+        }
+    }
+    return $installmode;
 }

Braces +30 added lines, -26 removed lines

@@ -4,10 +4,8 @@ 
 	global $_lang;
 	
 	// session loop-back tester
-	if(!isset($_GET['action']) || $_GET['action']!=='mode')
-	{
-		if(!isset($_SESSION['test']) || $_SESSION['test']!=1)
-		{
+	if(!isset($_GET['action']) || $_GET['action']!=='mode') {
+		if(!isset($_SESSION['test']) || $_SESSION['test']!=1) {
 			echo '
 <html>
 <head>
@@ -34,8 +32,7 @@ 
 
 function parse($src,$ph,$left='[+',$right='+]')
 {
-	foreach($ph as $k=>$v)
-	{
+	foreach($ph as $k=>$v) {
 		$k = $left . $k . $right;
 		$src = str_replace($k,$v,$src);
 	}
@@ -46,8 +43,11 @@ 
 {
 	global $_lang,$moduleName,$moduleVersion,$modx_textdir,$modx_release_date;
 
-	if(isset($_SESSION['installmode'])) $installmode = $_SESSION['installmode'];
-	else                                $installmode = get_installmode();
+	if(isset($_SESSION['installmode'])) {
+	    $installmode = $_SESSION['installmode'];
+	} else {
+	    $installmode = get_installmode();
+	}
 
 	$ph['pagetitle']     = $_lang['modx_install'];
 	$ph['textdir']       = $modx_textdir ? ' id="rtl"':'';
@@ -65,29 +65,29 @@ 
 	global $base_path,$database_server, $database_user, $database_password, $dbase, $table_prefix;
 	
 	$conf_path = "{$base_path}manager/includes/config.inc.php";
-	if (!is_file($conf_path)) $installmode = 0;
-	elseif(isset($_POST['installmode'])) $installmode = $_POST['installmode'];
-	else
-	{
+	if (!is_file($conf_path)) {
+	    $installmode = 0;
+	} elseif(isset($_POST['installmode'])) {
+	    $installmode = $_POST['installmode'];
+	} else {
 		include_once("{$base_path}manager/includes/config.inc.php");
 		
-		if(!isset($dbase) || empty($dbase)) $installmode = 0;
-		else
-		{
+		if(!isset($dbase) || empty($dbase)) {
+		    $installmode = 0;
+		} else {
 			$conn = mysqli_connect($database_server, $database_user, $database_password);
-			if($conn)
-			{
+			if($conn) {
 				$_SESSION['database_server']   = $database_server;
 				$_SESSION['database_user']     = $database_user;
 				$_SESSION['database_password'] = $database_password;
 				
 				$dbase = trim($dbase, '`');
 				$rs = mysqli_select_db($conn, $dbase);
+			} else {
+			    $rs = false;
 			}
-			else $rs = false;
 			
-			if($rs)
-			{
+			if($rs) {
 				$_SESSION['dbase']                      = $dbase;
 				$_SESSION['table_prefix']               = $table_prefix;
 				$_SESSION['database_collation']         = 'utf8_general_ci';
@@ -95,17 +95,21 @@ 
 				
 				$tbl_system_settings = "`{$dbase}`.`{$table_prefix}system_settings`";
 				$rs = mysqli_query($conn, "SELECT setting_value FROM {$tbl_system_settings} WHERE setting_name='settings_version'");
-				if($rs)
-				{
+				if($rs) {
 					$row = mysqli_fetch_assoc($rs);
 					$settings_version = $row['setting_value'];
+				} else {
+				    $settings_version = '';
 				}
-				else $settings_version = '';
 				
-				if (empty($settings_version)) $installmode = 0;
-				else                          $installmode = 1;
+				if (empty($settings_version)) {
+				    $installmode = 0;
+				} else {
+				    $installmode = 1;
+				}
+			} else {
+			    $installmode = 1;
 			}
-			else $installmode = 1;
 		}
 	}
 	return $installmode;

install/connection.servertest.php

Indentation +3 added lines, -3 removed lines

@@ -7,10 +7,10 @@ 
 $self = 'install/connection.servertest.php';
 $base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
-	include_once("{$base_path}assets/cache/siteManager.php");
+    include_once("{$base_path}assets/cache/siteManager.php");
 }
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+    define('MGR_DIR','manager');
 }
 require_once("lang.php");
 
@@ -31,7 +31,7 @@ 
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         $strictMode = false;
         foreach ($modes as $mode) {
-    		    if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) $strictMode = true;
+                if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) $strictMode = true;
         }
         if ($strictMode) $output .= '<br /><span style="color:#FF0000;"> '.$_lang['strict_mode'].'</span>';
     }

Braces +8 added lines, -5 removed lines

@@ -17,8 +17,7 @@ 
 $output = $_lang["status_connecting"];
 if (!$conn = @mysqli_connect($host, $uid, $pwd)) {
     $output .= '<span id="server_fail" style="color:#FF0000;"> '.$_lang['status_failed'].'</span>';
-}
-else {
+} else {
     $output .= '<span id="server_pass" style="color:#80c000;"> '.$_lang['status_passed_server'].'</span>';
 
     // Mysql version check
@@ -27,13 +26,17 @@ 
     }
     // Mode check
     $mysqlmode = mysqli_query($conn, "SELECT @@session.sql_mode");
-    if (@mysqli_num_rows($mysqlmode) > 0){
+    if (@mysqli_num_rows($mysqlmode) > 0) {
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         $strictMode = false;
         foreach ($modes as $mode) {
-    		    if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) $strictMode = true;
+    		    if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) {
+    		        $strictMode = true;
+    		    }
+        }
+        if ($strictMode) {
+            $output .= '<br /><span style="color:#FF0000;"> '.$_lang['strict_mode'].'</span>';
         }
-        if ($strictMode) $output .= '<br /><span style="color:#FF0000;"> '.$_lang['strict_mode'].'</span>';
     }
 }
 echo $output;

install/connection.collation.php

Indentation +8 added lines, -8 removed lines

@@ -7,10 +7,10 @@ 
 $self = 'install/connection.collation.php';
 $base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
-	include_once("{$base_path}assets/cache/siteManager.php");
+    include_once("{$base_path}assets/cache/siteManager.php");
 }
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+    define('MGR_DIR','manager');
 }
 require_once('lang.php');
 
@@ -59,12 +59,12 @@ 
     $rs = array('recommend'=>'');
     $order = explode(',', $order);
     foreach($order as $v) {
-    	foreach($array as $name=>$sel) {
-        	if(strpos($name,$v)!==false) {
-        		$rs[$name] = $array[$name];
-        		unset($array[$name]);
-        	}
-    	}
+        foreach($array as $name=>$sel) {
+            if(strpos($name,$v)!==false) {
+                $rs[$name] = $array[$name];
+                unset($array[$name]);
+            }
+        }
     }
     $rs['unrecommend']='';
     return $rs + $array;

Braces +24 added lines, -13 removed lines

@@ -15,7 +15,9 @@ 
 require_once('lang.php');
 
 $conn = mysqli_connect($host, $uid, $pwd);
-if(!$conn) exit('can not connect');
+if(!$conn) {
+    exit('can not connect');
+}
 
 // get collation
 $rs = mysqli_query($conn, "SHOW COLLATION");
@@ -29,23 +31,31 @@ 
     $database_collation = htmlentities($_POST['database_collation']);
     $recommend_collation = $_lang['recommend_collation'];
     
-    if    (isset($_[$recommend_collation])) $_[$recommend_collation] = ' selected';
-    elseif(isset($_['utf8mb4_general_ci'])) $_['utf8mb4_general_ci'] = ' selected';
-    elseif(isset($_['utf8_general_ci']))    $_['utf8_general_ci']    = ' selected';
-    elseif(isset($_[$database_collation]))  $_[$database_collation]  = ' selected';
+    if    (isset($_[$recommend_collation])) {
+        $_[$recommend_collation] = ' selected';
+    } elseif(isset($_['utf8mb4_general_ci'])) {
+        $_['utf8mb4_general_ci'] = ' selected';
+    } elseif(isset($_['utf8_general_ci'])) {
+        $_['utf8_general_ci']    = ' selected';
+    } elseif(isset($_[$database_collation])) {
+        $_[$database_collation]  = ' selected';
+    }
     
     $_ = sortItem($_,$_lang['recommend_collations_order']);
     
     foreach($_ as $collation=>$selected) {
         $collation = htmlentities($collation);
         // if(substr($collation,0,4)!=='utf8') continue;
-        if(strpos($collation,'sjis')===0) continue;
-        if($collation=='recommend')
-            $output .= '<optgroup label="recommend">';
-        elseif($collation=='unrecommend')
-            $output .= '</optgroup><optgroup label="unrecommend">';
-        else
-            $output .= sprintf('<option value="%s" %s>%s</option>', $collation, $selected, $collation);
+        if(strpos($collation,'sjis')===0) {
+            continue;
+        }
+        if($collation=='recommend') {
+                    $output .= '<optgroup label="recommend">';
+        } elseif($collation=='unrecommend') {
+                    $output .= '</optgroup><optgroup label="unrecommend">';
+        } else {
+                    $output .= sprintf('<option value="%s" %s>%s</option>', $collation, $selected, $collation);
+        }
     }
     $output .= '</optgroup></select>';
 }
@@ -55,7 +65,8 @@ 
 
 
 
-function sortItem($array=array(),$order='utf8mb4,utf8') {
+function sortItem($array=array(),$order='utf8mb4,utf8')
+{
     $rs = array('recommend'=>'');
     $order = explode(',', $order);
     foreach($order as $v) {

install/index.php

Indentation +2 added lines, -2 removed lines

@@ -16,10 +16,10 @@
 error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED);
 
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
-	include_once("{$base_path}assets/cache/siteManager.php");
+    include_once("{$base_path}assets/cache/siteManager.php");
 }
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR', 'manager');
+    define('MGR_DIR', 'manager');
 }
 
 

install/instprocessor.php

Indentation +64 added lines, -64 removed lines

@@ -85,7 +85,7 @@ 
     echo "<span class=\"notok\" style='color:#707070'>".$_lang['setup_database_selection_failed']."</span>".$_lang['setup_database_selection_failed_note']."</p>";
     $create = true;
 } else {
-	if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_charset);
+    if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_charset);
     mysqli_query($conn, "{$database_connection_method} {$database_connection_charset}");
     echo '<span class="ok">'.$_lang['ok']."</span></p>";
 }
@@ -280,23 +280,23 @@ 
 
 // Reset database for installation of demo-site 
 if ($installData && $moduleSQLDataFile && $moduleSQLResetFile) {
-	echo "<p>" . $_lang['resetting_database'];
-	$sqlParser->process($moduleSQLResetFile);
-	// display database results
-	if ($sqlParser->installFailed == true) {
-		$errors += 1;
-		echo "<span class=\"notok\"><b>" . $_lang['database_alerts'] . "</span></p>";
-		echo "<p>" . $_lang['setup_couldnt_install'] . "</p>";
-		echo "<p>" . $_lang['installation_error_occured'] . "<br /><br />";
-		for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) {
-			echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />";
-		}
-		echo "</p>";
-		echo "<p>" . $_lang['some_tables_not_updated'] . "</p>";
-		return;
-	} else {
-		echo '<span class="ok">'.$_lang['ok']."</span></p>";
-	}
+    echo "<p>" . $_lang['resetting_database'];
+    $sqlParser->process($moduleSQLResetFile);
+    // display database results
+    if ($sqlParser->installFailed == true) {
+        $errors += 1;
+        echo "<span class=\"notok\"><b>" . $_lang['database_alerts'] . "</span></p>";
+        echo "<p>" . $_lang['setup_couldnt_install'] . "</p>";
+        echo "<p>" . $_lang['installation_error_occured'] . "<br /><br />";
+        for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) {
+            echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />";
+        }
+        echo "</p>";
+        echo "<p>" . $_lang['some_tables_not_updated'] . "</p>";
+        return;
+    } else {
+        echo '<span class="ok">'.$_lang['ok']."</span></p>";
+    }
 }
 
 // Install Templates
@@ -418,7 +418,7 @@ 
                         $tRow = mysqli_fetch_assoc($ts);
                         $templateId = $tRow['id'];
                         mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)");
-                   }
+                    }
                 }
             }
         }
@@ -687,51 +687,51 @@ 
 
 // Install Dependencies
 foreach ($moduleDependencies as $dependency) {
-	$ds = mysqli_query($sqlParser->conn, 'SELECT id, guid FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_modules` WHERE name="' . $dependency['module'] . '"');
-	if (!$ds) {
-		echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
-		return;
-	} else {
-		$row = mysqli_fetch_assoc($ds);
-		$moduleId = $row["id"];
-		$moduleGuid = $row["guid"];
-	}
-	// get extra id
-	$ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE ' . $dependency['column'] . '="' . $dependency['name'] . '"');
-	if (!$ds) {
-		echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
-		return;
-	} else {
-		$row = mysqli_fetch_assoc($ds);
-		$extraId = $row["id"];
-	}
-	// setup extra as module dependency
-	$ds = mysqli_query($sqlParser->conn, 'SELECT module FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type'] . ' LIMIT 1');
-	if (!$ds) {
-		echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
-		return;
-	} else {
-		if (mysqli_num_rows($ds) === 0) {
-			mysqli_query($sqlParser->conn, 'INSERT INTO ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` (module, resource, type) VALUES(' . $moduleId . ',' . $extraId . ',' . $dependency['type'] . ')');
-			echo '<p>&nbsp;&nbsp;' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_create'] . '</span></p>';
-		} else {
-			mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` SET module = ' . $moduleId . ', resource = ' . $extraId . ', type = ' . $dependency['type'] . ' WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type']);
-			echo '<p>&nbsp;&nbsp;' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_update'] . '</span></p>';
-		}
-		if ($dependency['type'] == 30 || $dependency['type'] == 40) {
-			// set extra guid for plugins and snippets
-			$ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE id=' . $extraId . ' LIMIT 1');
-			if (!$ds) {
-				echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
-				return;
-			} else {
-				if (mysqli_num_rows($ds) != 0) {
-					mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` SET moduleguid = ' . $moduleGuid . ' WHERE id=' . $extraId);
-					echo '<p>&nbsp;&nbsp;' . $dependency['name'] . ': <span class="ok">' . $_lang['guid_set'] . '</span></p>';
-				}
-			}
-		}
-	}
+    $ds = mysqli_query($sqlParser->conn, 'SELECT id, guid FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_modules` WHERE name="' . $dependency['module'] . '"');
+    if (!$ds) {
+        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+        return;
+    } else {
+        $row = mysqli_fetch_assoc($ds);
+        $moduleId = $row["id"];
+        $moduleGuid = $row["guid"];
+    }
+    // get extra id
+    $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE ' . $dependency['column'] . '="' . $dependency['name'] . '"');
+    if (!$ds) {
+        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+        return;
+    } else {
+        $row = mysqli_fetch_assoc($ds);
+        $extraId = $row["id"];
+    }
+    // setup extra as module dependency
+    $ds = mysqli_query($sqlParser->conn, 'SELECT module FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type'] . ' LIMIT 1');
+    if (!$ds) {
+        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+        return;
+    } else {
+        if (mysqli_num_rows($ds) === 0) {
+            mysqli_query($sqlParser->conn, 'INSERT INTO ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` (module, resource, type) VALUES(' . $moduleId . ',' . $extraId . ',' . $dependency['type'] . ')');
+            echo '<p>&nbsp;&nbsp;' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_create'] . '</span></p>';
+        } else {
+            mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` SET module = ' . $moduleId . ', resource = ' . $extraId . ', type = ' . $dependency['type'] . ' WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type']);
+            echo '<p>&nbsp;&nbsp;' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_update'] . '</span></p>';
+        }
+        if ($dependency['type'] == 30 || $dependency['type'] == 40) {
+            // set extra guid for plugins and snippets
+            $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE id=' . $extraId . ' LIMIT 1');
+            if (!$ds) {
+                echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                return;
+            } else {
+                if (mysqli_num_rows($ds) != 0) {
+                    mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` SET moduleguid = ' . $moduleGuid . ' WHERE id=' . $extraId);
+                    echo '<p>&nbsp;&nbsp;' . $dependency['name'] . ': <span class="ok">' . $_lang['guid_set'] . '</span></p>';
+                }
+            }
+        }
+    }
 }
 
 // call back function

Braces +62 added lines, -39 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 if (file_exists(dirname(__FILE__)."/../assets/cache/siteManager.php")) {
     include_once(dirname(__FILE__)."/../assets/cache/siteManager.php");
-}else{
+} else {
     define('MGR_DIR', 'manager');
 }
 
@@ -58,13 +58,15 @@ 
 
 // get base path and url
 $a = explode("install", str_replace("\\", "/", dirname($_SERVER["PHP_SELF"])));
-if (count($a) > 1)
+if (count($a) > 1) {
     array_pop($a);
+}
 $url = implode("install", $a);
 reset($a);
 $a = explode("install", str_replace("\\", "/", realpath(dirname(__FILE__))));
-if (count($a) > 1)
+if (count($a) > 1) {
     array_pop($a);
+}
 $pth = implode("install", $a);
 unset ($a);
 $base_url = $url . (substr($url, -1) != "/" ? "/" : "");
@@ -85,7 +87,9 @@ 
     echo "<span class=\"notok\" style='color:#707070'>".$_lang['setup_database_selection_failed']."</span>".$_lang['setup_database_selection_failed_note']."</p>";
     $create = true;
 } else {
-	if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_charset);
+	if (function_exists('mysqli_set_charset')) {
+	    mysqli_set_charset($conn, $database_charset);
+	}
     mysqli_query($conn, "{$database_connection_method} {$database_connection_charset}");
     echo '<span class="ok">'.$_lang['ok']."</span></p>";
 }
@@ -127,7 +131,8 @@ 
 if(!function_exists('parseProperties')) {
     // parses a resource property string and returns the result as an array
     // duplicate of method in documentParser class
-    function parseProperties($propertyString) {
+    function parseProperties($propertyString)
+    {
         $parameter= array ();
         if (!empty ($propertyString)) {
             $tmpParams= explode("&", $propertyString);
@@ -135,11 +140,14 @@ 
                 if (strpos($tmpParams[$x], '=', 0)) {
                     $pTmp= explode("=", $tmpParams[$x]);
                     $pvTmp= explode(";", trim($pTmp[1]));
-                    if ($pvTmp[1] == 'list' && $pvTmp[3] != "")
-                        $parameter[trim($pTmp[0])]= $pvTmp[3]; //list default
+                    if ($pvTmp[1] == 'list' && $pvTmp[3] != "") {
+                                            $parameter[trim($pTmp[0])]= $pvTmp[3];
+                    }
+                    //list default
                     else
-                        if ($pvTmp[1] != 'list' && $pvTmp[2] != "")
-                            $parameter[trim($pTmp[0])]= $pvTmp[2];
+                        if ($pvTmp[1] != 'list' && $pvTmp[2] != "") {
+                                                    $parameter[trim($pTmp[0])]= $pvTmp[2];
+                        }
                 }
             }
         }
@@ -210,7 +218,7 @@ 
 // custom or not
 if (file_exists(dirname(__FILE__)."/../../assets/cache/siteManager.php")) {
     $mgrdir = 'include_once(dirname(__FILE__)."/../../assets/cache/siteManager.php");';
-}else{
+} else {
     $mgrdir = 'define(\'MGR_DIR\', \'manager\');';
 }
 
@@ -346,7 +354,9 @@ 
                         echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
                         return;
                     }
-                    if(!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn);
+                    if(!is_null($save_sql_id_as)) {
+                        $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn);
+                    }
                     echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
                 }
             }
@@ -440,9 +450,9 @@ 
             $overwrite = mysqli_real_escape_string($conn, $moduleChunk[4]);
             $filecontent = $moduleChunk[2];
 
-            if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+            } else {
 
                 // Create the category if it does not already exist
                 $category_id = getCreateDbCategory($category, $sqlParser);
@@ -494,9 +504,9 @@ 
             $guid = mysqli_real_escape_string($conn, $moduleModule[4]);
             $shared = mysqli_real_escape_string($conn, $moduleModule[5]);
             $category = mysqli_real_escape_string($conn, $moduleModule[6]);
-            if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+            } else {
 
                 // Create the category if it does not already exist
                 $category = getCreateDbCategory($category, $sqlParser);
@@ -546,9 +556,9 @@ 
                 // parse comma-separated legacy names and prepare them for sql IN clause
                 $leg_names = "'" . implode("','", preg_split('/\s*,\s*/', mysqli_real_escape_string($conn, $modulePlugin[7]))) . "'";
             }
-            if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+            } else {
 
                 // disable legacy versions based on legacy_names provided
                 if(!empty($leg_names)) {
@@ -567,7 +577,7 @@ 
                     $insert = true;
                     while($row = mysqli_fetch_assoc($rs)) {
                         $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
-                        if($row['description'] == $desc){
+                        if($row['description'] == $desc) {
                             if (! mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) {
                                 echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
                                 return;
@@ -625,9 +635,9 @@ 
             $filecontent = $moduleSnippet[2];
             $properties = $moduleSnippet[3];
             $category = mysqli_real_escape_string($conn, $moduleSnippet[4]);
-            if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+            } else {
 
                 // Create the category if it does not already exist
                 $category = getCreateDbCategory($category, $sqlParser);
@@ -735,13 +745,16 @@ 
 }
 
 // call back function
-if ($callBackFnc != "")
+if ($callBackFnc != "") {
     $callBackFnc ($sqlParser);
+}
 
 // Setup the MODX API -- needed for the cache processor
 define('MODX_API_MODE', true);
 define('MODX_BASE_PATH', $base_path);
-if (!defined('MODX_MANAGER_PATH')) define('MODX_MANAGER_PATH', $base_path.MGR_DIR.'/');
+if (!defined('MODX_MANAGER_PATH')) {
+    define('MODX_MANAGER_PATH', $base_path.MGR_DIR.'/');
+}
 $database_type = 'mysqli';
 // initiate a new document parser
 include_once('../'.MGR_DIR.'/includes/document.parser.class.inc.php');
@@ -780,11 +793,12 @@ 
 }
 
 // Property Update function
-function propUpdate($new,$old){
+function propUpdate($new,$old)
+{
     $newArr = parseProperties($new);
     $oldArr = parseProperties($old);
-    foreach ($oldArr as $k => $v){
-        if (isset($v['0']['options'])){
+    foreach ($oldArr as $k => $v) {
+        if (isset($v['0']['options'])) {
             $oldArr[$k]['0']['options'] = $newArr[$k]['0']['options'];
         }
     }
@@ -794,12 +808,17 @@ 
     return $return;
 }
 
-function parseProperties($propertyString, $json=false) {   
+function parseProperties($propertyString, $json=false)
+{
     $propertyString = str_replace('{}', '', $propertyString ); 
     $propertyString = str_replace('} {', ',', $propertyString );
 
-    if(empty($propertyString)) return array();
-    if($propertyString=='{}' || $propertyString=='[]') return array();
+    if(empty($propertyString)) {
+        return array();
+    }
+    if($propertyString=='{}' || $propertyString=='[]') {
+        return array();
+    }
     
     $jsonFormat = isJson($propertyString, true);
     $property = array();
@@ -809,7 +828,7 @@ 
         $arr = array();
         $key = array();
         foreach ($props as $prop) {
-            if ($prop != ''){
+            if ($prop != '') {
                 $arr = explode(';', $prop);
                 $key = explode('=', $arr['0']);
                 $property[$key['0']]['0']['label'] = trim($key['1']);
@@ -833,7 +852,7 @@ 
             
         }
     // new json-format
-    } else if(!empty($jsonFormat)){
+    } else if(!empty($jsonFormat)) {
         $property = $jsonFormat;
     }
     if ($json) {
@@ -843,12 +862,14 @@ 
     return $property;
 }
 
-function isJson($string, $returnData=false) {
+function isJson($string, $returnData=false)
+{
     $data = json_decode($string, true);
     return (json_last_error() == JSON_ERROR_NONE) ? ($returnData ? $data : true) : false;
 }
 
-function getCreateDbCategory($category, $sqlParser) {
+function getCreateDbCategory($category, $sqlParser)
+{
     $dbase = $sqlParser->dbname;
     $dbase = '`' . trim($dbase,'`') . '`';
     $table_prefix = $sqlParser->prefix;
@@ -870,7 +891,8 @@ 
 }
 
 // Remove installer Docblock only from components using plugin FileSource / fileBinding
-function removeDocblock($code, $type) {
+function removeDocblock($code, $type)
+{
     
     $cleaned = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', $code, 1);
     
@@ -891,8 +913,9 @@ 
         default:
             return $cleaned;
     };
-    if(substr(trim($cleaned),0,$count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/')
-        return $cleaned;
+    if(substr(trim($cleaned),0,$count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/') {
+            return $cleaned;
+    }
     
     // fileBinding not found - return code incl docblock
     return $code;

install/sqlParser.class.php

Braces +26 added lines, -11 removed lines

@@ -3,14 +3,16 @@ 
 // MySQL Dump Parser
 // SNUFFKIN/ Alex 2004
 
-class SqlParser {
+class SqlParser
+{
 	var $host, $dbname, $prefix, $user, $password, $mysqlErrors;
 	var $conn, $installFailed, $sitename, $adminname, $adminemail, $adminpass, $managerlanguage;
 	var $mode, $fileManagerPath, $imgPath, $imgUrl;
 	var $dbMODx, $dbVersion;
     var $connection_charset, $connection_method;
 
-	function SqlParser($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent') {
+	function SqlParser($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent')
+	{
 		$this->host = $host;
 		$this->dbname = $db;
 		$this->prefix = $prefix;
@@ -26,10 +28,13 @@ 
         $this->autoTemplateLogic = $auto_template_logic;
 	}
 
-	function connect() {
+	function connect()
+	{
 		$this->conn = mysqli_connect($this->host, $this->user, $this->password);
 		mysqli_select_db($this->conn, $this->dbname);
-		if (function_exists('mysqli_set_charset')) mysqli_set_charset($this->conn, $this->connection_charset);
+		if (function_exists('mysqli_set_charset')) {
+		    mysqli_set_charset($this->conn, $this->connection_charset);
+		}
 
 		$this->dbVersion = 3.23; // assume version 3.23
 		if(function_exists("mysqli_get_server_info")) {
@@ -41,7 +46,8 @@ 
         mysqli_query($this->conn,"{$this->connection_method} {$this->connection_charset}");
 	}
 
-	function process($filename) {
+	function process($filename)
+	{
 	    global $custom_placeholders;
 
 		// check to make sure file exists
@@ -66,7 +72,9 @@ 
 			// remove non-upgradeable parts
 			$s = strpos($idata,"non-upgrade-able[[");
 			$e = strpos($idata,"]]non-upgrade-able")+17;
-			if($s && $e) $idata = str_replace(substr($idata,$s,$e-$s)," Removed non upgradeable items",$idata);
+			if($s && $e) {
+			    $idata = str_replace(substr($idata,$s,$e-$s)," Removed non upgradeable items",$idata);
+			}
 		}
 
 		// replace {} tags
@@ -94,7 +102,9 @@ 
 		foreach($sql_array as $sql_entry) {
 			$sql_do = trim($sql_entry, "\r\n; ");
 
-			if (preg_match('/^\#/', $sql_do)) continue;
+			if (preg_match('/^\#/', $sql_do)) {
+			    continue;
+			}
 
 			// strip out comments and \n for mysql 3.x
 			if ($this->dbVersion <4.0) {
@@ -105,11 +115,15 @@ 
 
 
 			$num = $num + 1;
-			if ($sql_do) mysqli_query($this->conn, $sql_do);
+			if ($sql_do) {
+			    mysqli_query($this->conn, $sql_do);
+			}
 			if(mysqli_error($this->conn)) {
 				// Ignore duplicate and drop errors - Raymond
-				if ($this->ignoreDuplicateErrors){
-					if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) continue;
+				if ($this->ignoreDuplicateErrors) {
+					if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) {
+					    continue;
+					}
 				}
 				// End Ignore duplicate
 				$this->mysqlErrors[] = array("error" => mysqli_error($this->conn), "sql" => $sql_do);
@@ -118,7 +132,8 @@ 
 		}
 	}
 
-	function close() {
+	function close()
+	{
 		mysqli_close($this->conn);
 	}
 }

Indentation +110 added lines, -110 removed lines

@@ -4,121 +4,121 @@
 // SNUFFKIN/ Alex 2004
 
 class SqlParser {
-	var $host, $dbname, $prefix, $user, $password, $mysqlErrors;
-	var $conn, $installFailed, $sitename, $adminname, $adminemail, $adminpass, $managerlanguage;
-	var $mode, $fileManagerPath, $imgPath, $imgUrl;
-	var $dbMODx, $dbVersion;
+    var $host, $dbname, $prefix, $user, $password, $mysqlErrors;
+    var $conn, $installFailed, $sitename, $adminname, $adminemail, $adminpass, $managerlanguage;
+    var $mode, $fileManagerPath, $imgPath, $imgUrl;
+    var $dbMODx, $dbVersion;
     var $connection_charset, $connection_method;
 
-	function SqlParser($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent') {
-		$this->host = $host;
-		$this->dbname = $db;
-		$this->prefix = $prefix;
-		$this->user = $user;
-		$this->password = $password;
-		$this->adminpass = $adminpass;
-		$this->adminname = $adminname;
-		$this->adminemail = $adminemail;
-		$this->connection_charset = $connection_charset;
-		$this->connection_method = $connection_method;
-		$this->ignoreDuplicateErrors = false;
-		$this->managerlanguage = $managerlanguage;
+    function SqlParser($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent') {
+        $this->host = $host;
+        $this->dbname = $db;
+        $this->prefix = $prefix;
+        $this->user = $user;
+        $this->password = $password;
+        $this->adminpass = $adminpass;
+        $this->adminname = $adminname;
+        $this->adminemail = $adminemail;
+        $this->connection_charset = $connection_charset;
+        $this->connection_method = $connection_method;
+        $this->ignoreDuplicateErrors = false;
+        $this->managerlanguage = $managerlanguage;
         $this->autoTemplateLogic = $auto_template_logic;
-	}
+    }
 
-	function connect() {
-		$this->conn = mysqli_connect($this->host, $this->user, $this->password);
-		mysqli_select_db($this->conn, $this->dbname);
-		if (function_exists('mysqli_set_charset')) mysqli_set_charset($this->conn, $this->connection_charset);
+    function connect() {
+        $this->conn = mysqli_connect($this->host, $this->user, $this->password);
+        mysqli_select_db($this->conn, $this->dbname);
+        if (function_exists('mysqli_set_charset')) mysqli_set_charset($this->conn, $this->connection_charset);
 
-		$this->dbVersion = 3.23; // assume version 3.23
-		if(function_exists("mysqli_get_server_info")) {
-			$ver = mysqli_get_server_info($this->conn);
-			$this->dbMODx 	 = version_compare($ver,"4.0.2");
-			$this->dbVersion = (float) $ver; // Typecasting (float) instead of floatval() [PHP < 4.2]
-		}
+        $this->dbVersion = 3.23; // assume version 3.23
+        if(function_exists("mysqli_get_server_info")) {
+            $ver = mysqli_get_server_info($this->conn);
+            $this->dbMODx 	 = version_compare($ver,"4.0.2");
+            $this->dbVersion = (float) $ver; // Typecasting (float) instead of floatval() [PHP < 4.2]
+        }
 
         mysqli_query($this->conn,"{$this->connection_method} {$this->connection_charset}");
-	}
-
-	function process($filename) {
-	    global $custom_placeholders;
-
-		// check to make sure file exists
-		if (!file_exists($filename)) {
-			$this->mysqlErrors[] = array("error" => "File '$filename' not found");
-			$this->installFailed = true ;
-			return false;
-		}
-
-		$fh = fopen($filename, 'r');
-		$idata = '';
-
-		while (!feof($fh)) {
-			$idata .= fread($fh, 1024);
-		}
-
-		fclose($fh);
-		$idata = str_replace("\r", '', $idata);
-
-		// check if in upgrade mode
-		if ($this->mode=="upd") {
-			// remove non-upgradeable parts
-			$s = strpos($idata,"non-upgrade-able[[");
-			$e = strpos($idata,"]]non-upgrade-able")+17;
-			if($s && $e) $idata = str_replace(substr($idata,$s,$e-$s)," Removed non upgradeable items",$idata);
-		}
-
-		// replace {} tags
-		$idata = str_replace('{PREFIX}', $this->prefix, $idata);
-		$idata = str_replace('{ADMIN}', $this->adminname, $idata);
-		$idata = str_replace('{ADMINEMAIL}', $this->adminemail, $idata);
-		$idata = str_replace('{ADMINPASS}', $this->adminpass, $idata);
-		$idata = str_replace('{IMAGEPATH}', $this->imgPath, $idata);
-		$idata = str_replace('{IMAGEURL}', $this->imgUrl, $idata);
-		$idata = str_replace('{FILEMANAGERPATH}', $this->fileManagerPath, $idata);
-		$idata = str_replace('{MANAGERLANGUAGE}', $this->managerlanguage, $idata);
-		$idata = str_replace('{AUTOTEMPLATELOGIC}', $this->autoTemplateLogic, $idata);
-		/*$idata = str_replace('{VERSION}', $modx_version, $idata);*/
-
-		// Replace custom placeholders
-		foreach($custom_placeholders as $key=>$val) {
-			if (strpos($idata, '{'.$key.'}') !== false) {
-				$idata = str_replace('{'.$key.'}', $val, $idata);
-			}
-		}
-
-		$sql_array = explode("\n\n", $idata);
-
-		$num = 0;
-		foreach($sql_array as $sql_entry) {
-			$sql_do = trim($sql_entry, "\r\n; ");
-
-			if (preg_match('/^\#/', $sql_do)) continue;
-
-			// strip out comments and \n for mysql 3.x
-			if ($this->dbVersion <4.0) {
-				$sql_do = preg_replace("~COMMENT.*[^']?'.*[^']?'~","",$sql_do);
-				$sql_do = str_replace('\r', "", $sql_do);
-				$sql_do = str_replace('\n', "", $sql_do);
-			}
-
-
-			$num = $num + 1;
-			if ($sql_do) mysqli_query($this->conn, $sql_do);
-			if(mysqli_error($this->conn)) {
-				// Ignore duplicate and drop errors - Raymond
-				if ($this->ignoreDuplicateErrors){
-					if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) continue;
-				}
-				// End Ignore duplicate
-				$this->mysqlErrors[] = array("error" => mysqli_error($this->conn), "sql" => $sql_do);
-				$this->installFailed = true;
-			}
-		}
-	}
-
-	function close() {
-		mysqli_close($this->conn);
-	}
+    }
+
+    function process($filename) {
+        global $custom_placeholders;
+
+        // check to make sure file exists
+        if (!file_exists($filename)) {
+            $this->mysqlErrors[] = array("error" => "File '$filename' not found");
+            $this->installFailed = true ;
+            return false;
+        }
+
+        $fh = fopen($filename, 'r');
+        $idata = '';
+
+        while (!feof($fh)) {
+            $idata .= fread($fh, 1024);
+        }
+
+        fclose($fh);
+        $idata = str_replace("\r", '', $idata);
+
+        // check if in upgrade mode
+        if ($this->mode=="upd") {
+            // remove non-upgradeable parts
+            $s = strpos($idata,"non-upgrade-able[[");
+            $e = strpos($idata,"]]non-upgrade-able")+17;
+            if($s && $e) $idata = str_replace(substr($idata,$s,$e-$s)," Removed non upgradeable items",$idata);
+        }
+
+        // replace {} tags
+        $idata = str_replace('{PREFIX}', $this->prefix, $idata);
+        $idata = str_replace('{ADMIN}', $this->adminname, $idata);
+        $idata = str_replace('{ADMINEMAIL}', $this->adminemail, $idata);
+        $idata = str_replace('{ADMINPASS}', $this->adminpass, $idata);
+        $idata = str_replace('{IMAGEPATH}', $this->imgPath, $idata);
+        $idata = str_replace('{IMAGEURL}', $this->imgUrl, $idata);
+        $idata = str_replace('{FILEMANAGERPATH}', $this->fileManagerPath, $idata);
+        $idata = str_replace('{MANAGERLANGUAGE}', $this->managerlanguage, $idata);
+        $idata = str_replace('{AUTOTEMPLATELOGIC}', $this->autoTemplateLogic, $idata);
+        /*$idata = str_replace('{VERSION}', $modx_version, $idata);*/
+
+        // Replace custom placeholders
+        foreach($custom_placeholders as $key=>$val) {
+            if (strpos($idata, '{'.$key.'}') !== false) {
+                $idata = str_replace('{'.$key.'}', $val, $idata);
+            }
+        }
+
+        $sql_array = explode("\n\n", $idata);
+
+        $num = 0;
+        foreach($sql_array as $sql_entry) {
+            $sql_do = trim($sql_entry, "\r\n; ");
+
+            if (preg_match('/^\#/', $sql_do)) continue;
+
+            // strip out comments and \n for mysql 3.x
+            if ($this->dbVersion <4.0) {
+                $sql_do = preg_replace("~COMMENT.*[^']?'.*[^']?'~","",$sql_do);
+                $sql_do = str_replace('\r', "", $sql_do);
+                $sql_do = str_replace('\n', "", $sql_do);
+            }
+
+
+            $num = $num + 1;
+            if ($sql_do) mysqli_query($this->conn, $sql_do);
+            if(mysqli_error($this->conn)) {
+                // Ignore duplicate and drop errors - Raymond
+                if ($this->ignoreDuplicateErrors){
+                    if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) continue;
+                }
+                // End Ignore duplicate
+                $this->mysqlErrors[] = array("error" => mysqli_error($this->conn), "sql" => $sql_do);
+                $this->installFailed = true;
+            }
+        }
+    }
+
+    function close() {
+        mysqli_close($this->conn);
+    }
 }