evolution-cms / evolution

manager/actions/resources/mgrResources.class.php

Indentation +98 added lines, -98 removed lines

@@ -7,7 +7,7 @@ 
     /**
      * @var array
      */
-	public $types = array();
+    public $types = array();
     /**
      * @var array
      */
@@ -25,73 +25,73 @@ 
      * mgrResources constructor.
      */
     public function __construct() {
-		$this->setTypes();
-		$this->queryItemsFromDB();
-		$this->prepareCategoryArrays();
-	}
+        $this->setTypes();
+        $this->queryItemsFromDB();
+        $this->prepareCategoryArrays();
+    }
 
     /**
      * @return void
      */
     public function setTypes() {
-		global $_lang;
-		$this->types['site_templates']    = array(
-			'title'=>$_lang["manage_templates"],
-			'actions'=>array( 'edit'=>array(16,'edit_template'), 'duplicate'=>array(96,'new_template'), 'remove'=>array(21,'delete_template') ),
-			'permissions'=>array('new_template','edit_template'),
-			'name'=>'templatename'
-		);
-		$this->types['site_tmplvars']     = array(
-			'title'=>$_lang["tmplvars"],
-			'actions'=>array('edit'=>array(301,'edit_template'), 'duplicate'=>array(304,'edit_template'), 'remove'=>array(303,'edit_template')),
-			'permissions'=>array('new_template','edit_template'),
-		);
-		$this->types['site_htmlsnippets'] = array(
-			'title'=>$_lang["manage_htmlsnippets"],
-			'actions'=>array('edit'=>array(78,'edit_chunk'), 'duplicate'=>array(97,'new_chunk'), 'remove'=>array(80,'delete_chunk')),
-			'permissions'=>array('new_chunk','edit_chunk'),
-		);
-		$this->types['site_snippets']     = array(
-			'title'=>$_lang["manage_snippets"],
-			'actions'=>array('edit'=>array(22,'edit_snippet'), 'duplicate'=>array(98,'new_snippet'), 'remove'=>array(25,'delete_snippet')),
-			'permissions'=>array('new_snippet','edit_snippet'),
-		);
-		$this->types['site_plugins']      = array(
-			'title'=>$_lang["manage_plugins"],
-			'actions'=>array('edit'=>array(102,'edit_plugin'), 'duplicate'=>array(105,'new_plugin'), 'remove'=>array(104,'delete_plugin')),
-			'permissions'=>array('new_plugin','edit_plugin'),
-		);
-		$this->types['site_modules']      = array(
-			'title'=>$_lang["manage_modules"],
-			'actions'=>array('edit'=>array(108,'edit_module'), 'duplicate'=>array(111,'new_module'), 'remove'=>array(110,'delete_module')),
-			'permissions'=>array('new_module','edit_module'),
-		);
-	}
+        global $_lang;
+        $this->types['site_templates']    = array(
+            'title'=>$_lang["manage_templates"],
+            'actions'=>array( 'edit'=>array(16,'edit_template'), 'duplicate'=>array(96,'new_template'), 'remove'=>array(21,'delete_template') ),
+            'permissions'=>array('new_template','edit_template'),
+            'name'=>'templatename'
+        );
+        $this->types['site_tmplvars']     = array(
+            'title'=>$_lang["tmplvars"],
+            'actions'=>array('edit'=>array(301,'edit_template'), 'duplicate'=>array(304,'edit_template'), 'remove'=>array(303,'edit_template')),
+            'permissions'=>array('new_template','edit_template'),
+        );
+        $this->types['site_htmlsnippets'] = array(
+            'title'=>$_lang["manage_htmlsnippets"],
+            'actions'=>array('edit'=>array(78,'edit_chunk'), 'duplicate'=>array(97,'new_chunk'), 'remove'=>array(80,'delete_chunk')),
+            'permissions'=>array('new_chunk','edit_chunk'),
+        );
+        $this->types['site_snippets']     = array(
+            'title'=>$_lang["manage_snippets"],
+            'actions'=>array('edit'=>array(22,'edit_snippet'), 'duplicate'=>array(98,'new_snippet'), 'remove'=>array(25,'delete_snippet')),
+            'permissions'=>array('new_snippet','edit_snippet'),
+        );
+        $this->types['site_plugins']      = array(
+            'title'=>$_lang["manage_plugins"],
+            'actions'=>array('edit'=>array(102,'edit_plugin'), 'duplicate'=>array(105,'new_plugin'), 'remove'=>array(104,'delete_plugin')),
+            'permissions'=>array('new_plugin','edit_plugin'),
+        );
+        $this->types['site_modules']      = array(
+            'title'=>$_lang["manage_modules"],
+            'actions'=>array('edit'=>array(108,'edit_module'), 'duplicate'=>array(111,'new_module'), 'remove'=>array(110,'delete_module')),
+            'permissions'=>array('new_module','edit_module'),
+        );
+    }
 
     /**
      * @return void
      */
     public function queryItemsFromDB() {
-		foreach($this->types as $resourceTable=>$type) {
-			if($this->hasAnyPermissions($type['permissions'])) {
-				$nameField = isset($type['name']) ? $type['name'] : 'name';
-				$this->items[$resourceTable] = $this->queryResources($resourceTable, $nameField);
-		   }
-		 }
-	}
+        foreach($this->types as $resourceTable=>$type) {
+            if($this->hasAnyPermissions($type['permissions'])) {
+                $nameField = isset($type['name']) ? $type['name'] : 'name';
+                $this->items[$resourceTable] = $this->queryResources($resourceTable, $nameField);
+            }
+            }
+    }
 
     /**
      * @param array $permissions
      * @return bool
      */
     public function hasAnyPermissions($permissions) {
-		global $modx;
+        global $modx;
 
-		foreach($permissions as $p)
-			if($modx->hasPermission($p)) return true;
+        foreach($permissions as $p)
+            if($modx->hasPermission($p)) return true;
 
-		return false;
-	}
+        return false;
+    }
 
     /**
      * @param string $resourceTable
@@ -99,7 +99,7 @@ 
      * @return array|bool
      */
     public function queryResources($resourceTable, $nameField = 'name') {
-		global $modx, $_lang;
+        global $modx, $_lang;
 
         $allowed = array(
             'site_htmlsnippets',
@@ -107,59 +107,59 @@ 
             'site_plugins',
             'site_modules'
         );
-		$pluginsql = !empty($resourceTable) && in_array($resourceTable, $allowed) ? $resourceTable . '.disabled, ' : '';
-
-		$tvsql  = '';
-		$tvjoin = '';
-		if ($resourceTable === 'site_tmplvars') {
-			$tvsql    = 'site_tmplvars.caption, ';
-			$tvjoin   = sprintf('LEFT JOIN %s AS stt ON site_tmplvars.id=stt.tmplvarid GROUP BY site_tmplvars.id,reltpl', $modx->getFullTableName('site_tmplvar_templates'));
-			$sttfield = 'IF(stt.templateid,1,0) AS reltpl,';
-		}
-		else $sttfield = '';
-
-		$selectableTemplates = $resourceTable === 'site_templates' ? "{$resourceTable}.selectable, " : "";
-
-		$rs = $modx->db->select(
-			"{$sttfield} {$pluginsql} {$tvsql} {$resourceTable}.{$nameField} as name, {$resourceTable}.id, {$resourceTable}.description, {$resourceTable}.locked, {$selectableTemplates}IF(isnull(categories.category),'{$_lang['no_category']}',categories.category) as category, categories.id as catid",
-			$modx->getFullTableName($resourceTable) . " AS {$resourceTable}
+        $pluginsql = !empty($resourceTable) && in_array($resourceTable, $allowed) ? $resourceTable . '.disabled, ' : '';
+
+        $tvsql  = '';
+        $tvjoin = '';
+        if ($resourceTable === 'site_tmplvars') {
+            $tvsql    = 'site_tmplvars.caption, ';
+            $tvjoin   = sprintf('LEFT JOIN %s AS stt ON site_tmplvars.id=stt.tmplvarid GROUP BY site_tmplvars.id,reltpl', $modx->getFullTableName('site_tmplvar_templates'));
+            $sttfield = 'IF(stt.templateid,1,0) AS reltpl,';
+        }
+        else $sttfield = '';
+
+        $selectableTemplates = $resourceTable === 'site_templates' ? "{$resourceTable}.selectable, " : "";
+
+        $rs = $modx->db->select(
+            "{$sttfield} {$pluginsql} {$tvsql} {$resourceTable}.{$nameField} as name, {$resourceTable}.id, {$resourceTable}.description, {$resourceTable}.locked, {$selectableTemplates}IF(isnull(categories.category),'{$_lang['no_category']}',categories.category) as category, categories.id as catid",
+            $modx->getFullTableName($resourceTable) . " AS {$resourceTable}
 	            LEFT JOIN " . $modx->getFullTableName('categories') . " AS categories ON {$resourceTable}.category = categories.id {$tvjoin}",
-			"",
-			"category,name"
-		);
-		$limit = $modx->db->getRecordCount($rs);
+            "",
+            "category,name"
+        );
+        $limit = $modx->db->getRecordCount($rs);
 
-		if($limit < 1) return false;
+        if($limit < 1) return false;
 
-		$result = array();
-		while ($row = $modx->db->getRow($rs)) {
-			$result[] = $row;
-		}
-		return $result;
-	}
+        $result = array();
+        while ($row = $modx->db->getRow($rs)) {
+            $result[] = $row;
+        }
+        return $result;
+    }
 
     /**
      * @return void
      */
     public function prepareCategoryArrays() {
-		foreach($this->items as $type=>$items) {
-			foreach((array)$items as $item) {
-				$catid = $item['catid'] ? $item['catid'] : 0;
-				$this->categories[$catid] = $item['category'];
-
-				$item['type'] = $type;
-				$this->itemsPerCategory[$catid][] = $item;
-			}
-		}
-
-		// Sort categories by name
-		natcasesort($this->categories);
-
-		// Now sort by name
-		foreach($this->itemsPerCategory as $catid=>$items) {
-			usort($this->itemsPerCategory[$catid], function ($a, $b) {
-				return strcasecmp($a['name'], $b['name']);
-			});
-		}
-	}
+        foreach($this->items as $type=>$items) {
+            foreach((array)$items as $item) {
+                $catid = $item['catid'] ? $item['catid'] : 0;
+                $this->categories[$catid] = $item['category'];
+
+                $item['type'] = $type;
+                $this->itemsPerCategory[$catid][] = $item;
+            }
+        }
+
+        // Sort categories by name
+        natcasesort($this->categories);
+
+        // Now sort by name
+        foreach($this->itemsPerCategory as $catid=>$items) {
+            usort($this->itemsPerCategory[$catid], function ($a, $b) {
+                return strcasecmp($a['name'], $b['name']);
+            });
+        }
+    }
 }

manager/actions/mutate_content.dynamic.php

Indentation +411 added lines, -411 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 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.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
 /********************/
@@ -12,30 +12,30 @@ 
 
 // check permissions
 switch($modx->manager->action) {
-	case 27:
-		if(!$modx->hasPermission('edit_document')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	case 85:
-	case 72:
-	case 4:
-		if(!$modx->hasPermission('new_document')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		} elseif(isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') {
-			// check user has permissions for parent
-			include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
-			$udperms = new udperms();
-			$udperms->user = $modx->getLoginUserID();
-			$udperms->document = empty($_REQUEST['pid']) ? 0 : $_REQUEST['pid'];
-			$udperms->role = $_SESSION['mgrRole'];
-			if(!$udperms->checkPermissions()) {
-				$modx->webAlertAndQuit($_lang["access_permission_denied"]);
-			}
-		}
-		break;
-	default:
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    case 27:
+        if(!$modx->hasPermission('edit_document')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        }
+        break;
+    case 85:
+    case 72:
+    case 4:
+        if(!$modx->hasPermission('new_document')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        } elseif(isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') {
+            // check user has permissions for parent
+            include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
+            $udperms = new udperms();
+            $udperms->user = $modx->getLoginUserID();
+            $udperms->document = empty($_REQUEST['pid']) ? 0 : $_REQUEST['pid'];
+            $udperms->role = $_SESSION['mgrRole'];
+            if(!$udperms->checkPermissions()) {
+                $modx->webAlertAndQuit($_lang["access_permission_denied"]);
+            }
+        }
+        break;
+    default:
+        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
@@ -54,22 +54,22 @@ 
 $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars');
 
 if($modx->manager->action == 27) {
-	//editing an existing document
-	// check permissions on the document
-	include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
-	$udperms = new udperms();
-	$udperms->user = $modx->getLoginUserID();
-	$udperms->document = $id;
-	$udperms->role = $_SESSION['mgrRole'];
-
-	if(!$udperms->checkPermissions()) {
-		$modx->webAlertAndQuit($_lang["access_permission_denied"]);
-	}
+    //editing an existing document
+    // check permissions on the document
+    include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
+    $udperms = new udperms();
+    $udperms->user = $modx->getLoginUserID();
+    $udperms->document = $id;
+    $udperms->role = $_SESSION['mgrRole'];
+
+    if(!$udperms->checkPermissions()) {
+        $modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    }
 }
 
 // check to see if resource isn't locked
 if($lockedEl = $modx->elementIsLocked(7, $id)) {
-	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['resource']));
+    $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['resource']));
 }
 // end check for lock
 
