evolution-cms / evolution

manager/includes/controls/datasetpager.class.php

Spacing +43 added lines, -43 removed lines

@@ -10,7 +10,7 @@ 
 
 $__DataSetPagerCnt = 0;
 
-class DataSetPager {
+class DataSetPager{
 
 	var $ds; // datasource
 	var $pageSize;
@@ -27,26 +27,26 @@ 
 	var $selPageStyle;
 	var $selPageClass;
 
-	function __construct($id, $ds, $pageSize = 10, $pageNumber = -1) {
+	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;
 		}
 
@@ -57,40 +57,40 @@ 
 		$this->pager = '';
 	}
 
-	function getRenderedPager() {
+	function getRenderedPager(){
 		return $this->pager;
 	}
 
-	function getRenderedRows() {
+	function getRenderedRows(){
 		return $this->rows;
 	}
 
-	function setDataSource($ds) {
+	function setDataSource($ds){
 		$this->ds = $ds;
 	}
 
-	function setPageSize($ps) {
+	function setPageSize($ps){
 		$this->pageSize = $ps;
 	}
 
-	function setRenderRowFnc($fncName, $args = "") {
+	function setRenderRowFnc($fncName, $args = ""){
 		$this->renderRowFnc = &$fncName;
-		$this->renderRowFncArgs = $args;    // extra agruments
+		$this->renderRowFncArgs = $args; // extra agruments
 
 
 	}
 
-	function setRenderPagerFnc($fncName, $args = "") {
+	function setRenderPagerFnc($fncName, $args = ""){
 		$this->renderPagerFnc = $fncName;
-		$this->renderPagerFncArgs = $args;    // extra agruments
+		$this->renderPagerFncArgs = $args; // extra agruments
 	}
 
-	function render() {
+	function render(){
 		global $modx, $_PAGE;
 
 		$isDataset = $modx->db->isResult($this->ds);
 
-		if(!$this->selPageStyle) {
+		if (!$this->selPageStyle) {
 			$this->selPageStyle = "font-weight:bold";
 		}
 
@@ -98,11 +98,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 {
@@ -114,7 +114,7 @@ 
 
 		// get total pages
 		$tp = ceil($tnr / $this->pageSize);
-		if($this->pageNumber > $tp) {
+		if ($this->pageNumber > $tp) {
 			$this->pageNumber = 1;
 		}
 
@@ -122,38 +122,38 @@ 
 		$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) {
 			$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> ";
 				}
 			}
 		}
@@ -162,21 +162,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 {

manager/includes/session_keepalive.php

Spacing +2 added lines, -2 removed lines

@@ -11,13 +11,13 @@
 $modx->getSettings();
 $modx->invokeEvent('OnManagerPageInit');
 $ok = false;
-if(isset($_SESSION['mgrToken']) && $_GET['tok'] == $_SESSION['mgrToken']) {
+if (isset($_SESSION['mgrToken']) && $_GET['tok'] == $_SESSION['mgrToken']) {
   $ok = true;
   $modx->updateValidatedUserSession();
 }
 
 header('Content-type: application/json');
-if($ok) {
+if ($ok) {
     echo '{"status":"ok"}';
 } else {
   echo '{"status":"null"}';

manager/includes/version.inc.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@
 <?php
-$modx_version      = '1.5.0-beta';      // Current version number
-$modx_release_date = 'Jan 26, 2018';     // Date of release
-$modx_branch       = 'Evolution';        // Codebase name
+$modx_version      = '1.5.0-beta'; // Current version number
+$modx_release_date = 'Jan 26, 2018'; // Date of release
+$modx_branch       = 'Evolution'; // Codebase name
 $modx_full_appname = "{$modx_branch} {$modx_version} ({$modx_release_date})";

manager/includes/tmplvars.inc.php

Spacing +63 added lines, -63 removed lines

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

manager/includes/extenders/ex_maketable.inc.php

Spacing +3 added lines, -3 removed lines

@@ -5,9 +5,9 @@
  * Time: 14:38
  */
 
-if (!include_once MODX_MANAGER_PATH . 'includes/extenders/maketable.class.php'){
+if (!include_once MODX_MANAGER_PATH.'includes/extenders/maketable.class.php') {
     return false;
-}else{
-    $this->table= new MakeTable;
+} else {
+    $this->table = new MakeTable;
     return true;
 }
\ No newline at end of file

manager/includes/extenders/ex_managerapi.inc.php

Spacing +3 added lines, -3 removed lines

@@ -5,9 +5,9 @@
  * Time: 14:16
  */
 
-if (!include_once MODX_MANAGER_PATH . 'includes/extenders/manager.api.class.inc.php'){
+if (!include_once MODX_MANAGER_PATH.'includes/extenders/manager.api.class.inc.php') {
     return false;
-}else{
-    $this->manager= new ManagerAPI;
+} else {
+    $this->manager = new ManagerAPI;
     return true;
 }
\ No newline at end of file

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

Spacing +5 added lines, -5 removed lines

@@ -1,16 +1,16 @@
 <?php
 $pattern = '/<img[\s\n]+.*src=[\s\n]*"([^"]+\.(jpg|jpeg|png|gif))"[^>]+>/i';
-preg_match_all($pattern , $value , $images);
-if($opt==='')
+preg_match_all($pattern, $value, $images);
+if ($opt === '')
 {
-    if($images[1][0])  return $images[1][0];
+    if ($images[1][0])  return $images[1][0];
     else               return '';
 }
 else
 {
-    foreach($images[0] as $i=>$image)
+    foreach ($images[0] as $i=>$image)
     {
-        if(strpos($image,$opt)!==false) return $images[1][$i];
+        if (strpos($image, $opt) !== false) return $images[1][$i];
     }
 }
 

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

Spacing +1 added lines, -1 removed lines

@@ -1,2 +1,2 @@
 <?php
-return preg_replace_callback("~(\b\w+\b)~",function($m) use($wrapat) {return wordwrap($m[1],$wrapat,' ',1);},$value);
+return preg_replace_callback("~(\b\w+\b)~", function($m) use($wrapat) {return wordwrap($m[1], $wrapat, ' ', 1); },$value);

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

Spacing +6 added lines, -6 removed lines

@@ -1,21 +1,21 @@
 <?php
 $text = $modx->filter->parseDocumentSource($value);
-$text = str_replace(array("\r\n","\r"),"\n",$text);
+$text = str_replace(array("\r\n", "\r"), "\n", $text);
 
 $blockElms  = 'br,table,tbody,tr,td,th,thead,tfoot,caption,colgroup,div';
 $blockElms .= ',dl,dd,dt,ul,ol,li,pre,select,option,form,map,area,blockquote';
 $blockElms .= ',address,math,style,input,p,h1,h2,h3,h4,h5,h6,hr,object,param,embed';
 $blockElms .= ',noframes,noscript,section,article,aside,hgroup,footer,address,code';
 $blockElms = explode(',', $blockElms);
-$lines = explode("\n",$text);
+$lines = explode("\n", $text);
 $c = count($lines);
-foreach($lines as $i=>$line)
+foreach ($lines as $i=>$line)
 {
     $line = rtrim($line);
-    if($i===$c-1) break;
-    foreach($blockElms as $block)
+    if ($i === $c - 1) break;
+    foreach ($blockElms as $block)
     {
-        if(preg_match("@</?{$block}" . '[^>]*>$@',$line))
+        if (preg_match("@</?{$block}".'[^>]*>$@', $line))
             continue 2;
     }
     $lines[$i] = "{$line}<br />";