evolution-cms / evolution

manager/processors/execute_module.processor.php

Indentation +57 added lines, -57 removed lines

@@ -3,51 +3,51 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('exec_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"]);
 }
 
 // check if user has access permission, except admins
 if($_SESSION['mgrRole']!=1){
-	$rs = $modx->db->select(
-		'sma.usergroup,mg.member',
-		$modx->getFullTableName("site_module_access")." sma
+    $rs = $modx->db->select(
+        'sma.usergroup,mg.member',
+        $modx->getFullTableName("site_module_access")." sma
 			LEFT JOIN ".$modx->getFullTableName("member_groups")." mg ON mg.user_group = sma.usergroup AND member='".$modx->getLoginUserID()."'",
-		"sma.module = '{$id}'"
-		);
-	//initialize permission to -1, if it stays -1 no permissions
-	//attached so permission granted
-	$permissionAccessInt = -1;
+        "sma.module = '{$id}'"
+        );
+    //initialize permission to -1, if it stays -1 no permissions
+    //attached so permission granted
+    $permissionAccessInt = -1;
 
-	while ($row = $modx->db->getRow($rs)) {
-		if($row["usergroup"] && $row["member"]) {
-			//if there are permissions and this member has permission, ofcourse
-			//this is granted
-			$permissionAccessInt = 1;
-		} elseif ($permissionAccessInt==-1) {
-			//if there are permissions but this member has no permission and the
-			//variable was still in init state we set permission to 0; no permissions
-			$permissionAccessInt = 0;
-		}
-	}
+    while ($row = $modx->db->getRow($rs)) {
+        if($row["usergroup"] && $row["member"]) {
+            //if there are permissions and this member has permission, ofcourse
+            //this is granted
+            $permissionAccessInt = 1;
+        } elseif ($permissionAccessInt==-1) {
+            //if there are permissions but this member has no permission and the
+            //variable was still in init state we set permission to 0; no permissions
+            $permissionAccessInt = 0;
+        }
+    }
 
-	if($permissionAccessInt==0) {
-		$modx->webAlertAndQuit("You do not sufficient privileges to execute this module.", "index.php?a=106");
-	}
+    if($permissionAccessInt==0) {
+        $modx->webAlertAndQuit("You do not sufficient privileges to execute this module.", "index.php?a=106");
+    }
 }
 
 // get module data
 $rs = $modx->db->select('*', $modx->getFullTableName("site_modules"), "id='{$id}'");
 $content = $modx->db->getRow($rs);
 if(!$content) {
-	$modx->webAlertAndQuit("No record found for id {$id}.", "index.php?a=106");
+    $modx->webAlertAndQuit("No record found for id {$id}.", "index.php?a=106");
 }
 if($content['disabled']) {
-	$modx->webAlertAndQuit("This module is disabled and cannot be executed.", "index.php?a=106");
+    $modx->webAlertAndQuit("This module is disabled and cannot be executed.", "index.php?a=106");
 }
 
 // Set the item name for logger
@@ -71,38 +71,38 @@ 
  * @return string
  */
 function evalModule($moduleCode,$params){
-	global $modx;
-	$modx->event->params = &$params; // store params inside event object
-	if(is_array($params)) {
-		extract($params, EXTR_SKIP);
-	}
-	ob_start();
-	$mod = eval($moduleCode);
-	$msg = ob_get_contents();
-	ob_end_clean();
-	if (isset($php_errormsg))
-	{
-		$error_info = error_get_last();
+    global $modx;
+    $modx->event->params = &$params; // store params inside event object
+    if(is_array($params)) {
+        extract($params, EXTR_SKIP);
+    }
+    ob_start();
+    $mod = eval($moduleCode);
+    $msg = ob_get_contents();
+    ob_end_clean();
+    if (isset($php_errormsg))
+    {
+        $error_info = error_get_last();
         switch($error_info['type'])
         {
-        	case E_NOTICE :
-        		$error_level = 1;
-        	case E_USER_NOTICE :
-        		break;
-        	case E_DEPRECATED :
-        	case E_USER_DEPRECATED :
-        	case E_STRICT :
-        		$error_level = 2;
-        		break;
-        	default:
-        		$error_level = 99;
+            case E_NOTICE :
+                $error_level = 1;
+            case E_USER_NOTICE :
+                break;
+            case E_DEPRECATED :
+            case E_USER_DEPRECATED :
+            case E_STRICT :
+                $error_level = 2;
+                break;
+            default:
+                $error_level = 99;
+        }
+        if($modx->config['error_reporting']==='99' || 2<$error_level)
+        {
+            $modx->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], $_SESSION['itemname'] . ' - Module', $error_info['message'], $error_info['line'], $msg);
+            $modx->event->alert("An error occurred while loading. Please see the event log for more information<p>{$msg}</p>");
         }
-		if($modx->config['error_reporting']==='99' || 2<$error_level)
-		{
-			$modx->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], $_SESSION['itemname'] . ' - Module', $error_info['message'], $error_info['line'], $msg);
-			$modx->event->alert("An error occurred while loading. Please see the event log for more information<p>{$msg}</p>");
-		}
-	}
-	unset($modx->event->params);
-	return $mod.$msg;
+    }
+    unset($modx->event->params);
+    return $mod.$msg;
 }

manager/processors/move_document.processor.php

