evolution-cms / evolution

install/actions/action_connection.php

Spacing +22 added lines, -22 removed lines

@@ -1,12 +1,12 @@ 
 <?php
-$installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0;
+$installMode = isset($_POST['installmode']) ? (int) $_POST['installmode'] : 0;
 
 // Determine upgradeability
-$upgradeable= 0;
+$upgradeable = 0;
 if ($installMode === 0) {
-    $database_name= '';
-    $database_server= 'localhost';
-    $table_prefix= substr(md5(time()), rand(0, 27), rand(3, 5))."_";
+    $database_name = '';
+    $database_server = 'localhost';
+    $table_prefix = substr(md5(time()), rand(0, 27), rand(3, 5))."_";
 } else {
     $database_name = '';
     if (!is_file($base_path.MGR_DIR.'/includes/config.inc.php')) $upgradeable = 0;
@@ -17,13 +17,13 @@ 
         if ($dbase) {
           $database_name = trim($dbase, '`');
           if (!$conn = mysqli_connect($database_server, $database_user, $database_password))
-              $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2;
-          elseif (! mysqli_select_db($conn, trim($dbase, '`')))
-              $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2;
+              $upgradeable = (isset($_POST['installmode']) && $_POST['installmode'] == 'new') ? 0 : 2;
+          elseif (!mysqli_select_db($conn, trim($dbase, '`')))
+              $upgradeable = (isset($_POST['installmode']) && $_POST['installmode'] == 'new') ? 0 : 2;
           else
               $upgradeable = 1;
         }
-        else $upgradable= 2;
+        else $upgradable = 2;
     }
 }
 
@@ -49,28 +49,28 @@ 
     $database_connection_method = 'SET CHARACTER SET';
 }
 
-$ph['database_name'] = isset($_POST['database_name']) ? $_POST['database_name']: $database_name;
-$ph['tableprefix'] = isset($_POST['tableprefix']) ? $_POST['tableprefix']: $table_prefix;
+$ph['database_name'] = isset($_POST['database_name']) ? $_POST['database_name'] : $database_name;
+$ph['tableprefix'] = isset($_POST['tableprefix']) ? $_POST['tableprefix'] : $table_prefix;
 $ph['selected_set_character_set'] = isset($database_connection_method) && $database_connection_method == 'SET CHARACTER SET' ? 'selected' : '';
 $ph['selected_set_names'] = isset($database_connection_method) && $database_connection_method == 'SET NAMES' ? 'selected' : '';
 $ph['show#connection_method'] = (($installMode == 0) || ($installMode == 2)) ? 'block' : 'none';
-$ph['database_collation'] = isset($_POST['database_collation']) ? $_POST['database_collation']: $database_collation;
-$ph['show#AUH'] = ($installMode == 0) ? 'block':'none';
-$ph['cmsadmin'] = isset($_POST['cmsadmin']) ? $_POST['cmsadmin']:'admin';
-$ph['cmsadminemail'] = isset($_POST['cmsadminemail']) ? $_POST['cmsadminemail']:"";
-$ph['cmspassword'] = isset($_POST['cmspassword']) ? $_POST['cmspassword']:"";
-$ph['cmspasswordconfirm'] = isset($_POST['cmspasswordconfirm']) ? $_POST['cmspasswordconfirm']:"";
+$ph['database_collation'] = isset($_POST['database_collation']) ? $_POST['database_collation'] : $database_collation;
+$ph['show#AUH'] = ($installMode == 0) ? 'block' : 'none';
+$ph['cmsadmin'] = isset($_POST['cmsadmin']) ? $_POST['cmsadmin'] : 'admin';
+$ph['cmsadminemail'] = isset($_POST['cmsadminemail']) ? $_POST['cmsadminemail'] : "";
+$ph['cmspassword'] = isset($_POST['cmspassword']) ? $_POST['cmspassword'] : "";
+$ph['cmspasswordconfirm'] = isset($_POST['cmspasswordconfirm']) ? $_POST['cmspasswordconfirm'] : "";
 $ph['managerLangs'] = getLangs($install_language);
 $ph['install_language'] = $install_language;
 $ph['installMode'] = $installMode;
-$ph['checkedChkagree']  = isset($_POST['chkagree']) ? 'checked':"";
+$ph['checkedChkagree']  = isset($_POST['chkagree']) ? 'checked' : "";
 $ph['database_connection_method'] = isset($database_connection_method) ? $database_connection_method : '';
-$ph['databasehost'] = isset($_POST['databasehost']) ? $_POST['databasehost']: $database_server;
-$ph['databaseloginname'] = isset($_SESSION['databaseloginname']) ? $_SESSION['databaseloginname']: '';
-$ph['databaseloginpassword'] = isset($_SESSION['databaseloginpassword']) ? $_SESSION['databaseloginpassword']: "";
+$ph['databasehost'] = isset($_POST['databasehost']) ? $_POST['databasehost'] : $database_server;
+$ph['databaseloginname'] = isset($_SESSION['databaseloginname']) ? $_SESSION['databaseloginname'] : '';
+$ph['databaseloginpassword'] = isset($_SESSION['databaseloginpassword']) ? $_SESSION['databaseloginpassword'] : "";
 $ph['MGR_DIR'] = MGR_DIR;
 
 $content = file_get_contents('./actions/tpl_connection.html');
