xpressengine / xe-core

modules/board/board.class.php

Spacing +11 added lines, -11 removed lines

@@ -9,7 +9,7 @@ 
 
 class board extends ModuleObject
 {
-	var $search_option = array('title_content','title','content','comment','user_name','nick_name','user_id','tag'); ///< 검색 옵션
+	var $search_option = array('title_content', 'title', 'content', 'comment', 'user_name', 'nick_name', 'user_id', 'tag'); ///< 검색 옵션
 
 	var $order_target = array('list_order', 'update_order', 'regdate', 'voted_count', 'blamed_count', 'readed_count', 'comment_count', 'title', 'nick_name', 'user_name', 'user_id'); // 정렬 옵션
 
@@ -25,9 +25,9 @@ 
 	 */
 	function board()
 	{
-		if(!Context::isInstalled()) return;
+		if (!Context::isInstalled()) return;
 
-		if(!Context::isExistsSSLAction('dispBoardWrite') && Context::getSslStatus() == 'optional')
+		if (!Context::isExistsSSLAction('dispBoardWrite') && Context::getSslStatus() == 'optional')
 		{
 			$ssl_actions = array('dispBoardWrite', 'dispBoardWriteComment', 'dispBoardReplyComment', 'dispBoardModifyComment', 'dispBoardDelete', 'dispBoardDeleteComment', 'procBoardInsertDocument', 'procBoardDeleteDocument', 'procBoardInsertComment', 'procBoardDeleteComment', 'procBoardVerificationPassword');
 			Context::addSSLActions($ssl_actions);
@@ -50,7 +50,7 @@ 
 		$args = new stdClass;
 		$args->site_srl = 0;
 		$output = executeQuery('module.getSite', $args);
-		if(!$output->data->index_module_srl)
+		if (!$output->data->index_module_srl)
 		{
 			$args->mid = 'board';
 			$args->module = 'board';
@@ -59,7 +59,7 @@ 
 			$args->site_srl = 0;
 			$output = $oModuleController->insertModule($args);
 
-			if($output->toBool())
+			if ($output->toBool())
 			{
 				$module_srl = $output->get('module_srl');
 
@@ -83,10 +83,10 @@ 
 		$oModuleModel = getModel('module');
 
 		// 2007. 10. 17 get the member menu trigger
-		if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) return true;
+		if (!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) return true;
 
 		// 2011. 09. 20 when add new menu in sitemap, custom menu add
-		if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) return true;
+		if (!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) return true;
 		return false;
 	}
 
@@ -99,13 +99,13 @@ 
 		$oModuleController = getController('module');
 
 		// 2007. 10. 17  check the member menu trigger, if it is not existed then insert
-		if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after'))
+		if (!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after'))
 		{
 			$oModuleController->insertTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after');
 		}
 
 		// 2011. 09. 20 when add new menu in sitemap, custom menu add
-		if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after'))
+		if (!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after'))
 		{
 			$oModuleController->insertTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after');
 		}
@@ -116,12 +116,12 @@ 
 	function moduleUninstall()
 	{
 		$output = executeQueryArray("board.getAllBoard");
-		if(!$output->data) return new Object();
+		if (!$output->data) return new Object();
 		@set_time_limit(0);
 
 		$oModuleController = getController('module');
 
-		foreach($output->data as $board)
+		foreach ($output->data as $board)
 		{
 			$oModuleController->deleteModule($board->module_srl);
 		}

Braces +12 added lines, -4 removed lines

@@ -25,7 +25,9 @@ 
 	 */
 	function board()
 	{
-		if(!Context::isInstalled()) return;
+		if(!Context::isInstalled()) {
+			return;
+		}
 
 		if(!Context::isExistsSSLAction('dispBoardWrite') && Context::getSslStatus() == 'optional')
 		{
@@ -83,10 +85,14 @@ 
 		$oModuleModel = getModel('module');
 
 		// 2007. 10. 17 get the member menu trigger
-		if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) return true;
+		if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) {
+			return true;
+		}
 
 		// 2011. 09. 20 when add new menu in sitemap, custom menu add
-		if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) return true;
+		if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) {
+			return true;
+		}
 		return false;
 	}
 
@@ -116,7 +122,9 @@ 
 	function moduleUninstall()
 	{
 		$output = executeQueryArray("board.getAllBoard");
-		if(!$output->data) return new Object();
+		if(!$output->data) {
+			return new Object();
+		}
 		@set_time_limit(0);
 
 		$oModuleController = getController('module');

modules/board/board.controller.php

Spacing +58 added lines, -58 removed lines

@@ -23,11 +23,11 @@ 
 	function procBoardInsertDocument()
 	{
 		// check grant
-		if($this->module_info->module != "board")
+		if ($this->module_info->module != "board")
 		{
 			return new Object(-1, "msg_invalid_request");
 		}
-		if(!$this->grant->write_document)
+		if (!$this->grant->write_document)
 		{
 			return new Object(-1, 'msg_not_permitted');
 		}
@@ -36,16 +36,16 @@ 
 		// setup variables
 		$obj = Context::getRequestVars();
 		$obj->module_srl = $this->module_srl;
-		if($obj->is_notice!='Y'||!$this->grant->manager) $obj->is_notice = 'N';
+		if ($obj->is_notice != 'Y' || !$this->grant->manager) $obj->is_notice = 'N';
 		$obj->commentStatus = $obj->comment_status;
 
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		if ($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))), 20, '...');
 		//setup dpcument title tp 'Untitled'
-		if($obj->title == '') $obj->title = 'Untitled';
+		if ($obj->title == '') $obj->title = 'Untitled';
 
 		// unset document style if the user is not the document manager
-		if(!$this->grant->manager)
+		if (!$this->grant->manager)
 		{
 			unset($obj->title_color);
 			unset($obj->title_bold);
@@ -62,24 +62,24 @@ 
 
 		// update the document if it is existed
 		$is_update = false;
-		if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
+		if ($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
 		{
 			$is_update = true;
 		}
 
 		// if use anonymous is true
-		if($this->module_info->use_anonymous == 'Y')
+		if ($this->module_info->use_anonymous == 'Y')
 		{
 			$this->module_info->admin_mail = '';
 			$obj->notify_message = 'N';
-			if($is_update===false)
+			if ($is_update === false)
 			{
-				$obj->member_srl = -1*$logged_info->member_srl;
+				$obj->member_srl = -1 * $logged_info->member_srl;
 			}
 			$obj->email_address = $obj->homepage = $obj->user_id = '';
 			$obj->user_name = $obj->nick_name = 'anonymous';
 			$bAnonymous = true;
-			if($is_update===false)
+			if ($is_update === false)
 			{
 				$oDocument->add('member_srl', $obj->member_srl);
 			}
@@ -89,10 +89,10 @@ 
 			$bAnonymous = false;
 		}
 
-		if($obj->is_secret == 'Y' || strtoupper($obj->status == 'SECRET'))
+		if ($obj->is_secret == 'Y' || strtoupper($obj->status == 'SECRET'))
 		{
 			$use_status = explode('|@|', $this->module_info->use_status);
-			if(!is_array($use_status) || !in_array('SECRET', $use_status))
+			if (!is_array($use_status) || !in_array('SECRET', $use_status))
 			{
 				unset($obj->is_secret);
 				$obj->status = 'PUBLIC';
@@ -100,19 +100,19 @@ 
 		}
 
 		// update the document if it is existed
-		if($is_update)
+		if ($is_update)
 		{
-			if(!$oDocument->isGranted())
+			if (!$oDocument->isGranted())
 			{
-				return new Object(-1,'msg_not_permitted');
+				return new Object(-1, 'msg_not_permitted');
 			}
 
-			if($this->module_info->protect_content=="Y" && $oDocument->get('comment_count')>0 && $this->grant->manager==false)
+			if ($this->module_info->protect_content == "Y" && $oDocument->get('comment_count') > 0 && $this->grant->manager == false)
 			{
-				return new Object(-1,'msg_protect_content');
+				return new Object(-1, 'msg_protect_content');
 			}
 
-			if(!$this->grant->manager)
+			if (!$this->grant->manager)
 			{
 				// notice & document style same as before if not manager
 				$obj->is_notice = $oDocument->get('is_notice');
@@ -121,7 +121,7 @@ 
 			}
 			
 			// modify list_order if document status is temp
-			if($oDocument->get('status') == 'TEMP')
+			if ($oDocument->get('status') == 'TEMP')
 			{
 				$obj->last_update = $obj->regdate = date('YmdHis');
 				$obj->update_order = $obj->list_order = (getNextSequence() * -1);
@@ -137,18 +137,18 @@ 
 			$obj->document_srl = $output->get('document_srl');
 
 			// send an email to admin user
-			if($output->toBool() && $this->module_info->admin_mail)
+			if ($output->toBool() && $this->module_info->admin_mail)
 			{
 				$oMail = new Mail();
 				$oMail->setTitle($obj->title);
-				$oMail->setContent( sprintf("From : <a href=\"%s\">%s</a><br/>\r\n%s", getFullUrl('','document_srl',$obj->document_srl), getFullUrl('','document_srl',$obj->document_srl), $obj->content));
+				$oMail->setContent(sprintf("From : <a href=\"%s\">%s</a><br/>\r\n%s", getFullUrl('', 'document_srl', $obj->document_srl), getFullUrl('', 'document_srl', $obj->document_srl), $obj->content));
 				$oMail->setSender($obj->user_name, $obj->email_address);
 
-				$target_mail = explode(',',$this->module_info->admin_mail);
-				for($i=0;$i<count($target_mail);$i++)
+				$target_mail = explode(',', $this->module_info->admin_mail);
+				for ($i = 0; $i < count($target_mail); $i++)
 				{
 					$email_address = trim($target_mail[$i]);
-					if(!$email_address) continue;
+					if (!$email_address) continue;
 					$oMail->setReceiptor($email_address, $email_address);
 					$oMail->send();
 				}
@@ -156,7 +156,7 @@ 
 		}
 
 		// if there is an error
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -178,7 +178,7 @@ 
 		$document_srl = Context::get('document_srl');
 
 		// if the document is not existed
-		if(!$document_srl)
+		if (!$document_srl)
 		{
 			return $this->doError('msg_invalid_document');
 		}
@@ -186,7 +186,7 @@ 
 		$oDocumentModel = &getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
 		// check protect content
-		if($this->module_info->protect_content=="Y" && $oDocument->get('comment_count')>0 && $this->grant->manager==false)
+		if ($this->module_info->protect_content == "Y" && $oDocument->get('comment_count') > 0 && $this->grant->manager == false)
 		{
 			return new Object(-1, 'msg_protect_content');
 		}
@@ -196,7 +196,7 @@ 
 
 		// delete the document
 		$output = $oDocumentController->deleteDocument($document_srl, $this->grant->manager);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -226,7 +226,7 @@ 
 	function procBoardInsertComment()
 	{
 		// check grant
-		if(!$this->grant->write_comment)
+		if (!$this->grant->write_comment)
 		{
 			return new Object(-1, 'msg_not_permitted');
 		}
@@ -236,13 +236,13 @@ 
 		$obj = Context::getRequestVars();
 		$obj->module_srl = $this->module_srl;
 
-		if(!$this->module_info->use_status) $this->module_info->use_status = 'PUBLIC';
-		if(!is_array($this->module_info->use_status))
+		if (!$this->module_info->use_status) $this->module_info->use_status = 'PUBLIC';
+		if (!is_array($this->module_info->use_status))
 		{
 			$this->module_info->use_status = explode('|@|', $this->module_info->use_status);
 		}
 
-		if(in_array('SECRET', $this->module_info->use_status))
+		if (in_array('SECRET', $this->module_info->use_status))
 		{
 			$this->module_info->secret = 'Y';
 		}
@@ -255,17 +255,17 @@ 
 		// check if the doument is existed
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($obj->document_srl);
-		if(!$oDocument->isExists())
+		if (!$oDocument->isExists())
 		{
-			return new Object(-1,'msg_not_founded');
+			return new Object(-1, 'msg_not_founded');
 		}
 
 		// For anonymous use, remove writer's information and notifying information
-		if($this->module_info->use_anonymous == 'Y')
+		if ($this->module_info->use_anonymous == 'Y')
 		{
 			$this->module_info->admin_mail = '';
 			$obj->notify_message = 'N';
-			$obj->member_srl = -1*$logged_info->member_srl;
+			$obj->member_srl = -1 * $logged_info->member_srl;
 			$obj->email_address = $obj->homepage = $obj->user_id = '';
 			$obj->user_name = $obj->nick_name = 'anonymous';
 			$bAnonymous = true;
@@ -283,7 +283,7 @@ 
 
 		// check the comment is existed
 		// if the comment is not existed, then generate a new sequence
-		if(!$obj->comment_srl)
+		if (!$obj->comment_srl)
 		{
 			$obj->comment_srl = getNextSequence();
 		} else {
@@ -291,14 +291,14 @@ 
 		}
 
 		// if comment_srl is not existed, then insert the comment
-		if($comment->comment_srl != $obj->comment_srl)
+		if ($comment->comment_srl != $obj->comment_srl)
 		{
 
 			// parent_srl is existed
-			if($obj->parent_srl)
+			if ($obj->parent_srl)
 			{
 				$parent_comment = $oCommentModel->getComment($obj->parent_srl);
-				if(!$parent_comment->comment_srl)
+				if (!$parent_comment->comment_srl)
 				{
 					return new Object(-1, 'msg_invalid_request');
 				}
@@ -312,9 +312,9 @@ 
 		// update the comment if it is not existed
 		} else {
 			// check the grant
-			if(!$comment->isGranted())
+			if (!$comment->isGranted())
 			{
-				return new Object(-1,'msg_not_permitted');
+				return new Object(-1, 'msg_not_permitted');
 			}
 
 			$obj->parent_srl = $comment->parent_srl;
@@ -322,7 +322,7 @@ 
 			$comment_srl = $obj->comment_srl;
 		}
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -340,7 +340,7 @@ 
 	{
 		// get the comment_srl
 		$comment_srl = Context::get('comment_srl');
-		if(!$comment_srl)
+		if (!$comment_srl)
 		{
 			return $this->doError('msg_invalid_request');
 		}
@@ -349,7 +349,7 @@ 
 		$oCommentController = getController('comment');
 
 		$output = $oCommentController->deleteComment($comment_srl, $this->grant->manager);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -370,10 +370,10 @@ 
 		// generate trackback module controller object
 		$oTrackbackController = getController('trackback');
 
-		if(!$oTrackbackController) return;
+		if (!$oTrackbackController) return;
 
 		$output = $oTrackbackController->deleteTrackback($trackback_srl, $this->grant->manager);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -397,18 +397,18 @@ 
 		$oMemberModel = getModel('member');
 
 		// if the comment exists
-		if($comment_srl)
+		if ($comment_srl)
 		{
 			// get the comment information
 			$oCommentModel = getModel('comment');
 			$oComment = $oCommentModel->getComment($comment_srl);
-			if(!$oComment->isExists())
+			if (!$oComment->isExists())
 			{
 				return new Object(-1, 'msg_invalid_request');
 			}
 
 			// compare the comment password and the user input password
-			if(!$oMemberModel->isValidPassword($oComment->get('password'),$password))
+			if (!$oMemberModel->isValidPassword($oComment->get('password'), $password))
 			{
 				return new Object(-1, 'msg_invalid_password');
 			}
@@ -418,13 +418,13 @@ 
 			 // get the document information
 			$oDocumentModel = getModel('document');
 			$oDocument = $oDocumentModel->getDocument($document_srl);
-			if(!$oDocument->isExists())
+			if (!$oDocument->isExists())
 			{
 				return new Object(-1, 'msg_invalid_request');
 			}
 
 			// compare the document password and the user input password
-			if(!$oMemberModel->isValidPassword($oDocument->get('password'),$password))
+			if (!$oMemberModel->isValidPassword($oDocument->get('password'), $password))
 			{
 				return new Object(-1, 'msg_invalid_password');
 			}
@@ -441,7 +441,7 @@ 
 		$member_srl = Context::get('target_srl');
 		$mid = Context::get('cur_mid');
 
-		if(!$member_srl || !$mid)
+		if (!$member_srl || !$mid)
 		{
 			return new Object();
 		}
@@ -453,13 +453,13 @@ 
 		$columnList = array('module');
 		$cur_module_info = $oModuleModel->getModuleInfoByMid($mid, 0, $columnList);
 
-		if($cur_module_info->module != 'board')
+		if ($cur_module_info->module != 'board')
 		{
 			return new Object();
 		}
 
 		// get the member information
-		if($member_srl == $logged_info->member_srl)
+		if ($member_srl == $logged_info->member_srl)
 		{
 			$member_info = $logged_info;
 		} else {
@@ -467,13 +467,13 @@ 
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
 		}
 
-		if(!$member_info->user_id)
+		if (!$member_info->user_id)
 		{
 			return new Object();
 		}
 
 		//search
-		$url = getUrl('','mid',$mid,'search_target','nick_name','search_keyword',$member_info->nick_name);
+		$url = getUrl('', 'mid', $mid, 'search_target', 'nick_name', 'search_keyword', $member_info->nick_name);
 		$oMemberController = getController('member');
 		$oMemberController->addMemberPopupMenu($url, 'cmd_view_own_document', '');
 

Braces +21 added lines, -12 removed lines

@@ -36,13 +36,19 @@ 
 		// setup variables
 		$obj = Context::getRequestVars();
 		$obj->module_srl = $this->module_srl;
-		if($obj->is_notice!='Y'||!$this->grant->manager) $obj->is_notice = 'N';
+		if($obj->is_notice!='Y'||!$this->grant->manager) {
+			$obj->is_notice = 'N';
+		}
 		$obj->commentStatus = $obj->comment_status;
 
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		if($obj->title == '') {
+			$obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		}
 		//setup dpcument title tp 'Untitled'
-		if($obj->title == '') $obj->title = 'Untitled';
+		if($obj->title == '') {
+			$obj->title = 'Untitled';
+		}
 
 		// unset document style if the user is not the document manager
 		if(!$this->grant->manager)
@@ -83,8 +89,7 @@ 
 			{
 				$oDocument->add('member_srl', $obj->member_srl);
 			}
-		}
-		else
+		} else
 		{
 			$bAnonymous = false;
 		}
@@ -148,7 +153,9 @@ 
 				for($i=0;$i<count($target_mail);$i++)
 				{
 					$email_address = trim($target_mail[$i]);
-					if(!$email_address) continue;
+					if(!$email_address) {
+						continue;
+					}
 					$oMail->setReceiptor($email_address, $email_address);
 					$oMail->send();
 				}
@@ -236,7 +243,9 @@ 
 		$obj = Context::getRequestVars();
 		$obj->module_srl = $this->module_srl;
 
-		if(!$this->module_info->use_status) $this->module_info->use_status = 'PUBLIC';
+		if(!$this->module_info->use_status) {
+			$this->module_info->use_status = 'PUBLIC';
+		}
 		if(!is_array($this->module_info->use_status))
 		{
 			$this->module_info->use_status = explode('|@|', $this->module_info->use_status);
@@ -245,8 +254,7 @@ 
 		if(in_array('SECRET', $this->module_info->use_status))
 		{
 			$this->module_info->secret = 'Y';
-		}
-		else
+		} else
 		{
 			unset($obj->is_secret);
 			$this->module_info->secret = 'N';
@@ -269,8 +277,7 @@ 
 			$obj->email_address = $obj->homepage = $obj->user_id = '';
 			$obj->user_name = $obj->nick_name = 'anonymous';
 			$bAnonymous = true;
-		}
-		else
+		} else
 		{
 			$bAnonymous = false;
 		}
@@ -370,7 +377,9 @@ 
 		// generate trackback module controller object
 		$oTrackbackController = getController('trackback');
 
-		if(!$oTrackbackController) return;
+		if(!$oTrackbackController) {
+			return;
+		}
 
 		$output = $oTrackbackController->deleteTrackback($trackback_srl, $this->grant->manager);
 		if(!$output->toBool())

modules/board/board.mobile.php

Spacing +21 added lines, -21 removed lines

@@ -1,7 +1,7 @@ 
 <?php

 /* Copyright (C) NAVER <http://www.navercorp.com> */

 

-require_once(_XE_PATH_.'modules/board/board.view.php');

+require_once(_XE_PATH_ . 'modules/board/board.view.php');

 

 class boardMobile extends boardView

 {

@@ -10,32 +10,32 @@ 
 		$oSecurity = new Security();

 		$oSecurity->encodeHTML('document_srl', 'comment_srl', 'vid', 'mid', 'page', 'category', 'search_target', 'search_keyword', 'sort_index', 'order_type', 'trackback_srl');

 

-		if($this->module_info->list_count) $this->list_count = $this->module_info->list_count;

-		if($this->module_info->mobile_list_count) $this->list_count = $this->module_info->mobile_list_count;

-		if($this->module_info->search_list_count) $this->search_list_count = $this->module_info->search_list_count;

-		if($this->module_info->mobile_search_list_count) $this->list_count = $this->module_info->mobile_search_list_count;

-		if($this->module_info->page_count) $this->page_count = $this->module_info->page_count;

-		if($this->module_info->mobile_page_count) $this->page_count = $this->module_info->mobile_page_count;

+		if ($this->module_info->list_count) $this->list_count = $this->module_info->list_count;

+		if ($this->module_info->mobile_list_count) $this->list_count = $this->module_info->mobile_list_count;

+		if ($this->module_info->search_list_count) $this->search_list_count = $this->module_info->search_list_count;

+		if ($this->module_info->mobile_search_list_count) $this->list_count = $this->module_info->mobile_search_list_count;

+		if ($this->module_info->page_count) $this->page_count = $this->module_info->page_count;

+		if ($this->module_info->mobile_page_count) $this->page_count = $this->module_info->mobile_page_count;

 		$this->except_notice = $this->module_info->except_notice == 'N' ? false : true;

 

 		// $this->_getStatusNameListecret option backward compatibility

 		$oDocumentModel = getModel('document');

 

 		$statusList = $this->_getStatusNameList($oDocumentModel);

-		if(isset($statusList['SECRET']))

+		if (isset($statusList['SECRET']))

 		{

 			$this->module_info->secret = 'Y';

 		}

 

 		// use_category <=1.5.x, hide_category >=1.7.x

 		$count_category = count($oDocumentModel->getCategoryList($this->module_info->module_srl));

-		if($count_category)

+		if ($count_category)

 		{

-			if($this->module_info->hide_category)

+			if ($this->module_info->hide_category)

 			{

 				$this->module_info->use_category = ($this->module_info->hide_category == 'Y') ? 'N' : 'Y';

 			}

-			else if($this->module_info->use_category)

+			else if ($this->module_info->use_category)

 			{

 				$this->module_info->hide_category = ($this->module_info->use_category == 'Y') ? 'N' : 'Y';

 			}

@@ -55,10 +55,10 @@ 
 		 * check the consultation function, if the user is admin then swich off consultation function

 		 * if the user is not logged, then disppear write document/write comment./ view document

 		 **/

-		if($this->module_info->consultation == 'Y' && !$this->grant->manager)

+		if ($this->module_info->consultation == 'Y' && !$this->grant->manager)

 		{

 			$this->consultation = true;

-			if(!Context::get('is_logged')) $this->grant->list = $this->grant->write_document = $this->grant->write_comment = $this->grant->view = false;

+			if (!Context::get('is_logged')) $this->grant->list = $this->grant->write_document = $this->grant->write_comment = $this->grant->view = false;

 		} else {

 			$this->consultation = false;

 		}

@@ -67,14 +67,14 @@ 
 		$extra_keys = $oDocumentModel->getExtraKeys($this->module_info->module_srl);

 		Context::set('extra_keys', $extra_keys);

 

-		$template_path = sprintf("%sm.skins/%s/",$this->module_path, $this->module_info->mskin);

-		if(!is_dir($template_path)||!$this->module_info->mskin)

+		$template_path = sprintf("%sm.skins/%s/", $this->module_path, $this->module_info->mskin);

+		if (!is_dir($template_path) || !$this->module_info->mskin)

 		{

 			$this->module_info->mskin = 'default';

-			$template_path = sprintf("%sm.skins/%s/",$this->module_path, $this->module_info->mskin);

+			$template_path = sprintf("%sm.skins/%s/", $this->module_path, $this->module_info->mskin);

 		}

 		$this->setTemplatePath($template_path);

-		Context::addJsFilter($this->module_path.'tpl/filter', 'input_password.xml');

+		Context::addJsFilter($this->module_path . 'tpl/filter', 'input_password.xml');

 	}

 

 	function dispBoardCategory()

@@ -87,13 +87,13 @@ 
 	function getBoardCommentPage()

 	{

 		$document_srl = Context::get('document_srl');

-		$oDocumentModel =& getModel('document');

-		if(!$document_srl)

+		$oDocumentModel = & getModel('document');

+		if (!$document_srl)

 		{

 			return new Object(-1, "msg_invalid_request");

 		}

 		$oDocument = $oDocumentModel->getDocument($document_srl);

-		if(!$oDocument->isExists())

+		if (!$oDocument->isExists())

 		{

 			return new Object(-1, "msg_invalid_request");

 		}

@@ -106,7 +106,7 @@ 
 	function dispBoardMessage($msg_code)

 	{

 		$msg = Context::getLang($msg_code);

-		$oMessageObject = &ModuleHandler::getModuleInstance('message','mobile');

+		$oMessageObject = &ModuleHandler::getModuleInstance('message', 'mobile');

 		$oMessageObject->setError(-1);

 		$oMessageObject->setMessage($msg);

 		$oMessageObject->dispMessage();

Braces +24 added lines, -13 removed lines

@@ -10,12 +10,24 @@ 
 		$oSecurity = new Security();

 		$oSecurity->encodeHTML('document_srl', 'comment_srl', 'vid', 'mid', 'page', 'category', 'search_target', 'search_keyword', 'sort_index', 'order_type', 'trackback_srl');

 

-		if($this->module_info->list_count) $this->list_count = $this->module_info->list_count;

-		if($this->module_info->mobile_list_count) $this->list_count = $this->module_info->mobile_list_count;

-		if($this->module_info->search_list_count) $this->search_list_count = $this->module_info->search_list_count;

-		if($this->module_info->mobile_search_list_count) $this->list_count = $this->module_info->mobile_search_list_count;

-		if($this->module_info->page_count) $this->page_count = $this->module_info->page_count;

-		if($this->module_info->mobile_page_count) $this->page_count = $this->module_info->mobile_page_count;

+		if($this->module_info->list_count) {
+			$this->list_count = $this->module_info->list_count;
+		}
+		if($this->module_info->mobile_list_count) {
+			$this->list_count = $this->module_info->mobile_list_count;
+		}
+		if($this->module_info->search_list_count) {
+			$this->search_list_count = $this->module_info->search_list_count;
+		}
+		if($this->module_info->mobile_search_list_count) {
+			$this->list_count = $this->module_info->mobile_search_list_count;
+		}
+		if($this->module_info->page_count) {
+			$this->page_count = $this->module_info->page_count;
+		}
+		if($this->module_info->mobile_page_count) {
+			$this->page_count = $this->module_info->mobile_page_count;
+		}
 		$this->except_notice = $this->module_info->except_notice == 'N' ? false : true;

 

 		// $this->_getStatusNameListecret option backward compatibility

@@ -34,18 +46,15 @@ 
 			if($this->module_info->hide_category)

 			{

 				$this->module_info->use_category = ($this->module_info->hide_category == 'Y') ? 'N' : 'Y';

-			}

-			else if($this->module_info->use_category)

+			} else if($this->module_info->use_category)

 			{

 				$this->module_info->hide_category = ($this->module_info->use_category == 'Y') ? 'N' : 'Y';

-			}

-			else

+			} else

 			{

 				$this->module_info->hide_category = 'N';

 				$this->module_info->use_category = 'Y';

 			}

-		}

-		else

+		} else

 		{

 			$this->module_info->hide_category = 'Y';

 			$this->module_info->use_category = 'N';

@@ -58,7 +67,9 @@ 
 		if($this->module_info->consultation == 'Y' && !$this->grant->manager)

 		{

 			$this->consultation = true;

-			if(!Context::get('is_logged')) $this->grant->list = $this->grant->write_document = $this->grant->write_comment = $this->grant->view = false;

+			if(!Context::get('is_logged')) {
+				$this->grant->list = $this->grant->write_document = $this->grant->write_comment = $this->grant->view = false;
+			}
 		} else {

 			$this->consultation = false;

 		}

modules/board/board.model.php

Spacing +11 added lines, -11 removed lines

@@ -25,21 +25,21 @@ 
 

 		// get the list config value, if it is not exitsted then setup the default value

 		$list_config = $oModuleModel->getModulePartConfig('board', $module_srl);

-		if(!$list_config || count($list_config) <= 0)

+		if (!$list_config || count($list_config) <= 0)

 		{

-			$list_config = array( 'no', 'title', 'nick_name','regdate','readed_count');

+			$list_config = array('no', 'title', 'nick_name', 'regdate', 'readed_count');

 		}

 

 		// get the extra variables

 		$inserted_extra_vars = $oDocumentModel->getExtraKeys($module_srl);

 

-		foreach($list_config as $key)

+		foreach ($list_config as $key)

 		{

-			if(preg_match('/^([0-9]+)$/',$key))

+			if (preg_match('/^([0-9]+)$/', $key))

 			{

-				if($inserted_extra_vars[$key])

+				if ($inserted_extra_vars[$key])

 				{

-					$output['extra_vars'.$key] = $inserted_extra_vars[$key];

+					$output['extra_vars' . $key] = $inserted_extra_vars[$key];

 				}

 				else

 				{

@@ -60,9 +60,9 @@ 
 	function getDefaultListConfig($module_srl)

 	{

 		// add virtual srl, title, registered date, update date, nickname, ID, name, readed count, voted count etc.

-		$virtual_vars = array( 'no', 'title', 'regdate', 'last_update', 'last_post', 'nick_name',

+		$virtual_vars = array('no', 'title', 'regdate', 'last_update', 'last_post', 'nick_name',

 				'user_id', 'user_name', 'readed_count', 'voted_count', 'blamed_count', 'thumbnail', 'summary', 'comment_status');

-		foreach($virtual_vars as $key)

+		foreach ($virtual_vars as $key)

 		{

 			$extra_vars[$key] = new ExtraItem($module_srl, -1, Context::getLang($key), $key, 'N', 'N', 'N', null);

 		}

@@ -71,11 +71,11 @@ 
 		$oDocumentModel = getModel('document');

 		$inserted_extra_vars = $oDocumentModel->getExtraKeys($module_srl);

 

-		if(count($inserted_extra_vars))

+		if (count($inserted_extra_vars))

 		{

-			foreach($inserted_extra_vars as $obj)

+			foreach ($inserted_extra_vars as $obj)

 			{

-				$extra_vars['extra_vars'.$obj->idx] = $obj;

+				$extra_vars['extra_vars' . $obj->idx] = $obj;

 			}

 		}

 

Braces +2 added lines, -4 removed lines

@@ -40,13 +40,11 @@
 				if($inserted_extra_vars[$key])

 				{

 					$output['extra_vars'.$key] = $inserted_extra_vars[$key];

-				}

-				else

+				} else

 				{

 					continue;

 				}

-			}

-			else

+			} else

 			{

 				$output[$key] = new ExtraItem($module_srl, -1, Context::getLang($key), $key, 'N', 'N', 'N', null);

 			}

modules/board/board.wap.php

Spacing +30 added lines, -30 removed lines

@@ -15,7 +15,7 @@ 
 	function procWAP(&$oMobile)

 	{

 		// check grant

-		if(!$this->grant->list || $this->module_info->consultation == 'Y')

+		if (!$this->grant->list || $this->module_info->consultation == 'Y')

 		{

 			return $oMobile->setContent(Context::getLang('msg_not_permitted'));

 		}

@@ -25,13 +25,13 @@ 
 

 		// if the doument is existed

 		$document_srl = Context::get('document_srl');

-		if($document_srl)

+		if ($document_srl)

 		{

 			$oDocument = $oDocumentModel->getDocument($document_srl);

-			if($oDocument->isExists())

+			if ($oDocument->isExists())

 			{

 				// check the grant

-				if(!$this->grant->view)

+				if (!$this->grant->view)

 				{

 					return $oMobile->setContent(Context::getLang('msg_not_permitted'));

 				}

@@ -40,48 +40,48 @@ 
 				Context::setBrowserTitle($oDocument->getTitleText());

 

 				// if the act is display comment list

-				if($this->act=='dispBoardContentCommentList')

+				if ($this->act == 'dispBoardContentCommentList')

 				{

 

 					$oCommentModel = getModel('comment');

 					$output = $oCommentModel->getCommentList($oDocument->document_srl, 0, false, $oDocument->getCommentCount());

 

 					$content = '';

-					if(count($output->data))

+					if (count($output->data))

 					{

-						foreach($output->data as $key => $val)

+						foreach ($output->data as $key => $val)

 						{

 							$oComment = new commentItem();

 							$oComment->setAttribute($val);

 

-							if(!$oComment->isAccessible()) continue;

+							if (!$oComment->isAccessible()) continue;

 

-							$content .= "<b>".$oComment->getNickName()."</b> (".$oComment->getRegdate("Y-m-d").")<br>\r\n".$oComment->getContent(false,false)."<br>\r\n";

+							$content .= "<b>" . $oComment->getNickName() . "</b> (" . $oComment->getRegdate("Y-m-d") . ")<br>\r\n" . $oComment->getContent(false, false) . "<br>\r\n";

 						}

 					}

 

 					// setup mobile contents

-					$oMobile->setContent( $content );

+					$oMobile->setContent($content);

 

 					// setup upper URL

-					$oMobile->setUpperUrl( getUrl('act',''), Context::getLang('cmd_go_upper') );

+					$oMobile->setUpperUrl(getUrl('act', ''), Context::getLang('cmd_go_upper'));

 

 				// display the document if the act is not display the comment list

 				} else {

 

 					// setup contents (strip all html tags)

-					$content = strip_tags(str_replace('<p>','<br>&nbsp;&nbsp;&nbsp;',$oDocument->getContent(false,false,false)),'<br><b><i><u><em><small><strong><big>');

+					$content = strip_tags(str_replace('<p>', '<br>&nbsp;&nbsp;&nbsp;', $oDocument->getContent(false, false, false)), '<br><b><i><u><em><small><strong><big>');

 

 

 					// setup content information(include the comments link)

-					$content = Context::getLang('replies').' : <a href="'.getUrl('act','dispBoardContentCommentList').'">'.$oDocument->getCommentCount().'</a><br>'."\r\n".$content;

-					$content = '<b>'.$oDocument->getNickName().'</b> ('.$oDocument->getRegdate("Y-m-d").")<br>\r\n".$content;

+					$content = Context::getLang('replies') . ' : <a href="' . getUrl('act', 'dispBoardContentCommentList') . '">' . $oDocument->getCommentCount() . '</a><br>' . "\r\n" . $content;

+					$content = '<b>' . $oDocument->getNickName() . '</b> (' . $oDocument->getRegdate("Y-m-d") . ")<br>\r\n" . $content;

 

 					// setup mobile contents

-					$oMobile->setContent( $content );

+					$oMobile->setContent($content);

 

 					// setup upper URL

-					$oMobile->setUpperUrl( getUrl('document_srl',''), Context::getLang('cmd_list') );

+					$oMobile->setUpperUrl(getUrl('document_srl', ''), Context::getLang('cmd_list'));

 

 				}

 

@@ -92,44 +92,44 @@ 
 		// board index

 		$args = new stdClass;

 		$args->module_srl = $this->module_srl;

-		$args->page = Context::get('page');;

+		$args->page = Context::get('page'); ;

 		$args->list_count = 9;

-		$args->sort_index = $this->module_info->order_target?$this->module_info->order_target:'list_order';

-		$args->order_type = $this->module_info->order_type?$this->module_info->order_type:'asc';

+		$args->sort_index = $this->module_info->order_target ? $this->module_info->order_target : 'list_order';

+		$args->order_type = $this->module_info->order_type ? $this->module_info->order_type : 'asc';

 		$output = $oDocumentModel->getDocumentList($args, $this->except_notice);

 		$document_list = $output->data;

 		$page_navigation = $output->page_navigation;

 

 		$childs = array();

-		if($document_list && count($document_list))

+		if ($document_list && count($document_list))

 		{

-			foreach($document_list as $key => $val)

+			foreach ($document_list as $key => $val)

 			{

-				$href = getUrl('mid',$_GET['mid'],'document_srl',$val->document_srl);

+				$href = getUrl('mid', $_GET['mid'], 'document_srl', $val->document_srl);

 				$obj = null;

 				$obj['href'] = $val->getPermanentUrl();

 

 				$title = htmlspecialchars($val->getTitleText());

-				if($val->getCommentCount()) $title .= ' ['.$val->getCommentCount().']';

-				$obj['link'] = $obj['text'] = '['.$val->getNickName().'] '.$title;

+				if ($val->getCommentCount()) $title .= ' [' . $val->getCommentCount() . ']';

+				$obj['link'] = $obj['text'] = '[' . $val->getNickName() . '] ' . $title;

 				$childs[] = $obj;

 			}

 			$oMobile->setChilds($childs);

 		}

 

 		$totalPage = $page_navigation->last_page;

-		$page = (int)Context::get('page');

-		if(!$page) $page = 1;

+		$page = (int) Context::get('page');

+		if (!$page) $page = 1;

 

 		// next/prevUrl specification

-		if($page > 1)

+		if ($page > 1)

 		{

-			$oMobile->setPrevUrl(getUrl('mid',$_GET['mid'],'page',$page-1), sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $page-1, $totalPage));

+			$oMobile->setPrevUrl(getUrl('mid', $_GET['mid'], 'page', $page - 1), sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $page - 1, $totalPage));

 		}

 

-		if($page < $totalPage)

+		if ($page < $totalPage)

 		{

-			$oMobile->setNextUrl(getUrl('mid',$_GET['mid'],'page',$page+1), sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $page+1, $totalPage));

+			$oMobile->setNextUrl(getUrl('mid', $_GET['mid'], 'page', $page + 1), sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $page + 1, $totalPage));

 		}

 

 		$oMobile->mobilePage = $page;

Braces +9 added lines, -3 removed lines

@@ -54,7 +54,9 @@ 
 							$oComment = new commentItem();

 							$oComment->setAttribute($val);

 

-							if(!$oComment->isAccessible()) continue;

+							if(!$oComment->isAccessible()) {
+								continue;
+							}
 

 							$content .= "<b>".$oComment->getNickName()."</b> (".$oComment->getRegdate("Y-m-d").")<br>\r\n".$oComment->getContent(false,false)."<br>\r\n";

 						}

@@ -110,7 +112,9 @@ 
 				$obj['href'] = $val->getPermanentUrl();

 

 				$title = htmlspecialchars($val->getTitleText());

-				if($val->getCommentCount()) $title .= ' ['.$val->getCommentCount().']';

+				if($val->getCommentCount()) {
+					$title .= ' ['.$val->getCommentCount().']';
+				}
 				$obj['link'] = $obj['text'] = '['.$val->getNickName().'] '.$title;

 				$childs[] = $obj;

 			}

@@ -119,7 +123,9 @@ 
 

 		$totalPage = $page_navigation->last_page;

 		$page = (int)Context::get('page');

-		if(!$page) $page = 1;

+		if(!$page) {
+			$page = 1;
+		}
 

 		// next/prevUrl specification

 		if($page > 1)

modules/comment/comment.admin.view.php

Spacing +7 added lines, -7 removed lines

@@ -52,7 +52,7 @@ 
 		// get a list by using comment->getCommentList. 
 		$oCommentModel = getModel('comment');
 		$secretNameList = $oCommentModel->getSecretNameList();
-		$columnList = array('comment_srl', 'document_srl','module_srl','is_secret', 'status', 'content', 'comments.member_srl', 'comments.nick_name', 'comments.regdate', 'ipaddress', 'voted_count', 'blamed_count');
+		$columnList = array('comment_srl', 'document_srl', 'module_srl', 'is_secret', 'status', 'content', 'comments.member_srl', 'comments.nick_name', 'comments.regdate', 'ipaddress', 'voted_count', 'blamed_count');
 		$output = $oCommentModel->getTotalCommentList($args, $columnList);
 
 		// $modules = $oCommentModel->getDistinctModules();
@@ -70,20 +70,20 @@ 
 		$oModuleModel = getModel('module');
 		$module_list = array();
 		$mod_srls = array();
-		foreach($output->data as $val)
+		foreach ($output->data as $val)
 		{
 			$mod_srls[] = $val->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;
 				}
@@ -114,11 +114,11 @@ 
 		$declared_output = executeQuery('comment.getDeclaredList', $args);
 		$oCommentModel = getModel('comment');
 
-		if($declared_output->data && count($declared_output->data))
+		if ($declared_output->data && count($declared_output->data))
 		{
 			$comment_list = array();
 
-			foreach($declared_output->data as $key => $comment)
+			foreach ($declared_output->data as $key => $comment)
 			{
 				$comment_list[$key] = new commentItem();
 				$comment_list[$key]->setAttribute($comment);

modules/comment/comment.class.php

Spacing +22 added lines, -22 removed lines

@@ -48,55 +48,55 @@ 
 		$oDB = DB::getInstance();
 		$oModuleModel = getModel('module');
 		// 2007. 10. 17 add a trigger to delete comments together with posting deleted
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
+		if (!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
 		{
 			return TRUE;
 		}
 		// 2007. 10. 17 add a trigger to delete all of comments together with module deleted
-		if(!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
+		if (!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
 		{
 			return TRUE;
 		}
 		// 2007. 10. 23 add a column for recommendation votes or notification of the comments
-		if(!$oDB->isColumnExists("comments", "voted_count"))
+		if (!$oDB->isColumnExists("comments", "voted_count"))
 		{
 			return TRUE;
 		}
-		if(!$oDB->isColumnExists("comments", "notify_message"))
+		if (!$oDB->isColumnExists("comments", "notify_message"))
 		{
 			return TRUE;
 		}
 		// 2008. 02. 22 add comment setting when a new module added
-		if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
+		if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
 		{
 			return TRUE;
 		}
 		// 2008. 05. 14 add a column for blamed count
-		if(!$oDB->isColumnExists("comments", "blamed_count"))
+		if (!$oDB->isColumnExists("comments", "blamed_count"))
 		{
 			return TRUE;
 		}
-		if(!$oDB->isColumnExists("comment_voted_log", "point"))
+		if (!$oDB->isColumnExists("comment_voted_log", "point"))
 		{
 			return TRUE;
 		}
 
-		if(!$oDB->isIndexExists("comments", "idx_module_list_order"))
+		if (!$oDB->isIndexExists("comments", "idx_module_list_order"))
 		{
 			return TRUE;
 		}
 		//2012. 02. 24 add comment published status column and index
-		if(!$oDB->isColumnExists("comments", "status"))
+		if (!$oDB->isColumnExists("comments", "status"))
 		{
 			return TRUE;
 		}
-		if(!$oDB->isIndexExists("comments", "idx_status"))
+		if (!$oDB->isIndexExists("comments", "idx_status"))
 		{
 			return TRUE;
 		}
 
 		// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-		if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
+		if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
 		{
 			return TRUE;
 		}
@@ -114,43 +114,43 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		// 2007. 10. 17 add a trigger to delete comments together with posting deleted
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
+		if (!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
 		{
 			$oModuleController->insertTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after');
 		}
 		// 2007. 10. 17 add a trigger to delete all of comments together with module deleted
-		if(!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
+		if (!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
 		{
 			$oModuleController->insertTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after');
 		}
 		// 2007. 10. 23 add a column for recommendation votes or notification of the comments
-		if(!$oDB->isColumnExists("comments", "voted_count"))
+		if (!$oDB->isColumnExists("comments", "voted_count"))
 		{
 			$oDB->addColumn("comments", "voted_count", "number", "11");
 			$oDB->addIndex("comments", "idx_voted_count", array("voted_count"));
 		}
 
-		if(!$oDB->isColumnExists("comments", "notify_message"))
+		if (!$oDB->isColumnExists("comments", "notify_message"))
 		{
 			$oDB->addColumn("comments", "notify_message", "char", "1");
 		}
 		// 2008. 02. 22 add comment setting when a new module added
-		if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
+		if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
 		{
 			$oModuleController->insertTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before');
 		}
 		// 2008. 05. 14 add a column for blamed count
-		if(!$oDB->isColumnExists("comments", "blamed_count"))
+		if (!$oDB->isColumnExists("comments", "blamed_count"))
 		{
 			$oDB->addColumn('comments', 'blamed_count', 'number', 11, 0, TRUE);
 			$oDB->addIndex('comments', 'idx_blamed_count', array('blamed_count'));
 		}
-		if(!$oDB->isColumnExists("comment_voted_log", "point"))
+		if (!$oDB->isColumnExists("comment_voted_log", "point"))
 		{
 			$oDB->addColumn('comment_voted_log', 'point', 'number', 11, 0, TRUE);
 		}
 
-		if(!$oDB->isIndexExists("comments", "idx_module_list_order"))
+		if (!$oDB->isIndexExists("comments", "idx_module_list_order"))
 		{
 			$oDB->addIndex(
 					"comments", "idx_module_list_order", array("module_srl", "list_order"), TRUE
@@ -158,11 +158,11 @@ 
 		}
 
 		//2012. 02. 24 add comment published status column and index
-		if(!$oDB->isColumnExists("comments", "status"))
+		if (!$oDB->isColumnExists("comments", "status"))
 		{
 			$oDB->addColumn("comments", "status", "number", 1, 1, TRUE);
 		}
-		if(!$oDB->isIndexExists("comments", "idx_status"))
+		if (!$oDB->isIndexExists("comments", "idx_status"))
 		{
 			$oDB->addIndex(
 					"comments", "idx_status", array("status", "comment_srl", "module_srl", "document_srl"), TRUE
@@ -170,7 +170,7 @@ 
 		}
 
 		// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-		if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
+		if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
 		{
 			$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after');
 		}

modules/comment/comment.item.php

Spacing +62 added lines, -62 removed lines

@@ -49,7 +49,7 @@ 
 	 */
 	function _loadFromDB()
 	{
-		if(!$this->comment_srl)
+		if (!$this->comment_srl)
 		{
 			return;
 		}
@@ -67,7 +67,7 @@ 
 	 */
 	function setAttribute($attribute)
 	{
-		if(!$attribute->comment_srl)
+		if (!$attribute->comment_srl)
 		{
 			$this->comment_srl = NULL;
 			return;
@@ -77,9 +77,9 @@ 
 		$this->adds($attribute);
 
 		// define vars on the object for backward compatibility of skins
-		if(count($attribute))
+		if (count($attribute))
 		{
-			foreach($attribute as $key => $val)
+			foreach ($attribute as $key => $val)
 			{
 				$this->{$key} = $val;
 			}
@@ -93,29 +93,29 @@ 
 
 	function isGranted()
 	{
-		if($_SESSION['own_comment'][$this->comment_srl])
+		if ($_SESSION['own_comment'][$this->comment_srl])
 		{
 			return TRUE;
 		}
 
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return FALSE;
 		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
 			return TRUE;
 		}
 
 		$grant = Context::get('grant');
-		if($grant->manager)
+		if ($grant->manager)
 		{
 			return TRUE;
 		}
 
-		if($this->get('member_srl') && ($this->get('member_srl') == $logged_info->member_srl || $this->get('member_srl') * -1 == $logged_info->member_srl))
+		if ($this->get('member_srl') && ($this->get('member_srl') == $logged_info->member_srl || $this->get('member_srl') * -1 == $logged_info->member_srl))
 		{
 			return TRUE;
 		}
@@ -136,7 +136,7 @@ 
 
 	function isEditable()
 	{
-		if($this->isGranted() || !$this->get('member_srl'))
+		if ($this->isGranted() || !$this->get('member_srl'))
 		{
 			return TRUE;
 		}
@@ -150,12 +150,12 @@ 
 
 	function isAccessible()
 	{
-		if($_SESSION['accessibled_comment'][$this->comment_srl])
+		if ($_SESSION['accessibled_comment'][$this->comment_srl])
 		{
 			return TRUE;
 		}
 
-		if($this->isGranted() || !$this->isSecret())
+		if ($this->isGranted() || !$this->isSecret())
 		{
 			$this->setAccessible();
 			return TRUE;
@@ -163,7 +163,7 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($this->get('document_srl'));
-		if($oDocument->isGranted())
+		if ($oDocument->isGranted())
 		{
 			$this->setAccessible();
 			return TRUE;
@@ -184,20 +184,20 @@ 
 	function notify($type, $content)
 	{
 		// return if not useNotify
-		if(!$this->useNotify())
+		if (!$this->useNotify())
 		{
 			return;
 		}
 
 		// pass if the author is not logged-in user 
-		if(!$this->get('member_srl'))
+		if (!$this->get('member_srl'))
 		{
 			return;
 		}
 
 		// return if the currently logged-in user is an author of the comment.
 		$logged_info = Context::get('logged_info');
-		if($logged_info->member_srl == $this->get('member_srl'))
+		if ($logged_info->member_srl == $this->get('member_srl'))
 		{
 			return;
 		}
@@ -207,7 +207,7 @@ 
 		$oDocument = $oDocumentModel->getDocument($this->get('document_srl'));
 
 		// Variables
-		if($type)
+		if ($type)
 		{
 			$title = "[" . $type . "] ";
 		}
@@ -224,7 +224,7 @@ 
 
 	function getIpAddress()
 	{
-		if($this->isGranted())
+		if ($this->isGranted())
 		{
 			return $this->get('ipaddress');
 		}
@@ -234,7 +234,7 @@ 
 
 	function isExistsHomepage()
 	{
-		if(trim($this->get('homepage')))
+		if (trim($this->get('homepage')))
 		{
 			return TRUE;
 		}
@@ -245,12 +245,12 @@ 
 	function getHomepageUrl()
 	{
 		$url = trim($this->get('homepage'));
-		if(!$url)
+		if (!$url)
 		{
 			return;
 		}
 
-		if(strncasecmp('http://', $url, 7) !== 0)
+		if (strncasecmp('http://', $url, 7) !== 0)
 		{
 			$url = "http://" . $url;
 		}
@@ -284,14 +284,14 @@ 
 	 */
 	function getContentText($strlen = 0)
 	{
-		if($this->isSecret() && !$this->isAccessible())
+		if ($this->isSecret() && !$this->isAccessible())
 		{
 			return Context::getLang('msg_is_secret');
 		}
 
 		$content = $this->get('content');
 
-		if($strlen)
+		if ($strlen)
 		{
 			return cut_str(strip_tags($content), $strlen, '...');
 		}
@@ -305,7 +305,7 @@ 
 	 */
 	function getContent($add_popup_menu = TRUE, $add_content_info = TRUE, $add_xe_content_class = TRUE)
 	{
-		if($this->isSecret() && !$this->isAccessible())
+		if ($this->isSecret() && !$this->isAccessible())
 		{
 			return Context::getLang('msg_is_secret');
 		}
@@ -314,7 +314,7 @@ 
 		stripEmbedTagForAdmin($content, $this->get('member_srl'));
 
 		// when displaying the comment on the pop-up menu
-		if($add_popup_menu && Context::get('is_logged'))
+		if ($add_popup_menu && Context::get('is_logged'))
 		{
 			$content = sprintf(
 					'%s<div class="comment_popup_menu"><a href="#popup_menu_area" class="comment_%d" onclick="return false">%s</a></div>', $content, $this->comment_srl, Context::getLang('cmd_comment_do')
@@ -322,10 +322,10 @@ 
 		}
 
 		// if additional information which can access contents is set
-		if($add_content_info)
+		if ($add_content_info)
 		{
 			$memberSrl = $this->get('member_srl');
-			if($memberSrl < 0)
+			if ($memberSrl < 0)
 			{
 				$memberSrl = 0;
 			}
@@ -336,7 +336,7 @@ 
 		}
 		else
 		{
-			if($add_xe_content_class)
+			if ($add_xe_content_class)
 			{
 				$content = sprintf('<div class="xe_content">%s</div>', $content);
 			}
@@ -427,7 +427,7 @@ 
 
 	function hasUploadedFiles()
 	{
-		if(($this->isSecret() && !$this->isAccessible()) && !$this->isGranted())
+		if (($this->isSecret() && !$this->isAccessible()) && !$this->isGranted())
 		{
 			return FALSE;
 		}
@@ -436,12 +436,12 @@ 
 
 	function getUploadedFiles()
 	{
-		if(($this->isSecret() && !$this->isAccessible()) && !$this->isGranted())
+		if (($this->isSecret() && !$this->isAccessible()) && !$this->isGranted())
 		{
 			return;
 		}
 
-		if(!$this->get('uploaded_count'))
+		if (!$this->get('uploaded_count'))
 		{
 			return;
 		}
@@ -458,7 +458,7 @@ 
 	function getEditor()
 	{
 		$module_srl = $this->get('module_srl');
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			$module_srl = Context::get('module_srl');
 		}
@@ -472,13 +472,13 @@ 
 	 */
 	function getProfileImage()
 	{
-		if(!$this->isExists() || !$this->get('member_srl'))
+		if (!$this->isExists() || !$this->get('member_srl'))
 		{
 			return;
 		}
 		$oMemberModel = getModel('member');
 		$profile_info = $oMemberModel->getProfileImage($this->get('member_srl'));
-		if(!$profile_info)
+		if (!$profile_info)
 		{
 			return;
 		}
@@ -493,7 +493,7 @@ 
 	function getSignature()
 	{
 		// pass if the posting not exists.
-		if(!$this->isExists() || !$this->get('member_srl'))
+		if (!$this->isExists() || !$this->get('member_srl'))
 		{
 			return;
 		}
@@ -503,7 +503,7 @@ 
 		$signature = $oMemberModel->getSignature($this->get('member_srl'));
 
 		// check if max height of the signiture is specified on the member module
-		if(!isset($GLOBALS['__member_signature_max_height']))
+		if (!isset($GLOBALS['__member_signature_max_height']))
 		{
 			$oModuleModel = getModel('module');
 			$member_config = $oModuleModel->getModuleConfig('member');
@@ -512,7 +512,7 @@ 
 
 		$max_signature_height = $GLOBALS['__member_signature_max_height'];
 
-		if($max_signature_height)
+		if ($max_signature_height)
 		{
 			$signature = sprintf('<div style="max-height:%dpx;overflow:auto;overflow-x:hidden;height:expression(this.scrollHeight > %d ? \'%dpx\': \'auto\')">%s</div>', $max_signature_height, $max_signature_height, $max_signature_height, $signature);
 		}
@@ -522,12 +522,12 @@ 
 
 	function thumbnailExists($width = 80, $height = 0, $type = '')
 	{
-		if(!$this->comment_srl)
+		if (!$this->comment_srl)
 		{
 			return FALSE;
 		}
 
-		if(!$this->getThumbnail($width, $height, $type))
+		if (!$this->getThumbnail($width, $height, $type))
 		{
 			return FALSE;
 		}
@@ -538,30 +538,30 @@ 
 	function getThumbnail($width = 80, $height = 0, $thumbnail_type = '')
 	{
 		// return false if no doc exists
-		if(!$this->comment_srl)
+		if (!$this->comment_srl)
 		{
 			return;
 		}
 
-		if($this->isSecret() && !$this->isGranted())
+		if ($this->isSecret() && !$this->isGranted())
 		{
 			return;
 		}
 
 		// If signiture height setting is omitted, create a square
-		if(!$height)
+		if (!$height)
 		{
 			$height = $width;
 		}
 
 		// return false if neigher attached file nor image;
-		if(!$this->hasUploadedFiles() && !preg_match("!<img!is", $this->get('content')))
+		if (!$this->hasUploadedFiles() && !preg_match("!<img!is", $this->get('content')))
 		{
 			return;
 		}
 
 		// get thumbail generation info on the doc module configuration.
-		if(!in_array($thumbnail_type, array('crop', 'ratio')))
+		if (!in_array($thumbnail_type, array('crop', 'ratio')))
 		{
 			$thumbnail_type = 'crop';
 		}
@@ -572,9 +572,9 @@ 
 		$thumbnail_url = Context::getRequestUri() . $thumbnail_file;
 
 		// return false if a size of existing thumbnail file is 0. otherwise return the file path
-		if(file_exists($thumbnail_file))
+		if (file_exists($thumbnail_file))
 		{
-			if(filesize($thumbnail_file) < 1)
+			if (filesize($thumbnail_file) < 1)
 			{
 				return FALSE;
 			}
@@ -589,40 +589,40 @@ 
 		$is_tmp_file = FALSE;
 
 		// find an image file among attached files
-		if($this->hasUploadedFiles())
+		if ($this->hasUploadedFiles())
 		{
 			$file_list = $this->getUploadedFiles();
 
 			$first_image = null;
-			foreach($file_list as $file)
+			foreach ($file_list as $file)
 			{
-				if($file->direct_download !== 'Y') continue;
+				if ($file->direct_download !== 'Y') continue;
 
-				if($file->cover_image === 'Y' && file_exists($file->uploaded_filename))
+				if ($file->cover_image === 'Y' && file_exists($file->uploaded_filename))
 				{
 					$source_file = $file->uploaded_filename;
 					break;
 				}
 
-				if($first_image) continue;
+				if ($first_image) continue;
 
-				if(preg_match("/\.(jpe?g|png|gif|bmp)$/i", $file->source_filename))
+				if (preg_match("/\.(jpe?g|png|gif|bmp)$/i", $file->source_filename))
 				{
-					if(file_exists($file->uploaded_filename))
+					if (file_exists($file->uploaded_filename))
 					{
 						$first_image = $file->uploaded_filename;
 					}
 				}
 			}
 
-			if(!$source_file && $first_image)
+			if (!$source_file && $first_image)
 			{
 				$source_file = $first_image;
 			}
 		}
 
 		// get an image file from the doc content if no file attached. 
-		if(!$source_file)
+		if (!$source_file)
 		{
 			$content = $this->get('content');
 			$target_src = NULL;
@@ -631,16 +631,16 @@ 
 
 			$cnt = count($matches);
 
-			for($i = 0; $i < $cnt; $i++)
+			for ($i = 0; $i < $cnt; $i++)
 			{
 				$target_src = $matches[$i][2];
-				if(preg_match('/\/(common|modules|widgets|addons|layouts)\//i', $target_src))
+				if (preg_match('/\/(common|modules|widgets|addons|layouts)\//i', $target_src))
 				{
 					continue;
 				}
 				else
 				{
-					if(!preg_match('/^(http|https):\/\//i', $target_src))
+					if (!preg_match('/^(http|https):\/\//i', $target_src))
 					{
 						$target_src = Context::getRequestUri() . $target_src;
 					}
@@ -651,7 +651,7 @@ 
 
 					FileHandler::getRemoteFile($target_src, $tmp_file);
 
-					if(!file_exists($tmp_file))
+					if (!file_exists($tmp_file))
 					{
 						continue;
 					}
@@ -659,7 +659,7 @@ 
 					{
 						list($_w, $_h, $_t, $_a) = @getimagesize($tmp_file);
 
-						if($_w < $width || $_h < $height)
+						if ($_w < $width || $_h < $height)
 						{
 							continue;
 						}
@@ -674,13 +674,13 @@ 
 
 		$output = FileHandler::createImageFile($source_file, $thumbnail_file, $width, $height, 'jpg', $thumbnail_type);
 
-		if($is_tmp_file)
+		if ($is_tmp_file)
 		{
 			FileHandler::removeFile($source_file);
 		}
 
 		// return the thumbnail path if successfully generated.
-		if($output)
+		if ($output)
 		{
 			return $thumbnail_url;
 		}

Braces +10 added lines, -10 removed lines

@@ -333,8 +333,7 @@ 
 					'<!--BeforeComment(%d,%d)--><div class="comment_%d_%d xe_content">%s</div><!--AfterComment(%d,%d)-->', $this->comment_srl, $memberSrl, $this->comment_srl, $memberSrl, $content, $this->comment_srl, $memberSrl
 			);
 			// xe_content class name should be specified although content access is not necessary.
-		}
-		else
+		} else
 		{
 			if($add_xe_content_class)
 			{
@@ -577,8 +576,7 @@ 
 			if(filesize($thumbnail_file) < 1)
 			{
 				return FALSE;
-			}
-			else
+			} else
 			{
 				return $thumbnail_url;
 			}
@@ -596,7 +594,9 @@ 
 			$first_image = null;
 			foreach($file_list as $file)
 			{
-				if($file->direct_download !== 'Y') continue;
+				if($file->direct_download !== 'Y') {
+					continue;
+				}
 
 				if($file->cover_image === 'Y' && file_exists($file->uploaded_filename))
 				{
@@ -604,7 +604,9 @@ 
 					break;
 				}
 
-				if($first_image) continue;
+				if($first_image) {
+					continue;
+				}
 
 				if(preg_match("/\.(jpe?g|png|gif|bmp)$/i", $file->source_filename))
 				{
@@ -637,8 +639,7 @@ 
 				if(preg_match('/\/(common|modules|widgets|addons|layouts)\//i', $target_src))
 				{
 					continue;
-				}
-				else
+				} else
 				{
 					if(!preg_match('/^(http|https):\/\//i', $target_src))
 					{
@@ -654,8 +655,7 @@ 
 					if(!file_exists($tmp_file))
 					{
 						continue;
-					}
-					else
+					} else
 					{
 						list($_w, $_h, $_t, $_a) = @getimagesize($tmp_file);
 

modules/comment/comment.model.php

Spacing +94 added lines, -94 removed lines

@@ -43,7 +43,7 @@ 
 		$oCommentController = getController('comment');
 
 		// feature that only member can do
-		if($logged_info->member_srl)
+		if ($logged_info->member_srl)
 		{
 			$oCommentModel = getModel('comment');
 			$columnList = array('comment_srl', 'module_srl', 'member_srl', 'ipaddress');
@@ -54,14 +54,14 @@ 
 			$oModuleModel = getModel('module');
 			$comment_config = $oModuleModel->getModulePartConfig('document', $module_srl);
 
-			if($comment_config->use_vote_up != 'N' && $member_srl != $logged_info->member_srl)
+			if ($comment_config->use_vote_up != 'N' && $member_srl != $logged_info->member_srl)
 			{
 				// Add a vote-up button for positive feedback
 				$url = sprintf("doCallModuleAction('comment','procCommentVoteUp','%s')", $comment_srl);
 				$oCommentController->addCommentPopupMenu($url, 'cmd_vote', '', 'javascript');
 			}
 
-			if($comment_config->use_vote_down != 'N' && $member_srl != $logged_info->member_srl)
+			if ($comment_config->use_vote_down != 'N' && $member_srl != $logged_info->member_srl)
 			{
 				// Add a vote-down button for negative feedback
 				$url = sprintf("doCallModuleAction('comment','procCommentVoteDown','%s')", $comment_srl);
@@ -76,20 +76,20 @@ 
 		// call a trigger (after)
 		ModuleHandler::triggerCall('comment.getCommentMenu', 'after', $menu_list);
 
-		if($this->grant->manager){
+		if ($this->grant->manager) {
 			$str_confirm = Context::getLang('confirm_move');
 			$url = sprintf("if(!confirm('%s')) return; var params = new Array(); params['comment_srl']='%s'; params['mid']=current_mid;params['cur_url']=current_url; exec_xml('comment', 'procCommentAdminMoveToTrash', params)", $str_confirm, $comment_srl);
-			$oCommentController->addCommentPopupMenu($url,'cmd_trash','','javascript');
+			$oCommentController->addCommentPopupMenu($url, 'cmd_trash', '', 'javascript');
 
 		}
 
 		// find a comment by IP matching if an administrator.
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
 			$oCommentModel = getModel('comment');
 			$oComment = $oCommentModel->getComment($comment_srl);
 
-			if($oComment->isExists())
+			if ($oComment->isExists())
 			{
 				// Find a post of the corresponding ip address
 				$url = getUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_target', 'ipaddress', 'search_keyword', $oComment->getIpAddress());
@@ -104,7 +104,7 @@ 
 		$menus = Context::get('comment_popup_menu_list');
 		$menus_count = count($menus);
 
-		for($i = 0; $i < $menus_count; $i++)
+		for ($i = 0; $i < $menus_count; $i++)
 		{
 			$menus[$i]->str = Context::getLang($menus[$i]->str);
 		}
@@ -160,7 +160,7 @@ 
 	function getComment($comment_srl = 0, $is_admin = FALSE, $columnList = array())
 	{
 		$oComment = new commentItem($comment_srl, $columnList);
-		if($is_admin)
+		if ($is_admin)
 		{
 			$oComment->setGrant();
 		}
@@ -176,7 +176,7 @@ 
 	 */
 	function getComments($comment_srl_list, $columnList = array())
 	{
-		if(is_array($comment_srl_list))
+		if (is_array($comment_srl_list))
 		{
 			$comment_srls = implode(',', $comment_srl_list);
 		}
@@ -185,25 +185,25 @@ 
 		$args = new stdClass();
 		$args->comment_srls = $comment_srls;
 		$output = executeQuery('comment.getComments', $args, $columnList);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return;
 		}
 
 		$comment_list = $output->data;
-		if(!$comment_list)
+		if (!$comment_list)
 		{
 			return;
 		}
-		if(!is_array($comment_list))
+		if (!is_array($comment_list))
 		{
 			$comment_list = array($comment_list);
 		}
 
 		$comment_count = count($comment_list);
-		foreach($comment_list as $key => $attribute)
+		foreach ($comment_list as $key => $attribute)
 		{
-			if(!$attribute->comment_srl)
+			if (!$attribute->comment_srl)
 			{
 				continue;
 			}
@@ -211,7 +211,7 @@ 
 			$oComment = NULL;
 			$oComment = new commentItem();
 			$oComment->setAttribute($attribute);
-			if($is_admin)
+			if ($is_admin)
 			{
 				$oComment->setGrant();
 			}
@@ -238,7 +238,7 @@ 
 		$oDocument = $oDocumentModel->getDocument($document_srl, FALSE, TRUE, $columnList);
 
 		// return if no doc exists.
-		if(!$oDocument->isExists())
+		if (!$oDocument->isExists())
 		{
 			return;
 		}
@@ -250,7 +250,7 @@ 
 		$oCommentController = getController('comment');
 
 		$using_validation = $oCommentController->isModuleUsingPublishValidation($module_srl);
-		if($using_validation)
+		if ($using_validation)
 		{
 			$args->status = 1;
 		}
@@ -269,18 +269,18 @@ 
 	 */
 	function getCommentCountByDate($date = '', $moduleSrlList = array())
 	{
-		if($date)
+		if ($date)
 		{
 			$args->regDate = date('Ymd', strtotime($date));
 		}
 
-		if(count($moduleSrlList) > 0)
+		if (count($moduleSrlList) > 0)
 		{
 			$args->module_srl = $moduleSrlList;
 		}
 
 		$output = executeQuery('comment.getCommentCount', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return 0;
 		}
@@ -299,19 +299,19 @@ 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 
-		if(is_null($published))
+		if (is_null($published))
 		{
 			// check if module is using comment validation system
 			$oCommentController = getController("comment");
 			$is_using_validation = $oCommentController->isModuleUsingPublishValidation($module_srl);
-			if($is_using_validation)
+			if ($is_using_validation)
 			{
 				$args->status = 1;
 			}
 		}
 		else
 		{
-			if($published)
+			if ($published)
 			{
 				$args->status = 1;
 			}
@@ -363,12 +363,12 @@ 
 	{
 		$args = new stdClass();
 
-		if(!is_object($obj))
+		if (!is_object($obj))
 		{
 			$obj = new stdClass();
 		}
 
-		if($obj->mid)
+		if ($obj->mid)
 		{
 			$oModuleModel = getModel('module');
 			$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
@@ -376,7 +376,7 @@ 
 		}
 
 		// check if module_srl is an arrary.
-		if(is_array($obj->module_srl))
+		if (is_array($obj->module_srl))
 		{
 			$args->module_srl = implode(',', $obj->module_srl);
 		}
@@ -388,14 +388,14 @@ 
 		$args->document_srl = $obj->document_srl;
 		$args->list_count = $obj->list_count;
 
-		if(strpos($args->module_srl, ",") === false)
+		if (strpos($args->module_srl, ",") === false)
 		{
-			if($args->module_srl)
+			if ($args->module_srl)
 			{
 				// check if module is using comment validation system
 				$oCommentController = getController("comment");
 				$is_using_validation = $oCommentController->isModuleUsingPublishValidation($obj->module_srl);
-				if($is_using_validation)
+				if ($is_using_validation)
 				{
 					$args->status = 1;
 				}
@@ -404,24 +404,24 @@ 
 
 		$output = executeQuery('comment.getNewestCommentList', $args, $columnList);
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		$comment_list = $output->data;
-		if($comment_list)
+		if ($comment_list)
 		{
-			if(!is_array($comment_list))
+			if (!is_array($comment_list))
 			{
 				$comment_list = array($comment_list);
 			}
 
 			$comment_count = count($comment_list);
 
-			foreach($comment_list as $key => $attribute)
+			foreach ($comment_list as $key => $attribute)
 			{
-				if(!$attribute->comment_srl)
+				if (!$attribute->comment_srl)
 				{
 					continue;
 				}
@@ -448,7 +448,7 @@ 
 	 */
 	function getCommentList($document_srl, $page = 0, $is_admin = FALSE, $count = 0)
 	{
-		if(!isset($document_srl))
+		if (!isset($document_srl))
 		{
 			return;
 		}
@@ -459,13 +459,13 @@ 
 		$oDocument = $oDocumentModel->getDocument($document_srl, FALSE, TRUE, $columnList);
 
 		// return if no doc exists.
-		if(!$oDocument->isExists())
+		if (!$oDocument->isExists())
 		{
 			return;
 		}
 
 		// return if no comment exists
-		if($oDocument->getCommentCount() < 1)
+		if ($oDocument->getCommentCount() < 1)
 		{
 			return;
 		}
@@ -473,11 +473,11 @@ 
 		// get a list of comments
 		$module_srl = $oDocument->get('module_srl');
 
-		if(!$count)
+		if (!$count)
 		{
 			$comment_config = $this->getCommentConfig($module_srl);
 			$comment_count = $comment_config->comment_count;
-			if(!$comment_count)
+			if (!$comment_count)
 			{
 				$comment_count = 50;
 			}
@@ -488,9 +488,9 @@ 
 		}
 
 		// get a very last page if no page exists
-		if(!$page)
+		if (!$page)
 		{
-			$page = (int) ( ($oDocument->getCommentCount() - 1) / $comment_count) + 1;
+			$page = (int) (($oDocument->getCommentCount() - 1) / $comment_count) + 1;
 		}
 
 		// get a list of comments
@@ -503,7 +503,7 @@ 
 		//check if module is using validation system
 		$oCommentController = getController('comment');
 		$using_validation = $oCommentController->isModuleUsingPublishValidation($module_srl);
-		if($using_validation)
+		if ($using_validation)
 		{
 			$args->status = 1;
 		}
@@ -511,17 +511,17 @@ 
 		$output = executeQueryArray('comment.getCommentPageList', $args);
 
 		// return if an error occurs in the query results
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return;
 		}
 
 		// insert data into CommentPageList table if the number of results is different from stored comments
-		if(!$output->data)
+		if (!$output->data)
 		{
 			$this->fixCommentList($oDocument->get('module_srl'), $document_srl);
 			$output = executeQueryArray('comment.getCommentPageList', $args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return;
 			}
@@ -542,7 +542,7 @@ 
 		// create a lock file to prevent repeated work when performing a batch job
 		$lock_file = "./files/cache/tmp/lock." . $document_srl;
 
-		if(file_exists($lock_file) && filemtime($lock_file) + 60 * 60 * 10 < $_SERVER['REQUEST_TIME'])
+		if (file_exists($lock_file) && filemtime($lock_file) + 60 * 60 * 10 < $_SERVER['REQUEST_TIME'])
 		{
 			return;
 		}
@@ -554,13 +554,13 @@ 
 		$args->document_srl = $document_srl;
 		$args->list_order = 'list_order';
 		$output = executeQuery('comment.getCommentList', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		$source_list = $output->data;
-		if(!is_array($source_list))
+		if (!is_array($source_list))
 		{
 			$source_list = array($source_list);
 		}
@@ -576,11 +576,11 @@ 
 		$logged_info = Context::get('logged_info');
 
 		// generate a hierarchical structure of comments for loop
-		for($i = $comment_count - 1; $i >= 0; $i--)
+		for ($i = $comment_count - 1; $i >= 0; $i--)
 		{
 			$comment_srl = $source_list[$i]->comment_srl;
 			$parent_srl = $source_list[$i]->parent_srl;
-			if(!$comment_srl)
+			if (!$comment_srl)
 			{
 				continue;
 			}
@@ -588,7 +588,7 @@ 
 			// generate a list
 			$list[$comment_srl] = $source_list[$i];
 
-			if($parent_srl)
+			if ($parent_srl)
 			{
 				$list[$parent_srl]->child[] = &$list[$comment_srl];
 			}
@@ -600,9 +600,9 @@ 
 		$this->_arrangeComment($comment_list, $root->child, 0, NULL);
 
 		// insert values to the database
-		if(count($comment_list))
+		if (count($comment_list))
 		{
-			foreach($comment_list as $comment_srl => $item)
+			foreach ($comment_list as $comment_srl => $item)
 			{
 				$comment_args = new stdClass();
 				$comment_args->comment_srl = $comment_srl;
@@ -631,14 +631,14 @@ 
 	 */
 	function _arrangeComment(&$comment_list, $list, $depth, $parent = NULL)
 	{
-		if(!count($list))
+		if (!count($list))
 		{
 			return;
 		}
 
-		foreach($list as $key => $val)
+		foreach ($list as $key => $val)
 		{
-			if($parent)
+			if ($parent)
 			{
 				$val->head = $parent->head;
 			}
@@ -649,7 +649,7 @@ 
 
 			$val->arrange = count($comment_list) + 1;
 
-			if($val->child)
+			if ($val->child)
 			{
 				$val->depth = $depth;
 				$comment_list[$val->comment_srl] = $val;
@@ -686,7 +686,7 @@ 
 		// check if module is using comment validation system
 		$oCommentController = getController("comment");
 		$is_using_validation = $oCommentController->isModuleUsingPublishValidation($obj->module_srl);
-		if($is_using_validation)
+		if ($is_using_validation)
 		{
 			$args->s_is_published = 1;
 		}
@@ -694,12 +694,12 @@ 
 		// Search options
 		$search_target = $obj->search_target ? $obj->search_target : trim(Context::get('search_target'));
 		$search_keyword = $obj->search_keyword ? $obj->search_keyword : trim(Context::get('search_keyword'));
-		if($search_target && $search_keyword)
+		if ($search_target && $search_keyword)
 		{
-			switch($search_target)
+			switch ($search_target)
 			{
 				case 'content' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -708,7 +708,7 @@ 
 					break;
 
 				case 'user_id' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -719,7 +719,7 @@ 
 					break;
 
 				case 'user_name' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -728,7 +728,7 @@ 
 					break;
 
 				case 'nick_name' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -737,7 +737,7 @@ 
 					break;
 
 				case 'email_address' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -746,7 +746,7 @@ 
 					break;
 
 				case 'homepage' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -771,12 +771,12 @@ 
 					break;
 
 				case 'is_published' :
-					if($search_keyword == 'Y')
+					if ($search_keyword == 'Y')
 					{
 						$args->s_is_published = 1;
 					}
 
-					if($search_keyword == 'N')
+					if ($search_keyword == 'N')
 					{
 						$args->s_is_published = 0;
 					}
@@ -797,12 +797,12 @@ 
 		$output = executeQueryArray($query_id, $args, $columnList);
 
 		// return when no result or error occurance
-		if(!$output->toBool() || !count($output->data))
+		if (!$output->toBool() || !count($output->data))
 		{
 			return $output;
 		}
 
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			unset($_oComment);
 			$_oComment = new CommentItem(0);
@@ -831,12 +831,12 @@ 
 		$search_target = $obj->search_target ? $obj->search_target : trim(Context::get('search_target'));
 		$search_keyword = $obj->search_keyword ? $obj->search_keyword : trim(Context::get('search_keyword'));
 
-		if($search_target && $search_keyword)
+		if ($search_target && $search_keyword)
 		{
-			switch($search_target)
+			switch ($search_target)
 			{
 				case 'content' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -845,7 +845,7 @@ 
 					break;
 
 				case 'user_id' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -855,7 +855,7 @@ 
 					break;
 
 				case 'user_name' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -864,7 +864,7 @@ 
 					break;
 
 				case 'nick_name' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -873,7 +873,7 @@ 
 					break;
 
 				case 'email_address' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -882,7 +882,7 @@ 
 					break;
 
 				case 'homepage' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -915,7 +915,7 @@ 
 		$output = executeQueryArray($query_id, $args);
 
 		// return when no result or error occurance
-		if(!$output->toBool() || !count($output->data))
+		if (!$output->toBool() || !count($output->data))
 		{
 			return $output;
 		}
@@ -932,12 +932,12 @@ 
 	{
 		$oModuleModel = getModel('module');
 		$comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl);
-		if(!is_object($comment_config))
+		if (!is_object($comment_config))
 		{
 			$comment_config = new stdClass();
 		}
 
-		if(!isset($comment_config->comment_count))
+		if (!isset($comment_config->comment_count))
 		{
 			$comment_config->comment_count = 50;
 		}
@@ -952,13 +952,13 @@ 
 	function getCommentVotedMemberList()
 	{
 		$comment_srl = Context::get('comment_srl');
-		if(!$comment_srl)
+		if (!$comment_srl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
 		$point = Context::get('point');
-		if($point != -1)
+		if ($point != -1)
 		{
 			$point = 1;
 		}
@@ -966,7 +966,7 @@ 
 		$oCommentModel = getModel('comment');
 		$oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE);
 		$module_srl = $oComment->get('module_srl');
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -976,9 +976,9 @@ 
 
 		$args = new stdClass();
 
-		if($point == -1)
+		if ($point == -1)
 		{
-			if($comment_config->use_vote_down != 'S')
+			if ($comment_config->use_vote_down != 'S')
 			{
 				return new Object(-1, 'msg_invalid_request');
 			}
@@ -987,7 +987,7 @@ 
 		}
 		else
 		{
-			if($comment_config->use_vote_up != 'S')
+			if ($comment_config->use_vote_up != 'S')
 			{
 				return new Object(-1, 'msg_invalid_request');
 			}
@@ -997,15 +997,15 @@ 
 
 		$args->comment_srl = $comment_srl;
 		$output = executeQueryArray('comment.getVotedMemberList', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		$oMemberModel = getModel('member');
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $k => $d)
+			foreach ($output->data as $k => $d)
 			{
 				$profile_image = $oMemberModel->getProfileImage($d->member_srl);
 				$output->data[$k]->src = $profile_image->src;
@@ -1023,7 +1023,7 @@ 
 	{
 		global $lang;
 
-		if(!isset($lang->secret_name_list))
+		if (!isset($lang->secret_name_list))
 		{
 			return array('Y' => 'Secret', 'N' => 'Public');
 		}
@@ -1064,8 +1064,8 @@ 
 		$output = executeQuery('comment.getCommentListByMemberSrl', $args, $columnList);
 		$comment_list = $output->data;
 
-		if(!$comment_list) return array();
-		if(!is_array($comment_list)) $comment_list = array($comment_list);
+		if (!$comment_list) return array();
+		if (!is_array($comment_list)) $comment_list = array($comment_list);
 
 		return $comment_list;
 

Braces +15 added lines, -20 removed lines

@@ -308,14 +308,12 @@ 
 			{
 				$args->status = 1;
 			}
-		}
-		else
+		} else
 		{
 			if($published)
 			{
 				$args->status = 1;
-			}
-			else
+			} else
 			{
 				$args->status = 0;
 			}
@@ -379,8 +377,7 @@ 
 		if(is_array($obj->module_srl))
 		{
 			$args->module_srl = implode(',', $obj->module_srl);
-		}
-		else
+		} else
 		{
 			$args->module_srl = $obj->module_srl;
 		}
@@ -481,8 +478,7 @@ 
 			{
 				$comment_count = 50;
 			}
-		}
-		else
+		} else
 		{
 			$comment_count = $count;
 		}
@@ -591,8 +587,7 @@ 
 			if($parent_srl)
 			{
 				$list[$parent_srl]->child[] = &$list[$comment_srl];
-			}
-			else
+			} else
 			{
 				$root->child[] = &$list[$comment_srl];
 			}
@@ -641,8 +636,7 @@ 
 			if($parent)
 			{
 				$val->head = $parent->head;
-			}
-			else
+			} else
 			{
 				$val->head = $val->comment_srl;
 			}
@@ -655,8 +649,7 @@ 
 				$comment_list[$val->comment_srl] = $val;
 				$this->_arrangeComment($comment_list, $val->child, $depth + 1, $val);
 				unset($val->child);
-			}
-			else
+			} else
 			{
 				$val->depth = $depth;
 				$comment_list[$val->comment_srl] = $val;
@@ -984,8 +977,7 @@ 
 			}
 
 			$args->below_point = 0;
-		}
-		else
+		} else
 		{
 			if($comment_config->use_vote_up != 'S')
 			{
@@ -1026,8 +1018,7 @@ 
 		if(!isset($lang->secret_name_list))
 		{
 			return array('Y' => 'Secret', 'N' => 'Public');
-		}
-		else
+		} else
 		{
 			return $lang->secret_name_list;
 		}
@@ -1064,8 +1055,12 @@ 
 		$output = executeQuery('comment.getCommentListByMemberSrl', $args, $columnList);
 		$comment_list = $output->data;
 
-		if(!$comment_list) return array();
-		if(!is_array($comment_list)) $comment_list = array($comment_list);
+		if(!$comment_list) {
+			return array();
+		}
+		if(!is_array($comment_list)) {
+			$comment_list = array($comment_list);
+		}
 
 		return $comment_list;