evolution-cms / evolution

manager/actions/mutate_module.dynamic.php

Spacing +36 added lines, -36 removed lines

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

-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

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

 }

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

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

 	case 107:

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

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

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

 		}

 		break;

 	case 108:

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

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

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

 // Get table names (alphabetical)

 $tbl_membergroup_names = $modx->getFullTableName('membergroup_names');

 $tbl_site_content = $modx->getFullTableName('site_content');

@@ -33,16 +33,16 @@ 
  *

  * @return string

  */

-function createGUID() {

+function createGUID(){

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

 	$r = rand();

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

+	$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)) {

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

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

 }

 // end check for lock

@@ -50,29 +50,29 @@ 
 // Lock snippet for other users to edit

 $modx->lockElement(6, $id);

 

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

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

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

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

-	if(!$content) {

+	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) {

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

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

 	}

 } else {

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

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

 }

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

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

 	$modx->manager->loadFormValues();

 }

 

 // Add lock-element JS-Script

 $lockElementId = $id;

 $lockElementType = 6;

-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');

+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');

 ?>

 <script type="text/javascript">

 	function loadDependencies() {

@@ -419,7 +419,7 @@ 
 	function BrowseServer() {

 		var w = screen.width * 0.7;

 		var h = screen.height * 0.7;

-		OpenServerBrowser("<?= MODX_MANAGER_URL;?>media/browser/<?= $which_browser;?>/browser.php?Type=images", w, h);

+		OpenServerBrowser("<?= MODX_MANAGER_URL; ?>media/browser/<?= $which_browser; ?>/browser.php?Type=images", w, h);

 	}

 

 	function SetUrl(url, width, height, alt) {

@@ -439,7 +439,7 @@ 
 	<?php

 	// invoke OnModFormPrerender event

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

-	if(is_array($evtOut)) {

+	if (is_array($evtOut)) {

 		echo implode('', $evtOut);

 	}

 

@@ -453,7 +453,7 @@ 
 	<input type="hidden" name="mode" value="<?= $modx->manager->action ?>">

 

 	<h1>

-		<i class="<?= ($content['icon'] != '' ? $content['icon'] : $_style['icons_module']) ?>"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_module']) ?><i class="fa fa-question-circle help"></i>

+		<i class="<?= ($content['icon'] != '' ? $content['icon'] : $_style['icons_module']) ?>"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_module']) ?><i class="fa fa-question-circle help"></i>

 	</h1>

 

 	<?= $_style['actionbuttons']['dynamic']['element'] ?>

@@ -478,8 +478,8 @@ 
 						<div class="col-md-9 col-lg-10">

 							<div class="form-control-name clearfix">

 								<input name="name" type="text" maxlength="100" value="<?= $modx->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" />

-								<?php if($modx->hasPermission('save_role')): ?>

-									<label class="custom-control" title="<?= $_lang['lock_module'] . "\n" . $_lang['lock_module_msg'] ?>" tooltip>

+								<?php if ($modx->hasPermission('save_role')): ?>

+									<label class="custom-control" title="<?= $_lang['lock_module']."\n".$_lang['lock_module_msg'] ?>" tooltip>

 										<input name="locked" type="checkbox"<?= ($content['locked'] == 1 ? ' checked="checked"' : '') ?> />

 										<i class="fa fa-lock"></i>

 									</label>

@@ -501,9 +501,9 @@ 
 							<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>

@@ -535,7 +535,7 @@ 
 				<div class="form-group">

 					<div class="form-row">

 						<label for="disabled"><input name="disabled" id="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> />

-							<?= ($content['disabled'] == 1 ? '<span class="text-danger">' . $_lang['module_disabled'] . '</span>' : $_lang['module_disabled']) ?></label>

+							<?= ($content['disabled'] == 1 ? '<span class="text-danger">'.$_lang['module_disabled'].'</span>' : $_lang['module_disabled']) ?></label>

 					</div>

 					<div class="form-row">

 						<label for="parse_docblock">

@@ -600,7 +600,7 @@ 
 			</div>

 			<!-- HTML text editor end -->

 		</div>

-		<?php if($modx->manager->action == '108'): ?>

+		<?php if ($modx->manager->action == '108'): ?>

 			<!-- Dependencies -->

 			<div class="tab-page" id="tabDepend">

 				<h2 class="tab"><?= $_lang['settings_dependencies'] ?></h2>

@@ -628,14 +628,14 @@ 
 						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";

+					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->columns = $_lang['element_name']." ,".$_lang['type'];

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

 					echo $grd->render();

 					?>

@@ -648,13 +648,13 @@ 
 			<h2 class="tab"><?= $_lang['access_permissions'] ?></h2>

 			<script type="text/javascript">tp.addTabPage(document.getElementById("tabPermissions"));</script>

 			<div class="container container-body">

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

+				<?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);

 

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

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

 						?>

 						<!-- User Group Access Permissions -->

 						<script type="text/javascript">

@@ -682,22 +682,22 @@ 
 					}

 					$chk = '';

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

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

+					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) {

+						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";

+							$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 ($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;

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

 					?>

@@ -718,7 +718,7 @@ 
 		<?php

 		// invoke OnModFormRender event

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

-		if(is_array($evtOut)) {

+		if (is_array($evtOut)) {

 			echo implode('', $evtOut);

 		}

 		?>

manager/actions/import_site.static.php

Spacing +83 added lines, -83 removed lines

@@ -1,8 +1,8 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+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.");
 }
-if(!$modx->hasPermission('import_static')) {
+if (!$modx->hasPermission('import_static')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -43,8 +43,8 @@ 
 	<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" />
@@ -104,14 +104,14 @@ 
 /**
  * @return string
  */
-function run() {
+function run(){
 	global $modx, $_lang;
 
 	$tbl_site_content = $modx->getFullTableName('site_content');
 	$output = '';
 	$maxtime = $_POST['maxtime'];
 
-	if(!is_numeric($maxtime)) {
+	if (!is_numeric($maxtime)) {
 		$maxtime = 30;
 	}
 
@@ -122,17 +122,17 @@ 
 	$mtime = $mtime[1] + $mtime[0];
 	$importstart = $mtime;
 
-	if($_POST['reset'] == 'on') {
+	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/';
+	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 = '';
     }
@@ -143,10 +143,10 @@ 
 	$files = pop_index($files);
 
 	// no. of files to import
-	$output .= sprintf('<p>' . $_lang['import_files_found'] . '</p>', $filesfound);
+	$output .= sprintf('<p>'.$_lang['import_files_found'].'</p>', $filesfound);
 
 	// import files
-	if(0 < count($files)) {
+	if (0 < count($files)) {
 		$modx->db->update(array('isfolder' => 1), $tbl_site_content, "id='{$parent}'");
 		importFiles($parent, $filedir, $files, 'root');
 	}
@@ -156,9 +156,9 @@ 
 	$mtime = $mtime[1] + $mtime[0];
 	$importend = $mtime;
 	$totaltime = ($importend - $importstart);
-	$output .= sprintf('<p>' . $_lang['import_site_time'] . '</p>', round($totaltime, 3));
+	$output .= sprintf('<p>'.$_lang['import_site_time'].'</p>', round($totaltime, 3));
 
-	if($_POST['convert_link'] == 'on') {
+	if ($_POST['convert_link'] == 'on') {
 		convertLink();
 	}
 
@@ -171,7 +171,7 @@ 
  * @param array $files
  * @param string $mode
  */
-function importFiles($parent, $filedir, $files, $mode) {
+function importFiles($parent, $filedir, $files, $mode){
 	global $modx;
 	global $_lang, $allowedfiles;
 	global $search_default, $cache_default, $publish_default;
@@ -180,21 +180,21 @@ 
 	$tbl_system_settings = $modx->getFullTableName('system_settings');
 
 	$createdby = $modx->getLoginUserID();
-	if(!is_array($files)) {
+	if (!is_array($files)) {
 		return;
 	}
-	if($_POST['object'] === 'all') {
+	if ($_POST['object'] === 'all') {
 		$modx->config['default_template'] = '0';
 		$richtext = '0';
 	} else {
 		$richtext = '1';
 	}
 
-	foreach($files as $id => $value) {
-		if(is_array($value)) {
+	foreach ($files as $id => $value) {
+		if (is_array($value)) {
 			// create folder
 			$alias = $id;
-			printf('<span>' . $_lang['import_site_importing_document'] . '</span>', $alias);
+			printf('<span>'.$_lang['import_site_importing_document'].'</span>', $alias);
 			$field = array();
 			$field['type'] = 'document';
 			$field['contentType'] = 'text/html';
@@ -209,12 +209,12 @@ 
 			$field['isfolder'] = 1;
 			$field['menuindex'] = 1;
 			$find = false;
-			foreach(array(
+			foreach (array(
 						'index.html',
 						'index.htm'
 					) as $filename) {
-				$filepath = $filedir . $alias . '/' . $filename;
-				if($find === false && file_exists($filepath)) {
+				$filepath = $filedir.$alias.'/'.$filename;
+				if ($find === false && file_exists($filepath)) {
 					$file = getFileContent($filepath);
 					list($pagetitle, $content, $description) = treatContent($file, $filename, $alias);
 
@@ -226,17 +226,17 @@ 
 					$field['createdon'] = $date;
 					$field['editedon'] = $date;
 					$newid = $modx->db->insert($field, $tbl_site_content);
-					if($newid) {
+					if ($newid) {
 						$find = true;
-						echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
-						importFiles($newid, $filedir . $alias . '/', $value, 'sub');
+						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();
+						echo '<span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_db_error"].$modx->db->getLastError();
 						exit;
 					}
 				}
 			}
-			if($find === false) {
+			if ($find === false) {
 				$date = time();
 				$field['pagetitle'] = '---';
 				$field['content'] = '';
@@ -244,30 +244,30 @@ 
 				$field['editedon'] = $date;
 				$field['hidemenu'] = '1';
 				$newid = $modx->db->insert($field, $tbl_site_content);
-				if($newid) {
+				if ($newid) {
 					$find = true;
-					echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
-					importFiles($newid, $filedir . $alias . '/', $value, 'sub');
+					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();
+					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') {
+			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);
+			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";
+			if (!in_array($ext, $allowedfiles)) {
+				echo ' - <span class="fail">'.$_lang["import_site_skip"].'</span><br />'."\n";
 			} else {
-				$filepath = $filedir . $filename;
+				$filepath = $filedir.$filename;
 				$file = getFileContent($filepath);
 				list($pagetitle, $content, $description) = treatContent($file, $filename, $alias);
 
@@ -292,18 +292,18 @@ 
 				$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";
+				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();
+					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') {
+				if ($filename == 'index.html') {
 					$is_site_start = true;
 				}
-				if($is_site_start == true && $_POST['reset'] == 'on') {
+				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}'");
 				}
@@ -318,26 +318,26 @@ 
  * @param int $count
  * @return array
  */
-function getFiles($directory, $listing = array(), $count = 0) {
+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 == '..') {
+	if (!empty($directory) && $files = scandir($directory)) {
+		foreach ($files as $file) {
+			if ($file == '.' || $file == '..') {
 				continue;
-			} elseif($h = @opendir($directory . $file . "/")) {
+			} elseif ($h = @opendir($directory.$file."/")) {
 				closedir($h);
 				$count = -1;
-				$listing[$file] = getFiles($directory . $file . "/", array(), $count + 1);
-			} elseif(strpos($file, '.htm') !== false) {
+				$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>";
+		echo '<p><span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_no_open_dir"].$directory.".</p>";
 	}
 	return ($listing);
 }
@@ -346,11 +346,11 @@ 
  * @param string $filepath
  * @return bool|string
  */
-function getFileContent($filepath) {
+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>";
+	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;
 	}
@@ -360,17 +360,17 @@ 
  * @param array $array
  * @return array
  */
-function pop_index($array) {
+function pop_index($array){
 	$new_array = array();
-	foreach($array as $k => $v) {
-		if($v !== 'index.html' && $v !== 'index.htm') {
+	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)) {
+	foreach ($array as $k => $v) {
+		if (is_array($v)) {
 			$new_array[$k] = $v;
 		}
 	}
@@ -383,34 +383,34 @@ 
  * @param string $alias
  * @return array
  */
-function treatContent($src, $filename, $alias) {
+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)) {
+	if (preg_match("@<title>(.*)</title>@i", $src, $matches)) {
 		$pagetitle = ($matches[1] !== '') ? $matches[1] : $filename;
 		$pagetitle = str_replace('[*pagetitle*]', '', $pagetitle);
 	} else {
 		$pagetitle = $alias;
 	}
-	if(!$pagetitle) {
+	if (!$pagetitle) {
 		$pagetitle = $alias;
 	}
 
-	if(preg_match('@<meta[^>]+"description"[^>]+content=[\'"](.*)[\'"].+>@i', $src, $matches)) {
+	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') {
+	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';
+		$r = '$1'.$modx->config['modx_charset'].'$2';
 		$content = preg_replace($s, $r, $content);
 		$content = preg_replace('@<title>.*</title>@i', "<title>[*pagetitle*]</title>", $content);
 	}
@@ -427,7 +427,7 @@ 
 /**
  * @return void
  */
-function convertLink() {
+function convertLink(){
 	global $modx;
 	$tbl_site_content = $modx->getFullTableName('site_content');
 
@@ -435,33 +435,33 @@ 
 	$p = array();
     $target = array();
 	$dir = '';
-	while($row = $modx->db->getRow($rs)) {
+	while ($row = $modx->db->getRow($rs)) {
 		$id = $row['id'];
 		$array = explode('<a href=', $row['content']);
 		$c = 0;
-		foreach($array as $v) {
-			if($v[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 (strpos($_, $modx->config['site_url']) !== false) {
+					$_ = $modx->config['base_url'].str_replace($modx->config['site_url'], '', $_);
 				}
-				if($_[0] === '/') {
+				if ($_[0] === '/') {
 					$_ = substr($_, 1);
 				}
 				$_ = str_replace('/index.html', '.html', $_);
 				$level = substr_count($_, '../');
-				if(1 < $level) {
-					if(!isset($p[$id])) {
+				if (1 < $level) {
+					if (!isset($p[$id])) {
 						$p[$id] = $modx->getParentIds($id);
 					}
 					$k = array_keys($p[$id]);
-					while(0 < $level) {
+					while (0 < $level) {
 						$dir = array_shift($k);
 						$level--;
 					}
-					if($dir != '') {
+					if ($dir != '') {
 						$dir .= '/';
 					}
 				} else {
@@ -469,18 +469,18 @@ 
 				}
 
 				$_ = trim($_, './');
-				if(strpos($_, '/') !== false) {
+				if (strpos($_, '/') !== false) {
 					$_ = substr($_, strrpos($_, '/'));
 				}
-				$_ = $dir . str_replace('.html', '', $_);
-				if(!isset($target[$_])) {
+				$_ = $dir.str_replace('.html', '', $_);
+				if (!isset($target[$_])) {
 					$target[$_] = $modx->getIdFromAlias($_);
 				}
 				$target[$_] = trim($target[$_]);
-				if(!empty($target[$_])) {
-					$href = '[~' . $target[$_] . '~]';
+				if (!empty($target[$_])) {
+					$href = '[~'.$target[$_].'~]';
 				}
-				$array[$c] = '<a href="' . $href . '"' . $v;
+				$array[$c] = '<a href="'.$href.'"'.$v;
 			}
 			$c++;
 		}

manager/actions/mutate_role.dynamic.php

Spacing +12 added lines, -12 removed lines

@@ -1,16 +1,16 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+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.");
 }
 
-switch((int) $modx->manager->action) {
+switch ((int) $modx->manager->action) {
 	case 35:
-		if(!$modx->hasPermission('edit_role')) {
+		if (!$modx->hasPermission('edit_role')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 		}
 		break;
 	case 38:
-		if(!$modx->hasPermission('new_role')) {
+		if (!$modx->hasPermission('new_role')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 		}
 		break;
@@ -18,12 +18,12 @@ 
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$role = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$role = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 $tbl_user_roles = $modx->getFullTableName('user_roles');
 
 // check to see the snippet editor isn't locked
-if($lockedEl = $modx->elementIsLocked(8, $role)) {
+if ($lockedEl = $modx->elementIsLocked(8, $role)) {
 	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['role']));
 }
 // end check for lock
@@ -31,10 +31,10 @@ 
 // Lock snippet for other users to edit
 $modx->lockElement(8, $role);
 
-if($modx->manager->action == '35') {
+if ($modx->manager->action == '35') {
 	$rs = $modx->db->select('*', $tbl_user_roles, "id='{$role}'");
 	$roledata = $modx->db->getRow($rs);
-	if(!$roledata) {
+	if (!$roledata) {
 		$modx->webAlertAndQuit("No role returned!");
 	}
 	$_SESSION['itemname'] = $roledata['name'];
@@ -46,7 +46,7 @@ 
 // Add lock-element JS-Script
 $lockElementId = $role;
 $lockElementType = 8;
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
 ?>
 	<script type="text/javascript">
 		function changestate(element) {
@@ -82,7 +82,7 @@ 
 		<input type="hidden" name="id" value="<?= $_GET['id'] ?>">
 
 		<h1>
-            <i class="fa fa-legal"></i><?= ($roledata['name'] ? $roledata['name'] . '<small>(' . $roledata['id'] . ')</small>' : $_lang['role_title']) ?>
+            <i class="fa fa-legal"></i><?= ($roledata['name'] ? $roledata['name'].'<small>('.$roledata['id'].')</small>' : $_lang['role_title']) ?>
         </h1>
 
 		<?= $_style['actionbuttons']['dynamic']['savedelete'] ?>
@@ -299,7 +299,7 @@ 
  * @param string $status
  * @return string
  */
-function render_form($name, $label, $status = '') {
+function render_form($name, $label, $status = ''){
 	global $modx, $roledata;
 
 	$tpl = '<label class="d-block" for="[+name+]check">
@@ -310,7 +310,7 @@ 
 
 	$checked = ($roledata[$name] == 1) ? 'checked' : '';
 	$value = ($roledata[$name] == 1) ? 1 : 0;
-	if($status == 'disabled') {
+	if ($status == 'disabled') {
 		$checked = 'checked';
 		$value = 1;
 		$set = 'fix';

manager/actions/help/01About_EVO.php

Spacing +13 added lines, -13 removed lines

@@ -1,21 +1,21 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+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.");
 }
-$logo= '<img src="media/style/default/images/misc/login-logo.png" height="54" width="358" border="0">';
+$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(
+	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/'),
 );
 
 /**
@@ -23,20 +23,20 @@ 
  * @param array $linkArr
  * @return string
  */
-function createList($sectionHeader, $linkArr) {
+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) {
+	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>';
+			$links .= '<a href="'.$link.'" target="_blank">'.$link.'</a>';
 		}
 		$output .= '
 		<tr>
-			<td align="left"><strong>' . $row["title"] . '</strong></td>
-			<td align="left">' . $links . '</td>
+			<td align="left"><strong>' . $row["title"].'</strong></td>
+			<td align="left">' . $links.'</td>
 		</tr>';
 		$links = '';
 	}

manager/actions/search.static.php

Spacing +76 added lines, -76 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     exit();
 }
 unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes
@@ -41,9 +41,9 @@ 
                         <?php
                         $rs = $modx->db->select('*', $modx->getFullTableName('site_templates'));
                         $option[] = '<option value="">No selected</option>';
-                        $templateid = (isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '') ? (int)$_REQUEST['templateid'] : '';
+                        $templateid = (isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '') ? (int) $_REQUEST['templateid'] : '';
                         $selected = $templateid === 0 ? ' selected="selected"' : '';
-                        $option[] = '<option value="0"' . $selected . '>(blank)</option>';
+                        $option[] = '<option value="0"'.$selected.'>(blank)</option>';
                         while ($row = $modx->db->getRow($rs)) {
                             $templatename = htmlspecialchars($row['templatename'], ENT_QUOTES, $modx->config['modx_charset']);
                             $selected = $row['id'] == $templateid ? ' selected="selected"' : '';
@@ -86,7 +86,7 @@ 
     $searchfields = htmlentities(trim($_POST['searchfields']), ENT_QUOTES, $modx_manager_charset);
     $searchlongtitle = $modx->db->escape(trim($_REQUEST['searchfields']));
     $search_alias = $modx->db->escape(trim($_REQUEST['searchfields']));
-    $templateid = isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '' ? (int)$_REQUEST['templateid'] : '';
+    $templateid = isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '' ? (int) $_REQUEST['templateid'] : '';
     $searchcontent = $modx->db->escape($_REQUEST['content']);
 
     $fields = 'DISTINCT sc.id, contenttype, pagetitle, longtitle, description, introtext, menutitle, deleted, published, isfolder, type';
@@ -100,12 +100,12 @@ 
         $friendly_url_suffix = $modx->config['friendly_url_suffix'];
         $base_url = $modx->config['base_url'];
         $site_url = $modx->config['site_url'];
-        $url = preg_replace('@' . $friendly_url_suffix . '$@', '', $url);
+        $url = preg_replace('@'.$friendly_url_suffix.'$@', '', $url);
         if ($url[0] === '/') {
-            $url = preg_replace('@^' . $base_url . '@', '', $url);
+            $url = preg_replace('@^'.$base_url.'@', '', $url);
         }
         if (substr($url, 0, 4) === 'http') {
-            $url = preg_replace('@^' . $site_url . '@', '', $url);
+            $url = preg_replace('@^'.$site_url.'@', '', $url);
         }
         $idFromAlias = $modx->getIdFromAlias($url);
     }
@@ -118,18 +118,18 @@ 
 		$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){
+		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.=',';
+			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{
+		} else {
 			$articul_id_query = '';
 		}
 		/*end search by TV*/
@@ -137,7 +137,7 @@ 
         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}'";
@@ -180,8 +180,8 @@ 
         $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
         $mgrRole = (isset ($_SESSION['mgrRole']) && $_SESSION['mgrRole'] == 1) ? 1 : 0;
         $docgrp_cond = $docgrp ? " OR dg.document_group IN ({$docgrp})" : '';
-        $fields .= ', MAX(IF(1=' . $mgrRole . ' OR sc.privatemgr=0' . $docgrp_cond . ',1,0)) AS hasAccess';
-        $sqladd = '(' . $sqladd . ") AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
+        $fields .= ', MAX(IF(1='.$mgrRole.' OR sc.privatemgr=0'.$docgrp_cond.',1,0)) AS hasAccess';
+        $sqladd = '('.$sqladd.") AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
     }
 
     if ($sqladd) {
@@ -191,7 +191,7 @@ 
     $where = $sqladd;
 
     if ($where) {
-        $rs = $modx->db->select($fields, $tbl_site_content . ' AS sc LEFT JOIN ' . $tbldg . ' AS dg ON dg.document=sc.id', $where, 'sc.id');
+        $rs = $modx->db->select($fields, $tbl_site_content.' AS sc LEFT JOIN '.$tbldg.' AS dg ON dg.document=sc.id', $where, 'sc.id');
         $limit = $modx->db->getRecordCount($rs);
     } else {
         $limit = 0;
@@ -210,7 +210,7 @@ 
                 if ($limit < 1) {
                     echo $_lang['search_empty'];
                 } else {
-                    printf('<p>' . $_lang['search_results_returned_msg'] . '</p>', $limit);
+                    printf('<p>'.$_lang['search_results_returned_msg'].'</p>', $limit);
                     ?>
                     <script type="text/javascript" src="media/script/tablesort.js"></script>
                     <table class="grid sortabletable sortable-onload-2 rowstyle-even" id="table-1">
@@ -270,14 +270,14 @@ 
                                 if (function_exists('mb_strlen') && function_exists('mb_substr')) {
                                     ?>
                                     <td<?= $tdClass ?>>
-                                        <a href="index.php?a=27&id=<?= $row['id'] ?>"><?= mb_strlen($row['pagetitle'], $modx_manager_charset) > 70 ? mb_substr($row['pagetitle'], 0, 70, $modx_manager_charset) . "..." : $row['pagetitle'] ?></a>
+                                        <a href="index.php?a=27&id=<?= $row['id'] ?>"><?= mb_strlen($row['pagetitle'], $modx_manager_charset) > 70 ? mb_substr($row['pagetitle'], 0, 70, $modx_manager_charset)."..." : $row['pagetitle'] ?></a>
                                     </td>
-                                    <td<?= $tdClass ?>><?= mb_strlen($row['description'], $modx_manager_charset) > 70 ? mb_substr($row['description'], 0, 70, $modx_manager_charset) . "..." : $row['description'] ?></td>
+                                    <td<?= $tdClass ?>><?= mb_strlen($row['description'], $modx_manager_charset) > 70 ? mb_substr($row['description'], 0, 70, $modx_manager_charset)."..." : $row['description'] ?></td>
                                     <?php
                                 } else {
                                     ?>
-                                    <td<?= $tdClass ?>><?= strlen($row['pagetitle']) > 20 ? substr($row['pagetitle'], 0, 20) . '...' : $row['pagetitle'] ?></td>
-                                    <td<?= $tdClass ?>><?= strlen($row['description']) > 35 ? substr($row['description'], 0, 35) . '...' : $row['description'] ?></td>
+                                    <td<?= $tdClass ?>><?= strlen($row['pagetitle']) > 20 ? substr($row['pagetitle'], 0, 20).'...' : $row['pagetitle'] ?></td>
+                                    <td<?= $tdClass ?>><?= strlen($row['description']) > 35 ? substr($row['description'], 0, 35).'...' : $row['description'] ?></td>
                                     <?php
                                 }
                                 ?>
@@ -297,115 +297,115 @@ 
                 if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
                     $docscounts = $modx->db->getRecordCount($rs);
                     if ($docscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-sitemap"></i> ' . $_lang["manage_documents"] . ' (' . $docscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-sitemap"></i> '.$_lang["manage_documents"].' ('.$docscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList('', !$row['published'], $row['deleted']) . '><a href="index.php?a=27&id=' . $row['id'] . '" id="content_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['pagetitle'] . ' <small>(' . $row['id'] . ')</small>', $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList('', !$row['published'], $row['deleted']).'><a href="index.php?a=27&id='.$row['id'].'" id="content_'.$row['id'].'" target="main">'.highlightingCoincidence($row['pagetitle'].' <small>('.$row['id'].')</small>', $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //templates
                 if ($modx->hasPermission('edit_template')) {
-                    $rs = $modx->db->select("id,templatename,locked", $modx->getFullTableName('site_templates'), "`id` like '%" . $searchfields . "%' 
-					OR `templatename` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `content` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,templatename,locked", $modx->getFullTableName('site_templates'), "`id` like '%".$searchfields."%' 
+					OR `templatename` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `content` like '%" . $searchfields."%'");
                     $templatecounts = $modx->db->getRecordCount($rs);
                     if ($templatecounts > 0) {
-                        $output .= '<li><b><i class="fa fa-newspaper-o"></i> ' . $_lang["manage_templates"] . ' (' . $templatecounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-newspaper-o"></i> '.$_lang["manage_templates"].' ('.$templatecounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked']) . '><a href="index.php?a=16&id=' . $row['id'] . '" id="templates_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['templatename'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked']).'><a href="index.php?a=16&id='.$row['id'].'" id="templates_'.$row['id'].'" target="main">'.highlightingCoincidence($row['templatename'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //tvs
                 if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
-                    $rs = $modx->db->select("id,name,locked", $modx->getFullTableName('site_tmplvars'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `type` like '%" . $searchfields . "%' 
-					OR `elements` like '%" . $searchfields . "%' 
-					OR `display` like '%" . $searchfields . "%' 
-					OR `display_params` like '%" . $searchfields . "%' 
-					OR `default_text` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked", $modx->getFullTableName('site_tmplvars'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `type` like '%" . $searchfields."%' 
+					OR `elements` like '%" . $searchfields."%' 
+					OR `display` like '%" . $searchfields."%' 
+					OR `display_params` like '%" . $searchfields."%' 
+					OR `default_text` like '%" . $searchfields."%'");
                     $tvscounts = $modx->db->getRecordCount($rs);
                     if ($tvscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-list-alt"></i> ' . $_lang["settings_templvars"] . ' (' . $tvscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-list-alt"></i> '.$_lang["settings_templvars"].' ('.$tvscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked']) . '><a href="index.php?a=301&id=' . $row['id'] . '" id="tmplvars_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked']).'><a href="index.php?a=301&id='.$row['id'].'" id="tmplvars_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //Chunks
                 if ($modx->hasPermission('edit_chunk')) {
-                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_htmlsnippets'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%'     
-					OR `snippet` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_htmlsnippets'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%'     
+					OR `snippet` like '%" . $searchfields."%'");
                     $chunkscounts = $modx->db->getRecordCount($rs);
                     if ($chunkscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-th-large"></i> ' . $_lang["manage_htmlsnippets"] . ' (' . $chunkscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-th-large"></i> '.$_lang["manage_htmlsnippets"].' ('.$chunkscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=78&id=' . $row['id'] . '" id="htmlsnippets_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=78&id='.$row['id'].'" id="htmlsnippets_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //Snippets
                 if ($modx->hasPermission('edit_snippet')) {
-                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_snippets'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `snippet` like '%" . $searchfields . "%'  
-					OR `properties` like '%" . $searchfields . "%'      
-					OR `moduleguid` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_snippets'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `snippet` like '%" . $searchfields."%'  
+					OR `properties` like '%" . $searchfields."%'      
+					OR `moduleguid` like '%" . $searchfields."%'");
                     $snippetscounts = $modx->db->getRecordCount($rs);
                     if ($snippetscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-code"></i> ' . $_lang["manage_snippets"] . ' (' . $snippetscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-code"></i> '.$_lang["manage_snippets"].' ('.$snippetscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=22&id=' . $row['id'] . '" id="snippets_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=22&id='.$row['id'].'" id="snippets_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //plugins
                 if ($modx->hasPermission('edit_plugin')) {
-                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_plugins'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `plugincode` like '%" . $searchfields . "%'  
-					OR `properties` like '%" . $searchfields . "%'      
-					OR `moduleguid` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_plugins'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `plugincode` like '%" . $searchfields."%'  
+					OR `properties` like '%" . $searchfields."%'      
+					OR `moduleguid` like '%" . $searchfields."%'");
                     $pluginscounts = $modx->db->getRecordCount($rs);
                     if ($pluginscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-plug"></i> ' . $_lang["manage_plugins"] . ' (' . $pluginscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-plug"></i> '.$_lang["manage_plugins"].' ('.$pluginscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=102&id=' . $row['id'] . '" id="plugins_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=102&id='.$row['id'].'" id="plugins_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //modules
                 if ($modx->hasPermission('edit_module')) {
-                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_modules'), "`id` like '%" . $searchfields . "%' 
-                    OR `name` like '%" . $searchfields . "%' 
-                    OR `description` like '%" . $searchfields . "%' 
-                    OR `modulecode` like '%" . $searchfields . "%'  
-                    OR `properties` like '%" . $searchfields . "%'  
-                    OR `guid` like '%" . $searchfields . "%'      
-                    OR `resourcefile` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_modules'), "`id` like '%".$searchfields."%' 
+                    OR `name` like '%" . $searchfields."%' 
+                    OR `description` like '%" . $searchfields."%' 
+                    OR `modulecode` like '%" . $searchfields."%'  
+                    OR `properties` like '%" . $searchfields."%'  
+                    OR `guid` like '%" . $searchfields."%'      
+                    OR `resourcefile` like '%" . $searchfields."%'");
                     $modulescounts = $modx->db->getRecordCount($rs);
                     if ($modulescounts > 0) {
-                        $output .= '<li><b><i class="fa fa-cogs"></i> ' . $_lang["modules"] . ' (' . $modulescounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-cogs"></i> '.$_lang["modules"].' ('.$modulescounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=108&id=' . $row['id'] . '" id="modules_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=108&id='.$row['id'].'" id="modules_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
-                echo $output ? '<div class="ajaxSearchResults"><ul>' . $output . '</ul></div>' : '1';
+                echo $output ? '<div class="ajaxSearchResults"><ul>'.$output.'</ul></div>' : '1';
             }
 
             ?>
@@ -421,13 +421,13 @@ 
  */
 function highlightingCoincidence($text, $search)
 {
-    $regexp = '!(' . str_replace(array(
+    $regexp = '!('.str_replace(array(
             '(',
             ')'
         ), array(
             '\(',
             '\)'
-        ), trim($search)) . ')!isu';
+        ), trim($search)).')!isu';
     return preg_replace($regexp, '<span class="text-danger">$1</span>', $text);
 }
 
@@ -450,7 +450,7 @@ 
         $class .= ' deleted';
     }
     if ($class) {
-        $class = ' class="' . trim($class) . '"';
+        $class = ' class="'.trim($class).'"';
     }
     return $class;
 }

manager/actions/mutate_plugin.dynamic.php

Spacing +17 added lines, -17 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+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.");
 }
 
@@ -18,7 +18,7 @@ 
         $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 $tbl_site_plugins = $modx->getFullTableName('site_plugins');
 $tbl_site_plugin_events = $modx->getFullTableName('site_plugin_events');
@@ -46,7 +46,7 @@ 
     $content['properties'] = str_replace("&", "&amp;", $content['properties']);
 } else {
     $_SESSION['itemname'] = $_lang["new_plugin"];
-    $content['category'] = (int)$_REQUEST['catid'];
+    $content['category'] = (int) $_REQUEST['catid'];
 }
 
 if ($modx->manager->hasFormValues()) {
@@ -56,7 +56,7 @@ 
 // Add lock-element JS-Script
 $lockElementId = $id;
 $lockElementType = 5;
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
 
 /**
  * @param bool $cond
@@ -478,7 +478,7 @@ 
     <input type="hidden" name="mode" value="<?= $modx->manager->action ?>">
 
     <h1>
-        <i class="fa fa-plug"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_plugin']) ?><i class="fa fa-question-circle help"></i>
+        <i class="fa fa-plug"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_plugin']) ?><i class="fa fa-question-circle help"></i>
     </h1>
 
     <?= $_style['actionbuttons']['dynamic']['element'] ?>
@@ -504,7 +504,7 @@ 
                             <div class="form-control-name clearfix">
                                 <input name="name" type="text" maxlength="100" value="<?= $modx->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" />
                                 <?php if ($modx->hasPermission('save_role')): ?>
-                                <label class="custom-control" title="<?= $_lang['lock_plugin'] . "\n" . $_lang['lock_plugin_msg'] ?>" tooltip>
+                                <label class="custom-control" title="<?= $_lang['lock_plugin']."\n".$_lang['lock_plugin_msg'] ?>" tooltip>
                                     <input name="locked" type="checkbox" value="on"<?= ($content['locked'] == 1 ? ' checked="checked"' : '') ?> />
                                     <i class="fa fa-lock"></i>
                                 </label>
@@ -528,9 +528,9 @@ 
                             <select name="categoryid" class="form-control" onchange="documentDirty=true;">
                                 <option>&nbsp;</option>
                                 <?php
-                                include_once(MODX_MANAGER_PATH . 'includes/categories.inc.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>";
+                                    echo '<option value="'.$v['id'].'"'.($content["category"] == $v["id"] ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($v["category"])."</option>";
                                 }
                                 ?>
                             </select>
@@ -546,7 +546,7 @@ 
                 <?php if ($modx->hasPermission('save_role')): ?>
                 <div class="form-group">
                     <div class="form-row">
-                        <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>" . $_lang['plugin_disabled'] . "</span>" : $_lang['plugin_disabled']) ?></label>
+                        <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>".$_lang['plugin_disabled']."</span>" : $_lang['plugin_disabled']) ?></label>
                     </div>
                     <div class="form-row">
                         <label>
@@ -593,11 +593,11 @@ 
                             <select name="moduleguid" class="form-control" onchange="documentDirty=true;">
                                 <option>&nbsp;</option>
                                 <?php
-                                $ds = $modx->db->select('sm.id,sm.name,sm.guid', $modx->getFullTableName("site_modules") . " sm 
-								INNER JOIN " . $modx->getFullTableName("site_module_depobj") . " smd ON smd.module=sm.id AND smd.type=30
-								INNER JOIN " . $modx->getFullTableName("site_plugins") . " sp ON sp.id=smd.resource", "smd.resource='{$id}' AND sm.enable_sharedparams='1'", 'sm.name');
+                                $ds = $modx->db->select('sm.id,sm.name,sm.guid', $modx->getFullTableName("site_modules")." sm 
+								INNER JOIN " . $modx->getFullTableName("site_module_depobj")." smd ON smd.module=sm.id AND smd.type=30
+								INNER JOIN " . $modx->getFullTableName("site_plugins")." sp ON sp.id=smd.resource", "smd.resource='{$id}' AND sm.enable_sharedparams='1'", 'sm.name');
                                 while ($row = $modx->db->getRow($ds)) {
-                                    echo "<option value='" . $row['guid'] . "'" . ($content["moduleguid"] == $row["guid"] ? " selected='selected'" : "") . ">" . $modx->htmlspecialchars($row["name"]) . "</option>";
+                                    echo "<option value='".$row['guid']."'".($content["moduleguid"] == $row["guid"] ? " selected='selected'" : "").">".$modx->htmlspecialchars($row["name"])."</option>";
                                 }
                                 ?>
                             </select>
@@ -658,7 +658,7 @@ 
                                 echoEventRows($evtnames);
                             }
                             echo '<hr class="clear">';
-                            echo '<div class="form-group"><b>' . $services[$srv - 1] . '</b></div>';
+                            echo '<div class="form-group"><b>'.$services[$srv - 1].'</b></div>';
                         }
                         // display group name
                         if ($grp != $row['groupname']) {
@@ -667,9 +667,9 @@ 
                                 echoEventRows($evtnames);
                             }
                             echo '<hr class="clear">';
-                            echo '<div class="form-group"><b>' . $row['groupname'] . '</b></div>';
+                            echo '<div class="form-group"><b>'.$row['groupname'].'</b></div>';
                         }
-                        $evtnames[] = '<input name="sysevents[]" id="' . $row['name'] . '" type="checkbox" ' . (in_array($row['id'], $evts) ? ' checked="checked" ' : '') . 'class="inputBox" value="' . $row['id'] . '" /> <label for="' . $row['name'] . '" ' . bold(in_array($row['id'], $evts)) . '> ' . $row['name'] . '</label>' . "\n";
+                        $evtnames[] = '<input name="sysevents[]" id="'.$row['name'].'" type="checkbox" '.(in_array($row['id'], $evts) ? ' checked="checked" ' : '').'class="inputBox" value="'.$row['id'].'" /> <label for="'.$row['name'].'" '.bold(in_array($row['id'], $evts)).'> '.$row['name'].'</label>'."\n";
                         if (count($evtnames) == 2) {
                             echoEventRows($evtnames);
                         }
@@ -681,7 +681,7 @@ 
 
                 function echoEventRows(&$evtnames)
                 {
-                    echo '<div class="row form-row"><div class="col-sm-6 col-md-4 col-lg-3">' . implode('</div><div class="col-sm-6 col-md-4 col-lg-3">', $evtnames) . '</div></div>';
+                    echo '<div class="row form-row"><div class="col-sm-6 col-md-4 col-lg-3">'.implode('</div><div class="col-sm-6 col-md-4 col-lg-3">', $evtnames).'</div></div>';
                     $evtnames = array();
                 }
 

manager/actions/category_mgr/inc/Module_Categories_Manager.php

Spacing +6 added lines, -6 removed lines

@@ -7,7 +7,7 @@ 
     die('Please use the MODx Backend.');
 }
 
-require_once realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'Categories.php';
+require_once realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR.'Categories.php';
 
 class Module_Categories_Manager extends Categories
 {
@@ -94,8 +94,8 @@ 
     {
         global $_lang, $_style;
 
-        $filename = trim($view_name) . '.tpl.phtml';
-        $file = self::get('views_dir') . $filename;
+        $filename = trim($view_name).'.tpl.phtml';
+        $file = self::get('views_dir').$filename;
         $view = &$this;
 
         if (is_file($file)
@@ -120,14 +120,14 @@ 
     {
 
         $_update = array(
-            'id'       => (int)$element_id,
-            'category' => (int)$category_id
+            'id'       => (int) $element_id,
+            'category' => (int) $category_id
         );
 
         $this->db->update(
             $_update,
             $this->db_tbl[$element],
-            "`id` = '" . (int)$element_id . "'"
+            "`id` = '".(int) $element_id."'"
         );
 
         return $this->db->getAffectedRows() === 1;

manager/actions/category_mgr/inc/Categories.php

Spacing +11 added lines, -11 removed lines

@@ -20,7 +20,7 @@ 
         $this->db_tbl['categories'] = $modx->getFullTableName('categories');
 
         foreach ($this->elements as $element) {
-            $this->db_tbl[$element] = $modx->getFullTableName('site_' . $element);
+            $this->db_tbl[$element] = $modx->getFullTableName('site_'.$element);
         }
     }
 
@@ -54,7 +54,7 @@ 
             $this->db->select(
                 '*',
                 $this->db_tbl['categories'],
-                "`" . $where . "` = '" . $this->db->escape($search) . "'"
+                "`".$where."` = '".$this->db->escape($search)."'"
             )
         );
 
@@ -71,9 +71,9 @@ 
     {
         $_value = $this->db->getValue(
             $this->db->select(
-                '`' . $value . '`',
+                '`'.$value.'`',
                 $this->db_tbl['categories'],
-                "`" . $where . "` = '" . $this->db->escape($search) . "'"
+                "`".$where."` = '".$this->db->escape($search)."'"
             )
         );
 
@@ -92,7 +92,7 @@ 
                 $this->db->select(
                     '*',
                     $this->db_tbl[$element],
-                    "`category` = '" . (int)$category_id . "'"
+                    "`category` = '".(int) $category_id."'"
                 )
             );
 
@@ -135,13 +135,13 @@ 
             $this->db->update(
                 $_update,
                 $this->db_tbl[$element],
-                "`category` = '" . (int)$category_id . "'"
+                "`category` = '".(int) $category_id."'"
             );
         }
 
         $this->db->delete(
             $this->db_tbl['categories'],
-            "`id` = '" . (int)$category_id . "'"
+            "`id` = '".(int) $category_id."'"
         );
 
         return $this->db->getAffectedRows() === 1;
@@ -160,13 +160,13 @@ 
 
         $_update = array(
             'category' => $this->db->escape($data['category']),
-            'rank'     => (int)$data['rank']
+            'rank'     => (int) $data['rank']
         );
 
         $this->db->update(
             $_update,
             $this->db_tbl['categories'],
-            "`id` = '" . (int)$category_id . "'"
+            "`id` = '".(int) $category_id."'"
         );
 
         if ($this->db->getAffectedRows() === 1) {
@@ -189,7 +189,7 @@ 
 
         $_insert = array(
             'category' => $this->db->escape($category_name),
-            'rank'     => (int)$category_rank
+            'rank'     => (int) $category_rank
         );
 
         $this->db->insert(
@@ -216,7 +216,7 @@ 
             $this->db->select(
                 '`id`',
                 $this->db_tbl['categories'],
-                "`category` = '" . $category . "'"
+                "`category` = '".$category."'"
             )
         );
 

manager/includes/secure_mgr_documents.inc.php

Spacing +5 added lines, -5 removed lines

@@ -20,14 +20,14 @@
         ($docid > 0 ? "id='$docid'" : "privatemgr = 1"));
     $rs = $modx->db->select(
         'DISTINCT sc.id',
-        $modx->getFullTableName("site_content") . " sc
-			LEFT JOIN " . $modx->getFullTableName("document_groups") . " dg ON dg.document = sc.id
-			LEFT JOIN " . $modx->getFullTableName("membergroup_access") . " mga ON mga.documentgroup = dg.document_group",
-        ($docid > 0 ? " sc.id='{$docid}' AND " : "") . "mga.id>0"
+        $modx->getFullTableName("site_content")." sc
+			LEFT JOIN " . $modx->getFullTableName("document_groups")." dg ON dg.document = sc.id
+			LEFT JOIN " . $modx->getFullTableName("membergroup_access")." mga ON mga.documentgroup = dg.document_group",
+        ($docid > 0 ? " sc.id='{$docid}' AND " : "")."mga.id>0"
     );
     $ids = $modx->db->getColumn("id", $rs);
     if (count($ids) > 0) {
         $modx->db->update('privatemgr = 1', $modx->getFullTableName("site_content"),
-            "id IN (" . implode(", ", $ids) . ")");
+            "id IN (".implode(", ", $ids).")");
     }
 }