evolution-cms / evolution

manager/includes/config_check.inc.php

Indentation +16 added lines, -16 removed lines

@@ -5,14 +5,14 @@ 
 
 // PROCESSOR FIRST
 if($_SESSION['mgrRole'] == 1) {
-	if($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) {
-		$current = $modx->manager->getSystemChecksum($modx->config['check_files_onlogin']);
-		if(!empty($current)) {
-			$modx->manager->setSystemChecksum($current);
-			$modx->clearCache('full');
-			$modx->config['sys_files_checksum'] = $current;
-		};
-	}
+    if($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) {
+        $current = $modx->manager->getSystemChecksum($modx->config['check_files_onlogin']);
+        if(!empty($current)) {
+            $modx->manager->setSystemChecksum($current);
+            $modx->clearCache('full');
+            $modx->config['sys_files_checksum'] = $current;
+        };
+    }
 }
 
 // NOW CHECK CONFIG
@@ -20,15 +20,15 @@ 
 
 $sysfiles_check = $modx->manager->checkSystemChecksum();
 if ($sysfiles_check!=='0'){
-      $warningspresent = 1;
-      $warnings[] = array($_lang['configcheck_sysfiles_mod']);
+        $warningspresent = 1;
+        $warnings[] = array($_lang['configcheck_sysfiles_mod']);
 }
 
 if (is_writable("includes/config.inc.php")){
     // Warn if world writable
     if(@fileperms('includes/config.inc.php') & 0x0002) {
-      $warningspresent = 1;
-      $warnings[] = array($_lang['configcheck_configinc']);
+        $warningspresent = 1;
+        $warnings[] = array($_lang['configcheck_configinc']);
     }
 }
 
@@ -179,10 +179,10 @@ 
             break;
         case $_lang['configcheck_sysfiles_mod']:
             $warnings[$i][1] = $_lang["configcheck_sysfiles_mod_msg"];
-			$warnings[$i][2] = '<ul><li>'. implode('</li><li>', $sysfiles_check) .'</li></ul>';
-			if($modx->hasPermission('settings')) {
-				$warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\'' . $_lang["reset_sysfiles_checksum_alert"] . '\')">' . $_lang["reset_sysfiles_checksum_button"] . '</a></li></ul>';
-			}
+            $warnings[$i][2] = '<ul><li>'. implode('</li><li>', $sysfiles_check) .'</li></ul>';
+            if($modx->hasPermission('settings')) {
+                $warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\'' . $_lang["reset_sysfiles_checksum_alert"] . '\')">' . $_lang["reset_sysfiles_checksum_button"] . '</a></li></ul>';
+            }
             if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1]." ".implode(', ',$sysfiles_check),$_lang['configcheck_sysfiles_mod']);
             break;
         case $_lang['configcheck_lang_difference'] :

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/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/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/processors/duplicate_module.processor.php

Indentation +35 added lines, -35 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('new_module')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /**
@@ -17,11 +17,11 @@ 
  * @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;
 }
 
 // count duplicates
@@ -32,40 +32,40 @@ 
 
 // duplicate module
 $newid = $modx->db->insert(
-	array(
-		'name'=>'',
-		'description'=>'',
-		'disabled'=>'',
-		'category'=>'',
-		'wrap'=>'',
-		'icon'=>'',
-		'enable_resource'=>'',
-		'resourcefile'=>'',
-		'createdon'=>'',
-		'editedon'=>'',
-		'guid'=>'',
-		'enable_sharedparams'=>'',
-		'properties'=>'',
-		'modulecode'=>'',
-		), $modx->getFullTableName('site_modules'), // Insert into
-	"CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, '1' AS disabled, category, wrap, icon, enable_resource, resourcefile, createdon, editedon, '".createGUID()."' AS guid, enable_sharedparams, properties, modulecode", $modx->getFullTableName('site_modules'), "id='{$id}'"); // Copy from
+    array(
+        'name'=>'',
+        'description'=>'',
+        'disabled'=>'',
+        'category'=>'',
+        'wrap'=>'',
+        'icon'=>'',
+        'enable_resource'=>'',
+        'resourcefile'=>'',
+        'createdon'=>'',
+        'editedon'=>'',
+        'guid'=>'',
+        'enable_sharedparams'=>'',
+        'properties'=>'',
+        'modulecode'=>'',
+        ), $modx->getFullTableName('site_modules'), // Insert into
+    "CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, '1' AS disabled, category, wrap, icon, enable_resource, resourcefile, createdon, editedon, '".createGUID()."' AS guid, enable_sharedparams, properties, modulecode", $modx->getFullTableName('site_modules'), "id='{$id}'"); // Copy from
 
 // duplicate module dependencies
 $modx->db->insert(
-	array(
-		'module'=>'',
-		'resource'=>'',
-		'type'=>'',
-		), $modx->getFullTableName('site_module_depobj'), // Insert into
-	"'{$newid}', resource, type", $modx->getFullTableName('site_module_depobj'), "module='{$id}'"); // Copy from
+    array(
+        'module'=>'',
+        'resource'=>'',
+        'type'=>'',
+        ), $modx->getFullTableName('site_module_depobj'), // Insert into
+    "'{$newid}', resource, type", $modx->getFullTableName('site_module_depobj'), "module='{$id}'"); // Copy from
 
 // duplicate module user group access
 $modx->db->insert(
-	array(
-		'module'=>'',
-		'usergroup'=>'',
-		), $modx->getFullTableName('site_module_access'), // Insert into
-	"'{$newid}', usergroup", $modx->getFullTableName('site_module_access'), "module='{$id}'"); // Copy from
+    array(
+        'module'=>'',
+        'usergroup'=>'',
+        ), $modx->getFullTableName('site_module_access'), // Insert into
+    "'{$newid}', usergroup", $modx->getFullTableName('site_module_access'), "module='{$id}'"); // Copy from
 
 // Set the item name for logger
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_modules'), "id='{$newid}'"));

manager/processors/remove_installer.processor.php

Indentation +14 added lines, -14 removed lines

@@ -16,9 +16,9 @@ 
 $pth = dirname(dirname(dirname(__FILE__)))."/install/";
 $pth = str_replace("\\","/",$pth);
 if(isset($_GET["rminstall"])) {
-	if(is_dir($pth)) {
-		if(!rmdirRecursive($pth)) $msg="An error occured while attempting to remove the install folder";
-	}
+    if(is_dir($pth)) {
+        if(!rmdirRecursive($pth)) $msg="An error occured while attempting to remove the install folder";
+    }
 }
 if($msg) echo "<script>alert('".addslashes($msg)."');</script>";
 echo "<script>window.location='../index.php?a=2';</script>";
@@ -31,15 +31,15 @@ 
  * @return bool
  */
 function rmdirRecursive($path, $followLinks=false) {
-   $dir = opendir($path) ;
-   while ($entry = readdir($dir)) {
-	   if (is_file("$path/$entry") || ((!$followLinks) && is_link("$path/$entry"))) {
-		   @unlink( "$path/$entry" );
-	   }
-	   elseif (is_dir("$path/$entry") && $entry!='.' && $entry!='..') {
-		   rmdirRecursive("$path/$entry"); // recursive
-	   }
-   }
-   closedir($dir);
-   return @rmdir($path);
+    $dir = opendir($path) ;
+    while ($entry = readdir($dir)) {
+        if (is_file("$path/$entry") || ((!$followLinks) && is_link("$path/$entry"))) {
+            @unlink( "$path/$entry" );
+        }
+        elseif (is_dir("$path/$entry") && $entry!='.' && $entry!='..') {
+            rmdirRecursive("$path/$entry"); // recursive
+        }
+    }
+    closedir($dir);
+    return @rmdir($path);
 }