Indentation +65 added lines, -65 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('edit_document')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $newParentID = isset($_REQUEST['new_parent']) ? (int)$_REQUEST['new_parent'] : 0;
@@ -25,17 +25,17 @@ 
 // check user has permission to move document to chosen location
 
 if ($use_udperms == 1) {
-	if ($oldparent != $newParentID) {
-		include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
-		$udperms = new udperms();
-		$udperms->user = $modx->getLoginUserID();
-		$udperms->document = $newParentID;
-		$udperms->role = $_SESSION['mgrRole'];
-
-		 if (!$udperms->checkPermissions()) {
-			$modx->webAlertAndQuit($_lang["access_permission_parent_denied"]);
-		 }
-	}
+    if ($oldparent != $newParentID) {
+        include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
+        $udperms = new udperms();
+        $udperms->user = $modx->getLoginUserID();
+        $udperms->document = $newParentID;
+        $udperms->role = $_SESSION['mgrRole'];
+
+            if (!$udperms->checkPermissions()) {
+            $modx->webAlertAndQuit($_lang["access_permission_parent_denied"]);
+            }
+    }
 }
 
 /**
@@ -43,67 +43,67 @@ 
  * @return array
  */
 function allChildren($currDocID) {
-	global $modx;
-	$children= array();
-	$currDocID = $modx->db->escape($currDocID);
-	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent = '{$currDocID}'");
-	while ($child= $modx->db->getRow($rs)) {
-		$children[]= $child['id'];
-		$children= array_merge($children, allChildren($child['id']));
-	}
-	return $children;
+    global $modx;
+    $children= array();
+    $currDocID = $modx->db->escape($currDocID);
+    $rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent = '{$currDocID}'");
+    while ($child= $modx->db->getRow($rs)) {
+        $children[]= $child['id'];
+        $children= array_merge($children, allChildren($child['id']));
+    }
+    return $children;
 }
 
 $evtOut = $modx->invokeEvent("onBeforeMoveDocument", array (
-	"id_document" => $documentID,
-	"old_parent" => $oldparent,
-	"new_parent" => $newParentID
+    "id_document" => $documentID,
+    "old_parent" => $oldparent,
+    "new_parent" => $newParentID
 ));
 if (is_array($evtOut) && count($evtOut) > 0){
-	$newParent = array_pop($evtOut);
-	if($newParent == $oldparent) {
-		$modx->webAlertAndQuit($_lang["error_movedocument2"]);
-	}else{
-		$newParentID = $newParent;
-	}
+    $newParent = array_pop($evtOut);
+    if($newParent == $oldparent) {
+        $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+    }else{
+        $newParentID = $newParent;
+    }
 }
 
 $children = allChildren($documentID);
 if (!array_search($newParentID, $children)) {
-	$modx->db->update(array(
-		'isfolder' => 1,
-	), $modx->getFullTableName('site_content'), "id='{$newParentID}'");
-
-	$modx->db->update(array(
-		'parent'   => $newParentID,
-		'editedby' => $modx->getLoginUserID(),
-		'editedon' => time(),
-	), $modx->getFullTableName('site_content'), "id='{$documentID}'");
-
-	// finished moving the document, now check to see if the old_parent should no longer be a folder.
-	$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_content'), "parent='{$oldparent}'");
-	$limit = $modx->db->getValue($rs);
-
-	if(!$limit>0) {
-		$modx->db->update(array(
-			'isfolder' => 0,
-		), $modx->getFullTableName('site_content'), "id='{$oldparent}'");
-	}
-	// Set the item name for logger
-	$pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$documentID}'"));
-	$_SESSION['itemname'] = $pagetitle;
-
-	$modx->invokeEvent("onAfterMoveDocument", array (
-		"id_document" => $documentID,
-		"old_parent" => $oldparent,
-		"new_parent" => $newParentID
-	));
-
-	// empty cache & sync site
-	$modx->clearCache('full');
-
-	$header="Location: index.php?a=3&id={$documentID}&r=9";
-	header($header);
+    $modx->db->update(array(
+        'isfolder' => 1,
+    ), $modx->getFullTableName('site_content'), "id='{$newParentID}'");
+
+    $modx->db->update(array(
+        'parent'   => $newParentID,
+        'editedby' => $modx->getLoginUserID(),
+        'editedon' => time(),
+    ), $modx->getFullTableName('site_content'), "id='{$documentID}'");
+
+    // finished moving the document, now check to see if the old_parent should no longer be a folder.
+    $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_content'), "parent='{$oldparent}'");
+    $limit = $modx->db->getValue($rs);
+
+    if(!$limit>0) {
+        $modx->db->update(array(
+            'isfolder' => 0,
+        ), $modx->getFullTableName('site_content'), "id='{$oldparent}'");
+    }
+    // Set the item name for logger
+    $pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$documentID}'"));
+    $_SESSION['itemname'] = $pagetitle;
+
+    $modx->invokeEvent("onAfterMoveDocument", array (
+        "id_document" => $documentID,
+        "old_parent" => $oldparent,
+        "new_parent" => $newParentID
+    ));
+
+    // empty cache & sync site
+    $modx->clearCache('full');
+
+    $header="Location: index.php?a=3&id={$documentID}&r=9";
+    header($header);
 } else {
-	$modx->webAlertAndQuit("You cannot move a document to a child document!");
+    $modx->webAlertAndQuit("You cannot move a document to a child document!");
 }

manager/processors/save_web_user.processor.php

Indentation +277 added lines, -277 removed lines

@@ -1,9 +1,9 @@ 
 <?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('save_web_user')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $tbl_web_users = $modx->getFullTableName('web_users');
@@ -12,10 +12,10 @@ 
 
 $input = $_POST;
 foreach($input as $k => $v) {
-	if($k !== 'comment') {
-		$v = sanitize($v);
-	}
-	$input[$k] = $v;
+    if($k !== 'comment') {
+        $v = sanitize($v);
+    }
+    $input[$k] = $v;
 }
 
 $id = (int)$input['id'];
