xpressengine / xe-core

modules/communication/communication.admin.model.php

Spacing +4 added lines, -4 removed lines

@@ -27,7 +27,7 @@ 
 		$type = Context::get('type') == 'P' ? 'P' : 'M';
 		Context::set('type', $type);
 
-		if($type == 'P')
+		if ($type == 'P')
 		{
 			$dir = 'skins';
 		}
@@ -36,7 +36,7 @@ 
 			$dir = 'm.skins';
 		}
 
-		if(!$skin)
+		if (!$skin)
 		{
 			$tpl = "";
 		}
@@ -48,8 +48,8 @@ 
 
 			$oModuleModel = getModel('module');
 			$communication_config = $oModuleModel->getModuleConfig('communication');
-			if(!is_object($communication_config)) $communication_config = new stdClass;
-			if(!$communication_config->colorset)
+			if (!is_object($communication_config)) $communication_config = new stdClass;
+			if (!$communication_config->colorset)
 			{
 				$communication_config->colorset = "white";
 			}

Braces +5 added lines, -5 removed lines

@@ -30,8 +30,7 @@ 
 		if($type == 'P')
 		{
 			$dir = 'skins';
-		}
-		else
+		} else
 		{
 			$dir = 'm.skins';
 		}
@@ -39,8 +38,7 @@ 
 		if(!$skin)
 		{
 			$tpl = "";
-		}
-		else
+		} else
 		{
 			$oModuleModel = getModel('module');
 			$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin, $dir);
@@ -48,7 +46,9 @@ 
 
 			$oModuleModel = getModel('module');
 			$communication_config = $oModuleModel->getModuleConfig('communication');
