evolution-cms / evolution

manager/actions/mutate_module.dynamic.php

Indentation +94 added lines, -94 removed lines

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

 if(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']) ? intval($_REQUEST['id']) : 0;

 // Get table names (alphabetical)

@@ -30,16 +30,16 @@ 
 $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars');

 // create globally unique identifiers (guid)

 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

 

@@ -47,22 +47,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

@@ -433,18 +433,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 ?>">

 

@@ -497,11 +497,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>

@@ -608,7 +608,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'

@@ -624,17 +624,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; ?>

@@ -646,12 +646,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) {

@@ -675,28 +675,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>

@@ -712,11 +712,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/web_user_management.static.php

Indentation +29 added lines, -29 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 if(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('edit_web_user')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // initialize page view state - the $_PAGE object
@@ -11,12 +11,12 @@ 
 
 // get and save search string
 if($_REQUEST['op'] == 'reset') {
-	$query = '';
-	$_PAGE['vs']['search'] = '';
+    $query = '';
+    $_PAGE['vs']['search'] = '';
 } else {
-	$query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];
-	$sqlQuery = $modx->db->escape($query);
-	$_PAGE['vs']['search'] = $query;
+    $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];
+    $sqlQuery = $modx->db->escape($query);
+    $_PAGE['vs']['search'] = $query;
 }
 
 // get & save listmode
@@ -120,29 +120,29 @@ 
 			<div class="row">
 				<div class="table-responsive">
 					<?php