@@ -51,80 +51,80 @@ 
 
 // verify password
 if($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) {
-	webAlertAndQuit("Password typed is mismatched");
+    webAlertAndQuit("Password typed is mismatched");
 }
 
 // verify email
 if($email == '' || !preg_match("/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,24}$/i", $email)) {
-	webAlertAndQuit("E-mail address doesn't seem to be valid!");
+    webAlertAndQuit("E-mail address doesn't seem to be valid!");
 }
 
 switch($input['mode']) {
-	case '87' : // new user
-		// check if this user name already exist
-		$rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("User name is already in use!");
-		}
-
-		// check if the email address already exist
-		$rs = $modx->db->select('count(id)', $tbl_web_user_attributes, "email='{$esc_email}' AND id!='{$id}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("Email is already in use!");
-		}
-
-		// generate a new password for this user
-		if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-			if(strlen($specifiedpassword) < 6) {
-				webAlertAndQuit("Password is too short!");
-			} else {
-				$newpassword = $specifiedpassword;
-			}
-		} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
-			webAlertAndQuit("You didn't specify a password for this user!");
-		} elseif($passwordgenmethod == 'g') {
-			$newpassword = generate_password(8);
-		} else {
-			webAlertAndQuit("No password generation method specified!");
-		}
-
-		// invoke OnBeforeWUsrFormSave event
-		$modx->invokeEvent("OnBeforeWUsrFormSave", array(
-			"mode" => "new",
-		));
-
-		// create the user account
-		$field = array();
-		$field['username'] = $esc_newusername;
-		$field['password'] = md5($newpassword);
-		$internalKey = $modx->db->insert($field, $tbl_web_users);
-
-		$field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');
-		$field = $modx->db->escape($field);
-		$modx->db->insert($field, $tbl_web_user_attributes);
-
-		// Save User Settings
-		saveUserSettings($internalKey);
-
-		// Set the item name for logger
-		$_SESSION['itemname'] = $newusername;
-
-		/*******************************************************************************/
-		// put the user in the user_groups he/ she should be in
-		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
-					$f = array();
-					$f['webgroup'] = (int)$user_groups[$i];
-					$f['webuser'] = $internalKey;
-					$modx->db->insert($f, $tbl_web_groups);
-				}
-			}
-		}
-		// end of user_groups stuff!
+    case '87' : // new user
+        // check if this user name already exist
+        $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}'");
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("User name is already in use!");
+        }
+
+        // check if the email address already exist
+        $rs = $modx->db->select('count(id)', $tbl_web_user_attributes, "email='{$esc_email}' AND id!='{$id}'");
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("Email is already in use!");
+        }
+
+        // generate a new password for this user
+        if($specifiedpassword != "" && $passwordgenmethod == "spec") {
+            if(strlen($specifiedpassword) < 6) {
+                webAlertAndQuit("Password is too short!");
+            } else {
+                $newpassword = $specifiedpassword;
+            }
+        } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+            webAlertAndQuit("You didn't specify a password for this user!");
+        } elseif($passwordgenmethod == 'g') {
+            $newpassword = generate_password(8);
+        } else {
+            webAlertAndQuit("No password generation method specified!");
+        }
+
+        // invoke OnBeforeWUsrFormSave event
+        $modx->invokeEvent("OnBeforeWUsrFormSave", array(
+            "mode" => "new",
+        ));
+
+        // create the user account
+        $field = array();
+        $field['username'] = $esc_newusername;
+        $field['password'] = md5($newpassword);
+        $internalKey = $modx->db->insert($field, $tbl_web_users);
+
+        $field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');
+        $field = $modx->db->escape($field);
+        $modx->db->insert($field, $tbl_web_user_attributes);
+
+        // Save User Settings
+        saveUserSettings($internalKey);
+
+        // Set the item name for logger
+        $_SESSION['itemname'] = $newusername;
+
+        /*******************************************************************************/
+        // put the user in the user_groups he/ she should be in
+        // first, check that up_perms are switched on!
+        if($use_udperms == 1) {
+            if(!empty($user_groups)) {
+                for($i = 0; $i < count($user_groups); $i++) {
+                    $f = array();
+                    $f['webgroup'] = (int)$user_groups[$i];
+                    $f['webuser'] = $internalKey;
+                    $modx->db->insert($f, $tbl_web_groups);
+                }
+            }
+        }
+        // end of user_groups stuff!
 
         // invoke OnWebSaveUser event
         $modx->invokeEvent("OnWebSaveUser", array(
@@ -142,26 +142,26 @@ 
             "id" => $internalKey
         ));
 
-		if($passwordnotifymethod == 'e') {
-			sendMailMessage($email, $newusername, $newpassword, $fullname);
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
-				header($header);
-			} else {
-				$header = "Location: index.php?a=99&r=2";
-				header($header);
-			}
-		} else {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
-			} else {
-				$stayUrl = "index.php?a=99&r=2";
-			}
-
-			include_once "header.inc.php";
-			?>
+        if($passwordnotifymethod == 'e') {
+            sendMailMessage($email, $newusername, $newpassword, $fullname);
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
+                $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+                header($header);
+            } else {
+                $header = "Location: index.php?a=99&r=2";
+                header($header);
+            }
+        } else {
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
+                $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+            } else {
+                $stayUrl = "index.php?a=99&r=2";
+            }
+
+            include_once "header.inc.php";
+            ?>
 
 			<h1><?php echo $_lang['web_user_title']; ?></h1>
 
@@ -183,84 +183,84 @@ 
 			</div>
 			<?php
 
