evolution-cms / evolution

manager/processors/save_plugin.processor.php

Spacing +9 added lines, -9 removed lines

@@ -1,12 +1,12 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
 }
 if (!$modx->hasPermission('save_plugin')) {
     $modx->webAlertAndQuit($_lang['error_no_privileges']);
 }
 
-$id = (int)$_POST['id'];
+$id = (int) $_POST['id'];
 $name = $modx->getDatabase()->escape(trim($_POST['name']));
 $description = $modx->getDatabase()->escape($_POST['description']);
 $locked = isset($_POST['locked']) && $_POST['locked'] == 'on' ? '1' : '0';
@@ -20,11 +20,11 @@ 
 
 //Kyle Jaebker - added category support
 if (empty($_POST['newcategory']) && $_POST['categoryid'] > 0) {
-    $categoryid = (int)$_POST['categoryid'];
+    $categoryid = (int) $_POST['categoryid'];
 } elseif (empty($_POST['newcategory']) && $_POST['categoryid'] <= 0) {
     $categoryid = 0;
 } else {
-    include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+    include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
     $categoryid = getCategory($_POST['newcategory']);
 }
 
@@ -40,12 +40,12 @@ 
     $moduleguid = isset($parsed['guid']) ? $parsed['guid'] : $moduleguid;
 
     $description = isset($parsed['description']) ? $parsed['description'] : $description;
-    $version = isset($parsed['version']) ? '<b>' . $parsed['version'] . '</b> ' : '';
+    $version = isset($parsed['version']) ? '<b>'.$parsed['version'].'</b> ' : '';
     if ($version) {
-        $description = $version . trim(preg_replace('/(<b>.+?)+(<\/b>)/i', '', $description));
+        $description = $version.trim(preg_replace('/(<b>.+?)+(<\/b>)/i', '', $description));
     }
     if (isset($parsed['modx_category'])) {
-        include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+        include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
         $categoryid = getCategory($parsed['modx_category']);
     }
 }
@@ -103,7 +103,7 @@ 
         // finished emptying cache - redirect
         if ($_POST['stay'] != '') {
             $a = ($_POST['stay'] == '2') ? "102&id=$newid" : '101';
-            $header = 'Location: index.php?a=' . $a . '&r=2&stay=' . $_POST['stay'];
+            $header = 'Location: index.php?a='.$a.'&r=2&stay='.$_POST['stay'];
             header($header);
         } else {
             $header = 'Location: index.php?a=76&r=2';
@@ -158,7 +158,7 @@ 
         // finished emptying cache - redirect
         if ($_POST['stay'] != '') {
             $a = ($_POST['stay'] == '2') ? "102&id=$id" : '101';
-            $header = 'Location: index.php?a=' . $a . '&r=2&stay=' . $_POST['stay'];
+            $header = 'Location: index.php?a='.$a.'&r=2&stay='.$_POST['stay'];
             header($header);
         } else {
             $modx->unlockElement(5, $id);

manager/processors/remove_installer.processor.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
 }
 
 $msg = '';
-$pth = dirname(__DIR__, 2) . '/install/';
+$pth = dirname(__DIR__, 2).'/install/';
 $pth = str_replace('\\', '/', $pth);
 
 if (isset($_GET['rminstall'])) {
@@ -47,7 +47,7 @@ 
     }
 }
 if ($msg) {
-    echo "<script>alert('" . addslashes($msg) . "');</script>";
+    echo "<script>alert('".addslashes($msg)."');</script>";
 }
 
 echo "<script>window.location='../index.php?a=2';</script>";

manager/processors/login.processor.php

Indentation +127 added lines, -127 removed lines

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

 if (! isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {

-	header('HTTP/1.0 404 Not Found');

-	exit('error');

+    header('HTTP/1.0 404 Not Found');

+    exit('error');

 }

 

 define('IN_MANAGER_MODE', true);  // we use this to make sure files are accessed through

@@ -33,7 +33,7 @@ 
 

 // Initialize System Alert Message Queque

 if(!isset($_SESSION['SystemAlertMsgQueque'])) {

-	$_SESSION['SystemAlertMsgQueque'] = array();

+    $_SESSION['SystemAlertMsgQueque'] = array();

 }

 $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];

 

@@ -51,10 +51,10 @@ 
 

 // invoke OnBeforeManagerLogin event

 $modx->invokeEvent('OnBeforeManagerLogin', array(

-		'username' => $username,

-		'userpassword' => $givenPassword,

-		'rememberme' => $rememberme

-	));

+        'username' => $username,

+        'userpassword' => $givenPassword,

+        'rememberme' => $rememberme

+    ));

 $fields = 'mu.*, ua.*';

 $from = $modx->getDatabase()->getFullTableName('manager_users') . ' AS mu, ' .

     $modx->getDatabase()->getFullTableName('user_attributes') . ' AS ua';

@@ -63,8 +63,8 @@ 
 $limit = $modx->getDatabase()->getRecordCount($rs);

 

 if($limit == 0 || $limit > 1) {

-	jsAlert($_lang['login_processor_unknown_user']);

-	return;

+    jsAlert($_lang['login_processor_unknown_user']);

+    return;

 }

 $row = $modx->getDatabase()->getRow($rs);

 

@@ -88,36 +88,36 @@ 
     "user='{$internalKey}' AND setting_value!=''"

 );

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

-	extract($row);

-	${$setting_name} = $setting_value;

+    extract($row);

+    ${$setting_name} = $setting_value;

 }

 

 // blocked due to number of login errors.

 if($failedlogins >= $failed_allowed && $blockeduntildate > time()) {

-	@session_destroy();

-	session_unset();

-	if($cip = getenv("HTTP_CLIENT_IP")) {

-		$ip = $cip;

-	} elseif($cip = getenv("HTTP_X_FORWARDED_FOR")) {

-		$ip = $cip;

-	} elseif($cip = getenv("REMOTE_ADDR")) {

-		$ip = $cip;

-	} else {

-		$ip = "UNKNOWN";

-	}

-	$log = new EvolutionCMS\Legacy\LogHandler();

-	$log->initAndWriteLog("Login Fail (Temporary Block)", $internalKey, $username, "119", $internalKey, "IP: " . $ip);

-	jsAlert($_lang['login_processor_many_failed_logins']);

-	return;

+    @session_destroy();

+    session_unset();

+    if($cip = getenv("HTTP_CLIENT_IP")) {

+        $ip = $cip;

+    } elseif($cip = getenv("HTTP_X_FORWARDED_FOR")) {

+        $ip = $cip;

+    } elseif($cip = getenv("REMOTE_ADDR")) {

+        $ip = $cip;

+    } else {

+        $ip = "UNKNOWN";

+    }

+    $log = new EvolutionCMS\Legacy\LogHandler();

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

-	$fields = array();

-	$fields['failedlogincount'] = '0';

-	$fields['blockeduntil'] = time() - 1;

-	$modx->getDatabase()->update(

-	    $fields,

+    $fields = array();

+    $fields['failedlogincount'] = '0';

+    $fields['blockeduntil'] = time() - 1;

+    $modx->getDatabase()->update(

+        $fields,

         $modx->getDatabase()->getFullTableName('user_attributes'),

         "internalKey='{$internalKey}'"

     );

@@ -125,94 +125,94 @@ 
 

 // this user has been blocked by an admin, so no way he's loggin in!

 if($blocked == '1') {

-	@session_destroy();

-	session_unset();

-	jsAlert($_lang['login_processor_blocked1']);

-	return;

+    @session_destroy();

+    session_unset();

+    jsAlert($_lang['login_processor_blocked1']);

+    return;

 }

 

 // blockuntil: this user has a block until date

 if($blockeduntildate > time()) {

-	@session_destroy();

-	session_unset();

-	jsAlert($_lang['login_processor_blocked2']);

-	return;

+    @session_destroy();

+    session_unset();

+    jsAlert($_lang['login_processor_blocked2']);

+    return;

 }

 

 // blockafter: this user has a block after date

 if($blockedafterdate > 0 && $blockedafterdate < time()) {

-	@session_destroy();

-	session_unset();

-	jsAlert($_lang['login_processor_blocked3']);

-	return;

+    @session_destroy();

+    session_unset();

+    jsAlert($_lang['login_processor_blocked3']);

+    return;

 }

 

 // allowed ip

 if(!empty($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))))) {

-		jsAlert($_lang['login_processor_remote_ip']);

-		return;

-	}

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

