evolution-cms / evolution

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*/
     public $dir_font   = "ttf/";
@@ -54,45 +54,45 @@ 
     public $im_height  = 0;
     public $im;
 
-    public function __construct($w=200, $h=80) {
+    public 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;
     }
 
-    public function set_veriword() {
+    public function set_veriword(){
         /* create session variable for verification,
            you may change the session variable name */
         $this->word             = $this->pick_word();
         $_SESSION['veriword']   = $this->word;
     }
 
-    public function output_image() {
+    public function output_image(){
         /* output the image as jpeg */
         $this->draw_image();
         header("Content-type: image/jpeg");
         imagejpeg($this->im);
     }
 
-    public function pick_word() {
+    public 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);
     }
 
-    public function draw_text() {
+    public 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;
             }
         }
@@ -100,35 +100,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 @@ 
     }
 
 
-    public function draw_image() {
+    public 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;
     }
 
-    public function destroy_image() {
+    public function destroy_image(){
 
         imagedestroy($this->im);
 

manager/includes/extenders/dbapi.mysqli.class.inc.php

Spacing +23 added lines, -23 removed lines

@@ -19,7 +19,7 @@ 
         $pre = null,
         $charset = '',
         $connection_method = 'SET CHARACTER SET'
-    ) {
+    ){
         $this->config['host'] = $host ? $host : $GLOBALS['database_server'];
         $this->config['dbase'] = $dbase ? $dbase : $GLOBALS['dbase'];
         $this->config['user'] = $uid ? $uid : $GLOBALS['database_user'];
@@ -52,7 +52,7 @@ 
                         $ua = $modx->htmlspecialchars($_SERVER['HTTP_USER_AGENT']);
                         $referer = $modx->htmlspecialchars($_SERVER['HTTP_REFERER']);
                         $modx->sendmail(array(
-                            'subject' => 'Missing to create the database connection! from ' . $modx->config['site_name'],
+                            'subject' => 'Missing to create the database connection! from '.$modx->config['site_name'],
                             'body'    => "{$logtitle}\n{$request_uri}\n{$ua}\n{$referer}",
                             'type'    => 'text'
                         ));
@@ -70,8 +70,8 @@ 
             $tend = $modx->getMicroTime();
             $totaltime = $tend - $tstart;
             if ($modx->dumpSQL) {
-                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Database connection</legend>" . sprintf("Database connection was created in %2.4f s",
-                        $totaltime) . "</fieldset><br />";
+                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Database connection</legend>".sprintf("Database connection was created in %2.4f s",
+                        $totaltime)."</fieldset><br />";
             }
             $this->conn->set_charset($this->config['charset']);
             $this->isConnected = true;
@@ -138,7 +138,7 @@ 
                 case 1091:
                     break;
                 default:
-                    $modx->messageQuit('Execution of a query to the database failed - ' . $this->getLastError(), $sql);
+                    $modx->messageQuit('Execution of a query to the database failed - '.$this->getLastError(), $sql);
             }
         } else {
             $tend = $modx->getMicroTime();
@@ -152,24 +152,24 @@ 
                     $debug_path[] = $line['function'];
                 }
                 $debug_path = implode(' > ', array_reverse($debug_path));
-                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Query " . ($modx->executedQueries + 1) . " - " . sprintf("%2.2f ms",
-                        $totaltime * 1000) . "</legend>";
-                $modx->queryCode .= $sql . '<br><br>';
+                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Query ".($modx->executedQueries + 1)." - ".sprintf("%2.2f ms",
+                        $totaltime * 1000)."</legend>";
+                $modx->queryCode .= $sql.'<br><br>';
                 if ($modx->event->name) {
-                    $modx->queryCode .= 'Current Event  => ' . $modx->event->name . '<br>';
+                    $modx->queryCode .= 'Current Event  => '.$modx->event->name.'<br>';
                 }
                 if ($modx->event->activePlugin) {
-                    $modx->queryCode .= 'Current Plugin => ' . $modx->event->activePlugin . '<br>';
+                    $modx->queryCode .= 'Current Plugin => '.$modx->event->activePlugin.'<br>';
                 }
                 if ($modx->currentSnippet) {
-                    $modx->queryCode .= 'Current Snippet => ' . $modx->currentSnippet . '<br>';
+                    $modx->queryCode .= 'Current Snippet => '.$modx->currentSnippet.'<br>';
                 }
                 if (stripos($sql, 'select') === 0) {
-                    $modx->queryCode .= 'Record Count => ' . $this->getRecordCount($result) . '<br>';
+                    $modx->queryCode .= 'Record Count => '.$this->getRecordCount($result).'<br>';
                 } else {
-                    $modx->queryCode .= 'Affected Rows => ' . $this->getAffectedRows() . '<br>';
+                    $modx->queryCode .= 'Affected Rows => '.$this->getAffectedRows().'<br>';
                 }
-                $modx->queryCode .= 'Functions Path => ' . $debug_path . '<br>';
+                $modx->queryCode .= 'Functions Path => '.$debug_path.'<br>';
                 $modx->queryCode .= "</fieldset><br />";
             }
             $modx->executedQueries = $modx->executedQueries + 1;
@@ -252,9 +252,9 @@ 
                     if (is_null($value) || strtolower($value) === 'null') {
                         $flds = 'NULL';
                     } else {
-                        $flds = "'" . $value . "'";
+                        $flds = "'".$value."'";
                     }
-                    $fields[$key] = "`{$key}` = " . $flds;
+                    $fields[$key] = "`{$key}` = ".$flds;
                 }
                 $fields = implode(",", $fields);
             }