@@ -78,74 +78,74 @@ 
 
 // get document groups for current user
 if($_SESSION['mgrDocgroups']) {
-	$docgrp = implode(',', $_SESSION['mgrDocgroups']);
+    $docgrp = implode(',', $_SESSION['mgrDocgroups']);
 }
 
 if(!empty ($id)) {
-	$access = sprintf("1='%s' OR sc.privatemgr=0", $_SESSION['mgrRole']);
-	if($docgrp) {
-		$access .= " OR dg.document_group IN ({$docgrp})";
-	}
-	$rs = $modx->db->select('sc.*', "{$tbl_site_content} AS sc LEFT JOIN {$tbl_document_groups} AS dg ON dg.document=sc.id", "sc.id='{$id}' AND ({$access})");
-	$content = array();
-	$content = $modx->db->getRow($rs);
-	$modx->documentObject = &$content;
-	if(!$content) {
-		$modx->webAlertAndQuit($_lang["access_permission_denied"]);
-	}
-	$_SESSION['itemname'] = $content['pagetitle'];
+    $access = sprintf("1='%s' OR sc.privatemgr=0", $_SESSION['mgrRole']);
+    if($docgrp) {
+        $access .= " OR dg.document_group IN ({$docgrp})";
+    }
+    $rs = $modx->db->select('sc.*', "{$tbl_site_content} AS sc LEFT JOIN {$tbl_document_groups} AS dg ON dg.document=sc.id", "sc.id='{$id}' AND ({$access})");
+    $content = array();
+    $content = $modx->db->getRow($rs);
+    $modx->documentObject = &$content;
+    if(!$content) {
+        $modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    }
+    $_SESSION['itemname'] = $content['pagetitle'];
 } else {
-	$content = array();
+    $content = array();
 
-	if(isset($_REQUEST['newtemplate'])) {
-		$content['template'] = $_REQUEST['newtemplate'];
-	} else {
-		$content['template'] = getDefaultTemplate();
-	}
+    if(isset($_REQUEST['newtemplate'])) {
+        $content['template'] = $_REQUEST['newtemplate'];
+    } else {
+        $content['template'] = getDefaultTemplate();
+    }
 
-	$_SESSION['itemname'] = $_lang["new_resource"];
+    $_SESSION['itemname'] = $_lang["new_resource"];
 }
 
 // restore saved form
 $formRestored = $modx->manager->loadFormValues();
 if(isset($_REQUEST['newtemplate'])) {
-	$formRestored = true;
+    $formRestored = true;
 }
 
 // retain form values if template was changed
 // edited to convert pub_date and unpub_date
 // sottwell 02-09-2006
 if($formRestored == true) {
-	$content = array_merge($content, $_POST);
-	$content['content'] = $_POST['ta'];
-	if(empty ($content['pub_date'])) {
-		unset ($content['pub_date']);
-	} else {
-		$content['pub_date'] = $modx->toTimeStamp($content['pub_date']);
-	}
-	if(empty ($content['unpub_date'])) {
-		unset ($content['unpub_date']);
-	} else {
-		$content['unpub_date'] = $modx->toTimeStamp($content['unpub_date']);
-	}
+    $content = array_merge($content, $_POST);
+    $content['content'] = $_POST['ta'];
+    if(empty ($content['pub_date'])) {
+        unset ($content['pub_date']);
+    } else {
+        $content['pub_date'] = $modx->toTimeStamp($content['pub_date']);
+    }
+    if(empty ($content['unpub_date'])) {
+        unset ($content['unpub_date']);
+    } else {
+        $content['unpub_date'] = $modx->toTimeStamp($content['unpub_date']);
+    }
 }
 
 // increase menu index if this is a new document
 if(!isset ($_REQUEST['id'])) {
-	if(!isset ($modx->config['auto_menuindex'])) {
-		$modx->config['auto_menuindex'] = 1;
-	}
-	if($modx->config['auto_menuindex']) {
-		$pid = (int)$_REQUEST['pid'];
-		$rs = $modx->db->select('count(*)', $tbl_site_content, "parent='{$pid}'");
-		$content['menuindex'] = $modx->db->getValue($rs);
-	} else {
-		$content['menuindex'] = 0;
-	}
+    if(!isset ($modx->config['auto_menuindex'])) {
+        $modx->config['auto_menuindex'] = 1;
+    }
+    if($modx->config['auto_menuindex']) {
+        $pid = (int)$_REQUEST['pid'];
+        $rs = $modx->db->select('count(*)', $tbl_site_content, "parent='{$pid}'");
+        $content['menuindex'] = $modx->db->getValue($rs);
+    } else {
+        $content['menuindex'] = 0;
+    }
 }
 
 if(isset ($_POST['which_editor'])) {
-	$modx->config['which_editor'] = $_POST['which_editor'];
+    $modx->config['which_editor'] = $_POST['which_editor'];
 }
 
 // Add lock-element JS-Script
@@ -545,23 +545,23 @@ 
 
 	<form name="mutate" id="mutate" class="content" method="post" enctype="multipart/form-data" action="index.php" onsubmit="documentDirty=false;">
 		<?php
-		// invoke OnDocFormPrerender event
-		$evtOut = $modx->invokeEvent('OnDocFormPrerender', array(
-			'id' => $id,
-			'template' => $content['template']
-		));
-
-		if(is_array($evtOut)) {
-			echo implode('', $evtOut);
-		}
-
-		/*************************/
-		$dir = isset($_REQUEST['dir']) ? $_REQUEST['dir'] : '';
-		$sort = isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'createdon';
-		$page = isset($_REQUEST['page']) ? (int) $_REQUEST['page'] : '';
-		/*************************/
-
-		?>
+        // invoke OnDocFormPrerender event
+        $evtOut = $modx->invokeEvent('OnDocFormPrerender', array(
+            'id' => $id,
+            'template' => $content['template']
+        ));
+
+        if(is_array($evtOut)) {
+            echo implode('', $evtOut);
+        }
+
+        /*************************/
+        $dir = isset($_REQUEST['dir']) ? $_REQUEST['dir'] : '';
+        $sort = isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'createdon';
+        $page = isset($_REQUEST['page']) ? (int) $_REQUEST['page'] : '';
+        /*************************/
+
+        ?>
 		<input type="hidden" name="a" value="5" />
 		<input type="hidden" name="id" value="<?= $content['id'] ?>" />
 		<input type="hidden" name="mode" value="<?= $modx->manager->action ?>" />
@@ -576,54 +576,54 @@ 
 
 			<h1>
 				<i class="fa fa-pencil-square-o"></i><?php if(isset($_REQUEST['id'])) {
-					echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']) . (iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '') . '<small>(' . $_REQUEST['id'] . ')</small>';
-				} else {
-				    if ($modx->manager->action == '4') {
+                    echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']) . (iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '') . '<small>(' . $_REQUEST['id'] . ')</small>';
+                } else {
+                    if ($modx->manager->action == '4') {
                         echo $_lang['add_resource'];
                     } else if ($modx->manager->action == '72') {
                         echo $_lang['add_weblink'];
                     } else {
                         echo $_lang['create_resource_title'];
                     }
-				} ?>
+                } ?>
 			</h1>
 
 			<?= $_style['actionbuttons']['dynamic']['document'] ?>
 
 			<?php
-			// breadcrumbs
-			if($modx->config['use_breadcrumbs']) {
-				$temp = array();
-				$title = isset($content['pagetitle']) ? $content['pagetitle'] : $_lang['create_resource_title'];
-
-				if(isset($_REQUEST['id']) && $content['parent'] != 0) {
-					$bID = (int) $_REQUEST['id'];
-					$temp = $modx->getParentIds($bID);
-				} else if(isset($_REQUEST['pid'])) {
-					$bID = (int) $_REQUEST['pid'];
-					$temp = $modx->getParentIds($bID);
-					array_unshift($temp, $bID);
-				}
-
-				if($temp) {
-					$parents = implode(',', $temp);
-
-					if(!empty($parents)) {
-						$where = "FIND_IN_SET(id,'{$parents}') DESC";
-						$rs = $modx->db->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where);
-						while($row = $modx->db->getRow($rs)) {
-							$out .= '<li class="breadcrumbs__li">
+            // breadcrumbs
+            if($modx->config['use_breadcrumbs']) {
+                $temp = array();
+                $title = isset($content['pagetitle']) ? $content['pagetitle'] : $_lang['create_resource_title'];
+
+                if(isset($_REQUEST['id']) && $content['parent'] != 0) {
+                    $bID = (int) $_REQUEST['id'];
+                    $temp = $modx->getParentIds($bID);
+                } else if(isset($_REQUEST['pid'])) {
+                    $bID = (int) $_REQUEST['pid'];
+                    $temp = $modx->getParentIds($bID);
+                    array_unshift($temp, $bID);
+                }
+
+                if($temp) {
+                    $parents = implode(',', $temp);
+
+                    if(!empty($parents)) {
+                        $where = "FIND_IN_SET(id,'{$parents}') DESC";
+                        $rs = $modx->db->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where);
+                        while($row = $modx->db->getRow($rs)) {
+                            $out .= '<li class="breadcrumbs__li">
                                 <a href="index.php?a=27&id=' . $row['id'] . '" class="breadcrumbs__a">' . htmlspecialchars($row['pagetitle'], ENT_QUOTES, $modx->config['modx_charset']) . '</a>
                                 <span class="breadcrumbs__sep">&gt;</span>
                             </li>';
-						}
-					}
-				}
+                        }
+                    }
+                }
 
-				$out .= '<li class="breadcrumbs__li breadcrumbs__li_current">' . $title . '</li>';
-				echo '<ul class="breadcrumbs">' . $out . '</ul>';
-			}
-			?>
+                $out .= '<li class="breadcrumbs__li breadcrumbs__li_current">' . $title . '</li>';
+                echo '<ul class="breadcrumbs">' . $out . '</ul>';
+            }
+            ?>
 
 			<!-- start main wrapper -->
 			<div class="sectionBody">
@@ -635,13 +635,13 @@ 
 
 					<!-- General -->
 					<?php
