evolution-cms / evolution

manager/processors/login.processor.php

Braces +15 added lines, -7 removed lines

@@ -296,7 +296,8 @@ 
  *
  * @param string $msg
  */
-function jsAlert($msg) {
+function jsAlert($msg)
+{
 	global $modx;
 	if($_POST['ajax'] != 1) {
 		echo "<script>window.setTimeout(\"alert('" . addslashes($modx->db->escape($msg)) . "')\",10);history.go(-1)</script>";
@@ -311,7 +312,8 @@ 
  * @param string $dbasePassword
  * @return bool
  */
-function login($username, $givenPassword, $dbasePassword) {
+function login($username, $givenPassword, $dbasePassword)
+{
 	global $modx;
 	return $modx->phpass->CheckPassword($givenPassword, $dbasePassword);
 }
@@ -323,7 +325,8 @@ 
  * @param string $username
  * @return bool
  */
-function loginV1($internalKey, $givenPassword, $dbasePassword, $username) {
+function loginV1($internalKey, $givenPassword, $dbasePassword, $username)
+{
 	global $modx;
 
 	$user_algo = $modx->manager->getV1UserHashAlgorithm($internalKey);
@@ -353,7 +356,8 @@ 
  * @param string $username
  * @return bool
  */
-function loginMD5($internalKey, $givenPassword, $dbasePassword, $username) {
+function loginMD5($internalKey, $givenPassword, $dbasePassword, $username)
+{
 	global $modx;
 
 	if($dbasePassword != md5($givenPassword)) {
@@ -367,7 +371,8 @@ 
  * @param string $username
  * @param string $password
  */
-function updateNewHash($username, $password) {
+function updateNewHash($username, $password)
+{
 	global $modx;
 
 	$field = array();
@@ -381,16 +386,19 @@ 
  * @param int $failed_allowed
  * @param int $blocked_minutes
  */
-function incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes) {
+function incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes)
+{
 	global $modx;
 
 	$failedlogins += 1;
 
 	$fields = array('failedlogincount' => $failedlogins);
-	if($failedlogins >= $failed_allowed) //block user for too many fail attempts
+	if($failedlogins >= $failed_allowed) {
+	    //block user for too many fail attempts
 	{
 		$fields['blockeduntil'] = time() + ($blocked_minutes * 60);
 	}
+	}
 
 	$modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
 

manager/processors/undelete_content.processor.php

Braces +2 added lines, -1 removed lines

@@ -47,7 +47,8 @@
 /**
  * @param int $parent
  */
-function getChildren($parent) {
+function getChildren($parent)
+{
 
 	global $modx;
 	global $children;

manager/processors/remove_installer.processor.php

Braces +9 added lines, -5 removed lines

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

manager/processors/duplicate_content.processor.php

Braces +18 added lines, -10 removed lines

@@ -42,7 +42,8 @@ 
  * @param int $_toplevel
  * @return int
  */
-function duplicateDocument($docid, $parent=null, $_toplevel=0) {
+function duplicateDocument($docid, $parent=null, $_toplevel=0)
+{
 	global $modx, $_lang;
 
 	// invoke OnBeforeDocDuplicate event
@@ -63,8 +64,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";
 			$rs = $modx->db->select('MIN(T0.id)+1', $from, "T1.id IS NULL");
@@ -85,8 +85,11 @@ 
 		$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);
-		else $count = '';
+		if($count>=1) {
+		    $count = ' '.($count+1);
+		} else {
+		    $count = '';
+		}
 
 		$content['pagetitle'] = $_lang['duplicated_el_suffix'].$count.' '.$content['pagetitle'];
 		$content['alias'] = null;
@@ -95,7 +98,9 @@ 
 	}
 
 	// change the parent accordingly
-	if ($parent !== null) $content['parent'] = $parent;
+	if ($parent !== null) {
+	    $content['parent'] = $parent;
+	}
 
 	// Change the author
 	$content['createdby'] = $userID;
@@ -135,8 +140,9 @@ 
 	// Start duplicating all the child documents that aren't deleted.
 	$_toplevel++;
 	$rs = $modx->db->select('id', $tblsc, "parent='{$docid}' AND deleted=0", 'id ASC');
-		while ($row = $modx->db->getRow($rs))
-			duplicateDocument($row['id'], $newparent, $_toplevel);
+		while ($row = $modx->db->getRow($rs)) {
+					duplicateDocument($row['id'], $newparent, $_toplevel);
+		}
 
 	// return the new doc id
 	return $newparent;
@@ -148,7 +154,8 @@ 
  * @param int $oldid
  * @param int $newid
  */
-function duplicateTVs($oldid, $newid){
+function duplicateTVs($oldid, $newid)
+{
 	global $modx;
 
 	$tbltvc = $modx->getFullTableName('site_tmplvar_contentvalues');
@@ -168,7 +175,8 @@ 
  * @param int $oldid
  * @param int $newid
  */
-function duplicateAccess($oldid, $newid){
+function duplicateAccess($oldid, $newid)
+{
 	global $modx;
 
 	$tbldg = $modx->getFullTableName('document_groups');

manager/processors/execute_module.processor.php

Braces +6 added lines, -8 removed lines

@@ -12,7 +12,7 @@ 
 }
 
 // check if user has access permission, except admins
-if($_SESSION['mgrRole']!=1){
+if($_SESSION['mgrRole']!=1) {
 	$rs = $modx->db->select(
 		'sma.usergroup,mg.member',
 		$modx->getFullTableName("site_module_access")." sma
@@ -70,7 +70,8 @@ 
  * @param array $params
  * @return string
  */
-function evalModule($moduleCode,$params){
+function evalModule($moduleCode,$params)
+{
 	global $modx;
 	$modx->event->params = &$params; // store params inside event object
 	if(is_array($params)) {
@@ -80,11 +81,9 @@ 
 	$mod = eval($moduleCode);
 	$msg = ob_get_contents();
 	ob_end_clean();
-	if (isset($php_errormsg))
-	{
+	if (isset($php_errormsg)) {
 		$error_info = error_get_last();
-        switch($error_info['type'])
-        {
+        switch($error_info['type']) {
         	case E_NOTICE :
         		$error_level = 1;
         	case E_USER_NOTICE :
@@ -97,8 +96,7 @@ 
         	default:
         		$error_level = 99;
         }
-		if($modx->config['error_reporting']==='99' || 2<$error_level)
-		{
+		if($modx->config['error_reporting']==='99' || 2<$error_level) {
 			$modx->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], $_SESSION['itemname'] . ' - Module', $error_info['message'], $error_info['line'], $msg);
 			$modx->event->alert("An error occurred while loading. Please see the event log for more information<p>{$msg}</p>");
 		}

manager/processors/move_document.processor.php

Braces +16 added lines, -7 removed lines

@@ -12,12 +12,20 @@ 
 // 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"]);
+if (in_array($documentID, $parents)) {
+    $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+}
 
 $rs = $modx->db->select('parent', $modx->getFullTableName('site_content'), "id='{$documentID}'");
 $oldparent = $modx->db->getValue($rs);
@@ -42,7 +50,8 @@ 
  * @param int $currDocID
  * @return array
  */
-function allChildren($currDocID) {
+function allChildren($currDocID)
+{
 	global $modx;
 	$children= array();
 	$currDocID = $modx->db->escape($currDocID);
@@ -59,11 +68,11 @@ 
 	"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) {
 		$modx->webAlertAndQuit($_lang["error_movedocument2"]);
-	}else{
+	} else {
 		$newParentID = $newParent;
 	}
 }

manager/processors/save_web_user.processor.php

Braces +12 added lines, -6 removed lines

@@ -340,7 +340,8 @@ 
  * @param string $string
  * @return string
  */
-function save_user_quoted_printable($string) {
+function save_user_quoted_printable($string)
+{
 	$crlf = "\n";
 	$string = preg_replace('!(\r\n|\r|\n)!', $crlf, $string) . $crlf;
 	$f[] = '/([\000-\010\013\014\016-\037\075\177-\377])/e';
@@ -359,7 +360,8 @@ 
  * @param string $pwd
  * @param string $ufn
  */
-function sendMailMessage($email, $uid, $pwd, $ufn) {
+function sendMailMessage($email, $uid, $pwd, $ufn)
+{
 	global $modx, $_lang, $websignupemail_message;
 	global $emailsubject, $emailsender;
 	global $site_name, $site_url;
@@ -387,7 +389,8 @@ 
 }
 
 // Save User Settings
-function saveUserSettings($id) {
+function saveUserSettings($id)
+{
 	global $modx;
 	$tbl_web_user_settings = $modx->getFullTableName('web_user_settings');
 
@@ -416,7 +419,8 @@ 
 }
 
 // Web alert -  sends an alert to web browser
-function webAlertAndQuit($msg) {
+function webAlertAndQuit($msg)
+{
 	global $id, $modx;
 	$mode = $_POST['mode'];
 	$modx->manager->saveFormValues($mode);
@@ -424,7 +428,8 @@ 
 }
 
 // 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);
@@ -435,7 +440,8 @@ 
 	return $pass;
 }
 
-function sanitize($str = '', $safecount = 0) {
+function sanitize($str = '', $safecount = 0)
+{
 	global $modx;
 	$safecount++;
 	if(1000 < $safecount) {

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

Braces +15 added lines, -6 removed lines

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

index.php

Braces +12 added lines, -6 removed lines

@@ -50,17 +50,23 @@ 
 	include_once($autoloader);
 }
 
-if(!isset($_SERVER['REQUEST_TIME_FLOAT'])) $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true);
+if(!isset($_SERVER['REQUEST_TIME_FLOAT'])) {
+    $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true);
+}
 
 $base_path = str_replace('\\','/',dirname(__FILE__)) . '/';
-if(is_file($base_path . 'assets/cache/siteManager.php'))
+if(is_file($base_path . 'assets/cache/siteManager.php')) {
     include_once($base_path . 'assets/cache/siteManager.php');
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager"))
+}
+if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
 	define('MGR_DIR', 'manager');
-if(is_file($base_path . 'assets/cache/siteHostnames.php'))
+}
+if(is_file($base_path . 'assets/cache/siteHostnames.php')) {
     include_once($base_path . 'assets/cache/siteHostnames.php');
-if(!defined('MODX_SITE_HOSTNAMES'))
+}
+if(!defined('MODX_SITE_HOSTNAMES')) {
 	define('MODX_SITE_HOSTNAMES', '');
+}
 
 // get start time
 $mstart = memory_get_usage();
@@ -129,7 +135,7 @@ 
     @ini_set("display_errors","0");
 }
 
-if(MODX_CLI){
+if(MODX_CLI) {
     @set_time_limit(0);
     @ini_set('max_execution_time',0);
 }