-			include_once "footer.inc.php";
-		}
-		break;
-	case '88' : // edit user
-		// generate a new password for this user
-		if($genpassword == 1) {
-			if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-				if(strlen($specifiedpassword) < 6) {
-					webAlertAndQuit("Password is too short!");
-				} else {
-					$newpassword = $specifiedpassword;
-				}
-			} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
-				webAlertAndQuit("You didn't specify a password for this user!");
-			} elseif($passwordgenmethod == 'g') {
-				$newpassword = generate_password(8);
-			} else {
-				webAlertAndQuit("No password generation method specified!");
-			}
-		}
-		if($passwordnotifymethod == 'e') {
-			sendMailMessage($email, $newusername, $newpassword, $fullname);
-		}
-
-		// check if the username already exist
-		$rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}' AND id!='{$id}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("User name is already in use!");
-		}
-
-		// check if the email address already exists
-		$rs = $modx->db->select('count(internalKey)', $tbl_web_user_attributes, "email='{$esc_email}' AND internalKey!='{$id}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("Email is already in use!");
-		}
-
-		// invoke OnBeforeWUsrFormSave event
-		$modx->invokeEvent("OnBeforeWUsrFormSave", array(
-			"mode" => "upd",
-			"id" => $id
-		));
-
-		// update user name and password
-		$field = array();
-		$field['username'] = $esc_newusername;
-		if($genpassword == 1) {
-			$field['password'] = md5($newpassword);
-		}
-		$modx->db->update($field, $tbl_web_users, "id='{$id}'");
-		$field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter');
-		$field = $modx->db->escape($field);
-		$modx->db->update($field, $tbl_web_user_attributes, "internalKey='{$id}'");
-
-		// Save User Settings
-		saveUserSettings($id);
-
-		// Set the item name for logger
-		$_SESSION['itemname'] = $newusername;
-
-		/*******************************************************************************/
-		// put the user in the user_groups he/ she should be in
-		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			// as this is an existing user, delete his/ her entries in the groups before saving the new groups
-			$modx->db->delete($tbl_web_groups, "webuser='{$id}'");
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
-					$field = array();
-					$field['webgroup'] = (int)$user_groups[$i];
-					$field['webuser'] = $id;
-					$modx->db->insert($field, $tbl_web_groups);
-				}
-			}
-		}
-		// end of user_groups stuff!
-		/*******************************************************************************/
+            include_once "footer.inc.php";
+        }
+        break;
+    case '88' : // edit user
+        // generate a new password for this user
+        if($genpassword == 1) {
+            if($specifiedpassword != "" && $passwordgenmethod == "spec") {
+                if(strlen($specifiedpassword) < 6) {
+                    webAlertAndQuit("Password is too short!");
+                } else {
+                    $newpassword = $specifiedpassword;
+                }
+            } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+                webAlertAndQuit("You didn't specify a password for this user!");
+            } elseif($passwordgenmethod == 'g') {
+                $newpassword = generate_password(8);
+            } else {
+                webAlertAndQuit("No password generation method specified!");
+            }
+        }
+        if($passwordnotifymethod == 'e') {
+            sendMailMessage($email, $newusername, $newpassword, $fullname);
+        }
+
+        // check if the username already exist
+        $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}' AND id!='{$id}'");
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("User name is already in use!");
+        }
+
+        // check if the email address already exists
+        $rs = $modx->db->select('count(internalKey)', $tbl_web_user_attributes, "email='{$esc_email}' AND internalKey!='{$id}'");
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("Email is already in use!");
+        }
+
+        // invoke OnBeforeWUsrFormSave event
+        $modx->invokeEvent("OnBeforeWUsrFormSave", array(
+            "mode" => "upd",
+            "id" => $id
+        ));
+
+        // update user name and password
+        $field = array();
+        $field['username'] = $esc_newusername;
+        if($genpassword == 1) {
+            $field['password'] = md5($newpassword);
+        }
+        $modx->db->update($field, $tbl_web_users, "id='{$id}'");
+        $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter');
+        $field = $modx->db->escape($field);
+        $modx->db->update($field, $tbl_web_user_attributes, "internalKey='{$id}'");
+
+        // Save User Settings
+        saveUserSettings($id);
+
+        // Set the item name for logger
+        $_SESSION['itemname'] = $newusername;
+
+        /*******************************************************************************/
+        // put the user in the user_groups he/ she should be in
+        // first, check that up_perms are switched on!
+        if($use_udperms == 1) {
+            // as this is an existing user, delete his/ her entries in the groups before saving the new groups
+            $modx->db->delete($tbl_web_groups, "webuser='{$id}'");
+            if(!empty($user_groups)) {
+                for($i = 0; $i < count($user_groups); $i++) {
+                    $field = array();
+                    $field['webgroup'] = (int)$user_groups[$i];
+                    $field['webuser'] = $id;
+                    $modx->db->insert($field, $tbl_web_groups);
+                }
+            }
+        }
+        // end of user_groups stuff!
+        /*******************************************************************************/
 
         // invoke OnWebSaveUser event
         $modx->invokeEvent("OnWebSaveUser", array(
@@ -289,16 +289,16 @@ 
             "id" => $id
         ));
 
-		if($genpassword == 1 && $passwordnotifymethod == 's') {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
-			} else {
-				$stayUrl = "index.php?a=99&r=2";
-			}
+        if($genpassword == 1 && $passwordnotifymethod == 's') {
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
+                $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+            } else {
+                $stayUrl = "index.php?a=99&r=2";
+            }
 
-			include_once "header.inc.php";
-			?>
+            include_once "header.inc.php";
+            ?>
 
 			<h1><?php echo $_lang['web_user_title']; ?></h1>
 
@@ -318,20 +318,20 @@ 
 			</div>
 			<?php
 