-					$evtOut = $modx->invokeEvent('OnDocFormTemplateRender', array(
-						'id' => $id
-					));
-					if(is_array($evtOut)) {
-						echo implode('', $evtOut);
-					} else {
-						?>
+                    $evtOut = $modx->invokeEvent('OnDocFormTemplateRender', array(
+                        'id' => $id
+                    ));
+                    if(is_array($evtOut)) {
+                        echo implode('', $evtOut);
+                    } else {
+                        ?>
 						<div class="tab-page" id="tabGeneral">
 							<h2 class="tab"><?= $_lang['settings_general'] ?></h2>
 							<script type="text/javascript">tpSettings.addTabPage(document.getElementById("tabGeneral"));</script>
@@ -726,36 +726,36 @@ 
 										<select id="template" name="template" class="inputBox" onchange="templateWarning();">
 											<option value="0">(blank)</option>
 											<?php
-											$field = "t.templatename, t.selectable, t.id, c.category";
-											$from = "{$tbl_site_templates} AS t LEFT JOIN {$tbl_categories} AS c ON t.category = c.id";
-											$rs = $modx->db->select($field, $from, '', 'c.category, t.templatename ASC');
-											$currentCategory = '';
-											while($row = $modx->db->getRow($rs)) {
-												if($row['selectable'] != 1 && $row['id'] != $content['template']) {
-													continue;
-												};
-												// Skip if not selectable but show if selected!
-												$thisCategory = $row['category'];
-												if($thisCategory == null) {
-													$thisCategory = $_lang["no_category"];
-												}
-												if($thisCategory != $currentCategory) {
-													if($closeOptGroup) {
-														echo "\t\t\t\t\t</optgroup>\n";
-													}
-													echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n";
-													$closeOptGroup = true;
-												}
+                                            $field = "t.templatename, t.selectable, t.id, c.category";
+                                            $from = "{$tbl_site_templates} AS t LEFT JOIN {$tbl_categories} AS c ON t.category = c.id";
+                                            $rs = $modx->db->select($field, $from, '', 'c.category, t.templatename ASC');
+                                            $currentCategory = '';
+                                            while($row = $modx->db->getRow($rs)) {
+                                                if($row['selectable'] != 1 && $row['id'] != $content['template']) {
+                                                    continue;
+                                                };
+                                                // Skip if not selectable but show if selected!
+                                                $thisCategory = $row['category'];
+                                                if($thisCategory == null) {
+                                                    $thisCategory = $_lang["no_category"];
+                                                }
+                                                if($thisCategory != $currentCategory) {
+                                                    if($closeOptGroup) {
+                                                        echo "\t\t\t\t\t</optgroup>\n";
+                                                    }
+                                                    echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n";
+                                                    $closeOptGroup = true;
+                                                }
 
-												$selectedtext = ($row['id'] == $content['template']) ? ' selected="selected"' : '';
+                                                $selectedtext = ($row['id'] == $content['template']) ? ' selected="selected"' : '';
 
-												echo "\t\t\t\t\t" . '<option value="' . $row['id'] . '"' . $selectedtext . '>' . $row['templatename'] . "</option>\n";
-												$currentCategory = $thisCategory;
-											}
-											if($thisCategory != '') {
-												echo "\t\t\t\t\t</optgroup>\n";
-											}
-											?>
+                                                echo "\t\t\t\t\t" . '<option value="' . $row['id'] . '"' . $selectedtext . '>' . $row['templatename'] . "</option>\n";
+                                                $currentCategory = $thisCategory;
+                                            }
+                                            if($thisCategory != '') {
+                                                echo "\t\t\t\t\t</optgroup>\n";
+                                            }
+                                            ?>
 										</select>
 									</td>
 								</tr>
@@ -795,37 +795,37 @@ 
 									</td>
 									<td valign="top">
 										<?php
-										$parentlookup = false;
-										if(isset ($_REQUEST['id'])) {
-											if($content['parent'] == 0) {
-												$parentname = $site_name;
-											} else {
-												$parentlookup = $content['parent'];
-											}
-										} elseif(isset ($_REQUEST['pid'])) {
-											if($_REQUEST['pid'] == 0) {
-												$parentname = $site_name;
-											} else {
-												$parentlookup = $_REQUEST['pid'];
-											}
-										} elseif(isset($_POST['parent'])) {
-											if($_POST['parent'] == 0) {
-												$parentname = $site_name;
-											} else {
-												$parentlookup = $_POST['parent'];
-											}
-										} else {
-											$parentname = $site_name;
-											$content['parent'] = 0;
-										}
-										if($parentlookup !== false && is_numeric($parentlookup)) {
-											$rs = $modx->db->select('pagetitle', $tbl_site_content, "id='{$parentlookup}'");
-											$parentname = $modx->db->getValue($rs);
-											if(!$parentname) {
-												$modx->webAlertAndQuit($_lang["error_no_parent"]);
-											}
-										}
-										?>
+                                        $parentlookup = false;
+                                        if(isset ($_REQUEST['id'])) {
+                                            if($content['parent'] == 0) {
+                                                $parentname = $site_name;
+                                            } else {
+                                                $parentlookup = $content['parent'];
+                                            }
+                                        } elseif(isset ($_REQUEST['pid'])) {
+                                            if($_REQUEST['pid'] == 0) {
+                                                $parentname = $site_name;
+                                            } else {
+                                                $parentlookup = $_REQUEST['pid'];
+                                            }
+                                        } elseif(isset($_POST['parent'])) {
+                                            if($_POST['parent'] == 0) {
+                                                $parentname = $site_name;
+                                            } else {
+                                                $parentlookup = $_POST['parent'];
+                                            }
+                                        } else {
+                                            $parentname = $site_name;
+                                            $content['parent'] = 0;
+                                        }
+                                        if($parentlookup !== false && is_numeric($parentlookup)) {
+                                            $rs = $modx->db->select('pagetitle', $tbl_site_content, "id='{$parentlookup}'");
+                                            $parentname = $modx->db->getValue($rs);
+                                            if(!$parentname) {
+                                                $modx->webAlertAndQuit($_lang["error_no_parent"]);
+                                            }
+                                        }
+                                        ?>
 										<i id="plock" class="<?= $_style["actions_folder"] ?>" onclick="enableParentSelection(!allowParentSelection);"></i>
 										<b><span id="parentName"><?= (isset($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']) ?> (<?= $parentname ?>)</span></b>
 										<input type="hidden" name="parent" value="<?= (isset($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']) ?>" onchange="documentDirty=true;" />
@@ -833,7 +833,7 @@ 
 								</tr>
 								<tr></tr>
 								<?php
-								/*
+                                /*
 								if($content['type'] == 'reference' || $modx->manager->action == '72') {
 									?>
 									<tr>
@@ -861,7 +861,7 @@ 
 									</tr>
 									<?php
 								}*/
-								?>
+                                ?>
 
 								<?php if($content['type'] == 'document' || $modx->manager->action == '4') { ?>
 									<tr>
@@ -874,36 +874,36 @@ 
 													<select id="which_editor" class="form-control form-control-sm" size="1" name="which_editor" onchange="changeRTE();">
 													<option value="none"><?= $_lang['none'] ?></option>
 														<?php
-														// invoke OnRichTextEditorRegister event
-														$evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
-														if(is_array($evtOut)) {
-															for($i = 0; $i < count($evtOut); $i++) {
-																$editor = $evtOut[$i];
-																echo "\t\t\t", '<option value="', $editor, '"', ($modx->config['which_editor'] == $editor ? ' selected="selected"' : ''), '>', $editor, "</option>\n";
-															}
-														}
-														?>
+                                                        // invoke OnRichTextEditorRegister event
+                                                        $evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
+                                                        if(is_array($evtOut)) {
+                                                            for($i = 0; $i < count($evtOut); $i++) {
+                                                                $editor = $evtOut[$i];
+                                                                echo "\t\t\t", '<option value="', $editor, '"', ($modx->config['which_editor'] == $editor ? ' selected="selected"' : ''), '>', $editor, "</option>\n";
+                                                            }
+                                                        }
+                                                        ?>
 													</select>
 												</label>
 											</div>
 											<div id="content_body">
 												<?php
-												if(($content['richtext'] == 1 || $modx->manager->action == '4') && $use_editor == 1) {
-													$htmlContent = $content['content'];
-													?>
+                                                if(($content['richtext'] == 1 || $modx->manager->action == '4') && $use_editor == 1) {
+                                                    $htmlContent = $content['content'];
+                                                    ?>
 													<div class="section-editor clearfix">
 														<textarea id="ta" name="ta" onchange="documentDirty=true;"><?= $modx->htmlspecialchars($htmlContent) ?></textarea>
 													</div>
 													<?php
-													// Richtext-[*content*]
-													$richtexteditorIds = array();
-													$richtexteditorOptions = array();
-													$richtexteditorIds[$modx->config['which_editor']][] = 'ta';
-													$richtexteditorOptions[$modx->config['which_editor']]['ta'] = '';
-												} else {
-													echo "\t" . '<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>' . "\n";
-												}
-												?>
+                                                    // Richtext-[*content*]
+                                                    $richtexteditorIds = array();
+                                                    $richtexteditorOptions = array();
+                                                    $richtexteditorIds[$modx->config['which_editor']][] = 'ta';
+                                                    $richtexteditorOptions[$modx->config['which_editor']]['ta'] = '';
+                                                } else {
+                                                    echo "\t" . '<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>' . "\n";
+                                                }
+                                                ?>
 											</div>
 										</td>
 									</tr>
@@ -1190,8 +1190,8 @@ 
 
 								<?php
 
-								if($_SESSION['mgrRole'] == 1 || $modx->manager->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
-									?>
+                                if($_SESSION['mgrRole'] == 1 || $modx->manager->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
+                                    ?>
 									<tr>
 										<td>
 											<span class="warning"><?= $_lang['resource_type'] ?></span>
@@ -1213,15 +1213,15 @@ 
 										<td>
 											<select name="contentType" class="inputBox" onchange="documentDirty=true;">
 												<?php
-												if(!$content['contentType']) {
-													$content['contentType'] = 'text/html';
-												}
-												$custom_contenttype = (isset ($custom_contenttype) ? $custom_contenttype : "text/html,text/plain,text/xml");
-												$ct = explode(",", $custom_contenttype);
-												for($i = 0; $i < count($ct); $i++) {
-													echo "\t\t\t\t\t" . '<option value="' . $ct[$i] . '"' . ($content['contentType'] == $ct[$i] ? ' selected="selected"' : '') . '>' . $ct[$i] . "</option>\n";
-												}
-												?>
+                                                if(!$content['contentType']) {
+                                                    $content['contentType'] = 'text/html';
+                                                }
+                                                $custom_contenttype = (isset ($custom_contenttype) ? $custom_contenttype : "text/html,text/plain,text/xml");
+                                                $ct = explode(",", $custom_contenttype);
+                                                for($i = 0; $i < count($ct); $i++) {
+                                                    echo "\t\t\t\t\t" . '<option value="' . $ct[$i] . '"' . ($content['contentType'] == $ct[$i] ? ' selected="selected"' : '') . '>' . $ct[$i] . "</option>\n";
+                                                }
+                                                ?>
 											</select>
 										</td>
 									</tr>
@@ -1244,23 +1244,23 @@ 
 										</td>
 									</tr>
 									<?php
-								} else {
-									if($content['type'] != 'reference' && $modx->manager->action != '72') {
-										// non-admin managers creating or editing a document resource
-										?>
+                                } else {
+                                    if($content['type'] != 'reference' && $modx->manager->action != '72') {
+                                        // non-admin managers creating or editing a document resource
+                                        ?>
 										<input type="hidden" name="contentType" value="<?= (isset($content['contentType']) ? $content['contentType'] : "text/html") ?>" />
 										<input type="hidden" name="type" value="document" />
 										<input type="hidden" name="content_dispo" value="<?= (isset($content['content_dispo']) ? $content['content_dispo'] : '0') ?>" />
 										<?php
-									} else {
-										// non-admin managers creating or editing a reference (weblink) resource
-										?>
+                                    } else {
+                                        // non-admin managers creating or editing a reference (weblink) resource
+                                        ?>
 										<input type="hidden" name="type" value="reference" />
 										<input type="hidden" name="contentType" value="text/html" />
 										<?php
-									}
-								}//if mgrRole
-								?>
+                                    }
+                                }//if mgrRole
+                                ?>
 
 								<tr>
 									<td>
@@ -1343,112 +1343,112 @@ 
                     ?>
 
 						<?php
-					/*******************************
+                    /*******************************
 					 * Document Access Permissions */
-					if($use_udperms == 1) {
-						$groupsarray = array();
-						$sql = '';
-
-						$documentId = ($modx->manager->action == '27' ? $id : (!empty($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']));
-						if($documentId > 0) {
-							// Load up, the permissions from the parent (if new document) or existing document
-							$rs = $modx->db->select('id, document_group', $tbl_document_groups, "document='{$documentId}'");
-							while($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
-
-							// Load up the current permissions and names
-							$vs = array(
-								$tbl_document_group_names,
-								$tbl_document_groups,
-								$documentId
-							);
-							$from = vsprintf("%s AS dgn LEFT JOIN %s AS groups ON groups.document_group=dgn.id AND groups.document='%s'", $vs);
-							$rs = $modx->db->select('dgn.*, groups.id AS link_id', $from, '', 'name');
-						} else {
-							// Just load up the names, we're starting clean
-							$rs = $modx->db->select('*, NULL AS link_id', $tbl_document_group_names, '', 'name');
-						}
-
-						// retain selected doc groups between post
-						if(isset($_POST['docgroups'])) {
-							$groupsarray = array_merge($groupsarray, $_POST['docgroups']);
-						}
+                    if($use_udperms == 1) {
+                        $groupsarray = array();
+                        $sql = '';
+
+                        $documentId = ($modx->manager->action == '27' ? $id : (!empty($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']));
+                        if($documentId > 0) {
+                            // Load up, the permissions from the parent (if new document) or existing document
+                            $rs = $modx->db->select('id, document_group', $tbl_document_groups, "document='{$documentId}'");
+                            while($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
+
+                            // Load up the current permissions and names
+                            $vs = array(
+                                $tbl_document_group_names,
+                                $tbl_document_groups,
+                                $documentId
+                            );
+                            $from = vsprintf("%s AS dgn LEFT JOIN %s AS groups ON groups.document_group=dgn.id AND groups.document='%s'", $vs);
+                            $rs = $modx->db->select('dgn.*, groups.id AS link_id', $from, '', 'name');
+                        } else {
+                            // Just load up the names, we're starting clean
+                            $rs = $modx->db->select('*, NULL AS link_id', $tbl_document_group_names, '', 'name');
+                        }
+
+                        // retain selected doc groups between post
+                        if(isset($_POST['docgroups'])) {
+                            $groupsarray = array_merge($groupsarray, $_POST['docgroups']);
+                        }
+
+                        $isManager = $modx->hasPermission('access_permissions');
+                        $isWeb = $modx->hasPermission('web_access_permissions');
+
+                        // Setup Basic attributes for each Input box
+                        $inputAttributes = array(
+                            'type' => 'checkbox',
+                            'class' => 'checkbox',
+                            'name' => 'docgroups[]',
+                            'onclick' => 'makePublic(false);',
+                        );
+                        $permissions = array(); // New Permissions array list (this contains the HTML)
+                        $permissions_yes = 0; // count permissions the current mgr user has
+                        $permissions_no = 0; // count permissions the current mgr user doesn't have
+
+                        // Loop through the permissions list
+                        while($row = $modx->db->getRow($rs)) {
+
+                            // Create an inputValue pair (group ID and group link (if it exists))
+                            $inputValue = $row['id'] . ',' . ($row['link_id'] ? $row['link_id'] : 'new');
+                            $inputId = 'group-' . $row['id'];
+
+                            $checked = in_array($inputValue, $groupsarray);
+                            if($checked) {
+                                $notPublic = true;
+                            } // Mark as private access (either web or manager)
+
+                            // Skip the access permission if the user doesn't have access...
+                            if((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) {
+                                continue;
+                            }
 
-						$isManager = $modx->hasPermission('access_permissions');
-						$isWeb = $modx->hasPermission('web_access_permissions');
-
-						// Setup Basic attributes for each Input box
-						$inputAttributes = array(
-							'type' => 'checkbox',
-							'class' => 'checkbox',
-							'name' => 'docgroups[]',
-							'onclick' => 'makePublic(false);',
-						);
-						$permissions = array(); // New Permissions array list (this contains the HTML)
-						$permissions_yes = 0; // count permissions the current mgr user has
-						$permissions_no = 0; // count permissions the current mgr user doesn't have
-
-						// Loop through the permissions list
-						while($row = $modx->db->getRow($rs)) {
-
-							// Create an inputValue pair (group ID and group link (if it exists))
-							$inputValue = $row['id'] . ',' . ($row['link_id'] ? $row['link_id'] : 'new');
-							$inputId = 'group-' . $row['id'];
-
-							$checked = in_array($inputValue, $groupsarray);
-							if($checked) {
-								$notPublic = true;
-							} // Mark as private access (either web or manager)
-
-							// Skip the access permission if the user doesn't have access...
-							if((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) {
-								continue;
-							}
-
-							// Setup attributes for this Input box
-							$inputAttributes['id'] = $inputId;
-							$inputAttributes['value'] = $inputValue;
-							if($checked) {
-								$inputAttributes['checked'] = 'checked';
-							} else {
-								unset($inputAttributes['checked']);
-							}
-
-							// Create attribute string list
-							$inputString = array();
-							foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"';
-
-							// Make the <input> HTML
-							$inputHTML = '<input ' . implode(' ', $inputString) . ' />';
-
-							// does user have this permission?
-							$from = "{$tbl_membergroup_access} AS mga, {$tbl_member_groups} AS mg";
-							$vs = array(
-								$row['id'],
-								$_SESSION['mgrInternalKey']
-							);
-							$where = vsprintf("mga.membergroup=mg.user_group AND mga.documentgroup=%s AND mg.member=%s", $vs);
-							$rsp = $modx->db->select('COUNT(mg.id)', $from, $where);
-							$count = $modx->db->getValue($rsp);
-							if($count > 0) {
-								++$permissions_yes;
-							} else {
-								++$permissions_no;
-							}
-							$permissions[] = "\t\t" . '<li>' . $inputHTML . '<label for="' . $inputId . '">' . $row['name'] . '</label></li>';
-						}
-						// if mgr user doesn't have access to any of the displayable permissions, forget about them and make doc public
-						if($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) {
-							$permissions = array();
-						}
+                            // Setup attributes for this Input box
+                            $inputAttributes['id'] = $inputId;
+                            $inputAttributes['value'] = $inputValue;
+                            if($checked) {
+                                $inputAttributes['checked'] = 'checked';
+                            } else {
+                                unset($inputAttributes['checked']);
+                            }
 
-						// See if the Access Permissions section is worth displaying...
-						if(!empty($permissions)) {
-							// Add the "All Document Groups" item if we have rights in both contexts
-							if($isManager && $isWeb) {
-								array_unshift($permissions, "\t\t" . '<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true);" /><label for="groupall" class="warning">' . $_lang['all_doc_groups'] . '</label></li>');
-							}
-							// Output the permissions list...
-							?>
+                            // Create attribute string list
+                            $inputString = array();
+                            foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"';
+
+                            // Make the <input> HTML
+                            $inputHTML = '<input ' . implode(' ', $inputString) . ' />';
+
+                            // does user have this permission?
+                            $from = "{$tbl_membergroup_access} AS mga, {$tbl_member_groups} AS mg";
+                            $vs = array(
+                                $row['id'],
+                                $_SESSION['mgrInternalKey']
+                            );
+                            $where = vsprintf("mga.membergroup=mg.user_group AND mga.documentgroup=%s AND mg.member=%s", $vs);
+                            $rsp = $modx->db->select('COUNT(mg.id)', $from, $where);
+                            $count = $modx->db->getValue($rsp);
+                            if($count > 0) {
+                                ++$permissions_yes;
+                            } else {
+                                ++$permissions_no;
+                            }
+                            $permissions[] = "\t\t" . '<li>' . $inputHTML . '<label for="' . $inputId . '">' . $row['name'] . '</label></li>';
+                        }
+                        // if mgr user doesn't have access to any of the displayable permissions, forget about them and make doc public
+                        if($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) {
+                            $permissions = array();
+                        }
+
+                        // See if the Access Permissions section is worth displaying...
+                        if(!empty($permissions)) {
+                            // Add the "All Document Groups" item if we have rights in both contexts
+                            if($isManager && $isWeb) {
+                                array_unshift($permissions, "\t\t" . '<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true);" /><label for="groupall" class="warning">' . $_lang['all_doc_groups'] . '</label></li>');
+                            }
+                            // Output the permissions list...
+                            ?>
 							<!-- Access Permissions -->
 							<div class="tab-page" id="tabAccess">
 								<h2 class="tab" id="tab_access_header"><?= $_lang['access_permissions'] ?></h2>
@@ -1482,31 +1482,31 @@ 
 								</ul>
 							</div><!--div class="tab-page" id="tabAccess"-->
 							<?php
-						} // !empty($permissions)
-						elseif($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) {
-							?>
+                        } // !empty($permissions)
+                        elseif($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) {
+                            ?>
 							<p><?= $_lang["access_permissions_docs_collision"] ?></p>
 							<?php
 
-						}
-					}
-					/* End Document Access Permissions *
+                        }
+                    }
+                    /* End Document Access Permissions *
 					 ***********************************/
-					?>
+                    ?>
 
 					<input type="submit" name="save" style="display:none" />
 					<?php
 
-					// invoke OnDocFormRender event
-					$evtOut = $modx->invokeEvent('OnDocFormRender', array(
-						'id' => $id,
-						'template' => $content['template']
-					));
+                    // invoke OnDocFormRender event
+                    $evtOut = $modx->invokeEvent('OnDocFormRender', array(
+                        'id' => $id,
+                        'template' => $content['template']
+                    ));
 
-					if(is_array($evtOut)) {
-						echo implode('', $evtOut);
-					}
-					?>
+                    if(is_array($evtOut)) {
+                        echo implode('', $evtOut);
+                    }
+                    ?>
 				</div><!--div class="tab-pane" id="documentPane"-->
 			</div><!--div class="sectionBody"-->
 		</fieldset>
@@ -1517,63 +1517,63 @@ 
 	</script>
 <?php
 if(($content['richtext'] == 1 || $modx->manager->action == '4' || $modx->manager->action == '72') && $use_editor == 1) {
-	if(is_array($richtexteditorIds)) {
-		foreach($richtexteditorIds as $editor => $elements) {
-			// invoke OnRichTextEditorInit event
-			$evtOut = $modx->invokeEvent('OnRichTextEditorInit', array(
-				'editor' => $editor,
-				'elements' => $elements,
-				'options' => $richtexteditorOptions[$editor]
-			));
-			if(is_array($evtOut)) {
-				echo implode('', $evtOut);
-			}
-		}
-	}
+    if(is_array($richtexteditorIds)) {
+        foreach($richtexteditorIds as $editor => $elements) {
+            // invoke OnRichTextEditorInit event
+            $evtOut = $modx->invokeEvent('OnRichTextEditorInit', array(
+                'editor' => $editor,
+                'elements' => $elements,
+                'options' => $richtexteditorOptions[$editor]
+            ));
+            if(is_array($evtOut)) {
+                echo implode('', $evtOut);
+            }
+        }
+    }
 }
 
 /**
  * @return string
  */
 function getDefaultTemplate() {
-	global $modx;
+    global $modx;
 
     $default_template = '';
-	switch($modx->config['auto_template_logic']) {
-		case 'sibling':
-			if(!isset($_GET['pid']) || empty($_GET['pid'])) {
-				$site_start = $modx->config['site_start'];
-				$where = "sc.isfolder=0 AND sc.id!='{$site_start}'";
-				$sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', $where, 'menuindex', 'ASC', 1);
-				if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
-					$default_template = $sibl[0]['template'];
-				}
-			} else {
-				$sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
-				if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
-					$default_template = $sibl[0]['template'];
-				} else {
-					$sibl = $modx->getDocumentChildren($_REQUEST['pid'], 0, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
-					if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
-						$default_template = $sibl[0]['template'];
-					}
-				}
-			}
-			if(isset($default_template)) {
-				break;
-			} // If $default_template could not be determined, fall back / through to "parent"-mode
-		case 'parent':
-			if(isset($_REQUEST['pid']) && !empty($_REQUEST['pid'])) {
-				$parent = $modx->getPageInfo($_REQUEST['pid'], 0, 'template');
-				if(isset($parent['template'])) {
-					$default_template = $parent['template'];
-				}
-			}
-			break;
-		case 'system':
-		default: // default_template is already set
-			$default_template = $modx->config['default_template'];
-	}
-
-	return empty($default_template) ? $modx->config['default_template'] : $default_template;
+    switch($modx->config['auto_template_logic']) {
+        case 'sibling':
+            if(!isset($_GET['pid']) || empty($_GET['pid'])) {
+                $site_start = $modx->config['site_start'];
+                $where = "sc.isfolder=0 AND sc.id!='{$site_start}'";
+                $sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', $where, 'menuindex', 'ASC', 1);
+                if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+                    $default_template = $sibl[0]['template'];
+                }
+            } else {
+                $sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
+                if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+                    $default_template = $sibl[0]['template'];
+                } else {
+                    $sibl = $modx->getDocumentChildren($_REQUEST['pid'], 0, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
+                    if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+                        $default_template = $sibl[0]['template'];
+                    }
+                }
+            }
+            if(isset($default_template)) {
+                break;
+            } // If $default_template could not be determined, fall back / through to "parent"-mode
+        case 'parent':
+            if(isset($_REQUEST['pid']) && !empty($_REQUEST['pid'])) {
+                $parent = $modx->getPageInfo($_REQUEST['pid'], 0, 'template');
+                if(isset($parent['template'])) {
+                    $default_template = $parent['template'];
+                }
+            }
+            break;
+        case 'system':
+        default: // default_template is already set
+            $default_template = $modx->config['default_template'];
+    }
+
+    return empty($default_template) ? $modx->config['default_template'] : $default_template;
 }

manager/actions/mutate_module.dynamic.php

Indentation +94 added lines, -94 removed lines

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

 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.");

+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

 switch($modx->manager->action) {

-	case 107:

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

-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);

-		}

-		break;

-	case 108:

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

-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);

-		}

-		break;

-	default:

-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);

+    case 107:

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

+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);

+        }

+        break;

+    case 108:

+        if(!$modx->hasPermission('edit_module')) {

+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);

+        }

+        break;

+    default:

+        $modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;

 // Get table names (alphabetical)

@@ -34,16 +34,16 @@ 
  * @return string

  */

 function createGUID() {

-	srand((double) microtime() * 1000000);

-	$r = rand();

-	$u = uniqid(getmypid() . $r . (double) microtime() * 1000000, 1);

-	$m = md5($u);

-	return $m;

+    srand((double) microtime() * 1000000);

+    $r = rand();

+    $u = uniqid(getmypid() . $r . (double) microtime() * 1000000, 1);

+    $m = md5($u);

+    return $m;

 }

 

 // check to see the module editor isn't locked

 if($lockedEl = $modx->elementIsLocked(6, $id)) {

-	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['module']));

+    $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['module']));

 }

 // end check for lock

 

@@ -51,22 +51,22 @@ 
 $modx->lockElement(6, $id);

 

 if(isset($_GET['id'])) {

-	$rs = $modx->db->select('*', $tbl_site_modules, "id='{$id}'");

-	$content = $modx->db->getRow($rs);

-	if(!$content) {

-		$modx->webAlertAndQuit("Module not found for id '{$id}'.");

-	}

-	$content['properties'] = str_replace("&", "&amp;", $content['properties']);

-	$_SESSION['itemname'] = $content['name'];

-	if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {

-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);

-	}

+    $rs = $modx->db->select('*', $tbl_site_modules, "id='{$id}'");

+    $content = $modx->db->getRow($rs);

+    if(!$content) {

+        $modx->webAlertAndQuit("Module not found for id '{$id}'.");

+    }

+    $content['properties'] = str_replace("&", "&amp;", $content['properties']);

+    $_SESSION['itemname'] = $content['name'];

+    if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {

+        $modx->webAlertAndQuit($_lang["error_no_privileges"]);

+    }

 } else {

-	$_SESSION['itemname'] = $_lang["new_module"];

-	$content['wrap'] = '1';

+    $_SESSION['itemname'] = $_lang["new_module"];

+    $content['wrap'] = '1';

 }

 if($modx->manager->hasFormValues()) {

-	$modx->manager->loadFormValues();

+    $modx->manager->loadFormValues();

 }

 

 // Add lock-element JS-Script

@@ -437,18 +437,18 @@ 
 

 <form name="mutate" id="mutate" class="module" method="post" action="index.php?a=109">

 	<?php

-	// invoke OnModFormPrerender event

-	$evtOut = $modx->invokeEvent('OnModFormPrerender', array('id' => $id));

-	if(is_array($evtOut)) {

-		echo implode('', $evtOut);

-	}

-

-	// Prepare internal params & info-tab via parseDocBlock

-	$modulecode = isset($content['modulecode']) ? $modx->db->escape($content['modulecode']) : '';

-	$docBlock = $modx->parseDocBlockFromString($modulecode);

-	$docBlockList = $modx->convertDocBlockIntoList($docBlock);

-	$internal = array();

-	?>

+    // invoke OnModFormPrerender event

+    $evtOut = $modx->invokeEvent('OnModFormPrerender', array('id' => $id));

+    if(is_array($evtOut)) {

+        echo implode('', $evtOut);

+    }

+

+    // Prepare internal params & info-tab via parseDocBlock

+    $modulecode = isset($content['modulecode']) ? $modx->db->escape($content['modulecode']) : '';

+    $docBlock = $modx->parseDocBlockFromString($modulecode);

+    $docBlockList = $modx->convertDocBlockIntoList($docBlock);

+    $internal = array();

+    ?>

 	<input type="hidden" name="id" value="<?= $content['id'] ?>">

 	<input type="hidden" name="mode" value="<?= $modx->manager->action ?>">

 

@@ -501,11 +501,11 @@ 
 							<select name="categoryid" class="form-control" onchange="documentDirty=true;">

 								<option>&nbsp;</option>

 								<?php

-								include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');

-								foreach(getCategories() as $n => $v) {

-									echo "\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v['category']) . "</option>\n";

-								}

-								?>

+                                include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');

+                                foreach(getCategories() as $n => $v) {

+                                    echo "\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v['category']) . "</option>\n";

+                                }

+                                ?>

 							</select>

 						</div>

 					</div>

@@ -612,7 +612,7 @@ 
 							<i class="<?= $_style["actions_save"] ?>"></i> <?= $_lang['manage_depends'] ?></a>

 					</div>

 					<?php

-					$ds = $modx->db->select("smd.id, COALESCE(ss.name,st.templatename,sv.name,sc.name,sp.name,sd.pagetitle) AS name, 

+                    $ds = $modx->db->select("smd.id, COALESCE(ss.name,st.templatename,sv.name,sc.name,sp.name,sd.pagetitle) AS name, 

 					CASE smd.type

 						WHEN 10 THEN 'Chunk'

 						WHEN 20 THEN 'Document'

@@ -628,17 +628,17 @@ 
 						LEFT JOIN {$tbl_site_templates} AS st ON st.id = smd.resource AND smd.type = 50

 						LEFT JOIN {$tbl_site_tmplvars} AS sv ON sv.id = smd.resource AND smd.type = 60", "smd.module='{$id}'", 'smd.type,name');

 

-					include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";

-					$grd = new DataGrid('', $ds, 0); // set page size to 0 t show all items

-					$grd->noRecordMsg = $_lang['no_records_found'];

-					$grd->cssClass = 'grid';

-					$grd->columnHeaderClass = 'gridHeader';

-					$grd->itemClass = 'gridItem';

-					$grd->altItemClass = 'gridAltItem';

-					$grd->columns = $_lang['element_name'] . " ," . $_lang['type'];

-					$grd->fields = "name,type";

-					echo $grd->render();

-					?>

+                    include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";

+                    $grd = new DataGrid('', $ds, 0); // set page size to 0 t show all items

+                    $grd->noRecordMsg = $_lang['no_records_found'];

+                    $grd->cssClass = 'grid';

+                    $grd->columnHeaderClass = 'gridHeader';

+                    $grd->itemClass = 'gridItem';

+                    $grd->altItemClass = 'gridAltItem';

+                    $grd->columns = $_lang['element_name'] . " ," . $_lang['type'];

+                    $grd->fields = "name,type";

+                    echo $grd->render();

+                    ?>

 				</div>

 			</div>

 		<?php endif; ?>

@@ -650,12 +650,12 @@ 
 			<div class="container container-body">

 				<?php if($use_udperms == 1) : ?>

 					<?php

-					// fetch user access permissions for the module

-					$rs = $modx->db->select('usergroup', $tbl_site_module_access, "module='{$id}'");

-					$groupsarray = $modx->db->getColumn('usergroup', $rs);

+                    // fetch user access permissions for the module

+                    $rs = $modx->db->select('usergroup', $tbl_site_module_access, "module='{$id}'");

+                    $groupsarray = $modx->db->getColumn('usergroup', $rs);

 

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

-						?>

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

+                        ?>

 						<!-- User Group Access Permissions -->

 						<script type="text/javascript">

 							function makePublic(b) {

@@ -679,28 +679,28 @@ 
 						</script>

 						<p><?= $_lang['module_group_access_msg'] ?></p>

 						<?php

-					}

-					$chk = '';

-					$rs = $modx->db->select('name, id', $tbl_membergroup_names, '', 'name');

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

-						$groupsarray = is_numeric($id) && $id > 0 ? $groupsarray : array();

-						$checked = in_array($row['id'], $groupsarray);

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

-							if($checked) {

-								$notPublic = true;

-							}

-							$chks .= '<label><input type="checkbox" name="usrgroups[]" value="' . $row['id'] . '"' . ($checked ? ' checked="checked"' : '') . ' onclick="makePublic(false)" /> ' . $row['name'] . "</label><br />\n";

-						} else {

-							if($checked) {

-								$chks = '<input type="hidden" name="usrgroups[]"  value="' . $row['id'] . '" />' . "\n" . $chks;

-							}

-						}

-					}

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

-						$chks = '<label><input type="checkbox" name="chkallgroups"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true)" /><span class="warning"> ' . $_lang['all_usr_groups'] . '</span></label><br />' . "\n" . $chks;

-					}

