evolution-cms / evolution

install/functions.php

Doc Comments +4 added lines

@@ -33,6 +33,10 @@
 }
 
 if( ! function_exists('parse')) {
+
+    /**
+     * @param string $src
+     */
     function parse($src, $ph, $left = '[+', $right = '+]')
     {
         foreach ($ph as $k => $v) {

manager/actions/mutate_settings/functions.inc.php

Doc Comments +1 added lines

@@ -18,6 +18,7 @@
 /**

  * get_langs_by_key

  *

+ * @param string $key
  * @return array of languages that define the key in their file

  */

 function get_langs_by_key($key) {

Braces +34 added lines, -20 removed lines

@@ -4,12 +4,13 @@ 
  *

  * @return array of keys from a language file

  */

-function get_lang_keys($filename) {

+function get_lang_keys($filename)
+{
     $file = MODX_MANAGER_PATH.'includes/lang' . DIRECTORY_SEPARATOR . $filename;

-    if(is_file($file) && is_readable($file)) {

+    if(is_file($file) && is_readable($file)) {
         include($file);

         $out = isset($_lang) ? array_keys($_lang) : array();

-    } else {

+    } else {
         $out = array();

     }

 

@@ -20,11 +21,12 @@ 
  *

  * @return array of languages that define the key in their file

  */

-function get_langs_by_key($key) {

+function get_langs_by_key($key)
+{
     global $lang_keys;

     $lang_return = array();

-    foreach($lang_keys as $lang=>$keys) {

-        if(in_array($key, $keys)) {

+    foreach($lang_keys as $lang=>$keys) {
+        if(in_array($key, $keys)) {
             $lang_return[] = $lang;

         }

     }

@@ -40,23 +42,24 @@ 
  * @param string $selected_lang specify language to select in option list, default none

  * @return string html option list

  */

-function get_lang_options($key = '', $selected_lang=null) {

+function get_lang_options($key = '', $selected_lang=null)
+{
     global $lang_keys, $_lang;

     $lang_options = '';

-    if( ! empty($key)) {

+    if( ! empty($key)) {
         $languages = get_langs_by_key($key);

         sort($languages);

         $lang_options .= '<option value="">'.$_lang['language_title'].'</option>';

 

-        foreach($languages as $language_name) {

+        foreach($languages as $language_name) {
             $uclanguage_name = ucwords(str_replace("_", " ", $language_name));

             $lang_options .= '<option value="'.$language_name.'">'.$uclanguage_name.'</option>';

         }

         return $lang_options;

-    } else {

+    } else {
         $languages = array_keys($lang_keys);

         sort($languages);

-        foreach($languages as $language_name) {

+        foreach($languages as $language_name) {
             $uclanguage_name = ucwords(str_replace("_", " ", $language_name));

             $sel = $language_name == $selected_lang ? ' selected="selected"' : '';

             $lang_options .= '<option value="'.$language_name.'" '.$sel.'>'.$uclanguage_name.'</option>';

@@ -65,31 +68,42 @@ 
     }

 }

 

-function form_radio($name,$value,$add='',$disabled=false) {

+function form_radio($name,$value,$add='',$disabled=false)
+{
     global ${$name};

     $var = ${$name};

     $checked  = ($var==$value) ? ' checked="checked"' : '';

-    if($disabled) $disabled = ' disabled'; else $disabled = '';

-  if($add)     $add = ' ' . $add;

+    if($disabled) {
+        $disabled = ' disabled';
+    } else {
+        $disabled = '';
+    }
+  if($add) {
+      $add = ' ' . $add;
+  }
   return sprintf('<input onchange="documentDirty=true;" type="radio" name="%s" value="%s" %s %s %s />', $name, $value, $checked, $disabled, $add);

 }

 

-function wrap_label($str='',$object) {

+function wrap_label($str='',$object)
+{
   return "<label>{$object}\n{$str}</label>";

 }

 

-function parseText($tpl='', $ph=array()) {

-    if(empty($ph) || empty($tpl)) return $tpl;

+function parseText($tpl='', $ph=array())
+{
+    if(empty($ph) || empty($tpl)) {
+        return $tpl;
+    }
 

-    foreach($ph as $k=>$v)

-    {

+    foreach($ph as $k=>$v) {
         $k = "[+{$k}+]";

         $tpl = str_replace($k, $v, $tpl);

     }

     return $tpl;

 }

 

-function showHide($cond=true) {

+function showHide($cond=true)
+{
     global $displayStyle;

     $showHide = $cond ? $displayStyle : 'none';

     return sprintf('style="display:%s"', $showHide);

manager/includes/document.parser.class.inc.php

Doc Comments +25 added lines, -25 removed lines

@@ -252,7 +252,7 @@ 
      * MODX_MANAGER_PATH."includes/extenders/ex_{$extname}.inc.php"
      * $extname - extension name in lowercase
      *
-     * @param $extname
+     * @param string $extname
      * @param bool $reload
      * @return bool
      */
@@ -295,7 +295,7 @@ 
      * @param int $count_attempts
      * @param string $type $type
      * @param string $responseCode
-     * @return bool
+     * @return false|null
      * @global string $base_url
      * @global string $site_url
      */
@@ -995,7 +995,7 @@ 
     }
 
     /**
-     * @param $contents
+     * @param string $contents
      * @return mixed
      */
     public function RecoveryEscapedTags($contents)
@@ -1019,7 +1019,7 @@ 
     }
 
     /**
-     * @param $tstart
+     * @param double $tstart
      * @return array
      */
     public function getTimerStats($tstart)
@@ -1771,7 +1771,7 @@ 
 
     /**
      * Remove Comment-Tags from output like <!--@- Comment -@-->
-     * @param $content
+     * @param string $content
      * @param string $left
      * @param string $right
      * @return mixed
@@ -1944,7 +1944,7 @@ 
     /**
      * Run snippets as per the tags in $documentSource and replace the tags with the returned values.
      *
-     * @param $content
+     * @param string $content
      * @return string
      * @internal param string $documentSource
      */
@@ -2977,7 +2977,7 @@ 
 
     /**
      * @param $templateID
-     * @return mixed
+     * @return string
      */
     public function _getTemplateCodeFromDB($templateID)
     {
@@ -3018,9 +3018,9 @@ 
     }
 
     /**
-     * @param $id
+     * @param integer $id
      * @param int $top
-     * @return mixed
+     * @return string
      */
     public function getUltimateParentId($id, $top = 0)
     {
@@ -3351,7 +3351,7 @@ 
      *
      * @param int $type Types: 1=template, 2=tv, 3=chunk, 4=snippet, 5=plugin, 6=module, 7=resource, 8=role
      * @param int $id Element- / Resource-id
-     * @return bool
+     * @return false|null
      */
     public function lockElement($type, $id)
     {
@@ -3373,7 +3373,7 @@ 
      * @param int $type Types: 1=template, 2=tv, 3=chunk, 4=snippet, 5=plugin, 6=module, 7=resource, 8=role
      * @param int $id Element- / Resource-id
      * @param bool $includeAllUsers true = Deletes not only own user-locks
-     * @return bool
+     * @return false|null
      */
     public function unlockElement($type, $id, $includeAllUsers = false)
     {
@@ -3481,7 +3481,7 @@ 
      * @param array $params
      * @param string $msg
      * @param array $files
-     * @return mixed
+     * @return boolean
      */
     public function sendmail($params = array(), $msg = '', $files = array())
     {
@@ -3977,7 +3977,7 @@ 
      *
      * @param string $type
      * @param bool $report
-     * @return bool
+     * @return boolean|null
      */
     public function clearCache($type = '', $report = false)
     {
@@ -5322,7 +5322,7 @@ 
      * Remove event listener - only for use within the current execution cycle
      *
      * @param string $evtName
-     * @return boolean
+     * @return false|null
      */
     public function removeEventListener($evtName)
     {
@@ -5346,7 +5346,7 @@ 
      *
      * @param string $evtName
      * @param array $extParams Parameters available to plugins. Each array key will be the PHP variable name, and the array value will be the variable value.
-     * @return boolean|array
+     * @return false|null
      */
     public function invokeEvent($evtName, $extParams = array())
     {
@@ -5767,7 +5767,7 @@ 
 
     /**
      * @param string $string
-     * @return mixed|string
+     * @return string
      */
     public function removeSanitizeSeed($string = '')
     {
@@ -5782,7 +5782,7 @@ 
 
     /**
      * @param string $content
-     * @return mixed|string
+     * @return string
      */
     public function cleanUpMODXTags($content = '')
     {
@@ -5945,7 +5945,7 @@ 
 
     /**
      * @param string $str
-     * @return bool|mixed|string
+     * @return string
      */
     public function atBindFileContent($str = '')
     {
@@ -5996,8 +5996,8 @@ 
     }
 
     /**
-     * @param $str
-     * @return bool|string
+     * @param string $str
+     * @return false|string
      */
     public function getExtFromFilename($str)
     {
@@ -6025,7 +6025,7 @@ 
      * @param string $text Error message
      * @param string $file File where the error was detected
      * @param string $line Line number within $file
-     * @return boolean
+     * @return boolean|null
      */
     public function phpError($nr, $text, $file, $line)
     {
@@ -6077,7 +6077,7 @@ 
      * @param string $text
      * @param string $line
      * @param string $output
-     * @return bool
+     * @return null|boolean
      */
     public function messageQuit($msg = 'unspecified error', $query = '', $is_error = true, $nr = '', $file = '', $source = '', $text = '', $line = '', $output = '')
     {
@@ -6499,7 +6499,7 @@ 
 
     /**
      * @param string $str
-     * @return bool|mixed|string
+     * @return string
      */
     public function atBindInclude($str = '')
     {
@@ -6550,7 +6550,7 @@ 
      * @param $str
      * @param int $flags
      * @param string $encode
-     * @return mixed
+     * @return string
      */
     public function htmlspecialchars($str, $flags = ENT_COMPAT, $encode = '')
     {
@@ -6559,7 +6559,7 @@ 
     }
 
     /**
-     * @param $string
+     * @param string $string
      * @param bool $returnData
      * @return bool|mixed
      */

Braces +55 added lines, -26 removed lines

@@ -695,13 +695,15 @@ 
             $this->virtualDir = '';
         }
 
-        if (preg_match('@^[1-9][0-9]*$@', $q) && !isset($this->documentListing[$q])) { /* we got an ID returned, check to make sure it's not an alias */
+        if (preg_match('@^[1-9][0-9]*$@', $q) && !isset($this->documentListing[$q])) {
+/* we got an ID returned, check to make sure it's not an alias */
             /* FS#476 and FS#308: check that id is valid in terms of virtualDir structure */
             if ($this->config['use_alias_path'] == 1) {
                 if (($this->virtualDir != '' && !isset($this->documentListing[$this->virtualDir . '/' . $q]) || ($this->virtualDir == '' && !isset($this->documentListing[$q]))) && (($this->virtualDir != '' && isset($this->documentListing[$this->virtualDir]) && in_array($q, $this->getChildIds($this->documentListing[$this->virtualDir], 1))) || ($this->virtualDir == '' && in_array($q, $this->getChildIds(0, 1))))) {
                     $this->documentMethod = 'id';
                     return $q;
-                } else { /* not a valid id in terms of virtualDir, treat as alias */
+                } else {
+/* not a valid id in terms of virtualDir, treat as alias */
                     $this->documentMethod = 'alias';
                     return $q;
                 }
@@ -709,7 +711,8 @@ 
                 $this->documentMethod = 'id';
                 return $q;
             }
-        } else { /* we didn't get an ID back, so instead we assume it's an alias */
+        } else {
+/* we didn't get an ID back, so instead we assume it's an alias */
             if ($this->config['friendly_alias_urls'] != 1) {
                 $q = $qOrig;
             }
@@ -739,13 +742,14 @@ 
      * @param $id
      * @return array|mixed|null|string
      */
-    public function makePageCacheKey($id){
+    public function makePageCacheKey($id)
+    {
         $hash = $id;
         $tmp = null;
         $params = array();
-        if(!empty($this->systemCacheKey)){
+        if(!empty($this->systemCacheKey)) {
             $hash = $this->systemCacheKey;
-        }else {
+        } else {
             if (!empty($_GET)) {
                 // Sort GET parameters so that the order of parameters on the HTTP request don't affect the generated cache ID.
                 $params = $_GET;
@@ -754,7 +758,7 @@ 
             }
         }
         $evtOut = $this->invokeEvent("OnMakePageCacheKey", array ("hash" => $hash, "id" => $id, 'params' => $params));
-        if (is_array($evtOut) && count($evtOut) > 0){
+        if (is_array($evtOut) && count($evtOut) > 0) {
             $tmp = array_pop($evtOut);
         }
         return empty($tmp) ? $hash : $tmp;
@@ -1165,10 +1169,18 @@ 
             return array();
         }
         $spacer = md5('<<<EVO>>>');
-        if($left==='{{' && strpos($content,';}}')!==false)  $content = str_replace(';}}', sprintf(';}%s}',   $spacer),$content);
-        if($left==='{{' && strpos($content,'{{}}')!==false) $content = str_replace('{{}}',sprintf('{%$1s{}%$1s}',$spacer),$content);
-        if($left==='[[' && strpos($content,']]]]')!==false) $content = str_replace(']]]]',sprintf(']]%s]]',  $spacer),$content);
-        if($left==='[[' && strpos($content,']]]')!==false)  $content = str_replace(']]]', sprintf(']%s]]',   $spacer),$content);
+        if($left==='{{' && strpos($content,';}}')!==false) {
+            $content = str_replace(';}}', sprintf(';}%s}',   $spacer),$content);
+        }
+        if($left==='{{' && strpos($content,'{{}}')!==false) {
+            $content = str_replace('{{}}',sprintf('{%$1s{}%$1s}',$spacer),$content);
+        }
+        if($left==='[[' && strpos($content,']]]]')!==false) {
+            $content = str_replace(']]]]',sprintf(']]%s]]',  $spacer),$content);
+        }
+        if($left==='[[' && strpos($content,']]]')!==false) {
+            $content = str_replace(']]]', sprintf(']%s]]',   $spacer),$content);
+        }
 
         $pos['<![CDATA['] = strpos($content, '<![CDATA[');
         $pos[']]>'] = strpos($content, ']]>');
@@ -1221,7 +1233,8 @@ 
                         }
                     }
 
-                    if (!in_array($fetch, $tags)) {  // Avoid double Matches
+                    if (!in_array($fetch, $tags)) {
+// Avoid double Matches
                         $tags[] = $fetch; // Fetch
                     };
                     $fetch = ''; // and reset
@@ -1239,7 +1252,9 @@ 
             }
         }
         foreach($tags as $i=>$tag) {
-            if(strpos($tag,$spacer)!==false) $tags[$i] = str_replace($spacer, '', $tag);
+            if(strpos($tag,$spacer)!==false) {
+                $tags[$i] = str_replace($spacer, '', $tag);
+            }
         }
         return $tags;
     }
@@ -1279,7 +1294,10 @@ 
         }
 
         foreach ($matches[1] as $i => $key) {
-            if(strpos($key,'[+')!==false) continue; // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
+            if(strpos($key,'[+')!==false) {
+                continue;
+            }
+            // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
             if (substr($key, 0, 1) == '#') {
                 $key = substr($key, 1);
             } // remove # for QuickEdit format
@@ -2004,7 +2022,8 @@ 
      * @return mixed|string
      */
     public function _getSGVar($value)
-    { // Get super globals
+    {
+// Get super globals
         $key = $value;
         $_ = $this->config['enable_filter'];
         $this->config['enable_filter'] = 1;
@@ -2409,7 +2428,8 @@ 
         if ($this->config['friendly_urls'] == 1) {
             $aliases = array();
             if (is_array($this->documentListing)) {
-                foreach ($this->documentListing as $path => $docid) { // This is big Loop on large site!
+                foreach ($this->documentListing as $path => $docid) {
+// This is big Loop on large site!
                     $aliases[$docid] = $path;
                     $isfolder[$docid] = $this->aliasListing[$docid]['isfolder'];
                 }
@@ -2442,7 +2462,7 @@ 
             $isfriendly = ($this->config['friendly_alias_urls'] == 1 ? 1 : 0);
             $pref = $this->config['friendly_url_prefix'];
             $suff = $this->config['friendly_url_suffix'];
-            $documentSource = preg_replace_callback($in, function ($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff) {
+            $documentSource = preg_replace_callback($in, function ($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff){
                 global $modx;
                 $thealias = $aliases[$m[1]];
                 $thefolder = $isfolder[$m[1]];
@@ -4214,7 +4234,8 @@ 
         if (isset ($this->snippetCache[$snippetName])) {
             $snippet = $this->snippetCache[$snippetName];
             $properties = !empty($this->snippetCache[$snippetName . "Props"]) ? $this->snippetCache[$snippetName . "Props"] : '';
-        } else { // not in cache so let's check the db
+        } else {
+// not in cache so let's check the db
             $sql = "SELECT ss.`name`, ss.`snippet`, ss.`properties`, sm.properties as `sharedproperties` FROM " . $this->getFullTableName("site_snippets") . " as ss LEFT JOIN " . $this->getFullTableName('site_modules') . " as sm on sm.guid=ss.moduleguid WHERE ss.`name`='" . $this->db->escape($snippetName) . "'  AND ss.disabled=0;";
             $result = $this->db->query($sql);
             if ($this->db->getRecordCount($result) == 1) {
@@ -4718,7 +4739,7 @@ 
             $result = $this->db->makeArray($rs);
 
             // get default/built-in template variables
-            if(is_array($docRow)){
+            if(is_array($docRow)) {
                 ksort($docRow);
 
                 foreach ($docRow as $key => $value) {
@@ -5197,12 +5218,16 @@ 
             return '';
         } // nothing to register
         if (!is_array($options)) {
-            if (is_bool($options))  // backward compatibility with old plaintext parameter
+            if (is_bool($options)) {
+                // backward compatibility with old plaintext parameter
             {
                 $options = array('plaintext' => $options);
-            } elseif (is_string($options)) // Also allow script name as 2nd param
+            }
+            } elseif (is_string($options)) {
+                // Also allow script name as 2nd param
             {
                 $options = array('name' => $options);
+            }
             } else {
                 $options = array();
             }
@@ -5214,7 +5239,8 @@ 
         unset($overwritepos); // probably unnecessary--just making sure
 
         $useThisVer = true;
-        if (isset($this->loadedjscripts[$key])) { // a matching script was found
+        if (isset($this->loadedjscripts[$key])) {
+// a matching script was found
             // if existing script is a startup script, make sure the candidate is also a startup script
             if ($this->loadedjscripts[$key]['startup']) {
                 $startup = true;
@@ -5234,7 +5260,8 @@ 
                     // overwrite the old script (the position may be important for dependent scripts)
                     $overwritepos = $this->loadedjscripts[$key]['pos'];
                 }
-            } else { // Use the original version
+            } else {
+// Use the original version
                 if ($startup == true && $this->loadedjscripts[$key]['startup'] == false) {
                     // need to move the exisiting script to the head
                     $version = $this->loadedjscripts[$key][$version];
@@ -5358,7 +5385,8 @@ 
         }
 
         $results = null;
-        foreach ($this->pluginEvent[$evtName] as $pluginName) { // start for loop
+        foreach ($this->pluginEvent[$evtName] as $pluginName) {
+// start for loop
             if ($this->dumpPlugins) {
                 $eventtime = $this->getMicroTime();
             }
@@ -5906,7 +5934,8 @@ 
      * @return bool
      */
     public function isSafeCode($phpcode = '', $safe_functions = '')
-    { // return true or false
+    {
+// return true or false
         if ($safe_functions == '') {
             return false;
         }
@@ -6322,7 +6351,7 @@ 
             $args = array_pad(array(), $_, '$var');
             $args = implode(", ", $args);
             $modx = &$this;
-            $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val) {
+            $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val){
                 $arg = $val['args'][$tmp - 1];
                 switch (true) {
                     case is_null($arg): {

install/actions/action_connection.php

Braces +12 added lines, -9 removed lines

@@ -9,21 +9,24 @@
     $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;
-    else {
+    if (!is_file($base_path.MGR_DIR.'/includes/config.inc.php')) {
+        $upgradeable = 0;
+    } else {
         // Include the file so we can test its validity
         include($base_path.MGR_DIR.'/includes/config.inc.php');
         // We need to have all connection settings - but prefix may be empty so we have to ignore it
         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;
-            else
-                $upgradeable = 1;
+            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;
+            } else {
+                            $upgradeable = 1;
+            }
+        } else {
+            $upgradable= 2;
         }
-        else $upgradable= 2;
     }
 }
 

install/sqlParser.class.php

Braces +23 added lines, -10 removed lines

@@ -3,7 +3,8 @@ 
 // MySQL Dump Parser
 // SNUFFKIN/ Alex 2004
 
-class SqlParser {
+class SqlParser
+{
 	public $host;
 	public $dbname;
 	public $prefix;
@@ -28,7 +29,8 @@ 
     public $ignoreDuplicateErrors;
     public $autoTemplateLogic;
 
-	public function __construct($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent') {
+	public function __construct($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent')
+	{
 		$this->host = $host;
 		$this->dbname = $db;
 		$this->prefix = $prefix;
@@ -44,10 +46,13 @@ 
         $this->autoTemplateLogic = $auto_template_logic;
 	}
 
-	public function connect() {
+	public 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")) {
@@ -59,7 +64,8 @@ 
         mysqli_query($this->conn,"{$this->connection_method} {$this->connection_charset}");
 	}
 
-    public function process($filename) {
+    public function process($filename)
+    {
 	    global $custom_placeholders;
 
 		// check to make sure file exists
@@ -114,7 +120,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) {
@@ -125,11 +133,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);
@@ -138,7 +150,8 @@ 
 		}
 	}
 
-    public function close() {
+    public function close()
+    {
 		mysqli_close($this->conn);
 	}
 }

manager/actions/bkmanager.static.php

Braces +3 added lines, -1 removed lines

@@ -597,7 +597,9 @@
                 $insertdump = $lf;
                 $insertdump .= "INSERT INTO `{$tblval}` VALUES (";
                 $arr = $this->object2Array($row);
-                if( ! is_array($arr)) $arr = array();
+                if( ! is_array($arr)) {
+                    $arr = array();
+                }
                 foreach ($arr as $key => $value) {
                     if (is_null($value)) {
                         $value = 'NULL';

manager/actions/import_site.static.php

Braces +14 added lines, -7 removed lines

@@ -101,7 +101,8 @@ 
 	</div>
 
 <?php
-function run() {
+function run()
+{
 	global $modx, $_lang;
 
 	$tbl_site_content = $modx->getFullTableName('site_content');
@@ -162,7 +163,8 @@ 
 	return $output;
 }
 
-function importFiles($parent, $filedir, $files, $mode) {
+function importFiles($parent, $filedir, $files, $mode)
+{
 	global $modx;
 	global $_lang, $allowedfiles;
 	global $search_default, $cache_default, $publish_default;
@@ -303,7 +305,8 @@ 
 	}
 }
 
-function getFiles($directory, $listing = array(), $count = 0) {
+function getFiles($directory, $listing = array(), $count = 0)
+{
 	global $_lang;
 	global $filesfound;
 	$dummy = $count;
@@ -327,7 +330,8 @@ 
 	return ($listing);
 }
 
-function getFileContent($filepath) {
+function getFileContent($filepath)
+{
 	global $_lang;
 	// get the file
 	if(!$buffer = file_get_contents($filepath)) {
@@ -337,7 +341,8 @@ 
 	}
 }
 
-function pop_index($array) {
+function pop_index($array)
+{
 	$new_array = array();
 	foreach($array as $k => $v) {
 		if($v !== 'index.html' && $v !== 'index.htm') {
@@ -354,7 +359,8 @@ 
 	return $new_array;
 }
 
-function treatContent($src, $filename, $alias) {
+function treatContent($src, $filename, $alias)
+{
 	global $modx;
 
 	$src = mb_convert_encoding($src, $modx->config['modx_charset'], 'UTF-8,SJIS-win,eucJP-win,SJIS,EUC-JP,ASCII');
@@ -395,7 +401,8 @@ 
 	);
 }
 
-function convertLink() {
+function convertLink()
+{
 	global $modx;
 	$tbl_site_content = $modx->getFullTableName('site_content');
 

manager/actions/files.dynamic.php

Braces +5 added lines, -2 removed lines

@@ -733,7 +733,8 @@ 
 }
 
 function mkdirs($strPath, $mode)
-{ // recursive mkdir function
+{
+// recursive mkdir function
     if (is_dir($strPath)) {
         return true;
     }
@@ -838,7 +839,9 @@ 
     global $modx, $_lang, $startpath, $filemanager_path, $uploadablefiles, $new_file_permissions;
     $msg = '';
     foreach ($_FILES['userfile']['name'] as $i => $name) {
-        if (empty($_FILES['userfile']['tmp_name'][$i])) continue;
+        if (empty($_FILES['userfile']['tmp_name'][$i])) {
+            continue;
+        }
         $userfile= array();
 
         $userfile['tmp_name'] = $_FILES['userfile']['tmp_name'][$i];

manager/includes/extenders/ex_modifiers.inc.php

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * Time: 10:00
  */
 
-if (isset($this->filter) && is_object($this->filter)) return true;
+if (isset($this->filter) && is_object($this->filter)) {
+    return true;
+}
 
 include_once(MODX_MANAGER_PATH.'includes/extenders/modifiers.class.inc.php');
 $this->filter = new MODIFIERS;