-			include_once "footer.inc.php";
-		} else {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
-				header($header);
-			} else {
-				$header = "Location: index.php?a=99&r=2";
-				header($header);
-			}
-		}
-		break;
-	default :
-		webAlertAndQuit("No operation set in request.");
+            include_once "footer.inc.php";
+        } else {
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
+                $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+                header($header);
+            } else {
+                $header = "Location: index.php?a=99&r=2";
+                header($header);
+            }
+        }
+        break;
+    default :
+        webAlertAndQuit("No operation set in request.");
 }
 
 /**
@@ -341,14 +341,14 @@ 
  * @return string
  */
 function save_user_quoted_printable($string) {
-	$crlf = "\n";
-	$string = preg_replace('!(\r\n|\r|\n)!', $crlf, $string) . $crlf;
-	$f[] = '/([\000-\010\013\014\016-\037\075\177-\377])/e';
-	$r[] = "'=' . sprintf('%02X', ord('\\1'))";
-	$f[] = '/([\011\040])' . $crlf . '/e';
-	$r[] = "'=' . sprintf('%02X', ord('\\1')) . '" . $crlf . "'";
-	$string = preg_replace($f, $r, $string);
-	return trim(wordwrap($string, 70, ' =' . $crlf));
+    $crlf = "\n";
+    $string = preg_replace('!(\r\n|\r|\n)!', $crlf, $string) . $crlf;
+    $f[] = '/([\000-\010\013\014\016-\037\075\177-\377])/e';
+    $r[] = "'=' . sprintf('%02X', ord('\\1'))";
+    $f[] = '/([\011\040])' . $crlf . '/e';
+    $r[] = "'=' . sprintf('%02X', ord('\\1')) . '" . $crlf . "'";
+    $string = preg_replace($f, $r, $string);
+    return trim(wordwrap($string, 70, ' =' . $crlf));
 }
 
 /**
@@ -360,94 +360,94 @@ 
  * @param string $ufn
  */
 function sendMailMessage($email, $uid, $pwd, $ufn) {
-	global $modx, $_lang, $websignupemail_message;
-	global $emailsubject, $emailsender;
-	global $site_name, $site_url;
-	$message = sprintf($websignupemail_message, $uid, $pwd); // use old method
-	// replace placeholders
-	$message = str_replace("[+uid+]", $uid, $message);
-	$message = str_replace("[+pwd+]", $pwd, $message);
-	$message = str_replace("[+ufn+]", $ufn, $message);
-	$message = str_replace("[+sname+]", $site_name, $message);
-	$message = str_replace("[+saddr+]", $emailsender, $message);
-	$message = str_replace("[+semail+]", $emailsender, $message);
-	$message = str_replace("[+surl+]", $site_url, $message);
-
-	$param = array();
-	$param['from'] = "{$site_name}<{$emailsender}>";
-	$param['subject'] = $emailsubject;
-	$param['body'] = $message;
-	$param['to'] = $email;
-	$param['type'] = 'text';
-	$rs = $modx->sendmail($param);
-	if(!$rs) {
-		$modx->manager->saveFormValues();
-		$modx->messageQuit("{$email} - {$_lang['error_sending_email']}");
-	}
+    global $modx, $_lang, $websignupemail_message;
+    global $emailsubject, $emailsender;
+    global $site_name, $site_url;
+    $message = sprintf($websignupemail_message, $uid, $pwd); // use old method
+    // replace placeholders
+    $message = str_replace("[+uid+]", $uid, $message);
+    $message = str_replace("[+pwd+]", $pwd, $message);
+    $message = str_replace("[+ufn+]", $ufn, $message);
+    $message = str_replace("[+sname+]", $site_name, $message);
+    $message = str_replace("[+saddr+]", $emailsender, $message);
+    $message = str_replace("[+semail+]", $emailsender, $message);
+    $message = str_replace("[+surl+]", $site_url, $message);
+
+    $param = array();
+    $param['from'] = "{$site_name}<{$emailsender}>";
+    $param['subject'] = $emailsubject;
+    $param['body'] = $message;
+    $param['to'] = $email;
+    $param['type'] = 'text';
+    $rs = $modx->sendmail($param);
+    if(!$rs) {
+        $modx->manager->saveFormValues();
+        $modx->messageQuit("{$email} - {$_lang['error_sending_email']}");
+    }
 }
 
 // Save User Settings
 function saveUserSettings($id) {
-	global $modx;
-	$tbl_web_user_settings = $modx->getFullTableName('web_user_settings');
-
-	$settings = array(
-		"login_home",
-		"allowed_ip",
-		"allowed_days"
-	);
-
-	$modx->db->delete($tbl_web_user_settings, "webuser='{$id}'");
-
-	foreach($settings as $n) {
-		$vl = $_POST[$n];
-		if(is_array($vl)) {
-			$vl = implode(",", $vl);
-		}
-		if($vl != '') {
-			$f = array();
-			$f['webuser'] = $id;
-			$f['setting_name'] = $n;
-			$f['setting_value'] = $vl;
-			$f = $modx->db->escape($f);
-			$modx->db->insert($f, $tbl_web_user_settings);
-		}
-	}
+    global $modx;
+    $tbl_web_user_settings = $modx->getFullTableName('web_user_settings');
+
+    $settings = array(
+        "login_home",
+        "allowed_ip",
+        "allowed_days"
+    );
+
+    $modx->db->delete($tbl_web_user_settings, "webuser='{$id}'");
+
+    foreach($settings as $n) {
+        $vl = $_POST[$n];
+        if(is_array($vl)) {
+            $vl = implode(",", $vl);
+        }
+        if($vl != '') {
+            $f = array();
+            $f['webuser'] = $id;
+            $f['setting_name'] = $n;
+            $f['setting_value'] = $vl;
+            $f = $modx->db->escape($f);
+            $modx->db->insert($f, $tbl_web_user_settings);
+        }
+    }
 }
 
 // Web alert -  sends an alert to web browser
 function webAlertAndQuit($msg) {
-	global $id, $modx;
-	$mode = $_POST['mode'];
-	$modx->manager->saveFormValues($mode);
-	$modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '88' ? "&id={$id}" : ''));
+    global $id, $modx;
+    $mode = $_POST['mode'];
+    $modx->manager->saveFormValues($mode);
+    $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '88' ? "&id={$id}" : ''));
 }
 
 // Generate password
 function generate_password($length = 10) {
-	$allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
-	$ps_len = strlen($allowable_characters);
-	mt_srand((double) microtime() * 1000000);
-	$pass = "";
-	for($i = 0; $i < $length; $i++) {
-		$pass .= $allowable_characters[mt_rand(0, $ps_len - 1)];
-	}
-	return $pass;
+    $allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
+    $ps_len = strlen($allowable_characters);
+    mt_srand((double) microtime() * 1000000);
+    $pass = "";
+    for($i = 0; $i < $length; $i++) {
+        $pass .= $allowable_characters[mt_rand(0, $ps_len - 1)];
+    }
+    return $pass;
 }
 
 function sanitize($str = '', $safecount = 0) {
-	global $modx;
-	$safecount++;
-	if(1000 < $safecount) {
-		exit("error too many loops '{$safecount}'");
-	}
-	if(is_array($str)) {
-		foreach($str as $i => $v) {
-			$str[$i] = sanitize($v, $safecount);
-		}
-	} else {
-		// $str = strip_tags($str); // LEAVE < and > intact
-		$str = htmlspecialchars($str, ENT_NOQUOTES, $modx->config['modx_charset']);
-	}
-	return $str;
+    global $modx;
+    $safecount++;
+    if(1000 < $safecount) {
+        exit("error too many loops '{$safecount}'");
+    }
+    if(is_array($str)) {
+        foreach($str as $i => $v) {
+            $str[$i] = sanitize($v, $safecount);
+        }
+    } else {
+        // $str = strip_tags($str); // LEAVE < and > intact
+        $str = htmlspecialchars($str, ENT_NOQUOTES, $modx->config['modx_charset']);
+    }
+    return $str;
 }

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