-					$ds = $modx->db->select("wu.id, wu.username, wua.fullname, wua.email, ELT(wua.gender, '{$_lang['user_male']}', '{$_lang['user_female']}', '{$_lang['user_other']}') AS gender, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getFullTableName("web_users") . " wu 
+                    $ds = $modx->db->select("wu.id, wu.username, wua.fullname, wua.email, ELT(wua.gender, '{$_lang['user_male']}', '{$_lang['user_female']}', '{$_lang['user_other']}') AS gender, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getFullTableName("web_users") . " wu 
 			INNER JOIN " . $modx->getFullTableName("web_user_attributes") . " wua ON wua.internalKey=wu.id", ($sqlQuery ? "(wu.username LIKE '{$sqlQuery}%') OR (wua.fullname LIKE '%{$sqlQuery}%') OR (wua.email LIKE '%{$sqlQuery}%')" : ""), 'username');
-					include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
-					$grd = new DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items
-					$grd->noRecordMsg = $_lang["no_records_found"];
-					$grd->cssClass = "table data";
-					$grd->columnHeaderClass = "tableHeader";
-					$grd->itemClass = "tableItem";
-					$grd->altItemClass = "tableAltItem";
-					$grd->fields = "id,username,fullname,email,gender,blocked";
-					$grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["user_full_name"] . " ," . $_lang["email"] . " ," . $_lang["user_gender"] . " ," . $_lang["user_block"];
-					$grd->colWidths = "1%,,,,1%,1%";
-					$grd->colAligns = "center,,,,center,right' nowrap='nowrap";
-					$grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='" . $_style["icons_user"] . "'></i></a>||template:<a href='index.php?a=88&id=[+id+]' title='" . $_lang["click_to_edit_title"] . "'>[+value+]</a>";
-					if($listmode == '1') {
-						$grd->pageSize = 0;
-					}
-					if($_REQUEST['op'] == 'reset') {
-						$grd->pageNumber = 1;
-					}
-					// render grid
-					echo $grd->render();
-					?>
+                    include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+                    $grd = new DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items
+                    $grd->noRecordMsg = $_lang["no_records_found"];
+                    $grd->cssClass = "table data";
+                    $grd->columnHeaderClass = "tableHeader";
+                    $grd->itemClass = "tableItem";
+                    $grd->altItemClass = "tableAltItem";
+                    $grd->fields = "id,username,fullname,email,gender,blocked";
+                    $grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["user_full_name"] . " ," . $_lang["email"] . " ," . $_lang["user_gender"] . " ," . $_lang["user_block"];
+                    $grd->colWidths = "1%,,,,1%,1%";
+                    $grd->colAligns = "center,,,,center,right' nowrap='nowrap";
+                    $grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='" . $_style["icons_user"] . "'></i></a>||template:<a href='index.php?a=88&id=[+id+]' title='" . $_lang["click_to_edit_title"] . "'>[+value+]</a>";
+                    if($listmode == '1') {
+                        $grd->pageSize = 0;
+                    }
+                    if($_REQUEST['op'] == 'reset') {
+                        $grd->pageNumber = 1;
+                    }
+                    // render grid
+                    echo $grd->render();
+                    ?>
 				</div>
 			</div>
 		</div>

manager/actions/search.static.php

Indentation +22 added lines, -22 removed lines

@@ -113,31 +113,31 @@ 
     // Handle Input "Search in main fields"
     if ($searchfields != '') {
 	
-		/*start search by TV. Added Rising13*/
-		$tbl_site_tmplvar_contentvalues = $modx->getFullTableName('site_tmplvar_contentvalues');
-		$articul_query = "SELECT `contentid` FROM {$tbl_site_tmplvar_contentvalues} WHERE `value` LIKE '%{$searchfields}%'";
-		$articul_result = $modx->db->query($articul_query);
-		$articul_id_array = $modx->db->makeArray($articul_result);
-		if(count($articul_id_array)>0){
-			$articul_id = '';
-			$i = 1;
-			foreach( $articul_id_array as $articul ) {
-				$articul_id.=$articul['contentid'];
-				if($i !== count($articul_id_array)){
-					$articul_id.=',';
-				}
-				$i++;
-			}  
-		$articul_id_query = " OR sc.id IN ({$articul_id})";
-		}else{
-			$articul_id_query = '';
-		}
-		/*end search by TV*/
+        /*start search by TV. Added Rising13*/
+        $tbl_site_tmplvar_contentvalues = $modx->getFullTableName('site_tmplvar_contentvalues');
+        $articul_query = "SELECT `contentid` FROM {$tbl_site_tmplvar_contentvalues} WHERE `value` LIKE '%{$searchfields}%'";
+        $articul_result = $modx->db->query($articul_query);
+        $articul_id_array = $modx->db->makeArray($articul_result);
+        if(count($articul_id_array)>0){
+            $articul_id = '';
+            $i = 1;
+            foreach( $articul_id_array as $articul ) {
+                $articul_id.=$articul['contentid'];
+                if($i !== count($articul_id_array)){
+                    $articul_id.=',';
+                }
+                $i++;
+            }  
+        $articul_id_query = " OR sc.id IN ({$articul_id})";
+        }else{
+            $articul_id_query = '';
+        }
+        /*end search by TV*/
 		
         if (ctype_digit($searchfields)) {
             $sqladd .= "sc.id='{$searchfields}'";
             if (strlen($searchfields) > 3) {
-				$sqladd .= $articul_id_query;//search by TV
+                $sqladd .= $articul_id_query;//search by TV
                 $sqladd .= " OR sc.pagetitle LIKE '%{$searchfields}%'";
             }
         }
@@ -157,7 +157,7 @@ 
             $sqladd .= " OR sc.introtext LIKE '%{$searchlongtitle}%'";
             $sqladd .= " OR sc.menutitle LIKE '%{$searchlongtitle}%'";
             $sqladd .= " OR sc.alias LIKE '%{$search_alias}%'";
-			$sqladd .= $articul_id_query;//search by TV
+            $sqladd .= $articul_id_query;//search by TV
         }
     } else if ($idFromAlias) {
         $sqladd .= " sc.id='{$idFromAlias}'";

manager/actions/category_mgr/inc/request_trigger.inc.php

Indentation +8 added lines, -8 removed lines

@@ -21,7 +21,7 @@ 
             
             if( $uncategorized_elements = $cm->getAssignedElements( 0, $_data['elements'] ) )
             { 
-               $output .= $cm->renderView('chunks/categorize/uncategorized_elements', $uncategorized_elements);
+                $output .= $cm->renderView('chunks/categorize/uncategorized_elements', $uncategorized_elements);
             }
             
             foreach( $cm->getCategories() as $category )
@@ -106,14 +106,14 @@ 
 
     if( empty( $category ) )
     {
-       $cm->addMessage( $cm->txt('cm_enter_name_for_category'), 'add' );
-       return;
+        $cm->addMessage( $cm->txt('cm_enter_name_for_category'), 'add' );
+        return;
     }
 
     if( $cm->isCategoryExists( $category ) )
     {
-       $cm->addMessage( sprintf( $cm->txt('cm_category_x_exists'), $category ), 'add' ); 
-       return;
+        $cm->addMessage( sprintf( $cm->txt('cm_category_x_exists'), $category ), 'add' ); 
+        return;
     }
     
     if( $cm->addCategory( $category, $rank ) !== 0 )
@@ -287,8 +287,8 @@ 
 
     if( empty( $cm->new_translations ) )
     {   
-       //$_REQUEST['webfxtab_manage-categories-pane'] = 0;
-       // unset( $_COOKIE['webfxtab_manage-categories-pane'] );
-       // setcookie('webfxtab_manage-categories-pane', 0);
+        //$_REQUEST['webfxtab_manage-categories-pane'] = 0;
+        // unset( $_COOKIE['webfxtab_manage-categories-pane'] );
+        // setcookie('webfxtab_manage-categories-pane', 0);
     }
 }
\ No newline at end of file

manager/actions/web_access_permissions.dynamic.php

Indentation +89 added lines, -89 removed lines

@@ -1,32 +1,32 @@ 
 <?php
 if(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('web_access_permissions')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // find all document groups, for the select :)
 $rs = $modx->db->select('*', $modx->getFullTableName('documentgroup_names'), '', 'name');
 if($modx->db->getRecordCount($rs) < 1) {
-	$docgroupselector = "[no groups to add]";
+    $docgroupselector = "[no groups to add]";
 } else {
-	$docgroupselector = '<select name="docgroup">' . "\n";
-	while($row = $modx->db->getRow($rs)) {
-		$docgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
-	}
-	$docgroupselector .= "</select>\n";
+    $docgroupselector = '<select name="docgroup">' . "\n";
+    while($row = $modx->db->getRow($rs)) {
+        $docgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
+    }
+    $docgroupselector .= "</select>\n";
 }
 
 $rs = $modx->db->select('*', $modx->getFullTableName('webgroup_names'), '', 'name');
 if($modx->db->getRecordCount($rs) < 1) {
-	$usrgroupselector = '[no user groups]';
+    $usrgroupselector = '[no user groups]';
 } else {
-	$usrgroupselector = '<select name="usergroup">' . "\n";
-	while($row = $modx->db->getRow($rs)) {
-		$usrgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
-	}
-	$usrgroupselector .= "</select>\n";
+    $usrgroupselector = '<select name="usergroup">' . "\n";
+    while($row = $modx->db->getRow($rs)) {
+        $usrgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
+    }
+    $usrgroupselector .= "</select>\n";
 }
 
 ?>
@@ -88,24 +88,24 @@ 
 				</form>
 			</div>
 			<?php
-			$rs = $modx->db->select('groupnames.*, users.id AS user_id, users.username user_name ', $modx->getFullTableName('webgroup_names') . " AS groupnames
+            $rs = $modx->db->select('groupnames.*, users.id AS user_id, users.username user_name ', $modx->getFullTableName('webgroup_names') . " AS groupnames
 			LEFT JOIN " . $modx->getFullTableName('web_groups') . " AS groups ON groups.webgroup = groupnames.id
 			LEFT JOIN " . $modx->getFullTableName('web_users') . " AS users ON users.id = groups.webuser", '', 'groupnames.name, user_name');
-			if($modx->db->getRecordCount($rs) < 1) {
-				?>
+            if($modx->db->getRecordCount($rs) < 1) {
+                ?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
-			} else {
-			?>
+            } else {
+            ?>
 			<div class="form-group">
 				<?php
-				$pid = '';
-				while($row = $modx->db->getRow($rs)) {
-					if($pid != $row['id']) {
-						if($pid != '') {
-							echo '</div><div class="form-group">';
-						}
-						?>
+                $pid = '';
+                while($row = $modx->db->getRow($rs)) {
+                    if($pid != $row['id']) {
+                        if($pid != '') {
+                            echo '</div><div class="form-group">';
+                        }
+                        ?>
 						<form method="post" action="index.php" name="accesspermissions">
 							<input type="hidden" name="a" value="92" />
 							<input type="hidden" name="groupid" value="<?= $row['id'] ?>" />
@@ -120,21 +120,21 @@ 
 						</form>
 						<?= $_lang['web_access_permissions_users_in_group'] ?>
 						<?php
-					}
-					if(!$row['user_id']) {
-						?>
+                    }
+                    if(!$row['user_id']) {
+                        ?>
 						<i><?= $_lang['access_permissions_no_users_in_group'] ?></i>
 						<?php
-						$pid = $row['id'];
-						continue;
-					}
-					?>
+                        $pid = $row['id'];
+                        continue;
+                    }
+                    ?>
 					<?= ($pid == $row['id'] ? ', ' : '') ?><a href="index.php?a=88&id=<?= $row['user_id'] ?>"><?= $row['user_name'] ?></a>
 					<?php
-					$pid = $row['id'];
-				}
-				}
-				?>
+                    $pid = $row['id'];
+                }
+                }
+                ?>
 			</div>
 		</div>
 	</div>
@@ -159,24 +159,24 @@ 
 				</form>
 			</div>
 			<?php
-			$rs = $modx->db->select('dgnames.id, dgnames.name, sc.id AS doc_id, sc.pagetitle AS doc_title', $modx->getFullTableName('documentgroup_names') . " AS dgnames
+            $rs = $modx->db->select('dgnames.id, dgnames.name, sc.id AS doc_id, sc.pagetitle AS doc_title', $modx->getFullTableName('documentgroup_names') . " AS dgnames
 			LEFT JOIN " . $modx->getFullTableName('document_groups') . " AS dg ON dg.document_group = dgnames.id
 			LEFT JOIN " . $modx->getFullTableName('site_content') . " AS sc ON sc.id = dg.document", '', 'dgnames.name, sc.id');
-			if($modx->db->getRecordCount($rs) < 1) {
-				?>
+            if($modx->db->getRecordCount($rs) < 1) {
+                ?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
-			} else {
-			?>
+            } else {
+            ?>
 			<div class="form-group">
 				<?php
-				$pid = '';
-				while($row = $modx->db->getRow($rs)) {
-					if($pid != $row['id']) {
-						if($pid != '') {
-							echo '</div><div class="form-group">';
-						}
-						?>
+                $pid = '';
+                while($row = $modx->db->getRow($rs)) {
+                    if($pid != $row['id']) {
+                        if($pid != '') {
+                            echo '</div><div class="form-group">';
+                        }
+                        ?>
 						<form method="post" action="index.php" name="accesspermissions">
 							<input type="hidden" name="a" value="92" />
 							<input type="hidden" name="groupid" value="<?= $row['id'] ?>" />
@@ -191,21 +191,21 @@ 
 						</form>
 						<?= $_lang['access_permissions_resources_in_group'] ?>
 						<?php
-					}
-					if(!$row['doc_id']) {
-						?>
+                    }
+                    if(!$row['doc_id']) {
+                        ?>
 						<i><?= $_lang['access_permissions_no_resources_in_group'] ?></i>
 						<?php
-						$pid = $row['id'];
-						continue;
-					}
-					?>
+                        $pid = $row['id'];
+                        continue;
+                    }
+                    ?>
 					<?= ($pid == $row['id'] ? ', ' : '') ?><a href="index.php?a=3&id=<?= $row['doc_id'] ?>" title="<?= $modx->htmlspecialchars($row['doc_title']) ?>"><?= $row['doc_id'] ?></a>
 					<?php
-					$pid = $row['id'];
-				}
-				}
-				?>
+                    $pid = $row['id'];
+                }
+                }
+                ?>
 			</div>
 		</div>
 	</div>
@@ -217,15 +217,15 @@ 
 		<div class="container container-body">
 			<p class="element-edit-message-tab alert alert-warning"><?= $_lang['access_permissions_links_tab'] ?></p>
 			<?php
-			$rs = $modx->db->select('groupnames.*, groupacc.id AS link_id, dgnames.id AS dg_id, dgnames.name AS dg_name', $modx->getFullTableName('webgroup_names') . " AS groupnames
+            $rs = $modx->db->select('groupnames.*, groupacc.id AS link_id, dgnames.id AS dg_id, dgnames.name AS dg_name', $modx->getFullTableName('webgroup_names') . " AS groupnames
 			LEFT JOIN " . $modx->getFullTableName('webgroup_access') . " AS groupacc ON groupacc.webgroup = groupnames.id
 			LEFT JOIN " . $modx->getFullTableName('documentgroup_names') . " AS dgnames ON dgnames.id = groupacc.documentgroup", '', 'name, dg_name');
-			if($modx->db->getRecordCount($rs) < 1) {
-				?>
+            if($modx->db->getRecordCount($rs) < 1) {
+                ?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
-			} else {
-				?>
+            } else {
+                ?>
 				<div class="form-group">
 					<b><?= $_lang["access_permissions_group_link"] ?></b>
 					<form method="post" action="index.php" name="accesspermissions">
@@ -241,38 +241,38 @@ 
 				<hr>
 				<ul>
 					<?php
-					$pid = '';
-					while($row = $modx->db->getRow($rs)) {
-						if($row['id'] != $pid) {
-							if($pid != '') {
-								echo '</ul></li>';
-							} // close previous one
-							?>
+                    $pid = '';
+                    while($row = $modx->db->getRow($rs)) {
+                        if($row['id'] != $pid) {
+                            if($pid != '') {
+                                echo '</ul></li>';
+                            } // close previous one
+                            ?>
 							<li><b><?= $row['name'] ?></b></li>
 							<?php
-							if(!$row['dg_id']) {
-								echo '<i>' . $_lang['no_groups_found'] . '</i></li>';
-								$pid = '';
-								continue;
-							} else {
-								echo '<ul>';
-							}
-						}
-						if(!$row['dg_id']) {
-							continue;
-						}
-						?>
+                            if(!$row['dg_id']) {
+                                echo '<i>' . $_lang['no_groups_found'] . '</i></li>';
+                                $pid = '';
+                                continue;
+                            } else {
+                                echo '<ul>';
+                            }
+                        }
+                        if(!$row['dg_id']) {
+                            continue;
+                        }
+                        ?>
 						<li><?= $row['dg_name'] ?>
 							<small><i>(<a class="text-danger" href="index.php?a=92&coupling=<?= $row['link_id'] ?>&operation=remove_document_group_from_user_group"><?= $_lang['remove'] ?></a>)</i></small>
 						</li>
 						<?php
-						$pid = $row['id'];
-					}
-					?>
+                        $pid = $row['id'];
+                    }
+                    ?>
 				</ul>
 				<?php
-			}
-			?>
+            }
+            ?>
 		</div>
 	</div>
 

manager/actions/eventlog.dynamic.php

Indentation +34 added lines, -34 removed lines

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

 if(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('view_eventlog')) {

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

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

 }

 

 // Get table Names (alphabetical)

@@ -16,14 +16,14 @@ 
 

 // get and save search string

 if($_REQUEST['op'] == 'reset') {

-	$sqlQuery = $query = '';

-	$_PAGE['vs']['search'] = '';

+    $sqlQuery = $query = '';

+    $_PAGE['vs']['search'] = '';

 } else {

-	$sqlQuery = $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];

-	if(!is_numeric($sqlQuery)) {

-		$sqlQuery = $modx->db->escape($query);

-	}

-	$_PAGE['vs']['search'] = $query;

+    $sqlQuery = $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];

+    if(!is_numeric($sqlQuery)) {

+        $sqlQuery = $modx->db->escape($query);

+    }

+    $_PAGE['vs']['search'] = $query;

 }

 

 // get & save listmode

@@ -125,33 +125,33 @@ 
 			<div class="row">

 				<div class="table-responsive">

 					<?php

-					$ds = $modx->db->select("el.id, ELT(el.type , 'text-info {$_style['actions_info']}' , 'text-warning {$_style['actions_triangle']}' , 'text-danger {$_style['actions_error']}' ) as icon, el.createdon, el.source, el.eventid,IFNULL(wu.username,mu.username) as username", "{$tbl_event_log} AS el 

+                    $ds = $modx->db->select("el.id, ELT(el.type , 'text-info {$_style['actions_info']}' , 'text-warning {$_style['actions_triangle']}' , 'text-danger {$_style['actions_error']}' ) as icon, el.createdon, el.source, el.eventid,IFNULL(wu.username,mu.username) as username", "{$tbl_event_log} AS el 

 			LEFT JOIN {$tbl_manager_users} AS mu ON mu.id=el.user AND el.usertype=0

 			LEFT JOIN {$tbl_web_users} AS wu ON wu.id=el.user AND el.usertype=1", ($sqlQuery ? "" . (is_numeric($sqlQuery) ? "(eventid='{$sqlQuery}') OR " : '') . "(source LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "createdon DESC");

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

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

-					$grd->pagerClass = '';

-					$grd->pageClass = 'page-item';

-					$grd->selPageClass = 'page-item active';

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

-					$grd->cssClass = "table data nowrap";

-					$grd->columnHeaderClass = "tableHeader";

-					$grd->itemClass = "tableItem";

-					$grd->altItemClass = "tableAltItem";

-					$grd->fields = "type,source,createdon,eventid,username";

-					$grd->columns = $_lang['type'] . " ," . $_lang['source'] . " ," . $_lang['date'] . " ," . $_lang['event_id'] . " ," . $_lang['sysinfo_userid'];

-					$grd->colWidths = "1%,,1%,1%,1%";

-					$grd->colAligns = "center,,,center,center";

-					$grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang['click_to_context'] . "'><i class='[+icon+]'></i></a>||template:<a href='index.php?a=115&id=[+id+]' title='" . $_lang['click_to_view_details'] . "'>[+source+]</a>||date: " . $modx->toDateFormat(null, 'formatOnly') . ' %I:%M %p';

-					if($listmode == '1') {

-						$grd->pageSize = 0;

-					}

-					if($_REQUEST['op'] == 'reset') {

-						$grd->pageNumber = 1;

-					}

-					// render grid

-					echo $grd->render();

-					?>

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

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

+                    $grd->pagerClass = '';

+                    $grd->pageClass = 'page-item';

+                    $grd->selPageClass = 'page-item active';

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

+                    $grd->cssClass = "table data nowrap";

+                    $grd->columnHeaderClass = "tableHeader";

+                    $grd->itemClass = "tableItem";

+                    $grd->altItemClass = "tableAltItem";

+                    $grd->fields = "type,source,createdon,eventid,username";

+                    $grd->columns = $_lang['type'] . " ," . $_lang['source'] . " ," . $_lang['date'] . " ," . $_lang['event_id'] . " ," . $_lang['sysinfo_userid'];

+                    $grd->colWidths = "1%,,1%,1%,1%";

+                    $grd->colAligns = "center,,,center,center";

+                    $grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang['click_to_context'] . "'><i class='[+icon+]'></i></a>||template:<a href='index.php?a=115&id=[+id+]' title='" . $_lang['click_to_view_details'] . "'>[+source+]</a>||date: " . $modx->toDateFormat(null, 'formatOnly') . ' %I:%M %p';

+                    if($listmode == '1') {

+                        $grd->pageSize = 0;

+                    }

+                    if($_REQUEST['op'] == 'reset') {

+                        $grd->pageNumber = 1;

+                    }

+                    // render grid

+                    echo $grd->render();

+                    ?>

 				</div>

 			</div>

 		</div>

manager/actions/import_site.static.php

Indentation +333 added lines, -333 removed lines

@@ -1,17 +1,17 @@ 
 <?php
 if(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,371 +85,371 @@ 
 					<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>
 
 <?php
 function run() {
-	global $modx;
+    global $modx;
 
-	$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 = intval($_POST['parent']);
+    $parent = intval($_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/';
-	}
+    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/';
+    }
 
-	$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)) {
-		$rs = $modx->db->update(array('isfolder' => 1), $tbl_site_content, "id='{$parent}'");
-		importFiles($parent, $filedir, $files, 'root');
-	}
+    // import files
+    if(0 < count($files)) {
+        $rs = $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;
 }
 
 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');
-
-	$createdon = time();
-	$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');
+
+    $createdon = time();
+    $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}'");
+                }
+            }
+        }
+    }
 }
 
 function getFiles($directory, $listing = array(), $count = 0) {
-	global $_lang;
-	global $filesfound;
-	$dummy = $count;
-	if($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($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);
 }
 
 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;
+    }
 }
 
 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;
 }
 
 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
