evolution-cms / evolution

manager/processors/login.processor.php

Spacing +62 added lines, -62 removed lines

@@ -1,23 +1,23 @@ 
 <?php
-if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
 	header('HTTP/1.0 404 Not Found');
 	exit('error');
 }
-define('IN_MANAGER_MODE', true);  // we use this to make sure files are accessed through
+define('IN_MANAGER_MODE', true); // we use this to make sure files are accessed through
 define('MODX_API_MODE', true);
-include_once(__DIR__ . '/../../index.php');
+include_once(__DIR__.'/../../index.php');
 $modx->db->connect();
 $modx->getSettings();
 $modx->invokeEvent('OnManagerPageInit');
 $modx->loadExtension('ManagerAPI');
 $modx->loadExtension('phpass');
 
-$core_path = MODX_MANAGER_PATH . 'includes/';
+$core_path = MODX_MANAGER_PATH.'includes/';
 // include_once the language file
 $_lang = array();
 include_once("{$core_path}lang/english.inc.php");
 
-if($manager_language !== 'english' && is_file("{$core_path}lang/{$manager_language}.inc.php")) {
+if ($manager_language !== 'english' && is_file("{$core_path}lang/{$manager_language}.inc.php")) {
 	include_once("{$core_path}lang/{$manager_language}.inc.php");
 }
 
@@ -25,7 +25,7 @@ 
 include_once("{$core_path}log.class.inc.php");
 
 // Initialize System Alert Message Queque
-if(!isset($_SESSION['SystemAlertMsgQueque'])) {
+if (!isset($_SESSION['SystemAlertMsgQueque'])) {
 	$_SESSION['SystemAlertMsgQueque'] = array();
 }
 $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
@@ -51,7 +51,7 @@ 
 $rs = $modx->db->select($fields, $from, $where);
 $limit = $modx->db->getRecordCount($rs);
 
-if($limit == 0 || $limit > 1) {
+if ($limit == 0 || $limit > 1) {
 	jsAlert($_lang['login_processor_unknown_user']);
 	return;
 }
@@ -73,32 +73,32 @@ 
 
 // get the user settings from the database
 $rs = $modx->db->select('setting_name, setting_value', '[+prefix+]user_settings', "user='{$internalKey}' AND setting_value!=''");
-while($row = $modx->db->getRow($rs)) {
+while ($row = $modx->db->getRow($rs)) {
 	extract($row);
 	${$setting_name} = $setting_value;
 }
 
 // blocked due to number of login errors.
-if($failedlogins >= $failed_allowed && $blockeduntildate > time()) {
+if ($failedlogins >= $failed_allowed && $blockeduntildate > time()) {
 	@session_destroy();
 	session_unset();
-	if($cip = getenv("HTTP_CLIENT_IP")) {
+	if ($cip = getenv("HTTP_CLIENT_IP")) {
 		$ip = $cip;
-	} elseif($cip = getenv("HTTP_X_FORWARDED_FOR")) {
+	} elseif ($cip = getenv("HTTP_X_FORWARDED_FOR")) {
 		$ip = $cip;
-	} elseif($cip = getenv("REMOTE_ADDR")) {
+	} elseif ($cip = getenv("REMOTE_ADDR")) {
 		$ip = $cip;
 	} else {
 		$ip = "UNKNOWN";
 	}
 	$log = new logHandler;
-	$log->initAndWriteLog("Login Fail (Temporary Block)", $internalKey, $username, "119", $internalKey, "IP: " . $ip);
+	$log->initAndWriteLog("Login Fail (Temporary Block)", $internalKey, $username, "119", $internalKey, "IP: ".$ip);
 	jsAlert($_lang['login_processor_many_failed_logins']);
 	return;
 }
 
 // blocked due to number of login errors, but get to try again
-if($failedlogins >= $failed_allowed && $blockeduntildate < time()) {
+if ($failedlogins >= $failed_allowed && $blockeduntildate < time()) {
 	$fields = array();
 	$fields['failedlogincount'] = '0';
 	$fields['blockeduntil'] = time() - 1;
@@ -106,7 +106,7 @@ 
 }
 
 // this user has been blocked by an admin, so no way he's loggin in!
-if($blocked == '1') {
+if ($blocked == '1') {
 	@session_destroy();
 	session_unset();
 	jsAlert($_lang['login_processor_blocked1']);
@@ -114,7 +114,7 @@ 
 }
 
 // blockuntil: this user has a block until date
-if($blockeduntildate > time()) {
+if ($blockeduntildate > time()) {
 	@session_destroy();
 	session_unset();
 	jsAlert($_lang['login_processor_blocked2']);
@@ -122,7 +122,7 @@ 
 }
 
 // blockafter: this user has a block after date
-if($blockedafterdate > 0 && $blockedafterdate < time()) {
+if ($blockedafterdate > 0 && $blockedafterdate < time()) {
 	@session_destroy();
 	session_unset();
 	jsAlert($_lang['login_processor_blocked3']);
@@ -130,24 +130,24 @@ 
 }
 
 // allowed ip
-if($allowed_ip) {
-	if(($hostname = gethostbyaddr($_SERVER['REMOTE_ADDR'])) && ($hostname != $_SERVER['REMOTE_ADDR'])) {
-		if(gethostbyname($hostname) != $_SERVER['REMOTE_ADDR']) {
+if ($allowed_ip) {
+	if (($hostname = gethostbyaddr($_SERVER['REMOTE_ADDR'])) && ($hostname != $_SERVER['REMOTE_ADDR'])) {
+		if (gethostbyname($hostname) != $_SERVER['REMOTE_ADDR']) {
 			jsAlert($_lang['login_processor_remotehost_ip']);
 			return;
 		}
 	}
-	if(!in_array($_SERVER['REMOTE_ADDR'], array_filter(array_map('trim', explode(',', $allowed_ip))))) {
+	if (!in_array($_SERVER['REMOTE_ADDR'], array_filter(array_map('trim', explode(',', $allowed_ip))))) {
 		jsAlert($_lang['login_processor_remote_ip']);
 		return;
 	}
 }
 
 // allowed days
-if($allowed_days) {
+if ($allowed_days) {
 	$date = getdate();
 	$day = $date['wday'] + 1;
-	if(strpos($allowed_days, $day) === false) {
+	if (strpos($allowed_days, $day) === false) {
 		jsAlert($_lang['login_processor_date']);
 		return;
 	}
@@ -164,33 +164,33 @@ 
 
 // check if plugin authenticated the user
 $matchPassword = false;
-if(!isset($rt) || !$rt || (is_array($rt) && !in_array(true, $rt))) {
+if (!isset($rt) || !$rt || (is_array($rt) && !in_array(true, $rt))) {
 	// check user password - local authentication
 	$hashType = $modx->manager->getHashType($dbasePassword);
-	if($hashType == 'phpass') {
+	if ($hashType == 'phpass') {
 		$matchPassword = login($username, $_REQUEST['password'], $dbasePassword);
-	} elseif($hashType == 'md5') {
+	} elseif ($hashType == 'md5') {
 		$matchPassword = loginMD5($internalKey, $_REQUEST['password'], $dbasePassword, $username);
-	} elseif($hashType == 'v1') {
+	} elseif ($hashType == 'v1') {
 		$matchPassword = loginV1($internalKey, $_REQUEST['password'], $dbasePassword, $username);
 	} else {
 		$matchPassword = false;
 	}
-} else if($rt === true || (is_array($rt) && in_array(true, $rt))) {
+} else if ($rt === true || (is_array($rt) && in_array(true, $rt))) {
 	$matchPassword = true;
 }
 
-if(!$matchPassword) {
+if (!$matchPassword) {
 	jsAlert($_lang['login_processor_wrong_password']);
 	incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
 	return;
 }
 
-if($modx->config['use_captcha'] == 1) {
-	if(!isset ($_SESSION['veriword'])) {
+if ($modx->config['use_captcha'] == 1) {
+	if (!isset ($_SESSION['veriword'])) {
 		jsAlert($_lang['login_processor_captcha_config']);
 		return;
-	} elseif($_SESSION['veriword'] != $captcha_code) {
+	} elseif ($_SESSION['veriword'] != $captcha_code) {
 		jsAlert($_lang['login_processor_bad_code']);
 		incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
 		return;
@@ -218,25 +218,25 @@ 
 $_SESSION['mgrPermissions'] = $modx->db->getRow($rs);
 
 // successful login so reset fail count and update key values
-$modx->db->update('failedlogincount=0, ' . 'logincount=logincount+1, ' . 'lastlogin=thislogin, ' . 'thislogin=' . time() . ', ' . "sessionid='{$currentsessionid}'", '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
+$modx->db->update('failedlogincount=0, '.'logincount=logincount+1, '.'lastlogin=thislogin, '.'thislogin='.time().', '."sessionid='{$currentsessionid}'", '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
 
 // get user's document groups
 $i = 0;
-$rs = $modx->db->select('uga.documentgroup', $modx->getFullTableName('member_groups') . ' ug
-		INNER JOIN ' . $modx->getFullTableName('membergroup_access') . ' uga ON uga.membergroup=ug.user_group', "ug.member='{$internalKey}'");
+$rs = $modx->db->select('uga.documentgroup', $modx->getFullTableName('member_groups').' ug
+		INNER JOIN ' . $modx->getFullTableName('membergroup_access').' uga ON uga.membergroup=ug.user_group', "ug.member='{$internalKey}'");
 $_SESSION['mgrDocgroups'] = $modx->db->getColumn('documentgroup', $rs);
 
 $_SESSION['mgrToken'] = md5($currentsessionid);
 
-if($rememberme == '1') {
-	$_SESSION['modx.mgr.session.cookie.lifetime'] = (int)$modx->config['session.cookie.lifetime'];
+if ($rememberme == '1') {
+	$_SESSION['modx.mgr.session.cookie.lifetime'] = (int) $modx->config['session.cookie.lifetime'];
 
 	// Set a cookie separate from the session cookie with the username in it.
 	// Are we using secure connection? If so, make sure the cookie is secure
 	global $https_port;
 
 	$secure = ((isset ($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') || $_SERVER['SERVER_PORT'] == $https_port);
-	if(version_compare(PHP_VERSION, '5.2', '<')) {
+	if (version_compare(PHP_VERSION, '5.2', '<')) {
 		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, '; HttpOnly', $secure);
 	} else {
 		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, NULL, $secure, true);
@@ -251,9 +251,9 @@ 
 // Check if user already has an active session, if not check if user pressed logout end of last session
 $rs = $modx->db->select('lasthit', $modx->getFullTableName('active_user_sessions'), "internalKey='{$internalKey}'");
 $activeSession = $modx->db->getValue($rs);
-if(!$activeSession) {
+if (!$activeSession) {
 	$rs = $modx->db->select('lasthit', $modx->getFullTableName('active_users'), "internalKey='{$internalKey}' AND action != 8");
-	if($lastHit = $modx->db->getValue($rs)) {
+	if ($lastHit = $modx->db->getValue($rs)) {
 		$_SESSION['show_logout_reminder'] = array(
 			'type' => 'logout_reminder',
 			'lastHit' => $lastHit
@@ -274,17 +274,17 @@ 
 
 // check if we should redirect user to a web page
 $rs = $modx->db->select('setting_value', '[+prefix+]user_settings', "user='{$internalKey}' AND setting_name='manager_login_startup'");
-$id = (int)$modx->db->getValue($rs);
-if($id > 0) {
-	$header = 'Location: ' . $modx->makeUrl($id, '', '', 'full');
-	if($_POST['ajax'] == 1) {
+$id = (int) $modx->db->getValue($rs);
+if ($id > 0) {
+	$header = 'Location: '.$modx->makeUrl($id, '', '', 'full');
+	if ($_POST['ajax'] == 1) {
 		echo $header;
 	} else {
 		header($header);
 	}
 } else {
-	$header = 'Location: ' . MODX_MANAGER_URL;
-	if($_POST['ajax'] == 1) {
+	$header = 'Location: '.MODX_MANAGER_URL;
+	if ($_POST['ajax'] == 1) {
 		echo $header;
 	} else {
 		header($header);
@@ -296,12 +296,12 @@ 
  *
  * @param string $msg
  */
-function jsAlert($msg) {
+function jsAlert($msg){
 	global $modx;
-	if($_POST['ajax'] != 1) {
-		echo "<script>window.setTimeout(\"alert('" . addslashes($modx->db->escape($msg)) . "')\",10);history.go(-1)</script>";
+	if ($_POST['ajax'] != 1) {
+		echo "<script>window.setTimeout(\"alert('".addslashes($modx->db->escape($msg))."')\",10);history.go(-1)</script>";
 	} else {
-		echo $msg . "\n";
+		echo $msg."\n";
 	}
 }
 
@@ -311,7 +311,7 @@ 
  * @param string $dbasePassword
  * @return bool
  */
-function login($username, $givenPassword, $dbasePassword) {
+function login($username, $givenPassword, $dbasePassword){
 	global $modx;
 	return $modx->phpass->CheckPassword($givenPassword, $dbasePassword);
 }
@@ -323,21 +323,21 @@ 
  * @param string $username
  * @return bool
  */
-function loginV1($internalKey, $givenPassword, $dbasePassword, $username) {
+function loginV1($internalKey, $givenPassword, $dbasePassword, $username){
 	global $modx;
 
 	$user_algo = $modx->manager->getV1UserHashAlgorithm($internalKey);
 
-	if(!isset($modx->config['pwd_hash_algo']) || empty($modx->config['pwd_hash_algo'])) {
+	if (!isset($modx->config['pwd_hash_algo']) || empty($modx->config['pwd_hash_algo'])) {
 		$modx->config['pwd_hash_algo'] = 'UNCRYPT';
 	}
 
-	if($user_algo !== $modx->config['pwd_hash_algo']) {
+	if ($user_algo !== $modx->config['pwd_hash_algo']) {
 		$bk_pwd_hash_algo = $modx->config['pwd_hash_algo'];
 		$modx->config['pwd_hash_algo'] = $user_algo;
 	}
 
-	if($dbasePassword != $modx->manager->genV1Hash($givenPassword, $internalKey)) {
+	if ($dbasePassword != $modx->manager->genV1Hash($givenPassword, $internalKey)) {
 		return false;
 	}
 
@@ -353,10 +353,10 @@ 
  * @param string $username
  * @return bool
  */
-function loginMD5($internalKey, $givenPassword, $dbasePassword, $username) {
+function loginMD5($internalKey, $givenPassword, $dbasePassword, $username){
 	global $modx;
 
-	if($dbasePassword != md5($givenPassword)) {
+	if ($dbasePassword != md5($givenPassword)) {
 		return false;
 	}
 	updateNewHash($username, $givenPassword);
@@ -367,7 +367,7 @@ 
  * @param string $username
  * @param string $password
  */
-function updateNewHash($username, $password) {
+function updateNewHash($username, $password){
 	global $modx;
 
 	$field = array();
@@ -381,23 +381,23 @@ 
  * @param int $failed_allowed
  * @param int $blocked_minutes
  */
-function incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes) {
+function incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes){
 	global $modx;
 
 	$failedlogins += 1;
 
 	$fields = array('failedlogincount' => $failedlogins);
-	if($failedlogins >= $failed_allowed) //block user for too many fail attempts
+	if ($failedlogins >= $failed_allowed) //block user for too many fail attempts
 	{
 		$fields['blockeduntil'] = time() + ($blocked_minutes * 60);
 	}
 
 	$modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
 
-	if($failedlogins < $failed_allowed) {
+	if ($failedlogins < $failed_allowed) {
 		//sleep to help prevent brute force attacks
 		$sleep = (int) $failedlogins / 2;
-		if($sleep > 5) {
+		if ($sleep > 5) {
 			$sleep = 5;
 		}
 		sleep($sleep);

manager/processors/delete_content.processor.php

Spacing +21 added lines, -21 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('delete_document')) {
     $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"]);
 }
 
 /*******ищем родителя чтобы к нему вернуться********/
-$content=$modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
-$pid=($content['parent']==0?$id:$content['parent']);
+$content = $modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
+$pid = ($content['parent'] == 0 ? $id : $content['parent']);
 
 /************ а заодно и путь возврата (сам путь внизу файла) **********/
-$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;
 
 /*****************************/
 
@@ -27,7 +27,7 @@ 
 $children = array();
 
 // check permissions on the document
-include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
+include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php";
 $udperms = new udperms();
 $udperms->user = $modx->getLoginUserID();
 $udperms->document = $id;
@@ -52,17 +52,17 @@ 
     $parent = $modx->db->escape($parent);
     $rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent={$parent} AND deleted=0");
         // the document has children documents, we'll need to delete those too
-        while ($childid=$modx->db->getValue($rs)) {
-            if ($childid==$site_start) {
+        while ($childid = $modx->db->getValue($rs)) {
+            if ($childid == $site_start) {
                 $modx->webAlertAndQuit("The document you are trying to delete is a folder containing document {$childid}. This document is registered as the 'Site start' document, and cannot be deleted. Please assign another document as your 'Site start' document and try again.");
             }
-            if ($childid==$site_unavailable_page) {
+            if ($childid == $site_unavailable_page) {
                 $modx->webAlertAndQuit("The document you are trying to delete is a folder containing document {$childid}. This document is registered as the 'Site unavailable page' document, and cannot be deleted. Please assign another document as your 'Site unavailable page' document and try again.");
             }
-            if ($childid==$error_page) {
+            if ($childid == $error_page) {
                 $modx->webAlertAndQuit("The document you are trying to delete is a folder containing document {$childid}. This document is registered as the 'Site error page' document, and cannot be deleted. Please assign another document as your 'Site error page' document and try again.");
             }
-            if ($childid==$unauthorized_page) {
+            if ($childid == $unauthorized_page) {
                 $modx->webAlertAndQuit("The document you are trying to delete is a folder containing document {$childid}. This document is registered as the 'Site unauthorized page' document, and cannot be deleted. Please assign another document as your 'Site unauthorized page' document and try again.");
             }
             $children[] = $childid;
@@ -80,7 +80,7 @@ 
                             "children"=>$children
                         ));
 
-if (count($children)>0) {
+if (count($children) > 0) {
     $modx->db->update(
         array(
             'deleted'   => 1,
@@ -89,19 +89,19 @@ 
         ), $modx->getFullTableName('site_content'), "id IN (".implode(", ", $children).")");
 }
 
-if ($site_start==$id) {
+if ($site_start == $id) {
     $modx->webAlertAndQuit("Document is 'Site start' and cannot be deleted!");
 }
 
-if ($site_unavailable_page==$id) {
+if ($site_unavailable_page == $id) {
     $modx->webAlertAndQuit("Document is used as the 'Site unavailable page' and cannot be deleted!");
 }
 
-if ($error_page==$id) {
+if ($error_page == $id) {
     $modx->webAlertAndQuit("Document is used as the 'Site error page' and cannot be deleted!");
 }
 
-if ($unauthorized_page==$id) {
+if ($unauthorized_page == $id) {
     $modx->webAlertAndQuit("Document is used as the 'Site unauthorized page' and cannot be deleted!");
 }
 
@@ -127,5 +127,5 @@ 
 $modx->clearCache('full');
 
 // finished emptying cache - redirect
-$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);

manager/processors/undelete_content.processor.php

Spacing +18 added lines, -18 removed lines

@@ -1,44 +1,44 @@ 
 <?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('delete_document')) {
+if (!$modx->hasPermission('delete_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->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
-$pid=($content['parent']==0?$id:$content['parent']);
+$content = $modx->db->getRow($modx->db->select('parent, pagetitle', $modx->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;
 
 /***********************************/
 
 
 // check permissions on the document
-include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
+include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php";
 $udperms = new udperms();
 $udperms->user = $modx->getLoginUserID();
 $udperms->document = $id;
 $udperms->role = $_SESSION['mgrRole'];
 
-if(!$udperms->checkPermissions()) {
+if (!$udperms->checkPermissions()) {
 	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
 // get the timestamp on which the document was deleted.
 $rs = $modx->db->select('deletedon', $modx->getFullTableName('site_content'), "id='{$id}' AND deleted=1");
 $deltime = $modx->db->getValue($rs);
-if(!$deltime) {
+if (!$deltime) {
 	$modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!");
 }
 
@@ -47,15 +47,15 @@ 
 /**
  * @param int $parent
  */
-function getChildren($parent) {
+function getChildren($parent){
 
 	global $modx;
 	global $children;
 	global $deltime;
 
-	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='".(int)$parent."' AND deleted=1 AND deletedon='".(int)$deltime."'");
+	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='".(int) $parent."' AND deleted=1 AND deletedon='".(int) $deltime."'");
 		// the document has children documents, we'll need to delete those too
-		while ($row=$modx->db->getRow($rs)) {
+		while ($row = $modx->db->getRow($rs)) {
 			$children[] = $row['id'];
 			getChildren($row['id']);
 			//echo "Found childNode of parentNode $parent: ".$row['id']."<br />";
@@ -64,7 +64,7 @@ 
 
 getChildren($id);
 
-if(count($children)>0) {
+if (count($children) > 0) {
 	$modx->db->update(
 		array(
 			'deleted'   => 0,
@@ -93,5 +93,5 @@ 
 $modx->clearCache('full');
 
 // finished emptying cache - redirect
-$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);

manager/processors/remove_installer.processor.php

Spacing +10 added lines, -10 removed lines

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

manager/processors/duplicate_content.processor.php

Spacing +16 added lines, -16 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('new_document') || !$modx->hasPermission('save_document')) {
+if (!$modx->hasPermission('new_document') || !$modx->hasPermission('save_document')) {
 	$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"]);
 }
 
 $children = array();
 
 // check permissions on the document
-include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
+include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php";
 $udperms = new udperms();
 $udperms->user = $modx->getLoginUserID();
 $udperms->document = $id;
 $udperms->role = $_SESSION['mgrRole'];
 $udperms->duplicateDoc = true;
 
-if(!$udperms->checkPermissions()) {
+if (!$udperms->checkPermissions()) {
 	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
@@ -33,7 +33,7 @@ 
 $_SESSION['itemname'] = $name;
 
 // finish cloning - redirect
-$header="Location: index.php?r=1&a=3&id=$id";
+$header = "Location: index.php?r=1&a=3&id=$id";
 header($header);
 
 /**
@@ -42,7 +42,7 @@ 
  * @param int $_toplevel
  * @return int
  */
-function duplicateDocument($docid, $parent=null, $_toplevel=0) {
+function duplicateDocument($docid, $parent = null, $_toplevel = 0){
 	global $modx, $_lang;
 
 	// invoke OnBeforeDocDuplicate event
@@ -63,7 +63,7 @@ 
 	$content = $modx->db->getRow($rs);
 
 	// Handle incremental ID
-	switch($modx->config['docid_incrmnt_method'])
+	switch ($modx->config['docid_incrmnt_method'])
 	{
 		case '1':
 			$from = "{$tblsc} AS T0 LEFT JOIN {$tblsc} AS T1 ON T0.id + 1 = T1.id";
@@ -71,7 +71,7 @@ 
 			$content['id'] = $modx->db->getValue($rs);
 			break;
 		case '2':
-			$rs = $modx->db->select('MAX(id)+1',$tblsc);
+			$rs = $modx->db->select('MAX(id)+1', $tblsc);
 			$content['id'] = $modx->db->getValue($rs);
 			break;
 
@@ -85,12 +85,12 @@ 
 		$pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$docid}'"));
 		$pagetitle = $modx->db->escape($pagetitle);
 		$count = $modx->db->getRecordCount($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "pagetitle LIKE '{$pagetitle} Duplicate%'"));
-		if($count>=1) $count = ' '.($count+1);
+		if ($count >= 1) $count = ' '.($count + 1);
 		else $count = '';
 
 		$content['pagetitle'] = $_lang['duplicated_el_suffix'].$count.' '.$content['pagetitle'];
 		$content['alias'] = null;
-	} elseif($modx->config['friendly_urls'] == 0 || $modx->config['allow_duplicate_alias'] == 0) {
+	} elseif ($modx->config['friendly_urls'] == 0 || $modx->config['allow_duplicate_alias'] == 0) {
 		$content['alias'] = null;
 	}
 
@@ -153,8 +153,8 @@ 
 
 	$tbltvc = $modx->getFullTableName('site_tmplvar_contentvalues');
 
-    $newid = (int)$newid;
-    $oldid = (int)$oldid;
+    $newid = (int) $newid;
+    $oldid = (int) $oldid;
 
     $modx->db->insert(
 		array('contentid'=>'', 'tmplvarid'=>'', 'value'=>''), $tbltvc, // Insert into
@@ -173,8 +173,8 @@ 
 
 	$tbldg = $modx->getFullTableName('document_groups');
 
-    $newid = (int)$newid;
-    $oldid = (int)$oldid;
+    $newid = (int) $newid;
+    $oldid = (int) $oldid;
 
     $modx->db->insert(
 		array('document'=>'', 'document_group'=>''), $tbldg, // Insert into

manager/processors/execute_module.processor.php

Spacing +16 added lines, -16 removed lines

@@ -1,18 +1,18 @@ 
 <?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('exec_module')) {
+if (!$modx->hasPermission('exec_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"]);
 }
 
 // check if user has access permission, except admins
-if($_SESSION['mgrRole']!=1){
+if ($_SESSION['mgrRole'] != 1) {
 	$rs = $modx->db->select(
 		'sma.usergroup,mg.member',
 		$modx->getFullTableName("site_module_access")." sma
@@ -24,18 +24,18 @@ 
 	$permissionAccessInt = -1;
 
 	while ($row = $modx->db->getRow($rs)) {
-		if($row["usergroup"] && $row["member"]) {
+		if ($row["usergroup"] && $row["member"]) {
 			//if there are permissions and this member has permission, ofcourse
 			//this is granted
 			$permissionAccessInt = 1;
-		} elseif ($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) {
+	if ($permissionAccessInt == 0) {
 		$modx->webAlertAndQuit("You do not sufficient privileges to execute this module.", "index.php?a=106");
 	}
 }
@@ -43,10 +43,10 @@ 
 // get module data
 $rs = $modx->db->select('*', $modx->getFullTableName("site_modules"), "id='{$id}'");
 $content = $modx->db->getRow($rs);
-if(!$content) {
+if (!$content) {
 	$modx->webAlertAndQuit("No record found for id {$id}.", "index.php?a=106");
 }
-if($content['disabled']) {
+if ($content['disabled']) {
 	$modx->webAlertAndQuit("This module is disabled and cannot be executed.", "index.php?a=106");
 }
 
@@ -59,7 +59,7 @@ 
 // Set the item name for logger
 $_SESSION['itemname'] = $content['name'];
 
-$output = evalModule($content["modulecode"],$parameter);
+$output = evalModule($content["modulecode"], $parameter);
 echo $output;
 include MODX_MANAGER_PATH."includes/sysalert.display.inc.php";
 
@@ -70,10 +70,10 @@ 
  * @param array $params
  * @return string
  */
-function evalModule($moduleCode,$params){
+function evalModule($moduleCode, $params){
 	global $modx;
 	$modx->event->params = &$params; // store params inside event object
-	if(is_array($params)) {
+	if (is_array($params)) {
 		extract($params, EXTR_SKIP);
 	}
 	ob_start();
@@ -83,7 +83,7 @@ 
 	if (isset($php_errormsg))
 	{
 		$error_info = error_get_last();
-        switch($error_info['type'])
+        switch ($error_info['type'])
         {
         	case E_NOTICE :
         		$error_level = 1;
@@ -97,9 +97,9 @@ 
         	default:
         		$error_level = 99;
         }
-		if($modx->config['error_reporting']==='99' || 2<$error_level)
+		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->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>");
 		}
 	}

manager/processors/move_document.processor.php

Spacing +20 added lines, -20 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('edit_document')) {
+if (!$modx->hasPermission('edit_document')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$newParentID = isset($_REQUEST['new_parent']) ? (int)$_REQUEST['new_parent'] : 0;
-$documentID = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$newParentID = isset($_REQUEST['new_parent']) ? (int) $_REQUEST['new_parent'] : 0;
+$documentID = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 // ok, two things to check.
 // first, document cannot be moved to itself
 // second, new parent must be a folder. If not, set it to folder.
-if($documentID==$newParentID) $modx->webAlertAndQuit($_lang["error_movedocument1"]);
-if($documentID <= 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
-if($newParentID < 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+if ($documentID == $newParentID) $modx->webAlertAndQuit($_lang["error_movedocument1"]);
+if ($documentID <= 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+if ($newParentID < 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
 
 $parents = $modx->getParentIds($newParentID);
 if (in_array($documentID, $parents))  $modx->webAlertAndQuit($_lang["error_movedocument2"]);
@@ -26,7 +26,7 @@ 
 
 if ($use_udperms == 1) {
 	if ($oldparent != $newParentID) {
-		include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
+		include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php";
 		$udperms = new udperms();
 		$udperms->user = $modx->getLoginUserID();
 		$udperms->document = $newParentID;
@@ -42,28 +42,28 @@ 
  * @param int $currDocID
  * @return array
  */
-function allChildren($currDocID) {
+function allChildren($currDocID){
 	global $modx;
-	$children= array();
+	$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']));
+	while ($child = $modx->db->getRow($rs)) {
+		$children[] = $child['id'];
+		$children = array_merge($children, allChildren($child['id']));
 	}
 	return $children;
 }
 
-$evtOut = $modx->invokeEvent("onBeforeMoveDocument", array (
+$evtOut = $modx->invokeEvent("onBeforeMoveDocument", array(
 	"id_document" => $documentID,
 	"old_parent" => $oldparent,
 	"new_parent" => $newParentID
 ));
-if (is_array($evtOut) && count($evtOut) > 0){
+if (is_array($evtOut) && count($evtOut) > 0) {
 	$newParent = array_pop($evtOut);
-	if($newParent == $oldparent) {
+	if ($newParent == $oldparent) {
 		$modx->webAlertAndQuit($_lang["error_movedocument2"]);
-	}else{
+	} else {
 		$newParentID = $newParent;
 	}
 }
@@ -84,7 +84,7 @@ 
 	$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_content'), "parent='{$oldparent}'");
 	$limit = $modx->db->getValue($rs);
 
-	if(!$limit>0) {
+	if (!$limit > 0) {
 		$modx->db->update(array(
 			'isfolder' => 0,
 		), $modx->getFullTableName('site_content'), "id='{$oldparent}'");
@@ -93,7 +93,7 @@ 
 	$pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$documentID}'"));
 	$_SESSION['itemname'] = $pagetitle;
 
-	$modx->invokeEvent("onAfterMoveDocument", array (
+	$modx->invokeEvent("onAfterMoveDocument", array(
 		"id_document" => $documentID,
 		"old_parent" => $oldparent,
 		"new_parent" => $newParentID
@@ -102,7 +102,7 @@ 
 	// empty cache & sync site
 	$modx->clearCache('full');
 
-	$header="Location: index.php?a=3&id={$documentID}&r=9";
+	$header = "Location: index.php?a=3&id={$documentID}&r=9";
 	header($header);
 } else {
 	$modx->webAlertAndQuit("You cannot move a document to a child document!");

manager/processors/save_web_user.processor.php

Spacing +61 added lines, -61 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('save_web_user')) {
+if (!$modx->hasPermission('save_web_user')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -11,14 +11,14 @@ 
 $tbl_web_groups = $modx->getFullTableName('web_groups');
 
 $input = $_POST;
-foreach($input as $k => $v) {
-	if($k !== 'comment') {
+foreach ($input as $k => $v) {
+	if ($k !== 'comment') {
 		$v = sanitize($v);
 	}
 	$input[$k] = $v;
 }
 
-$id = (int)$input['id'];
+$id = (int) $input['id'];
 $oldusername = $input['oldusername'];
 $newusername = !empty ($input['newusername']) ? trim($input['newusername']) : "New User";
 $esc_newusername = $modx->db->escape($newusername);
@@ -50,41 +50,41 @@ 
 $user_groups = $input['user_groups'];
 
 // verify password
-if($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) {
+if ($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) {
 	webAlertAndQuit("Password typed is mismatched");
 }
 
 // verify email
-if($email == '' || !preg_match("/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,24}$/i", $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!");
 }
 
-switch($input['mode']) {
+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) {
+		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) {
+		if ($limit > 0) {
 			webAlertAndQuit("Email is already in use!");
 		}
 
 		// generate a new password for this user
-		if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-			if(strlen($specifiedpassword) < 6) {
+		if ($specifiedpassword != "" && $passwordgenmethod == "spec") {
+			if (strlen($specifiedpassword) < 6) {
 				webAlertAndQuit("Password is too short!");
 			} else {
 				$newpassword = $specifiedpassword;
 			}
-		} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+		} elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {
 			webAlertAndQuit("You didn't specify a password for this user!");
-		} elseif($passwordgenmethod == 'g') {
+		} elseif ($passwordgenmethod == 'g') {
 			$newpassword = generate_password(8);
 		} else {
 			webAlertAndQuit("No password generation method specified!");
@@ -114,11 +114,11 @@ 
 		/*******************************************************************************/
 		// 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++) {
+		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['webgroup'] = (int) $user_groups[$i];
 					$f['webuser'] = $internalKey;
 					$modx->db->insert($f, $tbl_web_groups);
 				}
@@ -142,20 +142,20 @@ 
             "id" => $internalKey
         ));
 
-		if($passwordnotifymethod == 'e') {
+		if ($passwordnotifymethod == 'e') {
 			sendMailMessage($email, $newusername, $newpassword, $fullname);
-			if($input['stay'] != '') {
+			if ($input['stay'] != '') {
 				$a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+				$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'] != '') {
+			if ($input['stay'] != '') {
 				$a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+				$stayUrl = "index.php?a={$a}&r=2&stay=".$input['stay'];
 			} else {
 				$stayUrl = "index.php?a=99&r=2";
 			}
@@ -188,36 +188,36 @@ 
 		break;
 	case '88' : // edit user
 		// generate a new password for this user
-		if($genpassword == 1) {
-			if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-				if(strlen($specifiedpassword) < 6) {
+		if ($genpassword == 1) {
+			if ($specifiedpassword != "" && $passwordgenmethod == "spec") {
+				if (strlen($specifiedpassword) < 6) {
 					webAlertAndQuit("Password is too short!");
 				} else {
 					$newpassword = $specifiedpassword;
 				}
-			} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+			} elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {
 				webAlertAndQuit("You didn't specify a password for this user!");
-			} elseif($passwordgenmethod == 'g') {
+			} elseif ($passwordgenmethod == 'g') {
 				$newpassword = generate_password(8);
 			} else {
 				webAlertAndQuit("No password generation method specified!");
 			}
 		}
-		if($passwordnotifymethod == 'e') {
+		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) {
+		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) {
+		if ($limit > 0) {
 			webAlertAndQuit("Email is already in use!");
 		}
 
@@ -230,7 +230,7 @@ 
 		// update user name and password
 		$field = array();
 		$field['username'] = $esc_newusername;
-		if($genpassword == 1) {
+		if ($genpassword == 1) {
 			$field['password'] = md5($newpassword);
 		}
 		$modx->db->update($field, $tbl_web_users, "id='{$id}'");
@@ -247,13 +247,13 @@ 
 		/*******************************************************************************/
 		// 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 ($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++) {
+			if (!empty($user_groups)) {
+				for ($i = 0; $i < count($user_groups); $i++) {
 					$field = array();
-					$field['webgroup'] = (int)$user_groups[$i];
+					$field['webgroup'] = (int) $user_groups[$i];
 					$field['webuser'] = $id;
 					$modx->db->insert($field, $tbl_web_groups);
 				}
@@ -275,7 +275,7 @@ 
         ));
 
         // invoke OnWebChangePassword event
-        if($genpassword == 1) {
+        if ($genpassword == 1) {
             $modx->invokeEvent("OnWebChangePassword", array(
                 "userid" => $id,
                 "username" => $newusername,
@@ -289,10 +289,10 @@ 
             "id" => $id
         ));
 
-		if($genpassword == 1 && $passwordnotifymethod == 's') {
-			if($input['stay'] != '') {
+		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'];
+				$stayUrl = "index.php?a={$a}&r=2&stay=".$input['stay'];
 			} else {
 				$stayUrl = "index.php?a=99&r=2";
 			}
@@ -320,9 +320,9 @@ 
 
 			include_once "footer.inc.php";
 		} else {
-			if($input['stay'] != '') {
+			if ($input['stay'] != '') {
 				$a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+				$header = "Location: index.php?a={$a}&r=2&stay=".$input['stay'];
 				header($header);
 			} else {
 				$header = "Location: index.php?a=99&r=2";
@@ -340,15 +340,15 @@ 
  * @param string $string
  * @return string
  */
-function save_user_quoted_printable($string) {
+function save_user_quoted_printable($string){
 	$crlf = "\n";
-	$string = preg_replace('!(\r\n|\r|\n)!', $crlf, $string) . $crlf;
+	$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 . "'";
+	$f[] = '/([\011\040])'.$crlf.'/e';
+	$r[] = "'=' . sprintf('%02X', ord('\\1')) . '".$crlf."'";
 	$string = preg_replace($f, $r, $string);
-	return trim(wordwrap($string, 70, ' =' . $crlf));
+	return trim(wordwrap($string, 70, ' ='.$crlf));
 }
 
 /**
@@ -359,7 +359,7 @@ 
  * @param string $pwd
  * @param string $ufn
  */
-function sendMailMessage($email, $uid, $pwd, $ufn) {
+function sendMailMessage($email, $uid, $pwd, $ufn){
 	global $modx, $_lang, $websignupemail_message;
 	global $emailsubject, $emailsender;
 	global $site_name, $site_url;
@@ -380,14 +380,14 @@ 
 	$param['to'] = $email;
 	$param['type'] = 'text';
 	$rs = $modx->sendmail($param);
-	if(!$rs) {
+	if (!$rs) {
 		$modx->manager->saveFormValues();
 		$modx->messageQuit("{$email} - {$_lang['error_sending_email']}");
 	}
 }
 
 // Save User Settings
-function saveUserSettings($id) {
+function saveUserSettings($id){
 	global $modx;
 	$tbl_web_user_settings = $modx->getFullTableName('web_user_settings');
 
@@ -399,12 +399,12 @@ 
 
 	$modx->db->delete($tbl_web_user_settings, "webuser='{$id}'");
 
-	foreach($settings as $n) {
+	foreach ($settings as $n) {
 		$vl = $_POST[$n];
-		if(is_array($vl)) {
+		if (is_array($vl)) {
 			$vl = implode(",", $vl);
 		}
-		if($vl != '') {
+		if ($vl != '') {
 			$f = array();
 			$f['webuser'] = $id;
 			$f['setting_name'] = $n;
@@ -416,33 +416,33 @@ 
 }
 
 // Web alert -  sends an alert to web browser
-function webAlertAndQuit($msg) {
+function webAlertAndQuit($msg){
 	global $id, $modx;
 	$mode = $_POST['mode'];
 	$modx->manager->saveFormValues($mode);
-	$modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '88' ? "&id={$id}" : ''));
+	$modx->webAlertAndQuit($msg, "index.php?a={$mode}".($mode == '88' ? "&id={$id}" : ''));
 }
 
 // Generate password
-function generate_password($length = 10) {
+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++) {
+	for ($i = 0; $i < $length; $i++) {
 		$pass .= $allowable_characters[mt_rand(0, $ps_len - 1)];
 	}
 	return $pass;
 }
 
-function sanitize($str = '', $safecount = 0) {
+function sanitize($str = '', $safecount = 0){
 	global $modx;
 	$safecount++;
-	if(1000 < $safecount) {
+	if (1000 < $safecount) {
 		exit("error too many loops '{$safecount}'");
 	}
-	if(is_array($str)) {
-		foreach($str as $i => $v) {
+	if (is_array($str)) {
+		foreach ($str as $i => $v) {
 			$str[$i] = sanitize($v, $safecount);
 		}
 	} else {

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

Spacing +7 added lines, -7 removed lines

@@ -1,13 +1,13 @@ 
 <?php
-class DATEPICKER {
+class DATEPICKER{
     /**
      * @return string
      */
-    public function getDP() {
+    public function getDP(){
         global $modx;
 
         $load_script = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
-        if(!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
+        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';
         return $modx->mergeSettingsContent($load_script);
     }
@@ -15,14 +15,14 @@ 
     /**
      * @return string
      */
-    public function getLangCode() {
+    public function getLangCode(){
         global $modx, $modx_lang_attribute;
 
-        if(!$modx_lang_attribute) return 'en';
+        if (!$modx_lang_attribute) return 'en';
 
         $lc = $modx_lang_attribute;
-        if($lc === 'uk') return 'ru';
-        $dp_path = str_replace('\\','/',dirname(__FILE__));
+        if ($lc === 'uk') return 'ru';
+        $dp_path = str_replace('\\', '/', dirname(__FILE__));
 
         return (is_file("{$dp_path}/i18n/datepicker.{$lc}.js")) ? $modx_lang_attribute : 'en';
     }