-					echo $chks;

-					?>

+                    }

+                    $chk = '';

+                    $rs = $modx->db->select('name, id', $tbl_membergroup_names, '', 'name');

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

+                        $groupsarray = is_numeric($id) && $id > 0 ? $groupsarray : array();

+                        $checked = in_array($row['id'], $groupsarray);

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

+                            if($checked) {

+                                $notPublic = true;

+                            }

+                            $chks .= '<label><input type="checkbox" name="usrgroups[]" value="' . $row['id'] . '"' . ($checked ? ' checked="checked"' : '') . ' onclick="makePublic(false)" /> ' . $row['name'] . "</label><br />\n";

+                        } else {

+                            if($checked) {

+                                $chks = '<input type="hidden" name="usrgroups[]"  value="' . $row['id'] . '" />' . "\n" . $chks;

+                            }

+                        }

+                    }

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

+                        $chks = '<label><input type="checkbox" name="chkallgroups"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true)" /><span class="warning"> ' . $_lang['all_usr_groups'] . '</span></label><br />' . "\n" . $chks;

+                    }

+                    echo $chks;

+                    ?>

 				<?php endif; ?>

 			</div>

 		</div>

@@ -716,11 +716,11 @@ 
 

 		<input type="submit" name="save" style="display:none;">

 		<?php