-$content = parse($content, $_lang, '[%','%]');
+$content = parse($content, $_lang, '[%', '%]');
 $content = parse($content, $ph);
 echo $content;
\ No newline at end of file

install/functions.php

Spacing +19 added lines, -19 removed lines

@@ -4,9 +4,9 @@ 
 	global $_lang;
 	
 	// session loop-back tester
-	if(!isset($_GET['action']) || $_GET['action']!=='mode')
+	if (!isset($_GET['action']) || $_GET['action'] !== 'mode')
 	{
-		if(!isset($_SESSION['test']) || $_SESSION['test']!=1)
+		if (!isset($_SESSION['test']) || $_SESSION['test'] != 1)
 		{
 			echo '
 <html>
@@ -22,8 +22,8 @@ 
 </head>
 <body>
 	<div class="install">
-		<p>' . $_lang["session_problem"] . '</p>
-		<p><a href="./">' .$_lang["session_problem_try_again"] . '</a></p>
+		<p>' . $_lang["session_problem"].'</p>
+		<p><a href="./">' .$_lang["session_problem_try_again"].'</a></p>
 	</div>
 </body>
 </html>';
@@ -32,28 +32,28 @@ 
 	}
 }
 
-function parse($src,$ph,$left='[+',$right='+]')
+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);
+		$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'];
+	if (isset($_SESSION['installmode'])) $installmode = $_SESSION['installmode'];
 	else                                $installmode = get_installmode();
 
 	$ph['pagetitle']     = $_lang['modx_install'];
-	$ph['textdir']       = $modx_textdir ? ' id="rtl"':'';
+	$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['release_date']  = ($modx_textdir ? '&rlm;' : '').$modx_release_date;
 	$ph['footer1']       = $_lang['modx_footer1'];
 	$ph['footer2']       = $_lang['modx_footer2'];
 	$ph['current_year']  = date('Y');
@@ -62,20 +62,20 @@ 
 
 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'];
+	elseif (isset($_POST['installmode'])) $installmode = $_POST['installmode'];
 	else
 	{
 		include_once("{$base_path}manager/includes/config.inc.php");
 		
-		if(!isset($dbase) || empty($dbase)) $installmode = 0;
+		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;
@@ -86,7 +86,7 @@ 
 			}
 			else $rs = false;
 			
-			if($rs)
+			if ($rs)
 			{
 				$_SESSION['dbase']                      = $dbase;
 				$_SESSION['table_prefix']               = $table_prefix;
@@ -95,7 +95,7 @@ 
 				
 				$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'];
@@ -120,7 +120,7 @@ 
     }
 
     $langs = array();
-    if ($handle = opendir("../" . MGR_DIR . "/includes/lang")) {
+    if ($handle = opendir("../".MGR_DIR."/includes/lang")) {
         while (false !== ($file = readdir($handle))) {
             if (strpos($file, '.inc.') !== false) {
                 $langs[] = $file;

Indentation +70 added lines, -70 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,88 +27,88 @@ 
 	</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;
 }
 
 /**
@@ -139,7 +139,7 @@ 
         $abrv_language = explode('.', $language);
         $selected = (strtolower($abrv_language[0]) == strtolower($manager_language)) ? ' selected' : '';
         $_[] = sprintf('<option value="%s" %s>%s</option>', $abrv_language[0], $selected,
-                       ucwords($abrv_language[0]));
+                        ucwords($abrv_language[0]));
     }
 
     return implode("\n", $_);

install/connection.collation.php

Spacing +6 added lines, -6 removed lines

@@ -50,12 +50,12 @@ 
     foreach ($_ as $collation=>$selected) {
         $collation = htmlentities($collation);
         // if(substr($collation,0,4)!=='utf8') continue;
-        if (strpos($collation, 'sjis')===0) {
+        if (strpos($collation, 'sjis') === 0) {
             continue;
         }
-        if ($collation=='recommend') {
+        if ($collation == 'recommend') {
             $output .= '<optgroup label="recommend">';
-        } elseif ($collation=='unrecommend') {
+        } elseif ($collation == 'unrecommend') {
             $output .= '</optgroup><optgroup label="unrecommend">';
         } else {
             $output .= sprintf('<option value="%s" %s>%s</option>', $collation, $selected, $collation);
@@ -67,18 +67,18 @@ 
 echo $output;
 exit;
 
-function sortItem($array=array(), $order='utf8mb4,utf8')
+function sortItem($array = array(), $order = 'utf8mb4,utf8')
 {
     $rs = array('recommend'=>'');
     $order = explode(',', $order);
     foreach ($order as $v) {
         foreach ($array as $name=>$sel) {
-            if (strpos($name, $v)!==false) {
+            if (strpos($name, $v) !== false) {
                 $rs[$name] = $array[$name];
                 unset($array[$name]);
             }
         }
     }
-    $rs['unrecommend']='';
+    $rs['unrecommend'] = '';
     return $rs + $array;
 }
\ No newline at end of file