Indentation +1 added lines, -1 removed lines

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

manager/processors/save_content.processor.php

Indentation +1 added lines, -1 removed lines

@@ -492,7 +492,7 @@
                 }elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) {
                 $publishedon = $pub_date;
                 $publishedby = $modx->getLoginUserID();
-                   }elseif ($was_published && !$published) {
+                    }elseif ($was_published && !$published) {
                 $publishedon = 0;
                 $publishedby = 0;
             } else {

manager/frames/mainmenu.php

Indentation +325 added lines, -325 removed lines

@@ -4,237 +4,237 @@ 
 */

 

 $sitemenu['bars'] = array(

-	'bars',

-	'main',

-	'<i class="fa fa-bars"></i>',

-	'javascript:;',

-	$_lang['home'],

-	'modx.resizer.toggle(); return false;',

-	' return false;',

-	'',

-	0,

-	10,

-	''

+    'bars',

+    'main',

+    '<i class="fa fa-bars"></i>',

+    'javascript:;',

+    $_lang['home'],

+    'modx.resizer.toggle(); return false;',

+    ' return false;',

+    '',

+    0,

+    10,

+    ''

 );

 

 //mainMenu

 $sitemenu['site'] = array(

-	'site',

-	'main',

-	'<i class="fa fa-tachometer"></i>' . $_lang['home'],

-	'index.php?a=2',

-	$_lang['home'],

-	'',

-	'',

-	'main',

-	0,

-	10,

-	'active'

+    'site',

+    'main',

+    '<i class="fa fa-tachometer"></i>' . $_lang['home'],

+    'index.php?a=2',

+    $_lang['home'],

+    '',

+    '',

+    'main',

+    0,

+    10,

+    'active'

 );

 

 if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {

-	$sitemenu['elements'] = array(

-		'elements',

-		'main',

-		'<i class="fa fa-th"></i>' . $_lang['elements'],

-		'javascript:;',

-		$_lang['elements'],

-		' return false;',

-		'',

-		'',

-		0,

-		20,

-		''

-	);

+    $sitemenu['elements'] = array(

+        'elements',

+        'main',

+        '<i class="fa fa-th"></i>' . $_lang['elements'],

+        'javascript:;',

+        $_lang['elements'],

+        ' return false;',

+        '',

+        '',

+        0,

+        20,

+        ''

+    );

 }

 

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

-	$sitemenu['modules'] = array(

-		'modules',

-		'main',

-		'<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['modules'],

-		'javascript:;',

-		$_lang['modules'],

-		' return false;',

-		'',

-		'',

-		0,

-		30,

-		''

-	);

+    $sitemenu['modules'] = array(

+        'modules',

+        'main',

+        '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['modules'],

+        'javascript:;',

+        $_lang['modules'],

+        ' return false;',

+        '',

+        '',

+        0,

+        30,

+        ''

+    );

 }

 

 if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {

-	$sitemenu['users'] = array(

-		'users',

-		'main',

-		'<i class="fa fa-users"></i>' . $_lang['users'],

-		'javascript:;',

-		$_lang['users'],

-		' return false;',

-		'edit_user',

-		'',

-		0,

-		40,

-		''

-	);

+    $sitemenu['users'] = array(

+        'users',

+        'main',

+        '<i class="fa fa-users"></i>' . $_lang['users'],

+        'javascript:;',

+        $_lang['users'],

+        ' return false;',

+        'edit_user',

+        '',

+        0,

+        40,

+        ''

+    );

 }

 

 if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {

-	$sitemenu['tools'] = array(

-		'tools',

-		'main',

-		'<i class="fa fa-wrench"></i>' . $_lang['tools'],

-		'javascript:;',

-		$_lang['tools'],

-		' return false;',

-		'',

-		'',

-		0,

-		50,

-		''

-	);

+    $sitemenu['tools'] = array(

+        'tools',

+        'main',

+        '<i class="fa fa-wrench"></i>' . $_lang['tools'],

+        'javascript:;',

+        $_lang['tools'],

+        ' return false;',

+        '',

+        '',

+        0,

+        50,

+        ''

+    );

 }

 

 $tab = 0;

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

-	$sitemenu['element_templates'] = array(

-		'element_templates',

-		'elements',

-		'<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=76&tab=' . $tab++,

-		$_lang['manage_templates'],

-		'',

-		'new_template,edit_template',

-		'main',

-		0,

-		10,

-		'dropdown-toggle'

-	);

+    $sitemenu['element_templates'] = array(

+        'element_templates',

+        'elements',

+        '<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=76&tab=' . $tab++,

+        $_lang['manage_templates'],

+        '',

+        'new_template,edit_template',

+        'main',

+        0,

+        10,

+        'dropdown-toggle'

+    );

 }

 if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {

-	$sitemenu['element_tplvars'] = array(

-		'element_tplvars',

-		'elements',

-		'<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=76&tab=' . $tab++,

-		$_lang['tmplvars'],

-		'',

-		'new_template,edit_template',

-		'main',

-		0,

-		20,

-		'dropdown-toggle'

-	);

+    $sitemenu['element_tplvars'] = array(

+        'element_tplvars',

+        'elements',

+        '<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=76&tab=' . $tab++,

+        $_lang['tmplvars'],

+        '',

+        'new_template,edit_template',

+        'main',

+        0,

+        20,

+        'dropdown-toggle'

+    );

 }

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