+        jsAlert($_lang['login_processor_remote_ip']);

+        return;

+    }

 }

 

 // allowed days

 if(!empty($allowed_days)) {

-	$date = getdate();

-	$day = $date['wday'] + 1;

-	if(!in_array($day,explode(',',$allowed_days))) {

-		jsAlert($_lang['login_processor_date']);

-		return;

-	}

+    $date = getdate();

+    $day = $date['wday'] + 1;

+    if(!in_array($day,explode(',',$allowed_days))) {

+        jsAlert($_lang['login_processor_date']);

+        return;

+    }

 }

 

 // invoke OnManagerAuthentication event

 $rt = $modx->invokeEvent('OnManagerAuthentication', array(

-		'userid' => $internalKey,

-		'username' => $username,

-		'userpassword' => $givenPassword,

-		'savedpassword' => $dbasePassword,

-		'rememberme' => $rememberme

-	));

+        'userid' => $internalKey,

+        'username' => $username,

+        'userpassword' => $givenPassword,

+        'savedpassword' => $dbasePassword,

+        'rememberme' => $rememberme

+    ));

 

 // check if plugin authenticated the user

 $matchPassword = false;

 if(!isset($rt) || !$rt || (is_array($rt) && !in_array(true, $rt))) {

-	// check user password - local authentication

-	$hashType = $modx->getManagerApi()->getHashType($dbasePassword);

-	if($hashType == 'phpass') {

-		$matchPassword = login($username, $requestPassword, $dbasePassword);

-	} elseif($hashType == 'md5') {

-		$matchPassword = loginMD5($internalKey, $requestPassword, $dbasePassword, $username);

-	} elseif($hashType == 'v1') {

-		$matchPassword = loginV1($internalKey, $requestPassword, $dbasePassword, $username);

-	} else {

-		$matchPassword = false;

-	}

+    // check user password - local authentication

+    $hashType = $modx->getManagerApi()->getHashType($dbasePassword);

+    if($hashType == 'phpass') {

+        $matchPassword = login($username, $requestPassword, $dbasePassword);

+    } elseif($hashType == 'md5') {

+        $matchPassword = loginMD5($internalKey, $requestPassword, $dbasePassword, $username);

+    } elseif($hashType == 'v1') {

+        $matchPassword = loginV1($internalKey, $requestPassword, $dbasePassword, $username);

+    } else {

+        $matchPassword = false;

+    }

 } else if($rt === true || (is_array($rt) && in_array(true, $rt))) {

-	$matchPassword = true;

+    $matchPassword = true;

 }

 

 if(!$matchPassword) {

-	jsAlert($_lang['login_processor_wrong_password']);

-	incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes ?? 10);

-	return;

+    jsAlert($_lang['login_processor_wrong_password']);

+    incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes ?? 10);

+    return;

 }

 

 if($modx->config['use_captcha'] == 1) {

-	if(!isset ($_SESSION['veriword'])) {

-		jsAlert($_lang['login_processor_captcha_config']);

-		return;

-	} elseif($_SESSION['veriword'] != $captcha_code) {

-		jsAlert($_lang['login_processor_bad_code']);

-		incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes ?? 10);

-		return;

-	}

+    if(!isset ($_SESSION['veriword'])) {

+        jsAlert($_lang['login_processor_captcha_config']);

+        return;

+    } elseif($_SESSION['veriword'] != $captcha_code) {

+        jsAlert($_lang['login_processor_bad_code']);

+        incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes ?? 10);

+        return;

+    }

 }

 

 $modx->cleanupExpiredLocks();

@@ -251,36 +251,36 @@ 
 $_SESSION['mgrToken'] = md5($currentsessionid);

 

 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', '<')) {

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

-	}

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

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

+    }

 } else {

-	$_SESSION['modx.mgr.session.cookie.lifetime'] = 0;

+    $_SESSION['modx.mgr.session.cookie.lifetime'] = 0;

 

-	// Remove the Remember Me cookie

-	setcookie('modx_remember_manager', '', time() - 3600, MODX_BASE_URL);

+    // Remove the Remember Me cookie

+    setcookie('modx_remember_manager', '', time() - 3600, MODX_BASE_URL);

 }

 

 // Check if user already has an active session, if not check if user pressed logout end of last session

 $rs = $modx->getDatabase()->select('lasthit', $modx->getDatabase()->getFullTableName('active_user_sessions'), "internalKey='{$internalKey}'");

 $activeSession = $modx->getDatabase()->getValue($rs);

 if(!$activeSession) {

-	$rs = $modx->getDatabase()->select('lasthit', $modx->getDatabase()->getFullTableName('active_users'), "internalKey='{$internalKey}' AND action != 8");

-	if($lastHit = $modx->getDatabase()->getValue($rs)) {

-		$_SESSION['show_logout_reminder'] = array(

-			'type' => 'logout_reminder',

-			'lastHit' => $lastHit

-		);

-	}

+    $rs = $modx->getDatabase()->select('lasthit', $modx->getDatabase()->getFullTableName('active_users'), "internalKey='{$internalKey}' AND action != 8");

+    if($lastHit = $modx->getDatabase()->getValue($rs)) {

+        $_SESSION['show_logout_reminder'] = array(

+            'type' => 'logout_reminder',

+            'lastHit' => $lastHit

+        );

+    }

 }

 

 $log = new EvolutionCMS\Legacy\LogHandler();

@@ -288,11 +288,11 @@ 
 

 // invoke OnManagerLogin event

 $modx->invokeEvent('OnManagerLogin', array(

-		'userid' => $internalKey,

-		'username' => $username,

-		'userpassword' => $givenPassword,

-		'rememberme' => $rememberme

-	));

+        'userid' => $internalKey,

+        'username' => $username,

+        'userpassword' => $givenPassword,

+        'rememberme' => $rememberme

+    ));

 

 // check if we should redirect user to a web page

 $rs = $modx->getDatabase()->select(

@@ -303,17 +303,17 @@ 
 $id = (int)$modx->getDatabase()->getValue($rs);

 $ajax = (int)get_by_key($_POST, 'ajax', 0, 'is_scalar');

 if($id > 0) {

-	$header = 'Location: ' . $modx->makeUrl($id, '', '', 'full');

-	if($ajax === 1) {

-		echo $header;

-	} else {

-		header($header);

-	}

+    $header = 'Location: ' . $modx->makeUrl($id, '', '', 'full');

+    if($ajax === 1) {

+        echo $header;

+    } else {

+        header($header);

+    }

 } else {

-	$header = 'Location: ' . MODX_MANAGER_URL;

-	if($ajax === 1) {

-		echo $header;

-	} else {

-		header($header);

-	}

+    $header = 'Location: ' . MODX_MANAGER_URL;

+    if($ajax === 1) {

+        echo $header;

+    } else {

+        header($header);

+    }

 }

Spacing +52 added lines, -52 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);

 

