evolution-cms / evolution

manager/includes/controls/datagrid.class.php

Indentation +225 added lines, -225 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() {
         $modx = DocumentParser::getInstance();
-		$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
+        $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(){
         $modx = DocumentParser::getInstance();
-		$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()
+    {
         $modx = DocumentParser::getInstance();
 		$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

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() {
-		$modx = DocumentParser::getInstance(); global $_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++;
-			}
-		}
-	}
+        $modx = DocumentParser::getInstance(); global $_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(){
 		$modx = DocumentParser::getInstance(); global $_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()
+    {
 		$modx = DocumentParser::getInstance(); global $_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/log.class.inc.php

Spacing +6 added lines, -6 removed lines

@@ -36,16 +36,16 @@ 
         $action = "",
         $itemid = "",
         $itemname = ""
-    ) {
+    ){
         $modx = DocumentParser::getInstance();
         $this->entry['msg'] = $msg; // writes testmessage to the object
-        $this->entry['action'] = empty($action) ? $modx->manager->action : $action;    // writes the action to the object
+        $this->entry['action'] = empty($action) ? $modx->manager->action : $action; // writes the action to the object
 
         // User Credentials
         $this->entry['internalKey'] = $internalKey == "" ? $modx->getLoginUserID() : $internalKey;
         $this->entry['username'] = $username == "" ? $modx->getLoginUserName() : $username;
 
-        $this->entry['itemId'] = (empty($itemid) && isset($_REQUEST['id'])) ? (int)$_REQUEST['id'] : $itemid;  // writes the id to the object
+        $this->entry['itemId'] = (empty($itemid) && isset($_REQUEST['id'])) ? (int) $_REQUEST['id'] : $itemid; // writes the id to the object
         if ($this->entry['itemId'] == 0) {
             $this->entry['itemId'] = "-";
         } // to stop items having id 0
@@ -93,10 +93,10 @@ 
         $fields['message'] = $modx->db->escape($this->entry['msg']);
         $insert_id = $modx->db->insert($fields, $tbl_manager_log);
         if (!$insert_id) {
-            $modx->messageQuit("Logging error: couldn't save log to table! Error code: " . $modx->db->getLastError());
+            $modx->messageQuit("Logging error: couldn't save log to table! Error code: ".$modx->db->getLastError());
         } else {
-            $limit = (isset($modx->config['manager_log_limit'])) ? (int)$modx->config['manager_log_limit'] : 3000;
-            $trim = (isset($modx->config['manager_log_trim'])) ? (int)$modx->config['manager_log_trim'] : 100;
+            $limit = (isset($modx->config['manager_log_limit'])) ? (int) $modx->config['manager_log_limit'] : 3000;
+            $trim = (isset($modx->config['manager_log_trim'])) ? (int) $modx->config['manager_log_trim'] : 100;
             if (($insert_id % $trim) === 0) {
                 $modx->rotate_log('manager_log', $limit, $trim);
             }

manager/includes/tmplvars.format.inc.php

Indentation +320 added lines, -320 removed lines

@@ -21,320 +21,320 @@ 
     $o = '';
 
     // process any TV commands in value
-	$docid = (int)$docid > 0 ? (int)$docid : $modx->documentIdentifier;
-	$value = ProcessTVCommand($value, $name, $docid);
+    $docid = (int)$docid > 0 ? (int)$docid : $modx->documentIdentifier;
+    $value = ProcessTVCommand($value, $name, $docid);
 
-	$params = array();
-	if($paramstring) {
-		$cp = explode("&", $paramstring);
-		foreach($cp as $p => $v) {
-			$v = trim($v); // trim
-			$ar = explode("=", $v);
-			if(is_array($ar) && count($ar) == 2) {
-				$params[$ar[0]] = decodeParamValue($ar[1]);
-			}
-		}
-	}
+    $params = array();
+    if($paramstring) {
+        $cp = explode("&", $paramstring);
+        foreach($cp as $p => $v) {
+            $v = trim($v); // trim
+            $ar = explode("=", $v);
+            if(is_array($ar) && count($ar) == 2) {
+                $params[$ar[0]] = decodeParamValue($ar[1]);
+            }
+        }
+    }
 
-	$id = "tv$name";
-	switch($format) {
-		case 'image':
-			$images = parseInput($value, '||', 'array');
-			foreach($images as $image) {
-				if(!is_array($image)) {
-					$image = explode('==', $image);
-				}
-				$src = $image[0];
+    $id = "tv$name";
+    switch($format) {
+        case 'image':
+            $images = parseInput($value, '||', 'array');
+            foreach($images as $image) {
+                if(!is_array($image)) {
+                    $image = explode('==', $image);
+                }
+                $src = $image[0];
 
-				if($src) {
-					// We have a valid source
-					$attributes = '';
-					$attr = array(
-						'class' => $params['class'],
-						'src' => $src,
-						'id' => ($params['id'] ? $params['id'] : ''),
-						'alt' => $modx->htmlspecialchars($params['alttext']),
-						'style' => $params['style']
-					);
-					if(isset($params['align']) && $params['align'] != 'none') {
-						$attr['align'] = $params['align'];
-					}
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-					$attributes .= ' ' . $params['attrib'];
+                if($src) {
+                    // We have a valid source
+                    $attributes = '';
+                    $attr = array(
+                        'class' => $params['class'],
+                        'src' => $src,
+                        'id' => ($params['id'] ? $params['id'] : ''),
+                        'alt' => $modx->htmlspecialchars($params['alttext']),
+                        'style' => $params['style']
+                    );
+                    if(isset($params['align']) && $params['align'] != 'none') {
+                        $attr['align'] = $params['align'];
+                    }
+                    foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+                    $attributes .= ' ' . $params['attrib'];
 
-					// Output the image with attributes
-					$o .= '<img' . rtrim($attributes) . ' />';
-				}
-			}
-			break;
+                    // Output the image with attributes
+                    $o .= '<img' . rtrim($attributes) . ' />';
+                }
+            }
+            break;
 
-		case "delim":    // display as delimitted list
-			$value = parseInput($value, "||");
-			$p = $params['format'] ? $params['format'] : " ";
-			if($p == "\\n") {
-				$p = "\n";
-			}
-			$o = str_replace("||", $p, $value);
-			break;
+        case "delim":    // display as delimitted list
+            $value = parseInput($value, "||");
+            $p = $params['format'] ? $params['format'] : " ";
+            if($p == "\\n") {
+                $p = "\n";
+            }
+            $o = str_replace("||", $p, $value);
+            break;
 
-		case "string":
-			$value = parseInput($value);
-			$format = strtolower($params['format']);
-			if($format == 'upper case') {
-				$o = strtoupper($value);
-			} else if($format == 'lower case') {
-				$o = strtolower($value);
-			} else if($format == 'sentence case') {
-				$o = ucfirst($value);
-			} else if($format == 'capitalize') {
-				$o = ucwords($value);
-			} else {
-				$o = $value;
-			}
-			break;
+        case "string":
+            $value = parseInput($value);
+            $format = strtolower($params['format']);
+            if($format == 'upper case') {
+                $o = strtoupper($value);
+            } else if($format == 'lower case') {
+                $o = strtolower($value);
+            } else if($format == 'sentence case') {
+                $o = ucfirst($value);
+            } else if($format == 'capitalize') {
+                $o = ucwords($value);
+            } else {
+                $o = $value;
+            }
+            break;
 
-		case "date":
-			if($value != '' || $params['default'] == 'Yes') {
-				if(empty($value)) {
-					$value = 'now';
-				}
-				$timestamp = getUnixtimeFromDateString($value);
-				$p = $params['format'] ? $params['format'] : "%A %d, %B %Y";
-				$o = strftime($p, $timestamp);
-			} else {
-				$value = '';
-			}
-			break;
+        case "date":
+            if($value != '' || $params['default'] == 'Yes') {
+                if(empty($value)) {
+                    $value = 'now';
+                }
+                $timestamp = getUnixtimeFromDateString($value);
+                $p = $params['format'] ? $params['format'] : "%A %d, %B %Y";
+                $o = strftime($p, $timestamp);
+            } else {
+                $value = '';
+            }
+            break;
 
-		case "hyperlink":
-			$value = parseInput($value, "||", "array");
-			$o = '';
-			$countValue = count($value);
-			for($i = 0; $i < $countValue; $i++) {
-				list($name, $url) = is_array($value[$i]) ? $value[$i] : explode("==", $value[$i]);
-				if(!$url) {
-					$url = $name;
-				}
-				if($url) {
-					if($o) {
-						$o .= '<br />';
-					}
-					$attributes = '';
-					// setup the link attributes
-					$attr = array(
-						'href' => $url,
-						'title' => $params['title'] ? $modx->htmlspecialchars($params['title']) : $name,
-						'class' => $params['class'],
-						'style' => $params['style'],
-						'target' => $params['target'],
-					);
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-					$attributes .= ' ' . $params['attrib']; // add extra
+        case "hyperlink":
+            $value = parseInput($value, "||", "array");
+            $o = '';
+            $countValue = count($value);
+            for($i = 0; $i < $countValue; $i++) {
+                list($name, $url) = is_array($value[$i]) ? $value[$i] : explode("==", $value[$i]);
+                if(!$url) {
+                    $url = $name;
+                }
+                if($url) {
+                    if($o) {
+                        $o .= '<br />';
+                    }
+                    $attributes = '';
+                    // setup the link attributes
+                    $attr = array(
+                        'href' => $url,
+                        'title' => $params['title'] ? $modx->htmlspecialchars($params['title']) : $name,
+                        'class' => $params['class'],
+                        'style' => $params['style'],
+                        'target' => $params['target'],
+                    );
+                    foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+                    $attributes .= ' ' . $params['attrib']; // add extra
 
-					// Output the link
-					$o .= '<a' . rtrim($attributes) . '>' . ($params['text'] ? $modx->htmlspecialchars($params['text']) : $name) . '</a>';
-				}
-			}
-			break;
+                    // Output the link
+                    $o .= '<a' . rtrim($attributes) . '>' . ($params['text'] ? $modx->htmlspecialchars($params['text']) : $name) . '</a>';
+                }
+            }
+            break;
 
-		case "htmltag":
-			$value = parseInput($value, "||", "array");
-			$tagid = $params['tagid'];
-			$tagname = ($params['tagname']) ? $params['tagname'] : 'div';
-			$o = '';
-			// Loop through a list of tags
+        case "htmltag":
+            $value = parseInput($value, "||", "array");
+            $tagid = $params['tagid'];
+            $tagname = ($params['tagname']) ? $params['tagname'] : 'div';
+            $o = '';
+            // Loop through a list of tags
             $countValue = count($value);
-			for($i = 0; $i < $countValue; $i++) {
-				$tagvalue = is_array($value[$i]) ? implode(' ', $value[$i]) : $value[$i];
-				if(!$tagvalue) {
-					continue;
-				}
+            for($i = 0; $i < $countValue; $i++) {
+                $tagvalue = is_array($value[$i]) ? implode(' ', $value[$i]) : $value[$i];
+                if(!$tagvalue) {
+                    continue;
+                }
 
-				$attributes = '';
-				$attr = array(
-					'id' => ($tagid ? $tagid : $id),
-					// 'tv' already added to id
-					'class' => $params['class'],
-					'style' => $params['style'],
-				);
-				foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-				$attributes .= ' ' . $params['attrib']; // add extra
+                $attributes = '';
+                $attr = array(
+                    'id' => ($tagid ? $tagid : $id),
+                    // 'tv' already added to id
+                    'class' => $params['class'],
+                    'style' => $params['style'],
+                );
+                foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+                $attributes .= ' ' . $params['attrib']; // add extra
 
-				// Output the HTML Tag
-				$o .= '<' . $tagname . rtrim($attributes) . '>' . $tagvalue . '</' . $tagname . '>';
-			}
-			break;
+                // Output the HTML Tag
+                $o .= '<' . $tagname . rtrim($attributes) . '>' . $tagvalue . '</' . $tagname . '>';
+            }
+            break;
 
-		case "richtext":
-			$value = parseInput($value);
-			$w = $params['w'] ? $params['w'] : '100%';
-			$h = $params['h'] ? $params['h'] : '400px';
-			$richtexteditor = $params['edt'] ? $params['edt'] : "";
-			$o = '<div class="MODX_RichTextWidget"><textarea id="' . $id . '" name="' . $id . '" style="width:' . $w . '; height:' . $h . ';">';
-			$o .= $modx->htmlspecialchars($value);
-			$o .= '</textarea></div>';
-			$replace_richtext = array($id);
-			// setup editors
-			if(!empty($replace_richtext) && !empty($richtexteditor)) {
-				// invoke OnRichTextEditorInit event
-				$evtOut = $modx->invokeEvent("OnRichTextEditorInit", array(
-					'editor' => $richtexteditor,
-					'elements' => $replace_richtext,
-					'forfrontend' => 1,
-					'width' => $w,
-					'height' => $h
-				));
-				if(is_array($evtOut)) {
-					$o .= implode("", $evtOut);
-				}
-			}
-			break;
+        case "richtext":
+            $value = parseInput($value);
+            $w = $params['w'] ? $params['w'] : '100%';
+            $h = $params['h'] ? $params['h'] : '400px';
+            $richtexteditor = $params['edt'] ? $params['edt'] : "";
+            $o = '<div class="MODX_RichTextWidget"><textarea id="' . $id . '" name="' . $id . '" style="width:' . $w . '; height:' . $h . ';">';
+            $o .= $modx->htmlspecialchars($value);
+            $o .= '</textarea></div>';
+            $replace_richtext = array($id);
+            // setup editors
+            if(!empty($replace_richtext) && !empty($richtexteditor)) {
+                // invoke OnRichTextEditorInit event
+                $evtOut = $modx->invokeEvent("OnRichTextEditorInit", array(
+                    'editor' => $richtexteditor,
+                    'elements' => $replace_richtext,
+                    'forfrontend' => 1,
+                    'width' => $w,
+                    'height' => $h
+                ));
+                if(is_array($evtOut)) {
+                    $o .= implode("", $evtOut);
+                }
+            }
+            break;
 
-		case "unixtime":
-			$value = parseInput($value);
-			$o = getUnixtimeFromDateString($value);
-			break;
+        case "unixtime":
+            $value = parseInput($value);
+            $o = getUnixtimeFromDateString($value);
+            break;
 
-		case "viewport":
-			$value = parseInput($value);
-			$id = '_' . time();
-			if(!$params['vpid']) {
-				$params['vpid'] = $id;
-			}
-			$sTag = "<iframe";
-			$eTag = "</iframe>";
-			$autoMode = "0";
-			$w = $params['width'];
-			$h = $params['height'];
-			if($params['stretch'] == 'Yes') {
-				$w = "100%";
-				$h = "100%";
-			}
-			if($params['asize'] == 'Yes' || ($params['awidth'] == 'Yes' && $params['aheight'] == 'Yes')) {
-				$autoMode = "3";  //both
-			} else if($params['awidth'] == 'Yes') {
-				$autoMode = "1"; //width only
-			} else if($params['aheight'] == 'Yes') {
-				$autoMode = "2";    //height only
-			}
+        case "viewport":
+            $value = parseInput($value);
+            $id = '_' . time();
+            if(!$params['vpid']) {
+                $params['vpid'] = $id;
+            }
+            $sTag = "<iframe";
+            $eTag = "</iframe>";
+            $autoMode = "0";
+            $w = $params['width'];
+            $h = $params['height'];
+            if($params['stretch'] == 'Yes') {
+                $w = "100%";
+                $h = "100%";
+            }
+            if($params['asize'] == 'Yes' || ($params['awidth'] == 'Yes' && $params['aheight'] == 'Yes')) {
+                $autoMode = "3";  //both
+            } else if($params['awidth'] == 'Yes') {
+                $autoMode = "1"; //width only
+            } else if($params['aheight'] == 'Yes') {
+                $autoMode = "2";    //height only
+            }
 
-			$modx->regClientStartupScript(MODX_MANAGER_URL . "media/script/bin/viewport.js", array(
-				'name' => 'viewport',
-				'version' => '0',
-				'plaintext' => false
-			));
-			$o = $sTag . " id='" . $params['vpid'] . "' name='" . $params['vpid'] . "' ";
-			if($params['class']) {
-				$o .= " class='" . $params['class'] . "' ";
-			}
-			if($params['style']) {
-				$o .= " style='" . $params['style'] . "' ";
-			}
-			if($params['attrib']) {
-				$o .= $params['attrib'] . " ";
-			}
-			$o .= "scrolling='" . ($params['sbar'] == 'No' ? "no" : ($params['sbar'] == 'Yes' ? "yes" : "auto")) . "' ";
-			$o .= "src='" . $value . "' frameborder='" . $params['borsize'] . "' ";
-			$o .= "onload=\"window.setTimeout('ResizeViewPort(\\'" . $params['vpid'] . "\\'," . $autoMode . ")',100);\" width='" . $w . "' height='" . $h . "' ";
-			$o .= ">";
-			$o .= $eTag;
-			break;
+            $modx->regClientStartupScript(MODX_MANAGER_URL . "media/script/bin/viewport.js", array(
+                'name' => 'viewport',
+                'version' => '0',
+                'plaintext' => false
+            ));
+            $o = $sTag . " id='" . $params['vpid'] . "' name='" . $params['vpid'] . "' ";
+            if($params['class']) {
+                $o .= " class='" . $params['class'] . "' ";
+            }
+            if($params['style']) {
+                $o .= " style='" . $params['style'] . "' ";
+            }
+            if($params['attrib']) {
+                $o .= $params['attrib'] . " ";
+            }
+            $o .= "scrolling='" . ($params['sbar'] == 'No' ? "no" : ($params['sbar'] == 'Yes' ? "yes" : "auto")) . "' ";
+            $o .= "src='" . $value . "' frameborder='" . $params['borsize'] . "' ";
+            $o .= "onload=\"window.setTimeout('ResizeViewPort(\\'" . $params['vpid'] . "\\'," . $autoMode . ")',100);\" width='" . $w . "' height='" . $h . "' ";
+            $o .= ">";
+            $o .= $eTag;
+            break;
 
-		case "datagrid":
-			include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
-			$grd = new DataGrid('', $value);
+        case "datagrid":
+            include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+            $grd = new DataGrid('', $value);
 
-			$grd->noRecordMsg = $params['egmsg'];
+            $grd->noRecordMsg = $params['egmsg'];
 
-			$grd->columnHeaderClass = $params['chdrc'];
-			$grd->cssClass = $params['tblc'];
-			$grd->itemClass = $params['itmc'];
-			$grd->altItemClass = $params['aitmc'];
+            $grd->columnHeaderClass = $params['chdrc'];
+            $grd->cssClass = $params['tblc'];
+            $grd->itemClass = $params['itmc'];
+            $grd->altItemClass = $params['aitmc'];
 
-			$grd->columnHeaderStyle = $params['chdrs'];
-			$grd->cssStyle = $params['tbls'];
-			$grd->itemStyle = $params['itms'];
-			$grd->altItemStyle = $params['aitms'];
+            $grd->columnHeaderStyle = $params['chdrs'];
+            $grd->cssStyle = $params['tbls'];
+            $grd->itemStyle = $params['itms'];
+            $grd->altItemStyle = $params['aitms'];
 
-			$grd->columns = $params['cols'];
-			$grd->fields = $params['flds'];
-			$grd->colWidths = $params['cwidth'];
-			$grd->colAligns = $params['calign'];
-			$grd->colColors = $params['ccolor'];
-			$grd->colTypes = $params['ctype'];
+            $grd->columns = $params['cols'];
+            $grd->fields = $params['flds'];
+            $grd->colWidths = $params['cwidth'];
+            $grd->colAligns = $params['calign'];
+            $grd->colColors = $params['ccolor'];
+            $grd->colTypes = $params['ctype'];
 
-			$grd->cellPadding = $params['cpad'];
-			$grd->cellSpacing = $params['cspace'];
-			$grd->header = $params['head'];
-			$grd->footer = $params['foot'];
-			$grd->pageSize = $params['psize'];
-			$grd->pagerLocation = $params['ploc'];
-			$grd->pagerClass = $params['pclass'];
-			$grd->pagerStyle = $params['pstyle'];
-			$o = $grd->render();
-			break;
+            $grd->cellPadding = $params['cpad'];
+            $grd->cellSpacing = $params['cspace'];
+            $grd->header = $params['head'];
+            $grd->footer = $params['foot'];
+            $grd->pageSize = $params['psize'];
+            $grd->pagerLocation = $params['ploc'];
+            $grd->pagerClass = $params['pclass'];
+            $grd->pagerStyle = $params['pstyle'];
+            $o = $grd->render();
+            break;
 
-		case 'htmlentities':
-			$value = parseInput($value);
-			if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
-				// remove delimiter from checkbox and listbox-multiple TVs
-				$value = str_replace('||', '', $value);
-			}
-			$o = htmlentities($value, ENT_NOQUOTES, $modx->config['modx_charset']);
-			break;
+        case 'htmlentities':
+            $value = parseInput($value);
+            if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
+                // remove delimiter from checkbox and listbox-multiple TVs
+                $value = str_replace('||', '', $value);
+            }
+            $o = htmlentities($value, ENT_NOQUOTES, $modx->config['modx_charset']);
+            break;
 
-		case 'custom_widget':
-			$widget_output = '';
-			$o = '';
-			/* If we are loading a file */
-			if(substr($params['output'], 0, 5) == "@FILE") {
-				$file_name = MODX_BASE_PATH . trim(substr($params['output'], 6));
-				if(!file_exists($file_name)) {
-					$widget_output = $file_name . ' does not exist';
-				} else {
-					$widget_output = file_get_contents($file_name);
-				}
-			} elseif(substr($params['output'], 0, 8) == '@INCLUDE') {
-				$file_name = MODX_BASE_PATH . trim(substr($params['output'], 9));
-				if(!file_exists($file_name)) {
-					$widget_output = $file_name . ' does not exist';
-				} else {
-					/* The included file needs to set $widget_output. Can be string, array, object */
-					include $file_name;
-				}
-			} elseif(substr($params['output'], 0, 6) == '@CHUNK' && $value !== '') {
-				$chunk_name = trim(substr($params['output'], 7));
-				$widget_output = $modx->getChunk($chunk_name);
-			} elseif(substr($params['output'], 0, 5) == '@EVAL' && $value !== '') {
-				$eval_str = trim(substr($params['output'], 6));
-				$widget_output = eval($eval_str);
-			} elseif($value !== '') {
-				$widget_output = $params['output'];
-			} else {
-				$widget_output = '';
-			}
-			if(is_string($widget_output)) {
-				$_ = $modx->config['enable_filter'];
-				$modx->config['enable_filter'] = 1;
-				$widget_output = $modx->parseText($widget_output, array('value' => $value));
-				$modx->config['enable_filter'] = $_;
-				$o = $modx->parseDocumentSource($widget_output);
-			} else {
-				$o = $widget_output;
-			}
-			break;
+        case 'custom_widget':
+            $widget_output = '';
+            $o = '';
+            /* If we are loading a file */
+            if(substr($params['output'], 0, 5) == "@FILE") {
+                $file_name = MODX_BASE_PATH . trim(substr($params['output'], 6));
+                if(!file_exists($file_name)) {
+                    $widget_output = $file_name . ' does not exist';
+                } else {
+                    $widget_output = file_get_contents($file_name);
+                }
+            } elseif(substr($params['output'], 0, 8) == '@INCLUDE') {
+                $file_name = MODX_BASE_PATH . trim(substr($params['output'], 9));
+                if(!file_exists($file_name)) {
+                    $widget_output = $file_name . ' does not exist';
+                } else {
+                    /* The included file needs to set $widget_output. Can be string, array, object */
+                    include $file_name;
+                }
+            } elseif(substr($params['output'], 0, 6) == '@CHUNK' && $value !== '') {
+                $chunk_name = trim(substr($params['output'], 7));
+                $widget_output = $modx->getChunk($chunk_name);
+            } elseif(substr($params['output'], 0, 5) == '@EVAL' && $value !== '') {
+                $eval_str = trim(substr($params['output'], 6));
+                $widget_output = eval($eval_str);
+            } elseif($value !== '') {
+                $widget_output = $params['output'];
+            } else {
+                $widget_output = '';
+            }
+            if(is_string($widget_output)) {
+                $_ = $modx->config['enable_filter'];
+                $modx->config['enable_filter'] = 1;
+                $widget_output = $modx->parseText($widget_output, array('value' => $value));
+                $modx->config['enable_filter'] = $_;
+                $o = $modx->parseDocumentSource($widget_output);
+            } else {
+                $o = $widget_output;
+            }
+            break;
 
-		default:
-			$value = parseInput($value);
-			if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
-				// add separator
-				$value = explode('||', $value);
-				$value = implode($sep, $value);
-			}
-			$o = $value;
-			break;
-	}
-	return $o;
+        default:
+            $value = parseInput($value);
+            if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
+                // add separator
+                $value = explode('||', $value);
+                $value = implode($sep, $value);
+            }
+            $o = $value;
+            break;
+    }
+    return $o;
 }
 
 /**
@@ -342,8 +342,8 @@ 
  * @return string
  */
 function decodeParamValue($s) {
-	$s = str_replace("%3D", '=', $s); // =
-	return str_replace("%26", '&', $s); // &
+    $s = str_replace("%3D", '=', $s); // =
+    return str_replace("%26", '&', $s); // &
 }
 
 /**
@@ -357,19 +357,19 @@ 
  */
 function parseInput($src, $delim = "||", $type = "string", $columns = true) { // type can be: string, array
     $modx = DocumentParser::getInstance();
-	if($modx->db->isResult($src)) {
-		// must be a recordset
-		$rows = array();
-		while($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols);
-		return ($type == "array") ? $rows : implode($delim, $rows);
-	} else {
-		// must be a text
-		if($type == "array") {
-			return explode($delim, $src);
-		} else {
-			return $src;
-		}
-	}
+    if($modx->db->isResult($src)) {
+        // must be a recordset
+        $rows = array();
+        while($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols);
+        return ($type == "array") ? $rows : implode($delim, $rows);
+    } else {
+        // must be a text
+        if($type == "array") {
+            return explode($delim, $src);
+        } else {
+            return $src;
+        }
+    }
 }
 
 /**
@@ -377,21 +377,21 @@ 
  * @return bool|false|int
  */
 function getUnixtimeFromDateString($value) {
-	$timestamp = false;
-	// Check for MySQL or legacy style date
-	$date_match_1 = '/^([0-9]{2})-([0-9]{2})-([0-9]{4})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
-	$date_match_2 = '/^([0-9]{4})-([0-9]{2})-([0-9]{2})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
-	$matches = array();
-	if(strpos($value, '-') !== false) {
-		if(preg_match($date_match_1, $value, $matches)) {
-			$timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[1], $matches[3]);
-		} elseif(preg_match($date_match_2, $value, $matches)) {
-			$timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
-		}
-	}
-	// If those didn't work, use strtotime to figure out the date
-	if($timestamp === false || $timestamp === -1) {
-		$timestamp = strtotime($value);
-	}
-	return $timestamp;
+    $timestamp = false;
+    // Check for MySQL or legacy style date
+    $date_match_1 = '/^([0-9]{2})-([0-9]{2})-([0-9]{4})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
+    $date_match_2 = '/^([0-9]{4})-([0-9]{2})-([0-9]{2})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
+    $matches = array();
+    if(strpos($value, '-') !== false) {
+        if(preg_match($date_match_1, $value, $matches)) {
+            $timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[1], $matches[3]);
+        } elseif(preg_match($date_match_2, $value, $matches)) {
+            $timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
+        }
+    }
+    // If those didn't work, use strtotime to figure out the date
+    if($timestamp === false || $timestamp === -1) {
+        $timestamp = strtotime($value);
+    }
+    return $timestamp;
 }

