evolution-cms / evolution

manager/media/style/default/style.php

Spacing +75 added lines, -75 removed lines

@@ -8,19 +8,19 @@ 
  * Version:        1.1

  * MODX version:   1.0.3

  */

-$style_path = 'media/style/' . $modx->config['manager_theme'] . '/images/';

+$style_path = 'media/style/'.$modx->config['manager_theme'].'/images/';

 $modx->config['mgr_date_picker_path'] = 'media/calendar/datepicker.inc.php';

-if(!$modx->config['lang_code']) {

+if (!$modx->config['lang_code']) {

 	global $modx_lang_attribute;

 	$modx->config['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute;

 }

 

-if($_GET['a'] == 2) {

+if ($_GET['a'] == 2) {

 	include_once('welcome.php');

 }

 

 // Favicon

-$_style['favicon']                  = (file_exists(MODX_BASE_PATH . 'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/' . $modx->config['manager_theme'] . '/images/favicon.ico');

+$_style['favicon']                  = (file_exists(MODX_BASE_PATH.'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/'.$modx->config['manager_theme'].'/images/favicon.ico');

 

 //Main Menu

 $_style['menu_search']              = '<i class="fa fa-search"></i>';

@@ -99,10 +99,10 @@ 
 $_style['tree_page_word']           = "<i class='fa fa-file-word-o'></i>";

 $_style['tree_page_excel']          = "<i class='fa fa-file-excel-o'></i>";

 

-$_style['tree_minusnode']           = "<i class='fa fa-angle-down'></i>";//$style_path.'tree/angle-down.png';

-$_style['tree_plusnode']            = "<i class='fa fa-angle-right'></i>";//$style_path.'tree/angle-right.png';

+$_style['tree_minusnode']           = "<i class='fa fa-angle-down'></i>"; //$style_path.'tree/angle-down.png';

+$_style['tree_plusnode']            = "<i class='fa fa-angle-right'></i>"; //$style_path.'tree/angle-right.png';

 $_style['tree_weblink']             = $style_path.'tree/link.png';

-$_style['tree_preview_resource']    = "<i class='fa fa-eye'></i>";//$style_path.'icons/eye.png';

+$_style['tree_preview_resource']    = "<i class='fa fa-eye'></i>"; //$style_path.'icons/eye.png';

 

 $_style['tree_showtree']            = '<i class="fa fa-sitemap"></i>';

 $_style['tree_working']             = '<i class="fa fa-warning"></i>';

@@ -137,8 +137,8 @@ 
 $_style['icons_edit_document']      = $style_path.'icons/save.png';

 $_style['icons_delete_document']    = $style_path.'icons/trash.png';

 //locks

-$_style['icons_preview_resource']   = $style_path.'icons/eye.png';//$style_path.'icons/eye.png';

-$_style['icons_secured']            = "<i class='fa fa-lock'></i>";//$style_path.'icons/lock.png';

+$_style['icons_preview_resource']   = $style_path.'icons/eye.png'; //$style_path.'icons/eye.png';

+$_style['icons_secured']            = "<i class='fa fa-lock'></i>"; //$style_path.'icons/lock.png';

 

 //file manager icons

 $_style['files_save']               = 'fa fa-floppy-o';

@@ -213,7 +213,7 @@ 
 $_style['icons_set_parent']         = $style_path.'icons/folder-open.png';

 

 //modules

-$_style['icons_module']            = 'fa fa-cube';

+$_style['icons_module'] = 'fa fa-cube';

 $_style['icons_modules']            = 'fa fa-cubes'; //$style_path.'icons/modules.png';

 $_style['icons_run']                = $style_path.'icons/play.png';

 

@@ -273,57 +273,57 @@ 
 $stay = isset($_REQUEST['stay']) ? $_REQUEST['stay'] : '';

 $addnew = 0;

 $run = 0;

-switch($action) {

+switch ($action) {

 	case '3':

 	case '4':

 	case '27':

 	case '72':

-		if($modx->hasPermission('new_document')) {

+		if ($modx->hasPermission('new_document')) {

 			$addnew = 1;

 		}

 		break;

 	case '16':

 	case '19':

-		if($modx->hasPermission('new_template')) {

+		if ($modx->hasPermission('new_template')) {

 			$addnew = 1;

 		}

 		break;

 	case '300':

 	case '301':

-		if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {

+		if ($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {

 			$addnew = 1;

 		}

 		break;

 	case '77':

 	case '78':

-		if($modx->hasPermission('new_chunk')) {

+		if ($modx->hasPermission('new_chunk')) {

 			$addnew = 1;

 		}

 		break;

 	case '22':

 	case '23':

-		if($modx->hasPermission('new_snippet')) {

+		if ($modx->hasPermission('new_snippet')) {

 			$addnew = 1;

 		}

 		break;

 	case '101':

 	case '102':

-		if($modx->hasPermission('new_plugin')) {

+		if ($modx->hasPermission('new_plugin')) {

 			$addnew = 1;

 		}

 		break;

 	case '106':

 	case '107':

 	case '108':

-		if($modx->hasPermission('new_module')) {

+		if ($modx->hasPermission('new_module')) {

 			$addnew = 1;

 		}

-		if($modx->hasPermission('exec_module')) {

+		if ($modx->hasPermission('exec_module')) {

 			$run = 1;

 		}

 		break;

 	case '88':

-		if($modx->hasPermission('new_web_user')) {

+		if ($modx->hasPermission('new_web_user')) {

 			$addnew = 1;

 		}

 		break;

@@ -337,30 +337,30 @@ 
 			<div class="btn-group">

 				<div class="btn-group">

 					<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">

-						<i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>

+						<i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>

 					</a>

 					<span class="btn btn-success plus dropdown-toggle"></span>

 					<select id="stay" name="stay">

 						' . ($addnew ? '

-							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '') . '>' . $_lang['stay_new'] . '</option>

-						' : '') . '

-						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '') . '>' . $_lang['stay'] . '</option>

-						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option>

+							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '').'>'.$_lang['stay_new'].'</option>

+						' : '').'

+						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '').'>'.$_lang['stay'].'</option>

+						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '').'>'.$_lang['close'].'</option>

 					</select>

 				</div>' .

 					($addnew ? '

-					<a id="Button6" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.duplicate();">

-						<i class="' . $_style["actions_duplicate"] . '"></i><span>' . $_lang['duplicate'] . '</span>

+					<a id="Button6" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.duplicate();">

+						<i class="' . $_style["actions_duplicate"].'"></i><span>'.$_lang['duplicate'].'</span>

 					</a>

-					' : '') . '

-				<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">

-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>

+					' : '').'

+				<a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">

+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>

 				</a>

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 				<a id="Button4" class="btn btn-secondary" href="javascript:;" onclick="actions.view();">

-					<i class="' . $_style["actions_preview"] . '"></i><span>' . $_lang['preview'] . '</span>

+					<i class="' . $_style["actions_preview"].'"></i><span>'.$_lang['preview'].'</span>

 				</a>

 			</div>

 		</div>',

@@ -368,22 +368,22 @@ 
 			<div class="btn-group">

 				<div class="btn-group">

 					<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">

-						<i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>

+						<i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>

 					</a>

 					<span class="btn btn-success plus dropdown-toggle"></span>

 					<select id="stay" name="stay">

 						' . ($addnew ? '

-							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '') . '>' . $_lang['stay_new'] . '</option>

-						' : '') . '

-						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '') . '>' . $_lang['stay'] . '</option>

-						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option>

+							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '').'>'.$_lang['stay_new'].'</option>

+						' : '').'

+						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '').'>'.$_lang['stay'].'</option>

+						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '').'>'.$_lang['close'].'</option>

 					</select>

 				</div>

-				<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">

-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>

+				<a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">

+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>

 				</a>

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 			</div>

 		</div>',

@@ -391,86 +391,86 @@ 
 			<div class="btn-group">

 				<div class="btn-group">

 					<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">

-						<i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>

+						<i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>

 					</a>

 					<span class="btn btn-success plus dropdown-toggle"></span>

 					<select id="stay" name="stay">

 						' . ($addnew ? '

-							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '') . '>' . $_lang['stay_new'] . '</option>

-						' : '') . '

-						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '') . '>' . $_lang['stay'] . '</option>

-						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option>

+							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '').'>'.$_lang['stay_new'].'</option>

+						' : '').'

+						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '').'>'.$_lang['stay'].'</option>

+						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '').'>'.$_lang['close'].'</option>

 					</select>

 				</div>

 				' . ($addnew ? '

-				<a id="Button6" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.duplicate();">

-					<i class="' . $_style["actions_duplicate"] . '"></i><span>' . $_lang['duplicate'] . '</span>

+				<a id="Button6" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.duplicate();">

+					<i class="' . $_style["actions_duplicate"].'"></i><span>'.$_lang['duplicate'].'</span>

 				</a>

-				' : '') . '

-				<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">

-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>

+				' : '').'

+				<a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">

+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>

 				</a>

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 				' . ($run ? '

-				<a id="Button4" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.run();">

-					<i class="' . $_style["actions_run"] . '"></i><span>' . $_lang['run_module'] . '</span>

+				<a id="Button4" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.run();">

+					<i class="' . $_style["actions_run"].'"></i><span>'.$_lang['run_module'].'</span>

 				</a>

-				' : '') . '

+				' : '').'

 			</div>

 		</div>',

 		'newmodule' => ($addnew ? '<div id="actions">

 			<div class="btn-group">

 				<a id="newModule" class="btn btn-secondary" href="javascript:;" onclick="actions.new();">

-					<i class="' . $_style["actions_new"] . '"></i><span>' . $_lang['new_module'] . '</span>

+					<i class="' . $_style["actions_new"].'"></i><span>'.$_lang['new_module'].'</span>

 				</a>

 			</div>

 		</div>' : ''),

 		'close' => '<div id="actions">

 			<div class="btn-group">

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.close();">

-					<i class="' . $_style["actions_close"] . '"></i><span>' . $_lang['close'] . '</span>

+					<i class="' . $_style["actions_close"].'"></i><span>'.$_lang['close'].'</span>

 				</a>

 			</div>

 		</div>',

 		'save' => '<div id="actions">

 			<div class="btn-group">

 				<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">

-					<i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>

+					<i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>

 				</a>

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 			</div>

 		</div>',

 		'savedelete' => '<div id="actions">

 			<div class="btn-group">

 				<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">

-					<i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>

+					<i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>

 				</a>

-				<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">

-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>

+				<a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">

+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>

 				</a>

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 			</div>

 		</div>',

 		'cancel' => '<div id="actions">

 			<div class="btn-group">

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 			</div>

 		</div>',

 		'canceldelete' => '<div id="actions">

 			<div class="btn-group">

-				<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">

-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>

+				<a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">

+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>

 				</a>

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 			</div>

 		</div>',

@@ -480,33 +480,33 @@ 
 			<div class="btn-group">' .

 				($addnew ? '

 					<a class="btn btn-secondary" href="javascript:;" onclick="actions.new();">

-						<i class="' . $_style["icons_new_document"] . '"></i><span>' . $_lang['create_resource_here'] . '</span>

+						<i class="' . $_style["icons_new_document"].'"></i><span>'.$_lang['create_resource_here'].'</span>

 					</a>

 					<a class="btn btn-secondary" href="javascript:;" onclick="actions.newlink();">

-						<i class="' . $_style["icons_new_weblink"] . '"></i><span>' . $_lang['create_weblink_here'] . '</span>

+						<i class="' . $_style["icons_new_weblink"].'"></i><span>'.$_lang['create_weblink_here'].'</span>

 					</a>

-				' : '') . '

+				' : '').'

 				<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.edit();">

-					<i class="' . $_style["actions_edit"] . '"></i><span>' . $_lang['edit'] . '</span>

+					<i class="' . $_style["actions_edit"].'"></i><span>'.$_lang['edit'].'</span>

 				</a>

 				<a id="Button2" class="btn btn-secondary" href="javascript:;" onclick="actions.move();">

-					<i class="' . $_style["actions_move"] . '"></i><span>' . $_lang['move'] . '</span>

+					<i class="' . $_style["actions_move"].'"></i><span>'.$_lang['move'].'</span>

 				</a>

 				<a id="Button6" class="btn btn-secondary" href="javascript:;" onclick="actions.duplicate();">

-					<i class="' . $_style["actions_duplicate"] . '"></i><span>' . $_lang['duplicate'] . '</span>

+					<i class="' . $_style["actions_duplicate"].'"></i><span>'.$_lang['duplicate'].'</span>

 				</a>

 				<a id="Button3" class="btn btn-secondary" href="javascript:;" onclick="actions.delete();">

-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>

+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>

 				</a>

 				<a id="Button4" class="btn btn-secondary" href="javascript:;" onclick="actions.view();">

-					<i class="' . $_style["actions_preview"] . '"></i><span>' . $_lang['preview'] . '</span>

+					<i class="' . $_style["actions_preview"].'"></i><span>'.$_lang['preview'].'</span>

 				</a>

 			</div>

 		</div>',

 		'cancel' => '<div id="actions">

 			<div class="btn-group">

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 			</div>

 		</div>',

manager/media/style/common/moo-datepicker/datepicker.inc.php

Spacing +5 added lines, -5 removed lines

@@ -1,11 +1,11 @@
 <?php
-class DATEPICKER {
-    function __construct() {
+class DATEPICKER{
+    function __construct(){
     }
-    function getDP() {
-        global $modx,$_lang;
+    function getDP(){
+        global $modx, $_lang;
         
         $tpl = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
-        return $modx->parseText($tpl,$_lang,'[%','%]');
+        return $modx->parseText($tpl, $_lang, '[%', '%]');
     }
 }

manager/media/rss/extlib/Snoopy.class.inc

Spacing +43 added lines, -43 removed lines

@@ -149,7 +149,7 @@ 
                         // using proxy, send entire URI
                         $this->_httprequest($URI, $fp, $URI, $this->_httpmethod);
                     } else {
-                        $path = $URI_PARTS["path"] . ($URI_PARTS["query"] ? "?" . $URI_PARTS["query"] : "");
+                        $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
                         // no proxy, send only the path
                         $this->_httprequest($path, $fp, $URI, $this->_httpmethod);
                     }
@@ -160,7 +160,7 @@ 
                         /* url was redirected, check if we've hit the max depth */
                         if ($this->maxredirs > $this->_redirectdepth) {
                             // only follow redirect if it's on this site, or offsiteok is true
-                            if (preg_match("|^https?://" . preg_quote($this->host) . "|i", $this->_redirectaddr) || $this->offsiteok) {
+                            if (preg_match("|^https?://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok) {
                                 /* follow the redirect */
                                 $this->_redirectdepth++;
                                 $this->lastredirectaddr = $this->_redirectaddr;
@@ -188,7 +188,7 @@ 
                 break;
             default:
                 // not a valid protocol
-                $this->error = 'Invalid protocol "' . $URI_PARTS["scheme"] . '"\n';
+                $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
                 return false;
                 break;
         }
@@ -239,7 +239,7 @@ 
                         // using proxy, send entire URI
                         $this->_httprequest($URI, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata);
                     } else {
-                        $path = $URI_PARTS["path"] . ($URI_PARTS["query"] ? "?" . $URI_PARTS["query"] : "");
+                        $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
                         // no proxy, send only the path
                         $this->_httprequest($path, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata);
                     }
@@ -249,11 +249,11 @@ 
                     if ($this->_redirectaddr) {
                         /* url was redirected, check if we've hit the max depth */
                         if ($this->maxredirs > $this->_redirectdepth) {
-                            if (!preg_match("|^" . $URI_PARTS["scheme"] . "://|", $this->_redirectaddr))
-                                $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr, $URI_PARTS["scheme"] . "://" . $URI_PARTS["host"]);
+                            if (!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
+                                $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr, $URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
 
                             // only follow redirect if it's on this site, or offsiteok is true
-                            if (preg_match("|^https?://" . preg_quote($this->host) . "|i", $this->_redirectaddr) || $this->offsiteok) {
+                            if (preg_match("|^https?://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok) {
                                 /* follow the redirect */
                                 $this->_redirectdepth++;
                                 $this->lastredirectaddr = $this->_redirectaddr;
@@ -285,7 +285,7 @@ 
                 break;
             default:
                 // not a valid protocol
-                $this->error = 'Invalid protocol "' . $URI_PARTS["scheme"] . '"\n';
+                $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
                 return false;
                 break;
         }
@@ -585,9 +585,9 @@ 
         $match = preg_replace("|/$|", "", $match);
         $match_part = parse_url($match);
         $match_root =
-            $match_part["scheme"] . "://" . $match_part["host"];
+            $match_part["scheme"]."://".$match_part["host"];
 
-        $search = array("|^http://" . preg_quote($this->host) . "|i",
+        $search = array("|^http://".preg_quote($this->host)."|i",
             "|^(\/)|i",
             "|^(?!http://)(?!mailto:)|i",
             "|/\./|",
@@ -595,8 +595,8 @@ 
         );
 
         $replace = array("",
-            $match_root . "/",
-            $match . "/",
+            $match_root."/",
+            $match."/",
             "/",
             "/"
         );
@@ -625,17 +625,17 @@ 
         $URI_PARTS = parse_url($URI);
         if (empty($url))
             $url = "/";
-        $headers = $http_method . " " . $url . " " . $this->_httpversion . "\r\n";
+        $headers = $http_method." ".$url." ".$this->_httpversion."\r\n";
         if (!empty($this->host) && !isset($this->rawheaders['Host'])) {
-            $headers .= "Host: " . $this->host;
+            $headers .= "Host: ".$this->host;
             if (!empty($this->port) && $this->port != '80')
-                $headers .= ":" . $this->port;
+                $headers .= ":".$this->port;
             $headers .= "\r\n";
         }
         if (!empty($this->agent))
-            $headers .= "User-Agent: " . $this->agent . "\r\n";
+            $headers .= "User-Agent: ".$this->agent."\r\n";
         if (!empty($this->accept))
-            $headers .= "Accept: " . $this->accept . "\r\n";
+            $headers .= "Accept: ".$this->accept."\r\n";
         if ($this->use_gzip) {
             // make sure PHP was built with --with-zlib
             // and we can handle gzipp'ed data
@@ -643,46 +643,46 @@ 
                 $headers .= "Accept-encoding: gzip\r\n";
             } else {
                 trigger_error(
-                    "use_gzip is on, but PHP was built without zlib support." .
+                    "use_gzip is on, but PHP was built without zlib support.".
                     "  Requesting file(s) without gzip encoding.",
                     E_USER_NOTICE);
             }
         }
         if (!empty($this->referer))
-            $headers .= "Referer: " . $this->referer . "\r\n";
+            $headers .= "Referer: ".$this->referer."\r\n";
         if (!empty($this->cookies)) {
             if (!is_array($this->cookies))
-                $this->cookies = (array)$this->cookies;
+                $this->cookies = (array) $this->cookies;
 
             reset($this->cookies);
             if (count($this->cookies) > 0) {
                 $cookie_headers .= 'Cookie: ';
                 foreach ($this->cookies as $cookieKey => $cookieVal) {
-                    $cookie_headers .= $cookieKey . "=" . urlencode($cookieVal) . "; ";
+                    $cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
                 }
-                $headers .= substr($cookie_headers, 0, -2) . "\r\n";
+                $headers .= substr($cookie_headers, 0, -2)."\r\n";
             }
         }
         if (!empty($this->rawheaders)) {
             if (!is_array($this->rawheaders))
-                $this->rawheaders = (array)$this->rawheaders;
+                $this->rawheaders = (array) $this->rawheaders;
             while (list($headerKey, $headerVal) = each($this->rawheaders))
-                $headers .= $headerKey . ": " . $headerVal . "\r\n";
+                $headers .= $headerKey.": ".$headerVal."\r\n";
         }
         if (!empty($content_type)) {
             $headers .= "Content-type: $content_type";
             if ($content_type == "multipart/form-data")
-                $headers .= "; boundary=" . $this->_mime_boundary;
+                $headers .= "; boundary=".$this->_mime_boundary;
             $headers .= "\r\n";
         }
         if (!empty($body))
-            $headers .= "Content-length: " . strlen($body) . "\r\n";
+            $headers .= "Content-length: ".strlen($body)."\r\n";
         if (!empty($this->user) || !empty($this->pass))
-            $headers .= "Authorization: Basic " . base64_encode($this->user . ":" . $this->pass) . "\r\n";
+            $headers .= "Authorization: Basic ".base64_encode($this->user.":".$this->pass)."\r\n";
 
         //add proxy auth headers
         if (!empty($this->proxy_user))
-            $headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass) . "\r\n";
+            $headers .= 'Proxy-Authorization: '.'Basic '.base64_encode($this->proxy_user.':'.$this->proxy_pass)."\r\n";
 
 
         $headers .= "\r\n";
@@ -692,7 +692,7 @@ 
             socket_set_timeout($fp, $this->read_timeout);
         $this->timed_out = false;
 
-        fwrite($fp, $headers . $body, strlen($headers . $body));
+        fwrite($fp, $headers.$body, strlen($headers.$body));
 
         $this->_redirectaddr = false;
         unset($this->headers);
@@ -716,10 +716,10 @@ 
                 // look for :// in the Location header to see if hostname is included
                 if (!preg_match("|\:\/\/|", $matches[2])) {
                     // no host in the path, so prepend
-                    $this->_redirectaddr = $URI_PARTS["scheme"] . "://" . $this->host . ":" . $this->port;
+                    $this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
                     // eliminate double slash
                     if (!preg_match("|^/|", $matches[2]))
-                        $this->_redirectaddr .= "/" . $matches[2];
+                        $this->_redirectaddr .= "/".$matches[2];
                     else
                         $this->_redirectaddr .= $matches[2];
                 } else
@@ -771,7 +771,7 @@ 
         if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i", $results, $match)) {
             $this->results[] = $results;
             for ($x = 0; $x < count($match[1]); $x++)
-                $this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"] . "://" . $this->host);
+                $this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"]."://".$this->host);
         } // have we already fetched framed content?
         elseif (is_array($this->results))
             $this->results[] = $results;
@@ -858,14 +858,14 @@ 
                     $context_opts['ssl']['capath'] = $this->capath;
             }
                     
-            $host = 'ssl://' . $host;
+            $host = 'ssl://'.$host;
         }
 
         $context = stream_context_create($context_opts);
 
         if (version_compare(PHP_VERSION, '5.0.0', '>')) {
-            if($this->scheme == 'http')
-                $host = "tcp://" . $host;
+            if ($this->scheme == 'http')
+                $host = "tcp://".$host;
             $fp = stream_socket_client(
                 "$host:$port",
                 $errno,
@@ -897,7 +897,7 @@ 
                 case -5:
                     $this->error = "connection refused or timed out (-5)";
                 default:
-                    $this->error = "connection failed (" . $errno . ")";
+                    $this->error = "connection failed (".$errno.")";
             }
             return false;
         }
@@ -938,26 +938,26 @@ 
                 while (list($key, $val) = each($formvars)) {
                     if (is_array($val) || is_object($val)) {
                         while (list($cur_key, $cur_val) = each($val)) {
-                            $postdata .= urlencode($key) . "[]=" . urlencode($cur_val) . "&";
+                            $postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
                         }
                     } else
-                        $postdata .= urlencode($key) . "=" . urlencode($val) . "&";
+                        $postdata .= urlencode($key)."=".urlencode($val)."&";
                 }
                 break;
 
             case "multipart/form-data":
-                $this->_mime_boundary = "Snoopy" . md5(uniqid(microtime()));
+                $this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
 
                 reset($formvars);
                 while (list($key, $val) = each($formvars)) {
                     if (is_array($val) || is_object($val)) {
                         while (list($cur_key, $cur_val) = each($val)) {
-                            $postdata .= "--" . $this->_mime_boundary . "\r\n";
+                            $postdata .= "--".$this->_mime_boundary."\r\n";
                             $postdata .= "Content-Disposition: form-data; name=\"$key\[\]\"\r\n\r\n";
                             $postdata .= "$cur_val\r\n";
                         }
                     } else {
-                        $postdata .= "--" . $this->_mime_boundary . "\r\n";
+                        $postdata .= "--".$this->_mime_boundary."\r\n";
                         $postdata .= "Content-Disposition: form-data; name=\"$key\"\r\n\r\n";
                         $postdata .= "$val\r\n";
                     }
@@ -974,12 +974,12 @@ 
                         fclose($fp);
                         $base_name = basename($file_name);
 
-                        $postdata .= "--" . $this->_mime_boundary . "\r\n";
+                        $postdata .= "--".$this->_mime_boundary."\r\n";
                         $postdata .= "Content-Disposition: form-data; name=\"$field_name\"; filename=\"$base_name\"\r\n\r\n";
                         $postdata .= "$file_content\r\n";
                     }
                 }
-                $postdata .= "--" . $this->_mime_boundary . "--\r\n";
+                $postdata .= "--".$this->_mime_boundary."--\r\n";
                 break;
         }
 

manager/includes/tmplvars.format.inc.php

Spacing +78 added lines, -78 removed lines

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

manager/includes/rss.inc.php

Spacing +16 added lines, -16 removed lines

@@ -29,33 +29,33 @@ 
 // include MagPieRSS
 require_once(MODX_MANAGER_PATH.'media/rss/rss_fetch.inc');
 // Convert relative path into absolute url
-function rel2abs( $rel, $base ) {
+function rel2abs($rel, $base){
 	// parse base URL  and convert to local variables: $scheme, $host,  $path
-	extract( parse_url( $base ) );
-	if ( strpos( $rel,"//" ) === 0 ) {
-		return $scheme . ':' . $rel;
+	extract(parse_url($base));
+	if (strpos($rel, "//") === 0) {
+		return $scheme.':'.$rel;
 	}
 	// return if already absolute URL
-	if ( parse_url( $rel, PHP_URL_SCHEME ) != '' ) {
+	if (parse_url($rel, PHP_URL_SCHEME) != '') {
 		return $rel;
 	}
 	// queries and anchors
-	if ( $rel[0] == '#' || $rel[0] == '?' ) {
-		return $base . $rel;
+	if ($rel[0] == '#' || $rel[0] == '?') {
+		return $base.$rel;
 	}
 	// remove non-directory element from path
-	$path = preg_replace( '#/[^/]*$#', '', $path );
+	$path = preg_replace('#/[^/]*$#', '', $path);
 	// destroy path if relative url points to root
-	if ( $rel[0] ==  '/' ) {
+	if ($rel[0] == '/') {
 		$path = '';
 	}
 	// dirty absolute URL
-	$abs = $host . $path . "/" . $rel;
+	$abs = $host.$path."/".$rel;
 	// replace '//' or  '/./' or '/foo/../' with '/'
-	$abs = preg_replace( "/(\/\.?\/)/", "/", $abs );
-	$abs = preg_replace( "/\/(?!\.\.)[^\/]+\/\.\.\//", "/", $abs );
+	$abs = preg_replace("/(\/\.?\/)/", "/", $abs);
+	$abs = preg_replace("/\/(?!\.\.)[^\/]+\/\.\.\//", "/", $abs);
 	// absolute URL is ready!
-	return $scheme . '://' . $abs;
+	return $scheme.'://'.$abs;
 }
 $feedData = array();
 
@@ -63,15 +63,15 @@ 
 foreach ($urls as $section=>$url) {
 	$output = '';
     $rss = @fetch_rss($url);
-    if( !$rss ){
-    	$feedData[$section] = 'Failed to retrieve ' . $url;
+    if (!$rss) {
+    	$feedData[$section] = 'Failed to retrieve '.$url;
     	continue;
 	}
     $output .= '<ul>';
 
     $items = array_slice($rss->items, 0, $itemsNumber);
     foreach ($items as $item) {
-        $href = rel2abs($item['link'],'https://github.com');
+        $href = rel2abs($item['link'], 'https://github.com');
         $title = $item['title'];
         $pubdate = $item['pubdate'];
         $pubdate = $modx->toDateFormat(strtotime($pubdate));

manager/includes/default_config.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php

 

-$c  = &$settings;

+$c = &$settings;

 

 $c['site_name']                = 'My MODX Site';

 $c['site_start']               = 1;

manager/includes/charsets.php

Spacing +17 added lines, -17 removed lines

@@ -65,26 +65,26 @@
 $_['macintosh']         = 'Western European (Mac) - macintosh';
 $_['Windows-1252']      = 'Western European (Windows) - Windows-1252';
 
-if($modx_charset     == 'euc-jp')      $_['euc-jp']      = 'Japanese (EUC) - euc-jp';
-elseif($modx_charset == 'shift_jis')   $_['shift_jis']   = 'Japanese (Shift-JIS) - shift_jis';
-elseif($modx_charset == 'iso-2022-jp') $_['iso-2022-jp'] = 'Japanese (JIS-Allow 1 byte Kana - SO/SI) - iso-2022-jp';
-elseif($modx_charset == 'csISO2022JP') $_['csISO2022JP'] = 'Japanese (JIS-Allow 1 byte Kana) - csISO2022JP';
-elseif($modx_charset == 'EUC-CN')            $_['EUC-CN']            = 'Chinese Simplified (EUC) - EUC-CN';
-elseif($modx_charset == 'hz-gb-2312')        $_['hz-gb-2312']        = 'Chinese Simplified (HZ) - hz-gb-2312';
-elseif($modx_charset == 'x-mac-chinesesimp') $_['x-mac-chinesesimp'] = 'Chinese Simplified (Mac) - x-mac-chinesesimp';
-elseif($modx_charset == 'x-Chinese-CNS')     $_['x-Chinese-CNS']     = 'Chinese Traditional (CNS) - x-Chinese-CNS';
-elseif($modx_charset == 'x-Chinese-Eten')    $_['x-Chinese-Eten']    = 'Chinese Traditional (Eten) - x-Chinese-Eten';
-elseif($modx_charset == 'x-mac-chinesetrad') $_['x-mac-chinesetrad'] = 'Chinese Traditional (Mac) - x-mac-chinesetrad';
-elseif($modx_charset == 'ks_c_5601-1987') $_['ks_c_5601-1987'] = 'Korean - ks_c_5601-1987';
-elseif($modx_charset == 'euc-kr')         $_['euc-kr']         = 'Korean (EUC) - euc-kr';
-elseif($modx_charset == 'iso-2022-kr')    $_['iso-2022-kr']    = 'Korean (ISO) - iso-2022-kr';
-elseif($modx_charset == 'Johab')          $_['Johab']          = 'Korean (Johab) - Johab';
-elseif($modx_charset == 'x-mac-korean')   $_['x-mac-korean']   = 'Korean (Mac) - x-mac-korean';
+if ($modx_charset == 'euc-jp')      $_['euc-jp']      = 'Japanese (EUC) - euc-jp';
+elseif ($modx_charset == 'shift_jis')   $_['shift_jis']   = 'Japanese (Shift-JIS) - shift_jis';
+elseif ($modx_charset == 'iso-2022-jp') $_['iso-2022-jp'] = 'Japanese (JIS-Allow 1 byte Kana - SO/SI) - iso-2022-jp';
+elseif ($modx_charset == 'csISO2022JP') $_['csISO2022JP'] = 'Japanese (JIS-Allow 1 byte Kana) - csISO2022JP';
+elseif ($modx_charset == 'EUC-CN')            $_['EUC-CN']            = 'Chinese Simplified (EUC) - EUC-CN';
+elseif ($modx_charset == 'hz-gb-2312')        $_['hz-gb-2312']        = 'Chinese Simplified (HZ) - hz-gb-2312';
+elseif ($modx_charset == 'x-mac-chinesesimp') $_['x-mac-chinesesimp'] = 'Chinese Simplified (Mac) - x-mac-chinesesimp';
+elseif ($modx_charset == 'x-Chinese-CNS')     $_['x-Chinese-CNS']     = 'Chinese Traditional (CNS) - x-Chinese-CNS';
+elseif ($modx_charset == 'x-Chinese-Eten')    $_['x-Chinese-Eten']    = 'Chinese Traditional (Eten) - x-Chinese-Eten';
+elseif ($modx_charset == 'x-mac-chinesetrad') $_['x-mac-chinesetrad'] = 'Chinese Traditional (Mac) - x-mac-chinesetrad';
+elseif ($modx_charset == 'ks_c_5601-1987') $_['ks_c_5601-1987'] = 'Korean - ks_c_5601-1987';
+elseif ($modx_charset == 'euc-kr')         $_['euc-kr']         = 'Korean (EUC) - euc-kr';
+elseif ($modx_charset == 'iso-2022-kr')    $_['iso-2022-kr']    = 'Korean (ISO) - iso-2022-kr';
+elseif ($modx_charset == 'Johab')          $_['Johab']          = 'Korean (Johab) - Johab';
+elseif ($modx_charset == 'x-mac-korean')   $_['x-mac-korean']   = 'Korean (Mac) - x-mac-korean';
 
 $tpl = '<option value="%s" %s>%s</option>';
 $options = array();
-foreach($_ as $value=>$label) {
-    $selected = $value===$modx_charset ? 'selected' : '';
+foreach ($_ as $value=>$label) {
+    $selected = $value === $modx_charset ? 'selected' : '';
     $options[] = sprintf($tpl, $value, $selected, $label);
 }
 echo join("\n", $options);

manager/includes/preload.functions.inc.php

Spacing +7 added lines, -7 removed lines

@@ -3,10 +3,10 @@ 
 global $site_sessionname;

 $site_sessionname = genEvoSessionName(); // For legacy extras not using startCMSSession

 

-function genEvoSessionName() {

+function genEvoSessionName(){

     $_ = crc32(__FILE__);

     $_ = sprintf('%u', $_);

-    return 'evo' . base_convert($_,10,36);

+    return 'evo'.base_convert($_, 10, 36);

 }

 

 function startCMSSession(){

@@ -15,7 +15,7 @@ 
     

     session_name($site_sessionname);

     removeInvalidCmsSessionIds($site_sessionname);

-    $cookieExpiration= 0;

+    $cookieExpiration = 0;

     $secure = ((isset ($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') || $_SERVER['SERVER_PORT'] == $https_port);

     $cookiePath = !empty($session_cookie_path) ? $session_cookie_path : MODX_BASE_URL;

     $cookieDomain = !empty($session_cookie_domain) ? $session_cookie_domain : '';

@@ -24,8 +24,8 @@ 
 

     $key = "modx.{$context}.session.cookie.lifetime";

     if (isset($_SESSION[$key]) && is_numeric($_SESSION[$key])) {

-        $cookieLifetime= intval($_SESSION[$key]);

-        if($cookieLifetime) $cookieExpiration = $_SERVER['REQUEST_TIME']+$cookieLifetime;

+        $cookieLifetime = intval($_SESSION[$key]);

+        if ($cookieLifetime) $cookieExpiration = $_SERVER['REQUEST_TIME'] + $cookieLifetime;

         setcookie(session_name(), session_id(), $cookieExpiration, $cookiePath, $cookieDomain, $secure, true);

     }

     if (!isset($_SESSION['modx.session.created.time'])) {

@@ -33,14 +33,14 @@ 
     }

 }

 

-function removeInvalidCmsSessionFromStorage(&$storage, $session_name) {

+function removeInvalidCmsSessionFromStorage(&$storage, $session_name){

     if (isset($storage[$session_name]) && ($storage[$session_name] === '' || $storage[$session_name] === 'deleted'))

     {

     unset($storage[$session_name]);

     }

 }

 

-function removeInvalidCmsSessionIds($session_name) {

+function removeInvalidCmsSessionIds($session_name){

     // session ids is invalid iff it is empty string

     // storage priorioty can see in PHP source ext/session/session.c

     removeInvalidCmsSessionFromStorage($_COOKIE, $session_name);

manager/includes/categories.inc.php

Spacing +8 added lines, -8 removed lines

@@ -3,7 +3,7 @@ 
 //Kyle Jaebker - 08/07/06
 
 //Create a new category
-function newCategory($newCat) {
+function newCategory($newCat){
     global $modx;
     $useTable = $modx->getFullTableName('categories');
     $categoryId = $modx->db->insert(
@@ -14,36 +14,36 @@ 
     return $categoryId;
 }
 //check if new category already exists
-function checkCategory($newCat = '') {
+function checkCategory($newCat = ''){
     global $modx;
     $useTable = $modx->getFullTableName('categories');
     $newCat = $modx->db->escape($newCat);
     $cats = $modx->db->select('id', $modx->getFullTableName('categories'), "category='{$newCat}'");
-	if($cat = $modx->db->getValue($cats)) {
+	if ($cat = $modx->db->getValue($cats)) {
 		return $cat;
 	}
     return 0;
 }
 //Check for category, create new if not exists
-function getCategory($category='') {
+function getCategory($category = ''){
     $categoryId = checkCategory($category);
-    if(!$categoryId) $categoryId = newCategory($category);
+    if (!$categoryId) $categoryId = newCategory($category);
     return $categoryId;
 }
 //Get all categories
-function getCategories() {
+function getCategories(){
     global $modx;
     $useTable = $modx->getFullTableName('categories');
     $cats = $modx->db->select('id, category', $modx->getFullTableName('categories'), '', 'category');
 	$resourceArray = array();
-    while($row = $modx->db->getRow($cats)) {
+    while ($row = $modx->db->getRow($cats)) {
         $row['category'] = stripslashes($row['category']);
         $resourceArray[] = $row;
     }
     return $resourceArray;
 }
 //Delete category & associations
-function deleteCategory($catId=0) {
+function deleteCategory($catId = 0){
     global $modx;
     if ($catId) {
         $resetTables = array('site_plugins', 'site_snippets', 'site_htmlsnippets', 'site_templates', 'site_tmplvars', 'site_modules');