evolution-cms / evolution

manager/media/browser/mcpuk/core/uploader.php

Spacing +46 added lines, -47 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class uploader {
+class uploader{
 
 /** Release version */
     const VERSION = "2.54";
@@ -72,8 +72,8 @@ 
 
 /** Next three properties are got from the current language file
   * @var string */
-    protected $dateTimeFull;   // Currently not used
-    protected $dateTimeMid;    // Currently not used
+    protected $dateTimeFull; // Currently not used
+    protected $dateTimeMid; // Currently not used
     protected $dateTimeSmall;
 
 /** Contain Specified language labels
@@ -104,11 +104,11 @@ 
 /** Magic method which allows read-only access to protected or private class properties
   * @param string $property
   * @return mixed */
-    public function __get($property) {
+    public function __get($property){
         return property_exists($this, $property) ? $this->$property : null;
     }
 
-    public function __construct($modx) {
+    public function __construct($modx){
 
         //MODX
         try {
@@ -206,7 +206,7 @@ 
 
         // COOKIES INIT
         $ip = '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)';
-        $ip = '/^' . implode('\.', array($ip, $ip, $ip, $ip)) . '$/';
+        $ip = '/^'.implode('\.', array($ip, $ip, $ip, $ip)).'$/';
         if (preg_match($ip, $_SERVER['HTTP_HOST']) ||
             preg_match('/^[^\.]+$/', $_SERVER['HTTP_HOST'])
         )
@@ -224,7 +224,7 @@ 
         ) {
             list($unused, $protocol, $domain, $unused, $port, $path) = $patt;
             $path = path::normalize($path);
-            $this->config['uploadURL'] = "$protocol://$domain" . (strlen($port) ? ":$port" : "") . "/$path";
+            $this->config['uploadURL'] = "$protocol://$domain".(strlen($port) ? ":$port" : "")."/$path";
             $this->config['uploadDir'] = strlen($this->config['uploadDir'])
                 ? path::normalize($this->config['uploadDir'])
                 : path::url2fullPath("/$path");
@@ -267,7 +267,7 @@ 
         foreach ($this->langInputNames as $key)
             if (isset($this->get[$key]) &&
                 preg_match('/^[a-z][a-z\._\-]*$/i', $this->get[$key]) &&
-                file_exists("lang/" . strtolower($this->get[$key]) . ".php")
+                file_exists("lang/".strtolower($this->get[$key]).".php")
             ) {
                 $this->lang = $this->get[$key];
                 break;
@@ -298,7 +298,7 @@ 
             $this->backMsg("Cannot read upload folder.");
     }
 
-    public function upload() {
+    public function upload(){
         $config = &$this->config;
         $file = &$this->file;
         $url = $message = "";
@@ -329,7 +329,7 @@ 
                     @mkdir(path::normalize($dir), $this->config['dirPerms'], true);
 
                 $filename = $this->normalizeFilename($file['name']);
-                $target = file::getInexistantFilename($dir . $filename);
+                $target = file::getInexistantFilename($dir.$filename);
 
                 if (!@move_uploaded_file($file['tmp_name'], $target) &&
                     !@rename($file['tmp_name'], $target) &&
@@ -342,11 +342,11 @@ 
                     $this->makeThumb($target);
                     $url = $this->typeURL;
                     if (isset($udir)) $url .= "/$udir";
-                    $url .= "/" . basename($target);
+                    $url .= "/".basename($target);
                     if (preg_match('/^([a-z]+)\:\/\/([^\/^\:]+)(\:(\d+))?\/(.+)$/', $url, $patt)) {
                         list($unused, $protocol, $domain, $unused, $port, $path) = $patt;
-                        $base = "$protocol://$domain" . (strlen($port) ? ":$port" : "") . "/";
-                        $url = $base . path::urlPathEncode($path);
+                        $base = "$protocol://$domain".(strlen($port) ? ":$port" : "")."/";
+                        $url = $base.path::urlPathEncode($path);
                     } else
                         $url = path::urlPathEncode($url);
                 }
@@ -365,12 +365,12 @@ 
     }
 
 
-	protected function getTransaliasSettings() {
+	protected function getTransaliasSettings(){
 		$modx = evolutionCMS();
 
 		// Cleaning uploaded filename?
 		$setting = $modx->db->select('count(*)', $modx->getFullTableName('system_settings'), 'setting_name="clean_uploaded_filename" AND setting_value=1');
-		if ($modx->db->getValue($setting)>0) {
+		if ($modx->db->getValue($setting) > 0) {
 			// Transalias plugin active?
 			$res = $modx->db->select('properties', $modx->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0');
 			if ($properties = $modx->db->getValue($res)) {
@@ -385,7 +385,7 @@ 
 	}
 
 
-	protected function normalizeFilename($filename) {
+	protected function normalizeFilename($filename){
 		if ($this->getTransaliasSettings()) {
         		$format = strrchr($filename, ".");
         		$filename = str_replace($format, "", $filename);
@@ -394,11 +394,11 @@ 
         	return $filename;
 	}
 
-	protected function normalizeDirname($dirname) {
+	protected function normalizeDirname($dirname){
         return $this->modx->stripAlias($dirname);
     }
 
-    protected function checkUploadedFile(array $aFile=null) {
+    protected function checkUploadedFile(array $aFile = null){
         $config = &$this->config;
         $file = ($aFile === null) ? $this->file : $aFile;
 
@@ -437,8 +437,7 @@ 
                 ($file['error'] == UPLOAD_ERR_NO_TMP_DIR) ?
                     $this->label("Missing a temporary folder.") : (
                 ($file['error'] == UPLOAD_ERR_CANT_WRITE) ?
-                    $this->label("Failed to write file.") :
-                    $this->label("Unknown error.")
+                    $this->label("Failed to write file.") : $this->label("Unknown error.")
             )))));
 
         // HIDDEN FILENAMES CHECK
@@ -473,14 +472,14 @@ 
 
 
 	// CHECK FOR MODX MAX FILE SIZE
-	$actualfilesize=filesize($file['tmp_name']);
+	$actualfilesize = filesize($file['tmp_name']);
 	if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize'])
 	    return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
 
         return true;
     }
 
-    protected function checkInputDir($dir, $inclType=true, $existing=true) {
+    protected function checkInputDir($dir, $inclType = true, $existing = true){
         $dir = path::normalize($dir);
         if (substr($dir, 0, 1) == "/")
             $dir = substr($dir, 1);
@@ -506,7 +505,7 @@ 
         return (is_dir($path) && is_readable($path)) ? $return : false;
     }
 
-    protected function validateExtension($ext, $type) {
+    protected function validateExtension($ext, $type){
         $ext = trim(strtolower($ext));
         if (!isset($this->types[$type]))
             return false;
@@ -531,17 +530,17 @@ 
         return in_array($ext, $exts);
     }
 
-    protected function getTypeFromPath($path) {
+    protected function getTypeFromPath($path){
         return preg_match('/^([^\/]*)\/.*$/', $path, $patt)
             ? $patt[1] : $path;
     }
 
-    protected function removeTypeFromPath($path) {
+    protected function removeTypeFromPath($path){
         return preg_match('/^[^\/]*\/(.*)$/', $path, $patt)
             ? $patt[1] : "";
     }
 
-    protected function imageResize($image, $file=null) {
+    protected function imageResize($image, $file = null){
 
         if (!($image instanceof image)) {
             $img = image::factory($this->imageDriver, $image);
@@ -629,24 +628,24 @@ 
             $img->watermark($this->config['watermark']['file'], $left, $top);
 		}
 
-        $options = array( 'file' => $file );
+        $options = array('file' => $file);
 
-        $type = exif_imagetype( $file );
+        $type = exif_imagetype($file);
 
-        switch ( $type ) {
+        switch ($type) {
             case IMAGETYPE_GIF:
-                return $img->output( 'gif', $options );
+                return $img->output('gif', $options);
 
             case IMAGETYPE_PNG:
-                return $img->output( 'png', $options );
+                return $img->output('png', $options);
 
             default:
-                return $img->output( 'jpeg', array_merge( $options, array( 'quality' => $this->config['jpegQuality'] ) ) );
+                return $img->output('jpeg', array_merge($options, array('quality' => $this->config['jpegQuality'])));
         }
 
     }
 
-    protected function makeThumb($file, $overwrite=true) {
+    protected function makeThumb($file, $overwrite = true){
         $img = image::factory($this->imageDriver, $file);
 
         // Drop files which are not images
@@ -654,7 +653,7 @@ 
             return true;
 
         $thumb = substr($file, strlen($this->config['uploadDir']));
-        $thumb = $this->config['uploadDir'] . "/" . $this->config['thumbsDir'] . "/" . $thumb;
+        $thumb = $this->config['uploadDir']."/".$this->config['thumbsDir']."/".$thumb;
         $thumb = path::normalize($thumb);
         $thumbDir = dirname($thumb);
         if (!is_dir($thumbDir) && !@mkdir($thumbDir, $this->config['dirPerms'], true))
@@ -677,15 +676,15 @@ 
         if (!$img->resizeFit($this->config['thumbWidth'], $this->config['thumbHeight']))
             return false;
 
-        if ( $this->imageDriver == 'gd' ) {
-            $width  = imagesx( $img->image );
-            $height = imagesy( $img->image );
-            $back   = image::factory( $this->imageDriver, array( $width, $height ) );
-            $tile   = image::factory( $this->imageDriver, __DIR__ . '/../themes/' . $this->config['theme'] . '/img/bg_transparent.png' );
+        if ($this->imageDriver == 'gd') {
+            $width  = imagesx($img->image);
+            $height = imagesy($img->image);
+            $back   = image::factory($this->imageDriver, array($width, $height));
+            $tile   = image::factory($this->imageDriver, __DIR__.'/../themes/'.$this->config['theme'].'/img/bg_transparent.png');
 
-            imagesettile( $back->image, $tile->image );
-            imagefilledrectangle( $back->image, 0, 0, $width, $height, IMG_COLOR_TILED );
-            imagecopy( $back->image, $img->image, 0, 0, 0, 0, $width, $height );
+            imagesettile($back->image, $tile->image);
+            imagefilledrectangle($back->image, 0, 0, $width, $height, IMG_COLOR_TILED);
+            imagecopy($back->image, $img->image, 0, 0, 0, 0, $width, $height);
 
             $img = $back;
         }
@@ -697,7 +696,7 @@ 
         ));
     }
 
-    protected function localize($langCode) {
+    protected function localize($langCode){
         require "lang/{$langCode}.php";
         setlocale(LC_ALL, $lang['_locale']);
         $this->charset = $lang['_charset'];
@@ -712,7 +711,7 @@ 
         $this->labels = $lang;
     }
 
-    protected function label($string, array $data=null) {
+    protected function label($string, array $data = null){
         $return = isset($this->labels[$string]) ? $this->labels[$string] : $string;
         if (is_array($data))
             foreach ($data as $key => $val)
@@ -720,7 +719,7 @@ 
         return $return;
     }
 
-    protected function backMsg($message, array $data=null) {
+    protected function backMsg($message, array $data = null){
         $message = $this->label($message, $data);
         if (isset($this->file['tmp_name']) && file_exists($this->file['tmp_name']))
             @unlink($this->file['tmp_name']);
@@ -728,7 +727,7 @@ 
         die;
     }
 
-    protected function callBack($url, $message="") {
+    protected function callBack($url, $message = ""){
         $message = text::jsValue($message);
         $CKfuncNum = isset($this->opener['CKEditor']['funcNum'])
             ? $this->opener['CKEditor']['funcNum'] : 0;
@@ -769,7 +768,7 @@ 
 
     }
 
-    protected function get_htaccess() {
+    protected function get_htaccess(){
         return "<IfModule mod_php4.c>
   php_value engine off
 </IfModule>

manager/media/browser/mcpuk/core/autoload.php

Spacing +12 added lines, -12 removed lines

@@ -26,7 +26,7 @@ 
 $modx = evolutionCMS();
 $modx->db->connect();
 startCMSSession();
-if(!isset($_SESSION['mgrValidated'])) {
+if (!isset($_SESSION['mgrValidated'])) {
         die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 define('IN_MANAGER_MODE', true);
@@ -34,7 +34,7 @@ 
 
 $manager_language = $modx->config['manager_language'];
 // Pass language code from MODX to KCFinder
-if(!file_exists("../../../includes/lang/".$manager_language.".inc.php")) {
+if (!file_exists("../../../includes/lang/".$manager_language.".inc.php")) {
     $manager_language = "english"; // if not set, get the english language file.
 }
 include_once "../../../includes/lang/".$manager_language.".inc.php";
@@ -42,7 +42,7 @@ 
 
 // PHP VERSION CHECK
 if (substr(PHP_VERSION, 0, strpos(PHP_VERSION, '.')) < 5)
-    die("You are using PHP " . PHP_VERSION . " when KCFinder require at least version 5! Some systems has an option to change the active PHP version. Please refer to your hosting provider or upgrade your PHP distribution.");
+    die("You are using PHP ".PHP_VERSION." when KCFinder require at least version 5! Some systems has an option to change the active PHP version. Please refer to your hosting provider or upgrade your PHP distribution.");
 
 
 // SAFE MODE CHECK
@@ -51,7 +51,7 @@ 
 
 
 // MAGIC AUTOLOAD CLASSES FUNCTION
-function autoloadda9d06472ccb71b84928677ce2a6ca89($class) {
+function autoloadda9d06472ccb71b84928677ce2a6ca89($class){
     static $classes = null;
     if ($classes === null) {
         $classes = array(
@@ -75,7 +75,7 @@ 
         );
     }
     if (isset($classes[$class])) {
-        require dirname(__FILE__) . $classes[$class];
+        require dirname(__FILE__).$classes[$class];
     }
 }
 spl_autoload_register('autoloadda9d06472ccb71b84928677ce2a6ca89', true);
@@ -84,18 +84,18 @@ 
 // json_encode() IMPLEMENTATION IF JSON EXTENSION IS MISSING
 if (!function_exists("json_encode")) {
 
-    function kcfinder_json_string_encode($string) {
-        return '"' .
+    function kcfinder_json_string_encode($string){
+        return '"'.
             str_replace('/', "\\/",
             str_replace("\t", "\\t",
             str_replace("\r", "\\r",
             str_replace("\n", "\\n",
             str_replace('"', "\\\"",
             str_replace("\\", "\\\\",
-        $string)))))) . '"';
+        $string)))))).'"';
     }
 
-    function json_encode($data) {
+    function json_encode($data){
 
         if (is_array($data)) {
             $ret = array();
@@ -103,14 +103,14 @@ 
             // OBJECT
             if (array_keys($data) !== range(0, count($data) - 1)) {
                 foreach ($data as $key => $val)
-                    $ret[] = kcfinder_json_string_encode($key) . ':' . json_encode($val);
-                return "{" . implode(",", $ret) . "}";
+                    $ret[] = kcfinder_json_string_encode($key).':'.json_encode($val);
+                return "{".implode(",", $ret)."}";
 
             // ARRAY
             } else {
                 foreach ($data as $val)
                     $ret[] = json_encode($val);
-                return "[" . implode(",", $ret) . "]";
+                return "[".implode(",", $ret)."]";
             }
 
         // BOOLEAN OR NULL

manager/processors/undelete_content.processor.php

Spacing +18 added lines, -18 removed lines

@@ -1,44 +1,44 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('delete_document')) {
+if (!$modx->hasPermission('delete_document')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id'])? (int)$_REQUEST['id'] : 0;
-if($id==0) {
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /************ webber ********/
-$content=$modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
-$pid=($content['parent']==0?$id:$content['parent']);
+$content = $modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
+$pid = ($content['parent'] == 0 ? $id : $content['parent']);
 
 /************** webber *************/
-$sd=isset($_REQUEST['dir'])?'&dir='.$_REQUEST['dir']:'&dir=DESC';
-$sb=isset($_REQUEST['sort'])?'&sort='.$_REQUEST['sort']:'&sort=createdon';
-$pg=isset($_REQUEST['page'])?'&page='.(int)$_REQUEST['page']:'';
-$add_path=$sd.$sb.$pg;
+$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC';
+$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon';
+$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : '';
+$add_path = $sd.$sb.$pg;
 
 /***********************************/
 
 
 // check permissions on the document
-include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
+include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php";
 $udperms = new udperms();
 $udperms->user = $modx->getLoginUserID();
 $udperms->document = $id;
 $udperms->role = $_SESSION['mgrRole'];
 
-if(!$udperms->checkPermissions()) {
+if (!$udperms->checkPermissions()) {
 	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
 // get the timestamp on which the document was deleted.
 $rs = $modx->db->select('deletedon', $modx->getFullTableName('site_content'), "id='{$id}' AND deleted=1");
 $deltime = $modx->db->getValue($rs);
-if(!$deltime) {
+if (!$deltime) {
 	$modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!");
 }
 
@@ -47,15 +47,15 @@ 
 /**
  * @param int $parent
  */
-function getChildren($parent) {
+function getChildren($parent){
 
 	$modx = evolutionCMS();
 	global $children;
 	global $deltime;
 
-	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='".(int)$parent."' AND deleted=1 AND deletedon='".(int)$deltime."'");
+	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='".(int) $parent."' AND deleted=1 AND deletedon='".(int) $deltime."'");
 		// the document has children documents, we'll need to delete those too
-		while ($row=$modx->db->getRow($rs)) {
+		while ($row = $modx->db->getRow($rs)) {
 			$children[] = $row['id'];
 			getChildren($row['id']);
 			//echo "Found childNode of parentNode $parent: ".$row['id']."<br />";
@@ -64,7 +64,7 @@ 
 
 getChildren($id);
 
-if(count($children)>0) {
+if (count($children) > 0) {
 	$modx->db->update(
 		array(
 			'deleted'   => 0,
@@ -93,5 +93,5 @@ 
 $modx->clearCache('full');
 
 // finished emptying cache - redirect
-$header="Location: index.php?a=3&id=$pid&r=1".$add_path;
+$header = "Location: index.php?a=3&id=$pid&r=1".$add_path;
 header($header);

manager/processors/save_user.processor.php

Spacing +60 added lines, -60 removed lines

@@ -1,8 +1,8 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('save_user')) {
+if (!$modx->hasPermission('save_user')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -14,7 +14,7 @@ 
 
 $input = $_POST;
 
-$id = (int)$input['id'];
+$id = (int) $input['id'];
 $oldusername = $input['oldusername'];
 $newusername = !empty ($input['newusername']) ? trim($input['newusername']) : "New User";
 $fullname = $input['fullname'];
@@ -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,11 +141,11 @@ 
 		/*******************************************************************************/
 		// put the user in the user_groups he/ she should be in
 		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
+		if ($use_udperms == 1) {
+			if (!empty($user_groups)) {
+				for ($i = 0; $i < count($user_groups); $i++) {
 					$f = array();
-					$f['user_group'] = (int)$user_groups[$i];
+					$f['user_group'] = (int) $user_groups[$i];
 					$f['member'] = $internalKey;
 					$modx->db->insert($f, $tbl_member_groups);
 				}
@@ -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,13 +286,13 @@ 
 		/*******************************************************************************/
 		// put the user in the user_groups he/ she should be in
 		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
+		if ($use_udperms == 1) {
 			// as this is an existing user, delete his/ her entries in the groups before saving the new groups
 			$modx->db->delete($tbl_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'] = (int)$user_groups[$i];
+					$field['user_group'] = (int) $user_groups[$i];
 					$field['member'] = $id;
 					$modx->db->insert($field, $tbl_member_groups);
 				}
@@ -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";
@@ -356,7 +356,7 @@ 
  * @param string $pwd
  * @param string $ufn
  */
-function sendMailMessage($email, $uid, $pwd, $ufn) {
+function sendMailMessage($email, $uid, $pwd, $ufn){
 	$modx = evolutionCMS(); global $_lang, $signupemail_message;
 	global $emailsubject, $emailsender;
 	global $site_name;
@@ -378,7 +378,7 @@ 
 	$param['to'] = $email;
 	$param['type'] = 'text';
 	$rs = $modx->sendmail($param);
-	if(!$rs) {
+	if (!$rs) {
 		$modx->manager->saveFormValues();
 		$modx->messageQuit("{$email} - {$_lang['error_sending_email']}");
 	}
@@ -389,7 +389,7 @@ 
  *
  * @param int $id
  */
-function saveUserSettings($id) {
+function saveUserSettings($id){
 	$modx = evolutionCMS();
 	$tbl_user_settings = $modx->getFullTableName('user_settings');
 
@@ -441,27 +441,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;
@@ -477,11 +477,11 @@ 
  *
  * @param $msg
  */
-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}" : ''));
 }
 
 /**
@@ -490,12 +490,12 @@ 
  * @param int $length
  * @return string
  */
-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/save_plugin.processor.php

Spacing +16 added lines, -16 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->db->escape(trim($_POST['name']));
 $description = $modx->db->escape($_POST['description']);
 $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);
@@ -177,7 +177,7 @@ 
     // save selected system events
     $formEventList = array();
     foreach ($sysevents as $evtId) {
-        if(!preg_match('@^[1-9][0-9]*$@',$evtId)) $evtId = getEventIdByName($evtId);
+        if (!preg_match('@^[1-9][0-9]*$@', $evtId)) $evtId = getEventIdByName($evtId);
         if ($mode == '101') {
             $rs = $modx->db->select('max(priority) as priority', '[+prefix+]site_plugin_events', "evtid='{$evtId}'");
         } else {
@@ -202,13 +202,13 @@ 
     $rs = $modx->db->select('*', '[+prefix+]site_plugin_events', sprintf("pluginid='%s'", $id));
     $dbEventList = array();
     $del = array();
-    while($row = $modx->db->getRow($rs)) {
-        if(!in_array($row['evtid'], $evtids)) $del[] = $row['evtid'];
+    while ($row = $modx->db->getRow($rs)) {
+        if (!in_array($row['evtid'], $evtids)) $del[] = $row['evtid'];
     }
 
-    if(empty($del)) return;
+    if (empty($del)) return;
 
-    foreach($del as $delid) {
+    foreach ($del as $delid) {
         $modx->db->delete('[+prefix+]site_plugin_events', sprintf("evtid='%s' AND pluginid='%s'", $delid, $id));
     }
 }
@@ -220,9 +220,9 @@ 
 function getEventIdByName($name)
 {
     $modx = evolutionCMS();
-    static $eventIds=array();
+    static $eventIds = array();
 
-    if(isset($eventIds[$name])) return $eventIds[$name];
+    if (isset($eventIds[$name])) return $eventIds[$name];
 
     $rs = $modx->db->select('id, name', '[+prefix+]system_eventnames');
     while ($row = $modx->db->getRow($rs)) {

manager/processors/move_document.processor.php

Spacing +20 added lines, -20 removed lines

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

manager/processors/duplicate_content.processor.php

Spacing +16 added lines, -16 removed lines

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

manager/includes/preload.functions.inc.php

Spacing +7 added lines, -7 removed lines

@@ -4,14 +4,14 @@ 
 $site_sessionname = genEvoSessionName(); // For legacy extras not using startCMSSession

 

 

-if( ! function_exists('evolutionCMS')) {

+if (!function_exists('evolutionCMS')) {

     /**

      * @return DocumentParser

      */

     function evolutionCMS()

     {

-        if( ! defined('MODX_CLASS')) {

-            if( ! class_exists('DocumentParser')) {

+        if (!defined('MODX_CLASS')) {

+            if (!class_exists('DocumentParser')) {

                 throw new RuntimeException('MODX_CLASS not defined and DocumentParser class not exists');

             }

             define('MODX_CLASS', 'DocumentParser');

@@ -29,7 +29,7 @@ 
     $_ = crc32(__FILE__);

     $_ = sprintf('%u', $_);

 

-    return 'evo' . base_convert($_, 10, 36);

+    return 'evo'.base_convert($_, 10, 36);

 }

 

 /**

@@ -38,7 +38,7 @@ 
 function startCMSSession()

 {

     global $site_sessionname, $https_port, $session_cookie_path, $session_cookie_domain;

-    if(MODX_CLI) return;

+    if (MODX_CLI) return;

 

     session_name($site_sessionname);

     removeInvalidCmsSessionIds($site_sessionname);

@@ -50,7 +50,7 @@ 
     session_start();

     $key = "modx.mgr.session.cookie.lifetime";

     if (isset($_SESSION[$key]) && is_numeric($_SESSION[$key])) {

-        $cookieLifetime = (int)$_SESSION[$key];

+        $cookieLifetime = (int) $_SESSION[$key];

         if ($cookieLifetime) {

             $cookieExpiration = $_SERVER['REQUEST_TIME'] + $cookieLifetime;

         }

@@ -79,7 +79,7 @@ 
  */

 function removeInvalidCmsSessionIds($session_name)

 {

-    if(MODX_CLI) return;

+    if (MODX_CLI) return;

     // session ids is invalid iff it is empty string

     // storage priorioty can see in PHP source ext/session/session.c

     removeInvalidCmsSessionFromStorage($_COOKIE, $session_name);

manager/processors/save_content.processor.php

Spacing +12 added lines, -12 removed lines

@@ -278,7 +278,7 @@ 
         case 'new' :
 
             // invoke OnBeforeDocFormSave event
-            switch($modx->config['docid_incrmnt_method'])
+            switch ($modx->config['docid_incrmnt_method'])
             {
             case '1':
                 $from = "{$tbl_site_content} AS T0 LEFT JOIN {$tbl_site_content} AS T1 ON T0.id + 1 = T1.id";
@@ -489,7 +489,7 @@ 
             if (!$was_published && $published) {
                 $publishedon = $currentdate;
                 $publishedby = $modx->getLoginUserID();
-                }elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) {
+                }elseif ((!empty($pub_date) && $pub_date <= $currentdate && $published)) {
                 $publishedon = $pub_date;
                 $publishedby = $modx->getLoginUserID();
                    }elseif ($was_published && !$published) {
@@ -501,7 +501,7 @@ 
             }
 
             // invoke OnBeforeDocFormSave event
-            $modx->invokeEvent("OnBeforeDocFormSave", array (
+            $modx->invokeEvent("OnBeforeDocFormSave", array(
                 "mode" => "upd",
                 "id" => $id
             ));
@@ -526,7 +526,7 @@ 
                 . "menuindex={$menuindex}, "
                 . "searchable={$searchable}, "
                 . "cacheable={$cacheable}, "
-                . "editedby=" . $modx->getLoginUserID() . ", "
+                . "editedby=".$modx->getLoginUserID().", "
                 . "editedon={$currentdate}, "
                 . "publishedon={$publishedon}, "
                 . "publishedby={$publishedby}, "
@@ -540,7 +540,7 @@ 
 
             // update template variables
             $rs = $modx->db->select('id, tmplvarid', $tbl_site_tmplvar_contentvalues, "contentid='{$id}'");
-            $tvIds = array ();
+            $tvIds = array();
             while ($row = $modx->db->getRow($rs)) {
                 $tvIds[$row['tmplvarid']] = $row['id'];
             }
@@ -593,7 +593,7 @@ 
                     'groups.id, groups.document_group',
                     "{$tbl_document_groups} AS groups
                     LEFT JOIN {$tbl_documentgroup_names} AS dgn ON dgn.id = groups.document_group",
-                    "((1=".(int)$isManager." AND dgn.private_memgroup) OR (1=".(int)$isWeb." AND dgn.private_webgroup)) AND groups.document = '{$id}'"
+                    "((1=".(int) $isManager." AND dgn.private_memgroup) OR (1=".(int) $isWeb." AND dgn.private_webgroup)) AND groups.document = '{$id}'"
                     );
                 $old_groups = array();
                 while ($row = $modx->db->getRow($rs)) $old_groups[$row['document_group']] = $row['id'];
@@ -605,7 +605,7 @@ 
                         unset($old_groups[$group]);
                         continue;
                     } elseif ($link_id == 'new') {
-                        $insertions[] = '('.(int)$group.','.$id.')';
+                        $insertions[] = '('.(int) $group.','.$id.')';
                     }
                 }
                 if (!empty($insertions)) {
@@ -637,17 +637,17 @@ 
 
 
             // invoke OnDocFormSave event
-            $modx->invokeEvent("OnDocFormSave", array (
+            $modx->invokeEvent("OnDocFormSave", array(
                 "mode" => "upd",
                 "id" => $id
             ));
 
             // secure web documents - flag as private
-            include MODX_MANAGER_PATH . "includes/secure_web_documents.inc.php";
+            include MODX_MANAGER_PATH."includes/secure_web_documents.inc.php";
             secureWebDocument($id);
 
             // secure manager documents - flag as private
-            include MODX_MANAGER_PATH . "includes/secure_mgr_documents.inc.php";
+            include MODX_MANAGER_PATH."includes/secure_mgr_documents.inc.php";
             secureMgrDocument($id);
 
             // Set the item name for logger
@@ -673,13 +673,13 @@ 
                         // document
                         $a = ($_POST['stay'] == '2') ? "27&id=$id" : "4&pid=$parent";
                     }
-                    $header = "Location: index.php?a=" . $a . "&r=1&stay=" . $_POST['stay'].$add_path;
+                    $header = "Location: index.php?a=".$a."&r=1&stay=".$_POST['stay'].$add_path;
                 } else {
                     $header = "Location: index.php?a=3&id=$id&r=1".$add_path;
                 }
             }
             if (headers_sent()) {
-                $header = str_replace('Location: ','',$header);
+                $header = str_replace('Location: ', '', $header);
                 echo "<script>document.location.href='$header';</script>\n";
             } else {
                 header($header);