Inspection of "Dependency Injection" - evolution-cms/evolution - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — develop (#725)

by Agel_Nash

created 2018-06-12 09:37 UTC

Status

Spacing +64 added lines, -64 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

manager/includes/src/Support/MysqlDumper.php 1 patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -73,7 +73,7 @@  discard block
 block discarded – undo
 
         // Set line feed
         $lf = "\n";
-        $tempfile_path = $modx->config['base_path'] . 'assets/backup/temp.php';
+        $tempfile_path = $modx->config['base_path'].'assets/backup/temp.php';
 
         $result = $modx->getDatabase()->query('SHOW TABLES');
         $tables = $this->result2Array(0, $result);
@@ -86,15 +86,15 @@  discard block
 block discarded – undo
 
         // Set header
         $output = "#{$lf}";
-        $output .= "# " . addslashes($modx->config['site_name']) . " Database Dump{$lf}";
+        $output .= "# ".addslashes($modx->config['site_name'])." Database Dump{$lf}";
         $output .= "# MODX Version:{$version['version']}{$lf}";
         $output .= "# {$lf}";
         $output .= "# Host: {$this->database_server}{$lf}";
-        $output .= "# Generation Time: " . $modx->toDateFormat(time()) . $lf;
-        $output .= "# Server version: " . $modx->getDatabase()->getVersion() . $lf;
-        $output .= "# PHP Version: " . phpversion() . $lf;
+        $output .= "# Generation Time: ".$modx->toDateFormat(time()).$lf;
+        $output .= "# Server version: ".$modx->getDatabase()->getVersion().$lf;
+        $output .= "# PHP Version: ".phpversion().$lf;
         $output .= "# Database: `{$this->dbname}`{$lf}";
-        $output .= "# Description: " . trim($_REQUEST['backup_title']) . "{$lf}";
+        $output .= "# Description: ".trim($_REQUEST['backup_title'])."{$lf}";
         $output .= "#";
         file_put_contents($tempfile_path, $output, FILE_APPEND | LOCK_EX);
         $output = '';
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
                 }
             }
             if ($callBack === 'snapshot') {
-                if (!preg_match('@^' . $modx->getDatabase()->config['table_prefix'] . '@', $tblval)) {
+                if (!preg_match('@^'.$modx->getDatabase()->config['table_prefix'].'@', $tblval)) {
                     continue;
                 }
             }
@@ -150,9 +150,9 @@  discard block
 block discarded – undo
                         ), '\\n', $value);
                         $value = "'{$value}'";
                     }
-                    $insertdump .= $value . ',';
+                    $insertdump .= $value.',';
                 }