Spacing +79 added lines, -79 removed lines

@@ -15,38 +15,38 @@ 
  * @param string $sep
  * @return mixed|string
  */
-function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = "", $docid = "", $sep = '') {
+function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = "", $docid = "", $sep = ''){
 
     $modx = DocumentParser::getInstance();
     $o = '';
 
     // process any TV commands in value
-	$docid = (int)$docid > 0 ? (int)$docid : $modx->documentIdentifier;
+	$docid = (int) $docid > 0 ? (int) $docid : $modx->documentIdentifier;
 	$value = ProcessTVCommand($value, $name, $docid);
 
 	$params = array();
-	if($paramstring) {
+	if ($paramstring) {
 		$cp = explode("&", $paramstring);
-		foreach($cp as $p => $v) {
+		foreach ($cp as $p => $v) {
 			$v = trim($v); // trim
 			$ar = explode("=", $v);
-			if(is_array($ar) && count($ar) == 2) {
+			if (is_array($ar) && count($ar) == 2) {
 				$params[$ar[0]] = decodeParamValue($ar[1]);
 			}
 		}
 	}
 
 	$id = "tv$name";
-	switch($format) {
+	switch ($format) {
 		case 'image':
 			$images = parseInput($value, '||', 'array');
-			foreach($images as $image) {
-				if(!is_array($image)) {
+			foreach ($images as $image) {
+				if (!is_array($image)) {
 					$image = explode('==', $image);
 				}
 				$src = $image[0];
 
-				if($src) {
+				if ($src) {
 					// We have a valid source
 					$attributes = '';
 					$attr = array(
@@ -56,14 +56,14 @@ 
 						'alt' => $modx->htmlspecialchars($params['alttext']),
 						'style' => $params['style']
 					);
-					if(isset($params['align']) && $params['align'] != 'none') {
+					if (isset($params['align']) && $params['align'] != 'none') {
 						$attr['align'] = $params['align'];
 					}
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-					$attributes .= ' ' . $params['attrib'];
+					foreach ($attr as $k => $v) $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
+					$attributes .= ' '.$params['attrib'];
 
 					// Output the image with attributes
-					$o .= '<img' . rtrim($attributes) . ' />';
+					$o .= '<img'.rtrim($attributes).' />';
 				}
 			}
 			break;
@@ -71,7 +71,7 @@ 
 		case "delim":    // display as delimitted list
 			$value = parseInput($value, "||");
 			$p = $params['format'] ? $params['format'] : " ";
-			if($p == "\\n") {
+			if ($p == "\\n") {
 				$p = "\n";
 			}
 			$o = str_replace("||", $p, $value);
@@ -80,13 +80,13 @@ 
 		case "string":
 			$value = parseInput($value);
 			$format = strtolower($params['format']);
-			if($format == 'upper case') {
+			if ($format == 'upper case') {
 				$o = strtoupper($value);
-			} else if($format == 'lower case') {
+			} else if ($format == 'lower case') {
 				$o = strtolower($value);
-			} else if($format == 'sentence case') {
+			} else if ($format == 'sentence case') {
 				$o = ucfirst($value);
-			} else if($format == 'capitalize') {
+			} else if ($format == 'capitalize') {
 				$o = ucwords($value);
 			} else {
 				$o = $value;
@@ -94,8 +94,8 @@ 
 			break;
 
 		case "date":
-			if($value != '' || $params['default'] == 'Yes') {
-				if(empty($value)) {
+			if ($value != '' || $params['default'] == 'Yes') {
+				if (empty($value)) {
 					$value = 'now';
 				}
 				$timestamp = getUnixtimeFromDateString($value);
@@ -110,13 +110,13 @@ 
 			$value = parseInput($value, "||", "array");
 			$o = '';
 			$countValue = count($value);
-			for($i = 0; $i < $countValue; $i++) {
+			for ($i = 0; $i < $countValue; $i++) {
 				list($name, $url) = is_array($value[$i]) ? $value[$i] : explode("==", $value[$i]);
-				if(!$url) {
+				if (!$url) {
 					$url = $name;
 				}
-				if($url) {
-					if($o) {
+				if ($url) {
+					if ($o) {
 						$o .= '<br />';
 					}
 					$attributes = '';
@@ -128,11 +128,11 @@ 
 						'style' => $params['style'],
 						'target' => $params['target'],
 					);
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-					$attributes .= ' ' . $params['attrib']; // add extra
+					foreach ($attr as $k => $v) $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
+					$attributes .= ' '.$params['attrib']; // add extra
 
 					// Output the link
-					$o .= '<a' . rtrim($attributes) . '>' . ($params['text'] ? $modx->htmlspecialchars($params['text']) : $name) . '</a>';
+					$o .= '<a'.rtrim($attributes).'>'.($params['text'] ? $modx->htmlspecialchars($params['text']) : $name).'</a>';
 				}
 			}
 			break;
@@ -144,9 +144,9 @@ 
 			$o = '';
 			// Loop through a list of tags
             $countValue = count($value);
-			for($i = 0; $i < $countValue; $i++) {
+			for ($i = 0; $i < $countValue; $i++) {
 				$tagvalue = is_array($value[$i]) ? implode(' ', $value[$i]) : $value[$i];
-				if(!$tagvalue) {
+				if (!$tagvalue) {
 					continue;
 				}
 
@@ -157,11 +157,11 @@ 
 					'class' => $params['class'],
 					'style' => $params['style'],
 				);
-				foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-				$attributes .= ' ' . $params['attrib']; // add extra
+				foreach ($attr as $k => $v) $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
+				$attributes .= ' '.$params['attrib']; // add extra
 
 				// Output the HTML Tag
-				$o .= '<' . $tagname . rtrim($attributes) . '>' . $tagvalue . '</' . $tagname . '>';
+				$o .= '<'.$tagname.rtrim($attributes).'>'.$tagvalue.'</'.$tagname.'>';
 			}
 			break;
 
@@ -170,12 +170,12 @@ 
 			$w = $params['w'] ? $params['w'] : '100%';
 			$h = $params['h'] ? $params['h'] : '400px';
 			$richtexteditor = $params['edt'] ? $params['edt'] : "";
-			$o = '<div class="MODX_RichTextWidget"><textarea id="' . $id . '" name="' . $id . '" style="width:' . $w . '; height:' . $h . ';">';
+			$o = '<div class="MODX_RichTextWidget"><textarea id="'.$id.'" name="'.$id.'" style="width:'.$w.'; height:'.$h.';">';
 			$o .= $modx->htmlspecialchars($value);
 			$o .= '</textarea></div>';
 			$replace_richtext = array($id);
 			// setup editors
-			if(!empty($replace_richtext) && !empty($richtexteditor)) {
+			if (!empty($replace_richtext) && !empty($richtexteditor)) {
 				// invoke OnRichTextEditorInit event
 				$evtOut = $modx->invokeEvent("OnRichTextEditorInit", array(
 					'editor' => $richtexteditor,
@@ -184,7 +184,7 @@ 
 					'width' => $w,
 					'height' => $h
 				));
-				if(is_array($evtOut)) {
+				if (is_array($evtOut)) {
 					$o .= implode("", $evtOut);
 				}
 			}
@@ -197,8 +197,8 @@ 
 
 		case "viewport":
 			$value = parseInput($value);
-			$id = '_' . time();
-			if(!$params['vpid']) {
+			$id = '_'.time();
+			if (!$params['vpid']) {
 				$params['vpid'] = $id;
 			}
 			$sTag = "<iframe";
@@ -206,42 +206,42 @@ 
 			$autoMode = "0";
 			$w = $params['width'];
 			$h = $params['height'];
-			if($params['stretch'] == 'Yes') {
+			if ($params['stretch'] == 'Yes') {
 				$w = "100%";
 				$h = "100%";
 			}
-			if($params['asize'] == 'Yes' || ($params['awidth'] == 'Yes' && $params['aheight'] == 'Yes')) {
-				$autoMode = "3";  //both
-			} else if($params['awidth'] == 'Yes') {
+			if ($params['asize'] == 'Yes' || ($params['awidth'] == 'Yes' && $params['aheight'] == 'Yes')) {
+				$autoMode = "3"; //both
+			} else if ($params['awidth'] == 'Yes') {
 				$autoMode = "1"; //width only
-			} else if($params['aheight'] == 'Yes') {
-				$autoMode = "2";    //height only
+			} else if ($params['aheight'] == 'Yes') {
+				$autoMode = "2"; //height only
 			}
 
-			$modx->regClientStartupScript(MODX_MANAGER_URL . "media/script/bin/viewport.js", array(
+			$modx->regClientStartupScript(MODX_MANAGER_URL."media/script/bin/viewport.js", array(
 				'name' => 'viewport',
 				'version' => '0',
 				'plaintext' => false
 			));
-			$o = $sTag . " id='" . $params['vpid'] . "' name='" . $params['vpid'] . "' ";
-			if($params['class']) {
-				$o .= " class='" . $params['class'] . "' ";
+			$o = $sTag." id='".$params['vpid']."' name='".$params['vpid']."' ";
+			if ($params['class']) {
+				$o .= " class='".$params['class']."' ";
 			}
-			if($params['style']) {
-				$o .= " style='" . $params['style'] . "' ";
+			if ($params['style']) {
+				$o .= " style='".$params['style']."' ";
 			}
-			if($params['attrib']) {
-				$o .= $params['attrib'] . " ";
+			if ($params['attrib']) {
+				$o .= $params['attrib']." ";
 			}
-			$o .= "scrolling='" . ($params['sbar'] == 'No' ? "no" : ($params['sbar'] == 'Yes' ? "yes" : "auto")) . "' ";
-			$o .= "src='" . $value . "' frameborder='" . $params['borsize'] . "' ";
-			$o .= "onload=\"window.setTimeout('ResizeViewPort(\\'" . $params['vpid'] . "\\'," . $autoMode . ")',100);\" width='" . $w . "' height='" . $h . "' ";
+			$o .= "scrolling='".($params['sbar'] == 'No' ? "no" : ($params['sbar'] == 'Yes' ? "yes" : "auto"))."' ";
+			$o .= "src='".$value."' frameborder='".$params['borsize']."' ";
+			$o .= "onload=\"window.setTimeout('ResizeViewPort(\\'".$params['vpid']."\\',".$autoMode.")',100);\" width='".$w."' height='".$h."' ";
 			$o .= ">";
 			$o .= $eTag;
 			break;
 
 		case "datagrid":
-			include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+			include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";
 			$grd = new DataGrid('', $value);
 
 			$grd->noRecordMsg = $params['egmsg'];
@@ -276,7 +276,7 @@ 
 
 		case 'htmlentities':
 			$value = parseInput($value);
-			if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
+			if ($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
 				// remove delimiter from checkbox and listbox-multiple TVs
 				$value = str_replace('||', '', $value);
 			}
@@ -287,33 +287,33 @@ 
 			$widget_output = '';
 			$o = '';
 			/* If we are loading a file */
-			if(substr($params['output'], 0, 5) == "@FILE") {
-				$file_name = MODX_BASE_PATH . trim(substr($params['output'], 6));
-				if(!file_exists($file_name)) {
-					$widget_output = $file_name . ' does not exist';
+			if (substr($params['output'], 0, 5) == "@FILE") {
+				$file_name = MODX_BASE_PATH.trim(substr($params['output'], 6));
+				if (!file_exists($file_name)) {
+					$widget_output = $file_name.' does not exist';
 				} else {
 					$widget_output = file_get_contents($file_name);
 				}
-			} elseif(substr($params['output'], 0, 8) == '@INCLUDE') {
-				$file_name = MODX_BASE_PATH . trim(substr($params['output'], 9));
-				if(!file_exists($file_name)) {
-					$widget_output = $file_name . ' does not exist';
+			} elseif (substr($params['output'], 0, 8) == '@INCLUDE') {
+				$file_name = MODX_BASE_PATH.trim(substr($params['output'], 9));
+				if (!file_exists($file_name)) {
+					$widget_output = $file_name.' does not exist';
 				} else {
 					/* The included file needs to set $widget_output. Can be string, array, object */
 					include $file_name;
 				}
-			} elseif(substr($params['output'], 0, 6) == '@CHUNK' && $value !== '') {
+			} elseif (substr($params['output'], 0, 6) == '@CHUNK' && $value !== '') {
 				$chunk_name = trim(substr($params['output'], 7));
 				$widget_output = $modx->getChunk($chunk_name);
-			} elseif(substr($params['output'], 0, 5) == '@EVAL' && $value !== '') {
+			} elseif (substr($params['output'], 0, 5) == '@EVAL' && $value !== '') {
 				$eval_str = trim(substr($params['output'], 6));
 				$widget_output = eval($eval_str);
-			} elseif($value !== '') {
+			} elseif ($value !== '') {
 				$widget_output = $params['output'];
 			} else {
 				$widget_output = '';
 			}
-			if(is_string($widget_output)) {
+			if (is_string($widget_output)) {
 				$_ = $modx->config['enable_filter'];
 				$modx->config['enable_filter'] = 1;
 				$widget_output = $modx->parseText($widget_output, array('value' => $value));
@@ -326,7 +326,7 @@ 
 
 		default:
 			$value = parseInput($value);
-			if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
+			if ($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
 				// add separator
 				$value = explode('||', $value);
 				$value = implode($sep, $value);
@@ -341,7 +341,7 @@ 
  * @param string $s
  * @return string
  */
-function decodeParamValue($s) {
+function decodeParamValue($s){
 	$s = str_replace("%3D", '=', $s); // =
 	return str_replace("%26", '&', $s); // &
 }
@@ -355,16 +355,16 @@ 
  * @param bool $columns
  * @return array|string
  */
-function parseInput($src, $delim = "||", $type = "string", $columns = true) { // type can be: string, array
+function parseInput($src, $delim = "||", $type = "string", $columns = true){ // type can be: string, array
     $modx = DocumentParser::getInstance();
-	if($modx->db->isResult($src)) {
+	if ($modx->db->isResult($src)) {
 		// must be a recordset
 		$rows = array();
-		while($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols);
+		while ($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols);
 		return ($type == "array") ? $rows : implode($delim, $rows);
 	} else {
 		// must be a text
-		if($type == "array") {
+		if ($type == "array") {
 			return explode($delim, $src);
 		} else {
 			return $src;
@@ -376,21 +376,21 @@ 
  * @param string $value
  * @return bool|false|int
  */
-function getUnixtimeFromDateString($value) {
+function getUnixtimeFromDateString($value){
 	$timestamp = false;
 	// Check for MySQL or legacy style date
 	$date_match_1 = '/^([0-9]{2})-([0-9]{2})-([0-9]{4})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
 	$date_match_2 = '/^([0-9]{4})-([0-9]{2})-([0-9]{2})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
 	$matches = array();
-	if(strpos($value, '-') !== false) {
-		if(preg_match($date_match_1, $value, $matches)) {
+	if (strpos($value, '-') !== false) {
+		if (preg_match($date_match_1, $value, $matches)) {
 			$timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[1], $matches[3]);
-		} elseif(preg_match($date_match_2, $value, $matches)) {
+		} elseif (preg_match($date_match_2, $value, $matches)) {
 			$timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
 		}
 	}
 	// If those didn't work, use strtotime to figure out the date
-	if($timestamp === false || $timestamp === -1) {
+	if ($timestamp === false || $timestamp === -1) {
 		$timestamp = strtotime($value);
 	}
 	return $timestamp;

Braces +21 added lines, -8 removed lines

@@ -15,7 +15,8 @@ 
  * @param string $sep
  * @return mixed|string
  */
-function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = "", $docid = "", $sep = '') {
+function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = "", $docid = "", $sep = '')
+{
 
     $modx = DocumentParser::getInstance();
     $o = '';
@@ -59,7 +60,9 @@ 
 					if(isset($params['align']) && $params['align'] != 'none') {
 						$attr['align'] = $params['align'];
 					}
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+					foreach($attr as $k => $v) {
+					    $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+					}
 					$attributes .= ' ' . $params['attrib'];
 
 					// Output the image with attributes
@@ -128,7 +131,9 @@ 
 						'style' => $params['style'],
 						'target' => $params['target'],
 					);
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+					foreach($attr as $k => $v) {
+					    $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+					}
 					$attributes .= ' ' . $params['attrib']; // add extra
 
 					// Output the link
@@ -157,7 +162,9 @@ 
 					'class' => $params['class'],
 					'style' => $params['style'],
 				);
-				foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+				foreach($attr as $k => $v) {
+				    $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+				}
 				$attributes .= ' ' . $params['attrib']; // add extra
 
 				// Output the HTML Tag
@@ -341,7 +348,8 @@ 
  * @param string $s
  * @return string
  */
-function decodeParamValue($s) {
+function decodeParamValue($s)
+{
 	$s = str_replace("%3D", '=', $s); // =
 	return str_replace("%26", '&', $s); // &
 }
@@ -355,12 +363,16 @@ 
  * @param bool $columns
  * @return array|string
  */
-function parseInput($src, $delim = "||", $type = "string", $columns = true) { // type can be: string, array
+function parseInput($src, $delim = "||", $type = "string", $columns = true)
+{
+// type can be: string, array
     $modx = DocumentParser::getInstance();
 	if($modx->db->isResult($src)) {
 		// must be a recordset
 		$rows = array();
-		while($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols);
+		while($cols = $modx->db->getRow($src, 'num')) {
+		    $rows[] = ($columns) ? $cols : implode(" ", $cols);
+		}
 		return ($type == "array") ? $rows : implode($delim, $rows);
 	} else {
 		// must be a text
@@ -376,7 +388,8 @@ 
  * @param string $value
  * @return bool|false|int
  */
-function getUnixtimeFromDateString($value) {
+function getUnixtimeFromDateString($value)
+{
 	$timestamp = false;
 	// Check for MySQL or legacy style date
 	$date_match_1 = '/^([0-9]{2})-([0-9]{2})-([0-9]{4})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';

manager/includes/tmplvars.inc.php

Indentation +248 added lines, -248 removed lines

@@ -14,158 +14,158 @@ 
  */
 function renderFormElement($field_type, $field_id, $default_text = '', $field_elements = '', $field_value = '', $field_style = '', $row = array(), $tvsArray = array()) {
     $modx = DocumentParser::getInstance();
-	global $_style;
-	global $_lang;
-	global $content;
-	global $which_browser;
+    global $_style;
+    global $_lang;
+    global $content;
+    global $which_browser;
 
-	if(substr($default_text, 0, 6) === '@@EVAL' && $field_value === $default_text) {
-		$eval_str = trim(substr($default_text, 7));
-		$default_text = eval($eval_str);
-		$field_value = $default_text;
-	}
+    if(substr($default_text, 0, 6) === '@@EVAL' && $field_value === $default_text) {
+        $eval_str = trim(substr($default_text, 7));
+        $default_text = eval($eval_str);
+        $field_value = $default_text;
+    }
 
-	$field_html = '';
-	$cimode = strpos($field_type, ':');
-	if($cimode === false) {
-		switch($field_type) {
+    $field_html = '';
+    $cimode = strpos($field_type, ':');
+    if($cimode === false) {
+        switch($field_type) {
 
-			case "text": // handler for regular text boxes
-			case "rawtext"; // non-htmlentity converted text boxes
-				$field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%" />';
-				break;
-			case "email": // handles email input fields
-				$field_html .= '<input type="email" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%"/>';
-				break;
-			case "number": // handles the input of numbers
-				$field_html .= '<input type="number" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%" onkeyup="this.value=this.value.replace(/[^\d-,.+]/,\'\')"/>';
-				break;
-			case "textareamini": // handler for textarea mini boxes
-				$field_html .= '<textarea id="tv' . $field_id . '" name="tv' . $field_id . '" cols="40" rows="5" onchange="documentDirty=true;" style="width:100%">' . $modx->htmlspecialchars($field_value) . '</textarea>';
-				break;
-			case "textarea": // handler for textarea boxes
-			case "rawtextarea": // non-htmlentity convertex textarea boxes
-			case "htmlarea": // handler for textarea boxes (deprecated)
-			case "richtext": // handler for textarea boxes
-				$field_html .= '<textarea id="tv' . $field_id . '" name="tv' . $field_id . '" cols="40" rows="15" onchange="documentDirty=true;" style="width:100%">' . $modx->htmlspecialchars($field_value) . '</textarea>';
-				break;
-			case "date":
-				$field_id = str_replace(array(
-					'-',
-					'.'
-				), '_', urldecode($field_id));
-				if($field_value == '') {
-					$field_value = 0;
-				}
-				$field_html .= '<input id="tv' . $field_id . '" name="tv' . $field_id . '" class="DatePicker" type="text" value="' . ($field_value == 0 || !isset($field_value) ? "" : $field_value) . '" onblur="documentDirty=true;" />';
-				$field_html .= ' <a onclick="document.forms[\'mutate\'].elements[\'tv' . $field_id . '\'].value=\'\';document.forms[\'mutate\'].elements[\'tv' . $field_id . '\'].onblur(); return true;" onmouseover="window.status=\'clear the date\'; return true;" onmouseout="window.status=\'\'; return true;" style="cursor:pointer; cursor:hand"><i class="' . $_style["actions_calendar_delete"] . '"></i></a>';
+            case "text": // handler for regular text boxes
+            case "rawtext"; // non-htmlentity converted text boxes
+                $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%" />';
+                break;
+            case "email": // handles email input fields
+                $field_html .= '<input type="email" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%"/>';
+                break;
+            case "number": // handles the input of numbers
+                $field_html .= '<input type="number" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%" onkeyup="this.value=this.value.replace(/[^\d-,.+]/,\'\')"/>';
+                break;
+            case "textareamini": // handler for textarea mini boxes
+                $field_html .= '<textarea id="tv' . $field_id . '" name="tv' . $field_id . '" cols="40" rows="5" onchange="documentDirty=true;" style="width:100%">' . $modx->htmlspecialchars($field_value) . '</textarea>';
+                break;
+            case "textarea": // handler for textarea boxes
+            case "rawtextarea": // non-htmlentity convertex textarea boxes
+            case "htmlarea": // handler for textarea boxes (deprecated)
+            case "richtext": // handler for textarea boxes
+                $field_html .= '<textarea id="tv' . $field_id . '" name="tv' . $field_id . '" cols="40" rows="15" onchange="documentDirty=true;" style="width:100%">' . $modx->htmlspecialchars($field_value) . '</textarea>';
+                break;
+            case "date":
+                $field_id = str_replace(array(
+                    '-',
+                    '.'
+                ), '_', urldecode($field_id));
+                if($field_value == '') {
+                    $field_value = 0;
+                }
+                $field_html .= '<input id="tv' . $field_id . '" name="tv' . $field_id . '" class="DatePicker" type="text" value="' . ($field_value == 0 || !isset($field_value) ? "" : $field_value) . '" onblur="documentDirty=true;" />';
+                $field_html .= ' <a onclick="document.forms[\'mutate\'].elements[\'tv' . $field_id . '\'].value=\'\';document.forms[\'mutate\'].elements[\'tv' . $field_id . '\'].onblur(); return true;" onmouseover="window.status=\'clear the date\'; return true;" onmouseout="window.status=\'\'; return true;" style="cursor:pointer; cursor:hand"><i class="' . $_style["actions_calendar_delete"] . '"></i></a>';
 
-				break;
-			case "dropdown": // handler for select boxes
-				$field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" size="1" onchange="documentDirty=true;">';
-				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
-				while(list($item, $itemvalue) = each($index_list)) {
-					list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
-					if(strlen($itemvalue) == 0) {
-						$itemvalue = $item;
-					}
-					$field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
-				}
-				$field_html .= "</select>";
-				break;
-			case "listbox": // handler for select boxes
-				$field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" onchange="documentDirty=true;" size="8">';
-				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
-				while(list($item, $itemvalue) = each($index_list)) {
-					list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
-					if(strlen($itemvalue) == 0) {
-						$itemvalue = $item;
-					}
-					$field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
-				}
-				$field_html .= "</select>";
-				break;
-			case "listbox-multiple": // handler for select boxes where you can choose multiple items
-				$field_value = explode("||", $field_value);
-				$field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '[]" multiple="multiple" onchange="documentDirty=true;" size="8">';
-				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
-				while(list($item, $itemvalue) = each($index_list)) {
-					list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
-					if(strlen($itemvalue) == 0) {
-						$itemvalue = $item;
-					}
-					$field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . (in_array($itemvalue, $field_value) ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
-				}
-				$field_html .= "</select>";
-				break;
-			case "url": // handles url input fields
-				$urls = array(
-					'' => '--',
-					'http://' => 'http://',
-					'https://' => 'https://',
-					'ftp://' => 'ftp://',
-					'mailto:' => 'mailto:'
-				);
-				$field_html = '<table border="0" cellspacing="0" cellpadding="0"><tr><td><select id="tv' . $field_id . '_prefix" name="tv' . $field_id . '_prefix" onchange="documentDirty=true;">';
-				foreach($urls as $k => $v) {
-					if(strpos($field_value, $v) === false) {
-						$field_html .= '<option value="' . $v . '">' . $k . '</option>';
-					} else {
-						$field_value = str_replace($v, '', $field_value);
-						$field_html .= '<option value="' . $v . '" selected="selected">' . $k . '</option>';
-					}
-				}
-				$field_html .= '</select></td><td>';
-				$field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" width="100" ' . $field_style . ' onchange="documentDirty=true;" /></td></tr></table>';
-				break;
-			case 'checkbox': // handles check boxes
-				$values = !is_array($field_value) ? explode('||', $field_value) : $field_value;
-				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
-				$tpl = '<label class="checkbox"><input type="checkbox" value="%s" id="tv_%s" name="tv%s[]" %s onchange="documentDirty=true;" />%s</label><br />';
-				static $i = 0;
-				$_ = array();
-				foreach($index_list as $c => $item) {
-					if(is_array($item)) {
-						$name = trim($item[0]);
-						$value = isset($item[1]) ? $item[1] : $name;
-					} else {
-						$item = trim($item);
-						list($name, $value) = (strpos($item, '==') !== false) ? explode('==', $item, 2) : array(
-							$item,
-							$item
-						);
-					}
-					$checked = in_array($value, $values) ? ' checked="checked"' : '';
-					$param = array(
-						$modx->htmlspecialchars($value),
-						$i,
-						$field_id,
-						$checked,
-						$modx->htmlspecialchars($name)
-					);
-					$_[] = vsprintf($tpl, $param);
-					$i++;
-				}
-				$field_html = implode("\n", $_);
-				break;
-			case "option": // handles radio buttons
-				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
-				static $i = 0;
-				while(list($item, $itemvalue) = each($index_list)) {
-					list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
-					if(strlen($itemvalue) == 0) {
-						$itemvalue = $item;
-					}
-					$field_html .= '<input type="radio" value="' . $modx->htmlspecialchars($itemvalue) . '" id="tv_' . $i . '" name="tv' . $field_id . '" ' . ($itemvalue == $field_value ? 'checked="checked"' : '') . ' onchange="documentDirty=true;" /><label for="tv_' . $i . '" class="radio">' . $item . '</label><br />';
-					$i++;
-				}
-				break;
-			case "image": // handles image fields using htmlarea image manager
-				global $_lang;
-				global $ResourceManagerLoaded;
-				global $content, $use_editor, $which_editor;
-				if(!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) {
-					$field_html .= "
+                break;
+            case "dropdown": // handler for select boxes
+                $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" size="1" onchange="documentDirty=true;">';
+                $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
+                while(list($item, $itemvalue) = each($index_list)) {
+                    list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
+                    if(strlen($itemvalue) == 0) {
+                        $itemvalue = $item;
+                    }
+                    $field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
+                }
+                $field_html .= "</select>";
+                break;
+            case "listbox": // handler for select boxes
+                $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" onchange="documentDirty=true;" size="8">';
+                $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
+                while(list($item, $itemvalue) = each($index_list)) {
+                    list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
+                    if(strlen($itemvalue) == 0) {
+                        $itemvalue = $item;
+                    }
+                    $field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
+                }
+                $field_html .= "</select>";
+                break;
+            case "listbox-multiple": // handler for select boxes where you can choose multiple items
+                $field_value = explode("||", $field_value);
+                $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '[]" multiple="multiple" onchange="documentDirty=true;" size="8">';
+                $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
+                while(list($item, $itemvalue) = each($index_list)) {
+                    list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
+                    if(strlen($itemvalue) == 0) {
+                        $itemvalue = $item;
+                    }
+                    $field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . (in_array($itemvalue, $field_value) ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
+                }
+                $field_html .= "</select>";
+                break;
+            case "url": // handles url input fields
+                $urls = array(
+                    '' => '--',
+                    'http://' => 'http://',
+                    'https://' => 'https://',
+                    'ftp://' => 'ftp://',
+                    'mailto:' => 'mailto:'
+                );
+                $field_html = '<table border="0" cellspacing="0" cellpadding="0"><tr><td><select id="tv' . $field_id . '_prefix" name="tv' . $field_id . '_prefix" onchange="documentDirty=true;">';
+                foreach($urls as $k => $v) {
+                    if(strpos($field_value, $v) === false) {
+                        $field_html .= '<option value="' . $v . '">' . $k . '</option>';
+                    } else {
+                        $field_value = str_replace($v, '', $field_value);
+                        $field_html .= '<option value="' . $v . '" selected="selected">' . $k . '</option>';
+                    }
+                }
+                $field_html .= '</select></td><td>';
+                $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" width="100" ' . $field_style . ' onchange="documentDirty=true;" /></td></tr></table>';
+                break;
+            case 'checkbox': // handles check boxes
+                $values = !is_array($field_value) ? explode('||', $field_value) : $field_value;
+                $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
+                $tpl = '<label class="checkbox"><input type="checkbox" value="%s" id="tv_%s" name="tv%s[]" %s onchange="documentDirty=true;" />%s</label><br />';
+                static $i = 0;
+                $_ = array();
+                foreach($index_list as $c => $item) {
+                    if(is_array($item)) {
+                        $name = trim($item[0]);
+                        $value = isset($item[1]) ? $item[1] : $name;
+                    } else {
+                        $item = trim($item);
+                        list($name, $value) = (strpos($item, '==') !== false) ? explode('==', $item, 2) : array(
+                            $item,
+                            $item
+                        );
+                    }
+                    $checked = in_array($value, $values) ? ' checked="checked"' : '';
+                    $param = array(
+                        $modx->htmlspecialchars($value),
+                        $i,
+                        $field_id,
+                        $checked,
+                        $modx->htmlspecialchars($name)
+                    );
+                    $_[] = vsprintf($tpl, $param);
+                    $i++;
+                }
+                $field_html = implode("\n", $_);
+                break;
+            case "option": // handles radio buttons
+                $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
+                static $i = 0;
+                while(list($item, $itemvalue) = each($index_list)) {
+                    list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
+                    if(strlen($itemvalue) == 0) {
+                        $itemvalue = $item;
+                    }
+                    $field_html .= '<input type="radio" value="' . $modx->htmlspecialchars($itemvalue) . '" id="tv_' . $i . '" name="tv' . $field_id . '" ' . ($itemvalue == $field_value ? 'checked="checked"' : '') . ' onchange="documentDirty=true;" /><label for="tv_' . $i . '" class="radio">' . $item . '</label><br />';
+                    $i++;
+                }
+                break;
+            case "image": // handles image fields using htmlarea image manager
+                global $_lang;
+                global $ResourceManagerLoaded;
+                global $content, $use_editor, $which_editor;
+                if(!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) {
+                    $field_html .= "
 						<script type=\"text/javascript\">
 							/* <![CDATA[ */
 								var lastImageCtrl;
@@ -224,18 +224,18 @@ 
 								}
 							/* ]]> */
 						</script>";
-					$ResourceManagerLoaded = true;
-				}
-				$field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '"  value="' . $field_value . '" ' . $field_style . ' onchange="documentDirty=true;" /><input type="button" value="' . $_lang['insert'] . '" onclick="BrowseServer(\'tv' . $field_id . '\')" />';
-				break;
-			case "file": // handles the input of file uploads
-				/* Modified by Timon for use with resource browser */
-				global $_lang;
-				global $ResourceManagerLoaded;
-				global $content, $use_editor, $which_editor;
-				if(!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) {
-					/* I didn't understand the meaning of the condition above, so I left it untouched ;-) */
-					$field_html .= "
+                    $ResourceManagerLoaded = true;
+                }
+                $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '"  value="' . $field_value . '" ' . $field_style . ' onchange="documentDirty=true;" /><input type="button" value="' . $_lang['insert'] . '" onclick="BrowseServer(\'tv' . $field_id . '\')" />';
+                break;
+            case "file": // handles the input of file uploads
+                /* Modified by Timon for use with resource browser */
+                global $_lang;
+                global $ResourceManagerLoaded;
+                global $content, $use_editor, $which_editor;
+                if(!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) {
+                    /* I didn't understand the meaning of the condition above, so I left it untouched ;-) */
+                    $field_html .= "
 						<script type=\"text/javascript\">
 							/* <![CDATA[ */
 								var lastImageCtrl;
@@ -294,90 +294,90 @@ 
 								}
 							/* ]]> */
 						</script>";
-					$ResourceManagerLoaded = true;
-				}
-				$field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '"  value="' . $field_value . '" ' . $field_style . ' onchange="documentDirty=true;" /><input type="button" value="' . $_lang['insert'] . '" onclick="BrowseFileServer(\'tv' . $field_id . '\')" />';
+                    $ResourceManagerLoaded = true;
+                }
+                $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '"  value="' . $field_value . '" ' . $field_style . ' onchange="documentDirty=true;" /><input type="button" value="' . $_lang['insert'] . '" onclick="BrowseFileServer(\'tv' . $field_id . '\')" />';
 
-				break;
+                break;
 
-			case 'custom_tv':
-				$custom_output = '';
-				/* If we are loading a file */
-				if(substr($field_elements, 0, 5) == "@FILE") {
-					$file_name = MODX_BASE_PATH . trim(substr($field_elements, 6));
-					if(!file_exists($file_name)) {
-						$custom_output = $file_name . ' does not exist';
-					} else {
-						$custom_output = file_get_contents($file_name);
-					}
-				} elseif(substr($field_elements, 0, 8) == '@INCLUDE') {
-					$file_name = MODX_BASE_PATH . trim(substr($field_elements, 9));
-					if(!file_exists($file_name)) {
-						$custom_output = $file_name . ' does not exist';
-					} else {
-						ob_start();
-						include $file_name;
-						$custom_output = ob_get_contents();
-						ob_end_clean();
-					}
-				} elseif(substr($field_elements, 0, 6) == "@CHUNK") {
-					$chunk_name = trim(substr($field_elements, 7));
-					$chunk_body = $modx->getChunk($chunk_name);
-					if($chunk_body == false) {
-						$custom_output = $_lang['chunk_no_exist'] . '(' . $_lang['htmlsnippet_name'] . ':' . $chunk_name . ')';
-					} else {
-						$custom_output = $chunk_body;
-					}
-				} elseif(substr($field_elements, 0, 5) == "@EVAL") {
-					$eval_str = trim(substr($field_elements, 6));
-					$custom_output = eval($eval_str);
-				} else {
-					$custom_output = $field_elements;
-				}
-				$replacements = array(
-					'[+field_type+]' => $field_type,
-					'[+field_id+]' => $field_id,
-					'[+default_text+]' => $default_text,
-					'[+field_value+]' => $modx->htmlspecialchars($field_value),
-					'[+field_style+]' => $field_style,
-				);
-				$custom_output = str_replace(array_keys($replacements), $replacements, $custom_output);
-				$modx->documentObject = $content;
-				$modx->documentIdentifier = $content['id'];
-				$custom_output = $modx->parseDocumentSource($custom_output);
-				$field_html .= $custom_output;
-				break;
+            case 'custom_tv':
+                $custom_output = '';
+                /* If we are loading a file */
+                if(substr($field_elements, 0, 5) == "@FILE") {
+                    $file_name = MODX_BASE_PATH . trim(substr($field_elements, 6));
+                    if(!file_exists($file_name)) {
+                        $custom_output = $file_name . ' does not exist';
+                    } else {
+                        $custom_output = file_get_contents($file_name);
+                    }
+                } elseif(substr($field_elements, 0, 8) == '@INCLUDE') {
+                    $file_name = MODX_BASE_PATH . trim(substr($field_elements, 9));
+                    if(!file_exists($file_name)) {
+                        $custom_output = $file_name . ' does not exist';
+                    } else {
+                        ob_start();
+                        include $file_name;
+                        $custom_output = ob_get_contents();
+                        ob_end_clean();
+                    }
+                } elseif(substr($field_elements, 0, 6) == "@CHUNK") {
+                    $chunk_name = trim(substr($field_elements, 7));
+                    $chunk_body = $modx->getChunk($chunk_name);
+                    if($chunk_body == false) {
+                        $custom_output = $_lang['chunk_no_exist'] . '(' . $_lang['htmlsnippet_name'] . ':' . $chunk_name . ')';
+                    } else {
+                        $custom_output = $chunk_body;
+                    }
+                } elseif(substr($field_elements, 0, 5) == "@EVAL") {
+                    $eval_str = trim(substr($field_elements, 6));
+                    $custom_output = eval($eval_str);
+                } else {
+                    $custom_output = $field_elements;
+                }
+                $replacements = array(
+                    '[+field_type+]' => $field_type,
+                    '[+field_id+]' => $field_id,
+                    '[+default_text+]' => $default_text,
+                    '[+field_value+]' => $modx->htmlspecialchars($field_value),
+                    '[+field_style+]' => $field_style,
+                );
+                $custom_output = str_replace(array_keys($replacements), $replacements, $custom_output);
+                $modx->documentObject = $content;
+                $modx->documentIdentifier = $content['id'];
+                $custom_output = $modx->parseDocumentSource($custom_output);
+                $field_html .= $custom_output;
+                break;
 
-			default: // the default handler -- for errors, mostly
-				$field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' onchange="documentDirty=true;" />';
+            default: // the default handler -- for errors, mostly
+                $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' onchange="documentDirty=true;" />';
 
-		} // end switch statement
-	} else {
-		$custom = explode(":", $field_type);
-		$custom_output = '';
-		$file_name = MODX_BASE_PATH . 'assets/tvs/' . $custom['1'] . '/' . $custom['1'] . '.customtv.php';
-		if(!file_exists($file_name)) {
-			$custom_output = $file_name . ' does not exist';
-		} else {
-			ob_start();
-			include $file_name;
-			$custom_output = ob_get_contents();
-			ob_end_clean();
-		}
-		$replacements = array(
-			'[+field_type+]' => $field_type,
-			'[+field_id+]' => $field_id,
-			'[+default_text+]' => $default_text,
-			'[+field_value+]' => $modx->htmlspecialchars($field_value),
-			'[+field_style+]' => $field_style,
-		);
-		$custom_output = str_replace(array_keys($replacements), $replacements, $custom_output);
-		$modx->documentObject = $content;
-		$custom_output = $modx->parseDocumentSource($custom_output);
-		$field_html .= $custom_output;
-	}
+        } // end switch statement
+    } else {
+        $custom = explode(":", $field_type);
+        $custom_output = '';
+        $file_name = MODX_BASE_PATH . 'assets/tvs/' . $custom['1'] . '/' . $custom['1'] . '.customtv.php';
+        if(!file_exists($file_name)) {
+            $custom_output = $file_name . ' does not exist';
+        } else {
+            ob_start();
+            include $file_name;
+            $custom_output = ob_get_contents();
+            ob_end_clean();
+        }
+        $replacements = array(
+            '[+field_type+]' => $field_type,
+            '[+field_id+]' => $field_id,
+            '[+default_text+]' => $default_text,
+            '[+field_value+]' => $modx->htmlspecialchars($field_value),
+            '[+field_style+]' => $field_style,
+        );
+        $custom_output = str_replace(array_keys($replacements), $replacements, $custom_output);
+        $modx->documentObject = $content;
+        $custom_output = $modx->parseDocumentSource($custom_output);
+        $field_html .= $custom_output;
+    }
 
-	return $field_html;
+    return $field_html;
 } // end renderFormElement function
 
 /**
@@ -386,13 +386,13 @@ 
  */
 function ParseIntputOptions($v) {
     $modx = DocumentParser::getInstance();
-	$a = array();
-	if(is_array($v)) {
-		return $v;
-	} else if($modx->db->isResult($v)) {
-		while($cols = $modx->db->getRow($v, 'num')) $a[] = $cols;
-	} else {
-		$a = explode("||", $v);
-	}
-	return $a;
+    $a = array();
+    if(is_array($v)) {
+        return $v;
+    } else if($modx->db->isResult($v)) {
+        while($cols = $modx->db->getRow($v, 'num')) $a[] = $cols;
+    } else {
+        $a = explode("||", $v);
+    }
+    return $a;
 }

Spacing +63 added lines, -63 removed lines

@@ -12,14 +12,14 @@ 
  * @param array $tvsArray
  * @return string
  */
-function renderFormElement($field_type, $field_id, $default_text = '', $field_elements = '', $field_value = '', $field_style = '', $row = array(), $tvsArray = array()) {
+function renderFormElement($field_type, $field_id, $default_text = '', $field_elements = '', $field_value = '', $field_style = '', $row = array(), $tvsArray = array()){
     $modx = DocumentParser::getInstance();
 	global $_style;
 	global $_lang;
 	global $content;
 	global $which_browser;
 
-	if(substr($default_text, 0, 6) === '@@EVAL' && $field_value === $default_text) {
+	if (substr($default_text, 0, 6) === '@@EVAL' && $field_value === $default_text) {
 		$eval_str = trim(substr($default_text, 7));
 		$default_text = eval($eval_str);
 		$field_value = $default_text;
@@ -27,74 +27,74 @@ 
 
 	$field_html = '';
 	$cimode = strpos($field_type, ':');
-	if($cimode === false) {
-		switch($field_type) {
+	if ($cimode === false) {
+		switch ($field_type) {
 
 			case "text": // handler for regular text boxes
 			case "rawtext"; // non-htmlentity converted text boxes
-				$field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%" />';
+				$field_html .= '<input type="text" id="tv'.$field_id.'" name="tv'.$field_id.'" value="'.$modx->htmlspecialchars($field_value).'" '.$field_style.' tvtype="'.$field_type.'" onchange="documentDirty=true;" style="width:100%" />';
 				break;
 			case "email": // handles email input fields
-				$field_html .= '<input type="email" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%"/>';
+				$field_html .= '<input type="email" id="tv'.$field_id.'" name="tv'.$field_id.'" value="'.$modx->htmlspecialchars($field_value).'" '.$field_style.' tvtype="'.$field_type.'" onchange="documentDirty=true;" style="width:100%"/>';
 				break;
 			case "number": // handles the input of numbers
-				$field_html .= '<input type="number" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%" onkeyup="this.value=this.value.replace(/[^\d-,.+]/,\'\')"/>';
+				$field_html .= '<input type="number" id="tv'.$field_id.'" name="tv'.$field_id.'" value="'.$modx->htmlspecialchars($field_value).'" '.$field_style.' tvtype="'.$field_type.'" onchange="documentDirty=true;" style="width:100%" onkeyup="this.value=this.value.replace(/[^\d-,.+]/,\'\')"/>';
 				break;
 			case "textareamini": // handler for textarea mini boxes
-				$field_html .= '<textarea id="tv' . $field_id . '" name="tv' . $field_id . '" cols="40" rows="5" onchange="documentDirty=true;" style="width:100%">' . $modx->htmlspecialchars($field_value) . '</textarea>';
+				$field_html .= '<textarea id="tv'.$field_id.'" name="tv'.$field_id.'" cols="40" rows="5" onchange="documentDirty=true;" style="width:100%">'.$modx->htmlspecialchars($field_value).'</textarea>';
 				break;
 			case "textarea": // handler for textarea boxes
 			case "rawtextarea": // non-htmlentity convertex textarea boxes
 			case "htmlarea": // handler for textarea boxes (deprecated)
 			case "richtext": // handler for textarea boxes
-				$field_html .= '<textarea id="tv' . $field_id . '" name="tv' . $field_id . '" cols="40" rows="15" onchange="documentDirty=true;" style="width:100%">' . $modx->htmlspecialchars($field_value) . '</textarea>';
+				$field_html .= '<textarea id="tv'.$field_id.'" name="tv'.$field_id.'" cols="40" rows="15" onchange="documentDirty=true;" style="width:100%">'.$modx->htmlspecialchars($field_value).'</textarea>';
 				break;
 			case "date":
 				$field_id = str_replace(array(
 					'-',
 					'.'
 				), '_', urldecode($field_id));
-				if($field_value == '') {
+				if ($field_value == '') {
 					$field_value = 0;
 				}
-				$field_html .= '<input id="tv' . $field_id . '" name="tv' . $field_id . '" class="DatePicker" type="text" value="' . ($field_value == 0 || !isset($field_value) ? "" : $field_value) . '" onblur="documentDirty=true;" />';
-				$field_html .= ' <a onclick="document.forms[\'mutate\'].elements[\'tv' . $field_id . '\'].value=\'\';document.forms[\'mutate\'].elements[\'tv' . $field_id . '\'].onblur(); return true;" onmouseover="window.status=\'clear the date\'; return true;" onmouseout="window.status=\'\'; return true;" style="cursor:pointer; cursor:hand"><i class="' . $_style["actions_calendar_delete"] . '"></i></a>';
+				$field_html .= '<input id="tv'.$field_id.'" name="tv'.$field_id.'" class="DatePicker" type="text" value="'.($field_value == 0 || !isset($field_value) ? "" : $field_value).'" onblur="documentDirty=true;" />';
+				$field_html .= ' <a onclick="document.forms[\'mutate\'].elements[\'tv'.$field_id.'\'].value=\'\';document.forms[\'mutate\'].elements[\'tv'.$field_id.'\'].onblur(); return true;" onmouseover="window.status=\'clear the date\'; return true;" onmouseout="window.status=\'\'; return true;" style="cursor:pointer; cursor:hand"><i class="'.$_style["actions_calendar_delete"].'"></i></a>';
 
 				break;
 			case "dropdown": // handler for select boxes
-				$field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" size="1" onchange="documentDirty=true;">';
+				$field_html .= '<select id="tv'.$field_id.'" name="tv'.$field_id.'" size="1" onchange="documentDirty=true;">';
 				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
-				while(list($item, $itemvalue) = each($index_list)) {
+				while (list($item, $itemvalue) = each($index_list)) {
 					list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
-					if(strlen($itemvalue) == 0) {
+					if (strlen($itemvalue) == 0) {
 						$itemvalue = $item;
 					}
-					$field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
+					$field_html .= '<option value="'.$modx->htmlspecialchars($itemvalue).'"'.($itemvalue == $field_value ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($item).'</option>';
 				}
 				$field_html .= "</select>";
 				break;
 			case "listbox": // handler for select boxes
-				$field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" onchange="documentDirty=true;" size="8">';
+				$field_html .= '<select id="tv'.$field_id.'" name="tv'.$field_id.'" onchange="documentDirty=true;" size="8">';
 				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
-				while(list($item, $itemvalue) = each($index_list)) {
+				while (list($item, $itemvalue) = each($index_list)) {
 					list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
-					if(strlen($itemvalue) == 0) {
+					if (strlen($itemvalue) == 0) {
 						$itemvalue = $item;
 					}
-					$field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
+					$field_html .= '<option value="'.$modx->htmlspecialchars($itemvalue).'"'.($itemvalue == $field_value ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($item).'</option>';
 				}
 				$field_html .= "</select>";
 				break;
 			case "listbox-multiple": // handler for select boxes where you can choose multiple items
 				$field_value = explode("||", $field_value);
-				$field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '[]" multiple="multiple" onchange="documentDirty=true;" size="8">';
+				$field_html .= '<select id="tv'.$field_id.'" name="tv'.$field_id.'[]" multiple="multiple" onchange="documentDirty=true;" size="8">';
 				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
-				while(list($item, $itemvalue) = each($index_list)) {
+				while (list($item, $itemvalue) = each($index_list)) {
 					list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
-					if(strlen($itemvalue) == 0) {
+					if (strlen($itemvalue) == 0) {
 						$itemvalue = $item;
 					}
-					$field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . (in_array($itemvalue, $field_value) ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
+					$field_html .= '<option value="'.$modx->htmlspecialchars($itemvalue).'"'.(in_array($itemvalue, $field_value) ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($item).'</option>';
 				}
 				$field_html .= "</select>";
 				break;
@@ -106,17 +106,17 @@ 
 					'ftp://' => 'ftp://',
 					'mailto:' => 'mailto:'
 				);
-				$field_html = '<table border="0" cellspacing="0" cellpadding="0"><tr><td><select id="tv' . $field_id . '_prefix" name="tv' . $field_id . '_prefix" onchange="documentDirty=true;">';
-				foreach($urls as $k => $v) {
-					if(strpos($field_value, $v) === false) {
-						$field_html .= '<option value="' . $v . '">' . $k . '</option>';
+				$field_html = '<table border="0" cellspacing="0" cellpadding="0"><tr><td><select id="tv'.$field_id.'_prefix" name="tv'.$field_id.'_prefix" onchange="documentDirty=true;">';
+				foreach ($urls as $k => $v) {
+					if (strpos($field_value, $v) === false) {
+						$field_html .= '<option value="'.$v.'">'.$k.'</option>';
 					} else {
 						$field_value = str_replace($v, '', $field_value);
-						$field_html .= '<option value="' . $v . '" selected="selected">' . $k . '</option>';
+						$field_html .= '<option value="'.$v.'" selected="selected">'.$k.'</option>';
 					}
 				}
 				$field_html .= '</select></td><td>';
-				$field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" width="100" ' . $field_style . ' onchange="documentDirty=true;" /></td></tr></table>';
+				$field_html .= '<input type="text" id="tv'.$field_id.'" name="tv'.$field_id.'" value="'.$modx->htmlspecialchars($field_value).'" width="100" '.$field_style.' onchange="documentDirty=true;" /></td></tr></table>';
 				break;
 			case 'checkbox': // handles check boxes
 				$values = !is_array($field_value) ? explode('||', $field_value) : $field_value;
@@ -124,8 +124,8 @@ 
 				$tpl = '<label class="checkbox"><input type="checkbox" value="%s" id="tv_%s" name="tv%s[]" %s onchange="documentDirty=true;" />%s</label><br />';
 				static $i = 0;
 				$_ = array();
-				foreach($index_list as $c => $item) {
-					if(is_array($item)) {
+				foreach ($index_list as $c => $item) {
+					if (is_array($item)) {
 						$name = trim($item[0]);
 						$value = isset($item[1]) ? $item[1] : $name;
 					} else {
@@ -151,12 +151,12 @@ 
 			case "option": // handles radio buttons
 				$index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
 				static $i = 0;
-				while(list($item, $itemvalue) = each($index_list)) {
+				while (list($item, $itemvalue) = each($index_list)) {
 					list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
-					if(strlen($itemvalue) == 0) {
+					if (strlen($itemvalue) == 0) {
 						$itemvalue = $item;
 					}
-					$field_html .= '<input type="radio" value="' . $modx->htmlspecialchars($itemvalue) . '" id="tv_' . $i . '" name="tv' . $field_id . '" ' . ($itemvalue == $field_value ? 'checked="checked"' : '') . ' onchange="documentDirty=true;" /><label for="tv_' . $i . '" class="radio">' . $item . '</label><br />';
+					$field_html .= '<input type="radio" value="'.$modx->htmlspecialchars($itemvalue).'" id="tv_'.$i.'" name="tv'.$field_id.'" '.($itemvalue == $field_value ? 'checked="checked"' : '').' onchange="documentDirty=true;" /><label for="tv_'.$i.'" class="radio">'.$item.'</label><br />';
 					$i++;
 				}
 				break;
@@ -164,7 +164,7 @@ 
 				global $_lang;
 				global $ResourceManagerLoaded;
 				global $content, $use_editor, $which_editor;
-				if(!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) {
+				if (!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) {
 					$field_html .= "
 						<script type=\"text/javascript\">
 							/* <![CDATA[ */
@@ -186,13 +186,13 @@ 
 									lastImageCtrl = ctrl;
 									var w = screen.width * 0.5;
 									var h = screen.height * 0.5;
-									OpenServerBrowser('" . MODX_MANAGER_URL . "media/browser/{$which_browser}/browser.php?Type=images', w, h);
+									OpenServerBrowser('" . MODX_MANAGER_URL."media/browser/{$which_browser}/browser.php?Type=images', w, h);
 								}
 								function BrowseFileServer(ctrl) {
 									lastFileCtrl = ctrl;
 									var w = screen.width * 0.5;
 									var h = screen.height * 0.5;
-									OpenServerBrowser('" . MODX_MANAGER_URL . "media/browser/{$which_browser}/browser.php?Type=files', w, h);
+									OpenServerBrowser('".MODX_MANAGER_URL."media/browser/{$which_browser}/browser.php?Type=files', w, h);
 								}
 								function SetUrlChange(el) {
 									if ('createEvent' in document) {
@@ -226,14 +226,14 @@ 
 						</script>";
 					$ResourceManagerLoaded = true;
 				}
-				$field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '"  value="' . $field_value . '" ' . $field_style . ' onchange="documentDirty=true;" /><input type="button" value="' . $_lang['insert'] . '" onclick="BrowseServer(\'tv' . $field_id . '\')" />';
+				$field_html .= '<input type="text" id="tv'.$field_id.'" name="tv'.$field_id.'"  value="'.$field_value.'" '.$field_style.' onchange="documentDirty=true;" /><input type="button" value="'.$_lang['insert'].'" onclick="BrowseServer(\'tv'.$field_id.'\')" />';
 				break;
 			case "file": // handles the input of file uploads
 				/* Modified by Timon for use with resource browser */
 				global $_lang;
 				global $ResourceManagerLoaded;
 				global $content, $use_editor, $which_editor;
-				if(!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) {
+				if (!$ResourceManagerLoaded && !(($content['richtext'] == 1 || $modx->manager->action == 4) && $use_editor == 1 && $which_editor == 3)) {
 					/* I didn't understand the meaning of the condition above, so I left it untouched ;-) */
 					$field_html .= "
 						<script type=\"text/javascript\">
@@ -256,13 +256,13 @@ 
 									lastImageCtrl = ctrl;
 									var w = screen.width * 0.5;
 									var h = screen.height * 0.5;
-									OpenServerBrowser('" . MODX_MANAGER_URL . "media/browser/{$which_browser}/browser.php?Type=images', w, h);
+									OpenServerBrowser('" . MODX_MANAGER_URL."media/browser/{$which_browser}/browser.php?Type=images', w, h);
 								}
 								function BrowseFileServer(ctrl) {
 									lastFileCtrl = ctrl;
 									var w = screen.width * 0.5;
 									var h = screen.height * 0.5;
-									OpenServerBrowser('" . MODX_MANAGER_URL . "media/browser/{$which_browser}/browser.php?Type=files', w, h);
+									OpenServerBrowser('".MODX_MANAGER_URL."media/browser/{$which_browser}/browser.php?Type=files', w, h);
 								}
 								function SetUrlChange(el) {
 									if ('createEvent' in document) {
@@ -296,39 +296,39 @@ 
 						</script>";
 					$ResourceManagerLoaded = true;
 				}
-				$field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '"  value="' . $field_value . '" ' . $field_style . ' onchange="documentDirty=true;" /><input type="button" value="' . $_lang['insert'] . '" onclick="BrowseFileServer(\'tv' . $field_id . '\')" />';
+				$field_html .= '<input type="text" id="tv'.$field_id.'" name="tv'.$field_id.'"  value="'.$field_value.'" '.$field_style.' onchange="documentDirty=true;" /><input type="button" value="'.$_lang['insert'].'" onclick="BrowseFileServer(\'tv'.$field_id.'\')" />';
 
 				break;
 
 			case 'custom_tv':
 				$custom_output = '';
 				/* If we are loading a file */
-				if(substr($field_elements, 0, 5) == "@FILE") {
-					$file_name = MODX_BASE_PATH . trim(substr($field_elements, 6));
-					if(!file_exists($file_name)) {
-						$custom_output = $file_name . ' does not exist';
+				if (substr($field_elements, 0, 5) == "@FILE") {
+					$file_name = MODX_BASE_PATH.trim(substr($field_elements, 6));
+					if (!file_exists($file_name)) {
+						$custom_output = $file_name.' does not exist';
 					} else {
 						$custom_output = file_get_contents($file_name);
 					}
-				} elseif(substr($field_elements, 0, 8) == '@INCLUDE') {
-					$file_name = MODX_BASE_PATH . trim(substr($field_elements, 9));
-					if(!file_exists($file_name)) {
-						$custom_output = $file_name . ' does not exist';
+				} elseif (substr($field_elements, 0, 8) == '@INCLUDE') {
+					$file_name = MODX_BASE_PATH.trim(substr($field_elements, 9));
+					if (!file_exists($file_name)) {
+						$custom_output = $file_name.' does not exist';
 					} else {
 						ob_start();
 						include $file_name;
 						$custom_output = ob_get_contents();
 						ob_end_clean();
 					}
-				} elseif(substr($field_elements, 0, 6) == "@CHUNK") {
+				} elseif (substr($field_elements, 0, 6) == "@CHUNK") {
 					$chunk_name = trim(substr($field_elements, 7));
 					$chunk_body = $modx->getChunk($chunk_name);
-					if($chunk_body == false) {
-						$custom_output = $_lang['chunk_no_exist'] . '(' . $_lang['htmlsnippet_name'] . ':' . $chunk_name . ')';
+					if ($chunk_body == false) {
+						$custom_output = $_lang['chunk_no_exist'].'('.$_lang['htmlsnippet_name'].':'.$chunk_name.')';
 					} else {
 						$custom_output = $chunk_body;
 					}
-				} elseif(substr($field_elements, 0, 5) == "@EVAL") {
+				} elseif (substr($field_elements, 0, 5) == "@EVAL") {
 					$eval_str = trim(substr($field_elements, 6));
 					$custom_output = eval($eval_str);
 				} else {
@@ -349,15 +349,15 @@ 
 				break;
 
 			default: // the default handler -- for errors, mostly
-				$field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' onchange="documentDirty=true;" />';
+				$field_html .= '<input type="text" id="tv'.$field_id.'" name="tv'.$field_id.'" value="'.$modx->htmlspecialchars($field_value).'" '.$field_style.' onchange="documentDirty=true;" />';
 
 		} // end switch statement
 	} else {
 		$custom = explode(":", $field_type);
 		$custom_output = '';
-		$file_name = MODX_BASE_PATH . 'assets/tvs/' . $custom['1'] . '/' . $custom['1'] . '.customtv.php';
-		if(!file_exists($file_name)) {
-			$custom_output = $file_name . ' does not exist';
+		$file_name = MODX_BASE_PATH.'assets/tvs/'.$custom['1'].'/'.$custom['1'].'.customtv.php';
+		if (!file_exists($file_name)) {
+			$custom_output = $file_name.' does not exist';
 		} else {
 			ob_start();
 			include $file_name;
@@ -384,13 +384,13 @@ 
  * @param string|array|mysqli_result $v
  * @return array
  */
-function ParseIntputOptions($v) {
+function ParseIntputOptions($v){
     $modx = DocumentParser::getInstance();
 	$a = array();
-	if(is_array($v)) {
+	if (is_array($v)) {
 		return $v;
-	} else if($modx->db->isResult($v)) {
-		while($cols = $modx->db->getRow($v, 'num')) $a[] = $cols;
+	} else if ($modx->db->isResult($v)) {
+		while ($cols = $modx->db->getRow($v, 'num')) $a[] = $cols;
 	} else {
 		$a = explode("||", $v);
 	}

Braces +7 added lines, -3 removed lines

@@ -12,7 +12,8 @@ 
  * @param array $tvsArray
  * @return string
  */
-function renderFormElement($field_type, $field_id, $default_text = '', $field_elements = '', $field_value = '', $field_style = '', $row = array(), $tvsArray = array()) {
+function renderFormElement($field_type, $field_id, $default_text = '', $field_elements = '', $field_value = '', $field_style = '', $row = array(), $tvsArray = array())
+{
     $modx = DocumentParser::getInstance();
 	global $_style;
 	global $_lang;
@@ -384,13 +385,16 @@ 
  * @param string|array|mysqli_result $v
  * @return array
  */
-function ParseIntputOptions($v) {
+function ParseIntputOptions($v)
+{
     $modx = DocumentParser::getInstance();
 	$a = array();
 	if(is_array($v)) {
 		return $v;
 	} else if($modx->db->isResult($v)) {
-		while($cols = $modx->db->getRow($v, 'num')) $a[] = $cols;
+		while($cols = $modx->db->getRow($v, 'num')) {
+		    $a[] = $cols;
+		}
 	} else {
 		$a = explode("||", $v);
 	}

manager/includes/config_check.inc.php

Spacing +41 added lines, -41 removed lines

@@ -1,13 +1,13 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
 // PROCESSOR FIRST
-if($_SESSION['mgrRole'] == 1) {
-	if($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) {
+if ($_SESSION['mgrRole'] == 1) {
+	if ($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) {
 		$current = $modx->manager->getSystemChecksum($modx->config['check_files_onlogin']);
-		if(!empty($current)) {
+		if (!empty($current)) {
 			$modx->manager->setSystemChecksum($current);
 			$modx->clearCache('full');
 			$modx->config['sys_files_checksum'] = $current;
@@ -19,14 +19,14 @@ 
 $warningspresent = 0;
 
 $sysfiles_check = $modx->manager->checkSystemChecksum();
-if ($sysfiles_check!=='0'){
+if ($sysfiles_check !== '0') {
       $warningspresent = 1;
       $warnings[] = array($_lang['configcheck_sysfiles_mod']);
 }
 
-if (is_writable("includes/config.inc.php")){
+if (is_writable("includes/config.inc.php")) {
     // Warn if world writable
-    if(@fileperms('includes/config.inc.php') & 0x0002) {
+    if (@fileperms('includes/config.inc.php') & 0x0002) {
       $warningspresent = 1;
       $warnings[] = array($_lang['configcheck_configinc']);
     }
@@ -42,8 +42,8 @@ 
     $warnings[] = array($_lang['configcheck_php_gdzip']);
 }
 
-if(!isset($modx->config['_hide_configcheck_validate_referer']) || $modx->config['_hide_configcheck_validate_referer'] !== '1') {
-    if(isset($_SESSION['mgrPermissions']['settings']) && $_SESSION['mgrPermissions']['settings'] == '1') {
+if (!isset($modx->config['_hide_configcheck_validate_referer']) || $modx->config['_hide_configcheck_validate_referer'] !== '1') {
+    if (isset($_SESSION['mgrPermissions']['settings']) && $_SESSION['mgrPermissions']['settings'] == '1') {
         if ($modx->db->getValue($modx->db->select('COUNT(setting_value)', $modx->getFullTableName('system_settings'), "setting_name='validate_referer' AND setting_value='0'"))) {
             $warningspresent = 1;
             $warnings[] = array($_lang['configcheck_validate_referer']);
@@ -52,11 +52,11 @@ 
 }
 
 // check for Template Switcher plugin
-if(!isset($modx->config['_hide_configcheck_templateswitcher_present']) || $modx->config['_hide_configcheck_templateswitcher_present'] !== '1') {
-    if(isset($_SESSION['mgrPermissions']['edit_plugin']) && $_SESSION['mgrPermissions']['edit_plugin'] == '1') {
+if (!isset($modx->config['_hide_configcheck_templateswitcher_present']) || $modx->config['_hide_configcheck_templateswitcher_present'] !== '1') {
+    if (isset($_SESSION['mgrPermissions']['edit_plugin']) && $_SESSION['mgrPermissions']['edit_plugin'] == '1') {
         $rs = $modx->db->select('name, disabled', $modx->getFullTableName('site_plugins'), "name IN ('TemplateSwitcher', 'Template Switcher', 'templateswitcher', 'template_switcher', 'template switcher') OR plugincode LIKE '%TemplateSwitcher%'");
         $row = $modx->db->getRow($rs);
-        if($row && $row['disabled'] == 0) {
+        if ($row && $row['disabled'] == 0) {
             $warningspresent = 1;
             $warnings[] = array($_lang['configcheck_templateswitcher_present']);
             $tplName = $row['name'];
@@ -120,36 +120,36 @@ 
     /**
      * @return bool
      */
-    function checkSiteCache() {
+    function checkSiteCache(){
         $modx = DocumentParser::getInstance();
-        $checked= true;
-        if (file_exists($modx->config['base_path'] . 'assets/cache/siteCache.idx.php')) {
-            $checked= @include_once ($modx->config['base_path'] . 'assets/cache/siteCache.idx.php');
+        $checked = true;
+        if (file_exists($modx->config['base_path'].'assets/cache/siteCache.idx.php')) {
+            $checked = @include_once ($modx->config['base_path'].'assets/cache/siteCache.idx.php');
         }
         return $checked;
     }
 }
 
-if (!is_writable(MODX_BASE_PATH . "assets/cache/")) {
+if (!is_writable(MODX_BASE_PATH."assets/cache/")) {
     $warningspresent = 1;
     $warnings[] = array($_lang['configcheck_cache']);
 }
 
 if (!checkSiteCache()) {
     $warningspresent = 1;
-    $warnings[]= array($lang['configcheck_sitecache_integrity']);
+    $warnings[] = array($lang['configcheck_sitecache_integrity']);
 }
 
-if (!is_writable(MODX_BASE_PATH . "assets/images/")) {
+if (!is_writable(MODX_BASE_PATH."assets/images/")) {
     $warningspresent = 1;
     $warnings[] = array($_lang['configcheck_images']);
 }
 
-if(strpos($modx->config['rb_base_dir'],MODX_BASE_PATH)!==0) {
+if (strpos($modx->config['rb_base_dir'], MODX_BASE_PATH) !== 0) {
     $warningspresent = 1;
     $warnings[] = array($_lang['configcheck_rb_base_dir']);
 }
-if(strpos($modx->config['filemanager_path'],MODX_BASE_PATH)!==0) {
+if (strpos($modx->config['filemanager_path'], MODX_BASE_PATH) !== 0) {
     $warningspresent = 1;
     $warnings[] = array($_lang['configcheck_filemanager_path']);
 }
@@ -157,36 +157,36 @@ 
 // clear file info cache
 clearstatcache();
 
-if ($warningspresent==1) {
+if ($warningspresent == 1) {
 
-if(!isset($modx->config['send_errormail'])) $modx->config['send_errormail']='3';
+if (!isset($modx->config['send_errormail'])) $modx->config['send_errormail'] = '3';
 $config_check_results = "<h3>".$_lang['configcheck_notok']."</h3>";
 
-for ($i=0;$i<count($warnings);$i++) {
+for ($i = 0; $i < count($warnings); $i++) {
     switch ($warnings[$i][0]) {
         case $_lang['configcheck_configinc'];
             $warnings[$i][1] = $_lang['configcheck_configinc_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_configinc']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 3, $warnings[$i][1], $_lang['configcheck_configinc']);
             break;
         case $_lang['configcheck_installer'] :
             $warnings[$i][1] = $_lang['configcheck_installer_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_installer']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 3, $warnings[$i][1], $_lang['configcheck_installer']);
             break;
         case $_lang['configcheck_cache'] :
             $warnings[$i][1] = $_lang['configcheck_cache_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_cache']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 2, $warnings[$i][1], $_lang['configcheck_cache']);
             break;
         case $_lang['configcheck_images'] :
             $warnings[$i][1] = $_lang['configcheck_images_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_images']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 2, $warnings[$i][1], $_lang['configcheck_images']);
             break;
         case $_lang['configcheck_sysfiles_mod']:
             $warnings[$i][1] = $_lang["configcheck_sysfiles_mod_msg"];
-			$warnings[$i][2] = '<ul><li>'. implode('</li><li>', $sysfiles_check) .'</li></ul>';
-			if($modx->hasPermission('settings')) {
-				$warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\'' . $_lang["reset_sysfiles_checksum_alert"] . '\')">' . $_lang["reset_sysfiles_checksum_button"] . '</a></li></ul>';
+			$warnings[$i][2] = '<ul><li>'.implode('</li><li>', $sysfiles_check).'</li></ul>';
+			if ($modx->hasPermission('settings')) {
+				$warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\''.$_lang["reset_sysfiles_checksum_alert"].'\')">'.$_lang["reset_sysfiles_checksum_button"].'</a></li></ul>';
 			}
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1]." ".implode(', ',$sysfiles_check),$_lang['configcheck_sysfiles_mod']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 3, $warnings[$i][1]." ".implode(', ', $sysfiles_check), $_lang['configcheck_sysfiles_mod']);
             break;
         case $_lang['configcheck_lang_difference'] :
             $warnings[$i][1] = $_lang['configcheck_lang_difference_msg'];
@@ -208,18 +208,18 @@ 
             break;
         case $_lang['configcheck_validate_referer'] :
             $msg = $_lang['configcheck_validate_referer_msg'];
-            $msg .= '<br />' . sprintf($_lang["configcheck_hide_warning"], 'validate_referer');
+            $msg .= '<br />'.sprintf($_lang["configcheck_hide_warning"], 'validate_referer');
             $warnings[$i][1] = "<span id=\"validate_referer_warning_wrapper\">{$msg}</span>\n";
             break;
         case $_lang['configcheck_templateswitcher_present'] :
             $msg = $_lang["configcheck_templateswitcher_present_msg"];
-            if(isset($_SESSION['mgrPermissions']['save_plugin']) && $_SESSION['mgrPermissions']['save_plugin'] == '1') {
-                $msg .= '<br />' . $_lang["configcheck_templateswitcher_present_disable"];
+            if (isset($_SESSION['mgrPermissions']['save_plugin']) && $_SESSION['mgrPermissions']['save_plugin'] == '1') {
+                $msg .= '<br />'.$_lang["configcheck_templateswitcher_present_disable"];
             }
-            if(isset($_SESSION['mgrPermissions']['delete_plugin']) && $_SESSION['mgrPermissions']['delete_plugin'] == '1') {
-                $msg .= '<br />' . $_lang["configcheck_templateswitcher_present_delete"];
+            if (isset($_SESSION['mgrPermissions']['delete_plugin']) && $_SESSION['mgrPermissions']['delete_plugin'] == '1') {
+                $msg .= '<br />'.$_lang["configcheck_templateswitcher_present_delete"];
             }
-            $msg .= '<br />' . sprintf($_lang["configcheck_hide_warning"], 'templateswitcher_present');
+            $msg .= '<br />'.sprintf($_lang["configcheck_hide_warning"], 'templateswitcher_present');
             $warnings[$i][1] = "<span id=\"templateswitcher_present_warning_wrapper\">{$msg}</span>\n";
             break;
         case $_lang['configcheck_rb_base_dir'] :
@@ -232,7 +232,7 @@ 
             $warnings[$i][1] = $_lang['configcheck_default_msg'];
     }
 
-    $admin_warning = $_SESSION['mgrRole']!=1 ? $_lang['configcheck_admin'] : "" ;
+    $admin_warning = $_SESSION['mgrRole'] != 1 ? $_lang['configcheck_admin'] : "";
     $config_check_results .= "
             <fieldset>
             <p><strong>".$_lang['configcheck_warning']."</strong> '".$warnings[$i][0]."'</p>
@@ -241,11 +241,11 @@ 
             ".(isset($warnings[$i][2]) ? '<div style="padding-left:1em">'.$warnings[$i][2].'</div>' : '')."
             </fieldset>
 ";
-        if ($i!=count($warnings)-1) {
+        if ($i != count($warnings) - 1) {
             $config_check_results .= "<br />";
         }
     }
-    $_SESSION["mgrConfigCheck"]=true;
+    $_SESSION["mgrConfigCheck"] = true;
 } else {
     $config_check_results = $_lang['configcheck_ok'];
 }

Braces +22 added lines, -9 removed lines

@@ -19,12 +19,12 @@ 
 $warningspresent = 0;
 
 $sysfiles_check = $modx->manager->checkSystemChecksum();
-if ($sysfiles_check!=='0'){
+if ($sysfiles_check!=='0') {
       $warningspresent = 1;
       $warnings[] = array($_lang['configcheck_sysfiles_mod']);
 }
 
-if (is_writable("includes/config.inc.php")){
+if (is_writable("includes/config.inc.php")) {
     // Warn if world writable
     if(@fileperms('includes/config.inc.php') & 0x0002) {
       $warningspresent = 1;
@@ -120,7 +120,8 @@ 
     /**
      * @return bool
      */
-    function checkSiteCache() {
+    function checkSiteCache()
+    {
         $modx = DocumentParser::getInstance();
         $checked= true;
         if (file_exists($modx->config['base_path'] . 'assets/cache/siteCache.idx.php')) {
@@ -159,26 +160,36 @@ 
 
 if ($warningspresent==1) {
 
-if(!isset($modx->config['send_errormail'])) $modx->config['send_errormail']='3';
+if(!isset($modx->config['send_errormail'])) {
+    $modx->config['send_errormail']='3';
+}
 $config_check_results = "<h3>".$_lang['configcheck_notok']."</h3>";
 
 for ($i=0;$i<count($warnings);$i++) {
     switch ($warnings[$i][0]) {
         case $_lang['configcheck_configinc'];
             $warnings[$i][1] = $_lang['configcheck_configinc_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_configinc']);
+            if(!$_SESSION["mgrConfigCheck"]) {
+                $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_configinc']);
+            }
             break;
         case $_lang['configcheck_installer'] :
             $warnings[$i][1] = $_lang['configcheck_installer_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_installer']);
+            if(!$_SESSION["mgrConfigCheck"]) {
+                $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_installer']);
+            }
             break;
         case $_lang['configcheck_cache'] :
             $warnings[$i][1] = $_lang['configcheck_cache_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_cache']);
+            if(!$_SESSION["mgrConfigCheck"]) {
+                $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_cache']);
+            }
             break;
         case $_lang['configcheck_images'] :
             $warnings[$i][1] = $_lang['configcheck_images_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_images']);
+            if(!$_SESSION["mgrConfigCheck"]) {
+                $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_images']);
+            }
             break;
         case $_lang['configcheck_sysfiles_mod']:
             $warnings[$i][1] = $_lang["configcheck_sysfiles_mod_msg"];
@@ -186,7 +197,9 @@ 
 			if($modx->hasPermission('settings')) {
 				$warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\'' . $_lang["reset_sysfiles_checksum_alert"] . '\')">' . $_lang["reset_sysfiles_checksum_button"] . '</a></li></ul>';
 			}
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1]." ".implode(', ',$sysfiles_check),$_lang['configcheck_sysfiles_mod']);
+            if(!$_SESSION["mgrConfigCheck"]) {
+                $modx->logEvent(0,3,$warnings[$i][1]." ".implode(', ',$sysfiles_check),$_lang['configcheck_sysfiles_mod']);
+            }
             break;
         case $_lang['configcheck_lang_difference'] :
             $warnings[$i][1] = $_lang['configcheck_lang_difference_msg'];

manager/media/browser/mcpuk/core/uploader.php

Indentation +74 added lines, -74 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Uploader class
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <sunhater@sunhater.com>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ *
+ *      @desc Uploader class
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <sunhater@sunhater.com>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 class uploader {
 
@@ -18,92 +18,92 @@ 
     const VERSION = "2.54";
 
 /** Config session-overrided settings
-  * @var array */
+ * @var array */
     protected $config = array();
 
 /** Default image driver
-  * @var string */
+ * @var string */
     protected $imageDriver = "gd";
 
 /** Opener applocation properties
-  *   $opener['name']                 Got from $_GET['opener'];
-  *   $opener['CKEditor']['funcNum']  CKEditor function number (got from $_GET)
-  *   $opener['TinyMCE']              Boolean
-  * @var array */
+ *   $opener['name']                 Got from $_GET['opener'];
+ *   $opener['CKEditor']['funcNum']  CKEditor function number (got from $_GET)
+ *   $opener['TinyMCE']              Boolean
+ * @var array */
     protected $opener = array();
 
 /** Got from $_GET['type'] or first one $config['types'] array key, if inexistant
-  * @var string */
+ * @var string */
     protected $type;
 
 /** Helper property. Local filesystem path to the Type Directory
-  * Equivalent: $config['uploadDir'] . "/" . $type
-  * @var string */
+ * Equivalent: $config['uploadDir'] . "/" . $type
+ * @var string */
     protected $typeDir;
 
 /** Helper property. Web URL to the Type Directory
-  * Equivalent: $config['uploadURL'] . "/" . $type
-  * @var string */
+ * Equivalent: $config['uploadURL'] . "/" . $type
+ * @var string */
     protected $typeURL;
 
 /** Linked to $config['types']
-  * @var array */
+ * @var array */
     protected $types = array();
 
 /** Settings which can override default settings if exists as keys in $config['types'][$type] array
-  * @var array */
+ * @var array */
     protected $typeSettings = array('disabled', 'theme', 'dirPerms', 'filePerms', 'denyZipDownload', 'maxImageWidth', 'maxImageHeight', 'thumbWidth', 'thumbHeight', 'jpegQuality', 'access', 'filenameChangeChars', 'dirnameChangeChars', 'denyExtensionRename', 'deniedExts', 'watermark');
 
 /** Got from language file
-  * @var string */
+ * @var string */
     protected $charset;
 
 /** The language got from $_GET['lng'] or $_GET['lang'] or... Please see next property
-  * @var string */
+ * @var string */
     protected $lang = 'en';
 
 /** Possible language $_GET keys
-  * @var array */
+ * @var array */
     protected $langInputNames = array('lang', 'langCode', 'lng', 'language', 'lang_code');
 
 /** Uploaded file(s) info. Linked to first $_FILES element
-  * @var array */
+ * @var array */
     protected $file;
 
 /** Next three properties are got from the current language file
-  * @var string */
+ * @var string */
     protected $dateTimeFull;   // Currently not used
     protected $dateTimeMid;    // Currently not used
     protected $dateTimeSmall;
 
 /** Contain Specified language labels
-  * @var array */
+ * @var array */
     protected $labels = array();
 
 /** Contain unprocessed $_GET array. Please use this instead of $_GET
-  * @var array */
+ * @var array */
     protected $get;
 
 /** Contain unprocessed $_POST array. Please use this instead of $_POST
-  * @var array */
+ * @var array */
     protected $post;
 
 /** Contain unprocessed $_COOKIE array. Please use this instead of $_COOKIE
-  * @var array */
+ * @var array */
     protected $cookie;
 
 /** Session array. Please use this property instead of $_SESSION
-  * @var array */
+ * @var array */
     protected $session;
 
 /** CMS integration attribute (got from $_GET['cms'])
-  * @var string */
+ * @var string */
     protected $cms = "";
 
     protected $modx = null;
 /** Magic method which allows read-only access to protected or private class properties
-  * @param string $property
-  * @return mixed */
+     * @param string $property
+     * @return mixed */
     public function __get($property) {
         return property_exists($this, $property) ? $this->$property : null;
     }
@@ -132,7 +132,7 @@ 
         )
             $this->cms = $this->get['cms'];
 
-		// LINKING UPLOADED FILE
+        // LINKING UPLOADED FILE
         if (count($_FILES))
             $this->file = &$_FILES[key($_FILES)];
 
@@ -228,8 +228,8 @@ 
             $this->config['uploadDir'] = strlen($this->config['uploadDir'])
                 ? path::normalize($this->config['uploadDir'])
                 : path::url2fullPath("/$path");
-         $this->typeDir = "{$this->config['uploadDir']}/{$this->type}";
-         $this->typeURL = "{$this->config['siteURL']}/{$this->config['uploadURL']}/{$this->type}";
+            $this->typeDir = "{$this->config['uploadDir']}/{$this->type}";
+            $this->typeURL = "{$this->config['siteURL']}/{$this->config['uploadURL']}/{$this->type}";
 
         // SITE ROOT
         } elseif ($this->config['uploadURL'] == "/") {
@@ -365,36 +365,36 @@ 
     }
 
 
-	protected function getTransaliasSettings() {
-		$modx = DocumentParser::getInstance();
-
-		// Cleaning uploaded filename?
-		$setting = $modx->db->select('count(*)', $modx->getFullTableName('system_settings'), 'setting_name="clean_uploaded_filename" AND setting_value=1');
-		if ($modx->db->getValue($setting)>0) {
-			// Transalias plugin active?
-			$res = $modx->db->select('properties', $modx->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0');
-			if ($properties = $modx->db->getValue($res)) {
-				$properties = $modx->parseProperties($properties, 'TransAlias', 'plugin');
-			} else {
-				$properties = NULL;
-			}
-		} else {
-			$properties = NULL;
-		}
-		return $properties;
-	}
-
-
-	protected function normalizeFilename($filename) {
-		if ($this->getTransaliasSettings()) {
-        		$format = strrchr($filename, ".");
-        		$filename = str_replace($format, "", $filename);
-            		$filename = $this->modx->stripAlias($filename).$format;
-        	}
-        	return $filename;
-	}
-
-	protected function normalizeDirname($dirname) {
+    protected function getTransaliasSettings() {
+        $modx = DocumentParser::getInstance();
+
+        // Cleaning uploaded filename?
+        $setting = $modx->db->select('count(*)', $modx->getFullTableName('system_settings'), 'setting_name="clean_uploaded_filename" AND setting_value=1');
+        if ($modx->db->getValue($setting)>0) {
+            // Transalias plugin active?
+            $res = $modx->db->select('properties', $modx->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0');
+            if ($properties = $modx->db->getValue($res)) {
+                $properties = $modx->parseProperties($properties, 'TransAlias', 'plugin');
+            } else {
+                $properties = NULL;
+            }
+        } else {
+            $properties = NULL;
+        }
+        return $properties;
+    }
+
+
+    protected function normalizeFilename($filename) {
+        if ($this->getTransaliasSettings()) {
+                $format = strrchr($filename, ".");
+                $filename = str_replace($format, "", $filename);
+                    $filename = $this->modx->stripAlias($filename).$format;
+            }
+            return $filename;
+    }
+
+    protected function normalizeDirname($dirname) {
         return $this->modx->stripAlias($dirname);
     }
 
@@ -472,10 +472,10 @@ 
             return $this->label("The image is too big and/or cannot be resized.");
 
 
-	// CHECK FOR MODX MAX FILE SIZE
-	$actualfilesize=filesize($file['tmp_name']);
-	if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize'])
-	    return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
+    // CHECK FOR MODX MAX FILE SIZE
+    $actualfilesize=filesize($file['tmp_name']);
+    if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize'])
+        return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
 
         return true;
     }
@@ -627,7 +627,7 @@ 
             $top = isset($this->config['watermark']['top'])
                 ? $this->config['watermark']['top'] : false;
             $img->watermark($this->config['watermark']['file'], $left, $top);
-		}
+        }
 
         $options = array( 'file' => $file );
 

Spacing +46 added lines, -47 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class uploader {
+class uploader{
 
 /** Release version */
     const VERSION = "2.54";
@@ -72,8 +72,8 @@ 
 
 /** Next three properties are got from the current language file
   * @var string */
-    protected $dateTimeFull;   // Currently not used
-    protected $dateTimeMid;    // Currently not used
+    protected $dateTimeFull; // Currently not used
+    protected $dateTimeMid; // Currently not used
     protected $dateTimeSmall;
 
 /** Contain Specified language labels
@@ -104,11 +104,11 @@ 
 /** Magic method which allows read-only access to protected or private class properties
   * @param string $property
   * @return mixed */
-    public function __get($property) {
+    public function __get($property){
         return property_exists($this, $property) ? $this->$property : null;
     }
 
-    public function __construct($modx) {
+    public function __construct($modx){
 
         //MODX
         try {
@@ -206,7 +206,7 @@ 
 
         // COOKIES INIT
         $ip = '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)';
-        $ip = '/^' . implode('\.', array($ip, $ip, $ip, $ip)) . '$/';
+        $ip = '/^'.implode('\.', array($ip, $ip, $ip, $ip)).'$/';
         if (preg_match($ip, $_SERVER['HTTP_HOST']) ||
             preg_match('/^[^\.]+$/', $_SERVER['HTTP_HOST'])
         )
@@ -224,7 +224,7 @@ 
         ) {
             list($unused, $protocol, $domain, $unused, $port, $path) = $patt;
             $path = path::normalize($path);
-            $this->config['uploadURL'] = "$protocol://$domain" . (strlen($port) ? ":$port" : "") . "/$path";
+            $this->config['uploadURL'] = "$protocol://$domain".(strlen($port) ? ":$port" : "")."/$path";
             $this->config['uploadDir'] = strlen($this->config['uploadDir'])
                 ? path::normalize($this->config['uploadDir'])
                 : path::url2fullPath("/$path");
@@ -267,7 +267,7 @@ 
         foreach ($this->langInputNames as $key)
             if (isset($this->get[$key]) &&
                 preg_match('/^[a-z][a-z\._\-]*$/i', $this->get[$key]) &&
-                file_exists("lang/" . strtolower($this->get[$key]) . ".php")
+                file_exists("lang/".strtolower($this->get[$key]).".php")
             ) {
                 $this->lang = $this->get[$key];
                 break;
@@ -298,7 +298,7 @@ 
             $this->backMsg("Cannot read upload folder.");
     }
 
-    public function upload() {
+    public function upload(){
         $config = &$this->config;
         $file = &$this->file;
         $url = $message = "";
@@ -329,7 +329,7 @@ 
                     @mkdir(path::normalize($dir), $this->config['dirPerms'], true);
 
                 $filename = $this->normalizeFilename($file['name']);
-                $target = file::getInexistantFilename($dir . $filename);
+                $target = file::getInexistantFilename($dir.$filename);
 
                 if (!@move_uploaded_file($file['tmp_name'], $target) &&
                     !@rename($file['tmp_name'], $target) &&
@@ -342,11 +342,11 @@ 
                     $this->makeThumb($target);
                     $url = $this->typeURL;
                     if (isset($udir)) $url .= "/$udir";
-                    $url .= "/" . basename($target);
+                    $url .= "/".basename($target);
                     if (preg_match('/^([a-z]+)\:\/\/([^\/^\:]+)(\:(\d+))?\/(.+)$/', $url, $patt)) {
                         list($unused, $protocol, $domain, $unused, $port, $path) = $patt;
-                        $base = "$protocol://$domain" . (strlen($port) ? ":$port" : "") . "/";
-                        $url = $base . path::urlPathEncode($path);
+                        $base = "$protocol://$domain".(strlen($port) ? ":$port" : "")."/";
+                        $url = $base.path::urlPathEncode($path);
                     } else
                         $url = path::urlPathEncode($url);
                 }
@@ -365,12 +365,12 @@ 
     }
 
 
-	protected function getTransaliasSettings() {
+	protected function getTransaliasSettings(){
 		$modx = DocumentParser::getInstance();
 
 		// Cleaning uploaded filename?
 		$setting = $modx->db->select('count(*)', $modx->getFullTableName('system_settings'), 'setting_name="clean_uploaded_filename" AND setting_value=1');
-		if ($modx->db->getValue($setting)>0) {
+		if ($modx->db->getValue($setting) > 0) {
 			// Transalias plugin active?
 			$res = $modx->db->select('properties', $modx->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0');
 			if ($properties = $modx->db->getValue($res)) {
@@ -385,7 +385,7 @@ 
 	}
 
 
-	protected function normalizeFilename($filename) {
+	protected function normalizeFilename($filename){
 		if ($this->getTransaliasSettings()) {
         		$format = strrchr($filename, ".");
         		$filename = str_replace($format, "", $filename);
@@ -394,11 +394,11 @@ 
         	return $filename;
 	}
 
-	protected function normalizeDirname($dirname) {
+	protected function normalizeDirname($dirname){
         return $this->modx->stripAlias($dirname);
     }
 
-    protected function checkUploadedFile(array $aFile=null) {
+    protected function checkUploadedFile(array $aFile = null){
         $config = &$this->config;
         $file = ($aFile === null) ? $this->file : $aFile;
 
@@ -437,8 +437,7 @@ 
                 ($file['error'] == UPLOAD_ERR_NO_TMP_DIR) ?
                     $this->label("Missing a temporary folder.") : (
                 ($file['error'] == UPLOAD_ERR_CANT_WRITE) ?
-                    $this->label("Failed to write file.") :
-                    $this->label("Unknown error.")
+                    $this->label("Failed to write file.") : $this->label("Unknown error.")
             )))));
 
         // HIDDEN FILENAMES CHECK
@@ -473,14 +472,14 @@ 
 
 
 	// CHECK FOR MODX MAX FILE SIZE
-	$actualfilesize=filesize($file['tmp_name']);
+	$actualfilesize = filesize($file['tmp_name']);
 	if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize'])
 	    return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
 
         return true;
     }
 
-    protected function checkInputDir($dir, $inclType=true, $existing=true) {
+    protected function checkInputDir($dir, $inclType = true, $existing = true){
         $dir = path::normalize($dir);
         if (substr($dir, 0, 1) == "/")
             $dir = substr($dir, 1);
@@ -506,7 +505,7 @@ 
         return (is_dir($path) && is_readable($path)) ? $return : false;
     }
 
-    protected function validateExtension($ext, $type) {
+    protected function validateExtension($ext, $type){
         $ext = trim(strtolower($ext));
         if (!isset($this->types[$type]))
             return false;
@@ -531,17 +530,17 @@ 
         return in_array($ext, $exts);
     }
 
-    protected function getTypeFromPath($path) {
+    protected function getTypeFromPath($path){
         return preg_match('/^([^\/]*)\/.*$/', $path, $patt)
             ? $patt[1] : $path;
     }
 
-    protected function removeTypeFromPath($path) {
+    protected function removeTypeFromPath($path){
         return preg_match('/^[^\/]*\/(.*)$/', $path, $patt)
             ? $patt[1] : "";
     }
 
-    protected function imageResize($image, $file=null) {
+    protected function imageResize($image, $file = null){
 
         if (!($image instanceof image)) {
             $img = image::factory($this->imageDriver, $image);
@@ -629,24 +628,24 @@ 
             $img->watermark($this->config['watermark']['file'], $left, $top);
 		}
 
-        $options = array( 'file' => $file );
+        $options = array('file' => $file);
 
-        $type = exif_imagetype( $file );
+        $type = exif_imagetype($file);
 
-        switch ( $type ) {
+        switch ($type) {
             case IMAGETYPE_GIF:
-                return $img->output( 'gif', $options );
+                return $img->output('gif', $options);
 
             case IMAGETYPE_PNG:
-                return $img->output( 'png', $options );
+                return $img->output('png', $options);
 
             default:
-                return $img->output( 'jpeg', array_merge( $options, array( 'quality' => $this->config['jpegQuality'] ) ) );
+                return $img->output('jpeg', array_merge($options, array('quality' => $this->config['jpegQuality'])));
         }
 
     }
 
-    protected function makeThumb($file, $overwrite=true) {
+    protected function makeThumb($file, $overwrite = true){
         $img = image::factory($this->imageDriver, $file);
 
         // Drop files which are not images
@@ -654,7 +653,7 @@ 
             return true;
 
         $thumb = substr($file, strlen($this->config['uploadDir']));
-        $thumb = $this->config['uploadDir'] . "/" . $this->config['thumbsDir'] . "/" . $thumb;
+        $thumb = $this->config['uploadDir']."/".$this->config['thumbsDir']."/".$thumb;
         $thumb = path::normalize($thumb);
         $thumbDir = dirname($thumb);
         if (!is_dir($thumbDir) && !@mkdir($thumbDir, $this->config['dirPerms'], true))
@@ -677,15 +676,15 @@ 
         if (!$img->resizeFit($this->config['thumbWidth'], $this->config['thumbHeight']))
             return false;
 
-        if ( $this->imageDriver == 'gd' ) {
-            $width  = imagesx( $img->image );
-            $height = imagesy( $img->image );
-            $back   = image::factory( $this->imageDriver, array( $width, $height ) );
-            $tile   = image::factory( $this->imageDriver, __DIR__ . '/../themes/' . $this->config['theme'] . '/img/bg_transparent.png' );
+        if ($this->imageDriver == 'gd') {
+            $width  = imagesx($img->image);
+            $height = imagesy($img->image);
+            $back   = image::factory($this->imageDriver, array($width, $height));
+            $tile   = image::factory($this->imageDriver, __DIR__.'/../themes/'.$this->config['theme'].'/img/bg_transparent.png');
 
-            imagesettile( $back->image, $tile->image );
-            imagefilledrectangle( $back->image, 0, 0, $width, $height, IMG_COLOR_TILED );
-            imagecopy( $back->image, $img->image, 0, 0, 0, 0, $width, $height );
+            imagesettile($back->image, $tile->image);
+            imagefilledrectangle($back->image, 0, 0, $width, $height, IMG_COLOR_TILED);
+            imagecopy($back->image, $img->image, 0, 0, 0, 0, $width, $height);
 
             $img = $back;
         }
@@ -697,7 +696,7 @@ 
         ));
     }
 
-    protected function localize($langCode) {
+    protected function localize($langCode){
         require "lang/{$langCode}.php";
         setlocale(LC_ALL, $lang['_locale']);
         $this->charset = $lang['_charset'];
@@ -712,7 +711,7 @@ 
         $this->labels = $lang;
     }
 
-    protected function label($string, array $data=null) {
+    protected function label($string, array $data = null){
         $return = isset($this->labels[$string]) ? $this->labels[$string] : $string;
         if (is_array($data))
             foreach ($data as $key => $val)
@@ -720,7 +719,7 @@ 
         return $return;
     }
 
-    protected function backMsg($message, array $data=null) {
+    protected function backMsg($message, array $data = null){
         $message = $this->label($message, $data);
         if (isset($this->file['tmp_name']) && file_exists($this->file['tmp_name']))
             @unlink($this->file['tmp_name']);
@@ -728,7 +727,7 @@ 
         die;
     }
 
-    protected function callBack($url, $message="") {
+    protected function callBack($url, $message = ""){
         $message = text::jsValue($message);
         $CKfuncNum = isset($this->opener['CKEditor']['funcNum'])
             ? $this->opener['CKEditor']['funcNum'] : 0;
@@ -769,7 +768,7 @@ 
 
     }
 
-    protected function get_htaccess() {
+    protected function get_htaccess(){
         return "<IfModule mod_php4.c>
   php_value engine off
 </IfModule>

Braces +238 added lines, -149 removed lines

@@ -12,7 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class uploader {
+class uploader
+{
 
 /** Release version */
     const VERSION = "2.54";
@@ -104,17 +105,21 @@ 
 /** Magic method which allows read-only access to protected or private class properties
   * @param string $property
   * @return mixed */
-    public function __get($property) {
+    public function __get($property)
+    {
         return property_exists($this, $property) ? $this->$property : null;
     }
 
-    public function __construct($modx) {
+    public function __construct($modx)
+    {
 
         //MODX
         try {
             if ($modx instanceof DocumentParser) {
                 $this->modx = $modx;
-            } else throw new Exception('MODX should be instance of DocumentParser');
+            } else {
+                throw new Exception('MODX should be instance of DocumentParser');
+            }
         } catch (Exception $e) {
             die($e->getMessage());
         }
@@ -129,26 +134,34 @@ 
         // SET CMS INTEGRATION ATTRIBUTE
         if (isset($this->get['cms']) &&
             in_array($this->get['cms'], array("drupal"))
-        )
-            $this->cms = $this->get['cms'];
+        ) {
+                    $this->cms = $this->get['cms'];
+        }
 
 		// LINKING UPLOADED FILE
-        if (count($_FILES))
-            $this->file = &$_FILES[key($_FILES)];
+        if (count($_FILES)) {
+                    $this->file = &$_FILES[key($_FILES)];
+        }
 
         // LOAD DEFAULT CONFIGURATION
         require "config.php";
 
         // SETTING UP SESSION
-        if (isset($_CONFIG['_sessionLifetime']))
-            ini_set('session.gc_maxlifetime', $_CONFIG['_sessionLifetime'] * 60);
-        if (isset($_CONFIG['_sessionDir']))
-            ini_set('session.save_path', $_CONFIG['_sessionDir']);
-        if (isset($_CONFIG['_sessionDomain']))
-            ini_set('session.cookie_domain', $_CONFIG['_sessionDomain']);
+        if (isset($_CONFIG['_sessionLifetime'])) {
+                    ini_set('session.gc_maxlifetime', $_CONFIG['_sessionLifetime'] * 60);
+        }
+        if (isset($_CONFIG['_sessionDir'])) {
+                    ini_set('session.save_path', $_CONFIG['_sessionDir']);
+        }
+        if (isset($_CONFIG['_sessionDomain'])) {
+                    ini_set('session.cookie_domain', $_CONFIG['_sessionDomain']);
+        }
         switch ($this->cms) {
             case "drupal": break;
-            default: if (!session_id()) session_start(); break;
+            default: if (!session_id()) {
+                session_start();
+            }
+            break;
         }
 
         // RELOAD DEFAULT CONFIGURATION
@@ -159,31 +172,37 @@ 
         if (isset($_CONFIG['_sessionVar']) &&
             is_array($_CONFIG['_sessionVar'])
         ) {
-            foreach ($_CONFIG['_sessionVar'] as $key => $val)
-                if ((substr($key, 0, 1) != "_") && isset($_CONFIG[$key]))
+            foreach ($_CONFIG['_sessionVar'] as $key => $val) {
+                            if ((substr($key, 0, 1) != "_") && isset($_CONFIG[$key]))
                     $this->config[$key] = $val;
-            if (!isset($this->config['_sessionVar']['self']))
-                $this->config['_sessionVar']['self'] = array();
+            }
+            if (!isset($this->config['_sessionVar']['self'])) {
+                            $this->config['_sessionVar']['self'] = array();
+            }
             $this->session = &$this->config['_sessionVar']['self'];
-        } else
-            $this->session = &$_SESSION;
+        } else {
+                    $this->session = &$_SESSION;
+        }
 
         // IMAGE DRIVER INIT
         if (isset($this->config['imageDriversPriority'])) {
             $this->config['imageDriversPriority'] =
                 text::clearWhitespaces($this->config['imageDriversPriority']);
             $driver = image::getDriver(explode(' ', $this->config['imageDriversPriority']));
-            if ($driver !== false)
-                $this->imageDriver = $driver;
+            if ($driver !== false) {
+                            $this->imageDriver = $driver;
+            }
         }
         if ((!isset($driver) || ($driver === false)) &&
             (image::getDriver(array($this->imageDriver)) === false)
-        )
-            die("Cannot find any of the supported PHP image extensions!");
+        ) {
+                    die("Cannot find any of the supported PHP image extensions!");
+        }
 
         // WATERMARK INIT
-        if (isset($this->config['watermark']) && is_string($this->config['watermark']))
-            $this->config['watermark'] = array('file' => $this->config['watermark']);
+        if (isset($this->config['watermark']) && is_string($this->config['watermark'])) {
+                    $this->config['watermark'] = array('file' => $this->config['watermark']);
+        }
 
         // GET TYPE DIRECTORY
         $this->types = &$this->config['types'];
@@ -197,9 +216,10 @@ 
 
         // LOAD TYPE DIRECTORY SPECIFIC CONFIGURATION IF EXISTS
         if (is_array($this->types[$this->type])) {
-            foreach ($this->types[$this->type] as $key => $val)
-                if (in_array($key, $this->typeSettings))
+            foreach ($this->types[$this->type] as $key => $val) {
+                            if (in_array($key, $this->typeSettings))
                     $this->config[$key] = $val;
+            }
             $this->types[$this->type] = isset($this->types[$this->type]['type'])
                 ? $this->types[$this->type]['type'] : "";
         }
@@ -209,12 +229,14 @@ 
         $ip = '/^' . implode('\.', array($ip, $ip, $ip, $ip)) . '$/';
         if (preg_match($ip, $_SERVER['HTTP_HOST']) ||
             preg_match('/^[^\.]+$/', $_SERVER['HTTP_HOST'])
-        )
-            $this->config['cookieDomain'] = "";
-        elseif (!strlen($this->config['cookieDomain']))
-            $this->config['cookieDomain'] = $_SERVER['HTTP_HOST'];
-        if (!strlen($this->config['cookiePath']))
-            $this->config['cookiePath'] = "/";
+        ) {
+                    $this->config['cookieDomain'] = "";
+        } elseif (!strlen($this->config['cookieDomain'])) {
+                    $this->config['cookieDomain'] = $_SERVER['HTTP_HOST'];
+        }
+        if (!strlen($this->config['cookiePath'])) {
+                    $this->config['cookiePath'] = "/";
+        }
 
         // UPLOAD FOLDER INIT
 
@@ -250,26 +272,30 @@ 
             $this->typeDir = "{$this->config['uploadDir']}/{$this->type}";
             $this->typeURL = "{$this->config['uploadURL']}/{$this->type}";
         }
-        if (!is_dir($this->config['uploadDir']))
-            @mkdir($this->config['uploadDir'], $this->config['dirPerms']);
+        if (!is_dir($this->config['uploadDir'])) {
+                    @mkdir($this->config['uploadDir'], $this->config['dirPerms']);
+        }
 
         // HOST APPLICATIONS INIT
-        if (isset($this->get['CKEditorFuncNum']))
-            $this->opener['CKEditor']['funcNum'] = $this->get['CKEditorFuncNum'];
+        if (isset($this->get['CKEditorFuncNum'])) {
+                    $this->opener['CKEditor']['funcNum'] = $this->get['CKEditorFuncNum'];
+        }
         if (isset($this->get['opener']) &&
             (strtolower($this->get['opener']) == "tinymce") &&
             isset($this->config['_tinyMCEPath']) &&
             strlen($this->config['_tinyMCEPath'])
-        )
-            $this->opener['TinyMCE'] = true;
+        ) {
+                    $this->opener['TinyMCE'] = true;
+        }
 
         // LOCALIZATION
-        foreach ($this->langInputNames as $key)
-            if (isset($this->get[$key]) &&
+        foreach ($this->langInputNames as $key) {
+                    if (isset($this->get[$key]) &&
                 preg_match('/^[a-z][a-z\._\-]*$/i', $this->get[$key]) &&
                 file_exists("lang/" . strtolower($this->get[$key]) . ".php")
             ) {
                 $this->lang = $this->get[$key];
+        }
                 break;
             }
         $this->localize($this->lang);
@@ -280,31 +306,39 @@ 
         ) {
             $htaccess = "{$this->config['uploadDir']}/.htaccess";
             if (!file_exists($htaccess)) {
-                if (!@file_put_contents($htaccess, $this->get_htaccess()))
-                    $this->backMsg("Cannot write to upload folder. {$this->config['uploadDir']}");
+                if (!@file_put_contents($htaccess, $this->get_htaccess())) {
+                                    $this->backMsg("Cannot write to upload folder. {$this->config['uploadDir']}");
+                }
             } else {
-                if (false === ($data = @file_get_contents($htaccess)))
-                    $this->backMsg("Cannot read .htaccess");
-                if (($data != $this->get_htaccess()) && !@file_put_contents($htaccess, $data))
-                    $this->backMsg("Incorrect .htaccess file. Cannot rewrite it!");
+                if (false === ($data = @file_get_contents($htaccess))) {
+                                    $this->backMsg("Cannot read .htaccess");
+                }
+                if (($data != $this->get_htaccess()) && !@file_put_contents($htaccess, $data)) {
+                                    $this->backMsg("Incorrect .htaccess file. Cannot rewrite it!");
+                }
             }
         }
 
         // CHECK & CREATE UPLOAD FOLDER
         if (!is_dir($this->typeDir)) {
-            if (!mkdir($this->typeDir, $this->config['dirPerms']))
-                $this->backMsg("Cannot create {dir} folder.", array('dir' => $this->type));
-        } elseif (!is_readable($this->typeDir))
-            $this->backMsg("Cannot read upload folder.");
+            if (!mkdir($this->typeDir, $this->config['dirPerms'])) {
+                            $this->backMsg("Cannot create {dir} folder.", array('dir' => $this->type));
+            }
+        } elseif (!is_readable($this->typeDir)) {
+                    $this->backMsg("Cannot read upload folder.");
+        }
     }
 
-    public function upload() {
+    public function upload()
+    {
         $config = &$this->config;
         $file = &$this->file;
         $url = $message = "";
 
         if ($config['disabled'] || !$config['access']['files']['upload']) {
-            if (isset($file['tmp_name'])) @unlink($file['tmp_name']);
+            if (isset($file['tmp_name'])) {
+                @unlink($file['tmp_name']);
+            }
             $message = $this->label("You don't have permissions to upload files.");
 
         } elseif (true === ($message = $this->checkUploadedFile())) {
@@ -315,9 +349,9 @@ 
                 (false !== ($gdir = $this->checkInputDir($this->get['dir'])))
             ) {
                 $udir = path::normalize("$dir$gdir");
-                if (substr($udir, 0, strlen($dir)) !== $dir)
-                    $message = $this->label("Unknown error.");
-                else {
+                if (substr($udir, 0, strlen($dir)) !== $dir) {
+                                    $message = $this->label("Unknown error.");
+                } else {
                     $l = strlen($dir);
                     $dir = "$udir/";
                     $udir = substr($udir, $l);
@@ -325,8 +359,9 @@ 
             }
 
             if (!strlen($message)) {
-                if (!is_dir(path::normalize($dir)))
-                    @mkdir(path::normalize($dir), $this->config['dirPerms'], true);
+                if (!is_dir(path::normalize($dir))) {
+                                    @mkdir(path::normalize($dir), $this->config['dirPerms'], true);
+                }
 
                 $filename = $this->normalizeFilename($file['name']);
                 $target = file::getInexistantFilename($dir . $filename);
@@ -334,21 +369,25 @@ 
                 if (!@move_uploaded_file($file['tmp_name'], $target) &&
                     !@rename($file['tmp_name'], $target) &&
                     !@copy($file['tmp_name'], $target)
-                )
-                    $message = $this->label("Cannot move uploaded file to target folder.");
-                else {
-                    if (function_exists('chmod'))
-                        @chmod($target, $this->config['filePerms']);
+                ) {
+                                    $message = $this->label("Cannot move uploaded file to target folder.");
+                } else {
+                    if (function_exists('chmod')) {
+                                            @chmod($target, $this->config['filePerms']);
+                    }
                     $this->makeThumb($target);
                     $url = $this->typeURL;
-                    if (isset($udir)) $url .= "/$udir";
+                    if (isset($udir)) {
+                        $url .= "/$udir";
+                    }
                     $url .= "/" . basename($target);
                     if (preg_match('/^([a-z]+)\:\/\/([^\/^\:]+)(\:(\d+))?\/(.+)$/', $url, $patt)) {
                         list($unused, $protocol, $domain, $unused, $port, $path) = $patt;
                         $base = "$protocol://$domain" . (strlen($port) ? ":$port" : "") . "/";
                         $url = $base . path::urlPathEncode($path);
-                    } else
-                        $url = path::urlPathEncode($url);
+                    } else {
+                                            $url = path::urlPathEncode($url);
+                    }
                 }
             }
         }
@@ -356,16 +395,19 @@ 
         if (strlen($message) &&
             isset($this->file['tmp_name']) &&
             file_exists($this->file['tmp_name'])
-        )
-            @unlink($this->file['tmp_name']);
+        ) {
+                    @unlink($this->file['tmp_name']);
+        }
 
-        if (strlen($message) && method_exists($this, 'errorMsg'))
-            $this->errorMsg($message);
+        if (strlen($message) && method_exists($this, 'errorMsg')) {
+                    $this->errorMsg($message);
+        }
         $this->callBack($url, $message);
     }
 
 
-	protected function getTransaliasSettings() {
+	protected function getTransaliasSettings()
+	{
 		$modx = DocumentParser::getInstance();
 
 		// Cleaning uploaded filename?
@@ -385,7 +427,8 @@ 
 	}
 
 
-	protected function normalizeFilename($filename) {
+	protected function normalizeFilename($filename)
+	{
 		if ($this->getTransaliasSettings()) {
         		$format = strrchr($filename, ".");
         		$filename = str_replace($format, "", $filename);
@@ -394,16 +437,19 @@ 
         	return $filename;
 	}
 
-	protected function normalizeDirname($dirname) {
+	protected function normalizeDirname($dirname)
+	{
         return $this->modx->stripAlias($dirname);
     }
 
-    protected function checkUploadedFile(array $aFile=null) {
+    protected function checkUploadedFile(array $aFile=null)
+    {
         $config = &$this->config;
         $file = ($aFile === null) ? $this->file : $aFile;
 
-        if (!is_array($file) || !isset($file['name']))
-            return $this->label("Unknown error");
+        if (!is_array($file) || !isset($file['name'])) {
+                    return $this->label("Unknown error");
+        }
 
         if (is_array($file['name'])) {
             foreach ($file['name'] as $i => $name) {
@@ -412,8 +458,9 @@ 
                     'tmp_name' => $file['tmp_name'][$i],
                     'error' => $file['error'][$i]
                 ));
-                if ($return !== true)
-                    return "$name: $return";
+                if ($return !== true) {
+                                    return "$name: $return";
+                }
             }
             return true;
         }
@@ -422,8 +469,8 @@ 
         $typePatt = strtolower(text::clearWhitespaces($this->types[$this->type]));
 
         // CHECK FOR UPLOAD ERRORS
-        if ($file['error'])
-            return
+        if ($file['error']) {
+                    return
                 ($file['error'] == UPLOAD_ERR_INI_SIZE) ?
                     $this->label("The uploaded file exceeds {size} bytes.",
                         array('size' => ini_get('upload_max_filesize'))) : (
@@ -440,14 +487,17 @@ 
                     $this->label("Failed to write file.") :
                     $this->label("Unknown error.")
             )))));
+        }
 
         // HIDDEN FILENAMES CHECK
-        elseif (substr($file['name'], 0, 1) == ".")
-            return $this->label("File name shouldn't begins with '.'");
+        elseif (substr($file['name'], 0, 1) == ".") {
+                    return $this->label("File name shouldn't begins with '.'");
+        }
 
         // EXTENSION CHECK
-        elseif (!$this->validateExtension($extension, $this->type))
-            return $this->label("Denied file extension.");
+        elseif (!$this->validateExtension($extension, $this->type)) {
+                    return $this->label("Denied file extension.");
+        }
 
         // SPECIAL DIRECTORY TYPES CHECK (e.g. *img)
         elseif (preg_match('/^\*([^ ]+)(.*)?$/s', $typePatt, $patt)) {
@@ -457,70 +507,84 @@ 
                 $type = new $class();
                 $cfg = $config;
                 $cfg['filename'] = $file['name'];
-                if (strlen($params))
-                    $cfg['params'] = trim($params);
+                if (strlen($params)) {
+                                    $cfg['params'] = trim($params);
+                }
                 $response = $type->checkFile($file['tmp_name'], $cfg);
-                if ($response !== true)
-                    return $this->label($response);
-            } else
-                return $this->label("Non-existing directory type.");
+                if ($response !== true) {
+                                    return $this->label($response);
+                }
+            } else {
+                            return $this->label("Non-existing directory type.");
+            }
         }
 
         // IMAGE RESIZE
         $img = image::factory($this->imageDriver, $file['tmp_name']);
-        if (!$img->initError && !$this->imageResize($img, $file['tmp_name']))
-            return $this->label("The image is too big and/or cannot be resized.");
+        if (!$img->initError && !$this->imageResize($img, $file['tmp_name'])) {
+                    return $this->label("The image is too big and/or cannot be resized.");
+        }
 
 
 	// CHECK FOR MODX MAX FILE SIZE
 	$actualfilesize=filesize($file['tmp_name']);
-	if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize'])
-	    return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
+	if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize']) {
+		    return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
+	}
 
         return true;
     }
 
-    protected function checkInputDir($dir, $inclType=true, $existing=true) {
+    protected function checkInputDir($dir, $inclType=true, $existing=true)
+    {
         $dir = path::normalize($dir);
-        if (substr($dir, 0, 1) == "/")
-            $dir = substr($dir, 1);
+        if (substr($dir, 0, 1) == "/") {
+                    $dir = substr($dir, 1);
+        }
 
-        if ((substr($dir, 0, 1) == ".") || (substr(basename($dir), 0, 1) == "."))
-            return false;
+        if ((substr($dir, 0, 1) == ".") || (substr(basename($dir), 0, 1) == ".")) {
+                    return false;
+        }
 
         if ($inclType) {
             $first = explode("/", $dir);
             $first = $first[0];
-            if ($first != $this->type)
-                return false;
+            if ($first != $this->type) {
+                            return false;
+            }
             $return = $this->removeTypeFromPath($dir);
         } else {
             $return = $dir;
             $dir = "{$this->type}/$dir";
         }
 
-        if (!$existing)
-            return $return;
+        if (!$existing) {
+                    return $return;
+        }
 
         $path = "{$this->config['uploadDir']}/$dir";
         return (is_dir($path) && is_readable($path)) ? $return : false;
     }
 
-    protected function validateExtension($ext, $type) {
+    protected function validateExtension($ext, $type)
+    {
         $ext = trim(strtolower($ext));
-        if (!isset($this->types[$type]))
-            return false;
+        if (!isset($this->types[$type])) {
+                    return false;
+        }
 
         $exts = strtolower(text::clearWhitespaces($this->config['deniedExts']));
         if (strlen($exts)) {
             $exts = explode(" ", $exts);
-            if (in_array($ext, $exts))
-                return false;
+            if (in_array($ext, $exts)) {
+                            return false;
+            }
         }
 
         $exts = trim($this->types[$type]);
-        if (!strlen($exts) || substr($exts, 0, 1) == "*")
-            return true;
+        if (!strlen($exts) || substr($exts, 0, 1) == "*") {
+                    return true;
+        }
 
         if (substr($exts, 0, 1) == "!") {
             $exts = explode(" ", trim(strtolower(substr($exts, 1))));
@@ -531,26 +595,32 @@ 
         return in_array($ext, $exts);
     }
 
-    protected function getTypeFromPath($path) {
+    protected function getTypeFromPath($path)
+    {
         return preg_match('/^([^\/]*)\/.*$/', $path, $patt)
             ? $patt[1] : $path;
     }
 
-    protected function removeTypeFromPath($path) {
+    protected function removeTypeFromPath($path)
+    {
         return preg_match('/^[^\/]*\/(.*)$/', $path, $patt)
             ? $patt[1] : "";
     }
 
-    protected function imageResize($image, $file=null) {
+    protected function imageResize($image, $file=null)
+    {
 
         if (!($image instanceof image)) {
             $img = image::factory($this->imageDriver, $image);
-            if ($img->initError) return false;
+            if ($img->initError) {
+                return false;
+            }
             $file = $image;
-        } elseif ($file === null)
-            return false;
-        else
-            $img = $image;
+        } elseif ($file === null) {
+                    return false;
+        } else {
+                    $img = $image;
+        }
 
         $orientation = 1;
         if (function_exists("exif_read_data")) {
@@ -572,8 +642,9 @@ 
             )
             ) &&
             ($orientation == 1)
-        )
-            return true;
+        ) {
+                    return true;
+        }
 
 
         // PROPORTIONAL RESIZE
@@ -593,15 +664,17 @@ 
                 $width = $img->getPropWidth($height);
             }
 
-            if (isset($width) && isset($height) && !$img->resize($width, $height))
-                return false;
+            if (isset($width) && isset($height) && !$img->resize($width, $height)) {
+                            return false;
+            }
 
         // RESIZE TO FIT
         } elseif (
             $this->config['maxImageWidth'] && $this->config['maxImageHeight'] &&
             !$img->resizeFit($this->config['maxImageWidth'], $this->config['maxImageHeight'])
-        )
-            return false;
+        ) {
+                    return false;
+        }
 
         // AUTO FLIP AND ROTATE FROM EXIF
         if ((($orientation == 2) && !$img->flipHorizontal()) ||
@@ -611,11 +684,13 @@ 
             (($orientation == 6) && !$img->rotate(90)) ||
             (($orientation == 7) && (!$img->flipHorizontal() || !$img->rotate(90))) ||
             (($orientation == 8) && !$img->rotate(270))
-        )
-            return false;
-        if (($orientation >= 2) && ($orientation <= 8) && ($this->imageDriver == "imagick"))
-            try {
+        ) {
+                    return false;
+        }
+        if (($orientation >= 2) && ($orientation <= 8) && ($this->imageDriver == "imagick")) {
+                    try {
                 $img->image->setImageProperty('exif:Orientation', "1");
+        }
             } catch (Exception $e) {}
 
         // WATERMARK
@@ -646,22 +721,26 @@ 
 
     }
 
-    protected function makeThumb($file, $overwrite=true) {
+    protected function makeThumb($file, $overwrite=true)
+    {
         $img = image::factory($this->imageDriver, $file);
 
         // Drop files which are not images
-        if ($img->initError)
-            return true;
+        if ($img->initError) {
+                    return true;
+        }
 
         $thumb = substr($file, strlen($this->config['uploadDir']));
         $thumb = $this->config['uploadDir'] . "/" . $this->config['thumbsDir'] . "/" . $thumb;
         $thumb = path::normalize($thumb);
         $thumbDir = dirname($thumb);
-        if (!is_dir($thumbDir) && !@mkdir($thumbDir, $this->config['dirPerms'], true))
-            return false;
+        if (!is_dir($thumbDir) && !@mkdir($thumbDir, $this->config['dirPerms'], true)) {
+                    return false;
+        }
 
-        if (!$overwrite && is_file($thumb))
-            return true;
+        if (!$overwrite && is_file($thumb)) {
+                    return true;
+        }
 
         // Images with smaller resolutions than thumbnails
         /*if (($img->width <= $this->config['thumbWidth']) &&
@@ -674,8 +753,9 @@ 
 
         // Resize image
         } else */
-        if (!$img->resizeFit($this->config['thumbWidth'], $this->config['thumbHeight']))
-            return false;
+        if (!$img->resizeFit($this->config['thumbWidth'], $this->config['thumbHeight'])) {
+                    return false;
+        }
 
         if ( $this->imageDriver == 'gd' ) {
             $width  = imagesx( $img->image );
@@ -697,7 +777,8 @@ 
         ));
     }
 
-    protected function localize($langCode) {
+    protected function localize($langCode)
+    {
         require "lang/{$langCode}.php";
         setlocale(LC_ALL, $lang['_locale']);
         $this->charset = $lang['_charset'];
@@ -712,27 +793,34 @@ 
         $this->labels = $lang;
     }
 
-    protected function label($string, array $data=null) {
+    protected function label($string, array $data=null)
+    {
         $return = isset($this->labels[$string]) ? $this->labels[$string] : $string;
-        if (is_array($data))
-            foreach ($data as $key => $val)
+        if (is_array($data)) {
+                    foreach ($data as $key => $val)
                 $return = str_replace("{{$key}}", $val, $return);
+        }
         return $return;
     }
 
-    protected function backMsg($message, array $data=null) {
+    protected function backMsg($message, array $data=null)
+    {
         $message = $this->label($message, $data);
-        if (isset($this->file['tmp_name']) && file_exists($this->file['tmp_name']))
-            @unlink($this->file['tmp_name']);
+        if (isset($this->file['tmp_name']) && file_exists($this->file['tmp_name'])) {
+                    @unlink($this->file['tmp_name']);
+        }
         $this->callBack("", $message);
         die;
     }
 
-    protected function callBack($url, $message="") {
+    protected function callBack($url, $message="")
+    {
         $message = text::jsValue($message);
         $CKfuncNum = isset($this->opener['CKEditor']['funcNum'])
             ? $this->opener['CKEditor']['funcNum'] : 0;
-        if (!$CKfuncNum) $CKfuncNum = 0;
+        if (!$CKfuncNum) {
+            $CKfuncNum = 0;
+        }
         header("Content-Type: text/html; charset={$this->charset}");
 
 ?><html>
@@ -769,7 +857,8 @@ 
 
     }
 
-    protected function get_htaccess() {
+    protected function get_htaccess()
+    {
         return "<IfModule mod_php4.c>
   php_value engine off
 </IfModule>

manager/media/browser/mcpuk/core/autoload.php

Spacing +12 added lines, -12 removed lines

@@ -26,7 +26,7 @@ 
 $modx = DocumentParser::getInstance();
 $modx->db->connect();
 startCMSSession();
-if(!isset($_SESSION['mgrValidated'])) {
+if (!isset($_SESSION['mgrValidated'])) {
         die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 define('IN_MANAGER_MODE', true);
@@ -34,7 +34,7 @@ 
 
 $manager_language = $modx->config['manager_language'];
 // Pass language code from MODX to KCFinder
-if(!file_exists("../../../includes/lang/".$manager_language.".inc.php")) {
+if (!file_exists("../../../includes/lang/".$manager_language.".inc.php")) {
     $manager_language = "english"; // if not set, get the english language file.
 }
 include_once "../../../includes/lang/".$manager_language.".inc.php";
@@ -42,7 +42,7 @@ 
 
 // PHP VERSION CHECK
 if (substr(PHP_VERSION, 0, strpos(PHP_VERSION, '.')) < 5)
-    die("You are using PHP " . PHP_VERSION . " when KCFinder require at least version 5! Some systems has an option to change the active PHP version. Please refer to your hosting provider or upgrade your PHP distribution.");
+    die("You are using PHP ".PHP_VERSION." when KCFinder require at least version 5! Some systems has an option to change the active PHP version. Please refer to your hosting provider or upgrade your PHP distribution.");
 
 
 // SAFE MODE CHECK
@@ -51,7 +51,7 @@ 
 
 
 // MAGIC AUTOLOAD CLASSES FUNCTION
-function autoloadda9d06472ccb71b84928677ce2a6ca89($class) {
+function autoloadda9d06472ccb71b84928677ce2a6ca89($class){
     static $classes = null;
     if ($classes === null) {
         $classes = array(
@@ -75,7 +75,7 @@ 
         );
     }
     if (isset($classes[$class])) {
-        require dirname(__FILE__) . $classes[$class];
+        require dirname(__FILE__).$classes[$class];
     }
 }
 spl_autoload_register('autoloadda9d06472ccb71b84928677ce2a6ca89', true);
@@ -84,18 +84,18 @@ 
 // json_encode() IMPLEMENTATION IF JSON EXTENSION IS MISSING
 if (!function_exists("json_encode")) {
 
-    function kcfinder_json_string_encode($string) {
-        return '"' .
+    function kcfinder_json_string_encode($string){
+        return '"'.
             str_replace('/', "\\/",
             str_replace("\t", "\\t",
             str_replace("\r", "\\r",
             str_replace("\n", "\\n",
             str_replace('"', "\\\"",
             str_replace("\\", "\\\\",
-        $string)))))) . '"';
+        $string)))))).'"';
     }
 
-    function json_encode($data) {
+    function json_encode($data){
 
         if (is_array($data)) {
             $ret = array();
@@ -103,14 +103,14 @@ 
             // OBJECT
             if (array_keys($data) !== range(0, count($data) - 1)) {
                 foreach ($data as $key => $val)
-                    $ret[] = kcfinder_json_string_encode($key) . ':' . json_encode($val);
-                return "{" . implode(",", $ret) . "}";
+                    $ret[] = kcfinder_json_string_encode($key).':'.json_encode($val);
+                return "{".implode(",", $ret)."}";
 
             // ARRAY
             } else {
                 foreach ($data as $val)
                     $ret[] = json_encode($val);
-                return "[" . implode(",", $ret) . "]";
+                return "[".implode(",", $ret)."]";
             }
 
         // BOOLEAN OR NULL

manager/media/script/air-datepicker/datepicker.inc.php

Spacing +7 added lines, -7 removed lines

@@ -1,13 +1,13 @@ 
 <?php
-class DATEPICKER {
+class DATEPICKER{
     /**
      * @return string
      */
-    public function getDP() {
+    public function getDP(){
         $modx = DocumentParser::getInstance();
 
         $load_script = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
-        if(!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
+        if (!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
 		$modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
         return $modx->mergeSettingsContent($load_script);
     }
@@ -15,14 +15,14 @@ 
     /**
      * @return string
      */
-    public function getLangCode() {
+    public function getLangCode(){
         $modx = DocumentParser::getInstance(); global $modx_lang_attribute;
 
-        if(!$modx_lang_attribute) return 'en';
+        if (!$modx_lang_attribute) return 'en';
 
         $lc = $modx_lang_attribute;
-        if($lc === 'uk') return 'ru';
-        $dp_path = str_replace('\\','/',dirname(__FILE__));
+        if ($lc === 'uk') return 'ru';
+        $dp_path = str_replace('\\', '/', dirname(__FILE__));
 
         return (is_file("{$dp_path}/i18n/datepicker.{$lc}.js")) ? $modx_lang_attribute : 'en';
     }

Braces +15 added lines, -6 removed lines

@@ -1,13 +1,17 @@ 
 <?php
-class DATEPICKER {
+class DATEPICKER
+{
     /**
      * @return string
      */
-    public function getDP() {
+    public function getDP()
+    {
         $modx = DocumentParser::getInstance();
 
         $load_script = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
-        if(!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
+        if(!isset($modx->config['lang_code'])) {
+            $modx->config['lang_code'] = $this->getLangCode();
+        }
 		$modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
         return $modx->mergeSettingsContent($load_script);
     }
@@ -15,13 +19,18 @@ 
     /**
      * @return string
      */
-    public function getLangCode() {
+    public function getLangCode()
+    {
         $modx = DocumentParser::getInstance(); global $modx_lang_attribute;
 
-        if(!$modx_lang_attribute) return 'en';
+        if(!$modx_lang_attribute) {
+            return 'en';
+        }
 
         $lc = $modx_lang_attribute;
-        if($lc === 'uk') return 'ru';
+        if($lc === 'uk') {
+            return 'ru';
+        }
         $dp_path = str_replace('\\','/',dirname(__FILE__));
 
         return (is_file("{$dp_path}/i18n/datepicker.{$lc}.js")) ? $modx_lang_attribute : 'en';