evolution-cms / evolution

manager/actions/mutate_role.dynamic.php

Switch Indentation +11 added lines, -11 removed lines

@@ -4,18 +4,18 @@
 }
 
 switch ((int)$modx->getManagerApi()->action) {
-    case 35:
-        if (!$modx->hasPermission('edit_role')) {
-            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
-        }
-        break;
-    case 38:
-        if (!$modx->hasPermission('new_role')) {
+        case 35:
+            if (!$modx->hasPermission('edit_role')) {
+                $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+            }
+            break;
+        case 38:
+            if (!$modx->hasPermission('new_role')) {
+                $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+            }
+            break;
+        default:
             $modx->webAlertAndQuit($_lang["error_no_privileges"]);
-        }
-        break;
-    default:
-        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $role = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;

Spacing +4 added lines, -4 removed lines

@@ -3,7 +3,7 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-switch ((int)$modx->getManagerApi()->action) {
+switch ((int) $modx->getManagerApi()->action) {
     case 35:
         if (!$modx->hasPermission('edit_role')) {
             $modx->webAlertAndQuit($_lang["error_no_privileges"]);
@@ -18,7 +18,7 @@ 
         $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->getDatabase()->getFullTableName('user_roles');
 
@@ -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>
 
     <?= ManagerTheme::getStyle('actionbuttons.dynamic.savedelete') ?>

manager/processors/send_message.processor.php

Braces +6 added lines, -2 removed lines

@@ -10,9 +10,13 @@
 $userid = $_REQUEST['user'];
 $groupid = $_REQUEST['group'];
 $subject = $modx->getDatabase()->escape($_REQUEST['messagesubject']);
-if($subject=="") $subject="(no subject)";
+if($subject=="") {
+    $subject="(no subject)";
+}
 $message = $modx->getDatabase()->escape($_REQUEST['messagebody']);
-if($message=="") $message="(no message)";
+if($message=="") {
+    $message="(no message)";
+}
 $postdate = time();
 
 if($sendto=='u') {

Indentation +43 added lines, -43 removed lines

@@ -3,7 +3,7 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('messages')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $sendto = $_REQUEST['sendto'];
@@ -16,55 +16,55 @@ 
 $postdate = time();
 
 if($sendto=='u') {
-	if($userid==0) {
-		$modx->webAlertAndQuit($_lang["error_no_user_selected"]);
-	}
-	$modx->getDatabase()->insert(
-		array(
-			'recipient' => $userid,
-			'sender'    => $modx->getLoginUserID(),
-			'subject'   => $subject,
-			'message'   => $message,
-			'postdate'  => $postdate,
-			'type'      => 'Message',
-			'private'   => 1,
-		), $modx->getDatabase()->getFullTableName('user_messages'));
+    if($userid==0) {
+        $modx->webAlertAndQuit($_lang["error_no_user_selected"]);
+    }
+    $modx->getDatabase()->insert(
+        array(
+            'recipient' => $userid,
+            'sender'    => $modx->getLoginUserID(),
+            'subject'   => $subject,
+            'message'   => $message,
+            'postdate'  => $postdate,
+            'type'      => 'Message',
+            'private'   => 1,
+        ), $modx->getDatabase()->getFullTableName('user_messages'));
 }
 
 if($sendto=='g') {
-	if($groupid==0) {
-		$modx->webAlertAndQuit($_lang["error_no_group_selected"]);
-	}
-	$rs = $modx->getDatabase()->select('internalKey', $modx->getDatabase()->getFullTableName('user_attributes'), "role='{$groupid}' AND internalKey!='".$modx->getLoginUserID()."'");
-	while ($row=$modx->getDatabase()->getRow($rs)) {
-		$modx->getDatabase()->insert(
-			array(
-				'recipient' => $row['internalKey'],
-				'sender'    => $modx->getLoginUserID(),
-				'subject'   => $subject,
-				'message'   => $message,
-				'postdate'  => $postdate,
-				'type'      => 'Message',
-				'private'   => 0,
-			), $modx->getDatabase()->getFullTableName('user_messages'));
-	}
+    if($groupid==0) {
+        $modx->webAlertAndQuit($_lang["error_no_group_selected"]);
+    }
+    $rs = $modx->getDatabase()->select('internalKey', $modx->getDatabase()->getFullTableName('user_attributes'), "role='{$groupid}' AND internalKey!='".$modx->getLoginUserID()."'");
+    while ($row=$modx->getDatabase()->getRow($rs)) {
+        $modx->getDatabase()->insert(
+            array(
+                'recipient' => $row['internalKey'],
+                'sender'    => $modx->getLoginUserID(),
+                'subject'   => $subject,
+                'message'   => $message,
+                'postdate'  => $postdate,
+                'type'      => 'Message',
+                'private'   => 0,
+            ), $modx->getDatabase()->getFullTableName('user_messages'));
+    }
 }
 
 
 if($sendto=='a') {
-	$rs = $modx->getDatabase()->select('id', $modx->getDatabase()->getFullTableName('manager_users'), "id!='".$modx->getLoginUserID()."'");
-	while ($row=$modx->getDatabase()->getRow($rs)) {
-		$modx->getDatabase()->insert(
-			array(
-				'recipient' => $row['id'],
-				'sender'    => $modx->getLoginUserID(),
-				'subject'   => $subject,
-				'message'   => $message,
-				'postdate'  => $postdate,
-				'type'      => 'Message',
-				'private'   => 0,
-			), $modx->getDatabase()->getFullTableName('user_messages'));
-	}
+    $rs = $modx->getDatabase()->select('id', $modx->getDatabase()->getFullTableName('manager_users'), "id!='".$modx->getLoginUserID()."'");
+    while ($row=$modx->getDatabase()->getRow($rs)) {
+        $modx->getDatabase()->insert(
+            array(
+                'recipient' => $row['id'],
+                'sender'    => $modx->getLoginUserID(),
+                'subject'   => $subject,
+                'message'   => $message,
+                'postdate'  => $postdate,
+                'type'      => 'Message',
+                'private'   => 0,
+            ), $modx->getDatabase()->getFullTableName('user_messages'));
+    }
 }
 
 $header = "Location: index.php?a=10";

Spacing +11 added lines, -11 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('messages')) {
+if (!$modx->hasPermission('messages')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -10,13 +10,13 @@ 
 $userid = $_REQUEST['user'];
 $groupid = $_REQUEST['group'];
 $subject = $modx->getDatabase()->escape($_REQUEST['messagesubject']);
-if($subject=="") $subject="(no subject)";
+if ($subject == "") $subject = "(no subject)";
 $message = $modx->getDatabase()->escape($_REQUEST['messagebody']);
-if($message=="") $message="(no message)";
+if ($message == "") $message = "(no message)";
 $postdate = time();
 
-if($sendto=='u') {
-	if($userid==0) {
+if ($sendto == 'u') {
+	if ($userid == 0) {
 		$modx->webAlertAndQuit($_lang["error_no_user_selected"]);
 	}
 	$modx->getDatabase()->insert(
@@ -31,12 +31,12 @@ 
 		), $modx->getDatabase()->getFullTableName('user_messages'));
 }
 
-if($sendto=='g') {
-	if($groupid==0) {
+if ($sendto == 'g') {
+	if ($groupid == 0) {
 		$modx->webAlertAndQuit($_lang["error_no_group_selected"]);
 	}
 	$rs = $modx->getDatabase()->select('internalKey', $modx->getDatabase()->getFullTableName('user_attributes'), "role='{$groupid}' AND internalKey!='".$modx->getLoginUserID()."'");
-	while ($row=$modx->getDatabase()->getRow($rs)) {
+	while ($row = $modx->getDatabase()->getRow($rs)) {
 		$modx->getDatabase()->insert(
 			array(
 				'recipient' => $row['internalKey'],
@@ -51,9 +51,9 @@ 
 }
 
 
-if($sendto=='a') {
+if ($sendto == 'a') {
 	$rs = $modx->getDatabase()->select('id', $modx->getDatabase()->getFullTableName('manager_users'), "id!='".$modx->getLoginUserID()."'");
-	while ($row=$modx->getDatabase()->getRow($rs)) {
+	while ($row = $modx->getDatabase()->getRow($rs)) {
 		$modx->getDatabase()->insert(
 			array(
 				'recipient' => $row['id'],

manager/processors/save_module.processor.php

Spacing +10 added lines, -10 removed lines

@@ -1,12 +1,12 @@ 
 <?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('save_module')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = (int)$_POST['id'];
+$id = (int) $_POST['id'];
 $name = $modx->getDatabase()->escape(trim($_POST['name']));
 $description = $modx->getDatabase()->escape($_POST['description']);
 $resourcefile = $modx->getDatabase()->escape($_POST['resourcefile']);
@@ -25,11 +25,11 @@ 
 
 //Kyle Jaebker - added category support
 if (empty($_POST['newcategory']) && $_POST['categoryid'] > 0) {
-    $categoryid = (int)$_POST['categoryid'];
+    $categoryid = (int) $_POST['categoryid'];
 } elseif (empty($_POST['newcategory']) && $_POST['categoryid'] <= 0) {
     $categoryid = 0;
 } else {
-    include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+    include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
     $categoryid = checkCategory($_POST['newcategory']);
     if (!$categoryid) {
         $categoryid = newCategory($_POST['newcategory']);
@@ -45,15 +45,15 @@ 
     $name = isset($parsed['name']) ? $parsed['name'] : $name;
     $properties = isset($parsed['properties']) ? $parsed['properties'] : $properties;
     $guid = isset($parsed['guid']) ? $parsed['guid'] : $guid;
-    $enable_sharedparams = isset($parsed['shareparams']) ? (int)$parsed['shareparams'] : $enable_sharedparams;
+    $enable_sharedparams = isset($parsed['shareparams']) ? (int) $parsed['shareparams'] : $enable_sharedparams;
 
     $description = isset($parsed['description']) ? $parsed['description'] : $description;
-    $version = isset($parsed['version']) ? '<b>' . $parsed['version'] . '</b> ' : '';
+    $version = isset($parsed['version']) ? '<b>'.$parsed['version'].'</b> ' : '';
     if ($version) {
-        $description = $version . trim(preg_replace('/(<b>.+?)+(<\/b>)/i', '', $description));
+        $description = $version.trim(preg_replace('/(<b>.+?)+(<\/b>)/i', '', $description));
     }
     if (isset($parsed['modx_category'])) {
-        include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+        include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
         $categoryid = getCategory($parsed['modx_category']);
     }
 }
@@ -111,7 +111,7 @@ 
         // finished emptying cache - redirect
         if ($_POST['stay'] != '') {
             $a = ($_POST['stay'] == '2') ? "108&id=$newid" : "107";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+            $header = "Location: index.php?a=".$a."&r=2&stay=".$_POST['stay'];
             header($header);
         } else {
             $header = "Location: index.php?a=106&r=2";
@@ -168,7 +168,7 @@ 
         // finished emptying cache - redirect
         if ($_POST['stay'] != '') {
             $a = ($_POST['stay'] == '2') ? "108&id=$id" : "107";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+            $header = "Location: index.php?a=".$a."&r=2&stay=".$_POST['stay'];
             header($header);
         } else {
             $modx->unlockElement(6, $id);

Switch Indentation +119 added lines, -119 removed lines

@@ -59,123 +59,123 @@
 }
 
 switch ($_POST['mode']) {
-    case '107':
-        // invoke OnBeforeModFormSave event
-        $modx->invokeEvent("OnBeforeModFormSave", array(
-                "mode" => "new",
-                "id" => $id
-            ));
-
-        // disallow duplicate names for new modules
-        $rs = $modx->getDatabase()->select('count(id)', $modx->getDatabase()->getFullTableName('site_modules'), "name='{$name}'");
-        $count = $modx->getDatabase()->getValue($rs);
-        if ($count > 0) {
-            $modx->getManagerApi()->saveFormValues(107);
-            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_module'], $name), "index.php?a=107");
-        }
-
-        // save the new module
-        $newid = $modx->getDatabase()->insert(array(
-            'name' => $name,
-            'description' => $description,
-            'disabled' => $disabled,
-            'wrap' => $wrap,
-            'locked' => $locked,
-            'icon' => $icon,
-            'resourcefile' => $resourcefile,
-            'enable_resource' => $enable_resource,
-            'category' => $categoryid,
-            'enable_sharedparams' => $enable_sharedparams,
-            'guid' => $guid,
-            'modulecode' => $modulecode,
-            'properties' => $properties,
-            'createdon' => $currentdate,
-            'editedon' => $currentdate
-        ), $modx->getDatabase()->getFullTableName('site_modules'));
-
-        // save user group access permissions
-        saveUserGroupAccessPermissons();
-
-        // invoke OnModFormSave event
-        $modx->invokeEvent("OnModFormSave", array(
-                "mode" => "new",
-                "id" => $newid
-            ));
-
-        // Set the item name for logger
-        $_SESSION['itemname'] = $name;
-
-        // empty cache
-        $modx->clearCache('full');
-
-        // finished emptying cache - redirect
-        if ($_POST['stay'] != '') {
-            $a = ($_POST['stay'] == '2') ? "108&id=$newid" : "107";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
-            header($header);
-        } else {
-            $header = "Location: index.php?a=106&r=2";
-            header($header);
-        }
-        break;
-    case '108':
-        // invoke OnBeforeModFormSave event
-        $modx->invokeEvent("OnBeforeModFormSave", array(
-                "mode" => "upd",
-                "id" => $id
-            ));
-
-        // disallow duplicate names for new modules
-        $rs = $modx->getDatabase()->select('count(id)', $modx->getDatabase()->getFullTableName('site_modules'), "name='{$name}' AND id!='{$id}'");
-        if ($modx->getDatabase()->getValue($rs) > 0) {
-            $modx->getManagerApi()->saveFormValues(108);
-            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_module'], $name), "index.php?a=108&id={$id}");
-        }
-
-        // save the edited module
-        $modx->getDatabase()->update(array(
-            'name' => $name,
-            'description' => $description,
-            'icon' => $icon,
-            'enable_resource' => $enable_resource,
-            'resourcefile' => $resourcefile,
-            'disabled' => $disabled,
-            'wrap' => $wrap,
-            'locked' => $locked,
-            'category' => $categoryid,
-            'enable_sharedparams' => $enable_sharedparams,
-            'guid' => $guid,
-            'modulecode' => $modulecode,
-            'properties' => $properties,
-            'editedon' => $currentdate
-        ), $modx->getDatabase()->getFullTableName('site_modules'), "id='{$id}'");
-
-        // save user group access permissions
-        saveUserGroupAccessPermissons();
-
-        // invoke OnModFormSave event
-        $modx->invokeEvent("OnModFormSave", array(
-                "mode" => "upd",
-                "id" => $id
-            ));
-
-        // Set the item name for logger
-        $_SESSION['itemname'] = $name;
-
-        // empty cache
-        $modx->clearCache('full');
-
-        // finished emptying cache - redirect
-        if ($_POST['stay'] != '') {
-            $a = ($_POST['stay'] == '2') ? "108&id=$id" : "107";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
-            header($header);
-        } else {
-            $modx->unlockElement(6, $id);
-            $header = "Location: index.php?a=106&r=2";
-            header($header);
-        }
-        break;
-    default:
-        $modx->webAlertAndQuit("No operation set in request.");
+        case '107':
+            // invoke OnBeforeModFormSave event
+            $modx->invokeEvent("OnBeforeModFormSave", array(
+                    "mode" => "new",
+                    "id" => $id
+                ));
+
+            // disallow duplicate names for new modules
+            $rs = $modx->getDatabase()->select('count(id)', $modx->getDatabase()->getFullTableName('site_modules'), "name='{$name}'");
+            $count = $modx->getDatabase()->getValue($rs);
+            if ($count > 0) {
+                $modx->getManagerApi()->saveFormValues(107);
+                $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_module'], $name), "index.php?a=107");
+            }
+
+            // save the new module
+            $newid = $modx->getDatabase()->insert(array(
+                'name' => $name,
+                'description' => $description,
+                'disabled' => $disabled,
+                'wrap' => $wrap,
+                'locked' => $locked,
+                'icon' => $icon,
+                'resourcefile' => $resourcefile,
+                'enable_resource' => $enable_resource,
+                'category' => $categoryid,
+                'enable_sharedparams' => $enable_sharedparams,
+                'guid' => $guid,
+                'modulecode' => $modulecode,
+                'properties' => $properties,
+                'createdon' => $currentdate,
+                'editedon' => $currentdate
+            ), $modx->getDatabase()->getFullTableName('site_modules'));
+
+            // save user group access permissions
+            saveUserGroupAccessPermissons();
+
+            // invoke OnModFormSave event
+            $modx->invokeEvent("OnModFormSave", array(
+                    "mode" => "new",
+                    "id" => $newid
+                ));
+
+            // Set the item name for logger
+            $_SESSION['itemname'] = $name;
+
+            // empty cache
+            $modx->clearCache('full');
+
+            // finished emptying cache - redirect
+            if ($_POST['stay'] != '') {
+                $a = ($_POST['stay'] == '2') ? "108&id=$newid" : "107";
+                $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+                header($header);
+            } else {
+                $header = "Location: index.php?a=106&r=2";
+                header($header);
+            }
+            break;
+        case '108':
+            // invoke OnBeforeModFormSave event
+            $modx->invokeEvent("OnBeforeModFormSave", array(
+                    "mode" => "upd",
+                    "id" => $id
+                ));
+
+            // disallow duplicate names for new modules
+            $rs = $modx->getDatabase()->select('count(id)', $modx->getDatabase()->getFullTableName('site_modules'), "name='{$name}' AND id!='{$id}'");
+            if ($modx->getDatabase()->getValue($rs) > 0) {
+                $modx->getManagerApi()->saveFormValues(108);
+                $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_module'], $name), "index.php?a=108&id={$id}");
+            }
+
+            // save the edited module
+            $modx->getDatabase()->update(array(
+                'name' => $name,
+                'description' => $description,
+                'icon' => $icon,
+                'enable_resource' => $enable_resource,
+                'resourcefile' => $resourcefile,
+                'disabled' => $disabled,
+                'wrap' => $wrap,
+                'locked' => $locked,
+                'category' => $categoryid,
+                'enable_sharedparams' => $enable_sharedparams,
+                'guid' => $guid,
+                'modulecode' => $modulecode,
+                'properties' => $properties,
+                'editedon' => $currentdate
+            ), $modx->getDatabase()->getFullTableName('site_modules'), "id='{$id}'");
+
+            // save user group access permissions
+            saveUserGroupAccessPermissons();
+
+            // invoke OnModFormSave event
+            $modx->invokeEvent("OnModFormSave", array(
+                    "mode" => "upd",
+                    "id" => $id
+                ));
+
+            // Set the item name for logger
+            $_SESSION['itemname'] = $name;
+
+            // empty cache
+            $modx->clearCache('full');
+
+            // finished emptying cache - redirect
+            if ($_POST['stay'] != '') {
+                $a = ($_POST['stay'] == '2') ? "108&id=$id" : "107";
+                $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+                header($header);
+            } else {
+                $modx->unlockElement(6, $id);
+                $header = "Location: index.php?a=106&r=2";
+                header($header);
+            }
+            break;
+        default:
+            $modx->webAlertAndQuit("No operation set in request.");
 }

manager/actions/mutate_module_resources.dynamic.php

Indentation +85 added lines, -85 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
 if(!$modx->hasPermission('edit_module')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
@@ -26,91 +26,91 @@ 
 // check to see the  editor isn't locked
 $rs = $modx->getDatabase()->select('username', $tbl_active_users, "action=108 AND id='{$id}' AND internalKey!='" . $modx->getLoginUserID() . "'");
 if($username = $modx->getDatabase()->getValue($rs)) {
-	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $username, 'module'));
+    $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $username, 'module'));
 }
 // end check for lock
 
 // take action
 switch($_REQUEST['op']) {
-	case 'add':
-		// convert ids to numbers
-		$opids = array_filter(array_map('intval', explode(',', $_REQUEST['newids'])));
-
-		if(count($opids) > 0) {
-			// 1-snips, 2-tpls, 3-tvs, 4-chunks, 5-plugins, 6-docs
-			$rt = strtolower($_REQUEST["rt"]);
-			if($rt == 'chunk') {
-				$type = 10;
-			}
-			if($rt == 'doc') {
-				$type = 20;
-			}
-			if($rt == 'plug') {
-				$type = 30;
-			}
-			if($rt == 'snip') {
-				$type = 40;
-			}
-			if($rt == 'tpl') {
-				$type = 50;
-			}
-			if($rt == 'tv') {
-				$type = 60;
-			}
-			$modx->getDatabase()->delete($tbl_site_module_depobj, "module='{$id}' AND resource IN (" . implode(',', $opids) . ") AND type='{$type}'");
-			foreach($opids as $opid) {
-				$modx->getDatabase()->insert(array(
-					'module' => $id,
-					'resource' => $opid,
-					'type' => $type,
-				), $tbl_site_module_depobj);
-			}
-		}
-		break;
-	case 'del':
-		// convert ids to numbers
-		$opids = array_filter(array_map('intval', $_REQUEST['depid']));
-
-		// get resources that needs to be removed
-		$ds = $modx->getDatabase()->select('*', $tbl_site_module_depobj, "id IN (" . implode(",", $opids) . ")");
-		// loop through resources and look for plugins and snippets
-		$plids = array();
-		$snid = array();
-		while($row = $modx->getDatabase()->getRow($ds)) {
-			if($row['type'] == '30') {
-				$plids[$i] = $row['resource'];
-			}
-			if($row['type'] == '40') {
-				$snids[$i] = $row['resource'];
-			}
-		}
-		// get guid
-		$ds = $modx->getDatabase()->select('guid', $tbl_site_modules, "id='{$id}'");
-		$guid = $modx->getDatabase()->getValue($ds);
-		// reset moduleguid for deleted resources
-		if(($cp = count($plids)) || ($cs = count($snids))) {
-			if($cp) {
-				$modx->getDatabase()->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (" . implode(',', $plids) . ") AND moduleguid='{$guid}'");
-			}
-			if($cs) {
-				$modx->getDatabase()->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (" . implode(',', $snids) . ") AND moduleguid='{$guid}'");
-			}
-			// reset cache
-			$modx->clearCache('full');
-		}
-		$modx->getDatabase()->delete($tbl_site_module_depobj, "id IN (" . implode(',', $opids) . ")");
-		break;
+    case 'add':
+        // convert ids to numbers
+        $opids = array_filter(array_map('intval', explode(',', $_REQUEST['newids'])));
+
+        if(count($opids) > 0) {
+            // 1-snips, 2-tpls, 3-tvs, 4-chunks, 5-plugins, 6-docs
+            $rt = strtolower($_REQUEST["rt"]);
+            if($rt == 'chunk') {
+                $type = 10;
+            }
+            if($rt == 'doc') {
+                $type = 20;
+            }
+            if($rt == 'plug') {
+                $type = 30;
+            }
+            if($rt == 'snip') {
+                $type = 40;
+            }
+            if($rt == 'tpl') {
+                $type = 50;
+            }
+            if($rt == 'tv') {
+                $type = 60;
+            }
+            $modx->getDatabase()->delete($tbl_site_module_depobj, "module='{$id}' AND resource IN (" . implode(',', $opids) . ") AND type='{$type}'");
+            foreach($opids as $opid) {
+                $modx->getDatabase()->insert(array(
+                    'module' => $id,
+                    'resource' => $opid,
+                    'type' => $type,
+                ), $tbl_site_module_depobj);
+            }
+        }
+        break;
+    case 'del':
+        // convert ids to numbers
+        $opids = array_filter(array_map('intval', $_REQUEST['depid']));
+
+        // get resources that needs to be removed
+        $ds = $modx->getDatabase()->select('*', $tbl_site_module_depobj, "id IN (" . implode(",", $opids) . ")");
+        // loop through resources and look for plugins and snippets
+        $plids = array();
+        $snid = array();
+        while($row = $modx->getDatabase()->getRow($ds)) {
+            if($row['type'] == '30') {
+                $plids[$i] = $row['resource'];
+            }
+            if($row['type'] == '40') {
+                $snids[$i] = $row['resource'];
+            }
+        }
+        // get guid
+        $ds = $modx->getDatabase()->select('guid', $tbl_site_modules, "id='{$id}'");
+        $guid = $modx->getDatabase()->getValue($ds);
+        // reset moduleguid for deleted resources
+        if(($cp = count($plids)) || ($cs = count($snids))) {
+            if($cp) {
+                $modx->getDatabase()->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (" . implode(',', $plids) . ") AND moduleguid='{$guid}'");
+            }
+            if($cs) {
+                $modx->getDatabase()->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (" . implode(',', $snids) . ") AND moduleguid='{$guid}'");
+            }
+            // reset cache
+            $modx->clearCache('full');
+        }
+        $modx->getDatabase()->delete($tbl_site_module_depobj, "id IN (" . implode(',', $opids) . ")");
+        break;
 }
 
 // load record
 $rs = $modx->getDatabase()->select('*', $tbl_site_modules, "id = '{$id}'");
 $content = $modx->getDatabase()->getRow($rs);
 if(!$content) {
-	$modx->webAlertAndQuit("Module not found for id '{$id}'.");
+    $modx->webAlertAndQuit("Module not found for id '{$id}'.");
 }
 $_SESSION['itemname'] = $content['name'];
 if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 ?>
@@ -203,7 +203,7 @@ 
 				<tr>
 					<td valign="top" align="left">
 						<?php
-						$ds = $modx->getDatabase()->select("smd.id,COALESCE(ss.name,st.templatename,sv.name,sc.name,sp.name,sd.pagetitle) as name,
+                        $ds = $modx->getDatabase()->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'
@@ -218,17 +218,17 @@ 
 					LEFT JOIN {$tbl_site_snippets} AS ss ON ss.id = smd.resource AND smd.type = '40'
 					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");
-						$grd = new \EvolutionCMS\Support\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->colTypes = "template:<input type='checkbox' name='depid[]' value='[+id+]'> [+value+]";
-						$grd->fields = "name,type";
-						echo $grd->render();
-						?>
+                        $grd = new \EvolutionCMS\Support\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->colTypes = "template:<input type='checkbox' name='depid[]' value='[+id+]'> [+value+]";
+                        $grd->fields = "name,type";
+                        echo $grd->render();
+                        ?>
 					</td>
 					<td valign="top" style="width: 150px;">
 						<a class="btn btn-block btn-danger text-left" style="margin-bottom:10px;" href="javascript:;" onclick="removeDependencies();return false;"><i class="<?php echo $_style["actions_delete"] ?>"></i> <?php echo $_lang['remove']; ?></a>

Spacing +30 added lines, -30 removed lines

@@ -1,13 +1,13 @@ 
 <?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('edit_module')) {
+if (!$modx->hasPermission('edit_module')) {
 	$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_active_users = $modx->getDatabase()->getFullTableName('active_users');
@@ -24,41 +24,41 @@ 
 $modx->getManagerApi()->initPageViewState();
 
 // check to see the  editor isn't locked
-$rs = $modx->getDatabase()->select('username', $tbl_active_users, "action=108 AND id='{$id}' AND internalKey!='" . $modx->getLoginUserID() . "'");
-if($username = $modx->getDatabase()->getValue($rs)) {
+$rs = $modx->getDatabase()->select('username', $tbl_active_users, "action=108 AND id='{$id}' AND internalKey!='".$modx->getLoginUserID()."'");
+if ($username = $modx->getDatabase()->getValue($rs)) {
 	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $username, 'module'));
 }
 // end check for lock
 
 // take action
-switch($_REQUEST['op']) {
+switch ($_REQUEST['op']) {
 	case 'add':
 		// convert ids to numbers
 		$opids = array_filter(array_map('intval', explode(',', $_REQUEST['newids'])));
 
-		if(count($opids) > 0) {
+		if (count($opids) > 0) {
 			// 1-snips, 2-tpls, 3-tvs, 4-chunks, 5-plugins, 6-docs
 			$rt = strtolower($_REQUEST["rt"]);
-			if($rt == 'chunk') {
+			if ($rt == 'chunk') {
 				$type = 10;
 			}
-			if($rt == 'doc') {
+			if ($rt == 'doc') {
 				$type = 20;
 			}
-			if($rt == 'plug') {
+			if ($rt == 'plug') {
 				$type = 30;
 			}
-			if($rt == 'snip') {
+			if ($rt == 'snip') {
 				$type = 40;
 			}
-			if($rt == 'tpl') {
+			if ($rt == 'tpl') {
 				$type = 50;
 			}
-			if($rt == 'tv') {
+			if ($rt == 'tv') {
 				$type = 60;
 			}
-			$modx->getDatabase()->delete($tbl_site_module_depobj, "module='{$id}' AND resource IN (" . implode(',', $opids) . ") AND type='{$type}'");
-			foreach($opids as $opid) {
+			$modx->getDatabase()->delete($tbl_site_module_depobj, "module='{$id}' AND resource IN (".implode(',', $opids).") AND type='{$type}'");
+			foreach ($opids as $opid) {
 				$modx->getDatabase()->insert(array(
 					'module' => $id,
 					'resource' => $opid,
@@ -72,15 +72,15 @@ 
 		$opids = array_filter(array_map('intval', $_REQUEST['depid']));
 
 		// get resources that needs to be removed
-		$ds = $modx->getDatabase()->select('*', $tbl_site_module_depobj, "id IN (" . implode(",", $opids) . ")");
+		$ds = $modx->getDatabase()->select('*', $tbl_site_module_depobj, "id IN (".implode(",", $opids).")");
 		// loop through resources and look for plugins and snippets
 		$plids = array();
 		$snid = array();
-		while($row = $modx->getDatabase()->getRow($ds)) {
-			if($row['type'] == '30') {
+		while ($row = $modx->getDatabase()->getRow($ds)) {
+			if ($row['type'] == '30') {
 				$plids[$i] = $row['resource'];
 			}
-			if($row['type'] == '40') {
+			if ($row['type'] == '40') {
 				$snids[$i] = $row['resource'];
 			}
 		}
@@ -88,28 +88,28 @@ 
 		$ds = $modx->getDatabase()->select('guid', $tbl_site_modules, "id='{$id}'");
 		$guid = $modx->getDatabase()->getValue($ds);
 		// reset moduleguid for deleted resources
-		if(($cp = count($plids)) || ($cs = count($snids))) {
-			if($cp) {
-				$modx->getDatabase()->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (" . implode(',', $plids) . ") AND moduleguid='{$guid}'");
+		if (($cp = count($plids)) || ($cs = count($snids))) {
+			if ($cp) {
+				$modx->getDatabase()->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (".implode(',', $plids).") AND moduleguid='{$guid}'");
 			}
-			if($cs) {
-				$modx->getDatabase()->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (" . implode(',', $snids) . ") AND moduleguid='{$guid}'");
+			if ($cs) {
+				$modx->getDatabase()->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (".implode(',', $snids).") AND moduleguid='{$guid}'");
 			}
 			// reset cache
 			$modx->clearCache('full');
 		}
-		$modx->getDatabase()->delete($tbl_site_module_depobj, "id IN (" . implode(',', $opids) . ")");
+		$modx->getDatabase()->delete($tbl_site_module_depobj, "id IN (".implode(',', $opids).")");
 		break;
 }
 
 // load record
 $rs = $modx->getDatabase()->select('*', $tbl_site_modules, "id = '{$id}'");
 $content = $modx->getDatabase()->getRow($rs);
-if(!$content) {
+if (!$content) {
 	$modx->webAlertAndQuit("Module not found for id '{$id}'.");
 }
 $_SESSION['itemname'] = $content['name'];
-if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
+if ($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -188,13 +188,13 @@ 
 	<input type="hidden" name="id" value="<?php echo $content['id']; ?>" />
 
 	<h1>
-		<i class="fa fa-cogs"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['module_resource_title']) ?>
+		<i class="fa fa-cogs"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['module_resource_title']) ?>
 	</h1>
 
 	<?php echo ManagerTheme::getStyle('actionbuttons.dynamic.close') ?>
 
 	<div class="section">
-		<div class="sectionHeader"><?php echo $content["name"] . " - " . $_lang['module_resource_title']; ?></div>
+		<div class="sectionHeader"><?php echo $content["name"]." - ".$_lang['module_resource_title']; ?></div>
 		<div class="sectionBody">
 			<p><?php echo $_lang['module_resource_msg']; ?></p>
 			<br />
@@ -224,7 +224,7 @@ 
 						$grd->columnHeaderClass = "gridHeader";
 						$grd->itemClass = "gridItem";
 						$grd->altItemClass = "gridAltItem";
-						$grd->columns = $_lang["element_name"] . " ," . $_lang["type"];
+						$grd->columns = $_lang["element_name"]." ,".$_lang["type"];
 						$grd->colTypes = "template:<input type='checkbox' name='depid[]' value='[+id+]'> [+value+]";
 						$grd->fields = "name,type";
 						echo $grd->render();

manager/actions/resource_selector.static.php

Spacing +5 added lines, -5 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.");
 }
 if (!$modx->hasPermission('edit_module')) {
@@ -63,7 +63,7 @@ 
 
 }
 
-include_once MODX_MANAGER_PATH . "includes/header.inc.php";
+include_once MODX_MANAGER_PATH."includes/header.inc.php";
 ?>
 <script language="JavaScript" type="text/javascript">
     function saveSelection()
@@ -138,7 +138,7 @@ 
 </script>
 
 <h1>
-    <?= $title . " - " . $_lang['element_selector_title'] ?><i class="fa fa-question-circle help"></i>
+    <?= $title." - ".$_lang['element_selector_title'] ?><i class="fa fa-question-circle help"></i>
 </h1>
 
 <div id="actions">
@@ -183,8 +183,8 @@ 
                     $grd->columnHeaderClass = "tableHeader";
                     $grd->itemClass = "tableItem";
                     $grd->altItemClass = "tableAltItem";
-                    $grd->columns = $_lang["name"] . " ," . $_lang["description"];
-                    $grd->colTypes = "template:<input type='" . ($sm == 'm' ? 'checkbox' : 'radio') . "' name='id[]' value='[+id+]' onclick='setCheckbox(this);'> [+value+]";
+                    $grd->columns = $_lang["name"]." ,".$_lang["description"];
+                    $grd->colTypes = "template:<input type='".($sm == 'm' ? 'checkbox' : 'radio')."' name='id[]' value='[+id+]' onclick='setCheckbox(this);'> [+value+]";
                     $grd->colWidths = "45%";
                     $grd->fields = "name,description";
                     if ($_REQUEST['listmode'] == '1') {

manager/processors/duplicate_module.processor.php

Indentation +30 added lines, -30 removed lines

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

Spacing +6 added lines, -6 removed lines

@@ -1,19 +1,19 @@ 
 <?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('new_module')) {
+if (!$modx->hasPermission('new_module')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 // count duplicates
 $name = $modx->getDatabase()->getValue($modx->getDatabase()->select('name', $modx->getDatabase()->getFullTableName('site_modules'), "id='{$id}'"));
 $count = $modx->getDatabase()->getRecordCount($modx->getDatabase()->select('name', $modx->getDatabase()->getFullTableName('site_modules'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
+if ($count >= 1) $count = ' '.($count + 1);
 else $count = '';
 
 // duplicate module
@@ -58,5 +58,5 @@ 
 $_SESSION['itemname'] = $name;
 
 // finish duplicating - redirect to new module
-$header="Location: index.php?r=2&a=108&id=$newid";
+$header = "Location: index.php?r=2&a=108&id=$newid";
 header($header);

Braces +5 added lines, -2 removed lines

@@ -13,8 +13,11 @@
 // count duplicates
 $name = $modx->getDatabase()->getValue($modx->getDatabase()->select('name', $modx->getDatabase()->getFullTableName('site_modules'), "id='{$id}'"));
 $count = $modx->getDatabase()->getRecordCount($modx->getDatabase()->select('name', $modx->getDatabase()->getFullTableName('site_modules'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
-else $count = '';
+if($count>=1) {
+    $count = ' '.($count+1);
+} else {
+    $count = '';
+}
 
 // duplicate module
 $newid = $modx->getDatabase()->insert(

manager/processors/duplicate_template.processor.php

Indentation +15 added lines, -15 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('new_template')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
@@ -19,22 +19,22 @@ 
 
 // duplicate template
 $newid = $modx->getDatabase()->insert(
-	array(
-		'templatename'=>'',
-		'description'=>'',
-		'content'=>'',
-		'category'=>'',
-		), $modx->getDatabase()->getFullTableName('site_templates'), // Insert into
-	"CONCAT(templatename, ' {$_lang['duplicated_el_suffix']}{$count}') AS templatename, description, content, category", $modx->getDatabase()->getFullTableName('site_templates'), "id='{$id}'"); // Copy from
+    array(
+        'templatename'=>'',
+        'description'=>'',
+        'content'=>'',
+        'category'=>'',
+        ), $modx->getDatabase()->getFullTableName('site_templates'), // Insert into
+    "CONCAT(templatename, ' {$_lang['duplicated_el_suffix']}{$count}') AS templatename, description, content, category", $modx->getDatabase()->getFullTableName('site_templates'), "id='{$id}'"); // Copy from
 
 // duplicate TV values
 $modx->getDatabase()->insert(
-	array(
-		'tmplvarid'=>'',
-		'templateid'=>'',
-		'rank'=>'',
-		), $modx->getDatabase()->getFullTableName('site_tmplvar_templates'), // Insert into
-	"tmplvarid, '{$newid}', rank", $modx->getDatabase()->getFullTableName('site_tmplvar_templates'), "templateid='{$id}'"); // Copy from
+    array(
+        'tmplvarid'=>'',
+        'templateid'=>'',
+        'rank'=>'',
+        ), $modx->getDatabase()->getFullTableName('site_tmplvar_templates'), // Insert into
+    "tmplvarid, '{$newid}', rank", $modx->getDatabase()->getFullTableName('site_tmplvar_templates'), "templateid='{$id}'"); // Copy from
 
 // Set the item name for logger
 $name = $modx->getDatabase()->getValue($modx->getDatabase()->select('templatename', $modx->getDatabase()->getFullTableName('site_templates'), "id='{$newid}'"));

Spacing +6 added lines, -6 removed lines

@@ -1,20 +1,20 @@ 
 <?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('new_template')) {
+if (!$modx->hasPermission('new_template')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
 $name = $modx->getDatabase()->getValue($modx->getDatabase()->select('templatename', $modx->getDatabase()->getFullTableName('site_templates'), "id='{$id}'"));
 $count = $modx->getDatabase()->getRecordCount($modx->getDatabase()->select('templatename', $modx->getDatabase()->getFullTableName('site_templates'), "templatename LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
+if ($count >= 1) $count = ' '.($count + 1);
 else $count = '';
 
 // duplicate template
@@ -41,5 +41,5 @@ 
 $_SESSION['itemname'] = $name;
 
 // finish duplicating - redirect to new template
-$header="Location: index.php?r=2&a=16&id=$newid";
+$header = "Location: index.php?r=2&a=16&id=$newid";
 header($header);

Braces +5 added lines, -2 removed lines

@@ -14,8 +14,11 @@
 // count duplicates
 $name = $modx->getDatabase()->getValue($modx->getDatabase()->select('templatename', $modx->getDatabase()->getFullTableName('site_templates'), "id='{$id}'"));
 $count = $modx->getDatabase()->getRecordCount($modx->getDatabase()->select('templatename', $modx->getDatabase()->getFullTableName('site_templates'), "templatename LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
-else $count = '';
+if($count>=1) {
+    $count = ' '.($count+1);
+} else {
+    $count = '';
+}
 
 // duplicate template
 $newid = $modx->getDatabase()->insert(

manager/processors/save_template.processor.php

Switch Indentation +109 added lines, -109 removed lines

@@ -33,113 +33,113 @@
 }
 
 switch ($_POST['mode']) {
-    case '19':
-
-        // invoke OnBeforeTempFormSave event
-        $modx->invokeEvent("OnBeforeTempFormSave", array(
-            "mode" => "new",
-            "id" => $id
-        ));
-
-        // disallow duplicate names for new templates
-        $rs = $modx->getDatabase()->select('COUNT(id)', $modx->getDatabase()->getFullTableName('site_templates'), "templatename='{$templatename}'");
-        $count = $modx->getDatabase()->getValue($rs);
-        if ($count > 0) {
-            $modx->getManagerApi()->saveFormValues(19);
-            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['template'], $templatename), "index.php?a=19");
-        }
-
-        //do stuff to save the new doc
-        $newid = $modx->getDatabase()->insert(array(
-            'templatename' => $templatename,
-            'description' => $description,
-            'content' => $template,
-            'locked' => $locked,
-            'selectable' => $selectable,
-            'category' => $categoryid,
-            'createdon' => $currentdate,
-            'editedon' => $currentdate
-        ), $modx->getDatabase()->getFullTableName('site_templates'));
-
-        // invoke OnTempFormSave event
-        $modx->invokeEvent("OnTempFormSave", array(
-            "mode" => "new",
-            "id" => $newid
-        ));
-        // Set new assigned Tvs
-        saveTemplateAccess($newid);
-
-        // Set the item name for logger
-        $_SESSION['itemname'] = $templatename;
-
-        // empty cache
-        $modx->clearCache('full');
-
-        // finished emptying cache - redirect
-        if ($_POST['stay'] != '') {
-            $a = ($_POST['stay'] == '2') ? "16&id=$newid" : "19";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
-            header($header);
-        } else {
-            $header = "Location: index.php?a=76&r=2";
-            header($header);
-        }
-
-        break;
-    case '16':
-
-        // invoke OnBeforeTempFormSave event
-        $modx->invokeEvent("OnBeforeTempFormSave", array(
-            "mode" => "upd",
-            "id" => $id
-        ));
-
-        // disallow duplicate names for templates
-        $rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('site_templates'), "templatename='{$templatename}' AND id!='{$id}'");
-        $count = $modx->getDatabase()->getValue($rs);
-        if ($count > 0) {
-            $modx->getManagerApi()->saveFormValues(16);
-            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['template'], $templatename), "index.php?a=16&id={$id}");
-        }
-
-        //do stuff to save the edited doc
-        $modx->getDatabase()->update(array(
-            'templatename' => $templatename,
-            'description' => $description,
-            'content' => $template,
-            'locked' => $locked,
-            'selectable' => $selectable,
-            'category' => $categoryid,
-            'editedon' => $currentdate
-        ), $modx->getDatabase()->getFullTableName('site_templates'), "id='{$id}'");
-        // Set new assigned Tvs
-        saveTemplateAccess($id);
-
-        // invoke OnTempFormSave event
-        $modx->invokeEvent("OnTempFormSave", array(
-            "mode" => "upd",
-            "id" => $id
-        ));
-
-        // Set the item name for logger
-        $_SESSION['itemname'] = $templatename;
-
-        // first empty the cache
-        $modx->clearCache('full');
-
-        // finished emptying cache - redirect
-        if ($_POST['stay'] != '') {
-            $a = ($_POST['stay'] == '2') ? "16&id=$id" : "19";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
-            header($header);
-        } else {
-            $modx->unlockElement(1, $id);
-            $header = "Location: index.php?a=76&r=2";
-            header($header);
-        }
-
-
-        break;
-    default:
-        $modx->webAlertAndQuit("No operation set in request.");
+        case '19':
+
+            // invoke OnBeforeTempFormSave event
+            $modx->invokeEvent("OnBeforeTempFormSave", array(
+                "mode" => "new",
+                "id" => $id
+            ));
+
+            // disallow duplicate names for new templates
+            $rs = $modx->getDatabase()->select('COUNT(id)', $modx->getDatabase()->getFullTableName('site_templates'), "templatename='{$templatename}'");
+            $count = $modx->getDatabase()->getValue($rs);
+            if ($count > 0) {
+                $modx->getManagerApi()->saveFormValues(19);
+                $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['template'], $templatename), "index.php?a=19");
+            }
+
+            //do stuff to save the new doc
+            $newid = $modx->getDatabase()->insert(array(
+                'templatename' => $templatename,
+                'description' => $description,
+                'content' => $template,
+                'locked' => $locked,
+                'selectable' => $selectable,
+                'category' => $categoryid,
+                'createdon' => $currentdate,
+                'editedon' => $currentdate
+            ), $modx->getDatabase()->getFullTableName('site_templates'));
+
+            // invoke OnTempFormSave event
+            $modx->invokeEvent("OnTempFormSave", array(
+                "mode" => "new",
+                "id" => $newid
+            ));
+            // Set new assigned Tvs
+            saveTemplateAccess($newid);
+
+            // Set the item name for logger
+            $_SESSION['itemname'] = $templatename;
+
+            // empty cache
+            $modx->clearCache('full');
+
+            // finished emptying cache - redirect
+            if ($_POST['stay'] != '') {
+                $a = ($_POST['stay'] == '2') ? "16&id=$newid" : "19";
+                $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+                header($header);
+            } else {
+                $header = "Location: index.php?a=76&r=2";
+                header($header);
+            }
+
+            break;
+        case '16':
+
+            // invoke OnBeforeTempFormSave event
+            $modx->invokeEvent("OnBeforeTempFormSave", array(
+                "mode" => "upd",
+                "id" => $id
+            ));
+
+            // disallow duplicate names for templates
+            $rs = $modx->getDatabase()->select('COUNT(*)', $modx->getDatabase()->getFullTableName('site_templates'), "templatename='{$templatename}' AND id!='{$id}'");
+            $count = $modx->getDatabase()->getValue($rs);
+            if ($count > 0) {
+                $modx->getManagerApi()->saveFormValues(16);
+                $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['template'], $templatename), "index.php?a=16&id={$id}");
+            }
+
+            //do stuff to save the edited doc
+            $modx->getDatabase()->update(array(
+                'templatename' => $templatename,
+                'description' => $description,
+                'content' => $template,
+                'locked' => $locked,
+                'selectable' => $selectable,
+                'category' => $categoryid,
+                'editedon' => $currentdate
+            ), $modx->getDatabase()->getFullTableName('site_templates'), "id='{$id}'");
+            // Set new assigned Tvs
+            saveTemplateAccess($id);
+
+            // invoke OnTempFormSave event
+            $modx->invokeEvent("OnTempFormSave", array(
+                "mode" => "upd",
+                "id" => $id
+            ));
+
+            // Set the item name for logger
+            $_SESSION['itemname'] = $templatename;
+
+            // first empty the cache
+            $modx->clearCache('full');
+
+            // finished emptying cache - redirect
+            if ($_POST['stay'] != '') {
+                $a = ($_POST['stay'] == '2') ? "16&id=$id" : "19";
+                $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+                header($header);
+            } else {
+                $modx->unlockElement(1, $id);
+                $header = "Location: index.php?a=76&r=2";
+                header($header);
+            }
+
+
+            break;
+        default:
+            $modx->webAlertAndQuit("No operation set in request.");
 }

Spacing +7 added lines, -7 removed lines

@@ -1,27 +1,27 @@ 
 <?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('save_template')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = (int)$_POST['id'];
+$id = (int) $_POST['id'];
 $template = $modx->getDatabase()->escape($_POST['post']);
 $templatename = $modx->getDatabase()->escape(trim($_POST['templatename']));
 $description = $modx->getDatabase()->escape($_POST['description']);
 $locked = isset($_POST['locked']) && $_POST['locked'] == 'on' ? 1 : 0;
-$selectable = $id == $modx->config['default_template'] ? 1 :    // Force selectable
+$selectable = $id == $modx->config['default_template'] ? 1 : // Force selectable
     isset($_POST['selectable']) && $_POST['selectable'] == 'on' ? 1 : 0;
 $currentdate = time() + $modx->config['server_offset_time'];
 
 //Kyle Jaebker - added category support
 if (empty($_POST['newcategory']) && $_POST['categoryid'] > 0) {
-    $categoryid = (int)$_POST['categoryid'];
+    $categoryid = (int) $_POST['categoryid'];
 } elseif (empty($_POST['newcategory']) && $_POST['categoryid'] <= 0) {
     $categoryid = 0;
 } else {
-    include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+    include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
     $categoryid = checkCategory($_POST['newcategory']);
     if (!$categoryid) {
         $categoryid = newCategory($_POST['newcategory']);
@@ -78,7 +78,7 @@ 
         // finished emptying cache - redirect
         if ($_POST['stay'] != '') {
             $a = ($_POST['stay'] == '2') ? "16&id=$newid" : "19";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+            $header = "Location: index.php?a=".$a."&r=2&stay=".$_POST['stay'];
             header($header);
         } else {
             $header = "Location: index.php?a=76&r=2";
@@ -130,7 +130,7 @@ 
         // finished emptying cache - redirect
         if ($_POST['stay'] != '') {
             $a = ($_POST['stay'] == '2') ? "16&id=$id" : "19";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+            $header = "Location: index.php?a=".$a."&r=2&stay=".$_POST['stay'];
             header($header);
         } else {
             $modx->unlockElement(1, $id);

manager/processors/publish_content.processor.php

Indentation +12 added lines, -12 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('save_document')||!$modx->hasPermission('publish_document')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id'])? (int)$_REQUEST['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /************webber ********/
@@ -32,20 +32,20 @@ 
 $udperms->role = $_SESSION['mgrRole'];
 
 if(!$udperms->checkPermissions()) {
-	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    $modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
 // update the document
 $modx->getDatabase()->update(
-	array(
-		'published'   => 1,
-		'pub_date'    => 0,
-		'unpub_date'  => 0,
-		'editedby'    => $modx->getLoginUserID(),
-		'editedon'    => time(),
-		'publishedby' => $modx->getLoginUserID(),
-		'publishedon' => time(),
-	), $modx->getDatabase()->getFullTableName('site_content'), "id='{$id}'");
+    array(
+        'published'   => 1,
+        'pub_date'    => 0,
+        'unpub_date'  => 0,
+        'editedby'    => $modx->getLoginUserID(),
+        'editedon'    => time(),
+        'publishedby' => $modx->getLoginUserID(),
+        'publishedon' => time(),
+    ), $modx->getDatabase()->getFullTableName('site_content'), "id='{$id}'");
 
 // invoke OnDocPublished  event
 $modx->invokeEvent("OnDocPublished",array("docid"=>$id));

Spacing +13 added lines, -13 removed lines

@@ -1,25 +1,25 @@ 
 <?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('save_document')||!$modx->hasPermission('publish_document')) {
+if (!$modx->hasPermission('save_document') || !$modx->hasPermission('publish_document')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id'])? (int)$_REQUEST['id'] : 0;
-if($id==0) {
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /************webber ********/
-$content=$modx->getDatabase()->getRow($modx->getDatabase()->select('parent, pagetitle', $modx->getDatabase()->getFullTableName('site_content'), "id='{$id}'"));
-$pid=($content['parent']==0?$id:$content['parent']);
+$content = $modx->getDatabase()->getRow($modx->getDatabase()->select('parent, pagetitle', $modx->getDatabase()->getFullTableName('site_content'), "id='{$id}'"));
+$pid = ($content['parent'] == 0 ? $id : $content['parent']);
 
 /************** webber *************/
-$sd=isset($_REQUEST['dir'])?'&dir='.$_REQUEST['dir']:'&dir=DESC';
-$sb=isset($_REQUEST['sort'])?'&sort='.$_REQUEST['sort']:'&sort=createdon';
-$pg=isset($_REQUEST['page'])?'&page='.(int)$_REQUEST['page']:'';
-$add_path=$sd.$sb.$pg;
+$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC';
+$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon';
+$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : '';
+$add_path = $sd.$sb.$pg;
 
 /***********************************/
 
@@ -31,7 +31,7 @@ 
 $udperms->document = $id;
 $udperms->role = $_SESSION['mgrRole'];
 
-if(!$udperms->checkPermissions()) {
+if (!$udperms->checkPermissions()) {
 	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
@@ -48,7 +48,7 @@ 
 	), $modx->getDatabase()->getFullTableName('site_content'), "id='{$id}'");
 
 // invoke OnDocPublished  event
-$modx->invokeEvent("OnDocPublished",array("docid"=>$id));
+$modx->invokeEvent("OnDocPublished", array("docid"=>$id));
 
 // Set the item name for logger
 $_SESSION['itemname'] = $content['pagetitle'];
@@ -56,6 +56,6 @@ 
 // empty cache
 $modx->clearCache('full');
 
-$header="Location: index.php?a=3&id=$pid&r=1".$add_path;
+$header = "Location: index.php?a=3&id=$pid&r=1".$add_path;
 
 header($header);