+    );
 }
 
 function convertLink() {
-	global $modx;
-	$tbl_site_content = $modx->getFullTableName('site_content');
-
-	$rs = $modx->db->select('id,content', $tbl_site_content);
-	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}'");
-	}
+    global $modx;
+    $tbl_site_content = $modx->getFullTableName('site_content');
+
+    $rs = $modx->db->select('id,content', $tbl_site_content);
+    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_templates.dynamic.php

Indentation +124 added lines, -124 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 if(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 16:
-		if(!$modx->hasPermission('edit_template')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	case 19:
-		if(!$modx->hasPermission('new_template')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	default:
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    case 16:
+        if(!$modx->hasPermission('edit_template')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        }
+        break;
+    case 19:
+        if(!$modx->hasPermission('new_template')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        }
+        break;
+    default:
+        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
@@ -24,7 +24,7 @@ 
 
 // check to see the snippet editor isn't locked
 if($lockedEl = $modx->elementIsLocked(1, $id)) {
-	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['template']));
+    $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['template']));
 }
 // end check for lock
 
@@ -33,23 +33,23 @@ 
 
 $content = array();
 if(!empty($id)) {
-	$rs = $modx->db->select('*', $tbl_site_templates, "id='{$id}'");
-	$content = $modx->db->getRow($rs);
-	if(!$content) {
-		$modx->webAlertAndQuit("No database record has been found for this template.");
-	}
-
-	$_SESSION['itemname'] = $content['templatename'];
-	if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-	}
+    $rs = $modx->db->select('*', $tbl_site_templates, "id='{$id}'");
+    $content = $modx->db->getRow($rs);
+    if(!$content) {
+        $modx->webAlertAndQuit("No database record has been found for this template.");
+    }
+
+    $_SESSION['itemname'] = $content['templatename'];
+    if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
+        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    }
 } else {
-	$_SESSION['itemname'] = $_lang["new_template"];
-	$content['category'] = intval($_REQUEST['catid']);
+    $_SESSION['itemname'] = $_lang["new_template"];
+    $content['category'] = intval($_REQUEST['catid']);
 }
 
 if($modx->manager->hasFormValues()) {
-	$modx->manager->loadFormValues();
+    $modx->manager->loadFormValues();
 }
 
 $content = array_merge($content, $_POST);
