evolution-cms / evolution

install/setup.info.php

Spacing +62 added lines, -63 removed lines

@@ -1,33 +1,32 @@ 
 <?php
 //:: EVO Installer Setup file
 //:::::::::::::::::::::::::::::::::::::::::
-if (is_file($base_path . 'assets/cache/siteManager.php')) {
-    include_once($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')) define('MGR_DIR', 'manager');
+if (!defined('MGR_DIR')) define('MGR_DIR', 'manager');
 
 require_once('../'.MGR_DIR.'/includes/version.inc.php');
 
-$chunkPath    = $base_path .'install/assets/chunks';
-$snippetPath  = $base_path .'install/assets/snippets';
-$pluginPath   = $base_path .'install/assets/plugins';
-$modulePath   = $base_path .'install/assets/modules';
-$templatePath = $base_path .'install/assets/templates';
-$tvPath = $base_path .'install/assets/tvs';
+$chunkPath    = $base_path.'install/assets/chunks';
+$snippetPath  = $base_path.'install/assets/snippets';
+$pluginPath   = $base_path.'install/assets/plugins';
+$modulePath   = $base_path.'install/assets/modules';
+$templatePath = $base_path.'install/assets/templates';
+$tvPath = $base_path.'install/assets/tvs';
 
 // setup Template template files - array : name, description, type - 0:file or 1:content, parameters, category
 $mt = &$moduleTemplates;
-if(is_dir($templatePath) && is_readable($templatePath)) {
+if (is_dir($templatePath) && is_readable($templatePath)) {
     $d = dir($templatePath);
     while (false !== ($tplfile = $d->read()))
     {
-        if(substr($tplfile, -4) != '.tpl') continue;
+        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
-            (
+            $mt[] = array(
                 $params['name'],
                 $description,
                 // Don't think this is gonna be used ... but adding it just in case 'type'
@@ -45,12 +44,12 @@ 
 
 // setup Template Variable template files
 $mtv = &$moduleTVs;
-if(is_dir($tvPath) && is_readable($tvPath)) {
+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)) {
+        if (is_array($params) && (count($params) > 0)) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $mtv[] = array(
                 $params['name'],
@@ -62,9 +61,9 @@ 
                 $params['output_widget'],
                 $params['output_widget_params'],
                 "$templatePath/{$params['filename']}", /* not currently used */
-                $params['template_assignments']!="*"?$params['template_assignments']:implode(",",array_map(create_function('$v','return $v[0];'),$mt)), /* comma-separated list of template names */
+                $params['template_assignments'] != "*" ? $params['template_assignments'] : implode(",", array_map(create_function('$v', 'return $v[0];'), $mt)), /* comma-separated list of template names */
                 $params['modx_category'],
-                $params['lock_tv'],  /* value should be 1 or 0 */
+                $params['lock_tv'], /* value should be 1 or 0 */
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false
             );
         }
@@ -74,14 +73,14 @@ 
 
 // setup chunks template files - array : name, description, type - 0:file or 1:content, file or content
 $mc = &$moduleChunks;
-if(is_dir($chunkPath) && is_readable($chunkPath)) {
+if (is_dir($chunkPath) && is_readable($chunkPath)) {
     $d = dir($chunkPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($chunkPath, $tplfile);
-        if(is_array($params) && count($params) > 0) {
+        if (is_array($params) && count($params) > 0) {
             $mc[] = array(
                 $params['name'],
                 $params['description'],
@@ -97,14 +96,14 @@ 
 
 // setup snippets template files - array : name, description, type - 0:file or 1:content, file or content,properties
 $ms = &$moduleSnippets;
-if(is_dir($snippetPath) && is_readable($snippetPath)) {
+if (is_dir($snippetPath) && is_readable($snippetPath)) {
     $d = dir($snippetPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($snippetPath, $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']}";
             $ms[] = array(
                 $params['name'],
@@ -121,14 +120,14 @@ 
 
 // setup plugins template files - array : name, description, type - 0:file or 1:content, file or content,properties
 $mp = &$modulePlugins;
-if(is_dir($pluginPath) && is_readable($pluginPath)) {
+if (is_dir($pluginPath) && is_readable($pluginPath)) {
     $d = dir($pluginPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($pluginPath, $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']}";
             $mp[] = array(
                 $params['name'],
@@ -150,14 +149,14 @@ 
 // setup modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid,enable_sharedparams
 $mm = &$moduleModules;
 $mdp = &$moduleDependencies;
-if(is_dir($modulePath) && is_readable($modulePath)) {
+if (is_dir($modulePath) && is_readable($modulePath)) {
     $d = dir($modulePath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($modulePath, $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']}";
             $mm[] = array(
                 $params['name'],
@@ -241,103 +240,103 @@ 
 // setup callback function
 $callBackFnc = "clean_up";
 
-function clean_up($sqlParser) {
+function clean_up($sqlParser){
     $ids = array();
 
     // secure web documents - privateweb
-    mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 0 WHERE privateweb = 1");
-    $sql =  "SELECT DISTINCT sc.id
+    mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 0 WHERE privateweb = 1");
+    $sql = "SELECT DISTINCT sc.id
              FROM `".$sqlParser->prefix."site_content` sc
              LEFT JOIN `".$sqlParser->prefix."document_groups` dg ON dg.document = sc.id
              LEFT JOIN `".$sqlParser->prefix."webgroup_access` wga ON wga.documentgroup = dg.document_group
              WHERE wga.id>0";
-    $ds = mysqli_query($sqlParser->conn,$sql);
-    if(!$ds) {
+    $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"];
-        if(count($ids)>0) {
-            mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ",$ids).")");
+        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);
         }
     }
 
     // secure manager documents privatemgr
-    mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 0 WHERE privatemgr = 1");
-    $sql =  "SELECT DISTINCT sc.id
+    mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 0 WHERE privatemgr = 1");
+    $sql = "SELECT DISTINCT sc.id
              FROM `".$sqlParser->prefix."site_content` sc
              LEFT JOIN `".$sqlParser->prefix."document_groups` dg ON dg.document = sc.id
              LEFT JOIN `".$sqlParser->prefix."membergroup_access` mga ON mga.documentgroup = dg.document_group
              WHERE mga.id>0";
-    $ds = mysqli_query($sqlParser->conn,$sql);
-    if(!$ds) {
+    $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"];
-        if(count($ids)>0) {
-            mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ",$ids).")");
+        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);
         }
     }
 }
 
-function parse_docblock($element_dir, $filename) {
+function parse_docblock($element_dir, $filename){
     $params = array();
-    $fullpath = $element_dir . '/' . $filename;
-    if(is_readable($fullpath)) {
+    $fullpath = $element_dir.'/'.$filename;
+    if (is_readable($fullpath)) {
         $tpl = @fopen($fullpath, "r");
-        if($tpl) {
+        if ($tpl) {
             $params['filename'] = $filename;
             $docblock_start_found = false;
             $name_found = false;
             $description_found = false;
 
-            while(!feof($tpl)) {
+            while (!feof($tpl)) {
                 $line = fgets($tpl);
-                if(!$docblock_start_found) {
+                if (!$docblock_start_found) {
                     // find docblock start
-                    if(strpos($line, '/**') !== false) {
+                    if (strpos($line, '/**') !== false) {
                         $docblock_start_found = true;
                     }
                     continue;
-                } elseif(!$name_found) {
+                } elseif (!$name_found) {
                     // find name
                     $ma = null;
-                    if(preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
+                    if (preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
                         $params['name'] = trim($ma[1]);
                         $name_found = !empty($params['name']);
                     }
                     continue;
-                } elseif(!$description_found) {
+                } elseif (!$description_found) {
                     // find description
                     $ma = null;
-                    if(preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
+                    if (preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
                         $params['description'] = trim($ma[1]);
                         $description_found = !empty($params['description']);
                     }
                     continue;
                 } else {
                     $ma = null;
-                    if(preg_match("/^\s+\*\s+\@([^\s]+)\s+(.+)/", $line, $ma)) {
+                    if (preg_match("/^\s+\*\s+\@([^\s]+)\s+(.+)/", $line, $ma)) {
                         $param = trim($ma[1]);
                         $val = trim($ma[2]);
-                        if(!empty($param) && !empty($val)) {
-                            if($param == 'internal') {
+                        if (!empty($param) && !empty($val)) {
+                            if ($param == 'internal') {
                                 $ma = null;
-                                if(preg_match("/\@([^\s]+)\s+(.+)/", $val, $ma)) {
+                                if (preg_match("/\@([^\s]+)\s+(.+)/", $val, $ma)) {
                                     $param = trim($ma[1]);
                                     $val = trim($ma[2]);
                                 }
                                 //if($val !== '0' && (empty($param) || empty($val))) {
-                                if(empty($param)) {
+                                if (empty($param)) {
                                     continue;
                                 }
                             }
                             $params[$param] = $val;
                         }
-                    } elseif(preg_match("/^\s*\*\/\s*$/", $line)) {
+                    } elseif (preg_match("/^\s*\*\/\s*$/", $line)) {
                         break;
                     }
                 }

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

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_imagick extends image {
+class image_imagick extends image{
 
     static $MIMES = array(
         //'tif' => "image/tiff"
@@ -21,7 +21,7 @@ 
 
     // ABSTRACT PUBLIC METHODS
 
-    public function resize($width, $height) {//
+    public function resize($width, $height){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
         try {
@@ -34,7 +34,7 @@ 
         return true;
     }
 
-    public function resizeFit($width, $height, $background=false) {//
+    public function resizeFit($width, $height, $background = false){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -65,7 +65,7 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
+    public function resizeCrop($width, $height, $offset = false){
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -115,7 +115,7 @@ 
         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 +127,7 @@ 
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal(){
         try {
             $this->image->flopImage();
         } catch (Exception $e) {
@@ -136,7 +136,7 @@ 
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical(){
         try {
             $this->image->flipImage();
         } catch (Exception $e) {
@@ -145,7 +145,7 @@ 
         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();
@@ -181,7 +181,7 @@ 
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height){
         try {
             $img = new Imagick();
             $img->newImage($width, $height, "none");
@@ -192,7 +192,7 @@ 
         return $img;
     }
 
-    protected function getImage($image, &$width, &$height) {
+    protected function getImage($image, &$width, &$height){
 
         if (is_object($image) && ($image instanceof image_imagick)) {
             try {
@@ -234,11 +234,11 @@ 
 
     // 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 +250,7 @@ 
 
     // 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);
@@ -269,7 +269,7 @@ 
             echo $this->image;
 
         } else {
-            $file = $options['file'] . ".$type";
+            $file = $options['file'].".$type";
             try {
                 $this->image->writeImage($file);
             } catch (Exception $e) {
@@ -289,7 +289,7 @@ 
 
     // 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

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_gmagick extends image {
+class image_gmagick extends image{
 
     static $MIMES = array(
         //'tif' => "image/tiff"
@@ -21,7 +21,7 @@ 
 
     // ABSTRACT PUBLIC METHODS
 
-    public function resize($width, $height) {//
+    public function resize($width, $height){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
         try {
@@ -34,7 +34,7 @@ 
         return true;
     }
 
-    public function resizeFit($width, $height, $background=false) {//
+    public function resizeFit($width, $height, $background = false){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -69,7 +69,7 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
+    public function resizeCrop($width, $height, $offset = false){
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -119,7 +119,7 @@ 
         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 +132,7 @@ 
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal(){
         try {
             $this->image->flopImage();
         } catch (Exception $e) {
@@ -141,7 +141,7 @@ 
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical(){
         try {
             $this->image->flipImage();
         } catch (Exception $e) {
@@ -150,7 +150,7 @@ 
         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();
@@ -185,7 +185,7 @@ 
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height){
         try {
             $img = new Gmagick();
             $img->newImage($width, $height, "none");
@@ -195,7 +195,7 @@ 
         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;
@@ -232,11 +232,11 @@ 
 
     // 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 +248,7 @@ 
 
     // 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);
@@ -267,7 +267,7 @@ 
             echo $this->image;
 
         } else {
-            $file = $options['file'] . ".$type";
+            $file = $options['file'].".$type";
             try {
                 $this->image->writeImage($file);
             } catch (Exception $e) {
@@ -287,7 +287,7 @@ 
 
     // 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/core/autoload.php

Spacing +12 added lines, -12 removed lines

@@ -26,7 +26,7 @@ 
 $modx = new DocumentParser;
 $modx->db->connect();
 startCMSSession();
-if(!isset($_SESSION['mgrValidated'])) {
+if (!isset($_SESSION['mgrValidated'])) {
         die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 define('IN_MANAGER_MODE', true);
@@ -34,7 +34,7 @@ 
 
 $manager_language = $modx->config['manager_language'];
 // Pass language code from MODX to KCFinder
-if(!file_exists("../../../includes/lang/".$manager_language.".inc.php")) {
+if (!file_exists("../../../includes/lang/".$manager_language.".inc.php")) {
     $manager_language = "english"; // if not set, get the english language file.
 }
 include_once "../../../includes/lang/".$manager_language.".inc.php";
@@ -42,7 +42,7 @@ 
 
 // PHP VERSION CHECK
 if (substr(PHP_VERSION, 0, strpos(PHP_VERSION, '.')) < 5)
-    die("You are using PHP " . PHP_VERSION . " when KCFinder require at least version 5! Some systems has an option to change the active PHP version. Please refer to your hosting provider or upgrade your PHP distribution.");
+    die("You are using PHP ".PHP_VERSION." when KCFinder require at least version 5! Some systems has an option to change the active PHP version. Please refer to your hosting provider or upgrade your PHP distribution.");
 
 
 // SAFE MODE CHECK
@@ -51,7 +51,7 @@ 
 
 
 // MAGIC AUTOLOAD CLASSES FUNCTION
-function autoloadda9d06472ccb71b84928677ce2a6ca89($class) {
+function autoloadda9d06472ccb71b84928677ce2a6ca89($class){
     static $classes = null;
     if ($classes === null) {
         $classes = array(
@@ -75,7 +75,7 @@ 
         );
     }
     if (isset($classes[$class])) {
-        require dirname(__FILE__) . $classes[$class];
+        require dirname(__FILE__).$classes[$class];
     }
 }
 spl_autoload_register('autoloadda9d06472ccb71b84928677ce2a6ca89', true);
@@ -84,18 +84,18 @@ 
 // json_encode() IMPLEMENTATION IF JSON EXTENSION IS MISSING
 if (!function_exists("json_encode")) {
 
-    function kcfinder_json_string_encode($string) {
-        return '"' .
+    function kcfinder_json_string_encode($string){
+        return '"'.
             str_replace('/', "\\/",
             str_replace("\t", "\\t",
             str_replace("\r", "\\r",
             str_replace("\n", "\\n",
             str_replace('"', "\\\"",
             str_replace("\\", "\\\\",
-        $string)))))) . '"';
+        $string)))))).'"';
     }
 
-    function json_encode($data) {
+    function json_encode($data){
 
         if (is_array($data)) {
             $ret = array();
@@ -103,14 +103,14 @@ 
             // OBJECT
             if (array_keys($data) !== range(0, count($data) - 1)) {
                 foreach ($data as $key => $val)
-                    $ret[] = kcfinder_json_string_encode($key) . ':' . json_encode($val);
-                return "{" . implode(",", $ret) . "}";
+                    $ret[] = kcfinder_json_string_encode($key).':'.json_encode($val);
+                return "{".implode(",", $ret)."}";
 
             // ARRAY
             } else {
                 foreach ($data as $val)
                     $ret[] = json_encode($val);
-                return "[" . implode(",", $ret) . "]";
+                return "[".implode(",", $ret)."]";
             }
 
         // BOOLEAN OR NULL

manager/media/rss/rss_parse.inc

Spacing +118 added lines, -118 removed lines

@@ -23,7 +23,7 @@ 
 define('RSS', 'RSS');
 define('ATOM', 'Atom');
 
-require_once (MAGPIE_DIR . 'rss_utils.inc');
+require_once (MAGPIE_DIR.'rss_utils.inc');
 
 /**
 * Hybrid parser, and object, takes RSS as a string and returns a simple object.
@@ -31,19 +31,19 @@ 
 * 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
-    var $items          = array();  // collection of parsed items
-    var $channel        = array();  // hash of channel fields
+    var $current_item   = array(); // item currently being parsed
+    var $items          = array(); // collection of parsed items
+    var $channel        = array(); // hash of channel fields
     var $textinput      = array();
     var $image          = array();
     var $feed_type;
     var $feed_version;
-    var $encoding       = '';       // output encoding of parsed rss
+    var $encoding       = ''; // output encoding of parsed rss
 
-    var $_source_encoding = '';     // only set if we have to parse xml prolog
+    var $_source_encoding = ''; // only set if we have to parse xml prolog
 
     var $ERROR = "";
     var $WARNING = "";
@@ -91,15 +91,15 @@ 
      *                                  source encoding. (caveat emptor)
      *
      */
-    function __construct($source, $output_encoding='ISO-8859-1',
-                        $input_encoding=null, $detect_encoding=true)
+    function __construct($source, $output_encoding = 'ISO-8859-1',
+                        $input_encoding = null, $detect_encoding = true)
     {
         # if PHP xml isn't compiled in, die
         #
         if (!function_exists('xml_parser_create')) {
-            $this->error( "Failed to load PHP's XML Extension. " .
+            $this->error("Failed to load PHP's XML Extension. ".
                           "http://www.php.net/manual/en/ref.xml.php",
-                           E_USER_ERROR );
+                           E_USER_ERROR);
         }
 
         list($parser, $source) = $this->create_parser($source,
@@ -107,9 +107,9 @@ 
 
 
         if (!is_resource($parser)) {
-            $this->error( "Failed to create an instance of PHP's XML parser. " .
+            $this->error("Failed to create an instance of PHP's XML parser. ".
                           "http://www.php.net/manual/en/ref.xml.php",
-                          E_USER_ERROR );
+                          E_USER_ERROR);
         }
 
 
@@ -118,57 +118,57 @@ 
         # pass in parser, and a reference to this object
         # setup handlers
         #
-        xml_set_object( $this->parser, $this );
+        xml_set_object($this->parser, $this);
         xml_set_element_handler($this->parser,
-                'feed_start_element', 'feed_end_element' );
+                'feed_start_element', 'feed_end_element');
 
-        xml_set_character_data_handler( $this->parser, 'feed_cdata' );
+        xml_set_character_data_handler($this->parser, 'feed_cdata');
 
-        $status = xml_parse( $this->parser, $source );
+        $status = xml_parse($this->parser, $source);
 
-        if (! $status ) {
-            $errorcode = xml_get_error_code( $this->parser );
-            if ( $errorcode != XML_ERROR_NONE ) {
-                $xml_error = xml_error_string( $errorcode );
+        if (!$status) {
+            $errorcode = xml_get_error_code($this->parser);
+            if ($errorcode != XML_ERROR_NONE) {
+                $xml_error = xml_error_string($errorcode);
                 $error_line = xml_get_current_line_number($this->parser);
                 $error_col = xml_get_current_column_number($this->parser);
                 $errormsg = "$xml_error at line $error_line, column $error_col";
 
-                $this->error( $errormsg );
+                $this->error($errormsg);
             }
         }
 
-        xml_parser_free( $this->parser );
+        xml_parser_free($this->parser);
 
         $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);
 
         // check for a namespace, and split if found
         $ns = false;
-        if ( strpos( $element, ':' ) ) {
-            list($ns, $el) = explode( ':', $element, 2);
+        if (strpos($element, ':')) {
+            list($ns, $el) = explode(':', $element, 2);
         }
-        if ( $ns and $ns != 'rdf' ) {
+        if ($ns and $ns != 'rdf') {
             $this->current_namespace = $ns;
         }
 
         # if feed type isn't set, then this is first element of feed
         # identify feed from root element
         #
-        if (!isset($this->feed_type) ) {
-            if ( $el == 'rdf' ) {
+        if (!isset($this->feed_type)) {
+            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,14 +176,14 @@ 
             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']) ) {
+            if (isset($attrs['rdf:about'])) {
                 $this->current_item['about'] = $attrs['rdf:about'];
             }
         }
@@ -207,10 +207,10 @@ 
         }
 
         # 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' ) {
+            if ($el == 'content') {
                 $el = 'atom_content';
             }
 
@@ -220,31 +220,31 @@ 
         }
 
         // 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',
                     array_keys($attrs),
-                    array_values($attrs) ) );
+                    array_values($attrs)));
 
-            $this->append_content( "<$element $attrs_str>"  );
+            $this->append_content("<$element $attrs_str>");
 
-            array_unshift( $this->stack, $el );
+            array_unshift($this->stack, $el);
         }
 
         // Atom support many links per containging element.
         // 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' )
+        elseif ($this->feed_type == ATOM and $el == 'link')
         {
-            if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' )
+            if (isset($attrs['rel']) and $attrs['rel'] == 'alternate')
             {
                 $link_el = 'link';
             }
             else {
-                $link_el = 'link_' . $attrs['rel'];
+                $link_el = 'link_'.$attrs['rel'];
             }
 
             $this->append($link_el, $attrs['href']);
@@ -257,10 +257,10 @@ 
 
 
 
-    function feed_cdata ($p, $text) {
+    function feed_cdata($p, $text){
         if ($this->feed_type == ATOM and $this->incontent)
         {
-            $this->append_content( $text );
+            $this->append_content($text);
         }
         else {
             $current_el = join('_', array_reverse($this->stack));
@@ -268,35 +268,35 @@ 
         }
     }
 
-    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>");
             }
@@ -304,91 +304,91 @@ 
                 $this->append_content("<$el />");
             }
 
-            array_shift( $this->stack );
+            array_shift($this->stack);
         }
         else {
-            array_shift( $this->stack );
+            array_shift($this->stack);
         }
 
         $this->current_namespace = false;
     }
 
-    function concat (&$str1, $str2="") {
-        if (!isset($str1) ) {
-            $str1="";
+    function concat(&$str1, $str2 = ""){
+        if (!isset($str1)) {
+            $str1 = "";
         }
         $str1 .= $str2;
     }
 
 
 
-    function append_content($text) {
-        if ( $this->initem ) {
-            $this->concat( $this->current_item[ $this->incontent ], $text );
+    function append_content($text){
+        if ($this->initem) {
+            $this->concat($this->current_item[$this->incontent], $text);
         }
-        elseif ( $this->inchannel ) {
-            $this->concat( $this->channel[ $this->incontent ], $text );
+        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 ) {
+            if ($this->initem) {
                 $this->concat(
-                    $this->current_item[ $this->current_namespace ][ $el ], $text);
+                    $this->current_item[$this->current_namespace][$el], $text);
             }
             elseif ($this->inchannel) {
                 $this->concat(
-                    $this->channel[ $this->current_namespace][ $el ], $text );
+                    $this->channel[$this->current_namespace][$el], $text );
             }
             elseif ($this->intextinput) {
                 $this->concat(
-                    $this->textinput[ $this->current_namespace][ $el ], $text );
+                    $this->textinput[$this->current_namespace][$el], $text );
             }
             elseif ($this->inimage) {
                 $this->concat(
-                    $this->image[ $this->current_namespace ][ $el ], $text );
+                    $this->image[$this->current_namespace][$el], $text );
             }
         }
         else {
-            if ( $this->initem ) {
+            if ($this->initem) {
                 $this->concat(
-                    $this->current_item[ $el ], $text);
+                    $this->current_item[$el], $text);
             }
             elseif ($this->intextinput) {
                 $this->concat(
-                    $this->textinput[ $el ], $text );
+                    $this->textinput[$el], $text );
             }
             elseif ($this->inimage) {
                 $this->concat(
-                    $this->image[ $el ], $text );
+                    $this->image[$el], $text );
             }
             elseif ($this->inchannel) {
                 $this->concat(
-                    $this->channel[ $el ], $text );
+                    $this->channel[$el], $text );
             }
 
         }
     }
 
-    function normalize () {
+    function normalize(){
         // if atom populate rss fields
-        if ( $this->is_atom() ) {
+        if ($this->is_atom()) {
             $this->channel['description'] = $this->channel['tagline'];
-            for ( $i = 0; $i < count($this->items); $i++) {
+            for ($i = 0; $i < count($this->items); $i++) {
                 $item = $this->items[$i];
-                if ( isset($item['summary']) )
+                if (isset($item['summary']))
                     $item['description'] = $item['summary'];
-                if ( isset($item['atom_content']))
+                if (isset($item['atom_content']))
                     $item['content']['encoded'] = $item['atom_content'];
 
-                $atom_date = (isset($item['issued']) ) ? $item['issued'] : $item['modified'];
-                if ( $atom_date ) {
+                $atom_date = (isset($item['issued'])) ? $item['issued'] : $item['modified'];
+                if ($atom_date) {
                     $epoch = @parse_w3cdtf($atom_date);
                     if ($epoch and $epoch > 0) {
                         $item['date_timestamp'] = $epoch;
@@ -398,22 +398,22 @@ 
                 $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++) {
+            for ($i = 0; $i < count($this->items); $i++) {
                 $item = $this->items[$i];
-                if ( isset($item['description']))
+                if (isset($item['description']))
                     $item['summary'] = $item['description'];
-                if ( isset($item['content']['encoded'] ) )
+                if (isset($item['content']['encoded']))
                     $item['atom_content'] = $item['content']['encoded'];
 
-                if ( $this->is_rss() == '1.0' and isset($item['dc']['date']) ) {
+                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,8 +426,8 @@ 
     }
 
 
-    function is_rss () {
-        if ( $this->feed_type == RSS ) {
+    function is_rss(){
+        if ($this->feed_type == RSS) {
             return $this->feed_version;
         }
         else {
@@ -435,8 +435,8 @@ 
         }
     }
 
-    function is_atom() {
-        if ( $this->feed_type == ATOM ) {
+    function is_atom(){
+        if ($this->feed_type == ATOM) {
             return $this->feed_version;
         }
         else {
@@ -448,8 +448,8 @@ 
     * return XML parser, and possibly re-encoded source
     *
     */
-    function create_parser($source, $out_enc, $in_enc, $detect) {
-        if ( substr(phpversion(),0,1) == 5) {
+    function create_parser($source, $out_enc, $in_enc, $detect){
+        if (substr(phpversion(), 0, 1) == 5) {
             $parser = $this->php5_create_parser($in_enc, $detect);
         }
         else {
@@ -472,9 +472,9 @@ 
     * 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) {
+        if (!$detect && $in_enc) {
             return xml_parser_create($in_enc);
         }
         else {
@@ -497,8 +497,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) {
-        if ( !$detect ) {
+    function php4_create_parser($source, $in_enc, $detect){
+        if (!$detect) {
             return array(xml_parser_create($in_enc), $source);
         }
 
@@ -522,8 +522,8 @@ 
         // cast the XML to a known encoding
         // @see http://php.net/iconv
 
-        if (function_exists('iconv'))  {
-            $encoded_source = iconv($in_enc,'UTF-8', $source);
+        if (function_exists('iconv')) {
+            $encoded_source = iconv($in_enc, 'UTF-8', $source);
             if ($encoded_source) {
                 return array(xml_parser_create('UTF-8'), $encoded_source);
             }
@@ -531,24 +531,24 @@ 
 
         // iconv didn't work, try mb_convert_encoding
         // @see http://php.net/mbstring
-        if(function_exists('mb_convert_encoding')) {
-            $encoded_source = mb_convert_encoding($source, 'UTF-8', $in_enc );
+        if (function_exists('mb_convert_encoding')) {
+            $encoded_source = mb_convert_encoding($source, 'UTF-8', $in_enc);
             if ($encoded_source) {
                 return array(xml_parser_create('UTF-8'), $encoded_source);
             }
         }
 
         // else
-        $this->error("Feed is in an unsupported character encoding. ($in_enc) " .
+        $this->error("Feed is in an unsupported character encoding. ($in_enc) ".
                      "You may see strange artifacts, and mangled characters.",
                      E_USER_NOTICE);
 
         return array(xml_parser_create(), $source);
     }
 
-    function known_encoding($enc) {
+    function known_encoding($enc){
         $enc = strtoupper($enc);
-        if ( in_array($enc, $this->_KNOWN_ENCODINGS) ) {
+        if (in_array($enc, $this->_KNOWN_ENCODINGS)) {
             return $enc;
         }
         else {
@@ -556,20 +556,20 @@ 
         }
     }
 
-    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) ) {
+        if (isset($php_errormsg)) {
             $errormsg .= " ($php_errormsg)";
         }
-        if ( MAGPIE_DEBUG ) {
-            trigger_error( $errormsg, $lvl);
+        if (MAGPIE_DEBUG) {
+            trigger_error($errormsg, $lvl);
         }
         else {
-            error_log( $errormsg, 0);
+            error_log($errormsg, 0);
         }
 
-        $notices = E_USER_NOTICE|E_NOTICE;
-        if ( $lvl&$notices ) {
+        $notices = E_USER_NOTICE | E_NOTICE;
+        if ($lvl & $notices) {
             $this->WARNING = $errormsg;
         } else {
             $this->ERROR = $errormsg;
@@ -579,7 +579,7 @@ 
 
 } // end class RSS
 
-function map_attrs($k, $v) {
+function map_attrs($k, $v){
     return "$k=\"$v\"";
 }
 
@@ -591,19 +591,19 @@ 
 	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';
+               $cmd = 'strtolower';
                break;
            case CASE_UPPER:
-               $cmd='strtoupper';
+               $cmd = 'strtoupper';
                break;
            default:
                $cmd = '';
         }
-        foreach($array as $key=>$value) {
+        foreach ($array as $key=>$value) {
             $output[empty($cmd) ? $key : $cmd($key)] = $value;
         }
         return $output;

manager/actions/site_schedule.static.php

Spacing +10 added lines, -10 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"]);

 }

 ?>

@@ -17,9 +17,9 @@ 
 		<div class="form-group" id="lyr1">

 			<b><?= $_lang["publish_events"] ?></b>

 			<?php

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

+			$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

@@ -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>

@@ -56,9 +56,9 @@ 
 		<div class="form-group" id="lyr2">

 			<b><?= $_lang["unpublish_events"] ?></b>

 			<?php

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

+			$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

@@ -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,7 +97,7 @@ 
 			<?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

@@ -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/mutate_plugin_priority.dynamic.php

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('save_plugin')) {
@@ -11,7 +11,7 @@ 
 $updateMsg = '';
 
 if (isset($_POST['listSubmitted'])) {
-    $updateMsg .= '<span class="text-success" id="updated">' . $_lang['sort_updated'] . '</span>';
+    $updateMsg .= '<span class="text-success" id="updated">'.$_lang['sort_updated'].'</span>';
     $tbl = $modx->getFullTableName('site_plugin_events');
 
     foreach ($_POST as $listName => $listValue) {
@@ -34,9 +34,9 @@ 
     $modx->clearCache('full');
 }
 
-$rs = $modx->db->select("sysevt.name as evtname, sysevt.id as evtid, pe.pluginid, plugs.name, pe.priority, plugs.disabled", $modx->getFullTableName('system_eventnames') . " sysevt
-		INNER JOIN " . $modx->getFullTableName('site_plugin_events') . " pe ON pe.evtid = sysevt.id
-		INNER JOIN " . $modx->getFullTableName('site_plugins') . " plugs ON plugs.id = pe.pluginid", '', 'sysevt.name,pe.priority');
+$rs = $modx->db->select("sysevt.name as evtname, sysevt.id as evtid, pe.pluginid, plugs.name, pe.priority, plugs.disabled", $modx->getFullTableName('system_eventnames')." sysevt
+		INNER JOIN " . $modx->getFullTableName('site_plugin_events')." pe ON pe.evtid = sysevt.id
+		INNER JOIN " . $modx->getFullTableName('site_plugins')." plugs ON plugs.id = pe.pluginid", '', 'sysevt.name,pe.priority');
 
 $insideUl = 0;
 $preEvt = '';
@@ -47,17 +47,17 @@ 
     if ($preEvt !== $plugins['evtid']) {
         $sortables[] = $plugins['evtid'];
         $sortableList .= $insideUl ? '</ul></div>' : '';
-        $sortableList .= '<div class="form-group clearfix"><strong>' . $plugins['evtname'] . '</strong><ul id="' . $plugins['evtid'] . '" class="sortableList">';
+        $sortableList .= '<div class="form-group clearfix"><strong>'.$plugins['evtname'].'</strong><ul id="'.$plugins['evtid'].'" class="sortableList">';
         $insideUl = 1;
     }
-    $sortableList .= '<li id="item_' . $plugins['pluginid'] . '"' . ($plugins['disabled'] ? ' class="disabledPlugin"' : '') . '><i class="fa fa-plug"></i> ' . $plugins['name'] . ($plugins['disabled'] ? ' (hide)' : '') . '</li>';
+    $sortableList .= '<li id="item_'.$plugins['pluginid'].'"'.($plugins['disabled'] ? ' class="disabledPlugin"' : '').'><i class="fa fa-plug"></i> '.$plugins['name'].($plugins['disabled'] ? ' (hide)' : '').'</li>';
     $preEvt = $plugins['evtid'];
 }
 if ($insideUl) {
     $sortableList .= '</ul></div>';
 }
 
-require_once(MODX_MANAGER_PATH . 'includes/header.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/header.inc.php');
 ?>
 
 <script type="text/javascript">

manager/actions/mutate_template_tv_rank.dynamic.php

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('save_template')) {
@@ -19,7 +19,7 @@ 
 $templatename = '';
 
 if (isset($_POST['listSubmitted'])) {
-    $updateMsg .= '<div class="text-success" id="updated">' . $_lang['sort_updated'] . '</div>';
+    $updateMsg .= '<div class="text-success" id="updated">'.$_lang['sort_updated'].'</div>';
     foreach ($_POST as $listName => $listValue) {
         if ($listName == 'listSubmitted' || $listName == 'reset') {
             continue;
@@ -47,11 +47,11 @@ 
     while ($row = $modx->db->getRow($rs)) {
         $templatename = $row['templatename'];
         $caption = $row['caption'] != '' ? $row['caption'] : $row['name'];
-        $sortableList .= '<li id="item_' . $row['id'] . '"><i class="fa fa-list-alt"></i> ' . $caption . ' <small class="protectedNode" style="float:right">[*' . $row['name'] . '*]</small></li>';
+        $sortableList .= '<li id="item_'.$row['id'].'"><i class="fa fa-list-alt"></i> '.$caption.' <small class="protectedNode" style="float:right">[*'.$row['name'].'*]</small></li>';
     }
     $sortableList .= '</ul></div>';
 } else {
-    $updateMsg = '<p class="text-danger">' . $_lang['tmplvars_novars'] . '</p>';
+    $updateMsg = '<p class="text-danger">'.$_lang['tmplvars_novars'].'</p>';
 }
 ?>
 
@@ -128,7 +128,7 @@ 
 </script>
 
 <h1>
-    <i class="fa fa-sort-numeric-asc"></i><?= ($templatename ? $templatename . '<small>(' . $id . ')</small>' : $_lang['template_tv_edit_title']) ?>
+    <i class="fa fa-sort-numeric-asc"></i><?= ($templatename ? $templatename.'<small>('.$id.')</small>' : $_lang['template_tv_edit_title']) ?>
 </h1>
 
 <?= $_style['actionbuttons']['dynamic']['save'] ?>

manager/actions/modules.static.php

Spacing +13 added lines, -13 removed lines

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

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

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

     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

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

@@ -25,7 +25,7 @@ 
 

 

 // context menu

-include_once MODX_MANAGER_PATH . "includes/controls/contextmenu.php";

+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')) {

@@ -108,24 +108,24 @@ 
     <div class="table-responsive">

         <?php

         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

+            $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')) {

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

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

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

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

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

             } else {

                 $title = '[+value+]';

             }

         } 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>";

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

         }

-        include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";

+        include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";

         $grd = new DataGrid('', $rs, $number_of_results); // set page size to 0 t show all items

         $grd->noRecordMsg = $_lang["no_records_found"];

         $grd->cssClass = "table data";

@@ -133,10 +133,10 @@ 
         $grd->itemClass = "tableItem";

         $grd->altItemClass = "tableAltItem";

         $grd->fields = "icon,name,description,locked,disabled";

-        $grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["description"] . " ," . $_lang["locked"] . " ," . $_lang["disabled"];

+        $grd->columns = $_lang["icon"]." ,".$_lang["name"]." ,".$_lang["description"]." ,".$_lang["locked"]." ,".$_lang["disabled"];

         $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;

+        $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') {

             $grd->pageSize = 0;

         }