-		// invoke OnModFormRender event

-		$evtOut = $modx->invokeEvent('OnModFormRender', array('id' => $id));

-		if(is_array($evtOut)) {

-			echo implode('', $evtOut);

-		}

-		?>

+        // invoke OnModFormRender event

+        $evtOut = $modx->invokeEvent('OnModFormRender', array('id' => $id));

+        if(is_array($evtOut)) {

+            echo implode('', $evtOut);

+        }

+        ?>

 </form>

 <script type="text/javascript">setTimeout('showParameters();', 10);</script>

manager/actions/import_site.static.php

Indentation +333 added lines, -333 removed lines

@@ -1,17 +1,17 @@ 
 <?php
 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.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('import_static')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // Files to upload
 $allowedfiles = array(
-	'html',
-	'htm',
-	'shtml',
-	'xml'
+    'html',
+    'htm',
+    'shtml',
+    'xml'
 );
 ?>
 	<script language="javascript">
@@ -43,9 +43,9 @@ 
 	<div class="tab-page">
 		<div class="container container-body">
 			<?php
-			if(!isset($_POST['import'])) {
-				echo "<div class=\"element-edit-message\">" . $_lang['import_site_message'] . "</div>";
-				?>
+            if(!isset($_POST['import'])) {
+                echo "<div class=\"element-edit-message\">" . $_lang['import_site_message'] . "</div>";
+                ?>
 				<form action="index.php" method="post" name="importFrm">
 					<input type="hidden" name="import" value="import" />
 					<input type="hidden" name="a" value="95" />
@@ -85,18 +85,18 @@ 
 					<a href="javascript:;" class="btn btn-primary" onclick="window.importFrm.submit();"><i class="<?= $_style["actions_save"] ?>"></i> <?= $_lang["import_site_start"] ?></a>
 				</form>
 			<?php
-			} else {
-			run();
-			$modx->clearCache('full');
-			?>
+            } else {
+            run();
+            $modx->clearCache('full');
+            ?>
 				<a href="javascript:;" class="btn btn-primary" onclick="window.location.href='index.php?a=2';"><i class="<?= $_style["actions_close"] ?>"></i> <?= $_lang["close"] ?></a>
 				<script type="text/javascript">
 					top.mainMenu.reloadtree();
 					parent.tree.ca = 'open';
 				</script>
 				<?php
-			}
-			?>
+            }
+            ?>
 		</div>
 	</div>
 
