evolution-cms / evolution

manager/includes/controls/datagrid.class.php

Doc Comments +6 added lines

@@ -72,6 +72,9 @@ 
      */
     public $cdelim;
 
+    /**
+     * @param null|string $id
+     */
     public function __construct($id, $ds, $pageSize = 20, $pageNumber = -1) {
 		global $__DataGridCnt;
 
@@ -207,6 +210,9 @@ 
 
 	// format column values
 
+    /**
+     * @param integer $n
+     */
     public function RenderRowFnc($n, $row) {
 		if($this->_alt == 0) {
 			$Style = $this->_itemStyle;

Indentation +226 added lines, -226 removed lines

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

Spacing +66 added lines, -66 removed lines

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

Braces +15 added lines, -7 removed lines

@@ -10,7 +10,8 @@ 
 
 $__DataGridCnt = 0;
 
-class DataGrid {
+class DataGrid
+{
 
 	public $ds; // datasource
     public $id;
@@ -72,7 +73,8 @@ 
      */
     public $cdelim;
 
-    public function __construct($id, $ds, $pageSize = 20, $pageNumber = -1) {
+    public function __construct($id, $ds, $pageSize = 20, $pageNumber = -1)
+    {
 		global $__DataGridCnt;
 
 		// set id
@@ -88,11 +90,13 @@ 
 		$this->pagerLocation = 'top-right';
 	}
 
-    public function setDataSource($ds) {
+    public function setDataSource($ds)
+    {
 		$this->ds = $ds;
 	}
 
-    public function render() {
+    public function render()
+    {
 		global $modx;
 		$columnHeaderStyle = ($this->columnHeaderStyle) ? "style='" . $this->columnHeaderStyle . "'" : '';
 		$columnHeaderClass = ($this->columnHeaderClass) ? "class='" . $this->columnHeaderClass . "'" : "";
@@ -127,7 +131,9 @@ 
 
 		if($this->_isDataset && !$this->columns) {
 			$cols = $modx->db->numFields($this->ds);
-			for($i = 0; $i < $cols; $i++) $this->columns .= ($i ? "," : "") . $modx->db->fieldName($this->ds, $i);
+			for($i = 0; $i < $cols; $i++) {
+			    $this->columns .= ($i ? "," : "") . $modx->db->fieldName($this->ds, $i);
+			}
 		}
 
 		// start grid
@@ -207,7 +213,8 @@ 
 
 	// format column values
 
-    public function RenderRowFnc($n, $row) {
+    public function RenderRowFnc($n, $row)
+    {
 		if($this->_alt == 0) {
 			$Style = $this->_itemStyle;
 			$Class = $this->_itemClass;
@@ -237,7 +244,8 @@ 
 		return $o;
 	}
 
-    public function formatColumnValue($row, $value, $type, &$align) {
+    public function formatColumnValue($row, $value, $type, &$align)
+    {
 		if(strpos($type, ":") !== false) {
 			list($type, $type_format) = explode(":", $type, 2);
 		}

manager/includes/controls/datasetpager.class.php

Doc Comments +6 added lines

@@ -31,6 +31,9 @@ 
     public $renderPagerFnc;
     public $renderPagerFncArgs;
 
+    /**
+     * @param boolean|string $id
+     */
     public function __construct($id, $ds, $pageSize = 10, $pageNumber = -1) {
 		global $_PAGE; // use view state object
 
@@ -77,6 +80,9 @@ 
 		$this->pageSize = $ps;
 	}
 
+    /**
+     * @param DataGrid $fncName
+     */
     public function setRenderRowFnc($fncName, $args = "") {
 		$this->renderRowFnc = &$fncName;
 		$this->renderRowFncArgs = $args;    // extra agruments

Indentation +149 added lines, -149 removed lines

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

Spacing +43 added lines, -43 removed lines

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

Braces +21 added lines, -10 removed lines

@@ -10,7 +10,8 @@ 
 
 $__DataSetPagerCnt = 0;
 
-class DataSetPager {
+class DataSetPager
+{
 
 	public $ds; // datasource
     public $pageSize;
@@ -31,7 +32,8 @@ 
     public $renderPagerFnc;
     public $renderPagerFncArgs;
 
-    public function __construct($id, $ds, $pageSize = 10, $pageNumber = -1) {
+    public function __construct($id, $ds, $pageSize = 10, $pageNumber = -1)
+    {
 		global $_PAGE; // use view state object
 
 		global $__DataSetPagerCnt;
@@ -61,35 +63,42 @@ 
 		$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
 
 
 	}
 
-    public function setRenderPagerFnc($fncName, $args = "") {
+    public function setRenderPagerFnc($fncName, $args = "")
+    {
 		$this->renderPagerFnc = $fncName;
 		$this->renderPagerFncArgs = $args;    // extra agruments
 	}
 
-    public function render() {
+    public function render()
+    {
 		global $modx, $_PAGE;
 
 		$isDataset = $modx->db->isResult($this->ds);
@@ -142,8 +151,10 @@ 
 					$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";
 				}
 				if($i >= 1) {

manager/includes/document.parser.class.inc.php

Doc Comments +26 added lines, -26 removed lines

@@ -256,7 +256,7 @@ 
      * MODX_MANAGER_PATH."includes/extenders/ex_{$extname}.inc.php"
      * $extname - extension name in lowercase
      *
-     * @param $extname
+     * @param string $extname
      * @param bool $reload
      * @return bool
      */
@@ -299,7 +299,7 @@ 
      * @param int $count_attempts
      * @param string $type $type
      * @param string $responseCode
-     * @return bool
+     * @return false|null
      * @global string $base_url
      * @global string $site_url
      */
@@ -999,7 +999,7 @@ 
     }
 
     /**
-     * @param $contents
+     * @param string $contents
      * @return mixed
      */
     public function RecoveryEscapedTags($contents)
@@ -1023,7 +1023,7 @@ 
     }
 
     /**
-     * @param $tstart
+     * @param double $tstart
      * @return array
      */
     public function getTimerStats($tstart)
@@ -1775,7 +1775,7 @@ 
 
     /**
      * Remove Comment-Tags from output like <!--@- Comment -@-->
-     * @param $content
+     * @param string $content
      * @param string $left
      * @param string $right
      * @return mixed
@@ -1948,7 +1948,7 @@ 
     /**
      * Run snippets as per the tags in $documentSource and replace the tags with the returned values.
      *
-     * @param $content
+     * @param string $content
      * @return string
      * @internal param string $documentSource
      */
@@ -2980,7 +2980,7 @@ 
 
     /**
      * @param $templateID
-     * @return mixed
+     * @return string
      */
     public function _getTemplateCodeFromDB($templateID)
     {
@@ -3021,9 +3021,9 @@ 
     }
 
     /**
-     * @param $id
+     * @param integer $id
      * @param int $top
-     * @return mixed
+     * @return string
      */
     public function getUltimateParentId($id, $top = 0)
     {
@@ -3354,7 +3354,7 @@ 
      *
      * @param int $type Types: 1=template, 2=tv, 3=chunk, 4=snippet, 5=plugin, 6=module, 7=resource, 8=role
      * @param int $id Element- / Resource-id
-     * @return bool
+     * @return false|null
      */
     public function lockElement($type, $id)
     {
@@ -3376,7 +3376,7 @@ 
      * @param int $type Types: 1=template, 2=tv, 3=chunk, 4=snippet, 5=plugin, 6=module, 7=resource, 8=role
      * @param int $id Element- / Resource-id
      * @param bool $includeAllUsers true = Deletes not only own user-locks
-     * @return bool
+     * @return false|null
      */
     public function unlockElement($type, $id, $includeAllUsers = false)
     {
@@ -3484,7 +3484,7 @@ 
      * @param array $params
      * @param string $msg
      * @param array $files
-     * @return mixed
+     * @return boolean
      */
     public function sendmail($params = array(), $msg = '', $files = array())
     {
@@ -3980,7 +3980,7 @@ 
      *
      * @param string $type
      * @param bool $report
-     * @return bool
+     * @return boolean|null
      */
     public function clearCache($type = '', $report = false)
     {
@@ -5024,7 +5024,7 @@ 
      * Returns a record for the web user
      *
      * @param int $uid
-     * @return boolean|string
+     * @return boolean|null
      */
     public function getWebUserInfo($uid)
     {
@@ -5322,7 +5322,7 @@ 
      * Remove event listener - only for use within the current execution cycle
      *
      * @param string $evtName
-     * @return boolean
+     * @return false|null
      */
     public function removeEventListener($evtName)
     {
@@ -5346,7 +5346,7 @@ 
      *
      * @param string $evtName
      * @param array $extParams Parameters available to plugins. Each array key will be the PHP variable name, and the array value will be the variable value.
-     * @return boolean|array
+     * @return false|null
      */
     public function invokeEvent($evtName, $extParams = array())
     {
@@ -5767,7 +5767,7 @@ 
 
     /**
      * @param string $string
-     * @return mixed|string
+     * @return string
      */
     public function removeSanitizeSeed($string = '')
     {
@@ -5782,7 +5782,7 @@ 
 
     /**
      * @param string $content
-     * @return mixed|string
+     * @return string
      */
     public function cleanUpMODXTags($content = '')
     {
@@ -5945,7 +5945,7 @@ 
 
     /**
      * @param string $str
-     * @return bool|mixed|string
+     * @return string
      */
     public function atBindFileContent($str = '')
     {
@@ -5996,8 +5996,8 @@ 
     }
 
     /**
-     * @param $str
-     * @return bool|string
+     * @param string $str
+     * @return false|string
      */
     public function getExtFromFilename($str)
     {
@@ -6025,7 +6025,7 @@ 
      * @param string $text Error message
      * @param string $file File where the error was detected
      * @param string $line Line number within $file
-     * @return boolean
+     * @return boolean|null
      */
     public function phpError($nr, $text, $file, $line)
     {
@@ -6077,7 +6077,7 @@ 
      * @param string $text
      * @param string $line
      * @param string $output
-     * @return bool
+     * @return null|boolean
      */
     public function messageQuit($msg = 'unspecified error', $query = '', $is_error = true, $nr = '', $file = '', $source = '', $text = '', $line = '', $output = '')
     {
@@ -6499,7 +6499,7 @@ 
 
     /**
      * @param string $str
-     * @return bool|mixed|string
+     * @return string
      */
     public function atBindInclude($str = '')
     {
@@ -6550,7 +6550,7 @@ 
      * @param $str
      * @param int $flags
      * @param string $encode
-     * @return mixed
+     * @return string
      */
     public function htmlspecialchars($str, $flags = ENT_COMPAT, $encode = '')
     {
@@ -6559,7 +6559,7 @@ 
     }
 
     /**
-     * @param $string
+     * @param string $string
      * @param bool $returnData
      * @return bool|mixed
      */

Spacing +266 added lines, -266 removed lines

@@ -205,7 +205,7 @@ 
      */
     function __call($method_name, $arguments)
     {
-        include_once(MODX_MANAGER_PATH . 'includes/extenders/deprecated.functions.inc.php');
+        include_once(MODX_MANAGER_PATH.'includes/extenders/deprecated.functions.inc.php');
         if (method_exists($this->old, $method_name)) {
             $error_type = 1;
         } else {
@@ -223,12 +223,12 @@ 
             $info = debug_backtrace();
             $m[] = $msg;
             if (!empty($this->currentSnippet)) {
-                $m[] = 'Snippet - ' . $this->currentSnippet;
+                $m[] = 'Snippet - '.$this->currentSnippet;
             } elseif (!empty($this->event->activePlugin)) {
-                $m[] = 'Plugin - ' . $this->event->activePlugin;
+                $m[] = 'Plugin - '.$this->event->activePlugin;
             }
             $m[] = $this->decoded_request_uri;
-            $m[] = str_replace('\\', '/', $info[0]['file']) . '(line:' . $info[0]['line'] . ')';
+            $m[] = str_replace('\\', '/', $info[0]['file']).'(line:'.$info[0]['line'].')';
             $msg = implode('<br />', $m);
             $this->logEvent(0, $error_type, $msg, $title);
         }
@@ -245,7 +245,7 @@ 
     {
         $flag = false;
         if (is_scalar($connector) && !empty($connector) && isset($this->{$connector}) && $this->{$connector} instanceof DBAPI) {
-            $flag = (bool)$this->{$connector}->conn;
+            $flag = (bool) $this->{$connector}->conn;
         }
         return $flag;
     }
@@ -272,7 +272,7 @@ 
         }
         if (!$out && $flag) {
             $extname = trim(str_replace(array('..', '/', '\\'), '', strtolower($extname)));
-            $filename = MODX_MANAGER_PATH . "includes/extenders/ex_{$extname}.inc.php";
+            $filename = MODX_MANAGER_PATH."includes/extenders/ex_{$extname}.inc.php";
             $out = is_file($filename) ? include $filename : false;
         }
         if ($out && !in_array($extname, $this->extensions)) {
@@ -289,7 +289,7 @@ 
     public function getMicroTime()
     {
         list ($usec, $sec) = explode(' ', microtime());
-        return ((float)$usec + (float)$sec);
+        return ((float) $usec + (float) $sec);
     }
 
     /**
@@ -313,7 +313,7 @@ 
             // append the redirect count string to the url
             $currentNumberOfRedirects = isset ($_REQUEST['err']) ? $_REQUEST['err'] : 0;
             if ($currentNumberOfRedirects > 3) {
-                $this->messageQuit('Redirection attempt failed - please ensure the document you\'re trying to redirect to exists. <p>Redirection URL: <i>' . $url . '</i></p>');
+                $this->messageQuit('Redirection attempt failed - please ensure the document you\'re trying to redirect to exists. <p>Redirection URL: <i>'.$url.'</i></p>');
             } else {
                 $currentNumberOfRedirects += 1;
                 if (strpos($url, "?") > 0) {
@@ -324,9 +324,9 @@ 
             }
         }
         if ($type == 'REDIRECT_REFRESH') {
-            $header = 'Refresh: 0;URL=' . $url;
+            $header = 'Refresh: 0;URL='.$url;
         } elseif ($type == 'REDIRECT_META') {
-            $header = '<META HTTP-EQUIV="Refresh" CONTENT="0; URL=' . $url . '" />';
+            $header = '<META HTTP-EQUIV="Refresh" CONTENT="0; URL='.$url.'" />';
             echo $header;
             exit;
         } elseif ($type == 'REDIRECT_HEADER' || empty ($type)) {
@@ -334,10 +334,10 @@ 
             global $base_url, $site_url;
             if (substr($url, 0, strlen($base_url)) == $base_url) {
                 // append $site_url to make it work with Location:
-                $url = $site_url . substr($url, strlen($base_url));
+                $url = $site_url.substr($url, strlen($base_url));
             }
             if (strpos($url, "\n") === false) {
-                $header = 'Location: ' . $url;
+                $header = 'Location: '.$url;
             } else {
                 $this->messageQuit('No newline allowed in redirect url.');
             }
@@ -346,7 +346,7 @@ 
             header($responseCode);
         }
 
-        if(!empty($header)) {
+        if (!empty($header)) {
             header($header);
         }
 
@@ -450,8 +450,8 @@ 
 
     private function recoverySiteCache()
     {
-        $site_cache_dir = MODX_BASE_PATH . $this->getCacheFolder();
-        $site_cache_path = $site_cache_dir . 'siteCache.idx.php';
+        $site_cache_dir = MODX_BASE_PATH.$this->getCacheFolder();
+        $site_cache_path = $site_cache_dir.'siteCache.idx.php';
 
         if (is_file($site_cache_path)) {
             include($site_cache_path);
@@ -460,7 +460,7 @@ 
             return;
         }
 
-        include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php');
+        include_once(MODX_MANAGER_PATH.'processors/cache_sync.class.processor.php');
         $cache = new synccache();
         $cache->setCachepath($site_cache_dir);
         $cache->setReport(false);
@@ -511,8 +511,8 @@ 
                 $this->invokeEvent("OnBeforeManagerPageInit");
             }
 
-            if (isset ($_SESSION[$usrType . 'UsrConfigSet'])) {
-                $usrSettings = &$_SESSION[$usrType . 'UsrConfigSet'];
+            if (isset ($_SESSION[$usrType.'UsrConfigSet'])) {
+                $usrSettings = &$_SESSION[$usrType.'UsrConfigSet'];
             } else {
                 if ($usrType == 'web') {
                     $from = $tbl_web_user_settings;
@@ -532,7 +532,7 @@ 
                     $usrSettings[$row['setting_name']] = $row['setting_value'];
                 }
                 if (isset ($usrType)) {
-                    $_SESSION[$usrType . 'UsrConfigSet'] = $usrSettings;
+                    $_SESSION[$usrType.'UsrConfigSet'] = $usrSettings;
                 } // store user settings in session
             }
         }
@@ -677,10 +677,10 @@ 
         $suf = $this->config['friendly_url_suffix'];
         $pre = preg_quote($pre, '/');
         $suf = preg_quote($suf, '/');
-        if ($pre && preg_match('@^' . $pre . '(.*)$@', $q, $_)) {
+        if ($pre && preg_match('@^'.$pre.'(.*)$@', $q, $_)) {
             $q = $_[1];
         }
-        if ($suf && preg_match('@(.*)' . $suf . '$@', $q, $_)) {
+        if ($suf && preg_match('@(.*)'.$suf.'$@', $q, $_)) {
             $q = $_[1];
         }
 
@@ -702,7 +702,7 @@ 
         if (preg_match('@^[1-9][0-9]*$@', $q) && !isset($this->documentListing[$q])) { /* we got an ID returned, check to make sure it's not an alias */
             /* FS#476 and FS#308: check that id is valid in terms of virtualDir structure */
             if ($this->config['use_alias_path'] == 1) {
-                if (($this->virtualDir != '' && !isset($this->documentListing[$this->virtualDir . '/' . $q]) || ($this->virtualDir == '' && !isset($this->documentListing[$q]))) && (($this->virtualDir != '' && isset($this->documentListing[$this->virtualDir]) && in_array($q, $this->getChildIds($this->documentListing[$this->virtualDir], 1))) || ($this->virtualDir == '' && in_array($q, $this->getChildIds(0, 1))))) {
+                if (($this->virtualDir != '' && !isset($this->documentListing[$this->virtualDir.'/'.$q]) || ($this->virtualDir == '' && !isset($this->documentListing[$q]))) && (($this->virtualDir != '' && isset($this->documentListing[$this->virtualDir]) && in_array($q, $this->getChildIds($this->documentListing[$this->virtualDir], 1))) || ($this->virtualDir == '' && in_array($q, $this->getChildIds(0, 1))))) {
                     $this->documentMethod = 'id';
                     return $q;
                 } else { /* not a valid id in terms of virtualDir, treat as alias */
@@ -736,7 +736,7 @@ 
      */
     public function getHashFile($key)
     {
-        return $this->getCacheFolder() . "docid_" . $key . ".pageCache.php";
+        return $this->getCacheFolder()."docid_".$key.".pageCache.php";
     }
 
     /**
@@ -747,9 +747,9 @@ 
         $hash = $id;
         $tmp = null;
         $params = array();
-        if(!empty($this->systemCacheKey)){
+        if (!empty($this->systemCacheKey)) {
             $hash = $this->systemCacheKey;
-        }else {
+        } else {
             if (!empty($_GET)) {
                 // Sort GET parameters so that the order of parameters on the HTTP request don't affect the generated cache ID.
                 $params = $_GET;
@@ -757,8 +757,8 @@ 
                 $hash .= '_'.md5(http_build_query($params));
             }
         }
-        $evtOut = $this->invokeEvent("OnMakePageCacheKey", array ("hash" => $hash, "id" => $id, 'params' => $params));
-        if (is_array($evtOut) && count($evtOut) > 0){
+        $evtOut = $this->invokeEvent("OnMakePageCacheKey", array("hash" => $hash, "id" => $id, 'params' => $params));
+        if (is_array($evtOut) && count($evtOut) > 0) {
             $tmp = array_pop($evtOut);
         }
         return empty($tmp) ? $hash : $tmp;
@@ -900,12 +900,12 @@ 
         if ($js = $this->getRegisteredClientStartupScripts()) {
             // change to just before closing </head>
             // $this->documentContent = preg_replace("/(<head[^>]*>)/i", "\\1\n".$js, $this->documentContent);
-            $this->documentOutput = preg_replace("/(<\/head>)/i", $js . "\n\\1", $this->documentOutput);
+            $this->documentOutput = preg_replace("/(<\/head>)/i", $js."\n\\1", $this->documentOutput);
         }
 
         // Insert jscripts & html block into template - template must have a </body> tag
         if ($js = $this->getRegisteredClientScripts()) {
-            $this->documentOutput = preg_replace("/(<\/body>)/i", $js . "\n\\1", $this->documentOutput);
+            $this->documentOutput = preg_replace("/(<\/body>)/i", $js."\n\\1", $this->documentOutput);
         }
         // End fix by sirlancelot
 
@@ -916,7 +916,7 @@ 
         // send out content-type and content-disposition headers
         if (IN_PARSER_MODE == "true") {
             $type = !empty ($this->contentTypes[$this->documentIdentifier]) ? $this->contentTypes[$this->documentIdentifier] : "text/html";
-            header('Content-Type: ' . $type . '; charset=' . $this->config['modx_charset']);
+            header('Content-Type: '.$type.'; charset='.$this->config['modx_charset']);
             //            if (($this->documentIdentifier == $this->config['error_page']) || $redirect_error)
             //                header('HTTP/1.0 404 Not Found');
             if (!$this->checkPreview() && $this->documentObject['content_dispo'] == 1) {
@@ -934,7 +934,7 @@ 
                     $name = preg_replace('|-+|', '-', $name);
                     $name = trim($name, '-');
                 }
-                $header = 'Content-Disposition: attachment; filename=' . $name;
+                $header = 'Content-Disposition: attachment; filename='.$name;
                 header($header);
             }
         }
@@ -942,7 +942,7 @@ 
 
         $stats = $this->getTimerStats($this->tstart);
 
-        $out =& $this->documentOutput;
+        $out = & $this->documentOutput;
         $out = str_replace("[^q^]", $stats['queries'], $out);
         $out = str_replace("[^qt^]", $stats['queryTime'], $out);
         $out = str_replace("[^p^]", $stats['phpTime'], $out);
@@ -981,17 +981,17 @@ 
                 $sc .= sprintf("%s. %s (%s)<br>", $s, $sname, sprintf("%2.2f ms", $t)); // currentSnippet
                 $tt += $t;
             }
-            echo "<fieldset><legend><b>Snippets</b> (" . count($this->snippetsTime) . " / " . sprintf("%2.2f ms", $tt) . ")</legend>{$sc}</fieldset><br />";
+            echo "<fieldset><legend><b>Snippets</b> (".count($this->snippetsTime)." / ".sprintf("%2.2f ms", $tt).")</legend>{$sc}</fieldset><br />";
             echo $this->snippetsCode;
         }
         if ($this->dumpPlugins) {
             $ps = "";
             $tt = 0;
             foreach ($this->pluginsTime as $s => $t) {
-                $ps .= "$s (" . sprintf("%2.2f ms", $t * 1000) . ")<br>";
+                $ps .= "$s (".sprintf("%2.2f ms", $t * 1000).")<br>";
                 $tt += $t;
             }
-            echo "<fieldset><legend><b>Plugins</b> (" . count($this->pluginsTime) . " / " . sprintf("%2.2f ms", $tt * 1000) . ")</legend>{$ps}</fieldset><br />";
+            echo "<fieldset><legend><b>Plugins</b> (".count($this->pluginsTime)." / ".sprintf("%2.2f ms", $tt * 1000).")</legend>{$ps}</fieldset><br />";
             echo $this->pluginsCode;
         }
 
@@ -1017,7 +1017,7 @@ 
         $srcTags = explode(',', $tags);
         $repTags = array();
         foreach ($srcTags as $tag) {
-            $repTags[] = '\\' . $tag[0] . '\\' . $tag[1];
+            $repTags[] = '\\'.$tag[0].'\\'.$tag[1];
         }
         return array($srcTags, $repTags);
     }
@@ -1039,7 +1039,7 @@ 
         $stats['phpTime'] = sprintf("%2.4f s", $stats['phpTime']);
         $stats['source'] = $this->documentGenerated == 1 ? "database" : "cache";
         $stats['queries'] = isset ($this->executedQueries) ? $this->executedQueries : 0;
-        $stats['phpMemory'] = (memory_get_peak_usage(true) / 1024 / 1024) . " mb";
+        $stats['phpMemory'] = (memory_get_peak_usage(true) / 1024 / 1024)." mb";
 
         return $stats;
     }
@@ -1072,7 +1072,7 @@ 
     {
         $cacheRefreshTime = 0;
         $recent_update = 0;
-        @include(MODX_BASE_PATH . $this->getCacheFolder() . 'sitePublishing.idx.php');
+        @include(MODX_BASE_PATH.$this->getCacheFolder().'sitePublishing.idx.php');
         $this->recentUpdate = $recent_update;
 
         $timeNow = $_SERVER['REQUEST_TIME'] + $this->config['server_offset_time'];
@@ -1126,8 +1126,8 @@ 
                 }
 
                 $docObjSerial = serialize($this->documentObject);
-                $cacheContent = $docObjSerial . "<!--__MODxCacheSpliter__-->" . $this->documentContent;
-                $page_cache_path = MODX_BASE_PATH . $this->getHashFile($this->cacheKey);
+                $cacheContent = $docObjSerial."<!--__MODxCacheSpliter__-->".$this->documentContent;
+                $page_cache_path = MODX_BASE_PATH.$this->getHashFile($this->cacheKey);
                 file_put_contents($page_cache_path, "<?php die('Unauthorized access.'); ?>$cacheContent");
             }
         }
@@ -1169,16 +1169,16 @@ 
             return array();
         }
         $spacer = md5('<<<EVO>>>');
-        if($left==='{{' && strpos($content,';}}')!==false)  $content = str_replace(';}}', sprintf(';}%s}',   $spacer),$content);
-        if($left==='{{' && strpos($content,'{{}}')!==false) $content = str_replace('{{}}',sprintf('{%$1s{}%$1s}',$spacer),$content);
-        if($left==='[[' && strpos($content,']]]]')!==false) $content = str_replace(']]]]',sprintf(']]%s]]',  $spacer),$content);
-        if($left==='[[' && strpos($content,']]]')!==false)  $content = str_replace(']]]', sprintf(']%s]]',   $spacer),$content);
+        if ($left === '{{' && strpos($content, ';}}') !== false)  $content = str_replace(';}}', sprintf(';}%s}', $spacer), $content);
+        if ($left === '{{' && strpos($content, '{{}}') !== false) $content = str_replace('{{}}', sprintf('{%$1s{}%$1s}', $spacer), $content);
+        if ($left === '[[' && strpos($content, ']]]]') !== false) $content = str_replace(']]]]', sprintf(']]%s]]', $spacer), $content);
+        if ($left === '[[' && strpos($content, ']]]') !== false)  $content = str_replace(']]]', sprintf(']%s]]', $spacer), $content);
 
         $pos['<![CDATA['] = strpos($content, '<![CDATA[');
         $pos[']]>'] = strpos($content, ']]>');
 
         if ($pos['<![CDATA['] !== false && $pos[']]>'] !== false) {
-            $content = substr($content, 0, $pos['<![CDATA[']) . substr($content, $pos[']]>'] + 3);
+            $content = substr($content, 0, $pos['<![CDATA[']).substr($content, $pos[']]>'] + 3);
         }
 
         $lp = explode($left, $content);
@@ -1242,8 +1242,8 @@ 
                 }
             }
         }
-        foreach($tags as $i=>$tag) {
-            if(strpos($tag,$spacer)!==false) $tags[$i] = str_replace($spacer, '', $tag);
+        foreach ($tags as $i=>$tag) {
+            if (strpos($tag, $spacer) !== false) $tags[$i] = str_replace($spacer, '', $tag);
         }
         return $tags;
     }
@@ -1283,7 +1283,7 @@ 
         }
 
         foreach ($matches[1] as $i => $key) {
-            if(strpos($key,'[+')!==false) continue; // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
+            if (strpos($key, '[+') !== false) continue; // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
             if (substr($key, 0, 1) == '#') {
                 $key = substr($key, 1);
             } // remove # for QuickEdit format
@@ -1303,8 +1303,8 @@ 
             }
 
             if (is_array($value)) {
-                include_once(MODX_MANAGER_PATH . 'includes/tmplvars.format.inc.php');
-                include_once(MODX_MANAGER_PATH . 'includes/tmplvars.commands.inc.php');
+                include_once(MODX_MANAGER_PATH.'includes/tmplvars.format.inc.php');
+                include_once(MODX_MANAGER_PATH.'includes/tmplvars.commands.inc.php');
                 $value = getTVDisplayFormat($value[0], $value[1], $value[2], $value[3], $value[4]);
             }
 
@@ -1315,8 +1315,8 @@ 
 
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('mergeDocumentContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('mergeDocumentContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -1483,8 +1483,8 @@ 
             $s = &$matches[0][$i];
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('mergeSettingsContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('mergeSettingsContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
         return $content;
@@ -1537,7 +1537,7 @@ 
             }
 
             $value = $this->parseText($value, $params); // parse local scope placeholers for ConditionalTags
-            $value = $this->mergePlaceholderContent($value, $params);  // parse page global placeholers
+            $value = $this->mergePlaceholderContent($value, $params); // parse page global placeholers
             if ($this->config['enable_at_syntax']) {
                 $value = $this->mergeConditionalTagsContent($value);
             }
@@ -1552,8 +1552,8 @@ 
             $s = &$matches[0][$i];
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('mergeChunkContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('mergeChunkContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
         return $content;
@@ -1611,8 +1611,8 @@ 
             $s = &$matches[0][$i];
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('mergePlaceholderContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('mergePlaceholderContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
         return $content;
@@ -1636,7 +1636,7 @@ 
             return $content;
         }
 
-        $sp = '#' . md5('ConditionalTags' . $_SERVER['REQUEST_TIME']) . '#';
+        $sp = '#'.md5('ConditionalTags'.$_SERVER['REQUEST_TIME']).'#';
         $content = str_replace(array('<?php', '<?=', '<?', '?>'), array("{$sp}b", "{$sp}p", "{$sp}s", "{$sp}e"), $content);
 
         $pieces = explode('<@IF:', $content);
@@ -1647,7 +1647,7 @@ 
             }
             list($cmd, $text) = explode('>', $split, 2);
             $cmd = str_replace("'", "\'", $cmd);
-            $content .= "<?php if(\$this->_parseCTagCMD('" . $cmd . "')): ?>";
+            $content .= "<?php if(\$this->_parseCTagCMD('".$cmd."')): ?>";
             $content .= $text;
         }
         $pieces = explode('<@ELSEIF:', $content);
@@ -1658,13 +1658,13 @@ 
             }
             list($cmd, $text) = explode('>', $split, 2);
             $cmd = str_replace("'", "\'", $cmd);
-            $content .= "<?php elseif(\$this->_parseCTagCMD('" . $cmd . "')): ?>";
+            $content .= "<?php elseif(\$this->_parseCTagCMD('".$cmd."')): ?>";
             $content .= $text;
         }
 
         $content = str_replace(array('<@ELSE>', '<@ENDIF>'), array('<?php else:?>', '<?php endif;?>'), $content);
         ob_start();
-        $content = eval('?>' . $content);
+        $content = eval('?>'.$content);
         $content = ob_get_clean();
         $content = str_replace(array("{$sp}b", "{$sp}p", "{$sp}s", "{$sp}e"), array('<?php', '<?=', '<?', '?>'), $content);
 
@@ -1789,7 +1789,7 @@ 
         $matches = $this->getTagsFromContent($content, $left, $right);
         if (!empty($matches)) {
             foreach ($matches[0] as $i => $v) {
-                $addBreakMatches[$i] = $v . "\n";
+                $addBreakMatches[$i] = $v."\n";
             }
             $content = str_replace($addBreakMatches, '', $content);
             if (strpos($content, $left) !== false) {
@@ -1822,8 +1822,8 @@ 
             $s = &$matches[0][$i];
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $v, $content);
-            } elseif($this->debug) {
-                $this->addLog('ignoreCommentedTagsContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('ignoreCommentedTagsContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
         return $content;
@@ -1887,7 +1887,7 @@ 
                 $msg = ($msg === false) ? 'ob_get_contents() error' : $msg;
                 $this->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], 'Plugin', $error_info['message'], $error_info['line'], $msg);
                 if ($this->isBackend()) {
-                    $this->event->alert('An error occurred while loading. Please see the event log for more information.<p>' . $msg . '</p>');
+                    $this->event->alert('An error occurred while loading. Please see the event log for more information.<p>'.$msg.'</p>');
                 }
             }
         } else {
@@ -1933,7 +1933,7 @@ 
                 $echo = ($echo === false) ? 'ob_get_contents() error' : $echo;
                 $this->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], 'Snippet', $error_info['message'], $error_info['line'], $echo);
                 if ($this->isBackend()) {
-                    $this->event->alert('An error occurred while loading. Please see the event log for more information<p>' . $echo . $return . '</p>');
+                    $this->event->alert('An error occurred while loading. Please see the event log for more information<p>'.$echo.$return.'</p>');
                 }
             }
         }
@@ -1941,7 +1941,7 @@ 
         if (is_array($return) || is_object($return)) {
             return $return;
         } else {
-            return $echo . $return;
+            return $echo.$return;
         }
     }
 
@@ -1979,8 +1979,8 @@ 
                 }
                 if (strpos($content, $s) !== false) {
                     $content = str_replace($s, $value, $content);
-                } elseif($this->debug) {
-                    $this->addLog('evalSnippetsSGVar parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+                } elseif ($this->debug) {
+                    $this->addLog('evalSnippetsSGVar parse error', $_SERVER['REQUEST_URI'].$s, 2);
                 }
                 continue;
             }
@@ -1991,8 +1991,8 @@ 
 
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('evalSnippets parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('evalSnippets parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -2083,7 +2083,7 @@ 
             $eventtime = sprintf('%2.2f ms', $eventtime * 1000);
             $code = str_replace("\t", '  ', $this->htmlspecialchars($value));
             $piece = str_replace("\t", '  ', $this->htmlspecialchars($piece));
-            $print_r_params = str_replace("\t", '  ', $this->htmlspecialchars('$modx->event->params = ' . print_r($params, true)));
+            $print_r_params = str_replace("\t", '  ', $this->htmlspecialchars('$modx->event->params = '.print_r($params, true)));
             $this->snippetsCode .= sprintf('<fieldset style="margin:1em;"><legend><b>%s</b>(%s)</legend><pre style="white-space: pre-wrap;background-color:#fff;width:90%%;">[[%s]]</pre><pre style="white-space: pre-wrap;background-color:#fff;width:90%%;">%s</pre><pre style="white-space: pre-wrap;background-color:#fff;width:90%%;">%s</pre></fieldset>', $snippetObject['name'], $eventtime, $piece, $print_r_params, $code);
             $this->snippetsTime[] = array('sname' => $key, 'time' => $eventtime);
         }
@@ -2327,7 +2327,7 @@ 
             $rs = $this->db->select('name,snippet,properties', '[+prefix+]site_snippets', $where);
             $count = $this->db->getRecordCount($rs);
             if (1 < $count) {
-                exit('Error $modx->_getSnippetObject()' . $snip_name);
+                exit('Error $modx->_getSnippetObject()'.$snip_name);
             }
             if ($count) {
                 $row = $this->db->getRow($rs);
@@ -2353,7 +2353,7 @@ 
     public function toAlias($text)
     {
         $suff = $this->config['friendly_url_suffix'];
-        return str_replace(array('.xml' . $suff, '.rss' . $suff, '.js' . $suff, '.css' . $suff, '.txt' . $suff, '.json' . $suff, '.pdf' . $suff), array('.xml', '.rss', '.js', '.css', '.txt', '.json', '.pdf'), $text);
+        return str_replace(array('.xml'.$suff, '.rss'.$suff, '.js'.$suff, '.css'.$suff, '.txt'.$suff, '.json'.$suff, '.pdf'.$suff), array('.xml', '.rss', '.js', '.css', '.txt', '.json', '.pdf'), $text);
     }
 
     /**
@@ -2385,7 +2385,7 @@ 
                 $suff = '/';
             }
 
-            $url = ($dir != '' ? $dir . '/' : '') . $pre . $alias . $suff;
+            $url = ($dir != '' ? $dir.'/' : '').$pre.$alias.$suff;
         }
 
         $evtOut = $this->invokeEvent('OnMakeDocUrl', array(
@@ -2422,7 +2422,7 @@ 
                 preg_match_all('!\[\~([0-9]+)\~\]!ise', $documentSource, $match);
                 $ids = implode(',', array_unique($match['1']));
                 if ($ids) {
-                    $res = $this->db->select("id,alias,isfolder,parent,alias_visible", $this->getFullTableName('site_content'), "id IN (" . $ids . ") AND isfolder = '0'");
+                    $res = $this->db->select("id,alias,isfolder,parent,alias_visible", $this->getFullTableName('site_content'), "id IN (".$ids.") AND isfolder = '0'");
                     while ($row = $this->db->getRow($res)) {
                         if ($this->config['use_alias_path'] == '1' && $row['parent'] != 0) {
                             $parent = $row['parent'];
@@ -2433,7 +2433,7 @@ 
                                 $parent = $this->aliasListing[$parent]['parent'];
                             }
 
-                            $aliases[$row['id']] = $path . '/' . $row['alias'];
+                            $aliases[$row['id']] = $path.'/'.$row['alias'];
                         } else {
                             $aliases[$row['id']] = $row['alias'];
                         }
@@ -2445,7 +2445,7 @@ 
             $isfriendly = ($this->config['friendly_alias_urls'] == 1 ? 1 : 0);
             $pref = $this->config['friendly_url_prefix'];
             $suff = $this->config['friendly_url_suffix'];
-            $documentSource = preg_replace_callback($in, function ($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff) {
+            $documentSource = preg_replace_callback($in, function($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff) {
                 global $modx;
                 $thealias = $aliases[$m[1]];
                 $thefolder = $isfolder[$m[1]];
@@ -2461,7 +2461,7 @@ 
 
         } else {
             $in = '!\[\~([0-9]+)\~\]!is';
-            $out = "index.php?id=" . '\1';
+            $out = "index.php?id=".'\1';
             $documentSource = preg_replace($in, $out, $documentSource);
         }
 
@@ -2482,7 +2482,7 @@ 
         $scheme = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
         $len_base_url = strlen($this->config['base_url']);
 
-        $url_path = $q;//LANG
+        $url_path = $q; //LANG
 
         if (substr($url_path, 0, $len_base_url) === $this->config['base_url']) {
             $url_path = substr($url_path, $len_base_url);
@@ -2494,7 +2494,7 @@ 
             $strictURL = substr($strictURL, $len_base_url);
         }
         $http_host = $_SERVER['HTTP_HOST'];
-        $requestedURL = "{$scheme}://{$http_host}" . '/' . $q; //LANG
+        $requestedURL = "{$scheme}://{$http_host}".'/'.$q; //LANG
 
         $site_url = $this->config['site_url'];
 
@@ -2510,7 +2510,7 @@ 
                 }
                 if ($this->config['base_url'] != $_SERVER['REQUEST_URI']) {
                     if (empty($_POST)) {
-                        if (($this->config['base_url'] . '?' . $qstring) != $_SERVER['REQUEST_URI']) {
+                        if (($this->config['base_url'].'?'.$qstring) != $_SERVER['REQUEST_URI']) {
                             $this->sendRedirect($url, 0, 'REDIRECT_HEADER', 'HTTP/1.0 301 Moved Permanently');
                             exit(0);
                         }
@@ -2573,7 +2573,7 @@ 
                 $docgrp = implode(",", $docgrp);
             }
             // get document
-            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
             $rs = $this->db->select('sc.*', "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg ON dg.document = sc.id", "sc.{$method} = '{$identifier}' AND ({$access})", "", 1);
             if ($this->db->getRecordCount($rs) < 1) {
@@ -2609,9 +2609,9 @@ 
             }
             if ($documentObject['template']) {
                 // load TVs and merge with document - Orig by Apodigm - Docvars
-                $rs = $this->db->select("tv.*, IF(tvc.value!='',tvc.value,tv.default_text) as value", $this->getFullTableName("site_tmplvars") . " tv
-                INNER JOIN " . $this->getFullTableName("site_tmplvar_templates") . " tvtpl ON tvtpl.tmplvarid = tv.id
-                LEFT JOIN " . $this->getFullTableName("site_tmplvar_contentvalues") . " tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$documentObject['id']}'", "tvtpl.templateid = '{$documentObject['template']}'");
+                $rs = $this->db->select("tv.*, IF(tvc.value!='',tvc.value,tv.default_text) as value", $this->getFullTableName("site_tmplvars")." tv
+                INNER JOIN " . $this->getFullTableName("site_tmplvar_templates")." tvtpl ON tvtpl.tmplvarid = tv.id
+                LEFT JOIN " . $this->getFullTableName("site_tmplvar_contentvalues")." tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$documentObject['id']}'", "tvtpl.templateid = '{$documentObject['template']}'");
                 $tmplvars = array();
                 while ($row = $this->db->getRow($rs)) {
                     $tmplvars[$row['name']] = array(
@@ -2657,7 +2657,7 @@ 
                 $st = md5($source);
             }
             if ($this->dumpSnippets == 1) {
-                $this->snippetsCode .= "<fieldset><legend><b style='color: #821517;'>PARSE PASS " . ($i + 1) . "</b></legend><p>The following snippets (if any) were parsed during this pass.</p>";
+                $this->snippetsCode .= "<fieldset><legend><b style='color: #821517;'>PARSE PASS ".($i + 1)."</b></legend><p>The following snippets (if any) were parsed during this pass.</p>";
             }
 
             // invoke OnParseDocument event
@@ -2743,7 +2743,7 @@ 
 
             // Check use_alias_path and check if $this->virtualDir is set to anything, then parse the path
             if ($this->config['use_alias_path'] == 1) {
-                $alias = (strlen($this->virtualDir) > 0 ? $this->virtualDir . '/' : '') . $this->documentIdentifier;
+                $alias = (strlen($this->virtualDir) > 0 ? $this->virtualDir.'/' : '').$this->documentIdentifier;
                 if (isset($this->documentListing[$alias])) {
                     $this->documentIdentifier = $this->documentListing[$alias];
                 } else {
@@ -2804,7 +2804,7 @@ 
                 } else {
                     $docAlias = $this->db->escape($this->documentIdentifier);
                     $rs = $this->db->select('id', $this->getFullTableName('site_content'), "deleted=0 and alias='{$docAlias}'");
-                    $this->documentIdentifier = (int)$this->db->getValue($rs);
+                    $this->documentIdentifier = (int) $this->db->getValue($rs);
                 }
             }
             $this->documentMethod = 'id';
@@ -2857,7 +2857,7 @@ 
                 $_REQUEST[$n] = $_GET[$n] = $v;
             }
         }
-        $_SERVER['PHP_SELF'] = $this->config['base_url'] . $qp['path'];
+        $_SERVER['PHP_SELF'] = $this->config['base_url'].$qp['path'];
         $this->q = $qp['path'];
         return $qp['path'];
     }
@@ -2951,7 +2951,7 @@ 
             $this->sendErrorPage();
         } else {
             // Inculde the necessary files to check document permissions
-            include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
+            include_once(MODX_MANAGER_PATH.'processors/user_documents_permissions.class.php');
             $udperms = new udperms();
             $udperms->user = $this->getLoginUserID();
             $udperms->document = $this->documentIdentifier;
@@ -3005,7 +3005,7 @@ 
         while ($id && $height--) {
             $thisid = $id;
             if ($this->config['aliaslistingfolder'] == 1) {
-                $id = isset($this->aliasListing[$id]['parent']) ? $this->aliasListing[$id]['parent'] : $this->db->getValue("SELECT `parent` FROM " . $this->getFullTableName("site_content") . " WHERE `id` = '{$id}' LIMIT 0,1");
+                $id = isset($this->aliasListing[$id]['parent']) ? $this->aliasListing[$id]['parent'] : $this->db->getValue("SELECT `parent` FROM ".$this->getFullTableName("site_content")." WHERE `id` = '{$id}' LIMIT 0,1");
                 if (!$id || $id == '0') {
                     break;
                 }
@@ -3056,15 +3056,15 @@ 
 
         if ($this->config['aliaslistingfolder'] == 1) {
 
-            $res = $this->db->select("id,alias,isfolder,parent", $this->getFullTableName('site_content'), "parent IN (" . $id . ") AND deleted = '0'");
+            $res = $this->db->select("id,alias,isfolder,parent", $this->getFullTableName('site_content'), "parent IN (".$id.") AND deleted = '0'");
             $idx = array();
             while ($row = $this->db->getRow($res)) {
                 $pAlias = '';
                 if (isset($this->aliasListing[$row['parent']])) {
-                    $pAlias .= !empty($this->aliasListing[$row['parent']]['path']) ? $this->aliasListing[$row['parent']]['path'] . '/' : '';
-                    $pAlias .= !empty($this->aliasListing[$row['parent']]['alias']) ? $this->aliasListing[$row['parent']]['alias'] . '/' : '';
+                    $pAlias .= !empty($this->aliasListing[$row['parent']]['path']) ? $this->aliasListing[$row['parent']]['path'].'/' : '';
+                    $pAlias .= !empty($this->aliasListing[$row['parent']]['alias']) ? $this->aliasListing[$row['parent']]['alias'].'/' : '';
                 };
-                $children[$pAlias . $row['alias']] = $row['id'];
+                $children[$pAlias.$row['alias']] = $row['id'];
                 if ($row['isfolder'] == 1) {
                     $idx[] = $row['id'];
                 }
@@ -3096,7 +3096,7 @@ 
                 $depth--;
 
                 foreach ($documentMap_cache[$id] as $childId) {
-                    $pkey = (strlen($this->aliasListing[$childId]['path']) ? "{$this->aliasListing[$childId]['path']}/" : '') . $this->aliasListing[$childId]['alias'];
+                    $pkey = (strlen($this->aliasListing[$childId]['path']) ? "{$this->aliasListing[$childId]['path']}/" : '').$this->aliasListing[$childId]['alias'];
                     if (!strlen($pkey)) {
                         $pkey = "{$childId}";
                     }
@@ -3125,7 +3125,7 @@ 
         if (substr(strtolower($url), 0, 11) == "javascript:") {
             $fnc = substr($url, 11);
         } elseif ($url) {
-            $fnc = "window.location.href='" . addslashes($url) . "';";
+            $fnc = "window.location.href='".addslashes($url)."';";
         } else {
             $fnc = "history.back(-1);";
         }
@@ -3134,7 +3134,7 @@ 
             <meta http-equiv=\"Content-Type\" content=\"text/html; charset={$modx_manager_charset};\">
             <script>
                 function __alertQuit() {
-                    alert('" . addslashes($msg) . "');
+                    alert('".addslashes($msg)."');
                     {$fnc}
                 }
                 window.setTimeout('__alertQuit();',100);
@@ -3158,7 +3158,7 @@ 
         if ($pms) {
             $state = ($pms[$pm] == 1);
         }
-        return (int)$state;
+        return (int) $state;
     }
 
     /**
@@ -3171,8 +3171,8 @@ 
      */
     public function elementIsLocked($type, $id, $includeThisUser = false)
     {
-        $id = (int)$id;
-        $type = (int)$type;
+        $id = (int) $id;
+        $type = (int) $type;
         if (!$type || !$id) {
             return null;
         }
@@ -3222,7 +3222,7 @@ 
             return $lockedElements;
         }
 
-        $type = (int)$type;
+        $type = (int) $type;
         if (isset($lockedElements[$type])) {
             return $lockedElements[$type];
         } else {
@@ -3239,7 +3239,7 @@ 
             $this->lockedElements = array();
             $this->cleanupExpiredLocks();
 
-            $rs = $this->db->select('sid,internalKey,elementType,elementId,lasthit,username', $this->getFullTableName('active_user_locks') . " ul
+            $rs = $this->db->select('sid,internalKey,elementType,elementId,lasthit,username', $this->getFullTableName('active_user_locks')." ul
                 LEFT JOIN {$this->getFullTableName('manager_users')} mu on ul.internalKey = mu.id");
             while ($row = $this->db->getRow($rs)) {
                 $this->lockedElements[$row['elementType']][$row['elementId']] = array(
@@ -3262,7 +3262,7 @@ 
     public function cleanupExpiredLocks()
     {
         // Clean-up active_user_sessions first
-        $timeout = (int)$this->config['session_timeout'] < 2 ? 120 : $this->config['session_timeout'] * 60; // session.js pings every 10min, updateMail() in mainMenu pings every minute, so 2min is minimum
+        $timeout = (int) $this->config['session_timeout'] < 2 ? 120 : $this->config['session_timeout'] * 60; // session.js pings every 10min, updateMail() in mainMenu pings every minute, so 2min is minimum
         $validSessionTimeLimit = $this->time - $timeout;
         $this->db->delete($this->getFullTableName('active_user_sessions'), "lasthit < {$validSessionTimeLimit}");
 
@@ -3275,7 +3275,7 @@ 
             foreach ($rs as $row) {
                 $userSids[] = $row['sid'];
             }
-            $userSids = "'" . implode("','", $userSids) . "'";
+            $userSids = "'".implode("','", $userSids)."'";
             $this->db->delete($this->getFullTableName('active_user_locks'), "sid NOT IN({$userSids})");
         } else {
             $this->db->delete($this->getFullTableName('active_user_locks'));
@@ -3359,8 +3359,8 @@ 
     public function lockElement($type, $id)
     {
         $userId = $this->isBackend() && $_SESSION['mgrInternalKey'] ? $_SESSION['mgrInternalKey'] : 0;
-        $type = (int)$type;
-        $id = (int)$id;
+        $type = (int) $type;
+        $id = (int) $id;
         if (!$type || !$id || !$userId) {
             return false;
         }
@@ -3381,8 +3381,8 @@ 
     public function unlockElement($type, $id, $includeAllUsers = false)
     {
         $userId = $this->isBackend() && $_SESSION['mgrInternalKey'] ? $_SESSION['mgrInternalKey'] : 0;
-        $type = (int)$type;
-        $id = (int)$id;
+        $type = (int) $type;
+        $id = (int) $id;
         if (!$type || !$id) {
             return false;
         }
@@ -3449,8 +3449,8 @@ 
         }
 
         $usertype = $this->isFrontend() ? 1 : 0;
-        $evtid = (int)$evtid;
-        $type = (int)$type;
+        $evtid = (int) $evtid;
+        $type = (int) $type;
 
         // Types: 1 = information, 2 = warning, 3 = error
         if ($type < 1) {
@@ -3472,8 +3472,8 @@ 
         if (isset($this->config['send_errormail']) && $this->config['send_errormail'] !== '0') {
             if ($this->config['send_errormail'] <= $type) {
                 $this->sendmail(array(
-                    'subject' => 'MODX System Error on ' . $this->config['site_name'],
-                    'body' => 'Source: ' . $source . ' - The details of the error could be seen in the MODX system events log.',
+                    'subject' => 'MODX System Error on '.$this->config['site_name'],
+                    'body' => 'Source: '.$source.' - The details of the error could be seen in the MODX system events log.',
                     'type' => 'text'
                 ));
             }
@@ -3521,7 +3521,7 @@ 
             $p['fromname'] = $userinfo['username'];
         }
         if ($msg === '' && !isset($p['body'])) {
-            $p['body'] = $_SERVER['REQUEST_URI'] . "\n" . $_SERVER['HTTP_USER_AGENT'] . "\n" . $_SERVER['HTTP_REFERER'];
+            $p['body'] = $_SERVER['REQUEST_URI']."\n".$_SERVER['HTTP_USER_AGENT']."\n".$_SERVER['HTTP_REFERER'];
         } elseif (is_string($msg) && 0 < strlen($msg)) {
             $p['body'] = $msg;
         }
@@ -3561,8 +3561,8 @@ 
             $files = array();
         }
         foreach ($files as $f) {
-            if (file_exists(MODX_BASE_PATH . $f) && is_file(MODX_BASE_PATH . $f) && is_readable(MODX_BASE_PATH . $f)) {
-                $this->mail->AddAttachment(MODX_BASE_PATH . $f);
+            if (file_exists(MODX_BASE_PATH.$f) && is_file(MODX_BASE_PATH.$f) && is_readable(MODX_BASE_PATH.$f)) {
+                $this->mail->AddAttachment(MODX_BASE_PATH.$f);
             }
         }
         $rs = $this->mail->send();
@@ -3607,7 +3607,7 @@ 
      */
     public function isFrontend()
     {
-        return ! $this->isBackend();
+        return !$this->isBackend();
     }
 
     /**
@@ -3632,14 +3632,14 @@ 
         $tblsc = $this->getFullTableName("site_content");
         $tbldg = $this->getFullTableName("document_groups");
         // modify field names to use sc. table reference
-        $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-        $sort = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+        $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+        $sort = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
         // get document groups for current user
         if ($docgrp = $this->getUserDocGroups()) {
             $docgrp = implode(",", $docgrp);
         }
         // build query
-        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
         $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg on dg.document = sc.id", "sc.parent = '{$id}' AND ({$access}) GROUP BY sc.id", "{$sort} {$dir}");
         $resourceArray = $this->db->makeArray($result);
@@ -3669,14 +3669,14 @@ 
         $tbldg = $this->getFullTableName("document_groups");
 
         // modify field names to use sc. table reference
-        $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-        $sort = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+        $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+        $sort = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
         // get document groups for current user
         if ($docgrp = $this->getUserDocGroups()) {
             $docgrp = implode(",", $docgrp);
         }
         // build query
-        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
         $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg on dg.document = sc.id", "sc.parent = '{$id}' AND sc.published=1 AND sc.deleted=0 AND ({$access}) GROUP BY sc.id", "{$sort} {$dir}");
         $resourceArray = $this->db->makeArray($result);
@@ -3711,16 +3711,16 @@ 
             return $this->tmpCache[__FUNCTION__][$cacheKey];
         }
 
-        $published = ($published !== 'all') ? 'AND sc.published = ' . $published : '';
-        $deleted = ($deleted !== 'all') ? 'AND sc.deleted = ' . $deleted : '';
+        $published = ($published !== 'all') ? 'AND sc.published = '.$published : '';
+        $deleted = ($deleted !== 'all') ? 'AND sc.deleted = '.$deleted : '';
 
         if ($where != '') {
-            $where = 'AND ' . $where;
+            $where = 'AND '.$where;
         }
 
         // modify field names to use sc. table reference
-        $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-        $sort = ($sort == '') ? '' : 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+        $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+        $sort = ($sort == '') ? '' : 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
 
         // get document groups for current user
         if ($docgrp = $this->getUserDocGroups()) {
@@ -3728,7 +3728,7 @@ 
         }
 
         // build query
-        $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="' . $_SESSION['mgrRole'] . '" OR sc.privatemgr=0') . (!$docgrp ? '' : ' OR dg.document_group IN (' . $docgrp . ')');
+        $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="'.$_SESSION['mgrRole'].'" OR sc.privatemgr=0').(!$docgrp ? '' : ' OR dg.document_group IN ('.$docgrp.')');
 
         $tblsc = $this->getFullTableName('site_content');
         $tbldg = $this->getFullTableName('document_groups');
@@ -3780,10 +3780,10 @@ 
             return false;
         } else {
             // modify field names to use sc. table reference
-            $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-            $sort = ($sort == '') ? '' : 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+            $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+            $sort = ($sort == '') ? '' : 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
             if ($where != '') {
-                $where = 'AND ' . $where;
+                $where = 'AND '.$where;
             }
 
             $published = ($published !== 'all') ? "AND sc.published = '{$published}'" : '';
@@ -3794,13 +3794,13 @@ 
                 $docgrp = implode(',', $docgrp);
             }
 
-            $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="' . $_SESSION['mgrRole'] . '" OR sc.privatemgr=0') . (!$docgrp ? '' : ' OR dg.document_group IN (' . $docgrp . ')');
+            $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="'.$_SESSION['mgrRole'].'" OR sc.privatemgr=0').(!$docgrp ? '' : ' OR dg.document_group IN ('.$docgrp.')');
 
             $tblsc = $this->getFullTableName('site_content');
             $tbldg = $this->getFullTableName('document_groups');
 
             $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc
-                    LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id IN (" . implode(',', $ids) . ") {$published} {$deleted} {$where}) AND ({$access}) GROUP BY sc.id", ($sort ? "{$sort} {$dir}" : ""), $limit);
+                    LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id IN (".implode(',', $ids).") {$published} {$deleted} {$where}) AND ({$access}) GROUP BY sc.id", ($sort ? "{$sort} {$dir}" : ""), $limit);
 
             $resourceArray = $this->db->makeArray($result);
 
@@ -3905,12 +3905,12 @@ 
             $tbldg = $this->getFullTableName("document_groups");
             $activeSql = $active == 1 ? "AND sc.published=1 AND sc.deleted=0" : "";
             // modify field names to use sc. table reference
-            $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+            $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
             // get document groups for current user
             if ($docgrp = $this->getUserDocGroups()) {
                 $docgrp = implode(",", $docgrp);
             }
-            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
             $result = $this->db->select($fields, "{$tblsc} sc LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id='{$pageid}' {$activeSql}) AND ({$access})", "", 1);
             $pageInfo = $this->db->getRow($result);
 
@@ -3957,7 +3957,7 @@ 
     {
         if ($this->currentSnippet) {
             $tbl = $this->getFullTableName("site_snippets");
-            $rs = $this->db->select('id', $tbl, "name='" . $this->db->escape($this->currentSnippet) . "'", '', 1);
+            $rs = $this->db->select('id', $tbl, "name='".$this->db->escape($this->currentSnippet)."'", '', 1);
             if ($snippetId = $this->db->getValue($rs)) {
                 return $snippetId;
             }
@@ -3984,23 +3984,23 @@ 
      */
     public function clearCache($type = '', $report = false)
     {
-        $cache_dir = MODX_BASE_PATH . $this->getCacheFolder();
+        $cache_dir = MODX_BASE_PATH.$this->getCacheFolder();
         if (is_array($type)) {
             foreach ($type as $_) {
                 $this->clearCache($_, $report);
             }
         } elseif ($type == 'full') {
-            include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php');
+            include_once(MODX_MANAGER_PATH.'processors/cache_sync.class.processor.php');
             $sync = new synccache();
             $sync->setCachepath($cache_dir);
             $sync->setReport($report);
             $sync->emptyCache();
         } elseif (preg_match('@^[1-9][0-9]*$@', $type)) {
             $key = ($this->config['cache_type'] == 2) ? $this->makePageCacheKey($type) : $type;
-            $file_name = "docid_" . $key . "_*.pageCache.php";
-            $cache_path = $cache_dir . $file_name;
+            $file_name = "docid_".$key."_*.pageCache.php";
+            $cache_path = $cache_dir.$file_name;
             $files = glob($cache_path);
-            $files[] = $cache_dir . "docid_" . $key . ".pageCache.php";
+            $files[] = $cache_dir."docid_".$key.".pageCache.php";
             foreach ($files as $file) {
                 if (!is_file($file)) {
                     continue;
@@ -4008,7 +4008,7 @@ 
                 unlink($file);
             }
         } else {
-            $files = glob($cache_dir . '*');
+            $files = glob($cache_dir.'*');
             foreach ($files as $file) {
                 $name = basename($file);
                 if (strpos($name, '.pageCache.php') === false) {
@@ -4077,7 +4077,7 @@ 
                         $f_url_suffix = '/';
                     }
 
-                    $alPath = !empty ($al['path']) ? $al['path'] . '/' : '';
+                    $alPath = !empty ($al['path']) ? $al['path'].'/' : '';
 
                     if ($al && $al['alias']) {
                         $alias = $al['alias'];
@@ -4085,7 +4085,7 @@ 
 
                 }
 
-                $alias = $alPath . $f_url_prefix . $alias . $f_url_suffix;
+                $alias = $alPath.$f_url_prefix.$alias.$f_url_suffix;
                 $url = "{$alias}{$args}";
             } else {
                 $url = "index.php?id={$id}{$args}";
@@ -4104,7 +4104,7 @@ 
             }
 
             //TODO: check to make sure that $site_url incudes the url :port (e.g. :8080)
-            $host = $scheme == 'full' ? $this->config['site_url'] : $scheme . '://' . $_SERVER['HTTP_HOST'] . $host;
+            $host = $scheme == 'full' ? $this->config['site_url'] : $scheme.'://'.$_SERVER['HTTP_HOST'].$host;
         }
 
         //fix strictUrl by Bumkaka
@@ -4113,9 +4113,9 @@ 
         }
 
         if ($this->config['xhtml_urls']) {
-            $url = preg_replace("/&(?!amp;)/", "&amp;", $host . $virtualDir . $url);
+            $url = preg_replace("/&(?!amp;)/", "&amp;", $host.$virtualDir.$url);
         } else {
-            $url = $host . $virtualDir . $url;
+            $url = $host.$virtualDir.$url;
         }
 
         $evtOut = $this->invokeEvent('OnMakeDocUrl', array(
@@ -4139,21 +4139,21 @@ 
         if (isset($this->aliasListing[$id])) {
             $out = $this->aliasListing[$id];
         } else {
-            $q = $this->db->query("SELECT id,alias,isfolder,parent FROM " . $this->getFullTableName("site_content") . " WHERE id=" . (int)$id);
+            $q = $this->db->query("SELECT id,alias,isfolder,parent FROM ".$this->getFullTableName("site_content")." WHERE id=".(int) $id);
             if ($this->db->getRecordCount($q) == '1') {
                 $q = $this->db->getRow($q);
                 $this->aliasListing[$id] = array(
-                    'id' => (int)$q['id'],
+                    'id' => (int) $q['id'],
                     'alias' => $q['alias'] == '' ? $q['id'] : $q['alias'],
-                    'parent' => (int)$q['parent'],
-                    'isfolder' => (int)$q['isfolder'],
+                    'parent' => (int) $q['parent'],
+                    'isfolder' => (int) $q['isfolder'],
                 );
                 if ($this->aliasListing[$id]['parent'] > 0) {
                     //fix alias_path_usage
                     if ($this->config['use_alias_path'] == '1') {
                         //&& $tmp['path'] != '' - fix error slash with epty path
                         $tmp = $this->getAliasListing($this->aliasListing[$id]['parent']);
-                        $this->aliasListing[$id]['path'] = $tmp['path'] . ($tmp['alias_visible'] ? (($tmp['parent'] > 0 && $tmp['path'] != '') ? '/' : '') . $tmp['alias'] : '');
+                        $this->aliasListing[$id]['path'] = $tmp['path'].($tmp['alias_visible'] ? (($tmp['parent'] > 0 && $tmp['path'] != '') ? '/' : '').$tmp['alias'] : '');
                     } else {
                         $this->aliasListing[$id]['path'] = '';
                     }
@@ -4194,7 +4194,7 @@ 
         $out = array();
         if (empty($this->version) || !is_array($this->version)) {
             //include for compatibility modx version < 1.0.10
-            include MODX_MANAGER_PATH . "includes/version.inc.php";
+            include MODX_MANAGER_PATH."includes/version.inc.php";
             $this->version = array();
             $this->version['version'] = isset($modx_version) ? $modx_version : '';
             $this->version['branch'] = isset($modx_branch) ? $modx_branch : '';
@@ -4216,18 +4216,18 @@ 
     {
         if (isset ($this->snippetCache[$snippetName])) {
             $snippet = $this->snippetCache[$snippetName];
-            $properties = !empty($this->snippetCache[$snippetName . "Props"]) ? $this->snippetCache[$snippetName . "Props"] : '';
+            $properties = !empty($this->snippetCache[$snippetName."Props"]) ? $this->snippetCache[$snippetName."Props"] : '';
         } else { // not in cache so let's check the db
-            $sql = "SELECT ss.`name`, ss.`snippet`, ss.`properties`, sm.properties as `sharedproperties` FROM " . $this->getFullTableName("site_snippets") . " as ss LEFT JOIN " . $this->getFullTableName('site_modules') . " as sm on sm.guid=ss.moduleguid WHERE ss.`name`='" . $this->db->escape($snippetName) . "'  AND ss.disabled=0;";
+            $sql = "SELECT ss.`name`, ss.`snippet`, ss.`properties`, sm.properties as `sharedproperties` FROM ".$this->getFullTableName("site_snippets")." as ss LEFT JOIN ".$this->getFullTableName('site_modules')." as sm on sm.guid=ss.moduleguid WHERE ss.`name`='".$this->db->escape($snippetName)."'  AND ss.disabled=0;";
             $result = $this->db->query($sql);
             if ($this->db->getRecordCount($result) == 1) {
                 $row = $this->db->getRow($result);
                 $snippet = $this->snippetCache[$snippetName] = $row['snippet'];
                 $mergedProperties = array_merge($this->parseProperties($row['properties']), $this->parseProperties($row['sharedproperties']));
-                $properties = $this->snippetCache[$snippetName . "Props"] = json_encode($mergedProperties);
+                $properties = $this->snippetCache[$snippetName."Props"] = json_encode($mergedProperties);
             } else {
                 $snippet = $this->snippetCache[$snippetName] = "return false;";
-                $properties = $this->snippetCache[$snippetName . "Props"] = '';
+                $properties = $this->snippetCache[$snippetName."Props"] = '';
             }
         }
         // load default params/properties
@@ -4327,8 +4327,8 @@ 
             }
             if (strpos($tpl, $s) !== false) {
                 $tpl = str_replace($s, $value, $tpl);
-            } elseif($this->debug) {
-                $this->addLog('parseText parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('parseText parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -4377,7 +4377,7 @@ 
             case 'CODE':
                 break;
             case 'FILE':
-                $template = file_get_contents(MODX_BASE_PATH . $template);
+                $template = file_get_contents(MODX_BASE_PATH.$template);
                 break;
             case 'CHUNK':
                 $template = $this->getChunk($template);
@@ -4410,7 +4410,7 @@ 
         if ($mode !== 'formatOnly' && empty($timestamp)) {
             return '-';
         }
-        $timestamp = (int)$timestamp;
+        $timestamp = (int) $timestamp;
 
         switch ($this->config['datetime_format']) {
             case 'YYYY/mm/dd':
@@ -4430,7 +4430,7 @@ 
         }
 
         if (empty($mode)) {
-            $strTime = strftime($dateFormat . " %H:%M:%S", $timestamp);
+            $strTime = strftime($dateFormat." %H:%M:%S", $timestamp);
         } elseif ($mode == 'dateOnly') {
             $strTime = strftime($dateFormat, $timestamp);
         } elseif ($mode == 'formatOnly') {
@@ -4484,7 +4484,7 @@ 
             $S = 0;
         }
         $timeStamp = mktime($H, $M, $S, $m, $d, $Y);
-        $timeStamp = (int)$timeStamp;
+        $timeStamp = (int) $timeStamp;
         return $timeStamp;
     }
 
@@ -4526,7 +4526,7 @@ 
                     if ($v === 'value') {
                         unset($_[$i]);
                     } else {
-                        $_[$i] = 'tv.' . $v;
+                        $_[$i] = 'tv.'.$v;
                     }
                 }
                 $fields = join(',', $_);
@@ -4535,12 +4535,12 @@ 
             }
 
             if ($tvsort != '') {
-                $tvsort = 'tv.' . join(',tv.', array_filter(array_map('trim', explode(',', $tvsort))));
+                $tvsort = 'tv.'.join(',tv.', array_filter(array_map('trim', explode(',', $tvsort))));
             }
             if ($tvidnames == "*") {
                 $query = "tv.id<>0";
             } else {
-                $query = (is_numeric($tvidnames[0]) ? "tv.id" : "tv.name") . " IN ('" . join("','", $tvidnames) . "')";
+                $query = (is_numeric($tvidnames[0]) ? "tv.id" : "tv.name")." IN ('".join("','", $tvidnames)."')";
             }
 
             $this->getUserDocGroups();
@@ -4684,7 +4684,7 @@ 
             return $this->tmpCache[__FUNCTION__][$cacheKey];
         }
 
-        if (($idnames != '*' && !is_array($idnames)) || empty($idnames) ) {
+        if (($idnames != '*' && !is_array($idnames)) || empty($idnames)) {
             return false;
         } else {
 
@@ -4702,23 +4702,23 @@ 
             }
 
             // get user defined template variables
-            $fields = ($fields == '') ? 'tv.*' : 'tv.' . implode(',tv.', array_filter(array_map('trim', explode(',', $fields))));
-            $sort = ($sort == '') ? '' : 'tv.' . implode(',tv.', array_filter(array_map('trim', explode(',', $sort))));
+            $fields = ($fields == '') ? 'tv.*' : 'tv.'.implode(',tv.', array_filter(array_map('trim', explode(',', $fields))));
+            $sort = ($sort == '') ? '' : 'tv.'.implode(',tv.', array_filter(array_map('trim', explode(',', $sort))));
 
             if ($idnames == '*') {
                 $query = 'tv.id<>0';
             } else {
-                $query = (is_numeric($idnames[0]) ? 'tv.id' : 'tv.name') . " IN ('" . implode("','", $idnames) . "')";
+                $query = (is_numeric($idnames[0]) ? 'tv.id' : 'tv.name')." IN ('".implode("','", $idnames)."')";
             }
 
-            $rs = $this->db->select("{$fields}, IF(tvc.value != '', tvc.value, tv.default_text) as value", $this->getFullTableName('site_tmplvars') . " tv
-                    INNER JOIN " . $this->getFullTableName('site_tmplvar_templates') . " tvtpl ON tvtpl.tmplvarid = tv.id
-                    LEFT JOIN " . $this->getFullTableName('site_tmplvar_contentvalues') . " tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$docid}'", "{$query} AND tvtpl.templateid = '{$docRow['template']}'", ($sort ? "{$sort} {$dir}" : ""));
+            $rs = $this->db->select("{$fields}, IF(tvc.value != '', tvc.value, tv.default_text) as value", $this->getFullTableName('site_tmplvars')." tv
+                    INNER JOIN " . $this->getFullTableName('site_tmplvar_templates')." tvtpl ON tvtpl.tmplvarid = tv.id
+                    LEFT JOIN " . $this->getFullTableName('site_tmplvar_contentvalues')." tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$docid}'", "{$query} AND tvtpl.templateid = '{$docRow['template']}'", ($sort ? "{$sort} {$dir}" : ""));
 
             $result = $this->db->makeArray($rs);
 
             // get default/built-in template variables
-            if(is_array($docRow)){
+            if (is_array($docRow)) {
                 ksort($docRow);
 
                 foreach ($docRow as $key => $value) {
@@ -4756,22 +4756,22 @@ 
      */
     public function getTemplateVarOutput($idnames = array(), $docid = '', $published = 1, $sep = '')
     {
-        if (is_array($idnames) && empty($idnames) ) {
+        if (is_array($idnames) && empty($idnames)) {
             return false;
         } else {
             $output = array();
             $vars = ($idnames == '*' || is_array($idnames)) ? $idnames : array($idnames);
 
-            $docid = (int)$docid > 0 ? (int)$docid : $this->documentIdentifier;
+            $docid = (int) $docid > 0 ? (int) $docid : $this->documentIdentifier;
             // remove sort for speed
             $result = $this->getTemplateVars($vars, '*', $docid, $published, '', '');
 
             if ($result == false) {
                 return false;
             } else {
-                $baspath = MODX_MANAGER_PATH . 'includes';
-                include_once $baspath . '/tmplvars.format.inc.php';
-                include_once $baspath . '/tmplvars.commands.inc.php';
+                $baspath = MODX_MANAGER_PATH.'includes';
+                include_once $baspath.'/tmplvars.format.inc.php';
+                include_once $baspath.'/tmplvars.commands.inc.php';
 
                 for ($i = 0; $i < count($result); $i++) {
                     $row = $result[$i];
@@ -4796,7 +4796,7 @@ 
      */
     public function getFullTableName($tbl)
     {
-        return $this->db->config['dbase'] . ".`" . $this->db->config['table_prefix'] . $tbl . "`";
+        return $this->db->config['dbase'].".`".$this->db->config['table_prefix'].$tbl."`";
     }
 
     /**
@@ -4875,7 +4875,7 @@ 
     public function getCachePath()
     {
         global $base_url;
-        $pth = $base_url . $this->getCacheFolder();
+        $pth = $base_url.$this->getCacheFolder();
         return $pth;
     }
 
@@ -4927,8 +4927,8 @@ 
         $out = false;
 
         if (!empty($context)) {
-            if (is_scalar($context) && isset($_SESSION[$context . 'Validated'])) {
-                $out = $_SESSION[$context . 'InternalKey'];
+            if (is_scalar($context) && isset($_SESSION[$context.'Validated'])) {
+                $out = $_SESSION[$context.'InternalKey'];
             }
         } else {
             switch (true) {
@@ -4956,8 +4956,8 @@ 
         $out = false;
 
         if (!empty($context)) {
-            if (is_scalar($context) && isset($_SESSION[$context . 'Validated'])) {
-                $out = $_SESSION[$context . 'Shortname'];
+            if (is_scalar($context) && isset($_SESSION[$context.'Validated'])) {
+                $out = $_SESSION[$context.'Shortname'];
             }
         } else {
             switch (true) {
@@ -5028,8 +5028,8 @@ 
      */
     public function getWebUserInfo($uid)
     {
-        $rs = $this->db->select('wu.username, wu.password, wua.*', $this->getFullTableName("web_users") . " wu
-                INNER JOIN " . $this->getFullTableName("web_user_attributes") . " wua ON wua.internalkey=wu.id", "wu.id='{$uid}'");
+        $rs = $this->db->select('wu.username, wu.password, wua.*', $this->getFullTableName("web_users")." wu
+                INNER JOIN " . $this->getFullTableName("web_user_attributes")." wua ON wua.internalkey=wu.id", "wu.id='{$uid}'");
         if ($row = $this->db->getRow($rs)) {
             if (!isset($row['usertype']) or !$row["usertype"]) {
                 $row["usertype"] = "web";
@@ -5065,7 +5065,7 @@ 
         } else if (is_array($dg)) {
             // resolve ids to names
             $dgn = array();
-            $ds = $this->db->select('name', $this->getFullTableName("documentgroup_names"), "id IN (" . implode(",", $dg) . ")");
+            $ds = $this->db->select('name', $this->getFullTableName("documentgroup_names"), "id IN (".implode(",", $dg).")");
             while ($row = $this->db->getRow($ds)) {
                 $dgn[] = $row['name'];
             }
@@ -5093,7 +5093,7 @@ 
         $rt = false;
         if ($_SESSION["webValidated"] == 1) {
             $tbl = $this->getFullTableName("web_users");
-            $ds = $this->db->select('id, username, password', $tbl, "id='" . $this->getLoginUserID() . "'");
+            $ds = $this->db->select('id, username, password', $tbl, "id='".$this->getLoginUserID()."'");
             if ($row = $this->db->getRow($ds)) {
                 if ($row["password"] == md5($oldPwd)) {
                     if (strlen($newPwd) < 6) {
@@ -5103,7 +5103,7 @@ 
                     } else {
                         $this->db->update(array(
                             'password' => $this->db->escape($newPwd),
-                        ), $tbl, "id='" . $this->getLoginUserID() . "'");
+                        ), $tbl, "id='".$this->getLoginUserID()."'");
                         // invoke OnWebChangePassword event
                         $this->invokeEvent("OnWebChangePassword", array(
                             "userid" => $row["id"],
@@ -5134,8 +5134,8 @@ 
         // check cache
         $grpNames = isset ($_SESSION['webUserGroupNames']) ? $_SESSION['webUserGroupNames'] : false;
         if (!is_array($grpNames)) {
-            $rs = $this->db->select('wgn.name', $this->getFullTableName("webgroup_names") . " wgn
-                    INNER JOIN " . $this->getFullTableName("web_groups") . " wg ON wg.webgroup=wgn.id AND wg.webuser='" . $this->getLoginUserID() . "'");
+            $rs = $this->db->select('wgn.name', $this->getFullTableName("webgroup_names")." wgn
+                    INNER JOIN " . $this->getFullTableName("web_groups")." wg ON wg.webgroup=wgn.id AND wg.webuser='".$this->getLoginUserID()."'");
             $grpNames = $this->db->getColumn("name", $rs);
             // save to cache
             $_SESSION['webUserGroupNames'] = $grpNames;
@@ -5168,7 +5168,7 @@ 
         if (strpos(strtolower($src), "<style") !== false || strpos(strtolower($src), "<link") !== false) {
             $this->sjscripts[$nextpos] = $src;
         } else {
-            $this->sjscripts[$nextpos] = "\t" . '<link rel="stylesheet" type="text/css" href="' . $src . '" ' . ($media ? 'media="' . $media . '" ' : '') . '/>';
+            $this->sjscripts[$nextpos] = "\t".'<link rel="stylesheet" type="text/css" href="'.$src.'" '.($media ? 'media="'.$media.'" ' : '').'/>';
         }
     }
 
@@ -5247,7 +5247,7 @@ 
         }
 
         if ($useThisVer && $plaintext != true && (strpos(strtolower($src), "<script") === false)) {
-            $src = "\t" . '<script type="text/javascript" src="' . $src . '"></script>';
+            $src = "\t".'<script type="text/javascript" src="'.$src.'"></script>';
         }
         if ($startup) {
             $pos = isset($overwritepos) ? $overwritepos : max(array_merge(array(0), array_keys($this->sjscripts))) + 1;
@@ -5393,7 +5393,7 @@ 
                 $eventtime = $this->getMicroTime() - $eventtime;
                 $this->pluginsCode .= sprintf('<fieldset><legend><b>%s / %s</b> (%2.2f ms)</legend>', $evtName, $pluginName, $eventtime * 1000);
                 foreach ($parameter as $k => $v) {
-                    $this->pluginsCode .= "{$k} => " . print_r($v, true) . '<br>';
+                    $this->pluginsCode .= "{$k} => ".print_r($v, true).'<br>';
                 }
                 $this->pluginsCode .= '</fieldset><br />';
                 $this->pluginsTime["{$evtName} / {$pluginName}"] += $eventtime;
@@ -5421,13 +5421,13 @@ 
         $plugin = array();
         if (isset ($this->pluginCache[$pluginName])) {
             $pluginCode = $this->pluginCache[$pluginName];
-            $pluginProperties = isset($this->pluginCache[$pluginName . "Props"]) ? $this->pluginCache[$pluginName . "Props"] : '';
+            $pluginProperties = isset($this->pluginCache[$pluginName."Props"]) ? $this->pluginCache[$pluginName."Props"] : '';
         } else {
             $pluginName = $this->db->escape($pluginName);
             $result = $this->db->select('name, plugincode, properties', $this->getFullTableName("site_plugins"), "name='{$pluginName}' AND disabled=0");
             if ($row = $this->db->getRow($result)) {
                 $pluginCode = $this->pluginCache[$row['name']] = $row['plugincode'];
-                $pluginProperties = $this->pluginCache[$row['name'] . "Props"] = $row['properties'];
+                $pluginProperties = $this->pluginCache[$row['name']."Props"] = $row['properties'];
             } else {
                 $pluginCode = $this->pluginCache[$pluginName] = "return false;";
                 $pluginProperties = '';
@@ -5534,7 +5534,7 @@ 
     public function parseDocBlockFromFile($element_dir, $filename, $escapeValues = false)
     {
         $params = array();
-        $fullpath = $element_dir . '/' . $filename;
+        $fullpath = $element_dir.'/'.$filename;
         if (is_readable($fullpath)) {
             $tpl = @fopen($fullpath, "r");
             if ($tpl) {
@@ -5701,8 +5701,8 @@ 
         $ph = array('site_url' => MODX_SITE_URL);
         $regexUrl = "/((http|https|ftp|ftps)\:\/\/[^\/]+(\/[^\s]+[^,.?!:;\s])?)/";
         $regexEmail = '#([0-9a-z]([-_.]?[0-9a-z])*@[0-9a-z]([-.]?[0-9a-z])*\\.[a-wyz][a-z](fo|g|l|m|mes|o|op|pa|ro|seum|t|u|v|z)?)#i';
-        $emailSubject = isset($parsed['name']) ? '?subject=' . $parsed['name'] : '';
-        $emailSubject .= isset($parsed['version']) ? ' v' . $parsed['version'] : '';
+        $emailSubject = isset($parsed['name']) ? '?subject='.$parsed['name'] : '';
+        $emailSubject .= isset($parsed['version']) ? ' v'.$parsed['version'] : '';
         foreach ($parsed as $key => $val) {
             if (is_array($val)) {
                 foreach ($val as $key2 => $val2) {
@@ -5711,7 +5711,7 @@ 
                         $val2 = preg_replace($regexUrl, "<a href=\"{$url[0]}\" target=\"_blank\">{$url[0]}</a> ", $val2);
                     }
                     if (preg_match($regexEmail, $val2, $url)) {
-                        $val2 = preg_replace($regexEmail, '<a href="mailto:\\1' . $emailSubject . '">\\1</a>', $val2);
+                        $val2 = preg_replace($regexEmail, '<a href="mailto:\\1'.$emailSubject.'">\\1</a>', $val2);
                     }
                     $parsed[$key][$key2] = $val2;
                 }
@@ -5721,7 +5721,7 @@ 
                     $val = preg_replace($regexUrl, "<a href=\"{$url[0]}\" target=\"_blank\">{$url[0]}</a> ", $val);
                 }
                 if (preg_match($regexEmail, $val, $url)) {
-                    $val = preg_replace($regexEmail, '<a href="mailto:\\1' . $emailSubject . '">\\1</a>', $val);
+                    $val = preg_replace($regexEmail, '<a href="mailto:\\1'.$emailSubject.'">\\1</a>', $val);
                 }
                 $parsed[$key] = $val;
             }
@@ -5735,32 +5735,32 @@ 
         );
 
         $nl = "\n";
-        $list = isset($parsed['logo']) ? '<img src="' . $this->config['base_url'] . ltrim($parsed['logo'], "/") . '" style="float:right;max-width:100px;height:auto;" />' . $nl : '';
-        $list .= '<p>' . $nl;
-        $list .= isset($parsed['name']) ? '<strong>' . $parsed['name'] . '</strong><br/>' . $nl : '';
-        $list .= isset($parsed['description']) ? $parsed['description'] . $nl : '';
-        $list .= '</p><br/>' . $nl;
-        $list .= isset($parsed['version']) ? '<p><strong>' . $_lang['version'] . ':</strong> ' . $parsed['version'] . '</p>' . $nl : '';
-        $list .= isset($parsed['license']) ? '<p><strong>' . $_lang['license'] . ':</strong> ' . $parsed['license'] . '</p>' . $nl : '';
-        $list .= isset($parsed['lastupdate']) ? '<p><strong>' . $_lang['last_update'] . ':</strong> ' . $parsed['lastupdate'] . '</p>' . $nl : '';
-        $list .= '<br/>' . $nl;
+        $list = isset($parsed['logo']) ? '<img src="'.$this->config['base_url'].ltrim($parsed['logo'], "/").'" style="float:right;max-width:100px;height:auto;" />'.$nl : '';
+        $list .= '<p>'.$nl;
+        $list .= isset($parsed['name']) ? '<strong>'.$parsed['name'].'</strong><br/>'.$nl : '';
+        $list .= isset($parsed['description']) ? $parsed['description'].$nl : '';
+        $list .= '</p><br/>'.$nl;
+        $list .= isset($parsed['version']) ? '<p><strong>'.$_lang['version'].':</strong> '.$parsed['version'].'</p>'.$nl : '';
+        $list .= isset($parsed['license']) ? '<p><strong>'.$_lang['license'].':</strong> '.$parsed['license'].'</p>'.$nl : '';
+        $list .= isset($parsed['lastupdate']) ? '<p><strong>'.$_lang['last_update'].':</strong> '.$parsed['lastupdate'].'</p>'.$nl : '';
+        $list .= '<br/>'.$nl;
         $first = true;
         foreach ($arrayParams as $param => $label) {
             if (isset($parsed[$param])) {
                 if ($first) {
-                    $list .= '<p><strong>' . $_lang['references'] . '</strong></p>' . $nl;
-                    $list .= '<ul class="docBlockList">' . $nl;
+                    $list .= '<p><strong>'.$_lang['references'].'</strong></p>'.$nl;
+                    $list .= '<ul class="docBlockList">'.$nl;
                     $first = false;
                 }
-                $list .= '    <li><strong>' . $label . '</strong>' . $nl;
-                $list .= '        <ul>' . $nl;
+                $list .= '    <li><strong>'.$label.'</strong>'.$nl;
+                $list .= '        <ul>'.$nl;
                 foreach ($parsed[$param] as $val) {
-                    $list .= '            <li>' . $val . '</li>' . $nl;
+                    $list .= '            <li>'.$val.'</li>'.$nl;
                 }
-                $list .= '        </ul></li>' . $nl;
+                $list .= '        </ul></li>'.$nl;
             }
         }
-        $list .= !$first ? '</ul>' . $nl : '';
+        $list .= !$first ? '</ul>'.$nl : '';
 
         return $list;
     }
@@ -5836,7 +5836,7 @@ 
      */
     public function addSnippet($name, $phpCode)
     {
-        $this->snippetCache['#' . $name] = $phpCode;
+        $this->snippetCache['#'.$name] = $phpCode;
     }
 
     /**
@@ -5845,7 +5845,7 @@ 
      */
     public function addChunk($name, $text)
     {
-        $this->chunkCache['#' . $name] = $text;
+        $this->chunkCache['#'.$name] = $text;
     }
 
     /**
@@ -5881,7 +5881,7 @@ 
         }
 
         if (!$isSafe) {
-            $msg = $phpcode . "\n" . $this->currentSnippet . "\n" . print_r($_SERVER, true);
+            $msg = $phpcode."\n".$this->currentSnippet."\n".print_r($_SERVER, true);
             $title = sprintf('Unknown eval was executed (%s)', $this->htmlspecialchars(substr(trim($phpcode), 0, 50)));
             $this->messageQuit($title, '', true, '', '', 'Parser', $msg);
             return;
@@ -5895,7 +5895,7 @@ 
             return 'array()';
         }
 
-        $output = $echo . $return;
+        $output = $echo.$return;
         modx_sanitize_gpc($output);
         return $this->htmlspecialchars($output); // Maybe, all html tags are dangerous
     }
@@ -5913,8 +5913,8 @@ 
 
         $safe = explode(',', $safe_functions);
 
-        $phpcode = rtrim($phpcode, ';') . ';';
-        $tokens = token_get_all('<?php ' . $phpcode);
+        $phpcode = rtrim($phpcode, ';').';';
+        $tokens = token_get_all('<?php '.$phpcode);
         foreach ($tokens as $i => $token) {
             if (!is_array($token)) {
                 continue;
@@ -5950,7 +5950,7 @@ 
     public function atBindFileContent($str = '')
     {
 
-        $search_path = array('assets/tvs/', 'assets/chunks/', 'assets/templates/', $this->config['rb_base_url'] . 'files/', '');
+        $search_path = array('assets/tvs/', 'assets/chunks/', 'assets/templates/', $this->config['rb_base_url'].'files/', '');
 
         if (stripos($str, '@FILE') !== 0) {
             return $str;
@@ -5973,7 +5973,7 @@ 
         $errorMsg = sprintf("Could not retrieve string '%s'.", $str);
 
         foreach ($search_path as $path) {
-            $file_path = MODX_BASE_PATH . $path . $str;
+            $file_path = MODX_BASE_PATH.$path.$str;
             if (strpos($file_path, MODX_MANAGER_PATH) === 0) {
                 return $errorMsg;
             } elseif (is_file($file_path)) {
@@ -5987,7 +5987,7 @@ 
             return $errorMsg;
         }
 
-        $content = (string)file_get_contents($file_path);
+        $content = (string) file_get_contents($file_path);
         if ($content === false) {
             return $errorMsg;
         }
@@ -6100,22 +6100,22 @@ 
 
         $version = isset ($GLOBALS['modx_version']) ? $GLOBALS['modx_version'] : '';
         $release_date = isset ($GLOBALS['release_date']) ? $GLOBALS['release_date'] : '';
-        $request_uri = "http://" . $_SERVER['HTTP_HOST'] . ($_SERVER["SERVER_PORT"] == 80 ? "" : (":" . $_SERVER["SERVER_PORT"])) . $_SERVER['REQUEST_URI'];
+        $request_uri = "http://".$_SERVER['HTTP_HOST'].($_SERVER["SERVER_PORT"] == 80 ? "" : (":".$_SERVER["SERVER_PORT"])).$_SERVER['REQUEST_URI'];
         $request_uri = $this->htmlspecialchars($request_uri, ENT_QUOTES, $this->config['modx_charset']);
         $ua = $this->htmlspecialchars($_SERVER['HTTP_USER_AGENT'], ENT_QUOTES, $this->config['modx_charset']);
         $referer = $this->htmlspecialchars($_SERVER['HTTP_REFERER'], ENT_QUOTES, $this->config['modx_charset']);
         if ($is_error) {
             $str = '<h2 style="color:red">&laquo; Evo Parse Error &raquo;</h2>';
             if ($msg != 'PHP Parse Error') {
-                $str .= '<h3 style="color:red">' . $msg . '</h3>';
+                $str .= '<h3 style="color:red">'.$msg.'</h3>';
             }
         } else {
             $str = '<h2 style="color:#003399">&laquo; Evo Debug/ stop message &raquo;</h2>';
-            $str .= '<h3 style="color:#003399">' . $msg . '</h3>';
+            $str .= '<h3 style="color:#003399">'.$msg.'</h3>';
         }
 
         if (!empty ($query)) {
-            $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">SQL &gt; <span id="sqlHolder">' . $query . '</span></div>';
+            $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">SQL &gt; <span id="sqlHolder">'.$query.'</span></div>';
         }
 
         $errortype = array(
@@ -6138,13 +6138,13 @@ 
 
         if (!empty($nr) || !empty($file)) {
             if ($text != '') {
-                $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">Error : ' . $text . '</div>';
+                $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">Error : '.$text.'</div>';
             }
             if ($output != '') {
-                $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">' . $output . '</div>';
+                $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">'.$output.'</div>';
             }
             if ($nr !== '') {
-                $table[] = array('ErrorType[num]', $errortype [$nr] . "[" . $nr . "]");
+                $table[] = array('ErrorType[num]', $errortype [$nr]."[".$nr."]");
             }
             if ($file) {
                 $table[] = array('File', $file);
@@ -6164,7 +6164,7 @@ 
         }
 
         if (!empty($this->event->activePlugin)) {
-            $table[] = array('Current Plugin', $this->event->activePlugin . '(' . $this->event->name . ')');
+            $table[] = array('Current Plugin', $this->event->activePlugin.'('.$this->event->name.')');
         }
 
         $str .= $MakeTable->create($table, array('Error information', ''));
@@ -6174,17 +6174,17 @@ 
         $table[] = array('REQUEST_URI', $request_uri);
 
         if ($this->manager->action) {
-            include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');
+            include_once(MODX_MANAGER_PATH.'includes/actionlist.inc.php');
             global $action_list;
             $actionName = (isset($action_list[$this->manager->action])) ? " - {$action_list[$this->manager->action]}" : '';
 
-            $table[] = array('Manager action', $this->manager->action . $actionName);
+            $table[] = array('Manager action', $this->manager->action.$actionName);
         }
 
         if (preg_match('@^[0-9]+@', $this->documentIdentifier)) {
             $resource = $this->getDocumentObject('id', $this->documentIdentifier);
             $url = $this->makeUrl($this->documentIdentifier, '', '', 'full');
-            $table[] = array('Resource', '[' . $this->documentIdentifier . '] <a href="' . $url . '" target="_blank">' . $resource['pagetitle'] . '</a>');
+            $table[] = array('Resource', '['.$this->documentIdentifier.'] <a href="'.$url.'" target="_blank">'.$resource['pagetitle'].'</a>');
         }
         $table[] = array('Referer', $referer);
         $table[] = array('User Agent', $ua);
@@ -6205,7 +6205,7 @@ 
 
         $mem = memory_get_peak_usage(true);
         $total_mem = $mem - $this->mstart;
-        $total_mem = ($total_mem / 1024 / 1024) . ' mb';
+        $total_mem = ($total_mem / 1024 / 1024).' mb';
 
         $queryTime = $this->queryTime;
         $phpTime = $totalTime - $queryTime;
@@ -6226,18 +6226,18 @@ 
         $str .= $this->get_backtrace(debug_backtrace());
         // Log error
         if (!empty($this->currentSnippet)) {
-            $source = 'Snippet - ' . $this->currentSnippet;
+            $source = 'Snippet - '.$this->currentSnippet;
         } elseif (!empty($this->event->activePlugin)) {
-            $source = 'Plugin - ' . $this->event->activePlugin;
+            $source = 'Plugin - '.$this->event->activePlugin;
         } elseif ($source !== '') {
-            $source = 'Parser - ' . $source;
+            $source = 'Parser - '.$source;
         } elseif ($query !== '') {
             $source = 'SQL Query';
         } else {
             $source = 'Parser';
         }
         if ($msg) {
-            $source .= ' / ' . $msg;
+            $source .= ' / '.$msg;
         }
         if (isset($actionName) && !empty($actionName)) {
             $source .= $actionName;
@@ -6269,12 +6269,12 @@ 
 
         // Display error
         if (isset($_SESSION['mgrValidated'])) {
-            echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"><html><head><title>EVO Content Manager ' . $version . ' &raquo; ' . $release_date . '</title>
+            echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"><html><head><title>EVO Content Manager '.$version.' &raquo; '.$release_date.'</title>
                  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-                 <link rel="stylesheet" type="text/css" href="' . $this->config['site_manager_url'] . 'media/style/' . $this->config['manager_theme'] . '/style.css" />
+                 <link rel="stylesheet" type="text/css" href="' . $this->config['site_manager_url'].'media/style/'.$this->config['manager_theme'].'/style.css" />
                  <style type="text/css">body { padding:10px; } td {font:inherit;}</style>
                  </head><body>
-                 ' . $str . '</body></html>';
+                 ' . $str.'</body></html>';
 
         } else {
             echo 'Error';
@@ -6312,7 +6312,7 @@ 
             switch ($val['type']) {
                 case '->':
                 case '::':
-                    $functionName = $val['function'] = $val['class'] . $val['type'] . $val['function'];
+                    $functionName = $val['function'] = $val['class'].$val['type'].$val['function'];
                     break;
                 default:
                     $functionName = $val['function'];
@@ -6322,7 +6322,7 @@ 
             $args = array_pad(array(), $_, '$var');
             $args = implode(", ", $args);
             $modx = &$this;
-            $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val) {
+            $args = preg_replace_callback('/\$var/', function() use ($modx, &$tmp, $val) {
                 $arg = $val['args'][$tmp - 1];
                 switch (true) {
                     case is_null($arg): {
@@ -6334,7 +6334,7 @@ 
                         break;
                     }
                     case is_scalar($arg): {
-                        $out = strlen($arg) > 20 ? 'string $var' . $tmp : ("'" . $this->htmlspecialchars(str_replace("'", "\\'", $arg)) . "'");
+                        $out = strlen($arg) > 20 ? 'string $var'.$tmp : ("'".$this->htmlspecialchars(str_replace("'", "\\'", $arg))."'");
                         break;
                     }
                     case is_bool($arg): {
@@ -6342,23 +6342,23 @@ 
                         break;
                     }
                     case is_array($arg): {
-                        $out = 'array $var' . $tmp;
+                        $out = 'array $var'.$tmp;
                         break;
                     }
                     case is_object($arg): {
-                        $out = get_class($arg) . ' $var' . $tmp;
+                        $out = get_class($arg).' $var'.$tmp;
                         break;
                     }
                     default: {
-                        $out = '$var' . $tmp;
+                        $out = '$var'.$tmp;
                     }
                 }
                 $tmp++;
                 return $out;
             }, $args);
             $line = array(
-                "<strong>" . $functionName . "</strong>(" . $args . ")",
-                $path . " on line " . $val['line']
+                "<strong>".$functionName."</strong>(".$args.")",
+                $path." on line ".$val['line']
             );
             $table[] = array(implode("<br />", $line));
         }
@@ -6399,7 +6399,7 @@ 
             $alias = strip_tags($alias); // strip HTML
             $alias = preg_replace('/[^\.A-Za-z0-9 _-]/', '', $alias); // strip non-alphanumeric characters
             $alias = preg_replace('/\s+/', '-', $alias); // convert white-space to dash
-            $alias = preg_replace('/-+/', '-', $alias);  // convert multiple dashes to one
+            $alias = preg_replace('/-+/', '-', $alias); // convert multiple dashes to one
             $alias = trim($alias, '-'); // trim excess
             return $alias;
         }
@@ -6415,7 +6415,7 @@ 
         $precisions = count($sizes) - 1;
         foreach ($sizes as $unit => $bytes) {
             if ($size >= $bytes) {
-                return number_format($size / $bytes, $precisions) . ' ' . $unit;
+                return number_format($size / $bytes, $precisions).' '.$unit;
             }
             $precisions--;
         }
@@ -6519,10 +6519,10 @@ 
 
         if (strpos($str, MODX_MANAGER_PATH) === 0) {
             return false;
-        } elseif (is_file(MODX_BASE_PATH . $str)) {
-            $file_path = MODX_BASE_PATH . $str;
-        } elseif (is_file(MODX_BASE_PATH . "{$tpl_dir}{$str}")) {
-            $file_path = MODX_BASE_PATH . $tpl_dir . $str;
+        } elseif (is_file(MODX_BASE_PATH.$str)) {
+            $file_path = MODX_BASE_PATH.$str;
+        } elseif (is_file(MODX_BASE_PATH."{$tpl_dir}{$str}")) {
+            $file_path = MODX_BASE_PATH.$tpl_dir.$str;
         } else {
             return false;
         }
@@ -6648,7 +6648,7 @@ 
             $title = 'no title';
         }
         if (is_array($msg)) {
-            $msg = '<pre>' . print_r($msg, true) . '</pre>';
+            $msg = '<pre>'.print_r($msg, true).'</pre>';
         } elseif ($msg === '') {
             $msg = $_SERVER['REQUEST_URI'];
         }
@@ -6693,7 +6693,7 @@ 
         if (is_array($SystemAlertMsgQueque)) {
             $title = '';
             if ($this->name && $this->activePlugin) {
-                $title = "<div><b>" . $this->activePlugin . "</b> - <span style='color:maroon;'>" . $this->name . "</span></div>";
+                $title = "<div><b>".$this->activePlugin."</b> - <span style='color:maroon;'>".$this->name."</span></div>";
             }
             $SystemAlertMsgQueque[] = "$title<div style='margin-left:10px;margin-top:3px;'>$msg</div>";
         }

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

Doc Comments +10 added lines

@@ -554,6 +554,7 @@ 
      * @name:  getColumn
      * @desc:  returns an array of the values found on colun $name
      * @param: $dsq - dataset or query string
+     * @param string $name
      */
     public function getColumn($name, $dsq)
     {
@@ -720,6 +721,9 @@ 
         return $result;
     }
 
+    /**
+     * @param string $table_name
+     */
     public function optimize($table_name)
     {
         $rs = $this->query("OPTIMIZE TABLE {$table_name}");
@@ -742,6 +746,9 @@ 
         return mysql_data_seek($result, $row_number);
     }
 
+    /**
+     * @return string
+     */
     public function _getFieldsStringFromArray($fields = array())
     {
 
@@ -761,6 +768,9 @@ 
         return join(',', $_);
     }
 
+    /**
+     * @return string
+     */
     public function _getFromStringFromArray($tables = array())
     {
         $_ = array();

Spacing +25 added lines, -25 removed lines

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

Upper-Lower-Casing +10 added lines, -10 removed lines

@@ -280,13 +280,13 @@ 
             $orderby = trim($orderby);
             $limit = trim($limit);
             if ($where !== '' && stripos($where, 'WHERE') !== 0) {
-                $where = "WHERE {$where}";
+                $where = "where {$where}";
             }
             if ($orderby !== '' && stripos($orderby, 'ORDER BY') !== 0) {
                 $orderby = "ORDER BY {$orderby}";
             }
             if ($limit !== '' && stripos($limit, 'LIMIT') !== 0) {
-                $limit = "LIMIT {$limit}";
+                $limit = "limit {$limit}";
             }
 
             return $this->query("DELETE FROM {$from} {$where} {$orderby} {$limit}");
@@ -322,16 +322,16 @@ 
         $orderby = trim($orderby);
         $limit = trim($limit);
         if ($where !== '' && stripos($where, 'WHERE') !== 0) {
-            $where = "WHERE {$where}";
+            $where = "where {$where}";
         }
         if ($orderby !== '' && stripos($orderby, 'ORDER') !== 0) {
             $orderby = "ORDER BY {$orderby}";
         }
         if ($limit !== '' && stripos($limit, 'LIMIT') !== 0) {
-            $limit = "LIMIT {$limit}";
+            $limit = "limit {$limit}";
         }
 
-        return $this->query("SELECT {$fields} FROM {$from} {$where} {$orderby} {$limit}");
+        return $this->query("select {$fields} FROM {$from} {$where} {$orderby} {$limit}");
     }
 
     /**
@@ -358,10 +358,10 @@ 
             }
             $where = trim($where);
             if ($where !== '' && stripos($where, 'WHERE') !== 0) {
-                $where = "WHERE {$where}";
+                $where = "where {$where}";
             }
 
-            return $this->query("UPDATE {$table} SET {$fields} {$where}");
+            return $this->query("update {$table} SET {$fields} {$where}");
         }
     }
 
@@ -390,10 +390,10 @@ 
                         $where = trim($where);
                         $limit = trim($limit);
                         if ($where !== '' && stripos($where, 'WHERE') !== 0) {
-                            $where = "WHERE {$where}";
+                            $where = "where {$where}";
                         }
                         if ($limit !== '' && stripos($limit, 'LIMIT') !== 0) {
-                            $limit = "LIMIT {$limit}";
+                            $limit = "limit {$limit}";
                         }
                         $rt = $this->query("INSERT INTO {$intotable} {$fields} SELECT {$fromfields} FROM {$fromtable} {$where} {$limit}");
                     } else {
@@ -732,7 +732,7 @@ 
 
     public function truncate($table_name)
     {
-        $rs = $this->query("TRUNCATE {$table_name}");
+        $rs = $this->query("truncate {$table_name}");
 
         return $rs;
     }

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

Doc Comments +15 added lines

@@ -408,6 +408,9 @@ 
         return $out;
     }
 
+    /**
+     * @param string $name
+     */
     public function getColumn($name, $dsq)
     {
         if (!is_object($dsq)) {
@@ -506,6 +509,9 @@ 
         return $rsArray;
     }
 
+    /**
+     * @return string
+     */
     public function getVersion()
     {
         return $this->conn->server_info;
@@ -527,6 +533,9 @@ 
         return $result;
     }
 
+    /**
+     * @param string $table_name
+     */
     public function optimize($table_name)
     {
         $rs = $this->query("OPTIMIZE TABLE {$table_name}");
@@ -549,6 +558,9 @@ 
         return $result->data_seek($row_number);
     }
 
+    /**
+     * @return string
+     */
     public function _getFieldsStringFromArray($fields = array())
     {
 
@@ -568,6 +580,9 @@ 
         return join(',', $_);
     }
 
+    /**
+     * @return string
+     */
     public function _getFromStringFromArray($tables = array())
     {
         $_ = array();

Spacing +23 added lines, -23 removed lines

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

Braces +3 added lines, -2 removed lines

@@ -304,7 +304,8 @@ 
     }
 
     public function save($fields, $table, $where = '')
-    { // This is similar to "replace into table".
+    {
+// This is similar to "replace into table".
 
         if ($where === '') {
             $mode = 'insert';
@@ -386,7 +387,7 @@ 
     {
         $out = false;
         if (is_object($ds)) {
-            switch($mode){
+            switch($mode) {
                 case 'assoc':
                     $out = $ds->fetch_assoc();
                     break;

Upper-Lower-Casing +10 added lines, -10 removed lines

@@ -190,13 +190,13 @@ 
             $orderby = trim($orderby);
             $limit = trim($limit);
             if ($where !== '' && stripos($where, 'WHERE') !== 0) {
-                $where = "WHERE {$where}";
+                $where = "where {$where}";
             }
             if ($orderby !== '' && stripos($orderby, 'ORDER BY') !== 0) {
                 $orderby = "ORDER BY {$orderby}";
             }
             if ($limit !== '' && stripos($limit, 'LIMIT') !== 0) {
-                $limit = "LIMIT {$limit}";
+                $limit = "limit {$limit}";
             }
 
             return $this->query("DELETE FROM {$from} {$where} {$orderby} {$limit}");
@@ -228,16 +228,16 @@ 
         $orderby = trim($orderby);
         $limit = trim($limit);
         if ($where !== '' && stripos($where, 'WHERE') !== 0) {
-            $where = "WHERE {$where}";
+            $where = "where {$where}";
         }
         if ($orderby !== '' && stripos($orderby, 'ORDER') !== 0) {
             $orderby = "ORDER BY {$orderby}";
         }
         if ($limit !== '' && stripos($limit, 'LIMIT') !== 0) {
-            $limit = "LIMIT {$limit}";
+            $limit = "limit {$limit}";
         }
 
-        return $this->query("SELECT {$fields} FROM {$from} {$where} {$orderby} {$limit}");
+        return $this->query("select {$fields} FROM {$from} {$where} {$orderby} {$limit}");
     }
 
     public function update($fields, $table, $where = "")
@@ -260,10 +260,10 @@ 
             }
             $where = trim($where);
             if ($where !== '' && stripos($where, 'WHERE') !== 0) {
-                $where = "WHERE {$where}";
+                $where = "where {$where}";
             }
 
-            return $this->query("UPDATE {$table} SET {$fields} {$where}");
+            return $this->query("update {$table} SET {$fields} {$where}");
         }
     }
 
@@ -287,10 +287,10 @@ 
                     $where = trim($where);
                     $limit = trim($limit);
                     if ($where !== '' && stripos($where, 'WHERE') !== 0) {
-                        $where = "WHERE {$where}";
+                        $where = "where {$where}";
                     }
                     if ($limit !== '' && stripos($limit, 'LIMIT') !== 0) {
-                        $limit = "LIMIT {$limit}";
+                        $limit = "limit {$limit}";
                     }
                     $rt = $this->query("INSERT INTO {$intotable} {$fields} SELECT {$fromfields} FROM {$fromtable} {$where} {$limit}");
                 }
@@ -539,7 +539,7 @@ 
 
     public function truncate($table_name)
     {
-        $rs = $this->query("TRUNCATE {$table_name}");
+        $rs = $this->query("truncate {$table_name}");
 
         return $rs;
     }

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

Doc Comments +6 added lines

@@ -102,6 +102,9 @@ 
 		return $rs;
 	}
 
+    /**
+     * @param string $filepath
+     */
     public function makeFile($docid, $filepath)
 	{
 		global  $modx,$_lang;
@@ -250,6 +253,9 @@ 
 		return implode("\n", $this->output);
 	}
 
+    /**
+     * @param string $url
+     */
     public function curl_get_contents($url, $timeout = 30 )
     {
     	if(!function_exists('curl_init')) return @file_get_contents($url);

Indentation +209 added lines, -209 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 class EXPORT_SITE
 {
-	public $targetDir;
+    public $targetDir;
     public $generate_mode;
     public $total;
     public $count;
@@ -13,246 +13,246 @@ 
     public $dirCheckCount = 0;
 
     public function __construct()
-	{
-		global $modx;
-
-		if(!defined('MODX_BASE_PATH'))  return false;
-		$this->exportstart = $this->get_mtime();
-		$this->count = 0;
-		$this->setUrlMode();
-		$this->generate_mode = 'crawl';
-		$this->targetDir = $modx->config['base_path'] . 'temp/export';
-		if(!isset($this->total)) $this->getTotal();
-	}
+    {
+        global $modx;
+
+        if(!defined('MODX_BASE_PATH'))  return false;
+        $this->exportstart = $this->get_mtime();
+        $this->count = 0;
+        $this->setUrlMode();
+        $this->generate_mode = 'crawl';
+        $this->targetDir = $modx->config['base_path'] . 'temp/export';
+        if(!isset($this->total)) $this->getTotal();
+    }
 
     public function setExportDir($dir)
-	{
-		$dir = str_replace('\\','/',$dir);
-		$dir = rtrim($dir, '/');
-		$this->targetDir = $dir;
-	}
+    {
+        $dir = str_replace('\\','/',$dir);
+        $dir = rtrim($dir, '/');
+        $this->targetDir = $dir;
+    }
 
     public function get_mtime()
-	{
-		$mtime = microtime();
-		$mtime = explode(' ', $mtime);
-		$mtime = $mtime[1] + $mtime[0];
-		return $mtime;
-	}
+    {
+        $mtime = microtime();
+        $mtime = explode(' ', $mtime);
+        $mtime = $mtime[1] + $mtime[0];
+        return $mtime;
+    }
 
     public function setUrlMode()
-	{
-		global $modx;
-
-		if($modx->config['friendly_urls']==0)
-		{
-			$modx->config['friendly_urls']  = 1;
-			$modx->config['use_alias_path'] = 1;
-			$modx->clearCache('full');
-		}
-		$modx->config['make_folders'] = '1';
-	}
+    {
+        global $modx;
+
+        if($modx->config['friendly_urls']==0)
+        {
+            $modx->config['friendly_urls']  = 1;
+            $modx->config['use_alias_path'] = 1;
+            $modx->clearCache('full');
+        }
+        $modx->config['make_folders'] = '1';
+    }
 
     public function getTotal($ignore_ids='', $noncache='0')
-	{
-		global $modx;
-		$tbl_site_content = $modx->getFullTableName('site_content');
-
-		$ignore_ids = array_filter(array_map('intval', explode(',', $ignore_ids)));
-		if(count($ignore_ids)>0)
-		{
-			$ignore_ids = "AND NOT id IN ('".implode("','", $ignore_ids)."')";
-		} else {
-			$ignore_ids = '';
-		}
-
-		$this->ignore_ids = $ignore_ids;
-
-		$noncache = ($noncache == 1) ? '' : 'AND cacheable=1';
-		$where = "deleted=0 AND ((published=1 AND type='document') OR (isfolder=1)) {$noncache} {$ignore_ids}";
-		$rs  = $modx->db->select('count(id)',$tbl_site_content,$where);
-		$this->total = $modx->db->getValue($rs);
-		return $this->total;
-	}
+    {
+        global $modx;
+        $tbl_site_content = $modx->getFullTableName('site_content');
+
+        $ignore_ids = array_filter(array_map('intval', explode(',', $ignore_ids)));
+        if(count($ignore_ids)>0)
+        {
+            $ignore_ids = "AND NOT id IN ('".implode("','", $ignore_ids)."')";
+        } else {
+            $ignore_ids = '';
+        }
+
+        $this->ignore_ids = $ignore_ids;
+
+        $noncache = ($noncache == 1) ? '' : 'AND cacheable=1';
+        $where = "deleted=0 AND ((published=1 AND type='document') OR (isfolder=1)) {$noncache} {$ignore_ids}";
+        $rs  = $modx->db->select('count(id)',$tbl_site_content,$where);
+        $this->total = $modx->db->getValue($rs);
+        return $this->total;
+    }
 
     public function removeDirectoryAll($directory='')
-	{
-	    $rs = false;
-		if(empty($directory)) $directory = $this->targetDir;
-		$directory = rtrim($directory,'/');
-		// if the path is not valid or is not a directory ...
-		if(empty($directory)) return false;
-		if(strpos($directory,MODX_BASE_PATH)===false) return $rs;
-
-		if(!is_dir($directory))          return $rs;
-		elseif(!is_readable($directory)) return $rs;
-		else
-		{
-			$files = glob($directory . '/*');
-			if(!empty($files))
-			{
-    			foreach($files as $path)
-    			{
+    {
+        $rs = false;
+        if(empty($directory)) $directory = $this->targetDir;
+        $directory = rtrim($directory,'/');
+        // if the path is not valid or is not a directory ...
+        if(empty($directory)) return false;
+        if(strpos($directory,MODX_BASE_PATH)===false) return $rs;
+
+        if(!is_dir($directory))          return $rs;
+        elseif(!is_readable($directory)) return $rs;
+        else
+        {
+            $files = glob($directory . '/*');
+            if(!empty($files))
+            {
+                foreach($files as $path)
+                {
                     $rs = is_dir($path) ? $this->removeDirectoryAll($path) : unlink($path);
-    			}
-			}
-		}
-		if($directory !== $this->targetDir) $rs = rmdir($directory);
+                }
+            }
+        }
+        if($directory !== $this->targetDir) $rs = rmdir($directory);
 
-		return $rs;
-	}
+        return $rs;
+    }
 
     public function makeFile($docid, $filepath)
-	{
-		global  $modx,$_lang;
-		$file_permission = octdec($modx->config['new_file_permissions']);
-		if($this->generate_mode==='direct')
-		{
-			$back_lang = $_lang;
-			$src = $modx->executeParser($docid);
-
-			$_lang = $back_lang;
-		}
-		else $src = $this->curl_get_contents(MODX_SITE_URL . "index.php?id={$docid}");
-
-
-		if($src !== false)
-		{
-			if($this->repl_before!==$this->repl_after) $src = str_replace($this->repl_before,$this->repl_after,$src);
-			$result = file_put_contents($filepath,$src);
-			if($result!==false) @chmod($filepath, $file_permission);
-
-			if($result !== false) return 'success';
-			else                  return 'failed_no_write';
-		}
-		else                      return 'failed_no_retrieve';
-	}
+    {
+        global  $modx,$_lang;
+        $file_permission = octdec($modx->config['new_file_permissions']);
+        if($this->generate_mode==='direct')
+        {
+            $back_lang = $_lang;
+            $src = $modx->executeParser($docid);
+
+            $_lang = $back_lang;
+        }
+        else $src = $this->curl_get_contents(MODX_SITE_URL . "index.php?id={$docid}");
+
+
+        if($src !== false)
+        {
+            if($this->repl_before!==$this->repl_after) $src = str_replace($this->repl_before,$this->repl_after,$src);
+            $result = file_put_contents($filepath,$src);
+            if($result!==false) @chmod($filepath, $file_permission);
+
+            if($result !== false) return 'success';
+            else                  return 'failed_no_write';
+        }
+        else                      return 'failed_no_retrieve';
+    }
 
     public function getFileName($docid, $alias='', $prefix, $suffix)
-	{
-		global $modx;
-
-		if($alias==='') $filename = $prefix.$docid.$suffix;
-		else
-		{
-			if($modx->config['suffix_mode']==='1' && strpos($alias, '.')!==false)
-			{
-				$suffix = '';
-			}
-			$filename = $prefix.$alias.$suffix;
-		}
-		return $filename;
-	}
+    {
+        global $modx;
+
+        if($alias==='') $filename = $prefix.$docid.$suffix;
+        else
+        {
+            if($modx->config['suffix_mode']==='1' && strpos($alias, '.')!==false)
+            {
+                $suffix = '';
+            }
+            $filename = $prefix.$alias.$suffix;
+        }
+        return $filename;
+    }
 
     public function run($parent=0)
-	{
-		global $_lang;
-		global $modx;
+    {
+        global $_lang;
+        global $modx;
 
-		$tbl_site_content = $modx->getFullTableName('site_content');
+        $tbl_site_content = $modx->getFullTableName('site_content');
 
-		$ignore_ids = $this->ignore_ids;
-		$dirpath = $this->targetDir . '/';
+        $ignore_ids = $this->ignore_ids;
+        $dirpath = $this->targetDir . '/';
 
-		$prefix = $modx->config['friendly_url_prefix'];
-		$suffix = $modx->config['friendly_url_suffix'];
+        $prefix = $modx->config['friendly_url_prefix'];
+        $suffix = $modx->config['friendly_url_suffix'];
 
-		$tpl = ' <span class="[+status+]">[+msg1+]</span> [+msg2+]</span>';
-		$ph = array();
+        $tpl = ' <span class="[+status+]">[+msg1+]</span> [+msg2+]</span>';
+        $ph = array();
 
-		$ph['status'] = 'fail';
-		$ph['msg1']   = $_lang['export_site_failed'];
-		$ph['msg2']   = $_lang["export_site_failed_no_write"] . ' - ' . $dirpath;
-		$msg_failed_no_write    = $this->parsePlaceholder($tpl,$ph);
+        $ph['status'] = 'fail';
+        $ph['msg1']   = $_lang['export_site_failed'];
+        $ph['msg2']   = $_lang["export_site_failed_no_write"] . ' - ' . $dirpath;
+        $msg_failed_no_write    = $this->parsePlaceholder($tpl,$ph);
 
-		$ph['msg2']   = $_lang["export_site_failed_no_retrieve"];
-		$msg_failed_no_retrieve = $this->parsePlaceholder($tpl,$ph);
+        $ph['msg2']   = $_lang["export_site_failed_no_retrieve"];
+        $msg_failed_no_retrieve = $this->parsePlaceholder($tpl,$ph);
 
-		$ph['status'] = 'success';
-		$ph['msg1']   = $_lang['export_site_success'];
-		$ph['msg2']   = '';
-		$msg_success            = $this->parsePlaceholder($tpl,$ph);
+        $ph['status'] = 'success';
+        $ph['msg1']   = $_lang['export_site_success'];
+        $ph['msg2']   = '';
+        $msg_success            = $this->parsePlaceholder($tpl,$ph);
 
-		$ph['msg2']   = $_lang['export_site_success_skip_doc'];
-		$msg_success_skip_doc = $this->parsePlaceholder($tpl,$ph);
+        $ph['msg2']   = $_lang['export_site_success_skip_doc'];
+        $msg_success_skip_doc = $this->parsePlaceholder($tpl,$ph);
 
-		$ph['msg2']   = $_lang['export_site_success_skip_dir'];
-		$msg_success_skip_dir = $this->parsePlaceholder($tpl,$ph);
+        $ph['msg2']   = $_lang['export_site_success_skip_dir'];
+        $msg_success_skip_dir = $this->parsePlaceholder($tpl,$ph);
 
-		$fields = "id, alias, pagetitle, isfolder, (content = '' AND template = 0) AS wasNull, published";
-		$noncache = $_POST['includenoncache']==1 ? '' : 'AND cacheable=1';
-		$where = "parent = '{$parent}' AND deleted=0 AND ((published=1 AND type='document') OR (isfolder=1)) {$noncache} {$ignore_ids}";
-		$rs = $modx->db->select($fields,$tbl_site_content,$where);
+        $fields = "id, alias, pagetitle, isfolder, (content = '' AND template = 0) AS wasNull, published";
+        $noncache = $_POST['includenoncache']==1 ? '' : 'AND cacheable=1';
+        $where = "parent = '{$parent}' AND deleted=0 AND ((published=1 AND type='document') OR (isfolder=1)) {$noncache} {$ignore_ids}";
+        $rs = $modx->db->select($fields,$tbl_site_content,$where);
 
-		$ph = array();
-		$ph['total']     = $this->total;
-		$folder_permission = octdec($modx->config['new_folder_permissions']);
-		while($row = $modx->db->getRow($rs))
-		{
-			$this->count++;
+        $ph = array();
+        $ph['total']     = $this->total;
+        $folder_permission = octdec($modx->config['new_folder_permissions']);
+        while($row = $modx->db->getRow($rs))
+        {
+            $this->count++;
             $filename = '';
-			$row['count']     = $this->count;
-			$row['url'] = $modx->makeUrl($row['id']);
-
-			if (!$row['wasNull'])
-			{ // needs writing a document
-				$docname = $this->getFileName($row['id'], $row['alias'], $prefix, $suffix);
-				$filename = $dirpath.$docname;
-				if (!is_file($filename))
-				{
-					if($row['published']==='1')
-					{
-						$status = $this->makeFile($row['id'], $filename);
-						switch($status)
-						{
-							case 'failed_no_write'   :
+            $row['count']     = $this->count;
+            $row['url'] = $modx->makeUrl($row['id']);
+
+            if (!$row['wasNull'])
+            { // needs writing a document
+                $docname = $this->getFileName($row['id'], $row['alias'], $prefix, $suffix);
+                $filename = $dirpath.$docname;
+                if (!is_file($filename))
+                {
+                    if($row['published']==='1')
+                    {
+                        $status = $this->makeFile($row['id'], $filename);
+                        switch($status)
+                        {
+                            case 'failed_no_write'   :
                                                             $row['status'] = $msg_failed_no_write;
                                                             break;
-							case 'failed_no_retrieve':
+                            case 'failed_no_retrieve':
                                                             $row['status'] = $msg_failed_no_retrieve;
                                                             break;
-							default:
+                            default:
                                                             $row['status'] = $msg_success;
-						}
-					}
-					else $row['status'] = $msg_failed_no_retrieve;
-				}
-				else     $row['status'] = $msg_success_skip_doc;
-				$this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
-			}
-			else
-			{
-				$row['status'] = $msg_success_skip_dir;
-				$this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
-			}
-			if ($row['isfolder']==='1' && ($modx->config['suffix_mode']!=='1' || strpos($row['alias'],'.')===false))
-			{ // needs making a folder
-				$end_dir = ($row['alias']!=='') ? $row['alias'] : $row['id'];
-				$dir_path = $dirpath . $end_dir;
-				if(strpos($dir_path,MODX_BASE_PATH)===false) return FALSE;
-				if (!is_dir($dir_path))
-				{
-					if (is_file($dir_path)) @unlink($dir_path);
-					mkdir($dir_path);
-					@chmod($dir_path, $folder_permission);
-
-				}
-
-
-				if($modx->config['make_folders']==='1' && $row['published']==='1')
-				{
-					if( ! empty($filename) && is_file($filename)) rename($filename,$dir_path . '/index.html');
-				}
-				$this->targetDir = $dir_path;
-				$this->run($row['id']);
-			}
-		}
-		return implode("\n", $this->output);
-	}
+                        }
+                    }
+                    else $row['status'] = $msg_failed_no_retrieve;
+                }
+                else     $row['status'] = $msg_success_skip_doc;
+                $this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
+            }
+            else
+            {
+                $row['status'] = $msg_success_skip_dir;
+                $this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
+            }
+            if ($row['isfolder']==='1' && ($modx->config['suffix_mode']!=='1' || strpos($row['alias'],'.')===false))
+            { // needs making a folder
+                $end_dir = ($row['alias']!=='') ? $row['alias'] : $row['id'];
+                $dir_path = $dirpath . $end_dir;
+                if(strpos($dir_path,MODX_BASE_PATH)===false) return FALSE;
+                if (!is_dir($dir_path))
+                {
+                    if (is_file($dir_path)) @unlink($dir_path);
+                    mkdir($dir_path);
+                    @chmod($dir_path, $folder_permission);
+
+                }
+
+
+                if($modx->config['make_folders']==='1' && $row['published']==='1')
+                {
+                    if( ! empty($filename) && is_file($filename)) rename($filename,$dir_path . '/index.html');
+                }
+                $this->targetDir = $dir_path;
+                $this->run($row['id']);
+            }
+        }
+        return implode("\n", $this->output);
+    }
 
     public function curl_get_contents($url, $timeout = 30 )
     {
-    	if(!function_exists('curl_init')) return @file_get_contents($url);
+        if(!function_exists('curl_init')) return @file_get_contents($url);
 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
@@ -269,12 +269,12 @@ 
 
     public function parsePlaceholder($tpl,$ph=array())
     {
-    	foreach($ph as $k=>$v)
-    	{
-    		$k = "[+{$k}+]";
-    		$tpl = str_replace($k,$v,$tpl);
-    	}
-    	return $tpl;
+        foreach($ph as $k=>$v)
+        {
+            $k = "[+{$k}+]";
+            $tpl = str_replace($k,$v,$tpl);
+        }
+        return $tpl;
     }
 
 }

Spacing +59 added lines, -59 removed lines

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

Braces +85 added lines, -69 removed lines

@@ -13,27 +13,31 @@ 
     public $dirCheckCount = 0;
 
     public function __construct()
-	{
+    {
 		global $modx;
 
-		if(!defined('MODX_BASE_PATH'))  return false;
+		if(!defined('MODX_BASE_PATH')) {
+		    return false;
+		}
 		$this->exportstart = $this->get_mtime();
 		$this->count = 0;
 		$this->setUrlMode();
 		$this->generate_mode = 'crawl';
 		$this->targetDir = $modx->config['base_path'] . 'temp/export';
-		if(!isset($this->total)) $this->getTotal();
+		if(!isset($this->total)) {
+		    $this->getTotal();
+		}
 	}
 
     public function setExportDir($dir)
-	{
+    {
 		$dir = str_replace('\\','/',$dir);
 		$dir = rtrim($dir, '/');
 		$this->targetDir = $dir;
 	}
 
     public function get_mtime()
-	{
+    {
 		$mtime = microtime();
 		$mtime = explode(' ', $mtime);
 		$mtime = $mtime[1] + $mtime[0];
@@ -41,11 +45,10 @@ 
 	}
 
     public function setUrlMode()
-	{
+    {
 		global $modx;
 
-		if($modx->config['friendly_urls']==0)
-		{
+		if($modx->config['friendly_urls']==0) {
 			$modx->config['friendly_urls']  = 1;
 			$modx->config['use_alias_path'] = 1;
 			$modx->clearCache('full');
@@ -54,13 +57,12 @@ 
 	}
 
     public function getTotal($ignore_ids='', $noncache='0')
-	{
+    {
 		global $modx;
 		$tbl_site_content = $modx->getFullTableName('site_content');
 
 		$ignore_ids = array_filter(array_map('intval', explode(',', $ignore_ids)));
-		if(count($ignore_ids)>0)
-		{
+		if(count($ignore_ids)>0) {
 			$ignore_ids = "AND NOT id IN ('".implode("','", $ignore_ids)."')";
 		} else {
 			$ignore_ids = '';
@@ -76,67 +78,80 @@ 
 	}
 
     public function removeDirectoryAll($directory='')
-	{
+    {
 	    $rs = false;
-		if(empty($directory)) $directory = $this->targetDir;
+		if(empty($directory)) {
+		    $directory = $this->targetDir;
+		}
 		$directory = rtrim($directory,'/');
 		// if the path is not valid or is not a directory ...
-		if(empty($directory)) return false;
-		if(strpos($directory,MODX_BASE_PATH)===false) return $rs;
+		if(empty($directory)) {
+		    return false;
+		}
+		if(strpos($directory,MODX_BASE_PATH)===false) {
+		    return $rs;
+		}
 
-		if(!is_dir($directory))          return $rs;
-		elseif(!is_readable($directory)) return $rs;
-		else
-		{
+		if(!is_dir($directory)) {
+		    return $rs;
+		} elseif(!is_readable($directory)) {
+		    return $rs;
+		} else {
 			$files = glob($directory . '/*');
-			if(!empty($files))
-			{
-    			foreach($files as $path)
-    			{
+			if(!empty($files)) {
+    			foreach($files as $path) {
                     $rs = is_dir($path) ? $this->removeDirectoryAll($path) : unlink($path);
     			}
 			}
 		}
-		if($directory !== $this->targetDir) $rs = rmdir($directory);
+		if($directory !== $this->targetDir) {
+		    $rs = rmdir($directory);
+		}
 
 		return $rs;
 	}
 
     public function makeFile($docid, $filepath)
-	{
+    {
 		global  $modx,$_lang;
 		$file_permission = octdec($modx->config['new_file_permissions']);
-		if($this->generate_mode==='direct')
-		{
+		if($this->generate_mode==='direct') {
 			$back_lang = $_lang;
 			$src = $modx->executeParser($docid);
 
 			$_lang = $back_lang;
+		} else {
+		    $src = $this->curl_get_contents(MODX_SITE_URL . "index.php?id={$docid}");
 		}
-		else $src = $this->curl_get_contents(MODX_SITE_URL . "index.php?id={$docid}");
 
 
-		if($src !== false)
-		{
-			if($this->repl_before!==$this->repl_after) $src = str_replace($this->repl_before,$this->repl_after,$src);
+		if($src !== false) {
+			if($this->repl_before!==$this->repl_after) {
+			    $src = str_replace($this->repl_before,$this->repl_after,$src);
+			}
 			$result = file_put_contents($filepath,$src);
-			if($result!==false) @chmod($filepath, $file_permission);
+			if($result!==false) {
+			    @chmod($filepath, $file_permission);
+			}
 
-			if($result !== false) return 'success';
-			else                  return 'failed_no_write';
+			if($result !== false) {
+			    return 'success';
+			} else {
+			    return 'failed_no_write';
+			}
+		} else {
+		    return 'failed_no_retrieve';
 		}
-		else                      return 'failed_no_retrieve';
 	}
 
     public function getFileName($docid, $alias='', $prefix, $suffix)
-	{
+    {
 		global $modx;
 
-		if($alias==='') $filename = $prefix.$docid.$suffix;
-		else
-		{
-			if($modx->config['suffix_mode']==='1' && strpos($alias, '.')!==false)
-			{
+		if($alias==='') {
+		    $filename = $prefix.$docid.$suffix;
+		} else {
+			if($modx->config['suffix_mode']==='1' && strpos($alias, '.')!==false) {
 				$suffix = '';
 			}
 			$filename = $prefix.$alias.$suffix;
@@ -145,7 +160,7 @@ 
 	}
 
     public function run($parent=0)
-	{
+    {
 		global $_lang;
 		global $modx;
 
@@ -187,24 +202,20 @@ 
 		$ph = array();
 		$ph['total']     = $this->total;
 		$folder_permission = octdec($modx->config['new_folder_permissions']);
-		while($row = $modx->db->getRow($rs))
-		{
+		while($row = $modx->db->getRow($rs)) {
 			$this->count++;
             $filename = '';
 			$row['count']     = $this->count;
 			$row['url'] = $modx->makeUrl($row['id']);
 
-			if (!$row['wasNull'])
-			{ // needs writing a document
+			if (!$row['wasNull']) {
+// needs writing a document
 				$docname = $this->getFileName($row['id'], $row['alias'], $prefix, $suffix);
 				$filename = $dirpath.$docname;
-				if (!is_file($filename))
-				{
-					if($row['published']==='1')
-					{
+				if (!is_file($filename)) {
+					if($row['published']==='1') {
 						$status = $this->makeFile($row['id'], $filename);
-						switch($status)
-						{
+						switch($status) {
 							case 'failed_no_write'   :
                                                             $row['status'] = $msg_failed_no_write;
                                                             break;
@@ -214,34 +225,38 @@ 
 							default:
                                                             $row['status'] = $msg_success;
 						}
+					} else {
+					    $row['status'] = $msg_failed_no_retrieve;
 					}
-					else $row['status'] = $msg_failed_no_retrieve;
+				} else {
+				    $row['status'] = $msg_success_skip_doc;
 				}
-				else     $row['status'] = $msg_success_skip_doc;
 				$this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
-			}
-			else
-			{
+			} else {
 				$row['status'] = $msg_success_skip_dir;
 				$this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
 			}
-			if ($row['isfolder']==='1' && ($modx->config['suffix_mode']!=='1' || strpos($row['alias'],'.')===false))
-			{ // needs making a folder
+			if ($row['isfolder']==='1' && ($modx->config['suffix_mode']!=='1' || strpos($row['alias'],'.')===false)) {
+// needs making a folder
 				$end_dir = ($row['alias']!=='') ? $row['alias'] : $row['id'];
 				$dir_path = $dirpath . $end_dir;
-				if(strpos($dir_path,MODX_BASE_PATH)===false) return FALSE;
-				if (!is_dir($dir_path))
-				{
-					if (is_file($dir_path)) @unlink($dir_path);
+				if(strpos($dir_path,MODX_BASE_PATH)===false) {
+				    return FALSE;
+				}
+				if (!is_dir($dir_path)) {
+					if (is_file($dir_path)) {
+					    @unlink($dir_path);
+					}
 					mkdir($dir_path);
 					@chmod($dir_path, $folder_permission);
 
 				}
 
 
-				if($modx->config['make_folders']==='1' && $row['published']==='1')
-				{
-					if( ! empty($filename) && is_file($filename)) rename($filename,$dir_path . '/index.html');
+				if($modx->config['make_folders']==='1' && $row['published']==='1') {
+					if( ! empty($filename) && is_file($filename)) {
+					    rename($filename,$dir_path . '/index.html');
+					}
 				}
 				$this->targetDir = $dir_path;
 				$this->run($row['id']);
@@ -252,7 +267,9 @@ 
 
     public function curl_get_contents($url, $timeout = 30 )
     {
-    	if(!function_exists('curl_init')) return @file_get_contents($url);
+    	if(!function_exists('curl_init')) {
+    	    return @file_get_contents($url);
+    	}
 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
@@ -269,8 +286,7 @@ 
 
     public function parsePlaceholder($tpl,$ph=array())
     {
-    	foreach($ph as $k=>$v)
-    	{
+    	foreach($ph as $k=>$v) {
     		$k = "[+{$k}+]";
     		$tpl = str_replace($k,$v,$tpl);
     	}

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -229,7 +229,7 @@
 			{ // needs making a folder
 				$end_dir = ($row['alias']!=='') ? $row['alias'] : $row['id'];
 				$dir_path = $dirpath . $end_dir;
-				if(strpos($dir_path,MODX_BASE_PATH)===false) return FALSE;
+				if(strpos($dir_path,MODX_BASE_PATH)===false) return false;
 				if (!is_dir($dir_path))
 				{
 					if (is_file($dir_path)) @unlink($dir_path);

manager/includes/extenders/maketable.class.php

Doc Comments +6 added lines, -4 removed lines

@@ -85,7 +85,7 @@ 
 	/**
 	 * Sets the class attribute of the main HTML TABLE.
 	 *
-	 * @param $value A class for the main HTML TABLE.
+	 * @param string $value A class for the main HTML TABLE.
 	 */
     public function setTableClass($value) {
 		$this->tableClass= $value;
@@ -130,7 +130,7 @@ 
 	/**
 	 * Sets the class attribute of regular table rows.
 	 *
-	 * @param $value A class for regular table rows.
+	 * @param string $value A class for regular table rows.
 	 */
     public function setRowRegularClass($value) {
 		$this->rowRegularClass= $value;
@@ -139,7 +139,7 @@ 
 	/**
 	 * Sets the class attribute of alternate table rows.
 	 *
-	 * @param $value A class for alternate table rows.
+	 * @param string $value A class for alternate table rows.
 	 */
     public function setRowAlternateClass($value) {
 		$this->rowAlternateClass= $value;
@@ -215,6 +215,7 @@ 
 	 *
 	 * @param $value An Array of column widths in the order of the keys in the
 	 * 			source table array.
+	 * @param string[] $widthArray
 	 */
     public function setColumnWidths($widthArray) {
 		$this->columnWidths= $widthArray;
@@ -242,7 +243,7 @@ 
 	/**
 	 * Retrieves the width of a specific table column by index position.
 	 *
-	 * @param $columnPosition The index of the column to get the width for.
+	 * @param integer $columnPosition The index of the column to get the width for.
 	 */
     public function getColumnWidth($columnPosition) {
 		$currentWidth= '';
@@ -256,6 +257,7 @@ 
 	 * Determines what class the current row should have applied.
 	 *
 	 * @param $value The position of the current row being rendered.
+	 * @param integer $position
 	 */
     public function determineRowClass($position) {
 		switch ($this->rowAlternatingScheme) {

Indentation +439 added lines, -439 removed lines

@@ -9,7 +9,7 @@ 
  * @author Jason Coward <jason@opengeek.com> (MODX)
  */
 class MakeTable {
-	public $actionField;
+    public $actionField;
     public $cellAction;
     public $linkAction;
     public $tableWidth;
@@ -34,343 +34,343 @@ 
     public $extra;
 
     public function __construct() {
-		$this->fieldHeaders= array();
-		$this->excludeFields= array();
-		$this->actionField= '';
-		$this->cellAction= '';
-		$this->linkAction= '';
-		$this->tableWidth= '';
-		$this->tableClass= '';
-		$this->rowHeaderClass= '';
-		$this->columnHeaderClass= '';
-		$this->rowRegularClass= '';
-		$this->rowAlternateClass= 'alt';
-		$this->formName= 'tableForm';
-		$this->formAction= '[~[*id*]~]';
-		$this->formElementName= '';
-		$this->formElementType= '';
-		$this->rowAlternatingScheme= 'EVEN';
-		$this->allOption= 0;
-		$this->selectedValues= array();
-		$this->extra= '';
-	}
-
-	/**
-	 * Sets the default link href for all cells in the table.
-	 *
-	 * @param $value A URL to execute when table cells are clicked.
-	 */
+        $this->fieldHeaders= array();
+        $this->excludeFields= array();
+        $this->actionField= '';
+        $this->cellAction= '';
+        $this->linkAction= '';
+        $this->tableWidth= '';
+        $this->tableClass= '';
+        $this->rowHeaderClass= '';
+        $this->columnHeaderClass= '';
+        $this->rowRegularClass= '';
+        $this->rowAlternateClass= 'alt';
+        $this->formName= 'tableForm';
+        $this->formAction= '[~[*id*]~]';
+        $this->formElementName= '';
+        $this->formElementType= '';
+        $this->rowAlternatingScheme= 'EVEN';
+        $this->allOption= 0;
+        $this->selectedValues= array();
+        $this->extra= '';
+    }
+
+    /**
+     * Sets the default link href for all cells in the table.
+     *
+     * @param $value A URL to execute when table cells are clicked.
+     */
     public function setCellAction($value) {
-		$this->cellAction= $this->prepareLink($value);
-	}
-
-	/**
-	 * Sets the default link href for the text presented in a cell.
-	 *
-	 * @param $value A URL to execute when text within table cells are clicked.
-	 */
+        $this->cellAction= $this->prepareLink($value);
+    }
+
+    /**
+     * Sets the default link href for the text presented in a cell.
+     *
+     * @param $value A URL to execute when text within table cells are clicked.
+     */
     public function setLinkAction($value) {
-		$this->linkAction= $this->prepareLink($value);
-	}
-
-	/**
-	 * Sets the width attribute of the main HTML TABLE.
-	 *
-	 * @param $value A valid width attribute for the HTML TABLE tag
-	 */
+        $this->linkAction= $this->prepareLink($value);
+    }
+
+    /**
+     * Sets the width attribute of the main HTML TABLE.
+     *
+     * @param $value A valid width attribute for the HTML TABLE tag
+     */
     public function setTableWidth($value) {
-		$this->tableWidth= $value;
-	}
-
-	/**
-	 * Sets the class attribute of the main HTML TABLE.
-	 *
-	 * @param $value A class for the main HTML TABLE.
-	 */
+        $this->tableWidth= $value;
+    }
+
+    /**
+     * Sets the class attribute of the main HTML TABLE.
+     *
+     * @param $value A class for the main HTML TABLE.
+     */
     public function setTableClass($value) {
-		$this->tableClass= $value;
-	}
-
-	/**
-	 * Sets the id attribute of the main HTML TABLE.
-	 *
-	 * @param $value A class for the main HTML TABLE.
-	 */
+        $this->tableClass= $value;
+    }
+
+    /**
+     * Sets the id attribute of the main HTML TABLE.
+     *
+     * @param $value A class for the main HTML TABLE.
+     */
     public function setTableID($value) {
-		$this->tableID= $value;
-	}
-
-	/**
-	 * Sets the class attribute of the table header row.
-	 *
-	 * @param $value A class for the table header row.
-	 */
+        $this->tableID= $value;
+    }
+
+    /**
+     * Sets the class attribute of the table header row.
+     *
+     * @param $value A class for the table header row.
+     */
     public function setRowHeaderClass($value) {
-		$this->rowHeaderClass= $value;
-	}
-
-		/**
-	 * Sets the class attribute of the table header row.
-	 *
-	 * @param $value A class for the table header row.
-	 */
+        $this->rowHeaderClass= $value;
+    }
+
+        /**
+         * Sets the class attribute of the table header row.
+         *
+         * @param $value A class for the table header row.
+         */
     public function setThHeaderClass($value) {
-		$this->thClass= $value;
-	}
-
-	/**
-	 * Sets the class attribute of the column header row.
-	 *
-	 * @param $value A class for the column header row.
-	 */
+        $this->thClass= $value;
+    }
+
+    /**
+     * Sets the class attribute of the column header row.
+     *
+     * @param $value A class for the column header row.
+     */
     public function setColumnHeaderClass($value) {
-		$this->columnHeaderClass= $value;
-	}
-
-	/**
-	 * Sets the class attribute of regular table rows.
-	 *
-	 * @param $value A class for regular table rows.
-	 */
+        $this->columnHeaderClass= $value;
+    }
+
+    /**
+     * Sets the class attribute of regular table rows.
+     *
+     * @param $value A class for regular table rows.
+     */
     public function setRowRegularClass($value) {
-		$this->rowRegularClass= $value;
-	}
-
-	/**
-	 * Sets the class attribute of alternate table rows.
-	 *
-	 * @param $value A class for alternate table rows.
-	 */
+        $this->rowRegularClass= $value;
+    }
+
+    /**
+     * Sets the class attribute of alternate table rows.
+     *
+     * @param $value A class for alternate table rows.
+     */
     public function setRowAlternateClass($value) {
-		$this->rowAlternateClass= $value;
-	}
-
-	/**
-	 * Sets the type of INPUT form element to be presented as the first column.
-	 *
-	 * @param $value Indicates the INPUT form element type attribute.
-	 */
+        $this->rowAlternateClass= $value;
+    }
+
+    /**
+     * Sets the type of INPUT form element to be presented as the first column.
+     *
+     * @param $value Indicates the INPUT form element type attribute.
+     */
     public function setFormElementType($value) {
-		$this->formElementType= $value;
-	}
-
-	/**
-	 * Sets the name of the INPUT form element to be presented as the first column.
-	 *
-	 * @param $value Indicates the INPUT form element name attribute.
-	 */
+        $this->formElementType= $value;
+    }
+
+    /**
+     * Sets the name of the INPUT form element to be presented as the first column.
+     *
+     * @param $value Indicates the INPUT form element name attribute.
+     */
     public function setFormElementName($value) {
-		$this->formElementName= $value;
-	}
-
-	/**
-	 * Sets the name of the FORM to wrap the table in when a form element has
-	 * been indicated.
-	 *
-	 * @param $value Indicates the FORM name attribute.
-	 */
+        $this->formElementName= $value;
+    }
+
+    /**
+     * Sets the name of the FORM to wrap the table in when a form element has
+     * been indicated.
+     *
+     * @param $value Indicates the FORM name attribute.
+     */
     public function setFormName($value) {
-		$this->formName= $value;
-	}
-
-	/**
-	 * Sets the action of the FORM element.
-	 *
-	 * @param $value Indicates the FORM action attribute.
-	 */
+        $this->formName= $value;
+    }
+
+    /**
+     * Sets the action of the FORM element.
+     *
+     * @param $value Indicates the FORM action attribute.
+     */
     public function setFormAction($value) {
-		$this->formAction= $value;
-	}
-
-	/**
-	 * Excludes fields from the table by array key.
-	 *
-	 * @param $value An Array of field keys to exclude from the table.
-	 */
+        $this->formAction= $value;
+    }
+
+    /**
+     * Excludes fields from the table by array key.
+     *
+     * @param $value An Array of field keys to exclude from the table.
+     */
     public function setExcludeFields($value) {
-		$this->excludeFields= $value;
-	}
-
-	/**
-	 * Sets the table to provide alternate row colors using ODD or EVEN rows
-	 *
-	 * @param $value 'ODD' or 'EVEN' to indicate the alternate row scheme.
-	 */
+        $this->excludeFields= $value;
+    }
+
+    /**
+     * Sets the table to provide alternate row colors using ODD or EVEN rows
+     *
+     * @param $value 'ODD' or 'EVEN' to indicate the alternate row scheme.
+     */
     public function setRowAlternatingScheme($value) {
-		$this->rowAlternatingScheme= $value;
-	}
-
-	/**
-	 * Sets the default field value to be used when appending query parameters
-	 * to link actions.
-	 *
-	 * @param $value The key of the field to add as a query string parameter.
-	 */
+        $this->rowAlternatingScheme= $value;
+    }
+
+    /**
+     * Sets the default field value to be used when appending query parameters
+     * to link actions.
+     *
+     * @param $value The key of the field to add as a query string parameter.
+     */
     public function setActionFieldName($value) {
-		$this->actionField= $value;
-	}
-
-	/**
-	 * Sets the width attribute of each column in the array.
-	 *
-	 * @param $value An Array of column widths in the order of the keys in the
-	 * 			source table array.
-	 */
+        $this->actionField= $value;
+    }
+
+    /**
+     * Sets the width attribute of each column in the array.
+     *
+     * @param $value An Array of column widths in the order of the keys in the
+     * 			source table array.
+     */
     public function setColumnWidths($widthArray) {
-		$this->columnWidths= $widthArray;
-	}
-
-	/**
-	 * An optional array of values that can be preselected when using
-	 *
-	 * @param $value Indicates the INPUT form element type attribute.
-	 */
+        $this->columnWidths= $widthArray;
+    }
+
+    /**
+     * An optional array of values that can be preselected when using
+     *
+     * @param $value Indicates the INPUT form element type attribute.
+     */
     public function setSelectedValues($valueArray) {
-		$this->selectedValues= $valueArray;
-	}
-
-	/**
-	 * Sets extra content to be presented following the table (but within
-	 * the form, if a form is being rendered with the table).
-	 *
-	 * @param $value A string of additional content.
-	 */
+        $this->selectedValues= $valueArray;
+    }
+
+    /**
+     * Sets extra content to be presented following the table (but within
+     * the form, if a form is being rendered with the table).
+     *
+     * @param $value A string of additional content.
+     */
     public function setExtra($value) {
-		$this->extra= $value;
-	}
-
-	/**
-	 * Retrieves the width of a specific table column by index position.
-	 *
-	 * @param $columnPosition The index of the column to get the width for.
-	 */
+        $this->extra= $value;
+    }
+
+    /**
+     * Retrieves the width of a specific table column by index position.
+     *
+     * @param $columnPosition The index of the column to get the width for.
+     */
     public function getColumnWidth($columnPosition) {
-		$currentWidth= '';
-		if (is_array($this->columnWidths)) {
-			$currentWidth= $this->columnWidths[$columnPosition] ? ' width="'.$this->columnWidths[$columnPosition].'" ' : '';
-		}
-		return $currentWidth;
-	}
-
-	/**
-	 * Determines what class the current row should have applied.
-	 *
-	 * @param $value The position of the current row being rendered.
-	 */
+        $currentWidth= '';
+        if (is_array($this->columnWidths)) {
+            $currentWidth= $this->columnWidths[$columnPosition] ? ' width="'.$this->columnWidths[$columnPosition].'" ' : '';
+        }
+        return $currentWidth;
+    }
+
+    /**
+     * Determines what class the current row should have applied.
+     *
+     * @param $value The position of the current row being rendered.
+     */
     public function determineRowClass($position) {
-		switch ($this->rowAlternatingScheme) {
-			case 'ODD' :
-				$modRemainder= 1;
-				break;
-			case 'EVEN' :
-				$modRemainder= 0;
-				break;
-		}
-		if ($position % 2 == $modRemainder) {
-			$currentClass= $this->rowRegularClass;
-		} else {
-			$currentClass= $this->rowAlternateClass;
-		}
-		return ' class="'.$currentClass.'"';
-	}
-
-	/**
-	 * Generates an onclick action applied to the current cell, to execute
-	 * any specified cell actions.
-	 *
-	 * @param $value Indicates the INPUT form element type attribute.
-	 */
+        switch ($this->rowAlternatingScheme) {
+            case 'ODD' :
+                $modRemainder= 1;
+                break;
+            case 'EVEN' :
+                $modRemainder= 0;
+                break;
+        }
+        if ($position % 2 == $modRemainder) {
+            $currentClass= $this->rowRegularClass;
+        } else {
+            $currentClass= $this->rowAlternateClass;
+        }
+        return ' class="'.$currentClass.'"';
+    }
+
+    /**
+     * Generates an onclick action applied to the current cell, to execute
+     * any specified cell actions.
+     *
+     * @param $value Indicates the INPUT form element type attribute.
+     */
     public function getCellAction($currentActionFieldValue) {
-		if ($this->cellAction) {
-			$cellAction= ' onClick="javascript:window.location=\''.$this->cellAction.$this->actionField.'='.urlencode($currentActionFieldValue).'\'" ';
-		}
-		return $cellAction;
-	}
-
-	/**
-	 * Generates the cell content, including any specified action fields values.
-	 *
-	 * @param $currentActionFieldValue The value to be applied to the link action.
-	 * @param $value The value of the cell.
-	 */
+        if ($this->cellAction) {
+            $cellAction= ' onClick="javascript:window.location=\''.$this->cellAction.$this->actionField.'='.urlencode($currentActionFieldValue).'\'" ';
+        }
+        return $cellAction;
+    }
+
+    /**
+     * Generates the cell content, including any specified action fields values.
+     *
+     * @param $currentActionFieldValue The value to be applied to the link action.
+     * @param $value The value of the cell.
+     */
     public function createCellText($currentActionFieldValue, $value) {
-		$cell .= $value;
-		if ($this->linkAction) {
-			$cell= '<a href="'.$this->linkAction.$this->actionField.'='.urlencode($currentActionFieldValue).'">'.$cell.'</a>';
-		}
-		return $cell;
-	}
-
-	/**
-	 * Sets an option to generate a check all link when checkbox is indicated
-	 * as the table formElementType.
-	 */
+        $cell .= $value;
+        if ($this->linkAction) {
+            $cell= '<a href="'.$this->linkAction.$this->actionField.'='.urlencode($currentActionFieldValue).'">'.$cell.'</a>';
+        }
+        return $cell;
+    }
+
+    /**
+     * Sets an option to generate a check all link when checkbox is indicated
+     * as the table formElementType.
+     */
     public function setAllOption() {
-		$this->allOption= 1;
-	}
-
-	/**
-	 * Function to prepare a link generated in the table cell/link actions.
-	 *
-	 * @param $value Indicates the INPUT form element type attribute.
-	 */
+        $this->allOption= 1;
+    }
+
+    /**
+     * Function to prepare a link generated in the table cell/link actions.
+     *
+     * @param $value Indicates the INPUT form element type attribute.
+     */
     public function prepareLink($link) {
-		if (strstr($link, '?')) {
-			$end= '&';
-		} else {
-			$end= '?';
-		}
-		return $link.$end;
-	}
-
-	/**
-	 * Generates the table content.
-	 *
-	 * @param $fieldsArray The associative array representing the table rows
-	 * and columns.
-	 * @param $fieldHeadersArray An optional array of values for providing
-	 * alternative field headers; this is an associative arrays of keys from
-	 * the $fieldsArray where the values represent the alt heading content
-	 * for each column.
-	 */
+        if (strstr($link, '?')) {
+            $end= '&';
+        } else {
+            $end= '?';
+        }
+        return $link.$end;
+    }
+
+    /**
+     * Generates the table content.
+     *
+     * @param $fieldsArray The associative array representing the table rows
+     * and columns.
+     * @param $fieldHeadersArray An optional array of values for providing
+     * alternative field headers; this is an associative arrays of keys from
+     * the $fieldsArray where the values represent the alt heading content
+     * for each column.
+     */
     public function create($fieldsArray, $fieldHeadersArray=array(),$linkpage="") {
-	    global $_lang;
-		if (is_array($fieldsArray)) {
-			$i= 0;
-			foreach ($fieldsArray as $fieldName => $fieldValue) {
-				$table .= "\t<tr".$this->determineRowClass($i).">\n";
-				$currentActionFieldValue= $fieldValue[$this->actionField];
-				if (is_array($this->selectedValues)) {
-					$isChecked= array_search($currentActionFieldValue, $this->selectedValues)===false? 0 : 1;
-				} else {
-					$isChecked= false;
-				}
-				$table .= $this->addFormField($currentActionFieldValue, $isChecked);
-				$colPosition= 0;
-				foreach ($fieldValue as $key => $value) {
-					if (!in_array($key, $this->excludeFields)) {
-						$table .= "\t\t<td".$this->getCellAction($currentActionFieldValue).">";
-						$table .= $this->createCellText($currentActionFieldValue, $value);
-						$table .= "</td>\n";
-						if ($i == 0) {
-							if (empty ($header) && $this->formElementType) {
-								$header .= "\t\t<th style=\"width:32px\" ".($this->thClass ? 'class="'.$this->thClass.'"' : '').">". ($this->allOption ? '<a href="javascript:clickAll()">all</a>' : '')."</th>\n";
-							}
-							$headerText= array_key_exists($key, $fieldHeadersArray)? $fieldHeadersArray[$key]: $key;
-							$header .= "\t\t<th".$this->getColumnWidth($colPosition).($this->thClass ? ' class="'.$this->thClass.'" ' : '').">".$headerText."</th>\n";
-						}
-						$colPosition ++;
-					}
-				}
-				$i ++;
-				$table .= "\t</tr>\n";
-			}
-			$table= "\n".'<table'. ($this->tableWidth ? ' width="'.$this->tableWidth.'"' : ''). ($this->tableClass ? ' class="'.$this->tableClass.'"' : ''). ($this->tableID ? ' id="'.$this->tableID.'"' : '').">\n". ($header ? "\t<thead>\n\t<tr class=\"".$this->rowHeaderClass."\">\n".$header."\t</tr>\n\t</thead>\n" : '').$table."</table>\n";
-			if ($this->formElementType) {
-				$table= "\n".'<form id="'.$this->formName.'" name="'.$this->formName.'" action="'.$this->formAction.'" method="POST">'.$table;
-			}
-			if (strlen($this->pageNav) > 1) {//changed to display the pagination if exists.
-				/* commented this part because of cookie
+        global $_lang;
+        if (is_array($fieldsArray)) {
+            $i= 0;
+            foreach ($fieldsArray as $fieldName => $fieldValue) {
+                $table .= "\t<tr".$this->determineRowClass($i).">\n";
+                $currentActionFieldValue= $fieldValue[$this->actionField];
+                if (is_array($this->selectedValues)) {
+                    $isChecked= array_search($currentActionFieldValue, $this->selectedValues)===false? 0 : 1;
+                } else {
+                    $isChecked= false;
+                }
+                $table .= $this->addFormField($currentActionFieldValue, $isChecked);
+                $colPosition= 0;
+                foreach ($fieldValue as $key => $value) {
+                    if (!in_array($key, $this->excludeFields)) {
+                        $table .= "\t\t<td".$this->getCellAction($currentActionFieldValue).">";
+                        $table .= $this->createCellText($currentActionFieldValue, $value);
+                        $table .= "</td>\n";
+                        if ($i == 0) {
+                            if (empty ($header) && $this->formElementType) {
+                                $header .= "\t\t<th style=\"width:32px\" ".($this->thClass ? 'class="'.$this->thClass.'"' : '').">". ($this->allOption ? '<a href="javascript:clickAll()">all</a>' : '')."</th>\n";
+                            }
+                            $headerText= array_key_exists($key, $fieldHeadersArray)? $fieldHeadersArray[$key]: $key;
+                            $header .= "\t\t<th".$this->getColumnWidth($colPosition).($this->thClass ? ' class="'.$this->thClass.'" ' : '').">".$headerText."</th>\n";
+                        }
+                        $colPosition ++;
+                    }
+                }
+                $i ++;
+                $table .= "\t</tr>\n";
+            }
+            $table= "\n".'<table'. ($this->tableWidth ? ' width="'.$this->tableWidth.'"' : ''). ($this->tableClass ? ' class="'.$this->tableClass.'"' : ''). ($this->tableID ? ' id="'.$this->tableID.'"' : '').">\n". ($header ? "\t<thead>\n\t<tr class=\"".$this->rowHeaderClass."\">\n".$header."\t</tr>\n\t</thead>\n" : '').$table."</table>\n";
+            if ($this->formElementType) {
+                $table= "\n".'<form id="'.$this->formName.'" name="'.$this->formName.'" action="'.$this->formAction.'" method="POST">'.$table;
+            }
+            if (strlen($this->pageNav) > 1) {//changed to display the pagination if exists.
+                /* commented this part because of cookie
 				$table .= '<div id="max-display-records" ><select style="display:inline" onchange="javascript:updatePageSize(this[this.selectedIndex].value);">';
 				$pageSizes= array (10, 25, 50, 100, 250);
 				for ($i= 0; $i < count($pageSizes); $i ++) {
@@ -381,12 +381,12 @@ 
 
 				$table .= '</select>'.$_lang["pagination_table_perpage"].'</div>';
 				*/
-				$table .= '<div id="pagination" class="paginate">'.$_lang["pagination_table_gotopage"].'<ul>'.$this->pageNav.'</ul></div>';
-				//$table .= '<script language="javascript">function updatePageSize(size){window.location = \''.$this->prepareLink($linkpage).'pageSize=\'+size;}</script>';
+                $table .= '<div id="pagination" class="paginate">'.$_lang["pagination_table_gotopage"].'<ul>'.$this->pageNav.'</ul></div>';
+                //$table .= '<script language="javascript">function updatePageSize(size){window.location = \''.$this->prepareLink($linkpage).'pageSize=\'+size;}</script>';
 
-			}
-			if ($this->allOption) {
-				$table .= '
+            }
+            if ($this->allOption) {
+                $table .= '
 <script language="javascript">
 	toggled = 0;
 	function clickAll() {
@@ -399,134 +399,134 @@ 
 		toggled = (toggled?0:1);
 	}
 </script>';
-			}
-			if ($this->formElementType) {
-				if ($this->extra) {
-					$table.= "\n".$this->extra."\n";
-				}
-				$table.= "\n".'</form>'."\n";
-			}
-			return $table;
-		}
-	}
-
-	/**
-	 * Generates optional paging navigation controls for the table.
-	 *
-	 * @param $numRecords The number of records to show per page.
-	 * @param $qs An optional query string to be appended to the paging links
-	 */
+            }
+            if ($this->formElementType) {
+                if ($this->extra) {
+                    $table.= "\n".$this->extra."\n";
+                }
+                $table.= "\n".'</form>'."\n";
+            }
+            return $table;
+        }
+    }
+
+    /**
+     * Generates optional paging navigation controls for the table.
+     *
+     * @param $numRecords The number of records to show per page.
+     * @param $qs An optional query string to be appended to the paging links
+     */
     public function createPagingNavigation($numRecords, $qs='') {
-		global $_lang;
-		$currentPage= (is_numeric($_GET['page']) ? $_GET['page'] : 1);
-		$numPages= ceil($numRecords / MAX_DISPLAY_RECORDS_NUM);
-		if ($numPages > 1) {
-			$currentURL= empty($qs)? '': '?'.$qs;
-			if ($currentPage > 6) {
-				$nav .= $this->createPageLink($currentURL, 1, $_lang["pagination_table_first"]);
-			}
-			if ($currentPage != 1) {
-				$nav .= $this->createPageLink($currentURL, $currentPage -1, '&lt;&lt;');
-			}
-			$offset= -4 + ($currentPage < 5 ? (5 - $currentPage) : 0);
-			$i= 1;
-			while ($i < 10 && ($currentPage + $offset <= $numPages)) {
-				if ($currentPage == $currentPage + $offset)
-					$nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset, true);
-				else
-					$nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset);
-				$i ++;
-				$offset ++;
-			}
-			if ($currentPage < $numPages) {
-				$nav .= $this->createPageLink($currentURL, $currentPage +1, '&gt;&gt;');
-			}
-			if ($currentPage != $numPages) {
-				$nav .= $this->createPageLink($currentURL, $numPages, $_lang["pagination_table_last"]);
-			}
-		}
-		$this->pageNav= ' '.$nav;
-	}
-
-	/**
-	 * Creates an individual page link for the paging navigation.
-	 *
-	 * @param $link The link for the page, defaulted to the current document.
-	 * @param $pageNum The page number of the link.
-	 * @param $displayText The text of the link.
-	 * @param $currentPage Indicates if the link is to the current page.
-	 * @param $qs And optional query string to be appended to the link.
-	 */
+        global $_lang;
+        $currentPage= (is_numeric($_GET['page']) ? $_GET['page'] : 1);
+        $numPages= ceil($numRecords / MAX_DISPLAY_RECORDS_NUM);
+        if ($numPages > 1) {
+            $currentURL= empty($qs)? '': '?'.$qs;
+            if ($currentPage > 6) {
+                $nav .= $this->createPageLink($currentURL, 1, $_lang["pagination_table_first"]);
+            }
+            if ($currentPage != 1) {
+                $nav .= $this->createPageLink($currentURL, $currentPage -1, '&lt;&lt;');
+            }
+            $offset= -4 + ($currentPage < 5 ? (5 - $currentPage) : 0);
+            $i= 1;
+            while ($i < 10 && ($currentPage + $offset <= $numPages)) {
+                if ($currentPage == $currentPage + $offset)
+                    $nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset, true);
+                else
+                    $nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset);
+                $i ++;
+                $offset ++;
+            }
+            if ($currentPage < $numPages) {
+                $nav .= $this->createPageLink($currentURL, $currentPage +1, '&gt;&gt;');
+            }
+            if ($currentPage != $numPages) {
+                $nav .= $this->createPageLink($currentURL, $numPages, $_lang["pagination_table_last"]);
+            }
+        }
+        $this->pageNav= ' '.$nav;
+    }
+
+    /**
+     * Creates an individual page link for the paging navigation.
+     *
+     * @param $link The link for the page, defaulted to the current document.
+     * @param $pageNum The page number of the link.
+     * @param $displayText The text of the link.
+     * @param $currentPage Indicates if the link is to the current page.
+     * @param $qs And optional query string to be appended to the link.
+     */
     public function createPageLink($link='', $pageNum, $displayText, $currentPage=false, $qs='') {
-		global $modx;
-		$orderBy= !empty($_GET['orderby'])? '&orderby=' . $_GET['orderby']: '';
-		$orderDir= !empty($_GET['orderdir'])? '&orderdir=' . $_GET['orderdir']: '';
-		if (!empty($qs)) $qs= "?$qs";
-		$link= empty($link)? $modx->makeUrl($modx->documentIdentifier, $modx->documentObject['alias'], $qs . "page=$pageNum$orderBy$orderDir"): $this->prepareLink($link) . "page=$pageNum";
-		$nav .= '<li'.($currentPage? ' class="currentPage"': '').'><a'.($currentPage? ' class="currentPage"': '').' href="'.$link.'">'.$displayText.'</a></li>'."\n";
-		return $nav;
-	}
-
-	/**
-	 * Adds an INPUT form element column to the table.
-	 *
-	 * @param $value The value attribute of the element.
-	 * @param $isChecked Indicates if the checked attribute should apply to the
-	 * element.
-	 */
+        global $modx;
+        $orderBy= !empty($_GET['orderby'])? '&orderby=' . $_GET['orderby']: '';
+        $orderDir= !empty($_GET['orderdir'])? '&orderdir=' . $_GET['orderdir']: '';
+        if (!empty($qs)) $qs= "?$qs";
+        $link= empty($link)? $modx->makeUrl($modx->documentIdentifier, $modx->documentObject['alias'], $qs . "page=$pageNum$orderBy$orderDir"): $this->prepareLink($link) . "page=$pageNum";
+        $nav .= '<li'.($currentPage? ' class="currentPage"': '').'><a'.($currentPage? ' class="currentPage"': '').' href="'.$link.'">'.$displayText.'</a></li>'."\n";
+        return $nav;
+    }
+
+    /**
+     * Adds an INPUT form element column to the table.
+     *
+     * @param $value The value attribute of the element.
+     * @param $isChecked Indicates if the checked attribute should apply to the
+     * element.
+     */
     public function addFormField($value, $isChecked) {
-		if ($this->formElementType) {
-			$checked= $isChecked? "checked ": "";
-			$field= "\t\t".'<td><input type="'.$this->formElementType.'" name="'. ($this->formElementName ? $this->formElementName : $value).'"  value="'.$value.'" '.$checked.'/></td>'."\n";
-		}
-		return $field;
-	}
-
-	/**
-	 * Generates the proper LIMIT clause for queries to retrieve paged results in
-	 * a MakeTable $fieldsArray.
-	 */
+        if ($this->formElementType) {
+            $checked= $isChecked? "checked ": "";
+            $field= "\t\t".'<td><input type="'.$this->formElementType.'" name="'. ($this->formElementName ? $this->formElementName : $value).'"  value="'.$value.'" '.$checked.'/></td>'."\n";
+        }
+        return $field;
+    }
+
+    /**
+     * Generates the proper LIMIT clause for queries to retrieve paged results in
+     * a MakeTable $fieldsArray.
+     */
     public function handlePaging() {
-		$offset= (is_numeric($_GET['page']) && $_GET['page'] > 0) ? $_GET['page'] - 1 : 0;
-		$limitClause= ' LIMIT '. ($offset * MAX_DISPLAY_RECORDS_NUM).', '.MAX_DISPLAY_RECORDS_NUM;
-		return $limitClause;
-	}
-
-	/**
-	 * Generates the SORT BY clause for queries used to retrieve a MakeTable
-	 * $fieldsArray
-	 *
-	 * @param $natural_order If true, the results are returned in natural order.
-	 */
+        $offset= (is_numeric($_GET['page']) && $_GET['page'] > 0) ? $_GET['page'] - 1 : 0;
+        $limitClause= ' LIMIT '. ($offset * MAX_DISPLAY_RECORDS_NUM).', '.MAX_DISPLAY_RECORDS_NUM;
+        return $limitClause;
+    }
+
+    /**
+     * Generates the SORT BY clause for queries used to retrieve a MakeTable
+     * $fieldsArray
+     *
+     * @param $natural_order If true, the results are returned in natural order.
+     */
     public function handleSorting($natural_order=false) {
-		$orderByClause= '';
-		if (!$natural_order) {
-			$orderby= !empty($_GET['orderby'])? $_GET['orderby']: "id";
-			$orderdir= !empty($_GET['orderdir'])? $_GET['orderdir']: "DESC";
-			$orderbyClause= !empty($orderby)? ' ORDER BY ' . $orderby . ' ' . $orderdir . ' ': "";
-		}
-		return $orderbyClause;
-	}
-
-	/**
-	 * Generates a link to order by a specific $fieldsArray key; use to generate
-	 * sort by links in the MakeTable $fieldHeadingsArray values.
-	 *
-	 * @param $key The $fieldsArray key for the column to sort by.
-	 * @param $text The text for the link (e.g. table column header).
-	 * @param $qs An optional query string to append to the order by link.
-	 */
+        $orderByClause= '';
+        if (!$natural_order) {
+            $orderby= !empty($_GET['orderby'])? $_GET['orderby']: "id";
+            $orderdir= !empty($_GET['orderdir'])? $_GET['orderdir']: "DESC";
+            $orderbyClause= !empty($orderby)? ' ORDER BY ' . $orderby . ' ' . $orderdir . ' ': "";
+        }
+        return $orderbyClause;
+    }
+
+    /**
+     * Generates a link to order by a specific $fieldsArray key; use to generate
+     * sort by links in the MakeTable $fieldHeadingsArray values.
+     *
+     * @param $key The $fieldsArray key for the column to sort by.
+     * @param $text The text for the link (e.g. table column header).
+     * @param $qs An optional query string to append to the order by link.
+     */
     public function prepareOrderByLink($key, $text, $qs='') {
-		global $modx;
-		if (!empty($_GET['orderdir'])) {
-			$orderDir= strtolower($_GET['orderdir'])=='desc'? '&orderdir=asc': '&orderdir=desc';
-		} else {
-			$orderDir= '&orderdir=asc';
-		}
-		if (!empty($qs)) {
-			if (!strrpos($qs, '&')==strlen($qs)-1) $qs.= '&';
-		}
-		return '<a href="[~'.$modx->documentIdentifier.'~]?'.$qs.'orderby='.$key.$orderDir.'">'.$text.'</a>';
-	}
+        global $modx;
+        if (!empty($_GET['orderdir'])) {
+            $orderDir= strtolower($_GET['orderdir'])=='desc'? '&orderdir=asc': '&orderdir=desc';
+        } else {
+            $orderDir= '&orderdir=asc';
+        }
+        if (!empty($qs)) {
+            if (!strrpos($qs, '&')==strlen($qs)-1) $qs.= '&';
+        }
+        return '<a href="[~'.$modx->documentIdentifier.'~]?'.$qs.'orderby='.$key.$orderDir.'">'.$text.'</a>';
+    }
 
 }

Spacing +124 added lines, -124 removed lines

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

Braces +83 added lines, -42 removed lines

@@ -8,7 +8,8 @@ 
  *
  * @author Jason Coward <jason@opengeek.com> (MODX)
  */
-class MakeTable {
+class MakeTable
+{
 	public $actionField;
     public $cellAction;
     public $linkAction;
@@ -33,7 +34,8 @@ 
     public $fieldHeaders;
     public $extra;
 
-    public function __construct() {
+    public function __construct()
+    {
 		$this->fieldHeaders= array();
 		$this->excludeFields= array();
 		$this->actionField= '';
@@ -60,7 +62,8 @@ 
 	 *
 	 * @param $value A URL to execute when table cells are clicked.
 	 */
-    public function setCellAction($value) {
+    public function setCellAction($value)
+    {
 		$this->cellAction= $this->prepareLink($value);
 	}
 
@@ -69,7 +72,8 @@ 
 	 *
 	 * @param $value A URL to execute when text within table cells are clicked.
 	 */
-    public function setLinkAction($value) {
+    public function setLinkAction($value)
+    {
 		$this->linkAction= $this->prepareLink($value);
 	}
 
@@ -78,7 +82,8 @@ 
 	 *
 	 * @param $value A valid width attribute for the HTML TABLE tag
 	 */
-    public function setTableWidth($value) {
+    public function setTableWidth($value)
+    {
 		$this->tableWidth= $value;
 	}
 
@@ -87,7 +92,8 @@ 
 	 *
 	 * @param $value A class for the main HTML TABLE.
 	 */
-    public function setTableClass($value) {
+    public function setTableClass($value)
+    {
 		$this->tableClass= $value;
 	}
 
@@ -96,7 +102,8 @@ 
 	 *
 	 * @param $value A class for the main HTML TABLE.
 	 */
-    public function setTableID($value) {
+    public function setTableID($value)
+    {
 		$this->tableID= $value;
 	}
 
@@ -105,7 +112,8 @@ 
 	 *
 	 * @param $value A class for the table header row.
 	 */
-    public function setRowHeaderClass($value) {
+    public function setRowHeaderClass($value)
+    {
 		$this->rowHeaderClass= $value;
 	}
 
@@ -114,7 +122,8 @@ 
 	 *
 	 * @param $value A class for the table header row.
 	 */
-    public function setThHeaderClass($value) {
+    public function setThHeaderClass($value)
+    {
 		$this->thClass= $value;
 	}
 
@@ -123,7 +132,8 @@ 
 	 *
 	 * @param $value A class for the column header row.
 	 */
-    public function setColumnHeaderClass($value) {
+    public function setColumnHeaderClass($value)
+    {
 		$this->columnHeaderClass= $value;
 	}
 
@@ -132,7 +142,8 @@ 
 	 *
 	 * @param $value A class for regular table rows.
 	 */
-    public function setRowRegularClass($value) {
+    public function setRowRegularClass($value)
+    {
 		$this->rowRegularClass= $value;
 	}
 
@@ -141,7 +152,8 @@ 
 	 *
 	 * @param $value A class for alternate table rows.
 	 */
-    public function setRowAlternateClass($value) {
+    public function setRowAlternateClass($value)
+    {
 		$this->rowAlternateClass= $value;
 	}
 
@@ -150,7 +162,8 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element type attribute.
 	 */
-    public function setFormElementType($value) {
+    public function setFormElementType($value)
+    {
 		$this->formElementType= $value;
 	}
 
@@ -159,7 +172,8 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element name attribute.
 	 */
-    public function setFormElementName($value) {
+    public function setFormElementName($value)
+    {
 		$this->formElementName= $value;
 	}
 
@@ -169,7 +183,8 @@ 
 	 *
 	 * @param $value Indicates the FORM name attribute.
 	 */
-    public function setFormName($value) {
+    public function setFormName($value)
+    {
 		$this->formName= $value;
 	}
 
@@ -178,7 +193,8 @@ 
 	 *
 	 * @param $value Indicates the FORM action attribute.
 	 */
-    public function setFormAction($value) {
+    public function setFormAction($value)
+    {
 		$this->formAction= $value;
 	}
 
@@ -187,7 +203,8 @@ 
 	 *
 	 * @param $value An Array of field keys to exclude from the table.
 	 */
-    public function setExcludeFields($value) {
+    public function setExcludeFields($value)
+    {
 		$this->excludeFields= $value;
 	}
 
@@ -196,7 +213,8 @@ 
 	 *
 	 * @param $value 'ODD' or 'EVEN' to indicate the alternate row scheme.
 	 */
-    public function setRowAlternatingScheme($value) {
+    public function setRowAlternatingScheme($value)
+    {
 		$this->rowAlternatingScheme= $value;
 	}
 
@@ -206,7 +224,8 @@ 
 	 *
 	 * @param $value The key of the field to add as a query string parameter.
 	 */
-    public function setActionFieldName($value) {
+    public function setActionFieldName($value)
+    {
 		$this->actionField= $value;
 	}
 
@@ -216,7 +235,8 @@ 
 	 * @param $value An Array of column widths in the order of the keys in the
 	 * 			source table array.
 	 */
-    public function setColumnWidths($widthArray) {
+    public function setColumnWidths($widthArray)
+    {
 		$this->columnWidths= $widthArray;
 	}
 
@@ -225,7 +245,8 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element type attribute.
 	 */
-    public function setSelectedValues($valueArray) {
+    public function setSelectedValues($valueArray)
+    {
 		$this->selectedValues= $valueArray;
 	}
 
@@ -235,7 +256,8 @@ 
 	 *
 	 * @param $value A string of additional content.
 	 */
-    public function setExtra($value) {
+    public function setExtra($value)
+    {
 		$this->extra= $value;
 	}
 
@@ -244,7 +266,8 @@ 
 	 *
 	 * @param $columnPosition The index of the column to get the width for.
 	 */
-    public function getColumnWidth($columnPosition) {
+    public function getColumnWidth($columnPosition)
+    {
 		$currentWidth= '';
 		if (is_array($this->columnWidths)) {
 			$currentWidth= $this->columnWidths[$columnPosition] ? ' width="'.$this->columnWidths[$columnPosition].'" ' : '';
@@ -257,7 +280,8 @@ 
 	 *
 	 * @param $value The position of the current row being rendered.
 	 */
-    public function determineRowClass($position) {
+    public function determineRowClass($position)
+    {
 		switch ($this->rowAlternatingScheme) {
 			case 'ODD' :
 				$modRemainder= 1;
@@ -280,7 +304,8 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element type attribute.
 	 */
-    public function getCellAction($currentActionFieldValue) {
+    public function getCellAction($currentActionFieldValue)
+    {
 		if ($this->cellAction) {
 			$cellAction= ' onClick="javascript:window.location=\''.$this->cellAction.$this->actionField.'='.urlencode($currentActionFieldValue).'\'" ';
 		}
@@ -293,7 +318,8 @@ 
 	 * @param $currentActionFieldValue The value to be applied to the link action.
 	 * @param $value The value of the cell.
 	 */
-    public function createCellText($currentActionFieldValue, $value) {
+    public function createCellText($currentActionFieldValue, $value)
+    {
 		$cell .= $value;
 		if ($this->linkAction) {
 			$cell= '<a href="'.$this->linkAction.$this->actionField.'='.urlencode($currentActionFieldValue).'">'.$cell.'</a>';
@@ -305,7 +331,8 @@ 
 	 * Sets an option to generate a check all link when checkbox is indicated
 	 * as the table formElementType.
 	 */
-    public function setAllOption() {
+    public function setAllOption()
+    {
 		$this->allOption= 1;
 	}
 
@@ -314,7 +341,8 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element type attribute.
 	 */
-    public function prepareLink($link) {
+    public function prepareLink($link)
+    {
 		if (strstr($link, '?')) {
 			$end= '&';
 		} else {
@@ -333,7 +361,8 @@ 
 	 * the $fieldsArray where the values represent the alt heading content
 	 * for each column.
 	 */
-    public function create($fieldsArray, $fieldHeadersArray=array(),$linkpage="") {
+    public function create($fieldsArray, $fieldHeadersArray=array(),$linkpage="")
+    {
 	    global $_lang;
 		if (is_array($fieldsArray)) {
 			$i= 0;
@@ -369,7 +398,8 @@ 
 			if ($this->formElementType) {
 				$table= "\n".'<form id="'.$this->formName.'" name="'.$this->formName.'" action="'.$this->formAction.'" method="POST">'.$table;
 			}
-			if (strlen($this->pageNav) > 1) {//changed to display the pagination if exists.
+			if (strlen($this->pageNav) > 1) {
+//changed to display the pagination if exists.
 				/* commented this part because of cookie
 				$table .= '<div id="max-display-records" ><select style="display:inline" onchange="javascript:updatePageSize(this[this.selectedIndex].value);">';
 				$pageSizes= array (10, 25, 50, 100, 250);
@@ -416,7 +446,8 @@ 
 	 * @param $numRecords The number of records to show per page.
 	 * @param $qs An optional query string to be appended to the paging links
 	 */
-    public function createPagingNavigation($numRecords, $qs='') {
+    public function createPagingNavigation($numRecords, $qs='')
+    {
 		global $_lang;
 		$currentPage= (is_numeric($_GET['page']) ? $_GET['page'] : 1);
 		$numPages= ceil($numRecords / MAX_DISPLAY_RECORDS_NUM);
@@ -431,10 +462,11 @@ 
 			$offset= -4 + ($currentPage < 5 ? (5 - $currentPage) : 0);
 			$i= 1;
 			while ($i < 10 && ($currentPage + $offset <= $numPages)) {
-				if ($currentPage == $currentPage + $offset)
-					$nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset, true);
-				else
-					$nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset);
+				if ($currentPage == $currentPage + $offset) {
+									$nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset, true);
+				} else {
+									$nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset);
+				}
 				$i ++;
 				$offset ++;
 			}
@@ -457,11 +489,14 @@ 
 	 * @param $currentPage Indicates if the link is to the current page.
 	 * @param $qs And optional query string to be appended to the link.
 	 */
-    public function createPageLink($link='', $pageNum, $displayText, $currentPage=false, $qs='') {
+    public function createPageLink($link='', $pageNum, $displayText, $currentPage=false, $qs='')
+    {
 		global $modx;
 		$orderBy= !empty($_GET['orderby'])? '&orderby=' . $_GET['orderby']: '';
 		$orderDir= !empty($_GET['orderdir'])? '&orderdir=' . $_GET['orderdir']: '';
-		if (!empty($qs)) $qs= "?$qs";
+		if (!empty($qs)) {
+		    $qs= "?$qs";
+		}
 		$link= empty($link)? $modx->makeUrl($modx->documentIdentifier, $modx->documentObject['alias'], $qs . "page=$pageNum$orderBy$orderDir"): $this->prepareLink($link) . "page=$pageNum";
 		$nav .= '<li'.($currentPage? ' class="currentPage"': '').'><a'.($currentPage? ' class="currentPage"': '').' href="'.$link.'">'.$displayText.'</a></li>'."\n";
 		return $nav;
@@ -474,7 +509,8 @@ 
 	 * @param $isChecked Indicates if the checked attribute should apply to the
 	 * element.
 	 */
-    public function addFormField($value, $isChecked) {
+    public function addFormField($value, $isChecked)
+    {
 		if ($this->formElementType) {
 			$checked= $isChecked? "checked ": "";
 			$field= "\t\t".'<td><input type="'.$this->formElementType.'" name="'. ($this->formElementName ? $this->formElementName : $value).'"  value="'.$value.'" '.$checked.'/></td>'."\n";
@@ -486,7 +522,8 @@ 
 	 * Generates the proper LIMIT clause for queries to retrieve paged results in
 	 * a MakeTable $fieldsArray.
 	 */
-    public function handlePaging() {
+    public function handlePaging()
+    {
 		$offset= (is_numeric($_GET['page']) && $_GET['page'] > 0) ? $_GET['page'] - 1 : 0;
 		$limitClause= ' LIMIT '. ($offset * MAX_DISPLAY_RECORDS_NUM).', '.MAX_DISPLAY_RECORDS_NUM;
 		return $limitClause;
@@ -498,7 +535,8 @@ 
 	 *
 	 * @param $natural_order If true, the results are returned in natural order.
 	 */
-    public function handleSorting($natural_order=false) {
+    public function handleSorting($natural_order=false)
+    {
 		$orderByClause= '';
 		if (!$natural_order) {
 			$orderby= !empty($_GET['orderby'])? $_GET['orderby']: "id";
@@ -516,7 +554,8 @@ 
 	 * @param $text The text for the link (e.g. table column header).
 	 * @param $qs An optional query string to append to the order by link.
 	 */
-    public function prepareOrderByLink($key, $text, $qs='') {
+    public function prepareOrderByLink($key, $text, $qs='')
+    {
 		global $modx;
 		if (!empty($_GET['orderdir'])) {
 			$orderDir= strtolower($_GET['orderdir'])=='desc'? '&orderdir=asc': '&orderdir=desc';
@@ -524,7 +563,9 @@ 
 			$orderDir= '&orderdir=asc';
 		}
 		if (!empty($qs)) {
-			if (!strrpos($qs, '&')==strlen($qs)-1) $qs.= '&';
+			if (!strrpos($qs, '&')==strlen($qs)-1) {
+			    $qs.= '&';
+			}
 		}
 		return '<a href="[~'.$modx->documentIdentifier.'~]?'.$qs.'orderby='.$key.$orderDir.'">'.$text.'</a>';
 	}

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

Doc Comments +35 added lines

@@ -30,6 +30,11 @@ 
         $this->condModifiers = '=,is,eq,equals,ne,neq,notequals,isnot,isnt,not,%,isempty,isnotempty,isntempty,>=,gte,eg,gte,greaterthan,>,gt,isgreaterthan,isgt,lowerthan,<,lt,<=,lte,islte,islowerthan,islt,el,find,in,inarray,in_array,fnmatch,wcard,wcard_match,wildcard,wildcard_match,is_file,is_dir,file_exists,is_readable,is_writable,is_image,regex,preg,preg_match,memberof,mo,isinrole,ir';
     }
 
+    /**
+     * @param string $key
+     * @param string $value
+     * @param string|false $modifiers
+     */
     public function phxFilter($key,$value,$modifiers)
     {
         global $modx;
@@ -51,6 +56,10 @@ 
         return $value;
     }
 
+    /**
+     * @param string $mode
+     * @param string $modifiers
+     */
     public function _getDelim($mode,$modifiers) {
         $c = substr($modifiers,0,1);
         if(!in_array($c, array('"', "'", '`')) ) return false;
@@ -62,6 +71,11 @@ 
         return  $c;
     }
 
+    /**
+     * @param string $mode
+     * @param false|string $delim
+     * @param string $modifiers
+     */
     public function _getOpt($mode,$delim,$modifiers) {
         if($delim) {
             if($mode=='(') return substr($modifiers,1,strpos($modifiers, $delim . ')' )-1);
@@ -80,6 +94,14 @@ 
             return $opt;
         }
     }
+
+    /**
+     * @param string $mode
+     * @param false|string $delim
+     * @param string $modifiers
+     *
+     * @return string
+     */
     public function _getRemainModifiers($mode,$delim,$modifiers) {
         if($delim) {
             if($mode=='(')
@@ -107,6 +129,9 @@ 
         return substr($string,strpos($string, $delim)+$len);
     }
 
+    /**
+     * @param string $modifiers
+     */
     public function splitEachModifiers($modifiers) {
         global $modx;
 
@@ -242,6 +267,9 @@ 
         else                  return true;
     }
 
+    /**
+     * @param string $cmd
+     */
     public function getValueFromPreset($key, $value, $cmd, $opt)
     {
         global $modx;
@@ -927,6 +955,9 @@ 
         return $value;
     }
 
+    /**
+     * @param string $cmd
+     */
     public function includeMdfFile($cmd) {
         global $modx;
         $key = $this->key;
@@ -1082,6 +1113,10 @@ 
     }
 
     // Sets a placeholder variable which can only be access by Modifiers
+
+    /**
+     * @param string $value
+     */
     public function setModifiersVariable($key, $value) {
         if ($key != 'phx' && $key != 'dummy') $this->placeholders[$key] = $value;
     }

Spacing +350 added lines, -350 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-if(!defined('MODX_CORE_PATH')) define('MODX_CORE_PATH', MODX_MANAGER_PATH.'includes/');
+if (!defined('MODX_CORE_PATH')) define('MODX_CORE_PATH', MODX_MANAGER_PATH.'includes/');
 
-class MODIFIERS {
+class MODIFIERS{
 
     public $placeholders = array();
     public $vars = array();
@@ -30,14 +30,14 @@ 
         $this->condModifiers = '=,is,eq,equals,ne,neq,notequals,isnot,isnt,not,%,isempty,isnotempty,isntempty,>=,gte,eg,gte,greaterthan,>,gt,isgreaterthan,isgt,lowerthan,<,lt,<=,lte,islte,islowerthan,islt,el,find,in,inarray,in_array,fnmatch,wcard,wcard_match,wildcard,wildcard_match,is_file,is_dir,file_exists,is_readable,is_writable,is_image,regex,preg,preg_match,memberof,mo,isinrole,ir';
     }
 
-    public function phxFilter($key,$value,$modifiers)
+    public function phxFilter($key, $value, $modifiers)
     {
         global $modx;
-        if(substr($modifiers,0,3)!=='id(') $value = $this->parseDocumentSource($value);
+        if (substr($modifiers, 0, 3) !== 'id(') $value = $this->parseDocumentSource($value);
         $this->srcValue = $value;
         $modifiers = trim($modifiers);
-        $modifiers = ':'.trim($modifiers,':');
-        $modifiers = str_replace(array("\r\n","\r"), "\n", $modifiers);
+        $modifiers = ':'.trim($modifiers, ':');
+        $modifiers = str_replace(array("\r\n", "\r"), "\n", $modifiers);
         $modifiers = $this->splitEachModifiers($modifiers);
 
         $this->placeholders = array();
@@ -45,118 +45,118 @@ 
         $this->placeholders['dummy'] = '';
         $this->condition = array();
         $this->vars = array();
-        $this->vars['name']    = & $key;
-        $value = $this->parsePhx($key,$value,$modifiers);
+        $this->vars['name'] = & $key;
+        $value = $this->parsePhx($key, $value, $modifiers);
         $this->vars = array();
         return $value;
     }
 
-    public function _getDelim($mode,$modifiers) {
-        $c = substr($modifiers,0,1);
-        if(!in_array($c, array('"', "'", '`')) ) return false;
+    public function _getDelim($mode, $modifiers){
+        $c = substr($modifiers, 0, 1);
+        if (!in_array($c, array('"', "'", '`'))) return false;
 
-        $modifiers = substr($modifiers,1);
-        $closure = $mode=='(' ? "{$c})" : $c;
-        if(strpos($modifiers, $closure)===false) return false;
+        $modifiers = substr($modifiers, 1);
+        $closure = $mode == '(' ? "{$c})" : $c;
+        if (strpos($modifiers, $closure) === false) return false;
 
         return  $c;
     }
 
-    public function _getOpt($mode,$delim,$modifiers) {
-        if($delim) {
-            if($mode=='(') return substr($modifiers,1,strpos($modifiers, $delim . ')' )-1);
+    public function _getOpt($mode, $delim, $modifiers){
+        if ($delim) {
+            if ($mode == '(') return substr($modifiers, 1, strpos($modifiers, $delim.')') - 1);
 
-            return substr($modifiers,1,strpos($modifiers,$delim,1)-1);
+            return substr($modifiers, 1, strpos($modifiers, $delim, 1) - 1);
         }
         else {
-            if($mode=='(') return substr($modifiers,0,strpos($modifiers, ')') );
+            if ($mode == '(') return substr($modifiers, 0, strpos($modifiers, ')'));
 
             $chars = str_split($modifiers);
-            $opt='';
-            foreach($chars as $c) {
-                if($c==':' || $c==')') break;
-                $opt .=$c;
+            $opt = '';
+            foreach ($chars as $c) {
+                if ($c == ':' || $c == ')') break;
+                $opt .= $c;
             }
             return $opt;
         }
     }
-    public function _getRemainModifiers($mode,$delim,$modifiers) {
-        if($delim) {
-            if($mode=='(')
-                return $this->_fetchContent($modifiers, $delim . ')');
+    public function _getRemainModifiers($mode, $delim, $modifiers){
+        if ($delim) {
+            if ($mode == '(')
+                return $this->_fetchContent($modifiers, $delim.')');
             else {
                 $modifiers = trim($modifiers);
-                $modifiers = substr($modifiers,1);
+                $modifiers = substr($modifiers, 1);
                 return $this->_fetchContent($modifiers, $delim);
             }
         }
         else {
-            if($mode=='(') return $this->_fetchContent($modifiers, ')');
+            if ($mode == '(') return $this->_fetchContent($modifiers, ')');
             $chars = str_split($modifiers);
-            foreach($chars as $c) {
-                if($c==':') return $modifiers;
-                else $modifiers = substr($modifiers,1);
+            foreach ($chars as $c) {
+                if ($c == ':') return $modifiers;
+                else $modifiers = substr($modifiers, 1);
             }
             return $modifiers;
         }
     }
 
-    public function _fetchContent($string,$delim) {
+    public function _fetchContent($string, $delim){
         $len = strlen($delim);
         $string = $this->parseDocumentSource($string);
-        return substr($string,strpos($string, $delim)+$len);
+        return substr($string, strpos($string, $delim) + $len);
     }
 
-    public function splitEachModifiers($modifiers) {
+    public function splitEachModifiers($modifiers){
         global $modx;
 
         $cmd = '';
         $bt = '';
         $result = array();
-        while($bt!==$modifiers) {
+        while ($bt !== $modifiers) {
             $bt = $modifiers;
-            $c = substr($modifiers,0,1);
-            $modifiers = substr($modifiers,1);
+            $c = substr($modifiers, 0, 1);
+            $modifiers = substr($modifiers, 1);
 
-            if($c===':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { // :=, :!=, :<=, :>=, :!<=, :!>=
-                $c = substr($modifiers,strlen($match[1]),1);
+            if ($c === ':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { // :=, :!=, :<=, :>=, :!<=, :!>=
+                $c = substr($modifiers, strlen($match[1]), 1);
                 $debuginfo = "#i=0 #c=[{$c}] #m=[{$modifiers}]";
-                if($c==='(') $modifiers = substr($modifiers,strlen($match[1])+1);
-                else         $modifiers = substr($modifiers,strlen($match[1]));
+                if ($c === '(') $modifiers = substr($modifiers, strlen($match[1]) + 1);
+                else         $modifiers = substr($modifiers, strlen($match[1]));
 
-                $delim     = $this->_getDelim($c,$modifiers);
-                $opt       = $this->_getOpt($c,$delim,$modifiers);
-                $modifiers = trim($this->_getRemainModifiers($c,$delim,$modifiers));
+                $delim     = $this->_getDelim($c, $modifiers);
+                $opt       = $this->_getOpt($c, $delim, $modifiers);
+                $modifiers = trim($this->_getRemainModifiers($c, $delim, $modifiers));
 
-                $result[]=array('cmd'=>trim($match[1]),'opt'=>$opt,'debuginfo'=>$debuginfo);
+                $result[] = array('cmd'=>trim($match[1]), 'opt'=>$opt, 'debuginfo'=>$debuginfo);
                 $cmd = '';
             }
-            elseif(in_array($c,array('+','-','*','/')) && preg_match('@^[0-9]+@', $modifiers, $match)) { // :+3, :-3, :*3 ...
-                $modifiers = substr($modifiers,strlen($match[0]));
-                $result[]=array('cmd'=>'math','opt'=>'%s'.$c.$match[0]);
+            elseif (in_array($c, array('+', '-', '*', '/')) && preg_match('@^[0-9]+@', $modifiers, $match)) { // :+3, :-3, :*3 ...
+                $modifiers = substr($modifiers, strlen($match[0]));
+                $result[] = array('cmd'=>'math', 'opt'=>'%s'.$c.$match[0]);
                 $cmd = '';
             }
-            elseif($c==='(' || $c==='=') {
+            elseif ($c === '(' || $c === '=') {
                 $modifiers = $m1 = trim($modifiers);
-                $delim     = $this->_getDelim($c,$modifiers);
-                $opt       = $this->_getOpt($c,$delim,$modifiers);
-                $modifiers = trim($this->_getRemainModifiers($c,$delim,$modifiers));
+                $delim     = $this->_getDelim($c, $modifiers);
+                $opt       = $this->_getOpt($c, $delim, $modifiers);
+                $modifiers = trim($this->_getRemainModifiers($c, $delim, $modifiers));
                 $debuginfo = "#i=1 #c=[{$c}] #delim=[{$delim}] #m1=[{$m1}] remainMdf=[{$modifiers}]";
 
-                $result[]=array('cmd'=>trim($cmd),'opt'=>$opt,'debuginfo'=>$debuginfo);
+                $result[] = array('cmd'=>trim($cmd), 'opt'=>$opt, 'debuginfo'=>$debuginfo);
 
                 $cmd = '';
             }
-            elseif($c==':') {
+            elseif ($c == ':') {
                 $debuginfo = "#i=2 #c=[{$c}] #m=[{$modifiers}]";
-                if($cmd!=='') $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
+                if ($cmd !== '') $result[] = array('cmd'=>trim($cmd), 'opt'=>'', 'debuginfo'=>$debuginfo);
 
                 $cmd = '';
             }
-            elseif(trim($modifiers)=='' && trim($cmd)!=='') {
+            elseif (trim($modifiers) == '' && trim($cmd) !== '') {
                 $debuginfo = "#i=3 #c=[{$c}] #m=[{$modifiers}]";
                 $cmd .= $c;
-                $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
+                $result[] = array('cmd'=>trim($cmd), 'opt'=>'', 'debuginfo'=>$debuginfo);
 
                 break;
             }
@@ -165,65 +165,65 @@ 
             }
         }
 
-        if(empty($result)) return array();
+        if (empty($result)) return array();
 
-        foreach($result as $i=>$a)
+        foreach ($result as $i=>$a)
         {
             $a['opt'] = $this->parseDocumentSource($a['opt']);
-            $result[$i]['opt'] = $modx->mergePlaceholderContent($a['opt'],$this->placeholders);
+            $result[$i]['opt'] = $modx->mergePlaceholderContent($a['opt'], $this->placeholders);
         }
 
         return $result;
     }
 
-    public function parsePhx($key,$value,$modifiers)
+    public function parsePhx($key, $value, $modifiers)
     {
         global $modx;
         $lastKey = '';
-        $cacheKey = md5(sprintf('parsePhx#%s#%s#%s',$key,$value,print_r($modifiers,true)));
-        if(isset($this->tmpCache[$cacheKey])) return $this->tmpCache[$cacheKey];
-        if(empty($modifiers)) return '';
+        $cacheKey = md5(sprintf('parsePhx#%s#%s#%s', $key, $value, print_r($modifiers, true)));
+        if (isset($this->tmpCache[$cacheKey])) return $this->tmpCache[$cacheKey];
+        if (empty($modifiers)) return '';
 
-        foreach($modifiers as $m)
+        foreach ($modifiers as $m)
         {
             $lastKey = strtolower($m['cmd']);
         }
-        $_ = explode(',',$this->condModifiers);
-        if(in_array($lastKey,$_))
+        $_ = explode(',', $this->condModifiers);
+        if (in_array($lastKey, $_))
         {
-            $modifiers[] = array('cmd'=>'then','opt'=>'1');
-            $modifiers[] = array('cmd'=>'else','opt'=>'0');
+            $modifiers[] = array('cmd'=>'then', 'opt'=>'1');
+            $modifiers[] = array('cmd'=>'else', 'opt'=>'0');
         }
 
-        foreach($modifiers as $i=>$a)
+        foreach ($modifiers as $i=>$a)
         {
-            $value = $this->Filter($key,$value, $a['cmd'], $a['opt']);
+            $value = $this->Filter($key, $value, $a['cmd'], $a['opt']);
         }
         $this->tmpCache[$cacheKey] = $value;
         return $value;
     }
 
     // Parser: modifier detection and eXtended processing if needed
-    public function Filter($key, $value, $cmd, $opt='')
+    public function Filter($key, $value, $cmd, $opt = '')
     {
         global $modx;
 
-        if($key==='documentObject') $value = $modx->documentIdentifier;
+        if ($key === 'documentObject') $value = $modx->documentIdentifier;
         $cmd = $this->parseDocumentSource($cmd);
-        if(preg_match('@^[1-9][/0-9]*$@',$cmd))
+        if (preg_match('@^[1-9][/0-9]*$@', $cmd))
         {
-            if(strpos($cmd,'/')!==false)
-                $cmd = $this->substr($cmd,strrpos($cmd,'/')+1);
+            if (strpos($cmd, '/') !== false)
+                $cmd = $this->substr($cmd, strrpos($cmd, '/') + 1);
             $opt = $cmd;
             $cmd = 'id';
         }
 
-        if(isset($modx->snippetCache["phx:{$cmd}"]))   $this->elmName = "phx:{$cmd}";
-        elseif(isset($modx->chunkCache["phx:{$cmd}"])) $this->elmName = "phx:{$cmd}";
+        if (isset($modx->snippetCache["phx:{$cmd}"]))   $this->elmName = "phx:{$cmd}";
+        elseif (isset($modx->chunkCache["phx:{$cmd}"])) $this->elmName = "phx:{$cmd}";
         else                                           $this->elmName = '';
 
         $cmd = strtolower($cmd);
-        if($this->elmName!=='')
+        if ($this->elmName !== '')
             $value = $this->getValueFromElement($key, $value, $cmd, $opt);
         else
             $value = $this->getValueFromPreset($key, $value, $cmd, $opt);
@@ -233,12 +233,12 @@ 
         return $value;
     }
 
-    public function isEmpty($cmd,$value)
+    public function isEmpty($cmd, $value)
     {
-        if($value!=='') return false;
+        if ($value !== '') return false;
 
-        $_ = explode(',', $this->condModifiers . ',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary');
-        if(in_array($cmd,$_)) return false;
+        $_ = explode(',', $this->condModifiers.',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary');
+        if (in_array($cmd, $_)) return false;
         else                  return true;
     }
 
@@ -246,7 +246,7 @@ 
     {
         global $modx;
 
-        if($this->isEmpty($cmd,$value)) return '';
+        if ($this->isEmpty($cmd, $value)) return '';
 
         $this->key = $key;
         $this->value  = $value;
@@ -257,83 +257,83 @@ 
             #####  Conditional Modifiers
             case 'input':
             case 'if':
-                if(!$opt) return $value;
+                if (!$opt) return $value;
                 return $opt;
             case '=':
             case 'eq':
             case 'is':
             case 'equals':
-                $this->condition[] = (int)($value == $opt); break;
+                $this->condition[] = (int) ($value == $opt); break;
             case 'neq':
             case 'ne':
             case 'notequals':
             case 'isnot':
             case 'isnt':
             case 'not':
-                $this->condition[] = (int)($value != $opt);break;
+                $this->condition[] = (int) ($value != $opt); break;
             case '%':
-                $this->condition[] = (int)($value%$opt==0);break;
+                $this->condition[] = (int) ($value % $opt == 0); break;
             case 'isempty':
-                $this->condition[] = (int)(empty($value)); break;
+                $this->condition[] = (int) (empty($value)); break;
             case 'isntempty':
             case 'isnotempty':
-                $this->condition[] = (int)(!empty($value)); break;
+                $this->condition[] = (int) (!empty($value)); break;
             case '>=':
             case 'gte':
             case 'eg':
             case 'isgte':
-                $this->condition[] = (int)($value >= $opt);break;
+                $this->condition[] = (int) ($value >= $opt); break;
             case '<=':
             case 'lte':
             case 'el':
             case 'islte':
-                $this->condition[] = (int)($value <= $opt);break;
+                $this->condition[] = (int) ($value <= $opt); break;
             case '>':
             case 'gt':
             case 'greaterthan':
             case 'isgreaterthan':
             case 'isgt':
-                $this->condition[] = (int)($value > $opt);break;
+                $this->condition[] = (int) ($value > $opt); break;
             case '<':
             case 'lt':
             case 'lowerthan':
             case 'islowerthan':
             case 'islt':
-                $this->condition[] = (int)($value < $opt);break;
+                $this->condition[] = (int) ($value < $opt); break;
             case 'find':
-                $this->condition[] = (int)(strpos($value, $opt)!==false);break;
+                $this->condition[] = (int) (strpos($value, $opt) !== false); break;
             case 'inarray':
             case 'in_array':
             case 'in':
                 $opt = explode(',', $opt);
-                $this->condition[] = (int)(in_array($value, $opt)!==false);break;
+                $this->condition[] = (int) (in_array($value, $opt) !== false); break;
             case 'wildcard_match':
             case 'wcard_match':
             case 'wildcard':
             case 'wcard':
             case 'fnmatch':
-                $this->condition[] = (int)(fnmatch($opt, $value)!==false);break;
+                $this->condition[] = (int) (fnmatch($opt, $value) !== false); break;
             case 'is_file':
             case 'is_dir':
             case 'file_exists':
             case 'is_readable':
             case 'is_writable':
-                if(!$opt) $path = $value;
+                if (!$opt) $path = $value;
                 else      $path = $opt;
-                if(strpos($path,MODX_MANAGER_PATH)!==false) exit('Can not read core path');
-                if(strpos($path,$modx->config['base_path'])===false) $path = ltrim($path,'/');
-                $this->condition[] = (int)($cmd($path)!==false);break;
+                if (strpos($path, MODX_MANAGER_PATH) !== false) exit('Can not read core path');
+                if (strpos($path, $modx->config['base_path']) === false) $path = ltrim($path, '/');
+                $this->condition[] = (int) ($cmd($path) !== false); break;
             case 'is_image':
-                if(!$opt) $path = $value;
+                if (!$opt) $path = $value;
                 else      $path = $opt;
-                if(!is_file($path)) {$this->condition[]='0';break;}
+                if (!is_file($path)) {$this->condition[] = '0'; break; }
                 $_ = getimagesize($path);
-                $this->condition[] = (int)($_[0]);break;
+                $this->condition[] = (int) ($_[0]); break;
             case 'regex':
             case 'preg':
             case 'preg_match':
             case 'isinrole':
-            $this->condition[] = (int)(preg_match($opt,$value));break;
+            $this->condition[] = (int) (preg_match($opt, $value)); break;
             case 'ir':
             case 'memberof':
             case 'mo':
@@ -341,50 +341,50 @@ 
                 $this->condition[] = $this->includeMdfFile('memberof');
                 break;
             case 'or':
-                $this->condition[] = '||';break;
+                $this->condition[] = '||'; break;
             case 'and':
-                $this->condition[] = '&&';break;
+                $this->condition[] = '&&'; break;
             case 'show':
             case 'this':
-                $conditional = join(' ',$this->condition);
-                $isvalid = (int)(eval("return ({$conditional});"));
+                $conditional = join(' ', $this->condition);
+                $isvalid = (int) (eval("return ({$conditional});"));
                 if ($isvalid) return $this->srcValue;
                 return NULL;
             case 'then':
-                $conditional = join(' ',$this->condition);
-                $isvalid = (int)eval("return ({$conditional});");
+                $conditional = join(' ', $this->condition);
+                $isvalid = (int) eval("return ({$conditional});");
                 if ($isvalid)  return $opt;
                 return null;
             case 'else':
-                $conditional = join(' ',$this->condition);
-                $isvalid = (int)eval("return ({$conditional});");
+                $conditional = join(' ', $this->condition);
+                $isvalid = (int) eval("return ({$conditional});");
                 if (!$isvalid) return $opt;
                 break;
             case 'select':
             case 'switch':
-                $raw = explode('&',$opt);
+                $raw = explode('&', $opt);
                 $map = array();
                 $c = count($raw);
-                for($m=0; $m<$c; $m++) {
-                    $mi = explode('=',$raw[$m],2);
+                for ($m = 0; $m < $c; $m++) {
+                    $mi = explode('=', $raw[$m], 2);
                     $map[$mi[0]] = $mi[1];
                 }
-                if(isset($map[$value])) return $map[$value];
+                if (isset($map[$value])) return $map[$value];
                 else                    return '';
             ##### End of Conditional Modifiers
 
             #####  Encode / Decode / Hash / Escape
             case 'htmlent':
             case 'htmlentities':
-                return htmlentities($value,ENT_QUOTES,$modx->config['modx_charset']);
+                return htmlentities($value, ENT_QUOTES, $modx->config['modx_charset']);
             case 'html_entity_decode':
             case 'decode_html':
             case 'html_decode':
-                return html_entity_decode($value,ENT_QUOTES,$modx->config['modx_charset']);
+                return html_entity_decode($value, ENT_QUOTES, $modx->config['modx_charset']);
             case 'esc':
             case 'escape':
                 $value = preg_replace('/&amp;(#[0-9]+|[a-z]+);/i', '&$1;', htmlspecialchars($value, ENT_QUOTES, $modx->config['modx_charset']));
-                return str_replace(array('[', ']', '`'),array('&#91;', '&#93;', '&#96;'),$value);
+                return str_replace(array('[', ']', '`'), array('&#91;', '&#93;', '&#96;'), $value);
             case 'sql_escape':
             case 'encode_js':
                 return $modx->db->escape($value);
@@ -394,39 +394,39 @@ 
             case 'html_encode':
                 return preg_replace('/&amp;(#[0-9]+|[a-z]+);/i', '&$1;', htmlspecialchars($value, ENT_QUOTES, $modx->config['modx_charset']));
             case 'spam_protect':
-                return str_replace(array('@','.'),array('&#64;','&#46;'),$value);
+                return str_replace(array('@', '.'), array('&#64;', '&#46;'), $value);
             case 'strip':
-                if($opt==='') $opt = ' ';
+                if ($opt === '') $opt = ' ';
                 return preg_replace('/[\n\r\t\s]+/', $opt, $value);
             case 'strip_linefeeds':
-                return str_replace(array("\n","\r"), '', $value);
+                return str_replace(array("\n", "\r"), '', $value);
             case 'notags':
             case 'strip_tags':
             case 'remove_html':
-                if($opt!=='')
+                if ($opt !== '')
                 {
                     $param = array();
-                    foreach(explode(',',$opt) as $v)
+                    foreach (explode(',', $opt) as $v)
                     {
-                        $v = trim($v,'</> ');
+                        $v = trim($v, '</> ');
                         $param[] = "<{$v}>";
                     }
-                    $params = join(',',$param);
+                    $params = join(',', $param);
                 }
                 else $params = '';
-                if(!strpos($params,'<br>')===false) {
-                    $value = preg_replace('@(<br[ /]*>)\n@','$1',$value);
-                    $value = preg_replace('@<br[ /]*>@',"\n",$value);
+                if (!strpos($params, '<br>') === false) {
+                    $value = preg_replace('@(<br[ /]*>)\n@', '$1', $value);
+                    $value = preg_replace('@<br[ /]*>@', "\n", $value);
                 }
-                return $this->strip_tags($value,$params);
+                return $this->strip_tags($value, $params);
             case 'urlencode':
             case 'url_encode':
             case 'encode_url':
                 return urlencode($value);
             case 'base64_decode':
-                if($opt!=='false') $opt = true;
+                if ($opt !== 'false') $opt = true;
                 else               $opt = false;
-                return base64_decode($value,$opt);
+                return base64_decode($value, $opt);
             case 'encode_sha1': $cmd = 'sha1';
             case 'addslashes':
             case 'urldecode':
@@ -450,18 +450,18 @@ 
             case 'upper_case':
                 return $this->strtoupper($value);
             case 'capitalize':
-                $_ = explode(' ',$value);
-                foreach($_ as $i=>$v)
+                $_ = explode(' ', $value);
+                foreach ($_ as $i=>$v)
                 {
                     $_[$i] = ucfirst($v);
                 }
-                return join(' ',$_);
+                return join(' ', $_);
             case 'zenhan':
-                if(empty($opt)) $opt='VKas';
-                return mb_convert_kana($value,$opt,$modx->config['modx_charset']);
+                if (empty($opt)) $opt = 'VKas';
+                return mb_convert_kana($value, $opt, $modx->config['modx_charset']);
             case 'hanzen':
-                if(empty($opt)) $opt='VKAS';
-                return mb_convert_kana($value,$opt,$modx->config['modx_charset']);
+                if (empty($opt)) $opt = 'VKAS';
+                return mb_convert_kana($value, $opt, $modx->config['modx_charset']);
             case 'str_shuffle':
             case 'shuffle':
                 return $this->str_shuffle($value);
@@ -475,7 +475,7 @@ 
                 return $this->strlen($value);
             case 'count_words':
                 $value = trim($value);
-                return count(preg_split('/\s+/',$value));
+                return count(preg_split('/\s+/', $value));
             case 'str_word_count':
             case 'word_count':
             case 'wordcount':
@@ -483,55 +483,55 @@ 
             case 'count_paragraphs':
                 $value = trim($value);
                 $value = preg_replace('/\r/', '', $value);
-                return count(preg_split('/\n+/',$value));
+                return count(preg_split('/\n+/', $value));
             case 'strpos':
-                if($opt!=0&&empty($opt)) return $value;
-                return $this->strpos($value,$opt);
+                if ($opt != 0 && empty($opt)) return $value;
+                return $this->strpos($value, $opt);
             case 'wordwrap':
                 // default: 70
-                  $wrapat = (int)$opt > 0 ? (int)$opt : 70;
+                  $wrapat = (int) $opt > 0 ? (int) $opt : 70;
                 if (version_compare(PHP_VERSION, '5.3.0') >= 0) return $this->includeMdfFile('wordwrap');
-                else return preg_replace("@(\b\w+\b)@e","wordwrap('\\1',\$wrapat,' ',1)",$value);
+                else return preg_replace("@(\b\w+\b)@e", "wordwrap('\\1',\$wrapat,' ',1)", $value);
             case 'wrap_text':
-                $width = preg_match('/^[1-9][0-9]*$/',$opt) ? $opt : 70;
-                if($modx->config['manager_language']==='japanese-utf8') {
+                $width = preg_match('/^[1-9][0-9]*$/', $opt) ? $opt : 70;
+                if ($modx->config['manager_language'] === 'japanese-utf8') {
                     $chunk = array();
-                    $bt='';
-                    while($bt!=$value) {
+                    $bt = '';
+                    while ($bt != $value) {
                         $bt = $value;
-                        if($this->strlen($value)<$width) {
+                        if ($this->strlen($value) < $width) {
                             $chunk[] = $value;
                             break;
                         }
-                        $chunk[] = $this->substr($value,0,$width);
-                        $value = $this->substr($value,$width);
+                        $chunk[] = $this->substr($value, 0, $width);
+                        $value = $this->substr($value, $width);
                     }
-                    return join("\n",$chunk);
+                    return join("\n", $chunk);
                 }
                 else
-                    return wordwrap($value,$width,"\n",true);
+                    return wordwrap($value, $width, "\n", true);
             case 'substr':
-                if(empty($opt)) break;
-                if(strpos($opt,',')!==false) {
-                    list($b,$e) = explode(',',$opt,2);
-                    return $this->substr($value,$b,(int)$e);
+                if (empty($opt)) break;
+                if (strpos($opt, ',') !== false) {
+                    list($b, $e) = explode(',', $opt, 2);
+                    return $this->substr($value, $b, (int) $e);
                 }
-                else return $this->substr($value,$opt);
+                else return $this->substr($value, $opt);
             case 'limit':
             case 'trim_to': // http://www.movabletype.jp/documentation/appendices/modifiers/trim_to.html
-                if(strpos($opt,'+')!==false)
-                    list($len,$str) = explode('+',$opt,2);
+                if (strpos($opt, '+') !== false)
+                    list($len, $str) = explode('+', $opt, 2);
                 else {
                     $len = $opt;
                     $str = '';
                 }
-                if($len==='') $len = 100;
-                if(abs($len) > $this->strlen($value)) $str ='';
-                if(preg_match('/^[1-9][0-9]*$/',$len)) {
-                    return $this->substr($value,0,$len) . $str;
+                if ($len === '') $len = 100;
+                if (abs($len) > $this->strlen($value)) $str = '';
+                if (preg_match('/^[1-9][0-9]*$/', $len)) {
+                    return $this->substr($value, 0, $len).$str;
                 }
-                elseif(preg_match('/^\-[1-9][0-9]*$/',$len)) {
-                    return $str . $this->substr($value,$len);
+                elseif (preg_match('/^\-[1-9][0-9]*$/', $len)) {
+                    return $str.$this->substr($value, $len);
                 }
                 break;
             case 'summary':
@@ -540,81 +540,81 @@ 
                 return $this->includeMdfFile('summary');
             case 'replace':
             case 'str_replace':
-                if(empty($opt) || strpos($opt,',')===false) break;
-                if    (substr_count($opt, ',') ==1) $delim = ',';
-                elseif(substr_count($opt, '|') ==1) $delim = '|';
-                elseif(substr_count($opt, '=>')==1) $delim = '=>';
-                elseif(substr_count($opt, '/') ==1) $delim = '/';
+                if (empty($opt) || strpos($opt, ',') === false) break;
+                if (substr_count($opt, ',') == 1) $delim = ',';
+                elseif (substr_count($opt, '|') == 1) $delim = '|';
+                elseif (substr_count($opt, '=>') == 1) $delim = '=>';
+                elseif (substr_count($opt, '/') == 1) $delim = '/';
                 else break;
-                list($s,$r) = explode($delim,$opt);
-                if($value!=='') return str_replace($s,$r,$value);
+                list($s, $r) = explode($delim, $opt);
+                if ($value !== '') return str_replace($s, $r, $value);
                 break;
             case 'replace_to':
             case 'tpl':
-                if($value!=='') return str_replace(array('[+value+]','[+output+]','{value}','%s'),$value,$opt);
+                if ($value !== '') return str_replace(array('[+value+]', '[+output+]', '{value}', '%s'), $value, $opt);
                 break;
             case 'eachtpl':
-                $value = explode('||',$value);
+                $value = explode('||', $value);
                 $_ = array();
-                foreach($value as $v) {
-                    $_[] = str_replace(array('[+value+]','[+output+]','{value}','%s'),$v,$opt);
+                foreach ($value as $v) {
+                    $_[] = str_replace(array('[+value+]', '[+output+]', '{value}', '%s'), $v, $opt);
                 }
                 return join("\n", $_);
             case 'array_pop':
             case 'array_shift':
-                if(strpos($value,'||')!==false) $delim = '||';
+                if (strpos($value, '||') !== false) $delim = '||';
                 else                            $delim = ',';
-                return $cmd(explode($delim,$value));
+                return $cmd(explode($delim, $value));
             case 'preg_replace':
             case 'regex_replace':
-                if(empty($opt) || strpos($opt,',')===false) break;
-                list($s,$r) = explode(',',$opt,2);
-                if($value!=='') return preg_replace($s,$r,$value);
+                if (empty($opt) || strpos($opt, ',') === false) break;
+                list($s, $r) = explode(',', $opt, 2);
+                if ($value !== '') return preg_replace($s, $r, $value);
                 break;
             case 'cat':
             case 'concatenate':
             case '.':
-                if($value!=='') return $value . $opt;
+                if ($value !== '') return $value.$opt;
                 break;
             case 'sprintf':
             case 'string_format':
-                if($value!=='') return sprintf($opt,$value);
+                if ($value !== '') return sprintf($opt, $value);
                 break;
             case 'number_format':
-                    if($opt=='') $opt = 0;
-                    return number_format($value,$opt);
+                    if ($opt == '') $opt = 0;
+                    return number_format($value, $opt);
             case 'money_format':
-                    setlocale(LC_MONETARY,setlocale(LC_TIME,0));
-                    if($value!=='') return money_format($opt,(double)$value);
+                    setlocale(LC_MONETARY, setlocale(LC_TIME, 0));
+                    if ($value !== '') return money_format($opt, (double) $value);
                     break;
             case 'tobool':
                 return boolval($value);
             case 'nl2lf':
-                if($value!=='') return str_replace(array("\r\n","\n", "\r"), '\n', $value);
+                if ($value !== '') return str_replace(array("\r\n", "\n", "\r"), '\n', $value);
                 break;
             case 'br2nl':
                 return preg_replace('@<br[\s/]*>@i', "\n", $value);
             case 'nl2br':
                 if (version_compare(PHP_VERSION, '5.3.0', '<'))
                     return nl2br($value);
-                if($opt!=='')
+                if ($opt !== '')
                 {
                     $opt = trim($opt);
                     $opt = strtolower($opt);
-                    if($opt==='false') $opt = false;
-                    elseif($opt==='0') $opt = false;
+                    if ($opt === 'false') $opt = false;
+                    elseif ($opt === '0') $opt = false;
                     else               $opt = true;
                 }
-                elseif(isset($modx->config['mce_element_format'])&&$modx->config['mce_element_format']==='html')
+                elseif (isset($modx->config['mce_element_format']) && $modx->config['mce_element_format'] === 'html')
                                        $opt = false;
                 else                   $opt = true;
-                return nl2br($value,$opt);
+                return nl2br($value, $opt);
             case 'ltrim':
             case 'rtrim':
             case 'trim': // ref http://mblo.info/modifiers/custom-modifiers/rtrim_opt.html
-                if($opt==='')
+                if ($opt === '')
                     return $cmd($value);
-                else return $cmd($value,$opt);
+                else return $cmd($value, $opt);
             // These are all straight wrappers for PHP functions
             case 'ucfirst':
             case 'lcfirst':
@@ -625,58 +625,58 @@ 
             case 'strftime':
             case 'date':
             case 'dateformat':
-                if(empty($opt)) $opt = $modx->toDateFormat(null, 'formatOnly');
-                if(!preg_match('@^[0-9]+$@',$value)) $value = strtotime($value);
-                if(strpos($opt,'%')!==false)
-                    return strftime($opt,0+$value);
+                if (empty($opt)) $opt = $modx->toDateFormat(null, 'formatOnly');
+                if (!preg_match('@^[0-9]+$@', $value)) $value = strtotime($value);
+                if (strpos($opt, '%') !== false)
+                    return strftime($opt, 0 + $value);
                 else
-                    return date($opt,0+$value);
+                    return date($opt, 0 + $value);
             case 'time':
-                if(empty($opt)) $opt = '%H:%M';
-                if(!preg_match('@^[0-9]+$@',$value)) $value = strtotime($value);
-                return strftime($opt,0+$value);
+                if (empty($opt)) $opt = '%H:%M';
+                if (!preg_match('@^[0-9]+$@', $value)) $value = strtotime($value);
+                return strftime($opt, 0 + $value);
             case 'strtotime':
                 return strtotime($value);
             #####  mathematical function
             case 'toint':
-                return (int)$value;
+                return (int) $value;
             case 'tofloat':
                 return floatval($value);
             case 'round':
-                if(!$opt) $opt = 0;
-                return $cmd($value,$opt);
+                if (!$opt) $opt = 0;
+                return $cmd($value, $opt);
             case 'max':
             case 'min':
-                return $cmd(explode(',',$value));
+                return $cmd(explode(',', $value));
             case 'floor':
             case 'ceil':
             case 'abs':
                 return $cmd($value);
             case 'math':
             case 'calc':
-                $value = (int)$value;
-                if(empty($value)) $value = '0';
-                $filter = str_replace(array('[+value+]','[+output+]','{value}','%s'),'?',$opt);
-                $filter = preg_replace('@([a-zA-Z\n\r\t\s])@','',$filter);
-                if(strpos($filter,'?')===false) $filter = "?{$filter}";
-                $filter = str_replace('?',$value,$filter);
+                $value = (int) $value;
+                if (empty($value)) $value = '0';
+                $filter = str_replace(array('[+value+]', '[+output+]', '{value}', '%s'), '?', $opt);
+                $filter = preg_replace('@([a-zA-Z\n\r\t\s])@', '', $filter);
+                if (strpos($filter, '?') === false) $filter = "?{$filter}";
+                $filter = str_replace('?', $value, $filter);
                 return eval("return {$filter};");
             case 'count':
-                if($value=='') return 0;
-                $value = explode(',',$value);
+                if ($value == '') return 0;
+                $value = explode(',', $value);
                 return count($value);
             case 'sort':
             case 'rsort':
-                if(strpos($value,"\n")!==false) $delim="\n";
+                if (strpos($value, "\n") !== false) $delim = "\n";
                 else $delim = ',';
-                $swap = explode($delim,$value);
-                if(!$opt) $opt = SORT_REGULAR;
+                $swap = explode($delim, $value);
+                if (!$opt) $opt = SORT_REGULAR;
                 else      $opt = constant($opt);
-                $cmd($swap,$opt);
-                return join($delim,$swap);
+                $cmd($swap, $opt);
+                return join($delim, $swap);
             #####  Resource fields
             case 'id':
-                if($opt) return $this->getDocumentObject($opt,$key);
+                if ($opt) return $this->getDocumentObject($opt, $key);
                 break;
             case 'type':
             case 'contenttype':
@@ -713,36 +713,36 @@ 
             case 'privatemgr':
             case 'content_dispo':
             case 'hidemenu':
-                if($cmd==='contenttype') $cmd = 'contentType';
-                return $this->getDocumentObject($value,$cmd);
+                if ($cmd === 'contenttype') $cmd = 'contentType';
+                return $this->getDocumentObject($value, $cmd);
             case 'title':
-                $pagetitle = $this->getDocumentObject($value,'pagetitle');
-                $longtitle = $this->getDocumentObject($value,'longtitle');
+                $pagetitle = $this->getDocumentObject($value, 'pagetitle');
+                $longtitle = $this->getDocumentObject($value, 'longtitle');
                 return $longtitle ? $longtitle : $pagetitle;
             case 'shorttitle':
-                $pagetitle = $this->getDocumentObject($value,'pagetitle');
-                $menutitle = $this->getDocumentObject($value,'menutitle');
+                $pagetitle = $this->getDocumentObject($value, 'pagetitle');
+                $menutitle = $this->getDocumentObject($value, 'menutitle');
                 return $menutitle ? $menutitle : $pagetitle;
             case 'templatename':
-                $rs = $modx->db->select('templatename','[+prefix+]site_templates',"id='{$value}'");
+                $rs = $modx->db->select('templatename', '[+prefix+]site_templates', "id='{$value}'");
                 $templateName = $modx->db->getValue($rs);
                 return !$templateName ? '(blank)' : $templateName;
             case 'getfield':
-                if(!$opt) $opt = 'content';
-                return $modx->getField($opt,$value);
+                if (!$opt) $opt = 'content';
+                return $modx->getField($opt, $value);
             case 'children':
             case 'childids':
-                if($value=='') $value = 0; // 値がない場合はルートと見なす
+                if ($value == '') $value = 0; // 値がない場合はルートと見なす
                 $published = 1;
-                if($opt=='') $opt = 'page';
-                $_ = explode(',',$opt);
+                if ($opt == '') $opt = 'page';
+                $_ = explode(',', $opt);
                 $where = array();
-                foreach($_ as $opt) {
-                    switch(trim($opt)) {
+                foreach ($_ as $opt) {
+                    switch (trim($opt)) {
                         case 'page'; case '!folder'; case '!isfolder': $where[] = 'sc.isfolder=0'; break;
                         case 'folder'; case 'isfolder':                $where[] = 'sc.isfolder=1'; break;
-                        case  'menu';  case  'show_menu':              $where[] = 'sc.hidemenu=0'; break;
-                        case '!menu';  case '!show_menu':              $where[] = 'sc.hidemenu=1'; break;
+                        case  'menu'; case  'show_menu':              $where[] = 'sc.hidemenu=0'; break;
+                        case '!menu'; case '!show_menu':              $where[] = 'sc.hidemenu=1'; break;
                         case  'published':                             $published = 1; break;
                         case '!published':                             $published = 0; break;
                     }
@@ -750,69 +750,69 @@ 
                 $where = join(' AND ', $where);
                 $children = $modx->getDocumentChildren($value, $published, '0', 'id', $where);
                 $result = array();
-                foreach((array)$children as $child){
+                foreach ((array) $children as $child) {
                     $result[] = $child['id'];
                 }
                 return join(',', $result);
             case 'fullurl':
-                if(!is_numeric($value)) return $value;
+                if (!is_numeric($value)) return $value;
                 return $modx->makeUrl($value);
             case 'makeurl':
-                if(!is_numeric($value)) return $value;
-                if(!$opt) $opt = 'full';
-                return $modx->makeUrl($value,'','',$opt);
+                if (!is_numeric($value)) return $value;
+                if (!$opt) $opt = 'full';
+                return $modx->makeUrl($value, '', '', $opt);
 
             #####  File system
             case 'getimageinfo':
             case 'imageinfo':
-                if(!is_file($value)) return '';
+                if (!is_file($value)) return '';
                 $_ = getimagesize($value);
-                if(!$_[0]) return '';
+                if (!$_[0]) return '';
                 $info['width']  = $_[0];
                 $info['height'] = $_[1];
-                if    ($_[0] > $_[1]) $info['aspect'] = 'landscape';
-                elseif($_[0] < $_[1]) $info['aspect'] = 'portrait';
+                if ($_[0] > $_[1]) $info['aspect'] = 'landscape';
+                elseif ($_[0] < $_[1]) $info['aspect'] = 'portrait';
                 else                  $info['aspect'] = 'square';
-                switch($_[2]) {
+                switch ($_[2]) {
                     case IMAGETYPE_GIF  : $info['type'] = 'gif'; break;
                     case IMAGETYPE_JPEG : $info['type'] = 'jpg'; break;
                     case IMAGETYPE_PNG  : $info['type'] = 'png'; break;
                     default             : $info['type'] = 'unknown';
                 }
                 $info['attrib'] = $_[3];
-                switch($opt) {
+                switch ($opt) {
                     case 'width' : return $info['width'];
                     case 'height': return $info['height'];
                     case 'aspect': return $info['aspect'];
                     case 'type'  : return $info['type'];
                     case 'attrib': return $info['attrib'];
-                    default      : return print_r($info,true);
+                    default      : return print_r($info, true);
                 }
 
             case 'file_get_contents':
             case 'readfile':
-                if(!is_file($value)) return $value;
+                if (!is_file($value)) return $value;
                 $value = realpath($value);
-                if(strpos($value,MODX_MANAGER_PATH)!==false) exit('Can not read core file');
-                $ext = strtolower(substr($value,-4));
-                if($ext==='.php') exit('Can not read php file');
-                if($ext==='.cgi') exit('Can not read cgi file');
+                if (strpos($value, MODX_MANAGER_PATH) !== false) exit('Can not read core file');
+                $ext = strtolower(substr($value, -4));
+                if ($ext === '.php') exit('Can not read php file');
+                if ($ext === '.cgi') exit('Can not read cgi file');
                 return file_get_contents($value);
             case 'filesize':
-                if($value == '') return '';
+                if ($value == '') return '';
                 $filename = $value;
 
                 $site_url = $modx->config['site_url'];
-                if(strpos($filename,$site_url) === 0)
-                    $filename = substr($filename,0,strlen($site_url));
-                $filename = trim($filename,'/');
+                if (strpos($filename, $site_url) === 0)
+                    $filename = substr($filename, 0, strlen($site_url));
+                $filename = trim($filename, '/');
 
-                $opt = trim($opt,'/');
-                if($opt!=='') $opt .= '/';
+                $opt = trim($opt, '/');
+                if ($opt !== '') $opt .= '/';
 
                 $filename = MODX_BASE_PATH.$opt.$filename;
 
-                if(is_file($filename)){
+                if (is_file($filename)) {
                     clearstatcache();
                     $size = filesize($filename);
                     return $size;
@@ -845,10 +845,10 @@ 
                 $this->opt = $cmd;
                 return $this->includeMdfFile('moduser');
             case 'userinfo':
-                if(empty($opt)) $this->opt = 'username';
+                if (empty($opt)) $this->opt = 'username';
                 return $this->includeMdfFile('moduser');
             case 'webuserinfo':
-                if(empty($opt)) $this->opt = 'username';
+                if (empty($opt)) $this->opt = 'username';
                 $this->value = -$value;
                 return $this->includeMdfFile('moduser');
             #####  Special functions
@@ -859,27 +859,27 @@ 
             case 'ifnotempty':
                 if (!empty($value)) return $opt; break;
             case 'datagrid':
-                include_once(MODX_CORE_PATH . 'controls/datagrid.class.php');
+                include_once(MODX_CORE_PATH.'controls/datagrid.class.php');
                 $grd = new DataGrid(null, trim($value));
                 $grd->itemStyle = '';
                 $grd->altItemStyle = '';
-                $pos = strpos($value,"\n");
-                if($pos) $_ = substr($value,0,$pos);
+                $pos = strpos($value, "\n");
+                if ($pos) $_ = substr($value, 0, $pos);
                 else $_ = $pos;
-                $grd->cdelim = strpos($_,"\t")!==false ? 'tab' : ',';
+                $grd->cdelim = strpos($_, "\t") !== false ? 'tab' : ',';
                 return $grd->render();
             case 'rotate':
             case 'evenodd':
-                if(strpos($opt,',')===false) $opt = 'odd,even';
+                if (strpos($opt, ',') === false) $opt = 'odd,even';
                 $_ = explode(',', $opt);
                 $c = count($_);
                 $i = $value + $c;
                 $i = $i % $c;
                 return $_[$i];
             case 'takeval':
-                $arr = explode(",",$opt);
+                $arr = explode(",", $opt);
                 $idx = $value;
-                if(!is_numeric($idx)) return $value;
+                if (!is_numeric($idx)) return $value;
                 return $arr[$idx];
             case 'getimage':
                 return $this->includeMdfFile('getimage');
@@ -887,17 +887,17 @@ 
                     return $modx->nicesize($value);
             case 'googlemap':
             case 'googlemaps':
-                if(empty($opt)) $opt = 'border:none;width:500px;height:350px;';
+                if (empty($opt)) $opt = 'border:none;width:500px;height:350px;';
                 $tpl = '<iframe style="[+style+]" src="https://maps.google.co.jp/maps?ll=[+value+]&output=embed&z=15"></iframe>';
                 $ph['style'] = $opt;
                 $ph['value'] = $value;
-                return $modx->parseText($tpl,$ph);
+                return $modx->parseText($tpl, $ph);
             case 'youtube':
             case 'youtube16x9':
-                if(empty($opt)) $opt = 560;
-                $h = round($opt*0.5625);
+                if (empty($opt)) $opt = 560;
+                $h = round($opt * 0.5625);
                 $tpl = '<iframe width="%s" height="%s" src="https://www.youtube.com/embed/%s" frameborder="0" allowfullscreen></iframe>';
-                return sprintf($tpl,$opt,$h,$value);
+                return sprintf($tpl, $opt, $h, $value);
             //case 'youtube4x3':%s*0.75＋25
             case 'setvar':
                 $modx->placeholders[$opt] = $value;
@@ -927,7 +927,7 @@ 
         return $value;
     }
 
-    public function includeMdfFile($cmd) {
+    public function includeMdfFile($cmd){
         global $modx;
         $key = $this->key;
         $value  = $this->value;
@@ -938,54 +938,54 @@ 
     public function getValueFromElement($key, $value, $cmd, $opt)
     {
         global $modx;
-        if( isset($modx->snippetCache[$this->elmName]) )
+        if (isset($modx->snippetCache[$this->elmName]))
         {
             $php = $modx->snippetCache[$this->elmName];
         }
         else
         {
             $esc_elmName = $modx->db->escape($this->elmName);
-            $result = $modx->db->select('snippet','[+prefix+]site_snippets',"name='{$esc_elmName}'");
+            $result = $modx->db->select('snippet', '[+prefix+]site_snippets', "name='{$esc_elmName}'");
             $total = $modx->db->getRecordCount($result);
-            if($total == 1)
+            if ($total == 1)
             {
                 $row = $modx->db->getRow($result);
                 $php = $row['snippet'];
             }
-            elseif($total == 0)
+            elseif ($total == 0)
             {
                 $assets_path = MODX_BASE_PATH.'assets/';
-                if(is_file($assets_path."modifiers/mdf_{$cmd}.inc.php"))
+                if (is_file($assets_path."modifiers/mdf_{$cmd}.inc.php"))
                     $modifiers_path = $assets_path."modifiers/mdf_{$cmd}.inc.php";
-                elseif(is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php"))
+                elseif (is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php"))
                     $modifiers_path = $assets_path."plugins/phx/modifiers/{$cmd}.phx.php";
-                elseif(is_file(MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php"))
+                elseif (is_file(MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php"))
                     $modifiers_path = MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php";
                 else $modifiers_path = false;
 
-                if($modifiers_path !== false) {
+                if ($modifiers_path !== false) {
                     $php = @file_get_contents($modifiers_path);
                     $php = trim($php);
-                    if(substr($php,0,5)==='<?php') $php = substr($php,6);
-                    if(substr($php,0,2)==='<?')    $php = substr($php,3);
-                    if(substr($php,-2)==='?>')     $php = substr($php,0,-2);
-                    if($this->elmName!=='')
+                    if (substr($php, 0, 5) === '<?php') $php = substr($php, 6);
+                    if (substr($php, 0, 2) === '<?')    $php = substr($php, 3);
+                    if (substr($php, -2) === '?>')     $php = substr($php, 0, -2);
+                    if ($this->elmName !== '')
                         $modx->snippetCache[$this->elmName.'Props'] = '';
                 }
                 else
                     $php = false;
             }
             else $php = false;
-            if($this->elmName!=='') $modx->snippetCache[$this->elmName]= $php;
+            if ($this->elmName !== '') $modx->snippetCache[$this->elmName] = $php;
         }
-        if($php==='') $php=false;
+        if ($php === '') $php = false;
 
-        if($php===false) $html = $modx->getChunk($this->elmName);
+        if ($php === false) $html = $modx->getChunk($this->elmName);
         else             $html = false;
 
         $self = '[+output+]';
 
-        if($php !== false)
+        if ($php !== false)
         {
             ob_start();
             $options = $opt;
@@ -998,71 +998,71 @@ 
             $this->vars['options'] = & $opt;
             $custom = eval($php);
             $msg = ob_get_contents();
-            if($value===$this->bt) $value = $msg . $custom;
+            if ($value === $this->bt) $value = $msg.$custom;
             ob_end_clean();
         }
-        elseif($html!==false && isset($value) && $value!=='')
+        elseif ($html !== false && isset($value) && $value !== '')
         {
-            $html = str_replace(array($self,'[+value+]'), $value, $html);
-            $value = str_replace(array('[+options+]','[+param+]'), $opt, $html);
+            $html = str_replace(array($self, '[+value+]'), $value, $html);
+            $value = str_replace(array('[+options+]', '[+param+]'), $opt, $html);
         }
         else return false;
 
-        if($php===false && $html===false && $value!==''
-           && (strpos($cmd,'[+value+]')!==false || strpos($cmd,$self)!==false))
+        if ($php === false && $html === false && $value !== ''
+           && (strpos($cmd, '[+value+]') !== false || strpos($cmd, $self) !== false))
         {
-            $value = str_replace(array('[+value+]',$self),$value,$cmd);
+            $value = str_replace(array('[+value+]', $self), $value, $cmd);
         }
         return $value;
     }
 
-    public function parseDocumentSource($content='')
+    public function parseDocumentSource($content = '')
     {
         global $modx;
 
-        if(strpos($content,'[')===false && strpos($content,'{')===false) return $content;
+        if (strpos($content, '[') === false && strpos($content, '{') === false) return $content;
 
-        if(!$modx->maxParserPasses) $modx->maxParserPasses = 10;
-        $bt='';
-        $i=0;
-        while($bt!==$content)
+        if (!$modx->maxParserPasses) $modx->maxParserPasses = 10;
+        $bt = '';
+        $i = 0;
+        while ($bt !== $content)
         {
             $bt = $content;
-            if(strpos($content,'[*')!==false && $modx->documentIdentifier)
+            if (strpos($content, '[*') !== false && $modx->documentIdentifier)
                                               $content = $modx->mergeDocumentContent($content);
-            if(strpos($content,'[(')!==false) $content = $modx->mergeSettingsContent($content);
-            if(strpos($content,'{{')!==false) $content = $modx->mergeChunkContent($content);
-            if(strpos($content,'[!')!==false) $content = str_replace(array('[!','!]'),array('[[',']]'),$content);
-            if(strpos($content,'[[')!==false) $content = $modx->evalSnippets($content);
+            if (strpos($content, '[(') !== false) $content = $modx->mergeSettingsContent($content);
+            if (strpos($content, '{{') !== false) $content = $modx->mergeChunkContent($content);
+            if (strpos($content, '[!') !== false) $content = str_replace(array('[!', '!]'), array('[[', ']]'), $content);
+            if (strpos($content, '[[') !== false) $content = $modx->evalSnippets($content);
 
-            if($content===$bt)              break;
-            if($modx->maxParserPasses < $i) break;
+            if ($content === $bt)              break;
+            if ($modx->maxParserPasses < $i) break;
             $i++;
         }
         return $content;
     }
 
-    public function getDocumentObject($target='',$field='pagetitle')
+    public function getDocumentObject($target = '', $field = 'pagetitle')
     {
         global $modx;
 
         $target = trim($target);
-        if(empty($target)) $target = $modx->config['site_start'];
-        if(preg_match('@^[1-9][0-9]*$@',$target)) $method='id';
+        if (empty($target)) $target = $modx->config['site_start'];
+        if (preg_match('@^[1-9][0-9]*$@', $target)) $method = 'id';
         else $method = 'alias';
 
-        if(!isset($this->documentObject[$target]))
+        if (!isset($this->documentObject[$target]))
         {
-            $this->documentObject[$target] = $modx->getDocumentObject($method,$target,'direct');
+            $this->documentObject[$target] = $modx->getDocumentObject($method, $target, 'direct');
         }
 
-        if($this->documentObject[$target]['publishedon']==='0')
+        if ($this->documentObject[$target]['publishedon'] === '0')
             return '';
-        elseif(isset($this->documentObject[$target][$field]))
+        elseif (isset($this->documentObject[$target][$field]))
         {
-            if(is_array($this->documentObject[$target][$field]))
+            if (is_array($this->documentObject[$target][$field]))
             {
-                $a = $modx->getTemplateVarOutput($field,$target);
+                $a = $modx->getTemplateVarOutput($field, $target);
                 $this->documentObject[$target][$field] = $a[$field];
             }
         }
@@ -1071,8 +1071,8 @@ 
         return $this->documentObject[$target][$field];
     }
 
-    public function setPlaceholders($value = '', $key = '', $path = '') {
-        if($path!=='') $key = "{$path}.{$key}";
+    public function setPlaceholders($value = '', $key = '', $path = ''){
+        if ($path !== '') $key = "{$path}.{$key}";
         if (is_array($value)) {
             foreach ($value as $subkey => $subval) {
                 $this->setPlaceholders($subval, $subkey, $key);
@@ -1082,77 +1082,77 @@ 
     }
 
     // Sets a placeholder variable which can only be access by Modifiers
-    public function setModifiersVariable($key, $value) {
+    public function setModifiersVariable($key, $value){
         if ($key != 'phx' && $key != 'dummy') $this->placeholders[$key] = $value;
     }
 
     //mbstring
-    public function substr($str, $s, $l = null) {
+    public function substr($str, $s, $l = null){
         global $modx;
-        if(is_null($l)) $l = $this->strlen($str);
+        if (is_null($l)) $l = $this->strlen($str);
         if (function_exists('mb_substr'))
         {
-            if(strpos($str,"\r")!==false)
-                $str = str_replace(array("\r\n","\r"), "\n", $str);
+            if (strpos($str, "\r") !== false)
+                $str = str_replace(array("\r\n", "\r"), "\n", $str);
             return mb_substr($str, $s, $l, $modx->config['modx_charset']);
         }
         return substr($str, $s, $l);
     }
-    public function strpos($haystack,$needle,$offset=0) {
+    public function strpos($haystack, $needle, $offset = 0){
         global $modx;
-        if (function_exists('mb_strpos')) return mb_strpos($haystack,$needle,$offset,$modx->config['modx_charset']);
-        return strpos($haystack,$needle,$offset);
+        if (function_exists('mb_strpos')) return mb_strpos($haystack, $needle, $offset, $modx->config['modx_charset']);
+        return strpos($haystack, $needle, $offset);
     }
-    public function strlen($str) {
+    public function strlen($str){
         global $modx;
-        if (function_exists('mb_strlen')) return mb_strlen(str_replace("\r\n", "\n", $str),$modx->config['modx_charset']);
+        if (function_exists('mb_strlen')) return mb_strlen(str_replace("\r\n", "\n", $str), $modx->config['modx_charset']);
         return strlen($str);
     }
-    public function strtolower($str) {
+    public function strtolower($str){
         if (function_exists('mb_strtolower')) return mb_strtolower($str);
         return strtolower($str);
     }
-    public function strtoupper($str) {
+    public function strtoupper($str){
         if (function_exists('mb_strtoupper')) return mb_strtoupper($str);
         return strtoupper($str);
     }
-    public function ucfirst($str) {
+    public function ucfirst($str){
         if (function_exists('mb_strtoupper'))
             return mb_strtoupper($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
         return ucfirst($str);
     }
-    public function lcfirst($str) {
+    public function lcfirst($str){
         if (function_exists('mb_strtolower'))
             return mb_strtolower($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
         return lcfirst($str);
     }
-    public function ucwords($str) {
+    public function ucwords($str){
         if (function_exists('mb_convert_case'))
             return mb_convert_case($str, MB_CASE_TITLE);
         return ucwords($str);
     }
-    public function strrev($str) {
+    public function strrev($str){
         preg_match_all('/./us', $str, $ar);
         return join(array_reverse($ar[0]));
     }
-    public function str_shuffle($str) {
+    public function str_shuffle($str){
         preg_match_all('/./us', $str, $ar);
         shuffle($ar[0]);
         return join($ar[0]);
     }
-    public function str_word_count($str) {
-        return count(preg_split('~[^\p{L}\p{N}\']+~u',$str));
+    public function str_word_count($str){
+        return count(preg_split('~[^\p{L}\p{N}\']+~u', $str));
     }
-    public function strip_tags($value,$params='') {
+    public function strip_tags($value, $params = ''){
         global $modx;
 
-        if(stripos($params,'style')===false && stripos($value,'</style>')!==false) {
+        if (stripos($params, 'style') === false && stripos($value, '</style>') !== false) {
             $value = preg_replace('@<style.*?>.*?</style>@is', '', $value);
         }
-        if(stripos($params,'script')===false && stripos($value,'</script>')!==false) {
+        if (stripos($params, 'script') === false && stripos($value, '</script>') !== false) {
             $value = preg_replace('@<script.*?>.*?</script>@is', '', $value);
         }
 
-        return trim(strip_tags($value,$params));
+        return trim(strip_tags($value, $params));
     }
 }

Braces +544 added lines, -282 removed lines

@@ -1,8 +1,11 @@ 
 <?php
 
-if(!defined('MODX_CORE_PATH')) define('MODX_CORE_PATH', MODX_MANAGER_PATH.'includes/');
+if(!defined('MODX_CORE_PATH')) {
+    define('MODX_CORE_PATH', MODX_MANAGER_PATH.'includes/');
+}
 
-class MODIFIERS {
+class MODIFIERS
+{
 
     public $placeholders = array();
     public $vars = array();
@@ -26,14 +29,18 @@ 
     {
         global $modx;
 
-        if (function_exists('mb_internal_encoding')) mb_internal_encoding($modx->config['modx_charset']);
+        if (function_exists('mb_internal_encoding')) {
+            mb_internal_encoding($modx->config['modx_charset']);
+        }
         $this->condModifiers = '=,is,eq,equals,ne,neq,notequals,isnot,isnt,not,%,isempty,isnotempty,isntempty,>=,gte,eg,gte,greaterthan,>,gt,isgreaterthan,isgt,lowerthan,<,lt,<=,lte,islte,islowerthan,islt,el,find,in,inarray,in_array,fnmatch,wcard,wcard_match,wildcard,wildcard_match,is_file,is_dir,file_exists,is_readable,is_writable,is_image,regex,preg,preg_match,memberof,mo,isinrole,ir';
     }
 
     public function phxFilter($key,$value,$modifiers)
     {
         global $modx;
-        if(substr($modifiers,0,3)!=='id(') $value = $this->parseDocumentSource($value);
+        if(substr($modifiers,0,3)!=='id(') {
+            $value = $this->parseDocumentSource($value);
+        }
         $this->srcValue = $value;
         $modifiers = trim($modifiers);
         $modifiers = ':'.trim($modifiers,':');
@@ -51,63 +58,81 @@ 
         return $value;
     }
 
-    public function _getDelim($mode,$modifiers) {
+    public function _getDelim($mode,$modifiers)
+    {
         $c = substr($modifiers,0,1);
-        if(!in_array($c, array('"', "'", '`')) ) return false;
+        if(!in_array($c, array('"', "'", '`')) ) {
+            return false;
+        }
 
         $modifiers = substr($modifiers,1);
         $closure = $mode=='(' ? "{$c})" : $c;
-        if(strpos($modifiers, $closure)===false) return false;
+        if(strpos($modifiers, $closure)===false) {
+            return false;
+        }
 
         return  $c;
     }
 
-    public function _getOpt($mode,$delim,$modifiers) {
+    public function _getOpt($mode,$delim,$modifiers)
+    {
         if($delim) {
-            if($mode=='(') return substr($modifiers,1,strpos($modifiers, $delim . ')' )-1);
+            if($mode=='(') {
+                return substr($modifiers,1,strpos($modifiers, $delim . ')' )-1);
+            }
 
             return substr($modifiers,1,strpos($modifiers,$delim,1)-1);
-        }
-        else {
-            if($mode=='(') return substr($modifiers,0,strpos($modifiers, ')') );
+        } else {
+            if($mode=='(') {
+                return substr($modifiers,0,strpos($modifiers, ')') );
+            }
 
             $chars = str_split($modifiers);
             $opt='';
             foreach($chars as $c) {
-                if($c==':' || $c==')') break;
+                if($c==':' || $c==')') {
+                    break;
+                }
                 $opt .=$c;
             }
             return $opt;
         }
     }
-    public function _getRemainModifiers($mode,$delim,$modifiers) {
+    public function _getRemainModifiers($mode,$delim,$modifiers)
+    {
         if($delim) {
-            if($mode=='(')
-                return $this->_fetchContent($modifiers, $delim . ')');
-            else {
+            if($mode=='(') {
+                            return $this->_fetchContent($modifiers, $delim . ')');
+            } else {
                 $modifiers = trim($modifiers);
                 $modifiers = substr($modifiers,1);
                 return $this->_fetchContent($modifiers, $delim);
             }
-        }
-        else {
-            if($mode=='(') return $this->_fetchContent($modifiers, ')');
+        } else {
+            if($mode=='(') {
+                return $this->_fetchContent($modifiers, ')');
+            }
             $chars = str_split($modifiers);
             foreach($chars as $c) {
-                if($c==':') return $modifiers;
-                else $modifiers = substr($modifiers,1);
+                if($c==':') {
+                    return $modifiers;
+                } else {
+                    $modifiers = substr($modifiers,1);
+                }
             }
             return $modifiers;
         }
     }
 
-    public function _fetchContent($string,$delim) {
+    public function _fetchContent($string,$delim)
+    {
         $len = strlen($delim);
         $string = $this->parseDocumentSource($string);
         return substr($string,strpos($string, $delim)+$len);
     }
 
-    public function splitEachModifiers($modifiers) {
+    public function splitEachModifiers($modifiers)
+    {
         global $modx;
 
         $cmd = '';
@@ -118,11 +143,15 @@ 
             $c = substr($modifiers,0,1);
             $modifiers = substr($modifiers,1);
 
-            if($c===':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { // :=, :!=, :<=, :>=, :!<=, :!>=
+            if($c===':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) {
+// :=, :!=, :<=, :>=, :!<=, :!>=
                 $c = substr($modifiers,strlen($match[1]),1);
                 $debuginfo = "#i=0 #c=[{$c}] #m=[{$modifiers}]";
-                if($c==='(') $modifiers = substr($modifiers,strlen($match[1])+1);
-                else         $modifiers = substr($modifiers,strlen($match[1]));
+                if($c==='(') {
+                    $modifiers = substr($modifiers,strlen($match[1])+1);
+                } else {
+                    $modifiers = substr($modifiers,strlen($match[1]));
+                }
 
                 $delim     = $this->_getDelim($c,$modifiers);
                 $opt       = $this->_getOpt($c,$delim,$modifiers);
@@ -130,13 +159,12 @@ 
 
                 $result[]=array('cmd'=>trim($match[1]),'opt'=>$opt,'debuginfo'=>$debuginfo);
                 $cmd = '';
-            }
-            elseif(in_array($c,array('+','-','*','/')) && preg_match('@^[0-9]+@', $modifiers, $match)) { // :+3, :-3, :*3 ...
+            } elseif(in_array($c,array('+','-','*','/')) && preg_match('@^[0-9]+@', $modifiers, $match)) {
+// :+3, :-3, :*3 ...
                 $modifiers = substr($modifiers,strlen($match[0]));
                 $result[]=array('cmd'=>'math','opt'=>'%s'.$c.$match[0]);
                 $cmd = '';
-            }
-            elseif($c==='(' || $c==='=') {
+            } elseif($c==='(' || $c==='=') {
                 $modifiers = $m1 = trim($modifiers);
                 $delim     = $this->_getDelim($c,$modifiers);
                 $opt       = $this->_getOpt($c,$delim,$modifiers);
@@ -146,29 +174,29 @@ 
                 $result[]=array('cmd'=>trim($cmd),'opt'=>$opt,'debuginfo'=>$debuginfo);
 
                 $cmd = '';
-            }
-            elseif($c==':') {
+            } elseif($c==':') {
                 $debuginfo = "#i=2 #c=[{$c}] #m=[{$modifiers}]";
-                if($cmd!=='') $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
+                if($cmd!=='') {
+                    $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
+                }
 
                 $cmd = '';
-            }
-            elseif(trim($modifiers)=='' && trim($cmd)!=='') {
+            } elseif(trim($modifiers)=='' && trim($cmd)!=='') {
                 $debuginfo = "#i=3 #c=[{$c}] #m=[{$modifiers}]";
                 $cmd .= $c;
                 $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
 
                 break;
-            }
-            else {
+            } else {
                 $cmd .= $c;
             }
         }
 
-        if(empty($result)) return array();
+        if(empty($result)) {
+            return array();
+        }
 
-        foreach($result as $i=>$a)
-        {
+        foreach($result as $i=>$a) {
             $a['opt'] = $this->parseDocumentSource($a['opt']);
             $result[$i]['opt'] = $modx->mergePlaceholderContent($a['opt'],$this->placeholders);
         }
@@ -181,22 +209,23 @@ 
         global $modx;
         $lastKey = '';
         $cacheKey = md5(sprintf('parsePhx#%s#%s#%s',$key,$value,print_r($modifiers,true)));
-        if(isset($this->tmpCache[$cacheKey])) return $this->tmpCache[$cacheKey];
-        if(empty($modifiers)) return '';
+        if(isset($this->tmpCache[$cacheKey])) {
+            return $this->tmpCache[$cacheKey];
+        }
+        if(empty($modifiers)) {
+            return '';
+        }
 
-        foreach($modifiers as $m)
-        {
+        foreach($modifiers as $m) {
             $lastKey = strtolower($m['cmd']);
         }
         $_ = explode(',',$this->condModifiers);
-        if(in_array($lastKey,$_))
-        {
+        if(in_array($lastKey,$_)) {
             $modifiers[] = array('cmd'=>'then','opt'=>'1');
             $modifiers[] = array('cmd'=>'else','opt'=>'0');
         }
 
-        foreach($modifiers as $i=>$a)
-        {
+        foreach($modifiers as $i=>$a) {
             $value = $this->Filter($key,$value, $a['cmd'], $a['opt']);
         }
         $this->tmpCache[$cacheKey] = $value;
@@ -208,25 +237,32 @@ 
     {
         global $modx;
 
-        if($key==='documentObject') $value = $modx->documentIdentifier;
+        if($key==='documentObject') {
+            $value = $modx->documentIdentifier;
+        }
         $cmd = $this->parseDocumentSource($cmd);
-        if(preg_match('@^[1-9][/0-9]*$@',$cmd))
-        {
-            if(strpos($cmd,'/')!==false)
-                $cmd = $this->substr($cmd,strrpos($cmd,'/')+1);
+        if(preg_match('@^[1-9][/0-9]*$@',$cmd)) {
+            if(strpos($cmd,'/')!==false) {
+                            $cmd = $this->substr($cmd,strrpos($cmd,'/')+1);
+            }
             $opt = $cmd;
             $cmd = 'id';
         }
 
-        if(isset($modx->snippetCache["phx:{$cmd}"]))   $this->elmName = "phx:{$cmd}";
-        elseif(isset($modx->chunkCache["phx:{$cmd}"])) $this->elmName = "phx:{$cmd}";
-        else                                           $this->elmName = '';
+        if(isset($modx->snippetCache["phx:{$cmd}"])) {
+            $this->elmName = "phx:{$cmd}";
+        } elseif(isset($modx->chunkCache["phx:{$cmd}"])) {
+            $this->elmName = "phx:{$cmd}";
+        } else {
+            $this->elmName = '';
+        }
 
         $cmd = strtolower($cmd);
-        if($this->elmName!=='')
-            $value = $this->getValueFromElement($key, $value, $cmd, $opt);
-        else
-            $value = $this->getValueFromPreset($key, $value, $cmd, $opt);
+        if($this->elmName!=='') {
+                    $value = $this->getValueFromElement($key, $value, $cmd, $opt);
+        } else {
+                    $value = $this->getValueFromPreset($key, $value, $cmd, $opt);
+        }
 
         $value = str_replace('[+key+]', $key, $value);
 
@@ -235,29 +271,37 @@ 
 
     public function isEmpty($cmd,$value)
     {
-        if($value!=='') return false;
+        if($value!=='') {
+            return false;
+        }
 
         $_ = explode(',', $this->condModifiers . ',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary');
-        if(in_array($cmd,$_)) return false;
-        else                  return true;
+        if(in_array($cmd,$_)) {
+            return false;
+        } else {
+            return true;
+        }
     }
 
     public function getValueFromPreset($key, $value, $cmd, $opt)
     {
         global $modx;
 
-        if($this->isEmpty($cmd,$value)) return '';
+        if($this->isEmpty($cmd,$value)) {
+            return '';
+        }
 
         $this->key = $key;
         $this->value  = $value;
         $this->opt    = $opt;
 
-        switch ($cmd)
-        {
+        switch ($cmd) {
             #####  Conditional Modifiers
             case 'input':
             case 'if':
-                if(!$opt) return $value;
+                if(!$opt) {
+                    return $value;
+                }
                 return $opt;
             case '=':
             case 'eq':
@@ -318,14 +362,24 @@ 
             case 'file_exists':
             case 'is_readable':
             case 'is_writable':
-                if(!$opt) $path = $value;
-                else      $path = $opt;
-                if(strpos($path,MODX_MANAGER_PATH)!==false) exit('Can not read core path');
-                if(strpos($path,$modx->config['base_path'])===false) $path = ltrim($path,'/');
+                if(!$opt) {
+                    $path = $value;
+                } else {
+                    $path = $opt;
+                }
+                if(strpos($path,MODX_MANAGER_PATH)!==false) {
+                    exit('Can not read core path');
+                }
+                if(strpos($path,$modx->config['base_path'])===false) {
+                    $path = ltrim($path,'/');
+                }
                 $this->condition[] = (int)($cmd($path)!==false);break;
             case 'is_image':
-                if(!$opt) $path = $value;
-                else      $path = $opt;
+                if(!$opt) {
+                    $path = $value;
+                } else {
+                    $path = $opt;
+                }
                 if(!is_file($path)) {$this->condition[]='0';break;}
                 $_ = getimagesize($path);
                 $this->condition[] = (int)($_[0]);break;
@@ -348,17 +402,23 @@ 
             case 'this':
                 $conditional = join(' ',$this->condition);
                 $isvalid = (int)(eval("return ({$conditional});"));
-                if ($isvalid) return $this->srcValue;
+                if ($isvalid) {
+                    return $this->srcValue;
+                }
                 return NULL;
             case 'then':
                 $conditional = join(' ',$this->condition);
                 $isvalid = (int)eval("return ({$conditional});");
-                if ($isvalid)  return $opt;
+                if ($isvalid) {
+                    return $opt;
+                }
                 return null;
             case 'else':
                 $conditional = join(' ',$this->condition);
                 $isvalid = (int)eval("return ({$conditional});");
-                if (!$isvalid) return $opt;
+                if (!$isvalid) {
+                    return $opt;
+                }
                 break;
             case 'select':
             case 'switch':
@@ -369,8 +429,11 @@ 
                     $mi = explode('=',$raw[$m],2);
                     $map[$mi[0]] = $mi[1];
                 }
-                if(isset($map[$value])) return $map[$value];
-                else                    return '';
+                if(isset($map[$value])) {
+                    return $map[$value];
+                } else {
+                    return '';
+                }
             ##### End of Conditional Modifiers
 
             #####  Encode / Decode / Hash / Escape
@@ -396,24 +459,25 @@ 
             case 'spam_protect':
                 return str_replace(array('@','.'),array('&#64;','&#46;'),$value);
             case 'strip':
-                if($opt==='') $opt = ' ';
+                if($opt==='') {
+                    $opt = ' ';
+                }
                 return preg_replace('/[\n\r\t\s]+/', $opt, $value);
             case 'strip_linefeeds':
                 return str_replace(array("\n","\r"), '', $value);
             case 'notags':
             case 'strip_tags':
             case 'remove_html':
-                if($opt!=='')
-                {
+                if($opt!=='') {
                     $param = array();
-                    foreach(explode(',',$opt) as $v)
-                    {
+                    foreach(explode(',',$opt) as $v) {
                         $v = trim($v,'</> ');
                         $param[] = "<{$v}>";
                     }
                     $params = join(',',$param);
+                } else {
+                    $params = '';
                 }
-                else $params = '';
                 if(!strpos($params,'<br>')===false) {
                     $value = preg_replace('@(<br[ /]*>)\n@','$1',$value);
                     $value = preg_replace('@<br[ /]*>@',"\n",$value);
@@ -424,8 +488,11 @@ 
             case 'encode_url':
                 return urlencode($value);
             case 'base64_decode':
-                if($opt!=='false') $opt = true;
-                else               $opt = false;
+                if($opt!=='false') {
+                    $opt = true;
+                } else {
+                    $opt = false;
+                }
                 return base64_decode($value,$opt);
             case 'encode_sha1': $cmd = 'sha1';
             case 'addslashes':
@@ -451,16 +518,19 @@ 
                 return $this->strtoupper($value);
             case 'capitalize':
                 $_ = explode(' ',$value);
-                foreach($_ as $i=>$v)
-                {
+                foreach($_ as $i=>$v) {
                     $_[$i] = ucfirst($v);
                 }
                 return join(' ',$_);
             case 'zenhan':
-                if(empty($opt)) $opt='VKas';
+                if(empty($opt)) {
+                    $opt='VKas';
+                }
                 return mb_convert_kana($value,$opt,$modx->config['modx_charset']);
             case 'hanzen':
-                if(empty($opt)) $opt='VKAS';
+                if(empty($opt)) {
+                    $opt='VKAS';
+                }
                 return mb_convert_kana($value,$opt,$modx->config['modx_charset']);
             case 'str_shuffle':
             case 'shuffle':
@@ -485,13 +555,18 @@ 
                 $value = preg_replace('/\r/', '', $value);
                 return count(preg_split('/\n+/',$value));
             case 'strpos':
-                if($opt!=0&&empty($opt)) return $value;
+                if($opt!=0&&empty($opt)) {
+                    return $value;
+                }
                 return $this->strpos($value,$opt);
             case 'wordwrap':
                 // default: 70
                   $wrapat = (int)$opt > 0 ? (int)$opt : 70;
-                if (version_compare(PHP_VERSION, '5.3.0') >= 0) return $this->includeMdfFile('wordwrap');
-                else return preg_replace("@(\b\w+\b)@e","wordwrap('\\1',\$wrapat,' ',1)",$value);
+                if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
+                    return $this->includeMdfFile('wordwrap');
+                } else {
+                    return preg_replace("@(\b\w+\b)@e","wordwrap('\\1',\$wrapat,' ',1)",$value);
+                }
             case 'wrap_text':
                 $width = preg_match('/^[1-9][0-9]*$/',$opt) ? $opt : 70;
                 if($modx->config['manager_language']==='japanese-utf8') {
@@ -507,30 +582,36 @@ 
                         $value = $this->substr($value,$width);
                     }
                     return join("\n",$chunk);
+                } else {
+                                    return wordwrap($value,$width,"\n",true);
                 }
-                else
-                    return wordwrap($value,$width,"\n",true);
             case 'substr':
-                if(empty($opt)) break;
+                if(empty($opt)) {
+                    break;
+                }
                 if(strpos($opt,',')!==false) {
                     list($b,$e) = explode(',',$opt,2);
                     return $this->substr($value,$b,(int)$e);
+                } else {
+                    return $this->substr($value,$opt);
                 }
-                else return $this->substr($value,$opt);
             case 'limit':
             case 'trim_to': // http://www.movabletype.jp/documentation/appendices/modifiers/trim_to.html
-                if(strpos($opt,'+')!==false)
-                    list($len,$str) = explode('+',$opt,2);
-                else {
+                if(strpos($opt,'+')!==false) {
+                                    list($len,$str) = explode('+',$opt,2);
+                } else {
                     $len = $opt;
                     $str = '';
                 }
-                if($len==='') $len = 100;
-                if(abs($len) > $this->strlen($value)) $str ='';
+                if($len==='') {
+                    $len = 100;
+                }
+                if(abs($len) > $this->strlen($value)) {
+                    $str ='';
+                }
                 if(preg_match('/^[1-9][0-9]*$/',$len)) {
                     return $this->substr($value,0,$len) . $str;
-                }
-                elseif(preg_match('/^\-[1-9][0-9]*$/',$len)) {
+                } elseif(preg_match('/^\-[1-9][0-9]*$/',$len)) {
                     return $str . $this->substr($value,$len);
                 }
                 break;
@@ -540,18 +621,30 @@ 
                 return $this->includeMdfFile('summary');
             case 'replace':
             case 'str_replace':
-                if(empty($opt) || strpos($opt,',')===false) break;
-                if    (substr_count($opt, ',') ==1) $delim = ',';
-                elseif(substr_count($opt, '|') ==1) $delim = '|';
-                elseif(substr_count($opt, '=>')==1) $delim = '=>';
-                elseif(substr_count($opt, '/') ==1) $delim = '/';
-                else break;
+                if(empty($opt) || strpos($opt,',')===false) {
+                    break;
+                }
+                if    (substr_count($opt, ',') ==1) {
+                    $delim = ',';
+                } elseif(substr_count($opt, '|') ==1) {
+                    $delim = '|';
+                } elseif(substr_count($opt, '=>')==1) {
+                    $delim = '=>';
+                } elseif(substr_count($opt, '/') ==1) {
+                    $delim = '/';
+                } else {
+                    break;
+                }
                 list($s,$r) = explode($delim,$opt);
-                if($value!=='') return str_replace($s,$r,$value);
+                if($value!=='') {
+                    return str_replace($s,$r,$value);
+                }
                 break;
             case 'replace_to':
             case 'tpl':
-                if($value!=='') return str_replace(array('[+value+]','[+output+]','{value}','%s'),$value,$opt);
+                if($value!=='') {
+                    return str_replace(array('[+value+]','[+output+]','{value}','%s'),$value,$opt);
+                }
                 break;
             case 'eachtpl':
                 $value = explode('||',$value);
@@ -562,59 +655,83 @@ 
                 return join("\n", $_);
             case 'array_pop':
             case 'array_shift':
-                if(strpos($value,'||')!==false) $delim = '||';
-                else                            $delim = ',';
+                if(strpos($value,'||')!==false) {
+                    $delim = '||';
+                } else {
+                    $delim = ',';
+                }
                 return $cmd(explode($delim,$value));
             case 'preg_replace':
             case 'regex_replace':
-                if(empty($opt) || strpos($opt,',')===false) break;
+                if(empty($opt) || strpos($opt,',')===false) {
+                    break;
+                }
                 list($s,$r) = explode(',',$opt,2);
-                if($value!=='') return preg_replace($s,$r,$value);
+                if($value!=='') {
+                    return preg_replace($s,$r,$value);
+                }
                 break;
             case 'cat':
             case 'concatenate':
             case '.':
-                if($value!=='') return $value . $opt;
+                if($value!=='') {
+                    return $value . $opt;
+                }
                 break;
             case 'sprintf':
             case 'string_format':
-                if($value!=='') return sprintf($opt,$value);
+                if($value!=='') {
+                    return sprintf($opt,$value);
+                }
                 break;
             case 'number_format':
-                    if($opt=='') $opt = 0;
+                    if($opt=='') {
+                        $opt = 0;
+                    }
                     return number_format($value,$opt);
             case 'money_format':
                     setlocale(LC_MONETARY,setlocale(LC_TIME,0));
-                    if($value!=='') return money_format($opt,(double)$value);
+                    if($value!=='') {
+                        return money_format($opt,(double)$value);
+                    }
                     break;
             case 'tobool':
                 return boolval($value);
             case 'nl2lf':
-                if($value!=='') return str_replace(array("\r\n","\n", "\r"), '\n', $value);
+                if($value!=='') {
+                    return str_replace(array("\r\n","\n", "\r"), '\n', $value);
+                }
                 break;
             case 'br2nl':
                 return preg_replace('@<br[\s/]*>@i', "\n", $value);
             case 'nl2br':
-                if (version_compare(PHP_VERSION, '5.3.0', '<'))
-                    return nl2br($value);
-                if($opt!=='')
-                {
+                if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+                                    return nl2br($value);
+                }
+                if($opt!=='') {
                     $opt = trim($opt);
                     $opt = strtolower($opt);
-                    if($opt==='false') $opt = false;
-                    elseif($opt==='0') $opt = false;
-                    else               $opt = true;
+                    if($opt==='false') {
+                        $opt = false;
+                    } elseif($opt==='0') {
+                        $opt = false;
+                    } else {
+                        $opt = true;
+                    }
+                } elseif(isset($modx->config['mce_element_format'])&&$modx->config['mce_element_format']==='html') {
+                                                       $opt = false;
+                } else {
+                    $opt = true;
                 }
-                elseif(isset($modx->config['mce_element_format'])&&$modx->config['mce_element_format']==='html')
-                                       $opt = false;
-                else                   $opt = true;
                 return nl2br($value,$opt);
             case 'ltrim':
             case 'rtrim':
             case 'trim': // ref http://mblo.info/modifiers/custom-modifiers/rtrim_opt.html
-                if($opt==='')
-                    return $cmd($value);
-                else return $cmd($value,$opt);
+                if($opt==='') {
+                                    return $cmd($value);
+                } else {
+                    return $cmd($value,$opt);
+                }
             // These are all straight wrappers for PHP functions
             case 'ucfirst':
             case 'lcfirst':
@@ -625,15 +742,24 @@ 
             case 'strftime':
             case 'date':
             case 'dateformat':
-                if(empty($opt)) $opt = $modx->toDateFormat(null, 'formatOnly');
-                if(!preg_match('@^[0-9]+$@',$value)) $value = strtotime($value);
-                if(strpos($opt,'%')!==false)
-                    return strftime($opt,0+$value);
-                else
-                    return date($opt,0+$value);
+                if(empty($opt)) {
+                    $opt = $modx->toDateFormat(null, 'formatOnly');
+                }
+                if(!preg_match('@^[0-9]+$@',$value)) {
+                    $value = strtotime($value);
+                }
+                if(strpos($opt,'%')!==false) {
+                                    return strftime($opt,0+$value);
+                } else {
+                                    return date($opt,0+$value);
+                }
             case 'time':
-                if(empty($opt)) $opt = '%H:%M';
-                if(!preg_match('@^[0-9]+$@',$value)) $value = strtotime($value);
+                if(empty($opt)) {
+                    $opt = '%H:%M';
+                }
+                if(!preg_match('@^[0-9]+$@',$value)) {
+                    $value = strtotime($value);
+                }
                 return strftime($opt,0+$value);
             case 'strtotime':
                 return strtotime($value);
@@ -643,7 +769,9 @@ 
             case 'tofloat':
                 return floatval($value);
             case 'round':
-                if(!$opt) $opt = 0;
+                if(!$opt) {
+                    $opt = 0;
+                }
                 return $cmd($value,$opt);
             case 'max':
             case 'min':
@@ -655,28 +783,42 @@ 
             case 'math':
             case 'calc':
                 $value = (int)$value;
-                if(empty($value)) $value = '0';
+                if(empty($value)) {
+                    $value = '0';
+                }
                 $filter = str_replace(array('[+value+]','[+output+]','{value}','%s'),'?',$opt);
                 $filter = preg_replace('@([a-zA-Z\n\r\t\s])@','',$filter);
-                if(strpos($filter,'?')===false) $filter = "?{$filter}";
+                if(strpos($filter,'?')===false) {
+                    $filter = "?{$filter}";
+                }
                 $filter = str_replace('?',$value,$filter);
                 return eval("return {$filter};");
             case 'count':
-                if($value=='') return 0;
+                if($value=='') {
+                    return 0;
+                }
                 $value = explode(',',$value);
                 return count($value);
             case 'sort':
             case 'rsort':
-                if(strpos($value,"\n")!==false) $delim="\n";
-                else $delim = ',';
+                if(strpos($value,"\n")!==false) {
+                    $delim="\n";
+                } else {
+                    $delim = ',';
+                }
                 $swap = explode($delim,$value);
-                if(!$opt) $opt = SORT_REGULAR;
-                else      $opt = constant($opt);
+                if(!$opt) {
+                    $opt = SORT_REGULAR;
+                } else {
+                    $opt = constant($opt);
+                }
                 $cmd($swap,$opt);
                 return join($delim,$swap);
             #####  Resource fields
             case 'id':
-                if($opt) return $this->getDocumentObject($opt,$key);
+                if($opt) {
+                    return $this->getDocumentObject($opt,$key);
+                }
                 break;
             case 'type':
             case 'contenttype':
@@ -713,7 +855,9 @@ 
             case 'privatemgr':
             case 'content_dispo':
             case 'hidemenu':
-                if($cmd==='contenttype') $cmd = 'contentType';
+                if($cmd==='contenttype') {
+                    $cmd = 'contentType';
+                }
                 return $this->getDocumentObject($value,$cmd);
             case 'title':
                 $pagetitle = $this->getDocumentObject($value,'pagetitle');
@@ -728,13 +872,20 @@ 
                 $templateName = $modx->db->getValue($rs);
                 return !$templateName ? '(blank)' : $templateName;
             case 'getfield':
-                if(!$opt) $opt = 'content';
+                if(!$opt) {
+                    $opt = 'content';
+                }
                 return $modx->getField($opt,$value);
             case 'children':
             case 'childids':
-                if($value=='') $value = 0; // 値がない場合はルートと見なす
+                if($value=='') {
+                    $value = 0;
+                }
+                // 値がない場合はルートと見なす
                 $published = 1;
-                if($opt=='') $opt = 'page';
+                if($opt=='') {
+                    $opt = 'page';
+                }
                 $_ = explode(',',$opt);
                 $where = array();
                 foreach($_ as $opt) {
@@ -750,29 +901,43 @@ 
                 $where = join(' AND ', $where);
                 $children = $modx->getDocumentChildren($value, $published, '0', 'id', $where);
                 $result = array();
-                foreach((array)$children as $child){
+                foreach((array)$children as $child) {
                     $result[] = $child['id'];
                 }
                 return join(',', $result);
             case 'fullurl':
-                if(!is_numeric($value)) return $value;
+                if(!is_numeric($value)) {
+                    return $value;
+                }
                 return $modx->makeUrl($value);
             case 'makeurl':
-                if(!is_numeric($value)) return $value;
-                if(!$opt) $opt = 'full';
+                if(!is_numeric($value)) {
+                    return $value;
+                }
+                if(!$opt) {
+                    $opt = 'full';
+                }
                 return $modx->makeUrl($value,'','',$opt);
 
             #####  File system
             case 'getimageinfo':
             case 'imageinfo':
-                if(!is_file($value)) return '';
+                if(!is_file($value)) {
+                    return '';
+                }
                 $_ = getimagesize($value);
-                if(!$_[0]) return '';
+                if(!$_[0]) {
+                    return '';
+                }
                 $info['width']  = $_[0];
                 $info['height'] = $_[1];
-                if    ($_[0] > $_[1]) $info['aspect'] = 'landscape';
-                elseif($_[0] < $_[1]) $info['aspect'] = 'portrait';
-                else                  $info['aspect'] = 'square';
+                if    ($_[0] > $_[1]) {
+                    $info['aspect'] = 'landscape';
+                } elseif($_[0] < $_[1]) {
+                    $info['aspect'] = 'portrait';
+                } else {
+                    $info['aspect'] = 'square';
+                }
                 switch($_[2]) {
                     case IMAGETYPE_GIF  : $info['type'] = 'gif'; break;
                     case IMAGETYPE_JPEG : $info['type'] = 'jpg'; break;
@@ -791,33 +956,47 @@ 
 
             case 'file_get_contents':
             case 'readfile':
-                if(!is_file($value)) return $value;
+                if(!is_file($value)) {
+                    return $value;
+                }
                 $value = realpath($value);
-                if(strpos($value,MODX_MANAGER_PATH)!==false) exit('Can not read core file');
+                if(strpos($value,MODX_MANAGER_PATH)!==false) {
+                    exit('Can not read core file');
+                }
                 $ext = strtolower(substr($value,-4));
-                if($ext==='.php') exit('Can not read php file');
-                if($ext==='.cgi') exit('Can not read cgi file');
+                if($ext==='.php') {
+                    exit('Can not read php file');
+                }
+                if($ext==='.cgi') {
+                    exit('Can not read cgi file');
+                }
                 return file_get_contents($value);
             case 'filesize':
-                if($value == '') return '';
+                if($value == '') {
+                    return '';
+                }
                 $filename = $value;
 
                 $site_url = $modx->config['site_url'];
-                if(strpos($filename,$site_url) === 0)
-                    $filename = substr($filename,0,strlen($site_url));
+                if(strpos($filename,$site_url) === 0) {
+                                    $filename = substr($filename,0,strlen($site_url));
+                }
                 $filename = trim($filename,'/');
 
                 $opt = trim($opt,'/');
-                if($opt!=='') $opt .= '/';
+                if($opt!=='') {
+                    $opt .= '/';
+                }
 
                 $filename = MODX_BASE_PATH.$opt.$filename;
 
-                if(is_file($filename)){
+                if(is_file($filename)) {
                     clearstatcache();
                     $size = filesize($filename);
                     return $size;
+                } else {
+                    return '';
                 }
-                else return '';
             #####  User info
             case 'username':
             case 'fullname':
@@ -845,32 +1024,47 @@ 
                 $this->opt = $cmd;
                 return $this->includeMdfFile('moduser');
             case 'userinfo':
-                if(empty($opt)) $this->opt = 'username';
+                if(empty($opt)) {
+                    $this->opt = 'username';
+                }
                 return $this->includeMdfFile('moduser');
             case 'webuserinfo':
-                if(empty($opt)) $this->opt = 'username';
+                if(empty($opt)) {
+                    $this->opt = 'username';
+                }
                 $this->value = -$value;
                 return $this->includeMdfFile('moduser');
             #####  Special functions
             case 'ifempty':
             case '_default':
             case 'default':
-                if (empty($value)) return $opt; break;
+                if (empty($value)) {
+                    return $opt;
+                }
+                break;
             case 'ifnotempty':
-                if (!empty($value)) return $opt; break;
+                if (!empty($value)) {
+                    return $opt;
+                }
+                break;
             case 'datagrid':
                 include_once(MODX_CORE_PATH . 'controls/datagrid.class.php');
                 $grd = new DataGrid(null, trim($value));
                 $grd->itemStyle = '';
                 $grd->altItemStyle = '';
                 $pos = strpos($value,"\n");
-                if($pos) $_ = substr($value,0,$pos);
-                else $_ = $pos;
+                if($pos) {
+                    $_ = substr($value,0,$pos);
+                } else {
+                    $_ = $pos;
+                }
                 $grd->cdelim = strpos($_,"\t")!==false ? 'tab' : ',';
                 return $grd->render();
             case 'rotate':
             case 'evenodd':
-                if(strpos($opt,',')===false) $opt = 'odd,even';
+                if(strpos($opt,',')===false) {
+                    $opt = 'odd,even';
+                }
                 $_ = explode(',', $opt);
                 $c = count($_);
                 $i = $value + $c;
@@ -879,7 +1073,9 @@ 
             case 'takeval':
                 $arr = explode(",",$opt);
                 $idx = $value;
-                if(!is_numeric($idx)) return $value;
+                if(!is_numeric($idx)) {
+                    return $value;
+                }
                 return $arr[$idx];
             case 'getimage':
                 return $this->includeMdfFile('getimage');
@@ -887,14 +1083,18 @@ 
                     return $modx->nicesize($value);
             case 'googlemap':
             case 'googlemaps':
-                if(empty($opt)) $opt = 'border:none;width:500px;height:350px;';
+                if(empty($opt)) {
+                    $opt = 'border:none;width:500px;height:350px;';
+                }
                 $tpl = '<iframe style="[+style+]" src="https://maps.google.co.jp/maps?ll=[+value+]&output=embed&z=15"></iframe>';
                 $ph['style'] = $opt;
                 $ph['value'] = $value;
                 return $modx->parseText($tpl,$ph);
             case 'youtube':
             case 'youtube16x9':
-                if(empty($opt)) $opt = 560;
+                if(empty($opt)) {
+                    $opt = 560;
+                }
                 $h = round($opt*0.5625);
                 $tpl = '<iframe width="%s" height="%s" src="https://www.youtube.com/embed/%s" frameborder="0" allowfullscreen></iframe>';
                 return sprintf($tpl,$opt,$h,$value);
@@ -927,7 +1127,8 @@ 
         return $value;
     }
 
-    public function includeMdfFile($cmd) {
+    public function includeMdfFile($cmd)
+    {
         global $modx;
         $key = $this->key;
         $value  = $this->value;
@@ -938,55 +1139,65 @@ 
     public function getValueFromElement($key, $value, $cmd, $opt)
     {
         global $modx;
-        if( isset($modx->snippetCache[$this->elmName]) )
-        {
+        if( isset($modx->snippetCache[$this->elmName]) ) {
             $php = $modx->snippetCache[$this->elmName];
-        }
-        else
-        {
+        } else {
             $esc_elmName = $modx->db->escape($this->elmName);
             $result = $modx->db->select('snippet','[+prefix+]site_snippets',"name='{$esc_elmName}'");
             $total = $modx->db->getRecordCount($result);
-            if($total == 1)
-            {
+            if($total == 1) {
                 $row = $modx->db->getRow($result);
                 $php = $row['snippet'];
-            }
-            elseif($total == 0)
-            {
+            } elseif($total == 0) {
                 $assets_path = MODX_BASE_PATH.'assets/';
-                if(is_file($assets_path."modifiers/mdf_{$cmd}.inc.php"))
-                    $modifiers_path = $assets_path."modifiers/mdf_{$cmd}.inc.php";
-                elseif(is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php"))
-                    $modifiers_path = $assets_path."plugins/phx/modifiers/{$cmd}.phx.php";
-                elseif(is_file(MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php"))
-                    $modifiers_path = MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php";
-                else $modifiers_path = false;
+                if(is_file($assets_path."modifiers/mdf_{$cmd}.inc.php")) {
+                                    $modifiers_path = $assets_path."modifiers/mdf_{$cmd}.inc.php";
+                } elseif(is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php")) {
+                                    $modifiers_path = $assets_path."plugins/phx/modifiers/{$cmd}.phx.php";
+                } elseif(is_file(MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php")) {
+                                    $modifiers_path = MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php";
+                } else {
+                    $modifiers_path = false;
+                }
 
                 if($modifiers_path !== false) {
                     $php = @file_get_contents($modifiers_path);
                     $php = trim($php);
-                    if(substr($php,0,5)==='<?php') $php = substr($php,6);
-                    if(substr($php,0,2)==='<?')    $php = substr($php,3);
-                    if(substr($php,-2)==='?>')     $php = substr($php,0,-2);
-                    if($this->elmName!=='')
-                        $modx->snippetCache[$this->elmName.'Props'] = '';
-                }
-                else
-                    $php = false;
+                    if(substr($php,0,5)==='<?php') {
+                        $php = substr($php,6);
+                    }
+                    if(substr($php,0,2)==='<?') {
+                        $php = substr($php,3);
+                    }
+                    if(substr($php,-2)==='?>') {
+                        $php = substr($php,0,-2);
+                    }
+                    if($this->elmName!=='') {
+                                            $modx->snippetCache[$this->elmName.'Props'] = '';
+                    }
+                } else {
+                                    $php = false;
+                }
+            } else {
+                $php = false;
+            }
+            if($this->elmName!=='') {
+                $modx->snippetCache[$this->elmName]= $php;
             }
-            else $php = false;
-            if($this->elmName!=='') $modx->snippetCache[$this->elmName]= $php;
         }
-        if($php==='') $php=false;
+        if($php==='') {
+            $php=false;
+        }
 
-        if($php===false) $html = $modx->getChunk($this->elmName);
-        else             $html = false;
+        if($php===false) {
+            $html = $modx->getChunk($this->elmName);
+        } else {
+            $html = false;
+        }
 
         $self = '[+output+]';
 
-        if($php !== false)
-        {
+        if($php !== false) {
             ob_start();
             $options = $opt;
             $output = $value;
@@ -998,19 +1209,19 @@ 
             $this->vars['options'] = & $opt;
             $custom = eval($php);
             $msg = ob_get_contents();
-            if($value===$this->bt) $value = $msg . $custom;
+            if($value===$this->bt) {
+                $value = $msg . $custom;
+            }
             ob_end_clean();
-        }
-        elseif($html!==false && isset($value) && $value!=='')
-        {
+        } elseif($html!==false && isset($value) && $value!=='') {
             $html = str_replace(array($self,'[+value+]'), $value, $html);
             $value = str_replace(array('[+options+]','[+param+]'), $opt, $html);
+        } else {
+            return false;
         }
-        else return false;
 
         if($php===false && $html===false && $value!==''
-           && (strpos($cmd,'[+value+]')!==false || strpos($cmd,$self)!==false))
-        {
+           && (strpos($cmd,'[+value+]')!==false || strpos($cmd,$self)!==false)) {
             $value = str_replace(array('[+value+]',$self),$value,$cmd);
         }
         return $value;
@@ -1020,23 +1231,39 @@ 
     {
         global $modx;
 
-        if(strpos($content,'[')===false && strpos($content,'{')===false) return $content;
+        if(strpos($content,'[')===false && strpos($content,'{')===false) {
+            return $content;
+        }
 
-        if(!$modx->maxParserPasses) $modx->maxParserPasses = 10;
+        if(!$modx->maxParserPasses) {
+            $modx->maxParserPasses = 10;
+        }
         $bt='';
         $i=0;
-        while($bt!==$content)
-        {
+        while($bt!==$content) {
             $bt = $content;
-            if(strpos($content,'[*')!==false && $modx->documentIdentifier)
-                                              $content = $modx->mergeDocumentContent($content);
-            if(strpos($content,'[(')!==false) $content = $modx->mergeSettingsContent($content);
-            if(strpos($content,'{{')!==false) $content = $modx->mergeChunkContent($content);
-            if(strpos($content,'[!')!==false) $content = str_replace(array('[!','!]'),array('[[',']]'),$content);
-            if(strpos($content,'[[')!==false) $content = $modx->evalSnippets($content);
-
-            if($content===$bt)              break;
-            if($modx->maxParserPasses < $i) break;
+            if(strpos($content,'[*')!==false && $modx->documentIdentifier) {
+                                                          $content = $modx->mergeDocumentContent($content);
+            }
+            if(strpos($content,'[(')!==false) {
+                $content = $modx->mergeSettingsContent($content);
+            }
+            if(strpos($content,'{{')!==false) {
+                $content = $modx->mergeChunkContent($content);
+            }
+            if(strpos($content,'[!')!==false) {
+                $content = str_replace(array('[!','!]'),array('[[',']]'),$content);
+            }
+            if(strpos($content,'[[')!==false) {
+                $content = $modx->evalSnippets($content);
+            }
+
+            if($content===$bt) {
+                break;
+            }
+            if($modx->maxParserPasses < $i) {
+                break;
+            }
             $i++;
         }
         return $content;
@@ -1047,103 +1274,138 @@ 
         global $modx;
 
         $target = trim($target);
-        if(empty($target)) $target = $modx->config['site_start'];
-        if(preg_match('@^[1-9][0-9]*$@',$target)) $method='id';
-        else $method = 'alias';
+        if(empty($target)) {
+            $target = $modx->config['site_start'];
+        }
+        if(preg_match('@^[1-9][0-9]*$@',$target)) {
+            $method='id';
+        } else {
+            $method = 'alias';
+        }
 
-        if(!isset($this->documentObject[$target]))
-        {
+        if(!isset($this->documentObject[$target])) {
             $this->documentObject[$target] = $modx->getDocumentObject($method,$target,'direct');
         }
 
-        if($this->documentObject[$target]['publishedon']==='0')
-            return '';
-        elseif(isset($this->documentObject[$target][$field]))
-        {
-            if(is_array($this->documentObject[$target][$field]))
-            {
+        if($this->documentObject[$target]['publishedon']==='0') {
+                    return '';
+        } elseif(isset($this->documentObject[$target][$field])) {
+            if(is_array($this->documentObject[$target][$field])) {
                 $a = $modx->getTemplateVarOutput($field,$target);
                 $this->documentObject[$target][$field] = $a[$field];
             }
+        } else {
+            $this->documentObject[$target][$field] = false;
         }
-        else $this->documentObject[$target][$field] = false;
 
         return $this->documentObject[$target][$field];
     }
 
-    public function setPlaceholders($value = '', $key = '', $path = '') {
-        if($path!=='') $key = "{$path}.{$key}";
+    public function setPlaceholders($value = '', $key = '', $path = '')
+    {
+        if($path!=='') {
+            $key = "{$path}.{$key}";
+        }
         if (is_array($value)) {
             foreach ($value as $subkey => $subval) {
                 $this->setPlaceholders($subval, $subkey, $key);
             }
+        } else {
+            $this->setModifiersVariable($key, $value);
         }
-        else $this->setModifiersVariable($key, $value);
     }
 
     // Sets a placeholder variable which can only be access by Modifiers
-    public function setModifiersVariable($key, $value) {
-        if ($key != 'phx' && $key != 'dummy') $this->placeholders[$key] = $value;
+    public function setModifiersVariable($key, $value)
+    {
+        if ($key != 'phx' && $key != 'dummy') {
+            $this->placeholders[$key] = $value;
+        }
     }
 
     //mbstring
-    public function substr($str, $s, $l = null) {
+    public function substr($str, $s, $l = null)
+    {
         global $modx;
-        if(is_null($l)) $l = $this->strlen($str);
-        if (function_exists('mb_substr'))
-        {
-            if(strpos($str,"\r")!==false)
-                $str = str_replace(array("\r\n","\r"), "\n", $str);
+        if(is_null($l)) {
+            $l = $this->strlen($str);
+        }
+        if (function_exists('mb_substr')) {
+            if(strpos($str,"\r")!==false) {
+                            $str = str_replace(array("\r\n","\r"), "\n", $str);
+            }
             return mb_substr($str, $s, $l, $modx->config['modx_charset']);
         }
         return substr($str, $s, $l);
     }
-    public function strpos($haystack,$needle,$offset=0) {
+    public function strpos($haystack,$needle,$offset=0)
+    {
         global $modx;
-        if (function_exists('mb_strpos')) return mb_strpos($haystack,$needle,$offset,$modx->config['modx_charset']);
+        if (function_exists('mb_strpos')) {
+            return mb_strpos($haystack,$needle,$offset,$modx->config['modx_charset']);
+        }
         return strpos($haystack,$needle,$offset);
     }
-    public function strlen($str) {
+    public function strlen($str)
+    {
         global $modx;
-        if (function_exists('mb_strlen')) return mb_strlen(str_replace("\r\n", "\n", $str),$modx->config['modx_charset']);
+        if (function_exists('mb_strlen')) {
+            return mb_strlen(str_replace("\r\n", "\n", $str),$modx->config['modx_charset']);
+        }
         return strlen($str);
     }
-    public function strtolower($str) {
-        if (function_exists('mb_strtolower')) return mb_strtolower($str);
+    public function strtolower($str)
+    {
+        if (function_exists('mb_strtolower')) {
+            return mb_strtolower($str);
+        }
         return strtolower($str);
     }
-    public function strtoupper($str) {
-        if (function_exists('mb_strtoupper')) return mb_strtoupper($str);
+    public function strtoupper($str)
+    {
+        if (function_exists('mb_strtoupper')) {
+            return mb_strtoupper($str);
+        }
         return strtoupper($str);
     }
-    public function ucfirst($str) {
-        if (function_exists('mb_strtoupper'))
-            return mb_strtoupper($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
+    public function ucfirst($str)
+    {
+        if (function_exists('mb_strtoupper')) {
+                    return mb_strtoupper($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
+        }
         return ucfirst($str);
     }
-    public function lcfirst($str) {
-        if (function_exists('mb_strtolower'))
-            return mb_strtolower($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
+    public function lcfirst($str)
+    {
+        if (function_exists('mb_strtolower')) {
+                    return mb_strtolower($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
+        }
         return lcfirst($str);
     }
-    public function ucwords($str) {
-        if (function_exists('mb_convert_case'))
-            return mb_convert_case($str, MB_CASE_TITLE);
+    public function ucwords($str)
+    {
+        if (function_exists('mb_convert_case')) {
+                    return mb_convert_case($str, MB_CASE_TITLE);
+        }
         return ucwords($str);
     }
-    public function strrev($str) {
+    public function strrev($str)
+    {
         preg_match_all('/./us', $str, $ar);
         return join(array_reverse($ar[0]));
     }
-    public function str_shuffle($str) {
+    public function str_shuffle($str)
+    {
         preg_match_all('/./us', $str, $ar);
         shuffle($ar[0]);
         return join($ar[0]);
     }
-    public function str_word_count($str) {
+    public function str_word_count($str)
+    {
         return count(preg_split('~[^\p{L}\p{N}\']+~u',$str));
     }
-    public function strip_tags($value,$params='') {
+    public function strip_tags($value,$params='')
+    {
         global $modx;
 
         if(stripos($params,'style')===false && stripos($value,'</style>')!==false) {

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -349,7 +349,7 @@
                 $conditional = join(' ',$this->condition);
                 $isvalid = (int)(eval("return ({$conditional});"));
                 if ($isvalid) return $this->srcValue;
-                return NULL;
+                return null;
             case 'then':
                 $conditional = join(' ',$this->condition);
                 $isvalid = (int)eval("return ({$conditional});");

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

Unused Use Statements +1 added lines, -1 removed lines

@@ -8,8 +8,8 @@
  *******************************************************
  */
 
-use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\Exception as PHPMailerException;
+use PHPMailer\PHPMailer\PHPMailer;
 
 require MODX_MANAGER_PATH . 'includes/controls/phpmailer/Exception.php';
 require MODX_MANAGER_PATH . 'includes/controls/phpmailer/PHPMailer.php';

Spacing +19 added lines, -19 removed lines

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