evolution-cms / evolution

manager/processors/unpublish_content.processor.php

Indentation +12 added lines, -12 removed lines

@@ -3,12 +3,12 @@ 
     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')||!$modx->hasPermission('publish_document')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id'])? (int)$_REQUEST['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /************webber ********/
@@ -33,20 +33,20 @@ 
 $udperms->role = $_SESSION['mgrRole'];
 
 if(!$udperms->checkPermissions()) {
-	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    $modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
 // update the document
 $modx->db->update(
-	array(
-		'published'   => 0,
-		'pub_date'    => 0,
-		'unpub_date'  => 0,
-		'editedby'    => $modx->getLoginUserID(),
-		'editedon'    => time(),
-		'publishedby' => 0,
-		'publishedon' => 0,
-	), $modx->getFullTableName('site_content'), "id='{$id}'");
+    array(
+        'published'   => 0,
+        'pub_date'    => 0,
+        'unpub_date'  => 0,
+        'editedby'    => $modx->getLoginUserID(),
+        'editedon'    => time(),
+        'publishedby' => 0,
+        'publishedon' => 0,
+    ), $modx->getFullTableName('site_content'), "id='{$id}'");
 
 // invoke OnDocUnPublished  event
 $modx->invokeEvent("OnDocUnPublished",array("docid"=>$id));

Spacing +13 added lines, -13 removed lines

@@ -1,25 +1,25 @@ 
 <?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')||!$modx->hasPermission('publish_document')) {
+if (!$modx->hasPermission('save_document') || !$modx->hasPermission('publish_document')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id'])? (int)$_REQUEST['id'] : 0;
-if($id==0) {
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /************webber ********/
-$content=$modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
-$pid=($content['parent']==0?$id:$content['parent']);
+$content = $modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
+$pid = ($content['parent'] == 0 ? $id : $content['parent']);
 
 /************** webber *************/
-$sd=isset($_REQUEST['dir'])?'&dir='.$_REQUEST['dir']:'&dir=DESC';
-$sb=isset($_REQUEST['sort'])?'&sort='.$_REQUEST['sort']:'&sort=createdon';
-$pg=isset($_REQUEST['page'])?'&page='.(int)$_REQUEST['page']:'';
-$add_path=$sd.$sb.$pg;
+$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC';
+$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon';
+$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : '';
+$add_path = $sd.$sb.$pg;
 
 /***********************************/
 
@@ -31,7 +31,7 @@ 
 $udperms->document = $id;
 $udperms->role = $_SESSION['mgrRole'];
 
-if(!$udperms->checkPermissions()) {
+if (!$udperms->checkPermissions()) {
 	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
@@ -48,7 +48,7 @@ 
 	), $modx->getFullTableName('site_content'), "id='{$id}'");
 
 // invoke OnDocUnPublished  event
-$modx->invokeEvent("OnDocUnPublished",array("docid"=>$id));
+$modx->invokeEvent("OnDocUnPublished", array("docid"=>$id));
 
 // Set the item name for logger
 $_SESSION['itemname'] = $content['pagetitle'];
@@ -56,6 +56,6 @@ 
 // empty cache
 $modx->clearCache('full');
 
-$header="Location: index.php?a=3&id=$pid&r=1".$add_path;
+$header = "Location: index.php?a=3&id=$pid&r=1".$add_path;
 
 header($header);

manager/processors/delete_module.processor.php

Indentation +8 added lines, -8 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('delete_module')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // Set the item name for logger
@@ -17,9 +17,9 @@ 
 
 // invoke OnBeforeModFormDelete event
 $modx->invokeEvent("OnBeforeModFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 // delete the module.
 $modx->db->delete($modx->getFullTableName('site_modules'), "id='{$id}'");
@@ -32,9 +32,9 @@ 
 
 // invoke OnModFormDelete event
 $modx->invokeEvent("OnModFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 // empty cache
 $modx->clearCache('full');

Spacing +5 added lines, -5 removed lines

@@ -1,13 +1,13 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('delete_module')) {
+if (!$modx->hasPermission('delete_module')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
@@ -40,5 +40,5 @@ 
 $modx->clearCache('full');
 
 // finished emptying cache - redirect
-$header="Location: index.php?a=106&r=2";
+$header = "Location: index.php?a=106&r=2";
 header($header);

manager/includes/controls/datagrid.class.php

Doc Comments +7 added lines

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

Indentation +225 added lines, -225 removed lines

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

Spacing +66 added lines, -66 removed lines

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

Braces +15 added lines, -7 removed lines

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

manager/includes/protect.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 // sanitize array
 if (!function_exists('modx_sanitize_gpc')) {
     /**
-     * @param array|string $values
+     * @param string $values
      * @param int $depth
      * @return array|string
      */

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 }
 
 global $sanitize_seed;
-$sanitize_seed = 'sanitize_seed_' . base_convert(md5(__FILE__), 16, 36);
+$sanitize_seed = 'sanitize_seed_'.base_convert(md5(__FILE__), 16, 36);
 
 // sanitize array
 if (!function_exists('modx_sanitize_gpc')) {

manager/includes/secure_mgr_documents.inc.php

Spacing +5 added lines, -5 removed lines

@@ -20,14 +20,14 @@
         ($docid > 0 ? "id='$docid'" : "privatemgr = 1"));
     $rs = $modx->db->select(
         'DISTINCT sc.id',
-        $modx->getFullTableName("site_content") . " sc
-			LEFT JOIN " . $modx->getFullTableName("document_groups") . " dg ON dg.document = sc.id
-			LEFT JOIN " . $modx->getFullTableName("membergroup_access") . " mga ON mga.documentgroup = dg.document_group",
-        ($docid > 0 ? " sc.id='{$docid}' AND " : "") . "mga.id>0"
+        $modx->getFullTableName("site_content")." sc
+			LEFT JOIN " . $modx->getFullTableName("document_groups")." dg ON dg.document = sc.id
+			LEFT JOIN " . $modx->getFullTableName("membergroup_access")." mga ON mga.documentgroup = dg.document_group",
+        ($docid > 0 ? " sc.id='{$docid}' AND " : "")."mga.id>0"
     );
     $ids = $modx->db->getColumn("id", $rs);
     if (count($ids) > 0) {
         $modx->db->update('privatemgr = 1', $modx->getFullTableName("site_content"),
-            "id IN (" . implode(", ", $ids) . ")");
+            "id IN (".implode(", ", $ids).")");
     }
 }

manager/includes/user_settings.inc.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 if (!empty($user_id)) {
     // Raymond: grab the user settings from the database.
     $rs = $modx->db->select('setting_name, setting_value', $modx->getFullTableName('user_settings'),
-        "user=" . $modx->getLoginUserID());
+        "user=".$modx->getLoginUserID());
 
     $which_browser_default = $which_browser;
     while ($row = $modx->db->getRow($rs)) {

manager/includes/secure_web_documents.inc.php

Spacing +5 added lines, -5 removed lines

@@ -20,14 +20,14 @@
         ($docid > 0 ? "id='$docid'" : "privateweb = 1"));
     $rs = $modx->db->select(
         'DISTINCT sc.id',
-        $modx->getFullTableName("site_content") . " sc
-			LEFT JOIN " . $modx->getFullTableName("document_groups") . " dg ON dg.document = sc.id
-			LEFT JOIN " . $modx->getFullTableName("webgroup_access") . " wga ON wga.documentgroup = dg.document_group",
-        ($docid > 0 ? " sc.id='{$docid}' AND " : "") . "wga.id>0"
+        $modx->getFullTableName("site_content")." sc
+			LEFT JOIN " . $modx->getFullTableName("document_groups")." dg ON dg.document = sc.id
+			LEFT JOIN " . $modx->getFullTableName("webgroup_access")." wga ON wga.documentgroup = dg.document_group",
+        ($docid > 0 ? " sc.id='{$docid}' AND " : "")."wga.id>0"
     );
     $ids = $modx->db->getColumn("id", $rs);
     if (count($ids) > 0) {
         $modx->db->update('privateweb = 1', $modx->getFullTableName("site_content"),
-            "id IN (" . implode(", ", $ids) . ")");
+            "id IN (".implode(", ", $ids).")");
     }
 }

manager/includes/messageCount.inc.php

Spacing +3 added lines, -3 removed lines

@@ -4,15 +4,15 @@
 }
 
 $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'),
-    "recipient=" . $modx->getLoginUserID() . " AND messageread=0");
+    "recipient=".$modx->getLoginUserID()." AND messageread=0");
 $nrnewmessages = $modx->db->getValue($rs);