-	$sitemenu['element_htmlsnippets'] = array(

-		'element_htmlsnippets',

-		'elements',

-		'<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=76&tab=' . $tab++,

-		$_lang['manage_htmlsnippets'],

-		'',

-		'new_chunk,edit_chunk',

-		'main',

-		0,

-		30,

-		'dropdown-toggle'

-	);

+    $sitemenu['element_htmlsnippets'] = array(

+        'element_htmlsnippets',

+        'elements',

+        '<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=76&tab=' . $tab++,

+        $_lang['manage_htmlsnippets'],

+        '',

+        'new_chunk,edit_chunk',

+        'main',

+        0,

+        30,

+        'dropdown-toggle'

+    );

 }

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

-	$sitemenu['element_snippets'] = array(

-		'element_snippets',

-		'elements',

-		'<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=76&tab=' . $tab++,

-		$_lang['manage_snippets'],

-		'',

-		'new_snippet,edit_snippet',

-		'main',

-		0,

-		40,

-		'dropdown-toggle'

-	);

+    $sitemenu['element_snippets'] = array(

+        'element_snippets',

+        'elements',

+        '<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=76&tab=' . $tab++,

+        $_lang['manage_snippets'],

+        '',

+        'new_snippet,edit_snippet',

+        'main',

+        0,

+        40,

+        'dropdown-toggle'

+    );

 }

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

-	$sitemenu['element_plugins'] = array(

-		'element_plugins',

-		'elements',

-		'<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=76&tab=' . $tab++,

-		$_lang['manage_plugins'],

-		'',

-		'new_plugin,edit_plugin',

-		'main',

-		0,

-		50,

-		'dropdown-toggle'

-	);

+    $sitemenu['element_plugins'] = array(

+        'element_plugins',

+        'elements',

+        '<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=76&tab=' . $tab++,

+        $_lang['manage_plugins'],

+        '',

+        'new_plugin,edit_plugin',

+        'main',

+        0,

+        50,

+        'dropdown-toggle'

+    );

 }

 //$sitemenu['element_categories']     = array('element_categories','elements',$_lang['element_categories'],'index.php?a=76&tab=5',$_lang['element_categories'],'','new_template,edit_template,new_snippet,edit_snippet,new_chunk,edit_chunk,new_plugin,edit_plugin','main',1,60,'');

 

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

-	$sitemenu['manage_files'] = array(

-		'manage_files',

-		'elements',

-		'<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'],

-		'index.php?a=31',

-		$_lang['manage_files'],

-		'',

-		'file_manager',

-		'main',

-		0,

-		80,

-		''

-	);

+    $sitemenu['manage_files'] = array(

+        'manage_files',

+        'elements',

+        '<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'],

+        'index.php?a=31',

+        $_lang['manage_files'],

+        '',

+        'file_manager',

+        'main',

+        0,

+        80,

+        ''

+    );

 }

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

-	$sitemenu['manage_categories'] = array(

-		'manage_categories',

-		'elements',

-		'<i class="fa fa-object-group"></i>' . $_lang['manage_categories'],

-		'index.php?a=120',

-		$_lang['manage_categories'],

-		'',

-		'category_manager',

-		'main',

-		0,

-		70,

-		''

-	);

+    $sitemenu['manage_categories'] = array(

+        'manage_categories',

+        'elements',

+        '<i class="fa fa-object-group"></i>' . $_lang['manage_categories'],

+        'index.php?a=120',

+        $_lang['manage_categories'],

+        '',

+        'category_manager',

+        'main',

+        0,

+        70,

+        ''

+    );

 }

 

 // Modules Menu Items

 if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {

-	$sitemenu['new_module'] = array(

-		'new_module',

-		'modules',

-		'<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'],

-		'index.php?a=106',

-		$_lang['module_management'],

-		'',

-		'new_module,edit_module',

-		'main',

-		1,

-		0,

-		''

-	);

+    $sitemenu['new_module'] = array(

+        'new_module',

+        'modules',

+        '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'],

+        'index.php?a=106',

+        $_lang['module_management'],

+        '',

+        'new_module,edit_module',

+        'main',

+        1,

+        0,

+        ''

+    );

 }

 

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

-	if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

-		$rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member

+    if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

+        $rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member

 				FROM ' . $modx->getFullTableName('site_modules') . ' AS sm

 				LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id

 				LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group

                 WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1

                 ORDER BY sm.name');

-	} else {

-		$rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');

-	}

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

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

+    } else {

+        $rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');

+    }

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

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

             $sitemenu['module' . $row['id']] = array(

                 'module' . $row['id'],

                 'modules',

@@ -255,83 +255,83 @@ 
 // security menu items (users)

 

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

-	$sitemenu['user_management_title'] = array(

-		'user_management_title',

-		'users',

-		'<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=75',

-		$_lang['user_management_title'],

-		'',

-		'edit_user',

-		'main',

-		0,

-		10,

-		'dropdown-toggle'

-	);

+    $sitemenu['user_management_title'] = array(

+        'user_management_title',

+        'users',

+        '<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=75',

+        $_lang['user_management_title'],

+        '',

+        'edit_user',

+        'main',

+        0,

+        10,

+        'dropdown-toggle'

+    );

 }

 

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

-	$sitemenu['web_user_management_title'] = array(

-		'web_user_management_title',

-		'users',

-		'<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=99',

-		$_lang['web_user_management_title'],

-		'',

-		'edit_web_user',

-		'main',

-		0,

-		20,

-		'dropdown-toggle'

-	);

+    $sitemenu['web_user_management_title'] = array(

+        'web_user_management_title',

+        'users',

+        '<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',

+        'index.php?a=99',

+        $_lang['web_user_management_title'],

+        '',

+        'edit_web_user',

+        'main',

+        0,

+        20,

+        'dropdown-toggle'

+    );

 }

 

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

-	$sitemenu['role_management_title'] = array(

-		'role_management_title',

-		'users',

-		'<i class="fa fa-legal"></i>' . $_lang['role_management_title'],

-		'index.php?a=86',

-		$_lang['role_management_title'],

-		'',

-		'new_role,edit_role,delete_role',

-		'main',

-		0,

-		30,

-		''

-	);

