evolution-cms / evolution

manager/includes/controls/datasetpager.class.php

Doc Comments +6 added lines

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

Indentation +149 added lines, -149 removed lines

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

Spacing +43 added lines, -43 removed lines

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

Braces +21 added lines, -10 removed lines

@@ -10,7 +10,8 @@ 
 
 $__DataSetPagerCnt = 0;
 
-class DataSetPager {
+class DataSetPager
+{
 
 	public $ds; // datasource
     public $pageSize;
@@ -31,7 +32,8 @@ 
     public $renderPagerFnc;
     public $renderPagerFncArgs;
 
-    public function __construct($id, $ds, $pageSize = 10, $pageNumber = -1) {
+    public function __construct($id, $ds, $pageSize = 10, $pageNumber = -1)
+    {
 		global $_PAGE; // use view state object
 
 		global $__DataSetPagerCnt;
@@ -61,35 +63,42 @@ 
 		$this->pager = '';
 	}
 
-    public function getRenderedPager() {
+    public function getRenderedPager()
+    {
 		return $this->pager;
 	}
 
-    public function getRenderedRows() {
+    public function getRenderedRows()
+    {
 		return $this->rows;
 	}
 
-    public function setDataSource($ds) {
+    public function setDataSource($ds)
+    {
 		$this->ds = $ds;
 	}
 
-    public function setPageSize($ps) {
+    public function setPageSize($ps)
+    {
 		$this->pageSize = $ps;
 	}
 
-    public function setRenderRowFnc($fncName, $args = "") {
+    public function setRenderRowFnc($fncName, $args = "")
+    {
 		$this->renderRowFnc = &$fncName;
 		$this->renderRowFncArgs = $args;    // extra agruments
 
 
 	}
 
-    public function setRenderPagerFnc($fncName, $args = "") {
+    public function setRenderPagerFnc($fncName, $args = "")
+    {
 		$this->renderPagerFnc = $fncName;
 		$this->renderPagerFncArgs = $args;    // extra agruments
 	}
 
-    public function render() {
+    public function render()
+    {
 		global $modx, $_PAGE;
 
 		$isDataset = $modx->db->isResult($this->ds);
@@ -142,8 +151,10 @@ 
 					$url = $_SERVER['PHP_SELF'] . '?';
 				}
 				$i = 0;
-				foreach($_GET as $n => $v) if($n != 'dpgn' . $this->id) {
+				foreach($_GET as $n => $v) {
+				    if($n != 'dpgn' . $this->id) {
 					$i++;
+				}
 					$url .= (($i > 1) ? "&" : "") . "$n=$v";
 				}
 				if($i >= 1) {

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

Doc Comments +6 added lines

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

Indentation +209 added lines, -209 removed lines

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

Spacing +59 added lines, -59 removed lines

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

Braces +85 added lines, -69 removed lines

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

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

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

manager/includes/extenders/maketable.class.php

Doc Comments +6 added lines, -4 removed lines

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

Indentation +439 added lines, -439 removed lines

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

Spacing +124 added lines, -124 removed lines

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

Braces +83 added lines, -42 removed lines

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

manager/includes/menu.class.inc.php

Doc Comments +4 added lines

@@ -41,6 +41,10 @@
         $this->menu = $new;
     }
 
+    /**
+     * @param string $parentid
+     * @param integer $level
+     */
     public function DrawSub($parentid, $level)
     {
         global $modx;

Spacing +4 added lines, -4 removed lines

@@ -67,14 +67,14 @@ 
                 $countChild++;
                 $id = $value[0];
                 $ph['id'] = $id;
-                $ph['li_class'] = $this->get_li_class($id) . $value[10];
+                $ph['li_class'] = $this->get_li_class($id).$value[10];
                 $ph['href'] = $value[3];
                 $ph['alt'] = $value[4];
                 $ph['target'] = $value[7];
                 $ph['onclick'] = $value[5];
                 $ph['a_class'] = $this->get_a_class($id);
                 $ph['LinkAttr'] = $this->getLinkAttr($id);
-                $ph['itemName'] = $value[2] . $this->getItemName($id);
+                $ph['itemName'] = $value[2].$this->getItemName($id);
 
                 $ph['DrawSub'] = '';
 
@@ -113,7 +113,7 @@ 
     public function get_li_class($id)
     {
         if (isset($this->menu[$id])) {
-            return $this->defaults['parentClass'] . ' ';
+            return $this->defaults['parentClass'].' ';
         } else {
             return '';
         }
@@ -122,7 +122,7 @@ 
     public function get_a_class($id)
     {
         if (isset($this->menu[$id])) {
-            return ' class="' . $this->defaults['parentLinkClass'] . '"';
+            return ' class="'.$this->defaults['parentLinkClass'].'"';
         } else {
             return '';
         }

manager/frames/nodes.php

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
  *  Build and return document tree view nodes
  *
  */
-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.');
 }
 
@@ -18,11 +18,11 @@ 
     exit('send some data');
 } //??
 
-$indent = (int)$_REQUEST['indent'];
-$parent = (int)$_REQUEST['parent'];
-$expandAll = (int)$_REQUEST['expandAll'];
+$indent = (int) $_REQUEST['indent'];
+$parent = (int) $_REQUEST['parent'];
+$expandAll = (int) $_REQUEST['expandAll'];
 $output = '';
-$theme = $manager_theme . "/";
+$theme = $manager_theme."/";
 $hereid = isset($_REQUEST['id']) && is_numeric($_REQUEST['id']) ? $_REQUEST['id'] : '';
 
 if (isset($_REQUEST['showonlyfolders'])) {

manager/actions/logging.static.php

Spacing +27 added lines, -27 removed lines

@@ -1,5 +1,5 @@ 
 <?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.");

 }

 if (!$modx->hasPermission('logs')) {

@@ -65,7 +65,7 @@ 
                             $logs_user = record_sort(array_unique_multi($logs, 'internalKey'), 'username');

                             foreach ($logs_user as $row) {

                                 $selectedtext = $row['internalKey'] == $_REQUEST['searchuser'] ? ' selected="selected"' : '';

-                                echo "\t\t" . '<option value="' . $row['internalKey'] . '"' . $selectedtext . '>' . $row['username'] . "</option>\n";

+                                echo "\t\t".'<option value="'.$row['internalKey'].'"'.$selectedtext.'>'.$row['username']."</option>\n";

                             }

                             ?>

                         </select>

@@ -86,7 +86,7 @@ 
                                     continue;

                                 }

                                 $selectedtext = $row['action'] == $_REQUEST['action'] ? ' selected="selected"' : '';

-                                echo "\t\t" . '<option value="' . $row['action'] . '"' . $selectedtext . '>' . $row['action'] . ' - ' . $action . "</option>\n";

+                                echo "\t\t".'<option value="'.$row['action'].'"'.$selectedtext.'>'.$row['action'].' - '.$action."</option>\n";

                             }

                             ?>

                         </select>

@@ -102,7 +102,7 @@ 
                             $logs_items = record_sort(array_unique_multi($logs, 'itemid'), 'itemid');

                             foreach ($logs_items as $row) {

                                 $selectedtext = $row['itemid'] == $_REQUEST['itemid'] ? ' selected="selected"' : '';

-                                echo "\t\t" . '<option value="' . $row['itemid'] . '"' . $selectedtext . '>' . $row['itemid'] . "</option>\n";

+                                echo "\t\t".'<option value="'.$row['itemid'].'"'.$selectedtext.'>'.$row['itemid']."</option>\n";

                             }

                             ?>

                         </select>

@@ -118,7 +118,7 @@ 
                             $logs_names = record_sort(array_unique_multi($logs, 'itemname'), 'itemname');

                             foreach ($logs_names as $row) {

                                 $selectedtext = $row['itemname'] == $_REQUEST['itemname'] ? ' selected="selected"' : '';

-                                echo "\t\t" . '<option value="' . $row['itemname'] . '"' . $selectedtext . '>' . $row['itemname'] . "</option>\n";

+                                echo "\t\t".'<option value="'.$row['itemname'].'"'.$selectedtext.'>'.$row['itemname']."</option>\n";

                             }

                             ?>

                         </select>

@@ -176,26 +176,26 @@ 
     // get the selections the user made.

     $sqladd = array();

     if ($_REQUEST['searchuser'] != 0) {

-        $sqladd[] = "internalKey='" . (int)$_REQUEST['searchuser'] . "'";

+        $sqladd[] = "internalKey='".(int) $_REQUEST['searchuser']."'";

     }

     if ($_REQUEST['action'] != 0) {

-        $sqladd[] = "action=" . (int)$_REQUEST['action'];

+        $sqladd[] = "action=".(int) $_REQUEST['action'];

     }

     if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") {

-        $sqladd[] = "itemid='" . $_REQUEST['itemid'] . "'";

+        $sqladd[] = "itemid='".$_REQUEST['itemid']."'";

     }

     if ($_REQUEST['itemname'] != '0') {

-        $sqladd[] = "itemname='" . $modx->db->escape($_REQUEST['itemname']) . "'";

+        $sqladd[] = "itemname='".$modx->db->escape($_REQUEST['itemname'])."'";

     }

     if ($_REQUEST['message'] != "") {

-        $sqladd[] = "message LIKE '%" . $modx->db->escape($_REQUEST['message']) . "%'";

+        $sqladd[] = "message LIKE '%".$modx->db->escape($_REQUEST['message'])."%'";

     }

     // date stuff

     if ($_REQUEST['datefrom'] != "") {

-        $sqladd[] = "timestamp>" . $modx->toTimeStamp($_REQUEST['datefrom']);

+        $sqladd[] = "timestamp>".$modx->toTimeStamp($_REQUEST['datefrom']);

     }

     if ($_REQUEST['dateto'] != "") {

-        $sqladd[] = "timestamp<" . $modx->toTimeStamp($_REQUEST['dateto']);

+        $sqladd[] = "timestamp<".$modx->toTimeStamp($_REQUEST['dateto']);

     }

 

     // If current position is not set, set it to zero

@@ -208,7 +208,7 @@ 
     // Number of result to display on the page, will be in the LIMIT of the sql query also

     $int_num_result = is_numeric($_REQUEST['nrresults']) ? $_REQUEST['nrresults'] : $number_of_logs;

 

-    $extargv = "&a=13&searchuser=" . $_REQUEST['searchuser'] . "&action=" . $_REQUEST['action'] . "&itemid=" . $_REQUEST['itemid'] . "&itemname=" . $_REQUEST['itemname'] . "&message=" . $_REQUEST['message'] . "&dateto=" . $_REQUEST['dateto'] . "&datefrom=" . $_REQUEST['datefrom'] . "&nrresults=" . $int_num_result . "&log_submit=" . $_REQUEST['log_submit']; // extra argv here (could be anything depending on your page)

+    $extargv = "&a=13&searchuser=".$_REQUEST['searchuser']."&action=".$_REQUEST['action']."&itemid=".$_REQUEST['itemid']."&itemname=".$_REQUEST['itemname']."&message=".$_REQUEST['message']."&dateto=".$_REQUEST['dateto']."&datefrom=".$_REQUEST['datefrom']."&nrresults=".$int_num_result."&log_submit=".$_REQUEST['log_submit']; // extra argv here (could be anything depending on your page)

 

     // build the sql

     $limit = $num_rows = $modx->db->getValue($modx->db->select('COUNT(*)', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : '')));

@@ -216,9 +216,9 @@ 
     $rs = $modx->db->select('*', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : ''), 'timestamp DESC, id DESC', "{$int_cur_position}, {$int_num_result}");

 

 if ($limit < 1) {

-    echo '<p>' . $_lang["mgrlog_emptysrch"] . '</p>';

+    echo '<p>'.$_lang["mgrlog_emptysrch"].'</p>';

 } else {

-    echo '<p>' . $_lang["mgrlog_sortinst"] . '</p>';

+    echo '<p>'.$_lang["mgrlog_sortinst"].'</p>';

 

     include_once "paginate.inc.php";

     // New instance of the Paging class, you can modify the color and the width of the html table

@@ -230,11 +230,11 @@ 
     $current_row = $int_cur_position / $int_num_result;

 

     // Display the result as you like...

-    print "<p>" . $_lang["paging_showing"] . " " . $array_paging['lower'];

-    print " " . $_lang["paging_to"] . " " . $array_paging['upper'];

-    print " (" . $array_paging['total'] . " " . $_lang["paging_total"] . ")<br />";

-    $paging = $array_paging['first_link'] . $_lang["paging_first"] . (isset($array_paging['first_link']) ? "</a> " : " ");

-    $paging .= $array_paging['previous_link'] . $_lang["paging_prev"] . (isset($array_paging['previous_link']) ? "</a> " : " ");

+    print "<p>".$_lang["paging_showing"]." ".$array_paging['lower'];

+    print " ".$_lang["paging_to"]." ".$array_paging['upper'];

+    print " (".$array_paging['total']." ".$_lang["paging_total"].")<br />";

+    $paging = $array_paging['first_link'].$_lang["paging_first"].(isset($array_paging['first_link']) ? "</a> " : " ");

+    $paging .= $array_paging['previous_link'].$_lang["paging_prev"].(isset($array_paging['previous_link']) ? "</a> " : " ");

     $pagesfound = sizeof($array_row_paging);

     if ($pagesfound > 6) {

         $paging .= $array_row_paging[$current_row - 2]; // ."&nbsp;";

@@ -244,11 +244,11 @@ 
         $paging .= $array_row_paging[$current_row + 2]; // ."&nbsp;";

     } else {

         for ($i = 0; $i < $pagesfound; $i++) {

-            $paging .= $array_row_paging[$i] . "&nbsp;";

+            $paging .= $array_row_paging[$i]."&nbsp;";

         }

     }

-    $paging .= $array_paging['next_link'] . $_lang["paging_next"] . (isset($array_paging['next_link']) ? "</a> " : " ") . " ";

-    $paging .= $array_paging['last_link'] . $_lang["paging_last"] . (isset($array_paging['last_link']) ? "</a> " : " ") . " ";

+    $paging .= $array_paging['next_link'].$_lang["paging_next"].(isset($array_paging['next_link']) ? "</a> " : " ")." ";

+    $paging .= $array_paging['last_link'].$_lang["paging_last"].(isset($array_paging['last_link']) ? "</a> " : " ")." ";

     // The above exemple print somethings like:

     // Results 1 to 20 of 597  <<< 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 >>>

     // Of course you can now play with array_row_paging in order to print

@@ -282,16 +282,16 @@ 
                     if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) {

                         $item = '<div style="text-align:center;">-</div>';

                     } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) {

-                        $item = '<a href="index.php?a=3&amp;id=' . $logentry['itemid'] . '">' . $logentry['itemname'] . '</a>';

+                        $item = '<a href="index.php?a=3&amp;id='.$logentry['itemid'].'">'.$logentry['itemname'].'</a>';

                     } else {

                         $item = $logentry['itemname'];

                     }

                     //index.php?a=13&searchuser=' . $logentry['internalKey'] . '&action=' . $logentry['action'] . '&itemname=' . $logentry['itemname'] . '&log_submit=true'

-                    $user_drill = 'index.php?a=13&searchuser=' . $logentry['internalKey'] . '&itemname=0&log_submit=true';

+                    $user_drill = 'index.php?a=13&searchuser='.$logentry['internalKey'].'&itemname=0&log_submit=true';

                     ?>

                     <tr>

-                        <td><?= '<a href="' . $user_drill . '">' . $logentry['username'] . '</a>' ?></td>

-                        <td class="text-nowrap"><?= '[' . $logentry['action'] . '] ' . $logentry['message'] ?></td>

+                        <td><?= '<a href="'.$user_drill.'">'.$logentry['username'].'</a>' ?></td>

+                        <td class="text-nowrap"><?= '['.$logentry['action'].'] '.$logentry['message'] ?></td>

                         <td class="text-xs-right"><?= $logentry['itemid'] ?></td>

                         <td><?= $item ?></td>

                         <td class="text-nowrap"><?= $modx->toDateFormat($logentry['timestamp'] + $server_offset_time) ?></td>

Braces +36 added lines, -36 removed lines

@@ -1,22 +1,22 @@ 
 <?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.");

 }

-if (!$modx->hasPermission('logs')) {

+if (!$modx->hasPermission('logs')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 

-function array_unique_multi($array, $checkKey)

-{

+function array_unique_multi($array, $checkKey)
+{
     // Use the builtin if we're not a multi-dimensional array

-    if (!is_array(current($array)) || empty($checkKey)) {

+    if (!is_array(current($array)) || empty($checkKey)) {
         return array_unique($array);

     }

 

     $ret = array();

     $checkValues = array(); // contains the unique key Values

-    foreach ($array as $key => $current) {

-        if (in_array($current[$checkKey], $checkValues)) {

+    foreach ($array as $key => $current) {
+        if (in_array($current[$checkKey], $checkValues)) {
             continue;

         } // duplicate

 

@@ -26,17 +26,17 @@ 
     return $ret;

 }

 

-function record_sort($array, $key)

-{

+function record_sort($array, $key)
+{
     $hash = array();

-    foreach ($array as $k => $v) {

+    foreach ($array as $k => $v) {
         $hash[$k] = $v[$key];

     }

 

     natsort($hash);

 

     $records = array();

-    foreach ($hash as $k => $row) {

+    foreach ($hash as $k => $row) {
         $records[$k] = $array[$k];

     }

 

@@ -63,7 +63,7 @@ 
                             <?php

                             // get all users currently in the log

                             $logs_user = record_sort(array_unique_multi($logs, 'internalKey'), 'username');

-                            foreach ($logs_user as $row) {

+                            foreach ($logs_user as $row) {
                                 $selectedtext = $row['internalKey'] == $_REQUEST['searchuser'] ? ' selected="selected"' : '';

                                 echo "\t\t" . '<option value="' . $row['internalKey'] . '"' . $selectedtext . '>' . $row['username'] . "</option>\n";

                             }

@@ -80,9 +80,9 @@ 
                             // get all available actions in the log

                             include_once "actionlist.inc.php";

                             $logs_actions = record_sort(array_unique_multi($logs, 'action'), 'action');

-                            foreach ($logs_actions as $row) {

+                            foreach ($logs_actions as $row) {
                                 $action = getAction($row['action']);

-                                if ($action == 'Idle') {

+                                if ($action == 'Idle') {
                                     continue;

                                 }

                                 $selectedtext = $row['action'] == $_REQUEST['action'] ? ' selected="selected"' : '';

@@ -100,7 +100,7 @@ 
                             <?php

                             // get all itemid currently in logging

                             $logs_items = record_sort(array_unique_multi($logs, 'itemid'), 'itemid');

-                            foreach ($logs_items as $row) {

+                            foreach ($logs_items as $row) {
                                 $selectedtext = $row['itemid'] == $_REQUEST['itemid'] ? ' selected="selected"' : '';

                                 echo "\t\t" . '<option value="' . $row['itemid'] . '"' . $selectedtext . '>' . $row['itemid'] . "</option>\n";

                             }

@@ -116,7 +116,7 @@ 
                             <?php

                             // get all itemname currently in logging

                             $logs_names = record_sort(array_unique_multi($logs, 'itemname'), 'itemname');

-                            foreach ($logs_names as $row) {

+                            foreach ($logs_names as $row) {
                                 $selectedtext = $row['itemname'] == $_REQUEST['itemname'] ? ' selected="selected"' : '';

                                 echo "\t\t" . '<option value="' . $row['itemname'] . '"' . $selectedtext . '>' . $row['itemname'] . "</option>\n";

                             }

@@ -172,36 +172,36 @@ 
     <div class="container container-body">

 

 <?php

-if (isset($_REQUEST['log_submit'])) {

+if (isset($_REQUEST['log_submit'])) {
     // get the selections the user made.

     $sqladd = array();

-    if ($_REQUEST['searchuser'] != 0) {

+    if ($_REQUEST['searchuser'] != 0) {
         $sqladd[] = "internalKey='" . (int)$_REQUEST['searchuser'] . "'";

     }

-    if ($_REQUEST['action'] != 0) {

+    if ($_REQUEST['action'] != 0) {
         $sqladd[] = "action=" . (int)$_REQUEST['action'];

     }

-    if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") {

+    if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") {
         $sqladd[] = "itemid='" . $_REQUEST['itemid'] . "'";

     }

-    if ($_REQUEST['itemname'] != '0') {

+    if ($_REQUEST['itemname'] != '0') {
         $sqladd[] = "itemname='" . $modx->db->escape($_REQUEST['itemname']) . "'";

     }

-    if ($_REQUEST['message'] != "") {

+    if ($_REQUEST['message'] != "") {
         $sqladd[] = "message LIKE '%" . $modx->db->escape($_REQUEST['message']) . "%'";

     }

     // date stuff

-    if ($_REQUEST['datefrom'] != "") {

+    if ($_REQUEST['datefrom'] != "") {
         $sqladd[] = "timestamp>" . $modx->toTimeStamp($_REQUEST['datefrom']);

     }

-    if ($_REQUEST['dateto'] != "") {

+    if ($_REQUEST['dateto'] != "") {
         $sqladd[] = "timestamp<" . $modx->toTimeStamp($_REQUEST['dateto']);

     }

 

     // If current position is not set, set it to zero

-    if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) {

+    if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) {
         $int_cur_position = 0;

-    } else {

+    } else {
         $int_cur_position = $_REQUEST['int_cur_position'];

     }

 

@@ -215,9 +215,9 @@ 
 

     $rs = $modx->db->select('*', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : ''), 'timestamp DESC, id DESC', "{$int_cur_position}, {$int_num_result}");

 

-if ($limit < 1) {

+if ($limit < 1) {
     echo '<p>' . $_lang["mgrlog_emptysrch"] . '</p>';

-} else {

+} else {
     echo '<p>' . $_lang["mgrlog_sortinst"] . '</p>';

 

     include_once "paginate.inc.php";

@@ -236,14 +236,14 @@ 
     $paging = $array_paging['first_link'] . $_lang["paging_first"] . (isset($array_paging['first_link']) ? "</a> " : " ");

     $paging .= $array_paging['previous_link'] . $_lang["paging_prev"] . (isset($array_paging['previous_link']) ? "</a> " : " ");

     $pagesfound = sizeof($array_row_paging);

-    if ($pagesfound > 6) {

+    if ($pagesfound > 6) {
         $paging .= $array_row_paging[$current_row - 2]; // ."&nbsp;";

         $paging .= $array_row_paging[$current_row - 1]; // ."&nbsp;";

         $paging .= $array_row_paging[$current_row]; // ."&nbsp;";

         $paging .= $array_row_paging[$current_row + 1]; // ."&nbsp;";

         $paging .= $array_row_paging[$current_row + 2]; // ."&nbsp;";

-    } else {

-        for ($i = 0; $i < $pagesfound; $i++) {

+    } else {
+        for ($i = 0; $i < $pagesfound; $i++) {
             $paging .= $array_row_paging[$i] . "&nbsp;";

         }

     }

@@ -278,12 +278,12 @@ 
                 // grab the entire log file...

                 $logentries = array();

                 $i = 0;

-                while ($logentry = $modx->db->getRow($rs)) {

-                    if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) {

+                while ($logentry = $modx->db->getRow($rs)) {
+                    if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) {
                         $item = '<div style="text-align:center;">-</div>';

-                    } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) {

+                    } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) {
                         $item = '<a href="index.php?a=3&amp;id=' . $logentry['itemid'] . '">' . $logentry['itemname'] . '</a>';

-                    } else {

+                    } else {
                         $item = $logentry['itemname'];

                     }

                     //index.php?a=13&searchuser=' . $logentry['internalKey'] . '&action=' . $logentry['action'] . '&itemname=' . $logentry['itemname'] . '&log_submit=true'

@@ -318,6 +318,6 @@ 
     // @see index.php @ 915

     global $action;

     $action = 1;

-} else {

+} else {
     echo $_lang["mgrlog_noquery"];

 }

manager/actions/mutate_htmlsnippet.dynamic.php

Switch Indentation +11 added lines, -11 removed lines

@@ -4,18 +4,18 @@
 }
 
 switch ($modx->manager->action) {
-    case 78:
-        if (!$modx->hasPermission('edit_chunk')) {
-            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
-        }
-        break;
-    case 77:
-        if (!$modx->hasPermission('new_chunk')) {
+        case 78:
+            if (!$modx->hasPermission('edit_chunk')) {
+                $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+            }
+            break;
+        case 77:
+            if (!$modx->hasPermission('new_chunk')) {
+                $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+            }
+            break;
+        default:
             $modx->webAlertAndQuit($_lang["error_no_privileges"]);
-        }
-        break;
-    default:
-        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;

Spacing +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?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.");
 }
 
@@ -18,7 +18,7 @@ 
         $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 // Get table names (alphabetical)
 $tbl_site_htmlsnippets = $modx->getFullTableName('site_htmlsnippets');
@@ -47,7 +47,7 @@ 
     $content['name'] = $_REQUEST['itemname'];
 } else {
     $_SESSION['itemname'] = $_lang["new_htmlsnippet"];
-    $content['category'] = (int)$_REQUEST['catid'];
+    $content['category'] = (int) $_REQUEST['catid'];
 }
 
 if ($modx->manager->hasFormValues()) {
@@ -65,7 +65,7 @@ 
 // Add lock-element JS-Script
 $lockElementId = $id;
 $lockElementType = 3;
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
 
 // Print RTE Javascript function
 ?>
@@ -136,7 +136,7 @@ 
         <input type="hidden" name="mode" value="<?= $modx->manager->action ?>" />
 
         <h1>
-            <i class="fa fa-th-large"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_htmlsnippet']) ?><i class="fa fa-question-circle help"></i>
+            <i class="fa fa-th-large"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_htmlsnippet']) ?><i class="fa fa-question-circle help"></i>
         </h1>
 
         <?= $_style['actionbuttons']['dynamic']['element'] ?>
@@ -160,7 +160,7 @@ 
                             <div class="form-control-name clearfix">
                                 <input name="name" type="text" maxlength="100" value="<?= $modx->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" />
                                 <?php if ($modx->hasPermission('save_role')): ?>
-                                    <label class="custom-control" title="<?= $_lang['lock_htmlsnippet'] . "\n" . $_lang['lock_htmlsnippet_msg'] ?>" tooltip>
+                                    <label class="custom-control" title="<?= $_lang['lock_htmlsnippet']."\n".$_lang['lock_htmlsnippet_msg'] ?>" tooltip>
                                         <input name="locked" type="checkbox" value="on"<?= ($content['locked'] == 1 || $content['locked'] == 'on' ? ' checked="checked"' : '') ?> />
                                         <i class="fa fa-lock"></i>
                                     </label>
@@ -184,9 +184,9 @@ 
                             <select name="categoryid" class="form-control" onchange="documentDirty=true;">
                                 <option>&nbsp;</option>
                                 <?php
-                                include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+                                include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
                                 foreach (getCategories() as $n => $v) {
-                                    echo "\t\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] || (empty($content['category']) && $_POST['categoryid'] == $v['id']) ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v['category']) . "</option>\n";
+                                    echo "\t\t\t\t".'<option value="'.$v['id'].'"'.($content['category'] == $v['id'] || (empty($content['category']) && $_POST['categoryid'] == $v['id']) ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($v['category'])."</option>\n";
                                 }
                                 ?>
                             </select>
@@ -200,7 +200,7 @@ 
                     </div>
                     <?php if ($_SESSION['mgrRole'] == 1): ?>
                         <div class="form-row">
-                            <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>" . $_lang['disabled'] . "</span>" : $_lang['disabled']) ?></label>
+                            <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>".$_lang['disabled']."</span>" : $_lang['disabled']) ?></label>
                         </div>
                     <?php endif; ?>
                 </div>
@@ -216,7 +216,7 @@ 
                             $evtOut = $modx->invokeEvent('OnRichTextEditorRegister');
                             if (is_array($evtOut)) {
                                 foreach ($evtOut as $i => $editor) {
-                                    echo "\t" . '<option value="' . $editor . '"' . ($which_editor == $editor ? ' selected="selected"' : '') . '>' . $editor . "</option>\n";
+                                    echo "\t".'<option value="'.$editor.'"'.($which_editor == $editor ? ' selected="selected"' : '').'>'.$editor."</option>\n";
                                 }
                             }
                             ?>

manager/actions/move_document.dynamic.php

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?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.");
 }
 if (!$modx->hasPermission('save_document')) {
@@ -7,13 +7,13 @@ 
 }
 
 if (isset($_REQUEST['id'])) {
-    $id = (int)$_REQUEST['id'];
+    $id = (int) $_REQUEST['id'];
 } else {
     $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // check permissions on the document
-include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
+include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php";
 $udperms = new udperms();
 $udperms->user = $modx->getLoginUserID();
 $udperms->document = $id;
@@ -39,7 +39,7 @@ 
     },
     cancel: function() {
       documentDirty = false;
-        <?= ($id == 0 ? 'document.location.href="index.php?a=2";' : 'document.location.href="index.php?a=3&id=' . $id . '";') ?>
+        <?= ($id == 0 ? 'document.location.href="index.php?a=2";' : 'document.location.href="index.php?a=3&id='.$id.'";') ?>
     }
   };
 
@@ -80,7 +80,7 @@ 
 </script>
 
 <h1>
-    <i class="fa fa-arrows"></i><?= ($pagetitle ? $pagetitle . '<small>(' . $id . ')</small>' : $_lang['move_resource_title']) ?>
+    <i class="fa fa-arrows"></i><?= ($pagetitle ? $pagetitle.'<small>('.$id.')</small>' : $_lang['move_resource_title']) ?>
 </h1>
 
 <?= $_style['actionbuttons']['dynamic']['save'] ?>

manager/actions/mutate_template_tv_rank.dynamic.php

Spacing +6 added lines, -6 removed lines

@@ -1,12 +1,12 @@ 
 <?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.");
 }
 if (!$modx->hasPermission('save_template')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 $reset = isset($_POST['reset']) && $_POST['reset'] == 'true' ? 1 : 0;
 
 $tbl_site_templates = $modx->getFullTableName('site_templates');
@@ -19,7 +19,7 @@ 
 $templatename = '';
 
 if (isset($_POST['listSubmitted'])) {
-    $updateMsg .= '<div class="text-success" id="updated">' . $_lang['sort_updated'] . '</div>';
+    $updateMsg .= '<div class="text-success" id="updated">'.$_lang['sort_updated'].'</div>';
     foreach ($_POST as $listName => $listValue) {
         if ($listName == 'listSubmitted' || $listName == 'reset') {
             continue;
@@ -47,11 +47,11 @@ 
     while ($row = $modx->db->getRow($rs)) {
         $templatename = $row['templatename'];
         $caption = $row['caption'] != '' ? $row['caption'] : $row['name'];
-        $sortableList .= '<li id="item_' . $row['id'] . '"><i class="fa fa-list-alt"></i> ' . $caption . ' <small class="protectedNode" style="float:right">[*' . $row['name'] . '*]</small></li>';
+        $sortableList .= '<li id="item_'.$row['id'].'"><i class="fa fa-list-alt"></i> '.$caption.' <small class="protectedNode" style="float:right">[*'.$row['name'].'*]</small></li>';
     }
     $sortableList .= '</ul></div>';
 } else {
-    $updateMsg = '<p class="text-danger">' . $_lang['tmplvars_novars'] . '</p>';
+    $updateMsg = '<p class="text-danger">'.$_lang['tmplvars_novars'].'</p>';
 }
 ?>
 
@@ -128,7 +128,7 @@ 
 </script>
 
 <h1>
-    <i class="fa fa-sort-numeric-asc"></i><?= ($templatename ? $templatename . '<small>(' . $id . ')</small>' : $_lang['template_tv_edit_title']) ?>
+    <i class="fa fa-sort-numeric-asc"></i><?= ($templatename ? $templatename.'<small>('.$id.')</small>' : $_lang['template_tv_edit_title']) ?>
 </h1>
 
 <?= $_style['actionbuttons']['dynamic']['save'] ?>