-                $output .= rtrim($insertdump, ',') . ");\n";
+                $output .= rtrim($insertdump, ',').");\n";
                 if (1048576 < strlen($output)) {
                     file_put_contents($tempfile_path, $output, FILE_APPEND | LOCK_EX);
                     $output = '';

Please login to merge, or discard this patch.

manager/includes/src/Support/ContextMenu.php 1 patch

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

@@ -19,46 +19,46 @@  discard block
 block discarded – undo
 
     public static $cnt;
 
-    public function __construct($id = '', $width = 120, $visible = false) {
+    public function __construct($id = '', $width = 120, $visible = false){
         self::$cnt++;
         $this->html = "";
         $this->visible = $visible ? $visible : false;
-        $this->width = is_numeric($width) ? (int)$width : 120;
-        $this->id = $id ? $id : "cntxMnu" . self::$cnt;    // set id
+        $this->width = is_numeric($width) ? (int) $width : 120;
+        $this->id = $id ? $id : "cntxMnu".self::$cnt; // set id
     }
 
-    public function addItem($text, $action = "", $img = "", $disabled = 0) {
+    public function addItem($text, $action = "", $img = "", $disabled = 0){
         global $base_url, $_style;
-        if($disabled) {
+        if ($disabled) {
             return;
         }
-        if(!$img) {
-            $img = $base_url . $_style['tx'];
+        if (!$img) {
+            $img = $base_url.$_style['tx'];
         }
-        if(substr($action, 0, 3) == "js:") {
+        if (substr($action, 0, 3) == "js:") {
             $action = substr($action, 3);
-        } else if(substr($action, 0, 3) == "hl:") {
-            $action = "window.location.href='" . substr($action, 3) . "'";
+        } else if (substr($action, 0, 3) == "hl:") {
+            $action = "window.location.href='".substr($action, 3)."'";
         } else {
-            $action = "window.location.href='" . $action . "'";
+            $action = "window.location.href='".$action."'";
         }
-        $action = " onmouseover=\"this.className='cntxMnuItemOver';\" onmouseout=\"this.className='cntxMnuItem';\" onclick=\"$action; hideCntxMenu('" . $this->id . "');\"";
-        $this->html .= "<div class='" . ($disabled ? "cntxMnuItemDisabled" : "cntxMnuItem") . "' $action>";
-        if(substr($img, 0, 5) == 'fa fa') {
-            $img = '<i class="' . $img . '"></i>';
-        } else if(substr($img, 0, 1) != '<') {
-            $img = '<img src="' . $img . '" />';
+        $action = " onmouseover=\"this.className='cntxMnuItemOver';\" onmouseout=\"this.className='cntxMnuItem';\" onclick=\"$action; hideCntxMenu('".$this->id."');\"";
+        $this->html .= "<div class='".($disabled ? "cntxMnuItemDisabled" : "cntxMnuItem")."' $action>";
+        if (substr($img, 0, 5) == 'fa fa') {
+            $img = '<i class="'.$img.'"></i>';
+        } else if (substr($img, 0, 1) != '<') {
+            $img = '<img src="'.$img.'" />';
         }
-        $this->html .= $img . '&nbsp;' . $text . '</div>';
+        $this->html .= $img.'&nbsp;'.$text.'</div>';
     }
 
-    public function addSeparator() {
+    public function addSeparator(){
         $this->html .= "
 			<div class='cntxMnuSeparator'></div>
 		";
     }
 
-    public function render() {
+    public function render(){
         $ContextMenuScript = <<<BLOCK
 <script>
 	function getCntxMenu(id) {
@@ -71,12 +71,12 @@  discard block
 block discarded – undo
 </script>
 BLOCK;
 
-        $html = $ContextMenuScript . "<div id='" . $this->id . "' class='contextMenu' style='width:" . $this->width . "px; visibility:" . ($this->visible ? 'visible' : 'hidden') . "'>" . $this->html . "</div>";
+        $html = $ContextMenuScript."<div id='".$this->id."' class='contextMenu' style='width:".$this->width."px; visibility:".($this->visible ? 'visible' : 'hidden')."'>".$this->html."</div>";
         $ContextMenuScript = ""; // reset css
         return $html;
     }
 
-    public function getClientScriptObject() {
-        return "getCntxMenu('" . $this->id . "')";
+    public function getClientScriptObject(){
+        return "getCntxMenu('".$this->id."')";
     }
 }

Please login to merge, or discard this patch.

manager/includes/src/Support/DataSetPager.php 1 patch

Spacing +42 added lines, -42 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

manager/includes/src/Mail.php 1 patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -29,7 +29,7 @@  discard block
 block discarded – undo
     {
         $modx = evolutionCMS();
         $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':
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
             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);
         }
@@ -163,12 +163,12 @@  discard block
 block discarded – undo
         }
 
         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');
 
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
             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);
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
         $classDump = call_user_func('get_object_vars', $this);
         unset($classDump['modx']);
         $this->modx->config['send_errormail'] = '0';
-        $this->modx->logEvent(0, 3, $msg . '<pre>' . print_r($classDump, true) . '</pre>', 'phpmailer');
+        $this->modx->logEvent(0, 3, $msg.'<pre>'.print_r($classDump, true).'</pre>', 'phpmailer');
 
         return parent::SetError($msg);
     }

Please login to merge, or discard this patch.

manager/includes/mutate_settings.ajax.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -6,7 +6,7 @@  discard block
 block discarded – undo
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-require_once(dirname(__FILE__) . '/protect.inc.php');
+require_once(dirname(__FILE__).'/protect.inc.php');
 
 $action = preg_replace('/[^A-Za-z0-9_\-\.\/]/', '', $_POST['action']);
 $lang = preg_replace('/[^A-Za-z0-9_\s\+\-\.\/]/', '', $_POST['lang']);
@@ -23,13 +23,13 @@  discard block
 block discarded – undo
 
 switch (true) {
     case ($action == 'get' && preg_match('/^[A-z0-9_-]+$/',
-            $lang) && file_exists(dirname(__FILE__) . '/lang/' . $lang . '.inc.php')): {
-        include(dirname(__FILE__) . '/lang/' . $lang . '.inc.php');
+            $lang) && file_exists(dirname(__FILE__).'/lang/'.$lang.'.inc.php')): {
+        include(dirname(__FILE__).'/lang/'.$lang.'.inc.php');
         $str = isset($key, $_lang, $_lang[$key]) ? $_lang[$key] : "";
         break;
     }
     case ($action == 'setsetting' && !empty($key) && !empty($value)): {
-        $sql = "REPLACE INTO " . $modx->getFullTableName("system_settings") . " (setting_name, setting_value) VALUES('{$key}', '{$value}');";
+        $sql = "REPLACE INTO ".$modx->getFullTableName("system_settings")." (setting_name, setting_value) VALUES('{$key}', '{$value}');";
         $str = "true";
         $modx->getDatabase()->query($sql);
         $emptyCache = true;

Please login to merge, or discard this patch.

manager/includes/categories.inc.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -34,7 +34,7 @@
 block discarded – undo
     $newCat = $modx->getDatabase()->escape($newCat);
     $cats = $modx->getDatabase()->select('id', $modx->getFullTableName('categories'), "category='{$newCat}'");
     if ($cat = $modx->getDatabase()->getValue($cats)) {
-        return (int)$cat;
+        return (int) $cat;
     }
 
     return 0;

Please login to merge, or discard this patch.

manager/includes/accesscontrol.inc.php 1 patch

Spacing +36 added lines, -36 removed lines patch added patch discarded remove patch

@@ -18,13 +18,13 @@  discard block
 block discarded – undo
 }
 
 // andrazk 20070416 - if installer is running, destroy active sessions
-if (file_exists(MODX_BASE_PATH . 'assets/cache/installProc.inc.php')) {
-    include_once(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
+if (file_exists(MODX_BASE_PATH.'assets/cache/installProc.inc.php')) {
+    include_once(MODX_BASE_PATH.'assets/cache/installProc.inc.php');
     if (isset($installStartTime)) {
         if ((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard
             unset($installStartTime);
-            @ chmod(MODX_BASE_PATH . 'assets/cache/installProc.inc.php', 0755);
-            unlink(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
+            @ chmod(MODX_BASE_PATH.'assets/cache/installProc.inc.php', 0755);
+            unlink(MODX_BASE_PATH.'assets/cache/installProc.inc.php');
         } else {
             if ($_SERVER['REQUEST_METHOD'] != 'POST') {
                 if (isset($_COOKIE[session_name()])) {
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
                         //						setcookie(session_name(), '', 0, MODX_BASE_URL);
                     }
                     header('HTTP/1.0 307 Redirect');
-                    header('Location: ' . MODX_MANAGER_URL . 'index.php?installGoingOn=2');
+                    header('Location: '.MODX_MANAGER_URL.'index.php?installGoingOn=2');
                 }
             }
         }
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
         // establish fallback to English default
         include_once "lang/english.inc.php";
         // include localized overrides
-        include_once "lang/" . $manager_language . ".inc.php";
+        include_once "lang/".$manager_language.".inc.php";
     } else {
         include_once "lang/english.inc.php";
     }
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
     $modx->setPlaceholder('modx_charset', $modx_manager_charset);
     $modx->setPlaceholder('theme', $manager_theme);
     $modx->setPlaceholder('favicon',
-        (file_exists(MODX_BASE_PATH . 'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/' . $modx->config['manager_theme'] . '/images/favicon.ico'));
+        (file_exists(MODX_BASE_PATH.'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/'.$modx->config['manager_theme'].'/images/favicon.ico'));
 
     // invoke OnManagerLoginFormPrerender event
     $evtOut = $modx->invokeEvent('OnManagerLoginFormPrerender');
@@ -81,25 +81,25 @@  discard block
 block discarded – undo
     $modx->setPlaceholder('manager_path', MGR_DIR);
     $modx->setPlaceholder('logo_slogan', $_lang["logo_slogan"]);
     $modx->setPlaceholder('login_message', $_lang["login_message"]);
-    $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/');
+    $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/');
     $modx->setPlaceholder('year', date('Y'));
 
     // set login logo image
-    if ( !empty($modx->config['login_logo']) ) {
-        $modx->setPlaceholder('login_logo', MODX_SITE_URL . $modx->config['login_logo']);
+    if (!empty($modx->config['login_logo'])) {
+        $modx->setPlaceholder('login_logo', MODX_SITE_URL.$modx->config['login_logo']);
     } else {
-        $modx->setPlaceholder('login_logo', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/images/login/default/login-logo.png');
+        $modx->setPlaceholder('login_logo', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/images/login/default/login-logo.png');
     }
 
     // set login background image
-    if ( !empty($modx->config['login_bg']) ) {
-        $modx->setPlaceholder('login_bg', MODX_SITE_URL . $modx->config['login_bg']);
+    if (!empty($modx->config['login_bg'])) {
+        $modx->setPlaceholder('login_bg', MODX_SITE_URL.$modx->config['login_bg']);
     } else {
-        $modx->setPlaceholder('login_bg', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/images/login/default/login-background.jpg');
+        $modx->setPlaceholder('login_bg', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/images/login/default/login-background.jpg');
     }
 
     // set form position css class
-    $modx->setPlaceholder('login_form_position_class', 'loginbox-' . $modx->config['login_form_position']);
+    $modx->setPlaceholder('login_form_position_class', 'loginbox-'.$modx->config['login_form_position']);
 
     switch ($modx->config['manager_theme_mode']) {
       case '1':
@@ -124,11 +124,11 @@  discard block
 block discarded – undo
         switch ($installGoingOn) {
             case 1 :
                 $modx->setPlaceholder('login_message',
-                    "<p><span class=\"fail\">" . $_lang["login_cancelled_install_in_progress"] . "</p><p>" . $_lang["login_message"] . "</p>");
+                    "<p><span class=\"fail\">".$_lang["login_cancelled_install_in_progress"]."</p><p>".$_lang["login_message"]."</p>");
                 break;
             case 2 :
                 $modx->setPlaceholder('login_message',
-                    "<p><span class=\"fail\">" . $_lang["login_cancelled_site_was_updated"] . "</p><p>" . $_lang["login_message"] . "</p>");
+                    "<p><span class=\"fail\">".$_lang["login_cancelled_site_was_updated"]."</p><p>".$_lang["login_message"]."</p>");
                 break;
         }
     }
@@ -136,9 +136,9 @@  discard block
 block discarded – undo
     if ($modx->config['use_captcha'] == 1) {
         $modx->setPlaceholder('login_captcha_message', $_lang["login_captcha_message"]);
         $modx->setPlaceholder('captcha_image',
-            '<a href="' . MODX_MANAGER_URL . '" class="loginCaptcha"><img id="captcha_image" src="' . MODX_MANAGER_URL . 'captcha.php?rand=' . rand() . '" alt="' . $_lang["login_captcha_message"] . '" /></a>');
+            '<a href="'.MODX_MANAGER_URL.'" class="loginCaptcha"><img id="captcha_image" src="'.MODX_MANAGER_URL.'captcha.php?rand='.rand().'" alt="'.$_lang["login_captcha_message"].'" /></a>');
         $modx->setPlaceholder('captcha_input',
-            '<label>' . $_lang["captcha_code"] . '</label> <input type="text" name="captcha_code" tabindex="3" value="" />');
+            '<label>'.$_lang["captcha_code"].'</label> <input type="text" name="captcha_code" tabindex="3" value="" />');
     }
 
     // login info
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
 
     // invoke OnManagerLoginFormRender event
     $evtOut = $modx->invokeEvent('OnManagerLoginFormRender');
-    $html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">' . implode('', $evtOut) . '</div>' : '';
+    $html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">'.implode('', $evtOut).'</div>' : '';
     $modx->setPlaceholder('OnManagerLoginFormRender', $html);
 
     // load template
@@ -174,29 +174,29 @@  discard block
 block discarded – undo
             $login_tpl = file_get_contents($target);
         }
     } else {
-        $theme_path = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/';
-        if (is_file($theme_path . 'style.php')) {
-            include($theme_path . 'style.php');
+        $theme_path = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/';
+        if (is_file($theme_path.'style.php')) {
+            include($theme_path.'style.php');
         }
         $chunk = $modx->getChunk($target);
         if ($chunk !== false && !empty($chunk)) {
             $login_tpl = $chunk;
-        } elseif (is_file(MODX_BASE_PATH . $target)) {
-            $target = MODX_BASE_PATH . $target;
+        } elseif (is_file(MODX_BASE_PATH.$target)) {
+            $target = MODX_BASE_PATH.$target;
             $login_tpl = file_get_contents($target);
         } elseif (is_file($target)) {
             $login_tpl = file_get_contents($target);
-        } elseif (is_file($theme_path . 'login.tpl')) {
-            $target = $theme_path . 'login.tpl';
+        } elseif (is_file($theme_path.'login.tpl')) {
+            $target = $theme_path.'login.tpl';
             $login_tpl = file_get_contents($target);
-        } elseif (is_file($theme_path . 'templates/actions/login.tpl')) {
-            $target = $theme_path . 'templates/actions/login.tpl';
+        } elseif (is_file($theme_path.'templates/actions/login.tpl')) {
+            $target = $theme_path.'templates/actions/login.tpl';
             $login_tpl = file_get_contents($target);
-        } elseif (is_file($theme_path . 'html/login.html')) { // ClipperCMS compatible
-            $target = $theme_path . 'html/login.html';
+        } elseif (is_file($theme_path.'html/login.html')) { // ClipperCMS compatible
+            $target = $theme_path.'html/login.html';
             $login_tpl = file_get_contents($target);
         } else {
-            $target = MODX_MANAGER_PATH . 'media/style/common/login.tpl';
+            $target = MODX_MANAGER_PATH.'media/style/common/login.tpl';
             $login_tpl = file_get_contents($target);
         }
     }
@@ -216,17 +216,17 @@  discard block
 block discarded – undo
     $modx->updateValidatedUserSession();
 
     // Update last action in table active_users
-    $itemid = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : '';
+    $itemid = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : '';
     $lasthittime = time();
-    $action = isset($_REQUEST['a']) ? (int)$_REQUEST['a'] : 1;
+    $action = isset($_REQUEST['a']) ? (int) $_REQUEST['a'] : 1;
 
     if ($action !== 1) {
-        if ((int)$itemid <= 0) {
+        if ((int) $itemid <= 0) {
             $itemid = null;
         }
         $sql = sprintf("REPLACE INTO %s (sid, internalKey, username, lasthit, action, id) VALUES ('%s', %d, '%s', %d, '%s', %s)",
             $modx->getFullTableName('active_users') // Table
-            , session_id(), $modx->getLoginUserID(), $_SESSION['mgrShortname'], $lasthittime, (string)$action,
+            , session_id(), $modx->getLoginUserID(), $_SESSION['mgrShortname'], $lasthittime, (string) $action,
             $itemid == null ? var_export(null, true) : $itemid);
         $modx->getDatabase()->query($sql);
     }

Please login to merge, or discard this patch.

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

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

		@@ -15,10 +15,10 @@ discard block
		block discarded – undo
15	15
16	16	public $ds; // datasource
17	17	public $id;
18		- public $pageSize; // pager settings
	18	+ public $pageSize; // pager settings
19	19	public $pageNumber;
20	20	public $pager;
21		- public $pagerLocation; // top-right, top-left, bottom-left, bottom-right, both-left, both-right
	21	+ public $pagerLocation; // top-right, top-left, bottom-left, bottom-right, both-left, both-right
22	22
23	23	public $cssStyle;
24	24	public $cssClass;
		@@ -36,7 +36,7 @@ discard block
		block discarded – undo
36	36	public $colAligns;
37	37	public $colWraps;
38	38	public $colColors;
39		- public $colTypes; // coltype1, coltype2, etc or coltype1:format1, e.g. date:%Y %m
	39	+ public $colTypes; // coltype1, coltype2, etc or coltype1:format1, e.g. date:%Y %m
40	40	// data type: integer,float,currency,date
41	41
42	42	public $header;
		@@ -44,7 +44,7 @@ discard block
		block discarded – undo
44	44	public $cellPadding;
45	45	public $cellSpacing;
46	46
47		- public $rowAlign; // vertical alignment: top, middle, bottom
	47	+ public $rowAlign; // vertical alignment: top, middle, bottom
48	48	public $rowIdField;
49	49
50	50	public $pagerStyle;
		@@ -75,10 +75,10 @@ discard block
		block discarded – undo
75	75
76	76	public static $dataGridCnt;
77	77
78		- public function __construct($id, $ds, $pageSize = 20, $pageNumber = -1) {
	78	+ public function __construct($id, $ds, $pageSize = 20, $pageNumber = -1){
79	79	// set id
80	80	self::$dataGridCnt++;
81		- $this->id = $this->id ? empty($id) : "dg" . self::$dataGridCnt;
	81	+ $this->id = $this->id ? empty($id) : "dg".self::$dataGridCnt;
82	82
83	83	// set datasource
84	84	$this->ds = $ds;
		@@ -89,50 +89,50 @@ discard block
		block discarded – undo
89	89	$this->pagerLocation = 'top-right';
90	90	}
91	91
92		- public function setDataSource($ds) {
	92	+ public function setDataSource($ds){
93	93	$this->ds = $ds;
94	94	}
95	95
96		- public function render() {
	96	+ public function render(){
97	97	$modx = evolutionCMS();
98		- $columnHeaderStyle = ($this->columnHeaderStyle) ? "style='" . $this->columnHeaderStyle . "'" : '';
99		- $columnHeaderClass = ($this->columnHeaderClass) ? "class='" . $this->columnHeaderClass . "'" : "";
100		- $cssStyle = ($this->cssStyle) ? "style='" . $this->cssStyle . "'" : '';
101		- $cssClass = ($this->cssClass) ? "class='" . $this->cssClass . "'" : '';
	98	+ $columnHeaderStyle = ($this->columnHeaderStyle) ? "style='".$this->columnHeaderStyle."'" : '';
	99	+ $columnHeaderClass = ($this->columnHeaderClass) ? "class='".$this->columnHeaderClass."'" : "";
	100	+ $cssStyle = ($this->cssStyle) ? "style='".$this->cssStyle."'" : '';
	101	+ $cssClass = ($this->cssClass) ? "class='".$this->cssClass."'" : '';
102	102
103		- $pagerClass = ($this->pagerClass) ? "class='" . $this->pagerClass . "'" : '';
104		- $pagerStyle = ($this->pagerStyle) ? "style='" . $this->pagerStyle . "'" : "style='background-color:#ffffff;'";
	103	+ $pagerClass = ($this->pagerClass) ? "class='".$this->pagerClass."'" : '';
	104	+ $pagerStyle = ($this->pagerStyle) ? "style='".$this->pagerStyle."'" : "style='background-color:#ffffff;'";
105	105
106		- $this->_itemStyle = ($this->itemStyle) ? "style='" . $this->itemStyle . "'" : '';
107		- $this->_itemClass = ($this->itemClass) ? "class='" . $this->itemClass . "'" : '';
108		- $this->_altItemStyle = ($this->altItemStyle) ? "style='" . $this->altItemStyle . "'" : '';
109		- $this->_altItemClass = ($this->altItemClass) ? "class='" . $this->altItemClass . "'" : '';
	106	+ $this->_itemStyle = ($this->itemStyle) ? "style='".$this->itemStyle."'" : '';
	107	+ $this->_itemClass = ($this->itemClass) ? "class='".$this->itemClass."'" : '';
	108	+ $this->_altItemStyle = ($this->altItemStyle) ? "style='".$this->altItemStyle."'" : '';
	109	+ $this->_altItemClass = ($this->altItemClass) ? "class='".$this->altItemClass."'" : '';
110	110
111	111	$this->_alt = 0;
112	112	$this->_total = 0;
113	113
114	114	$this->_isDataset = $modx->getDatabase()->isResult($this->ds); // if not dataset then treat as array
115	115
116		- if(!$cssStyle && !$cssClass) {
	116	+ if (!$cssStyle && !$cssClass) {
117	117	$cssStyle = "style='width:100%;border:1px solid silver;font-family:verdana,arial; font-size:11px;'";
118	118	}
119		- if(!$columnHeaderStyle && !$columnHeaderClass) {
	119	+ if (!$columnHeaderStyle && !$columnHeaderClass) {
120	120	$columnHeaderStyle = "style='color:black;background-color:silver'";
121	121	}
122		- if(!$this->_itemStyle && !$this->_itemClass) {
	122	+ if (!$this->_itemStyle && !$this->_itemClass) {
123	123	$this->_itemStyle = "style='color:black;'";
124	124	}
125		- if(!$this->_altItemStyle && !$this->_altItemClass) {
	125	+ if (!$this->_altItemStyle && !$this->_altItemClass) {
126	126	$this->_altItemStyle = "style='color:black;background-color:#eeeeee'";
127	127	}
128	128
129		- if($this->_isDataset && !$this->columns) {
	129	+ if ($this->_isDataset && !$this->columns) {
130	130	$cols = $modx->getDatabase()->numFields($this->ds);
131		- for($i = 0; $i < $cols; $i++) $this->columns .= ($i ? "," : "") . $modx->getDatabase()->fieldName($this->ds, $i);
	131	+ for ($i = 0; $i < $cols; $i++) $this->columns .= ($i ? "," : "").$modx->getDatabase()->fieldName($this->ds, $i);
132	132	}
133	133
134	134	// start grid
135		- $tblStart = "<table $cssClass $cssStyle cellpadding='" . (isset($this->cellPadding) ? (int) $this->cellPadding : 1) . "' cellspacing='" . (isset($this->cellSpacing) ? (int) $this->cellSpacing : 1) . "'>";
	135	+ $tblStart = "<table $cssClass $cssStyle cellpadding='".(isset($this->cellPadding) ? (int) $this->cellPadding : 1)."' cellspacing='".(isset($this->cellSpacing) ? (int) $this->cellSpacing : 1)."'>";
136	136	$tblEnd = "</table>";
137	137
138	138	// build column header
		@@ -143,32 +143,32 @@ discard block
		block discarded – undo
143	143	$this->_colcolors = explode((strstr($this->colColors, "\|\|") !== false ? "\|\|" : ","), $this->colColors);
144	144	$this->_coltypes = explode((strstr($this->colTypes, "\|\|") !== false ? "\|\|" : ","), $this->colTypes);
145	145	$this->_colcount = count($this->_colnames);
146		- if(!$this->_isDataset) {
	146	+ if (!$this->_isDataset) {
147	147	$this->ds = explode((strstr($this->ds, "\|\|") !== false ? "\|\|" : ","), $this->ds);
148	148	$this->ds = array_chunk($this->ds, $this->_colcount);
149	149	}
150	150	$tblColHdr = "<thead><tr>";
151		- for($c = 0; $c < $this->_colcount; $c++) {
	151	+ for ($c = 0; $c < $this->_colcount; $c++) {
152	152	$name = $this->_colnames[$c];
153	153	$width = $this->_colwidths[$c];
154		- $tblColHdr .= "<td $columnHeaderStyle $columnHeaderClass" . ($width ? " width='$width'" : "") . ">$name</td>";
	154	+ $tblColHdr .= "<td $columnHeaderStyle $columnHeaderClass".($width ? " width='$width'" : "").">$name</td>";
155	155	}
156	156	$tblColHdr .= "</tr></thead>\n";
157	157
158	158	// build rows
159	159	$rowcount = $this->_isDataset ? $modx->getDatabase()->getRecordCount($this->ds) : count($this->ds);
160	160	$this->_fieldnames = explode(",", $this->fields);
161		- if($rowcount == 0) {
162		- $tblRows .= "<tr><td " . $this->_itemStyle . " " . $this->_itemClass . " colspan='" . $this->_colcount . "'>" . $this->noRecordMsg . "</td></tr>\n";
	161	+ if ($rowcount == 0) {
	162	+ $tblRows .= "<tr><td ".$this->_itemStyle." ".$this->_itemClass." colspan='".$this->_colcount."'>".$this->noRecordMsg."</td></tr>\n";
163	163	} else {
164	164	// render grid items
165		- if($this->pageSize <= 0) {
166		- for($r = 0; $r < $rowcount; $r++) {
	165	+ if ($this->pageSize <= 0) {
	166	+ for ($r = 0; $r < $rowcount; $r++) {
167	167	$row = $this->_isDataset ? $modx->getDatabase()->getRow($this->ds) : $this->ds[$r];
168	168	$tblRows .= $this->RenderRowFnc($r + 1, $row);
169	169	}
170	170	} else {
171		- if(!$this->pager) {
	171	+ if (!$this->pager) {
172	172	$this->pager = new DataSetPager($this->id, $this->ds, $this->pageSize, $this->pageNumber);
173	173	$this->pager->setRenderRowFnc($this); // pass this object
174	174	$this->pager->cssStyle = $pagerStyle;
		@@ -188,18 +188,18 @@ discard block
		block discarded – undo
188	188	$o = $tblStart;
189	189	$ptop = (substr($this->pagerLocation, 0, 3) == "top") \|\| (substr($this->pagerLocation, 0, 4) == "both");
190	190	$pbot = (substr($this->pagerLocation, 0, 3) == "bot") \|\| (substr($this->pagerLocation, 0, 4) == "both");
191		- if($this->header) {
192		- $o .= "<tr><td bgcolor='#ffffff' colspan='" . $this->_colcount . "'>" . $this->header . "</td></tr>";
	191	+ if ($this->header) {
	192	+ $o .= "<tr><td bgcolor='#ffffff' colspan='".$this->_colcount."'>".$this->header."</td></tr>";
193	193	}
194		- if($tblPager && $ptop) {
195		- $o .= "<tr><td align='" . (substr($this->pagerLocation, -4) == "left" ? "left" : "right") . "' $pagerClass $pagerStyle colspan='" . $this->_colcount . "'>" . $tblPager . " </td></tr>";
	194	+ if ($tblPager && $ptop) {
	195	+ $o .= "<tr><td align='".(substr($this->pagerLocation, -4) == "left" ? "left" : "right")."' $pagerClass $pagerStyle colspan='".$this->_colcount."'>".$tblPager." </td></tr>";
196	196	}
197		- $o .= $tblColHdr . $tblRows;
198		- if($tblPager && $pbot) {
199		- $o .= "<tr><td align='" . (substr($this->pagerLocation, -4) == "left" ? "left" : "right") . "' $pagerClass $pagerStyle colspan='" . $this->_colcount . "'>" . $tblPager . " </td></tr>";
	197	+ $o .= $tblColHdr.$tblRows;
	198	+ if ($tblPager && $pbot) {
	199	+ $o .= "<tr><td align='".(substr($this->pagerLocation, -4) == "left" ? "left" : "right")."' $pagerClass $pagerStyle colspan='".$this->_colcount."'>".$tblPager." </td></tr>";
200	200	}
201		- if($this->footer) {
202		- $o .= "<tr><td bgcolor='#ffffff' colspan='" . $this->_colcount . "'>" . $this->footer . "</td></tr>";
	201	+ if ($this->footer) {
	202	+ $o .= "<tr><td bgcolor='#ffffff' colspan='".$this->_colcount."'>".$this->footer."</td></tr>";
203	203	}
204	204	$o .= $tblEnd;
205	205	return $o;
		@@ -207,8 +207,8 @@ discard block
		block discarded – undo
207	207
208	208	// format column values
209	209
210		- public function RenderRowFnc($n, $row) {
211		- if($this->_alt == 0) {
	210	+ public function RenderRowFnc($n, $row){
	211	+ if ($this->_alt == 0) {
212	212	$Style = $this->_itemStyle;
213	213	$Class = $this->_itemClass;
214	214	$this->_alt = 1;
		@@ -218,7 +218,7 @@ discard block
		block discarded – undo
218	218	$this->_alt = 0;
219	219	}
220	220	$o = "<tr>";
221		- for($c = 0; $c < $this->_colcount; $c++) {
	221	+ for ($c = 0; $c < $this->_colcount; $c++) {
222	222	$colStyle = $Style;
223	223	$fld = trim($this->_fieldnames[$c]);
224	224	$width = isset($this->_colwidths[$c]) ? $this->_colwidths[$c] : null;
		@@ -227,67 +227,67 @@ discard block
		block discarded – undo
227	227	$type = isset($this->_coltypes[$c]) ? $this->_coltypes[$c] : null;
228	228	$nowrap = isset($this->_colwraps[$c]) ? $this->_colwraps[$c] : null;
229	229	$value = $row[($this->_isDataset && $fld ? $fld : $c)];
230		- if($color && $Style) {
231		- $colStyle = substr($colStyle, 0, -1) . ";background-color:$color;'";
	230	+ if ($color && $Style) {
	231	+ $colStyle = substr($colStyle, 0, -1).";background-color:$color;'";
232	232	}
233	233	$value = $this->formatColumnValue($row, $value, $type, $align);
234		- $o .= "<td $colStyle $Class" . ($align ? " align='$align'" : "") . ($color ? " bgcolor='$color'" : "") . ($nowrap ? " nowrap='$nowrap'" : "") . ($width ? " width='$width'" : "") . ">$value</td>";
	234	+ $o .= "<td $colStyle $Class".($align ? " align='$align'" : "").($color ? " bgcolor='$color'" : "").($nowrap ? " nowrap='$nowrap'" : "").($width ? " width='$width'" : "").">$value</td>";
235	235	}
236	236	$o .= "</tr>\n";
237	237	return $o;
238	238	}
239	239
240		- public function formatColumnValue($row, $value, $type, &$align) {
241		- if(strpos($type, ":") !== false) {
	240	+ public function formatColumnValue($row, $value, $type, &$align){
	241	+ if (strpos($type, ":") !== false) {
242	242	list($type, $type_format) = explode(":", $type, 2);
243	243	}
244		- switch(strtolower($type)) {
	244	+ switch (strtolower($type)) {
245	245	case "integer":
246		- if($align == "") {
	246	+ if ($align == "") {
247	247	$align = "right";
248	248	}
249	249	$value = number_format($value);
250	250	break;
251	251
252	252	case "float":
253		- if($align == "") {
	253	+ if ($align == "") {
254	254	$align = "right";
255	255	}
256		- if(!$type_format) {
	256	+ if (!$type_format) {
257	257	$type_format = 2;
258	258	}
259	259	$value = number_format($value, $type_format);
260	260	break;
261	261
262	262	case "currency":
263		- if($align == "") {
	263	+ if ($align == "") {
264	264	$align = "right";
265	265	}
266		- if(!$type_format) {
	266	+ if (!$type_format) {
267	267	$type_format = 2;
268	268	}
269		- $value = "$" . number_format($value, $type_format);
	269	+ $value = "$".number_format($value, $type_format);
270	270	break;
271	271
272	272	case "date":
273		- if($align == "") {
	273	+ if ($align == "") {
274	274	$align = "right";
275	275	}
276		- if(!is_numeric($value)) {
	276	+ if (!is_numeric($value)) {
277	277	$value = strtotime($value);
278	278	}
279		- if(!$type_format) {
	279	+ if (!$type_format) {
280	280	$type_format = "%A %d, %B %Y";
281	281	}
282	282	$value = strftime($type_format, $value);
283	283	break;
284	284
285	285	case "boolean":
286		- if($align == '') {
	286	+ if ($align == '') {
287	287	$align = "center";
288	288	}
289	289	$value = number_format($value);
290		- if($value) {
	290	+ if ($value) {
291	291	$value = '•';
292	292	} else {
293	293	$value = ' ';
		@@ -298,8 +298,8 @@ discard block
		block discarded – undo
298	298	// replace [+value+] first
299	299	$value = str_replace("[+value+]", $value, $type_format);
300	300	// replace other [+fields+]
301		- if(strpos($value, "[+") !== false) {
302		- foreach($row as $k => $v) {
	301	+ if (strpos($value, "[+") !== false) {
	302	+ foreach ($row as $k => $v) {
303	303	$value = str_replace("[+$k+]", $v, $value);
304	304	}
305	305	}

		@@ -73,7 +73,7 @@ discard block
		block discarded – undo
73	73
74	74	// Set line feed
75	75	$lf = "\n";
76		- $tempfile_path = $modx->config['base_path'] . 'assets/backup/temp.php';
	76	+ $tempfile_path = $modx->config['base_path'].'assets/backup/temp.php';
77	77
78	78	$result = $modx->getDatabase()->query('SHOW TABLES');
79	79	$tables = $this->result2Array(0, $result);
		@@ -86,15 +86,15 @@ discard block
		block discarded – undo
86	86
87	87	// Set header
88	88	$output = "#{$lf}";
89		- $output .= "# " . addslashes($modx->config['site_name']) . " Database Dump{$lf}";
	89	+ $output .= "# ".addslashes($modx->config['site_name'])." Database Dump{$lf}";
90	90	$output .= "# MODX Version:{$version['version']}{$lf}";
91	91	$output .= "# {$lf}";
92	92	$output .= "# Host: {$this->database_server}{$lf}";
93		- $output .= "# Generation Time: " . $modx->toDateFormat(time()) . $lf;
94		- $output .= "# Server version: " . $modx->getDatabase()->getVersion() . $lf;
95		- $output .= "# PHP Version: " . phpversion() . $lf;
	93	+ $output .= "# Generation Time: ".$modx->toDateFormat(time()).$lf;
	94	+ $output .= "# Server version: ".$modx->getDatabase()->getVersion().$lf;
	95	+ $output .= "# PHP Version: ".phpversion().$lf;
96	96	$output .= "# Database: `{$this->dbname}`{$lf}";
97		- $output .= "# Description: " . trim($_REQUEST['backup_title']) . "{$lf}";
	97	+ $output .= "# Description: ".trim($_REQUEST['backup_title'])."{$lf}";
98	98	$output .= "#";
99	99	file_put_contents($tempfile_path, $output, FILE_APPEND \| LOCK_EX);
100	100	$output = '';
		@@ -113,7 +113,7 @@ discard block
		block discarded – undo
113	113	}
114	114	}
115	115	if ($callBack === 'snapshot') {
116		- if (!preg_match('@^' . $modx->getDatabase()->config['table_prefix'] . '@', $tblval)) {
	116	+ if (!preg_match('@^'.$modx->getDatabase()->config['table_prefix'].'@', $tblval)) {
117	117	continue;
118	118	}
119	119	}
		@@ -150,9 +150,9 @@ discard block
		block discarded – undo
150	150	), '\\n', $value);
151	151	$value = "'{$value}'";
152	152	}
153		- $insertdump .= $value . ',';
	153	+ $insertdump .= $value.',';
154	154	}
155		- $output .= rtrim($insertdump, ',') . ");\n";
	155	+ $output .= rtrim($insertdump, ',').");\n";
156	156	if (1048576 < strlen($output)) {
157	157	file_put_contents($tempfile_path, $output, FILE_APPEND \| LOCK_EX);
158	158	$output = '';

		@@ -19,46 +19,46 @@ discard block
		block discarded – undo
19	19
20	20	public static $cnt;
21	21
22		- public function __construct($id = '', $width = 120, $visible = false) {
	22	+ public function __construct($id = '', $width = 120, $visible = false){
23	23	self::$cnt++;
24	24	$this->html = "";
25	25	$this->visible = $visible ? $visible : false;
26		- $this->width = is_numeric($width) ? (int)$width : 120;
27		- $this->id = $id ? $id : "cntxMnu" . self::$cnt; // set id
	26	+ $this->width = is_numeric($width) ? (int) $width : 120;
	27	+ $this->id = $id ? $id : "cntxMnu".self::$cnt; // set id
28	28	}
29	29
30		- public function addItem($text, $action = "", $img = "", $disabled = 0) {
	30	+ public function addItem($text, $action = "", $img = "", $disabled = 0){
31	31	global $base_url, $_style;
32		- if($disabled) {
	32	+ if ($disabled) {
33	33	return;
34	34	}
35		- if(!$img) {
36		- $img = $base_url . $_style['tx'];
	35	+ if (!$img) {
	36	+ $img = $base_url.$_style['tx'];
37	37	}
38		- if(substr($action, 0, 3) == "js:") {
	38	+ if (substr($action, 0, 3) == "js:") {
39	39	$action = substr($action, 3);
40		- } else if(substr($action, 0, 3) == "hl:") {
41		- $action = "window.location.href='" . substr($action, 3) . "'";
	40	+ } else if (substr($action, 0, 3) == "hl:") {
	41	+ $action = "window.location.href='".substr($action, 3)."'";
42	42	} else {
43		- $action = "window.location.href='" . $action . "'";
	43	+ $action = "window.location.href='".$action."'";
44	44	}
45		- $action = " onmouseover=\"this.className='cntxMnuItemOver';\" onmouseout=\"this.className='cntxMnuItem';\" onclick=\"$action; hideCntxMenu('" . $this->id . "');\"";
46		- $this->html .= "<div class='" . ($disabled ? "cntxMnuItemDisabled" : "cntxMnuItem") . "' $action>";
47		- if(substr($img, 0, 5) == 'fa fa') {
48		- $img = '<i class="' . $img . '"></i>';
49		- } else if(substr($img, 0, 1) != '<') {
50		- $img = '<img src="' . $img . '" />';
	45	+ $action = " onmouseover=\"this.className='cntxMnuItemOver';\" onmouseout=\"this.className='cntxMnuItem';\" onclick=\"$action; hideCntxMenu('".$this->id."');\"";
	46	+ $this->html .= "<div class='".($disabled ? "cntxMnuItemDisabled" : "cntxMnuItem")."' $action>";
	47	+ if (substr($img, 0, 5) == 'fa fa') {
	48	+ $img = '<i class="'.$img.'"></i>';
	49	+ } else if (substr($img, 0, 1) != '<') {
	50	+ $img = '<img src="'.$img.'" />';
51	51	}
52		- $this->html .= $img . ' ' . $text . '</div>';
	52	+ $this->html .= $img.' '.$text.'</div>';
53	53	}
54	54
55		- public function addSeparator() {
	55	+ public function addSeparator(){
56	56	$this->html .= "
57	57	<div class='cntxMnuSeparator'></div>
58	58	";
59	59	}
60	60
61		- public function render() {
	61	+ public function render(){
62	62	$ContextMenuScript = <<<BLOCK
63	63	<script>
64	64	function getCntxMenu(id) {
		@@ -71,12 +71,12 @@ discard block
		block discarded – undo
71	71	</script>
72	72	BLOCK;
73	73
74		- $html = $ContextMenuScript . "<div id='" . $this->id . "' class='contextMenu' style='width:" . $this->width . "px; visibility:" . ($this->visible ? 'visible' : 'hidden') . "'>" . $this->html . "</div>";
	74	+ $html = $ContextMenuScript."<div id='".$this->id."' class='contextMenu' style='width:".$this->width."px; visibility:".($this->visible ? 'visible' : 'hidden')."'>".$this->html."</div>";
75	75	$ContextMenuScript = ""; // reset css
76	76	return $html;
77	77	}
78	78
79		- public function getClientScriptObject() {
80		- return "getCntxMenu('" . $this->id . "')";
	79	+ public function getClientScriptObject(){
	80	+ return "getCntxMenu('".$this->id."')";
81	81	}
82	82	}

		@@ -33,24 +33,24 @@ discard block
		block discarded – undo
33	33	public $renderPagerFncArgs;
34	34	public static $dataSetPagerCnt;
35	35
36		- public function __construct($id, $ds, $pageSize = 10, $pageNumber = -1) {
	36	+ public function __construct($id, $ds, $pageSize = 10, $pageNumber = -1){
37	37	global $_PAGE; // use view state object
38	38
39	39	// set id
40	40	self::$dataSetPagerCnt++;
41		- $this->id = !empty($id) ? $id : "dsp" . self::$dataSetPagerCnt;
	41	+ $this->id = !empty($id) ? $id : "dsp".self::$dataSetPagerCnt;
42	42
43	43	// get pagenumber
44	44	// by setting pager to -1 cause pager to load it's last page number
45		- if($pageNumber == -1) {
	45	+ if ($pageNumber == -1) {
46	46	$pageNumber = 1;
47		- if(isset($_GET["dpgn" . $this->id])) {
48		- $pageNumber = $_GET["dpgn" . $this->id];
49		- } elseif(isset($_PAGE['vs'][$id . '_dpgn'])) {
50		- $pageNumber = $_PAGE['vs'][$id . '_dpgn'];
	47	+ if (isset($_GET["dpgn".$this->id])) {
	48	+ $pageNumber = $_GET["dpgn".$this->id];
	49	+ } elseif (isset($_PAGE['vs'][$id.'_dpgn'])) {
	50	+ $pageNumber = $_PAGE['vs'][$id.'_dpgn'];
51	51	}
52	52	}
53		- if(!is_numeric($pageNumber)) {
	53	+ if (!is_numeric($pageNumber)) {
54	54	$pageNumber = 1;
55	55	}
56	56
		@@ -61,40 +61,40 @@ discard block
		block discarded – undo
61	61	$this->pager = '';
62	62	}
63	63
64		- public function getRenderedPager() {
	64	+ public function getRenderedPager(){
65	65	return $this->pager;
66	66	}
67	67
68		- public function getRenderedRows() {
	68	+ public function getRenderedRows(){
69	69	return $this->rows;
70	70	}
71	71
72		- public function setDataSource($ds) {
	72	+ public function setDataSource($ds){
73	73	$this->ds = $ds;
74	74	}
75	75
76		- public function setPageSize($ps) {
	76	+ public function setPageSize($ps){
77	77	$this->pageSize = $ps;
78	78	}
79	79
80		- public function setRenderRowFnc($fncName, $args = "") {
	80	+ public function setRenderRowFnc($fncName, $args = ""){
81	81	$this->renderRowFnc = &$fncName;
82		- $this->renderRowFncArgs = $args; // extra agruments
	82	+ $this->renderRowFncArgs = $args; // extra agruments
83	83
84	84
85	85	}
86	86
87		- public function setRenderPagerFnc($fncName, $args = "") {
	87	+ public function setRenderPagerFnc($fncName, $args = ""){
88	88	$this->renderPagerFnc = $fncName;
89		- $this->renderPagerFncArgs = $args; // extra agruments
	89	+ $this->renderPagerFncArgs = $args; // extra agruments
90	90	}
91	91
92		- public function render() {
	92	+ public function render(){
93	93	$modx = evolutionCMS(); global $_PAGE;
94	94
95	95	$isDataset = $modx->getDatabase()->isResult($this->ds);
96	96
97		- if(!$this->selPageStyle) {
	97	+ if (!$this->selPageStyle) {
98	98	$this->selPageStyle = "font-weight:bold";
99	99	}
100	100
		@@ -102,11 +102,11 @@ discard block
		block discarded – undo
102	102	$tnr = ($isDataset) ? $modx->getDatabase()->getRecordCount($this->ds) : count($this->ds);
103	103
104	104	// render: no records found
105		- if($tnr <= 0) {
	105	+ if ($tnr <= 0) {
106	106	$fnc = $this->renderRowFnc;
107	107	$args = $this->renderRowFncArgs;
108		- if(isset($fnc)) {
109		- if($args != "") {
	108	+ if (isset($fnc)) {
	109	+ if ($args != "") {
110	110	$this->rows .= $fnc(0, null, $args);
111	111	} // if agrs was specified then we will pass three params
112	112	else {
		@@ -118,7 +118,7 @@ discard block
		block discarded – undo
118	118
119	119	// get total pages
120	120	$tp = ceil($tnr / $this->pageSize);
121		- if($this->pageNumber > $tp) {
	121	+ if ($this->pageNumber > $tp) {
122	122	$this->pageNumber = 1;
123	123	}
124	124
		@@ -126,39 +126,39 @@ discard block
		block discarded – undo
126	126	$p = $this->pageNumber;
127	127
128	128	// save page number to view state if available
129		- if(isset($_PAGE['vs'])) {
130		- $_PAGE['vs'][$this->id . '_dpgn'] = $p;
	129	+ if (isset($_PAGE['vs'])) {
	130	+ $_PAGE['vs'][$this->id.'_dpgn'] = $p;
131	131	}
132	132
133	133	// render pager : renderPagerFnc($cuurentPage,$pagerNumber,$arguments="");
134		- if($tp > 1) {
	134	+ if ($tp > 1) {
135	135	$url = '';
136	136	$fnc = $this->renderPagerFnc;
137	137	$args = $this->renderPagerFncArgs;
138		- if(!isset($fnc)) {
139		- if($modx->isFrontend()) {
140		- $url = $modx->makeUrl($modx->documentIdentifier, '', '', 'full') . '?';
	138	+ if (!isset($fnc)) {
	139	+ if ($modx->isFrontend()) {
	140	+ $url = $modx->makeUrl($modx->documentIdentifier, '', '', 'full').'?';
141	141	} else {
142		- $url = $_SERVER['PHP_SELF'] . '?';
	142	+ $url = $_SERVER['PHP_SELF'].'?';
143	143	}
144	144	$i = 0;
145		- foreach($_GET as $n => $v) if($n != 'dpgn' . $this->id) {
	145	+ foreach ($_GET as $n => $v) if ($n != 'dpgn'.$this->id) {
146	146	$i++;
147		- $url .= (($i > 1) ? "&" : "") . "$n=$v";
	147	+ $url .= (($i > 1) ? "&" : "")."$n=$v";
148	148	}
149		- if($i >= 1) {
	149	+ if ($i >= 1) {
150	150	$url .= "&";
151	151	}
152	152	}
153		- for($i = 1; $i <= $tp; $i++) {
154		- if(isset($fnc)) {
155		- if($args != "") {
	153	+ for ($i = 1; $i <= $tp; $i++) {
	154	+ if (isset($fnc)) {
	155	+ if ($args != "") {
156	156	$this->pager .= $fnc($p, $i, $args);
157	157	} else {
158	158	$this->pager .= $fnc($p, $i);
159	159	}
160	160	} else {
161		- $this->pager .= ($p == $i) ? " <span class='" . $this->selPageClass . "' style='" . $this->selPageStyle . "'>$i</span> " : " <a href='" . $url . "dpgn" . $this->id . "=$i' class='" . $this->pageClass . "' style='" . $this->pageStyle . "'>$i</a> ";
	161	+ $this->pager .= ($p == $i) ? " <span class='".$this->selPageClass."' style='".$this->selPageStyle."'>$i</span> " : " <a href='".$url."dpgn".$this->id."=$i' class='".$this->pageClass."' style='".$this->pageStyle."'>$i</a> ";
162	162	}
163	163	}
164	164	}
		@@ -167,21 +167,21 @@ discard block
		block discarded – undo
167	167	$fnc = $this->renderRowFnc;
168	168	$args = $this->renderRowFncArgs;
169	169
170		- if(isset($fnc)) {
	170	+ if (isset($fnc)) {
171	171	$i = 1;
172	172	$fncObject = is_object($fnc);
173	173	$minitems = (($p - 1) * $this->pageSize) + 1;
174	174	$maxitems = (($p - 1) * $this->pageSize) + $this->pageSize;
175		- while($i <= $maxitems && ($row = ($isDataset) ? $modx->getDatabase()->getRow($this->ds) : $this->ds[$i - 1])) {
176		- if($i >= $minitems && $i <= $maxitems) {
177		- if($fncObject) {
178		- if($args != "") {
	175	+ while ($i <= $maxitems && ($row = ($isDataset) ? $modx->getDatabase()->getRow($this->ds) : $this->ds[$i - 1])) {
	176	+ if ($i >= $minitems && $i <= $maxitems) {
	177	+ if ($fncObject) {
	178	+ if ($args != "") {
179	179	$this->rows .= $fnc->RenderRowFnc($i, $row, $args);
180	180	} else {
181	181	$this->rows .= $fnc->RenderRowFnc($i, $row);
182	182	}
183	183	} else {
184		- if($args != "") {
	184	+ if ($args != "") {
185	185	$this->rows .= $fnc($i, $row, $args);
186	186	} // if agrs was specified then we wil pass three params
187	187	else {

		@@ -29,7 +29,7 @@ discard block
		block discarded – undo
29	29	{
30	30	$modx = evolutionCMS();
31	31	$this->modx = $modx;
32		- $this->PluginDir = MODX_MANAGER_PATH . 'includes/controls/phpmailer/';
	32	+ $this->PluginDir = MODX_MANAGER_PATH.'includes/controls/phpmailer/';
33	33
34	34	switch ($modx->config['email_method']) {
35	35	case 'smtp':
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95	mb_language($this->mb_language);
96	96	mb_internal_encoding($modx->config['modx_charset']);
97	97	}
98		- $exconf = MODX_MANAGER_PATH . 'includes/controls/phpmailer/config.inc.php';
	98	+ $exconf = MODX_MANAGER_PATH.'includes/controls/phpmailer/config.inc.php';
99	99	if (is_file($exconf)) {
100	100	include($exconf);
101	101	}
		@@ -163,12 +163,12 @@ discard block
		block discarded – undo
163	163	}
164	164
165	165	if ($this->modx->debug) {
166		- $debug_info = 'CharSet = ' . $this->CharSet . "\n";
167		- $debug_info .= 'Encoding = ' . $this->Encoding . "\n";
168		- $debug_info .= 'mb_language = ' . $this->mb_language . "\n";
169		- $debug_info .= 'encode_header_method = ' . $this->encode_header_method . "\n";
	166	+ $debug_info = 'CharSet = '.$this->CharSet."\n";
	167	+ $debug_info .= 'Encoding = '.$this->Encoding."\n";
	168	+ $debug_info .= 'mb_language = '.$this->mb_language."\n";
	169	+ $debug_info .= 'encode_header_method = '.$this->encode_header_method."\n";
170	170	$debug_info .= "send_mode = {$mode}\n";
171		- $debug_info .= 'Subject = ' . $this->Subject . "\n";
	171	+ $debug_info .= 'Subject = '.$this->Subject."\n";
172	172	$log = "<pre>{$debug_info}\n{$header}\n{$org_body}</pre>";
173	173	$this->modx->logEvent(1, 1, $log, 'MODxMailer debug information');
174	174
		@@ -234,7 +234,7 @@ discard block
		block discarded – undo
234	234	ini_set('sendmail_from', $old_from);
235	235	}
236	236	if (!$rt) {
237		- $msg = $this->Lang('instantiate') . "<br />\n";
	237	+ $msg = $this->Lang('instantiate')."<br />\n";
238	238	$msg .= "{$this->Subject}<br />\n";
239	239	$msg .= "{$this->FromName}<{$this->From}><br />\n";
240	240	$msg .= mb_convert_encoding($body, $this->modx->config['modx_charset'], $this->CharSet);
		@@ -256,7 +256,7 @@ discard block
		block discarded – undo
256	256	$classDump = call_user_func('get_object_vars', $this);
257	257	unset($classDump['modx']);
258	258	$this->modx->config['send_errormail'] = '0';
259		- $this->modx->logEvent(0, 3, $msg . '<pre>' . print_r($classDump, true) . '</pre>', 'phpmailer');
	259	+ $this->modx->logEvent(0, 3, $msg.'<pre>'.print_r($classDump, true).'</pre>', 'phpmailer');
260	260
261	261	return parent::SetError($msg);
262	262	}

		@@ -6,7 +6,7 @@ discard block
		block discarded – undo
6	6	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
7	7	}
8	8
9		-require_once(dirname(__FILE__) . '/protect.inc.php');
	9	+require_once(dirname(__FILE__).'/protect.inc.php');
10	10
11	11	$action = preg_replace('/[^A-Za-z0-9_\-\.\/]/', '', $_POST['action']);
12	12	$lang = preg_replace('/[^A-Za-z0-9_\s\+\-\.\/]/', '', $_POST['lang']);
		@@ -23,13 +23,13 @@ discard block
		block discarded – undo
23	23
24	24	switch (true) {
25	25	case ($action == 'get' && preg_match('/^[A-z0-9_-]+$/',
26		- $lang) && file_exists(dirname(__FILE__) . '/lang/' . $lang . '.inc.php')): {
27		- include(dirname(__FILE__) . '/lang/' . $lang . '.inc.php');
	26	+ $lang) && file_exists(dirname(__FILE__).'/lang/'.$lang.'.inc.php')): {
	27	+ include(dirname(__FILE__).'/lang/'.$lang.'.inc.php');
28	28	$str = isset($key, $_lang, $_lang[$key]) ? $_lang[$key] : "";
29	29	break;
30	30	}
31	31	case ($action == 'setsetting' && !empty($key) && !empty($value)): {
32		- $sql = "REPLACE INTO " . $modx->getFullTableName("system_settings") . " (setting_name, setting_value) VALUES('{$key}', '{$value}');";
	32	+ $sql = "REPLACE INTO ".$modx->getFullTableName("system_settings")." (setting_name, setting_value) VALUES('{$key}', '{$value}');";
33	33	$str = "true";
34	34	$modx->getDatabase()->query($sql);
35	35	$emptyCache = true;

		@@ -34,7 +34,7 @@
		block discarded – undo
34	34	$newCat = $modx->getDatabase()->escape($newCat);
35	35	$cats = $modx->getDatabase()->select('id', $modx->getFullTableName('categories'), "category='{$newCat}'");
36	36	if ($cat = $modx->getDatabase()->getValue($cats)) {
37		- return (int)$cat;
	37	+ return (int) $cat;
38	38	}
39	39
40	40	return 0;

		@@ -18,13 +18,13 @@ discard block
		block discarded – undo
18	18	}
19	19
20	20	// andrazk 20070416 - if installer is running, destroy active sessions
21		-if (file_exists(MODX_BASE_PATH . 'assets/cache/installProc.inc.php')) {
22		- include_once(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
	21	+if (file_exists(MODX_BASE_PATH.'assets/cache/installProc.inc.php')) {
	22	+ include_once(MODX_BASE_PATH.'assets/cache/installProc.inc.php');
23	23	if (isset($installStartTime)) {
24	24	if ((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard
25	25	unset($installStartTime);
26		- @ chmod(MODX_BASE_PATH . 'assets/cache/installProc.inc.php', 0755);
27		- unlink(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
	26	+ @ chmod(MODX_BASE_PATH.'assets/cache/installProc.inc.php', 0755);
	27	+ unlink(MODX_BASE_PATH.'assets/cache/installProc.inc.php');
28	28	} else {
29	29	if ($_SERVER['REQUEST_METHOD'] != 'POST') {
30	30	if (isset($_COOKIE[session_name()])) {
		@@ -50,7 +50,7 @@ discard block
		block discarded – undo
50	50	// setcookie(session_name(), '', 0, MODX_BASE_URL);
51	51	}
52	52	header('HTTP/1.0 307 Redirect');
53		- header('Location: ' . MODX_MANAGER_URL . 'index.php?installGoingOn=2');
	53	+ header('Location: '.MODX_MANAGER_URL.'index.php?installGoingOn=2');
54	54	}
55	55	}
56	56	}
		@@ -62,7 +62,7 @@ discard block
		block discarded – undo
62	62	// establish fallback to English default
63	63	include_once "lang/english.inc.php";
64	64	// include localized overrides
65		- include_once "lang/" . $manager_language . ".inc.php";
	65	+ include_once "lang/".$manager_language.".inc.php";
66	66	} else {
67	67	include_once "lang/english.inc.php";
68	68	}
		@@ -70,7 +70,7 @@ discard block
		block discarded – undo
70	70	$modx->setPlaceholder('modx_charset', $modx_manager_charset);
71	71	$modx->setPlaceholder('theme', $manager_theme);
72	72	$modx->setPlaceholder('favicon',
73		- (file_exists(MODX_BASE_PATH . 'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/' . $modx->config['manager_theme'] . '/images/favicon.ico'));
	73	+ (file_exists(MODX_BASE_PATH.'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/'.$modx->config['manager_theme'].'/images/favicon.ico'));
74	74
75	75	// invoke OnManagerLoginFormPrerender event
76	76	$evtOut = $modx->invokeEvent('OnManagerLoginFormPrerender');
		@@ -81,25 +81,25 @@ discard block
		block discarded – undo
81	81	$modx->setPlaceholder('manager_path', MGR_DIR);
82	82	$modx->setPlaceholder('logo_slogan', $_lang["logo_slogan"]);
83	83	$modx->setPlaceholder('login_message', $_lang["login_message"]);
84		- $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/');
	84	+ $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/');
85	85	$modx->setPlaceholder('year', date('Y'));
86	86
87	87	// set login logo image
88		- if ( !empty($modx->config['login_logo']) ) {
89		- $modx->setPlaceholder('login_logo', MODX_SITE_URL . $modx->config['login_logo']);
	88	+ if (!empty($modx->config['login_logo'])) {
	89	+ $modx->setPlaceholder('login_logo', MODX_SITE_URL.$modx->config['login_logo']);
90	90	} else {
91		- $modx->setPlaceholder('login_logo', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/images/login/default/login-logo.png');
	91	+ $modx->setPlaceholder('login_logo', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/images/login/default/login-logo.png');
92	92	}
93	93
94	94	// set login background image
95		- if ( !empty($modx->config['login_bg']) ) {
96		- $modx->setPlaceholder('login_bg', MODX_SITE_URL . $modx->config['login_bg']);
	95	+ if (!empty($modx->config['login_bg'])) {
	96	+ $modx->setPlaceholder('login_bg', MODX_SITE_URL.$modx->config['login_bg']);
97	97	} else {
98		- $modx->setPlaceholder('login_bg', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/images/login/default/login-background.jpg');
	98	+ $modx->setPlaceholder('login_bg', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/images/login/default/login-background.jpg');
99	99	}
100	100
101	101	// set form position css class
102		- $modx->setPlaceholder('login_form_position_class', 'loginbox-' . $modx->config['login_form_position']);
	102	+ $modx->setPlaceholder('login_form_position_class', 'loginbox-'.$modx->config['login_form_position']);
103	103
104	104	switch ($modx->config['manager_theme_mode']) {
105	105	case '1':
		@@ -124,11 +124,11 @@ discard block
		block discarded – undo
124	124	switch ($installGoingOn) {
125	125	case 1 :
126	126	$modx->setPlaceholder('login_message',
127		- "<p><span class=\"fail\">" . $_lang["login_cancelled_install_in_progress"] . "</p><p>" . $_lang["login_message"] . "</p>");
	127	+ "<p><span class=\"fail\">".$_lang["login_cancelled_install_in_progress"]."</p><p>".$_lang["login_message"]."</p>");
128	128	break;
129	129	case 2 :
130	130	$modx->setPlaceholder('login_message',
131		- "<p><span class=\"fail\">" . $_lang["login_cancelled_site_was_updated"] . "</p><p>" . $_lang["login_message"] . "</p>");
	131	+ "<p><span class=\"fail\">".$_lang["login_cancelled_site_was_updated"]."</p><p>".$_lang["login_message"]."</p>");
132	132	break;
133	133	}
134	134	}
		@@ -136,9 +136,9 @@ discard block
		block discarded – undo
136	136	if ($modx->config['use_captcha'] == 1) {
137	137	$modx->setPlaceholder('login_captcha_message', $_lang["login_captcha_message"]);
138	138	$modx->setPlaceholder('captcha_image',
139		- '<a href="' . MODX_MANAGER_URL . '" class="loginCaptcha"><img id="captcha_image" src="' . MODX_MANAGER_URL . 'captcha.php?rand=' . rand() . '" alt="' . $_lang["login_captcha_message"] . '" /></a>');
	139	+ '<a href="'.MODX_MANAGER_URL.'" class="loginCaptcha"><img id="captcha_image" src="'.MODX_MANAGER_URL.'captcha.php?rand='.rand().'" alt="'.$_lang["login_captcha_message"].'" /></a>');
140	140	$modx->setPlaceholder('captcha_input',
141		- '<label>' . $_lang["captcha_code"] . '</label> <input type="text" name="captcha_code" tabindex="3" value="" />');
	141	+ '<label>'.$_lang["captcha_code"].'</label> <input type="text" name="captcha_code" tabindex="3" value="" />');
142	142	}
143	143
144	144	// login info
		@@ -156,7 +156,7 @@ discard block
		block discarded – undo
156	156
157	157	// invoke OnManagerLoginFormRender event
158	158	$evtOut = $modx->invokeEvent('OnManagerLoginFormRender');
159		- $html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">' . implode('', $evtOut) . '</div>' : '';
	159	+ $html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">'.implode('', $evtOut).'</div>' : '';
160	160	$modx->setPlaceholder('OnManagerLoginFormRender', $html);
161	161
162	162	// load template
		@@ -174,29 +174,29 @@ discard block
		block discarded – undo
174	174	$login_tpl = file_get_contents($target);
175	175	}
176	176	} else {
177		- $theme_path = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/';
178		- if (is_file($theme_path . 'style.php')) {
179		- include($theme_path . 'style.php');
	177	+ $theme_path = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/';
	178	+ if (is_file($theme_path.'style.php')) {
	179	+ include($theme_path.'style.php');
180	180	}
181	181	$chunk = $modx->getChunk($target);
182	182	if ($chunk !== false && !empty($chunk)) {
183	183	$login_tpl = $chunk;
184		- } elseif (is_file(MODX_BASE_PATH . $target)) {
185		- $target = MODX_BASE_PATH . $target;
	184	+ } elseif (is_file(MODX_BASE_PATH.$target)) {
	185	+ $target = MODX_BASE_PATH.$target;
186	186	$login_tpl = file_get_contents($target);
187	187	} elseif (is_file($target)) {
188	188	$login_tpl = file_get_contents($target);
189		- } elseif (is_file($theme_path . 'login.tpl')) {
190		- $target = $theme_path . 'login.tpl';
	189	+ } elseif (is_file($theme_path.'login.tpl')) {
	190	+ $target = $theme_path.'login.tpl';
191	191	$login_tpl = file_get_contents($target);
192		- } elseif (is_file($theme_path . 'templates/actions/login.tpl')) {
193		- $target = $theme_path . 'templates/actions/login.tpl';
	192	+ } elseif (is_file($theme_path.'templates/actions/login.tpl')) {
	193	+ $target = $theme_path.'templates/actions/login.tpl';
194	194	$login_tpl = file_get_contents($target);
195		- } elseif (is_file($theme_path . 'html/login.html')) { // ClipperCMS compatible
196		- $target = $theme_path . 'html/login.html';
	195	+ } elseif (is_file($theme_path.'html/login.html')) { // ClipperCMS compatible
	196	+ $target = $theme_path.'html/login.html';
197	197	$login_tpl = file_get_contents($target);
198	198	} else {
199		- $target = MODX_MANAGER_PATH . 'media/style/common/login.tpl';
	199	+ $target = MODX_MANAGER_PATH.'media/style/common/login.tpl';
200	200	$login_tpl = file_get_contents($target);
201	201	}
202	202	}
		@@ -216,17 +216,17 @@ discard block
		block discarded – undo
216	216	$modx->updateValidatedUserSession();
217	217
218	218	// Update last action in table active_users
219		- $itemid = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : '';
	219	+ $itemid = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : '';
220	220	$lasthittime = time();
221		- $action = isset($_REQUEST['a']) ? (int)$_REQUEST['a'] : 1;
	221	+ $action = isset($_REQUEST['a']) ? (int) $_REQUEST['a'] : 1;
222	222
223	223	if ($action !== 1) {
224		- if ((int)$itemid <= 0) {
	224	+ if ((int) $itemid <= 0) {
225	225	$itemid = null;
226	226	}
227	227	$sql = sprintf("REPLACE INTO %s (sid, internalKey, username, lasthit, action, id) VALUES ('%s', %d, '%s', %d, '%s', %s)",
228	228	$modx->getFullTableName('active_users') // Table
229		- , session_id(), $modx->getLoginUserID(), $_SESSION['mgrShortname'], $lasthittime, (string)$action,
	229	+ , session_id(), $modx->getLoginUserID(), $_SESSION['mgrShortname'], $lasthittime, (string) $action,
230	230	$itemid == null ? var_export(null, true) : $itemid);
231	231	$modx->getDatabase()->query($sql);
232	232	}

		@@ -1,5 +1,5 @@
		block discarded – undo
1	1	<?php
2		-$userid = (int)$value;
	2	+$userid = (int) $value;
3	3	if (!isset($modx->getModifiers()->cache['ui'][$userid])) {
4	4	if ($userid < 0) $user = $modx->getWebUserInfo(abs($userid));
5	5	else $user = $modx->getUserInfo($userid);

evolution-cms / evolution

Pull Request — develop (#725)

Status

Category

Spacing +64 added lines, -64 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

Spacing +42 added lines, -42 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +36 added lines, -36 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch