xpressengine / xe-core

config/config.inc.php

Spacing +36 added lines, -36 removed lines

@@ -7,7 +7,7 @@ 
  * @file   config/config.inc.php
  * @author NAVER (developers@xpressengine.com)
  */
-if(version_compare(PHP_VERSION, '5.4.0', '<'))
+if (version_compare(PHP_VERSION, '5.4.0', '<'))
 {
 	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING);
 }
@@ -16,7 +16,7 @@ 
 	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING ^ E_STRICT);
 }
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 {
 	exit();
 }
@@ -53,9 +53,9 @@ 
 ini_set('session.use_only_cookies', 0);
 
 
-if(file_exists(_XE_PATH_ . 'config/package.inc.php'))
+if (file_exists(_XE_PATH_.'config/package.inc.php'))
 {
-	require _XE_PATH_ . 'config/package.inc.php';
+	require _XE_PATH_.'config/package.inc.php';
 }
 else
 {
@@ -97,12 +97,12 @@ 
  * define('__ENABLE_PHPUNIT_TEST__', 0);
  * define('__PROXY_SERVER__', 'http://domain:port/path');
  */
-if(file_exists(_XE_PATH_ . 'config/config.user.inc.php'))
+if (file_exists(_XE_PATH_.'config/config.user.inc.php'))
 {
-	require _XE_PATH_ . 'config/config.user.inc.php';
+	require _XE_PATH_.'config/config.user.inc.php';
 }
 
-if(!defined('__DEBUG__'))
+if (!defined('__DEBUG__'))
 {
 	/**
 	 * output debug message(bit value)
@@ -117,7 +117,7 @@ 
 	define('__DEBUG__', 0);
 }
 
-if(!defined('__DEBUG_OUTPUT__'))
+if (!defined('__DEBUG_OUTPUT__'))
 {
 	/**
 	 * output location of debug message
@@ -131,7 +131,7 @@ 
 	define('__DEBUG_OUTPUT__', 0);
 }
 
-if(!defined('__DEBUG_PROTECT__'))
+if (!defined('__DEBUG_PROTECT__'))
 {
 	/**
 	 * output comments of the firePHP console and browser
@@ -144,7 +144,7 @@ 
 	define('__DEBUG_PROTECT__', 1);
 }
 
-if(!defined('__DEBUG_PROTECT_IP__'))
+if (!defined('__DEBUG_PROTECT_IP__'))
 {
 	/**
 	 * Set a ip address to allow debug
@@ -152,7 +152,7 @@ 
 	define('__DEBUG_PROTECT_IP__', '127.0.0.1');
 }
 
-if(!defined('__DEBUG_DB_OUTPUT__'))
+if (!defined('__DEBUG_DB_OUTPUT__'))
 {
 	/**
 	 * DB error message definition
@@ -165,7 +165,7 @@ 
 	define('__DEBUG_DB_OUTPUT__', 0);
 }
 
-if(!defined('__LOG_SLOW_QUERY__'))
+if (!defined('__LOG_SLOW_QUERY__'))
 {
 	/**
 	 * Query log for only timeout query among DB queries
@@ -179,7 +179,7 @@ 
 	define('__LOG_SLOW_QUERY__', 0);
 }
 
-if(!defined('__LOG_SLOW_TRIGGER__'))
+if (!defined('__LOG_SLOW_TRIGGER__'))
 {
 	/**
 	 * Trigger excute time log
@@ -193,7 +193,7 @@ 
 	define('__LOG_SLOW_TRIGGER__', 0);
 }
 
-if(!defined('__LOG_SLOW_ADDON__'))
+if (!defined('__LOG_SLOW_ADDON__'))
 {
 	/**
 	 * Addon excute time log
@@ -207,7 +207,7 @@ 
 	define('__LOG_SLOW_ADDON__', 0);
 }
 
-if(!defined('__LOG_SLOW_WIDGET__'))
+if (!defined('__LOG_SLOW_WIDGET__'))
 {
 	/**
 	 * Widget excute time log
@@ -221,7 +221,7 @@ 
 	define('__LOG_SLOW_WIDGET__', 0);
 }
 
-if(!defined('__DEBUG_QUERY__'))
+if (!defined('__DEBUG_QUERY__'))
 {
 	/**
 	 * Leave DB query information
@@ -234,7 +234,7 @@ 
 	define('__DEBUG_QUERY__', 0);
 }
 
-if(!defined('__OB_GZHANDLER_ENABLE__'))
+if (!defined('__OB_GZHANDLER_ENABLE__'))
 {
 	/**
 	 * option to enable/disable a compression feature using ob_gzhandler
@@ -248,7 +248,7 @@ 
 	define('__OB_GZHANDLER_ENABLE__', 1);
 }
 
-if(!defined('__ENABLE_PHPUNIT_TEST__'))
+if (!defined('__ENABLE_PHPUNIT_TEST__'))
 {
 	/**
 	 * decide to use/not use the php unit test (Path/tests/index.php)
@@ -261,7 +261,7 @@ 
 	define('__ENABLE_PHPUNIT_TEST__', 0);
 }
 
-if(!defined('__PROXY_SERVER__'))
+if (!defined('__PROXY_SERVER__'))
 {
 	/**
 	 * __PROXY_SERVER__ has server information to request to the external through the target server
@@ -271,25 +271,25 @@ 
 }
 
 // Require specific files when using Firebug console output
-if((__DEBUG_OUTPUT__ == 2) && version_compare(PHP_VERSION, '6.0.0') === -1)
+if ((__DEBUG_OUTPUT__ == 2) && version_compare(PHP_VERSION, '6.0.0') === -1)
 {
-	require _XE_PATH_ . 'libs/FirePHPCore/FirePHP.class.php';
+	require _XE_PATH_.'libs/FirePHPCore/FirePHP.class.php';
 }
 
 // Set Timezone as server time
-if(version_compare(PHP_VERSION, '5.3.0') >= 0)
+if (version_compare(PHP_VERSION, '5.3.0') >= 0)
 {
 	date_default_timezone_set(@date_default_timezone_get());
 }
 
 // Require a function-defined-file for simple use
-require(_XE_PATH_ . 'config/func.inc.php');
+require(_XE_PATH_.'config/func.inc.php');
 
-if(__DEBUG__) {
+if (__DEBUG__) {
 	define('__StartTime__', getMicroTime());
 }
 
-if(__DEBUG__) {
+if (__DEBUG__) {
 	$GLOBALS['__elapsed_class_load__'] = 0;
 }
 
@@ -391,38 +391,38 @@ 
 
 function __xe_autoload($class_name)
 {
-	if(__DEBUG__) {
+	if (__DEBUG__) {
 		$time_at = getMicroTime();
 	}
 
-	if(isset($GLOBALS['__xe_autoload_file_map'][strtolower($class_name)]))
+	if (isset($GLOBALS['__xe_autoload_file_map'][strtolower($class_name)]))
 	{
-		require _XE_PATH_ . $GLOBALS['__xe_autoload_file_map'][strtolower($class_name)];
+		require _XE_PATH_.$GLOBALS['__xe_autoload_file_map'][strtolower($class_name)];
 	}
-	elseif(preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
+	elseif (preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
 	{
 		$candidate_filename = array();
-		$candidate_filename[] = 'modules/' . $matches[1] . '/' . $matches[1];
-		if(isset($matches[2]) && $matches[2]) $candidate_filename[] = 'admin';
+		$candidate_filename[] = 'modules/'.$matches[1].'/'.$matches[1];
+		if (isset($matches[2]) && $matches[2]) $candidate_filename[] = 'admin';
 		$candidate_filename[] = (isset($matches[3]) && $matches[3]) ? strtolower($matches[3]) : 'class';
 		$candidate_filename[] = 'php';
 
 		$candidate_filename = implode('.', $candidate_filename);
 
-		if(file_exists(_XE_PATH_ . $candidate_filename))
+		if (file_exists(_XE_PATH_.$candidate_filename))
 		{
-			require _XE_PATH_ . $candidate_filename;
+			require _XE_PATH_.$candidate_filename;
 		}
 	}
 
-	if(__DEBUG__) {
+	if (__DEBUG__) {
 		$GLOBALS['__elapsed_class_load__'] += getMicroTime() - $time_at;
 	}
 }
 spl_autoload_register('__xe_autoload');
 
-if(file_exists(_XE_PATH_  . '/vendor/autoload.php')) {
-	require _XE_PATH_  . '/vendor/autoload.php';
+if (file_exists(_XE_PATH_.'/vendor/autoload.php')) {
+	require _XE_PATH_.'/vendor/autoload.php';
 }
 /* End of file config.inc.php */
 /* Location: ./config/config.inc.php */

modules/communication/communication.model.php

Spacing +35 added lines, -35 removed lines

@@ -27,32 +27,32 @@ 
 		$oModuleModel = getModel('module');
 		$communication_config = $oModuleModel->getModuleConfig('communication');
 
-		if(!is_object($communication_config))
+		if (!is_object($communication_config))
 		{
 			$communication_config = new stdClass();
 		}
 
-		if(!$communication_config->skin)
+		if (!$communication_config->skin)
 		{
 			$communication_config->skin = 'default';
 		}
 
-		if(!$communication_config->colorset)
+		if (!$communication_config->colorset)
 		{
 			$communication_config->colorset = 'white';
 		}
 
-		if(!$communication_config->editor_skin)
+		if (!$communication_config->editor_skin)
 		{
 			$communication_config->editor_skin = 'ckeditor';
 		}
 
-		if(!$communication_config->mskin)
+		if (!$communication_config->mskin)
 		{
 			$communication_config->mskin = 'default';
 		}
 		
-		if(!$communication_config->grant_write)
+		if (!$communication_config->grant_write)
 		{
 			$communication_config->grant_write = array('default_grant'=>'member');
 		}
@@ -69,9 +69,9 @@ 
 	function getGrantArray($default, $group)
 	{
 		$grant = array();
-		if($default!="")
+		if ($default != "")
 		{
-			switch($default)
+			switch ($default)
 			{
 				case "-2":
 					$grant = array("default_grant"=>"site");
@@ -84,13 +84,13 @@ 
 					break;
 			}
 		} 
-		else if(is_array($group)) 
+		else if (is_array($group)) 
 		{
 			$oMemberModel = getModel('member');
 			$group_list = $oMemberModel->getGroups($this->site_srl);
 
 			$group_grant = array();
-			foreach($group as $group_srl)
+			foreach ($group as $group_srl)
 			{
 				$group_grant[$group_srl] = $group_list[$group_srl]->title;
 			}
@@ -107,37 +107,37 @@ 
 	  */
 	function checkGrant($arrGrant)
 	{
-		if(!$arrGrant)
+		if (!$arrGrant)
 			return false;
 
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info)
+		if (!$logged_info)
 			return false;
 
-		if($logged_info->is_admin == "Y")
+		if ($logged_info->is_admin == "Y")
 			return true;
 
-		if($arrGrant['default_grant'])
+		if ($arrGrant['default_grant'])
 		{
-			if($arrGrant['default_grant'] == "member" && $logged_info)
+			if ($arrGrant['default_grant'] == "member" && $logged_info)
 				return true;
 
-			if($arrGrant['default_grant'] == "site" && $this->site_srl == $logged_info->site_srl)
+			if ($arrGrant['default_grant'] == "site" && $this->site_srl == $logged_info->site_srl)
 				return true;
 
-			if($arrGrant['default_grant'] == "manager" && $logged_info->is_admin == "Y")
+			if ($arrGrant['default_grant'] == "manager" && $logged_info->is_admin == "Y")
 				return true;
 		}
 
-		if($arrGrant['group_grant'])
+		if ($arrGrant['group_grant'])
 		{
 			$group_grant = $arrGrant['group_grant'];
-			if(!is_array($group_grant))
+			if (!is_array($group_grant))
 				return false;
 
-			foreach($logged_info->group_list as $group_srl=>$title)
+			foreach ($logged_info->group_list as $group_srl=>$title)
 			{
-				if(isset($group_grant[$group_srl])&&$group_grant[$group_srl]==$title)
+				if (isset($group_grant[$group_srl]) && $group_grant[$group_srl] == $title)
 					return true;
 			}
 
@@ -162,7 +162,7 @@ 
 		$output = executeQuery('communication.getMessage', $args, $columnList);
 
 		$message = $output->data;
-		if(!$message)
+		if (!$message)
 		{
 			return;
 		}
@@ -170,7 +170,7 @@ 
 		// get recipient's information if it is a sent message
 		$oMemberModel = getModel('member');
 
-		if($message->sender_srl == $logged_info->member_srl && $message->message_type == 'S')
+		if ($message->sender_srl == $logged_info->member_srl && $message->message_type == 'S')
 		{
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($message->receiver_srl);
 		}
@@ -180,22 +180,22 @@ 
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($message->sender_srl);
 		}
 
-		if($member_info)
+		if ($member_info)
 		{
-			foreach($member_info as $key => $val)
+			foreach ($member_info as $key => $val)
 			{
-				if($key === 'title') continue;
-				if($key === 'content') continue;
-				if($key === 'sender_srl') continue;
-				if($key === 'password') continue;
-				if($key === 'regdate') continue;
+				if ($key === 'title') continue;
+				if ($key === 'content') continue;
+				if ($key === 'sender_srl') continue;
+				if ($key === 'password') continue;
+				if ($key === 'regdate') continue;
 
 				$message->{$key} = $val;
 			}
 		}
 
 		// change the status if is a received and not yet read message
-		if($message->message_type == 'R' && $message->readed != 'Y')
+		if ($message->message_type == 'R' && $message->readed != 'Y')
 		{
 			$oCommunicationController = getController('communication');
 			$oCommunicationController->setMessageReaded($message_srl);
@@ -218,7 +218,7 @@ 
 		$args->readed = 'N';
 
 		$output = executeQuery('communication.getNewMessage', $args, $columnList);
-		if(!count($output->data))
+		if (!count($output->data))
 		{
 			return;
 		}
@@ -242,7 +242,7 @@ 
 		$logged_info = Context::get('logged_info');
 		$args = new stdClass();
 
-		switch($message_type)
+		switch ($message_type)
 		{
 			case 'R' :
 				$args->member_srl = $logged_info->member_srl;
@@ -347,7 +347,7 @@ 
 		$output = executeQueryArray('communication.getFriendGroups', $args);
 
 		$group_list = $output->data;
-		if(!$group_list)
+		if (!$group_list)
 		{
 			return;
 		}
@@ -370,7 +370,7 @@ 
 
 		$output = executeQuery('communication.isAddedFriend', $args);
 
-		if($output->data->count)
+		if ($output->data->count)
 		{
 			return TRUE;
 		}

Braces +40 added lines, -23 removed lines

@@ -83,8 +83,7 @@ 
 					$grant = array("default_grant"=>"member");
 					break;
 			}
-		} 
-		else if(is_array($group)) 
+		} else if(is_array($group)) 
 		{
 			$oMemberModel = getModel('member');
 			$group_list = $oMemberModel->getGroups($this->site_srl);
@@ -107,38 +106,46 @@ 
 	  */
 	function checkGrant($arrGrant)
 	{
-		if(!$arrGrant)
-			return false;
+		if(!$arrGrant) {
+					return false;
+		}
 
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info)
-			return false;
+		if(!$logged_info) {
+					return false;
+		}
 
-		if($logged_info->is_admin == "Y")
-			return true;
+		if($logged_info->is_admin == "Y") {
+					return true;
+		}
 
 		if($arrGrant['default_grant'])
 		{
-			if($arrGrant['default_grant'] == "member" && $logged_info)
-				return true;
+			if($arrGrant['default_grant'] == "member" && $logged_info) {
+							return true;
+			}
 
-			if($arrGrant['default_grant'] == "site" && $this->site_srl == $logged_info->site_srl)
-				return true;
+			if($arrGrant['default_grant'] == "site" && $this->site_srl == $logged_info->site_srl) {
+							return true;
+			}
 
-			if($arrGrant['default_grant'] == "manager" && $logged_info->is_admin == "Y")
-				return true;
+			if($arrGrant['default_grant'] == "manager" && $logged_info->is_admin == "Y") {
+							return true;
+			}
 		}
 
 		if($arrGrant['group_grant'])
 		{
 			$group_grant = $arrGrant['group_grant'];
-			if(!is_array($group_grant))
-				return false;
+			if(!is_array($group_grant)) {
+							return false;
+			}
 
 			foreach($logged_info->group_list as $group_srl=>$title)
 			{
-				if(isset($group_grant[$group_srl])&&$group_grant[$group_srl]==$title)
-					return true;
+				if(isset($group_grant[$group_srl])&&$group_grant[$group_srl]==$title) {
+									return true;
+				}
 			}
 
 		}
@@ -184,11 +191,21 @@ 
 		{
 			foreach($member_info as $key => $val)
 			{
-				if($key === 'title') continue;
-				if($key === 'content') continue;
-				if($key === 'sender_srl') continue;
-				if($key === 'password') continue;
-				if($key === 'regdate') continue;
+				if($key === 'title') {
+					continue;
+				}
+				if($key === 'content') {
+					continue;
+				}
+				if($key === 'sender_srl') {
+					continue;
+				}
+				if($key === 'password') {
+					continue;
+				}
+				if($key === 'regdate') {
+					continue;
+				}
 
 				$message->{$key} = $val;
 			}