@@ -105,64 +105,64 @@ 
  * @return string
  */
 function run() {
-	global $modx, $_lang;
+    global $modx, $_lang;
 
-	$tbl_site_content = $modx->getFullTableName('site_content');
-	$output = '';
-	$maxtime = $_POST['maxtime'];
+    $tbl_site_content = $modx->getFullTableName('site_content');
+    $output = '';
+    $maxtime = $_POST['maxtime'];
 
-	if(!is_numeric($maxtime)) {
-		$maxtime = 30;
-	}
+    if(!is_numeric($maxtime)) {
+        $maxtime = 30;
+    }
 
-	@set_time_limit($maxtime);
+    @set_time_limit($maxtime);
 
-	$mtime = microtime();
-	$mtime = explode(' ', $mtime);
-	$mtime = $mtime[1] + $mtime[0];
-	$importstart = $mtime;
+    $mtime = microtime();
+    $mtime = explode(' ', $mtime);
+    $mtime = $mtime[1] + $mtime[0];
+    $importstart = $mtime;
 
-	if($_POST['reset'] == 'on') {
-		$modx->db->truncate($tbl_site_content);
-		$modx->db->query("ALTER TABLE {$tbl_site_content} AUTO_INCREMENT = 1");
-	}
+    if($_POST['reset'] == 'on') {
+        $modx->db->truncate($tbl_site_content);
+        $modx->db->query("ALTER TABLE {$tbl_site_content} AUTO_INCREMENT = 1");
+    }
 
-	$parent = (int)$_POST['parent'];
+    $parent = (int)$_POST['parent'];
 
-	if(is_dir(MODX_BASE_PATH . 'temp/import')) {
-		$filedir = MODX_BASE_PATH . 'temp/import/';
-	} elseif(is_dir(MODX_BASE_PATH . 'assets/import')) {
-		$filedir = MODX_BASE_PATH . 'assets/import/';
-	} else {
+    if(is_dir(MODX_BASE_PATH . 'temp/import')) {
+        $filedir = MODX_BASE_PATH . 'temp/import/';
+    } elseif(is_dir(MODX_BASE_PATH . 'assets/import')) {
+        $filedir = MODX_BASE_PATH . 'assets/import/';
+    } else {
         $filedir = '';
     }
 
-	$filesfound = 0;
+    $filesfound = 0;
 
-	$files = getFiles($filedir);
-	$files = pop_index($files);
+    $files = getFiles($filedir);
+    $files = pop_index($files);
 
-	// no. of files to import
-	$output .= sprintf('<p>' . $_lang['import_files_found'] . '</p>', $filesfound);
+    // no. of files to import
+    $output .= sprintf('<p>' . $_lang['import_files_found'] . '</p>', $filesfound);
 
-	// import files
-	if(0 < count($files)) {
-		$modx->db->update(array('isfolder' => 1), $tbl_site_content, "id='{$parent}'");
-		importFiles($parent, $filedir, $files, 'root');
-	}
+    // import files
+    if(0 < count($files)) {
+        $modx->db->update(array('isfolder' => 1), $tbl_site_content, "id='{$parent}'");
+        importFiles($parent, $filedir, $files, 'root');
+    }
 
-	$mtime = microtime();
-	$mtime = explode(' ', $mtime);
-	$mtime = $mtime[1] + $mtime[0];
-	$importend = $mtime;
-	$totaltime = ($importend - $importstart);
-	$output .= sprintf('<p>' . $_lang['import_site_time'] . '</p>', round($totaltime, 3));
+    $mtime = microtime();
+    $mtime = explode(' ', $mtime);
+    $mtime = $mtime[1] + $mtime[0];
+    $importend = $mtime;
+    $totaltime = ($importend - $importstart);
+    $output .= sprintf('<p>' . $_lang['import_site_time'] . '</p>', round($totaltime, 3));
 
-	if($_POST['convert_link'] == 'on') {
-		convertLink();
-	}
+    if($_POST['convert_link'] == 'on') {
+        convertLink();
+    }
 
-	return $output;
+    return $output;
 }
 
 /**
@@ -172,144 +172,144 @@ 
  * @param string $mode
  */
 function importFiles($parent, $filedir, $files, $mode) {
-	global $modx;
-	global $_lang, $allowedfiles;
-	global $search_default, $cache_default, $publish_default;
-
-	$tbl_site_content = $modx->getFullTableName('site_content');
-	$tbl_system_settings = $modx->getFullTableName('system_settings');
-
-	$createdby = $modx->getLoginUserID();
-	if(!is_array($files)) {
-		return;
-	}
-	if($_POST['object'] === 'all') {
-		$modx->config['default_template'] = '0';
-		$richtext = '0';
-	} else {
-		$richtext = '1';
-	}
-
-	foreach($files as $id => $value) {
-		if(is_array($value)) {
-			// create folder
-			$alias = $id;
-			printf('<span>' . $_lang['import_site_importing_document'] . '</span>', $alias);
-			$field = array();
-			$field['type'] = 'document';
-			$field['contentType'] = 'text/html';
-			$field['published'] = $publish_default;
-			$field['parent'] = $parent;
-			$field['alias'] = $modx->stripAlias($alias);
-			$field['richtext'] = $richtext;
-			$field['template'] = $modx->config['default_template'];
-			$field['searchable'] = $search_default;
-			$field['cacheable'] = $cache_default;
-			$field['createdby'] = $createdby;
-			$field['isfolder'] = 1;
-			$field['menuindex'] = 1;
-			$find = false;
-			foreach(array(
-						'index.html',
-						'index.htm'
-					) as $filename) {
-				$filepath = $filedir . $alias . '/' . $filename;
-				if($find === false && file_exists($filepath)) {
-					$file = getFileContent($filepath);
-					list($pagetitle, $content, $description) = treatContent($file, $filename, $alias);
-
-					$date = filemtime($filepath);
-					$field['pagetitle'] = $pagetitle;
-					$field['longtitle'] = $pagetitle;
-					$field['description'] = $description;
-					$field['content'] = $modx->db->escape($content);
-					$field['createdon'] = $date;
-					$field['editedon'] = $date;
-					$newid = $modx->db->insert($field, $tbl_site_content);
-					if($newid) {
-						$find = true;
-						echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
-						importFiles($newid, $filedir . $alias . '/', $value, 'sub');
-					} else {
-						echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->db->getLastError();
-						exit;
-					}
-				}
-			}
-			if($find === false) {
-				$date = time();
-				$field['pagetitle'] = '---';
-				$field['content'] = '';
-				$field['createdon'] = $date;
-				$field['editedon'] = $date;
-				$field['hidemenu'] = '1';
-				$newid = $modx->db->insert($field, $tbl_site_content);
-				if($newid) {
-					$find = true;
-					echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
-					importFiles($newid, $filedir . $alias . '/', $value, 'sub');
-				} else {
-					echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->db->getLastError();
-					exit;
-				}
-			}
-		} else {
-			// create document
-			if($mode == 'sub' && $value == 'index.html') {
-				continue;
-			}
-			$filename = $value;
-			$fparts = explode('.', $value);
-			$alias = $fparts[0];
-			$ext = (count($fparts) > 1) ? $fparts[count($fparts) - 1] : "";
-			printf("<span>" . $_lang['import_site_importing_document'] . "</span>", $filename);
-
-			if(!in_array($ext, $allowedfiles)) {
-				echo ' - <span class="fail">' . $_lang["import_site_skip"] . '</span><br />' . "\n";
-			} else {
-				$filepath = $filedir . $filename;
-				$file = getFileContent($filepath);
-				list($pagetitle, $content, $description) = treatContent($file, $filename, $alias);
-
-				$date = filemtime($filepath);
-				$field = array();
-				$field['type'] = 'document';
-				$field['contentType'] = 'text/html';
-				$field['pagetitle'] = $pagetitle;
-				$field['longtitle'] = $pagetitle;
-				$field['description'] = $description;
-				$field['alias'] = $modx->stripAlias($alias);
-				$field['published'] = $publish_default;
-				$field['parent'] = $parent;
-				$field['content'] = $modx->db->escape($content);
-				$field['richtext'] = $richtext;
-				$field['template'] = $modx->config['default_template'];
-				$field['searchable'] = $search_default;
-				$field['cacheable'] = $cache_default;
-				$field['createdby'] = $createdby;
-				$field['createdon'] = $date;
-				$field['editedon'] = $date;
-				$field['isfolder'] = 0;
-				$field['menuindex'] = ($alias == 'index') ? 0 : 2;
-				$newid = $modx->db->insert($field, $tbl_site_content);
-				if($newid) {
-					echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
-				} else {
-					echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->db->getLastError();
-					exit;
-				}
-
-				$is_site_start = false;
-				if($filename == 'index.html') {
-					$is_site_start = true;
-				}
-				if($is_site_start == true && $_POST['reset'] == 'on') {
-					$modx->db->update(array('setting_value' => $newid), $tbl_system_settings, "setting_name='site_start'");
-					$modx->db->update(array('menuindex' => 0), $tbl_site_content, "id='{$newid}'");
-				}
-			}
-		}
-	}
+    global $modx;
+    global $_lang, $allowedfiles;
+    global $search_default, $cache_default, $publish_default;
+
+    $tbl_site_content = $modx->getFullTableName('site_content');
+    $tbl_system_settings = $modx->getFullTableName('system_settings');
+
+    $createdby = $modx->getLoginUserID();
+    if(!is_array($files)) {
+        return;
+    }
+    if($_POST['object'] === 'all') {
+        $modx->config['default_template'] = '0';
+        $richtext = '0';
+    } else {
+        $richtext = '1';
+    }
+
+    foreach($files as $id => $value) {
+        if(is_array($value)) {
+            // create folder
+            $alias = $id;
+            printf('<span>' . $_lang['import_site_importing_document'] . '</span>', $alias);
+            $field = array();
+            $field['type'] = 'document';
+            $field['contentType'] = 'text/html';
+            $field['published'] = $publish_default;
+            $field['parent'] = $parent;
+            $field['alias'] = $modx->stripAlias($alias);
+            $field['richtext'] = $richtext;
+            $field['template'] = $modx->config['default_template'];
+            $field['searchable'] = $search_default;
+            $field['cacheable'] = $cache_default;
+            $field['createdby'] = $createdby;
+            $field['isfolder'] = 1;
+            $field['menuindex'] = 1;
+            $find = false;
+            foreach(array(
+                        'index.html',
+                        'index.htm'
+                    ) as $filename) {
+                $filepath = $filedir . $alias . '/' . $filename;
+                if($find === false && file_exists($filepath)) {
+                    $file = getFileContent($filepath);
+                    list($pagetitle, $content, $description) = treatContent($file, $filename, $alias);
+
+                    $date = filemtime($filepath);
+                    $field['pagetitle'] = $pagetitle;
+                    $field['longtitle'] = $pagetitle;
+                    $field['description'] = $description;
+                    $field['content'] = $modx->db->escape($content);
+                    $field['createdon'] = $date;
+                    $field['editedon'] = $date;
+                    $newid = $modx->db->insert($field, $tbl_site_content);
+                    if($newid) {
+                        $find = true;
+                        echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
+                        importFiles($newid, $filedir . $alias . '/', $value, 'sub');
+                    } else {
+                        echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->db->getLastError();
+                        exit;
+                    }
+                }
+            }
+            if($find === false) {
+                $date = time();
+                $field['pagetitle'] = '---';
+                $field['content'] = '';
+                $field['createdon'] = $date;
+                $field['editedon'] = $date;
+                $field['hidemenu'] = '1';
+                $newid = $modx->db->insert($field, $tbl_site_content);
+                if($newid) {
+                    $find = true;
+                    echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
+                    importFiles($newid, $filedir . $alias . '/', $value, 'sub');
+                } else {
+                    echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->db->getLastError();
+                    exit;
+                }
+            }
+        } else {
+            // create document
+            if($mode == 'sub' && $value == 'index.html') {
+                continue;
+            }
+            $filename = $value;
+            $fparts = explode('.', $value);
+            $alias = $fparts[0];
+            $ext = (count($fparts) > 1) ? $fparts[count($fparts) - 1] : "";
+            printf("<span>" . $_lang['import_site_importing_document'] . "</span>", $filename);
+
+            if(!in_array($ext, $allowedfiles)) {
+                echo ' - <span class="fail">' . $_lang["import_site_skip"] . '</span><br />' . "\n";
+            } else {
+                $filepath = $filedir . $filename;
+                $file = getFileContent($filepath);
+                list($pagetitle, $content, $description) = treatContent($file, $filename, $alias);
+
+                $date = filemtime($filepath);
+                $field = array();
+                $field['type'] = 'document';
+                $field['contentType'] = 'text/html';
+                $field['pagetitle'] = $pagetitle;
+                $field['longtitle'] = $pagetitle;
+                $field['description'] = $description;
+                $field['alias'] = $modx->stripAlias($alias);
+                $field['published'] = $publish_default;
+                $field['parent'] = $parent;
+                $field['content'] = $modx->db->escape($content);
+                $field['richtext'] = $richtext;
+                $field['template'] = $modx->config['default_template'];
+                $field['searchable'] = $search_default;
+                $field['cacheable'] = $cache_default;
+                $field['createdby'] = $createdby;
+                $field['createdon'] = $date;
+                $field['editedon'] = $date;
+                $field['isfolder'] = 0;
+                $field['menuindex'] = ($alias == 'index') ? 0 : 2;
+                $newid = $modx->db->insert($field, $tbl_site_content);
+                if($newid) {
+                    echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
+                } else {
+                    echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->db->getLastError();
+                    exit;
+                }
+
+                $is_site_start = false;
+                if($filename == 'index.html') {
+                    $is_site_start = true;
+                }
+                if($is_site_start == true && $_POST['reset'] == 'on') {
+                    $modx->db->update(array('setting_value' => $newid), $tbl_system_settings, "setting_name='site_start'");
+                    $modx->db->update(array('menuindex' => 0), $tbl_site_content, "id='{$newid}'");
+                }
+            }
+        }
+    }
 }
 
 /**
@@ -319,27 +319,27 @@ 
  * @return array
  */
 function getFiles($directory, $listing = array(), $count = 0) {
-	global $_lang;
-	global $filesfound;
-	$dummy = $count;
-	if( ! empty($directory) && $files = scandir($directory)) {
-		foreach($files as $file) {
-			if($file == '.' || $file == '..') {
-				continue;
-			} elseif($h = @opendir($directory . $file . "/")) {
-				closedir($h);
-				$count = -1;
-				$listing[$file] = getFiles($directory . $file . "/", array(), $count + 1);
-			} elseif(strpos($file, '.htm') !== false) {
-				$listing[$dummy] = $file;
-				$dummy = $dummy + 1;
-				$filesfound++;
-			}
-		}
-	} else {
-		echo '<p><span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_no_open_dir"] . $directory . ".</p>";
-	}
-	return ($listing);
+    global $_lang;
+    global $filesfound;
+    $dummy = $count;
+    if( ! empty($directory) && $files = scandir($directory)) {
+        foreach($files as $file) {
+            if($file == '.' || $file == '..') {
+                continue;
+            } elseif($h = @opendir($directory . $file . "/")) {
+                closedir($h);
+                $count = -1;
+                $listing[$file] = getFiles($directory . $file . "/", array(), $count + 1);
+            } elseif(strpos($file, '.htm') !== false) {
+                $listing[$dummy] = $file;
+                $dummy = $dummy + 1;
+                $filesfound++;
+            }
+        }
+    } else {
+        echo '<p><span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_no_open_dir"] . $directory . ".</p>";
+    }
+    return ($listing);
 }
 
 /**
@@ -347,13 +347,13 @@ 
  * @return bool|string
  */
 function getFileContent($filepath) {
-	global $_lang;
-	// get the file
-	if(!$buffer = file_get_contents($filepath)) {
-		echo '<p><span class="fail">' . $_lang['import_site_failed'] . "</span> " . $_lang["import_site_failed_no_retrieve_file"] . $filepath . ".</p>";
-	} else {
-		return $buffer;
-	}
+    global $_lang;
+    // get the file
+    if(!$buffer = file_get_contents($filepath)) {
+        echo '<p><span class="fail">' . $_lang['import_site_failed'] . "</span> " . $_lang["import_site_failed_no_retrieve_file"] . $filepath . ".</p>";
+    } else {
+        return $buffer;
+    }
 }
 
 /**
@@ -361,20 +361,20 @@ 
  * @return array
  */
 function pop_index($array) {
-	$new_array = array();
-	foreach($array as $k => $v) {
-		if($v !== 'index.html' && $v !== 'index.htm') {
-			$new_array[$k] = $v;
-		} else {
-			array_unshift($new_array, $v);
-		}
-	}
-	foreach($array as $k => $v) {
-		if(is_array($v)) {
-			$new_array[$k] = $v;
-		}
-	}
-	return $new_array;
+    $new_array = array();
+    foreach($array as $k => $v) {
+        if($v !== 'index.html' && $v !== 'index.htm') {
+            $new_array[$k] = $v;
+        } else {
+            array_unshift($new_array, $v);
+        }
+    }
+    foreach($array as $k => $v) {
+        if(is_array($v)) {
+            $new_array[$k] = $v;
+        }
+    }
+    return $new_array;
 }
 
 /**
@@ -384,108 +384,108 @@ 
  * @return array
  */
 function treatContent($src, $filename, $alias) {
-	global $modx;
-
-	$src = mb_convert_encoding($src, $modx->config['modx_charset'], 'UTF-8,SJIS-win,eucJP-win,SJIS,EUC-JP,ASCII');
-
-	if(preg_match("@<title>(.*)</title>@i", $src, $matches)) {
-		$pagetitle = ($matches[1] !== '') ? $matches[1] : $filename;
-		$pagetitle = str_replace('[*pagetitle*]', '', $pagetitle);
-	} else {
-		$pagetitle = $alias;
-	}
-	if(!$pagetitle) {
-		$pagetitle = $alias;
-	}
-
-	if(preg_match('@<meta[^>]+"description"[^>]+content=[\'"](.*)[\'"].+>@i', $src, $matches)) {
-		$description = ($matches[1] !== '') ? $matches[1] : $filename;
-		$description = str_replace('[*description*]', '', $description);
-	} else {
-		$description = '';
-	}
-
-	if((preg_match("@<body[^>]*>(.*)[^<]+</body>@is", $src, $matches)) && $_POST['object'] == 'body') {
-		$content = $matches[1];
-	} else {
-		$content = $src;
-		$s = '/(<meta[^>]+charset\s*=)[^>"\'=]+(.+>)/i';
-		$r = '$1' . $modx->config['modx_charset'] . '$2';
-		$content = preg_replace($s, $r, $content);
-		$content = preg_replace('@<title>.*</title>@i', "<title>[*pagetitle*]</title>", $content);
-	}
-	$content = str_replace('[*content*]', '[ *content* ]', $content);
-	$content = trim($content);
-	$pagetitle = $modx->db->escape($pagetitle);
-	return array(
-		$pagetitle,
-		$content,
-		$description
-	);
+    global $modx;
+
+    $src = mb_convert_encoding($src, $modx->config['modx_charset'], 'UTF-8,SJIS-win,eucJP-win,SJIS,EUC-JP,ASCII');
+
+    if(preg_match("@<title>(.*)</title>@i", $src, $matches)) {
+        $pagetitle = ($matches[1] !== '') ? $matches[1] : $filename;
+        $pagetitle = str_replace('[*pagetitle*]', '', $pagetitle);
+    } else {
+        $pagetitle = $alias;
+    }
+    if(!$pagetitle) {
+        $pagetitle = $alias;
+    }
+
+    if(preg_match('@<meta[^>]+"description"[^>]+content=[\'"](.*)[\'"].+>@i', $src, $matches)) {
+        $description = ($matches[1] !== '') ? $matches[1] : $filename;
+        $description = str_replace('[*description*]', '', $description);
+    } else {
+        $description = '';
+    }
+
+    if((preg_match("@<body[^>]*>(.*)[^<]+</body>@is", $src, $matches)) && $_POST['object'] == 'body') {
+        $content = $matches[1];
+    } else {
+        $content = $src;
+        $s = '/(<meta[^>]+charset\s*=)[^>"\'=]+(.+>)/i';
+        $r = '$1' . $modx->config['modx_charset'] . '$2';
+        $content = preg_replace($s, $r, $content);
+        $content = preg_replace('@<title>.*</title>@i', "<title>[*pagetitle*]</title>", $content);
+    }
+    $content = str_replace('[*content*]', '[ *content* ]', $content);
+    $content = trim($content);
+    $pagetitle = $modx->db->escape($pagetitle);
+    return array(
+        $pagetitle,
+        $content,
+        $description
+    );
 }
 
 /**
  * @return void
  */
 function convertLink() {
-	global $modx;
-	$tbl_site_content = $modx->getFullTableName('site_content');
+    global $modx;
+    $tbl_site_content = $modx->getFullTableName('site_content');
 
-	$rs = $modx->db->select('id,content', $tbl_site_content);
-	$p = array();
+    $rs = $modx->db->select('id,content', $tbl_site_content);
+    $p = array();
     $target = array();
-	$dir = '';
-	while($row = $modx->db->getRow($rs)) {
-		$id = $row['id'];
-		$array = explode('<a href=', $row['content']);
-		$c = 0;
-		foreach($array as $v) {
-			if($v[0] === '"') {
-				$v = substr($v, 1);
-				list($href, $v) = explode('"', $v, 2);
-				$_ = $href;
-				if(strpos($_, $modx->config['site_url']) !== false) {
-					$_ = $modx->config['base_url'] . str_replace($modx->config['site_url'], '', $_);
-				}
-				if($_[0] === '/') {
-					$_ = substr($_, 1);
-				}
-				$_ = str_replace('/index.html', '.html', $_);
-				$level = substr_count($_, '../');
-				if(1 < $level) {
-					if(!isset($p[$id])) {
-						$p[$id] = $modx->getParentIds($id);
-					}
-					$k = array_keys($p[$id]);
-					while(0 < $level) {
-						$dir = array_shift($k);
-						$level--;
-					}
-					if($dir != '') {
-						$dir .= '/';
-					}
-				} else {
-					$dir = '';
-				}
-
-				$_ = trim($_, './');
-				if(strpos($_, '/') !== false) {
-					$_ = substr($_, strrpos($_, '/'));
-				}
-				$_ = $dir . str_replace('.html', '', $_);
-				if(!isset($target[$_])) {
-					$target[$_] = $modx->getIdFromAlias($_);
-				}
-				$target[$_] = trim($target[$_]);
-				if(!empty($target[$_])) {
-					$href = '[~' . $target[$_] . '~]';
-				}
-				$array[$c] = '<a href="' . $href . '"' . $v;
-			}
-			$c++;
-		}
-		$content = implode('', $array);
-		$f['content'] = $modx->db->escape($content);
-		$modx->db->update($f, $tbl_site_content, "id='{$id}'");
-	}
+    $dir = '';
+    while($row = $modx->db->getRow($rs)) {
+        $id = $row['id'];
+        $array = explode('<a href=', $row['content']);
+        $c = 0;
+        foreach($array as $v) {
+            if($v[0] === '"') {
+                $v = substr($v, 1);
+                list($href, $v) = explode('"', $v, 2);
+                $_ = $href;
+                if(strpos($_, $modx->config['site_url']) !== false) {
+                    $_ = $modx->config['base_url'] . str_replace($modx->config['site_url'], '', $_);
+                }
+                if($_[0] === '/') {
+                    $_ = substr($_, 1);
+                }
+                $_ = str_replace('/index.html', '.html', $_);
+                $level = substr_count($_, '../');
+                if(1 < $level) {
+                    if(!isset($p[$id])) {
+                        $p[$id] = $modx->getParentIds($id);
+                    }
+                    $k = array_keys($p[$id]);
+                    while(0 < $level) {
+                        $dir = array_shift($k);
+                        $level--;
+                    }
+                    if($dir != '') {
+                        $dir .= '/';
+                    }
+                } else {
+                    $dir = '';
+                }
+
+                $_ = trim($_, './');
+                if(strpos($_, '/') !== false) {
+                    $_ = substr($_, strrpos($_, '/'));
+                }
+                $_ = $dir . str_replace('.html', '', $_);
+                if(!isset($target[$_])) {
+                    $target[$_] = $modx->getIdFromAlias($_);
+                }
+                $target[$_] = trim($target[$_]);
+                if(!empty($target[$_])) {
+                    $href = '[~' . $target[$_] . '~]';
+                }
+                $array[$c] = '<a href="' . $href . '"' . $v;
+            }
+            $c++;
+        }
+        $content = implode('', $array);
+        $f['content'] = $modx->db->escape($content);
+        $modx->db->update($f, $tbl_site_content, "id='{$id}'");
+    }
 }

manager/actions/mutate_role.dynamic.php

Indentation +126 added lines, -126 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 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.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
 switch((int) $modx->manager->action) {
-	case 35:
-		if(!$modx->hasPermission('edit_role')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	case 38:
-		if(!$modx->hasPermission('new_role')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	default:
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    case 35:
+        if(!$modx->hasPermission('edit_role')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        }
+        break;
+    case 38:
+        if(!$modx->hasPermission('new_role')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        }
+        break;
+    default:
+        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $role = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
@@ -24,7 +24,7 @@ 
 
 // check to see the snippet editor isn't locked
 if($lockedEl = $modx->elementIsLocked(8, $role)) {
-	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['role']));
+    $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['role']));
 }
 // end check for lock
 