-			if(!is_object($communication_config)) $communication_config = new stdClass;
+			if(!is_object($communication_config)) {
+				$communication_config = new stdClass;
+			}
 			if(!$communication_config->colorset)
 			{
 				$communication_config->colorset = "white";

modules/communication/communication.class.php

Spacing +9 added lines, -9 removed lines

@@ -26,7 +26,7 @@ 
 	 */
 	function checkUpdate()
 	{
-		if(!is_dir("./files/member_extra_info/new_message_flags"))
+		if (!is_dir("./files/member_extra_info/new_message_flags"))
 		{
 			return TRUE;
 		}
@@ -34,13 +34,13 @@ 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('message');
 
-		if($config->skin)
+		if ($config->skin)
 		{
 			$config_parse = explode('.', $config->skin);
-			if(count($config_parse) > 1)
+			if (count($config_parse) > 1)
 			{
 				$template_path = sprintf('./themes/%s/modules/communication/', $config_parse[0]);
-				if(is_dir($template_path))
+				if (is_dir($template_path))
 				{
 					return TRUE;
 				}
@@ -55,25 +55,25 @@ 
 	 */
 	function moduleUpdate()
 	{
-		if(!is_dir("./files/member_extra_info/new_message_flags"))
+		if (!is_dir("./files/member_extra_info/new_message_flags"))
 		{
 			FileHandler::makeDir('./files/member_extra_info/new_message_flags');
 		}
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('message');
-		if(!is_object($config))
+		if (!is_object($config))
 		{
 			$config = new stdClass();
 		}
 
-		if($config->skin)
+		if ($config->skin)
 		{
 			$config_parse = explode('.', $config->skin);
-			if(count($config_parse) > 1)
+			if (count($config_parse) > 1)
 			{
 				$template_path = sprintf('./themes/%s/modules/communication/', $config_parse[0]);
-				if(is_dir($template_path))
+				if (is_dir($template_path))
 				{
 					$config->skin = implode('|@|', $config_parse);
 					$oModuleController = getController('module');

modules/communication/communication.controller.php

Spacing +75 added lines, -75 removed lines

@@ -23,7 +23,7 @@ 
 	 */
 	function procCommunicationUpdateAllowMessage()
 	{
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new Object(-1, 'msg_not_logged');
 		}
@@ -31,7 +31,7 @@ 
 		$args = new stdClass();
 		$args->allow_message = Context::get('allow_message');
 
-		if(!in_array($args->allow_message, array('Y', 'N', 'F')))
+		if (!in_array($args->allow_message, array('Y', 'N', 'F')))
 		{
 			$args->allow_message = 'Y';
 		}
@@ -53,7 +53,7 @@ 
 	function procCommunicationSendMessage()
 	{
 		// Check login information
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new Object(-1, 'msg_not_logged');
 		}
@@ -62,25 +62,25 @@ 
 
 		// Check variables
 		$receiver_srl = Context::get('receiver_srl');
-		if(!$receiver_srl)
+		if (!$receiver_srl)
 		{
 			return new Object(-1, 'msg_not_exists_member');
 		}
 
 		$title = trim(Context::get('title'));
-		if(!$title)
+		if (!$title)
 		{
 			return new Object(-1, 'msg_title_is_null');
 		}
 
 		$content = trim(Context::get('content'));
-		if(!$content)
+		if (!$content)
 		{
 			return new Object(-1, 'msg_content_is_null');
 		}
 
 		$send_mail = Context::get('send_mail');
-		if($send_mail != 'Y')
+		if ($send_mail != 'Y')
 		{
 			$send_mail = 'N';
 		}
@@ -90,28 +90,28 @@ 
 		$oCommunicationModel = getModel('communication');
 		$config = $oCommunicationModel->getConfig();
 
-		if(!$oCommunicationModel->checkGrant($config->grant_write))
+		if (!$oCommunicationModel->checkGrant($config->grant_write))
 		{
 			return new Object(-1, 'msg_not_permitted');
 		}
 
 		$receiver_member_info = $oMemberModel->getMemberInfoByMemberSrl($receiver_srl);
-		if($receiver_member_info->member_srl != $receiver_srl)
+		if ($receiver_member_info->member_srl != $receiver_srl)
 		{
 			return new Object(-1, 'msg_not_exists_member');
 		}
 
 		// check whether to allow to receive the message(pass if a top-administrator)
-		if($logged_info->is_admin != 'Y')
+		if ($logged_info->is_admin != 'Y')
 		{
-			if($receiver_member_info->allow_message == 'F')
+			if ($receiver_member_info->allow_message == 'F')
 			{
-				if(!$oCommunicationModel->isFriend($receiver_member_info->member_srl))
+				if (!$oCommunicationModel->isFriend($receiver_member_info->member_srl))
 				{
 					return new object(-1, 'msg_allow_message_to_friend');
 				}
 			}
-			else if($receiver_member_info->allow_message == 'N')
+			else if ($receiver_member_info->allow_message == 'N')
 			{
 				return new object(-1, 'msg_disallow_message');
 			}
@@ -120,13 +120,13 @@ 
 		// send a message
 		$output = $this->sendMessage($logged_info->member_srl, $receiver_srl, $title, $content);
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		// send an e-mail
-		if($send_mail == 'Y')
+		if ($send_mail == 'Y')
 		{
 			$view_url = Context::getRequestUri();
 			$content = sprintf("%s<br /><br />From : <a href=\"%s\" target=\"_blank\">%s</a>", $content, $view_url, $view_url);
@@ -138,9 +138,9 @@ 
 			$oMail->send();
 		}
 
-		if(!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
-			if(Context::get('is_popup') != 'Y')
+			if (Context::get('is_popup') != 'Y')
 			{
 				global $lang;
 				htmlHeader();
@@ -153,7 +153,7 @@ 
 			else
 			{
 				$this->setMessage('success_sended');
-				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('','act', 'dispCommunicationMessages', 'message_type', 'S', 'receiver_srl', $receiver_srl, 'message_srl', '');
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispCommunicationMessages', 'message_type', 'S', 'receiver_srl', $receiver_srl, 'message_srl', '');
 				$this->setRedirectUrl($returnUrl);
 			}
 		}
@@ -197,7 +197,7 @@ 
 		$receiver_args->related_srl = 0;
 		$receiver_args->list_order = $related_srl * -1;
 		$receiver_args->sender_srl = $sender_srl;
-		if(!$receiver_args->sender_srl)
+		if (!$receiver_args->sender_srl)
 		{
 			$receiver_args->sender_srl = $receiver_srl;
 		}
@@ -218,7 +218,7 @@ 
 		$trigger_obj->content = $content;
 		$trigger_obj->sender_log = $sender_log;
 		$triggerOutput = ModuleHandler::triggerCall('communication.sendMessage', 'before', $trigger_obj);
-		if(!$triggerOutput->toBool())
+		if (!$triggerOutput->toBool())
 		{
 			return $triggerOutput;
 		}
@@ -227,10 +227,10 @@ 
 		$oDB->begin();
 
 		// messages to save in the sendor's message box
-		if($sender_srl && $sender_log)
+		if ($sender_srl && $sender_log)
 		{
 			$output = executeQuery('communication.sendMessage', $sender_args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -239,7 +239,7 @@ 
 
 		// messages to save in the receiver's message box
 		$output = executeQuery('communication.sendMessage', $receiver_args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -247,7 +247,7 @@ 
 
 		// Call a trigger (after)
 		$trigger_output = ModuleHandler::triggerCall('communication.sendMessage', 'after', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			$oDB->rollback();
 			return $trigger_output;
@@ -272,7 +272,7 @@ 
 	function procCommunicationStoreMessage()
 	{
 		// Check login information
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new Object(-1, 'msg_not_logged');
 		}
@@ -280,7 +280,7 @@ 
 
 		// Check variable
 		$message_srl = Context::get('message_srl');
-		if(!$message_srl)
+		if (!$message_srl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -288,7 +288,7 @@ 
 		// get the message
 		$oCommunicationModel = getModel('communication');
 		$message = $oCommunicationModel->getSelectedMessage($message_srl);
-		if(!$message || $message->message_type != 'R')
+		if (!$message || $message->message_type != 'R')
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -297,7 +297,7 @@ 
 		$args->message_srl = $message_srl;
 		$args->receiver_srl = $logged_info->member_srl;
 		$output = executeQuery('communication.setMessageStored', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -312,7 +312,7 @@ 
 	function procCommunicationDeleteMessage()
 	{
 		// Check login information
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new Object(-1, 'msg_not_logged');
 		}
@@ -322,7 +322,7 @@ 
 
 		// Check the variable
 		$message_srl = Context::get('message_srl');
-		if(!$message_srl)
+		if (!$message_srl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -330,23 +330,23 @@ 
 		// Get the message
 		$oCommunicationModel = getModel('communication');
 		$message = $oCommunicationModel->getSelectedMessage($message_srl);
-		if(!$message)
+		if (!$message)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
 		// Check the grant
-		switch($message->message_type)
+		switch ($message->message_type)
 		{
 			case 'S':
-				if($message->sender_srl != $member_srl)
+				if ($message->sender_srl != $member_srl)
 				{
 					return new Object(-1, 'msg_invalid_request');
 				}
 				break;
 
 			case 'R':
-				if($message->receiver_srl != $member_srl)
+				if ($message->receiver_srl != $member_srl)
 				{
 					return new Object(-1, 'msg_invalid_request');
 				}
@@ -357,7 +357,7 @@ 
 		$args = new stdClass();
 		$args->message_srl = $message_srl;
 		$output = executeQuery('communication.deleteMessage', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -372,7 +372,7 @@ 
 	function procCommunicationDeleteMessages()
 	{
 		// Check login information
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new Object(-1, 'msg_not_logged');
 		}
@@ -381,41 +381,41 @@ 
 		$member_srl = $logged_info->member_srl;
 
 		// check variables
-		if(!Context::get('message_srl_list'))
+		if (!Context::get('message_srl_list'))
 		{
 			return new Object(-1, 'msg_cart_is_null');
 		}
 
 		$message_srl_list = Context::get('message_srl_list');
-		if(!is_array($message_srl_list))
+		if (!is_array($message_srl_list))
 		{
 			$message_srl_list = explode('|@|', trim($message_srl_list));
 		}
 
-		if(!count($message_srl_list))
+		if (!count($message_srl_list))
 		{
 			return new Object(-1, 'msg_cart_is_null');
 		}
 
 		$message_type = Context::get('message_type');
-		if(!$message_type || !in_array($message_type, array('R', 'S', 'T')))
+		if (!$message_type || !in_array($message_type, array('R', 'S', 'T')))
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
 		$message_count = count($message_srl_list);
 		$target = array();
-		for($i = 0; $i < $message_count; $i++)
+		for ($i = 0; $i < $message_count; $i++)
 		{
 			$message_srl = (int) trim($message_srl_list[$i]);
-			if(!$message_srl)
+			if (!$message_srl)
 			{
 				continue;
 			}
 
 			$target[] = $message_srl;
 		}
-		if(!count($target))
+		if (!count($target))
 		{
 			return new Object(-1, 'msg_cart_is_null');
 		}
@@ -425,7 +425,7 @@ 
 		$args->message_srls = implode(',', $target);
 		$args->message_type = $message_type;
 
-		if($message_type == 'S')
+		if ($message_type == 'S')
 		{
 			$args->sender_srl = $member_srl;
 		}
@@ -435,7 +435,7 @@ 
 		}
 
 		$output = executeQuery('communication.deleteMessages', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -453,7 +453,7 @@ 
 	function procCommunicationAddFriend()
 	{
 		// Check login information
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new Object(-1, 'msg_not_logged');
 		}
@@ -461,7 +461,7 @@ 
 		$logged_info = Context::get('logged_info');
 
 		$target_srl = (int) trim(Context::get('target_srl'));
-		if(!$target_srl)
+		if (!$target_srl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -474,7 +474,7 @@ 
 		$args->member_srl = $logged_info->member_srl;
 		$args->target_srl = $target_srl;
 		$output = executeQuery('communication.addFriend', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -482,7 +482,7 @@ 
 		$this->add('member_srl', $target_srl);
 		$this->setMessage('success_registed');
 
-		if(!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			global $lang;
 			htmlHeader();
@@ -501,7 +501,7 @@ 
 	function procCommunicationMoveFriend()
 	{
 		// Check login information
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new Object(-1, 'msg_not_logged');
 		}
@@ -510,27 +510,27 @@ 
 
 		// Check variables
 		$friend_srl_list = Context::get('friend_srl_list');
-		if(!$friend_srl_list)
+		if (!$friend_srl_list)
 		{
 			return new Object(-1, 'msg_cart_is_null');
 		}
 
-		if(!is_array($friend_srl_list))
+		if (!is_array($friend_srl_list))
 		{
 			$friend_srl_list = explode('|@|', $friend_srl_list);
 		}
 
-		if(!count($friend_srl_list))
+		if (!count($friend_srl_list))
 		{
 			return new Object(-1, 'msg_cart_is_null');
 		}
 
 		$friend_count = count($friend_srl_list);
 		$target = array();
-		for($i = 0; $i < $friend_count; $i++)
+		for ($i = 0; $i < $friend_count; $i++)
 		{
 			$friend_srl = (int) trim($friend_srl_list[$i]);
-			if(!$friend_srl)
+			if (!$friend_srl)
 			{
 				continue;
 			}
@@ -538,7 +538,7 @@ 
 			$target[] = $friend_srl;
 		}
 
-		if(!count($target))
+		if (!count($target))
 		{
 			return new Object(-1, 'msg_cart_is_null');
 		}
@@ -550,7 +550,7 @@ 
 		$args->friend_group_srl = Context::get('target_friend_group_srl');
 
 		$output = executeQuery('communication.moveFriend', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -568,7 +568,7 @@ 
 	function procCommunicationDeleteFriend()
 	{
 		// Check login information
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new Object(-1, 'msg_not_logged');
 		}
@@ -579,12 +579,12 @@ 
 		// Check variables
 		$friend_srl_list = Context::get('friend_srl_list');
 
-		if(!is_array($friend_srl_list))
+		if (!is_array($friend_srl_list))
 		{
 			$friend_srl_list = explode('|@|', $friend_srl_list);
 		}
 
-		if(!count($friend_srl_list))
+		if (!count($friend_srl_list))
 		{
 			return new Object(-1, 'msg_cart_is_null');
 		}
@@ -592,10 +592,10 @@ 
 		$friend_count = count($friend_srl_list);
 		$target = array();
 
-		for($i = 0; $i < $friend_count; $i++)
+		for ($i = 0; $i < $friend_count; $i++)
 		{
 			$friend_srl = (int) trim($friend_srl_list[$i]);
-			if(!$friend_srl)
+			if (!$friend_srl)
 			{
 				continue;
 			}
@@ -603,7 +603,7 @@ 
 			$target[] = $friend_srl;
 		}
 
-		if(!count($target))
+		if (!count($target))
 		{
 			return new Object(-1, 'msg_cart_is_null');
 		}
@@ -613,7 +613,7 @@ 
 		$args->friend_srls = implode(',', $target);
 		$args->member_srl = $logged_info->member_srl;
 		$output = executeQuery('communication.deleteFriend', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -631,7 +631,7 @@ 
 	function procCommunicationAddFriendGroup()
 	{
 		// Check login information
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new Object(-1, 'msg_not_logged');
 		}
@@ -645,13 +645,13 @@ 
 		$args->title = Context::get('title');
 		$args->title = htmlspecialchars($args->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 
-		if(!$args->title)
+		if (!$args->title)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
 		// modify if friend_group_srl exists.
-		if($args->friend_group_srl)
+		if ($args->friend_group_srl)
 		{
 			$output = executeQuery('communication.renameFriendGroup', $args);
 			$msg_code = 'success_updated';
@@ -663,9 +663,9 @@ 
 			$msg_code = 'success_registed';
 		}
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
-			if(!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
+			if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 			{
 				global $lang;
 				htmlHeader();
@@ -682,7 +682,7 @@ 
 		}
 		else
 		{
-			if(!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
+			if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 			{
 				global $lang;
 				htmlHeader();
@@ -707,7 +707,7 @@ 
 	function procCommunicationRenameFriendGroup()
 	{
 		// Check login information
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new Object(-1, 'msg_not_logged');
 		}
@@ -721,13 +721,13 @@ 
 		$args->title = Context::get('title');
 		$args->title = htmlspecialchars($args->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 
-		if(!$args->title)
+		if (!$args->title)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
 		$output = executeQuery('communication.renameFriendGroup', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -742,7 +742,7 @@ 
 	function procCommunicationDeleteFriendGroup()
 	{
 		// Check login information
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new Object(-1, 'msg_not_logged');
 		}
@@ -754,7 +754,7 @@ 
 		$args->friend_group_srl = Context::get('friend_group_srl');
 		$args->member_srl = $logged_info->member_srl;
 		$output = executeQuery('communication.deleteFriendGroup', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}

Braces +7 added lines, -14 removed lines

@@ -110,8 +110,7 @@ 
 				{
 					return new object(-1, 'msg_allow_message_to_friend');
 				}
-			}
-			else if($receiver_member_info->allow_message == 'N')
+			} else if($receiver_member_info->allow_message == 'N')
 			{
 				return new object(-1, 'msg_disallow_message');
 			}
@@ -149,8 +148,7 @@ 
 				htmlFooter();
 				Context::close();
 				exit;
-			}
-			else
+			} else
 			{
 				$this->setMessage('success_sended');
 				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('','act', 'dispCommunicationMessages', 'message_type', 'S', 'receiver_srl', $receiver_srl, 'message_srl', '');
@@ -428,8 +426,7 @@ 
 		if($message_type == 'S')
 		{
 			$args->sender_srl = $member_srl;
-		}
-		else
+		} else
 		{
 			$args->receiver_srl = $member_srl;
 		}
@@ -656,8 +653,7 @@ 
 			$output = executeQuery('communication.renameFriendGroup', $args);
 			$msg_code = 'success_updated';
 			// add if not exists
-		}
-		else
+		} else
 		{
 			$output = executeQuery('communication.addFriendGroup', $args);
 			$msg_code = 'success_registed';
@@ -674,13 +670,11 @@ 
 				htmlFooter();
 				Context::close();
 				exit;
-			}
-			else
+			} else
 			{
 				return $output;
 			}
-		}
-		else
+		} else
 		{
 			if(!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 			{
@@ -692,8 +686,7 @@ 
 				htmlFooter();
 				Context::close();
 				exit;
-			}
-			else
+			} else
 			{
 				$this->setMessage($msg_code);
 			}

modules/counter/counter.admin.view.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
 		// set today's if no date is given
 		$selected_date = Context::get('selected_date');
 
-		if(!$selected_date)
+		if (!$selected_date)
 		{
 			$selected_date = date("Ymd");
 		}
@@ -50,7 +50,7 @@ 
 		// get data by time, day, month, and year
 		$type = Context::get('type');
 
-		if(!$type)
+		if (!$type)
 		{
 			$type = 'day';
 			Context::set('type', $type);

modules/counter/counter.class.php

Spacing +4 added lines, -4 removed lines

@@ -35,12 +35,12 @@ 
 	{
 		// Add site_srl to the counter
 		$oDB = DB::getInstance();
-		if(!$oDB->isColumnExists('counter_log', 'site_srl'))
+		if (!$oDB->isColumnExists('counter_log', 'site_srl'))
 		{
 			return TRUE;
 		}
 
-		if(!$oDB->isIndexExists('counter_log', 'idx_site_counter_log'))
+		if (!$oDB->isIndexExists('counter_log', 'idx_site_counter_log'))
 		{
 			return TRUE;
 		}
@@ -58,12 +58,12 @@ 
 		// Add site_srl to the counter
 		$oDB = DB::getInstance();
 
-		if(!$oDB->isColumnExists('counter_log', 'site_srl'))
+		if (!$oDB->isColumnExists('counter_log', 'site_srl'))
 		{
 			$oDB->addColumn('counter_log', 'site_srl', 'number', 11, 0, TRUE);
 		}
 
-		if(!$oDB->isIndexExists('counter_log', 'idx_site_counter_log'))
+		if (!$oDB->isIndexExists('counter_log', 'idx_site_counter_log'))
 		{
 			$oDB->addIndex('counter_log', 'idx_site_counter_log', array('site_srl', 'ipaddress'), FALSE);
 		}

modules/counter/counter.controller.php

Spacing +7 added lines, -7 removed lines

@@ -46,9 +46,9 @@ 
 		// Check the logs
 		$oCounterModel = getModel('counter');
 
-		if($oCounterModel->isInsertedTodayStatus($site_srl))
+		if ($oCounterModel->isInsertedTodayStatus($site_srl))
 		{
-			if($oCounterModel->isLogged($site_srl))
+			if ($oCounterModel->isLogged($site_srl))
 			{
 				//  Register pageview
 				$this->insertPageView($site_srl);
@@ -97,7 +97,7 @@ 
 		$args = new stdClass();
 		$args->regdate = '0,' . date('Ymd');
 
-		if($site_srl)
+		if ($site_srl)
 		{
 			$args->site_srl = $site_srl;
 			$output = executeQuery('counter.updateSiteCounterUnique', $args);
@@ -119,7 +119,7 @@ 
 		$args = new stdClass;
 		$args->regdate = '0,' . date('Ymd');
 
-		if($site_srl)
+		if ($site_srl)
 		{
 			$args->site_srl = $site_srl;
 			executeQuery('counter.updateSiteCounterPageview', $args);
@@ -141,7 +141,7 @@ 
 		$args = new stdClass();
 		$args->regdate = 0;
 
-		if($site_srl)
+		if ($site_srl)
 		{
 			$args->site_srl = $site_srl;
 			executeQuery('counter.insertSiteTodayStatus', $args);
@@ -162,7 +162,7 @@ 
 	function insertTodayStatus($regdate = 0, $site_srl = 0)
 	{
 		$args = new stdClass();
-		if($regdate)
+		if ($regdate)
 		{
 			$args->regdate = $regdate;
 		}
@@ -171,7 +171,7 @@ 
 			$args->regdate = date("Ymd");
 		}
 
-		if($site_srl)
+		if ($site_srl)
 		{
 			$args->site_srl = $site_srl;
 			$query_id = 'counter.insertSiteTodayStatus';

Braces +7 added lines, -14 removed lines

@@ -52,16 +52,14 @@ 
 			{
 				//  Register pageview
 				$this->insertPageView($site_srl);
-			}
-			else // If unregistered IP
+			} else // If unregistered IP
 			{
 				// Leave logs
 				$this->insertLog($site_srl);
 				// Register unique and pageview
 				$this->insertUniqueVisitor($site_srl);
 			}
-		}
-		else // Register today's row if not exist
+		} else // Register today's row if not exist
 		{
 			$this->insertTodayStatus(0, $site_srl);
 			// check user if the previous row exists
@@ -101,8 +99,7 @@ 
 		{
 			$args->site_srl = $site_srl;
 			$output = executeQuery('counter.updateSiteCounterUnique', $args);
-		}
-		else
+		} else
 		{
 			$output = executeQuery('counter.updateCounterUnique', $args);
 		}
@@ -123,8 +120,7 @@ 
 		{
 			$args->site_srl = $site_srl;
 			executeQuery('counter.updateSiteCounterPageview', $args);
-		}
-		else
+		} else
 		{
 			executeQuery('counter.updateCounterPageview', $args);
 		}
@@ -145,8 +141,7 @@ 
 		{
 			$args->site_srl = $site_srl;
 			executeQuery('counter.insertSiteTodayStatus', $args);
-		}
-		else
+		} else
 		{
 			executeQuery('counter.insertTodayStatus', $args);
 		}
@@ -165,8 +160,7 @@ 
 		if($regdate)
 		{
 			$args->regdate = $regdate;
-		}
-		else
+		} else
 		{
 			$args->regdate = date("Ymd");
 		}
@@ -178,8 +172,7 @@ 
 
 			$u_args->site_srl = $site_srl; // /< when inserting a daily row, attempt to inser total rows(where regdate=0) together
 			executeQuery($query_id, $u_args);
-		}
-		else
+		} else
 		{
 			$query_id = 'counter.insertTodayStatus';
 			executeQuery($query_id); // /< when inserting a daily row, attempt to inser total rows(where regdate=0) together

modules/counter/counter.model.php

Spacing +40 added lines, -40 removed lines

@@ -32,20 +32,20 @@ 
 
 		$iplogged = false;
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'counter:' . $site_srl . '_' . str_replace(array('.', ':'), '-', $args->ipaddress);
 			$cache_key = $oCacheHandler->getGroupKey('counterIpLogged_' . $args->regdate, $object_key);
 			$iplogged = $oCacheHandler->get($cache_key);
 		}
 
-		if($iplogged === false)
+		if ($iplogged === false)
 		{
 			$output = executeQuery('counter.getCounterLog', $args);
-			if($output->data->count) $iplogged = TRUE;
+			if ($output->data->count) $iplogged = TRUE;
 		}
 
-		if($iplogged && $oCacheHandler->isSupport())
+		if ($iplogged && $oCacheHandler->isSupport())
 		{
 			$oCacheHandler->put($cache_key, $iplogged);
 		}
@@ -66,15 +66,15 @@ 
 
 		$insertedTodayStatus = false;
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$cache_key = 'counter:insertedTodayStatus:' . $site_srl . '_' . $args->regdate;
 			$insertedTodayStatus = $oCacheHandler->get($cache_key);
 		}
 
-		if($insertedTodayStatus === false)
+		if ($insertedTodayStatus === false)
 		{
-			if($site_srl)
+			if ($site_srl)
 			{
 				$args->site_srl = $site_srl;
 				$output = executeQuery('counter.getSiteTodayStatus', $args);
@@ -86,7 +86,7 @@ 
 
 			$insertedTodayStatus = !!$output->data->count;
 
-			if($insertedTodayStatus && $oCacheHandler->isSupport())
+			if ($insertedTodayStatus && $oCacheHandler->isSupport())
 			{
 				$oCacheHandler->put($cache_key, TRUE);
 				$_old_date = date('Ymd', strtotime('-1 day'));
@@ -109,7 +109,7 @@ 
 		// If more than one date logs are selected
 		$args = new stdClass();
 		$args->regdate = is_array($selected_date) ? join(',', $selected_date) : $selected_date;
-		if($site_srl)
+		if ($site_srl)
 		{
 			$args->site_srl = $site_srl;
 			$output = executeQuery('counter.getSiteCounterStatusDays', $args);
@@ -120,14 +120,14 @@ 
 		}
 		$status = $output->data;
 
-		if(!is_array($selected_date))
+		if (!is_array($selected_date))
 		{
 			return $status;
 		}
 
-		if(!is_array($status)) $status = array($status);
+		if (!is_array($status)) $status = array($status);
 		$output = array();
-		foreach($status as $val)
+		foreach ($status as $val)
 		{
 			$output[substr($val->regdate, 0, 8)] = $val;
 		}
@@ -148,11 +148,11 @@ 
 		$max = 0;
 		$sum = 0;
 
-		switch($type)
+		switch ($type)
 		{
 			case 'year' :
 				// Get a date to start counting
-				if($site_srl)
+				if ($site_srl)
 				{
 					$args = new stdClass();
 					$args->site_srl = $site_srl;
@@ -163,18 +163,18 @@ 
 					$output = executeQuery('counter.getStartLogDate');
 				}
 
-				if(!($start_year = substr($output->data->regdate, 0, 4)))
+				if (!($start_year = substr($output->data->regdate, 0, 4)))
 				{
 					$start_year = date("Y");
 				}
 
-				for($i = $start_year, $y = date("Y"); $i <= $y; $i++)
+				for ($i = $start_year, $y = date("Y"); $i <= $y; $i++)
 				{
 					$args = new stdClass();
 					$args->start_date = sprintf('%04d0000', $i);
 					$args->end_date = sprintf('%04d1231', $i);
 
-					if($site_srl)
+					if ($site_srl)
 					{
 						$args->site_srl = $site_srl;
 						$output = executeQuery('counter.getSiteCounterStatus', $args);
@@ -184,10 +184,10 @@ 
 						$output = executeQuery('counter.getCounterStatus', $args);
 					}
 
-					$count = (int)($isPageView ? $output->data->pageview : $output->data->unique_visitor);
+					$count = (int) ($isPageView ? $output->data->pageview : $output->data->unique_visitor);
 					$status->list[$i] = $count;
 
-					if($count > $max) $max = $count;
+					if ($count > $max) $max = $count;
 
 					$sum += $count;
 				}
@@ -197,14 +197,14 @@ 
 				$time = strtotime($selected_date);
 				$w = date("D");
 
-				while(date("D", $time) != "Sun")
+				while (date("D", $time) != "Sun")
 				{
 					$time += 60 * 60 * 24;
 				}
 
 				$time -= 60 * 60 * 24;
 
-				while(date("D", $time) != "Sun")
+				while (date("D", $time) != "Sun")
 				{
 					$thisWeek[] = date("Ymd", $time);
 					$time -= 60 * 60 * 24;
@@ -214,13 +214,13 @@ 
 
 				asort($thisWeek);
 
-				foreach($thisWeek as $day)
+				foreach ($thisWeek as $day)
 				{
 					$args = new stdClass();
 					$args->start_date = $day;
 					$args->end_date = $day;
 
-					if($site_srl)
+					if ($site_srl)
 					{
 						$args->site_srl = $site_srl;
 						$output = executeQuery('counter.getSiteCounterStatus', $args);
@@ -230,10 +230,10 @@ 
 						$output = executeQuery('counter.getCounterStatus', $args);
 					}
 
-					$count = (int)($isPageView ? $output->data->pageview : $output->data->unique_visitor);
+					$count = (int) ($isPageView ? $output->data->pageview : $output->data->unique_visitor);
 					$status->list[$day] = $count;
 
-					if($count > $max) $max = $count;
+					if ($count > $max) $max = $count;
 
 					$sum += $count;
 				}
@@ -241,13 +241,13 @@ 
 
 			case 'month' :
 				$year = substr($selected_date, 0, 4);
-				for($i = 1; $i <= 12; $i++)
+				for ($i = 1; $i <= 12; $i++)
 				{
 					$args = new stdClass();
 					$args->start_date = sprintf('%04d%02d00', $year, $i);
 					$args->end_date = sprintf('%04d%02d31', $year, $i);
 
-					if($site_srl)
+					if ($site_srl)
 					{
 						$args->site_srl = $site_srl;
 						$output = executeQuery('counter.getSiteCounterStatus', $args);
@@ -257,23 +257,23 @@ 
 						$output = executeQuery('counter.getCounterStatus', $args);
 					}
 
-					$count = (int)($isPageView ? $output->data->pageview : $output->data->unique_visitor);
+					$count = (int) ($isPageView ? $output->data->pageview : $output->data->unique_visitor);
 					$status->list[$i] = $count;
 
-					if($count > $max) $max = $count;
+					if ($count > $max) $max = $count;
 
 					$sum += $count;
 				}
 				break;
 
 			case 'hour' :
-				for($i = 0; $i < 24; $i++)
+				for ($i = 0; $i < 24; $i++)
 				{
 					$args = new stdClass();
 					$args->start_date = sprintf('%08d%02d0000', $selected_date, $i);
 					$args->end_date = sprintf('%08d%02d5959', $selected_date, $i);
 
-					if($site_srl)
+					if ($site_srl)
 					{
 						$args->site_srl = $site_srl;
 						$output = executeQuery('counter.getSiteCounterLogStatus', $args);
@@ -287,7 +287,7 @@ 
 					$count = (int) $output->data->count;
 					$status->list[$i] = $count;
 
-					if($count > $max) $max = $count;
+					if ($count > $max) $max = $count;
 
 					$sum += $count;
 				}
@@ -298,13 +298,13 @@ 
 				$month = substr($selected_date, 4, 2);
 				$end_day = date('t', mktime(0, 0, 0, $month, 1, $year));
 
-				for($i = 1; $i <= $end_day; $i++)
+				for ($i = 1; $i <= $end_day; $i++)
 				{
 					$args = new stdClass();
 					$args->start_date = sprintf('%04d%02d%02d', $year, $month, $i);
 					$args->end_date = sprintf('%04d%02d%02d', $year, $month, $i);
 
-					if($site_srl)
+					if ($site_srl)
 					{
 						$args->site_srl = $site_srl;
 						$output = executeQuery('counter.getSiteCounterStatus', $args);
@@ -314,10 +314,10 @@ 
 						$output = executeQuery('counter.getCounterStatus', $args);
 					}
 
-					$count = (int)($isPageView ? $output->data->pageview : $output->data->unique_visitor);
+					$count = (int) ($isPageView ? $output->data->pageview : $output->data->unique_visitor);
 					$status->list[$i] = $count;
 
-					if($count > $max) $max = $count;
+					if ($count > $max) $max = $count;
 
 					$sum += $count;
 				}
@@ -337,7 +337,7 @@ 
 		$output1 = $this->getHourlyStatus('week', $date1);
 
 		$tmp = array();
-		foreach($output1->list as $key => $value)
+		foreach ($output1->list as $key => $value)
 		{
 			$tmp["'" . $key . "'"] = $value;
 		}
@@ -348,7 +348,7 @@ 
 		$output2 = $this->getHourlyStatus('week', $date2);
 
 		$tmp = array();
-		foreach($output2->list as $key => $value)
+		foreach ($output2->list as $key => $value)
 		{
 			$tmp["'" . $key . "'"] = $value;
 		}
@@ -365,7 +365,7 @@ 
 		$output1 = $this->getHourlyStatus('week', $date1, 0, TRUE);
 
 		$tmp = array();
-		foreach($output1->list as $key => $value)
+		foreach ($output1->list as $key => $value)
 		{
 			$tmp["'" . $key . "'"] = $value;
 		}
@@ -376,7 +376,7 @@ 
 		$output2 = $this->getHourlyStatus('week', $date2, 0, TRUE);
 
 		$tmp = array();
-		foreach($output2->list as $key => $value)
+		foreach ($output2->list as $key => $value)
 		{
 			$tmp["'" . $key . "'"] = $value;
 		}

Braces +29 added lines, -23 removed lines

@@ -42,7 +42,9 @@ 
 		if($iplogged === false)
 		{
 			$output = executeQuery('counter.getCounterLog', $args);
-			if($output->data->count) $iplogged = TRUE;
+			if($output->data->count) {
+				$iplogged = TRUE;
+			}
 		}
 
 		if($iplogged && $oCacheHandler->isSupport())
@@ -78,8 +80,7 @@ 
 			{
 				$args->site_srl = $site_srl;
 				$output = executeQuery('counter.getSiteTodayStatus', $args);
-			}
-			else
+			} else
 			{
 				$output = executeQuery('counter.getTodayStatus', $args);
 			}
@@ -113,8 +114,7 @@ 
 		{
 			$args->site_srl = $site_srl;
 			$output = executeQuery('counter.getSiteCounterStatusDays', $args);
-		}
-		else
+		} else
 		{
 			$output = executeQuery('counter.getCounterStatusDays', $args);
 		}
@@ -125,7 +125,9 @@ 
 			return $status;
 		}
 
-		if(!is_array($status)) $status = array($status);
+		if(!is_array($status)) {
+			$status = array($status);
+		}
 		$output = array();
 		foreach($status as $val)
 		{
@@ -157,8 +159,7 @@ 
 					$args = new stdClass();
 					$args->site_srl = $site_srl;
 					$output = executeQuery('counter.getSiteStartLogDate', $args);
-				}
-				else
+				} else
 				{
 					$output = executeQuery('counter.getStartLogDate');
 				}
@@ -178,8 +179,7 @@ 
 					{
 						$args->site_srl = $site_srl;
 						$output = executeQuery('counter.getSiteCounterStatus', $args);
-					}
-					else
+					} else
 					{
 						$output = executeQuery('counter.getCounterStatus', $args);
 					}
@@ -187,7 +187,9 @@ 
 					$count = (int)($isPageView ? $output->data->pageview : $output->data->unique_visitor);
 					$status->list[$i] = $count;
 
-					if($count > $max) $max = $count;
+					if($count > $max) {
+						$max = $count;
+					}
 
 					$sum += $count;
 				}
@@ -224,8 +226,7 @@ 
 					{
 						$args->site_srl = $site_srl;
 						$output = executeQuery('counter.getSiteCounterStatus', $args);
-					}
-					else
+					} else
 					{
 						$output = executeQuery('counter.getCounterStatus', $args);
 					}
@@ -233,7 +234,9 @@ 
 					$count = (int)($isPageView ? $output->data->pageview : $output->data->unique_visitor);
 					$status->list[$day] = $count;
 
-					if($count > $max) $max = $count;
+					if($count > $max) {
+						$max = $count;
+					}
 
 					$sum += $count;
 				}
@@ -251,8 +254,7 @@ 
 					{
 						$args->site_srl = $site_srl;
 						$output = executeQuery('counter.getSiteCounterStatus', $args);
-					}
-					else
+					} else
 					{
 						$output = executeQuery('counter.getCounterStatus', $args);
 					}
@@ -260,7 +262,9 @@ 
 					$count = (int)($isPageView ? $output->data->pageview : $output->data->unique_visitor);
 					$status->list[$i] = $count;
 
-					if($count > $max) $max = $count;
+					if($count > $max) {
+						$max = $count;
+					}
 
 					$sum += $count;
 				}
@@ -277,8 +281,7 @@ 
 					{
 						$args->site_srl = $site_srl;
 						$output = executeQuery('counter.getSiteCounterLogStatus', $args);
-					}
-					else
+					} else
 					{
 						$args->site_srl = 0;
 						$output = executeQuery('counter.getCounterLogStatus', $args);
@@ -287,7 +290,9 @@ 
 					$count = (int) $output->data->count;
 					$status->list[$i] = $count;
 
-					if($count > $max) $max = $count;
+					if($count > $max) {
+						$max = $count;
+					}
 
 					$sum += $count;
 				}
@@ -308,8 +313,7 @@ 
 					{
 						$args->site_srl = $site_srl;
 						$output = executeQuery('counter.getSiteCounterStatus', $args);
-					}
-					else
+					} else
 					{
 						$output = executeQuery('counter.getCounterStatus', $args);
 					}
@@ -317,7 +321,9 @@ 
 					$count = (int)($isPageView ? $output->data->pageview : $output->data->unique_visitor);
 					$status->list[$i] = $count;
 
-					if($count > $max) $max = $count;
+					if($count > $max) {
+						$max = $count;
+					}
 
 					$sum += $count;
 				}

modules/document/document.admin.model.php

Spacing +15 added lines, -15 removed lines

@@ -27,31 +27,31 @@ 
 	function getDocumentTrashList($obj)
 	{
 		// check a list and its order
-		if(!in_array($obj->sort_index, array('list_order','delete_date','title'))) $obj->sort_index = 'list_order';
-		if(!in_array($obj->order_type, array('desc','asc'))) $obj->order_type = 'asc';
+		if (!in_array($obj->sort_index, array('list_order', 'delete_date', 'title'))) $obj->sort_index = 'list_order';
+		if (!in_array($obj->order_type, array('desc', 'asc'))) $obj->order_type = 'asc';
 		// get a module_srl if mid is returned instead of modul_srl
-		if($obj->mid)
+		if ($obj->mid)
 		{
 			$oModuleModel = getModel('module');
 			$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
 			unset($obj->mid);
 		}
 		// check if the module_srl is an array
-		if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+		if (is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
 		else $args->module_srl = $obj->module_srl;
 		// Variable check
 		$args->sort_index = $obj->sort_index;
 		$args->order_type = $obj->order_type;
-		$args->page = $obj->page?$obj->page:1;
-		$args->list_count = $obj->list_count?$obj->list_count:20;
-		$args->page_count = $obj->page_count?$obj->page_count:10;
+		$args->page = $obj->page ? $obj->page : 1;
+		$args->list_count = $obj->list_count ? $obj->list_count : 20;
+		$args->page_count = $obj->page_count ? $obj->page_count : 10;
 		$args->member_srl = $obj->member_srl;
 		// Specify query_id
 		$query_id = 'document.getTrashList';
 		// Execute a query
 		$output = executeQueryArray($query_id, $args);
 		// Return if no result or an error occurs
-		if(!$output->toBool() || !count($output->data)) return $output;
+		if (!$output->toBool() || !count($output->data)) return $output;
 
 		$idx = 0;
 		$data = $output->data;
@@ -60,12 +60,12 @@ 
 		$keys = array_keys($data);
 		$virtual_number = $keys[0];
 
-		foreach($data as $key => $attribute)
+		foreach ($data as $key => $attribute)
 		{
 			$oDocument = null;
 			$oDocument = new documentItem();
 			$oDocument->setAttribute($attribute, false);
-			if($is_admin) $oDocument->setGrant();
+			if ($is_admin) $oDocument->setGrant();
 
 			$output->data[$virtual_number] = $oDocument;
 			$virtual_number--;
@@ -85,7 +85,7 @@ 
 		$output = executeQuery('document.getTrash', $args);
 
 		$node = $output->data;
-		if(!$node) return;
+		if (!$node) return;
 
 		return $node;
 	}
@@ -100,12 +100,12 @@ 
 	function getDocumentCountByDate($date = '', $moduleSrlList = array(), $statusList = array())
 	{
 		$args = new stdClass();
-		if($date) $args->regDate = date('Ymd', strtotime($date));
-		if(count($moduleSrlList)>0) $args->moduleSrlList = $moduleSrlList;
-		if(count($statusList)>0) $args->statusList = $statusList;
+		if ($date) $args->regDate = date('Ymd', strtotime($date));
+		if (count($moduleSrlList) > 0) $args->moduleSrlList = $moduleSrlList;
+		if (count($statusList) > 0) $args->statusList = $statusList;
 
 		$output = executeQuery('document.getDocumentCountByDate', $args);
-		if(!$output->toBool()) return 0;
+		if (!$output->toBool()) return 0;
 
 		return $output->data->count;
 	}

Braces +32 added lines, -11 removed lines

@@ -27,8 +27,12 @@ 
 	function getDocumentTrashList($obj)
 	{
 		// check a list and its order
-		if(!in_array($obj->sort_index, array('list_order','delete_date','title'))) $obj->sort_index = 'list_order';
-		if(!in_array($obj->order_type, array('desc','asc'))) $obj->order_type = 'asc';
+		if(!in_array($obj->sort_index, array('list_order','delete_date','title'))) {
+			$obj->sort_index = 'list_order';
+		}
+		if(!in_array($obj->order_type, array('desc','asc'))) {
+			$obj->order_type = 'asc';
+		}
 		// get a module_srl if mid is returned instead of modul_srl
 		if($obj->mid)
 		{
@@ -37,8 +41,11 @@ 
 			unset($obj->mid);
 		}
 		// check if the module_srl is an array
-		if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
-		else $args->module_srl = $obj->module_srl;
+		if(is_array($obj->module_srl)) {
+			$args->module_srl = implode(',', $obj->module_srl);
+		} else {
+			$args->module_srl = $obj->module_srl;
+		}
 		// Variable check
 		$args->sort_index = $obj->sort_index;
 		$args->order_type = $obj->order_type;
@@ -51,7 +58,9 @@ 
 		// Execute a query
 		$output = executeQueryArray($query_id, $args);
 		// Return if no result or an error occurs
-		if(!$output->toBool() || !count($output->data)) return $output;
+		if(!$output->toBool() || !count($output->data)) {
+			return $output;
+		}
 
 		$idx = 0;
 		$data = $output->data;
@@ -65,7 +74,9 @@ 
 			$oDocument = null;
 			$oDocument = new documentItem();
 			$oDocument->setAttribute($attribute, false);
-			if($is_admin) $oDocument->setGrant();
+			if($is_admin) {
+				$oDocument->setGrant();
+			}
 
 			$output->data[$virtual_number] = $oDocument;
 			$virtual_number--;
@@ -85,7 +96,9 @@ 
 		$output = executeQuery('document.getTrash', $args);
 
 		$node = $output->data;
-		if(!$node) return;
+		if(!$node) {
+			return;
+		}
 
 		return $node;
 	}
@@ -100,12 +113,20 @@ 
 	function getDocumentCountByDate($date = '', $moduleSrlList = array(), $statusList = array())
 	{
 		$args = new stdClass();
-		if($date) $args->regDate = date('Ymd', strtotime($date));
-		if(count($moduleSrlList)>0) $args->moduleSrlList = $moduleSrlList;
-		if(count($statusList)>0) $args->statusList = $statusList;
+		if($date) {
+			$args->regDate = date('Ymd', strtotime($date));
+		}
+		if(count($moduleSrlList)>0) {
+			$args->moduleSrlList = $moduleSrlList;
+		}
+		if(count($statusList)>0) {
+			$args->statusList = $statusList;
+		}
 
 		$output = executeQuery('document.getDocumentCountByDate', $args);
-		if(!$output->toBool()) return 0;
+		if(!$output->toBool()) {
+			return 0;
+		}
 
 		return $output->data->count;
 	}

modules/document/document.admin.view.php

Indentation +7 added lines, -7 removed lines

@@ -1,13 +1,13 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * documentAdminView class
- * Document admin view of the module class
- *
- * @author NAVER (developers@xpressengine.com)
- * @package /modules/document
- * @version 0.1
- */
+	 * documentAdminView class
+	 * Document admin view of the module class
+	 *
+	 * @author NAVER (developers@xpressengine.com)
+	 * @package /modules/document
+	 * @version 0.1
+	 */
 class documentAdminView extends document
 {
 	/**

Spacing +19 added lines, -19 removed lines

@@ -19,9 +19,9 @@ 
 		// check current location in admin menu
 		$oModuleModel = getModel('module');
 		$info = $oModuleModel->getModuleActionXml('document');
-		foreach($info->menu AS $key => $menu)
+		foreach ($info->menu AS $key => $menu)
 		{
-			if(in_array($this->act, $menu->acts))
+			if (in_array($this->act, $menu->acts))
 			{
 				Context::set('currentMenu', $key);
 				break;
@@ -66,7 +66,7 @@ 
 
 		// set a search option used in the template
 		$count_search_option = count($this->search_option);
-		for($i=0;$i<$count_search_option;$i++)
+		for ($i = 0; $i < $count_search_option; $i++)
 		{
 			$search_option[$this->search_option[$i]] = Context::getLang($this->search_option[$i]);
 		}
@@ -75,20 +75,20 @@ 
 		$oModuleModel = getModel('module');
 		$module_list = array();
 		$mod_srls = array();
-		foreach($output->data as $oDocument)
+		foreach ($output->data as $oDocument)
 		{
 			$mod_srls[] = $oDocument->get('module_srl');
 		}
 		$mod_srls = array_unique($mod_srls);
 		// Module List
 		$mod_srls_count = count($mod_srls);
-		if($mod_srls_count)
+		if ($mod_srls_count)
 		{
 			$columnList = array('module_srl', 'mid', 'browser_title');
 			$module_output = $oModuleModel->getModulesInfo($mod_srls, $columnList);
-			if($module_output && is_array($module_output))
+			if ($module_output && is_array($module_output))
 			{
-				foreach($module_output as $module)
+				foreach ($module_output as $module)
 				{
 					$module_list[$module->module_srl] = $module;
 				}
@@ -97,7 +97,7 @@ 
 		Context::set('module_list', $module_list);
 
 		// Specify a template
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 		$this->setTemplateFile('document_list');
 	}
 
@@ -109,10 +109,10 @@ 
 	{
 		$oDocumentModel = getModel('document');
 		$config = $oDocumentModel->getDocumentConfig();
-		Context::set('config',$config);
+		Context::set('config', $config);
 
 		// Set the template file
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 		$this->setTemplateFile('document_config');
 	}
 
@@ -123,7 +123,7 @@ 
 	function dispDocumentAdminDeclared()
 	{
 		// option for a list
-		$args =new stdClass();
+		$args = new stdClass();
 		$args->page = Context::get('page'); // /< Page
 		$args->list_count = 30; // /< the number of posts to display on a single page
 		$args->page_count = 10; // /< the number of pages that appear in the page navigation
@@ -137,11 +137,11 @@ 
 
 		// get a list
 		$declared_output = executeQuery('document.getDeclaredList', $args);
-		if($declared_output->data && count($declared_output->data))
+		if ($declared_output->data && count($declared_output->data))
 		{
 			$document_list = array();
 
-			foreach($declared_output->data as $key => $document)
+			foreach ($declared_output->data as $key => $document)
 			{
 				$document_list[$key] = new documentItem();
 				$document_list[$key]->setAttribute($document);
@@ -157,7 +157,7 @@ 
 		Context::set('page_navigation', $declared_output->page_navigation);
 		Context::set('status_name_list', $statusNameList);
 		// Set the template
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 		$this->setTemplateFile('declared_list');
 	}
 
@@ -168,15 +168,15 @@ 
 	function dispDocumentAdminAlias()
 	{
 		$args->document_srl = Context::get('document_srl');
-		if(!$args->document_srl) return $this->dispDocumentAdminList();
+		if (!$args->document_srl) return $this->dispDocumentAdminList();
 
 		$oModel = getModel('document');
 		$oDocument = $oModel->getDocument($args->document_srl);
-		if(!$oDocument->isExists()) return $this->dispDocumentAdminList();
+		if (!$oDocument->isExists()) return $this->dispDocumentAdminList();
 		Context::set('oDocument', $oDocument);
 
 		$output = executeQueryArray('document.getAliases', $args);
-		if(!$output->data)
+		if (!$output->data)
 		{
 			$aliases = array();
 		}
@@ -187,7 +187,7 @@ 
 
 		Context::set('aliases', $aliases);
 
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 		$this->setTemplateFile('document_alias');
 	}
 
@@ -218,7 +218,7 @@ 
 		Context::set('document_list', $output->data);
 		Context::set('page_navigation', $output->page_navigation);
 		// set the template
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 		$this->setTemplateFile('document_trash_list');
 	}
 }

Braces +7 added lines, -4 removed lines

@@ -168,19 +168,22 @@
 	function dispDocumentAdminAlias()
 	{
 		$args->document_srl = Context::get('document_srl');
-		if(!$args->document_srl) return $this->dispDocumentAdminList();
+		if(!$args->document_srl) {
+			return $this->dispDocumentAdminList();
+		}
 
 		$oModel = getModel('document');
 		$oDocument = $oModel->getDocument($args->document_srl);
-		if(!$oDocument->isExists()) return $this->dispDocumentAdminList();
+		if(!$oDocument->isExists()) {
+			return $this->dispDocumentAdminList();
+		}
 		Context::set('oDocument', $oDocument);
 
 		$output = executeQueryArray('document.getAliases', $args);
 		if(!$output->data)
 		{
 			$aliases = array();
-		}
-		else
+		} else
 		{
 			$aliases = $output->data; 
 		}