manager/media/script/air-datepicker/datepicker.inc.php

Indentation +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
         $load_script = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
         if(!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
-		$modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
+        $modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
         return $modx->mergeSettingsContent($load_script);
     }
 

index.php

Indentation +13 added lines, -13 removed lines

@@ -47,7 +47,7 @@ 
 
 $autoloader = __DIR__.'/vendor/autoload.php';
 if (file_exists($autoloader) && is_readable($autoloader)) {
-	include_once($autoloader);
+    include_once($autoloader);
 }
 
 if(!isset($_SERVER['REQUEST_TIME_FLOAT'])) $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true);
@@ -56,11 +56,11 @@ 
 if(is_file($base_path . 'assets/cache/siteManager.php'))
     include_once($base_path . 'assets/cache/siteManager.php');
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager"))
-	define('MGR_DIR', 'manager');
+    define('MGR_DIR', 'manager');
 if(is_file($base_path . 'assets/cache/siteHostnames.php'))
     include_once($base_path . 'assets/cache/siteHostnames.php');
 if(!defined('MODX_SITE_HOSTNAMES'))
-	define('MODX_SITE_HOSTNAMES', '');
+    define('MODX_SITE_HOSTNAMES', '');
 
 // get start time
 $mstart = memory_get_usage();
@@ -84,7 +84,7 @@ 
 
 define('IN_PARSER_MODE', true);
 if ( ! defined('IN_MANAGER_MODE')) {
-	define('IN_MANAGER_MODE', false);
+    define('IN_MANAGER_MODE', false);
 }
 if (!defined('MODX_API_MODE')) {
     define('MODX_API_MODE', false);
@@ -92,12 +92,12 @@ 
 
 // get the required includes
 if(!isset($database_user) || $database_user=="") {
-	$rt = @include_once(dirname(__FILE__).'/'.MGR_DIR.'/includes/config.inc.php');
-	// Be sure config.inc.php is there and that it contains some important values
-	if(!$rt || !$database_type || !$database_server || !$database_user || !$dbase) {
-		readfile('install/not_installed.tpl');
-		exit;
-	}
+    $rt = @include_once(dirname(__FILE__).'/'.MGR_DIR.'/includes/config.inc.php');
+    // Be sure config.inc.php is there and that it contains some important values
+    if(!$rt || !$database_type || !$database_server || !$database_user || !$dbase) {
+        readfile('install/not_installed.tpl');
+        exit;
+    }
 }
 
 // start session
@@ -105,11 +105,11 @@ 
 
 // initiate a new document parser
 if (isset($coreClass) && class_exists($coreClass)) {
-	$modx = new $coreClass;
+    $modx = new $coreClass;
 }
 if (!isset($modx) || !($modx instanceof \DocumentParser)) {
-	include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
-	$modx = DocumentParser::getInstance();
+    include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
+    $modx = DocumentParser::getInstance();
 }
 
 // set some parser options

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() {
-	$modx = evolutionCMS(); global $_lang;
+    $modx = evolutionCMS(); global $_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) {
-	$modx = evolutionCMS();
-	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}'");
-				}
-			}
-		}
-	}
+    $modx = evolutionCMS();
+    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) {
-	$modx = evolutionCMS();
-
-	$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
-	);
+    $modx = evolutionCMS();
+
+    $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() {
-	$modx = evolutionCMS();
-	$tbl_site_content = $modx->getFullTableName('site_content');
+    $modx = evolutionCMS();
+    $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}'");
+    }
 }