evolution-cms / evolution

install/cli-install.php

Braces +98 added lines, -66 removed lines

@@ -57,7 +57,7 @@ 
 
 $args = array_slice($argv, 1);
 
-if ( empty($args) ){
+if ( empty($args) ) {
     echo 'Install Evolution CMS'.PHP_EOL;
     //$installYes = readline("Type 'y' to continue: ");
     //if ($installYes != 'y') return;
@@ -76,7 +76,7 @@ 
     $managerlanguage = readline('Мanager language:' . ' [en] ');
     $installData = readline('Instal demo-site (y/n):' . ' [n] ');
     
-}else{
+} else {
     
     $cli_variables = [];
     foreach ($args as $arg) {
@@ -130,21 +130,24 @@ 
 }
 
 //////////////////////////////////////////////////////////////////////////////////////
-if( ! function_exists('f_owc')){
+if( ! function_exists('f_owc')) {
     /**
      * @param $path
      * @param $data
      * @param null|int $mode
      */
-    function f_owc($path, $data, $mode = null){
+    function f_owc($path, $data, $mode = null)
+    {
         try {
             // make an attempt to create the file
             $hnd = fopen($path, 'w');
             fwrite($hnd, $data);
             fclose($hnd);
 
-            if(null !== $mode) chmod($path, $mode);
-        }catch(Exception $e){
+            if(null !== $mode) {
+                chmod($path, $mode);
+            }
+        } catch(Exception $e) {
             // Nothing, this is NOT normal
             unset($e);
         }
@@ -210,7 +213,7 @@ 
 
 // File Browser directories exists?
 echo strip_tags($_lang['checking_if_images_exist']);
-switch(true){
+switch(true) {
     case !file_exists($path."../assets/images"):
     case !file_exists($path."../assets/files"):
     case !file_exists($path."../assets/backup"):
@@ -225,7 +228,7 @@ 
 
 // File Browser directories writable?
 echo strip_tags($_lang['checking_if_images_writable']);
-switch(true){
+switch(true) {
     case !is_writable($path."../assets/images"):
     case !is_writable($path."../assets/files"):
     case !is_writable($path."../assets/backup"):
@@ -361,7 +364,7 @@ 
 if ($conn) {
     echo $_lang['checking_mysql_strict_mode'];
     $mysqlmode = mysqli_query($conn, "SELECT @@global.sql_mode");
-    if (mysqli_num_rows($mysqlmode) > 0){
+    if (mysqli_num_rows($mysqlmode) > 0) {
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         //$modes = array("STRICT_TRANS_TABLES"); // for testing
         // print_r($modes);
@@ -397,9 +400,9 @@ 
 if ($errors > 0) {
     echo $_lang['setup_cannot_continue'] . ' ';
 
-    if($errors > 1){
+    if($errors > 1) {
         echo $errors . " " . $_lang['errors'] . $_lang['please_correct_errors'] . $_lang['and_try_again_plural'];
-    }else{
+    } else {
         echo $_lang['error'] . $_lang['please_correct_error'] . $_lang['and_try_again']. PHP_EOL;
     }
 
@@ -445,13 +448,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) != "/" ? "/" : "");
@@ -472,7 +477,9 @@ 
     echo $_lang['setup_database_selection_failed']." ".$_lang['setup_database_selection_failed_note'].PHP_EOL;
     $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 $_lang['ok'].PHP_EOL;
 }
@@ -518,7 +525,8 @@ 
      * @param string $propertyString
      * @return array
      */
-    function parseProperties($propertyString) {
+    function parseProperties($propertyString)
+    {
         $parameter= array ();
         if (!empty ($propertyString)) {
             $tmpParams= explode("&", $propertyString);
@@ -527,11 +535,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];
+                        }
                 }
             }
         }
@@ -579,12 +590,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
             (
@@ -608,7 +619,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']}";
@@ -801,7 +814,8 @@ 
 // setup callback function
 $callBackFnc = "clean_up";
 
-function clean_up($sqlParser) {
+function clean_up($sqlParser)
+{
     $ids = array();
 
     // secure web documents - privateweb
@@ -814,9 +828,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);
@@ -833,9 +848,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);
@@ -843,7 +859,8 @@ 
     }
 }
 
-function parse_docblock($element_dir, $filename) {
+function parse_docblock($element_dir, $filename)
+{
     $params = array();
     $fullpath = $element_dir . '/' . $filename;
     if(is_readable($fullpath)) {
@@ -944,7 +961,7 @@ 
 // custom or not
 if (file_exists($path."../assets/cache/siteManager.php")) {
     $mgrdir = 'include_once(dirname(__FILE__)."/../../assets/cache/siteManager.php");';
-}else{
+} else {
     $mgrdir = 'define(\'MGR_DIR\', \'manager\');';
 }
 
@@ -1084,7 +1101,9 @@ 
                         echo mysqli_error($sqlParser->conn) . PHP_EOL;
                         die();
                     }
-                    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 "  $name: " . $_lang['installed'] . PHP_EOL;
                 }
             }
@@ -1179,9 +1198,9 @@ 
             $overwrite = mysqli_real_escape_string($conn, $moduleChunk[4]);
             $filecontent = $moduleChunk[2];
 
-            if (!file_exists($filecontent))
-                echo "  $name: " . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL;
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "  $name: " . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL;
+            } else {
 
                 // Create the category if it does not already exist
                 $category_id = getCreateDbCategory($category, $sqlParser);
@@ -1234,9 +1253,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 "  $name: " . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL;
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "  $name: " . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL;
+            } else {
 
                 // Create the category if it does not already exist
                 $category = getCreateDbCategory($category, $sqlParser);
@@ -1254,7 +1273,7 @@ 
                     }
                     echo "  $name: " . $_lang['upgraded'] . PHP_EOL;
                 } else {
-                    if ($properties != NULL ){
+                    if ($properties != NULL ) {
                         $properties = mysqli_real_escape_string($conn, parseProperties($properties, true));
                     }
                     if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_modules` (name,description,modulecode,properties,guid,enable_sharedparams,category) VALUES('$name','$desc','$module','$properties','$guid','$shared', $category);")) {
@@ -1289,9 +1308,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 "  $name: " . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL;
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "  $name: " . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL;
+            } else {
 
                 // disable legacy versions based on legacy_names provided
                 if(!empty($leg_names)) {
@@ -1310,7 +1329,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 mysqli_error($sqlParser->conn) . PHP_EOL;
                                 return;
@@ -1332,7 +1351,7 @@ 
                     }
                     echo "  $name: " . $_lang['upgraded'] . PHP_EOL;
                 } else {
-                    if ($properties != NULL ){
+                    if ($properties != NULL ) {
                         $properties = mysqli_real_escape_string($conn, parseProperties($properties, true));
                     }
                     if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_plugins` (name,description,plugincode,properties,moduleguid,category,disabled) VALUES('$name','$desc','$plugin','$properties','$guid',$category,$disabled);")) {
@@ -1371,9 +1390,9 @@ 
             $filecontent = $moduleSnippet[2];
             $properties = $moduleSnippet[3];
             $category = mysqli_real_escape_string($conn, $moduleSnippet[4]);
-            if (!file_exists($filecontent))
-                echo "  $name: " . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL;
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "  $name: " . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . PHP_EOL;
+            } else {
 
                 // Create the category if it does not already exist
                 $category = getCreateDbCategory($category, $sqlParser);
@@ -1391,7 +1410,7 @@ 
                     }
                     echo "  $name: " . $_lang['upgraded'] . PHP_EOL;
                 } else {
-                    if ($properties != NULL ){
+                    if ($properties != NULL ) {
                         $properties = mysqli_real_escape_string($conn, parseProperties($properties, true));
                     }
                     if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_snippets` (name,description,snippet,properties,category) VALUES('$name','$desc','$snippet','$properties',$category);")) {
@@ -1484,11 +1503,14 @@ 
 }
 
 // call back function
-if ($callBackFnc != "")
+if ($callBackFnc != "") {
     $callBackFnc ($sqlParser);
+}
 
 // Setup the MODX API -- needed for the cache processor
-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($path.'../'.MGR_DIR.'/includes/document.parser.class.inc.php');
@@ -1527,7 +1549,7 @@ 
 }
 
 
-if ( empty($args) ){
+if ( empty($args) ) {
     echo PHP_EOL . 'Remove install folder?'.PHP_EOL;
     $removeInstall = readline("Type 'y' or 'n' to continue: ");
 }
@@ -1543,11 +1565,12 @@ 
  * @param string $old
  * @return string
  */
-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'];
         }
     }
@@ -1562,12 +1585,17 @@ 
  * @param bool|mixed $json
  * @return string
  */
-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();
@@ -1609,7 +1637,7 @@ 
 
         }
     // new json-format
-    } else if(!empty($jsonFormat)){
+    } else if(!empty($jsonFormat)) {
         $property = $jsonFormat;
     }
     if ($json) {
@@ -1624,7 +1652,8 @@ 
  * @param bool $returnData
  * @return bool|mixed
  */
-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;
 }
@@ -1634,7 +1663,8 @@ 
  * @param SqlParser $sqlParser
  * @return int
  */
-function getCreateDbCategory($category, $sqlParser) {
+function getCreateDbCategory($category, $sqlParser)
+{
     $dbase = $sqlParser->dbname;
     $dbase = '`' . trim($dbase,'`') . '`';
     $table_prefix = $sqlParser->prefix;
@@ -1662,7 +1692,8 @@ 
  * @param string $type
  * @return string
  */
-function removeDocblock($code, $type) {
+function removeDocblock($code, $type)
+{
 
     $cleaned = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', $code, 1);
 
@@ -1683,8 +1714,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;

manager/actions/mutate_settings/tab5_security_settings.inc.php

Braces +11 added lines, -5 removed lines

@@ -1,8 +1,8 @@ 
 <?php

     $MODX_SITE_HOSTNAMES = MODX_SITE_HOSTNAMES; // Fix for PHP 5.4

-    if(empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) {

+    if(empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) {
         $valid_hostnames = $_SERVER['HTTP_HOST'];

-    } else {

+    } else {
         $valid_hostnames = $MODX_SITE_HOSTNAMES;

     }

 ?>

@@ -157,7 +157,9 @@ 
 <th><?php echo $_lang['pwd_hash_algo_title'] ?><br><small>[(pwd_hash_algo)]</small></th>

 <td>

 <?php

-if(empty($pwd_hash_algo)) $phm['sel']['UNCRYPT'] = 1;

+if(empty($pwd_hash_algo)) {
+    $phm['sel']['UNCRYPT'] = 1;
+}
 $phm['e']['BLOWFISH_Y'] = $modx->manager->checkHashAlgorithm('BLOWFISH_Y') ? 0:1;

 $phm['e']['BLOWFISH_A'] = $modx->manager->checkHashAlgorithm('BLOWFISH_A') ? 0:1;

 $phm['e']['SHA512']     = $modx->manager->checkHashAlgorithm('SHA512') ? 0:1;

@@ -186,7 +188,9 @@ 
   ?>

 <?php

 $gdAvailable = extension_loaded('gd');

-if(!$gdAvailable) $use_captcha = 0;

+if(!$gdAvailable) {
+    $use_captcha = 0;
+}
 ?>

   <tr>

     <td nowrap class="warning"><?php echo $_lang['captcha_title'] ?><br><small>[(use_captcha)]</small></td>

@@ -226,7 +230,9 @@ 
         <?php

             // invoke OnMiscSettingsRender event

             $evtOut = $modx->invokeEvent('OnSecuritySettingsRender');

-            if(is_array($evtOut)) echo implode("",$evtOut);

+            if(is_array($evtOut)) {
+                echo implode("",$evtOut);
+            }
         ?>

     </td>

   </tr>

manager/actions/mutate_settings/tab6_filemanager_settings.inc.php

Braces +3 added lines, -1 removed lines

@@ -113,7 +113,9 @@
         <?php

             // invoke OnMiscSettingsRender event

             $evtOut = $modx->invokeEvent('OnFileManagerSettingsRender');

-            if(is_array($evtOut)) echo implode("",$evtOut);

+            if(is_array($evtOut)) {
+                echo implode("",$evtOut);
+            }
         ?>

     </td>

   </tr>

manager/processors/save_settings.processor.php

Braces +18 added lines, -25 removed lines

@@ -9,39 +9,27 @@ 
 // lose the POST now, gets rid of quirky issue with Safari 3 - see FS#972
 unset($_POST);
 
-if($data['friendly_urls']==='1' && strpos($_SERVER['SERVER_SOFTWARE'],'IIS')===false)
-{
+if($data['friendly_urls']==='1' && strpos($_SERVER['SERVER_SOFTWARE'],'IIS')===false) {
 	$htaccess        = $modx->config['base_path'] . '.htaccess';
 	$sample_htaccess = $modx->config['base_path'] . 'ht.access';
 	$dir = '/' . trim($modx->config['base_url'],'/');
-	if(is_file($htaccess))
-	{
+	if(is_file($htaccess)) {
 		$_ = file_get_contents($htaccess);
-		if(strpos($_,'RewriteBase')===false)
-		{
+		if(strpos($_,'RewriteBase')===false) {
 			$warnings[] = $_lang["settings_friendlyurls_alert2"];
-		}
-		elseif(is_writable($htaccess))
-		{
+		} elseif(is_writable($htaccess)) {
 			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
-			if(!@file_put_contents($htaccess,$_))
-			{
+			if(!@file_put_contents($htaccess,$_)) {
 				$warnings[] = $_lang["settings_friendlyurls_alert2"];
 			}
 		}
-	}
-	elseif(is_file($sample_htaccess))
-	{
-		if(!@rename($sample_htaccess,$htaccess))
-        {
+	} elseif(is_file($sample_htaccess)) {
+		if(!@rename($sample_htaccess,$htaccess)) {
         	$warnings[] = $_lang["settings_friendlyurls_alert"];
-		}
-		elseif($modx->config['base_url']!=='/')
-		{
+		} elseif($modx->config['base_url']!=='/') {
 			$_ = file_get_contents($htaccess);
 			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
-			if(!@file_put_contents($htaccess,$_))
-			{
+			if(!@file_put_contents($htaccess,$_)) {
 				$warnings[] = $_lang["settings_friendlyurls_alert2"];
 			}
 		}
@@ -73,7 +61,7 @@ 
 				$v = htmlspecialchars($v);
 				break;
             case 'settings_version':{
-                if($modx->getVersionData('version')!=$data['settings_version']){
+                if($modx->getVersionData('version')!=$data['settings_version']) {
                     $modx->logEvent(17,2,'<pre>'.var_export($data['settings_version'],true).'</pre>','fake settings_version');
                     $v = $modx->getVersionData('version');
                 }
@@ -134,7 +122,9 @@ 
 
 		$modx->config[$k] = $v;
 
-		if(!empty($k)) $savethese[] = '(\''.$modx->db->escape($k).'\', \''.$modx->db->escape($v).'\')';
+		if(!empty($k)) {
+		    $savethese[] = '(\''.$modx->db->escape($k).'\', \''.$modx->db->escape($v).'\')';
+		}
 	}
 
 	// Run a single query to save all the values
@@ -148,8 +138,11 @@ 
 		$oldtemplate = (int)$data['old_template'];
 		$tbl = $modx->getFullTableName('site_content');
 		$reset = $data['reset_template'];
-		if($reset==1) $modx->db->update(array('template' => $newtemplate), $tbl, "type='document'");
-		else if($reset==2) $modx->db->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");
+		if($reset==1) {
+		    $modx->db->update(array('template' => $newtemplate), $tbl, "type='document'");
+		} else if($reset==2) {
+		    $modx->db->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");
+		}
 	}
 
 	// empty cache

manager/actions/mutate_user.dynamic.php

Braces +8 added lines, -3 removed lines

@@ -39,7 +39,9 @@ 
 	// get user settings
 	$rs = $modx->db->select('*', $modx->getFullTableName('user_settings'), "user = '{$user}'");
 	$usersettings = array();
-	while($row = $modx->db->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];
+	while($row = $modx->db->getRow($rs)) {
+	    $usersettings[$row['setting_name']] = $row['setting_value'];
+	}
 	// manually extract so that user display settings are not overwritten
 	foreach($usersettings as $k => $v) {
 		if($k != 'manager_language' && $k != 'manager_theme') {
@@ -763,13 +765,16 @@ 
 
 			$groupsarray = array();
 
-			if($modx->manager->action == '12') { // only do this bit if the user is being edited
+			if($modx->manager->action == '12') {
+// only do this bit if the user is being edited
 				$rs = $modx->db->select('user_group', $modx->getFullTableName('member_groups'), "member='{$user}'");
 				$groupsarray = $modx->db->getColumn('user_group', $rs);
 			}
 			// retain selected doc groups between post
 			if(is_array($_POST['user_groups'])) {
-				foreach($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;
+				foreach($_POST['user_groups'] as $n => $v) {
+				    $groupsarray[] = $v;
+				}
 			}
 			?>
 			<div class="tab-page" id="tabAccess">

manager/includes/header.inc.php

Braces +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?php

-if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />

     Please use the EVO Content Manager instead of accessing this file directly.");

 }

@@ -10,26 +10,26 @@ 
 $modx_textdir = isset($modx_textdir) ? $modx_textdir : null;

 $onManagerMainFrameHeaderHTMLBlock = is_array($evtOut) ? implode("\n", $evtOut) : '';

 $textdir = $modx_textdir === 'rtl' ? 'rtl' : 'ltr';

-if (!isset($modx->config['mgr_jquery_path'])) {

+if (!isset($modx->config['mgr_jquery_path'])) {
     $modx->config['mgr_jquery_path'] = 'media/script/jquery/jquery.min.js';

 }

-if (!isset($modx->config['mgr_date_picker_path'])) {

+if (!isset($modx->config['mgr_date_picker_path'])) {
     $modx->config['mgr_date_picker_path'] = 'media/script/air-datepicker/datepicker.inc.php';

 }

 

 $body_class = '';

 $theme_modes = array('', 'lightness', 'light', 'dark', 'darkness');

-if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {

+if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {
     $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']];

-} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {

+} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {
     $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']];

 }

 

 $css = 'media/style/' . $modx->config['manager_theme'] . '/style.css?v=' . $lastInstallTime;

 

-if ($modx->config['manager_theme'] == 'default') {

+if ($modx->config['manager_theme'] == 'default') {
     if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')

-        && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {

+        && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
         $files = array(

             'bootstrap' => MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css',

             'font-awesome' => MODX_MANAGER_PATH . 'media/style/common/font-awesome/css/font-awesome.min.css',

@@ -48,7 +48,7 @@ 
             'source' => 'manager',

             'theme' => $modx->config['manager_theme']

         ));

-        switch (true) {

+        switch (true) {
             case empty($evtOut):

             case is_array($evtOut) && count($evtOut) === 0:

                 break;

@@ -66,7 +66,7 @@ 
             $css

         );

     }

-    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {

+    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
         $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;

     }

 }

@@ -124,7 +124,7 @@ 
     <script src="media/script/main.js"></script>

     <script>

         <?php

-        if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {

+        if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {
             echo 'doRefresh(' . $_REQUEST['r'] . ");\n";

         }

         ?>

install/actions/action_options.php

Braces +13 added lines, -7 removed lines

@@ -182,16 +182,18 @@ 
     }
 }
 
-switch($installMode){
+switch($installMode) {
     case 0:
     case 2:
         $database_collation = isset($_POST['database_collation']) ? $_POST['database_collation'] : 'utf8_general_ci';
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
         $_POST['database_connection_charset'] = $database_charset;
-        if(!empty($_POST['databaseloginpassword']))
-            $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword'];
-        if(!empty($_POST['databaseloginname']))
-            $_SESSION['databaseloginname'] = $_POST['databaseloginname'];
+        if(!empty($_POST['databaseloginpassword'])) {
+                    $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword'];
+        }
+        if(!empty($_POST['databaseloginname'])) {
+                    $_SESSION['databaseloginname'] = $_POST['databaseloginname'];
+        }
         break;
     case 1:
         include $base_path . MGR_DIR . '/includes/config.inc.php';
@@ -205,7 +207,9 @@ 
                 }
             }
         }
-        if (empty ($database_collation)) $database_collation = 'utf8_general_ci';
+        if (empty ($database_collation)) {
+            $database_collation = 'utf8_general_ci';
+        }
 
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
         if (!isset ($database_connection_charset) || empty ($database_connection_charset)) {
@@ -214,7 +218,9 @@ 
 
         if (!isset ($database_connection_method) || empty ($database_connection_method)) {
             $database_connection_method = 'SET CHARACTER SET';
-            if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_connection_charset);
+            if (function_exists('mysqli_set_charset')) {
+                mysqli_set_charset($conn, $database_connection_charset);
+            }
         }
         if ($database_connection_method != 'SET NAMES' && $database_connection_charset != $database_charset) {
             $database_connection_method = 'SET NAMES';

install/instprocessor.php

Braces +61 added lines, -38 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');
 }
 define('MODX_CLI', false);
@@ -59,13 +59,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) != "/" ? "/" : "");
@@ -86,7 +88,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>";
 }
@@ -133,7 +137,8 @@ 
      * @param string $propertyString
      * @return array
      */
-    function parseProperties($propertyString) {
+    function parseProperties($propertyString)
+    {
         $parameter= array ();
         if (!empty ($propertyString)) {
             $tmpParams= explode("&", $propertyString);
@@ -142,11 +147,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];
+                        }
                 }
             }
         }
@@ -217,7 +225,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\');';
 }
 
@@ -353,7 +361,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>";
                 }
             }
@@ -447,9 +457,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);
@@ -501,9 +511,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);
@@ -553,9 +563,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)) {
@@ -574,7 +584,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;
@@ -632,9 +642,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);
@@ -742,13 +752,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');
@@ -793,11 +806,12 @@ 
  * @param string $old
  * @return string
  */
-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'];
         }
     }
@@ -812,12 +826,17 @@ 
  * @param bool|mixed $json
  * @return string
  */
-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();
@@ -859,7 +878,7 @@ 
 
         }
     // new json-format
-    } else if(!empty($jsonFormat)){
+    } else if(!empty($jsonFormat)) {
         $property = $jsonFormat;
     }
     if ($json) {
@@ -874,7 +893,8 @@ 
  * @param bool $returnData
  * @return bool|mixed
  */
-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;
 }
@@ -884,7 +904,8 @@ 
  * @param SqlParser $sqlParser
  * @return int
  */
-function getCreateDbCategory($category, $sqlParser) {
+function getCreateDbCategory($category, $sqlParser)
+{
     $dbase = $sqlParser->dbname;
     $dbase = '`' . trim($dbase,'`') . '`';
     $table_prefix = $sqlParser->prefix;
@@ -912,7 +933,8 @@ 
  * @param string $type
  * @return string
  */
-function removeDocblock($code, $type) {
+function removeDocblock($code, $type)
+{
 
     $cleaned = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', $code, 1);
 
@@ -933,8 +955,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;

manager/includes/error.class.inc.php

Braces +2 added lines, -1 removed lines

@@ -5,7 +5,8 @@
  * @deprecated EvolutionCMS\Legacy\ErrorHandler
  * @todo could be unnecessary
  */
-class errorHandler extends EvolutionCMS\Legacy\ErrorHandler {
+class errorHandler extends EvolutionCMS\Legacy\ErrorHandler
+{
     public function include_lang($context = 'common')
     {
         parent::includeLang($context);