@@ -98,12 +98,12 @@ 
 
 <form name="mutate" method="post" action="index.php">
 	<?php
-	// invoke OnTempFormPrerender event
-	$evtOut = $modx->invokeEvent("OnTempFormPrerender", array("id" => $id));
-	if(is_array($evtOut)) {
-		echo implode("", $evtOut);
-	}
-	?>
+    // invoke OnTempFormPrerender event
+    $evtOut = $modx->invokeEvent("OnTempFormPrerender", array("id" => $id));
+    if(is_array($evtOut)) {
+        echo implode("", $evtOut);
+    }
+    ?>
 	<input type="hidden" name="a" value="20">
 	<input type="hidden" name="id" value="<?= $_REQUEST['id'] ?>">
 	<input type="hidden" name="mode" value="<?= $modx->manager->action ?>">
@@ -133,8 +133,8 @@ 
 						<label class="col-md-3 col-lg-2">
 							<?= $_lang['template_name'] ?>
 							<?php if($id == $modx->config['default_template']) {
-								echo '<small class="form-text text-danger">' . mb_strtolower(rtrim($_lang['defaulttemplate_title'], ':'), $modx_manager_charset) . '</small>';
-							} ?>
+                                echo '<small class="form-text text-danger">' . mb_strtolower(rtrim($_lang['defaulttemplate_title'], ':'), $modx_manager_charset) . '</small>';
+                            } ?>
 						</label>
 						<div class="col-md-9 col-lg-10">
 							<div class="form-control-name clearfix">
