evolution-cms / evolution

manager/includes/error.class.inc.php

Indentation +59 added lines, -59 removed lines

@@ -5,72 +5,72 @@ 
 var $errorcode;
 var $errors = array();
 
-	function __construct() {
+    function __construct() {
 		
-		$_lang = $this->include_lang('errormsg');
+        $_lang = $this->include_lang('errormsg');
 		
-		$this->errors = array(
-		0	=>	$_lang["No errors occured."],
-		1	=>	$_lang["An error occured!"],
-		2	=>	$_lang["Document's ID not passed in request!"],
-		3	=>	$_lang["You don't have enough privileges for this action!"],
-		4	=>	$_lang["ID passed in request is NaN!"],
-		5	=>	$_lang["The document is locked!"],
-		6	=>	$_lang["Too many results returned from database!"],
-		7	=>	$_lang["Not enough/ no results returned from database!"],
-		8	=>	$_lang["Couldn't find parent document's name!"],
-		9	=>	$_lang["Logging error!"],
-		10	=>	$_lang["Table to optimise not found in request!"],
-		11	=>	$_lang["No settings found in request!"],
-		12	=>	$_lang["The document must have a title!"],
-		13	=>	$_lang["No user selected as recipient of this message!"],
-		14	=>	$_lang["No group selected as recipient of this message!"],
-		15	=>	$_lang["The document was not found!"],
+        $this->errors = array(
+        0	=>	$_lang["No errors occured."],
+        1	=>	$_lang["An error occured!"],
+        2	=>	$_lang["Document's ID not passed in request!"],
+        3	=>	$_lang["You don't have enough privileges for this action!"],
+        4	=>	$_lang["ID passed in request is NaN!"],
+        5	=>	$_lang["The document is locked!"],
+        6	=>	$_lang["Too many results returned from database!"],
+        7	=>	$_lang["Not enough/ no results returned from database!"],
+        8	=>	$_lang["Couldn't find parent document's name!"],
+        9	=>	$_lang["Logging error!"],
+        10	=>	$_lang["Table to optimise not found in request!"],
+        11	=>	$_lang["No settings found in request!"],
+        12	=>	$_lang["The document must have a title!"],
+        13	=>	$_lang["No user selected as recipient of this message!"],
+        14	=>	$_lang["No group selected as recipient of this message!"],
+        15	=>	$_lang["The document was not found!"],
 	
-		100 =>	$_lang["Double action (GET & POST) posted!"],
-		600 =>	$_lang["Document cannot be it's own parent!"],
-		601 =>	$_lang["Document's ID not passed in request!"],
-		602 =>	$_lang["New parent not set in request!"],
-		900 =>	$_lang["don't know the user!"], // don't know the user!
-		901 =>	$_lang["wrong password!"], // wrong password!
-		902 =>	$_lang["Due to too many failed logins, you have been blocked!"],
-		903 =>	$_lang["You are blocked and cannot log in!"],
-		904 =>	$_lang["You are blocked and cannot log in! Please try again later."],
-		905 =>	$_lang["The security code you entered didn't validate! Please try to login again!"]
-	);
-	}
+        100 =>	$_lang["Double action (GET & POST) posted!"],
+        600 =>	$_lang["Document cannot be it's own parent!"],
+        601 =>	$_lang["Document's ID not passed in request!"],
+        602 =>	$_lang["New parent not set in request!"],
+        900 =>	$_lang["don't know the user!"], // don't know the user!
+        901 =>	$_lang["wrong password!"], // wrong password!
+        902 =>	$_lang["Due to too many failed logins, you have been blocked!"],
+        903 =>	$_lang["You are blocked and cannot log in!"],
+        904 =>	$_lang["You are blocked and cannot log in! Please try again later."],
+        905 =>	$_lang["The security code you entered didn't validate! Please try to login again!"]
+    );
+    }
 
-	function include_lang($context='common') {
-		global $modx;
-		$_lang = array();
+    function include_lang($context='common') {
+        global $modx;
+        $_lang = array();
 		
-		$context = trim($context,'/');
-		if(strpos($context,'..')!==false) return;
+        $context = trim($context,'/');
+        if(strpos($context,'..')!==false) return;
 		
-		if($context === 'common')
-			$lang_path = MODX_MANAGER_PATH . 'includes/lang/';
-		else
-			$lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
-		include_once($lang_path . 'english.inc.php');
-		$manager_language = $modx->config['manager_language'];
-		if(is_file("{$lang_path}{$manager_language}.inc.php"))
-			include_once("{$lang_path}{$manager_language}.inc.php");
-		return $_lang;
-	}
+        if($context === 'common')
+            $lang_path = MODX_MANAGER_PATH . 'includes/lang/';
+        else
+            $lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
+        include_once($lang_path . 'english.inc.php');
+        $manager_language = $modx->config['manager_language'];
+        if(is_file("{$lang_path}{$manager_language}.inc.php"))
+            include_once("{$lang_path}{$manager_language}.inc.php");
+        return $_lang;
+    }
 	