+    $sitemenu['role_management_title'] = array(

+        'role_management_title',

+        'users',

+        '<i class="fa fa-legal"></i>' . $_lang['role_management_title'],

+        'index.php?a=86',

+        $_lang['role_management_title'],

+        '',

+        'new_role,edit_role,delete_role',

+        'main',

+        0,

+        30,

+        ''

+    );

 }

 

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

-	$sitemenu['manager_permissions'] = array(

-		'manager_permissions',

-		'users',

-		'<i class="fa fa-male"></i>' . $_lang['manager_permissions'],

-		'index.php?a=40',

-		$_lang['manager_permissions'],

-		'',

-		'access_permissions',

-		'main',

-		0,

-		40,

-		''

-	);

+    $sitemenu['manager_permissions'] = array(

+        'manager_permissions',

+        'users',

+        '<i class="fa fa-male"></i>' . $_lang['manager_permissions'],

+        'index.php?a=40',

+        $_lang['manager_permissions'],

+        '',

+        'access_permissions',

+        'main',

+        0,

+        40,

+        ''

+    );

 }

 

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

-	$sitemenu['web_permissions'] = array(

-		'web_permissions',

-		'users',

-		'<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'],

-		'index.php?a=91',

-		$_lang['web_permissions'],

-		'',

-		'web_access_permissions',

-		'main',

-		0,

-		50,

-		''

-	);

+    $sitemenu['web_permissions'] = array(

+        'web_permissions',

+        'users',

+        '<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'],

+        'index.php?a=91',

+        $_lang['web_permissions'],

+        '',

+        'web_access_permissions',

+        'main',

+        0,

+        50,

+        ''

+    );

 }

 

 // Tools Menu

@@ -361,104 +361,104 @@ 
 );

 

 $sitemenu['search'] = array(

-	'search',

-	'tools',

-	'<i class="fa fa-search"></i>' . $_lang['search'],

-	'index.php?a=71',

-	$_lang['search'],

-	'',

-	'',

-	'main',

-	1,

-	9,

-	''

+    'search',

+    'tools',

+    '<i class="fa fa-search"></i>' . $_lang['search'],

+    'index.php?a=71',

+    $_lang['search'],

+    '',

+    '',

+    'main',

+    1,

+    9,

+    ''

 );

 

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

-	$sitemenu['bk_manager'] = array(

-		'bk_manager',

-		'tools',

-		'<i class="fa fa-database"></i>' . $_lang['bk_manager'],

-		'index.php?a=93',

-		$_lang['bk_manager'],

-		'',

-		'bk_manager',

-		'main',

-		0,

-		10,

-		''

-	);

+    $sitemenu['bk_manager'] = array(

+        'bk_manager',

+        'tools',

+        '<i class="fa fa-database"></i>' . $_lang['bk_manager'],

+        'index.php?a=93',

+        $_lang['bk_manager'],

+        '',

+        'bk_manager',

+        'main',

+        0,

+        10,

+        ''

+    );

 }

 

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

-	$sitemenu['remove_locks'] = array(

-		'remove_locks',

-		'tools',

-		'<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'],

-		'javascript:modx.removeLocks();',

-		$_lang['remove_locks'],

-		'',

-		'remove_locks',

-		'',

-		0,

-		20,

-		''

-	);

+    $sitemenu['remove_locks'] = array(

+        'remove_locks',

+        'tools',

+        '<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'],

+        'javascript:modx.removeLocks();',

+        $_lang['remove_locks'],

+        '',

+        'remove_locks',

+        '',

+        0,

+        20,

+        ''

+    );

 }

 

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

-	$sitemenu['import_site'] = array(

-		'import_site',

-		'tools',

-		'<i class="fa fa-upload"></i>' . $_lang['import_site'],

-		'index.php?a=95',

-		$_lang['import_site'],

-		'',

-		'import_static',

-		'main',

-		0,

-		30,

-		''

-	);

+    $sitemenu['import_site'] = array(

+        'import_site',

+        'tools',

+        '<i class="fa fa-upload"></i>' . $_lang['import_site'],

+        'index.php?a=95',

+        $_lang['import_site'],

+        '',

+        'import_static',

+        'main',

+        0,

+        30,

+        ''

+    );

 }

 

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

-	$sitemenu['export_site'] = array(

-		'export_site',

-		'tools',

-		'<i class="fa fa-download"></i>' . $_lang['export_site'],

-		'index.php?a=83',

-		$_lang['export_site'],

-		'',

-		'export_static',

-		'main',

-		1,

-		40,

-		''

-	);

+    $sitemenu['export_site'] = array(

+        'export_site',

+        'tools',

+        '<i class="fa fa-download"></i>' . $_lang['export_site'],

+        'index.php?a=83',

+        $_lang['export_site'],

+        '',

+        'export_static',

+        'main',

+        1,

+        40,

+        ''

+    );

 }

 

 $menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));

 if(is_array($menu)) {

-	$newmenu = array();

-	foreach($menu as $item){

-		if(is_array(unserialize($item))){

-			$newmenu = array_merge($newmenu, unserialize($item));

-		}

-	}

-	if(count($newmenu)> 0) $sitemenu = $newmenu;

+    $newmenu = array();

+    foreach($menu as $item){

+        if(is_array(unserialize($item))){

+            $newmenu = array_merge($newmenu, unserialize($item));

+        }

+    }

+    if(count($newmenu)> 0) $sitemenu = $newmenu;

 }

 

 if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {

-	include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php');

+    include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php');

 } else {

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

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

 }

 $menu = new EVOmenu();

 $menu->Build($sitemenu, array(

-	'outerClass' => 'nav',

-	'innerClass' => 'dropdown-menu',

-	'parentClass' => 'dropdown',

+    'outerClass' => 'nav',

+    'innerClass' => 'dropdown-menu',

+    'parentClass' => 'dropdown',

     'parentLinkClass' => 'dropdown-toggle',

     'parentLinkAttr' => '',

     'parentLinkIn' => ''