evolution-cms / evolution

manager/media/calendar/datepicker.inc.php

Indentation +7 added lines, -7 removed lines

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

 

 class DATEPICKER {

-	function __construct() {

-	}

+    function __construct() {

+    }

 

-	function getDP() {

-		global $modx, $_lang;

+    function getDP() {

+        global $modx, $_lang;

 

-		$tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl');

-		return $modx->parseText($tpl, $_lang, '[%', '%]');

-	}

+        $tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl');

+        return $modx->parseText($tpl, $_lang, '[%', '%]');

+    }

 }

Spacing +4 added lines, -4 removed lines

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

 

-class DATEPICKER {

-	function __construct() {

+class DATEPICKER{

+	function __construct(){

 	}

 

-	function getDP() {

+	function getDP(){

 		global $modx, $_lang;

 

-		$tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl');

+		$tpl = file_get_contents(dirname(__FILE__).'/datepicker.tpl');

 		return $modx->parseText($tpl, $_lang, '[%', '%]');

 	}

 }

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

Indentation +74 added lines, -74 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Uploader class
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <sunhater@sunhater.com>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ *
+ *      @desc Uploader class
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <sunhater@sunhater.com>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 class uploader {
 
@@ -18,92 +18,92 @@ 
     const VERSION = "2.54";
 
 /** Config session-overrided settings
-  * @var array */
+ * @var array */
     protected $config = array();
 
 /** Default image driver
-  * @var string */
+ * @var string */
     protected $imageDriver = "gd";
 
 /** Opener applocation properties
-  *   $opener['name']                 Got from $_GET['opener'];
-  *   $opener['CKEditor']['funcNum']  CKEditor function number (got from $_GET)
-  *   $opener['TinyMCE']              Boolean
-  * @var array */
+ *   $opener['name']                 Got from $_GET['opener'];
+ *   $opener['CKEditor']['funcNum']  CKEditor function number (got from $_GET)
+ *   $opener['TinyMCE']              Boolean
+ * @var array */
     protected $opener = array();
 
 /** Got from $_GET['type'] or first one $config['types'] array key, if inexistant
-  * @var string */
+ * @var string */
     protected $type;
 
 /** Helper property. Local filesystem path to the Type Directory
-  * Equivalent: $config['uploadDir'] . "/" . $type
-  * @var string */
+ * Equivalent: $config['uploadDir'] . "/" . $type
+ * @var string */
     protected $typeDir;
 
 /** Helper property. Web URL to the Type Directory
-  * Equivalent: $config['uploadURL'] . "/" . $type
-  * @var string */
+ * Equivalent: $config['uploadURL'] . "/" . $type
+ * @var string */
     protected $typeURL;
 
 /** Linked to $config['types']
-  * @var array */
+ * @var array */
     protected $types = array();
 
 /** Settings which can override default settings if exists as keys in $config['types'][$type] array
-  * @var array */
+ * @var array */
     protected $typeSettings = array('disabled', 'theme', 'dirPerms', 'filePerms', 'denyZipDownload', 'maxImageWidth', 'maxImageHeight', 'thumbWidth', 'thumbHeight', 'jpegQuality', 'access', 'filenameChangeChars', 'dirnameChangeChars', 'denyExtensionRename', 'deniedExts', 'watermark');
 
 /** Got from language file
-  * @var string */
+ * @var string */
     protected $charset;
 
 /** The language got from $_GET['lng'] or $_GET['lang'] or... Please see next property
-  * @var string */
+ * @var string */
     protected $lang = 'en';
 
 /** Possible language $_GET keys
-  * @var array */
+ * @var array */
     protected $langInputNames = array('lang', 'langCode', 'lng', 'language', 'lang_code');
 
 /** Uploaded file(s) info. Linked to first $_FILES element
-  * @var array */
+ * @var array */
     protected $file;
 
 /** Next three properties are got from the current language file
-  * @var string */
+ * @var string */
     protected $dateTimeFull;   // Currently not used
     protected $dateTimeMid;    // Currently not used
     protected $dateTimeSmall;
 
 /** Contain Specified language labels
-  * @var array */
+ * @var array */
     protected $labels = array();
 
 /** Contain unprocessed $_GET array. Please use this instead of $_GET
-  * @var array */
+ * @var array */
     protected $get;
 
 /** Contain unprocessed $_POST array. Please use this instead of $_POST
-  * @var array */
+ * @var array */
     protected $post;
 
 /** Contain unprocessed $_COOKIE array. Please use this instead of $_COOKIE
-  * @var array */
+ * @var array */
     protected $cookie;
 
 /** Session array. Please use this property instead of $_SESSION
-  * @var array */
+ * @var array */
     protected $session;
 
 /** CMS integration attribute (got from $_GET['cms'])
-  * @var string */
+ * @var string */
     protected $cms = "";
 
     protected $modx = null;
 /** Magic method which allows read-only access to protected or private class properties
-  * @param string $property
-  * @return mixed */
+     * @param string $property
+     * @return mixed */
     public function __get($property) {
         return property_exists($this, $property) ? $this->$property : null;
     }
@@ -132,7 +132,7 @@ 
         )
             $this->cms = $this->get['cms'];
 
-		// LINKING UPLOADED FILE
+        // LINKING UPLOADED FILE
         if (count($_FILES))
             $this->file = &$_FILES[key($_FILES)];
 
@@ -228,8 +228,8 @@ 
             $this->config['uploadDir'] = strlen($this->config['uploadDir'])
                 ? path::normalize($this->config['uploadDir'])
                 : path::url2fullPath("/$path");
-         $this->typeDir = "{$this->config['uploadDir']}/{$this->type}";
-         $this->typeURL = "{$this->config['siteURL']}/{$this->config['uploadURL']}/{$this->type}";
+            $this->typeDir = "{$this->config['uploadDir']}/{$this->type}";
+            $this->typeURL = "{$this->config['siteURL']}/{$this->config['uploadURL']}/{$this->type}";
 
         // SITE ROOT
         } elseif ($this->config['uploadURL'] == "/") {
@@ -365,36 +365,36 @@ 
     }
 
 
-	protected function getTransaliasSettings() {
-		global $modx;
-
-		// Cleaning uploaded filename?
-		$setting = $modx->db->select('count(*)', $modx->getFullTableName('system_settings'), 'setting_name="clean_uploaded_filename" AND setting_value=1');
-		if ($modx->db->getValue($setting)>0) {
-			// Transalias plugin active?
-			$res = $modx->db->select('properties', $modx->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0');
-			if ($properties = $modx->db->getValue($res)) {
-				$properties = $modx->parseProperties($properties, 'TransAlias', 'plugin');
-			} else {
-				$properties = NULL;
-			}
-		} else {
-			$properties = NULL;
-		}
-		return $properties;
-	}
-
-
-	protected function normalizeFilename($filename) {
-		if ($this->getTransaliasSettings()) {
-        		$format = strrchr($filename, ".");
-        		$filename = str_replace($format, "", $filename);
-            		$filename = $this->modx->stripAlias($filename).$format;
-        	}
-        	return $filename;
-	}
-
-	protected function normalizeDirname($dirname) {
+    protected function getTransaliasSettings() {
+        global $modx;
+
+        // Cleaning uploaded filename?
+        $setting = $modx->db->select('count(*)', $modx->getFullTableName('system_settings'), 'setting_name="clean_uploaded_filename" AND setting_value=1');
+        if ($modx->db->getValue($setting)>0) {
+            // Transalias plugin active?
+            $res = $modx->db->select('properties', $modx->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0');
+            if ($properties = $modx->db->getValue($res)) {
+                $properties = $modx->parseProperties($properties, 'TransAlias', 'plugin');
+            } else {
+                $properties = NULL;
+            }
+        } else {
+            $properties = NULL;
+        }
+        return $properties;
+    }
+
+
+    protected function normalizeFilename($filename) {
+        if ($this->getTransaliasSettings()) {
+                $format = strrchr($filename, ".");
+                $filename = str_replace($format, "", $filename);
+                    $filename = $this->modx->stripAlias($filename).$format;
+            }
+            return $filename;
+    }
+
+    protected function normalizeDirname($dirname) {
         return $this->modx->stripAlias($dirname);
     }
 
@@ -472,10 +472,10 @@ 
             return $this->label("The image is too big and/or cannot be resized.");
 
 
-	// CHECK FOR MODX MAX FILE SIZE                
-	$actualfilesize=filesize($file['tmp_name']);
-	if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize'])
-	    return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
+    // CHECK FOR MODX MAX FILE SIZE                
+    $actualfilesize=filesize($file['tmp_name']);
+    if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize'])
+        return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
 
         return true;
     }
@@ -627,7 +627,7 @@ 
             $top = isset($this->config['watermark']['top'])
                 ? $this->config['watermark']['top'] : false;
             $img->watermark($this->config['watermark']['file'], $left, $top);
-		}
+        }
 
         $options = array( 'file' => $file );
 

Spacing +46 added lines, -47 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class uploader {
+class uploader{
 
 /** Release version */
     const VERSION = "2.54";
@@ -72,8 +72,8 @@ 
 
 /** Next three properties are got from the current language file
   * @var string */
-    protected $dateTimeFull;   // Currently not used
-    protected $dateTimeMid;    // Currently not used
+    protected $dateTimeFull; // Currently not used
+    protected $dateTimeMid; // Currently not used
     protected $dateTimeSmall;
 
 /** Contain Specified language labels
@@ -104,11 +104,11 @@ 
 /** Magic method which allows read-only access to protected or private class properties
   * @param string $property
   * @return mixed */
-    public function __get($property) {
+    public function __get($property){
         return property_exists($this, $property) ? $this->$property : null;
     }
 
-    public function __construct($modx) {
+    public function __construct($modx){
 
         //MODX
         try {
@@ -206,7 +206,7 @@ 
 
         // COOKIES INIT
         $ip = '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)';
-        $ip = '/^' . implode('\.', array($ip, $ip, $ip, $ip)) . '$/';
+        $ip = '/^'.implode('\.', array($ip, $ip, $ip, $ip)).'$/';
         if (preg_match($ip, $_SERVER['HTTP_HOST']) ||
             preg_match('/^[^\.]+$/', $_SERVER['HTTP_HOST'])
         )
@@ -224,7 +224,7 @@ 
         ) {
             list($unused, $protocol, $domain, $unused, $port, $path) = $patt;
             $path = path::normalize($path);
-            $this->config['uploadURL'] = "$protocol://$domain" . (strlen($port) ? ":$port" : "") . "/$path";
+            $this->config['uploadURL'] = "$protocol://$domain".(strlen($port) ? ":$port" : "")."/$path";
             $this->config['uploadDir'] = strlen($this->config['uploadDir'])
                 ? path::normalize($this->config['uploadDir'])
                 : path::url2fullPath("/$path");
@@ -267,7 +267,7 @@ 
         foreach ($this->langInputNames as $key)
             if (isset($this->get[$key]) &&
                 preg_match('/^[a-z][a-z\._\-]*$/i', $this->get[$key]) &&
-                file_exists("lang/" . strtolower($this->get[$key]) . ".php")
+                file_exists("lang/".strtolower($this->get[$key]).".php")
             ) {
                 $this->lang = $this->get[$key];
                 break;
@@ -298,7 +298,7 @@ 
             $this->backMsg("Cannot read upload folder.");
     }
 
-    public function upload() {
+    public function upload(){
         $config = &$this->config;
         $file = &$this->file;
         $url = $message = "";
@@ -329,7 +329,7 @@ 
                     @mkdir(path::normalize($dir), $this->config['dirPerms'], true);
 
                 $filename = $this->normalizeFilename($file['name']);
-                $target = file::getInexistantFilename($dir . $filename);
+                $target = file::getInexistantFilename($dir.$filename);
 
                 if (!@move_uploaded_file($file['tmp_name'], $target) &&
                     !@rename($file['tmp_name'], $target) &&
@@ -342,11 +342,11 @@ 
                     $this->makeThumb($target);
                     $url = $this->typeURL;
                     if (isset($udir)) $url .= "/$udir";
-                    $url .= "/" . basename($target);
+                    $url .= "/".basename($target);
                     if (preg_match('/^([a-z]+)\:\/\/([^\/^\:]+)(\:(\d+))?\/(.+)$/', $url, $patt)) {
                         list($unused, $protocol, $domain, $unused, $port, $path) = $patt;
-                        $base = "$protocol://$domain" . (strlen($port) ? ":$port" : "") . "/";
-                        $url = $base . path::urlPathEncode($path);
+                        $base = "$protocol://$domain".(strlen($port) ? ":$port" : "")."/";
+                        $url = $base.path::urlPathEncode($path);
                     } else
                         $url = path::urlPathEncode($url);
                 }
@@ -365,12 +365,12 @@ 
     }
 
 
-	protected function getTransaliasSettings() {
+	protected function getTransaliasSettings(){
 		global $modx;
 
 		// Cleaning uploaded filename?
 		$setting = $modx->db->select('count(*)', $modx->getFullTableName('system_settings'), 'setting_name="clean_uploaded_filename" AND setting_value=1');
-		if ($modx->db->getValue($setting)>0) {
+		if ($modx->db->getValue($setting) > 0) {
 			// Transalias plugin active?
 			$res = $modx->db->select('properties', $modx->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0');
 			if ($properties = $modx->db->getValue($res)) {
@@ -385,7 +385,7 @@ 
 	}
 
 
-	protected function normalizeFilename($filename) {
+	protected function normalizeFilename($filename){
 		if ($this->getTransaliasSettings()) {
         		$format = strrchr($filename, ".");
         		$filename = str_replace($format, "", $filename);
@@ -394,11 +394,11 @@ 
         	return $filename;
 	}
 
-	protected function normalizeDirname($dirname) {
+	protected function normalizeDirname($dirname){
         return $this->modx->stripAlias($dirname);
     }
 
-    protected function checkUploadedFile(array $aFile=null) {
+    protected function checkUploadedFile(array $aFile = null){
         $config = &$this->config;
         $file = ($aFile === null) ? $this->file : $aFile;
 
@@ -437,8 +437,7 @@ 
                 ($file['error'] == UPLOAD_ERR_NO_TMP_DIR) ?
                     $this->label("Missing a temporary folder.") : (
                 ($file['error'] == UPLOAD_ERR_CANT_WRITE) ?
-                    $this->label("Failed to write file.") :
-                    $this->label("Unknown error.")
+                    $this->label("Failed to write file.") : $this->label("Unknown error.")
             )))));
 
         // HIDDEN FILENAMES CHECK
@@ -473,14 +472,14 @@ 
 
 
 	// CHECK FOR MODX MAX FILE SIZE                
-	$actualfilesize=filesize($file['tmp_name']);
+	$actualfilesize = filesize($file['tmp_name']);
 	if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize'])
 	    return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
 
         return true;
     }
 
-    protected function checkInputDir($dir, $inclType=true, $existing=true) {
+    protected function checkInputDir($dir, $inclType = true, $existing = true){
         $dir = path::normalize($dir);
         if (substr($dir, 0, 1) == "/")
             $dir = substr($dir, 1);
@@ -506,7 +505,7 @@ 
         return (is_dir($path) && is_readable($path)) ? $return : false;
     }
 
-    protected function validateExtension($ext, $type) {
+    protected function validateExtension($ext, $type){
         $ext = trim(strtolower($ext));
         if (!isset($this->types[$type]))
             return false;
@@ -531,17 +530,17 @@ 
         return in_array($ext, $exts);
     }
 
-    protected function getTypeFromPath($path) {
+    protected function getTypeFromPath($path){
         return preg_match('/^([^\/]*)\/.*$/', $path, $patt)
             ? $patt[1] : $path;
     }
 
-    protected function removeTypeFromPath($path) {
+    protected function removeTypeFromPath($path){
         return preg_match('/^[^\/]*\/(.*)$/', $path, $patt)
             ? $patt[1] : "";
     }
 
-    protected function imageResize($image, $file=null) {
+    protected function imageResize($image, $file = null){
 
         if (!($image instanceof image)) {
             $img = image::factory($this->imageDriver, $image);
@@ -629,24 +628,24 @@ 
             $img->watermark($this->config['watermark']['file'], $left, $top);
 		}
 
-        $options = array( 'file' => $file );
+        $options = array('file' => $file);
 
-        $type = exif_imagetype( $file );
+        $type = exif_imagetype($file);
 
-        switch ( $type ) {
+        switch ($type) {
             case IMAGETYPE_GIF: 
-                return $img->output( 'gif', $options );
+                return $img->output('gif', $options);
 
             case IMAGETYPE_PNG: 
-                return $img->output( 'png', $options );
+                return $img->output('png', $options);
             
             default:
-                return $img->output( 'jpeg', array_merge( $options, array( 'quality' => $this->config['jpegQuality'] ) ) );
+                return $img->output('jpeg', array_merge($options, array('quality' => $this->config['jpegQuality'])));
         }
 
     }
 
-    protected function makeThumb($file, $overwrite=true) {
+    protected function makeThumb($file, $overwrite = true){
         $img = image::factory($this->imageDriver, $file);
 
         // Drop files which are not images
@@ -654,7 +653,7 @@ 
             return true;
 
         $thumb = substr($file, strlen($this->config['uploadDir']));
-        $thumb = $this->config['uploadDir'] . "/" . $this->config['thumbsDir'] . "/" . $thumb;
+        $thumb = $this->config['uploadDir']."/".$this->config['thumbsDir']."/".$thumb;
         $thumb = path::normalize($thumb);
         $thumbDir = dirname($thumb);
         if (!is_dir($thumbDir) && !@mkdir($thumbDir, $this->config['dirPerms'], true))
@@ -677,15 +676,15 @@ 
         if (!$img->resizeFit($this->config['thumbWidth'], $this->config['thumbHeight']))
             return false;
 
-        if ( $this->imageDriver == 'gd' ) {
-            $width  = imagesx( $img->image );
-            $height = imagesy( $img->image );
-            $back   = image::factory( $this->imageDriver, array( $width, $height ) );
-            $tile   = image::factory( $this->imageDriver, __DIR__ . '/../themes/' . $this->config['theme'] . '/img/bg_transparent.png' );
+        if ($this->imageDriver == 'gd') {
+            $width  = imagesx($img->image);
+            $height = imagesy($img->image);
+            $back   = image::factory($this->imageDriver, array($width, $height));
+            $tile   = image::factory($this->imageDriver, __DIR__.'/../themes/'.$this->config['theme'].'/img/bg_transparent.png');
             
-            imagesettile( $back->image, $tile->image );
-            imagefilledrectangle( $back->image, 0, 0, $width, $height, IMG_COLOR_TILED );
-            imagecopy( $back->image, $img->image, 0, 0, 0, 0, $width, $height );
+            imagesettile($back->image, $tile->image);
+            imagefilledrectangle($back->image, 0, 0, $width, $height, IMG_COLOR_TILED);
+            imagecopy($back->image, $img->image, 0, 0, 0, 0, $width, $height);
 
             $img = $back;
         }
@@ -697,7 +696,7 @@ 
         ));
     }
 
-    protected function localize($langCode) {
+    protected function localize($langCode){
         require "lang/{$langCode}.php";
         setlocale(LC_ALL, $lang['_locale']);
         $this->charset = $lang['_charset'];
@@ -712,7 +711,7 @@ 
         $this->labels = $lang;
     }
 
-    protected function label($string, array $data=null) {
+    protected function label($string, array $data = null){
         $return = isset($this->labels[$string]) ? $this->labels[$string] : $string;
         if (is_array($data))
             foreach ($data as $key => $val)
@@ -720,7 +719,7 @@ 
         return $return;
     }
 
-    protected function backMsg($message, array $data=null) {
+    protected function backMsg($message, array $data = null){
         $message = $this->label($message, $data);
         if (isset($this->file['tmp_name']) && file_exists($this->file['tmp_name']))
             @unlink($this->file['tmp_name']);
@@ -728,7 +727,7 @@ 
         die;
     }
 
-    protected function callBack($url, $message="") {
+    protected function callBack($url, $message = ""){
         $message = text::jsValue($message);
         $CKfuncNum = isset($this->opener['CKEditor']['funcNum'])
             ? $this->opener['CKEditor']['funcNum'] : 0;
@@ -769,7 +768,7 @@ 
 
     }
 
-    protected function get_htaccess() {
+    protected function get_htaccess(){
         return "<IfModule mod_php4.c>
   php_value engine off
 </IfModule>

manager/media/style/common/moo-datepicker/datepicker.inc.php

Spacing +5 added lines, -5 removed lines

@@ -1,11 +1,11 @@
 <?php
-class DATEPICKER {
-    function __construct() {
+class DATEPICKER{
+    function __construct(){
     }
-    function getDP() {
-        global $modx,$_lang;
+    function getDP(){
+        global $modx, $_lang;
         
         $tpl = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
-        return $modx->parseText($tpl,$_lang,'[%','%]');
+        return $modx->parseText($tpl, $_lang, '[%', '%]');
     }
 }

index.php

Indentation +13 added lines, -13 removed lines

@@ -47,7 +47,7 @@ 
 
 $autoloader = __DIR__.'/vendor/autoload.php';
 if (file_exists($autoloader) && is_readable($autoloader)) {
-	include_once($autoloader);
+    include_once($autoloader);
 }
 
 if(!isset($_SERVER['REQUEST_TIME_FLOAT'])) $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true);
@@ -56,11 +56,11 @@ 
 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"))
-	define('MGR_DIR', 'manager');
+    define('MGR_DIR', 'manager');
 if(is_file($base_path . 'assets/cache/siteHostnames.php'))
     include_once($base_path . 'assets/cache/siteHostnames.php');
 if(!defined('MODX_SITE_HOSTNAMES'))
-	define('MODX_SITE_HOSTNAMES', '');
+    define('MODX_SITE_HOSTNAMES', '');
 
 // get start time
 $mstart = memory_get_usage();
@@ -84,7 +84,7 @@ 
 
 define('IN_PARSER_MODE', true);
 if ( ! defined('IN_MANAGER_MODE')) {
-	define('IN_MANAGER_MODE', false);
+    define('IN_MANAGER_MODE', false);
 }
 if (!defined('MODX_API_MODE')) {
     define('MODX_API_MODE', false);
@@ -92,12 +92,12 @@ 
 
 // get the required includes
 if(!isset($database_user) || $database_user=="") {
-	$rt = @include_once(dirname(__FILE__).'/'.MGR_DIR.'/includes/config.inc.php');
-	// Be sure config.inc.php is there and that it contains some important values
-	if(!$rt || !$database_type || !$database_server || !$database_user || !$dbase) {
-		readfile('install/not_installed.tpl');
-		exit;
-	}
+    $rt = @include_once(dirname(__FILE__).'/'.MGR_DIR.'/includes/config.inc.php');
+    // Be sure config.inc.php is there and that it contains some important values
+    if(!$rt || !$database_type || !$database_server || !$database_user || !$dbase) {
+        readfile('install/not_installed.tpl');
+        exit;
+    }
 }
 
 // start session
@@ -105,11 +105,11 @@ 
 
 // initiate a new document parser
 if (isset($coreClass) && class_exists($coreClass)) {
-	$modx = new $coreClass;
+    $modx = new $coreClass;
 }
 if (!isset($modx) || !($modx instanceof \DocumentParser)) {
-	include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
-	$modx = new \DocumentParser;
+    include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
+    $modx = new \DocumentParser;
 }
 
 // set some parser options

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/includes/controls/datagrid.class.php

Indentation +226 added lines, -226 removed lines

@@ -12,7 +12,7 @@ 
 
 class DataGrid {
 
-	public $ds; // datasource
+    public $ds; // datasource
     public $id;
     public $pageSize;            // pager settings
     public $pageNumber;
@@ -36,7 +36,7 @@ 
     public $colWraps;
     public $colColors;
     public $colTypes;            // coltype1, coltype2, etc or coltype1:format1, e.g. date:%Y %m
-	// data type: integer,float,currency,date
+    // data type: integer,float,currency,date
 
     public $header;
     public $footer;
@@ -73,239 +73,239 @@ 
     public $cdelim;
 
     public function __construct($id, $ds, $pageSize = 20, $pageNumber = -1) {
-		global $__DataGridCnt;
+        global $__DataGridCnt;
 
-		// set id
-		$__DataGridCnt++;
-		$this->id = $this->id ? empty($id) : "dg" . $__DataGridCnt;
+        // set id
+        $__DataGridCnt++;
+        $this->id = $this->id ? empty($id) : "dg" . $__DataGridCnt;
 
-		// set datasource
-		$this->ds = $ds;
+        // set datasource
+        $this->ds = $ds;
 
-		// set pager
-		$this->pageSize = $pageSize;
-		$this->pageNumber = $pageNumber; // by setting pager to -1 will cause pager to load it's last page number
-		$this->pagerLocation = 'top-right';
-	}
+        // set pager
+        $this->pageSize = $pageSize;
+        $this->pageNumber = $pageNumber; // by setting pager to -1 will cause pager to load it's last page number
+        $this->pagerLocation = 'top-right';
+    }
 
     public function setDataSource($ds) {
-		$this->ds = $ds;
-	}
+        $this->ds = $ds;
+    }
 
     public function render() {
-		global $modx;
-		$columnHeaderStyle = ($this->columnHeaderStyle) ? "style='" . $this->columnHeaderStyle . "'" : '';
-		$columnHeaderClass = ($this->columnHeaderClass) ? "class='" . $this->columnHeaderClass . "'" : "";
-		$cssStyle = ($this->cssStyle) ? "style='" . $this->cssStyle . "'" : '';
-		$cssClass = ($this->cssClass) ? "class='" . $this->cssClass . "'" : '';
-
-		$pagerClass = ($this->pagerClass) ? "class='" . $this->pagerClass . "'" : '';
-		$pagerStyle = ($this->pagerStyle) ? "style='" . $this->pagerStyle . "'" : "style='background-color:#ffffff;'";
-
-		$this->_itemStyle = ($this->itemStyle) ? "style='" . $this->itemStyle . "'" : '';
-		$this->_itemClass = ($this->itemClass) ? "class='" . $this->itemClass . "'" : '';
-		$this->_altItemStyle = ($this->altItemStyle) ? "style='" . $this->altItemStyle . "'" : '';
-		$this->_altItemClass = ($this->altItemClass) ? "class='" . $this->altItemClass . "'" : '';
-
-		$this->_alt = 0;
-		$this->_total = 0;
-
-		$this->_isDataset = $modx->db->isResult($this->ds); // if not dataset then treat as array
-
-		if(!$cssStyle && !$cssClass) {
-			$cssStyle = "style='width:100%;border:1px solid silver;font-family:verdana,arial; font-size:11px;'";
-		}
-		if(!$columnHeaderStyle && !$columnHeaderClass) {
-			$columnHeaderStyle = "style='color:black;background-color:silver'";
-		}
-		if(!$this->_itemStyle && !$this->_itemClass) {
-			$this->_itemStyle = "style='color:black;'";
-		}
-		if(!$this->_altItemStyle && !$this->_altItemClass) {
-			$this->_altItemStyle = "style='color:black;background-color:#eeeeee'";
-		}
-
-		if($this->_isDataset && !$this->columns) {
-			$cols = $modx->db->numFields($this->ds);
-			for($i = 0; $i < $cols; $i++) $this->columns .= ($i ? "," : "") . $modx->db->fieldName($this->ds, $i);
-		}
-
-		// start grid
-		$tblStart = "<table $cssClass $cssStyle cellpadding='" . (isset($this->cellPadding) ? (int) $this->cellPadding : 1) . "' cellspacing='" . (isset($this->cellSpacing) ? (int) $this->cellSpacing : 1) . "'>";
-		$tblEnd = "</table>";
-
-		// build column header
-		$this->_colnames = explode((strstr($this->columns, "||") !== false ? "||" : ","), $this->columns);
-		$this->_colwidths = explode((strstr($this->colWidths, "||") !== false ? "||" : ","), $this->colWidths);
-		$this->_colaligns = explode((strstr($this->colAligns, "||") !== false ? "||" : ","), $this->colAligns);
-		$this->_colwraps = explode((strstr($this->colWraps, "||") !== false ? "||" : ","), $this->colWraps);
-		$this->_colcolors = explode((strstr($this->colColors, "||") !== false ? "||" : ","), $this->colColors);
-		$this->_coltypes = explode((strstr($this->colTypes, "||") !== false ? "||" : ","), $this->colTypes);
-		$this->_colcount = count($this->_colnames);
-		if(!$this->_isDataset) {
-			$this->ds = explode((strstr($this->ds, "||") !== false ? "||" : ","), $this->ds);
-			$this->ds = array_chunk($this->ds, $this->_colcount);
-		}
-		$tblColHdr = "<thead><tr>";
-		for($c = 0; $c < $this->_colcount; $c++) {
-			$name = $this->_colnames[$c];
-			$width = $this->_colwidths[$c];
-			$tblColHdr .= "<td $columnHeaderStyle $columnHeaderClass" . ($width ? " width='$width'" : "") . ">$name</td>";
-		}
-		$tblColHdr .= "</tr></thead>\n";
-
-		// build rows
-		$rowcount = $this->_isDataset ? $modx->db->getRecordCount($this->ds) : count($this->ds);
-		$this->_fieldnames = explode(",", $this->fields);
-		if($rowcount == 0) {
-			$tblRows .= "<tr><td " . $this->_itemStyle . " " . $this->_itemClass . " colspan='" . $this->_colcount . "'>" . $this->noRecordMsg . "</td></tr>\n";
-		} else {
-			// render grid items
-			if($this->pageSize <= 0) {
-				for($r = 0; $r < $rowcount; $r++) {
-					$row = $this->_isDataset ? $modx->db->getRow($this->ds) : $this->ds[$r];
-					$tblRows .= $this->RenderRowFnc($r + 1, $row);
-				}
-			} else {
-				if(!$this->pager) {
-					include_once dirname(__FILE__) . "/datasetpager.class.php";
-					$this->pager = new DataSetPager($this->id, $this->ds, $this->pageSize, $this->pageNumber);
-					$this->pager->setRenderRowFnc($this); // pass this object
-					$this->pager->cssStyle = $pagerStyle;
-					$this->pager->cssClass = $pagerClass;
-				} else {
-					$this->pager->pageSize = $this->pageSize;
-					$this->pager->pageNumber = $this->pageNumber;
-				}
-
-				$this->pager->render();
-				$tblRows = $this->pager->getRenderedRows();
-				$tblPager = $this->pager->getRenderedPager();
-			}
-		}
-
-		// setup header,pager and footer
-		$o = $tblStart;
-		$ptop = (substr($this->pagerLocation, 0, 3) == "top") || (substr($this->pagerLocation, 0, 4) == "both");
-		$pbot = (substr($this->pagerLocation, 0, 3) == "bot") || (substr($this->pagerLocation, 0, 4) == "both");
-		if($this->header) {
-			$o .= "<tr><td bgcolor='#ffffff' colspan='" . $this->_colcount . "'>" . $this->header . "</td></tr>";
-		}
-		if($tblPager && $ptop) {
-			$o .= "<tr><td align='" . (substr($this->pagerLocation, -4) == "left" ? "left" : "right") . "' $pagerClass $pagerStyle colspan='" . $this->_colcount . "'>" . $tblPager . "&nbsp;</td></tr>";
-		}
-		$o .= $tblColHdr . $tblRows;
-		if($tblPager && $pbot) {
-			$o .= "<tr><td align='" . (substr($this->pagerLocation, -4) == "left" ? "left" : "right") . "' $pagerClass $pagerStyle colspan='" . $this->_colcount . "'>" . $tblPager . "&nbsp;</td></tr>";
-		}
-		if($this->footer) {
-			$o .= "<tr><td bgcolor='#ffffff' colspan='" . $this->_colcount . "'>" . $this->footer . "</td></tr>";
-		}
-		$o .= $tblEnd;
-		return $o;
-	}
-
-	// format column values
+        global $modx;
+        $columnHeaderStyle = ($this->columnHeaderStyle) ? "style='" . $this->columnHeaderStyle . "'" : '';
+        $columnHeaderClass = ($this->columnHeaderClass) ? "class='" . $this->columnHeaderClass . "'" : "";
+        $cssStyle = ($this->cssStyle) ? "style='" . $this->cssStyle . "'" : '';
+        $cssClass = ($this->cssClass) ? "class='" . $this->cssClass . "'" : '';
+
+        $pagerClass = ($this->pagerClass) ? "class='" . $this->pagerClass . "'" : '';
+        $pagerStyle = ($this->pagerStyle) ? "style='" . $this->pagerStyle . "'" : "style='background-color:#ffffff;'";
+
+        $this->_itemStyle = ($this->itemStyle) ? "style='" . $this->itemStyle . "'" : '';
+        $this->_itemClass = ($this->itemClass) ? "class='" . $this->itemClass . "'" : '';
+        $this->_altItemStyle = ($this->altItemStyle) ? "style='" . $this->altItemStyle . "'" : '';
+        $this->_altItemClass = ($this->altItemClass) ? "class='" . $this->altItemClass . "'" : '';
+
+        $this->_alt = 0;
+        $this->_total = 0;
+
+        $this->_isDataset = $modx->db->isResult($this->ds); // if not dataset then treat as array
+
+        if(!$cssStyle && !$cssClass) {
+            $cssStyle = "style='width:100%;border:1px solid silver;font-family:verdana,arial; font-size:11px;'";
+        }
+        if(!$columnHeaderStyle && !$columnHeaderClass) {
+            $columnHeaderStyle = "style='color:black;background-color:silver'";
+        }
+        if(!$this->_itemStyle && !$this->_itemClass) {
+            $this->_itemStyle = "style='color:black;'";
+        }
+        if(!$this->_altItemStyle && !$this->_altItemClass) {
+            $this->_altItemStyle = "style='color:black;background-color:#eeeeee'";
+        }
+
+        if($this->_isDataset && !$this->columns) {
+            $cols = $modx->db->numFields($this->ds);
+            for($i = 0; $i < $cols; $i++) $this->columns .= ($i ? "," : "") . $modx->db->fieldName($this->ds, $i);
+        }
+
+        // start grid
+        $tblStart = "<table $cssClass $cssStyle cellpadding='" . (isset($this->cellPadding) ? (int) $this->cellPadding : 1) . "' cellspacing='" . (isset($this->cellSpacing) ? (int) $this->cellSpacing : 1) . "'>";
+        $tblEnd = "</table>";
+
+        // build column header
+        $this->_colnames = explode((strstr($this->columns, "||") !== false ? "||" : ","), $this->columns);
+        $this->_colwidths = explode((strstr($this->colWidths, "||") !== false ? "||" : ","), $this->colWidths);
+        $this->_colaligns = explode((strstr($this->colAligns, "||") !== false ? "||" : ","), $this->colAligns);
+        $this->_colwraps = explode((strstr($this->colWraps, "||") !== false ? "||" : ","), $this->colWraps);
+        $this->_colcolors = explode((strstr($this->colColors, "||") !== false ? "||" : ","), $this->colColors);
+        $this->_coltypes = explode((strstr($this->colTypes, "||") !== false ? "||" : ","), $this->colTypes);
+        $this->_colcount = count($this->_colnames);
+        if(!$this->_isDataset) {
+            $this->ds = explode((strstr($this->ds, "||") !== false ? "||" : ","), $this->ds);
+            $this->ds = array_chunk($this->ds, $this->_colcount);
+        }
+        $tblColHdr = "<thead><tr>";
+        for($c = 0; $c < $this->_colcount; $c++) {
+            $name = $this->_colnames[$c];
+            $width = $this->_colwidths[$c];
+            $tblColHdr .= "<td $columnHeaderStyle $columnHeaderClass" . ($width ? " width='$width'" : "") . ">$name</td>";
+        }
+        $tblColHdr .= "</tr></thead>\n";
+
+        // build rows
+        $rowcount = $this->_isDataset ? $modx->db->getRecordCount($this->ds) : count($this->ds);
+        $this->_fieldnames = explode(",", $this->fields);
+        if($rowcount == 0) {
+            $tblRows .= "<tr><td " . $this->_itemStyle . " " . $this->_itemClass . " colspan='" . $this->_colcount . "'>" . $this->noRecordMsg . "</td></tr>\n";
+        } else {
+            // render grid items
+            if($this->pageSize <= 0) {
+                for($r = 0; $r < $rowcount; $r++) {
+                    $row = $this->_isDataset ? $modx->db->getRow($this->ds) : $this->ds[$r];
+                    $tblRows .= $this->RenderRowFnc($r + 1, $row);
+                }
+            } else {
+                if(!$this->pager) {
+                    include_once dirname(__FILE__) . "/datasetpager.class.php";
+                    $this->pager = new DataSetPager($this->id, $this->ds, $this->pageSize, $this->pageNumber);
+                    $this->pager->setRenderRowFnc($this); // pass this object
+                    $this->pager->cssStyle = $pagerStyle;
+                    $this->pager->cssClass = $pagerClass;
+                } else {
+                    $this->pager->pageSize = $this->pageSize;
+                    $this->pager->pageNumber = $this->pageNumber;
+                }
+
+                $this->pager->render();
+                $tblRows = $this->pager->getRenderedRows();
+                $tblPager = $this->pager->getRenderedPager();
+            }
+        }
+
+        // setup header,pager and footer
+        $o = $tblStart;
+        $ptop = (substr($this->pagerLocation, 0, 3) == "top") || (substr($this->pagerLocation, 0, 4) == "both");
+        $pbot = (substr($this->pagerLocation, 0, 3) == "bot") || (substr($this->pagerLocation, 0, 4) == "both");
+        if($this->header) {
+            $o .= "<tr><td bgcolor='#ffffff' colspan='" . $this->_colcount . "'>" . $this->header . "</td></tr>";
+        }
+        if($tblPager && $ptop) {
+            $o .= "<tr><td align='" . (substr($this->pagerLocation, -4) == "left" ? "left" : "right") . "' $pagerClass $pagerStyle colspan='" . $this->_colcount . "'>" . $tblPager . "&nbsp;</td></tr>";
+        }
+        $o .= $tblColHdr . $tblRows;
+        if($tblPager && $pbot) {
+            $o .= "<tr><td align='" . (substr($this->pagerLocation, -4) == "left" ? "left" : "right") . "' $pagerClass $pagerStyle colspan='" . $this->_colcount . "'>" . $tblPager . "&nbsp;</td></tr>";
+        }
+        if($this->footer) {
+            $o .= "<tr><td bgcolor='#ffffff' colspan='" . $this->_colcount . "'>" . $this->footer . "</td></tr>";
+        }
+        $o .= $tblEnd;
+        return $o;
+    }
+
+    // format column values
 
     public function RenderRowFnc($n, $row) {
-		if($this->_alt == 0) {
-			$Style = $this->_itemStyle;
-			$Class = $this->_itemClass;
-			$this->_alt = 1;
-		} else {
-			$Style = $this->_altItemStyle;
-			$Class = $this->_altItemClass;
-			$this->_alt = 0;
-		}
-		$o = "<tr>";
-		for($c = 0; $c < $this->_colcount; $c++) {
-			$colStyle = $Style;
-			$fld = trim($this->_fieldnames[$c]);
-			$width = isset($this->_colwidths[$c]) ? $this->_colwidths[$c] : null;
-			$align = isset($this->_colaligns[$c]) ? $this->_colaligns[$c] : null;
-			$color = isset($this->_colcolors[$c]) ? $this->_colcolors[$c] : null;
-			$type = isset($this->_coltypes[$c]) ? $this->_coltypes[$c] : null;
-			$nowrap = isset($this->_colwraps[$c]) ? $this->_colwraps[$c] : null;
-			$value = $row[($this->_isDataset && $fld ? $fld : $c)];
-			if($color && $Style) {
-				$colStyle = substr($colStyle, 0, -1) . ";background-color:$color;'";
-			}
-			$value = $this->formatColumnValue($row, $value, $type, $align);
-			$o .= "<td $colStyle $Class" . ($align ? " align='$align'" : "") . ($color ? " bgcolor='$color'" : "") . ($nowrap ? " nowrap='$nowrap'" : "") . ($width ? " width='$width'" : "") . ">$value</td>";
-		}
-		$o .= "</tr>\n";
-		return $o;
-	}
+        if($this->_alt == 0) {
+            $Style = $this->_itemStyle;
+            $Class = $this->_itemClass;
+            $this->_alt = 1;
+        } else {
+            $Style = $this->_altItemStyle;
+            $Class = $this->_altItemClass;
+            $this->_alt = 0;
+        }
+        $o = "<tr>";
+        for($c = 0; $c < $this->_colcount; $c++) {
+            $colStyle = $Style;
+            $fld = trim($this->_fieldnames[$c]);
+            $width = isset($this->_colwidths[$c]) ? $this->_colwidths[$c] : null;
+            $align = isset($this->_colaligns[$c]) ? $this->_colaligns[$c] : null;
+            $color = isset($this->_colcolors[$c]) ? $this->_colcolors[$c] : null;
+            $type = isset($this->_coltypes[$c]) ? $this->_coltypes[$c] : null;
+            $nowrap = isset($this->_colwraps[$c]) ? $this->_colwraps[$c] : null;
+            $value = $row[($this->_isDataset && $fld ? $fld : $c)];
+            if($color && $Style) {
+                $colStyle = substr($colStyle, 0, -1) . ";background-color:$color;'";
+            }
+            $value = $this->formatColumnValue($row, $value, $type, $align);
+            $o .= "<td $colStyle $Class" . ($align ? " align='$align'" : "") . ($color ? " bgcolor='$color'" : "") . ($nowrap ? " nowrap='$nowrap'" : "") . ($width ? " width='$width'" : "") . ">$value</td>";
+        }
+        $o .= "</tr>\n";
+        return $o;
+    }
 
     public function formatColumnValue($row, $value, $type, &$align) {
-		if(strpos($type, ":") !== false) {
-			list($type, $type_format) = explode(":", $type, 2);
-		}
-		switch(strtolower($type)) {
-			case "integer":
-				if($align == "") {
-					$align = "right";
-				}
-				$value = number_format($value);
-				break;
-
-			case "float":
-				if($align == "") {
-					$align = "right";
-				}
-				if(!$type_format) {
-					$type_format = 2;
-				}
-				$value = number_format($value, $type_format);
-				break;
-
-			case "currency":
-				if($align == "") {
-					$align = "right";
-				}
-				if(!$type_format) {
-					$type_format = 2;
-				}
-				$value = "$" . number_format($value, $type_format);
-				break;
-
-			case "date":
-				if($align == "") {
-					$align = "right";
-				}
-				if(!is_numeric($value)) {
-					$value = strtotime($value);
-				}
-				if(!$type_format) {
-					$type_format = "%A %d, %B %Y";
-				}
-				$value = strftime($type_format, $value);
-				break;
-
-			case "boolean":
-				if($align == '') {
-					$align = "center";
-				}
-				$value = number_format($value);
-				if($value) {
-					$value = '&bull;';
-				} else {
-					$value = '&nbsp;';
-				}
-				break;
-
-			case "template":
-				// replace [+value+] first
-				$value = str_replace("[+value+]", $value, $type_format);
-				// replace other [+fields+]
-				if(strpos($value, "[+") !== false) {
-					foreach($row as $k => $v) {
-						$value = str_replace("[+$k+]", $v, $value);
-					}
-				}
-				break;
-
-		}
-		return $value;
-	}
+        if(strpos($type, ":") !== false) {
+            list($type, $type_format) = explode(":", $type, 2);
+        }
+        switch(strtolower($type)) {
+            case "integer":
+                if($align == "") {
+                    $align = "right";
+                }
+                $value = number_format($value);
+                break;
+
+            case "float":
+                if($align == "") {
+                    $align = "right";
+                }
+                if(!$type_format) {
+                    $type_format = 2;
+                }
+                $value = number_format($value, $type_format);
+                break;
+
+            case "currency":
+                if($align == "") {
+                    $align = "right";
+                }
+                if(!$type_format) {
+                    $type_format = 2;
+                }
+                $value = "$" . number_format($value, $type_format);
+                break;
+
+            case "date":
+                if($align == "") {
+                    $align = "right";
+                }
+                if(!is_numeric($value)) {
+                    $value = strtotime($value);
+                }
+                if(!$type_format) {
+                    $type_format = "%A %d, %B %Y";
+                }
+                $value = strftime($type_format, $value);
+                break;
+
+            case "boolean":
+                if($align == '') {
+                    $align = "center";
+                }
+                $value = number_format($value);
+                if($value) {
+                    $value = '&bull;';
+                } else {
+                    $value = '&nbsp;';
+                }
+                break;
+
+            case "template":
+                // replace [+value+] first
+                $value = str_replace("[+value+]", $value, $type_format);
+                // replace other [+fields+]
+                if(strpos($value, "[+") !== false) {
+                    foreach($row as $k => $v) {
+                        $value = str_replace("[+$k+]", $v, $value);
+                    }
+                }
+                break;
+
+        }
+        return $value;
+    }
 }

Spacing +66 added lines, -66 removed lines

@@ -10,14 +10,14 @@ 
 
 $__DataGridCnt = 0;
 
-class DataGrid {
+class DataGrid{
 
 	public $ds; // datasource
     public $id;
-    public $pageSize;            // pager settings
+    public $pageSize; // pager settings
     public $pageNumber;
     public $pager;
-    public $pagerLocation;        // top-right, top-left, bottom-left, bottom-right, both-left, both-right
+    public $pagerLocation; // top-right, top-left, bottom-left, bottom-right, both-left, both-right
 
     public $cssStyle;
     public $cssClass;
@@ -35,7 +35,7 @@ 
     public $colAligns;
     public $colWraps;
     public $colColors;
-    public $colTypes;            // coltype1, coltype2, etc or coltype1:format1, e.g. date:%Y %m
+    public $colTypes; // coltype1, coltype2, etc or coltype1:format1, e.g. date:%Y %m
 	// data type: integer,float,currency,date
 
     public $header;
@@ -43,7 +43,7 @@ 
     public $cellPadding;
     public $cellSpacing;
 
-    public $rowAlign;            // vertical alignment: top, middle, bottom
+    public $rowAlign; // vertical alignment: top, middle, bottom
     public $rowIdField;
 
     public $pagerStyle;
@@ -72,12 +72,12 @@ 
      */
     public $cdelim;
 
-    public function __construct($id, $ds, $pageSize = 20, $pageNumber = -1) {
+    public function __construct($id, $ds, $pageSize = 20, $pageNumber = -1){
 		global $__DataGridCnt;
 
 		// set id
 		$__DataGridCnt++;
-		$this->id = $this->id ? empty($id) : "dg" . $__DataGridCnt;
+		$this->id = $this->id ? empty($id) : "dg".$__DataGridCnt;
 
 		// set datasource
 		$this->ds = $ds;
@@ -88,50 +88,50 @@ 
 		$this->pagerLocation = 'top-right';
 	}
 
-    public function setDataSource($ds) {
+    public function setDataSource($ds){
 		$this->ds = $ds;
 	}
 
-    public function render() {
+    public function render(){
 		global $modx;
-		$columnHeaderStyle = ($this->columnHeaderStyle) ? "style='" . $this->columnHeaderStyle . "'" : '';
-		$columnHeaderClass = ($this->columnHeaderClass) ? "class='" . $this->columnHeaderClass . "'" : "";
-		$cssStyle = ($this->cssStyle) ? "style='" . $this->cssStyle . "'" : '';
-		$cssClass = ($this->cssClass) ? "class='" . $this->cssClass . "'" : '';
+		$columnHeaderStyle = ($this->columnHeaderStyle) ? "style='".$this->columnHeaderStyle."'" : '';
+		$columnHeaderClass = ($this->columnHeaderClass) ? "class='".$this->columnHeaderClass."'" : "";
+		$cssStyle = ($this->cssStyle) ? "style='".$this->cssStyle."'" : '';
+		$cssClass = ($this->cssClass) ? "class='".$this->cssClass."'" : '';
 
-		$pagerClass = ($this->pagerClass) ? "class='" . $this->pagerClass . "'" : '';
-		$pagerStyle = ($this->pagerStyle) ? "style='" . $this->pagerStyle . "'" : "style='background-color:#ffffff;'";
+		$pagerClass = ($this->pagerClass) ? "class='".$this->pagerClass."'" : '';
+		$pagerStyle = ($this->pagerStyle) ? "style='".$this->pagerStyle."'" : "style='background-color:#ffffff;'";
 
-		$this->_itemStyle = ($this->itemStyle) ? "style='" . $this->itemStyle . "'" : '';
-		$this->_itemClass = ($this->itemClass) ? "class='" . $this->itemClass . "'" : '';
-		$this->_altItemStyle = ($this->altItemStyle) ? "style='" . $this->altItemStyle . "'" : '';
-		$this->_altItemClass = ($this->altItemClass) ? "class='" . $this->altItemClass . "'" : '';
+		$this->_itemStyle = ($this->itemStyle) ? "style='".$this->itemStyle."'" : '';
+		$this->_itemClass = ($this->itemClass) ? "class='".$this->itemClass."'" : '';
+		$this->_altItemStyle = ($this->altItemStyle) ? "style='".$this->altItemStyle."'" : '';
+		$this->_altItemClass = ($this->altItemClass) ? "class='".$this->altItemClass."'" : '';
 
 		$this->_alt = 0;
 		$this->_total = 0;
 
 		$this->_isDataset = $modx->db->isResult($this->ds); // if not dataset then treat as array
 
-		if(!$cssStyle && !$cssClass) {
+		if (!$cssStyle && !$cssClass) {
 			$cssStyle = "style='width:100%;border:1px solid silver;font-family:verdana,arial; font-size:11px;'";
 		}
-		if(!$columnHeaderStyle && !$columnHeaderClass) {
+		if (!$columnHeaderStyle && !$columnHeaderClass) {
 			$columnHeaderStyle = "style='color:black;background-color:silver'";
 		}
-		if(!$this->_itemStyle && !$this->_itemClass) {
+		if (!$this->_itemStyle && !$this->_itemClass) {
 			$this->_itemStyle = "style='color:black;'";
 		}
-		if(!$this->_altItemStyle && !$this->_altItemClass) {
+		if (!$this->_altItemStyle && !$this->_altItemClass) {
 			$this->_altItemStyle = "style='color:black;background-color:#eeeeee'";
 		}
 
-		if($this->_isDataset && !$this->columns) {
+		if ($this->_isDataset && !$this->columns) {
 			$cols = $modx->db->numFields($this->ds);
-			for($i = 0; $i < $cols; $i++) $this->columns .= ($i ? "," : "") . $modx->db->fieldName($this->ds, $i);
+			for ($i = 0; $i < $cols; $i++) $this->columns .= ($i ? "," : "").$modx->db->fieldName($this->ds, $i);
 		}
 
 		// start grid
-		$tblStart = "<table $cssClass $cssStyle cellpadding='" . (isset($this->cellPadding) ? (int) $this->cellPadding : 1) . "' cellspacing='" . (isset($this->cellSpacing) ? (int) $this->cellSpacing : 1) . "'>";
+		$tblStart = "<table $cssClass $cssStyle cellpadding='".(isset($this->cellPadding) ? (int) $this->cellPadding : 1)."' cellspacing='".(isset($this->cellSpacing) ? (int) $this->cellSpacing : 1)."'>";
 		$tblEnd = "</table>";
 
 		// build column header
@@ -142,33 +142,33 @@ 
 		$this->_colcolors = explode((strstr($this->colColors, "||") !== false ? "||" : ","), $this->colColors);
 		$this->_coltypes = explode((strstr($this->colTypes, "||") !== false ? "||" : ","), $this->colTypes);
 		$this->_colcount = count($this->_colnames);
-		if(!$this->_isDataset) {
+		if (!$this->_isDataset) {
 			$this->ds = explode((strstr($this->ds, "||") !== false ? "||" : ","), $this->ds);
 			$this->ds = array_chunk($this->ds, $this->_colcount);
 		}
 		$tblColHdr = "<thead><tr>";
-		for($c = 0; $c < $this->_colcount; $c++) {
+		for ($c = 0; $c < $this->_colcount; $c++) {
 			$name = $this->_colnames[$c];
 			$width = $this->_colwidths[$c];
-			$tblColHdr .= "<td $columnHeaderStyle $columnHeaderClass" . ($width ? " width='$width'" : "") . ">$name</td>";
+			$tblColHdr .= "<td $columnHeaderStyle $columnHeaderClass".($width ? " width='$width'" : "").">$name</td>";
 		}
 		$tblColHdr .= "</tr></thead>\n";
 
 		// build rows
 		$rowcount = $this->_isDataset ? $modx->db->getRecordCount($this->ds) : count($this->ds);
 		$this->_fieldnames = explode(",", $this->fields);
-		if($rowcount == 0) {
-			$tblRows .= "<tr><td " . $this->_itemStyle . " " . $this->_itemClass . " colspan='" . $this->_colcount . "'>" . $this->noRecordMsg . "</td></tr>\n";
+		if ($rowcount == 0) {
+			$tblRows .= "<tr><td ".$this->_itemStyle." ".$this->_itemClass." colspan='".$this->_colcount."'>".$this->noRecordMsg."</td></tr>\n";
 		} else {
 			// render grid items
-			if($this->pageSize <= 0) {
-				for($r = 0; $r < $rowcount; $r++) {
+			if ($this->pageSize <= 0) {
+				for ($r = 0; $r < $rowcount; $r++) {
 					$row = $this->_isDataset ? $modx->db->getRow($this->ds) : $this->ds[$r];
 					$tblRows .= $this->RenderRowFnc($r + 1, $row);
 				}
 			} else {
-				if(!$this->pager) {
-					include_once dirname(__FILE__) . "/datasetpager.class.php";
+				if (!$this->pager) {
+					include_once dirname(__FILE__)."/datasetpager.class.php";
 					$this->pager = new DataSetPager($this->id, $this->ds, $this->pageSize, $this->pageNumber);
 					$this->pager->setRenderRowFnc($this); // pass this object
 					$this->pager->cssStyle = $pagerStyle;
@@ -188,18 +188,18 @@ 
 		$o = $tblStart;
 		$ptop = (substr($this->pagerLocation, 0, 3) == "top") || (substr($this->pagerLocation, 0, 4) == "both");
 		$pbot = (substr($this->pagerLocation, 0, 3) == "bot") || (substr($this->pagerLocation, 0, 4) == "both");
-		if($this->header) {
-			$o .= "<tr><td bgcolor='#ffffff' colspan='" . $this->_colcount . "'>" . $this->header . "</td></tr>";
+		if ($this->header) {
+			$o .= "<tr><td bgcolor='#ffffff' colspan='".$this->_colcount."'>".$this->header."</td></tr>";
 		}
-		if($tblPager && $ptop) {
-			$o .= "<tr><td align='" . (substr($this->pagerLocation, -4) == "left" ? "left" : "right") . "' $pagerClass $pagerStyle colspan='" . $this->_colcount . "'>" . $tblPager . "&nbsp;</td></tr>";
+		if ($tblPager && $ptop) {
+			$o .= "<tr><td align='".(substr($this->pagerLocation, -4) == "left" ? "left" : "right")."' $pagerClass $pagerStyle colspan='".$this->_colcount."'>".$tblPager."&nbsp;</td></tr>";
 		}
-		$o .= $tblColHdr . $tblRows;
-		if($tblPager && $pbot) {
-			$o .= "<tr><td align='" . (substr($this->pagerLocation, -4) == "left" ? "left" : "right") . "' $pagerClass $pagerStyle colspan='" . $this->_colcount . "'>" . $tblPager . "&nbsp;</td></tr>";
+		$o .= $tblColHdr.$tblRows;
+		if ($tblPager && $pbot) {
+			$o .= "<tr><td align='".(substr($this->pagerLocation, -4) == "left" ? "left" : "right")."' $pagerClass $pagerStyle colspan='".$this->_colcount."'>".$tblPager."&nbsp;</td></tr>";
 		}
-		if($this->footer) {
-			$o .= "<tr><td bgcolor='#ffffff' colspan='" . $this->_colcount . "'>" . $this->footer . "</td></tr>";
+		if ($this->footer) {
+			$o .= "<tr><td bgcolor='#ffffff' colspan='".$this->_colcount."'>".$this->footer."</td></tr>";
 		}
 		$o .= $tblEnd;
 		return $o;
@@ -207,8 +207,8 @@ 
 
 	// format column values
 
-    public function RenderRowFnc($n, $row) {
-		if($this->_alt == 0) {
+    public function RenderRowFnc($n, $row){
+		if ($this->_alt == 0) {
 			$Style = $this->_itemStyle;
 			$Class = $this->_itemClass;
 			$this->_alt = 1;
@@ -218,7 +218,7 @@ 
 			$this->_alt = 0;
 		}
 		$o = "<tr>";
-		for($c = 0; $c < $this->_colcount; $c++) {
+		for ($c = 0; $c < $this->_colcount; $c++) {
 			$colStyle = $Style;
 			$fld = trim($this->_fieldnames[$c]);
 			$width = isset($this->_colwidths[$c]) ? $this->_colwidths[$c] : null;
@@ -227,67 +227,67 @@ 
 			$type = isset($this->_coltypes[$c]) ? $this->_coltypes[$c] : null;
 			$nowrap = isset($this->_colwraps[$c]) ? $this->_colwraps[$c] : null;
 			$value = $row[($this->_isDataset && $fld ? $fld : $c)];
-			if($color && $Style) {
-				$colStyle = substr($colStyle, 0, -1) . ";background-color:$color;'";
+			if ($color && $Style) {
+				$colStyle = substr($colStyle, 0, -1).";background-color:$color;'";
 			}
 			$value = $this->formatColumnValue($row, $value, $type, $align);
-			$o .= "<td $colStyle $Class" . ($align ? " align='$align'" : "") . ($color ? " bgcolor='$color'" : "") . ($nowrap ? " nowrap='$nowrap'" : "") . ($width ? " width='$width'" : "") . ">$value</td>";
+			$o .= "<td $colStyle $Class".($align ? " align='$align'" : "").($color ? " bgcolor='$color'" : "").($nowrap ? " nowrap='$nowrap'" : "").($width ? " width='$width'" : "").">$value</td>";
 		}
 		$o .= "</tr>\n";
 		return $o;
 	}
 
-    public function formatColumnValue($row, $value, $type, &$align) {
-		if(strpos($type, ":") !== false) {
+    public function formatColumnValue($row, $value, $type, &$align){
+		if (strpos($type, ":") !== false) {
 			list($type, $type_format) = explode(":", $type, 2);
 		}
-		switch(strtolower($type)) {
+		switch (strtolower($type)) {
 			case "integer":
-				if($align == "") {
+				if ($align == "") {
 					$align = "right";
 				}
 				$value = number_format($value);
 				break;
 
 			case "float":
-				if($align == "") {
+				if ($align == "") {
 					$align = "right";
 				}
-				if(!$type_format) {
+				if (!$type_format) {
 					$type_format = 2;
 				}
 				$value = number_format($value, $type_format);
 				break;
 
 			case "currency":
-				if($align == "") {
+				if ($align == "") {
 					$align = "right";
 				}
-				if(!$type_format) {
+				if (!$type_format) {
 					$type_format = 2;
 				}
-				$value = "$" . number_format($value, $type_format);
+				$value = "$".number_format($value, $type_format);
 				break;
 
 			case "date":
-				if($align == "") {
+				if ($align == "") {
 					$align = "right";
 				}
-				if(!is_numeric($value)) {
+				if (!is_numeric($value)) {
 					$value = strtotime($value);
 				}
-				if(!$type_format) {
+				if (!$type_format) {
 					$type_format = "%A %d, %B %Y";
 				}
 				$value = strftime($type_format, $value);
 				break;
 
 			case "boolean":
-				if($align == '') {
+				if ($align == '') {
 					$align = "center";
 				}
 				$value = number_format($value);
-				if($value) {
+				if ($value) {
 					$value = '&bull;';
 				} else {
 					$value = '&nbsp;';
@@ -298,8 +298,8 @@ 
 				// replace [+value+] first
 				$value = str_replace("[+value+]", $value, $type_format);
 				// replace other [+fields+]
-				if(strpos($value, "[+") !== false) {
-					foreach($row as $k => $v) {
+				if (strpos($value, "[+") !== false) {
+					foreach ($row as $k => $v) {
 						$value = str_replace("[+$k+]", $v, $value);
 					}
 				}

manager/includes/controls/datasetpager.class.php

Indentation +149 added lines, -149 removed lines

@@ -12,18 +12,18 @@ 
 
 class DataSetPager {
 
-	public $ds; // datasource
+    public $ds; // datasource
     public $pageSize;
     public $pageNumber;
     public $rows;
     public $pager;
     public $id;
 
-	// normal page
+    // normal page
     public $pageStyle;
     public $pageClass;
 
-	// selected page
+    // selected page
     public $selPageStyle;
     public $selPageClass;
     public $renderRowFnc;
@@ -32,166 +32,166 @@ 
     public $renderPagerFncArgs;
 
     public function __construct($id, $ds, $pageSize = 10, $pageNumber = -1) {
-		global $_PAGE; // use view state object
-
-		global $__DataSetPagerCnt;
-
-		// set id
-		$__DataSetPagerCnt++;
-		$this->id = !empty($id) ? $id : "dsp" . $__DataSetPagerCnt;
-
-		// get pagenumber
-		// by setting pager to -1 cause pager to load it's last page number
-		if($pageNumber == -1) {
-			$pageNumber = 1;
-			if(isset($_GET["dpgn" . $this->id])) {
-				$pageNumber = $_GET["dpgn" . $this->id];
-			} elseif(isset($_PAGE['vs'][$id . '_dpgn'])) {
-				$pageNumber = $_PAGE['vs'][$id . '_dpgn'];
-			}
-		}
-		if(!is_numeric($pageNumber)) {
-			$pageNumber = 1;
-		}
-
-		$this->ds = $ds; // datasource
-		$this->pageSize = $pageSize;
-		$this->pageNumber = $pageNumber;
-		$this->rows = '';
-		$this->pager = '';
-	}
+        global $_PAGE; // use view state object
+
+        global $__DataSetPagerCnt;
+
+        // set id
+        $__DataSetPagerCnt++;
+        $this->id = !empty($id) ? $id : "dsp" . $__DataSetPagerCnt;
+
+        // get pagenumber
+        // by setting pager to -1 cause pager to load it's last page number
+        if($pageNumber == -1) {
+            $pageNumber = 1;
+            if(isset($_GET["dpgn" . $this->id])) {
+                $pageNumber = $_GET["dpgn" . $this->id];
+            } elseif(isset($_PAGE['vs'][$id . '_dpgn'])) {
+                $pageNumber = $_PAGE['vs'][$id . '_dpgn'];
+            }
+        }
+        if(!is_numeric($pageNumber)) {
+            $pageNumber = 1;
+        }
+
+        $this->ds = $ds; // datasource
+        $this->pageSize = $pageSize;
+        $this->pageNumber = $pageNumber;
+        $this->rows = '';
+        $this->pager = '';
+    }
 
     public function getRenderedPager() {
-		return $this->pager;
-	}
+        return $this->pager;
+    }
 
     public function getRenderedRows() {
-		return $this->rows;
-	}
+        return $this->rows;
+    }
 
     public function setDataSource($ds) {
-		$this->ds = $ds;
-	}
+        $this->ds = $ds;
+    }
 
     public function setPageSize($ps) {
-		$this->pageSize = $ps;
-	}
+        $this->pageSize = $ps;
+    }
 
     public function setRenderRowFnc($fncName, $args = "") {
-		$this->renderRowFnc = &$fncName;
-		$this->renderRowFncArgs = $args;    // extra agruments
+        $this->renderRowFnc = &$fncName;
+        $this->renderRowFncArgs = $args;    // extra agruments
 
 
-	}
+    }
 
     public function setRenderPagerFnc($fncName, $args = "") {
-		$this->renderPagerFnc = $fncName;
-		$this->renderPagerFncArgs = $args;    // extra agruments
-	}
+        $this->renderPagerFnc = $fncName;
+        $this->renderPagerFncArgs = $args;    // extra agruments
+    }
 
     public function render() {
-		global $modx, $_PAGE;
-
-		$isDataset = $modx->db->isResult($this->ds);
-
-		if(!$this->selPageStyle) {
-			$this->selPageStyle = "font-weight:bold";
-		}
-
-		// get total number of rows
-		$tnr = ($isDataset) ? $modx->db->getRecordCount($this->ds) : count($this->ds);
-
-		// render: no records found
-		if($tnr <= 0) {
-			$fnc = $this->renderRowFnc;
-			$args = $this->renderRowFncArgs;
-			if(isset($fnc)) {
-				if($args != "") {
-					$this->rows .= $fnc(0, null, $args);
-				} // if agrs was specified then we will pass three params
-				else {
-					$this->rows .= $fnc(0, null);
-				}                 // otherwise two will be passed
-			}
-			return;
-		}
-
-		// get total pages
-		$tp = ceil($tnr / $this->pageSize);
-		if($this->pageNumber > $tp) {
-			$this->pageNumber = 1;
-		}
-
-		// get page number
-		$p = $this->pageNumber;
-
-		// save page number to view state if available
-		if(isset($_PAGE['vs'])) {
-			$_PAGE['vs'][$this->id . '_dpgn'] = $p;
-		}
-
-		// render pager : renderPagerFnc($cuurentPage,$pagerNumber,$arguments="");
-		if($tp > 1) {
-		    $url = '';
-			$fnc = $this->renderPagerFnc;
-			$args = $this->renderPagerFncArgs;
-			if(!isset($fnc)) {
-				if($modx->isFrontend()) {
-					$url = $modx->makeUrl($modx->documentIdentifier, '', '', 'full') . '?';
-				} else {
-					$url = $_SERVER['PHP_SELF'] . '?';
-				}
-				$i = 0;
-				foreach($_GET as $n => $v) if($n != 'dpgn' . $this->id) {
-					$i++;
-					$url .= (($i > 1) ? "&" : "") . "$n=$v";
-				}
-				if($i >= 1) {
-					$url .= "&";
-				}
-			}
-			for($i = 1; $i <= $tp; $i++) {
-				if(isset($fnc)) {
-					if($args != "") {
-						$this->pager .= $fnc($p, $i, $args);
-					} else {
-						$this->pager .= $fnc($p, $i);
-					}
-				} else {
-					$this->pager .= ($p == $i) ? " <span class='" . $this->selPageClass . "' style='" . $this->selPageStyle . "'>$i</span> " : " <a href='" . $url . "dpgn" . $this->id . "=$i' class='" . $this->pageClass . "' style='" . $this->pageStyle . "'>$i</a> ";
-				}
-			}
-		}
-
-		// render row : renderRowFnc($rowNumber,$row,$arguments="")
-		$fnc = $this->renderRowFnc;
-		$args = $this->renderRowFncArgs;
-
-		if(isset($fnc)) {
-			$i = 1;
-			$fncObject = is_object($fnc);
-			$minitems = (($p - 1) * $this->pageSize) + 1;
-			$maxitems = (($p - 1) * $this->pageSize) + $this->pageSize;
-			while($i <= $maxitems && ($row = ($isDataset) ? $modx->db->getRow($this->ds) : $this->ds[$i - 1])) {
-				if($i >= $minitems && $i <= $maxitems) {
-					if($fncObject) {
-						if($args != "") {
-							$this->rows .= $fnc->RenderRowFnc($i, $row, $args);
-						} else {
-							$this->rows .= $fnc->RenderRowFnc($i, $row);
-						}
-					} else {
-						if($args != "") {
-							$this->rows .= $fnc($i, $row, $args);
-						} // if agrs was specified then we wil pass three params
-						else {
-							$this->rows .= $fnc($i, $row);
-						}                 // otherwise two will be passed
-					}
-
-				}
-				$i++;
-			}
-		}
-	}
+        global $modx, $_PAGE;
+
+        $isDataset = $modx->db->isResult($this->ds);
+
+        if(!$this->selPageStyle) {
+            $this->selPageStyle = "font-weight:bold";
+        }
+
+        // get total number of rows
+        $tnr = ($isDataset) ? $modx->db->getRecordCount($this->ds) : count($this->ds);
+
+        // render: no records found
+        if($tnr <= 0) {
+            $fnc = $this->renderRowFnc;
+            $args = $this->renderRowFncArgs;
+            if(isset($fnc)) {
+                if($args != "") {
+                    $this->rows .= $fnc(0, null, $args);
+                } // if agrs was specified then we will pass three params
+                else {
+                    $this->rows .= $fnc(0, null);
+                }                 // otherwise two will be passed
+            }
+            return;
+        }
+
+        // get total pages
+        $tp = ceil($tnr / $this->pageSize);
+        if($this->pageNumber > $tp) {
+            $this->pageNumber = 1;
+        }
+
+        // get page number
+        $p = $this->pageNumber;
+
+        // save page number to view state if available
+        if(isset($_PAGE['vs'])) {
+            $_PAGE['vs'][$this->id . '_dpgn'] = $p;
+        }
+
+        // render pager : renderPagerFnc($cuurentPage,$pagerNumber,$arguments="");
+        if($tp > 1) {
+            $url = '';
+            $fnc = $this->renderPagerFnc;
+            $args = $this->renderPagerFncArgs;
+            if(!isset($fnc)) {
+                if($modx->isFrontend()) {
+                    $url = $modx->makeUrl($modx->documentIdentifier, '', '', 'full') . '?';
+                } else {
+                    $url = $_SERVER['PHP_SELF'] . '?';
+                }
+                $i = 0;
+                foreach($_GET as $n => $v) if($n != 'dpgn' . $this->id) {
+                    $i++;
+                    $url .= (($i > 1) ? "&" : "") . "$n=$v";
+                }
+                if($i >= 1) {
+                    $url .= "&";
+                }
+            }
+            for($i = 1; $i <= $tp; $i++) {
+                if(isset($fnc)) {
+                    if($args != "") {
+                        $this->pager .= $fnc($p, $i, $args);
+                    } else {
+                        $this->pager .= $fnc($p, $i);
+                    }
+                } else {
+                    $this->pager .= ($p == $i) ? " <span class='" . $this->selPageClass . "' style='" . $this->selPageStyle . "'>$i</span> " : " <a href='" . $url . "dpgn" . $this->id . "=$i' class='" . $this->pageClass . "' style='" . $this->pageStyle . "'>$i</a> ";
+                }
+            }
+        }
+
+        // render row : renderRowFnc($rowNumber,$row,$arguments="")
+        $fnc = $this->renderRowFnc;
+        $args = $this->renderRowFncArgs;
+
+        if(isset($fnc)) {
+            $i = 1;
+            $fncObject = is_object($fnc);
+            $minitems = (($p - 1) * $this->pageSize) + 1;
+            $maxitems = (($p - 1) * $this->pageSize) + $this->pageSize;
+            while($i <= $maxitems && ($row = ($isDataset) ? $modx->db->getRow($this->ds) : $this->ds[$i - 1])) {
+                if($i >= $minitems && $i <= $maxitems) {
+                    if($fncObject) {
+                        if($args != "") {
+                            $this->rows .= $fnc->RenderRowFnc($i, $row, $args);
+                        } else {
+                            $this->rows .= $fnc->RenderRowFnc($i, $row);
+                        }
+                    } else {
+                        if($args != "") {
+                            $this->rows .= $fnc($i, $row, $args);
+                        } // if agrs was specified then we wil pass three params
+                        else {
+                            $this->rows .= $fnc($i, $row);
+                        }                 // otherwise two will be passed
+                    }
+
+                }
+                $i++;
+            }
+        }
+    }
 }

Spacing +43 added lines, -43 removed lines

@@ -10,7 +10,7 @@ 
 
 $__DataSetPagerCnt = 0;
 
-class DataSetPager {
+class DataSetPager{
 
 	public $ds; // datasource
     public $pageSize;
@@ -31,26 +31,26 @@ 
     public $renderPagerFnc;
     public $renderPagerFncArgs;
 
-    public function __construct($id, $ds, $pageSize = 10, $pageNumber = -1) {
+    public function __construct($id, $ds, $pageSize = 10, $pageNumber = -1){
 		global $_PAGE; // use view state object
 
 		global $__DataSetPagerCnt;
 
 		// set id
 		$__DataSetPagerCnt++;
-		$this->id = !empty($id) ? $id : "dsp" . $__DataSetPagerCnt;
+		$this->id = !empty($id) ? $id : "dsp".$__DataSetPagerCnt;
 
 		// get pagenumber
 		// by setting pager to -1 cause pager to load it's last page number
-		if($pageNumber == -1) {
+		if ($pageNumber == -1) {
 			$pageNumber = 1;
-			if(isset($_GET["dpgn" . $this->id])) {
-				$pageNumber = $_GET["dpgn" . $this->id];
-			} elseif(isset($_PAGE['vs'][$id . '_dpgn'])) {
-				$pageNumber = $_PAGE['vs'][$id . '_dpgn'];
+			if (isset($_GET["dpgn".$this->id])) {
+				$pageNumber = $_GET["dpgn".$this->id];
+			} elseif (isset($_PAGE['vs'][$id.'_dpgn'])) {
+				$pageNumber = $_PAGE['vs'][$id.'_dpgn'];
 			}
 		}
-		if(!is_numeric($pageNumber)) {
+		if (!is_numeric($pageNumber)) {
 			$pageNumber = 1;
 		}
 
@@ -61,40 +61,40 @@ 
 		$this->pager = '';
 	}
 
-    public function getRenderedPager() {
+    public function getRenderedPager(){
 		return $this->pager;
 	}
 
-    public function getRenderedRows() {
+    public function getRenderedRows(){
 		return $this->rows;
 	}
 
-    public function setDataSource($ds) {
+    public function setDataSource($ds){
 		$this->ds = $ds;
 	}
 
-    public function setPageSize($ps) {
+    public function setPageSize($ps){
 		$this->pageSize = $ps;
 	}
 
-    public function setRenderRowFnc($fncName, $args = "") {
+    public function setRenderRowFnc($fncName, $args = ""){
 		$this->renderRowFnc = &$fncName;
-		$this->renderRowFncArgs = $args;    // extra agruments
+		$this->renderRowFncArgs = $args; // extra agruments
 
 
 	}
 
-    public function setRenderPagerFnc($fncName, $args = "") {
+    public function setRenderPagerFnc($fncName, $args = ""){
 		$this->renderPagerFnc = $fncName;
-		$this->renderPagerFncArgs = $args;    // extra agruments
+		$this->renderPagerFncArgs = $args; // extra agruments
 	}
 
-    public function render() {
+    public function render(){
 		global $modx, $_PAGE;
 
 		$isDataset = $modx->db->isResult($this->ds);
 
-		if(!$this->selPageStyle) {
+		if (!$this->selPageStyle) {
 			$this->selPageStyle = "font-weight:bold";
 		}
 
@@ -102,11 +102,11 @@ 
 		$tnr = ($isDataset) ? $modx->db->getRecordCount($this->ds) : count($this->ds);
 
 		// render: no records found
-		if($tnr <= 0) {
+		if ($tnr <= 0) {
 			$fnc = $this->renderRowFnc;
 			$args = $this->renderRowFncArgs;
-			if(isset($fnc)) {
-				if($args != "") {
+			if (isset($fnc)) {
+				if ($args != "") {
 					$this->rows .= $fnc(0, null, $args);
 				} // if agrs was specified then we will pass three params
 				else {
@@ -118,7 +118,7 @@ 
 
 		// get total pages
 		$tp = ceil($tnr / $this->pageSize);
-		if($this->pageNumber > $tp) {
+		if ($this->pageNumber > $tp) {
 			$this->pageNumber = 1;
 		}
 
@@ -126,39 +126,39 @@ 
 		$p = $this->pageNumber;
 
 		// save page number to view state if available
-		if(isset($_PAGE['vs'])) {
-			$_PAGE['vs'][$this->id . '_dpgn'] = $p;
+		if (isset($_PAGE['vs'])) {
+			$_PAGE['vs'][$this->id.'_dpgn'] = $p;
 		}
 
 		// render pager : renderPagerFnc($cuurentPage,$pagerNumber,$arguments="");
-		if($tp > 1) {
+		if ($tp > 1) {
 		    $url = '';
 			$fnc = $this->renderPagerFnc;
 			$args = $this->renderPagerFncArgs;
-			if(!isset($fnc)) {
-				if($modx->isFrontend()) {
-					$url = $modx->makeUrl($modx->documentIdentifier, '', '', 'full') . '?';
+			if (!isset($fnc)) {
+				if ($modx->isFrontend()) {
+					$url = $modx->makeUrl($modx->documentIdentifier, '', '', 'full').'?';
 				} else {
-					$url = $_SERVER['PHP_SELF'] . '?';
+					$url = $_SERVER['PHP_SELF'].'?';
 				}
 				$i = 0;
-				foreach($_GET as $n => $v) if($n != 'dpgn' . $this->id) {
+				foreach ($_GET as $n => $v) if ($n != 'dpgn'.$this->id) {
 					$i++;
-					$url .= (($i > 1) ? "&" : "") . "$n=$v";
+					$url .= (($i > 1) ? "&" : "")."$n=$v";
 				}
-				if($i >= 1) {
+				if ($i >= 1) {
 					$url .= "&";
 				}
 			}
-			for($i = 1; $i <= $tp; $i++) {
-				if(isset($fnc)) {
-					if($args != "") {
+			for ($i = 1; $i <= $tp; $i++) {
+				if (isset($fnc)) {
+					if ($args != "") {
 						$this->pager .= $fnc($p, $i, $args);
 					} else {
 						$this->pager .= $fnc($p, $i);
 					}
 				} else {
-					$this->pager .= ($p == $i) ? " <span class='" . $this->selPageClass . "' style='" . $this->selPageStyle . "'>$i</span> " : " <a href='" . $url . "dpgn" . $this->id . "=$i' class='" . $this->pageClass . "' style='" . $this->pageStyle . "'>$i</a> ";
+					$this->pager .= ($p == $i) ? " <span class='".$this->selPageClass."' style='".$this->selPageStyle."'>$i</span> " : " <a href='".$url."dpgn".$this->id."=$i' class='".$this->pageClass."' style='".$this->pageStyle."'>$i</a> ";
 				}
 			}
 		}
@@ -167,21 +167,21 @@ 
 		$fnc = $this->renderRowFnc;
 		$args = $this->renderRowFncArgs;
 
-		if(isset($fnc)) {
+		if (isset($fnc)) {
 			$i = 1;
 			$fncObject = is_object($fnc);
 			$minitems = (($p - 1) * $this->pageSize) + 1;
 			$maxitems = (($p - 1) * $this->pageSize) + $this->pageSize;
-			while($i <= $maxitems && ($row = ($isDataset) ? $modx->db->getRow($this->ds) : $this->ds[$i - 1])) {
-				if($i >= $minitems && $i <= $maxitems) {
-					if($fncObject) {
-						if($args != "") {
+			while ($i <= $maxitems && ($row = ($isDataset) ? $modx->db->getRow($this->ds) : $this->ds[$i - 1])) {
+				if ($i >= $minitems && $i <= $maxitems) {
+					if ($fncObject) {
+						if ($args != "") {
 							$this->rows .= $fnc->RenderRowFnc($i, $row, $args);
 						} else {
 							$this->rows .= $fnc->RenderRowFnc($i, $row);
 						}
 					} else {
-						if($args != "") {
+						if ($args != "") {
 							$this->rows .= $fnc($i, $row, $args);
 						} // if agrs was specified then we wil pass three params
 						else {

manager/index.php

Indentation +618 added lines, -618 removed lines

@@ -50,7 +50,7 @@ 
 
 $autoloader = realpath(__DIR__.'/../vendor/autoload.php');
 if (file_exists($autoloader) && is_readable($autoloader)) {
-	include_once($autoloader);
+    include_once($autoloader);
 }
 
 // get start time
@@ -65,22 +65,22 @@ 
 $site_hostnames_path = $base_path . 'assets/cache/siteHostnames.php';
 if(is_file($site_hostnames_path)) include_once($site_hostnames_path);
 if(!defined('MGR_DIR') || MGR_DIR!==$mgr_dir) {
-	$src = "<?php\n";
-	$src .= "define('MGR_DIR', '{$mgr_dir}');\n";
-	$rs = file_put_contents($site_mgr_path,$src);
-	if(!$rs) {
-		echo 'siteManager.php write error';
-		exit;
-	}
-	sleep(1);
-	header('Location:' . $_SERVER['REQUEST_URI']);
-	exit;
+    $src = "<?php\n";
+    $src .= "define('MGR_DIR', '{$mgr_dir}');\n";
+    $rs = file_put_contents($site_mgr_path,$src);
+    if(!$rs) {
+        echo 'siteManager.php write error';
+        exit;
+    }
+    sleep(1);
+    header('Location:' . $_SERVER['REQUEST_URI']);
+    exit;
 }
 
 // we use this to make sure files are accessed through
 // the manager instead of seperately.
 if ( ! defined('IN_MANAGER_MODE')) {
-	define('IN_MANAGER_MODE', true);
+    define('IN_MANAGER_MODE', true);
 }
 
 // harden it
@@ -101,16 +101,16 @@ 
 
 // check PHP version. EVO is compatible with php 5 (5.0.0+)
 $php_ver_comp =  version_compare(phpversion(), "5.0.0");
-		// -1 if left is less, 0 if equal, +1 if left is higher
+        // -1 if left is less, 0 if equal, +1 if left is higher
 if($php_ver_comp < 0) {
-	echo sprintf($_lang['php_version_check'], phpversion());
-	exit;
+    echo sprintf($_lang['php_version_check'], phpversion());
+    exit;
 }
 
 // check if iconv is installed
 if(!function_exists('iconv')) {
-	echo $_lang['iconv_not_available'];
-	exit;
+    echo $_lang['iconv_not_available'];
+    exit;
 }
 
 // set some runtime options
@@ -123,15 +123,15 @@ 
 
 // set the document_root :|
 if(!isset($_SERVER['DOCUMENT_ROOT']) || empty($_SERVER['DOCUMENT_ROOT'])) {
-	$_SERVER['DOCUMENT_ROOT'] = str_replace($_SERVER['PATH_INFO'], "", preg_replace("/\\\\/", "/", $_SERVER['PATH_TRANSLATED']))."/";
+    $_SERVER['DOCUMENT_ROOT'] = str_replace($_SERVER['PATH_INFO'], "", preg_replace("/\\\\/", "/", $_SERVER['PATH_TRANSLATED']))."/";
 }
 
 // include_once config file
 $config_filename = "./includes/config.inc.php";
 if (!file_exists($config_filename)) {
-	echo "<h3>Unable to load configuration settings</h3>";
-	echo "Please run the EVO <a href='../install'>install utility</a>";
-	exit;
+    echo "<h3>Unable to load configuration settings</h3>";
+    echo "Please run the EVO <a href='../install'>install utility</a>";
+    exit;
 }
 
 // include the database configuration file
@@ -139,11 +139,11 @@ 
 
 // initiate the content manager class
 if (isset($coreClass) && class_exists($coreClass)) {
-	$modx = new $coreClass;
+    $modx = new $coreClass;
 }
 if (!isset($modx) || !($modx instanceof \DocumentParser)) {
-	include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
-	$modx = new \DocumentParser;
+    include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
+    $modx = new \DocumentParser;
 }
 
 $modx->loadExtension("ManagerAPI");
@@ -166,25 +166,25 @@ 
 
 // now include_once different language file as english
 if(!isset($manager_language) || !file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
-	$manager_language = "english"; // if not set, get the english language file.
+    $manager_language = "english"; // if not set, get the english language file.
 }
 
 // $length_eng_lang = count($_lang); // Not used for now, required for difference-check with other languages than english (i.e. inside installer)
 
 if($manager_language!="english" && file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
-	include_once "lang/".$manager_language.".inc.php";
+    include_once "lang/".$manager_language.".inc.php";
 }
 
 // allow custom language overrides not altered by future EVO-updates
 if(file_exists(MODX_MANAGER_PATH."includes/lang/override/".$manager_language.".inc.php")) {
-	include_once "lang/override/".$manager_language.".inc.php";
+    include_once "lang/override/".$manager_language.".inc.php";
 }
 
 $s = array('[+MGR_DIR+]');
 $r = array(MGR_DIR);
 foreach($_lang as $k=>$v)
 {
-	if(strpos($v,'[+')!==false) $_lang[$k] = str_replace($s, $r, $v);
+    if(strpos($v,'[+')!==false) $_lang[$k] = str_replace($s, $r, $v);
 }
 
 // send the charset header
@@ -199,19 +199,19 @@ 
 
 // double check the session
 if(!isset($_SESSION['mgrValidated'])){
-	echo "Not Logged In!";
-	exit;
+    echo "Not Logged In!";
+    exit;
 }
 
 // include_once the style variables file
 if(isset($manager_theme) && !isset($_style)) {
-	$_style = array();
-	include_once "media/style/".$manager_theme."/style.php";
+    $_style = array();
+    include_once "media/style/".$manager_theme."/style.php";
 }
 
 // check if user is allowed to access manager interface
 if(isset($allow_manager_access) && $allow_manager_access==0) {
-	include_once "manager.lockout.inc.php";
+    include_once "manager.lockout.inc.php";
 }
 
 // Initialize System Alert Message Queque
@@ -220,13 +220,13 @@ 
 
 // first we check to see if this is a frameset request
 if(!isset($_POST['a']) && !isset($_GET['a']) && !isset($_POST['updateMsgCount'])) {
-	// this looks to be a top-level frameset request, so let's serve up a frameset
-	if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/frames/1.php")) {
-		include_once "media/style/".$manager_theme."/frames/1.php";
-	}else{
-		include_once "frames/1.php";
-	}
-	exit;
+    // this looks to be a top-level frameset request, so let's serve up a frameset
+    if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/frames/1.php")) {
+        include_once "media/style/".$manager_theme."/frames/1.php";
+    }else{
+        include_once "frames/1.php";
+    }
+    exit;
 }
 
 // OK, let's retrieve the action directive from the request
@@ -237,7 +237,7 @@ 
 else                       $action = null;
 
 if (isset($_POST['updateMsgCount']) && $modx->hasPermission('messages')) {
-	include_once 'messageCount.inc.php';
+    include_once 'messageCount.inc.php';
 }
 
 // save page to manager object
@@ -245,19 +245,19 @@ 
 
 // attempt to foil some simple types of CSRF attacks
 if (isset($modx->config['validate_referer']) && (int)$modx->config['validate_referer']) {
-	if (isset($_SERVER['HTTP_REFERER'])) {
-		$referer = $_SERVER['HTTP_REFERER'];
-
-		if (!empty($referer)) {
-			if (!preg_match('/^'.preg_quote(MODX_SITE_URL, '/').'/i', $referer)) {
-				$modx->webAlertAndQuit("A possible CSRF attempt was detected from referer: {$referer}.", "index.php");
-			}
-		} else {
-				$modx->webAlertAndQuit("A possible CSRF attempt was detected. No referer was provided by the client.", "index.php");
-		}
-	} else {
-		$modx->webAlertAndQuit("A possible CSRF attempt was detected. No referer was provided by the server.", "index.php");
-	}
+    if (isset($_SERVER['HTTP_REFERER'])) {
+        $referer = $_SERVER['HTTP_REFERER'];
+
+        if (!empty($referer)) {
+            if (!preg_match('/^'.preg_quote(MODX_SITE_URL, '/').'/i', $referer)) {
+                $modx->webAlertAndQuit("A possible CSRF attempt was detected from referer: {$referer}.", "index.php");
+            }
+        } else {
+                $modx->webAlertAndQuit("A possible CSRF attempt was detected. No referer was provided by the client.", "index.php");
+        }
+    } else {
+        $modx->webAlertAndQuit("A possible CSRF attempt was detected. No referer was provided by the server.", "index.php");
+    }
 }
 
 // invoke OnManagerPageInit event
@@ -265,13 +265,13 @@ 
 
 // return element filepath
 function includeFileProcessor ($filepath,$manager_theme) {
-	$element = "";
-	if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath)) {
-		$element = MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath;
-	}else{
-		$element = $filepath;
-	}
-	return $element;
+    $element = "";
+    if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath)) {
+        $element = MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath;
+    }else{
+        $element = $filepath;
+    }
+    return $element;
 }
 
 // Now we decide what to do according to the action request. This is a BIG list :)
@@ -279,714 +279,714 @@ 
 /********************************************************************/
 /* frame management - show the requested frame                      */
 /********************************************************************/
-	case 1 :
-		// get the requested frame
-		$frame = preg_replace('/[^a-z0-9]/i','',$_REQUEST['f']);
-		if($frame>9) {
-			$enable_debug=false;    // this is to stop the debug thingy being attached to the framesets
-		}
-		include_once(includeFileProcessor("frames/".$frame.".php",$manager_theme));
-	break;
+    case 1 :
+        // get the requested frame
+        $frame = preg_replace('/[^a-z0-9]/i','',$_REQUEST['f']);
+        if($frame>9) {
+            $enable_debug=false;    // this is to stop the debug thingy being attached to the framesets
+        }
+        include_once(includeFileProcessor("frames/".$frame.".php",$manager_theme));
+    break;
 /********************************************************************/
 /* show the homepage                                                */
 /********************************************************************/
-	case 2:
-		// get the home page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/welcome.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 2:
+        // get the home page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/welcome.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* document data                                                    */
 /********************************************************************/
-	case 3:
-		// get the page to show document's data
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/document_data.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 3:
+        // get the page to show document's data
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/document_data.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* content management                                               */
 /********************************************************************/
-	case 85:
-		// get the mutate page for adding a folder
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 27:
-		// get the mutate page for changing content
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 4:
-		// get the mutate page for adding content
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 5:
-		// get the save processor
-		include_once(includeFileProcessor("processors/save_content.processor.php",$manager_theme));
-	break;
-	case 6:
-		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_content.processor.php",$manager_theme));
-	break;
-	case 63:
-		// get the undelete processor
-		include_once(includeFileProcessor("processors/undelete_content.processor.php",$manager_theme));
-	break;
-	case 51:
-		// get the move action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/move_document.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 52:
-		// get the move document processor
-		include_once(includeFileProcessor("processors/move_document.processor.php",$manager_theme));
-	break;
-	case 61:
-		// get the processor for publishing content
-		include_once(includeFileProcessor("processors/publish_content.processor.php",$manager_theme));
-	break;
-	case 62:
-		// get the processor for publishing content
-		include_once(includeFileProcessor("processors/unpublish_content.processor.php",$manager_theme));
-	break;
-	case 56:
-		// get the sort menuindex action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_menuindex_sort.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-		break;
+    case 85:
+        // get the mutate page for adding a folder
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 27:
+        // get the mutate page for changing content
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 4:
+        // get the mutate page for adding content
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 5:
+        // get the save processor
+        include_once(includeFileProcessor("processors/save_content.processor.php",$manager_theme));
+    break;
+    case 6:
+        // get the delete processor
+        include_once(includeFileProcessor("processors/delete_content.processor.php",$manager_theme));
+    break;
+    case 63:
+        // get the undelete processor
+        include_once(includeFileProcessor("processors/undelete_content.processor.php",$manager_theme));
+    break;
+    case 51:
+        // get the move action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/move_document.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 52:
+        // get the move document processor
+        include_once(includeFileProcessor("processors/move_document.processor.php",$manager_theme));
+    break;
+    case 61:
+        // get the processor for publishing content
+        include_once(includeFileProcessor("processors/publish_content.processor.php",$manager_theme));
+    break;
+    case 62:
+        // get the processor for publishing content
+        include_once(includeFileProcessor("processors/unpublish_content.processor.php",$manager_theme));
+    break;
+    case 56:
+        // get the sort menuindex action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_menuindex_sort.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+        break;
 /********************************************************************/
 /* show the wait page - gives the tree time to refresh (hopefully)  */
 /********************************************************************/
-	case 7:
-		// get the wait page (so the tree can reload)
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/wait.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 7:
+        // get the wait page (so the tree can reload)
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/wait.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* let the user log out                                             */
 /********************************************************************/
-	case 8:
-		// get the logout processor
-		include_once(includeFileProcessor("processors/logout.processor.php",$manager_theme));
-	break;
+    case 8:
+        // get the logout processor
+        include_once(includeFileProcessor("processors/logout.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* user management                                                  */
 /********************************************************************/
-	case 87:
-		// get the new web user page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 88:
-		// get the edit web user page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 89:
-		// get the save web user processor
-		include_once(includeFileProcessor("processors/save_web_user.processor.php",$manager_theme));
-	break;
-	case 90:
-		// get the delete web user page
-		include_once(includeFileProcessor("processors/delete_web_user.processor.php",$manager_theme));
-	break;
-	case 11:
-		// get the new user page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 12:
-		// get the edit user page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 32:
-		// get the save user processor
-		include_once(includeFileProcessor("processors/save_user.processor.php",$manager_theme));
-	break;
-	case 28:
-		// get the change password page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_password.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 34:
-		// get the save new password page
-		include_once(includeFileProcessor("processors/save_password.processor.php",$manager_theme));
-	break;
-	case 33:
-		// get the delete user page
-		include_once(includeFileProcessor("processors/delete_user.processor.php",$manager_theme));
-	break;
+    case 87:
+        // get the new web user page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 88:
+        // get the edit web user page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 89:
+        // get the save web user processor
+        include_once(includeFileProcessor("processors/save_web_user.processor.php",$manager_theme));
+    break;
+    case 90:
+        // get the delete web user page
+        include_once(includeFileProcessor("processors/delete_web_user.processor.php",$manager_theme));
+    break;
+    case 11:
+        // get the new user page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 12:
+        // get the edit user page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 32:
+        // get the save user processor
+        include_once(includeFileProcessor("processors/save_user.processor.php",$manager_theme));
+    break;
+    case 28:
+        // get the change password page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_password.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 34:
+        // get the save new password page
+        include_once(includeFileProcessor("processors/save_password.processor.php",$manager_theme));
+    break;
+    case 33:
+        // get the delete user page
+        include_once(includeFileProcessor("processors/delete_user.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* role management                                                  */
 /********************************************************************/
-	case 38:
-		// get the new role page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 35:
-		// get the edit role page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 36:
-		// get the save role page
-		include_once(includeFileProcessor("processors/save_role.processor.php",$manager_theme));
-	break;
-	case 37:
-		// get the delete role page
-		include_once(includeFileProcessor("processors/delete_role.processor.php",$manager_theme));
-	break;
+    case 38:
+        // get the new role page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 35:
+        // get the edit role page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 36:
+        // get the save role page
+        include_once(includeFileProcessor("processors/save_role.processor.php",$manager_theme));
+    break;
+    case 37:
+        // get the delete role page
+        include_once(includeFileProcessor("processors/delete_role.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* category management                                               */
 /********************************************************************/
-	case 120:
-		// get the edit category page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 121:
-		// for ajax-requests
-		include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme));
-	break;
+    case 120:
+        // get the edit category page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 121:
+        // for ajax-requests
+        include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme));
+    break;
 /********************************************************************/
 /* template management                                              */
 /********************************************************************/
-	case 16:
-		// get the edit template action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 19:
-		// get the new template action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 20:
-		// get the save processor
-		include_once(includeFileProcessor("processors/save_template.processor.php",$manager_theme));
-	break;
-	case 21:
-		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_template.processor.php",$manager_theme));
-	break;
-	case 96:
-		// get the duplicate template processor
-		include_once(includeFileProcessor("processors/duplicate_template.processor.php",$manager_theme));
-	break;
-	case 117:
-		// change the tv rank for selected template
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_template_tv_rank.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-		break;
+    case 16:
+        // get the edit template action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 19:
+        // get the new template action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 20:
+        // get the save processor
+        include_once(includeFileProcessor("processors/save_template.processor.php",$manager_theme));
+    break;
+    case 21:
+        // get the delete processor
+        include_once(includeFileProcessor("processors/delete_template.processor.php",$manager_theme));
+    break;
+    case 96:
+        // get the duplicate template processor
+        include_once(includeFileProcessor("processors/duplicate_template.processor.php",$manager_theme));
+    break;
+    case 117:
+        // change the tv rank for selected template
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_template_tv_rank.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+        break;
 /********************************************************************/
 /* snippet management                                               */
 /********************************************************************/
-	case 22:
-		// get the edit snippet action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 23:
-		// get the new snippet action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 24:
-		// get the save processor
-		include_once(includeFileProcessor("processors/save_snippet.processor.php",$manager_theme));
-	break;
-	case 25:
-		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_snippet.processor.php",$manager_theme));
-	break;
-	case 98:
-		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_snippet.processor.php",$manager_theme));
-	break;
+    case 22:
+        // get the edit snippet action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 23:
+        // get the new snippet action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 24:
+        // get the save processor
+        include_once(includeFileProcessor("processors/save_snippet.processor.php",$manager_theme));
+    break;
+    case 25:
+        // get the delete processor
+        include_once(includeFileProcessor("processors/delete_snippet.processor.php",$manager_theme));
+    break;
+    case 98:
+        // get the duplicate processor
+        include_once(includeFileProcessor("processors/duplicate_snippet.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* htmlsnippet management                                               */
 /********************************************************************/
-	case 78:
-		// get the edit snippet action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 77:
-		// get the new snippet action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 79:
-		// get the save processor
-		include_once(includeFileProcessor("processors/save_htmlsnippet.processor.php",$manager_theme));
-	break;
-	case 80:
-		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_htmlsnippet.processor.php",$manager_theme));
-	break;
-	case 97:
-		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_htmlsnippet.processor.php",$manager_theme));
-	break;
+    case 78:
+        // get the edit snippet action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 77:
+        // get the new snippet action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 79:
+        // get the save processor
+        include_once(includeFileProcessor("processors/save_htmlsnippet.processor.php",$manager_theme));
+    break;
+    case 80:
+        // get the delete processor
+        include_once(includeFileProcessor("processors/delete_htmlsnippet.processor.php",$manager_theme));
+    break;
+    case 97:
+        // get the duplicate processor
+        include_once(includeFileProcessor("processors/duplicate_htmlsnippet.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* show the credits page                                            */
 /********************************************************************/
-	case 18:
-		// get the credits page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/credits.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 18:
+        // get the credits page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/credits.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* empty cache & synchronisation                                    */
 /********************************************************************/
-	case 26:
-		// get the cache emptying processor
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/refresh_site.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 26:
+        // get the cache emptying processor
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/refresh_site.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Module management                                                */
 /********************************************************************/
-	case 106:
-		// get module management
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/modules.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 107:
-		// get the new module action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 108:
-		// get the edit module action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 109:
-		// get the save processor
-		include_once(includeFileProcessor("processors/save_module.processor.php",$manager_theme));
-	break;
-	case 110:
-		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_module.processor.php",$manager_theme));
-	break;
-	case 111:
-		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_module.processor.php",$manager_theme));
-	break;
-	case 112:
-		// execute/run the module
-		//include_once "header.inc.php";
-		include_once(includeFileProcessor("processors/execute_module.processor.php",$manager_theme));
-		//include_once "footer.inc.php";
-		break;
-	case 113:
-		// get the module resources (dependencies) action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_module_resources.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 106:
+        // get module management
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/modules.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 107:
+        // get the new module action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 108:
+        // get the edit module action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 109:
+        // get the save processor
+        include_once(includeFileProcessor("processors/save_module.processor.php",$manager_theme));
+    break;
+    case 110:
+        // get the delete processor
+        include_once(includeFileProcessor("processors/delete_module.processor.php",$manager_theme));
+    break;
+    case 111:
+        // get the duplicate processor
+        include_once(includeFileProcessor("processors/duplicate_module.processor.php",$manager_theme));
+    break;
+    case 112:
+        // execute/run the module
+        //include_once "header.inc.php";
+        include_once(includeFileProcessor("processors/execute_module.processor.php",$manager_theme));
+        //include_once "footer.inc.php";
+        break;
+    case 113:
+        // get the module resources (dependencies) action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_module_resources.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* plugin management                                                */
 /********************************************************************/
-	case 100:
-		// change the plugin priority
-		//include_once "header.inc.php"; - in action file
-		include_once(includeFileProcessor("actions/mutate_plugin_priority.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 101:
-		// get the new plugin action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 102:
-		// get the edit plugin action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 103:
-		// get the save processor
-		include_once(includeFileProcessor("processors/save_plugin.processor.php",$manager_theme));
-	break;
-	case 104:
-		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_plugin.processor.php",$manager_theme));
-	break;
-	case 105:
-		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_plugin.processor.php",$manager_theme));
-	break;
-	case 119:
-		// get the purge processor
-		include_once(includeFileProcessor("processors/purge_plugin.processor.php",$manager_theme));
-	break;
+    case 100:
+        // change the plugin priority
+        //include_once "header.inc.php"; - in action file
+        include_once(includeFileProcessor("actions/mutate_plugin_priority.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 101:
+        // get the new plugin action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 102:
+        // get the edit plugin action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 103:
+        // get the save processor
+        include_once(includeFileProcessor("processors/save_plugin.processor.php",$manager_theme));
+    break;
+    case 104:
+        // get the delete processor
+        include_once(includeFileProcessor("processors/delete_plugin.processor.php",$manager_theme));
+    break;
+    case 105:
+        // get the duplicate processor
+        include_once(includeFileProcessor("processors/duplicate_plugin.processor.php",$manager_theme));
+    break;
+    case 119:
+        // get the purge processor
+        include_once(includeFileProcessor("processors/purge_plugin.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* view phpinfo                                                     */
 /********************************************************************/
-	case 200:
-		// show phpInfo
-		if($modx->hasPermission('logs')) {
-			include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-			include_once(includeFileProcessor("actions/phpinfo.static.php",$manager_theme));
-			include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-		}
-	break;
+    case 200:
+        // show phpInfo
+        if($modx->hasPermission('logs')) {
+            include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+            include_once(includeFileProcessor("actions/phpinfo.static.php",$manager_theme));
+            include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+        }
+    break;
 /********************************************************************/
 /* errorpage                                            */
 /********************************************************************/
-	case 29:
-		// get the error page
-		include_once(includeFileProcessor("actions/error_dialog.static.php",$manager_theme));
-	break;
+    case 29:
+        // get the error page
+        include_once(includeFileProcessor("actions/error_dialog.static.php",$manager_theme));
+    break;
 /********************************************************************/
 /* file manager                                                     */
 /********************************************************************/
-	case 31:
-		// get the page to manage files
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/files.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 31:
+        // get the page to manage files
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/files.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* access permissions                                               */
 /********************************************************************/
-	case 40:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/access_permissions.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 91:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/web_access_permissions.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 40:
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/access_permissions.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 91:
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/web_access_permissions.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* access groups processor                                          */
 /********************************************************************/
-	case 41:
-		include_once(includeFileProcessor("processors/access_groups.processor.php",$manager_theme));
-	break;
-	case 92:
-		include_once(includeFileProcessor("processors/web_access_groups.processor.php",$manager_theme));
-	break;
+    case 41:
+        include_once(includeFileProcessor("processors/access_groups.processor.php",$manager_theme));
+    break;
+    case 92:
+        include_once(includeFileProcessor("processors/web_access_groups.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* settings editor                                                  */
 /********************************************************************/
-	case 17:
-		// get the settings editor
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_settings.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 118:
-		// call settings ajax include
-		ob_clean();
-		include_once(includeFileProcessor("includes/mutate_settings.ajax.php",$manager_theme));
-	break;
+    case 17:
+        // get the settings editor
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_settings.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 118:
+        // call settings ajax include
+        ob_clean();
+        include_once(includeFileProcessor("includes/mutate_settings.ajax.php",$manager_theme));
+    break;
 /********************************************************************/
 /* save settings                                                    */
 /********************************************************************/
-	case 30:
-		// get the save settings processor
-		include_once(includeFileProcessor("processors/save_settings.processor.php",$manager_theme));
-	break;
+    case 30:
+        // get the save settings processor
+        include_once(includeFileProcessor("processors/save_settings.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* system information                                               */
 /********************************************************************/
-	case 53:
-		// get the settings editor
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/sysinfo.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 53:
+        // get the settings editor
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/sysinfo.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* optimise table                                               */
 /********************************************************************/
-	case 54:
-		// get the table optimizer/truncate processor
-		include_once(includeFileProcessor("processors/optimize_table.processor.php",$manager_theme));
-	break;
+    case 54:
+        // get the table optimizer/truncate processor
+        include_once(includeFileProcessor("processors/optimize_table.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* view logging                                                     */
 /********************************************************************/
-	case 13:
-		// view logging
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/logging.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 13:
+        // view logging
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/logging.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* empty logs                                                       */
 /********************************************************************/
-	case 55:
-		// get the settings editor
-		include_once(includeFileProcessor("processors/empty_table.processor.php",$manager_theme));
-	break;
+    case 55:
+        // get the settings editor
+        include_once(includeFileProcessor("processors/empty_table.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* calls test page                                                      */
 /********************************************************************/
-	case 999:
-		// get the test page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("test_page.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 999:
+        // get the test page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("test_page.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Empty recycle bin                                                */
 /********************************************************************/
-	case 64:
-		// get the Recycle bin emptier
-		include_once(includeFileProcessor("processors/remove_content.processor.php",$manager_theme));
-	break;
+    case 64:
+        // get the Recycle bin emptier
+        include_once(includeFileProcessor("processors/remove_content.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Messages                                                     */
 /********************************************************************/
-	case 10:
-		// get the messages page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/messages.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 10:
+        // get the messages page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/messages.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Delete a message                                                 */
 /********************************************************************/
-	case 65:
-		// get the message deleter
-		include_once(includeFileProcessor("processors/delete_message.processor.php",$manager_theme));
-	break;
+    case 65:
+        // get the message deleter
+        include_once(includeFileProcessor("processors/delete_message.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Send a message                                                   */
 /********************************************************************/
-	case 66:
-		// get the message deleter
-		include_once(includeFileProcessor("processors/send_message.processor.php",$manager_theme));
-	break;
+    case 66:
+        // get the message deleter
+        include_once(includeFileProcessor("processors/send_message.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Remove locks                                                 */
 /********************************************************************/
-	case 67:
-		// get the lock remover
-		include_once(includeFileProcessor("processors/remove_locks.processor.php",$manager_theme));
-	break;
+    case 67:
+        // get the lock remover
+        include_once(includeFileProcessor("processors/remove_locks.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Site schedule                                                    */
 /********************************************************************/
-	case 70:
-		// get the schedule page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/site_schedule.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 70:
+        // get the schedule page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/site_schedule.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Search                                                           */
 /********************************************************************/
-	case 71:
-		// get the search page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/search.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 71:
+        // get the search page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/search.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* About                                                            */
 /********************************************************************/
-	case 59:
-		// get the about page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/about.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 59:
+        // get the about page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/about.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Add weblink                                                          */
 /********************************************************************/
-	case 72:
-		// get the weblink page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 72:
+        // get the weblink page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* User management                                                  */
 /********************************************************************/
-	case 75:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/user_management.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 99:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/web_user_management.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 86:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/role_management.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 75:
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/user_management.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 99:
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/web_user_management.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 86:
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/role_management.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* template/ snippet management                                                 */
 /********************************************************************/
-	case 76:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/resources.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 76:
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/resources.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Export to file                                                   */
 /********************************************************************/
-	case 83:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/export_site.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 83:
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/export_site.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Resource Selector                                                    */
 /********************************************************************/
-	case 84:
-		include_once(includeFileProcessor("actions/resource_selector.static.php",$manager_theme));
-	break;
+    case 84:
+        include_once(includeFileProcessor("actions/resource_selector.static.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Backup Manager                                                   */
 /********************************************************************/
-	case 93:
-		# header and footer will be handled interally
-		include_once(includeFileProcessor("actions/bkmanager.static.php",$manager_theme));
-	break;
+    case 93:
+        # header and footer will be handled interally
+        include_once(includeFileProcessor("actions/bkmanager.static.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Duplicate Document                                                   */
 /********************************************************************/
-	case 94:
-		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_content.processor.php",$manager_theme));
-	break;
+    case 94:
+        // get the duplicate processor
+        include_once(includeFileProcessor("processors/duplicate_content.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Import Document from file                                        */
 /********************************************************************/
-	case 95:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/import_site.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 95:
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/import_site.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Help                                                             */
 /********************************************************************/
-	case 9:
-		// get the help page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/help.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 9:
+        // get the help page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/help.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Template Variables - Based on Apodigm's Docvars                  */
 /********************************************************************/
-	case 300:
-		// get the new document variable action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 301:
-		// get the edit document variable action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 302:
-		// get the save processor
-		include_once(includeFileProcessor("processors/save_tmplvars.processor.php",$manager_theme));
-	break;
-	case 303:
-		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_tmplvars.processor.php",$manager_theme));
-	break;
-	case 304:
-		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_tmplvars.processor.php",$manager_theme));
-	break;
-	case 305:
-		// get the tv-rank action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_tv_rank.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 300:
+        // get the new document variable action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 301:
+        // get the edit document variable action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 302:
+        // get the save processor
+        include_once(includeFileProcessor("processors/save_tmplvars.processor.php",$manager_theme));
+    break;
+    case 303:
+        // get the delete processor
+        include_once(includeFileProcessor("processors/delete_tmplvars.processor.php",$manager_theme));
+    break;
+    case 304:
+        // get the duplicate processor
+        include_once(includeFileProcessor("processors/duplicate_tmplvars.processor.php",$manager_theme));
+    break;
+    case 305:
+        // get the tv-rank action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_tv_rank.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Event viewer: show event message log                             */
 /********************************************************************/
-	case 114:
-		// get event logs
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/eventlog.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 115:
-		// get event log details viewer
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/eventlog_details.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 116:
-		// get the event log delete processor
-		include_once(includeFileProcessor("processors/delete_eventlog.processor.php",$manager_theme));
-	break;
-
-	case 501:
-		//delete category
-		include_once(includeFileProcessor("processors/delete_category.processor.php",$manager_theme));
-	break;
+    case 114:
+        // get event logs
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/eventlog.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 115:
+        // get event log details viewer
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/eventlog_details.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 116:
+        // get the event log delete processor
+        include_once(includeFileProcessor("processors/delete_eventlog.processor.php",$manager_theme));
+    break;
+
+    case 501:
+        //delete category
+        include_once(includeFileProcessor("processors/delete_category.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* default action: show not implemented message                     */
 /********************************************************************/
-	default :
-		// say that what was requested doesn't do anything yet
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		echo "
+    default :
+        // say that what was requested doesn't do anything yet
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        echo "
 			<div class='sectionHeader'>".$_lang['functionnotimpl']."</div>
 			<div class='sectionBody'>
 				<p>".$_lang['functionnotimpl_message']."</p>
 			</div>
 		";
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
 }
 
 /********************************************************************/
 // log action, unless it's a frame request
 if($action!=1 && $action!=7 && $action!=2) {
-	include_once "log.class.inc.php";
-	$log = new logHandler;
-	$log->initAndWriteLog();
+    include_once "log.class.inc.php";
+    $log = new logHandler;
+    $log->initAndWriteLog();
 }
 /********************************************************************/
 // show debug

manager/actions/welcome.static.php

Indentation +226 added lines, -226 removed lines

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

 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.');

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

 }

 

 unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes

 

 if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {

-	// seems to be a new install - send the user to the configuration page

-	exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');

+    // seems to be a new install - send the user to the configuration page

+    exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');

 }

 

 // set placeholders

@@ -17,70 +17,70 @@ 
 

 // setup message info

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

-	include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');

-	$_SESSION['nrtotalmessages'] = $nrtotalmessages;

-	$_SESSION['nrnewmessages'] = $nrnewmessages;

-

-	$msg = array();

-	$msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);

-	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : '';

-	$msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold">&nbsp;<a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);

-	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0';

-	$welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages);

-	$msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);

-	$ph['MessageInfo'] = implode("\n", $msg);

+    include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');

+    $_SESSION['nrtotalmessages'] = $nrtotalmessages;

+    $_SESSION['nrnewmessages'] = $nrnewmessages;

+

+    $msg = array();

+    $msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);

+    $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : '';

+    $msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold">&nbsp;<a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);

+    $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0';

+    $welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages);

+    $msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);

+    $ph['MessageInfo'] = implode("\n", $msg);

 }

 

 // setup icons

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

-	$icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';

-	$ph['SecurityIcon'] = wrapIcon($icon, 75);

+    $icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';

+    $ph['SecurityIcon'] = wrapIcon($icon, 75);

 }

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

-	$icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';

-	$ph['WebUserIcon'] = wrapIcon($icon, 99);

+    $icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';

+    $ph['WebUserIcon'] = wrapIcon($icon, 99);

 }

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

-	$icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';

-	$ph['ModulesIcon'] = wrapIcon($icon, 106);

+    $icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';

+    $ph['ModulesIcon'] = wrapIcon($icon, 106);

 }

 if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {

-	$icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';

-	$ph['ResourcesIcon'] = wrapIcon($icon, 76);

+    $icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';

+    $ph['ResourcesIcon'] = wrapIcon($icon, 76);

 }

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

-	$icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';

-	$ph['BackupIcon'] = wrapIcon($icon, 93);

+    $icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';

+    $ph['BackupIcon'] = wrapIcon($icon, 93);

 }

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

-	$icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';

-	$ph['HelpIcon'] = wrapIcon($icon, 9);

+    $icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';

+    $ph['HelpIcon'] = wrapIcon($icon, 9);

 }

 // do some config checks

 if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {

-	include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');

-	if($config_check_results != $_lang['configcheck_ok']) {

-		$ph['config_check_results'] = $config_check_results;

-		$ph['config_display'] = 'block';

-	} else {

-		$ph['config_display'] = 'none';

-	}

+    include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');

+    if($config_check_results != $_lang['configcheck_ok']) {

+        $ph['config_check_results'] = $config_check_results;

+        $ph['config_display'] = 'block';

+    } else {

+        $ph['config_display'] = 'none';

+    }

 } else {

-	$ph['config_display'] = 'none';

+    $ph['config_display'] = 'none';

 }

 

 // Check logout-reminder

 if(isset($_SESSION['show_logout_reminder'])) {

-	switch($_SESSION['show_logout_reminder']['type']) {

-		case 'logout_reminder':

-			$date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');

-			$ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);

-			break;

-	}

-	$ph['show_logout_reminder'] = 'block';

-	unset($_SESSION['show_logout_reminder']);

+    switch($_SESSION['show_logout_reminder']['type']) {

+        case 'logout_reminder':

+            $date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');

+            $ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);

+            break;

+    }

+    $ph['show_logout_reminder'] = 'block';

+    unset($_SESSION['show_logout_reminder']);

 } else {

-	$ph['show_logout_reminder'] = 'none';

+    $ph['show_logout_reminder'] = 'none';

 }

 

 // Check multiple sessions

@@ -128,11 +128,11 @@ 
 $nrnewmessages = '<span class="text-danger">' . $_SESSION['nrnewmessages'] . '</span>';

 

 $ph['UserInfo'] = $modx->parseText($tpl, array(

-	'username' => $modx->getLoginUserName(),

-	'role' => $_SESSION['mgrPermissions']['name'],

-	'lastlogin' => $modx->toDateFormat($_SESSION['mgrLastlogin'] + $server_offset_time),

-	'logincount' => $_SESSION['mgrLogincount'] + 1,

-	'msginfo' => sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages)

+    'username' => $modx->getLoginUserName(),

+    'role' => $_SESSION['mgrPermissions']['name'],

+    'lastlogin' => $modx->toDateFormat($_SESSION['mgrLastlogin'] + $server_offset_time),

+    'logincount' => $_SESSION['mgrLogincount'] + 1,

+    'msginfo' => sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages)

 ));

 

 $from = array();

@@ -141,13 +141,13 @@ 
 $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');

 

 if($modx->db->getRecordCount($rs) < 1) {

-	$html = '<p>[%no_active_users_found%]</p>';

+    $html = '<p>[%no_active_users_found%]</p>';

 } else {

-	include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');

-	$now = $_SERVER['REQUEST_TIME'] + $server_offset_time;

-	$ph['now'] = strftime('%H:%M:%S', $now);

-	$timetocheck = ($now - (60 * 20)); //+$server_offset_time;

-	$html = '

+    include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');

+    $now = $_SERVER['REQUEST_TIME'] + $server_offset_time;

+    $ph['now'] = strftime('%H:%M:%S', $now);

+    $timetocheck = ($now - (60 * 20)); //+$server_offset_time;

+    $html = '

 	<div class="card-body">

 		[%onlineusers_message%] 

 		<b>[+now+]</b>):

@@ -165,33 +165,33 @@ 
 	</thead>

 	<tbody>';

 

-	$userList = array();

-	$userCount = array();

-	// Create userlist with session-count first before output

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

-		$userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;

-

-		$idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';

-		$webicon = $activeusers['internalKey'] < 0 ? '<img src="[&tree_globe&]" alt="Web user" />&nbsp;' : '';

-		$ip = $activeusers['ip'] === '::1' ? '127.0.0.1' : $activeusers['ip'];

-		$currentaction = getAction($activeusers['action'], $activeusers['id']);

-		$userList[] = array(

-			$idle,

-			'',

-			$activeusers['username'],

-			$webicon,

-			abs($activeusers['internalKey']),

-			$ip,

-			strftime('%H:%M:%S', $activeusers['lasthit'] + $server_offset_time),

-			$currentaction

-		);

-	}

-	foreach($userList as $params) {

-		$params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';

-		$html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);

-	}

-

-	$html .= '

+    $userList = array();

+    $userCount = array();

+    // Create userlist with session-count first before output

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

+        $userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;

+

+        $idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';

+        $webicon = $activeusers['internalKey'] < 0 ? '<img src="[&tree_globe&]" alt="Web user" />&nbsp;' : '';

+        $ip = $activeusers['ip'] === '::1' ? '127.0.0.1' : $activeusers['ip'];

+        $currentaction = getAction($activeusers['action'], $activeusers['id']);

+        $userList[] = array(

+            $idle,

+            '',

+            $activeusers['username'],

+            $webicon,

+            abs($activeusers['internalKey']),

+            $ip,

+            strftime('%H:%M:%S', $activeusers['lasthit'] + $server_offset_time),

+            $currentaction

+        );

+    }

+    foreach($userList as $params) {

+        $params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';

+        $html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);

+    }

+

+    $html .= '

 	</tbody>

 	</table>

 </div>

@@ -232,17 +232,17 @@ 
 // invoke event OnManagerWelcomePrerender

 $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');

 if(is_array($evtOut)) {

-	$output = implode('', $evtOut);

-	$ph['OnManagerWelcomePrerender'] = $output;

+    $output = implode('', $evtOut);

+    $ph['OnManagerWelcomePrerender'] = $output;

 }

 

 $widgets['welcome'] = array(

-	'menuindex' => '10',

-	'id' => 'welcome',

-	'cols' => 'col-sm-6',

-	'icon' => 'fa-home',

-	'title' => '[%welcome_title%]',

-	'body' => '

+    'menuindex' => '10',

+    'id' => 'welcome',

+    'cols' => 'col-sm-6',

+    'icon' => 'fa-home',

+    'title' => '[%welcome_title%]',

+    'body' => '

 				<div class="wm_buttons card-body"> 

 					<!--@IF:[[#hasPermission?key=new_user]] OR [[#hasPermission?key=edit_user]]--> 

 					<span class="wm_button">

@@ -320,25 +320,25 @@ 
 					</table>

 				</div>

 		',

-	'hide'=>'0'

+    'hide'=>'0'

 );

 $widgets['onlineinfo'] = array(

-	'menuindex' => '20',

-	'id' => 'onlineinfo',

-	'cols' => 'col-sm-6',

-	'icon' => 'fa-user',

-	'title' => '[%onlineusers_title%]',

-	'body' => '<div class="userstable">[+OnlineInfo+]</div>',

-	'hide'=>'0'

+    'menuindex' => '20',

+    'id' => 'onlineinfo',

+    'cols' => 'col-sm-6',

+    'icon' => 'fa-user',

+    'title' => '[%onlineusers_title%]',

+    'body' => '<div class="userstable">[+OnlineInfo+]</div>',

+    'hide'=>'0'

 );

 $widgets['recentinfo'] = array(

-	'menuindex' => '30',

-	'id' => 'modxrecent_widget',

-	'cols' => 'col-sm-12',

-	'icon' => 'fa-pencil-square-o',

-	'title' => '[%activity_title%]',

-	'body' => '<div class="widget-stage">[+RecentInfo+]</div>',

-	'hide'=>'0'

+    'menuindex' => '30',

+    'id' => 'modxrecent_widget',

+    'cols' => 'col-sm-12',

+    'icon' => 'fa-pencil-square-o',

+    'title' => '[%activity_title%]',

+    'body' => '<div class="widget-stage">[+RecentInfo+]</div>',

+    'hide'=>'0'

 );

 if ($modx->config['rss_url_news']) {

     $widgets['news'] = array(

@@ -366,7 +366,7 @@ 
 // invoke OnManagerWelcomeHome event

 $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));

 if(is_array($sitewidgets)) {

-	$newwidgets = array();

+    $newwidgets = array();

     foreach($sitewidgets as $widget){

         $newwidgets = array_merge($newwidgets, unserialize($widget));

     }

@@ -374,21 +374,21 @@ 
 }

 

 usort($widgets, function ($a, $b) {

-	return $a['menuindex'] - $b['menuindex'];

+    return $a['menuindex'] - $b['menuindex'];

 });

 

 $tpl = getTplWidget();

 $output = '';

 foreach($widgets as $widget) {

-	if ($widget['hide'] != '1'){

-		$output .= $modx->parseText($tpl, $widget);

-	}

+    if ($widget['hide'] != '1'){

+        $output .= $modx->parseText($tpl, $widget);

+    }

 }

 $ph['widgets'] = $output;

 

 // load template

 if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {

-	$modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';

+    $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';

 }

 

 $target = $modx->config['manager_welcome_tpl'];

@@ -396,27 +396,27 @@ 
 $target = $modx->mergeSettingsContent($target);

 

 if(substr($target, 0, 1) === '@') {

-	if(substr($target, 0, 6) === '@CHUNK') {

-		$content = $modx->getChunk(trim(substr($target, 7)));

-	} elseif(substr($target, 0, 5) === '@FILE') {

-		$content = file_get_contents(trim(substr($target, 6)));

-	} else {

-		$content = '';

-	}

+    if(substr($target, 0, 6) === '@CHUNK') {

+        $content = $modx->getChunk(trim(substr($target, 7)));

+    } elseif(substr($target, 0, 5) === '@FILE') {

+        $content = file_get_contents(trim(substr($target, 6)));

+    } else {

+        $content = '';

+    }

 } else {

-	$chunk = $modx->getChunk($target);

-	if($chunk !== false && !empty($chunk)) {

-		$content = $chunk;

-	} elseif(is_file(MODX_BASE_PATH . $target)) {

-		$content = file_get_contents(MODX_BASE_PATH . $target);

-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');

-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible

-	{

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');

-	} else {

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');

-	}

+    $chunk = $modx->getChunk($target);

+    if($chunk !== false && !empty($chunk)) {

+        $content = $chunk;

+    } elseif(is_file(MODX_BASE_PATH . $target)) {

+        $content = file_get_contents(MODX_BASE_PATH . $target);

+    } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {

+        $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');

+    } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible

+    {

+        $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');

+    } else {

+        $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');

+    }

 }

 

 // merge placeholders

@@ -424,8 +424,8 @@ 
 $content = $modx->mergeSettingsContent($content);

 $content = $modx->parseText($content, $ph);

 if(strpos($content, '[+') !== false) {

-	$modx->toPlaceholders($ph);

-	$content = $modx->mergePlaceholderContent($content);

+    $modx->toPlaceholders($ph);

+    $content = $modx->mergePlaceholderContent($content);

 }

 $content = $modx->parseDocumentSource($content);

 $content = $modx->parseText($content, $_lang, '[%', '%]');

@@ -433,7 +433,7 @@ 
 $content = $modx->cleanUpMODXTags($content); //cleanup

 

 if($js = $modx->getRegisteredClientScripts()) {

-	$content .= $js;

+    $content .= $js;

 }

 

 echo $content;

@@ -443,7 +443,7 @@ 
 //  <a href="javascript:;" class="closed"><i class="fa fa-close"></i></a>

 //</span>

 function getTplWidget() { // recent document info

-	return '

+    return '

 		<div class="[+cols+]" id="[+id+]">

 			<div class="card"[+cardAttr+]>

 				<div class="card-header"[+headAttr+]> <i class="fa [+icon+]"></i> [+title+] </div>

@@ -454,11 +454,11 @@ 
 }

 

 function getRecentInfo() { // recent document info

-	global $modx;

+    global $modx;

 

-	$modx->addSnippet('recentInfoList', 'getRecentInfoList');

+    $modx->addSnippet('recentInfoList', 'getRecentInfoList');

 

-	$html = '

+    $html = '

 			<div class="table-responsive">

 				<table class="table data">

 					<thead>

@@ -476,96 +476,96 @@ 
 				</table>

 			</div>

 ';

-	return $html;

+    return $html;

 }

 

 function getRecentInfoList() {

-	global $modx;

-

-	$rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);

-

-	if($modx->db->getRecordCount($rs) < 1) {

-		return '<tr><td>[%no_activity_message%]</td></tr>';

-	}

-

-	$tpl = getRecentInfoRowTpl();

-

-	$btntpl['edit'] = '<a title="[%edit_resource%]" href="index.php?a=27&amp;id=[+id+]" target="main"><i class="fa fa-edit fa-fw"></i></a> ';

-	$btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&amp;id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> ';

-

-	$output = array();

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

-		$docid = $ph['id'];

-		$_ = $modx->getUserInfo($ph['editedby']);

-		$ph['username'] = $_['username'];

-

-		if($ph['deleted'] == 1) {

-			$ph['status'] = 'deleted text-danger';

-		} elseif($ph['published'] == 0) {

-			$ph['status'] = 'unpublished font-italic text-muted';

-		} else {

-			$ph['status'] = 'published';

-		}

-

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

-			$ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);

-		} else {

-			$ph['edit_btn'] = '';

-		}

-

-		$preview_disabled = ($ph['deleted'] == 1) ? 'disabled' : '';

-		$ph['preview_btn'] = str_replace(array(

-			'[+id+]',

-			'[+preview_disabled+]'

-		), array(

-			$docid,

-			$preview_disabled

-		), $btntpl['preview_btn']);

-

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

-			if($ph['deleted'] == 0) {

-				$delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&amp;id=[+id+]" target="main"><i class="fa fa-trash fa-fw"></i></a> ';

-			} else {

-				$delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&amp;id=[+id+]" target="main"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> ';

-			}

-			$ph['delete_btn'] = str_replace('[+id+]', $docid, $delete_btn);

-		} else {

-			$ph['delete_btn'] = '';

-		}

-

-		if($ph['deleted'] == 1 && $ph['published'] == 0) {

-			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

-		} elseif($ph['deleted'] == 1 && $ph['published'] == 1) {

-			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

-		} elseif($ph['deleted'] == 0 && $ph['published'] == 0) {

-			$publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

-		} else {

-			$publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

-		}

-		$ph['publish_btn'] = str_replace('[+id+]', $docid, $publish_btn);

-

-		$ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');

-

-		if($ph['longtitle'] == '') {

-			$ph['longtitle'] = '(<i>[%not_set%]</i>)';

-		}

-		if($ph['description'] == '') {

-			$ph['description'] = '(<i>[%not_set%]</i>)';

-		}

-		if($ph['introtext'] == '') {

-			$ph['introtext'] = '(<i>[%not_set%]</i>)';

-		}

-		if($ph['alias'] == '') {

-			$ph['alias'] = '(<i>[%not_set%]</i>)';

-		}

-

-		$output[] = $modx->parseText($tpl, $ph);

-	}

-	return implode("\n", $output);

+    global $modx;

+

+    $rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);

+

+    if($modx->db->getRecordCount($rs) < 1) {

+        return '<tr><td>[%no_activity_message%]</td></tr>';

+    }

+

+    $tpl = getRecentInfoRowTpl();

+

+    $btntpl['edit'] = '<a title="[%edit_resource%]" href="index.php?a=27&amp;id=[+id+]" target="main"><i class="fa fa-edit fa-fw"></i></a> ';

+    $btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&amp;id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> ';

+

+    $output = array();

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

+        $docid = $ph['id'];

+        $_ = $modx->getUserInfo($ph['editedby']);

+        $ph['username'] = $_['username'];

+

+        if($ph['deleted'] == 1) {

+            $ph['status'] = 'deleted text-danger';

+        } elseif($ph['published'] == 0) {

+            $ph['status'] = 'unpublished font-italic text-muted';

+        } else {

+            $ph['status'] = 'published';

+        }

+

+        if($modx->hasPermission('edit_document')) {

+            $ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);

+        } else {

+            $ph['edit_btn'] = '';

+        }

+

+        $preview_disabled = ($ph['deleted'] == 1) ? 'disabled' : '';

+        $ph['preview_btn'] = str_replace(array(

+            '[+id+]',

+            '[+preview_disabled+]'

+        ), array(

+            $docid,

+            $preview_disabled

+        ), $btntpl['preview_btn']);

+

+        if($modx->hasPermission('delete_document')) {

+            if($ph['deleted'] == 0) {

+                $delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&amp;id=[+id+]" target="main"><i class="fa fa-trash fa-fw"></i></a> ';

+            } else {

+                $delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&amp;id=[+id+]" target="main"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> ';

+            }

+            $ph['delete_btn'] = str_replace('[+id+]', $docid, $delete_btn);

+        } else {

+            $ph['delete_btn'] = '';

+        }

+

+        if($ph['deleted'] == 1 && $ph['published'] == 0) {

+            $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

+        } elseif($ph['deleted'] == 1 && $ph['published'] == 1) {

+            $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

+        } elseif($ph['deleted'] == 0 && $ph['published'] == 0) {

+            $publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

+        } else {

+            $publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

+        }

+        $ph['publish_btn'] = str_replace('[+id+]', $docid, $publish_btn);

+

+        $ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');

+

+        if($ph['longtitle'] == '') {

+            $ph['longtitle'] = '(<i>[%not_set%]</i>)';

+        }

+        if($ph['description'] == '') {

+            $ph['description'] = '(<i>[%not_set%]</i>)';

+        }

+        if($ph['introtext'] == '') {

+            $ph['introtext'] = '(<i>[%not_set%]</i>)';

+        }

+        if($ph['alias'] == '') {

+            $ph['alias'] = '(<i>[%not_set%]</i>)';

+        }

+

+        $output[] = $modx->parseText($tpl, $ph);

+    }

+    return implode("\n", $output);

 }

 

 function getRecentInfoRowTpl() {

-	$tpl = '

+    $tpl = '

 						<tr>

 							<td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right"><span class="label label-info">[+id+]</span></td>

 							<td data-toggle="collapse" data-target=".collapse[+id+]"><a class="[+status+]" title="[%edit_resource%]" href="index.php?a=3&amp;id=[+id+]" target="main">[+pagetitle+]</a></td>

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

 							</td>

 						</tr>';

-	return $tpl;

+    return $tpl;

 }

 

 // setup icons

 function wrapIcon($i, $action) {

-	return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);

+    return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);

 }

 

 function getStartUpScript() {

-	$script = '

+    $script = '

         <script type="text/javascript">

         function hideConfigCheckWarning(key) {

         	var xhr = new XMLHttpRequest();

@@ -622,5 +622,5 @@ 
 		})(jQuery);        

         </script>

 ';

-	return $script;

+    return $script;

 }

Spacing +65 added lines, -65 removed lines

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

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

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

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

 }

 

 unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes

 

-if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {

+if ($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {

 	// seems to be a new install - send the user to the configuration page

 	exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');

 }

@@ -16,50 +16,50 @@ 
 $_SESSION['nrnewmessages'] = 0;

 

 // setup message info

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

-	include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');

+if ($modx->hasPermission('messages')) {

+	include_once(MODX_MANAGER_PATH.'includes/messageCount.inc.php');

 	$_SESSION['nrtotalmessages'] = $nrtotalmessages;

 	$_SESSION['nrnewmessages'] = $nrnewmessages;

 

 	$msg = array();

 	$msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);

-	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : '';

+	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">'.$_SESSION['nrnewmessages'].'</span>)' : '';

 	$msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold">&nbsp;<a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);

-	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0';

+	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">'.$_SESSION['nrnewmessages'].'</span>' : '0';

 	$welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages);

 	$msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);

 	$ph['MessageInfo'] = implode("\n", $msg);

 }

 

 // setup icons

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

+if ($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {

 	$icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';

 	$ph['SecurityIcon'] = wrapIcon($icon, 75);

 }

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

+if ($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {

 	$icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';

 	$ph['WebUserIcon'] = wrapIcon($icon, 99);

 }

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

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

 	$icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';

 	$ph['ModulesIcon'] = wrapIcon($icon, 106);

 }

-if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {

+if ($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {

 	$icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';

 	$ph['ResourcesIcon'] = wrapIcon($icon, 76);

 }

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

+if ($modx->hasPermission('bk_manager')) {

 	$icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';

 	$ph['BackupIcon'] = wrapIcon($icon, 93);

 }

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

+if ($modx->hasPermission('help')) {

 	$icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';

 	$ph['HelpIcon'] = wrapIcon($icon, 9);

 }

 // do some config checks

-if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {

-	include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');

-	if($config_check_results != $_lang['configcheck_ok']) {

+if (($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {

+	include_once(MODX_MANAGER_PATH.'includes/config_check.inc.php');

+	if ($config_check_results != $_lang['configcheck_ok']) {

 		$ph['config_check_results'] = $config_check_results;

 		$ph['config_display'] = 'block';

 	} else {

@@ -70,8 +70,8 @@ 
 }

 

 // Check logout-reminder

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

-	switch($_SESSION['show_logout_reminder']['type']) {

+if (isset($_SESSION['show_logout_reminder'])) {

+	switch ($_SESSION['show_logout_reminder']['type']) {

 		case 'logout_reminder':

 			$date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');

 			$ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);

@@ -125,7 +125,7 @@ 
 	</tr>

 </table>';

 

-$nrnewmessages = '<span class="text-danger">' . $_SESSION['nrnewmessages'] . '</span>';

+$nrnewmessages = '<span class="text-danger">'.$_SESSION['nrnewmessages'].'</span>';

 

 $ph['UserInfo'] = $modx->parseText($tpl, array(

 	'username' => $modx->getLoginUserName(),

@@ -140,10 +140,10 @@ 
 $from[] = " us LEFT JOIN [+prefix+]active_users au ON au.sid=us.sid WHERE au.action <> '8'";

 $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');

 

-if($modx->db->getRecordCount($rs) < 1) {

+if ($modx->db->getRecordCount($rs) < 1) {

 	$html = '<p>[%no_active_users_found%]</p>';

 } else {

-	include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');

+	include_once(MODX_MANAGER_PATH.'includes/actionlist.inc.php');

 	$now = $_SERVER['REQUEST_TIME'] + $server_offset_time;

 	$ph['now'] = strftime('%H:%M:%S', $now);

 	$timetocheck = ($now - (60 * 20)); //+$server_offset_time;

@@ -168,7 +168,7 @@ 
 	$userList = array();

 	$userCount = array();

 	// Create userlist with session-count first before output

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

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

 		$userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;

 

 		$idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';

@@ -186,9 +186,9 @@ 
 			$currentaction

 		);

 	}

-	foreach($userList as $params) {

+	foreach ($userList as $params) {

 		$params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';

-		$html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);

+		$html .= "\n\t\t".vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);

 	}

 

 	$html .= '

@@ -200,7 +200,7 @@ 
 $ph['OnlineInfo'] = $html;

 

 // include rss feeds for important forum topics

-include_once(MODX_MANAGER_PATH . 'includes/rss.inc.php');

+include_once(MODX_MANAGER_PATH.'includes/rss.inc.php');

 $ph['modx_security_notices_content'] = $feedData['modx_security_notices_content'];

 $ph['modx_news_content'] = $feedData['modx_news_content'];

 

@@ -231,7 +231,7 @@ 
 

 // invoke event OnManagerWelcomePrerender

 $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');

-if(is_array($evtOut)) {

+if (is_array($evtOut)) {

 	$output = implode('', $evtOut);

 	$ph['OnManagerWelcomePrerender'] = $output;

 }

@@ -365,57 +365,57 @@ 
 

 // invoke OnManagerWelcomeHome event

 $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));

-if(is_array($sitewidgets)) {

+if (is_array($sitewidgets)) {

 	$newwidgets = array();

-    foreach($sitewidgets as $widget){

+    foreach ($sitewidgets as $widget) {

         $newwidgets = array_merge($newwidgets, unserialize($widget));

     }

     $widgets = (count($newwidgets) > 0) ? $newwidgets : $widgets;

 }

 

-usort($widgets, function ($a, $b) {

+usort($widgets, function($a, $b){

 	return $a['menuindex'] - $b['menuindex'];

 });

 

 $tpl = getTplWidget();

 $output = '';

-foreach($widgets as $widget) {

-	if ($widget['hide'] != '1'){

+foreach ($widgets as $widget) {

+	if ($widget['hide'] != '1') {

 		$output .= $modx->parseText($tpl, $widget);

 	}

 }

 $ph['widgets'] = $output;

 

 // load template

-if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {

-	$modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';

+if (!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {

+	$modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH.'media/style/common/welcome.tpl';

 }

 

 $target = $modx->config['manager_welcome_tpl'];

 $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);

 $target = $modx->mergeSettingsContent($target);

 

-if(substr($target, 0, 1) === '@') {

-	if(substr($target, 0, 6) === '@CHUNK') {

+if (substr($target, 0, 1) === '@') {

+	if (substr($target, 0, 6) === '@CHUNK') {

 		$content = $modx->getChunk(trim(substr($target, 7)));

-	} elseif(substr($target, 0, 5) === '@FILE') {

+	} elseif (substr($target, 0, 5) === '@FILE') {

 		$content = file_get_contents(trim(substr($target, 6)));

 	} else {

 		$content = '';

 	}

 } else {

 	$chunk = $modx->getChunk($target);

-	if($chunk !== false && !empty($chunk)) {

+	if ($chunk !== false && !empty($chunk)) {

 		$content = $chunk;

-	} elseif(is_file(MODX_BASE_PATH . $target)) {

-		$content = file_get_contents(MODX_BASE_PATH . $target);

-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');

-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible

+	} elseif (is_file(MODX_BASE_PATH.$target)) {

+		$content = file_get_contents(MODX_BASE_PATH.$target);

+	} elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/welcome.tpl')) {

+		$content = file_get_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/welcome.tpl');

+	} elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/welcome.html')) // ClipperCMS compatible

 	{

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');

+		$content = file_get_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/welcome.html');

 	} else {

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');

+		$content = file_get_contents(MODX_MANAGER_PATH.'media/style/common/welcome.tpl');

 	}

 }

 

@@ -423,7 +423,7 @@ 
 $content = $modx->mergeConditionalTagsContent($content);

 $content = $modx->mergeSettingsContent($content);

 $content = $modx->parseText($content, $ph);

-if(strpos($content, '[+') !== false) {

+if (strpos($content, '[+') !== false) {

 	$modx->toPlaceholders($ph);

 	$content = $modx->mergePlaceholderContent($content);

 }

@@ -432,7 +432,7 @@ 
 $content = $modx->parseText($content, $_style, '[&', '&]');

 $content = $modx->cleanUpMODXTags($content); //cleanup

 

-if($js = $modx->getRegisteredClientScripts()) {

+if ($js = $modx->getRegisteredClientScripts()) {

 	$content .= $js;

 }

 

@@ -442,7 +442,7 @@ 
 //	<a href="javascript:;" class="setting"><i class="fa fa-cog"></i></a>

 //  <a href="javascript:;" class="closed"><i class="fa fa-close"></i></a>

 //</span>

-function getTplWidget() { // recent document info

+function getTplWidget(){ // recent document info

 	return '

 		<div class="[+cols+]" id="[+id+]">

 			<div class="card"[+cardAttr+]>

@@ -453,7 +453,7 @@ 
 ';

 }

 

-function getRecentInfo() { // recent document info

+function getRecentInfo(){ // recent document info

 	global $modx;

 

 	$modx->addSnippet('recentInfoList', 'getRecentInfoList');

@@ -479,12 +479,12 @@ 
 	return $html;

 }

 

-function getRecentInfoList() {

+function getRecentInfoList(){

 	global $modx;

 

 	$rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);

 

-	if($modx->db->getRecordCount($rs) < 1) {

+	if ($modx->db->getRecordCount($rs) < 1) {

 		return '<tr><td>[%no_activity_message%]</td></tr>';

 	}

 

@@ -494,20 +494,20 @@ 
 	$btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&amp;id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> ';

 

 	$output = array();

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

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

 		$docid = $ph['id'];

 		$_ = $modx->getUserInfo($ph['editedby']);

 		$ph['username'] = $_['username'];

 

-		if($ph['deleted'] == 1) {

+		if ($ph['deleted'] == 1) {

 			$ph['status'] = 'deleted text-danger';

-		} elseif($ph['published'] == 0) {

+		} elseif ($ph['published'] == 0) {

 			$ph['status'] = 'unpublished font-italic text-muted';

 		} else {

 			$ph['status'] = 'published';

 		}

 

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

+		if ($modx->hasPermission('edit_document')) {

 			$ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);

 		} else {

 			$ph['edit_btn'] = '';

@@ -522,8 +522,8 @@ 
 			$preview_disabled

 		), $btntpl['preview_btn']);

 

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

-			if($ph['deleted'] == 0) {

+		if ($modx->hasPermission('delete_document')) {

+			if ($ph['deleted'] == 0) {

 				$delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&amp;id=[+id+]" target="main"><i class="fa fa-trash fa-fw"></i></a> ';

 			} else {

 				$delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&amp;id=[+id+]" target="main"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> ';

@@ -533,11 +533,11 @@ 
 			$ph['delete_btn'] = '';

 		}

 

-		if($ph['deleted'] == 1 && $ph['published'] == 0) {

+		if ($ph['deleted'] == 1 && $ph['published'] == 0) {

 			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

-		} elseif($ph['deleted'] == 1 && $ph['published'] == 1) {

+		} elseif ($ph['deleted'] == 1 && $ph['published'] == 1) {

 			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

-		} elseif($ph['deleted'] == 0 && $ph['published'] == 0) {

+		} elseif ($ph['deleted'] == 0 && $ph['published'] == 0) {

 			$publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

 		} else {

 			$publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

@@ -546,16 +546,16 @@ 
 

 		$ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');

 

-		if($ph['longtitle'] == '') {

+		if ($ph['longtitle'] == '') {

 			$ph['longtitle'] = '(<i>[%not_set%]</i>)';

 		}

-		if($ph['description'] == '') {

+		if ($ph['description'] == '') {

 			$ph['description'] = '(<i>[%not_set%]</i>)';

 		}

-		if($ph['introtext'] == '') {

+		if ($ph['introtext'] == '') {

 			$ph['introtext'] = '(<i>[%not_set%]</i>)';

 		}

-		if($ph['alias'] == '') {

+		if ($ph['alias'] == '') {

 			$ph['alias'] = '(<i>[%not_set%]</i>)';

 		}

 

@@ -564,7 +564,7 @@ 
 	return implode("\n", $output);

 }

 

-function getRecentInfoRowTpl() {

+function getRecentInfoRowTpl(){

 	$tpl = '

 						<tr>

 							<td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right"><span class="label label-info">[+id+]</span></td>

@@ -593,11 +593,11 @@ 
 }

 

 // setup icons

-function wrapIcon($i, $action) {

+function wrapIcon($i, $action){

 	return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);

 }

 

-function getStartUpScript() {

+function getStartUpScript(){

 	$script = '

         <script type="text/javascript">

         function hideConfigCheckWarning(key) {