-$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID());
+$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID());
 $nrtotalmessages = $modx->db->getValue($rs);
 $messagesallowed = $modx->hasPermission('messages');
 
 // ajax response
 if (isset($_POST['updateMsgCount'])) {
     header("Content-Type: application/json; charset=utf-8");
-    print $nrnewmessages . ',' . $nrtotalmessages;
+    print $nrnewmessages.','.$nrtotalmessages;
     exit;
 }

manager/includes/actionlist.inc.php

Indentation +129 added lines, -129 removed lines

@@ -5,133 +5,133 @@ 
 
 // action list
 $GLOBALS['action_list'] = array(
-	'1'	=> 'Loading a frame(set)',
-	'2'	=> 'Viewing home page/ online users',
-	'3'	=> 'Viewing data for resource',
-	'4'	=> 'Creating a resource',
-	'5'	=> 'Saving resource',
-	'6'	=> 'Deleting resource',
-	'7'	=> 'Waiting while MODX cleans up',
-	'8'	=> 'Logged out',
-	'9'	=> 'Viewing help',
-	'10'	=> 'Viewing/ composing messages',
-	'11'	=> 'Creating a user',
-	'12'	=> 'Editing user',
-	'13'	=> 'Viewing logging',
-	'14'	=> 'Editing a parser',
-	'15'	=> 'Saving a parser',
-	'16'	=> 'Editing template',
-	'17'	=> 'Editing settings',
-	'18'	=> 'Viewing Credits :)',
-	'19'	=> 'Creating a new template',
-	'20'	=> 'Saving template',
-	'21'	=> 'Deleting template',
-	'22'	=> 'Editing Snippet',
-	'23'	=> 'Creating a new Snippet',
-	'24'	=> 'Saving Snippet',
-	'25'	=> 'Deleting Snippet',
-	'26'	=> 'Refreshing site',
-	'27'	=> 'Editing resource',
-	'28'	=> 'Changing password',
-	'29'	=> 'Error',
-	'30'	=> 'Saving settings',
-	'31'	=> 'Using file manager',
-	'32'	=> 'Saving user',
-	'33'	=> 'Deleting user',
-	'34'	=> 'Saving new password',
-	'35'	=> 'Editing role',
-	'36'	=> 'Saving role',
-	'37'	=> 'Deleting role',
-	'38'	=> 'Creating new role',
-	'40'	=> 'Editing Access Permissions',
-	'41'	=> 'Editing Access Permissions',
-	'42'	=> 'Editing Access Permissions',
-	'43'	=> 'Editing Access Permissions',
-	'44'	=> 'Editing Access Permissions',
-	'45'	=> 'Idle',
-	'46'	=> 'Editing Access Permissions',
-	'47'	=> 'Editing Access Permissions',
-	'48'	=> 'Editing Access Permissions',
-	'49'	=> 'Editing Access Permissions',
-	'50'	=> 'Editing Access Permissions',
-	'51'	=> 'Moving resource',
-	'52'	=> 'Moved resource',
-	'53'	=> 'Viewing system info',
-	'54'	=> 'Optimizing a table',
-	'55'	=> 'Empty logs',
-	'56'	=> 'Refresh resource tree',
-	'57'	=> 'Refresh menu',
-	'58'	=> 'Logged in',
-	'59'    => 'About MODX',
-	'60'	=> 'Emptying Recycle Bin',
-	'61'	=> 'Publishing a resource',
-	'62'	=> 'Un-publishing a resource',
-	'63'	=> 'Un-deleting a resource',
-	'64'	=> 'Removing deleted content',
-	'65'	=> 'Deleting a message',
-	'66'	=> 'Sending a message',
-	'67'	=> 'Removing locks',
-	'68'	=> 'Viewing site logging',
-	'69'	=> 'Viewing online visitors',
-	'70'	=> 'Viewing site schedule',
-	'71'	=> 'Searching',
-	'72'	=> 'Adding a weblink',
-	'73'	=> 'Editing a weblink',
-		//case "74" : return "Changing personal preferences"; break;
-	'75'	=> 'User/ role management',
-	'76'	=> 'Element management',
-	'77'	=> 'Creating a new Chunk (HTML Snippet)',
-	'78'	=> 'Editing Chunk (HTML Snippet)',
-	'79'	=> 'Saving Chunk (HTML Snippet)',
-	'80'	=> 'Deleting Chunk (HTML Snippet)',
-	'83'	=> 'Exporting a resource to HTML',
-	'84'	=> 'Load Element Selector',
-	'85'	=> 'Create Folder',
-	'86'	=> 'Role management',
-	'87'	=> 'Create new web user',
-	'88'	=> 'Editing web user',
-	'89'	=> 'Saving web user',
-	'90'	=> 'Deleting web user',
-	'91'	=> 'Editing Web Access Permissions',
-	'92'	=> 'Editing Access Permissions',
-	'93'	=> 'Backup Manager',
-	'94'	=> 'Duplicate resource',
-	'95'	=> 'Importing resources from HTML',
-	'96'	=> 'Duplicate Template',
-	'97'	=> 'Duplicate Chunk (HTML Snippet)',
-	'98'	=> 'Duplicate Snippet',
-	'99'	=> 'Manage Web Users',
-	'100'	=> 'Previewing resource',
-	'101'	=> 'Create new plugin',
-	'102'	=> 'Edit plugin',
-	'103'	=> 'Saving plugin',
-	'104'	=> 'Delete plugin',
-	'105'	=> 'Duplicate plugin',
-	'106'	=> 'Viewing Modules',
-	'107'	=> 'Create new module',
-	'108'	=> 'Edit module',
-	'109'	=> 'Saving module',
-	'110'	=> 'Delete module',
-	'111'	=> 'Duplicate module',
-	'112'	=> 'Execute module',
-	'113'	=> 'Manage module dependencies',
-	'114'	=> 'View event log',
-	'115'	=> 'View event log details',
-	'116'	=> 'Delete event log',
-	'117'   => 'Editing tv rank',
-	'118'   => 'Call settings ajax include',
-	'119'   => 'Login Fail (Temporary Block)',
+    '1'	=> 'Loading a frame(set)',
+    '2'	=> 'Viewing home page/ online users',
+    '3'	=> 'Viewing data for resource',
+    '4'	=> 'Creating a resource',
+    '5'	=> 'Saving resource',
+    '6'	=> 'Deleting resource',
+    '7'	=> 'Waiting while MODX cleans up',
+    '8'	=> 'Logged out',
+    '9'	=> 'Viewing help',
+    '10'	=> 'Viewing/ composing messages',
+    '11'	=> 'Creating a user',
+    '12'	=> 'Editing user',
+    '13'	=> 'Viewing logging',
+    '14'	=> 'Editing a parser',
+    '15'	=> 'Saving a parser',
+    '16'	=> 'Editing template',
+    '17'	=> 'Editing settings',
+    '18'	=> 'Viewing Credits :)',
+    '19'	=> 'Creating a new template',
+    '20'	=> 'Saving template',
+    '21'	=> 'Deleting template',
+    '22'	=> 'Editing Snippet',
+    '23'	=> 'Creating a new Snippet',
+    '24'	=> 'Saving Snippet',
+    '25'	=> 'Deleting Snippet',
+    '26'	=> 'Refreshing site',
+    '27'	=> 'Editing resource',
+    '28'	=> 'Changing password',
+    '29'	=> 'Error',
+    '30'	=> 'Saving settings',
+    '31'	=> 'Using file manager',
+    '32'	=> 'Saving user',
+    '33'	=> 'Deleting user',
+    '34'	=> 'Saving new password',
+    '35'	=> 'Editing role',
+    '36'	=> 'Saving role',
+    '37'	=> 'Deleting role',
+    '38'	=> 'Creating new role',
+    '40'	=> 'Editing Access Permissions',
+    '41'	=> 'Editing Access Permissions',
+    '42'	=> 'Editing Access Permissions',
+    '43'	=> 'Editing Access Permissions',
+    '44'	=> 'Editing Access Permissions',
+    '45'	=> 'Idle',
+    '46'	=> 'Editing Access Permissions',
+    '47'	=> 'Editing Access Permissions',
+    '48'	=> 'Editing Access Permissions',
+    '49'	=> 'Editing Access Permissions',
+    '50'	=> 'Editing Access Permissions',
+    '51'	=> 'Moving resource',
+    '52'	=> 'Moved resource',
+    '53'	=> 'Viewing system info',
+    '54'	=> 'Optimizing a table',
+    '55'	=> 'Empty logs',
+    '56'	=> 'Refresh resource tree',
+    '57'	=> 'Refresh menu',
+    '58'	=> 'Logged in',
+    '59'    => 'About MODX',
+    '60'	=> 'Emptying Recycle Bin',
+    '61'	=> 'Publishing a resource',
+    '62'	=> 'Un-publishing a resource',
+    '63'	=> 'Un-deleting a resource',
+    '64'	=> 'Removing deleted content',
+    '65'	=> 'Deleting a message',
+    '66'	=> 'Sending a message',
+    '67'	=> 'Removing locks',
+    '68'	=> 'Viewing site logging',
+    '69'	=> 'Viewing online visitors',
+    '70'	=> 'Viewing site schedule',
+    '71'	=> 'Searching',
+    '72'	=> 'Adding a weblink',
+    '73'	=> 'Editing a weblink',
+        //case "74" : return "Changing personal preferences"; break;
+    '75'	=> 'User/ role management',
+    '76'	=> 'Element management',
+    '77'	=> 'Creating a new Chunk (HTML Snippet)',
+    '78'	=> 'Editing Chunk (HTML Snippet)',
+    '79'	=> 'Saving Chunk (HTML Snippet)',
+    '80'	=> 'Deleting Chunk (HTML Snippet)',
+    '83'	=> 'Exporting a resource to HTML',
+    '84'	=> 'Load Element Selector',
+    '85'	=> 'Create Folder',
+    '86'	=> 'Role management',
+    '87'	=> 'Create new web user',
+    '88'	=> 'Editing web user',
+    '89'	=> 'Saving web user',
+    '90'	=> 'Deleting web user',
+    '91'	=> 'Editing Web Access Permissions',
+    '92'	=> 'Editing Access Permissions',
+    '93'	=> 'Backup Manager',
+    '94'	=> 'Duplicate resource',
+    '95'	=> 'Importing resources from HTML',
+    '96'	=> 'Duplicate Template',
+    '97'	=> 'Duplicate Chunk (HTML Snippet)',
+    '98'	=> 'Duplicate Snippet',
+    '99'	=> 'Manage Web Users',
+    '100'	=> 'Previewing resource',
+    '101'	=> 'Create new plugin',
+    '102'	=> 'Edit plugin',
+    '103'	=> 'Saving plugin',
+    '104'	=> 'Delete plugin',
+    '105'	=> 'Duplicate plugin',
+    '106'	=> 'Viewing Modules',
+    '107'	=> 'Create new module',
+    '108'	=> 'Edit module',
+    '109'	=> 'Saving module',
+    '110'	=> 'Delete module',
+    '111'	=> 'Duplicate module',
+    '112'	=> 'Execute module',
+    '113'	=> 'Manage module dependencies',
+    '114'	=> 'View event log',
+    '115'	=> 'View event log details',
+    '116'	=> 'Delete event log',
+    '117'   => 'Editing tv rank',
+    '118'   => 'Call settings ajax include',
+    '119'   => 'Login Fail (Temporary Block)',
 
-	'300'	=> 'Create Template Variable',
-	'301'	=> 'Edit Template Variable',
-	'302'	=> 'Save Template Variable',
-	'303'	=> 'Delete Template Variable',
-	'304'	=> 'Duplicate Template Variable',
+    '300'	=> 'Create Template Variable',
+    '301'	=> 'Edit Template Variable',
+    '302'	=> 'Save Template Variable',
+    '303'	=> 'Delete Template Variable',
+    '304'	=> 'Duplicate Template Variable',
 
-	'200'	=> 'Viewing phpInfo()',
-	'501'   => 'Delete category',
-	'998'	=> 'Viewing web page',
-	'999'	=> 'Viewing test page',
+    '200'	=> 'Viewing phpInfo()',
+    '501'   => 'Delete category',
+    '998'	=> 'Viewing web page',
+    '999'	=> 'Viewing test page',
 );
 
 /**
@@ -140,10 +140,10 @@ 
  * @return string
  */
 function getAction($actionId, $itemid='') {
-	global $action_list;
+    global $action_list;
 
-	$ret = sprintf($action_list[$actionId], $itemid);
-	if (!$ret) $ret = "Idle (unknown)";
+    $ret = sprintf($action_list[$actionId], $itemid);
+    if (!$ret) $ret = "Idle (unknown)";
 
-	return $ret;
+    return $ret;
 }

Spacing +2 added lines, -2 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.");
 }
 
@@ -139,7 +139,7 @@ 
  * @param string $itemid
  * @return string
  */
-function getAction($actionId, $itemid='') {
+function getAction($actionId, $itemid = ''){
 	global $action_list;
 
 	$ret = sprintf($action_list[$actionId], $itemid);

Braces +5 added lines, -2 removed lines

@@ -139,11 +139,14 @@
  * @param string $itemid
  * @return string
  */
-function getAction($actionId, $itemid='') {
+function getAction($actionId, $itemid='')
+{
 	global $action_list;
 
 	$ret = sprintf($action_list[$actionId], $itemid);
-	if (!$ret) $ret = "Idle (unknown)";
+	if (!$ret) {
+	    $ret = "Idle (unknown)";
+	}
 
 	return $ret;
 }