evolution-cms / evolution

index.php

Braces +11 added lines, -5 removed lines

@@ -50,17 +50,23 @@
 	include_once($autoloader);
 }
 
-if(!isset($_SERVER['REQUEST_TIME_FLOAT'])) $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true);
+if(!isset($_SERVER['REQUEST_TIME_FLOAT'])) {
+    $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true);
+}
 
 $base_path = str_replace('\\','/',dirname(__FILE__)) . '/';
-if(is_file($base_path . 'assets/cache/siteManager.php'))
+if(is_file($base_path . 'assets/cache/siteManager.php')) {
     include_once($base_path . 'assets/cache/siteManager.php');
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager"))
+}
+if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
 	define('MGR_DIR', 'manager');
-if(is_file($base_path . 'assets/cache/siteHostnames.php'))
+}
+if(is_file($base_path . 'assets/cache/siteHostnames.php')) {
     include_once($base_path . 'assets/cache/siteHostnames.php');
-if(!defined('MODX_SITE_HOSTNAMES'))
+}
+if(!defined('MODX_SITE_HOSTNAMES')) {
 	define('MODX_SITE_HOSTNAMES', '');
+}
 
 // get start time
 $mstart = memory_get_usage();

install/instprocessor.php

Braces +61 added lines, -38 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 if (file_exists(dirname(__FILE__)."/../assets/cache/siteManager.php")) {
     include_once(dirname(__FILE__)."/../assets/cache/siteManager.php");
-}else{
+} else {
     define('MGR_DIR', 'manager');
 }
 
@@ -58,13 +58,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) != "/" ? "/" : "");
@@ -85,7 +87,9 @@ 
     echo "<span class=\"notok\" style='color:#707070'>".$_lang['setup_database_selection_failed']."</span>".$_lang['setup_database_selection_failed_note']."</p>";
     $create = true;
 } else {
-	if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_charset);
+	if (function_exists('mysqli_set_charset')) {
+	    mysqli_set_charset($conn, $database_charset);
+	}
     mysqli_query($conn, "{$database_connection_method} {$database_connection_charset}");
     echo '<span class="ok">'.$_lang['ok']."</span></p>";
 }
@@ -127,7 +131,8 @@ 
 if(!function_exists('parseProperties')) {
     // parses a resource property string and returns the result as an array
     // duplicate of method in documentParser class
-    function parseProperties($propertyString) {
+    function parseProperties($propertyString)
+    {
         $parameter= array ();
         if (!empty ($propertyString)) {
             $tmpParams= explode("&", $propertyString);
@@ -135,11 +140,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];
+                        }
                 }
             }
         }
@@ -210,7 +218,7 @@ 
 // custom or not
 if (file_exists(dirname(__FILE__)."/../../assets/cache/siteManager.php")) {
     $mgrdir = 'include_once(dirname(__FILE__)."/../../assets/cache/siteManager.php");';
-}else{
+} else {
     $mgrdir = 'define(\'MGR_DIR\', \'manager\');';
 }
 
@@ -346,7 +354,9 @@ 
                         echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
                         return;
                     }
-                    if(!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn);
+                    if(!is_null($save_sql_id_as)) {
+                        $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn);
+                    }
                     echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
                 }
             }
@@ -440,9 +450,9 @@ 
             $overwrite = mysqli_real_escape_string($conn, $moduleChunk[4]);
             $filecontent = $moduleChunk[2];
 
-            if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+            } else {
 
                 // Create the category if it does not already exist
                 $category_id = getCreateDbCategory($category, $sqlParser);
@@ -494,9 +504,9 @@ 
             $guid = mysqli_real_escape_string($conn, $moduleModule[4]);
             $shared = mysqli_real_escape_string($conn, $moduleModule[5]);
             $category = mysqli_real_escape_string($conn, $moduleModule[6]);
-            if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+            } else {
 
                 // Create the category if it does not already exist
                 $category = getCreateDbCategory($category, $sqlParser);
@@ -546,9 +556,9 @@ 
                 // parse comma-separated legacy names and prepare them for sql IN clause
                 $leg_names = "'" . implode("','", preg_split('/\s*,\s*/', mysqli_real_escape_string($conn, $modulePlugin[7]))) . "'";
             }
