evolution-cms / evolution

manager/processors/duplicate_htmlsnippet.processor.php

Spacing +6 added lines, -6 removed lines

@@ -1,18 +1,18 @@ 
 <?php
-if(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_chunk')) {
+if (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_chunk')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? intval($_GET['id']) : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_htmlsnippets'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_htmlsnippets'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
+if ($count >= 1) $count = ' '.($count + 1);
 else $count = '';
 
 // duplicate htmlsnippet
@@ -30,5 +30,5 @@ 
 $_SESSION['itemname'] = $name;
 
 // finish duplicating - redirect to new chunk
-$header="Location: index.php?r=2&a=78&id=$newid";
+$header = "Location: index.php?r=2&a=78&id=$newid";
 header($header);

manager/processors/user_documents_permissions.class.php

Spacing +11 added lines, -11 removed lines

@@ -7,7 +7,7 @@ 
 	var $role;
 	var $duplicateDoc = false;
 	
-	function checkPermissions() {
+	function checkPermissions(){
 		
 		global $udperms_allowroot;
 		global $modx;
@@ -19,23 +19,23 @@ 
 		$document = $this->document;
 		$role = $this->role;
 
-		if($role==1) {
-			return true;  // administrator - grant all document permissions
+		if ($role == 1) {
+			return true; // administrator - grant all document permissions
 		}
 		
-		if($modx->config['use_udperms']==0 || $modx->config['use_udperms']=="" || !isset($modx->config['use_udperms'])) {
+		if ($modx->config['use_udperms'] == 0 || $modx->config['use_udperms'] == "" || !isset($modx->config['use_udperms'])) {
 			return true; // permissions aren't in use
 		}
 		
 		$parent = $modx->db->getValue($modx->db->select('parent', $tblsc, "id='{$this->document}'"));
-		if($document == 0 && $parent == NULL && $udperms_allowroot == 1) return true; // User is allowed to create new document in root
-		if (($this->duplicateDoc==true || $document==0) && $parent==0 && $udperms_allowroot==0) {
+		if ($document == 0 && $parent == NULL && $udperms_allowroot == 1) return true; // User is allowed to create new document in root
+		if (($this->duplicateDoc == true || $document == 0) && $parent == 0 && $udperms_allowroot == 0) {
 			return false; // deny duplicate || create new document at root if Allow Root is No
 		}
 		
 		// get document groups for current user
-		if($_SESSION['mgrDocgroups']) {
-			$docgrp = implode(" || dg.document_group = ",$_SESSION['mgrDocgroups']);
+		if ($_SESSION['mgrDocgroups']) {
+			$docgrp = implode(" || dg.document_group = ", $_SESSION['mgrDocgroups']);
 		}
 
 		/* Note:
@@ -46,17 +46,17 @@ 
 			are private to the manager users will not be private to web users if the 
 			document group is not assigned to a web user group and visa versa.
 		 */
-		$permissionsok = false;  // set permissions to false
+		$permissionsok = false; // set permissions to false
 		
 		$rs = $modx->db->select(
 			'count(DISTINCT sc.id)',
 			"{$tblsc} AS sc 
 				LEFT JOIN {$tbldg} AS dg on dg.document = sc.id 
 				LEFT JOIN {$tbldgn} dgn ON dgn.id = dg.document_group",
-			"sc.id='{$this->document}' AND (". ( (!$docgrp) ? null : "dg.document_group = ".$docgrp." ||" ) . " sc.privatemgr = 0)"
+			"sc.id='{$this->document}' AND (".((!$docgrp) ? null : "dg.document_group = ".$docgrp." ||")." sc.privatemgr = 0)"
 			);
 		$limit = $modx->db->getValue($rs);
-		if($limit==1) $permissionsok = true;
+		if ($limit == 1) $permissionsok = true;
 		
 		return $permissionsok;
 	}

manager/processors/cache_sync.class.processor.php

Spacing +29 added lines, -29 removed lines

@@ -61,7 +61,7 @@ 
         if (isset($this->aliases[$id])) {
             if ($this->aliasVisible[$id] == 1) {
                 if ($path != '') {
-                    $path = $this->aliases[$id] . '/' . $path;
+                    $path = $this->aliases[$id].'/'.$path;
                 } else {
                     $path = $this->aliases[$id];
                 }
@@ -80,7 +80,7 @@ 
             $modx->messageQuit("Cache path not set.");
         }
 
-        $files = glob(realpath($this->cachePath) . '/*.pageCache.php');
+        $files = glob(realpath($this->cachePath).'/*.pageCache.php');
         $filesincache = count($files);
         $deletedfiles = array();
         while ($file = array_shift($files)) {
@@ -93,7 +93,7 @@ 
             }
         }
 
-        if(function_exists('opcache_get_status')) {
+        if (function_exists('opcache_get_status')) {
             $opcache = opcache_get_status();
             if (!empty($opcache['opcache_enabled'])) {
                 opcache_reset();
@@ -113,9 +113,9 @@ 
                 if (isset($opcache)) {
                     echo '<p>Opcache empty.</p>';
                 }
-                echo '<p>' . $_lang['cache_files_deleted'] . '</p><ul>';
+                echo '<p>'.$_lang['cache_files_deleted'].'</p><ul>';
                 foreach ($deletedfiles as $deletedfile) {
-                    echo '<li>' . $deletedfile . '</li>';
+                    echo '<li>'.$deletedfile.'</li>';
                 }
                 echo '</ul>';
             }
@@ -131,11 +131,11 @@ 
 
 
         // write the file
-        $content = '<?php' . "\n";
-        $content .= '$recent_update=\'' . $this->request_time . '\';' . "\n";
-        $content .= '$cacheRefreshTime=\'' . $cacheRefreshTime . '\';' . "\n";
+        $content = '<?php'."\n";
+        $content .= '$recent_update=\''.$this->request_time.'\';'."\n";
+        $content .= '$cacheRefreshTime=\''.$cacheRefreshTime.'\';'."\n";
 
-        $filename = $this->cachePath . '/sitePublishing.idx.php';
+        $filename = $this->cachePath.'/sitePublishing.idx.php';
         if (!$handle = fopen($filename, 'w')) {
             exit("Cannot open file ({$filename}");
         }
@@ -155,7 +155,7 @@ 
         // update publish time file
         $timesArr = array();
 
-        $result = $modx->db->select('MIN(pub_date) AS minpub', '[+prefix+]site_content', 'pub_date>' . $this->request_time);
+        $result = $modx->db->select('MIN(pub_date) AS minpub', '[+prefix+]site_content', 'pub_date>'.$this->request_time);
         if (!$result) {
             echo "Couldn't determine next publish event!";
         }
@@ -165,7 +165,7 @@ 
             $timesArr[] = $minpub;
         }
 
-        $result = $modx->db->select('MIN(unpub_date) AS minunpub', '[+prefix+]site_content', 'unpub_date>' . $this->request_time);
+        $result = $modx->db->select('MIN(unpub_date) AS minunpub', '[+prefix+]site_content', 'unpub_date>'.$this->request_time);
         if (!$result) {
             echo "Couldn't determine next unpublish event!";
         }
@@ -203,7 +203,7 @@ 
         $config = array();
         $content .= '$c=&$this->config;';
         while (list($key, $value) = $modx->db->getRow($rs, 'num')) {
-            $content .= '$c[\'' . $key . '\']="' . $this->escapeDoubleQuotes($value) . '";';
+            $content .= '$c[\''.$key.'\']="'.$this->escapeDoubleQuotes($value).'";';
             $config[$key] = $value;
         }
 
@@ -241,23 +241,23 @@ 
             $docid = $doc['id'];
             if ($use_alias_path) {
                 $tmpPath = $this->getParents($doc['parent']);
-                $alias = (strlen($tmpPath) > 0 ? "$tmpPath/" : '') . $doc['alias'];
+                $alias = (strlen($tmpPath) > 0 ? "$tmpPath/" : '').$doc['alias'];
                 $key = $alias;
             } else {
                 $key = $doc['alias'];
             }
 
             $doc['path'] = $tmpPath;
-            $content .= '$a[' . $docid . ']=array(\'id\'=>' . $docid . ',\'alias\'=>\'' . $doc['alias'] . '\',\'path\'=>\'' . $doc['path'] . '\',\'parent\'=>' . $doc['parent'] . ',\'isfolder\'=>' . $doc['isfolder'] . ',\'alias_visible\'=>' . $doc['alias_visible'] . ');';
-            $content .= '$d[\'' . $key . '\']=' . $docid . ';';
-            $content .= '$m[]=array(' . $doc['parent'] . '=>' . $docid . ');';
+            $content .= '$a['.$docid.']=array(\'id\'=>'.$docid.',\'alias\'=>\''.$doc['alias'].'\',\'path\'=>\''.$doc['path'].'\',\'parent\'=>'.$doc['parent'].',\'isfolder\'=>'.$doc['isfolder'].',\'alias_visible\'=>'.$doc['alias_visible'].');';
+            $content .= '$d[\''.$key.'\']='.$docid.';';
+            $content .= '$m[]=array('.$doc['parent'].'=>'.$docid.');';
         }
 
         // get content types
         $rs = $modx->db->select('id, contentType', '[+prefix+]site_content', "contentType!='text/html'");
         $content .= '$c=&$this->contentTypes;';
         while ($doc = $modx->db->getRow($rs)) {
-            $content .= '$c[\'' . $doc['id'] . '\']=\'' . $doc['contentType'] . '\';';
+            $content .= '$c[\''.$doc['id'].'\']=\''.$doc['contentType'].'\';';
         }
 
         // WRITE Chunks to cache file
@@ -267,7 +267,7 @@ 
             if ($modx->config['minifyphp_incache']) {
                 $doc['snippet'] = $this->php_strip_whitespace($doc['snippet']);
             }
-            $content .= '$c[\'' . $doc['name'] . '\']=\'' . ($doc['disabled'] ? '' : $this->escapeSingleQuotes($doc['snippet'])) . '\';';
+            $content .= '$c[\''.$doc['name'].'\']=\''.($doc['disabled'] ? '' : $this->escapeSingleQuotes($doc['snippet'])).'\';';
         }
 
         // WRITE snippets to cache file
@@ -278,18 +278,18 @@ 
         while ($row = $modx->db->getRow($rs)) {
             $key = $row['name'];
             if ($row['disabled']) {
-                $content .= '$s[\'' . $key . '\']=\'return false;\';';
+                $content .= '$s[\''.$key.'\']=\'return false;\';';
             } else {
                 $value = trim($row['snippet']);
                 if ($modx->config['minifyphp_incache']) {
                     $value = $this->php_strip_whitespace($value);
                 }
-                $content .= '$s[\'' . $key . '\']=\'' . $this->escapeSingleQuotes($value) . '\';';
+                $content .= '$s[\''.$key.'\']=\''.$this->escapeSingleQuotes($value).'\';';
                 $properties = $modx->parseProperties($row['properties']);
                 $sharedproperties = $modx->parseProperties($row['sharedproperties']);
                 $properties = array_merge($sharedproperties, $properties);
                 if (0 < count($properties)) {
-                    $content .= '$s[\'' . $key . 'Props\']=\'' . $this->escapeSingleQuotes(json_encode($properties)) . '\';';
+                    $content .= '$s[\''.$key.'Props\']=\''.$this->escapeSingleQuotes(json_encode($properties)).'\';';
                 }
             }
         }
@@ -307,13 +307,13 @@ 
             if ($modx->config['minifyphp_incache']) {
                 $value = $this->php_strip_whitespace($value);
             }
-            $content .= '$p[\'' . $key . '\']=\'' . $this->escapeSingleQuotes($value) . '\';';
+            $content .= '$p[\''.$key.'\']=\''.$this->escapeSingleQuotes($value).'\';';
             if ($row['properties'] != '' || $row['sharedproperties'] != '') {
                 $properties = $modx->parseProperties($row['properties']);
                 $sharedproperties = $modx->parseProperties($row['sharedproperties']);
                 $properties = array_merge($sharedproperties, $properties);
                 if (0 < count($properties)) {
-                    $content .= '$p[\'' . $key . 'Props\']=\'' . $this->escapeSingleQuotes(json_encode($properties)) . '\';';
+                    $content .= '$p[\''.$key.'Props\']=\''.$this->escapeSingleQuotes(json_encode($properties)).'\';';
                 }
             }
         }
@@ -336,13 +336,13 @@ 
         }
         foreach ($events as $evtname => $pluginnames) {
             $events[$evtname] = $pluginnames;
-            $content .= '$e[\'' . $evtname . '\']=array(\'' . implode('\',\'', $this->escapeSingleQuotes($pluginnames)) . '\');';
+            $content .= '$e[\''.$evtname.'\']=array(\''.implode('\',\'', $this->escapeSingleQuotes($pluginnames)).'\');';
         }
 
         $content .= "\n";
 
         // close and write the file
-        $filename = $this->cachePath . 'siteCache.idx.php';
+        $filename = $this->cachePath.'siteCache.idx.php';
 
         // invoke OnBeforeCacheUpdate event
         if ($modx) {
@@ -353,8 +353,8 @@ 
             exit("Cannot write main MODX cache file! Make sure the assets/cache directory is writable!");
         }
 
-        if (!is_file($this->cachePath . '/.htaccess')) {
-            file_put_contents($this->cachePath . '/.htaccess', "order deny,allow\ndeny from all\n");
+        if (!is_file($this->cachePath.'/.htaccess')) {
+            file_put_contents($this->cachePath.'/.htaccess', "order deny,allow\ndeny from all\n");
         }
 
         // invoke OnCacheUpdate event
@@ -371,7 +371,7 @@ 
 
         $source = trim($source);
         if (substr($source, 0, 5) !== '<?php') {
-            $source = '<?php ' . $source;
+            $source = '<?php '.$source;
         }
 
         $tokens = token_get_all($source);
@@ -427,7 +427,7 @@ 
                     $_ .= $text;
             }
         }
-        $source = preg_replace(array('@^<\?php@i', '|\s+|', '|<!--|', '|-->|', '|-->\s+<!--|'), array('', ' ', "\n" . '<!--', '-->' . "\n", '-->' . "\n" . '<!--'), $_);
+        $source = preg_replace(array('@^<\?php@i', '|\s+|', '|<!--|', '|-->|', '|-->\s+<!--|'), array('', ' ', "\n".'<!--', '-->'."\n", '-->'."\n".'<!--'), $_);
         $source = trim($source);
         return $source;
     }

manager/processors/save_user.processor.php

Spacing +57 added lines, -57 removed lines

@@ -1,8 +1,8 @@ 
 <?php
-if(IN_MANAGER_MODE != "true") {
+if (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_user')) {
+if (!$modx->hasPermission('save_user')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -44,56 +44,56 @@ 
 $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!");
 }
 
 // verify admin security
-if($_SESSION['mgrRole'] != 1) {
+if ($_SESSION['mgrRole'] != 1) {
 	// Check to see if user tried to spoof a "1" (admin) role
-	if(!$modx->hasPermission('save_role')) {
+	if (!$modx->hasPermission('save_role')) {
 		webAlertAndQuit("Illegal attempt to create/modify administrator by non-administrator!");
 	}
 	// Verify that the user being edited wasn't an admin and the user ID got spoofed
 	$rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, "internalKey='{$id}' AND role=1");
 	$limit = $modx->db->getValue($rs);
-	if($limit > 0) {
+	if ($limit > 0) {
 		webAlertAndQuit("You cannot alter an administrative user.");
 	}
 
 }
 
-switch($input['mode']) {
+switch ($input['mode']) {
 	case '11' : // new user
 		// check if this user name already exist
 		$rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s'", $modx->db->escape($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(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND id!='%s'", $modx->db->escape($email), $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!");
@@ -141,9 +141,9 @@ 
 		/*******************************************************************************/
 		// 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['user_group'] = intval($user_groups[$i]);
 					$f['member'] = $internalKey;
@@ -153,20 +153,20 @@ 
 		}
 		// end of user_groups stuff!
 
-		if($passwordnotifymethod == 'e') {
+		if ($passwordnotifymethod == 'e') {
 			sendMailMessage($email, $newusername, $newpassword, $fullname);
-			if($input['stay'] != '') {
+			if ($input['stay'] != '') {
 				$a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
-				$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=75&r=2";
 				header($header);
 			}
 		} else {
-			if($input['stay'] != '') {
+			if ($input['stay'] != '') {
 				$a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
-				$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=75&r=2";
 			}
@@ -199,36 +199,36 @@ 
 		break;
 	case '12' : // 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_manager_users, sprintf("username='%s' AND id!='%s'", $modx->db->escape($newusername), $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_user_attributes, sprintf("email='%s' AND internalKey!='%s'", $modx->db->escape($email), $id));
 		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
+		if ($limit > 0) {
 			webAlertAndQuit("Email is already in use!");
 		}
 
@@ -241,7 +241,7 @@ 
 		// update user name and password
 		$field = array();
 		$field['username'] = $modx->db->escape($newusername);
-		if($genpassword == 1) {
+		if ($genpassword == 1) {
 			$field['password'] = $modx->phpass->HashPassword($newpassword);
 		}
 		$modx->db->update($field, $tbl_manager_users, "id='{$id}'");
@@ -269,7 +269,7 @@ 
 		));
 
 		// invoke OnManagerChangePassword event
-		if($genpassword == 1) {
+		if ($genpassword == 1) {
 			$modx->invokeEvent("OnManagerChangePassword", array(
 				"userid" => $id,
 				"username" => $newusername,
@@ -286,11 +286,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 ($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_member_groups, "member='{$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['user_group'] = intval($user_groups[$i]);
 					$field['member'] = $id;
@@ -300,13 +300,13 @@ 
 		}
 		// end of user_groups stuff!
 		/*******************************************************************************/
-		if($id == $modx->getLoginUserID() && ($genpassword !== 1 && $passwordnotifymethod != 's')) {
+		if ($id == $modx->getLoginUserID() && ($genpassword !== 1 && $passwordnotifymethod != 's')) {
 			$modx->webAlertAndQuit($_lang["user_changeddata"], 'javascript:top.location.href="index.php?a=8";');
 		}
-		if($genpassword == 1 && $passwordnotifymethod == 's') {
-			if($input['stay'] != '') {
+		if ($genpassword == 1 && $passwordnotifymethod == 's') {
+			if ($input['stay'] != '') {
 				$a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
-				$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=75&r=2";
 			}
@@ -326,7 +326,7 @@ 
 				<div class="sectionHeader"><?php echo $_lang['user_title']; ?></div>
 				<div class="sectionBody">
 					<div id="disp">
-						<p><?php echo sprintf($_lang["password_msg"], $modx->htmlspecialchars($newusername), $modx->htmlspecialchars($newpassword)) . (($id == $modx->getLoginUserID()) ? ' ' . $_lang['user_changeddata'] : ''); ?></p>
+						<p><?php echo sprintf($_lang["password_msg"], $modx->htmlspecialchars($newusername), $modx->htmlspecialchars($newpassword)).(($id == $modx->getLoginUserID()) ? ' '.$_lang['user_changeddata'] : ''); ?></p>
 					</div>
 				</div>
 			</div>
@@ -334,9 +334,9 @@ 
 
 			include_once "footer.inc.php";
 		} else {
-			if($input['stay'] != '') {
+			if ($input['stay'] != '') {
 				$a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
-				$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=75&r=2";
@@ -349,7 +349,7 @@ 
 }
 
 // Send an email to the user
-function sendMailMessage($email, $uid, $pwd, $ufn) {
+function sendMailMessage($email, $uid, $pwd, $ufn){
 	global $modx, $_lang, $signupemail_message;
 	global $emailsubject, $emailsender;
 	global $site_name;
@@ -371,14 +371,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_user_settings = $modx->getFullTableName('user_settings');
 
@@ -430,27 +430,27 @@ 
 
 	// get user setting field names
 	$settings = array();
-	foreach($_POST as $n => $v) {
-		if(in_array($n, $ignore) || (!in_array($n, $defaults) && is_scalar($v) && trim($v) == '') || (!in_array($n, $defaults) && is_array($v) && empty($v))) {
+	foreach ($_POST as $n => $v) {
+		if (in_array($n, $ignore) || (!in_array($n, $defaults) && is_scalar($v) && trim($v) == '') || (!in_array($n, $defaults) && is_array($v) && empty($v))) {
 			continue;
 		} // ignore blacklist and empties
 		$settings[$n] = $v; // this value should be saved
 	}
 
-	foreach($defaults as $k) {
-		if(isset($settings['default_' . $k]) && $settings['default_' . $k] == '1') {
+	foreach ($defaults as $k) {
+		if (isset($settings['default_'.$k]) && $settings['default_'.$k] == '1') {
 			unset($settings[$k]);
 		}
-		unset($settings['default_' . $k]);
+		unset($settings['default_'.$k]);
 	}
 
 	$modx->db->delete($tbl_user_settings, "user='{$id}'");
 
-	foreach($settings as $n => $vl) {
-		if(is_array($vl)) {
+	foreach ($settings as $n => $vl) {
+		if (is_array($vl)) {
 			$vl = implode(",", $vl);
 		}
-		if($vl != '') {
+		if ($vl != '') {
 			$f = array();
 			$f['user'] = $id;
 			$f['setting_name'] = $n;
@@ -462,20 +462,20 @@ 
 }
 
 // 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 == '12' ? "&id={$id}" : ''));
+	$modx->webAlertAndQuit($msg, "index.php?a={$mode}".($mode == '12' ? "&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;

manager/processors/publish_content.processor.php

Spacing +14 added lines, -14 removed lines

@@ -1,36 +1,36 @@ 
 <?php
-if(IN_MANAGER_MODE!="true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
-if(!$modx->hasPermission('save_document')||!$modx->hasPermission('publish_document')) {
+if (IN_MANAGER_MODE != "true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+if (!$modx->hasPermission('save_document') || !$modx->hasPermission('publish_document')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id'])? intval($_REQUEST['id']) : 0;
-if($id==0) {
+$id = isset($_REQUEST['id']) ? intval($_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"]);
 }
 
@@ -47,7 +47,7 @@ 
 	), $modx->getFullTableName('site_content'), "id='{$id}'");
 
 // invoke OnDocPublished  event
-$modx->invokeEvent("OnDocPublished",array("docid"=>$id));
+$modx->invokeEvent("OnDocPublished", array("docid"=>$id));
 
 // Set the item name for logger
 $_SESSION['itemname'] = $content['pagetitle'];
@@ -55,6 +55,6 @@ 
 // empty cache
 $modx->clearCache('full');
 
-$header="Location: index.php?a=3&id=$pid&r=1".$add_path;
+$header = "Location: index.php?a=3&id=$pid&r=1".$add_path;
 
 header($header);

manager/processors/remove_locks.processor.php

Spacing +4 added lines, -4 removed lines

@@ -1,8 +1,8 @@ 
 <?php
-if(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 (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(!isset($_GET['id'])) {
-	if(!$modx->hasPermission('remove_locks')) $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+if (!isset($_GET['id'])) {
+	if (!$modx->hasPermission('remove_locks')) $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 	
 	// Remove all locks
 	$modx->db->truncate($modx->getFullTableName('active_user_locks'));
@@ -14,7 +14,7 @@ 
 	$type = intval($_GET['type']);
 	$id = intval($_GET['id']);
 	$includeAllUsers = $modx->hasPermission('remove_locks'); // Enables usage of "unlock"-ajax-button
-	if($type && $id) {
+	if ($type && $id) {
 		$modx->unlockElement($type, $id, $includeAllUsers);
 		echo '1';
 		exit;

manager/processors/duplicate_plugin.processor.php

Spacing +6 added lines, -6 removed lines

@@ -1,18 +1,18 @@ 
 <?php 
-if(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_plugin')) {
+if (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_plugin')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? intval($_GET['id']) : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_plugins'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_plugins'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
+if ($count >= 1) $count = ' '.($count + 1);
 else $count = '';
 
 // duplicate Plugin
@@ -42,5 +42,5 @@ 
 $_SESSION['itemname'] = $name;
 
 // finish duplicating - redirect to new plugin
-$header="Location: index.php?r=2&a=102&id=$newid";
+$header = "Location: index.php?r=2&a=102&id=$newid";
 header($header);

manager/processors/optimize_table.processor.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php 
-if(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('settings') && ($modx->hasPermission('logs')||$modx->hasPermission('bk_manager')))) {	
+if (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('settings') && ($modx->hasPermission('logs') || $modx->hasPermission('bk_manager')))) {	
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -31,5 +31,5 @@ 
 }
 
 $mode = intval($_REQUEST['mode']);
-$header="Location: index.php?a={$mode}&s=4";
+$header = "Location: index.php?a={$mode}&s=4";
 header($header);

manager/processors/save_role.processor.php

Spacing +7 added lines, -7 removed lines

@@ -1,15 +1,15 @@ 
 <?php
-if(IN_MANAGER_MODE != "true") {
+if (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_role')) {
+if (!$modx->hasPermission('save_role')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 extract($_POST);
 
-if($name == '' || !isset ($name)) {
-	$modx->webAlertAndQuit("Please enter a name for this role!", "index.php?a={$mode}" . ($mode = 35 ? "&id={$id}" : ""));
+if ($name == '' || !isset ($name)) {
+	$modx->webAlertAndQuit("Please enter a name for this role!", "index.php?a={$mode}".($mode = 35 ? "&id={$id}" : ""));
 }
 
 // setup fields
@@ -91,13 +91,13 @@ 
 
 $fields = $modx->db->escape($fields);
 
-switch($_POST['mode']) {
+switch ($_POST['mode']) {
 	case '38' :
 		$tbl = $modx->getFullTableName("user_roles");
 
 		// disallow duplicate names for role
 		$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_roles'), "name='{$fields['name']}'");
-		if($modx->db->getValue($rs) > 0) {
+		if ($modx->db->getValue($rs) > 0) {
 			$modx->manager->saveFormValues(38);
 			$modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=38");
 		}
@@ -115,7 +115,7 @@ 
 
 		// disallow duplicate names for role
 		$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_roles'), "name='{$fields['name']}' AND id!='{$id}'");
-		if($modx->db->getValue($rs) > 0) {
+		if ($modx->db->getValue($rs) > 0) {
 			$modx->manager->saveFormValues(35);
 			$modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['role'], $name), "index.php?a=35&id={$id}");
 		}