evolution-cms / evolution

core/src/Support/DataGrid.php

Indentation +223 added lines, -223 removed lines

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

core/src/Support/DataSetPager.php

Indentation +147 added lines, -147 removed lines

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

core/src/ManagerTheme.php

Indentation +1 added lines, -1 removed lines

@@ -425,7 +425,7 @@
     {
         $out = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
         if ($out <= 0) {
-           $out = null;
+            $out = null;
         }
 
         return $out;

core/src/Legacy/DeprecatedCore.php

Indentation +4 added lines, -4 removed lines

@@ -5,10 +5,10 @@
 class DeprecatedCore implements DeprecatedCoreInterface
 {
     /**
-    * @deprecated
-    *
-    * return @void
-    */
+     * @deprecated
+     *
+     * return @void
+     */
     public function dbConnect()
     {
         $modx = evolutionCMS();