-            if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+            } else {
 
                 // disable legacy versions based on legacy_names provided
                 if(!empty($leg_names)) {
@@ -567,7 +577,7 @@ 
                     $insert = true;
                     while($row = mysqli_fetch_assoc($rs)) {
                         $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
-                        if($row['description'] == $desc){
+                        if($row['description'] == $desc) {
                             if (! mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) {
                                 echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
                                 return;
@@ -625,9 +635,9 @@ 
             $filecontent = $moduleSnippet[2];
             $properties = $moduleSnippet[3];
             $category = mysqli_real_escape_string($conn, $moduleSnippet[4]);
-            if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+            } else {
 
                 // Create the category if it does not already exist
                 $category = getCreateDbCategory($category, $sqlParser);
@@ -735,13 +745,16 @@ 
 }
 
 // call back function
-if ($callBackFnc != "")
+if ($callBackFnc != "") {
     $callBackFnc ($sqlParser);
+}
 
 // Setup the MODX API -- needed for the cache processor
 define('MODX_API_MODE', true);
 define('MODX_BASE_PATH', $base_path);
-if (!defined('MODX_MANAGER_PATH')) define('MODX_MANAGER_PATH', $base_path.MGR_DIR.'/');
+if (!defined('MODX_MANAGER_PATH')) {
+    define('MODX_MANAGER_PATH', $base_path.MGR_DIR.'/');
+}
 $database_type = 'mysqli';
 // initiate a new document parser
 include_once('../'.MGR_DIR.'/includes/document.parser.class.inc.php');
@@ -780,11 +793,12 @@ 
 }
 
 // Property Update function
-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'];
         }
     }
@@ -794,12 +808,17 @@ 
     return $return;
 }
 
-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();
@@ -841,7 +860,7 @@ 
 
         }
     // new json-format
-    } else if(!empty($jsonFormat)){
+    } else if(!empty($jsonFormat)) {
         $property = $jsonFormat;
     }
     if ($json) {
@@ -851,12 +870,14 @@ 
     return $property;
 }
 
-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;
 }
 