@@ -278,12 +278,12 @@ 
                 $this->query("INSERT INTO {$intotable} {$fields}");
             } else {
                 if (empty($fromtable)) {
-                    $fields = "(`" . implode("`, `", array_keys($fields)) . "`) VALUES('" . implode("', '",
-                            array_values($fields)) . "')";
+                    $fields = "(`".implode("`, `", array_keys($fields))."`) VALUES('".implode("', '",
+                            array_values($fields))."')";
                     $rt = $this->query("INSERT INTO {$intotable} {$fields}");
                 } else {
                     $fromtable = $this->replaceFullTableName($fromtable);
-                    $fields = "(" . implode(",", array_keys($fields)) . ")";
+                    $fields = "(".implode(",", array_keys($fields)).")";
                     $where = trim($where);
                     $limit = trim($limit);
                     if ($where !== '' && stripos($where, 'WHERE') !== 0) {
@@ -348,7 +348,7 @@ 
     public function getInsertId($conn = null)
     {
         if (!is_object($conn)) {
-            $conn =& $this->conn;
+            $conn = & $this->conn;
         }
 
         return $conn->insert_id;
@@ -357,7 +357,7 @@ 
     public function getAffectedRows($conn = null)
     {
         if (!is_object($conn)) {
-            $conn =& $this->conn;
+            $conn = & $this->conn;
         }
 
         return $conn->affected_rows;
@@ -366,7 +366,7 @@ 
     public function getLastError($conn = null)
     {
         if (!is_object($conn)) {
-            $conn =& $this->conn;
+            $conn = & $this->conn;
         }
 
         return $conn->error;
@@ -386,7 +386,7 @@ 
     {
         $out = false;
         if (is_object($ds)) {
-            switch($mode){
+            switch ($mode) {
                 case 'assoc':
                     $out = $ds->fetch_assoc();
                     break;

manager/includes/extenders/maketable.class.php

Spacing +124 added lines, -124 removed lines

@@ -8,7 +8,7 @@ 
  *
  * @author Jason Coward <jason@opengeek.com> (MODX)
  */
-class MakeTable {
+class MakeTable{
 	public $actionField;
     public $cellAction;
     public $linkAction;
@@ -33,26 +33,26 @@ 
     public $fieldHeaders;
     public $extra;
 
-    public function __construct() {
-		$this->fieldHeaders= array();
-		$this->excludeFields= array();
-		$this->actionField= '';
-		$this->cellAction= '';
-		$this->linkAction= '';
-		$this->tableWidth= '';
-		$this->tableClass= '';
-		$this->rowHeaderClass= '';
-		$this->columnHeaderClass= '';
-		$this->rowRegularClass= '';
-		$this->rowAlternateClass= 'alt';
-		$this->formName= 'tableForm';
-		$this->formAction= '[~[*id*]~]';
-		$this->formElementName= '';
-		$this->formElementType= '';
-		$this->rowAlternatingScheme= 'EVEN';
-		$this->allOption= 0;
-		$this->selectedValues= array();
-		$this->extra= '';
+    public function __construct(){
+		$this->fieldHeaders = array();
+		$this->excludeFields = array();
+		$this->actionField = '';
+		$this->cellAction = '';
+		$this->linkAction = '';
+		$this->tableWidth = '';
+		$this->tableClass = '';
+		$this->rowHeaderClass = '';
+		$this->columnHeaderClass = '';
+		$this->rowRegularClass = '';
+		$this->rowAlternateClass = 'alt';
+		$this->formName = 'tableForm';
+		$this->formAction = '[~[*id*]~]';
+		$this->formElementName = '';
+		$this->formElementType = '';
+		$this->rowAlternatingScheme = 'EVEN';
+		$this->allOption = 0;
+		$this->selectedValues = array();
+		$this->extra = '';
 	}
 
 	/**
@@ -60,8 +60,8 @@ 
 	 *
 	 * @param $value A URL to execute when table cells are clicked.
 	 */
-    public function setCellAction($value) {
-		$this->cellAction= $this->prepareLink($value);
+    public function setCellAction($value){
+		$this->cellAction = $this->prepareLink($value);
 	}
 
 	/**
@@ -69,8 +69,8 @@ 
 	 *
 	 * @param $value A URL to execute when text within table cells are clicked.
 	 */
-    public function setLinkAction($value) {
-		$this->linkAction= $this->prepareLink($value);
+    public function setLinkAction($value){
+		$this->linkAction = $this->prepareLink($value);
 	}
 
 	/**
@@ -78,8 +78,8 @@ 
 	 *
 	 * @param $value A valid width attribute for the HTML TABLE tag
 	 */
-    public function setTableWidth($value) {
-		$this->tableWidth= $value;
+    public function setTableWidth($value){
+		$this->tableWidth = $value;
 	}
 
 	/**
@@ -87,8 +87,8 @@ 
 	 *
 	 * @param $value A class for the main HTML TABLE.
 	 */
-    public function setTableClass($value) {
-		$this->tableClass= $value;
+    public function setTableClass($value){
+		$this->tableClass = $value;
 	}
 
 	/**
@@ -96,8 +96,8 @@ 
 	 *
 	 * @param $value A class for the main HTML TABLE.
 	 */
-    public function setTableID($value) {
-		$this->tableID= $value;
+    public function setTableID($value){
+		$this->tableID = $value;
 	}
 
 	/**
@@ -105,8 +105,8 @@ 
 	 *
 	 * @param $value A class for the table header row.
 	 */
-    public function setRowHeaderClass($value) {
-		$this->rowHeaderClass= $value;
+    public function setRowHeaderClass($value){
+		$this->rowHeaderClass = $value;
 	}
 
 		/**
@@ -114,8 +114,8 @@ 
 	 *
 	 * @param $value A class for the table header row.
 	 */
-    public function setThHeaderClass($value) {
-		$this->thClass= $value;
+    public function setThHeaderClass($value){
+		$this->thClass = $value;
 	}
 
 	/**
@@ -123,8 +123,8 @@ 
 	 *
 	 * @param $value A class for the column header row.
 	 */
-    public function setColumnHeaderClass($value) {
-		$this->columnHeaderClass= $value;
+    public function setColumnHeaderClass($value){
+		$this->columnHeaderClass = $value;
 	}
 
 	/**
@@ -132,8 +132,8 @@ 
 	 *
 	 * @param $value A class for regular table rows.
 	 */
-    public function setRowRegularClass($value) {
-		$this->rowRegularClass= $value;
+    public function setRowRegularClass($value){
+		$this->rowRegularClass = $value;
 	}
 
 	/**
@@ -141,8 +141,8 @@ 
 	 *
 	 * @param $value A class for alternate table rows.
 	 */
-    public function setRowAlternateClass($value) {
-		$this->rowAlternateClass= $value;
+    public function setRowAlternateClass($value){
+		$this->rowAlternateClass = $value;
 	}
 
 	/**
@@ -150,8 +150,8 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element type attribute.
 	 */
-    public function setFormElementType($value) {
-		$this->formElementType= $value;
+    public function setFormElementType($value){
+		$this->formElementType = $value;
 	}
 
 	/**
@@ -159,8 +159,8 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element name attribute.
 	 */
-    public function setFormElementName($value) {
-		$this->formElementName= $value;
+    public function setFormElementName($value){
+		$this->formElementName = $value;
 	}
 
 	/**
@@ -169,8 +169,8 @@ 
 	 *
 	 * @param $value Indicates the FORM name attribute.
 	 */
-    public function setFormName($value) {
-		$this->formName= $value;
+    public function setFormName($value){
+		$this->formName = $value;
 	}
 
 	/**
@@ -178,8 +178,8 @@ 
 	 *
 	 * @param $value Indicates the FORM action attribute.
 	 */
-    public function setFormAction($value) {
-		$this->formAction= $value;
+    public function setFormAction($value){
+		$this->formAction = $value;
 	}
 
 	/**
@@ -187,8 +187,8 @@ 
 	 *
 	 * @param $value An Array of field keys to exclude from the table.
 	 */
-    public function setExcludeFields($value) {
-		$this->excludeFields= $value;
+    public function setExcludeFields($value){
+		$this->excludeFields = $value;
 	}
 
 	/**
@@ -196,8 +196,8 @@ 
 	 *
 	 * @param $value 'ODD' or 'EVEN' to indicate the alternate row scheme.
 	 */
-    public function setRowAlternatingScheme($value) {
-		$this->rowAlternatingScheme= $value;
+    public function setRowAlternatingScheme($value){
+		$this->rowAlternatingScheme = $value;
 	}
 
 	/**
@@ -206,8 +206,8 @@ 
 	 *
 	 * @param $value The key of the field to add as a query string parameter.
 	 */
-    public function setActionFieldName($value) {
-		$this->actionField= $value;
+    public function setActionFieldName($value){
+		$this->actionField = $value;
 	}
 
 	/**
@@ -216,8 +216,8 @@ 
 	 * @param $value An Array of column widths in the order of the keys in the
 	 * 			source table array.
 	 */
-    public function setColumnWidths($widthArray) {
-		$this->columnWidths= $widthArray;
+    public function setColumnWidths($widthArray){
+		$this->columnWidths = $widthArray;
 	}
 
 	/**
@@ -225,8 +225,8 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element type attribute.
 	 */
-    public function setSelectedValues($valueArray) {
-		$this->selectedValues= $valueArray;
+    public function setSelectedValues($valueArray){
+		$this->selectedValues = $valueArray;
 	}
 
 	/**
@@ -235,8 +235,8 @@ 
 	 *
 	 * @param $value A string of additional content.
 	 */
-    public function setExtra($value) {
-		$this->extra= $value;
+    public function setExtra($value){
+		$this->extra = $value;
 	}
 
 	/**
@@ -244,10 +244,10 @@ 
 	 *
 	 * @param $columnPosition The index of the column to get the width for.
 	 */
-    public function getColumnWidth($columnPosition) {
-		$currentWidth= '';
+    public function getColumnWidth($columnPosition){
+		$currentWidth = '';
 		if (is_array($this->columnWidths)) {
-			$currentWidth= $this->columnWidths[$columnPosition] ? ' width="'.$this->columnWidths[$columnPosition].'" ' : '';
+			$currentWidth = $this->columnWidths[$columnPosition] ? ' width="'.$this->columnWidths[$columnPosition].'" ' : '';
 		}
 		return $currentWidth;
 	}
@@ -257,19 +257,19 @@ 
 	 *
 	 * @param $value The position of the current row being rendered.
 	 */
-    public function determineRowClass($position) {
+    public function determineRowClass($position){
 		switch ($this->rowAlternatingScheme) {
 			case 'ODD' :
-				$modRemainder= 1;
+				$modRemainder = 1;
 				break;
 			case 'EVEN' :
-				$modRemainder= 0;
+				$modRemainder = 0;
 				break;
 		}
 		if ($position % 2 == $modRemainder) {
-			$currentClass= $this->rowRegularClass;
+			$currentClass = $this->rowRegularClass;
 		} else {
-			$currentClass= $this->rowAlternateClass;
+			$currentClass = $this->rowAlternateClass;
 		}
 		return ' class="'.$currentClass.'"';
 	}
@@ -280,9 +280,9 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element type attribute.
 	 */
-    public function getCellAction($currentActionFieldValue) {
+    public function getCellAction($currentActionFieldValue){
 		if ($this->cellAction) {
-			$cellAction= ' onClick="javascript:window.location=\''.$this->cellAction.$this->actionField.'='.urlencode($currentActionFieldValue).'\'" ';
+			$cellAction = ' onClick="javascript:window.location=\''.$this->cellAction.$this->actionField.'='.urlencode($currentActionFieldValue).'\'" ';
 		}
 		return $cellAction;
 	}
@@ -293,10 +293,10 @@ 
 	 * @param $currentActionFieldValue The value to be applied to the link action.
 	 * @param $value The value of the cell.
 	 */
-    public function createCellText($currentActionFieldValue, $value) {
+    public function createCellText($currentActionFieldValue, $value){
 		$cell .= $value;
 		if ($this->linkAction) {
-			$cell= '<a href="'.$this->linkAction.$this->actionField.'='.urlencode($currentActionFieldValue).'">'.$cell.'</a>';
+			$cell = '<a href="'.$this->linkAction.$this->actionField.'='.urlencode($currentActionFieldValue).'">'.$cell.'</a>';
 		}
 		return $cell;
 	}
@@ -305,8 +305,8 @@ 
 	 * Sets an option to generate a check all link when checkbox is indicated
 	 * as the table formElementType.
 	 */
-    public function setAllOption() {
-		$this->allOption= 1;
+    public function setAllOption(){
+		$this->allOption = 1;
 	}
 
 	/**
@@ -314,11 +314,11 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element type attribute.
 	 */
-    public function prepareLink($link) {
+    public function prepareLink($link){
 		if (strstr($link, '?')) {
-			$end= '&';
+			$end = '&';
 		} else {
-			$end= '?';
+			$end = '?';
 		}
 		return $link.$end;
 	}
@@ -333,20 +333,20 @@ 
 	 * the $fieldsArray where the values represent the alt heading content
 	 * for each column.
 	 */
-    public function create($fieldsArray, $fieldHeadersArray=array(),$linkpage="") {
+    public function create($fieldsArray, $fieldHeadersArray = array(), $linkpage = ""){
 	    global $_lang;
 		if (is_array($fieldsArray)) {
-			$i= 0;
+			$i = 0;
 			foreach ($fieldsArray as $fieldName => $fieldValue) {
 				$table .= "\t<tr".$this->determineRowClass($i).">\n";
-				$currentActionFieldValue= $fieldValue[$this->actionField];
+				$currentActionFieldValue = $fieldValue[$this->actionField];
 				if (is_array($this->selectedValues)) {
-					$isChecked= array_search($currentActionFieldValue, $this->selectedValues)===false? 0 : 1;
+					$isChecked = array_search($currentActionFieldValue, $this->selectedValues) === false ? 0 : 1;
 				} else {
-					$isChecked= false;
+					$isChecked = false;
 				}
 				$table .= $this->addFormField($currentActionFieldValue, $isChecked);
-				$colPosition= 0;
+				$colPosition = 0;
 				foreach ($fieldValue as $key => $value) {
 					if (!in_array($key, $this->excludeFields)) {
 						$table .= "\t\t<td".$this->getCellAction($currentActionFieldValue).">";
@@ -354,20 +354,20 @@ 
 						$table .= "</td>\n";
 						if ($i == 0) {
 							if (empty ($header) && $this->formElementType) {
-								$header .= "\t\t<th style=\"width:32px\" ".($this->thClass ? 'class="'.$this->thClass.'"' : '').">". ($this->allOption ? '<a href="javascript:clickAll()">all</a>' : '')."</th>\n";
+								$header .= "\t\t<th style=\"width:32px\" ".($this->thClass ? 'class="'.$this->thClass.'"' : '').">".($this->allOption ? '<a href="javascript:clickAll()">all</a>' : '')."</th>\n";
 							}
-							$headerText= array_key_exists($key, $fieldHeadersArray)? $fieldHeadersArray[$key]: $key;
+							$headerText = array_key_exists($key, $fieldHeadersArray) ? $fieldHeadersArray[$key] : $key;
 							$header .= "\t\t<th".$this->getColumnWidth($colPosition).($this->thClass ? ' class="'.$this->thClass.'" ' : '').">".$headerText."</th>\n";
 						}
-						$colPosition ++;
+						$colPosition++;
 					}
 				}
-				$i ++;
+				$i++;
 				$table .= "\t</tr>\n";
 			}
-			$table= "\n".'<table'. ($this->tableWidth ? ' width="'.$this->tableWidth.'"' : ''). ($this->tableClass ? ' class="'.$this->tableClass.'"' : ''). ($this->tableID ? ' id="'.$this->tableID.'"' : '').">\n". ($header ? "\t<thead>\n\t<tr class=\"".$this->rowHeaderClass."\">\n".$header."\t</tr>\n\t</thead>\n" : '').$table."</table>\n";
+			$table = "\n".'<table'.($this->tableWidth ? ' width="'.$this->tableWidth.'"' : '').($this->tableClass ? ' class="'.$this->tableClass.'"' : '').($this->tableID ? ' id="'.$this->tableID.'"' : '').">\n".($header ? "\t<thead>\n\t<tr class=\"".$this->rowHeaderClass."\">\n".$header."\t</tr>\n\t</thead>\n" : '').$table."</table>\n";
 			if ($this->formElementType) {
-				$table= "\n".'<form id="'.$this->formName.'" name="'.$this->formName.'" action="'.$this->formAction.'" method="POST">'.$table;
+				$table = "\n".'<form id="'.$this->formName.'" name="'.$this->formName.'" action="'.$this->formAction.'" method="POST">'.$table;
 			}
 			if (strlen($this->pageNav) > 1) {//changed to display the pagination if exists.
 				/* commented this part because of cookie
@@ -402,9 +402,9 @@ 
 			}
 			if ($this->formElementType) {
 				if ($this->extra) {
-					$table.= "\n".$this->extra."\n";
+					$table .= "\n".$this->extra."\n";
 				}
-				$table.= "\n".'</form>'."\n";
+				$table .= "\n".'</form>'."\n";
 			}
 			return $table;
 		}
@@ -416,36 +416,36 @@ 
 	 * @param $numRecords The number of records to show per page.
 	 * @param $qs An optional query string to be appended to the paging links
 	 */
-    public function createPagingNavigation($numRecords, $qs='') {
+    public function createPagingNavigation($numRecords, $qs = ''){
 		global $_lang;
-		$currentPage= (is_numeric($_GET['page']) ? $_GET['page'] : 1);
-		$numPages= ceil($numRecords / MAX_DISPLAY_RECORDS_NUM);
+		$currentPage = (is_numeric($_GET['page']) ? $_GET['page'] : 1);
+		$numPages = ceil($numRecords / MAX_DISPLAY_RECORDS_NUM);
 		if ($numPages > 1) {
-			$currentURL= empty($qs)? '': '?'.$qs;
+			$currentURL = empty($qs) ? '' : '?'.$qs;
 			if ($currentPage > 6) {
 				$nav .= $this->createPageLink($currentURL, 1, $_lang["pagination_table_first"]);
 			}
 			if ($currentPage != 1) {
-				$nav .= $this->createPageLink($currentURL, $currentPage -1, '&lt;&lt;');
+				$nav .= $this->createPageLink($currentURL, $currentPage - 1, '&lt;&lt;');
 			}
-			$offset= -4 + ($currentPage < 5 ? (5 - $currentPage) : 0);
-			$i= 1;
+			$offset = -4 + ($currentPage < 5 ? (5 - $currentPage) : 0);
+			$i = 1;
 			while ($i < 10 && ($currentPage + $offset <= $numPages)) {
 				if ($currentPage == $currentPage + $offset)
 					$nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset, true);
 				else
 					$nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset);
-				$i ++;
-				$offset ++;
+				$i++;
+				$offset++;
 			}
 			if ($currentPage < $numPages) {
-				$nav .= $this->createPageLink($currentURL, $currentPage +1, '&gt;&gt;');
+				$nav .= $this->createPageLink($currentURL, $currentPage + 1, '&gt;&gt;');
 			}
 			if ($currentPage != $numPages) {
 				$nav .= $this->createPageLink($currentURL, $numPages, $_lang["pagination_table_last"]);
 			}
 		}
-		$this->pageNav= ' '.$nav;
+		$this->pageNav = ' '.$nav;
 	}
 
 	/**
@@ -457,13 +457,13 @@ 
 	 * @param $currentPage Indicates if the link is to the current page.
 	 * @param $qs And optional query string to be appended to the link.
 	 */
-    public function createPageLink($link='', $pageNum, $displayText, $currentPage=false, $qs='') {
+    public function createPageLink($link = '', $pageNum, $displayText, $currentPage = false, $qs = ''){
 		global $modx;
-		$orderBy= !empty($_GET['orderby'])? '&orderby=' . $_GET['orderby']: '';
-		$orderDir= !empty($_GET['orderdir'])? '&orderdir=' . $_GET['orderdir']: '';
-		if (!empty($qs)) $qs= "?$qs";
-		$link= empty($link)? $modx->makeUrl($modx->documentIdentifier, $modx->documentObject['alias'], $qs . "page=$pageNum$orderBy$orderDir"): $this->prepareLink($link) . "page=$pageNum";
-		$nav .= '<li'.($currentPage? ' class="currentPage"': '').'><a'.($currentPage? ' class="currentPage"': '').' href="'.$link.'">'.$displayText.'</a></li>'."\n";
+		$orderBy = !empty($_GET['orderby']) ? '&orderby='.$_GET['orderby'] : '';
+		$orderDir = !empty($_GET['orderdir']) ? '&orderdir='.$_GET['orderdir'] : '';
+		if (!empty($qs)) $qs = "?$qs";
+		$link = empty($link) ? $modx->makeUrl($modx->documentIdentifier, $modx->documentObject['alias'], $qs."page=$pageNum$orderBy$orderDir") : $this->prepareLink($link)."page=$pageNum";
+		$nav .= '<li'.($currentPage ? ' class="currentPage"' : '').'><a'.($currentPage ? ' class="currentPage"' : '').' href="'.$link.'">'.$displayText.'</a></li>'."\n";
 		return $nav;
 	}
 
@@ -474,10 +474,10 @@ 
 	 * @param $isChecked Indicates if the checked attribute should apply to the
 	 * element.
 	 */
-    public function addFormField($value, $isChecked) {
+    public function addFormField($value, $isChecked){
 		if ($this->formElementType) {
-			$checked= $isChecked? "checked ": "";
-			$field= "\t\t".'<td><input type="'.$this->formElementType.'" name="'. ($this->formElementName ? $this->formElementName : $value).'"  value="'.$value.'" '.$checked.'/></td>'."\n";
+			$checked = $isChecked ? "checked " : "";
+			$field = "\t\t".'<td><input type="'.$this->formElementType.'" name="'.($this->formElementName ? $this->formElementName : $value).'"  value="'.$value.'" '.$checked.'/></td>'."\n";
 		}
 		return $field;
 	}
@@ -486,9 +486,9 @@ 
 	 * Generates the proper LIMIT clause for queries to retrieve paged results in
 	 * a MakeTable $fieldsArray.
 	 */
-    public function handlePaging() {
-		$offset= (is_numeric($_GET['page']) && $_GET['page'] > 0) ? $_GET['page'] - 1 : 0;
-		$limitClause= ' LIMIT '. ($offset * MAX_DISPLAY_RECORDS_NUM).', '.MAX_DISPLAY_RECORDS_NUM;
+    public function handlePaging(){
+		$offset = (is_numeric($_GET['page']) && $_GET['page'] > 0) ? $_GET['page'] - 1 : 0;
+		$limitClause = ' LIMIT '.($offset * MAX_DISPLAY_RECORDS_NUM).', '.MAX_DISPLAY_RECORDS_NUM;
 		return $limitClause;
 	}
 
@@ -498,12 +498,12 @@ 
 	 *
 	 * @param $natural_order If true, the results are returned in natural order.
 	 */
-    public function handleSorting($natural_order=false) {
-		$orderByClause= '';
+    public function handleSorting($natural_order = false){
+		$orderByClause = '';
 		if (!$natural_order) {
-			$orderby= !empty($_GET['orderby'])? $_GET['orderby']: "id";
-			$orderdir= !empty($_GET['orderdir'])? $_GET['orderdir']: "DESC";
-			$orderbyClause= !empty($orderby)? ' ORDER BY ' . $orderby . ' ' . $orderdir . ' ': "";
+			$orderby = !empty($_GET['orderby']) ? $_GET['orderby'] : "id";
+			$orderdir = !empty($_GET['orderdir']) ? $_GET['orderdir'] : "DESC";
+			$orderbyClause = !empty($orderby) ? ' ORDER BY '.$orderby.' '.$orderdir.' ' : "";
 		}
 		return $orderbyClause;
 	}
@@ -516,15 +516,15 @@ 
 	 * @param $text The text for the link (e.g. table column header).
 	 * @param $qs An optional query string to append to the order by link.
 	 */
-    public function prepareOrderByLink($key, $text, $qs='') {
+    public function prepareOrderByLink($key, $text, $qs = ''){
 		global $modx;
 		if (!empty($_GET['orderdir'])) {
-			$orderDir= strtolower($_GET['orderdir'])=='desc'? '&orderdir=asc': '&orderdir=desc';
+			$orderDir = strtolower($_GET['orderdir']) == 'desc' ? '&orderdir=asc' : '&orderdir=desc';
 		} else {
-			$orderDir= '&orderdir=asc';
+			$orderDir = '&orderdir=asc';
 		}
 		if (!empty($qs)) {
-			if (!strrpos($qs, '&')==strlen($qs)-1) $qs.= '&';
+			if (!strrpos($qs, '&') == strlen($qs) - 1) $qs .= '&';
 		}
 		return '<a href="[~'.$modx->documentIdentifier.'~]?'.$qs.'orderby='.$key.$orderDir.'">'.$text.'</a>';
 	}

manager/includes/extenders/modifiers/mdf_moduser.inc.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-$userid = (int)$value;
+$userid = (int) $value;
 if (!isset($modx->filter->cache['ui'][$userid])) {
     if ($userid < 0) $user = $modx->getWebUserInfo(abs($userid));
     else             $user = $modx->getUserInfo($userid);

manager/includes/extenders/modifiers/mdf_summary.inc.php

Spacing +19 added lines, -19 removed lines

@@ -1,43 +1,43 @@
 <?php
-if(strpos($opt,',')) list($limit,$delim) = explode(',', $opt);
-elseif(preg_match('/^[1-9][0-9]*$/',$opt)) {$limit=$opt;$delim='';}
-else {$limit=124;$delim='';}
+if (strpos($opt, ',')) list($limit, $delim) = explode(',', $opt);
+elseif (preg_match('/^[1-9][0-9]*$/', $opt)) {$limit = $opt; $delim = ''; }
+else {$limit = 124; $delim = ''; }
 
-if($delim==='') $delim = $modx->config['manager_language']==='japanese-utf8' ? '。' : '.';
-$limit = (int)$limit;
+if ($delim === '') $delim = $modx->config['manager_language'] === 'japanese-utf8' ? '。' : '.';
+$limit = (int) $limit;
 
 $content = $modx->filter->parseDocumentSource($value);
 
 $content = strip_tags($content);
 
-$content = str_replace(array("\r\n","\r","\n","\t",'&nbsp;'),' ',$content);
-if(preg_match('/\s+/',$content))
-    $content = preg_replace('/\s+/',' ',$content);
+$content = str_replace(array("\r\n", "\r", "\n", "\t", '&nbsp;'), ' ', $content);
+if (preg_match('/\s+/', $content))
+    $content = preg_replace('/\s+/', ' ', $content);
 $content = trim($content);
 
 $pos = $modx->filter->strpos($content, $delim);
 
-if($pos!==false && $pos<$limit) {
+if ($pos !== false && $pos < $limit) {
     $_ = explode($delim, $content);
     $text = '';
-    foreach($_ as $v) {
-        if($limit <= $modx->filter->strlen($text.$v.$delim)) break;
+    foreach ($_ as $v) {
+        if ($limit <= $modx->filter->strlen($text.$v.$delim)) break;
         $text .= $v.$delim;
     }
-    if($text) $content = $text;
+    if ($text) $content = $text;
 }
 
-if($limit<$modx->filter->strlen($content) && strpos($content,' ')!==false) {
+if ($limit < $modx->filter->strlen($content) && strpos($content, ' ') !== false) {
     $_ = explode(' ', $content);
     $text = '';
-    foreach($_ as $v) {
-        if($limit <= $modx->filter->strlen($text.$v.' ')) break;
-        $text .= $v . ' ';
+    foreach ($_ as $v) {
+        if ($limit <= $modx->filter->strlen($text.$v.' ')) break;
+        $text .= $v.' ';
     }
-    if($text!=='') $content = $text;
+    if ($text !== '') $content = $text;
 }
 
-if($limit < $modx->filter->strlen($content)) $content = $modx->filter->substr($content, 0, $limit);
-if($modx->filter->substr($content,-1)==$delim) $content = rtrim($content,$delim) . $delim;
+if ($limit < $modx->filter->strlen($content)) $content = $modx->filter->substr($content, 0, $limit);
+if ($modx->filter->substr($content, -1) == $delim) $content = rtrim($content, $delim).$delim;
 
 return $content;

manager/includes/extenders/modxmailer.class.inc.php

Spacing +19 added lines, -19 removed lines

@@ -11,9 +11,9 @@ 
 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\Exception as PHPMailerException;
 
-require MODX_MANAGER_PATH . 'includes/controls/phpmailer/Exception.php';
-require MODX_MANAGER_PATH . 'includes/controls/phpmailer/PHPMailer.php';
-require MODX_MANAGER_PATH . 'includes/controls/phpmailer/SMTP.php';
+require MODX_MANAGER_PATH.'includes/controls/phpmailer/Exception.php';
+require MODX_MANAGER_PATH.'includes/controls/phpmailer/PHPMailer.php';
+require MODX_MANAGER_PATH.'includes/controls/phpmailer/SMTP.php';
 
 /**
  * Class MODxMailer
@@ -35,7 +35,7 @@ 
     public function init(DocumentParser $modx)
     {
         $this->modx = $modx;
-        $this->PluginDir = MODX_MANAGER_PATH . 'includes/controls/phpmailer/';
+        $this->PluginDir = MODX_MANAGER_PATH.'includes/controls/phpmailer/';
 
         switch ($modx->config['email_method']) {
             case 'smtp':
@@ -99,7 +99,7 @@ 
             mb_language($this->mb_language);
             mb_internal_encoding($modx->config['modx_charset']);
         }
-        $exconf = MODX_MANAGER_PATH . 'includes/controls/phpmailer/config.inc.php';
+        $exconf = MODX_MANAGER_PATH.'includes/controls/phpmailer/config.inc.php';
         if (is_file($exconf)) {
             include($exconf);
         }
@@ -167,12 +167,12 @@ 
         }
 
         if ($this->modx->debug) {
-            $debug_info = 'CharSet = ' . $this->CharSet . "\n";
-            $debug_info .= 'Encoding = ' . $this->Encoding . "\n";
-            $debug_info .= 'mb_language = ' . $this->mb_language . "\n";
-            $debug_info .= 'encode_header_method = ' . $this->encode_header_method . "\n";
+            $debug_info = 'CharSet = '.$this->CharSet."\n";
+            $debug_info .= 'Encoding = '.$this->Encoding."\n";
+            $debug_info .= 'mb_language = '.$this->mb_language."\n";
+            $debug_info .= 'encode_header_method = '.$this->encode_header_method."\n";
             $debug_info .= "send_mode = {$mode}\n";
-            $debug_info .= 'Subject = ' . $this->Subject . "\n";
+            $debug_info .= 'Subject = '.$this->Subject."\n";
             $log = "<pre>{$debug_info}\n{$header}\n{$org_body}</pre>";
             $this->modx->logEvent(1, 1, $log, 'MODxMailer debug information');
 
@@ -236,7 +236,7 @@ 
             ini_set('sendmail_from', $old_from);
         }
         if (!$rt) {
-            $msg = $this->Lang('instantiate') . "<br />\n";
+            $msg = $this->Lang('instantiate')."<br />\n";
             $msg .= "{$this->Subject}<br />\n";
             $msg .= "{$this->FromName}&lt;{$this->From}&gt;<br />\n";
             $msg .= mb_convert_encoding($body, $this->modx->config['modx_charset'], $this->CharSet);
@@ -255,7 +255,7 @@ 
      */
     public function SetError($msg)
     {
-        $msg .= '<pre>' . print_r(get_object_vars($this), true) . '</pre>';
+        $msg .= '<pre>'.print_r(get_object_vars($this), true).'</pre>';
         $this->modx->config['send_errormail'] = '0';
         $this->modx->logEvent(0, 3, $msg, 'phpmailer');
 
@@ -284,14 +284,14 @@ 
     /**
      * @return string
      */
-    public function getMIMEHeader() {
+    public function getMIMEHeader(){
         return $this->MIMEHeader;
     }
 
     /**
      * @return string
      */
-    public function getMIMEBody() {
+    public function getMIMEBody(){
         return $this->MIMEBody;
     }
 
@@ -300,7 +300,7 @@ 
      *
      * @return $this
      */
-    public function setMIMEHeader($header = '') {
+    public function setMIMEHeader($header = ''){
         $this->MIMEHeader = $header;
 
         return $this;
@@ -311,7 +311,7 @@ 
      *
      * @return $this
      */
-    public function setMIMEBody($body = '') {
+    public function setMIMEBody($body = ''){
         $this->MIMEBody = $body;
 
         return $this;
@@ -322,7 +322,7 @@ 
      *
      * @return $this
      */
-    public function setMailHeader($header = '') {
+    public function setMailHeader($header = ''){
         $this->mailHeader = $header;
 
         return $this;
@@ -331,7 +331,7 @@ 
     /**
      * @return string
      */
-    public function getMessageID() {
-        return trim($this->lastMessageID,'<>');
+    public function getMessageID(){
+        return trim($this->lastMessageID, '<>');
     }
 }

manager/includes/extenders/dbapi.mysql.class.inc.php

Spacing +25 added lines, -25 removed lines

@@ -30,7 +30,7 @@ 
         $pre = null,
         $charset = '',
         $connection_method = 'SET CHARACTER SET'
-    ) {
+    ){
         $this->config['host'] = $host ? $host : $GLOBALS['database_server'];
         $this->config['dbase'] = $dbase ? $dbase : $GLOBALS['dbase'];
         $this->config['user'] = $uid ? $uid : $GLOBALS['database_user'];
@@ -120,7 +120,7 @@ 
                         $referer = $modx->htmlspecialchars($_SERVER['HTTP_REFERER']);
 
                         $modx->sendmail(array(
-                                'subject' => 'Missing to create the database connection! from ' . $modx->config['site_name'],
+                                'subject' => 'Missing to create the database connection! from '.$modx->config['site_name'],
                                 'body'    => "{$logtitle}\n{$request_uri}\n{$ua}\n{$referer}",
                                 'type'    => 'text'
                             )
@@ -137,15 +137,15 @@ 
         } else {
             $dbase = trim($dbase, '`'); // remove the `` chars
             if (!@ mysql_select_db($dbase, $this->conn)) {
-                $modx->messageQuit("Failed to select the database '" . $dbase . "'!");
+                $modx->messageQuit("Failed to select the database '".$dbase."'!");
                 exit;
             }
             @mysql_query("{$connection_method} {$charset}", $this->conn);
             $tend = $modx->getMicroTime();
             $totaltime = $tend - $tstart;
             if ($modx->dumpSQL) {
-                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Database connection</legend>" . sprintf("Database connection was created in %2.4f s",
-                        $totaltime) . "</fieldset><br />";
+                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Database connection</legend>".sprintf("Database connection was created in %2.4f s",
+                        $totaltime)."</fieldset><br />";
             }
             if (function_exists('mysql_set_charset')) {
                 mysql_set_charset($this->config['charset']);
@@ -225,7 +225,7 @@ 
                 case 1091:
                     break;
                 default:
-                    $modx->messageQuit('Execution of a query to the database failed - ' . $this->getLastError(), $sql);
+                    $modx->messageQuit('Execution of a query to the database failed - '.$this->getLastError(), $sql);
             }
         } else {
             $tend = $modx->getMicroTime();
@@ -239,24 +239,24 @@ 
                     $debug_path[] = $line['function'];
                 }
                 $debug_path = implode(' > ', array_reverse($debug_path));
-                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Query " . ($modx->executedQueries + 1) . " - " . sprintf("%2.2f ms",
-                        $totaltime * 1000) . "</legend>";
-                $modx->queryCode .= $sql . '<br><br>';
+                $modx->queryCode .= "<fieldset style='text-align:left'><legend>Query ".($modx->executedQueries + 1)." - ".sprintf("%2.2f ms",
+                        $totaltime * 1000)."</legend>";
+                $modx->queryCode .= $sql.'<br><br>';
                 if ($modx->event->name) {
-                    $modx->queryCode .= 'Current Event  => ' . $modx->event->name . '<br>';
+                    $modx->queryCode .= 'Current Event  => '.$modx->event->name.'<br>';
                 }
                 if ($modx->event->activePlugin) {
-                    $modx->queryCode .= 'Current Plugin => ' . $modx->event->activePlugin . '<br>';
+                    $modx->queryCode .= 'Current Plugin => '.$modx->event->activePlugin.'<br>';
                 }
                 if ($modx->currentSnippet) {
-                    $modx->queryCode .= 'Current Snippet => ' . $modx->currentSnippet . '<br>';
+                    $modx->queryCode .= 'Current Snippet => '.$modx->currentSnippet.'<br>';
                 }
                 if (stripos($sql, 'select') === 0) {
-                    $modx->queryCode .= 'Record Count => ' . $this->getRecordCount($result) . '<br>';
+                    $modx->queryCode .= 'Record Count => '.$this->getRecordCount($result).'<br>';
                 } else {
-                    $modx->queryCode .= 'Affected Rows => ' . $this->getAffectedRows() . '<br>';
+                    $modx->queryCode .= 'Affected Rows => '.$this->getAffectedRows().'<br>';
                 }
-                $modx->queryCode .= 'Functions Path => ' . $debug_path . '<br>';
+                $modx->queryCode .= 'Functions Path => '.$debug_path.'<br>';
                 $modx->queryCode .= "</fieldset><br />";
             }
             $modx->executedQueries = $modx->executedQueries + 1;
@@ -350,9 +350,9 @@ 
                     if (is_null($value) || strtolower($value) === 'null') {
                         $flds = 'NULL';
                     } else {
-                        $flds = "'" . $value . "'";
+                        $flds = "'".$value."'";
                     }
-                    $fields[$key] = "`{$key}` = " . $flds;
+                    $fields[$key] = "`{$key}` = ".$flds;
                 }
                 $fields = implode(",", $fields);
             }
@@ -380,13 +380,13 @@ 
                 $this->query("INSERT INTO {$intotable} {$fields}");
             } else {
                 if (empty($fromtable)) {
-                    $fields = "(`" . implode("`, `", array_keys($fields)) . "`) VALUES('" . implode("', '",
-                            array_values($fields)) . "')";
+                    $fields = "(`".implode("`, `", array_keys($fields))."`) VALUES('".implode("', '",
+                            array_values($fields))."')";
                     $rt = $this->query("INSERT INTO {$intotable} {$fields}");
                 } else {
                     if (version_compare($this->getVersion(), "4.0.14") >= 0) {
                         $fromtable = $this->replaceFullTableName($fromtable);
-                        $fields = "(" . implode(",", array_keys($fields)) . ")";
+                        $fields = "(".implode(",", array_keys($fields)).")";
                         $where = trim($where);
                         $limit = trim($limit);
                         if ($where !== '' && stripos($where, 'WHERE') !== 0) {
@@ -399,8 +399,8 @@ 
                     } else {
                         $ds = $this->select($fromfields, $fromtable, $where, '', $limit);
                         while ($row = $this->getRow($ds)) {
-                            $fields = "(" . implode(",", array_keys($fields)) . ") VALUES('" . implode("', '",
-                                    $row) . "')";
+                            $fields = "(".implode(",", array_keys($fields)).") VALUES('".implode("', '",
+                                    $row)."')";
                             $rt = $this->query("INSERT INTO {$intotable} {$fields}");
                         }
                     }
@@ -485,7 +485,7 @@ 
     public function getInsertId($conn = null)
     {
         if (!is_resource($conn)) {
-            $conn =& $this->conn;
+            $conn = & $this->conn;
         }
 
         return mysql_insert_id($conn);
@@ -498,7 +498,7 @@ 
     public function getAffectedRows($conn = null)
     {
         if (!is_resource($conn)) {
-            $conn =& $this->conn;
+            $conn = & $this->conn;
         }
 
         return mysql_affected_rows($conn);
@@ -511,7 +511,7 @@ 
     public function getLastError($conn = null)
     {
         if (!is_resource($conn)) {
-            $conn =& $this->conn;
+            $conn = & $this->conn;
         }
 
         return mysql_error($conn);

manager/includes/extenders/deprecated.functions.inc.php

Spacing +54 added lines, -54 removed lines

@@ -1,43 +1,43 @@ 
 <?php
 $this->old = new OldFunctions();
-class OldFunctions {
+class OldFunctions{
 
-    public function dbConnect()                 {global $modx;       $modx->db->connect();$modx->rs = $modx->db->conn;}
-    public function dbQuery($sql)               {global $modx;return $modx->db->query($sql);}
-    public function recordCount($rs)            {global $modx;return $modx->db->getRecordCount($rs);}
-    public function fetchRow($rs,$mode='assoc') {global $modx;return $modx->db->getRow($rs, $mode);}
-    public function affectedRows($rs)           {global $modx;return $modx->db->getAffectedRows($rs);}
-    public function insertId($rs)               {global $modx;return $modx->db->getInsertId($rs);}
-    public function dbClose()                   {global $modx;       $modx->db->disconnect();}
+    public function dbConnect(){global $modx; $modx->db->connect(); $modx->rs = $modx->db->conn; }
+    public function dbQuery($sql){global $modx; return $modx->db->query($sql); }
+    public function recordCount($rs){global $modx; return $modx->db->getRecordCount($rs); }
+    public function fetchRow($rs, $mode = 'assoc'){global $modx; return $modx->db->getRow($rs, $mode); }
+    public function affectedRows($rs){global $modx; return $modx->db->getAffectedRows($rs); }
+    public function insertId($rs){global $modx; return $modx->db->getInsertId($rs); }
+    public function dbClose(){global $modx; $modx->db->disconnect(); }
 
-    public function makeList($array, $ulroot= 'root', $ulprefix= 'sub_', $type= '', $ordered= false, $tablevel= 0) {
+    public function makeList($array, $ulroot = 'root', $ulprefix = 'sub_', $type = '', $ordered = false, $tablevel = 0){
         // first find out whether the value passed is an array
         if (!is_array($array)) {
             return "<ul><li>Bad list</li></ul>";
         }
         if (!empty ($type)) {
-            $typestr= " style='list-style-type: $type'";
+            $typestr = " style='list-style-type: $type'";
         } else {
-            $typestr= "";
+            $typestr = "";
         }
-        $tabs= "";
-        for ($i= 0; $i < $tablevel; $i++) {
+        $tabs = "";
+        for ($i = 0; $i < $tablevel; $i++) {
             $tabs .= "\t";
         }
-        $listhtml= $ordered == true ? $tabs . "<ol class='$ulroot'$typestr>\n" : $tabs . "<ul class='$ulroot'$typestr>\n";
+        $listhtml = $ordered == true ? $tabs."<ol class='$ulroot'$typestr>\n" : $tabs."<ul class='$ulroot'$typestr>\n";
         foreach ($array as $key => $value) {
             if (is_array($value)) {
-                $listhtml .= $tabs . "\t<li>" . $key . "\n" . $this->makeList($value, $ulprefix . $ulroot, $ulprefix, $type, $ordered, $tablevel +2) . $tabs . "\t</li>\n";
+                $listhtml .= $tabs."\t<li>".$key."\n".$this->makeList($value, $ulprefix.$ulroot, $ulprefix, $type, $ordered, $tablevel + 2).$tabs."\t</li>\n";
             } else {
-                $listhtml .= $tabs . "\t<li>" . $value . "</li>\n";
+                $listhtml .= $tabs."\t<li>".$value."</li>\n";
             }
         }
-        $listhtml .= $ordered == true ? $tabs . "</ol>\n" : $tabs . "</ul>\n";
+        $listhtml .= $ordered == true ? $tabs."</ol>\n" : $tabs."</ul>\n";
         return $listhtml;
     }
 
 
-    public function getUserData() {
+    public function getUserData(){
         $client['ip'] = $_SERVER['REMOTE_ADDR'];
         $client['ua'] = $_SERVER['HTTP_USER_AGENT'];
     	return $client;
@@ -45,80 +45,80 @@ 
 
     # Returns true, install or interact when inside manager
     // deprecated
-    public function insideManager() {
-        $m= false;
-        if( defined('IN_MANAGER_MODE') && IN_MANAGER_MODE === true) {
-            $m= true;
+    public function insideManager(){
+        $m = false;
+        if (defined('IN_MANAGER_MODE') && IN_MANAGER_MODE === true) {
+            $m = true;
             if (defined('SNIPPET_INTERACTIVE_MODE') && SNIPPET_INTERACTIVE_MODE == 'true')
-                $m= "interact";
+                $m = "interact";
             else
                 if (defined('SNIPPET_INSTALL_MODE') && SNIPPET_INSTALL_MODE == 'true')
-                    $m= "install";
+                    $m = "install";
         }
         return $m;
     }
 
     // deprecated
-    public function putChunk($chunkName) { // alias name >.<
+    public function putChunk($chunkName){ // alias name >.<
     	global $modx;
         return $modx->getChunk($chunkName);
     }
 
-    public function getDocGroups() {
+    public function getDocGroups(){
     	global $modx;
         return $modx->getUserDocGroups();
     } // deprecated
 
-    public function changePassword($o, $n) {
+    public function changePassword($o, $n){
         return changeWebUserPassword($o, $n);
     } // deprecated
 
-    public function userLoggedIn() {
+    public function userLoggedIn(){
     	global $modx;
-        $userdetails= array ();
+        $userdetails = array();
         if ($modx->isFrontend() && isset ($_SESSION['webValidated'])) {
             // web user
-            $userdetails['loggedIn']= true;
-            $userdetails['id']= $_SESSION['webInternalKey'];
-            $userdetails['username']= $_SESSION['webShortname'];
-            $userdetails['usertype']= 'web'; // added by Raymond
+            $userdetails['loggedIn'] = true;
+            $userdetails['id'] = $_SESSION['webInternalKey'];
+            $userdetails['username'] = $_SESSION['webShortname'];
+            $userdetails['usertype'] = 'web'; // added by Raymond
             return $userdetails;
         } else
             if ($modx->isBackend() && isset ($_SESSION['mgrValidated'])) {
                 // manager user
-                $userdetails['loggedIn']= true;
-                $userdetails['id']= $_SESSION['mgrInternalKey'];
-                $userdetails['username']= $_SESSION['mgrShortname'];
-                $userdetails['usertype']= 'manager'; // added by Raymond
+                $userdetails['loggedIn'] = true;
+                $userdetails['id'] = $_SESSION['mgrInternalKey'];
+                $userdetails['username'] = $_SESSION['mgrShortname'];
+                $userdetails['usertype'] = 'manager'; // added by Raymond
                 return $userdetails;
             } else {
                 return false;
             }
     }
 
-    public function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD) {
+    public function getFormVars($method = "", $prefix = "", $trim = "", $REQUEST_METHOD){
         //  function to retrieve form results into an associative array
     	global $modx;
-        $results= array ();
-        $method= strtoupper($method);
+        $results = array();
+        $method = strtoupper($method);
         if ($method == "")
-            $method= $REQUEST_METHOD;
+            $method = $REQUEST_METHOD;
         if ($method == "POST")
-            $method= & $_POST;
-        elseif ($method == "GET") $method= & $_GET;
+            $method = & $_POST;
+        elseif ($method == "GET") $method = & $_GET;
         else
             return false;
         reset($method);
         foreach ($method as $key => $value) {
             if (($prefix != "") && (substr($key, 0, strlen($prefix)) == $prefix)) {
                 if ($trim) {
-                    $pieces= explode($prefix, $key, 2);
-                    $key= $pieces[1];
-                    $results[$key]= $value;
+                    $pieces = explode($prefix, $key, 2);
+                    $key = $pieces[1];
+                    $results[$key] = $value;
                 } else
-                    $results[$key]= $value;
+                    $results[$key] = $value;
             }
-            elseif ($prefix == "") $results[$key]= $value;
+            elseif ($prefix == "") $results[$key] = $value;
         }
         return $results;
     }
@@ -129,16 +129,16 @@ 
      * @param string $msg Message to show
      * @param string $url URL to redirect to
      */
-    public function webAlert($msg, $url= "") {
+    public function webAlert($msg, $url = ""){
     	global $modx;
-        $msg= addslashes($modx->db->escape($msg));
+        $msg = addslashes($modx->db->escape($msg));
         if (substr(strtolower($url), 0, 11) == "javascript:") {
-            $act= "__WebAlert();";
-            $fnc= "function __WebAlert(){" . substr($url, 11) . "};";
+            $act = "__WebAlert();";
+            $fnc = "function __WebAlert(){".substr($url, 11)."};";
         } else {
-            $act= ($url ? "window.location.href='" . addslashes($url) . "';" : "");
+            $act = ($url ? "window.location.href='".addslashes($url)."';" : "");
         }
-        $html= "<script>$fnc window.setTimeout(\"alert('$msg');$act\",100);</script>";
+        $html = "<script>$fnc window.setTimeout(\"alert('$msg');$act\",100);</script>";
         if ($modx->isFrontend())
             $modx->regClientScript($html);
         else {

manager/includes/extenders/export.class.inc.php

Spacing +59 added lines, -59 removed lines

@@ -16,18 +16,18 @@ 
 	{
 		global $modx;
 
-		if(!defined('MODX_BASE_PATH'))  return false;
+		if (!defined('MODX_BASE_PATH'))  return false;
 		$this->exportstart = $this->get_mtime();
 		$this->count = 0;
 		$this->setUrlMode();
 		$this->generate_mode = 'crawl';
-		$this->targetDir = $modx->config['base_path'] . 'temp/export';
-		if(!isset($this->total)) $this->getTotal();
+		$this->targetDir = $modx->config['base_path'].'temp/export';
+		if (!isset($this->total)) $this->getTotal();
 	}
 
     public function setExportDir($dir)
 	{
-		$dir = str_replace('\\','/',$dir);
+		$dir = str_replace('\\', '/', $dir);
 		$dir = rtrim($dir, '/');
 		$this->targetDir = $dir;
 	}
@@ -44,7 +44,7 @@ 
 	{
 		global $modx;
 
-		if($modx->config['friendly_urls']==0)
+		if ($modx->config['friendly_urls'] == 0)
 		{
 			$modx->config['friendly_urls']  = 1;
 			$modx->config['use_alias_path'] = 1;
@@ -53,13 +53,13 @@ 
 		$modx->config['make_folders'] = '1';
 	}
 
-    public function getTotal($ignore_ids='', $noncache='0')
+    public function getTotal($ignore_ids = '', $noncache = '0')
 	{
 		global $modx;
 		$tbl_site_content = $modx->getFullTableName('site_content');
 
 		$ignore_ids = array_filter(array_map('intval', explode(',', $ignore_ids)));
-		if(count($ignore_ids)>0)
+		if (count($ignore_ids) > 0)
 		{
 			$ignore_ids = "AND NOT id IN ('".implode("','", $ignore_ids)."')";
 		} else {
@@ -70,72 +70,72 @@ 
 
 		$noncache = ($noncache == 1) ? '' : 'AND cacheable=1';
 		$where = "deleted=0 AND ((published=1 AND type='document') OR (isfolder=1)) {$noncache} {$ignore_ids}";
-		$rs  = $modx->db->select('count(id)',$tbl_site_content,$where);
+		$rs = $modx->db->select('count(id)', $tbl_site_content, $where);
 		$this->total = $modx->db->getValue($rs);
 		return $this->total;
 	}
 
-    public function removeDirectoryAll($directory='')
+    public function removeDirectoryAll($directory = '')
 	{
 	    $rs = false;
-		if(empty($directory)) $directory = $this->targetDir;
-		$directory = rtrim($directory,'/');
+		if (empty($directory)) $directory = $this->targetDir;
+		$directory = rtrim($directory, '/');
 		// if the path is not valid or is not a directory ...
-		if(empty($directory)) return false;
-		if(strpos($directory,MODX_BASE_PATH)===false) return $rs;
+		if (empty($directory)) return false;
+		if (strpos($directory, MODX_BASE_PATH) === false) return $rs;
 
-		if(!is_dir($directory))          return $rs;
-		elseif(!is_readable($directory)) return $rs;
+		if (!is_dir($directory))          return $rs;
+		elseif (!is_readable($directory)) return $rs;
 		else
 		{
-			$files = glob($directory . '/*');
-			if(!empty($files))
+			$files = glob($directory.'/*');
+			if (!empty($files))
 			{
-    			foreach($files as $path)
+    			foreach ($files as $path)
     			{
                     $rs = is_dir($path) ? $this->removeDirectoryAll($path) : unlink($path);
     			}
 			}
 		}
-		if($directory !== $this->targetDir) $rs = rmdir($directory);
+		if ($directory !== $this->targetDir) $rs = rmdir($directory);
 
 		return $rs;
 	}
 
     public function makeFile($docid, $filepath)
 	{
-		global  $modx,$_lang;
+		global  $modx, $_lang;
 		$file_permission = octdec($modx->config['new_file_permissions']);
-		if($this->generate_mode==='direct')
+		if ($this->generate_mode === 'direct')
 		{
 			$back_lang = $_lang;
 			$src = $modx->executeParser($docid);
 
 			$_lang = $back_lang;
 		}
-		else $src = $this->curl_get_contents(MODX_SITE_URL . "index.php?id={$docid}");
+		else $src = $this->curl_get_contents(MODX_SITE_URL."index.php?id={$docid}");
 
 
-		if($src !== false)
+		if ($src !== false)
 		{
-			if($this->repl_before!==$this->repl_after) $src = str_replace($this->repl_before,$this->repl_after,$src);
-			$result = file_put_contents($filepath,$src);
-			if($result!==false) @chmod($filepath, $file_permission);
+			if ($this->repl_before !== $this->repl_after) $src = str_replace($this->repl_before, $this->repl_after, $src);
+			$result = file_put_contents($filepath, $src);
+			if ($result !== false) @chmod($filepath, $file_permission);
 
-			if($result !== false) return 'success';
+			if ($result !== false) return 'success';
 			else                  return 'failed_no_write';
 		}
 		else                      return 'failed_no_retrieve';
 	}
 
-    public function getFileName($docid, $alias='', $prefix, $suffix)
+    public function getFileName($docid, $alias = '', $prefix, $suffix)
 	{
 		global $modx;
 
-		if($alias==='') $filename = $prefix.$docid.$suffix;
+		if ($alias === '') $filename = $prefix.$docid.$suffix;
 		else
 		{
-			if($modx->config['suffix_mode']==='1' && strpos($alias, '.')!==false)
+			if ($modx->config['suffix_mode'] === '1' && strpos($alias, '.') !== false)
 			{
 				$suffix = '';
 			}
@@ -144,7 +144,7 @@ 
 		return $filename;
 	}
 
-    public function run($parent=0)
+    public function run($parent = 0)
 	{
 		global $_lang;
 		global $modx;
@@ -152,7 +152,7 @@ 
 		$tbl_site_content = $modx->getFullTableName('site_content');
 
 		$ignore_ids = $this->ignore_ids;
-		$dirpath = $this->targetDir . '/';
+		$dirpath = $this->targetDir.'/';
 
 		$prefix = $modx->config['friendly_url_prefix'];
 		$suffix = $modx->config['friendly_url_suffix'];
@@ -162,36 +162,36 @@ 
 
 		$ph['status'] = 'fail';
 		$ph['msg1']   = $_lang['export_site_failed'];
-		$ph['msg2']   = $_lang["export_site_failed_no_write"] . ' - ' . $dirpath;
-		$msg_failed_no_write    = $this->parsePlaceholder($tpl,$ph);
+		$ph['msg2']   = $_lang["export_site_failed_no_write"].' - '.$dirpath;
+		$msg_failed_no_write    = $this->parsePlaceholder($tpl, $ph);
 
 		$ph['msg2']   = $_lang["export_site_failed_no_retrieve"];
-		$msg_failed_no_retrieve = $this->parsePlaceholder($tpl,$ph);
+		$msg_failed_no_retrieve = $this->parsePlaceholder($tpl, $ph);
 
 		$ph['status'] = 'success';
 		$ph['msg1']   = $_lang['export_site_success'];
 		$ph['msg2']   = '';
-		$msg_success            = $this->parsePlaceholder($tpl,$ph);
+		$msg_success = $this->parsePlaceholder($tpl, $ph);
 
 		$ph['msg2']   = $_lang['export_site_success_skip_doc'];
-		$msg_success_skip_doc = $this->parsePlaceholder($tpl,$ph);
+		$msg_success_skip_doc = $this->parsePlaceholder($tpl, $ph);
 
 		$ph['msg2']   = $_lang['export_site_success_skip_dir'];
-		$msg_success_skip_dir = $this->parsePlaceholder($tpl,$ph);
+		$msg_success_skip_dir = $this->parsePlaceholder($tpl, $ph);
 
 		$fields = "id, alias, pagetitle, isfolder, (content = '' AND template = 0) AS wasNull, published";
-		$noncache = $_POST['includenoncache']==1 ? '' : 'AND cacheable=1';
+		$noncache = $_POST['includenoncache'] == 1 ? '' : 'AND cacheable=1';
 		$where = "parent = '{$parent}' AND deleted=0 AND ((published=1 AND type='document') OR (isfolder=1)) {$noncache} {$ignore_ids}";
-		$rs = $modx->db->select($fields,$tbl_site_content,$where);
+		$rs = $modx->db->select($fields, $tbl_site_content, $where);
 
 		$ph = array();
-		$ph['total']     = $this->total;
+		$ph['total'] = $this->total;
 		$folder_permission = octdec($modx->config['new_folder_permissions']);
-		while($row = $modx->db->getRow($rs))
+		while ($row = $modx->db->getRow($rs))
 		{
 			$this->count++;
             $filename = '';
-			$row['count']     = $this->count;
+			$row['count'] = $this->count;
 			$row['url'] = $modx->makeUrl($row['id']);
 
 			if (!$row['wasNull'])
@@ -200,10 +200,10 @@ 
 				$filename = $dirpath.$docname;
 				if (!is_file($filename))
 				{
-					if($row['published']==='1')
+					if ($row['published'] === '1')
 					{
 						$status = $this->makeFile($row['id'], $filename);
-						switch($status)
+						switch ($status)
 						{
 							case 'failed_no_write'   :
                                                             $row['status'] = $msg_failed_no_write;
@@ -225,11 +225,11 @@ 
 				$row['status'] = $msg_success_skip_dir;
 				$this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
 			}
-			if ($row['isfolder']==='1' && ($modx->config['suffix_mode']!=='1' || strpos($row['alias'],'.')===false))
+			if ($row['isfolder'] === '1' && ($modx->config['suffix_mode'] !== '1' || strpos($row['alias'], '.') === false))
 			{ // needs making a folder
-				$end_dir = ($row['alias']!=='') ? $row['alias'] : $row['id'];
-				$dir_path = $dirpath . $end_dir;
-				if(strpos($dir_path,MODX_BASE_PATH)===false) return FALSE;
+				$end_dir = ($row['alias'] !== '') ? $row['alias'] : $row['id'];
+				$dir_path = $dirpath.$end_dir;
+				if (strpos($dir_path, MODX_BASE_PATH) === false) return FALSE;
 				if (!is_dir($dir_path))
 				{
 					if (is_file($dir_path)) @unlink($dir_path);
@@ -239,9 +239,9 @@ 
 				}
 
 
-				if($modx->config['make_folders']==='1' && $row['published']==='1')
+				if ($modx->config['make_folders'] === '1' && $row['published'] === '1')
 				{
-					if( ! empty($filename) && is_file($filename)) rename($filename,$dir_path . '/index.html');
+					if (!empty($filename) && is_file($filename)) rename($filename, $dir_path.'/index.html');
 				}
 				$this->targetDir = $dir_path;
 				$this->run($row['id']);
@@ -250,16 +250,16 @@ 
 		return implode("\n", $this->output);
 	}
 
-    public function curl_get_contents($url, $timeout = 30 )
+    public function curl_get_contents($url, $timeout = 30)
     {
-    	if(!function_exists('curl_init')) return @file_get_contents($url);
+    	if (!function_exists('curl_init')) return @file_get_contents($url);
 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);    // 0 = DO NOT VERIFY AUTHENTICITY OF SSL-CERT
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);    // 2 = CERT MUST INDICATE BEING CONNECTED TO RIGHT SERVER
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); // 0 = DO NOT VERIFY AUTHENTICITY OF SSL-CERT
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2); // 2 = CERT MUST INDICATE BEING CONNECTED TO RIGHT SERVER
         curl_setopt($ch, CURLOPT_HEADER, false);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true );
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
         curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
         $result = curl_exec($ch);
@@ -267,12 +267,12 @@ 
         return $result;
     }
 
-    public function parsePlaceholder($tpl,$ph=array())
+    public function parsePlaceholder($tpl, $ph = array())
     {
-    	foreach($ph as $k=>$v)
+    	foreach ($ph as $k=>$v)
     	{
     		$k = "[+{$k}+]";
-    		$tpl = str_replace($k,$v,$tpl);
+    		$tpl = str_replace($k, $v, $tpl);
     	}
     	return $tpl;
     }