-if (file_exists(dirname(__DIR__) . '/config.php')) {

-    $config = require dirname(__DIR__) . '/config.php';

-} elseif (file_exists(dirname(__DIR__, 2) . '/config.php')) {

-    $config = require dirname(__DIR__, 2) . '/config.php';

+if (file_exists(dirname(__DIR__).'/config.php')) {

+    $config = require dirname(__DIR__).'/config.php';

+} elseif (file_exists(dirname(__DIR__, 2).'/config.php')) {

+    $config = require dirname(__DIR__, 2).'/config.php';

 } else {

     $config = [

         'root' => dirname(__DIR__, 2)

     ];

 }

-if (!empty($config['root']) && file_exists($config['root']. '/index.php')) {

-    require_once $config['root'] . '/index.php';

+if (!empty($config['root']) && file_exists($config['root'].'/index.php')) {

+    require_once $config['root'].'/index.php';

 } else {

     echo "<h3>Unable to load configuration settings</h3>";

     echo "Please run the EVO <a href='../install'>install utility</a>";

@@ -32,7 +32,7 @@ 
 $_lang = ManagerTheme::getLexicon();

 

 // Initialize System Alert Message Queque

-if(!isset($_SESSION['SystemAlertMsgQueque'])) {

+if (!isset($_SESSION['SystemAlertMsgQueque'])) {

 	$_SESSION['SystemAlertMsgQueque'] = array();

 }

 $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];

@@ -56,13 +56,13 @@ 
 		'rememberme' => $rememberme

 	));

 $fields = 'mu.*, ua.*';

-$from = $modx->getDatabase()->getFullTableName('manager_users') . ' AS mu, ' .

-    $modx->getDatabase()->getFullTableName('user_attributes') . ' AS ua';

+$from = $modx->getDatabase()->getFullTableName('manager_users').' AS mu, '.

+    $modx->getDatabase()->getFullTableName('user_attributes').' AS ua';

 $where = "BINARY mu.username='{$username}' and ua.internalKey=mu.id";

 $rs = $modx->getDatabase()->select($fields, $from, $where);

 $limit = $modx->getDatabase()->getRecordCount($rs);

 

-if($limit == 0 || $limit > 1) {

+if ($limit == 0 || $limit > 1) {

 	jsAlert($_lang['login_processor_unknown_user']);

 	return;

 }

@@ -87,32 +87,32 @@ 
     $modx->getDatabase()->getFullTableName('user_settings'),

     "user='{$internalKey}' AND setting_value!=''"

 );

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

+while ($row = $modx->getDatabase()->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 EvolutionCMS\Legacy\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;

@@ -124,7 +124,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']);

@@ -132,7 +132,7 @@ 
 }

 

 // blockuntil: this user has a block until date

-if($blockeduntildate > time()) {

+if ($blockeduntildate > time()) {

 	@session_destroy();

 	session_unset();

 	jsAlert($_lang['login_processor_blocked2']);

@@ -140,7 +140,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']);

@@ -148,24 +148,24 @@ 
 }

 

 // allowed ip

-if(!empty($allowed_ip)) {

-	if(($hostname = gethostbyaddr($_SERVER['REMOTE_ADDR'])) && ($hostname != $_SERVER['REMOTE_ADDR'])) {

-		if(gethostbyname($hostname) != $_SERVER['REMOTE_ADDR']) {

+if (!empty($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(!empty($allowed_days)) {

+if (!empty($allowed_days)) {

 	$date = getdate();

 	$day = $date['wday'] + 1;

-	if(!in_array($day,explode(',',$allowed_days))) {

+	if (!in_array($day, explode(',', $allowed_days))) {

 		jsAlert($_lang['login_processor_date']);

 		return;

 	}

@@ -182,33 +182,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->getManagerApi()->getHashType($dbasePassword);

-	if($hashType == 'phpass') {

+	if ($hashType == 'phpass') {

 		$matchPassword = login($username, $requestPassword, $dbasePassword);

-	} elseif($hashType == 'md5') {

+	} elseif ($hashType == 'md5') {

 		$matchPassword = loginMD5($internalKey, $requestPassword, $dbasePassword, $username);

-	} elseif($hashType == 'v1') {

+	} elseif ($hashType == 'v1') {

 		$matchPassword = loginV1($internalKey, $requestPassword, $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 ?? 10);

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

 		return;

@@ -237,28 +237,28 @@ 
 

 // successful login so reset fail count and update key values

 $modx->getDatabase()->update(

-    'failedlogincount=0, ' . 'logincount=logincount+1, ' . 'lastlogin=thislogin, ' . 'thislogin=' . time() . ', ' . "sessionid='{$currentsessionid}'",

+    'failedlogincount=0, '.'logincount=logincount+1, '.'lastlogin=thislogin, '.'thislogin='.time().', '."sessionid='{$currentsessionid}'",

     $modx->getDatabase()->getFullTableName('user_attributes'),

     "internalKey='{$internalKey}'"

 );

 

 // get user's document groups

 $i = 0;

-$rs = $modx->getDatabase()->select('uga.documentgroup', $modx->getDatabase()->getFullTableName('member_groups') . ' ug

-		INNER JOIN ' . $modx->getDatabase()->getFullTableName('membergroup_access') . ' uga ON uga.membergroup=ug.user_group', "ug.member='{$internalKey}'");

+$rs = $modx->getDatabase()->select('uga.documentgroup', $modx->getDatabase()->getFullTableName('member_groups').' ug

+		INNER JOIN ' . $modx->getDatabase()->getFullTableName('membergroup_access').' uga ON uga.membergroup=ug.user_group', "ug.member='{$internalKey}'");

 $_SESSION['mgrDocgroups'] = $modx->getDatabase()->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);

@@ -273,9 +273,9 @@ 
 // Check if user already has an active session, if not check if user pressed logout end of last session

 $rs = $modx->getDatabase()->select('lasthit', $modx->getDatabase()->getFullTableName('active_user_sessions'), "internalKey='{$internalKey}'");

 $activeSession = $modx->getDatabase()->getValue($rs);

-if(!$activeSession) {

+if (!$activeSession) {

 	$rs = $modx->getDatabase()->select('lasthit', $modx->getDatabase()->getFullTableName('active_users'), "internalKey='{$internalKey}' AND action != 8");

-	if($lastHit = $modx->getDatabase()->getValue($rs)) {

+	if ($lastHit = $modx->getDatabase()->getValue($rs)) {

 		$_SESSION['show_logout_reminder'] = array(

 			'type' => 'logout_reminder',

 			'lastHit' => $lastHit

@@ -300,18 +300,18 @@ 
     $modx->getDatabase()->getFullTableName('user_settings'),

     "user='{$internalKey}' AND setting_name='manager_login_startup'"

 );

-$id = (int)$modx->getDatabase()->getValue($rs);

-$ajax = (int)get_by_key($_POST, 'ajax', 0, 'is_scalar');

-if($id > 0) {

-	$header = 'Location: ' . $modx->makeUrl($id, '', '', 'full');

-	if($ajax === 1) {

+$id = (int) $modx->getDatabase()->getValue($rs);

+$ajax = (int) get_by_key($_POST, 'ajax', 0, 'is_scalar');

+if ($id > 0) {

+	$header = 'Location: '.$modx->makeUrl($id, '', '', 'full');

+	if ($ajax === 1) {

 		echo $header;

 	} else {

 		header($header);

 	}

 } else {

-	$header = 'Location: ' . MODX_MANAGER_URL;

-	if($ajax === 1) {

+	$header = 'Location: '.MODX_MANAGER_URL;

+	if ($ajax === 1) {

 		echo $header;

 	} else {

 		header($header);

Braces +46 added lines, -46 removed lines

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

-if (! isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {

+if (! isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
 	header('HTTP/1.0 404 Not Found');

 	exit('error');

 }

@@ -7,18 +7,18 @@ 
 define('IN_MANAGER_MODE', true);  // we use this to make sure files are accessed through

 define('MODX_API_MODE', true);

 

-if (file_exists(dirname(__DIR__) . '/config.php')) {

+if (file_exists(dirname(__DIR__) . '/config.php')) {
     $config = require dirname(__DIR__) . '/config.php';

-} elseif (file_exists(dirname(__DIR__, 2) . '/config.php')) {

+} elseif (file_exists(dirname(__DIR__, 2) . '/config.php')) {
     $config = require dirname(__DIR__, 2) . '/config.php';

-} else {

+} else {
     $config = [

         'root' => dirname(__DIR__, 2)

     ];

 }

-if (!empty($config['root']) && file_exists($config['root']. '/index.php')) {

+if (!empty($config['root']) && file_exists($config['root']. '/index.php')) {
     require_once $config['root'] . '/index.php';

-} else {

+} else {
     echo "<h3>Unable to load configuration settings</h3>";

     echo "Please run the EVO <a href='../install'>install utility</a>";

     exit;

@@ -32,7 +32,7 @@ 
 $_lang = ManagerTheme::getLexicon();

 

 // Initialize System Alert Message Queque

-if(!isset($_SESSION['SystemAlertMsgQueque'])) {

+if(!isset($_SESSION['SystemAlertMsgQueque'])) {
 	$_SESSION['SystemAlertMsgQueque'] = array();

 }

 $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];

@@ -62,7 +62,7 @@ 
 $rs = $modx->getDatabase()->select($fields, $from, $where);

 $limit = $modx->getDatabase()->getRecordCount($rs);

 

-if($limit == 0 || $limit > 1) {

+if($limit == 0 || $limit > 1) {
 	jsAlert($_lang['login_processor_unknown_user']);

 	return;

 }

@@ -87,22 +87,22 @@ 
     $modx->getDatabase()->getFullTableName('user_settings'),

     "user='{$internalKey}' AND setting_value!=''"

 );

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

+while($row = $modx->getDatabase()->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 {

+	} else {
 		$ip = "UNKNOWN";

 	}

 	$log = new EvolutionCMS\Legacy\LogHandler();

@@ -112,7 +112,7 @@ 
 }

 

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

@@ -124,7 +124,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']);

@@ -132,7 +132,7 @@ 
 }

 

 // blockuntil: this user has a block until date

-if($blockeduntildate > time()) {

+if($blockeduntildate > time()) {
 	@session_destroy();

 	session_unset();

 	jsAlert($_lang['login_processor_blocked2']);

@@ -140,7 +140,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']);

@@ -148,24 +148,24 @@ 
 }

 

 // allowed ip

-if(!empty($allowed_ip)) {

-	if(($hostname = gethostbyaddr($_SERVER['REMOTE_ADDR'])) && ($hostname != $_SERVER['REMOTE_ADDR'])) {

-		if(gethostbyname($hostname) != $_SERVER['REMOTE_ADDR']) {

+if(!empty($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(!empty($allowed_days)) {

+if(!empty($allowed_days)) {
 	$date = getdate();

 	$day = $date['wday'] + 1;

-	if(!in_array($day,explode(',',$allowed_days))) {

+	if(!in_array($day,explode(',',$allowed_days))) {
 		jsAlert($_lang['login_processor_date']);

 		return;

 	}

@@ -182,33 +182,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->getManagerApi()->getHashType($dbasePassword);

-	if($hashType == 'phpass') {

+	if($hashType == 'phpass') {
 		$matchPassword = login($username, $requestPassword, $dbasePassword);

-	} elseif($hashType == 'md5') {

+	} elseif($hashType == 'md5') {
 		$matchPassword = loginMD5($internalKey, $requestPassword, $dbasePassword, $username);

-	} elseif($hashType == 'v1') {

+	} elseif($hashType == 'v1') {
 		$matchPassword = loginV1($internalKey, $requestPassword, $dbasePassword, $username);

-	} else {

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

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

 		return;

@@ -250,7 +250,7 @@ 
 

 $_SESSION['mgrToken'] = md5($currentsessionid);

 

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

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

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

+	} else {
 		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, NULL, $secure, true);

 	}

-} else {

+} else {
 	$_SESSION['modx.mgr.session.cookie.lifetime'] = 0;

 

 	// Remove the Remember Me cookie

@@ -273,9 +273,9 @@ 
 // Check if user already has an active session, if not check if user pressed logout end of last session

 $rs = $modx->getDatabase()->select('lasthit', $modx->getDatabase()->getFullTableName('active_user_sessions'), "internalKey='{$internalKey}'");

 $activeSession = $modx->getDatabase()->getValue($rs);

-if(!$activeSession) {

+if(!$activeSession) {
 	$rs = $modx->getDatabase()->select('lasthit', $modx->getDatabase()->getFullTableName('active_users'), "internalKey='{$internalKey}' AND action != 8");

-	if($lastHit = $modx->getDatabase()->getValue($rs)) {

+	if($lastHit = $modx->getDatabase()->getValue($rs)) {
 		$_SESSION['show_logout_reminder'] = array(

 			'type' => 'logout_reminder',

 			'lastHit' => $lastHit

@@ -302,18 +302,18 @@ 
 );

 $id = (int)$modx->getDatabase()->getValue($rs);

 $ajax = (int)get_by_key($_POST, 'ajax', 0, 'is_scalar');

-if($id > 0) {

+if($id > 0) {
 	$header = 'Location: ' . $modx->makeUrl($id, '', '', 'full');

-	if($ajax === 1) {

+	if($ajax === 1) {
 		echo $header;

-	} else {

+	} else {
 		header($header);

 	}

-} else {

+} else {
 	$header = 'Location: ' . MODX_MANAGER_URL;

-	if($ajax === 1) {

+	if($ajax === 1) {
 		echo $header;

-	} else {

+	} else {
 		header($header);

 	}

 }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -261,7 +261,7 @@
 	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);

+		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, null, $secure, true);

 	}

 } else {

 	$_SESSION['modx.mgr.session.cookie.lifetime'] = 0;

manager/processors/save_snippet.processor.php

Switch Indentation +85 added lines, -85 removed lines

@@ -65,89 +65,89 @@
 }
 
 switch ($_POST['mode']) {
-    case '23': // Save new snippet
-
-        // invoke OnBeforeSnipFormSave event
-        $modx->invokeEvent("OnBeforeSnipFormSave", array(
-            "mode" => "new",
-            "id" => $id
-        ));
-
-        // disallow duplicate names for new snippets
-        if (EvolutionCMS\Models\SiteSnippet::where('name','=',$name)->first()) {
-            $modx->getManagerApi()->saveFormValues(23);
-            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=23");
-        }
-
-        //do stuff to save the new doc
-        $newid = EvolutionCMS\Models\SiteSnippet::create(compact('name', 'description','snippet','moduleguid','locked','properties','category','disabled','createdon','editedon'))->getKey();
-
-        // invoke OnSnipFormSave event
-        $modx->invokeEvent("OnSnipFormSave", array(
-            "mode" => "new",
-            "id" => $newid
-        ));
-
-        // Set the item name for logger
-        $_SESSION['itemname'] = $name;
-
-        // empty cache
-        $modx->clearCache('full');
-
-        // finished emptying cache - redirect
-        if ($_POST['stay'] != '') {
-            $a = ($_POST['stay'] == '2') ? "22&id=$newid" : "23";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
-            header($header);
-        } else {
-            $header = "Location: index.php?a=76&r=2";
-            header($header);
-        }
-        break;
-    case '22': // Save existing snippet
-        // invoke OnBeforeSnipFormSave event
-        $modx->invokeEvent("OnBeforeSnipFormSave", array(
-            "mode" => "upd",
-            "id" => $id
-        ));
-
-        // disallow duplicate names for snippets
-        if (EvolutionCMS\Models\SiteSnippet::where('id','!=',$id)->where('name','=',$name)->first()) {
-            $modx->getManagerApi()->saveFormValues(22);
-            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=22&id={$id}");
-        }
-
-        //do stuff to save the edited doc
-        $siteSnippet= EvolutionCMS\Models\SiteSnippet::find($id);
-
-        $siteSnippet->update(compact('name', 'description','snippet','moduleguid','locked','properties','category','disabled','editedon'));
-
-        // invoke OnSnipFormSave event
-        $modx->invokeEvent("OnSnipFormSave", array(
-            "mode" => "upd",
-            "id" => $id
-        ));
-
-        // Set the item name for logger
-        $_SESSION['itemname'] = $name;
-
-        // empty cache
-        $modx->clearCache('full');
-
-        if (isset($_POST['runsnippet'])) {
-            run_snippet($snippet);
-        }
-        // finished emptying cache - redirect
-        if ($_POST['stay'] != '') {
-            $a = ($_POST['stay'] == '2') ? "22&id=$id" : "23";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
-            header($header);
-        } else {
-            $modx->unlockElement(4, $id);
-            $header = "Location: index.php?a=76&r=2";
-            header($header);
-        }
-        break;
-    default:
-        $modx->webAlertAndQuit("No operation set in request.");
+        case '23': // Save new snippet
+
+            // invoke OnBeforeSnipFormSave event
+            $modx->invokeEvent("OnBeforeSnipFormSave", array(
+                "mode" => "new",
+                "id" => $id
+            ));
+
+            // disallow duplicate names for new snippets
+            if (EvolutionCMS\Models\SiteSnippet::where('name','=',$name)->first()) {
+                $modx->getManagerApi()->saveFormValues(23);
+                $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=23");
+            }
+
+            //do stuff to save the new doc
+            $newid = EvolutionCMS\Models\SiteSnippet::create(compact('name', 'description','snippet','moduleguid','locked','properties','category','disabled','createdon','editedon'))->getKey();
+
+            // invoke OnSnipFormSave event
+            $modx->invokeEvent("OnSnipFormSave", array(
+                "mode" => "new",
+                "id" => $newid
+            ));
+
+            // Set the item name for logger
+            $_SESSION['itemname'] = $name;
+
+            // empty cache
+            $modx->clearCache('full');
+
+            // finished emptying cache - redirect
+            if ($_POST['stay'] != '') {
+                $a = ($_POST['stay'] == '2') ? "22&id=$newid" : "23";
+                $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+                header($header);
+            } else {
+                $header = "Location: index.php?a=76&r=2";
+                header($header);
+            }
+            break;
+        case '22': // Save existing snippet
+            // invoke OnBeforeSnipFormSave event
+            $modx->invokeEvent("OnBeforeSnipFormSave", array(
+                "mode" => "upd",
+                "id" => $id
+            ));
+
+            // disallow duplicate names for snippets
+            if (EvolutionCMS\Models\SiteSnippet::where('id','!=',$id)->where('name','=',$name)->first()) {
+                $modx->getManagerApi()->saveFormValues(22);
+                $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=22&id={$id}");
+            }
+
+            //do stuff to save the edited doc
+            $siteSnippet= EvolutionCMS\Models\SiteSnippet::find($id);
+
+            $siteSnippet->update(compact('name', 'description','snippet','moduleguid','locked','properties','category','disabled','editedon'));
+
+            // invoke OnSnipFormSave event
+            $modx->invokeEvent("OnSnipFormSave", array(
+                "mode" => "upd",
+                "id" => $id
+            ));
+
+            // Set the item name for logger
+            $_SESSION['itemname'] = $name;
+
+            // empty cache
+            $modx->clearCache('full');
+
+            if (isset($_POST['runsnippet'])) {
+                run_snippet($snippet);
+            }
+            // finished emptying cache - redirect
+            if ($_POST['stay'] != '') {
+                $a = ($_POST['stay'] == '2') ? "22&id=$id" : "23";
+                $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+                header($header);
+            } else {
+                $modx->unlockElement(4, $id);
+                $header = "Location: index.php?a=76&r=2";
+                header($header);
+            }
+            break;
+        default:
+            $modx->webAlertAndQuit("No operation set in request.");
 }

Spacing +14 added lines, -14 removed lines

@@ -1,12 +1,12 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('save_snippet')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = (int)$_POST['id'];
+$id = (int) $_POST['id'];
 $snippet = trim($_POST['post']);
 $name = trim($_POST['name']);
 $description = $_POST['description'];
@@ -32,11 +32,11 @@ 
 
 //Kyle Jaebker - added category support
 if (empty($_POST['newcategory']) && $_POST['categoryid'] > 0) {
-    $category = (int)$_POST['categoryid'];
+    $category = (int) $_POST['categoryid'];
 } elseif (empty($_POST['newcategory']) && $_POST['categoryid'] <= 0) {
     $category = 0;
 } else {
-    include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+    include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
     $category = checkCategory($_POST['newcategory']);
     if (!$category) {
         $category = newCategory($_POST['newcategory']);
@@ -54,12 +54,12 @@ 
     $moduleguid = isset($parsed['guid']) ? $parsed['guid'] : $moduleguid;
 
     $description = isset($parsed['description']) ? $parsed['description'] : $description;
-    $version = isset($parsed['version']) ? '<b>' . $parsed['version'] . '</b> ' : '';
+    $version = isset($parsed['version']) ? '<b>'.$parsed['version'].'</b> ' : '';
     if ($version) {
-        $description = $version . trim(preg_replace('/(<b>.+?)+(<\/b>)/i', '', $description));
+        $description = $version.trim(preg_replace('/(<b>.+?)+(<\/b>)/i', '', $description));
     }
     if (isset($parsed['modx_category'])) {
-        include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+        include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
         $category = getCategory($parsed['modx_category']);
     }
 }
@@ -74,13 +74,13 @@ 
         ));
 
         // disallow duplicate names for new snippets
-        if (EvolutionCMS\Models\SiteSnippet::where('name','=',$name)->first()) {
+        if (EvolutionCMS\Models\SiteSnippet::where('name', '=', $name)->first()) {
             $modx->getManagerApi()->saveFormValues(23);
             $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=23");
         }
 
         //do stuff to save the new doc
-        $newid = EvolutionCMS\Models\SiteSnippet::create(compact('name', 'description','snippet','moduleguid','locked','properties','category','disabled','createdon','editedon'))->getKey();
+        $newid = EvolutionCMS\Models\SiteSnippet::create(compact('name', 'description', 'snippet', 'moduleguid', 'locked', 'properties', 'category', 'disabled', 'createdon', 'editedon'))->getKey();
 
         // invoke OnSnipFormSave event
         $modx->invokeEvent("OnSnipFormSave", array(
@@ -97,7 +97,7 @@ 
         // finished emptying cache - redirect
         if ($_POST['stay'] != '') {
             $a = ($_POST['stay'] == '2') ? "22&id=$newid" : "23";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+            $header = "Location: index.php?a=".$a."&r=2&stay=".$_POST['stay'];
             header($header);
         } else {
             $header = "Location: index.php?a=76&r=2";
@@ -112,15 +112,15 @@ 
         ));
 
         // disallow duplicate names for snippets
-        if (EvolutionCMS\Models\SiteSnippet::where('id','!=',$id)->where('name','=',$name)->first()) {
+        if (EvolutionCMS\Models\SiteSnippet::where('id', '!=', $id)->where('name', '=', $name)->first()) {
             $modx->getManagerApi()->saveFormValues(22);
             $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=22&id={$id}");
         }
 
         //do stuff to save the edited doc
-        $siteSnippet= EvolutionCMS\Models\SiteSnippet::find($id);
+        $siteSnippet = EvolutionCMS\Models\SiteSnippet::find($id);
 
-        $siteSnippet->update(compact('name', 'description','snippet','moduleguid','locked','properties','category','disabled','editedon'));
+        $siteSnippet->update(compact('name', 'description', 'snippet', 'moduleguid', 'locked', 'properties', 'category', 'disabled', 'editedon'));
 
         // invoke OnSnipFormSave event
         $modx->invokeEvent("OnSnipFormSave", array(
@@ -140,7 +140,7 @@ 
         // finished emptying cache - redirect
         if ($_POST['stay'] != '') {
             $a = ($_POST['stay'] == '2') ? "22&id=$id" : "23";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+            $header = "Location: index.php?a=".$a."&r=2&stay=".$_POST['stay'];
             header($header);
         } else {
             $modx->unlockElement(4, $id);

manager/processors/duplicate_snippet.processor.php

Indentation +2 added lines, -2 removed lines

@@ -3,12 +3,12 @@
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('new_snippet')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates

Spacing +6 added lines, -6 removed lines

@@ -1,13 +1,13 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('new_snippet')) {
+if (!$modx->hasPermission('new_snippet')) {
 	$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"]);
 }
 
@@ -15,7 +15,7 @@ 
 $snippet = EvolutionCMS\Models\SiteSnippet::findOrFail($id);
 $name = $snippet ->name;
 $count = EvolutionCMS\Models\SiteSnippet::where('name', 'like', $name.' '.$_lang['duplicated_el_suffix'].'%')->count();
-if($count>=1) $count = ' '.($count+1);
+if ($count >= 1) $count = ' '.($count + 1);
 else $count = '';
 
 // duplicate Snippet
@@ -27,5 +27,5 @@ 
 $_SESSION['itemname'] = $newSnippet->name;
 
 // finish duplicating - redirect to new snippet
-$header="Location: index.php?r=2&a=22&id=".$newSnippet->getKey();
+$header = "Location: index.php?r=2&a=22&id=".$newSnippet->getKey();
 header($header);

Braces +5 added lines, -2 removed lines

@@ -15,8 +15,11 @@
 $snippet = EvolutionCMS\Models\SiteSnippet::findOrFail($id);
 $name = $snippet ->name;
 $count = EvolutionCMS\Models\SiteSnippet::where('name', 'like', $name.' '.$_lang['duplicated_el_suffix'].'%')->count();
-if($count>=1) $count = ' '.($count+1);
-else $count = '';
+if($count>=1) {
+    $count = ' '.($count+1);
+} else {
+    $count = '';
+}
 
 // duplicate Snippet
 $newSnippet = $snippet->replicate();

manager/actions/files.dynamic.php

Spacing +59 added lines, -59 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('file_manager')) {
@@ -9,7 +9,7 @@ 
 $newToken = makeToken();
 
 // settings
-$theme_image_path = MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/images/';
+$theme_image_path = MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/images/';
 $excludes = array(
     '.',
     '..',
@@ -17,9 +17,9 @@ 
     '.git',
     '.idea'
 );
-$alias_suffix = (!empty($friendly_url_suffix)) ? ',' . ltrim($friendly_url_suffix, '.') : '';
-$editablefiles = explode(',', 'txt,php,tpl,less,sass,shtml,html,htm,xml,js,css,pageCache,htaccess,json,ini' . $alias_suffix);
-$inlineviewablefiles = explode(',', 'txt,php,tpl,less,sass,html,htm,xml,js,css,pageCache,htaccess,json,ini' . $alias_suffix);
+$alias_suffix = (!empty($friendly_url_suffix)) ? ','.ltrim($friendly_url_suffix, '.') : '';
+$editablefiles = explode(',', 'txt,php,tpl,less,sass,shtml,html,htm,xml,js,css,pageCache,htaccess,json,ini'.$alias_suffix);
+$inlineviewablefiles = explode(',', 'txt,php,tpl,less,sass,html,htm,xml,js,css,pageCache,htaccess,json,ini'.$alias_suffix);
 $viewablefiles = explode(',', 'jpg,gif,png,ico');
 
 $editablefiles = add_dot($editablefiles);
@@ -32,31 +32,31 @@ 
 {
 */
 $protected_path[] = MODX_MANAGER_PATH;
-$protected_path[] = MODX_BASE_PATH . 'temp/backup';
-$protected_path[] = MODX_BASE_PATH . 'assets/backup';
+$protected_path[] = MODX_BASE_PATH.'temp/backup';
+$protected_path[] = MODX_BASE_PATH.'assets/backup';
 
 if (!$modx->hasPermission('save_plugin')) {
-    $protected_path[] = MODX_BASE_PATH . 'assets/plugins';
+    $protected_path[] = MODX_BASE_PATH.'assets/plugins';
 }
 if (!$modx->hasPermission('save_snippet')) {
-    $protected_path[] = MODX_BASE_PATH . 'assets/snippets';
+    $protected_path[] = MODX_BASE_PATH.'assets/snippets';
 }
 if (!$modx->hasPermission('save_template')) {
-    $protected_path[] = MODX_BASE_PATH . 'assets/templates';
+    $protected_path[] = MODX_BASE_PATH.'assets/templates';
 }
 if (!$modx->hasPermission('save_module')) {
-    $protected_path[] = MODX_BASE_PATH . 'assets/modules';
+    $protected_path[] = MODX_BASE_PATH.'assets/modules';
 }
 if (!$modx->hasPermission('empty_cache')) {
-    $protected_path[] = MODX_BASE_PATH . 'assets/cache';
+    $protected_path[] = MODX_BASE_PATH.'assets/cache';
 }
 if (!$modx->hasPermission('import_static')) {
-    $protected_path[] = MODX_BASE_PATH . 'temp/import';
-    $protected_path[] = MODX_BASE_PATH . 'assets/import';
+    $protected_path[] = MODX_BASE_PATH.'temp/import';
+    $protected_path[] = MODX_BASE_PATH.'assets/import';
 }
 if (!$modx->hasPermission('export_static')) {
-    $protected_path[] = MODX_BASE_PATH . 'temp/export';
-    $protected_path[] = MODX_BASE_PATH . 'assets/export';
+    $protected_path[] = MODX_BASE_PATH.'temp/export';
+    $protected_path[] = MODX_BASE_PATH.'assets/export';
 }
 /*
 }
@@ -98,15 +98,15 @@ 
 $rw = realpath('../');
 $webstart_path = str_replace('\\', '/', str_replace($rw, '', $rf));
 if (substr($webstart_path, 0, 1) == '/') {
-    $webstart_path = '..' . $webstart_path;
+    $webstart_path = '..'.$webstart_path;
 } else {
-    $webstart_path = '../' . $webstart_path;
+    $webstart_path = '../'.$webstart_path;
 }
 
 ?>
     <script type="text/javascript">
 
-        var current_path = '<?= $startpath;?>';
+        var current_path = '<?= $startpath; ?>';
 
         function viewfile (url)
         {
@@ -142,7 +142,7 @@ 
         function unzipFile (file)
         {
             if (confirmUnzip()) {
-                window.location.href = "index.php?a=31&mode=unzip&path=" + current_path + '/&file=' + file + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=unzip&path=" + current_path + '/&file=' + file + "&token=<?= $newToken; ?>";
                 return false;
             }
         }
@@ -164,7 +164,7 @@ 
         function deleteFolder (folder, status)
         {
             if (confirmDeleteFolder(status)) {
-                window.location.href = "index.php?a=31&mode=deletefolder&path=" + current_path + "&folderpath=" + current_path + '/' + folder + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=deletefolder&path=" + current_path + "&folderpath=" + current_path + '/' + folder + "&token=<?= $newToken; ?>";
                 return false;
             }
         }
@@ -172,7 +172,7 @@ 
         function deleteFile (file)
         {
             if (confirmDelete()) {
-                window.location.href = "index.php?a=31&mode=delete&path=" + current_path + '/' + file + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=delete&path=" + current_path + '/' + file + "&token=<?= $newToken; ?>";
                 return false;
             }
         }
@@ -181,7 +181,7 @@ 
         {
             var newFilename = prompt("<?= $_lang["files_dynamic_new_file_name"] ?>", file);
             if (newFilename !== null && newFilename !== file) {
-                window.location.href = "index.php?a=31&mode=duplicate&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=duplicate&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken; ?>";
             }
         }
 
@@ -189,7 +189,7 @@ 
         {
             var newDirname = prompt("<?= $_lang["files_dynamic_new_folder_name"] ?>", dir);
             if (newDirname !== null && newDirname !== dir) {
-                window.location.href = "index.php?a=31&mode=renameFolder&path=" + current_path + '&dirname=' + dir + "&newDirname=" + newDirname + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=renameFolder&path=" + current_path + '&dirname=' + dir + "&newDirname=" + newDirname + "&token=<?= $newToken; ?>";
             }
         }
 
@@ -197,7 +197,7 @@ 
         {
             var newFilename = prompt("<?= $_lang["files_dynamic_new_file_name"] ?>", file);
             if (newFilename !== null && newFilename !== file) {
-                window.location.href = "index.php?a=31&mode=renameFile&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken;?>";
+                window.location.href = "index.php?a=31&mode=renameFile&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken; ?>";
             }
         }
 
@@ -216,7 +216,7 @@ 
             <?php endif ?>
             <?php
             if (isset($_GET['mode']) && $_GET['mode'] !== 'drill') {
-                $href = 'a=31&path=' . urlencode($_REQUEST['path']);
+                $href = 'a=31&path='.urlencode($_REQUEST['path']);
             } else {
                 $href = 'a=2';
             }
@@ -226,12 +226,12 @@ 
                 $tpl = '<a class="btn btn-secondary" href="[+href+]" onclick="return getFolderName(this);"><i class="[+image+]"></i><span>[+subject+]</span></a>';
                 $ph['image'] = $_style['files_folder-open'];
                 $ph['subject'] = $_lang['add_folder'];
-                $ph['href'] = 'index.php?a=31&mode=newfolder&path=' . urlencode($startpath) . '&name=';
+                $ph['href'] = 'index.php?a=31&mode=newfolder&path='.urlencode($startpath).'&name=';
                 $_ = parsePlaceholder($tpl, $ph);
 
-                $tpl = '<a class="btn btn-secondary" href="[+href+]" onclick="return getFileName(this);"><i class="[+image+]"></i><span>' . $_lang['files.dynamic.php1'] . '</span></a>';
+                $tpl = '<a class="btn btn-secondary" href="[+href+]" onclick="return getFileName(this);"><i class="[+image+]"></i><span>'.$_lang['files.dynamic.php1'].'</span></a>';
                 $ph['image'] = $_style['files_page_html'];
-                $ph['href'] = 'index.php?a=31&mode=newfile&path=' . urlencode($startpath) . '&name=';
+                $ph['href'] = 'index.php?a=31&mode=newfile&path='.urlencode($startpath).'&name=';
                 $_ .= parsePlaceholder($tpl, $ph);
                 echo $_;
             }
@@ -261,12 +261,12 @@ 
             $ph = array();
             $ph['style_path'] = $theme_image_path;
             // To Top Level with folder icon to the left
-            if ($startpath == $filemanager_path || $startpath . '/' == $filemanager_path) {
-                $ph['image'] = '' . $_style['files_top'] . '';
+            if ($startpath == $filemanager_path || $startpath.'/' == $filemanager_path) {
+                $ph['image'] = ''.$_style['files_top'].'';
                 $ph['subject'] = '<span>Top</span>';
             } else {
-                $ph['image'] = '' . $_style['files_top'] . '';
-                $ph['subject'] = '<a href="index.php?a=31&mode=drill&path=' . $filemanager_path . '">Top</a>/';
+                $ph['image'] = ''.$_style['files_top'].'';
+                $ph['subject'] = '<a href="index.php?a=31&mode=drill&path='.$filemanager_path.'">Top</a>/';
             }
 
             echo parsePlaceholder($tpl, $ph);
@@ -283,12 +283,12 @@ 
                     if (empty($v)) {
                         continue;
                     }
-                    $path .= rtrim($v, '/') . '/';
+                    $path .= rtrim($v, '/').'/';
                     if (1 < $count) {
-                        $href = 'index.php?a=31&mode=drill&path=' . urlencode($filemanager_path . $path);
-                        $pieces[$i] = '<a href="' . $href . '">' . trim($v, '/') . '</a>';
+                        $href = 'index.php?a=31&mode=drill&path='.urlencode($filemanager_path.$path);
+                        $pieces[$i] = '<a href="'.$href.'">'.trim($v, '/').'</a>';
                     } else {
-                        $pieces[$i] = '<span>' . trim($v, '/') . '</span>';
+                        $pieces[$i] = '<span>'.trim($v, '/').'</span>';
                     }
                     $count--;
                 }
@@ -301,16 +301,16 @@ 
         </div>
         <?php
         // check to see user isn't trying to move below the document_root
-        if (substr(strtolower(str_replace('//', '/', $startpath . "/")), 0, $len) != strtolower(str_replace('//', '/', $filemanager_path . '/'))) {
+        if (substr(strtolower(str_replace('//', '/', $startpath."/")), 0, $len) != strtolower(str_replace('//', '/', $filemanager_path.'/'))) {
             $modx->webAlertAndQuit($_lang["files_access_denied"]);
         }
 
         // Unzip .zip files - by Raymond
         if ($enablefileunzip && get_by_key($_REQUEST, 'mode') == 'unzip' && is_writable($startpath)) {
-            if (!$err = unzip(realpath("{$startpath}/" . $_REQUEST['file']), realpath($startpath))) {
-                echo '<span class="warning"><b>' . $_lang['file_unzip_fail'] . ($err === 0 ? 'Missing zip library (php_zip.dll / zip.so)' : '') . '</b></span><br /><br />';
+            if (!$err = unzip(realpath("{$startpath}/".$_REQUEST['file']), realpath($startpath))) {
+                echo '<span class="warning"><b>'.$_lang['file_unzip_fail'].($err === 0 ? 'Missing zip library (php_zip.dll / zip.so)' : '').'</b></span><br /><br />';
             } else {
-                echo '<span class="success"><b>' . $_lang['file_unzip'] . '</b></span><br /><br />';
+                echo '<span class="success"><b>'.$_lang['file_unzip'].'</b></span><br /><br />';
             }
         }
         // End Unzip - Raymond
@@ -322,9 +322,9 @@ 
             if (get_by_key($_REQUEST, 'mode') == 'deletefolder') {
                 $folder = $_REQUEST['folderpath'];
                 if (!$token_check || !@rrmdir($folder)) {
-                    echo '<span class="warning"><b>' . $_lang['file_folder_not_deleted'] . '</b></span><br /><br />';
+                    echo '<span class="warning"><b>'.$_lang['file_folder_not_deleted'].'</b></span><br /><br />';
                 } else {
-                    echo '<span class="success"><b>' . $_lang['file_folder_deleted'] . '</b></span><br /><br />';
+                    echo '<span class="success"><b>'.$_lang['file_folder_deleted'].'</b></span><br /><br />';
                 }
             }
 
@@ -335,10 +335,10 @@ 
                 if (!mkdirs("{$startpath}/{$foldername}", 0777)) {
                     echo '<span class="warning"><b>', $_lang['file_folder_not_created'], '</b></span><br /><br />';
                 } else {
-                    if (!@chmod($startpath . '/' . $foldername, $newfolderaccessmode)) {
-                        echo '<span class="warning"><b>' . $_lang['file_folder_chmod_error'] . '</b></span><br /><br />';
+                    if (!@chmod($startpath.'/'.$foldername, $newfolderaccessmode)) {
+                        echo '<span class="warning"><b>'.$_lang['file_folder_chmod_error'].'</b></span><br /><br />';
                     } else {
-                        echo '<span class="success"><b>' . $_lang['file_folder_created'] . '</b></span><br /><br />';
+                        echo '<span class="success"><b>'.$_lang['file_folder_created'].'</b></span><br /><br />';
                     }
                 }
                 umask($old_umask);
@@ -350,7 +350,7 @@ 
                 $filename = $modx->getDatabase()->escape($filename);
 
                 if (!checkExtension($filename)) {
-                    echo '<span class="warning"><b>' . $_lang['files_filetype_notok'] . '</b></span><br /><br />';
+                    echo '<span class="warning"><b>'.$_lang['files_filetype_notok'].'</b></span><br /><br />';
                 } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $filename) !== 0) {
                     echo $_lang['files.dynamic.php3'];
                 } else {
@@ -372,11 +372,11 @@ 
                 $newFilename = $modx->getDatabase()->escape($newFilename);
 
                 if (!checkExtension($newFilename)) {
-                    echo '<span class="warning"><b>' . $_lang['files_filetype_notok'] . '</b></span><br /><br />';
+                    echo '<span class="warning"><b>'.$_lang['files_filetype_notok'].'</b></span><br /><br />';
                 } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newFilename) !== 0) {
                     echo $_lang['files.dynamic.php3'];
                 } else {
-                    if (!copy($filename, MODX_BASE_PATH . $newFilename)) {
+                    if (!copy($filename, MODX_BASE_PATH.$newFilename)) {
                         echo $_lang['files.dynamic.php5'];
                     }
                     umask($old_umask);
@@ -385,7 +385,7 @@ 
             // Rename folder here
             if (get_by_key($_REQUEST, 'mode') == 'renameFolder') {
                 $old_umask = umask(0);
-                $dirname = $_REQUEST['path'] . '/' . $_REQUEST['dirname'];
+                $dirname = $_REQUEST['path'].'/'.$_REQUEST['dirname'];
                 $dirname = $modx->getDatabase()->escape($dirname);
                 $newDirname = str_replace(array(
                     '..\\',
@@ -397,7 +397,7 @@ 
 
                 if (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newDirname) !== 0) {
                     echo $_lang['files.dynamic.php3'];
-                } else if (!rename($dirname, $_REQUEST['path'] . '/' . $newDirname)) {
+                } else if (!rename($dirname, $_REQUEST['path'].'/'.$newDirname)) {
                     echo '<span class="warning"><b>', $_lang['file_folder_not_created'], '</b></span><br /><br />';
                 }
                 umask($old_umask);
@@ -417,11 +417,11 @@ 
                 $newFilename = $modx->getDatabase()->escape($newFilename);
 
                 if (!checkExtension($newFilename)) {
-                    echo '<span class="warning"><b>' . $_lang['files_filetype_notok'] . '</b></span><br /><br />';
+                    echo '<span class="warning"><b>'.$_lang['files_filetype_notok'].'</b></span><br /><br />';
                 } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newFilename) !== 0) {
                     echo $_lang['files.dynamic.php3'];
                 } else {
-                    if (!rename($filename, $path . '/' . $newFilename)) {
+                    if (!rename($filename, $path.'/'.$newFilename)) {
                         echo $_lang['files.dynamic.php5'];
                     }
                     umask($old_umask);
@@ -450,7 +450,7 @@ 
                 extract(ls($startpath, compact('len', 'webstart_path', 'editablefiles', 'enablefileunzip', 'inlineviewablefiles', 'uploadablefiles', 'enablefiledownload', 'viewablefiles', 'protected_path', 'excludes')), EXTR_OVERWRITE);
                 echo "\n\n\n";
                 if ($folders == 0 && $files == 0) {
-                    echo '<tr><td colspan="4"><i class="' . $_style['files_deleted_folder'] . ' FilesDeletedFolder"></i> <span style="color:#888;cursor:default;"> ' . $_lang['files_directory_is_empty'] . ' </span></td></tr>';
+                    echo '<tr><td colspan="4"><i class="'.$_style['files_deleted_folder'].' FilesDeletedFolder"></i> <span style="color:#888;cursor:default;"> '.$_lang['files_directory_is_empty'].' </span></td></tr>';
                 }
                 ?>
             </table>
@@ -459,10 +459,10 @@ 
         <div class="container">
             <p>
                 <?php
-                echo $_lang['files_directories'] . ': <b>' . $folders . '</b> ';
-                echo $_lang['files_files'] . ': <b>' . $files . '</b> ';
-                echo $_lang['files_data'] . ': <b><span dir="ltr">' . nicesize($filesizes) . '</span></b> ';
-                echo $_lang['files_dirwritable'] . ' <b>' . (is_writable($startpath) == 1 ? $_lang['yes'] . '.' : $_lang['no']) . '.</b>'
+                echo $_lang['files_directories'].': <b>'.$folders.'</b> ';
+                echo $_lang['files_files'].': <b>'.$files.'</b> ';
+                echo $_lang['files_data'].': <b><span dir="ltr">'.nicesize($filesizes).'</span></b> ';
+                echo $_lang['files_dirwritable'].' <b>'.(is_writable($startpath) == 1 ? $_lang['yes'].'.' : $_lang['no']).'.</b>'
                 ?>
             </p>
 
@@ -487,7 +487,7 @@ 
                 </form>
                 <?php
             } else {
-                echo "<p>" . $_lang['files_upload_inhibited_msg'] . "</p>";
+                echo "<p>".$_lang['files_upload_inhibited_msg']."</p>";
             }
             ?>
             <div id="imageviewer"></div>

manager/actions/help/version_notices/1.4.5.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 ?>

manager/actions/help/version_notices/1.4.6.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 ?>

manager/actions/help/version_notices/1.4.2.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 ?>