-function getCreateDbCategory($category, $sqlParser) {
+function getCreateDbCategory($category, $sqlParser)
+{
     $dbase = $sqlParser->dbname;
     $dbase = '`' . trim($dbase,'`') . '`';
     $table_prefix = $sqlParser->prefix;
@@ -878,7 +899,8 @@ 
 }
 
 // Remove installer Docblock only from components using plugin FileSource / fileBinding
-function removeDocblock($code, $type) {
+function removeDocblock($code, $type)
+{
 
     $cleaned = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', $code, 1);
 
@@ -899,8 +921,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;

install/setup.info.php

Braces +23 added lines, -15 removed lines

@@ -4,7 +4,9 @@ 
 if (is_file($base_path . 'assets/cache/siteManager.php')) {
     include_once($base_path . 'assets/cache/siteManager.php');
 }
-if(!defined('MGR_DIR')) define('MGR_DIR', 'manager');
+if(!defined('MGR_DIR')) {
+    define('MGR_DIR', 'manager');
+}
 
 require_once('../'.MGR_DIR.'/includes/version.inc.php');
 
@@ -19,12 +21,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
             (
@@ -48,7 +50,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']}";
@@ -241,7 +245,8 @@ 
 // setup callback function
 $callBackFnc = "clean_up";
 
-function clean_up($sqlParser) {
+function clean_up($sqlParser)
+{
     $ids = array();
 
     // secure web documents - privateweb
@@ -254,9 +259,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);
@@ -273,9 +279,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);
@@ -283,7 +290,8 @@ 
     }
 }
 
-function parse_docblock($element_dir, $filename) {
+function parse_docblock($element_dir, $filename)
+{
     $params = array();
     $fullpath = $element_dir . '/' . $filename;
     if(is_readable($fullpath)) {

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

Braces +81 added lines, -40 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_imagick extends image {
+class image_imagick extends image
+{
 
     static $MIMES = array(
         //'tif' => "image/tiff"
@@ -21,9 +22,15 @@ 
 
     // ABSTRACT PUBLIC METHODS
 
-    public function resize($width, $height) {//
-        if (!$width) $width = 1;
-        if (!$height) $height = 1;
+    public function resize($width, $height)
+    {
+//
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
         try {
             $this->image->scaleImage($width, $height);
         } catch (Exception $e) {
@@ -34,9 +41,15 @@ 
         return true;
     }
 
-    public function resizeFit($width, $height, $background=false) {//
-        if (!$width) $width = 1;
-        if (!$height) $height = 1;
+    public function resizeFit($width, $height, $background=false)
+    {
+//
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
 
         try {
             $this->image->scaleImage($width, $height, true);
@@ -65,43 +78,58 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
-        if (!$width) $width = 1;
-        if (!$height) $height = 1;
+    public function resizeCrop($width, $height, $offset=false)
+    {
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
 
         if (($this->width / $this->height) > ($width / $height)) {
             $h = $height;
             $w = ($this->width * $h) / $this->height;
             $y = 0;
             if ($offset !== false) {
-                if ($offset > 0)
-                    $offset = -$offset;
-                if (($w + $offset) <= $width)
-                    $offset = $width - $w;
+                if ($offset > 0) {
+                                    $offset = -$offset;
+                }
+                if (($w + $offset) <= $width) {
+                                    $offset = $width - $w;
+                }
                 $x = $offset;
-            } else
-                $x = ($width - $w) / 2;
+            } else {
+                            $x = ($width - $w) / 2;
+            }
 
         } else {
             $w = $width;
             $h = ($this->height * $w) / $this->width;
             $x = 0;
             if ($offset !== false) {
-                if ($offset > 0)
-                    $offset = -$offset;
-                if (($h + $offset) <= $height)
-                    $offset = $height - $h;
+                if ($offset > 0) {
+                                    $offset = -$offset;
+                }
+                if (($h + $offset) <= $height) {
+                                    $offset = $height - $h;
+                }
                 $y = $offset;
-            } else
-                $y = ($height - $h) / 2;
+            } else {
+                            $y = ($height - $h) / 2;
+            }
         }
 
         $x = round($x);
         $y = round($y);
         $w = round($w);
         $h = round($h);
-        if (!$w) $w = 1;
-        if (!$h) $h = 1;
+        if (!$w) {
+            $w = 1;
+        }
+        if (!$h) {
+            $h = 1;
+        }
 
         try {
             $this->image->scaleImage($w, $h);
@@ -115,7 +143,8 @@ 
         return true;
     }
 
-    public function rotate($angle, $background="#000000") {
+    public function rotate($angle, $background="#000000")
+    {
         try {
             $this->image->rotateImage(new ImagickPixel($background), $angle);
             $size = $this->image->getImageGeometry();
@@ -127,7 +156,8 @@ 
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal()
+    {
         try {
             $this->image->flopImage();
         } catch (Exception $e) {
@@ -136,7 +166,8 @@ 
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical()
+    {
         try {
             $this->image->flipImage();
         } catch (Exception $e) {
@@ -145,7 +176,8 @@ 
         return true;
     }
 
-    public function watermark($file, $left=false, $top=false) {
+    public function watermark($file, $left=false, $top=false)
+    {
         try {
             $wm = new Imagick($file);
             $size = $wm->getImageGeometry();
@@ -167,8 +199,9 @@ 
         if ((($x + $w) > $this->width) ||
             (($y + $h) > $this->height) ||
             ($x < 0) || ($y < 0)
-        )
-            return false;
+        ) {
+                    return false;
+        }
 
         try {
             $this->image->compositeImage($wm, Imagick::COMPOSITE_DEFAULT, $x, $y);
@@ -181,7 +214,8 @@ 
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height)
+    {
         try {
             $img = new Imagick();
             $img->newImage($width, $height, "none");
@@ -192,7 +226,8 @@ 
         return $img;
     }
 
-    protected function getImage($image, &$width, &$height) {
+    protected function getImage($image, &$width, &$height)
+    {
 
         if (is_object($image) && ($image instanceof image_imagick)) {
             try {
@@ -227,18 +262,21 @@ 
             $height = $size['height'];
             return $image;
 
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
 
     // PSEUDO-ABSTRACT STATIC METHODS
 
-    static function available() {
+    static function available()
+    {
         return class_exists("Imagick");
     }
 
-    static function checkImage($file) {
+    static function checkImage($file)
+    {
         try {
             new Imagick($file);
         } catch (Exception $e) {
@@ -250,7 +288,8 @@ 
 
     // INHERIT METHODS
 
-    public function output($type="jpeg", array $options=array()) {
+    public function output($type="jpeg", array $options=array())
+    {
         $type = strtolower($type);
         try {
             $this->image->setImageFormat($type);
@@ -258,8 +297,9 @@ 
             return false;
         }
         $method = "optimize_$type";
-        if (method_exists($this, $method) && !$this->$method($options))
-            return false;
+        if (method_exists($this, $method) && !$this->$method($options)) {
+                    return false;
+        }
 
         if (!isset($options['file'])) {
             if (!headers_sent()) {
@@ -289,7 +329,8 @@ 
 
     // OWN METHODS
 
-    protected function optimize_jpeg(array $options=array()) {
+    protected function optimize_jpeg(array $options=array())
+    {
         $quality = isset($options['quality']) ? $options['quality'] : self::DEFAULT_JPEG_QUALITY;
         try {
             $this->image->setImageCompression(Imagick::COMPRESSION_JPEG);

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

Braces +81 added lines, -40 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_gmagick extends image {
+class image_gmagick extends image
+{
 
     static $MIMES = array(
         //'tif' => "image/tiff"
@@ -21,9 +22,15 @@ 
 
     // ABSTRACT PUBLIC METHODS
 
-    public function resize($width, $height) {//
-        if (!$width) $width = 1;
-        if (!$height) $height = 1;
+    public function resize($width, $height)
+    {
+//
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
         try {
             $this->image->scaleImage($width, $height);
         } catch (Exception $e) {
@@ -34,9 +41,15 @@ 
         return true;
     }
 
-    public function resizeFit($width, $height, $background=false) {//
-        if (!$width) $width = 1;
-        if (!$height) $height = 1;
+    public function resizeFit($width, $height, $background=false)
+    {
+//
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
 
         try {
             $this->image->scaleImage($width, $height, true);
@@ -69,43 +82,58 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
-        if (!$width) $width = 1;
-        if (!$height) $height = 1;
+    public function resizeCrop($width, $height, $offset=false)
+    {
+        if (!$width) {
+            $width = 1;
+        }
+        if (!$height) {
+            $height = 1;
+        }
 
         if (($this->width / $this->height) > ($width / $height)) {
             $h = $height;
             $w = ($this->width * $h) / $this->height;
             $y = 0;
             if ($offset !== false) {
-                if ($offset > 0)
-                    $offset = -$offset;
-                if (($w + $offset) <= $width)
-                    $offset = $width - $w;
+                if ($offset > 0) {
+                                    $offset = -$offset;
+                }
+                if (($w + $offset) <= $width) {
+                                    $offset = $width - $w;
+                }
                 $x = $offset;
-            } else
-                $x = ($width - $w) / 2;
+            } else {
+                            $x = ($width - $w) / 2;
+            }
 
         } else {
             $w = $width;
             $h = ($this->height * $w) / $this->width;
             $x = 0;
             if ($offset !== false) {
-                if ($offset > 0)
-                    $offset = -$offset;
-                if (($h + $offset) <= $height)
-                    $offset = $height - $h;
+                if ($offset > 0) {
+                                    $offset = -$offset;
+                }
+                if (($h + $offset) <= $height) {
+                                    $offset = $height - $h;
+                }
                 $y = $offset;
-            } else
-                $y = ($height - $h) / 2;
+            } else {
+                            $y = ($height - $h) / 2;
+            }
         }
 
         $x = round($x);
         $y = round($y);
         $w = round($w);
         $h = round($h);
-        if (!$w) $w = 1;
-        if (!$h) $h = 1;
+        if (!$w) {
+            $w = 1;
+        }
+        if (!$h) {
+            $h = 1;
+        }
 
         try {
             $this->image->scaleImage($w, $h);
@@ -119,7 +147,8 @@ 
         return true;
     }
 
-    public function rotate($angle, $background="#000000") {
+    public function rotate($angle, $background="#000000")
+    {
         try {
             $this->image->rotateImage($background, $angle);
             $w = $this->image->getImageWidth();
@@ -132,7 +161,8 @@ 
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal()
+    {
         try {
             $this->image->flopImage();
         } catch (Exception $e) {
@@ -141,7 +171,8 @@ 
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical()
+    {
         try {
             $this->image->flipImage();
         } catch (Exception $e) {
@@ -150,7 +181,8 @@ 
         return true;
     }
 
-    public function watermark($file, $left=false, $top=false) {
+    public function watermark($file, $left=false, $top=false)
+    {
         try {
             $wm = new Gmagick($file);
             $w = $wm->getImageWidth();
@@ -171,8 +203,9 @@ 
         if ((($x + $w) > $this->width) ||
             (($y + $h) > $this->height) ||
             ($x < 0) || ($y < 0)
-        )
-            return false;
+        ) {
+                    return false;
+        }
 
         try {
             $this->image->compositeImage($wm, 1, $x, $y);
@@ -185,7 +218,8 @@ 
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height)
+    {
         try {
             $img = new Gmagick();
             $img->newImage($width, $height, "none");
@@ -195,7 +229,8 @@ 
         return $img;
     }
 
-    protected function getImage($image, &$width, &$height) {
+    protected function getImage($image, &$width, &$height)
+    {
 
         if (is_object($image) && ($image instanceof image_gmagick)) {
             $width = $image->width;
@@ -225,18 +260,21 @@ 
             $height = $h;
             return $image;
 
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
 
     // PSEUDO-ABSTRACT STATIC METHODS
 
-    static function available() {
+    static function available()
+    {
         return class_exists("Gmagick");
     }
 
-    static function checkImage($file) {
+    static function checkImage($file)
+    {
         try {
             new Gmagick($file);
         } catch (Exception $e) {
@@ -248,7 +286,8 @@ 
 
     // INHERIT METHODS
 
-    public function output($type="jpeg", array $options=array()) {
+    public function output($type="jpeg", array $options=array())
+    {
         $type = strtolower($type);
         try {
             $this->image->setImageFormat($type);
@@ -256,8 +295,9 @@ 
             return false;
         }
         $method = "optimize_$type";
-        if (method_exists($this, $method) && !$this->$method($options))
-            return false;
+        if (method_exists($this, $method) && !$this->$method($options)) {
+                    return false;
+        }
 
         if (!isset($options['file'])) {
             if (!headers_sent()) {
@@ -287,7 +327,8 @@ 
 
     // OWN METHODS
 
-    protected function optimize_jpeg(array $options=array()) {
+    protected function optimize_jpeg(array $options=array())
+    {
         $quality = isset($options['quality']) ? $options['quality'] : self::DEFAULT_JPEG_QUALITY;
         try {
             $this->image->setCompressionQuality($quality);

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

Braces +26 added lines, -36 removed lines

@@ -21,13 +21,17 @@ 
 
 	public function __construct($uri = null)
 	{
-		if ($uri) $this->load($uri);
+		if ($uri) {
+		    $this->load($uri);
+		}
 	}
 
 
 	public function load($uri)
 	{
-		if ($this->handle) $this->close();
+		if ($this->handle) {
+		    $this->close();
+		}
 
 		$this->uri = $uri;
 		$this->handle = fopen($uri, 'r');
@@ -36,15 +40,16 @@ 
 
 	public function close()
 	{
-		if (is_resource($this->handle)) fclose($this->handle);
+		if (is_resource($this->handle)) {
+		    fclose($this->handle);
+		}
 	}
 
 
 	public function getSize()
 	{
 		$this->strpos = 0;
-		if ($this->getType())
-		{
+		if ($this->getType()) {
 			return array_values($this->parseSize());
 		}
 
@@ -56,10 +61,8 @@ 
 	{
 		$this->strpos = 0;
 
-		if (!$this->type)
-		{
-			switch ($this->getChars(2))
-			{
+		if (!$this->type) {
+			switch ($this->getChars(2)) {
 				case "BM":
 					return $this->type = 'bmp';
 				case "GI":
@@ -81,8 +84,7 @@ 
 	{
 		$this->strpos = 0;
 
-		switch ($this->type)
-		{
+		switch ($this->type) {
 			case 'png':
 				return $this->parseSizeForPNG();
 			case 'gif':
@@ -127,10 +129,8 @@ 
 	{
 		$state = null;
 
-		while (true)
-		{
-			switch ($state)
-			{
+		while (true) {
+			switch ($state) {
 				default:
 					$this->getChars(2);
 					$state = 'started';
@@ -138,27 +138,22 @@ 
 
 				case 'started':
 					$b = $this->getByte();
-					if ($b === false) return false;
+					if ($b === false) {
+					    return false;
+					}
 
 					$state = $b == 0xFF ? 'sof' : 'started';
 					break;
 
 				case 'sof':
 					$b = $this->getByte();
-					if (in_array($b, range(0xe0, 0xef)))
-					{
+					if (in_array($b, range(0xe0, 0xef))) {
 						$state = 'skipframe';
-					}
-					elseif (in_array($b, array_merge(range(0xC0,0xC3), range(0xC5,0xC7), range(0xC9,0xCB), range(0xCD,0xCF))))
-					{
+					} elseif (in_array($b, array_merge(range(0xC0,0xC3), range(0xC5,0xC7), range(0xC9,0xCB), range(0xCD,0xCF)))) {
 						$state = 'readsize';
-					}
-					elseif ($b == 0xFF)
-					{
+					} elseif ($b == 0xFF) {
 						$state = 'sof';
-					}
-					else
-					{
+					} else {
 						$state = 'skipframe';
 					}
 					break;
@@ -187,21 +182,16 @@ 
 		$response = null;
 
 		// do we need more data?
-		if ($this->strpos + $n -1 >= strlen($this->str))
-		{
+		if ($this->strpos + $n -1 >= strlen($this->str)) {
 			$end = ($this->strpos + $n);
 
-			while (strlen($this->str) < $end && $response !== false)
-			{
+			while (strlen($this->str) < $end && $response !== false) {
 				// read more from the file handle
 				$need = $end - ftell($this->handle);
 
-				if ($response = fread($this->handle, $need))
-				{
+				if ($response = fread($this->handle, $need)) {
 					$this->str .= $response;
-				}
-				else
-				{
+				} else {
 					return false;
 				}
 			}

manager/media/rss/rss_parse.inc

Braces +89 added lines, -115 removed lines

@@ -31,7 +31,8 @@ 
 * see: rss_fetch.inc for a simpler interface with integrated caching support
 *
 */
-class MagpieRSS {
+class MagpieRSS
+{
     var $parser;
 
     var $current_item   = array();  // item currently being parsed
@@ -143,7 +144,8 @@ 
         $this->normalize();
     }
 
-    function feed_start_element($p, $element, &$attrs) {
+    function feed_start_element($p, $element, &$attrs)
+    {
         $el = $element = strtolower($element);
         $attrs = array_change_key_case($attrs, CASE_LOWER);
 
@@ -163,12 +165,10 @@ 
             if ( $el == 'rdf' ) {
                 $this->feed_type = RSS;
                 $this->feed_version = '1.0';
-            }
-            elseif ( $el == 'rss' ) {
+            } elseif ( $el == 'rss' ) {
                 $this->feed_type = RSS;
                 $this->feed_version = $attrs['version'];
-            }
-            elseif ( $el == 'feed' ) {
+            } elseif ( $el == 'feed' ) {
                 $this->feed_type = ATOM;
                 $this->feed_version = $attrs['version'];
                 $this->inchannel = true;
@@ -176,12 +176,9 @@ 
             return;
         }
 
-        if ( $el == 'channel' )
-        {
+        if ( $el == 'channel' ) {
             $this->inchannel = true;
-        }
-        elseif ($el == 'item' or $el == 'entry' )
-        {
+        } elseif ($el == 'item' or $el == 'entry' ) {
             $this->initem = true;
             if ( isset($attrs['rdf:about']) ) {
                 $this->current_item['about'] = $attrs['rdf:about'];
@@ -193,22 +190,17 @@ 
         elseif (
             $this->feed_type == RSS and
             $this->current_namespace == '' and
-            $el == 'textinput' )
-        {
+            $el == 'textinput' ) {
             $this->intextinput = true;
-        }
-
-        elseif (
+        } elseif (
             $this->feed_type == RSS and
             $this->current_namespace == '' and
-            $el == 'image' )
-        {
+            $el == 'image' ) {
             $this->inimage = true;
         }
 
         # handle atom content constructs
-        elseif ( $this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
-        {
+        elseif ( $this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) ) {
             // avoid clashing w/ RSS mod_content
             if ($el == 'content' ) {
                 $el = 'atom_content';
@@ -220,8 +212,7 @@ 
         }
 
         // if inside an Atom content construct (e.g. content or summary) field treat tags as text
-        elseif ($this->feed_type == ATOM and $this->incontent )
-        {
+        elseif ($this->feed_type == ATOM and $this->incontent ) {
             // if tags are inlined, then flatten
             $attrs_str = join(' ',
                     array_map('map_attrs',
@@ -237,13 +228,10 @@ 
         // Magpie treats link elements of type rel='alternate'
         // as being equivalent to RSS's simple link element.
         //
-        elseif ($this->feed_type == ATOM and $el == 'link' )
-        {
-            if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' )
-            {
+        elseif ($this->feed_type == ATOM and $el == 'link' ) {
+            if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' ) {
                 $link_el = 'link';
-            }
-            else {
+            } else {
                 $link_el = 'link_' . $attrs['rel'];
             }
 
@@ -257,63 +245,51 @@ 
 
 
 
-    function feed_cdata ($p, $text) {
-        if ($this->feed_type == ATOM and $this->incontent)
-        {
+    function feed_cdata ($p, $text)
+    {
+        if ($this->feed_type == ATOM and $this->incontent) {
             $this->append_content( $text );
-        }
-        else {
+        } else {
             $current_el = join('_', array_reverse($this->stack));
             $this->append($current_el, $text);
         }
     }
 
-    function feed_end_element ($p, $el) {
+    function feed_end_element ($p, $el)
+    {
         $el = strtolower($el);
 
-        if ( $el == 'item' or $el == 'entry' )
-        {
+        if ( $el == 'item' or $el == 'entry' ) {
             $this->items[] = $this->current_item;
             $this->current_item = array();
             $this->initem = false;
-        }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' )
-        {
+        } elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' ) {
             $this->intextinput = false;
-        }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' )
-        {
+        } elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' ) {
             $this->inimage = false;
-        }
-        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
-        {
+        } elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) ) {
             $this->incontent = false;
-        }
-        elseif ($el == 'channel' or $el == 'feed' )
-        {
+        } elseif ($el == 'channel' or $el == 'feed' ) {
             $this->inchannel = false;
-        }
-        elseif ($this->feed_type == ATOM and $this->incontent  ) {
+        } elseif ($this->feed_type == ATOM and $this->incontent  ) {
             // balance tags properly
             // note:  i don't think this is actually neccessary
-            if ( $this->stack[0] == $el )
-            {
+            if ( $this->stack[0] == $el ) {
                 $this->append_content("</$el>");
-            }
-            else {
+            } else {
                 $this->append_content("<$el />");
             }
 
             array_shift( $this->stack );
-        }
-        else {
+        } else {
             array_shift( $this->stack );
         }
 
         $this->current_namespace = false;
     }
 
-    function concat (&$str1, $str2="") {
+    function concat (&$str1, $str2="")
+    {
         if (!isset($str1) ) {
             $str1="";
         }
@@ -322,53 +298,46 @@ 
 
 
 
-    function append_content($text) {
+    function append_content($text)
+    {
         if ( $this->initem ) {
             $this->concat( $this->current_item[ $this->incontent ], $text );
-        }
-        elseif ( $this->inchannel ) {
+        } elseif ( $this->inchannel ) {
             $this->concat( $this->channel[ $this->incontent ], $text );
         }
     }
 
     // smart append - field and namespace aware
-    function append($el, $text) {
+    function append($el, $text)
+    {
         if (!$el) {
             return;
         }
-        if ( $this->current_namespace )
-        {
+        if ( $this->current_namespace ) {
             if ( $this->initem ) {
                 $this->concat(
                     $this->current_item[ $this->current_namespace ][ $el ], $text);
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat(
                     $this->channel[ $this->current_namespace][ $el ], $text );
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat(
                     $this->textinput[ $this->current_namespace][ $el ], $text );
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat(
                     $this->image[ $this->current_namespace ][ $el ], $text );
             }
-        }
-        else {
+        } else {
             if ( $this->initem ) {
                 $this->concat(
                     $this->current_item[ $el ], $text);
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat(
                     $this->textinput[ $el ], $text );
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat(
                     $this->image[ $el ], $text );
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat(
                     $this->channel[ $el ], $text );
             }
@@ -376,16 +345,19 @@ 
         }
     }
 
-    function normalize () {
+    function normalize ()
+    {
         // if atom populate rss fields
         if ( $this->is_atom() ) {
             $this->channel['description'] = $this->channel['tagline'];
             for ( $i = 0; $i < count($this->items); $i++) {
                 $item = $this->items[$i];
-                if ( isset($item['summary']) )
-                    $item['description'] = $item['summary'];
-                if ( isset($item['atom_content']))
-                    $item['content']['encoded'] = $item['atom_content'];
+                if ( isset($item['summary']) ) {
+                                    $item['description'] = $item['summary'];
+                }
+                if ( isset($item['atom_content'])) {
+                                    $item['content']['encoded'] = $item['atom_content'];
+                }
 
                 $atom_date = (isset($item['issued']) ) ? $item['issued'] : $item['modified'];
                 if ( $atom_date ) {
@@ -397,23 +369,23 @@ 
 
                 $this->items[$i] = $item;
             }
-        }
-        elseif ( $this->is_rss() ) {
+        } elseif ( $this->is_rss() ) {
             $this->channel['tagline'] = $this->channel['description'];
             for ( $i = 0; $i < count($this->items); $i++) {
                 $item = $this->items[$i];
-                if ( isset($item['description']))
-                    $item['summary'] = $item['description'];
-                if ( isset($item['content']['encoded'] ) )
-                    $item['atom_content'] = $item['content']['encoded'];
+                if ( isset($item['description'])) {
+                                    $item['summary'] = $item['description'];
+                }
+                if ( isset($item['content']['encoded'] ) ) {
+                                    $item['atom_content'] = $item['content']['encoded'];
+                }
 
                 if ( $this->is_rss() == '1.0' and isset($item['dc']['date']) ) {
                     $epoch = @parse_w3cdtf($item['dc']['date']);
                     if ($epoch and $epoch > 0) {
                         $item['date_timestamp'] = $epoch;
                     }
-                }
-                elseif ( isset($item['pubdate']) ) {
+                } elseif ( isset($item['pubdate']) ) {
                     $epoch = @strtotime($item['pubdate']);
                     if ($epoch > 0) {
                         $item['date_timestamp'] = $epoch;
@@ -426,20 +398,20 @@ 
     }
 
 
-    function is_rss () {
+    function is_rss ()
+    {
         if ( $this->feed_type == RSS ) {
             return $this->feed_version;
-        }
-        else {
+        } else {
             return false;
         }
     }
 
-    function is_atom() {
+    function is_atom()
+    {
         if ( $this->feed_type == ATOM ) {
             return $this->feed_version;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -448,11 +420,11 @@ 
     * return XML parser, and possibly re-encoded source
     *
     */
-    function create_parser($source, $out_enc, $in_enc, $detect) {
+    function create_parser($source, $out_enc, $in_enc, $detect)
+    {
         if ( substr(phpversion(),0,1) == 5) {
             $parser = $this->php5_create_parser($in_enc, $detect);
-        }
-        else {
+        } else {
             list($parser, $source) = $this->php4_create_parser($source, $in_enc, $detect);
         }
         if ($out_enc) {
@@ -472,12 +444,12 @@ 
     * All hail libxml2!
     *
     */
-    function php5_create_parser($in_enc, $detect) {
+    function php5_create_parser($in_enc, $detect)
+    {
         // by default php5 does a fine job of detecting input encodings
         if(!$detect && $in_enc) {
             return xml_parser_create($in_enc);
-        }
-        else {
+        } else {
             return xml_parser_create('');
         }
     }
@@ -497,7 +469,8 @@ 
     * @see http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
     *
     */
-    function php4_create_parser($source, $in_enc, $detect) {
+    function php4_create_parser($source, $in_enc, $detect)
+    {
         if ( !$detect ) {
             return array(xml_parser_create($in_enc), $source);
         }
@@ -506,8 +479,7 @@ 
             if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/m', $source, $m)) {
                 $in_enc = strtoupper($m[1]);
                 $this->source_encoding = $in_enc;
-            }
-            else {
+            } else {
                 $in_enc = 'UTF-8';
             }
         }
@@ -522,7 +494,7 @@ 
         // cast the XML to a known encoding
         // @see http://php.net/iconv
 
-        if (function_exists('iconv'))  {
+        if (function_exists('iconv')) {
             $encoded_source = iconv($in_enc,'UTF-8', $source);
             if ($encoded_source) {
                 return array(xml_parser_create('UTF-8'), $encoded_source);
@@ -546,25 +518,25 @@ 
         return array(xml_parser_create(), $source);
     }
 
-    function known_encoding($enc) {
+    function known_encoding($enc)
+    {
         $enc = strtoupper($enc);
         if ( in_array($enc, $this->_KNOWN_ENCODINGS) ) {
             return $enc;
-        }
-        else {
+        } else {
             return false;
         }
     }
 
-    function error ($errormsg, $lvl=E_USER_WARNING) {
+    function error ($errormsg, $lvl=E_USER_WARNING)
+    {
         // append PHP's error message if track_errors enabled
         if ( isset($php_errormsg) ) {
             $errormsg .= " ($php_errormsg)";
         }
         if ( MAGPIE_DEBUG ) {
             trigger_error( $errormsg, $lvl);
-        }
-        else {
+        } else {
             error_log( $errormsg, 0);
         }
 
@@ -579,7 +551,8 @@ 
 
 } // end class RSS
 
-function map_attrs($k, $v) {
+function map_attrs($k, $v)
+{
     return "$k=\"$v\"";
 }
 
@@ -591,9 +564,10 @@ 
 	define('CASE_LOWER', 0);
 
 
-	function array_change_key_case($array, $case=CASE_LOWER) {
+	function array_change_key_case($array, $case=CASE_LOWER)
+	{
         $output = array();
-        switch($case){
+        switch($case) {
            case CASE_LOWER:
                $cmd='strtolower';
                break;

manager/actions/site_schedule.static.php

Braces +11 added lines, -11 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('view_eventlog')) {

+if(!$modx->hasPermission('view_eventlog')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 ?>

@@ -19,11 +19,11 @@ 
 			<?php

 			$rs = $modx->db->select('id, pagetitle, pub_date', $modx->getFullTableName('site_content'), "pub_date > " . time() . "", 'pub_date ASC');

 			$limit = $modx->db->getRecordCount($rs);

-			if($limit < 1) {

+			if($limit < 1) {
 				?>

 				<p><?= $_lang["no_docs_pending_publishing"] ?></p>

 				<?php

-			} else {

+			} else {
 				?>

 				<div class="table-responsive">

 					<table class="grid sortabletable" id="table-1">

@@ -36,7 +36,7 @@ 
 						</thead>

 						<tbody>

 						<?php

-						while($row = $modx->db->getRow($rs)) {

+						while($row = $modx->db->getRow($rs)) {
 							?>

 							<tr>

 								<td class="text-right"><?= $row['id'] ?></td>

@@ -58,11 +58,11 @@ 
 			<?php

 			$rs = $modx->db->select('id, pagetitle, unpub_date', $modx->getFullTableName('site_content'), "unpub_date > " . time() . "", 'unpub_date ASC');

 			$limit = $modx->db->getRecordCount($rs);

-			if($limit < 1) {

+			if($limit < 1) {
 				?>

 				<p><?= $_lang["no_docs_pending_unpublishing"] ?></p>

 				<?php

-			} else {

+			} else {
 				?>

 				<div class="table-responsive">

 					<table class="grid sortabletable" id="table-2">

@@ -75,7 +75,7 @@ 
 						</thead>

 						<tbody>

 						<?php

-						while($row = $modx->db->getRow($rs)) {

+						while($row = $modx->db->getRow($rs)) {
 							?>

 							<tr>

 								<td class="text-right"><?= $row['id'] ?></td>

@@ -97,11 +97,11 @@ 
 			<?php

 			$rs = $modx->db->select('id, pagetitle, pub_date, unpub_date', $modx->getFullTableName('site_content'), "pub_date > 0 OR unpub_date > 0", "pub_date DESC");

 			$limit = $modx->db->getRecordCount($rs);

-			if($limit < 1) {

+			if($limit < 1) {
 				?>

 				<p><?= $_lang["no_docs_pending_pubunpub"] ?></p>

 				<?php

-			} else {

+			} else {
 				?>

 				<div class="table-responsive">

 					<table class="grid sortabletable" id="table-3">

@@ -115,7 +115,7 @@ 
 						</thead>

 						<tbody>

 						<?php

-						while($row = $modx->db->getRow($rs)) {

+						while($row = $modx->db->getRow($rs)) {
 							?>

 							<tr>

 								<td class="text-right"><?= $row['id'] ?></td>

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->manager->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->db->escape($query);

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

@@ -28,7 +28,7 @@ 
 include_once MODX_MANAGER_PATH . "includes/controls/contextmenu.php";

 $cm = new 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));

@@ -107,21 +107,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->db->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->getFullTableName('site_modules') . ' AS sm

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

 				LEFT JOIN ' . $modx->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->db->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->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>";

         }

@@ -137,10 +137,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