@@ -32,15 +32,15 @@ 
 $modx->lockElement(8, $role);
 
 if($modx->manager->action == '35') {
-	$rs = $modx->db->select('*', $tbl_user_roles, "id='{$role}'");
-	$roledata = $modx->db->getRow($rs);
-	if(!$roledata) {
-		$modx->webAlertAndQuit("No role returned!");
-	}
-	$_SESSION['itemname'] = $roledata['name'];
+    $rs = $modx->db->select('*', $tbl_user_roles, "id='{$role}'");
+    $roledata = $modx->db->getRow($rs);
+    if(!$roledata) {
+        $modx->webAlertAndQuit("No role returned!");
+    }
+    $_SESSION['itemname'] = $roledata['name'];
 } else {
-	$roledata = 0;
-	$_SESSION['itemname'] = $_lang["new_role"];
+    $roledata = 0;
+    $_SESSION['itemname'] = $_lang["new_role"];
 }
 
 // Add lock-element JS-Script
@@ -107,63 +107,63 @@ 
 							<div class="form-group">
 								<h3><?= $_lang['page_data_general'] ?></h3>
 								<?php
-								echo render_form('frames', $_lang['role_frames'], 'disabled');
-								echo render_form('home', $_lang['role_home'], 'disabled');
-								echo render_form('messages', $_lang['role_messages']);
-								echo render_form('logout', $_lang['role_logout'], 'disabled');
-								echo render_form('help', $_lang['role_help']);
-								echo render_form('action_ok', $_lang['role_actionok'], 'disabled');
-								echo render_form('error_dialog', $_lang['role_errors'], 'disabled');
-								echo render_form('about', $_lang['role_about'], 'disabled');
-								echo render_form('credits', $_lang['role_credits'], 'disabled');
-								echo render_form('change_password', $_lang['role_change_password']);
-								echo render_form('save_password', $_lang['role_save_password']);
-								?>
+                                echo render_form('frames', $_lang['role_frames'], 'disabled');
+                                echo render_form('home', $_lang['role_home'], 'disabled');
+                                echo render_form('messages', $_lang['role_messages']);
+                                echo render_form('logout', $_lang['role_logout'], 'disabled');
+                                echo render_form('help', $_lang['role_help']);
+                                echo render_form('action_ok', $_lang['role_actionok'], 'disabled');
+                                echo render_form('error_dialog', $_lang['role_errors'], 'disabled');
+                                echo render_form('about', $_lang['role_about'], 'disabled');
+                                echo render_form('credits', $_lang['role_credits'], 'disabled');
+                                echo render_form('change_password', $_lang['role_change_password']);
+                                echo render_form('save_password', $_lang['role_save_password']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_content_management'] ?></h3>
 								<?php
-								echo render_form('view_document', $_lang['role_view_docdata'], 'disabled');
-								echo render_form('new_document', $_lang['role_create_doc']);
-								echo render_form('edit_document', $_lang['role_edit_doc']);
-								echo render_form('change_resourcetype', $_lang['role_change_resourcetype']);
-								echo render_form('save_document', $_lang['role_save_doc']);
-								echo render_form('publish_document', $_lang['role_publish_doc']);
-								echo render_form('delete_document', $_lang['role_delete_doc']);
-								echo render_form('empty_trash', $_lang['role_empty_trash']);
-								echo render_form('empty_cache', $_lang['role_cache_refresh']);
-								echo render_form('view_unpublished', $_lang['role_view_unpublished']);
-								?>
+                                echo render_form('view_document', $_lang['role_view_docdata'], 'disabled');
+                                echo render_form('new_document', $_lang['role_create_doc']);
+                                echo render_form('edit_document', $_lang['role_edit_doc']);
+                                echo render_form('change_resourcetype', $_lang['role_change_resourcetype']);
+                                echo render_form('save_document', $_lang['role_save_doc']);
+                                echo render_form('publish_document', $_lang['role_publish_doc']);
+                                echo render_form('delete_document', $_lang['role_delete_doc']);
+                                echo render_form('empty_trash', $_lang['role_empty_trash']);
+                                echo render_form('empty_cache', $_lang['role_cache_refresh']);
+                                echo render_form('view_unpublished', $_lang['role_view_unpublished']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3 form-group">
 							<div class="form-group">
 								<h3><?= $_lang['role_file_management'] ?></h3>
 								<?php
-								echo render_form('file_manager', $_lang['role_file_manager']);
-								echo render_form('assets_files', $_lang['role_assets_files']);
-								echo render_form('assets_images', $_lang['role_assets_images']);
-								?>
+                                echo render_form('file_manager', $_lang['role_file_manager']);
+                                echo render_form('assets_files', $_lang['role_assets_files']);
+                                echo render_form('assets_images', $_lang['role_assets_images']);
+                                ?>
 							</div>
 							<div class="form-group">
 								<h3><?= $_lang['category_management'] ?></h3>
 								<?php
-								echo render_form('category_manager', $_lang['role_category_manager']);
-								?>
+                                echo render_form('category_manager', $_lang['role_category_manager']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_module_management'] ?></h3>
 								<?php
-								echo render_form('new_module', $_lang['role_new_module']);
-								echo render_form('edit_module', $_lang['role_edit_module']);
-								echo render_form('save_module', $_lang['role_save_module']);
-								echo render_form('delete_module', $_lang['role_delete_module']);
-								echo render_form('exec_module', $_lang['role_run_module']);
-								?>
+                                echo render_form('new_module', $_lang['role_new_module']);
+                                echo render_form('edit_module', $_lang['role_edit_module']);
+                                echo render_form('save_module', $_lang['role_save_module']);
+                                echo render_form('delete_module', $_lang['role_delete_module']);
+                                echo render_form('exec_module', $_lang['role_run_module']);
+                                ?>
 							</div>
 						</div>
 					</div>
@@ -173,44 +173,44 @@ 
 							<div class="form-group">
 								<h3><?= $_lang['role_template_management'] ?></h3>
 								<?php
-								echo render_form('new_template', $_lang['role_create_template']);
-								echo render_form('edit_template', $_lang['role_edit_template']);
-								echo render_form('save_template', $_lang['role_save_template']);
-								echo render_form('delete_template', $_lang['role_delete_template']);
-								?>
+                                echo render_form('new_template', $_lang['role_create_template']);
+                                echo render_form('edit_template', $_lang['role_edit_template']);
+                                echo render_form('save_template', $_lang['role_save_template']);
+                                echo render_form('delete_template', $_lang['role_delete_template']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_snippet_management'] ?></h3>
 								<?php
-								echo render_form('new_snippet', $_lang['role_create_snippet']);
-								echo render_form('edit_snippet', $_lang['role_edit_snippet']);
-								echo render_form('save_snippet', $_lang['role_save_snippet']);
-								echo render_form('delete_snippet', $_lang['role_delete_snippet']);
-								?>
+                                echo render_form('new_snippet', $_lang['role_create_snippet']);
+                                echo render_form('edit_snippet', $_lang['role_edit_snippet']);
+                                echo render_form('save_snippet', $_lang['role_save_snippet']);
+                                echo render_form('delete_snippet', $_lang['role_delete_snippet']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_chunk_management'] ?></h3>
 								<?php
-								echo render_form('new_chunk', $_lang['role_create_chunk']);
-								echo render_form('edit_chunk', $_lang['role_edit_chunk']);
-								echo render_form('save_chunk', $_lang['role_save_chunk']);
-								echo render_form('delete_chunk', $_lang['role_delete_chunk']);
-								?>
+                                echo render_form('new_chunk', $_lang['role_create_chunk']);
+                                echo render_form('edit_chunk', $_lang['role_edit_chunk']);
+                                echo render_form('save_chunk', $_lang['role_save_chunk']);
+                                echo render_form('delete_chunk', $_lang['role_delete_chunk']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_plugin_management'] ?></h3>
 								<?php
-								echo render_form('new_plugin', $_lang['role_create_plugin']);
-								echo render_form('edit_plugin', $_lang['role_edit_plugin']);
-								echo render_form('save_plugin', $_lang['role_save_plugin']);
-								echo render_form('delete_plugin', $_lang['role_delete_plugin']);
-								?>
+                                echo render_form('new_plugin', $_lang['role_create_plugin']);
+                                echo render_form('edit_plugin', $_lang['role_edit_plugin']);
+                                echo render_form('save_plugin', $_lang['role_save_plugin']);
+                                echo render_form('delete_plugin', $_lang['role_delete_plugin']);
+                                ?>
 							</div>
 						</div>
 					</div>
@@ -220,42 +220,42 @@ 
 							<div class="form-group">
 								<h3><?= $_lang['role_user_management'] ?></h3>
 								<?php
-								echo render_form('new_user', $_lang['role_new_user']);
-								echo render_form('edit_user', $_lang['role_edit_user']);
-								echo render_form('save_user', $_lang['role_save_user']);
-								echo render_form('delete_user', $_lang['role_delete_user']);
-								?>
+                                echo render_form('new_user', $_lang['role_new_user']);
+                                echo render_form('edit_user', $_lang['role_edit_user']);
+                                echo render_form('save_user', $_lang['role_save_user']);
+                                echo render_form('delete_user', $_lang['role_delete_user']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_web_user_management'] ?></h3>
 								<?php
-								echo render_form('new_web_user', $_lang['role_new_web_user']);
-								echo render_form('edit_web_user', $_lang['role_edit_web_user']);
-								echo render_form('save_web_user', $_lang['role_save_web_user']);
-								echo render_form('delete_web_user', $_lang['role_delete_web_user']);
-								?>
+                                echo render_form('new_web_user', $_lang['role_new_web_user']);
+                                echo render_form('edit_web_user', $_lang['role_edit_web_user']);
+                                echo render_form('save_web_user', $_lang['role_save_web_user']);
+                                echo render_form('delete_web_user', $_lang['role_delete_web_user']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_udperms'] ?></h3>
 								<?php
-								echo render_form('access_permissions', $_lang['role_access_persmissions']);
-								echo render_form('web_access_permissions', $_lang['role_web_access_persmissions']);
-								?>
+                                echo render_form('access_permissions', $_lang['role_access_persmissions']);
+                                echo render_form('web_access_permissions', $_lang['role_web_access_persmissions']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_role_management'] ?></h3>
 								<?php
-								echo render_form('new_role', $_lang['role_new_role']);
-								echo render_form('edit_role', $_lang['role_edit_role']);
-								echo render_form('save_role', $_lang['role_save_role']);
-								echo render_form('delete_role', $_lang['role_delete_role']);
-								?>
+                                echo render_form('new_role', $_lang['role_new_role']);
+                                echo render_form('edit_role', $_lang['role_edit_role']);
+                                echo render_form('save_role', $_lang['role_save_role']);
+                                echo render_form('delete_role', $_lang['role_delete_role']);
+                                ?>
 							</div>
 						</div>
 					</div>
@@ -265,23 +265,23 @@ 
 							<div class="form-group">
 								<h3><?= $_lang['role_eventlog_management'] ?></h3>
 								<?php
-								echo render_form('view_eventlog', $_lang['role_view_eventlog']);
-								echo render_form('delete_eventlog', $_lang['role_delete_eventlog']);
-								?>
+                                echo render_form('view_eventlog', $_lang['role_view_eventlog']);
+                                echo render_form('delete_eventlog', $_lang['role_delete_eventlog']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_config_management'] ?></h3>
 								<?php
-								echo render_form('logs', $_lang['role_view_logs']);
-								echo render_form('settings', $_lang['role_edit_settings']);
-								echo render_form('bk_manager', $_lang['role_bk_manager']);
-								echo render_form('import_static', $_lang['role_import_static']);
-								echo render_form('export_static', $_lang['role_export_static']);
-								echo render_form('remove_locks', $_lang['role_remove_locks']);
-								echo render_form('display_locks', $_lang['role_display_locks']);
-								?>
+                                echo render_form('logs', $_lang['role_view_logs']);
+                                echo render_form('settings', $_lang['role_edit_settings']);
+                                echo render_form('bk_manager', $_lang['role_bk_manager']);
+                                echo render_form('import_static', $_lang['role_import_static']);
+                                echo render_form('export_static', $_lang['role_export_static']);
+                                echo render_form('remove_locks', $_lang['role_remove_locks']);
+                                echo render_form('display_locks', $_lang['role_display_locks']);
+                                ?>
 							</div>
 						</div>
 					</div>
@@ -300,32 +300,32 @@ 
  * @return string
  */
 function render_form($name, $label, $status = '') {
-	global $modx, $roledata;
+    global $modx, $roledata;
 
-	$tpl = '<label class="d-block" for="[+name+]check">
+    $tpl = '<label class="d-block" for="[+name+]check">
 		<input name="[+name+]check" id="[+name+]check" class="click" type="checkbox" onchange="changestate(document.userform.[+name+])" [+checked+] [+status+]>
 		<input type="hidden" class="[+set+]" name="[+name+]" value="[+value+]">
 		[+label+]
 	</label>';
 
-	$checked = ($roledata[$name] == 1) ? 'checked' : '';
-	$value = ($roledata[$name] == 1) ? 1 : 0;
-	if($status == 'disabled') {
-		$checked = 'checked';
-		$value = 1;
-		$set = 'fix';
-	} else {
-		$set = 'set';
-	}
+    $checked = ($roledata[$name] == 1) ? 'checked' : '';
+    $value = ($roledata[$name] == 1) ? 1 : 0;
+    if($status == 'disabled') {
+        $checked = 'checked';
+        $value = 1;
+        $set = 'fix';
+    } else {
+        $set = 'set';
+    }
 
-	$ph = array(
-		'name' => $name,
-		'checked' => $checked,
-		'status' => $status,
-		'value' => $value,
-		'label' => $label,
-		'set' => $set
-	);
+    $ph = array(
+        'name' => $name,
+        'checked' => $checked,
+        'status' => $status,
+        'value' => $value,
+        'label' => $label,
+        'set' => $set
+    );
 
-	return $modx->parseText($tpl, $ph);
+    return $modx->parseText($tpl, $ph);
 }

manager/actions/help/01About_EVO.php

Indentation +22 added lines, -22 removed lines

@@ -4,18 +4,18 @@ 
 }
 $logo= '<img src="media/style/default/images/misc/login-logo.png" height="54" width="358" border="0">';
 $downloadLinks = array(
-	0=>array('title'=>$_lang["information"],'link'=>'https://evo.im/'),
-	1=>array('title'=>$_lang["download"],'link'=>'https://github.com/evolution-cms/evolution/releases'),
-	2=>array('title'=>$_lang["previous_releases"],'link'=>'https://modx.com/download/evolution/previous-releases.html'),
-	3=>array('title'=>$_lang["extras"],'link'=>array(
-		'http://extras.evolution-cms.com/',
-		'https://github.com/extras-evolution'
-	)),
+    0=>array('title'=>$_lang["information"],'link'=>'https://evo.im/'),
+    1=>array('title'=>$_lang["download"],'link'=>'https://github.com/evolution-cms/evolution/releases'),
+    2=>array('title'=>$_lang["previous_releases"],'link'=>'https://modx.com/download/evolution/previous-releases.html'),
+    3=>array('title'=>$_lang["extras"],'link'=>array(
+        'http://extras.evolution-cms.com/',
+        'https://github.com/extras-evolution'
+    )),
 );
 
 $translationLinks = array(
-	0=>array('title'=>'Evolution CMS','link'=>'https://www.transifex.com/evolutioncms/evolution/'),
-	1=>array('title'=>$_lang["extras"],'link'=>'https://www.transifex.com/evolutioncms/extras/'),
+    0=>array('title'=>'Evolution CMS','link'=>'https://www.transifex.com/evolutioncms/evolution/'),
+    1=>array('title'=>$_lang["extras"],'link'=>'https://www.transifex.com/evolutioncms/extras/'),
 );
 
 /**
@@ -24,23 +24,23 @@ 
  * @return string
  */
 function createList($sectionHeader, $linkArr) {
-	$output = '<div class="sectionHeader">'.$sectionHeader.'</div><div class="sectionBody">'."\n";
-	$output .= '<table width="500"  border="0" cellspacing="0" cellpadding="0">'."\n";
-	$links = '';
-	foreach($linkArr as $row) {
-		if (!is_array($row['link'])) $row['link'] = array($row['link']);
-		foreach ($row['link'] as $link) {
-			$links .= $links != '' ? '<br/>' : '';
-			$links .= '<a href="' . $link . '" target="_blank">' . $link . '</a>';
-		}
-		$output .= '
+    $output = '<div class="sectionHeader">'.$sectionHeader.'</div><div class="sectionBody">'."\n";
+    $output .= '<table width="500"  border="0" cellspacing="0" cellpadding="0">'."\n";
+    $links = '';
+    foreach($linkArr as $row) {
+        if (!is_array($row['link'])) $row['link'] = array($row['link']);
+        foreach ($row['link'] as $link) {
+            $links .= $links != '' ? '<br/>' : '';
+            $links .= '<a href="' . $link . '" target="_blank">' . $link . '</a>';
+        }
+        $output .= '
 		<tr>
 			<td align="left"><strong>' . $row["title"] . '</strong></td>
 			<td align="left">' . $links . '</td>
 		</tr>';
-		$links = '';
-	}
-	$output .= '</table></div>'."\n";
+        $links = '';
+    }
+    $output .= '</table></div>'."\n";
     return $output;
 }
 echo $logo;

manager/includes/template.parser.class.inc.php

Indentation +142 added lines, -142 removed lines

@@ -10,178 +10,178 @@
 Class TemplateParser {

 

     /**

-	 * @param array $config [action, tabs, toArray]

-	 * @param array $data

-	 * @return string

-	 */

-	public function output($config = array(), $data = array()) {

-		global $modx;

-

-		$output = '';

-		$action = !empty($config['action']) ? $config['action'] : (!empty($_REQUEST['a']) ? $_REQUEST['a'] : '');

-		$tab = isset($config['tab']) ? ' AND tab IN(' . $config['tab'] . ')' : '';

-

-		if($action) {

-			$sql = $modx->db->query('SELECT t1.*, IF(t1.alias=\'\',t1.name,t1.alias) AS alias, t2.category AS category_name

+     * @param array $config [action, tabs, toArray]

+     * @param array $data

+     * @return string

+     */

+    public function output($config = array(), $data = array()) {

+        global $modx;

+

+        $output = '';

+        $action = !empty($config['action']) ? $config['action'] : (!empty($_REQUEST['a']) ? $_REQUEST['a'] : '');

+        $tab = isset($config['tab']) ? ' AND tab IN(' . $config['tab'] . ')' : '';

+

+        if($action) {

+            $sql = $modx->db->query('SELECT t1.*, IF(t1.alias=\'\',t1.name,t1.alias) AS alias, t2.category AS category_name

 			FROM ' . $modx->getFullTableName('system_templates') . ' AS t1

 			INNER JOIN ' . $modx->getFullTableName('categories') . ' AS t2 ON t2.id=t1.category

 			WHERE t1.action IN(' . $action . ') ' . $tab . '

 			ORDER BY t1.tab ASC, t1.rank ASC');

 

-			if($modx->db->getRecordCount($sql)) {

-				$tabs = array();

-				while($row = $modx->db->getRow($sql)) {

-					if(!$row['value'] && !empty($data[$row['name']])) {

-						$row['value'] = $data[$row['name']];

-					}

-					$tabs[$row['tab']]['category_name'] = $row['category_name'];

-					$tabs[$row['tab']][$row['name']] = TemplateParser::render($row);

-				}

-

-				if(!empty($config['toArray'])) {

-					$output = $tabs;

-				} else {

-					$output .= '<div class="tab-pane" id="pane_' . $action . '">';

-					$output .= '

+            if($modx->db->getRecordCount($sql)) {

+                $tabs = array();

+                while($row = $modx->db->getRow($sql)) {

+                    if(!$row['value'] && !empty($data[$row['name']])) {

+                        $row['value'] = $data[$row['name']];

+                    }

+                    $tabs[$row['tab']]['category_name'] = $row['category_name'];

+                    $tabs[$row['tab']][$row['name']] = TemplateParser::render($row);

+                }

+

+                if(!empty($config['toArray'])) {

+                    $output = $tabs;

+                } else {

+                    $output .= '<div class="tab-pane" id="pane_' . $action . '">';

+                    $output .= '

 					<script type="text/javascript">

 						var pane_' . $action . ' = new WebFXTabPane(document.getElementById("pane_' . $action . '"), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . ');

 					</script>';

 

-					foreach($tabs as $idTab => $tab) {

-						$output .= '<div class="tab-page" id="tab_' . $action . '_' . $idTab . '">';

-						$output .= '

+                    foreach($tabs as $idTab => $tab) {

+                        $output .= '<div class="tab-page" id="tab_' . $action . '_' . $idTab . '">';

+                        $output .= '

 						<h2 class="tab">' . (!empty($config['tabs'][$idTab]) ? $config['tabs'][$idTab] : $tab['category_name']) . '</h2>

 						<script type="text/javascript">pane_' . $action . '.addTabPage(document.getElementById("tab_' . $action . '_' . $idTab . '"));</script>';

-						unset($tab['category_name']);

-						foreach($tab as $item) {

-							$output .= $item;

-						}

-						$output .= '</div>';

-					}

-					$output .= '</div>';

-				}

-			}

-		}

-

-		return $output;

-	}

+                        unset($tab['category_name']);

+                        foreach($tab as $item) {

+                            $output .= $item;

+                        }

+                        $output .= '</div>';

+                    }

+                    $output .= '</div>';

+                }

+            }

+        }

+

+        return $output;

+    }

 

     /**

      * @param array $data

      * @return string

      */

-	private function render($data) {

-		global $modx, $_lang, $_country_lang;

+    private function render($data) {

+        global $modx, $_lang, $_country_lang;

 

-		$data['lang.name'] = (isset($_lang[$data['alias']]) ? $_lang[$data['alias']] : $data['alias']);

-		$data['value'] = (isset($_POST[$data['name']][$data['value']]) ? $_POST[$data['name']][$data['value']] : (isset($data['value']) ? $modx->htmlspecialchars($data['value']) : ''));

-		$data['readonly'] = ($data['readonly'] ? ' readonly' : '');

+        $data['lang.name'] = (isset($_lang[$data['alias']]) ? $_lang[$data['alias']] : $data['alias']);

+        $data['value'] = (isset($_POST[$data['name']][$data['value']]) ? $_POST[$data['name']][$data['value']] : (isset($data['value']) ? $modx->htmlspecialchars($data['value']) : ''));

+        $data['readonly'] = ($data['readonly'] ? ' readonly' : '');

 

-		$output = '';

-		$output .= '<div class="form-group row">';

+        $output = '';

+        $output .= '<div class="form-group row">';

 

-		switch($data['type']) {

+        switch($data['type']) {

 

-			case 'text':

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

+            case 'text':

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

 					<div class="col-sm-7">

 					<input type="text" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-				$output .= $data['content'];

-				$output .= '</div>';

+                $output .= $data['content'];

+                $output .= '</div>';

 

-				break;

+                break;

 

-			case 'textarea':

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

+            case 'textarea':

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

 					<div class="col-sm-7">

 					<textarea name="[+name+]" class="form-control" id="[+name+]" onChange="documentDirty=true;"[+readonly+]>[+value+]</textarea>';

-				$output .= $data['content'];

-				$output .= '</div>';

+                $output .= $data['content'];

+                $output .= '</div>';

 

-				break;

+                break;

 

-			case 'date':

-				$data['value'] = (isset($_POST[$data['name']][$data['value']]) ? $modx->toDateFormat($_POST[$data['name']][$data['value']]) : (isset($data['value']) ? $modx->toDateFormat($data['value']) : ''));

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

+            case 'date':

+                $data['value'] = (isset($_POST[$data['name']][$data['value']]) ? $modx->toDateFormat($_POST[$data['name']][$data['value']]) : (isset($data['value']) ? $modx->toDateFormat($data['value']) : ''));

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

 					<div class="col-sm-7">

 					<input type="text" name="[+name+]" class="form-control DatePicker" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-				$output .= $data['content'];

-				$output .= '</div>';

-

-				break;

-

-			case 'select':

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

-				$output .= '<div class="col-sm-7">';

-				$output .= '<select name="[+name+]" class="form-control" id="[+name+]" onChange="documentDirty=true;">';

-				if($data['name'] == 'country' && isset($_country_lang)) {

-					$chosenCountry = isset($_POST['country']) ? $_POST['country'] : $data['country'];

-					$output .= '<option value=""' . (!isset($chosenCountry) ? ' selected' : '') . '>&nbsp;</option>';

-					foreach($_country_lang as $key => $value) {

-						$output .= '<option value="' . $key . '"' . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . '>' . $value . '</option>';

-					}

-				} else {

-					if($data['elements']) {

-						$elements = explode('||', $data['elements']);

-						foreach($elements as $key => $value) {

-							$value = explode('==', $value);

-							$output .= '<option value="' . $value[1] . '">' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]) . '</option>';

-						}

-					}

-				}

-				$output .= '</select>';

-				$output .= $data['content'];

-				$output .= '</div>';

-

-				break;

-

-			case 'checkbox':

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

-				$output .= '<div class="col-sm-7">';

-				$output .= '<input type="checkbox" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-				if($data['elements']) {

-					$elements = explode('||', $data['elements']);

-					foreach($elements as $key => $value) {

-						$value = explode('==', $value);

-						$output .= '<br /><input type="checkbox" name="' . $value[0] . '" class="form-control" id="' . $value[0] . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

-					}

-				}

-				$output .= $data['content'];

-				$output .= '</div>';

-

-				break;

-

-			case 'radio':

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

-				$output .= '<div class="col-sm-7">';

-				$output .= '<input type="radio" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-				if($data['elements']) {

-					$elements = explode('||', $data['elements']);

-					foreach($elements as $key => $value) {

-						$value = explode('==', $value);

-						$output .= '<br /><input type="radio" name="[+name+]" class="form-control" id="[+name+]_' . $key . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

-					}

-				}

-				$output .= $data['content'];

-				$output .= '</div>';

-

-				break;

-

-			case 'custom':

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

-				$output .= '<div class="col-sm-7">';

-				$output .= $data['content'];

-				$output .= '</div>';

-

-				break;

-		}

-

-		$output .= '</div>';

-

-		$output = $modx->parseText($output, $data);

-

-		return $output;

-	}

+                $output .= $data['content'];

+                $output .= '</div>';

+

+                break;

+

+            case 'select':

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

+                $output .= '<div class="col-sm-7">';

+                $output .= '<select name="[+name+]" class="form-control" id="[+name+]" onChange="documentDirty=true;">';

+                if($data['name'] == 'country' && isset($_country_lang)) {

+                    $chosenCountry = isset($_POST['country']) ? $_POST['country'] : $data['country'];

+                    $output .= '<option value=""' . (!isset($chosenCountry) ? ' selected' : '') . '>&nbsp;</option>';

+                    foreach($_country_lang as $key => $value) {

+                        $output .= '<option value="' . $key . '"' . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . '>' . $value . '</option>';

+                    }

+                } else {

+                    if($data['elements']) {

+                        $elements = explode('||', $data['elements']);

+                        foreach($elements as $key => $value) {

+                            $value = explode('==', $value);

+                            $output .= '<option value="' . $value[1] . '">' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]) . '</option>';

+                        }

+                    }

+                }

+                $output .= '</select>';

+                $output .= $data['content'];

+                $output .= '</div>';

+

+                break;

+

+            case 'checkbox':

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

+                $output .= '<div class="col-sm-7">';

+                $output .= '<input type="checkbox" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

+                if($data['elements']) {

+                    $elements = explode('||', $data['elements']);

+                    foreach($elements as $key => $value) {

+                        $value = explode('==', $value);

+                        $output .= '<br /><input type="checkbox" name="' . $value[0] . '" class="form-control" id="' . $value[0] . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

+                    }

+                }

+                $output .= $data['content'];

+                $output .= '</div>';

+

+                break;

+

+            case 'radio':

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

+                $output .= '<div class="col-sm-7">';

+                $output .= '<input type="radio" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

+                if($data['elements']) {

+                    $elements = explode('||', $data['elements']);

+                    foreach($elements as $key => $value) {

+                        $value = explode('==', $value);

+                        $output .= '<br /><input type="radio" name="[+name+]" class="form-control" id="[+name+]_' . $key . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

+                    }

+                }

+                $output .= $data['content'];

+                $output .= '</div>';

+

+                break;

+

+            case 'custom':

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

+                $output .= '<div class="col-sm-7">';

+                $output .= $data['content'];

+                $output .= '</div>';

+

+                break;

+        }

+

+        $output .= '</div>';

+

+        $output = $modx->parseText($output, $data);

+

+        return $output;

+    }

 

 }

 

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;
 }

manager/includes/tmplvars.format.inc.php

Indentation +322 added lines, -322 removed lines

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