@@ -162,11 +162,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 "<option value='" . $v['id'] . "'" . ($content["category"] == $v["id"] ? " selected='selected'" : "") . ">" . $modx->htmlspecialchars($v["category"]) . "</option>";
-								}
-								?>
+                                include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+                                foreach(getCategories() as $n => $v) {
+                                    echo "<option value='" . $v['id'] . "'" . ($content["category"] == $v["id"] ? " selected='selected'" : "") . ">" . $modx->htmlspecialchars($v["category"]) . "</option>";
+                                }
+                                ?>
 							</select>
 						</div>
 					</div>
@@ -197,38 +197,38 @@ 
 			<input type="submit" name="save" style="display:none">
 
 			<?php
-			$selectedTvs = array();
-			if(!isset($_POST['assignedTv'])) {
-				$rs = $modx->db->select(sprintf("tv.name AS tvname, tv.id AS tvid, tr.templateid AS templateid, tv.description AS tvdescription, tv.caption AS tvcaption, tv.locked AS tvlocked, if(isnull(cat.category),'%s',cat.category) AS category", $_lang['no_category']), sprintf("%s tv
+            $selectedTvs = array();
+            if(!isset($_POST['assignedTv'])) {
+                $rs = $modx->db->select(sprintf("tv.name AS tvname, tv.id AS tvid, tr.templateid AS templateid, tv.description AS tvdescription, tv.caption AS tvcaption, tv.locked AS tvlocked, if(isnull(cat.category),'%s',cat.category) AS category", $_lang['no_category']), sprintf("%s tv
                 LEFT JOIN %s tr ON tv.id=tr.tmplvarid
                 LEFT JOIN %s cat ON tv.category=cat.id", $modx->getFullTableName('site_tmplvars'), $modx->getFullTableName('site_tmplvar_templates'), $modx->getFullTableName('categories')), "templateid='{$id}'", "tr.rank DESC, tv.rank DESC, tvcaption DESC, tvid DESC"     // workaround for correct sort of none-existing ranks
-				);
-				while($row = $modx->db->getRow($rs)) {
-					$selectedTvs[$row['tvid']] = $row;
-				}
-				$selectedTvs = array_reverse($selectedTvs, true);       // reverse ORDERBY DESC
-			}
-
-			$unselectedTvs = array();
-			$rs = $modx->db->select(sprintf("tv.name AS tvname, tv.id AS tvid, tr.templateid AS templateid, tv.description AS tvdescription, tv.caption AS tvcaption, tv.locked AS tvlocked, if(isnull(cat.category),'%s',cat.category) AS category, cat.id as catid", $_lang['no_category']), sprintf("%s tv
+                );
+                while($row = $modx->db->getRow($rs)) {
+                    $selectedTvs[$row['tvid']] = $row;
+                }
+                $selectedTvs = array_reverse($selectedTvs, true);       // reverse ORDERBY DESC
+            }
+
+            $unselectedTvs = array();
+            $rs = $modx->db->select(sprintf("tv.name AS tvname, tv.id AS tvid, tr.templateid AS templateid, tv.description AS tvdescription, tv.caption AS tvcaption, tv.locked AS tvlocked, if(isnull(cat.category),'%s',cat.category) AS category, cat.id as catid", $_lang['no_category']), sprintf("%s tv
 	    LEFT JOIN %s tr ON tv.id=tr.tmplvarid
 	    LEFT JOIN %s cat ON tv.category=cat.id", $modx->getFullTableName('site_tmplvars'), $modx->getFullTableName('site_tmplvar_templates'), $modx->getFullTableName('categories')), "", "category, tvcaption");
-			while($row = $modx->db->getRow($rs)) {
-				$unselectedTvs[$row['tvid']] = $row;
-			}
-
-			// Catch checkboxes if form not validated
-			if(isset($_POST['assignedTv'])) {
-				$selectedTvs = array();
-				foreach($_POST['assignedTv'] as $tvid) {
-					if(isset($unselectedTvs[$tvid])) {
-						$selectedTvs[$tvid] = $unselectedTvs[$tvid];
-					}
-				};
-			}
-
-			$total = count($selectedTvs);
-			?>
+            while($row = $modx->db->getRow($rs)) {
+                $unselectedTvs[$row['tvid']] = $row;
+            }
+
+            // Catch checkboxes if form not validated
+            if(isset($_POST['assignedTv'])) {
+                $selectedTvs = array();
+                foreach($_POST['assignedTv'] as $tvid) {
+                    if(isset($unselectedTvs[$tvid])) {
+                        $selectedTvs[$tvid] = $unselectedTvs[$tvid];
+                    }
+                };
+            }
+
+            $total = count($selectedTvs);
+            ?>
 		</div>
 
 		<div class="tab-page" id="tabAssignedTVs">
@@ -238,65 +238,65 @@ 
 
 			<div class="container container-body">
 				<?php
-				if($total > 0) {
-					echo '<p>' . $_lang['template_tv_msg'] . '</p>';
-				}
-				if($modx->hasPermission('save_template') && $total > 1 && $id) {
-					echo sprintf('<div class="form-group"><a class="btn btn-primary" href="index.php?a=117&amp;id=%s">%s</a></div>', $id, $_lang['template_tv_edit']);
-				}
-
-				// Selected TVs
-				$tvList = '';
-				if($total > 0) {
-					$tvList .= '<ul>';
-					foreach($selectedTvs as $row) {
-						$desc = !empty($row['tvdescription']) ? '&nbsp;&nbsp;<small>(' . $row['tvdescription'] . ')</small>' : '';
-						$locked = $row['tvlocked'] ? ' <em>(' . $_lang['locked'] . ')</em>' : "";
-						$tvList .= sprintf('<li><label><input name="assignedTv[]" value="%s" type="checkbox" checked="checked" onchange="documentDirty=true;jQuery(\'#tvsDirty\').val(\'1\');"> %s <small>(%s)</small> - %s%s</label>%s <a href="index.php?id=%s&a=301&or=%s&oid=%s">%s</a></li>', $row['tvid'], $row['tvname'], $row['tvid'], $row['tvcaption'], $desc, $locked, $row['tvid'], $modx->manager->action, $id, $_lang['edit']);
-					}
-					$tvList .= '</ul>';
-
-				} else {
-					echo $_lang['template_no_tv'];
-				}
-				echo $tvList;
-
-				// Unselected TVs
-				$tvList = '<hr/><p>' . $_lang['template_notassigned_tv'] . '</p><ul>';
-				$preCat = '';
-				$insideUl = 0;
-				while($row = array_shift($unselectedTvs)) {
-					if(isset($selectedTvs[$row['tvid']])) {
-						continue;
-					} // Skip selected
-					$row['category'] = stripslashes($row['category']); //pixelchutes
-					if($preCat !== $row['category']) {
-						$tvList .= $insideUl ? '</ul>' : '';
-						$tvList .= '<li><strong>' . $row['category'] . ($row['catid'] != '' ? ' <small>(' . $row['catid'] . ')</small>' : '') . '</strong><ul>';
-						$insideUl = 1;
-					}
-
-					$desc = !empty($row['tvdescription']) ? '&nbsp;&nbsp;<small>(' . $row['tvdescription'] . ')</small>' : '';
-					$locked = $row['tvlocked'] ? ' <em>(' . $_lang['locked'] . ')</em>' : "";
-					$tvList .= sprintf('<li><label><input name="assignedTv[]" value="%s" type="checkbox" onchange="documentDirty=true;jQuery(\'#tvsDirty\').val(\'1\');"> %s <small>(%s)</small> - %s%s</label>%s <a href="index.php?id=%s&a=301&or=%s&oid=%s">%s</a></li>', $row['tvid'], $row['tvname'], $row['tvid'], $row['tvcaption'], $desc, $locked, $row['tvid'], $modx->manager->action, $id, $_lang['edit']);
-					$tvList .= '</li>';
-
-					$preCat = $row['category'];
-				}
-				$tvList .= $insideUl ? '</ul>' : '';
-				$tvList .= '</ul>';
-				echo $tvList;
-
-				?>
+                if($total > 0) {
+                    echo '<p>' . $_lang['template_tv_msg'] . '</p>';
+                }
+                if($modx->hasPermission('save_template') && $total > 1 && $id) {
+                    echo sprintf('<div class="form-group"><a class="btn btn-primary" href="index.php?a=117&amp;id=%s">%s</a></div>', $id, $_lang['template_tv_edit']);
+                }
+
+                // Selected TVs
+                $tvList = '';
+                if($total > 0) {
+                    $tvList .= '<ul>';
+                    foreach($selectedTvs as $row) {
+                        $desc = !empty($row['tvdescription']) ? '&nbsp;&nbsp;<small>(' . $row['tvdescription'] . ')</small>' : '';
+                        $locked = $row['tvlocked'] ? ' <em>(' . $_lang['locked'] . ')</em>' : "";
+                        $tvList .= sprintf('<li><label><input name="assignedTv[]" value="%s" type="checkbox" checked="checked" onchange="documentDirty=true;jQuery(\'#tvsDirty\').val(\'1\');"> %s <small>(%s)</small> - %s%s</label>%s <a href="index.php?id=%s&a=301&or=%s&oid=%s">%s</a></li>', $row['tvid'], $row['tvname'], $row['tvid'], $row['tvcaption'], $desc, $locked, $row['tvid'], $modx->manager->action, $id, $_lang['edit']);
+                    }
+                    $tvList .= '</ul>';
+
+                } else {
+                    echo $_lang['template_no_tv'];
+                }
+                echo $tvList;
+
+                // Unselected TVs
+                $tvList = '<hr/><p>' . $_lang['template_notassigned_tv'] . '</p><ul>';
+                $preCat = '';
+                $insideUl = 0;
+                while($row = array_shift($unselectedTvs)) {
+                    if(isset($selectedTvs[$row['tvid']])) {
+                        continue;
+                    } // Skip selected
+                    $row['category'] = stripslashes($row['category']); //pixelchutes
+                    if($preCat !== $row['category']) {
+                        $tvList .= $insideUl ? '</ul>' : '';
+                        $tvList .= '<li><strong>' . $row['category'] . ($row['catid'] != '' ? ' <small>(' . $row['catid'] . ')</small>' : '') . '</strong><ul>';
+                        $insideUl = 1;
+                    }
+
+                    $desc = !empty($row['tvdescription']) ? '&nbsp;&nbsp;<small>(' . $row['tvdescription'] . ')</small>' : '';
+                    $locked = $row['tvlocked'] ? ' <em>(' . $_lang['locked'] . ')</em>' : "";
+                    $tvList .= sprintf('<li><label><input name="assignedTv[]" value="%s" type="checkbox" onchange="documentDirty=true;jQuery(\'#tvsDirty\').val(\'1\');"> %s <small>(%s)</small> - %s%s</label>%s <a href="index.php?id=%s&a=301&or=%s&oid=%s">%s</a></li>', $row['tvid'], $row['tvname'], $row['tvid'], $row['tvcaption'], $desc, $locked, $row['tvid'], $modx->manager->action, $id, $_lang['edit']);
+                    $tvList .= '</li>';
+
+                    $preCat = $row['category'];
+                }
+                $tvList .= $insideUl ? '</ul>' : '';
+                $tvList .= '</ul>';
+                echo $tvList;
+
+                ?>
 			</div>
 		</div>
 
 		<?php
-		// invoke OnTempFormRender event
-		$evtOut = $modx->invokeEvent("OnTempFormRender", array("id" => $id));
-		if(is_array($evtOut)) {
-			echo implode("", $evtOut);
-		}
-		?>
+        // invoke OnTempFormRender event
+        $evtOut = $modx->invokeEvent("OnTempFormRender", array("id" => $id));
+        if(is_array($evtOut)) {
+            echo implode("", $evtOut);
+        }
+        ?>
 	</div>
 </form>

manager/actions/mutate_settings/tab5_security_settings.inc.php

Indentation +3 added lines, -3 removed lines

@@ -177,9 +177,9 @@
     <td colspan="2"><div class="split"></div></td>

   </tr>

   <?php

-      // Check for GD before allowing captcha to be enabled

-      $gdAvailable = extension_loaded('gd');

-  ?>

+        // Check for GD before allowing captcha to be enabled

+        $gdAvailable = extension_loaded('gd');

+    ?>

 <?php

 $gdAvailable = extension_loaded('gd');

 if(!$gdAvailable) $use_captcha = 0;