-	function setError($errorcode, $custommessage=""){
-		$this->errorcode=$errorcode;
-		$this->errormessage=$this->errors[$errorcode];
-		if($custommessage!="") {
-			$this->errormessage=$custommessage;
-		}
-	}	
+    function setError($errorcode, $custommessage=""){
+        $this->errorcode=$errorcode;
+        $this->errormessage=$this->errors[$errorcode];
+        if($custommessage!="") {
+            $this->errormessage=$custommessage;
+        }
+    }	
 	
-	function getError() {
-		return $this->errorcode;
-	}
+    function getError() {
+        return $this->errorcode;
+    }
 	
-	function dumpError(){
+    function dumpError(){
 ?>
 	<html>
 	<head>
@@ -88,7 +88,7 @@ 
 	</body>
 	</html>
 <?php
-		exit;
-	}
+        exit;
+    }
 }
 ?>
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -5,7 +5,7 @@ 
 var $errorcode;
 var $errors = array();
 
-	function __construct() {
+	function __construct(){
 		
 		$_lang = $this->include_lang('errormsg');
 		
@@ -40,33 +40,33 @@ 
 	);
 	}
 
-	function include_lang($context='common') {
+	function include_lang($context = 'common'){
 		global $modx;
 		$_lang = array();
 		
-		$context = trim($context,'/');
-		if(strpos($context,'..')!==false) return;
+		$context = trim($context, '/');
+		if (strpos($context, '..') !== false) return;
 		
-		if($context === 'common')
-			$lang_path = MODX_MANAGER_PATH . 'includes/lang/';
+		if ($context === 'common')
+			$lang_path = MODX_MANAGER_PATH.'includes/lang/';
 		else
-			$lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
-		include_once($lang_path . 'english.inc.php');
+			$lang_path = MODX_MANAGER_PATH."includes/lang/{$context}/";
+		include_once($lang_path.'english.inc.php');
 		$manager_language = $modx->config['manager_language'];
-		if(is_file("{$lang_path}{$manager_language}.inc.php"))
+		if (is_file("{$lang_path}{$manager_language}.inc.php"))
 			include_once("{$lang_path}{$manager_language}.inc.php");
 		return $_lang;
 	}
 	
-	function setError($errorcode, $custommessage=""){
-		$this->errorcode=$errorcode;
-		$this->errormessage=$this->errors[$errorcode];
-		if($custommessage!="") {
-			$this->errormessage=$custommessage;
+	function setError($errorcode, $custommessage = ""){
+		$this->errorcode = $errorcode;
+		$this->errormessage = $this->errors[$errorcode];
+		if ($custommessage != "") {
+			$this->errormessage = $custommessage;
 		}
 	}	
 	
-	function getError() {
+	function getError(){
 		return $this->errorcode;
 	}
 	

Braces +23 added lines, -13 removed lines

@@ -1,11 +1,13 @@ 
 <?php
 // this is the old error handler. Here for legacy, until i replace all the old errors.
-class errorHandler{
+class errorHandler
+{
 
 var $errorcode;
 var $errors = array();
 
-	function __construct() {
+	function __construct()
+	{
 		
 		$_lang = $this->include_lang('errormsg');
 		
@@ -40,25 +42,31 @@ 
 	);
 	}
 
-	function include_lang($context='common') {
+	function include_lang($context='common')
+	{
 		global $modx;
 		$_lang = array();
 		
 		$context = trim($context,'/');
-		if(strpos($context,'..')!==false) return;
+		if(strpos($context,'..')!==false) {
+		    return;
+		}
 		
-		if($context === 'common')
-			$lang_path = MODX_MANAGER_PATH . 'includes/lang/';
-		else
-			$lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
+		if($context === 'common') {
+					$lang_path = MODX_MANAGER_PATH . 'includes/lang/';
+		} else {
+					$lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
+		}
 		include_once($lang_path . 'english.inc.php');
 		$manager_language = $modx->config['manager_language'];
-		if(is_file("{$lang_path}{$manager_language}.inc.php"))
-			include_once("{$lang_path}{$manager_language}.inc.php");
+		if(is_file("{$lang_path}{$manager_language}.inc.php")) {
+					include_once("{$lang_path}{$manager_language}.inc.php");
+		}
 		return $_lang;
 	}
 	
-	function setError($errorcode, $custommessage=""){
+	function setError($errorcode, $custommessage="")
+	{
 		$this->errorcode=$errorcode;
 		$this->errormessage=$this->errors[$errorcode];
 		if($custommessage!="") {
@@ -66,11 +74,13 @@ 
 		}
 	}	
 	
-	function getError() {
+	function getError()
+	{
 		return $this->errorcode;
 	}
 	
-	function dumpError(){
+	function dumpError()
+	{
 ?>
 	<html>
 	<head>

manager/includes/veriword.php

Spacing +33 added lines, -33 removed lines

@@ -7,7 +7,7 @@ 
 $modx->db->connect();
 $modx->getSettings();
 
-$vword = new VeriWord(148,60);
+$vword = new VeriWord(148, 60);
 $vword->output_image();
 $vword->destroy_image();
 
@@ -43,7 +43,7 @@ 
 ## see sample.php for test and usage
 ## sample URL: http://www.program-ruti.org/veriword/
 ####
-class VeriWord {
+class VeriWord{
 
     /* path to font directory*/
     var $dir_font   = "ttf/";
@@ -53,45 +53,45 @@ 
     var $im_width   = 0;
     var $im_height  = 0;
 
-    function __construct($w=200, $h=80) {
+    function __construct($w = 200, $h = 80){
         /* create session to set word for verification */
         startCMSSession();
         $this->set_veriword();
-        $this->dir_font = dirname(__FILE__) . '/' . $this->dir_font;
+        $this->dir_font = dirname(__FILE__).'/'.$this->dir_font;
         $this->im_width         = $w;
         $this->im_height        = $h;
     }
 
-    function set_veriword() {   
+    function set_veriword(){   
         /* create session variable for verification, 
            you may change the session variable name */
         $this->word             = $this->pick_word();   
         $_SESSION['veriword']   = $this->word;
     }
 
-    function output_image() {
+    function output_image(){
         /* output the image as jpeg */  
         $this->draw_image();
         header("Content-type: image/jpeg");
         imagejpeg($this->im);
     }
 
-    function pick_word() {
+    function pick_word(){
         global $modx;
         // set default words
-        $words="MODX,Access,Better,BitCode,Chunk,Cache,Desc,Design,Excell,Enjoy,URLs,TechView,Gerald,Griff,Humphrey,Holiday,Intel,Integration,Joystick,Join(),Oscope,Genetic,Light,Likeness,Marit,Maaike,Niche,Netherlands,Ordinance,Oscillo,Parser,Phusion,Query,Question,Regalia,Righteous,Snippet,Sentinel,Template,Thespian,Unity,Enterprise,Verily,Veri,Website,WideWeb,Yap,Yellow,Zebra,Zygote";
+        $words = "MODX,Access,Better,BitCode,Chunk,Cache,Desc,Design,Excell,Enjoy,URLs,TechView,Gerald,Griff,Humphrey,Holiday,Intel,Integration,Joystick,Join(),Oscope,Genetic,Light,Likeness,Marit,Maaike,Niche,Netherlands,Ordinance,Oscillo,Parser,Phusion,Query,Question,Regalia,Righteous,Snippet,Sentinel,Template,Thespian,Unity,Enterprise,Verily,Veri,Website,WideWeb,Yap,Yellow,Zebra,Zygote";
         $words = $modx->config['captcha_words'] ? $modx->config['captcha_words'] : $words;
         $arr_words = array_filter(array_map('trim', explode(',', $words)));
 
         /* pick one randomly for text verification */
-        return (string) $arr_words[array_rand($arr_words)].rand(10,999);
+        return (string) $arr_words[array_rand($arr_words)].rand(10, 999);
     }   
 
-    function draw_text() {        
+    function draw_text(){        
         $dir = dir($this->dir_font);
         $fontstmp = array();
         while (false !== ($file = $dir->read())) {
-            if(substr($file, -4) == '.ttf') {
+            if (substr($file, -4) == '.ttf') {
                 $fontstmp[] = $this->dir_font.$file;
             }
         }
@@ -99,35 +99,35 @@ 
         $text_font = (string) $fontstmp[array_rand($fontstmp)];
 
         /* angle for text inclination */
-        $text_angle = rand(-9,9);
+        $text_angle = rand(-9, 9);
         /* initial text size */
         $text_size  = 30;
         /* calculate text width and height */
-        $box        = imagettfbbox ( $text_size, $text_angle, $text_font, $this->word);
-        $text_width = $box[2]-$box[0]; //text width
-        $text_height= $box[5]-$box[3]; //text height
+        $box        = imagettfbbox($text_size, $text_angle, $text_font, $this->word);
+        $text_width = $box[2] - $box[0]; //text width
+        $text_height = $box[5] - $box[3]; //text height
 
         /* adjust text size */
-        $text_size  = round((20 * $this->im_width)/$text_width);  
+        $text_size  = round((20 * $this->im_width) / $text_width);  
 
         /* recalculate text width and height */
-        $box        = imagettfbbox ( $text_size, $text_angle, $text_font, $this->word);
-        $text_width = $box[2]-$box[0]; //text width
-        $text_height= $box[5]-$box[3]; //text height
+        $box        = imagettfbbox($text_size, $text_angle, $text_font, $this->word);
+        $text_width = $box[2] - $box[0]; //text width
+        $text_height = $box[5] - $box[3]; //text height
 
         /* calculate center position of text */
-        $text_x         = ($this->im_width - $text_width)/2;
-        $text_y         = ($this->im_height - $text_height)/2;
+        $text_x         = ($this->im_width - $text_width) / 2;
+        $text_y         = ($this->im_height - $text_height) / 2;
         
         /* create canvas for text drawing */
-        $im_text        = imagecreate ($this->im_width, $this->im_height); 
-        $bg_color       = imagecolorallocate ($im_text, 255, 255, 255); 
+        $im_text        = imagecreate($this->im_width, $this->im_height); 
+        $bg_color       = imagecolorallocate($im_text, 255, 255, 255); 
 
         /* pick color for text */
-        $text_color     = imagecolorallocate ($im_text, 0, 51, 153);
+        $text_color     = imagecolorallocate($im_text, 0, 51, 153);
 
         /* draw text into canvas */
-        imagettftext    (   $im_text,
+        imagettftext($im_text,
                             $text_size,
                             $text_angle,
                             $text_x,
@@ -143,19 +143,19 @@ 
     }
 
 
-    function draw_image() {
+    function draw_image(){
         
         /* pick one background image randomly from image directory */
-        $img_file       = $this->dir_noise."noise".rand(1,4).".jpg";
+        $img_file       = $this->dir_noise."noise".rand(1, 4).".jpg";
 
         /* create "noise" background image from your image stock*/
-        $noise_img      = @imagecreatefromjpeg ($img_file);
+        $noise_img      = @imagecreatefromjpeg($img_file);
         $noise_width    = imagesx($noise_img); 
         $noise_height   = imagesy($noise_img); 
         
         /* resize the background image to fit the size of image output */
-        $this->im       = imagecreatetruecolor($this->im_width,$this->im_height); 
-        imagecopyresampled ($this->im, 
+        $this->im       = imagecreatetruecolor($this->im_width, $this->im_height); 
+        imagecopyresampled($this->im, 
                             $noise_img, 
                             0, 0, 0, 0, 
                             $this->im_width, 
@@ -164,17 +164,17 @@ 
                             $noise_height);
 
         /* put text image into background image */
-        imagecopymerge (    $this->im, 
+        imagecopymerge($this->im, 
                             $this->draw_text(), 
                             0, 0, 0, 0, 
                             $this->im_width, 
                             $this->im_height, 
-                            70 );
+                            70);
 
         return $this->im;
     }
 
-    function destroy_image() {
+    function destroy_image(){
 
         imagedestroy($this->im);
 

Braces +16 added lines, -8 removed lines

@@ -43,7 +43,8 @@ 
 ## see sample.php for test and usage
 ## sample URL: http://www.program-ruti.org/veriword/
 ####
-class VeriWord {
+class VeriWord
+{
 
     /* path to font directory*/
     var $dir_font   = "ttf/";
@@ -53,7 +54,8 @@ 
     var $im_width   = 0;
     var $im_height  = 0;
 
-    function __construct($w=200, $h=80) {
+    function __construct($w=200, $h=80)
+    {
         /* create session to set word for verification */
         startCMSSession();
         $this->set_veriword();
@@ -62,21 +64,24 @@ 
         $this->im_height        = $h;
     }
 
-    function set_veriword() {   
+    function set_veriword()
+    {
         /* create session variable for verification, 
            you may change the session variable name */
         $this->word             = $this->pick_word();   
         $_SESSION['veriword']   = $this->word;
     }
 
-    function output_image() {
+    function output_image()
+    {
         /* output the image as jpeg */  
         $this->draw_image();
         header("Content-type: image/jpeg");
         imagejpeg($this->im);
     }
 
-    function pick_word() {
+    function pick_word()
+    {
         global $modx;
         // set default words
         $words="MODX,Access,Better,BitCode,Chunk,Cache,Desc,Design,Excell,Enjoy,URLs,TechView,Gerald,Griff,Humphrey,Holiday,Intel,Integration,Joystick,Join(),Oscope,Genetic,Light,Likeness,Marit,Maaike,Niche,Netherlands,Ordinance,Oscillo,Parser,Phusion,Query,Question,Regalia,Righteous,Snippet,Sentinel,Template,Thespian,Unity,Enterprise,Verily,Veri,Website,WideWeb,Yap,Yellow,Zebra,Zygote";
@@ -87,7 +92,8 @@ 
         return (string) $arr_words[array_rand($arr_words)].rand(10,999);
     }   
 
-    function draw_text() {        
+    function draw_text()
+    {
         $dir = dir($this->dir_font);
         $fontstmp = array();
         while (false !== ($file = $dir->read())) {
@@ -143,7 +149,8 @@ 
     }
 
 
-    function draw_image() {
+    function draw_image()
+    {
         
         /* pick one background image randomly from image directory */
         $img_file       = $this->dir_noise."noise".rand(1,4).".jpg";
@@ -174,7 +181,8 @@ 
         return $this->im;
     }
 
-    function destroy_image() {
+    function destroy_image()
+    {
 
         imagedestroy($this->im);
 

manager/includes/user_settings.inc.php

Indentation +13 added lines, -13 removed lines

@@ -3,24 +3,24 @@
 
 // START HACK
 if (isset ($modx)) {
-	$user_id = $modx->getLoginUserID();
+    $user_id = $modx->getLoginUserID();
 } else {
-	$user_id = $_SESSION['mgrInternalKey'];
+    $user_id = $_SESSION['mgrInternalKey'];
 }
 // END HACK
 
 if (!empty($user_id)) {
-	// Raymond: grab the user settings from the database.
-	$rs = $modx->db->select('setting_name, setting_value', $modx->getFullTableName('user_settings'), "user=".$modx->getLoginUserID());
+    // Raymond: grab the user settings from the database.
+    $rs = $modx->db->select('setting_name, setting_value', $modx->getFullTableName('user_settings'), "user=".$modx->getLoginUserID());
 
-	$which_browser_default = $which_browser;
-	while ($row = $modx->db->getRow($rs)) {
-		if($row['setting_name'] == 'which_browser' && $row['setting_value'] == 'default') $row['setting_value'] = $which_browser_default;
-		$settings[$row['setting_name']] = $row['setting_value'];
-		if (isset($modx->config)) {
-			$modx->config[$row['setting_name']] = $row['setting_value'];
-		}
-	}
-	extract($settings, EXTR_OVERWRITE);
+    $which_browser_default = $which_browser;
+    while ($row = $modx->db->getRow($rs)) {
+        if($row['setting_name'] == 'which_browser' && $row['setting_value'] == 'default') $row['setting_value'] = $which_browser_default;
+        $settings[$row['setting_name']] = $row['setting_value'];
+        if (isset($modx->config)) {
+            $modx->config[$row['setting_name']] = $row['setting_value'];
+        }
+    }
+    extract($settings, EXTR_OVERWRITE);
 }
 ?>
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(IN_MANAGER_MODE!="true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+if (IN_MANAGER_MODE != "true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 
 // START HACK
 if (isset ($modx)) {
@@ -15,7 +15,7 @@ 
 
 	$which_browser_default = $which_browser;
 	while ($row = $modx->db->getRow($rs)) {
-		if($row['setting_name'] == 'which_browser' && $row['setting_value'] == 'default') $row['setting_value'] = $which_browser_default;
+		if ($row['setting_name'] == 'which_browser' && $row['setting_value'] == 'default') $row['setting_value'] = $which_browser_default;
 		$settings[$row['setting_name']] = $row['setting_value'];
 		if (isset($modx->config)) {
 			$modx->config[$row['setting_name']] = $row['setting_value'];

Braces +6 added lines, -2 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(IN_MANAGER_MODE!="true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+if(IN_MANAGER_MODE!="true") {
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+}
 
 // START HACK
 if (isset ($modx)) {
@@ -15,7 +17,9 @@ 
 
 	$which_browser_default = $which_browser;
 	while ($row = $modx->db->getRow($rs)) {
-		if($row['setting_name'] == 'which_browser' && $row['setting_value'] == 'default') $row['setting_value'] = $which_browser_default;
+		if($row['setting_name'] == 'which_browser' && $row['setting_value'] == 'default') {
+		    $row['setting_value'] = $which_browser_default;
+		}
 		$settings[$row['setting_name']] = $row['setting_value'];
 		if (isset($modx->config)) {
 			$modx->config[$row['setting_name']] = $row['setting_value'];

manager/includes/active_user_locks.inc.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         var stay = document.getElementById('stay');
         // Trigger unlock
         if ((stay && stay.value !== '2') || !form_save) {
-          var url = '<?php echo MODX_MANAGER_URL; ?>?a=67&type=<?php echo $lockElementType;?>&id=<?php echo $lockElementId;?>&o=' + Math.random();
+          var url = '<?php echo MODX_MANAGER_URL; ?>?a=67&type=<?php echo $lockElementType; ?>&id=<?php echo $lockElementId; ?>&o=' + Math.random();
           if (navigator.sendBeacon) {
             navigator.sendBeacon(url)
           } else {

manager/includes/secure_mgr_documents.inc.php

Indentation +11 added lines, -11 removed lines

@@ -11,19 +11,19 @@
  */
 
 function secureMgrDocument($docid='') {
-	global $modx;
+    global $modx;
 		
-	$modx->db->update('privatemgr = 0', $modx->getFullTableName("site_content"), ($docid>0 ? "id='$docid'":"privatemgr = 1"));
-	$rs = $modx->db->select(
-		'DISTINCT sc.id',
-		$modx->getFullTableName("site_content")." sc
+    $modx->db->update('privatemgr = 0', $modx->getFullTableName("site_content"), ($docid>0 ? "id='$docid'":"privatemgr = 1"));
+    $rs = $modx->db->select(
+        'DISTINCT sc.id',
+        $modx->getFullTableName("site_content")." sc
 			LEFT JOIN ".$modx->getFullTableName("document_groups")." dg ON dg.document = sc.id
 			LEFT JOIN ".$modx->getFullTableName("membergroup_access")." mga ON mga.documentgroup = dg.document_group",
-		($docid>0 ? " sc.id='{$docid}' AND ":"")."mga.id>0"
-		);
-	$ids = $modx->db->getColumn("id",$rs);
-	if(count($ids)>0) {
-		$modx->db->update('privatemgr = 1', $modx->getFullTableName("site_content"), "id IN (".implode(", ",$ids).")");	
-	}
+        ($docid>0 ? " sc.id='{$docid}' AND ":"")."mga.id>0"
+        );
+    $ids = $modx->db->getColumn("id",$rs);
+    if(count($ids)>0) {
+        $modx->db->update('privatemgr = 1', $modx->getFullTableName("site_content"), "id IN (".implode(", ",$ids).")");	
+    }
 }
 ?>
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(IN_MANAGER_MODE!="true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+if (IN_MANAGER_MODE != "true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 
 /**
  *	Secure Manager Documents
@@ -10,20 +10,20 @@ 
  *
  */
 
-function secureMgrDocument($docid='') {
+function secureMgrDocument($docid = ''){
 	global $modx;
 		
-	$modx->db->update('privatemgr = 0', $modx->getFullTableName("site_content"), ($docid>0 ? "id='$docid'":"privatemgr = 1"));
+	$modx->db->update('privatemgr = 0', $modx->getFullTableName("site_content"), ($docid > 0 ? "id='$docid'" : "privatemgr = 1"));
 	$rs = $modx->db->select(
 		'DISTINCT sc.id',
 		$modx->getFullTableName("site_content")." sc
 			LEFT JOIN ".$modx->getFullTableName("document_groups")." dg ON dg.document = sc.id
 			LEFT JOIN ".$modx->getFullTableName("membergroup_access")." mga ON mga.documentgroup = dg.document_group",
-		($docid>0 ? " sc.id='{$docid}' AND ":"")."mga.id>0"
+		($docid > 0 ? " sc.id='{$docid}' AND " : "")."mga.id>0"
 		);
-	$ids = $modx->db->getColumn("id",$rs);
-	if(count($ids)>0) {
-		$modx->db->update('privatemgr = 1', $modx->getFullTableName("site_content"), "id IN (".implode(", ",$ids).")");	
+	$ids = $modx->db->getColumn("id", $rs);
+	if (count($ids) > 0) {
+		$modx->db->update('privatemgr = 1', $modx->getFullTableName("site_content"), "id IN (".implode(", ", $ids).")");	
 	}
 }
 ?>
\ No newline at end of file

Braces +5 added lines, -2 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(IN_MANAGER_MODE!="true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+if(IN_MANAGER_MODE!="true") {
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+}
 
 /**
  *	Secure Manager Documents
@@ -10,7 +12,8 @@ 
  *
  */
 
-function secureMgrDocument($docid='') {
+function secureMgrDocument($docid='')
+{
 	global $modx;
 		
 	$modx->db->update('privatemgr = 0', $modx->getFullTableName("site_content"), ($docid>0 ? "id='$docid'":"privatemgr = 1"));

manager/includes/sysalert.display.inc.php

Indentation +20 added lines, -20 removed lines

@@ -1,30 +1,30 @@ 
 <?php
 
-	/**
-	 *	System Alert Message Queue Display file
-	 *	Written By Raymond Irving, April, 2005
-	 *
-	 *	Used to display system alert messages inside the browser
-	 *
-	 */
+    /**
+     *	System Alert Message Queue Display file
+     *	Written By Raymond Irving, April, 2005
+     *
+     *	Used to display system alert messages inside the browser
+     *
+     */
 
-	require_once(dirname(__FILE__).'/protect.inc.php');
+    require_once(dirname(__FILE__).'/protect.inc.php');
 
-	$sysMsgs = "";
-	$limit = count($SystemAlertMsgQueque);
-	for($i=0;$i<$limit;$i++) {
-		$sysMsgs .= $SystemAlertMsgQueque[$i]."<hr sys/>";
-	}
-	// reset message queque
-	unset($_SESSION['SystemAlertMsgQueque']);
-	$_SESSION['SystemAlertMsgQueque'] = array();
-	$SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
+    $sysMsgs = "";
+    $limit = count($SystemAlertMsgQueque);
+    for($i=0;$i<$limit;$i++) {
+        $sysMsgs .= $SystemAlertMsgQueque[$i]."<hr sys/>";
+    }
+    // reset message queque
+    unset($_SESSION['SystemAlertMsgQueque']);
+    $_SESSION['SystemAlertMsgQueque'] = array();
+    $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
 
-	if($sysMsgs!="") {
+    if($sysMsgs!="") {
 ?>
 
 <?php // fetch the styles
-	echo '<link rel="stylesheet" type="text/css" href="'.MODX_MANAGER_URL.'media/style/'.$manager_theme.'/style.css'.'" />';
+    echo '<link rel="stylesheet" type="text/css" href="'.MODX_MANAGER_URL.'media/style/'.$manager_theme.'/style.css'.'" />';
 ?>
 <script type="text/javascript">
 // <![CDATA[
@@ -42,5 +42,5 @@ 
 // ]]>
 </script>
 <?php
-	}
+    }
 ?>
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 
 	$sysMsgs = "";
 	$limit = count($SystemAlertMsgQueque);
-	for($i=0;$i<$limit;$i++) {
+	for ($i = 0; $i < $limit; $i++) {
 		$sysMsgs .= $SystemAlertMsgQueque[$i]."<hr sys/>";
 	}
 	// reset message queque
@@ -20,7 +20,7 @@ 
 	$_SESSION['SystemAlertMsgQueque'] = array();
 	$SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
 
-	if($sysMsgs!="") {
+	if ($sysMsgs != "") {
 ?>
 
 <?php // fetch the styles
@@ -32,7 +32,7 @@ 
 			var sysAlert = new Element('div').setProperties({
 				'class': 'sysAlert'
 			});
-			sysAlert.innerHTML = '<?php echo $modx->db->escape($sysMsgs);?>';
+			sysAlert.innerHTML = '<?php echo $modx->db->escape($sysMsgs); ?>';
 			var boxHtml = new MooPrompt('<?php echo $_lang['sys_alert']; ?>', sysAlert, {
 				buttons: 1,
 				button1: 'Ok',

manager/includes/paginate.inc.php

Spacing +10 added lines, -10 removed lines

@@ -31,10 +31,10 @@ 
 class Paging
 {
 
-    var $int_num_result;  // Number of result to show per page (decided by user)
-    var $int_nbr_row;     // Total number of items (SQL count from db)
-    var $int_cur_position;// Current position in recordset
-    var $str_ext_argv;    // Extra argv of query string
+    var $int_num_result; // Number of result to show per page (decided by user)
+    var $int_nbr_row; // Total number of items (SQL count from db)
+    var $int_cur_position; // Current position in recordset
+    var $str_ext_argv; // Extra argv of query string
 
     // ------------------------------------------------------------------------ Constructor
     //
@@ -64,14 +64,14 @@ 
         $array_paging['total'] = $this->int_nbr_row;
 
         if ($this->int_cur_position != 0) {
-            $array_paging['first_link'] = "<a href=\"$PHP_SELF?int_cur_position=0" . $this->str_ext_argv . "\">";
-            $array_paging['previous_link'] = "<a href=\"$PHP_SELF?int_cur_position=" . ($this->int_cur_position - $this->int_num_result) . $this->str_ext_argv . "\">";
+            $array_paging['first_link'] = "<a href=\"$PHP_SELF?int_cur_position=0".$this->str_ext_argv."\">";
+            $array_paging['previous_link'] = "<a href=\"$PHP_SELF?int_cur_position=".($this->int_cur_position - $this->int_num_result).$this->str_ext_argv."\">";
         }
 
         if (($this->int_nbr_row - $this->int_cur_position) > $this->int_num_result) {
             $int_new_position = $this->int_cur_position + $this->int_num_result;
-            $array_paging['last_link'] = "<a href=\"$PHP_SELF?int_cur_position=" . $this->int_nbr_row . $this->str_ext_argv . "\">";
-            $array_paging['next_link'] = "<a href=\"$PHP_SELF?int_cur_position=$int_new_position" . $this->str_ext_argv . "\">";
+            $array_paging['last_link'] = "<a href=\"$PHP_SELF?int_cur_position=".$this->int_nbr_row.$this->str_ext_argv."\">";
+            $array_paging['next_link'] = "<a href=\"$PHP_SELF?int_cur_position=$int_new_position".$this->str_ext_argv."\">";
         }
         return $array_paging;
     } // end function
@@ -86,10 +86,10 @@ 
         for ($i = 0; $i < $this->getNumberOfPage(); $i++) {
             // if current page, do not make a link
             if ($i == $this->getCurrentPage()) {
-                $array_all_page[$i] = "<b>" . ($i + 1) . "</b>&nbsp;";
+                $array_all_page[$i] = "<b>".($i + 1)."</b>&nbsp;";
             } else {
                 $int_new_position = ($i * $this->int_num_result);
-                $array_all_page[$i] = "<a href=\"" . $PHP_SELF . "?int_cur_position=$int_new_position$this->str_ext_argv\">" . ($i + 1) . "</a>&nbsp;";
+                $array_all_page[$i] = "<a href=\"".$PHP_SELF."?int_cur_position=$int_new_position$this->str_ext_argv\">".($i + 1)."</a>&nbsp;";
             }
         }
         return $array_all_page;

manager/includes/active_user_locks.php

Indentation +1 added lines, -1 removed lines

@@ -21,5 +21,5 @@
 if($ok) {
     echo '{status:"ok"}';
 } else {
-  echo '{status:"null"}';
+    echo '{status:"null"}';
 }

Spacing +2 added lines, -2 removed lines

@@ -12,13 +12,13 @@
 $modx->invokeEvent('OnManagerPageInit');
 $ok = false;
 
-if($modx->elementIsLocked($_GET['type'], $_GET['id'], true)) {
+if ($modx->elementIsLocked($_GET['type'], $_GET['id'], true)) {
     $modx->lockElement($_GET['type'], $_GET['id'], true);
     $ok = true;
 }
 
 header('Content-type: application/json');
-if($ok) {
+if ($ok) {
     echo '{status:"ok"}';
 } else {
   echo '{status:"null"}';

manager/includes/log.class.inc.php

Spacing +17 added lines, -17 removed lines

@@ -12,24 +12,24 @@ 
 
 */
 
-class logHandler {
+class logHandler{
     // Single variable for a log entry
     var $entry = array();
 
-    function initAndWriteLog($msg="", $internalKey="", $username="", $action="", $itemid="", $itemname="") {
+    function initAndWriteLog($msg = "", $internalKey = "", $username = "", $action = "", $itemid = "", $itemname = ""){
         global $modx;
         $this->entry['msg'] = $msg; // writes testmessage to the object
-        $this->entry['action'] = empty($action)? $modx->manager->action : $action;    // writes the action to the object
+        $this->entry['action'] = empty($action) ? $modx->manager->action : $action; // writes the action to the object
 
         // User Credentials
         $this->entry['internalKey'] = $internalKey == "" ? $modx->getLoginUserID() : $internalKey;
         $this->entry['username'] = $username == "" ? $modx->getLoginUserName() : $username;
 
-        $this->entry['itemId'] = (empty($itemid) && isset($_REQUEST['id'])) ? (int)$_REQUEST['id'] : $itemid;  // writes the id to the object
-        if($this->entry['itemId'] == 0) $this->entry['itemId'] = "-"; // to stop items having id 0
+        $this->entry['itemId'] = (empty($itemid) && isset($_REQUEST['id'])) ? (int) $_REQUEST['id'] : $itemid; // writes the id to the object
+        if ($this->entry['itemId'] == 0) $this->entry['itemId'] = "-"; // to stop items having id 0
 
-        $this->entry['itemName'] = ($itemname == "" && isset($_SESSION['itemname']))? $_SESSION['itemname'] : $itemname; // writes the id to the object
-        if($this->entry['itemName'] == "") $this->entry['itemName'] = "-"; // to stop item name being empty
+        $this->entry['itemName'] = ($itemname == "" && isset($_SESSION['itemname'])) ? $_SESSION['itemname'] : $itemname; // writes the id to the object
+        if ($this->entry['itemName'] == "") $this->entry['itemName'] = "-"; // to stop item name being empty
 
         $this->writeToLog();
         return;
@@ -38,20 +38,20 @@ 
     // function to write to the log
     // collects all required info, and
     // writes it to the logging table
-    function writeToLog() {
+    function writeToLog(){
         global $modx;
         $tbl_manager_log = $modx->getFullTableName('manager_log');
         
-        if($this->entry['internalKey'] == "") {
+        if ($this->entry['internalKey'] == "") {
             $modx->webAlertAndQuit("Logging error: internalKey not set.");
         }
-        if(empty($this->entry['action'])) {
+        if (empty($this->entry['action'])) {
             $modx->webAlertAndQuit("Logging error: action not set.");
         }
-        if($this->entry['msg'] == "") {
+        if ($this->entry['msg'] == "") {
             include_once "actionlist.inc.php";
             $this->entry['msg'] = getAction($this->entry['action'], $this->entry['itemId']);
-            if($this->entry['msg'] == "") {
+            if ($this->entry['msg'] == "") {
                 $modx->webAlertAndQuit("Logging error: couldn't find message to write to log.");
             }
         }
@@ -63,14 +63,14 @@ 
         $fields['itemid']      = $this->entry['itemId'];
         $fields['itemname']    = $modx->db->escape($this->entry['itemName']);
         $fields['message']     = $modx->db->escape($this->entry['msg']);
-        $insert_id = $modx->db->insert($fields,$tbl_manager_log);
-        if(!$insert_id) {
+        $insert_id = $modx->db->insert($fields, $tbl_manager_log);
+        if (!$insert_id) {
             $modx->messageQuit("Logging error: couldn't save log to table! Error code: ".$modx->db->getLastError());
         } else {
             $limit = (isset($modx->config['manager_log_limit'])) ? intval($modx->config['manager_log_limit']) : 3000;
-            $trim  = (isset($modx->config['manager_log_trim']))  ? intval($modx->config['manager_log_trim']) : 100;
-            if(($insert_id % $trim) === 0) {
-                $modx->rotate_log('manager_log',$limit,$trim);
+            $trim  = (isset($modx->config['manager_log_trim'])) ? intval($modx->config['manager_log_trim']) : 100;
+            if (($insert_id % $trim) === 0) {
+                $modx->rotate_log('manager_log', $limit, $trim);
             }
         }
     }

Braces +14 added lines, -5 removed lines

@@ -12,11 +12,13 @@ 
 
 */
 
-class logHandler {
+class logHandler
+{
     // Single variable for a log entry
     var $entry = array();
 
-    function initAndWriteLog($msg="", $internalKey="", $username="", $action="", $itemid="", $itemname="") {
+    function initAndWriteLog($msg="", $internalKey="", $username="", $action="", $itemid="", $itemname="")
+    {
         global $modx;
         $this->entry['msg'] = $msg; // writes testmessage to the object
         $this->entry['action'] = empty($action)? $modx->manager->action : $action;    // writes the action to the object
@@ -26,10 +28,16 @@ 
         $this->entry['username'] = $username == "" ? $modx->getLoginUserName() : $username;
 
         $this->entry['itemId'] = (empty($itemid) && isset($_REQUEST['id'])) ? (int)$_REQUEST['id'] : $itemid;  // writes the id to the object
-        if($this->entry['itemId'] == 0) $this->entry['itemId'] = "-"; // to stop items having id 0
+        if($this->entry['itemId'] == 0) {
+            $this->entry['itemId'] = "-";
+        }
+        // to stop items having id 0
 
         $this->entry['itemName'] = ($itemname == "" && isset($_SESSION['itemname']))? $_SESSION['itemname'] : $itemname; // writes the id to the object
-        if($this->entry['itemName'] == "") $this->entry['itemName'] = "-"; // to stop item name being empty
+        if($this->entry['itemName'] == "") {
+            $this->entry['itemName'] = "-";
+        }
+        // to stop item name being empty
 
         $this->writeToLog();
         return;
@@ -38,7 +46,8 @@ 
     // function to write to the log
     // collects all required info, and
     // writes it to the logging table
-    function writeToLog() {
+    function writeToLog()
+    {
         global $modx;
         $tbl_manager_log = $modx->getFullTableName('manager_log');