evolution-cms / evolution

manager/includes/extenders/export.class.inc.php

Braces +4 added lines, -2 removed lines

@@ -279,7 +279,8 @@ 
             $row['count'] = $this->count;
             $row['url'] = $modx->makeUrl($row['id']);
 
-            if (!$row['wasNull']) { // needs writing a document
+            if (!$row['wasNull']) {
+// needs writing a document
                 $docname = $this->getFileName($row['id'], $row['alias'], $prefix, $suffix);
                 $filename = $dirpath . $docname;
                 if (!is_file($filename)) {
@@ -307,7 +308,8 @@ 
                 $this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
             }
             if ($row['isfolder'] === '1' && ($modx->config['suffix_mode'] !== '1' || strpos($row['alias'],
-                        '.') === false)) { // needs making a folder
+                        '.') === false)) {
+// needs making a folder
                 $end_dir = ($row['alias'] !== '') ? $row['alias'] : $row['id'];
                 $dir_path = $dirpath . $end_dir;
                 if (strpos($dir_path, MODX_BASE_PATH) === false) {

manager/includes/extenders/maketable.class.php

Braces +2 added lines, -1 removed lines

@@ -457,7 +457,8 @@
             if ($this->formElementType) {
                 $table = "\n" . '<form id="' . $this->formName . '" name="' . $this->formName . '" action="' . $this->formAction . '" method="POST">' . $table;
             }
-            if (strlen($this->pageNav) > 1) {//changed to display the pagination if exists.
+            if (strlen($this->pageNav) > 1) {
+//changed to display the pagination if exists.
                 /* commented this part because of cookie
                 $table .= '<div id="max-display-records" ><select style="display:inline" onchange="javascript:updatePageSize(this[this.selectedIndex].value);">';
                 $pageSizes= array (10, 25, 50, 100, 250);

manager/includes/accesscontrol.inc.php

Braces +4 added lines, -2 removed lines

@@ -21,7 +21,8 @@ 
 if (file_exists(MODX_BASE_PATH . 'assets/cache/installProc.inc.php')) {
     include_once(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
     if (isset($installStartTime)) {
-        if ((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard
+        if ((time() - $installStartTime) > 5 * 60) {
+// if install flag older than 5 minutes, discard
             unset($installStartTime);
             @ chmod(MODX_BASE_PATH . 'assets/cache/installProc.inc.php', 0755);
             unlink(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
@@ -163,7 +164,8 @@ 
         } elseif (is_file($theme_path . 'templates/actions/login.tpl')) {
             $target = $theme_path . 'templates/actions/login.tpl';
             $login_tpl = file_get_contents($target);
-        } elseif (is_file($theme_path . 'html/login.html')) { // ClipperCMS compatible
+        } elseif (is_file($theme_path . 'html/login.html')) {
+// ClipperCMS compatible
             $target = $theme_path . 'html/login.html';
             $login_tpl = file_get_contents($target);
         } else {

manager/includes/extenders/manager.api.class.inc.php

Braces +4 added lines, -2 removed lines

@@ -116,7 +116,8 @@ 
      * @return string
      */
     public function getHashType($db_value = '')
-    { // md5 | v1 | phpass
+    {
+// md5 | v1 | phpass
         $c = substr($db_value, 0, 1);
         if ($c === '$') {
             return 'phpass';
@@ -135,7 +136,8 @@ 
      * @return string
      */
     public function genV1Hash($password, $seed = '1')
-    { // $seed is user_id basically
+    {
+// $seed is user_id basically
         $modx = evolutionCMS();
 
         if (isset($modx->config['pwd_hash_algo']) && !empty($modx->config['pwd_hash_algo'])) {

manager/includes/extenders/deprecated.functions.inc.php

Braces +2 added lines, -1 removed lines

@@ -177,7 +177,8 @@
      * @return bool|string
      */
     public function putChunk($chunkName)
-    { // alias name >.<
+    {
+// alias name >.<
         $modx = evolutionCMS();
 
         return $modx->getChunk($chunkName);

manager/processors/cache_sync.class.processor.php

Braces +4 added lines, -2 removed lines

@@ -79,7 +79,8 @@ 
      * @return string
      */
     public function getParents($id, $path = '')
-    { // modx:returns child's parent
+    {
+// modx:returns child's parent
         $modx = evolutionCMS();
         if (empty($this->aliases)) {
             $f = "id, IF(alias='', id, alias) AS alias, parent, alias_visible";
@@ -456,7 +457,8 @@ 
                         $_ = trim($_);
                     }
                     $lastChar = substr($_, -1);
-                    if (!in_array($lastChar, $chars)) {// ,320,327,288,284,289
+                    if (!in_array($lastChar, $chars)) {
+// ,320,327,288,284,289
                         if (!in_array($prev_token,
                             array(T_FOREACH, T_WHILE, T_FOR, T_BOOLEAN_AND, T_BOOLEAN_OR, T_DOUBLE_ARROW))) {
                             $_ .= ' ';

install/actions/action_mode.php

Braces +12 added lines, -10 removed lines

@@ -1,20 +1,22 @@
 <?php
 // Determine upgradeability
 $upgradeable = 0;
-if (is_file($base_path . MGR_DIR . '/includes/config.inc.php')) { // Include the file so we can test its validity
+if (is_file($base_path . MGR_DIR . '/includes/config.inc.php')) {
+// Include the file so we can test its validity
     include_once $base_path . MGR_DIR . '/includes/config.inc.php';
     // We need to have all connection settings - tho prefix may be empty so we have to ignore it
     if (isset($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 {
+            $upgradeable = 2;
+    }
     }
-    else
-        $upgradeable = 2;
-}
 
 $ph['moduleName']       = $moduleName;
 $ph['displayNew']       = ($upgradeable!=0) ? 'display:none;' : '';

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/frames/tree.php

Braces +10 added lines, -10 removed lines

@@ -1,11 +1,11 @@ 
 <?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.");

 }

 

 // invoke OnManagerTreeInit event

 $evtOut = $modx->invokeEvent('OnManagerTreeInit', $_REQUEST);

-if (is_array($evtOut)) {

+if (is_array($evtOut)) {
     echo implode("\n", $evtOut);

 }

 ?>

@@ -17,7 +17,7 @@ 
 

 		<a class="treeButton" id="treeMenu_collapsetree" onclick="modx.tree.collapseTree();" title="<?php echo $_lang['collapse_tree']; ?>"><?php echo $_style['collapse_tree']; ?></a>

 

-		<?php if ($modx->hasPermission('new_document')) {

+		<?php if ($modx->hasPermission('new_document')) {
     ?>

 			<a class="treeButton" id="treeMenu_addresource" onclick="modx.tabs({url:'<?= MODX_MANAGER_URL ?>?a=4', title: '<?php echo $_lang['add_resource']; ?>'});" title="<?php echo $_lang['add_resource']; ?>"><?php echo $_style['add_doc_tree']; ?></a>

 			<a class="treeButton" id="treeMenu_addweblink" onclick="modx.tabs({url:'<?= MODX_MANAGER_URL ?>?a=72', title: '<?php echo $_lang['add_weblink']; ?>'});" title="<?php echo $_lang['add_weblink']; ?>"><?php echo $_style['add_weblink_tree']; ?></a>

@@ -28,31 +28,31 @@ 
 

 		<a class="treeButton" id="treeMenu_sortingtree" onclick="modx.tree.showSorter(event);" title="<?php echo $_lang['sort_tree']; ?>"><?php echo $_style['sort_tree']; ?></a>

 

-		<?php if ($modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {

+		<?php if ($modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
         ?>

 			<a class="treeButton" id="treeMenu_sortingindex" onclick="modx.tabs({url: '<?= MODX_MANAGER_URL ?>?a=56&id=0', title: '<?php echo $_lang['sort_menuindex']; ?>'});" title="<?php echo $_lang['sort_menuindex']; ?>"><?php echo $_style['sort_menuindex']; ?></a>

 		<?php

     } ?>

 

-		<?php if ($use_browser && $modx->hasPermission('assets_images')) {

+		<?php if ($use_browser && $modx->hasPermission('assets_images')) {
         ?>

 			<a class="treeButton" id="treeMenu_openimages" title="<?php echo $_lang["images_management"] . "\n" . $_lang['em_button_shift'] ?>"><?php echo $_style['images_management']; ?></a>

 		<?php

     } ?>

 

-		<?php if ($use_browser && $modx->hasPermission('assets_files')) {

+		<?php if ($use_browser && $modx->hasPermission('assets_files')) {
         ?>

 			<a class="treeButton" id="treeMenu_openfiles" title="<?php echo $_lang["files_management"] . "\n" . $_lang['em_button_shift'] ?>"><?php echo $_style['files_management']; ?></a>

 		<?php

     } ?>

 

-		<?php if ($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) {

+		<?php if ($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) {
         ?>

 			<a class="treeButton" id="treeMenu_openelements" title="<?php echo $_lang["element_management"] . "\n" . $_lang['em_button_shift'] ?>"><?php echo $_style['element_management']; ?></a>

 		<?php

     } ?>

 

-		<?php if ($modx->hasPermission('empty_trash')) {

+		<?php if ($modx->hasPermission('empty_trash')) {
         ?>

 			<a class="treeButton treeButtonDisabled" id="treeMenu_emptytrash" title="<?php echo $_lang['empty_recycle_bin_empty']; ?>"><?php echo $_style['empty_recycle_bin_empty']; ?></a>

 		<?php

@@ -66,7 +66,7 @@ 
 		<?php

         // invoke OnManagerTreePrerender event

         $evtOut = $modx->invokeEvent('OnManagerTreePrerender', $modx->db->escape($_REQUEST));

-        if (is_array($evtOut)) {

+        if (is_array($evtOut)) {
             echo implode("\n", $evtOut);

         }

         ?>

@@ -78,7 +78,7 @@ 
 		<?php

         // invoke OnManagerTreeRender event

         $evtOut = $modx->invokeEvent('OnManagerTreeRender', $modx->db->escape($_REQUEST));

-        if (is_array($evtOut)) {

+        if (is_array($evtOut)) {
             echo implode("\n", $evtOut);

         }

         ?>