evolution-cms / evolution

manager/actions/mutate_user.dynamic.php

Braces +8 added lines, -3 removed lines

@@ -43,7 +43,9 @@ 
 	// get user settings
 	$rs = $modx->getDatabase()->select('*', $modx->getDatabase()->getFullTableName('user_settings'), "user = '{$user}'");
 	$usersettings = array();
-	while($row = $modx->getDatabase()->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];
+	while($row = $modx->getDatabase()->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') {
@@ -771,13 +773,16 @@ 
 
 			$groupsarray = array();
 
-			if($modx->getManagerApi()->action == '12') { // only do this bit if the user is being edited
+			if($modx->getManagerApi()->action == '12') {
+// only do this bit if the user is being edited
 				$rs = $modx->getDatabase()->select('user_group', $modx->getDatabase()->getFullTableName('member_groups'), "member='{$user}'");
 				$groupsarray = $modx->getDatabase()->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/actions/modules.static.php

Braces +12 added lines, -12 removed lines

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

 }

-if (!($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('exec_module'))) {

+if (!($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('exec_module'))) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 

@@ -10,10 +10,10 @@ 
 $modx->getManagerApi()->initPageViewState();

 

 // get and save search string

-if ($_REQUEST['op'] == 'reset') {

+if ($_REQUEST['op'] == 'reset') {
     $query = '';

     $_PAGE['vs']['search'] = '';

-} else {

+} else {
     $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];

     $sqlQuery = $modx->getDatabase()->escape($query);

     $_PAGE['vs']['search'] = $query;

@@ -27,7 +27,7 @@ 
 // context menu

 $cm = new \EvolutionCMS\Support\ContextMenu("cntxm", 150);

 $cm->addItem($_lang["run_module"], "js:menuAction(1)", $_style['actions_run'], (!$modx->hasPermission('exec_module') ? 1 : 0));

-if ($modx->hasPermission('edit_module') || $modx->hasPermission('new_module') || $modx->hasPermission('delete_module')) {

+if ($modx->hasPermission('edit_module') || $modx->hasPermission('new_module') || $modx->hasPermission('delete_module')) {
     $cm->addSeparator();

 }

 $cm->addItem($_lang["edit"], "js:menuAction(2)", $_style['actions_edit'], (!$modx->hasPermission('edit_module') ? 1 : 0));

@@ -106,21 +106,21 @@ 
 <div class="tab-page">

     <div class="table-responsive">

         <?php

-        if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

+        if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
             $rs = $modx->getDatabase()->query('SELECT DISTINCT sm.id, sm.name, sm.description, mg.member, IF(disabled,"' . $_lang['yes'] . '","-") as disabled, IF(sm.icon<>"",sm.icon,"' . $_style['icons_modules'] . '") as icon

 				FROM ' . $modx->getDatabase()->getFullTableName('site_modules') . ' AS sm

 				LEFT JOIN ' . $modx->getDatabase()->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id

 				LEFT JOIN ' . $modx->getDatabase()->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group

                 WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1

                 ORDER BY sm.name');

-            if ($modx->hasPermission('edit_module')) {

+            if ($modx->hasPermission('edit_module')) {
                 $title = "<a href='index.php?a=108&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

-            } else if ($modx->hasPermission('exec_module')) {

+            } else if ($modx->hasPermission('exec_module')) {
                 $title = "<a href='index.php?a=112&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

-            } else {

+            } else {
                 $title = '[+value+]';

             }

-        } else {

+        } else {
             $rs = $modx->getDatabase()->select("id, name, description, IF(locked,'{$_lang['yes']}','-') as locked, IF(disabled,'{$_lang['yes']}','-') as disabled, IF(icon<>'',icon,'{$_style['icons_module']}') as icon", $modx->getDatabase()->getFullTableName("site_modules"), (!empty($sqlQuery) ? "(name LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "name");

             $title = "<a href='index.php?a=108&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

         }

@@ -135,10 +135,10 @@ 
         $grd->colWidths = "34,,,60,60";

         $grd->colAligns = "center,,,center,center";

         $grd->colTypes = "template:<a class='tableRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='[+value+]'></i></a>||template:" . $title;

-        if ($listmode == '1') {

+        if ($listmode == '1') {
             $grd->pageSize = 0;

         }

-        if ($_REQUEST['op'] == 'reset') {

+        if ($_REQUEST['op'] == 'reset') {
             $grd->pageNumber = 1;

         }

         // render grid

manager/media/browser/mcpuk/core/uploader.php

Braces +193 added lines, -121 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class uploader {
+class uploader
+{
 
 /** Release version */
     const VERSION = "2.54";
@@ -104,7 +105,8 @@ 
 /** Magic method which allows read-only access to protected or private class properties
   * @param string $property
   * @return mixed */
-    public function __get($property) {
+    public function __get($property)
+    {
         return property_exists($this, $property) ? $this->$property : null;
     }
 
@@ -112,13 +114,16 @@ 
      * uploader constructor.
      * @param DocumentParser $modx
      */
-    public function __construct(DocumentParser $modx) {
+    public function __construct(DocumentParser $modx)
+    {
 
         //MODX
         try {
             if ($modx instanceof DocumentParser) {
                 $this->modx = $modx;
-            } else throw new Exception('MODX should be instance of DocumentParser');
+            } else {
+                throw new Exception('MODX should be instance of DocumentParser');
+            }
         } catch (Exception $e) {
             die($e->getMessage());
         }
@@ -133,12 +138,14 @@ 
         // SET CMS INTEGRATION ATTRIBUTE
         if (isset($this->get['cms']) &&
             in_array($this->get['cms'], array("drupal"))
-        )
-            $this->cms = $this->get['cms'];
+        ) {
+                    $this->cms = $this->get['cms'];
+        }
 
 		// LINKING UPLOADED FILE
-        if (count($_FILES))
-            $this->file = &$_FILES[key($_FILES)];
+        if (count($_FILES)) {
+                    $this->file = &$_FILES[key($_FILES)];
+        }
 
         // LOAD DEFAULT CONFIGURATION
         require "config.php";
@@ -148,31 +155,37 @@ 
         if (isset($_CONFIG['_sessionVar']) &&
             is_array($_CONFIG['_sessionVar'])
         ) {
-            foreach ($_CONFIG['_sessionVar'] as $key => $val)
-                if ((substr($key, 0, 1) != "_") && isset($_CONFIG[$key]))
+            foreach ($_CONFIG['_sessionVar'] as $key => $val) {
+                            if ((substr($key, 0, 1) != "_") && isset($_CONFIG[$key]))
                     $this->config[$key] = $val;
-            if (!isset($this->config['_sessionVar']['self']))
-                $this->config['_sessionVar']['self'] = array();
+            }
+            if (!isset($this->config['_sessionVar']['self'])) {
+                            $this->config['_sessionVar']['self'] = array();
+            }
             $this->session = &$this->config['_sessionVar']['self'];
-        } else
-            $this->session = &$_SESSION;
+        } else {
+                    $this->session = &$_SESSION;
+        }
 
         // IMAGE DRIVER INIT
         if (isset($this->config['imageDriversPriority'])) {
             $this->config['imageDriversPriority'] =
                 text::clearWhitespaces($this->config['imageDriversPriority']);
             $driver = image::getDriver(explode(' ', $this->config['imageDriversPriority']));
-            if ($driver !== false)
-                $this->imageDriver = $driver;
+            if ($driver !== false) {
+                            $this->imageDriver = $driver;
+            }
         }
         if ((!isset($driver) || ($driver === false)) &&
             (image::getDriver(array($this->imageDriver)) === false)
-        )
-            die("Cannot find any of the supported PHP image extensions!");
+        ) {
+                    die("Cannot find any of the supported PHP image extensions!");
+        }
 
         // WATERMARK INIT
-        if (isset($this->config['watermark']) && is_string($this->config['watermark']))
-            $this->config['watermark'] = array('file' => $this->config['watermark']);
+        if (isset($this->config['watermark']) && is_string($this->config['watermark'])) {
+                    $this->config['watermark'] = array('file' => $this->config['watermark']);
+        }
 
         // GET TYPE DIRECTORY
         $this->types = &$this->config['types'];
@@ -186,9 +199,10 @@ 
 
         // LOAD TYPE DIRECTORY SPECIFIC CONFIGURATION IF EXISTS
         if (is_array($this->types[$this->type])) {
-            foreach ($this->types[$this->type] as $key => $val)
-                if (in_array($key, $this->typeSettings))
+            foreach ($this->types[$this->type] as $key => $val) {
+                            if (in_array($key, $this->typeSettings))
                     $this->config[$key] = $val;
+            }
             $this->types[$this->type] = isset($this->types[$this->type]['type'])
                 ? $this->types[$this->type]['type'] : "";
         }
@@ -198,12 +212,14 @@ 
         $ip = '/^' . implode('\.', array($ip, $ip, $ip, $ip)) . '$/';
         if (preg_match($ip, $_SERVER['HTTP_HOST']) ||
             preg_match('/^[^\.]+$/', $_SERVER['HTTP_HOST'])
-        )
-            $this->config['cookieDomain'] = "";
-        elseif (!strlen($this->config['cookieDomain']))
-            $this->config['cookieDomain'] = $_SERVER['HTTP_HOST'];
-        if (!strlen($this->config['cookiePath']))
-            $this->config['cookiePath'] = "/";
+        ) {
+                    $this->config['cookieDomain'] = "";
+        } elseif (!strlen($this->config['cookieDomain'])) {
+                    $this->config['cookieDomain'] = $_SERVER['HTTP_HOST'];
+        }
+        if (!strlen($this->config['cookiePath'])) {
+                    $this->config['cookiePath'] = "/";
+        }
 
         // UPLOAD FOLDER INIT
 
@@ -239,26 +255,30 @@ 
             $this->typeDir = "{$this->config['uploadDir']}/{$this->type}";
             $this->typeURL = "{$this->config['uploadURL']}/{$this->type}";
         }
-        if (!is_dir($this->config['uploadDir']))
-            @mkdir($this->config['uploadDir'], $this->config['dirPerms']);
+        if (!is_dir($this->config['uploadDir'])) {
+                    @mkdir($this->config['uploadDir'], $this->config['dirPerms']);
+        }
 
         // HOST APPLICATIONS INIT
-        if (isset($this->get['CKEditorFuncNum']))
-            $this->opener['CKEditor']['funcNum'] = $this->get['CKEditorFuncNum'];
+        if (isset($this->get['CKEditorFuncNum'])) {
+                    $this->opener['CKEditor']['funcNum'] = $this->get['CKEditorFuncNum'];
+        }
         if (isset($this->get['opener']) &&
             (strtolower($this->get['opener']) == "tinymce") &&
             isset($this->config['_tinyMCEPath']) &&
             strlen($this->config['_tinyMCEPath'])
-        )
-            $this->opener['TinyMCE'] = true;
+        ) {
+                    $this->opener['TinyMCE'] = true;
+        }
 
         // LOCALIZATION
-        foreach ($this->langInputNames as $key)
-            if (isset($this->get[$key]) &&
+        foreach ($this->langInputNames as $key) {
+                    if (isset($this->get[$key]) &&
                 preg_match('/^[a-z][a-z\._\-]*$/i', $this->get[$key]) &&
                 file_exists("lang/" . strtolower($this->get[$key]) . ".php")
             ) {
                 $this->lang = $this->get[$key];
+        }
                 break;
             }
         $this->localize($this->lang);
@@ -269,28 +289,34 @@ 
         ) {
             $htaccess = "{$this->config['uploadDir']}/.htaccess";
             if (!file_exists($htaccess)) {
-                if (!@file_put_contents($htaccess, $this->get_htaccess()))
-                    $this->backMsg("Cannot write to upload folder. {$this->config['uploadDir']}");
+                if (!@file_put_contents($htaccess, $this->get_htaccess())) {
+                                    $this->backMsg("Cannot write to upload folder. {$this->config['uploadDir']}");
+                }
             } else {
-                if (false === ($data = @file_get_contents($htaccess)))
-                    $this->backMsg("Cannot read .htaccess");
-                if (($data != $this->get_htaccess()) && !@file_put_contents($htaccess, $data))
-                    $this->backMsg("Incorrect .htaccess file. Cannot rewrite it!");
+                if (false === ($data = @file_get_contents($htaccess))) {
+                                    $this->backMsg("Cannot read .htaccess");
+                }
+                if (($data != $this->get_htaccess()) && !@file_put_contents($htaccess, $data)) {
+                                    $this->backMsg("Incorrect .htaccess file. Cannot rewrite it!");
+                }
             }
         }
 
         // CHECK & CREATE UPLOAD FOLDER
         if (!is_dir($this->typeDir)) {
-            if (!mkdir($this->typeDir, $this->config['dirPerms']))
-                $this->backMsg("Cannot create {dir} folder.", array('dir' => $this->type));
-        } elseif (!is_readable($this->typeDir))
-            $this->backMsg("Cannot read upload folder.");
+            if (!mkdir($this->typeDir, $this->config['dirPerms'])) {
+                            $this->backMsg("Cannot create {dir} folder.", array('dir' => $this->type));
+            }
+        } elseif (!is_readable($this->typeDir)) {
+                    $this->backMsg("Cannot read upload folder.");
+        }
     }
 
     /**
      * @return array|bool|int|null|string|void
      */
-    protected function getTransaliasSettings() {
+    protected function getTransaliasSettings()
+    {
 		$modx = evolutionCMS();
 
 		// Cleaning uploaded filename?
@@ -314,7 +340,8 @@ 
      * @param $filename
      * @return mixed|string
      */
-    protected function normalizeFilename($filename) {
+    protected function normalizeFilename($filename)
+    {
 		if ($this->getTransaliasSettings()) {
         		$format = strrchr($filename, ".");
         		$filename = str_replace($format, "", $filename);
@@ -327,7 +354,8 @@ 
      * @param $dirname
      * @return string
      */
-    protected function normalizeDirname($dirname) {
+    protected function normalizeDirname($dirname)
+    {
         return $this->modx->stripAlias($dirname);
     }
 
@@ -335,19 +363,21 @@ 
      * @param array|null $aFile
      * @return bool|mixed
      */
-    protected function checkUploadedFile(array $aFile=null) {
+    protected function checkUploadedFile(array $aFile=null)
+    {
         $config = &$this->config;
         $file = ($aFile === null) ? $this->file : $aFile;
 
-        if (!is_array($file) || !isset($file['name']))
-            return $this->label("Unknown error.");
+        if (!is_array($file) || !isset($file['name'])) {
+                    return $this->label("Unknown error.");
+        }
 
         $extension = file::getExtension($file['name']);
         $typePatt = strtolower(text::clearWhitespaces($this->types[$this->type]));
 
         // CHECK FOR UPLOAD ERRORS
-        if ($file['error'])
-            return
+        if ($file['error']) {
+                    return
                 ($file['error'] == UPLOAD_ERR_INI_SIZE) ?
                     $this->label("The uploaded file exceeds {size} bytes.",
                         array('size' => ini_get('upload_max_filesize'))) : (
@@ -364,14 +394,17 @@ 
                     $this->label("Failed to write file.") :
                     $this->label("Unknown error.")
             )))));
+        }
 
         // HIDDEN FILENAMES CHECK
-        elseif (substr($file['name'], 0, 1) == ".")
-            return $this->label("File name shouldn't begins with '.'");
+        elseif (substr($file['name'], 0, 1) == ".") {
+                    return $this->label("File name shouldn't begins with '.'");
+        }
 
         // EXTENSION CHECK
-        elseif (!$this->validateExtension($extension, $this->type))
-            return $this->label("Denied file extension.");
+        elseif (!$this->validateExtension($extension, $this->type)) {
+                    return $this->label("Denied file extension.");
+        }
 
         // SPECIAL DIRECTORY TYPES CHECK (e.g. *img)
         elseif (preg_match('/^\*([^ ]+)(.*)?$/s', $typePatt, $patt)) {
@@ -381,25 +414,30 @@ 
                 $type = new $class();
                 $cfg = $config;
                 $cfg['filename'] = $file['name'];
-                if (strlen($params))
-                    $cfg['params'] = trim($params);
+                if (strlen($params)) {
+                                    $cfg['params'] = trim($params);
+                }
                 $response = $type->checkFile($file['tmp_name'], $cfg);
-                if ($response !== true)
-                    return $this->label($response);
-            } else
-                return $this->label("Non-existing directory type.");
+                if ($response !== true) {
+                                    return $this->label($response);
+                }
+            } else {
+                            return $this->label("Non-existing directory type.");
+            }
         }
 
         // IMAGE RESIZE
         $img = image::factory($this->imageDriver, $file['tmp_name']);
-        if (!$img->initError && !$this->imageResize($img, $file['tmp_name']))
-            return $this->label("The image is too big and/or cannot be resized.");
+        if (!$img->initError && !$this->imageResize($img, $file['tmp_name'])) {
+                    return $this->label("The image is too big and/or cannot be resized.");
+        }
 
 
 	// CHECK FOR MODX MAX FILE SIZE
 	$actualfilesize=filesize($file['tmp_name']);
-	if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize'])
-	    return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
+	if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize']) {
+		    return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
+	}
 
         return true;
     }
@@ -410,27 +448,32 @@ 
      * @param bool $existing
      * @return bool|string
      */
-    protected function checkInputDir($dir, $inclType=true, $existing=true) {
+    protected function checkInputDir($dir, $inclType=true, $existing=true)
+    {
         $dir = path::normalize($dir);
-        if (substr($dir, 0, 1) == "/")
-            $dir = substr($dir, 1);
+        if (substr($dir, 0, 1) == "/") {
+                    $dir = substr($dir, 1);
+        }
 
-        if ((substr($dir, 0, 1) == ".") || (substr(basename($dir), 0, 1) == "."))
-            return false;
+        if ((substr($dir, 0, 1) == ".") || (substr(basename($dir), 0, 1) == ".")) {
+                    return false;
+        }
 
         if ($inclType) {
             $first = explode("/", $dir);
             $first = $first[0];
-            if ($first != $this->type)
-                return false;
+            if ($first != $this->type) {
+                            return false;
+            }
             $return = $this->removeTypeFromPath($dir);
         } else {
             $return = $dir;
             $dir = "{$this->type}/$dir";
         }
 
-        if (!$existing)
-            return $return;
+        if (!$existing) {
+                    return $return;
+        }
 
         $path = "{$this->config['uploadDir']}/$dir";
         return (is_dir($path) && is_readable($path)) ? $return : false;
@@ -441,21 +484,25 @@ 
      * @param $type
      * @return bool
      */
-    protected function validateExtension($ext, $type) {
+    protected function validateExtension($ext, $type)
+    {
         $ext = trim(strtolower($ext));
-        if (!isset($this->types[$type]))
-            return false;
+        if (!isset($this->types[$type])) {
+                    return false;
+        }
 
         $exts = strtolower(text::clearWhitespaces($this->config['deniedExts']));
         if (strlen($exts)) {
             $exts = explode(" ", $exts);
-            if (in_array($ext, $exts))
-                return false;
+            if (in_array($ext, $exts)) {
+                            return false;
+            }
         }
 
         $exts = trim($this->types[$type]);
-        if (!strlen($exts) || substr($exts, 0, 1) == "*")
-            return true;
+        if (!strlen($exts) || substr($exts, 0, 1) == "*") {
+                    return true;
+        }
 
         if (substr($exts, 0, 1) == "!") {
             $exts = explode(" ", trim(strtolower(substr($exts, 1))));
@@ -470,7 +517,8 @@ 
      * @param $path
      * @return mixed
      */
-    protected function getTypeFromPath($path) {
+    protected function getTypeFromPath($path)
+    {
         return preg_match('/^([^\/]*)\/.*$/', $path, $patt)
             ? $patt[1] : $path;
     }
@@ -479,7 +527,8 @@ 
      * @param $path
      * @return string
      */
-    protected function removeTypeFromPath($path) {
+    protected function removeTypeFromPath($path)
+    {
         return preg_match('/^[^\/]*\/(.*)$/', $path, $patt)
             ? $patt[1] : "";
     }
@@ -489,16 +538,20 @@ 
      * @param null $file
      * @return bool
      */
-    protected function imageResize($image, $file=null) {
+    protected function imageResize($image, $file=null)
+    {
 
         if (!($image instanceof image)) {
             $img = image::factory($this->imageDriver, $image);
-            if ($img->initError) return false;
+            if ($img->initError) {
+                return false;
+            }
             $file = $image;
-        } elseif ($file === null)
-            return false;
-        else
-            $img = $image;
+        } elseif ($file === null) {
+                    return false;
+        } else {
+                    $img = $image;
+        }
 
         $orientation = 1;
         if (function_exists("exif_read_data")) {
@@ -520,8 +573,9 @@ 
             )
             ) &&
             ($orientation == 1)
-        )
-            return true;
+        ) {
+                    return true;
+        }
 
 
         // PROPORTIONAL RESIZE
@@ -541,15 +595,17 @@ 
                 $width = $img->getPropWidth($height);
             }
 
-            if (isset($width) && isset($height) && !$img->resize($width, $height))
-                return false;
+            if (isset($width) && isset($height) && !$img->resize($width, $height)) {
+                            return false;
+            }
 
         // RESIZE TO FIT
         } elseif (
             $this->config['maxImageWidth'] && $this->config['maxImageHeight'] &&
             !$img->resizeFit($this->config['maxImageWidth'], $this->config['maxImageHeight'])
-        )
-            return false;
+        ) {
+                    return false;
+        }
 
         // AUTO FLIP AND ROTATE FROM EXIF
         if ((($orientation == 2) && !$img->flipHorizontal()) ||
@@ -559,11 +615,13 @@ 
             (($orientation == 6) && !$img->rotate(90)) ||
             (($orientation == 7) && (!$img->flipHorizontal() || !$img->rotate(90))) ||
             (($orientation == 8) && !$img->rotate(270))
-        )
-            return false;
-        if (($orientation >= 2) && ($orientation <= 8) && ($this->imageDriver == "imagick"))
-            try {
+        ) {
+                    return false;
+        }
+        if (($orientation >= 2) && ($orientation <= 8) && ($this->imageDriver == "imagick")) {
+                    try {
                 $img->image->setImageProperty('exif:Orientation', "1");
+        }
             } catch (Exception $e) {}
 
         // WATERMARK
@@ -599,22 +657,26 @@ 
      * @param bool $overwrite
      * @return bool
      */
-    protected function makeThumb($file, $overwrite=true) {
+    protected function makeThumb($file, $overwrite=true)
+    {
         $img = image::factory($this->imageDriver, $file);
 
         // Drop files which are not images
-        if ($img->initError)
-            return true;
+        if ($img->initError) {
+                    return true;
+        }
 
         $thumb = substr($file, strlen($this->config['uploadDir']));
         $thumb = $this->config['uploadDir'] . "/" . $this->config['thumbsDir'] . "/" . $thumb;
         $thumb = path::normalize($thumb);
         $thumbDir = dirname($thumb);
-        if (!is_dir($thumbDir) && !@mkdir($thumbDir, $this->config['dirPerms'], true))
-            return false;
+        if (!is_dir($thumbDir) && !@mkdir($thumbDir, $this->config['dirPerms'], true)) {
+                    return false;
+        }
 
-        if (!$overwrite && is_file($thumb))
-            return true;
+        if (!$overwrite && is_file($thumb)) {
+                    return true;
+        }
 
         // Images with smaller resolutions than thumbnails
         /*if (($img->width <= $this->config['thumbWidth']) &&
@@ -627,8 +689,9 @@ 
 
         // Resize image
         } else */
-        if (!$img->resizeFit($this->config['thumbWidth'], $this->config['thumbHeight']))
-            return false;
+        if (!$img->resizeFit($this->config['thumbWidth'], $this->config['thumbHeight'])) {
+                    return false;
+        }
 
         if ( $this->imageDriver == 'gd' ) {
             $width  = imagesx( $img->image );
@@ -653,7 +716,8 @@ 
     /**
      * @param $langCode
      */
-    protected function localize($langCode) {
+    protected function localize($langCode)
+    {
         require "lang/{$langCode}.php";
         setlocale(LC_ALL, $lang['_locale']);
         $this->charset = $lang['_charset'];
@@ -673,11 +737,13 @@ 
      * @param array|null $data
      * @return mixed
      */
-    protected function label($string, array $data=null) {
+    protected function label($string, array $data=null)
+    {
         $return = isset($this->labels[$string]) ? $this->labels[$string] : $string;
-        if (is_array($data))
-            foreach ($data as $key => $val)
+        if (is_array($data)) {
+                    foreach ($data as $key => $val)
                 $return = str_replace("{{$key}}", $val, $return);
+        }
         return $return;
     }
 
@@ -685,10 +751,12 @@ 
      * @param $message
      * @param array|null $data
      */
-    protected function backMsg($message, array $data=null) {
+    protected function backMsg($message, array $data=null)
+    {
         $message = $this->label($message, $data);
-        if (isset($this->file['tmp_name']) && file_exists($this->file['tmp_name']))
-            @unlink($this->file['tmp_name']);
+        if (isset($this->file['tmp_name']) && file_exists($this->file['tmp_name'])) {
+                    @unlink($this->file['tmp_name']);
+        }
         $this->callBack("", $message);
         die;
     }
@@ -697,11 +765,14 @@ 
      * @param $url
      * @param string $message
      */
-    protected function callBack($url, $message="") {
+    protected function callBack($url, $message="")
+    {
         $message = text::jsValue($message);
         $CKfuncNum = isset($this->opener['CKEditor']['funcNum'])
             ? $this->opener['CKEditor']['funcNum'] : 0;
-        if (!$CKfuncNum) $CKfuncNum = 0;
+        if (!$CKfuncNum) {
+            $CKfuncNum = 0;
+        }
         header("Content-Type: text/html; charset={$this->charset}");
 
 ?><html>
@@ -741,7 +812,8 @@ 
     /**
      * @return string
      */
-    protected function get_htaccess() {
+    protected function get_htaccess()
+    {
         return "<IfModule mod_php4.c>
   php_value engine off
 </IfModule>

manager/media/browser/mcpuk/lib/class_image.php

Braces +42 added lines, -21 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-abstract class image {
+abstract class image
+{
     const DEFAULT_JPEG_QUALITY = 75;
 
 /** Image resource or object
@@ -41,7 +42,8 @@ 
   * @param string $property
   * @return mixed */
 
-    final public function __get($property) {
+    final public function __get($property)
+    {
         return property_exists($this, $property) ? $this->$property : null;
     }
 
@@ -57,14 +59,16 @@ 
   * @param mixed $image
   * @param array $options */
 
-    public function __construct($image, array $options=array()) {
+    public function __construct($image, array $options=array())
+    {
         $this->image = $this->width = $this->height = null;
         $imageDetails = $this->buildImage($image);
 
-        if ($imageDetails !== false)
-            list($this->image, $this->width, $this->height) = $imageDetails;
-        else
-            $this->initError = true;
+        if ($imageDetails !== false) {
+                    list($this->image, $this->width, $this->height) = $imageDetails;
+        } else {
+                    $this->initError = true;
+        }
         $this->options = $options;
     }
 
@@ -75,7 +79,8 @@ 
   * @param mixed $image
   * @return object */
 
-    final static function factory($driver, $image, array $options=array()) {
+    final static function factory($driver, $image, array $options=array())
+    {
         $class = "image_$driver";
         return new $class($image, $options);
     }
@@ -86,14 +91,18 @@ 
   * @param array $drivers
   * @return string */
 
-    final static function getDriver(array $drivers=array('gd')) {
+    final static function getDriver(array $drivers=array('gd'))
+    {
         foreach ($drivers as $driver) {
-            if (!preg_match('/^[a-z0-9\_]+$/i', $driver))
-                continue;
+            if (!preg_match('/^[a-z0-9\_]+$/i', $driver)) {
+                            continue;
+            }
             $class = "image_$driver";
             if (class_exists($class) && method_exists($class, "available")) {
                 eval("\$avail = $class::available();");
-                if ($avail) return $driver;
+                if ($avail) {
+                    return $driver;
+                }
             }
         }
         return false;
@@ -105,7 +114,8 @@ 
   * @param mixed $image
   * @return array */
 
-    final protected function buildImage($image) {
+    final protected function buildImage($image)
+    {
         $class = get_class($this);
         if ($image instanceof $class) {
             $width = $image->width;
@@ -117,8 +127,9 @@ 
             $height = $image[1];
             $img = $this->getBlankImage($width, $height);
 
-        } else
-            $img = $this->getImage($image, $width, $height);
+        } else {
+                    $img = $this->getImage($image, $width, $height);
+        }
         return ($img !== false)
             ? array($img, $width, $height)
             : false;
@@ -129,9 +140,12 @@ 
   * @param integer $resizedHeight
   * @return integer */
 
-    final public function getPropWidth($resizedHeight) {
+    final public function getPropWidth($resizedHeight)
+    {
         $width = round(($this->width * $resizedHeight) / $this->height);
-        if (!$width) $width = 1;
+        if (!$width) {
+            $width = 1;
+        }
         return $width;
     }
 
@@ -140,9 +154,12 @@ 
   * @param integer $resizedWidth
   * @return integer */
 
-    final public function getPropHeight($resizedWidth) {
+    final public function getPropHeight($resizedWidth)
+    {
         $height = round(($this->height * $resizedWidth) / $this->width);
-        if (!$height) $height = 1;
+        if (!$height) {
+            $height = 1;
+        }
         return $height;
     }
 
@@ -151,13 +168,17 @@ 
   * static method should be implemented into driver classes like abstract
   * methods
   * @return bool */
-    static function available() { return false; }
+    static function available()
+    {
+return false; }
 
 /** Checks if file is an image. This static method should be implemented into
   * driver classes like abstract methods
   * @param string $file
   * @return bool */
-    static function checkImage($file) { return false; }
+    static function checkImage($file)
+    {
+return false; }
 
 /** Resize image. Should return TRUE on success or FALSE on failure
   * @param integer $width

manager/views/frame/1.blade.php

Braces +11 added lines, -11 removed lines

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

     // invoke OnManagerTopPrerender event

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

-    if (is_array($evtOut)) {

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

     }

     ?>

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

         // invoke OnManagerTreeInit event

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

-        if(is_array($evtOut)) {

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

         }

         ?>

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

                 // invoke OnManagerTreePrerender event

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

-                if(is_array($evtOut)) {

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

                 }

                 $siteName = $modx->getPhpCompat()->entities($modx->getConfig('site_name'));

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

                 // invoke OnManagerTreeRender event

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

-                if(is_array($evtOut)) {

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

                 }

                 ?>

@@ -414,11 +414,11 @@ 
             'tree_sortdir',

             'tree_nodename'

         );

-        foreach ($sortParams as $param) {

-            if (isset($_REQUEST[$param])) {

+        foreach ($sortParams as $param) {
+            if (isset($_REQUEST[$param])) {
                 $modx->getManagerApi()->saveLastUserSetting($param, $_REQUEST[$param]);

                 $_SESSION[$param] = $_REQUEST[$param];

-            } else if (!isset($_SESSION[$param])) {

+            } else if (!isset($_SESSION[$param])) {
                 $_SESSION[$param] = $modx->getManagerApi()->getLastUserSetting($param);

             }

         }

@@ -470,16 +470,16 @@ 
     </div>

 

 <?php

-if(!function_exists('constructLink')) {

+if(!function_exists('constructLink')) {
     /**

      * @param string $action

      * @param string $img

      * @param string $text

      * @param bool $allowed

      */

-    function constructLink($action, $img, $text, $allowed)

-    {

-        if ((bool)$allowed) {

+    function constructLink($action, $img, $text, $allowed)
+    {
+        if ((bool)$allowed) {
             echo sprintf('<div class="menuLink" id="item%s" onclick="modx.tree.menuHandler(%s);">', $action,

                 $action);

             echo sprintf('<i class="%s"></i> %s</div>', $img, $text);

manager/views/page/2.blade.php

Braces +3 added lines, -3 removed lines

@@ -420,20 +420,20 @@
     $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));
     if(is_array($sitewidgets)) {
         $newwidgets = array();
-        foreach($sitewidgets as $widget){
+        foreach($sitewidgets as $widget) {
             $newwidgets = array_merge($newwidgets, unserialize($widget));
         }
         $widgets = (count($newwidgets) > 0) ? $newwidgets : $widgets;
     }
 
-    usort($widgets, function ($a, $b) {
+    usort($widgets, function ($a, $b){
         return $a['menuindex'] - $b['menuindex'];
     });
 
     $tpl = $modx->getChunk('manager#welcome\Widget');
     $output = '';
     foreach($widgets as $widget) {
-        if ($widget['hide'] != '1'){
+        if ($widget['hide'] != '1') {
             $output .= $modx->parseText($tpl, $widget);
         }
     }

manager/media/script/air-datepicker/datepicker.inc.php

Braces +9 added lines, -4 removed lines

@@ -1,13 +1,17 @@ 
 <?php
-class DATEPICKER {
+class DATEPICKER
+{
     /**
      * @return string
      */
-    public function getDP() {
+    public function getDP()
+    {
         $modx = evolutionCMS();
 
         $load_script = file_get_contents(__DIR__.'/datepicker.tpl');
-        if(!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
+        if(!isset($modx->config['lang_code'])) {
+            $modx->config['lang_code'] = $this->getLangCode();
+        }
 		$modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
         return $modx->mergeSettingsContent($load_script);
     }
@@ -15,7 +19,8 @@ 
     /**
      * @return string
      */
-    public function getLangCode() {
+    public function getLangCode()
+    {
         $lang = evolutionCMS()->get('ManagerTheme')->getLang();
 
         if ($lang === 'uk') {

manager/media/calendar/datepicker.inc.php

Braces +6 added lines, -3 removed lines

@@ -1,10 +1,13 @@
 <?php

 

-class DATEPICKER {

-	function __construct() {

+class DATEPICKER
+{
+	function __construct()
+	{
 	}

 

-	function getDP() {

+	function getDP()
+	{
 		$modx = evolutionCMS(); global $_lang;

 

 		$tpl = file_get_contents(__DIR__ . '/datepicker.tpl');

manager/media/style/default/ajax.php

Braces +86 added lines, -86 removed lines

@@ -2,19 +2,19 @@ 
 define('IN_MANAGER_MODE', true);  // we use this to make sure files are accessed through

 define('MODX_API_MODE', true);

 

-if (file_exists(dirname(__DIR__, 3) . '/config.php')) {

+if (file_exists(dirname(__DIR__, 3) . '/config.php')) {
     $config = require dirname(__DIR__) . '/config.php';

-} elseif (file_exists(dirname(__DIR__, 4) . '/config.php')) {

+} elseif (file_exists(dirname(__DIR__, 4) . '/config.php')) {
     $config = require dirname(__DIR__, 4) . '/config.php';

-} else {

+} else {
     $config = [

         'root' => dirname(__DIR__, 4)

     ];

 }

 

-if (!empty($config['root']) && file_exists($config['root']. '/index.php')) {

+if (!empty($config['root']) && file_exists($config['root']. '/index.php')) {
     require_once $config['root'] . '/index.php';

-} else {

+} else {
     echo "<h3>Unable to load configuration settings</h3>";

     echo "Please run the EVO <a href='../install'>install utility</a>";

     exit;

@@ -22,7 +22,7 @@ 
 

 $modx->getSettings();

 

-if (!isset($_SESSION['mgrValidated']) || !isset($_SERVER['HTTP_X_REQUESTED_WITH']) || (strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') || ($_SERVER['REQUEST_METHOD'] != 'POST')) {

+if (!isset($_SESSION['mgrValidated']) || !isset($_SERVER['HTTP_X_REQUESTED_WITH']) || (strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') || ($_SERVER['REQUEST_METHOD'] != 'POST')) {
     $modx->sendErrorPage();

 }

 

@@ -40,16 +40,16 @@ 
 $limit = $modx->getConfig('number_of_results', 100);

 header('Content-Type: text/html; charset='.$modx->getConfig('modx_charset'), true);

 

-if (isset($action)) {

-    switch ($action) {

+if (isset($action)) {
+    switch ($action) {
         case '1': {

-            switch ($frame) {

+            switch ($frame) {
                 case 'nodes':

                     // save folderstate

-                    if (isset($_REQUEST['opened'])) {

+                    if (isset($_REQUEST['opened'])) {
                         $_SESSION['openedArray'] = $_REQUEST['opened'];

                     }

-                    if (isset($_REQUEST['savestateonly'])) {

+                    if (isset($_REQUEST['savestateonly'])) {
                         exit('send some data');

                     } //??

 

@@ -59,7 +59,7 @@ 
                     $output = '';

                     $hereid = isset($_REQUEST['id']) && is_numeric($_REQUEST['id']) ? $_REQUEST['id'] : '';

 

-                    if (isset($_REQUEST['showonlyfolders'])) {

+                    if (isset($_REQUEST['showonlyfolders'])) {
                         $_SESSION['tree_show_only_folders'] = $_REQUEST['showonlyfolders'];

                     }

 

@@ -69,8 +69,8 @@ 
                         'tree_sortdir',

                         'tree_nodename'

                     );

-                    foreach ($sortParams as $param) {

-                        if (isset($_REQUEST[$param])) {

+                    foreach ($sortParams as $param) {
+                        if (isset($_REQUEST[$param])) {
                             $_SESSION[$param] = $_REQUEST[$param];

                             $modx->getManagerApi()->saveLastUserSetting($param, $_REQUEST[$param]);

                         }

@@ -79,9 +79,9 @@ 
                     // icons by content type

                     $icons = getIconInfo($_style);

 

-                    if (isset($_SESSION['openedArray'])) {

+                    if (isset($_SESSION['openedArray'])) {
                         $opened = array_filter(array_map('intval', explode('|', $_SESSION['openedArray'])));

-                    } else {

+                    } else {
                         $opened = array();

                     }

 

@@ -92,9 +92,9 @@ 
                     echo makeHTML($indent, $parent, $expandAll, $hereid);

 

                     // check for deleted documents on reload

-                    if ($expandAll == 2) {

+                    if ($expandAll == 2) {
                         $rs = $modx->getDatabase()->select('id', $modx->getDatabase()->getFullTableName('site_content'), 'deleted=1 LIMIT 1');

-                        if ($modx->getDatabase()->getRecordCount($rs)) {

+                        if ($modx->getDatabase()->getRecordCount($rs)) {
                             echo '<span id="binFull"></span>'; // add a special element to let system now that the bin is full

                         }

                     }

@@ -108,7 +108,7 @@ 
 

             $elements = isset($_REQUEST['elements']) && is_scalar($_REQUEST['elements']) ? htmlentities($_REQUEST['elements']) : '';

 

-            if ($elements) {

+            if ($elements) {
                 $output = '';

                 $items = '';

                 $sql = '';

@@ -117,7 +117,7 @@ 
                 $sqlLike = $filter ? 'WHERE t1.name LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : '';

                 $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit;

 

-                switch ($elements) {

+                switch ($elements) {
                     case 'element_templates':

                         $a = 16;

                         $sqlLike = $filter ? 'WHERE t1.templatename LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : '';

@@ -127,7 +127,7 @@ 
                         ORDER BY t1.templatename ASC

                         ' . $sqlLimit);

 

-                        if ($modx->hasPermission('new_template')) {

+                        if ($modx->hasPermission('new_template')) {
                             $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>' . $_lang['new_template'] . '</a></li>';

                         }

 

@@ -143,7 +143,7 @@ 
                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

-                        if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {

+                        if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
                             $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>' . $_lang['new_tmplvars'] . '</a></li>';

                         }

 

@@ -157,7 +157,7 @@ 
                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

-                        if ($modx->hasPermission('new_chunk')) {

+                        if ($modx->hasPermission('new_chunk')) {
                             $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>' . $_lang['new_htmlsnippet'] . '</a></li>';

                         }

 

@@ -171,7 +171,7 @@ 
                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

-                        if ($modx->hasPermission('new_snippet')) {

+                        if ($modx->hasPermission('new_snippet')) {
                             $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>' . $_lang['new_snippet'] . '</a></li>';

                         }

 

@@ -185,19 +185,19 @@ 
                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

-                        if ($modx->hasPermission('new_plugin')) {

+                        if ($modx->hasPermission('new_plugin')) {
                             $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>' . $_lang['new_plugin'] . '</a></li>';

                         }

 

                         break;

                 }

 

-                if ($count = $modx->getDatabase()->getRecordCount($sql)) {

-                    if ($count == $limit) {

+                if ($count = $modx->getDatabase()->getRecordCount($sql)) {
+                    if ($count == $limit) {
                         $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';

                     }

-                    while ($row = $modx->getDatabase()->getRow($sql)) {

-                        if (($row['disabled'] || $row['locked']) && $role != 1) {

+                    while ($row = $modx->getDatabase()->getRow($sql)) {
+                        if (($row['disabled'] || $row['locked']) && $role != 1) {
                             continue;

                         }

 

@@ -205,9 +205,9 @@ 
                     }

                 }

 

-                if (isset($_REQUEST['filter'])) {

+                if (isset($_REQUEST['filter'])) {
                     $output = $items;

-                } else {

+                } else {
                     $output .= $items;

                 }

 

@@ -225,7 +225,7 @@ 
             $sqlLike = $filter ? 'WHERE t1.username LIKE "' . $modx->getDatabase()->escape($filter) . '%"' : '';

             $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit;

 

-            if(!$modx->hasPermission('save_role')) {

+            if(!$modx->hasPermission('save_role')) {
                 $sqlLike .= $sqlLike ? ' AND ' : 'WHERE ';

                 $sqlLike .= 't2.role != 1';

             }

@@ -237,22 +237,22 @@ 
 				ORDER BY t1.username ASC

 				' . $sqlLimit);

 

-            if ($modx->hasPermission('new_user')) {

+            if ($modx->hasPermission('new_user')) {
                 $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>' . $_lang['new_user'] . '</a></li>';

             }

 

-            if ($count = $modx->getDatabase()->getRecordCount($sql)) {

-                if ($count == $limit) {

+            if ($count = $modx->getDatabase()->getRecordCount($sql)) {
+                if ($count == $limit) {
                     $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';

                 }

-                while ($row = $modx->getDatabase()->getRow($sql)) {

+                while ($row = $modx->getDatabase()->getRow($sql)) {
                     $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . entities($row['name'], $modx->getConfig('modx_charset')) . ' <small>(' . $row['id'] . ')</small></a></li>';

                 }

             }

 

-            if (isset($_REQUEST['filter'])) {

+            if (isset($_REQUEST['filter'])) {
                 $output = $items;

-            } else {

+            } else {
                 $output .= $items;

             }

 

@@ -276,22 +276,22 @@ 
 				ORDER BY t1.username ASC

 				' . $sqlLimit);

 

-            if ($modx->hasPermission('new_web_user')) {

+            if ($modx->hasPermission('new_web_user')) {
                 $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>' . $_lang['new_web_user'] . '</a></li>';

             }

 

-            if ($count = $modx->getDatabase()->getRecordCount($sql)) {

-                if ($count == $limit) {

+            if ($count = $modx->getDatabase()->getRecordCount($sql)) {
+                if ($count == $limit) {
                     $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';

                 }

-                while ($row = $modx->getDatabase()->getRow($sql)) {

+                while ($row = $modx->getDatabase()->getRow($sql)) {
                     $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . entities($row['name'], $modx->getConfig('modx_charset')) . ' <small>(' . $row['id'] . ')</small></a></li>';

                 }

             }

 

-            if (isset($_REQUEST['filter'])) {

+            if (isset($_REQUEST['filter'])) {
                 $output = $items;

-            } else {

+            } else {
                 $output .= $items;

             }

 

@@ -305,8 +305,8 @@ 
             $type = isset($_REQUEST['type']) && is_scalar($_REQUEST['type']) ? $modx->getDatabase()->escape($_REQUEST['type']) : false;

             $contextmenu = '';

 

-            if ($role && $name && $type) {

-                switch ($type) {

+            if ($role && $name && $type) {
+                switch ($type) {
                     case 'Snippet':

                     case 'SnippetNoCache': {

 

@@ -315,7 +315,7 @@ 
 						WHERE name="' . $name . '"

 						LIMIT 1');

 

-                        if ($modx->getDatabase()->getRecordCount($sql)) {

+                        if ($modx->getDatabase()->getRecordCount($sql)) {
                             $row = $modx->getDatabase()->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

@@ -326,13 +326,13 @@ 
                                     'url' => "index.php?a=22&id=" . $row['id']

                                 )

                             );

-                            if (!empty($row['description'])) {

+                            if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

                                     'innerHTML' => '<i class="fa fa-info"></i> ' . entities($row['description'], $modx->getConfig('modx_charset'))

                                 );

                             }

-                        } else {

+                        } else {
                             $contextmenu = array(

                                 'header' => array(

                                     'innerHTML' => '<i class="fa fa-code"></i> ' . entities($name, $modx->getConfig('modx_charset'))

@@ -353,7 +353,7 @@ 
 						WHERE name="' . $name . '"

 						LIMIT 1');

 

-                        if ($modx->getDatabase()->getRecordCount($sql)) {

+                        if ($modx->getDatabase()->getRecordCount($sql)) {
                             $row = $modx->getDatabase()->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

@@ -364,13 +364,13 @@ 
                                     'url' => "index.php?a=78&id=" . $row['id']

                                 )

                             );

-                            if (!empty($row['description'])) {

+                            if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

                                     'innerHTML' => '<i class="fa fa-info"></i> ' . entities($row['description'], $modx->getConfig('modx_charset'))

                                 );

                             }

-                        } else {

+                        } else {
                             $contextmenu = array(

                                 'header' => array(

                                     'innerHTML' => '<i class="fa fa-th-large"></i> ' . entities($name, $modx->getConfig('modx_charset'))

@@ -390,7 +390,7 @@ 
 						WHERE name="' . $name . '"

 						LIMIT 1');

 

-                        if ($modx->getDatabase()->getRecordCount($sql)) {

+                        if ($modx->getDatabase()->getRecordCount($sql)) {
                             $row = $modx->getDatabase()->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

@@ -401,20 +401,20 @@ 
                                     'url' => "index.php?a=78&id=" . $row['id']

                                 )

                             );

-                            if (!empty($row['description'])) {

+                            if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

                                     'innerHTML' => '<i class="fa fa-info"></i> ' . entities($row['description'], $modx->getConfig('modx_charset'))

                                 );

                             }

-                        } else {

+                        } else {
 

                             $sql = $modx->getDatabase()->query('SELECT *

 							FROM ' . $modx->getFullTableName('site_snippets') . '

 							WHERE name="' . $name . '"

 							LIMIT 1');

 

-                            if ($modx->getDatabase()->getRecordCount($sql)) {

+                            if ($modx->getDatabase()->getRecordCount($sql)) {
                                 $row = $modx->getDatabase()->getRow($sql);

                                 $contextmenu = array(

                                     'header' => array(

@@ -425,13 +425,13 @@ 
                                         'url' => "index.php?a=22&id=" . $row['id']

                                     )

                                 );

-                                if (!empty($row['description'])) {

+                                if (!empty($row['description'])) {
                                     $contextmenu['seperator'] = '';

                                     $contextmenu['description'] = array(

                                         'innerHTML' => '<i class="fa fa-info"></i> ' . entities($row['description'], $modx->getConfig('modx_charset'))

                                     );

                                 }

-                            } else {

+                            } else {
                                 $contextmenu = array(

                                     'header' => array(

                                         'innerHTML' => '<i class="fa fa-code"></i> ' . entities($name, $modx->getConfig('modx_charset'))

@@ -493,7 +493,7 @@ 
                             'alias_visible'

                         );

 

-                        if (in_array($name, $default_field)) {

+                        if (in_array($name, $default_field)) {
                             return;

                         }

 

@@ -502,7 +502,7 @@ 
 						WHERE name="' . $name . '"

 						LIMIT 1');

 

-                        if ($modx->getDatabase()->getRecordCount($sql)) {

+                        if ($modx->getDatabase()->getRecordCount($sql)) {
                             $row = $modx->getDatabase()->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

@@ -513,13 +513,13 @@ 
                                     'url' => "index.php?a=301&id=" . $row['id']

                                 )

                             );

-                            if (!empty($row['description'])) {

+                            if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

                                     'innerHTML' => '<i class="fa fa-info"></i> ' . entities($row['description'], $modx->getConfig('modx_charset'))

                                 );

                             }

-                        } else {

+                        } else {
                             $contextmenu = array(

                                 'header' => array(

                                     'innerHTML' => '<i class="fa fa-list-alt"></i> ' . entities($name, $modx->getConfig('modx_charset'))

@@ -544,13 +544,13 @@ 
         case 'movedocument' : {

             $json = array();

 

-            if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {

+            if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
                 $id = !empty($_REQUEST['id']) ? (int)$_REQUEST['id'] : '';

                 $parent = isset($_REQUEST['parent']) ? (int)$_REQUEST['parent'] : 0;

                 $menuindex = isset($_REQUEST['menuindex']) && is_scalar($_REQUEST['menuindex']) ? $_REQUEST['menuindex'] : 0;

 

                 // set parent

-                if ($id && $parent >= 0) {

+                if ($id && $parent >= 0) {
 

                     // find older parent

                     $parentOld = $modx->getDatabase()->getValue($modx->getDatabase()->select('parent', $modx->getFullTableName('site_content'), 'id=' . $id));

@@ -561,31 +561,31 @@ 
                         'new_parent'  => $parent,

                     ]);

 

-                    if (is_array($eventOut) && count($eventOut) > 0) {

+                    if (is_array($eventOut) && count($eventOut) > 0) {
                         $eventParent = array_pop($eventOut);

 

-                        if ($eventParent == $parentOld) {

+                        if ($eventParent == $parentOld) {
                             $json['errors'] = $_lang['error_movedocument2'];

-                        } else {

+                        } else {
                             $parent = $eventParent;

                         }

                     }

 

-                    if (empty($json['errors'])) {

+                    if (empty($json['errors'])) {
                         // check privileges user for move docs

-                        if (!empty($modx->config['tree_show_protected']) && $role != 1) {

+                        if (!empty($modx->config['tree_show_protected']) && $role != 1) {
                             $sql = $modx->getDatabase()->select('*', $modx->getFullTableName('document_groups'), 'document IN(' . $id . ',' . $parent . ',' . $parentOld . ')');

-                            if ($modx->getDatabase()->getRecordCount($sql)) {

+                            if ($modx->getDatabase()->getRecordCount($sql)) {
                                 $document_groups = array();

-                                while ($row = $modx->getDatabase()->getRow($sql)) {

+                                while ($row = $modx->getDatabase()->getRow($sql)) {
                                     $document_groups[$row['document']]['groups'][] = $row['document_group'];

                                 }

-                                foreach ($document_groups as $key => $value) {

-                                    if (($key == $parent || $key == $parentOld || $key == $id) && !in_array($role, $value['groups'])) {

+                                foreach ($document_groups as $key => $value) {
+                                    if (($key == $parent || $key == $parentOld || $key == $id) && !in_array($role, $value['groups'])) {
                                         $json['errors'] = $_lang["error_no_privileges"];

                                     }

                                 }

-                                if ($json['errors']) {

+                                if ($json['errors']) {
                                     header('content-type: application/json');

                                     echo json_encode($json, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE);

                                     break;

@@ -593,9 +593,9 @@ 
                             }

                         }

 

-                        if ($parent == 0 && $parent != $parentOld && !$modx->config['udperms_allowroot'] && $role != 1) {

+                        if ($parent == 0 && $parent != $parentOld && !$modx->config['udperms_allowroot'] && $role != 1) {
                             $json['errors'] = $_lang["error_no_privileges"];

-                        } else {

+                        } else {
                             // set new parent

                             $modx->getDatabase()->update(array(

                                 'parent' => $parent

@@ -605,13 +605,13 @@ 
                                 'isfolder' => 1

                             ), $modx->getFullTableName('site_content'), 'id=' . $parent);

 

-                            if ($parent != $parentOld) {

+                            if ($parent != $parentOld) {
                                 // check children docs and set parent isfolder

-                                if ($modx->getDatabase()->getRecordCount($modx->getDatabase()->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) {

+                                if ($modx->getDatabase()->getRecordCount($modx->getDatabase()->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) {
                                     $modx->getDatabase()->update(array(

                                         'isfolder' => 1

                                     ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);

-                                } else {

+                                } else {
                                     $modx->getDatabase()->update(array(

                                         'isfolder' => 0

                                     ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);

@@ -619,16 +619,16 @@ 
                             }

 

                             // set menuindex

-                            if (!empty($menuindex)) {

+                            if (!empty($menuindex)) {
                                 $menuindex = explode(',', $menuindex);

-                                foreach ($menuindex as $key => $value) {

+                                foreach ($menuindex as $key => $value) {
                                     $modx->getDatabase()->query('UPDATE ' . $modx->getFullTableName('site_content') . ' SET menuindex=' . $key . ' WHERE id=' . $value);

                                 }

-                            } else {

+                            } else {
                                 // TODO: max(*) menuindex

                             }

 

-                            if (!$json['errors']) {

+                            if (!$json['errors']) {
                                 $json['success'] = $_lang["actioncomplete"];

 

                                 $modx->invokeEvent('onAfterMoveDocument', [

@@ -640,7 +640,7 @@ 
                         }

                     }

                 }

-            } else {

+            } else {
                 $json['errors'] = $_lang["error_no_privileges"];

             }

 

@@ -656,7 +656,7 @@ 
 

             $output = !!$modx->elementIsLocked($type, $id, true);

 

-            if (!$output) {

+            if (!$output) {
                 $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';

                 $docgrp_cond = $docgrp ? ' OR dg.document_group IN (' . $docgrp . ')' : '';

                 $sql = '

@@ -665,7 +665,7 @@ 
                     LEFT JOIN ' . $modx->getFullTableName('document_groups') . ' dg ON dg.document=sc.id

                     WHERE sc.id=' . $id . ' GROUP BY sc.id';

                 $sql = $modx->getDatabase()->query($sql);

-                if ($modx->getDatabase()->getRecordCount($sql)) {

+                if ($modx->getDatabase()->getRecordCount($sql)) {
                     $row = $modx->getDatabase()->getRow($sql);

                     $output = !!$row['locked'];

                 }