xpressengine / xe-core

modules/communication/communication.model.php

Doc Comments -1 removed lines

@@ -101,7 +101,6 @@
 
 	/**
 	  * @brief check member's grant
-	  * @param object $member_info
 	  * @param array $arrGrant
 	  * @return boolean
 	  */

Indentation +10 added lines, -10 removed lines

@@ -61,11 +61,11 @@ 
 	}
 
 	/**
-	  * @brief get grant array for insert to database. table module_config's config field 
-	  * @param string $default
-	  * @param array $group
-	  * @return array
-	  */
+	 * @brief get grant array for insert to database. table module_config's config field 
+	 * @param string $default
+	 * @param array $group
+	 * @return array
+	 */
 	function getGrantArray($default, $group)
 	{
 		$grant = array();
@@ -100,11 +100,11 @@ 
 	}
 
 	/**
-	  * @brief check member's grant
-	  * @param object $member_info
-	  * @param array $arrGrant
-	  * @return boolean
-	  */
+	 * @brief check member's grant
+	 * @param object $member_info
+	 * @param array $arrGrant
+	 * @return boolean
+	 */
 	function checkGrant($arrGrant)
 	{
 		if(!$arrGrant)

Spacing +35 added lines, -35 removed lines

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

Braces +40 added lines, -23 removed lines

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

modules/document/document.class.php

Doc Comments +1 added lines

@@ -351,6 +351,7 @@
 
 	/**
 	 * Return status by key
+	 * @param string $key
 	 * @return string
 	 */
 	function getConfigStatus($key)

Braces +140 added lines, -54 removed lines

@@ -70,68 +70,126 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 7. 25: Add a column(notify_message) for notification
-			if(!$oDB->isColumnExists("documents","notify_message")) return true;
+			if(!$oDB->isColumnExists("documents","notify_message")) {
+				return true;
+			}
 
 			// 2007. 8. 23: create a clustered index in the document table
-			if(!$oDB->isIndexExists("documents","idx_module_list_order")) return true;
-			if(!$oDB->isIndexExists("documents","idx_module_update_order")) return true;
-			if(!$oDB->isIndexExists("documents","idx_module_readed_count")) return true;
-			if(!$oDB->isIndexExists("documents","idx_module_voted_count")) return true;
+			if(!$oDB->isIndexExists("documents","idx_module_list_order")) {
+				return true;
+			}
+			if(!$oDB->isIndexExists("documents","idx_module_update_order")) {
+				return true;
+			}
+			if(!$oDB->isIndexExists("documents","idx_module_readed_count")) {
+				return true;
+			}
+			if(!$oDB->isIndexExists("documents","idx_module_voted_count")) {
+				return true;
+			}
 			// 2007. 10. 17 Add a trigger to delete all posts together when the module is deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after')) return true;
+			if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after')) {
+				return true;
+			}
 			// 2007. 10. 25 add parent_srl, expand to the document category
-			if(!$oDB->isColumnExists("document_categories","parent_srl")) return true;
-			if(!$oDB->isColumnExists("document_categories","expand")) return true;
-			if(!$oDB->isColumnExists("document_categories","group_srls")) return true;
+			if(!$oDB->isColumnExists("document_categories","parent_srl")) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("document_categories","expand")) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("document_categories","group_srls")) {
+				return true;
+			}
 			// 2007. 11. 20 create a composite index on the columns(module_srl + is_notice)
-			if(!$oDB->isIndexExists("documents","idx_module_notice")) return true;
+			if(!$oDB->isIndexExists("documents","idx_module_notice")) {
+				return true;
+			}
 			// 2008. 02. 18 create a composite index on the columns(module_srl + document_srl) (checked by Manian))
-			if(!$oDB->isIndexExists("documents","idx_module_document_srl")) return true;
+			if(!$oDB->isIndexExists("documents","idx_module_document_srl")) {
+				return true;
+			}
 
 			// 2007. 12. 03: Add if the colume(extra_vars) doesn't exist
-			if(!$oDB->isColumnExists("documents","extra_vars")) return true;
+			if(!$oDB->isColumnExists("documents","extra_vars")) {
+				return true;
+			}
 			// 2008. 04. 23 Add a column(blamed_count)
-			if(!$oDB->isColumnExists("documents", "blamed_count")) return true;
-			if(!$oDB->isIndexExists("documents","idx_module_blamed_count")) return true;
-			if(!$oDB->isColumnExists("document_voted_log", "point")) return true;
+			if(!$oDB->isColumnExists("documents", "blamed_count")) {
+				return true;
+			}
+			if(!$oDB->isIndexExists("documents","idx_module_blamed_count")) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("document_voted_log", "point")) {
+				return true;
+			}
 			// 2008-12-15 Add a column(color)
-			if(!$oDB->isColumnExists("document_categories", "color")) return true;
+			if(!$oDB->isColumnExists("document_categories", "color")) {
+				return true;
+			}
 
 			/**
 			 * 2009. 01. 29: Add a column(lang_code) if not exist in the document_extra_vars table
 			 */
-			if(!$oDB->isColumnExists("document_extra_vars","lang_code")) return true;
+			if(!$oDB->isColumnExists("document_extra_vars","lang_code")) {
+				return true;
+			}
 
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before')) return true;
+			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before')) {
+				return true;
+			}
 			// 2009. 03. 09 Add a column(lang_code) to the documnets table
-			if(!$oDB->isColumnExists("documents","lang_code")) return true;
+			if(!$oDB->isColumnExists("documents","lang_code")) {
+				return true;
+			}
 			// 2009. 03. 11 check the index in the document_extra_vars table
-			if(!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars")) return true;
+			if(!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars")) {
+				return true;
+			}
 
 			// 2009. 03. 19: Add a column(eid) if not exist in the table
-			if(!$oDB->isColumnExists("document_extra_keys","eid")) return true;
-			if(!$oDB->isColumnExists("document_extra_vars","eid")) return true;
+			if(!$oDB->isColumnExists("document_extra_keys","eid")) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("document_extra_vars","eid")) {
+				return true;
+			}
 
 			// 2011. 03. 30 Cubrid index Check the index in the document_extra_vars table
-			if(!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order")) return true;
+			if(!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order")) {
+				return true;
+			}
 
 			//2011. 04. 07 adding description column to document categories
-			if(!$oDB->isColumnExists("document_categories","description")) return true;
+			if(!$oDB->isColumnExists("document_categories","description")) {
+				return true;
+			}
 
 			//2011. 05. 23 adding status column to document
-			if(!$oDB->isColumnExists('documents', 'status')) return true;
+			if(!$oDB->isColumnExists('documents', 'status')) {
+				return true;
+			}
 
 			//2011. 06. 07 check comment status update
-			if($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment')) return true;
+			if($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment')) {
+				return true;
+			}
 
 			// 2011. 10. 25 status index check
-			if(!$oDB->isIndexExists("documents", "idx_module_status")) return true;
+			if(!$oDB->isIndexExists("documents", "idx_module_status")) {
+				return true;
+			}
 
 			// 2012. 02. 27 Add a trigger to copy extra keys when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after')) return true;
+			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after')) {
+				return true;
+			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after')) return true;
+			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after')) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -178,20 +236,33 @@ 
 				$oDB->addIndex("documents","idx_module_voted_count", array("module_srl","voted_count"));
 			}
 			// 2007. 10. 17 Add a trigger to delete all posts together when the module is deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after'))
-				$oModuleController->insertTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after');
+			if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after')) {
+							$oModuleController->insertTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after');
+			}
 			// 2007. 10. 25 add columns(parent_srl, expand) 
-			if(!$oDB->isColumnExists("document_categories","parent_srl")) $oDB->addColumn('document_categories',"parent_srl","number",12,0);
-			if(!$oDB->isColumnExists("document_categories","expand")) $oDB->addColumn('document_categories',"expand","char",1,"N");
-			if(!$oDB->isColumnExists("document_categories","group_srls")) $oDB->addColumn('document_categories',"group_srls","text");
+			if(!$oDB->isColumnExists("document_categories","parent_srl")) {
+				$oDB->addColumn('document_categories',"parent_srl","number",12,0);
+			}
+			if(!$oDB->isColumnExists("document_categories","expand")) {
+				$oDB->addColumn('document_categories',"expand","char",1,"N");
+			}
+			if(!$oDB->isColumnExists("document_categories","group_srls")) {
+				$oDB->addColumn('document_categories',"group_srls","text");
+			}
 			// 2007. 11. 20 create a composite index on the columns(module_srl + is_notice)
-			if(!$oDB->isIndexExists("documents","idx_module_notice")) $oDB->addIndex("documents","idx_module_notice", array("module_srl","is_notice"));
+			if(!$oDB->isIndexExists("documents","idx_module_notice")) {
+				$oDB->addIndex("documents","idx_module_notice", array("module_srl","is_notice"));
+			}
 
 			// 2007. 12. 03: Add if the colume(extra_vars) doesn't exist
-			if(!$oDB->isColumnExists("documents","extra_vars")) $oDB->addColumn('documents','extra_vars','text');
+			if(!$oDB->isColumnExists("documents","extra_vars")) {
+				$oDB->addColumn('documents','extra_vars','text');
+			}
 
 			// 2008. 02. 18 create a composite index on the columns(module_srl + document_srl) (checked by Manian))
-			if(!$oDB->isIndexExists("documents","idx_module_document_srl")) $oDB->addIndex("documents","idx_module_document_srl", array("module_srl","document_srl"));
+			if(!$oDB->isIndexExists("documents","idx_module_document_srl")) {
+				$oDB->addIndex("documents","idx_module_document_srl", array("module_srl","document_srl"));
+			}
 			// 2008. 04. 23 Add a column(blamed count)
 			if(!$oDB->isColumnExists("documents", "blamed_count"))
 			{
@@ -204,18 +275,24 @@ 
 				$oDB->addIndex('documents', 'idx_module_blamed_count', array('module_srl', 'blamed_count'));
 			}
 
-			if(!$oDB->isColumnExists("document_voted_log", "point"))
-				$oDB->addColumn('document_voted_log', 'point', 'number', 11, 0, true);
+			if(!$oDB->isColumnExists("document_voted_log", "point")) {
+							$oDB->addColumn('document_voted_log', 'point', 'number', 11, 0, true);
+			}
 
 
-			if(!$oDB->isColumnExists("document_categories","color")) $oDB->addColumn('document_categories',"color","char",7);
+			if(!$oDB->isColumnExists("document_categories","color")) {
+				$oDB->addColumn('document_categories',"color","char",7);
+			}
 
 			// 2009. 01. 29: Add a column(lang_code) if not exist in the document_extra_vars table
-			if(!$oDB->isColumnExists("document_extra_vars","lang_code")) $oDB->addColumn('document_extra_vars',"lang_code","varchar",10);
+			if(!$oDB->isColumnExists("document_extra_vars","lang_code")) {
+				$oDB->addColumn('document_extra_vars',"lang_code","varchar",10);
+			}
 
 			// 2009. 01. 29 Added a trigger for additional setup
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before'))
-				$oModuleController->insertTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before');
+			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before')) {
+							$oModuleController->insertTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before');
+			}
 			// 2009. 03. 09 Add a column(lang_code) to the documnets table
 			if(!$oDB->isColumnExists("documents","lang_code"))
 			{
@@ -276,7 +353,9 @@ 
 			}
 
 			//2011. 04. 07 adding description column to document categories
-			if(!$oDB->isColumnExists("document_categories","description")) $oDB->addColumn('document_categories',"description","varchar",200,0);
+			if(!$oDB->isColumnExists("document_categories","description")) {
+				$oDB->addColumn('document_categories',"description","varchar",200,0);
+			}
 
 			//2011. 05. 23 adding status column to document
 			if(!$oDB->isColumnExists('documents', 'status'))
@@ -287,8 +366,9 @@ 
 			}
 
 			// 2011. 09. 08 drop column document is_secret
-			if($oDB->isColumnExists('documents', 'status') && $oDB->isColumnExists('documents', 'is_secret'))
-				$oDB->dropColumn('documents', 'is_secret');
+			if($oDB->isColumnExists('documents', 'status') && $oDB->isColumnExists('documents', 'is_secret')) {
+							$oDB->dropColumn('documents', 'is_secret');
+			}
 
 			//2011. 06. 07 merge column, allow_comment and lock_comment
 			if($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment'))
@@ -313,14 +393,17 @@ 
 				$output = executeQuery('document.updateDocumentCommentStatus', $args);
 			}
 
-			if($oDB->isColumnExists('documents', 'allow_comment') && $oDB->isColumnExists('documents', 'comment_status'))
-				$oDB->dropColumn('documents', 'allow_comment');
+			if($oDB->isColumnExists('documents', 'allow_comment') && $oDB->isColumnExists('documents', 'comment_status')) {
+							$oDB->dropColumn('documents', 'allow_comment');
+			}
 
-			if($oDB->isColumnExists('documents', 'lock_comment') && $oDB->isColumnExists('documents', 'comment_status'))
-				$oDB->dropColumn('documents', 'lock_comment');
+			if($oDB->isColumnExists('documents', 'lock_comment') && $oDB->isColumnExists('documents', 'comment_status')) {
+							$oDB->dropColumn('documents', 'lock_comment');
+			}
 
-			if(!$oDB->isIndexExists("documents", "idx_module_status"))
-				$oDB->addIndex("documents", "idx_module_status", array("module_srl","status"));
+			if(!$oDB->isIndexExists("documents", "idx_module_status")) {
+							$oDB->addIndex("documents", "idx_module_status", array("module_srl","status"));
+			}
 
 			// 2012. 02. 27 Add a trigger to copy extra keys when the module is copied 
 			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after'))
@@ -376,8 +459,11 @@ 
 	 */
 	function getConfigStatus($key)
 	{
-		if(array_key_exists(strtolower($key), $this->statusList)) return $this->statusList[$key];
-		else $this->getDefaultStatus();
+		if(array_key_exists(strtolower($key), $this->statusList)) {
+			return $this->statusList[$key];
+		} else {
+			$this->getDefaultStatus();
+		}
 	}
 }
 /* End of file document.class.php */

Spacing +93 added lines, -93 removed lines

@@ -17,7 +17,7 @@ 
 	 * Search option to use in admin page
 	 * @var array
 	 */
-	var $search_option = array('title','content','title_content','user_name',); // /< Search options
+	var $search_option = array('title', 'content', 'title_content', 'user_name',); // /< Search options
 	/**
 	 * Status list
 	 * @var array
@@ -34,22 +34,22 @@ 
 		$oModuleController = getController('module');
 
 		$oDB = &DB::getInstance();
-		$oDB->addIndex("documents","idx_module_list_order", array("module_srl","list_order"));
-		$oDB->addIndex("documents","idx_module_update_order", array("module_srl","update_order"));
-		$oDB->addIndex("documents","idx_module_readed_count", array("module_srl","readed_count"));
-		$oDB->addIndex("documents","idx_module_voted_count", array("module_srl","voted_count"));
-		$oDB->addIndex("documents","idx_module_notice", array("module_srl","is_notice"));
-		$oDB->addIndex("documents","idx_module_document_srl", array("module_srl","document_srl"));
-		$oDB->addIndex("documents","idx_module_blamed_count", array("module_srl","blamed_count"));
-		$oDB->addIndex("document_aliases", "idx_module_title", array("module_srl","alias_title"), true);
-		$oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl","document_srl","var_idx","lang_code"), true);
+		$oDB->addIndex("documents", "idx_module_list_order", array("module_srl", "list_order"));
+		$oDB->addIndex("documents", "idx_module_update_order", array("module_srl", "update_order"));
+		$oDB->addIndex("documents", "idx_module_readed_count", array("module_srl", "readed_count"));
+		$oDB->addIndex("documents", "idx_module_voted_count", array("module_srl", "voted_count"));
+		$oDB->addIndex("documents", "idx_module_notice", array("module_srl", "is_notice"));
+		$oDB->addIndex("documents", "idx_module_document_srl", array("module_srl", "document_srl"));
+		$oDB->addIndex("documents", "idx_module_blamed_count", array("module_srl", "blamed_count"));
+		$oDB->addIndex("document_aliases", "idx_module_title", array("module_srl", "alias_title"), true);
+		$oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl", "document_srl", "var_idx", "lang_code"), true);
 		// 2007. 10. 17 Add a trigger to delete all posts together when the module is deleted
 		$oModuleController->insertTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after');
 
 		// 2009. 01. 29 Added a trigger for additional setup
 		$oModuleController->insertTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before');
 
-		if(!is_dir('./files/cache/tmp'))
+		if (!is_dir('./files/cache/tmp'))
 		{
 			FileHandler::makeDir('./files/cache/tmp');
 		}
@@ -67,71 +67,71 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 7. 25: Add a column(notify_message) for notification
-			if(!$oDB->isColumnExists("documents","notify_message")) return true;
+			if (!$oDB->isColumnExists("documents", "notify_message")) return true;
 
 			// 2007. 8. 23: create a clustered index in the document table
-			if(!$oDB->isIndexExists("documents","idx_module_list_order")) return true;
-			if(!$oDB->isIndexExists("documents","idx_module_update_order")) return true;
-			if(!$oDB->isIndexExists("documents","idx_module_readed_count")) return true;
-			if(!$oDB->isIndexExists("documents","idx_module_voted_count")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_list_order")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_update_order")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_readed_count")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_voted_count")) return true;
 			// 2007. 10. 17 Add a trigger to delete all posts together when the module is deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after')) return true;
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after')) return true;
 			// 2007. 10. 25 add parent_srl, expand to the document category
-			if(!$oDB->isColumnExists("document_categories","parent_srl")) return true;
-			if(!$oDB->isColumnExists("document_categories","expand")) return true;
-			if(!$oDB->isColumnExists("document_categories","group_srls")) return true;
+			if (!$oDB->isColumnExists("document_categories", "parent_srl")) return true;
+			if (!$oDB->isColumnExists("document_categories", "expand")) return true;
+			if (!$oDB->isColumnExists("document_categories", "group_srls")) return true;
 			// 2007. 11. 20 create a composite index on the columns(module_srl + is_notice)
-			if(!$oDB->isIndexExists("documents","idx_module_notice")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_notice")) return true;
 			// 2008. 02. 18 create a composite index on the columns(module_srl + document_srl) (checked by Manian))
-			if(!$oDB->isIndexExists("documents","idx_module_document_srl")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_document_srl")) return true;
 
 			// 2007. 12. 03: Add if the colume(extra_vars) doesn't exist
-			if(!$oDB->isColumnExists("documents","extra_vars")) return true;
+			if (!$oDB->isColumnExists("documents", "extra_vars")) return true;
 			// 2008. 04. 23 Add a column(blamed_count)
-			if(!$oDB->isColumnExists("documents", "blamed_count")) return true;
-			if(!$oDB->isIndexExists("documents","idx_module_blamed_count")) return true;
-			if(!$oDB->isColumnExists("document_voted_log", "point")) return true;
+			if (!$oDB->isColumnExists("documents", "blamed_count")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_blamed_count")) return true;
+			if (!$oDB->isColumnExists("document_voted_log", "point")) return true;
 			// 2008-12-15 Add a column(color)
-			if(!$oDB->isColumnExists("document_categories", "color")) return true;
+			if (!$oDB->isColumnExists("document_categories", "color")) return true;
 
 			/**
 			 * 2009. 01. 29: Add a column(lang_code) if not exist in the document_extra_vars table
 			 */
-			if(!$oDB->isColumnExists("document_extra_vars","lang_code")) return true;
+			if (!$oDB->isColumnExists("document_extra_vars", "lang_code")) return true;
 
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before')) return true;
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before')) return true;
 			// 2009. 03. 09 Add a column(lang_code) to the documnets table
-			if(!$oDB->isColumnExists("documents","lang_code")) return true;
+			if (!$oDB->isColumnExists("documents", "lang_code")) return true;
 			// 2009. 03. 11 check the index in the document_extra_vars table
-			if(!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars")) return true;
+			if (!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars")) return true;
 
 			// 2009. 03. 19: Add a column(eid) if not exist in the table
-			if(!$oDB->isColumnExists("document_extra_keys","eid")) return true;
-			if(!$oDB->isColumnExists("document_extra_vars","eid")) return true;
+			if (!$oDB->isColumnExists("document_extra_keys", "eid")) return true;
+			if (!$oDB->isColumnExists("document_extra_vars", "eid")) return true;
 
 			// 2011. 03. 30 Cubrid index Check the index in the document_extra_vars table
-			if(!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order")) return true;
+			if (!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order")) return true;
 
 			//2011. 04. 07 adding description column to document categories
-			if(!$oDB->isColumnExists("document_categories","description")) return true;
+			if (!$oDB->isColumnExists("document_categories", "description")) return true;
 
 			//2011. 05. 23 adding status column to document
-			if(!$oDB->isColumnExists('documents', 'status')) return true;
+			if (!$oDB->isColumnExists('documents', 'status')) return true;
 
 			//2011. 06. 07 check comment status update
-			if($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment')) return true;
+			if ($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment')) return true;
 
 			// 2011. 10. 25 status index check
-			if(!$oDB->isIndexExists("documents", "idx_module_status")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_status")) return true;
 
 			// 2012. 02. 27 Add a trigger to copy extra keys when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after')) return true;
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after')) return true;
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after')) return true;
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after')) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -149,101 +149,101 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 7. 25: Add a column(notify_message) for notification
-			if(!$oDB->isColumnExists("documents","notify_message"))
+			if (!$oDB->isColumnExists("documents", "notify_message"))
 			{
-				$oDB->addColumn('documents',"notify_message","char",1);
+				$oDB->addColumn('documents', "notify_message", "char", 1);
 			}
 
 			// 2007. 8. 23: create a clustered index in the document table
-			if(!$oDB->isIndexExists("documents","idx_module_list_order"))
+			if (!$oDB->isIndexExists("documents", "idx_module_list_order"))
 			{
-				$oDB->addIndex("documents","idx_module_list_order", array("module_srl","list_order"));
+				$oDB->addIndex("documents", "idx_module_list_order", array("module_srl", "list_order"));
 			}
 
-			if(!$oDB->isIndexExists("documents","idx_module_update_order"))
+			if (!$oDB->isIndexExists("documents", "idx_module_update_order"))
 			{
-				$oDB->addIndex("documents","idx_module_update_order", array("module_srl","update_order"));
+				$oDB->addIndex("documents", "idx_module_update_order", array("module_srl", "update_order"));
 			}
 
-			if(!$oDB->isIndexExists("documents","idx_module_readed_count"))
+			if (!$oDB->isIndexExists("documents", "idx_module_readed_count"))
 			{
-				$oDB->addIndex("documents","idx_module_readed_count", array("module_srl","readed_count"));
+				$oDB->addIndex("documents", "idx_module_readed_count", array("module_srl", "readed_count"));
 			}
 
-			if(!$oDB->isIndexExists("documents","idx_module_voted_count"))
+			if (!$oDB->isIndexExists("documents", "idx_module_voted_count"))
 			{
-				$oDB->addIndex("documents","idx_module_voted_count", array("module_srl","voted_count"));
+				$oDB->addIndex("documents", "idx_module_voted_count", array("module_srl", "voted_count"));
 			}
 			// 2007. 10. 17 Add a trigger to delete all posts together when the module is deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after'))
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after'))
 				$oModuleController->insertTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after');
 			// 2007. 10. 25 add columns(parent_srl, expand) 
-			if(!$oDB->isColumnExists("document_categories","parent_srl")) $oDB->addColumn('document_categories',"parent_srl","number",12,0);
-			if(!$oDB->isColumnExists("document_categories","expand")) $oDB->addColumn('document_categories',"expand","char",1,"N");
-			if(!$oDB->isColumnExists("document_categories","group_srls")) $oDB->addColumn('document_categories',"group_srls","text");
+			if (!$oDB->isColumnExists("document_categories", "parent_srl")) $oDB->addColumn('document_categories', "parent_srl", "number", 12, 0);
+			if (!$oDB->isColumnExists("document_categories", "expand")) $oDB->addColumn('document_categories', "expand", "char", 1, "N");
+			if (!$oDB->isColumnExists("document_categories", "group_srls")) $oDB->addColumn('document_categories', "group_srls", "text");
 			// 2007. 11. 20 create a composite index on the columns(module_srl + is_notice)
-			if(!$oDB->isIndexExists("documents","idx_module_notice")) $oDB->addIndex("documents","idx_module_notice", array("module_srl","is_notice"));
+			if (!$oDB->isIndexExists("documents", "idx_module_notice")) $oDB->addIndex("documents", "idx_module_notice", array("module_srl", "is_notice"));
 
 			// 2007. 12. 03: Add if the colume(extra_vars) doesn't exist
-			if(!$oDB->isColumnExists("documents","extra_vars")) $oDB->addColumn('documents','extra_vars','text');
+			if (!$oDB->isColumnExists("documents", "extra_vars")) $oDB->addColumn('documents', 'extra_vars', 'text');
 
 			// 2008. 02. 18 create a composite index on the columns(module_srl + document_srl) (checked by Manian))
-			if(!$oDB->isIndexExists("documents","idx_module_document_srl")) $oDB->addIndex("documents","idx_module_document_srl", array("module_srl","document_srl"));
+			if (!$oDB->isIndexExists("documents", "idx_module_document_srl")) $oDB->addIndex("documents", "idx_module_document_srl", array("module_srl", "document_srl"));
 			// 2008. 04. 23 Add a column(blamed count)
-			if(!$oDB->isColumnExists("documents", "blamed_count"))
+			if (!$oDB->isColumnExists("documents", "blamed_count"))
 			{
 				$oDB->addColumn('documents', 'blamed_count', 'number', 11, 0, true);
 				$oDB->addIndex('documents', 'idx_blamed_count', array('blamed_count'));
 			}
 
-			if(!$oDB->isIndexExists("documents","idx_module_blamed_count"))
+			if (!$oDB->isIndexExists("documents", "idx_module_blamed_count"))
 			{
 				$oDB->addIndex('documents', 'idx_module_blamed_count', array('module_srl', 'blamed_count'));
 			}
 
-			if(!$oDB->isColumnExists("document_voted_log", "point"))
+			if (!$oDB->isColumnExists("document_voted_log", "point"))
 				$oDB->addColumn('document_voted_log', 'point', 'number', 11, 0, true);
 
 
-			if(!$oDB->isColumnExists("document_categories","color")) $oDB->addColumn('document_categories',"color","char",7);
+			if (!$oDB->isColumnExists("document_categories", "color")) $oDB->addColumn('document_categories', "color", "char", 7);
 
 			// 2009. 01. 29: Add a column(lang_code) if not exist in the document_extra_vars table
-			if(!$oDB->isColumnExists("document_extra_vars","lang_code")) $oDB->addColumn('document_extra_vars',"lang_code","varchar",10);
+			if (!$oDB->isColumnExists("document_extra_vars", "lang_code")) $oDB->addColumn('document_extra_vars', "lang_code", "varchar", 10);
 
 			// 2009. 01. 29 Added a trigger for additional setup
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before'))
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before'))
 				$oModuleController->insertTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before');
 			// 2009. 03. 09 Add a column(lang_code) to the documnets table
-			if(!$oDB->isColumnExists("documents","lang_code"))
+			if (!$oDB->isColumnExists("documents", "lang_code"))
 			{
 				$db_info = Context::getDBInfo();
-				$oDB->addColumn('documents',"lang_code","varchar",10, $db_info->lang_code);
+				$oDB->addColumn('documents', "lang_code", "varchar", 10, $db_info->lang_code);
 				$obj->lang_code = $db_info->lang_type;
 				executeQuery('document.updateDocumentsLangCode', $obj);
 			}
 			// 2009. 03. 11 Check the index in the document_extra_vars table
-			if(!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars"))
+			if (!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars"))
 			{
-				$oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl","document_srl","var_idx","lang_code"), true);
+				$oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl", "document_srl", "var_idx", "lang_code"), true);
 			}
 
-			if($oDB->isIndexExists("document_extra_vars", "unique_module_vars"))
+			if ($oDB->isIndexExists("document_extra_vars", "unique_module_vars"))
 			{
 				$oDB->dropIndex("document_extra_vars", "unique_module_vars", true);
 			}
 
 			// 2009. 03. 19: Add a column(eid)
 			// 2009. 04. 12: Fixed the issue(#17922959) that changes another column values when adding eid column
-			if(!$oDB->isColumnExists("document_extra_keys","eid"))
+			if (!$oDB->isColumnExists("document_extra_keys", "eid"))
 			{
-				$oDB->addColumn("document_extra_keys","eid","varchar",40);
+				$oDB->addColumn("document_extra_keys", "eid", "varchar", 40);
 
 				$output = executeQuery('document.getGroupsExtraKeys', $obj);
-				if($output->toBool() && $output->data && count($output->data)) {
-					foreach($output->data as $extra_keys) {
+				if ($output->toBool() && $output->data && count($output->data)) {
+					foreach ($output->data as $extra_keys) {
 						$args->module_srl = $extra_keys->module_srl;
 						$args->var_idx = $extra_keys->idx;
 						$args->new_eid = "extra_vars".$extra_keys->idx;
@@ -252,14 +252,14 @@ 
 				}
 			}
 
-			if(!$oDB->isColumnExists("document_extra_vars","eid"))
+			if (!$oDB->isColumnExists("document_extra_vars", "eid"))
 			{
-				$oDB->addColumn("document_extra_vars","eid","varchar",40);
+				$oDB->addColumn("document_extra_vars", "eid", "varchar", 40);
 				$obj->var_idx = '-1,-2';
 				$output = executeQuery('document.getGroupsExtraVars', $obj);
-				if($output->toBool() && $output->data && count($output->data))
+				if ($output->toBool() && $output->data && count($output->data))
 				{
-					foreach($output->data as $extra_vars)
+					foreach ($output->data as $extra_vars)
 					{
 						$args->module_srl = $extra_vars->module_srl;
 						$args->var_idx = $extra_vars->idx;
@@ -270,16 +270,16 @@ 
 			}
 
 			// 2011. 03. 30 Cubrid index Check the index in the document_extra_vars table
-			if(!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order"))
+			if (!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order"))
 			{
-				$oDB->addIndex("document_extra_vars", "idx_document_list_order", array("document_srl","module_srl","var_idx"), false);
+				$oDB->addIndex("document_extra_vars", "idx_document_list_order", array("document_srl", "module_srl", "var_idx"), false);
 			}
 
 			//2011. 04. 07 adding description column to document categories
-			if(!$oDB->isColumnExists("document_categories","description")) $oDB->addColumn('document_categories',"description","varchar",200,0);
+			if (!$oDB->isColumnExists("document_categories", "description")) $oDB->addColumn('document_categories', "description", "varchar", 200, 0);
 
 			//2011. 05. 23 adding status column to document
-			if(!$oDB->isColumnExists('documents', 'status'))
+			if (!$oDB->isColumnExists('documents', 'status'))
 			{
 				$oDB->addColumn('documents', 'status', 'varchar', 20, 'PUBLIC');
 				$args->is_secret = 'Y';
@@ -287,11 +287,11 @@ 
 			}
 
 			// 2011. 09. 08 drop column document is_secret
-			if($oDB->isColumnExists('documents', 'status') && $oDB->isColumnExists('documents', 'is_secret'))
+			if ($oDB->isColumnExists('documents', 'status') && $oDB->isColumnExists('documents', 'is_secret'))
 				$oDB->dropColumn('documents', 'is_secret');
 
 			//2011. 06. 07 merge column, allow_comment and lock_comment
-			if($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment'))
+			if ($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment'))
 			{
 				$oDB->addColumn('documents', 'comment_status', 'varchar', 20, 'ALLOW');
 
@@ -313,23 +313,23 @@ 
 				$output = executeQuery('document.updateDocumentCommentStatus', $args);
 			}
 
-			if($oDB->isColumnExists('documents', 'allow_comment') && $oDB->isColumnExists('documents', 'comment_status'))
+			if ($oDB->isColumnExists('documents', 'allow_comment') && $oDB->isColumnExists('documents', 'comment_status'))
 				$oDB->dropColumn('documents', 'allow_comment');
 
-			if($oDB->isColumnExists('documents', 'lock_comment') && $oDB->isColumnExists('documents', 'comment_status'))
+			if ($oDB->isColumnExists('documents', 'lock_comment') && $oDB->isColumnExists('documents', 'comment_status'))
 				$oDB->dropColumn('documents', 'lock_comment');
 
-			if(!$oDB->isIndexExists("documents", "idx_module_status"))
-				$oDB->addIndex("documents", "idx_module_status", array("module_srl","status"));
+			if (!$oDB->isIndexExists("documents", "idx_module_status"))
+				$oDB->addIndex("documents", "idx_module_status", array("module_srl", "status"));
 
 			// 2012. 02. 27 Add a trigger to copy extra keys when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after'))
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after'))
 			{
 				$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after');
 			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after'))
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after'))
 			{
 				$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after');
 			}
@@ -337,7 +337,7 @@ 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		return new BaseObject(0,'success_updated');
+		return new BaseObject(0, 'success_updated');
 	}
 
 	/**
@@ -346,7 +346,7 @@ 
 	 */
 	function recompileCache()
 	{
-		if(!is_dir('./files/cache/tmp'))
+		if (!is_dir('./files/cache/tmp'))
 		{
 			FileHandler::makeDir('./files/cache/tmp');
 		}
@@ -376,7 +376,7 @@ 
 	 */
 	function getConfigStatus($key)
 	{
-		if(array_key_exists(strtolower($key), $this->statusList)) return $this->statusList[$key];
+		if (array_key_exists(strtolower($key), $this->statusList)) return $this->statusList[$key];
 		else $this->getDefaultStatus();
 	}
 }

modules/document/document.item.php

Doc Comments +1 added lines, -2 removed lines

@@ -1106,8 +1106,7 @@
 
 	/**
 	 * Check accessible by document status
-	 * @param array $matches
-	 * @return mixed
+	 * @return boolean
 	 */
 	function _checkAccessibleFromStatus()
 	{

Spacing +182 added lines, -182 removed lines

@@ -79,7 +79,7 @@ 
 	 */
 	function _loadFromDB($load_extra_vars = true)
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 
 		$document_item = false;
 		$cache_put = false;
@@ -88,11 +88,11 @@ 
 
 		// cache controll
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$cache_key = 'document_item:' . getNumberingPath($this->document_srl) . $this->document_srl;
+			$cache_key = 'document_item:'.getNumberingPath($this->document_srl).$this->document_srl;
 			$document_item = $oCacheHandler->get($cache_key);
-			if($document_item !== false)
+			if ($document_item !== false)
 			{
 				$columnList = array('readed_count', 'voted_count', 'blamed_count', 'comment_count', 'trackback_count');
 			}
@@ -102,12 +102,12 @@ 
 		$args->document_srl = $this->document_srl;
 		$output = executeQuery('document.getDocument', $args, $columnList);
 
-		if($document_item === false)
+		if ($document_item === false)
 		{
 			$document_item = $output->data;
 
 				//insert in cache
-			if($document_item && $oCacheHandler->isSupport())
+			if ($document_item && $oCacheHandler->isSupport())
 			{
 				$oCacheHandler->put($cache_key, $document_item);
 			}
@@ -124,9 +124,9 @@ 
 		$this->setAttribute($document_item, $load_extra_vars);
 	}
 
-	function setAttribute($attribute, $load_extra_vars=true)
+	function setAttribute($attribute, $load_extra_vars = true)
 	{
-		if(!$attribute->document_srl)
+		if (!$attribute->document_srl)
 		{
 			$this->document_srl = null;
 			return;
@@ -136,7 +136,7 @@ 
 		$this->adds($attribute);
 
 		// Tags
-		if($this->get('tags'))
+		if ($this->get('tags'))
 		{
 			$tag_list = explode(',', $this->get('tags'));
 			$tag_list = array_map('trim', $tag_list);
@@ -144,7 +144,7 @@ 
 		}
 
 		$oDocumentModel = getModel('document');
-		if($load_extra_vars)
+		if ($load_extra_vars)
 		{
 			$GLOBALS['XE_DOCUMENT_LIST'][$attribute->document_srl] = $this;
 			$oDocumentModel->setToAllDocumentExtraVars();
@@ -159,23 +159,23 @@ 
 
 	function isGranted()
 	{
-		if($_SESSION['own_document'][$this->document_srl]) return $this->grant_cache = true;
+		if ($_SESSION['own_document'][$this->document_srl]) return $this->grant_cache = true;
 
-		if($this->grant_cache !== null)
+		if ($this->grant_cache !== null)
 		{
 			return $this->grant_cache;
 		}
 
-		if(!Context::get('is_logged')) return $this->grant_cache = false;
+		if (!Context::get('is_logged')) return $this->grant_cache = false;
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return $this->grant_cache = true;
+		if ($logged_info->is_admin == 'Y') return $this->grant_cache = true;
 
 		$oModuleModel = getModel('module');
 		$grant = $oModuleModel->getGrant($oModuleModel->getModuleInfoByModuleSrl($this->get('module_srl')), $logged_info);
-		if($grant->manager) return $this->grant_cache = true;
+		if ($grant->manager) return $this->grant_cache = true;
 
-		if($this->get('member_srl') && abs($this->get('member_srl')) == $logged_info->member_srl)
+		if ($this->get('member_srl') && abs($this->get('member_srl')) == $logged_info->member_srl)
 		{
 			return $this->grant_cache = true;
 		}
@@ -191,13 +191,13 @@ 
 
 	function isAccessible()
 	{
-		return $_SESSION['accessible'][$this->document_srl]==true?true:false;
+		return $_SESSION['accessible'][$this->document_srl] == true ?true:false;
 	}
 
 	function allowComment()
 	{
 		// init write, document is not exists. so allow comment status is true
-		if(!$this->isExists()) return true;
+		if (!$this->isExists()) return true;
 
 		return $this->get('comment_status') == 'ALLOW' ? true : false;
 	}
@@ -205,11 +205,11 @@ 
 	function allowTrackback()
 	{
 		static $allow_trackback_status = null;
-		if(is_null($allow_trackback_status))
+		if (is_null($allow_trackback_status))
 		{
 			
 			// Check the tarckback module exist
-			if(!getClass('trackback'))
+			if (!getClass('trackback'))
 			{
 				$allow_trackback_status = false;
 			}
@@ -219,20 +219,20 @@ 
 				$oModuleModel = getModel('module');
 				$trackback_config = $oModuleModel->getModuleConfig('trackback');
 				
-				if(!$trackback_config)
+				if (!$trackback_config)
 				{
 					$trackback_config = new stdClass();
 				}
 				
-				if(!isset($trackback_config->enable_trackback)) $trackback_config->enable_trackback = 'Y';
-				if($trackback_config->enable_trackback != 'Y') $allow_trackback_status = false;
+				if (!isset($trackback_config->enable_trackback)) $trackback_config->enable_trackback = 'Y';
+				if ($trackback_config->enable_trackback != 'Y') $allow_trackback_status = false;
 				else
 				{
 					$module_srl = $this->get('module_srl');
 					// Check settings of each module
 					$module_config = $oModuleModel->getModulePartConfig('trackback', $module_srl);
-					if($module_config->enable_trackback == 'N') $allow_trackback_status = false;
-					else if($this->get('allow_trackback')=='Y' || !$this->isExists()) $allow_trackback_status = true;
+					if ($module_config->enable_trackback == 'N') $allow_trackback_status = false;
+					else if ($this->get('allow_trackback') == 'Y' || !$this->isExists()) $allow_trackback_status = true;
 				}
 			}
 		}
@@ -241,14 +241,14 @@ 
 
 	function isLocked()
 	{
-		if(!$this->isExists()) return false;
+		if (!$this->isExists()) return false;
 
 		return $this->get('comment_status') == 'ALLOW' ? false : true;
 	}
 
 	function isEditable()
 	{
-		if($this->isGranted() || !$this->get('member_srl')) return true;
+		if ($this->isGranted() || !$this->get('member_srl')) return true;
 		return false;
 	}
 
@@ -265,13 +265,13 @@ 
 
 	function useNotify()
 	{
-		return $this->get('notify_message')=='Y' ? true : false;
+		return $this->get('notify_message') == 'Y' ? true : false;
 	}
 
 	function doCart()
 	{
-		if(!$this->document_srl) return false;
-		if($this->isCarted()) $this->removeCart();
+		if (!$this->document_srl) return false;
+		if ($this->isCarted()) $this->removeCart();
 		else $this->addCart();
 	}
 
@@ -298,18 +298,18 @@ 
 	 */
 	function notify($type, $content)
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 		// return if it is not useNotify
-		if(!$this->useNotify()) return;
+		if (!$this->useNotify()) return;
 		// Pass if an author is not a logged-in user
-		if(!$this->get('member_srl')) return;
+		if (!$this->get('member_srl')) return;
 		// Return if the currently logged-in user is an author
 		$logged_info = Context::get('logged_info');
-		if($logged_info->member_srl == $this->get('member_srl')) return;
+		if ($logged_info->member_srl == $this->get('member_srl')) return;
 		// List variables
-		if($type) $title = "[".$type."] ";
+		if ($type) $title = "[".$type."] ";
 		$title .= cut_str(strip_tags($content), 10, '...');
-		$content = sprintf('%s<br /><br />from : <a href="%s" target="_blank">%s</a>',$content, getFullUrl('','document_srl',$this->document_srl), getFullUrl('','document_srl',$this->document_srl));
+		$content = sprintf('%s<br /><br />from : <a href="%s" target="_blank">%s</a>', $content, getFullUrl('', 'document_srl', $this->document_srl), getFullUrl('', 'document_srl', $this->document_srl));
 		$receiver_srl = $this->get('member_srl');
 		$sender_member_srl = $logged_info->member_srl;
 		// Send a message
@@ -324,26 +324,26 @@ 
 
 	function getIpAddress()
 	{
-		if($this->isGranted())
+		if ($this->isGranted())
 		{
 			return $this->get('ipaddress');
 		}
 
-		return '*' . strstr($this->get('ipaddress'), '.');
+		return '*'.strstr($this->get('ipaddress'), '.');
 	}
 
 	function isExistsHomepage()
 	{
-		if(trim($this->get('homepage'))) return true;
+		if (trim($this->get('homepage'))) return true;
 		return false;
 	}
 
 	function getHomepageUrl()
 	{
 		$url = trim($this->get('homepage'));
-		if(!$url) return;
+		if (!$url) return;
 
-		if(strncasecmp('http://', $url, 7) !== 0 && strncasecmp('https://', $url, 8) !== 0)  $url = 'http://' . $url;
+		if (strncasecmp('http://', $url, 7) !== 0 && strncasecmp('https://', $url, 8) !== 0)  $url = 'http://'.$url;
 
 		return $url;
 	}
@@ -373,52 +373,52 @@ 
 		return htmlspecialchars($this->get('last_updater'), ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 	}
 
-	function getTitleText($cut_size = 0, $tail='...')
+	function getTitleText($cut_size = 0, $tail = '...')
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 
-		if($cut_size) $title = cut_str($this->get('title'), $cut_size, $tail);
+		if ($cut_size) $title = cut_str($this->get('title'), $cut_size, $tail);
 		else $title = $this->get('title');
 
 		return $title;
 	}
 
-	function getTitle($cut_size = 0, $tail='...')
+	function getTitle($cut_size = 0, $tail = '...')
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 
 		$title = $this->getTitleText($cut_size, $tail);
 
 		$attrs = array();
 		$this->add('title_color', trim($this->get('title_color')));
-		if($this->get('title_bold')=='Y') $attrs[] = "font-weight:bold;";
-		if($this->get('title_color') && $this->get('title_color') != 'N') $attrs[] = "color:#".$this->get('title_color');
+		if ($this->get('title_bold') == 'Y') $attrs[] = "font-weight:bold;";
+		if ($this->get('title_color') && $this->get('title_color') != 'N') $attrs[] = "color:#".$this->get('title_color');
 
-		if(count($attrs)) return sprintf("<span style=\"%s\">%s</span>", implode(';',$attrs), htmlspecialchars($title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
+		if (count($attrs)) return sprintf("<span style=\"%s\">%s</span>", implode(';', $attrs), htmlspecialchars($title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 		else return htmlspecialchars($title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 	}
 
 	function getContentText($strlen = 0)
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 
-		if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
+		if ($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
 
 		$result = $this->_checkAccessibleFromStatus();
-		if($result) $_SESSION['accessible'][$this->document_srl] = true;
+		if ($result) $_SESSION['accessible'][$this->document_srl] = true;
 
 		$content = $this->get('content');
 		$content = preg_replace_callback('/<(object|param|embed)[^>]*/is', array($this, '_checkAllowScriptAccess'), $content);
 		$content = preg_replace_callback('/<object[^>]*>/is', array($this, '_addAllowScriptAccess'), $content);
 
-		if($strlen) return cut_str(strip_tags($content),$strlen,'...');
+		if ($strlen) return cut_str(strip_tags($content), $strlen, '...');
 
 		return htmlspecialchars($content);
 	}
 
 	function _addAllowScriptAccess($m)
 	{
-		if($this->allowscriptaccessList[$this->allowscriptaccessKey] == 1)
+		if ($this->allowscriptaccessList[$this->allowscriptaccessKey] == 1)
 		{
 			$m[0] = $m[0].'<param name="allowscriptaccess" value="never"></param>';
 		}
@@ -428,26 +428,26 @@ 
 
 	function _checkAllowScriptAccess($m)
 	{
-		if($m[1] == 'object')
+		if ($m[1] == 'object')
 		{
 			$this->allowscriptaccessList[] = 1;
 		}
 
-		if($m[1] == 'param')
+		if ($m[1] == 'param')
 		{
-			if(stripos($m[0], 'allowscriptaccess'))
+			if (stripos($m[0], 'allowscriptaccess'))
 			{
 				$m[0] = '<param name="allowscriptaccess" value="never"';
-				if(substr($m[0], -1) == '/')
+				if (substr($m[0], -1) == '/')
 				{
 					$m[0] .= '/';
 				}
-				$this->allowscriptaccessList[count($this->allowscriptaccessList)-1]--;
+				$this->allowscriptaccessList[count($this->allowscriptaccessList) - 1]--;
 			}
 		}
-		else if($m[1] == 'embed')
+		else if ($m[1] == 'embed')
 		{
-			if(stripos($m[0], 'allowscriptaccess'))
+			if (stripos($m[0], 'allowscriptaccess'))
 			{
 				$m[0] = preg_replace('/always|samedomain/i', 'never', $m[0]);
 			}
@@ -461,24 +461,24 @@ 
 
 	function getContent($add_popup_menu = true, $add_content_info = true, $resource_realpath = false, $add_xe_content_class = true, $stripEmbedTagException = false)
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 
-		if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
+		if ($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
 
 		$result = $this->_checkAccessibleFromStatus();
-		if($result) $_SESSION['accessible'][$this->document_srl] = true;
+		if ($result) $_SESSION['accessible'][$this->document_srl] = true;
 
 		$content = $this->get('content');
-		if(!$stripEmbedTagException) stripEmbedTagForAdmin($content, $this->get('member_srl'));
+		if (!$stripEmbedTagException) stripEmbedTagForAdmin($content, $this->get('member_srl'));
 
 		// Define a link if using a rewrite module
 		$oContext = &Context::getInstance();
-		if($oContext->allow_rewrite)
+		if ($oContext->allow_rewrite)
 		{
-			$content = preg_replace('/<a([ \t]+)href=("|\')\.\/\?/i',"<a href=\\2". Context::getRequestUri() ."?", $content);
+			$content = preg_replace('/<a([ \t]+)href=("|\')\.\/\?/i', "<a href=\\2".Context::getRequestUri()."?", $content);
 		}
 		// To display a pop-up menu
-		if($add_popup_menu)
+		if ($add_popup_menu)
 		{
 			$content = sprintf(
 				'%s<div class="document_popup_menu"><a href="#popup_menu_area" class="document_%d" onclick="return false">%s</a></div>',
@@ -487,10 +487,10 @@ 
 			);
 		}
 		// If additional content information is set
-		if($add_content_info)
+		if ($add_content_info)
 		{
 			$memberSrl = $this->get('member_srl');
-			if($memberSrl < 0)
+			if ($memberSrl < 0)
 			{
 				$memberSrl = 0;
 			}
@@ -506,12 +506,12 @@ 
 		}
 		else
 		{
-			if($add_xe_content_class) $content = sprintf('<div class="xe_content">%s</div>', $content);
+			if ($add_xe_content_class) $content = sprintf('<div class="xe_content">%s</div>', $content);
 		}
 		// Change the image path to a valid absolute path if resource_realpath is true
-		if($resource_realpath)
+		if ($resource_realpath)
 		{
-			$content = preg_replace_callback('/<img([^>]+)>/i',array($this,'replaceResourceRealPath'), $content);
+			$content = preg_replace_callback('/<img([^>]+)>/i', array($this, 'replaceResourceRealPath'), $content);
 		}
 
 		return $content;
@@ -560,7 +560,7 @@ 
 		$content = trim(cut_str($content, $str_size, $tail));
 
 		// Replace back < , <, "
-		$content = str_replace(array('<', '>', '"'),array('&lt;', '&gt;', '&quot;'), $content);
+		$content = str_replace(array('<', '>', '"'), array('&lt;', '&gt;', '&quot;'), $content);
 
 		return $content;
 	}
@@ -573,13 +573,13 @@ 
 	function getRegdateTime()
 	{
 		$regdate = $this->get('regdate');
-		$year = substr($regdate,0,4);
-		$month = substr($regdate,4,2);
-		$day = substr($regdate,6,2);
-		$hour = substr($regdate,8,2);
-		$min = substr($regdate,10,2);
-		$sec = substr($regdate,12,2);
-		return mktime($hour,$min,$sec,$month,$day,$year);
+		$year = substr($regdate, 0, 4);
+		$month = substr($regdate, 4, 2);
+		$day = substr($regdate, 6, 2);
+		$hour = substr($regdate, 8, 2);
+		$min = substr($regdate, 10, 2);
+		$sec = substr($regdate, 12, 2);
+		return mktime($hour, $min, $sec, $month, $day, $year);
 	}
 
 	function getRegdateGM()
@@ -589,7 +589,7 @@ 
 
 	function getRegdateDT()
 	{
-		return $this->getRegdate('Y-m-d').'T'.$this->getRegdate('H:i:s').substr($GLOBALS['_time_zone'],0,3).':'.substr($GLOBALS['_time_zone'],3,2);
+		return $this->getRegdate('Y-m-d').'T'.$this->getRegdate('H:i:s').substr($GLOBALS['_time_zone'], 0, 3).':'.substr($GLOBALS['_time_zone'], 3, 2);
 	}
 
 	function getUpdate($format = 'Y.m.d H:i:s')
@@ -599,13 +599,13 @@ 
 
 	function getUpdateTime()
 	{
-		$year = substr($this->get('last_update'),0,4);
-		$month = substr($this->get('last_update'),4,2);
-		$day = substr($this->get('last_update'),6,2);
-		$hour = substr($this->get('last_update'),8,2);
-		$min = substr($this->get('last_update'),10,2);
-		$sec = substr($this->get('last_update'),12,2);
-		return mktime($hour,$min,$sec,$month,$day,$year);
+		$year = substr($this->get('last_update'), 0, 4);
+		$month = substr($this->get('last_update'), 4, 2);
+		$day = substr($this->get('last_update'), 6, 2);
+		$hour = substr($this->get('last_update'), 8, 2);
+		$min = substr($this->get('last_update'), 10, 2);
+		$sec = substr($this->get('last_update'), 12, 2);
+		return mktime($hour, $min, $sec, $month, $day, $year);
 	}
 
 	function getUpdateGM()
@@ -615,21 +615,21 @@ 
 
 	function getUpdateDT()
 	{
-		return $this->getUpdate('Y-m-d').'T'.$this->getUpdate('H:i:s').substr($GLOBALS['_time_zone'],0,3).':'.substr($GLOBALS['_time_zone'],3,2);
+		return $this->getUpdate('Y-m-d').'T'.$this->getUpdate('H:i:s').substr($GLOBALS['_time_zone'], 0, 3).':'.substr($GLOBALS['_time_zone'], 3, 2);
 	}
 
 	function getPermanentUrl()
 	{
-		return getFullUrl('','mid', $this->getDocumentMid('document_srl'), 'document_srl', $this->get('document_srl'));
+		return getFullUrl('', 'mid', $this->getDocumentMid('document_srl'), 'document_srl', $this->get('document_srl'));
 	}
 
 	function getTrackbackUrl()
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 
 		// Generate a key to prevent spams
 		$oTrackbackModel = getModel('trackback');
-		if($oTrackbackModel) return $oTrackbackModel->getTrackbackUrl($this->document_srl, $this->getDocumentMid());
+		if ($oTrackbackModel) return $oTrackbackModel->getTrackbackUrl($this->document_srl, $this->getDocumentMid());
 	}
 
 	/**
@@ -639,24 +639,24 @@ 
 	function updateReadedCount()
 	{
 		$oDocumentController = getController('document');
-		if($oDocumentController->updateReadedCount($this))
+		if ($oDocumentController->updateReadedCount($this))
 		{
 			$readed_count = $this->get('readed_count');
-			$this->add('readed_count', $readed_count+1);
+			$this->add('readed_count', $readed_count + 1);
 		}
 	}
 
 	function isExtraVarsExists()
 	{
-		if(!$this->get('module_srl')) return false;
+		if (!$this->get('module_srl')) return false;
 		$oDocumentModel = getModel('document');
 		$extra_keys = $oDocumentModel->getExtraKeys($this->get('module_srl'));
-		return count($extra_keys)?true:false;
+		return count($extra_keys) ?true:false;
 	}
 
 	function getExtraVars()
 	{
-		if(!$this->get('module_srl') || !$this->document_srl) return null;
+		if (!$this->get('module_srl') || !$this->document_srl) return null;
 
 		$oDocumentModel = getModel('document');
 		return $oDocumentModel->getExtraVars($this->get('module_srl'), $this->document_srl);
@@ -665,7 +665,7 @@ 
 	function getExtraValue($idx)
 	{
 		$extra_vars = $this->getExtraVars();
-		if(is_array($extra_vars) && array_key_exists($idx,$extra_vars))
+		if (is_array($extra_vars) && array_key_exists($idx, $extra_vars))
 		{
 			return $extra_vars[$idx]->getValue();
 		}
@@ -678,7 +678,7 @@ 
 	function getExtraValueHTML($idx)
 	{
 		$extra_vars = $this->getExtraVars();
-		if(is_array($extra_vars) && array_key_exists($idx,$extra_vars))
+		if (is_array($extra_vars) && array_key_exists($idx, $extra_vars))
 		{
 			return $extra_vars[$idx]->getValueHTML();
 		}
@@ -692,16 +692,16 @@ 
 	{
 		$extra_vars = $this->getExtraVars();
 
-		if($extra_vars)
+		if ($extra_vars)
 		{
 			// Handle extra variable(eid)
-			foreach($extra_vars as $idx => $key)
+			foreach ($extra_vars as $idx => $key)
 			{
 				$extra_eid[$key->eid] = $key;
 			}
 		}
 		
-		if(is_array($extra_eid) && array_key_exists($eid,$extra_eid))
+		if (is_array($extra_eid) && array_key_exists($eid, $extra_eid))
 		{
 			return $extra_eid[$eid]->getValue();
 		}
@@ -715,12 +715,12 @@ 
 	{
 		$extra_vars = $this->getExtraVars();
 		// Handle extra variable(eid)
-		foreach($extra_vars as $idx => $key)
+		foreach ($extra_vars as $idx => $key)
 		{
 			$extra_eid[$key->eid] = $key;
 		}
 		
-		if(is_array($extra_eid) && array_key_exists($eid,$extra_eid))
+		if (is_array($extra_eid) && array_key_exists($eid, $extra_eid))
 		{
 			return $extra_eid[$eid]->getValueHTML();
 		}
@@ -744,13 +744,13 @@ 
 
 	function getComments()
 	{
-		if(!$this->getCommentCount()) return;
-		if(!$this->isGranted() && $this->isSecret()) return;
+		if (!$this->getCommentCount()) return;
+		if (!$this->isGranted() && $this->isSecret()) return;
 		// cpage is a number of comment pages
 		$cpageStr = sprintf('%d_cpage', $this->document_srl);
 		$cpage = Context::get($cpageStr);
 
-		if(!$cpage)
+		if (!$cpage)
 		{
 			$cpage = Context::get('cpage');
 		}
@@ -758,19 +758,19 @@ 
 		// Get a list of comments
 		$oCommentModel = getModel('comment');
 		$output = $oCommentModel->getCommentList($this->document_srl, $cpage, $is_admin);
-		if(!$output->toBool() || !count($output->data)) return;
+		if (!$output->toBool() || !count($output->data)) return;
 		// Create commentItem object from a comment list
 		// If admin priviledge is granted on parent posts, you can read its child posts.
 		$accessible = array();
 		$comment_list = array();
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$oCommentItem = new commentItem();
 			$oCommentItem->setAttribute($val);
 			// If permission is granted to the post, you can access it temporarily
-			if($oCommentItem->isGranted()) $accessible[$val->comment_srl] = true;
+			if ($oCommentItem->isGranted()) $accessible[$val->comment_srl] = true;
 			// If the comment is set to private and it belongs child post, it is allowable to read the comment for who has a admin privilege on its parent post
-			if($val->parent_srl>0 && $val->is_secret == 'Y' && !$oCommentItem->isAccessible() && $accessible[$val->parent_srl]===true)
+			if ($val->parent_srl > 0 && $val->is_secret == 'Y' && !$oCommentItem->isAccessible() && $accessible[$val->parent_srl] === true)
 			{
 				$oCommentItem->setAccessible();
 			}
@@ -779,7 +779,7 @@ 
 		// Variable setting to be displayed on the skin
 		Context::set($cpageStr, $output->page_navigation->cur_page);
 		Context::set('cpage', $output->page_navigation->cur_page);
-		if($output->total_page>1) $this->comment_page_navigation = $output->page_navigation;
+		if ($output->total_page > 1) $this->comment_page_navigation = $output->page_navigation;
 
 		return $comment_list;
 	}
@@ -791,9 +791,9 @@ 
 
 	function getTrackbacks()
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 
-		if(!$this->allowTrackback() || !$this->get('trackback_count')) return;
+		if (!$this->allowTrackback() || !$this->get('trackback_count')) return;
 
 		$oTrackbackModel = getModel('trackback');
 		return $oTrackbackModel->getTrackbackList($this->document_srl, $is_admin);
@@ -801,47 +801,47 @@ 
 
 	function thumbnailExists($width = 80, $height = 0, $type = '')
 	{
-		if(!$this->document_srl) return false;
-		if(!$this->getThumbnail($width, $height, $type)) return false;
+		if (!$this->document_srl) return false;
+		if (!$this->getThumbnail($width, $height, $type)) return false;
 		return true;
 	}
 
 	function getThumbnail($width = 80, $height = 0, $thumbnail_type = '')
 	{
 		// Return false if the document doesn't exist
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 
-		if($this->isSecret() && !$this->isGranted())
+		if ($this->isSecret() && !$this->isGranted())
 		{
 			return;
 		}
 
 		// If not specify its height, create a square
-		if(!$height) $height = $width;
+		if (!$height) $height = $width;
 
 		// Return false if neither attachement nor image files in the document
 		$content = $this->get('content');
-		if(!$this->get('uploaded_count'))
+		if (!$this->get('uploaded_count'))
 		{
-			if(!$content)
+			if (!$content)
 			{
 				$args = new stdClass();
 				$args->document_srl = $this->document_srl;
 				$output = executeQuery('document.getDocument', $args, array('content'));
-				if($output->toBool() && $output->data)
+				if ($output->toBool() && $output->data)
 				{
 					$content = $output->data->content;
 					$this->add('content', $content);
 				}
 			}
 
-			if(!preg_match("!<img!is", $content)) return;
+			if (!preg_match("!<img!is", $content)) return;
 		}
 		// Get thumbnai_type information from document module's configuration
-		if(!in_array($thumbnail_type, array('crop','ratio')))
+		if (!in_array($thumbnail_type, array('crop', 'ratio')))
 		{
 			$config = $GLOBALS['__document_config__'];
-			if(!$config)
+			if (!$config)
 			{
 				$oDocumentModel = getModel('document');
 				$config = $oDocumentModel->getDocumentConfig();
@@ -851,15 +851,15 @@ 
 		}
 
 		// Define thumbnail information
-		$thumbnail_path = sprintf('files/thumbnails/%s',getNumberingPath($this->document_srl, 3));
+		$thumbnail_path = sprintf('files/thumbnails/%s', getNumberingPath($this->document_srl, 3));
 		$thumbnail_file = sprintf('%s%dx%d.%s.jpg', $thumbnail_path, $width, $height, $thumbnail_type);
 		$thumbnail_lockfile = sprintf('%s%dx%d.%s.lock', $thumbnail_path, $width, $height, $thumbnail_type);
 		$thumbnail_url  = Context::getRequestUri().$thumbnail_file;
 
 		// Return false if thumbnail file exists and its size is 0. Otherwise, return its path
-		if(file_exists($thumbnail_file) || file_exists($thumbnail_lockfile))
+		if (file_exists($thumbnail_file) || file_exists($thumbnail_lockfile))
 		{
-			if(filesize($thumbnail_file) < 1)
+			if (filesize($thumbnail_file) < 1)
 			{
 				return FALSE;
 			}
@@ -877,64 +877,64 @@ 
 		$is_tmp_file = false;
 
 		// Find an iamge file among attached files if exists
-		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;
 			}
 		}
 		// If not exists, file an image file from the content
 		$is_tmp_file = false;
-		if(!$source_file)
+		if (!$source_file)
 		{
 			$random = new Password();
 
 			preg_match_all("!<img[^>]*src=(?:\"|\')([^\"\']*?)(?:\"|\')!is", $content, $matches, PREG_SET_ORDER);
 
-			foreach($matches as $target_image)
+			foreach ($matches as $target_image)
 			{
 				$target_src = trim($target_image[1]);
-				if(preg_match('/\/(common|modules|widgets|addons|layouts|m\.layouts)\//i', $target_src)) continue;
+				if (preg_match('/\/(common|modules|widgets|addons|layouts|m\.layouts)\//i', $target_src)) continue;
 
-				if(!preg_match('/^(http|https):\/\//i',$target_src))
+				if (!preg_match('/^(http|https):\/\//i', $target_src))
 				{
 					$target_src = Context::getRequestUri().$target_src;
 				}
 
 				$target_src = htmlspecialchars_decode($target_src);
 
-				$tmp_file = _XE_PATH_ . 'files/cache/tmp/' . $random->createSecureSalt(32, 'hex');
+				$tmp_file = _XE_PATH_.'files/cache/tmp/'.$random->createSecureSalt(32, 'hex');
 				FileHandler::getRemoteFile($target_src, $tmp_file);
-				if(!file_exists($tmp_file)) continue;
+				if (!file_exists($tmp_file)) continue;
 
 				$imageinfo = getimagesize($tmp_file);
 				list($_w, $_h) = $imageinfo;
-				if($imageinfo === false || ($_w < ($width * 0.3) && $_h < ($height * 0.3))) {
+				if ($imageinfo === false || ($_w < ($width * 0.3) && $_h < ($height * 0.3))) {
 					FileHandler::removeFile($tmp_file);
 					continue;
 				}
@@ -945,13 +945,13 @@ 
 			}
 		}
 
-		if($source_file)
+		if ($source_file)
 		{
 			$output_file = FileHandler::createImageFile($source_file, $thumbnail_file, $width, $height, 'jpg', $thumbnail_type);
 		}
 
 		// Remove source file if it was temporary
-		if($is_tmp_file)
+		if ($is_tmp_file)
 		{
 			FileHandler::removeFile($source_file);
 		}
@@ -960,14 +960,14 @@ 
 		FileHandler::removeFile($thumbnail_lockfile);
 
 		// Return the thumbnail path if it was successfully generated
-		if($output_file)
+		if ($output_file)
 		{
 			return $thumbnail_url;
 		}
 		// Create an empty file if thumbnail generation failed
 		else
 		{
-			FileHandler::writeFile($thumbnail_file, '','w');
+			FileHandler::writeFile($thumbnail_file, '', 'w');
 		}
 
 		return;
@@ -981,21 +981,21 @@ 
 	 */
 	function getExtraImages($time_interval = 43200)
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 		// variables for icon list
 		$buffs = array();
 
 		$check_files = false;
 
 		// Check if secret post is
-		if($this->isSecret()) $buffs[] = "secret";
+		if ($this->isSecret()) $buffs[] = "secret";
 
 		// Set the latest time
-		$time_check = date("YmdHis", $_SERVER['REQUEST_TIME']-$time_interval);
+		$time_check = date("YmdHis", $_SERVER['REQUEST_TIME'] - $time_interval);
 
 		// Check new post
-		if($this->get('regdate')>$time_check) $buffs[] = "new";
-		else if($this->get('last_update')>$time_check) $buffs[] = "update";
+		if ($this->get('regdate') > $time_check) $buffs[] = "new";
+		else if ($this->get('last_update') > $time_check) $buffs[] = "update";
 
 		/*
 		   $content = $this->get('content');
@@ -1018,14 +1018,14 @@ 
 		 */
 
 		// Check the attachment
-		if($this->hasUploadedFiles()) $buffs[] = "file";
+		if ($this->hasUploadedFiles()) $buffs[] = "file";
 
 		return $buffs;
 	}
 
 	function getStatus()
 	{
-		if(!$this->get('status')) {
+		if (!$this->get('status')) {
 			$oDocumentClass = getClass('document');
 			return $oDocumentClass->getDefaultStatus();
 		}
@@ -1039,11 +1039,11 @@ 
 	 */
 	function printExtraImages($time_check = 43200)
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 
 		$oDocumentModel = getModel('document');
 		$documentConfig = $oDocumentModel->getDocumentConfig();
-		if(Mobile::isFromMobilePhone())
+		if (Mobile::isFromMobilePhone())
 		{
 			$iconSkin = $documentConfig->micons;
 		}
@@ -1051,13 +1051,13 @@ 
 		{
 			$iconSkin = $documentConfig->icons;
 		}
-		$path = sprintf('%s%s',getUrl(), "modules/document/tpl/icons/$iconSkin/");
+		$path = sprintf('%s%s', getUrl(), "modules/document/tpl/icons/$iconSkin/");
 
 		$buffs = $this->getExtraImages($time_check);
-		if(!count($buffs)) return;
+		if (!count($buffs)) return;
 
 		$buff = array();
-		foreach($buffs as $key => $val)
+		foreach ($buffs as $key => $val)
 		{
 			$buff[] = sprintf('<img src="%s%s.gif" alt="%s" title="%s" style="margin-right:2px;" />', $path, $val, $val, $val);
 		}
@@ -1066,20 +1066,20 @@ 
 
 	function hasUploadedFiles()
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 
-		if($this->isSecret() && !$this->isGranted()) return false;
-		return $this->get('uploaded_count')? true : false;
+		if ($this->isSecret() && !$this->isGranted()) return false;
+		return $this->get('uploaded_count') ? true : false;
 	}
 
 	function getUploadedFiles($sortIndex = 'file_srl')
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 
-		if($this->isSecret() && !$this->isGranted()) return;
-		if(!$this->get('uploaded_count')) return;
+		if ($this->isSecret() && !$this->isGranted()) return;
+		if (!$this->get('uploaded_count')) return;
 
-		if(!$this->uploadedFiles[$sortIndex])
+		if (!$this->uploadedFiles[$sortIndex])
 		{
 			$oFileModel = getModel('file');
 			$this->uploadedFiles[$sortIndex] = $oFileModel->getFiles($this->document_srl, array(), $sortIndex, true);
@@ -1095,7 +1095,7 @@ 
 	function getEditor()
 	{
 		$module_srl = $this->get('module_srl');
-		if(!$module_srl) $module_srl = Context::get('module_srl');
+		if (!$module_srl) $module_srl = Context::get('module_srl');
 
 		$oEditorModel = getModel('editor');
 		return $oEditorModel->getModuleEditor('document', $module_srl, $this->document_srl, 'document_srl', 'content');
@@ -1110,7 +1110,7 @@ 
 	{
 		// Return false if not authorized, if a secret document, if the document is set not to allow any comment
 		if (!$this->allowComment()) return false;
-		if(!$this->isGranted() && $this->isSecret()) return false;
+		if (!$this->isGranted() && $this->isSecret()) return false;
 
 		return true;
 	}
@@ -1121,7 +1121,7 @@ 
 	 */
 	function getCommentEditor()
 	{
-		if(!$this->isEnableComment()) return;
+		if (!$this->isEnableComment()) return;
 
 		$oEditorModel = getModel('editor');
 		return $oEditorModel->getModuleEditor('comment', $this->get('module_srl'), $comment_srl, 'comment_srl', 'content');
@@ -1133,10 +1133,10 @@ 
 	 */
 	function getProfileImage()
 	{
-		if(!$this->isExists() || !$this->get('member_srl')) return;
+		if (!$this->isExists() || !$this->get('member_srl')) return;
 		$oMemberModel = getModel('member');
 		$profile_info = $oMemberModel->getProfileImage($this->get('member_srl'));
-		if(!$profile_info) return;
+		if (!$profile_info) return;
 
 		return $profile_info->src;
 	}
@@ -1148,21 +1148,21 @@ 
 	function getSignature()
 	{
 		// Pass if a document doesn't exist
-		if(!$this->isExists() || !$this->get('member_srl')) return;
+		if (!$this->isExists() || !$this->get('member_srl')) return;
 		// Get signature information
 		$oMemberModel = getModel('member');
 		$signature = $oMemberModel->getSignature($this->get('member_srl'));
 		// Check if a maximum height of signiture is set in 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');
 			$GLOBALS['__member_signature_max_height'] = $member_config->signature_max_height;
 		}
-		if($signature)
+		if ($signature)
 		{
 			$max_signature_height = $GLOBALS['__member_signature_max_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);
+			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);
 		}
 
 		return $signature;
@@ -1175,7 +1175,7 @@ 
 	 */
 	function replaceResourceRealPath($matches)
 	{
-		return preg_replace('/src=(["\']?)files/i','src=$1'.Context::getRequestUri().'files', $matches[0]);
+		return preg_replace('/src=(["\']?)files/i', 'src=$1'.Context::getRequestUri().'files', $matches[0]);
 	}
 
 	/**
@@ -1186,19 +1186,19 @@ 
 	function _checkAccessibleFromStatus()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return true;
+		if ($logged_info->is_admin == 'Y') return true;
 
 		$status = $this->get('status');
-		if(empty($status)) return false;
+		if (empty($status)) return false;
 
 		$oDocumentModel = getModel('document');
 		$configStatusList = $oDocumentModel->getStatusList();
 
-		if($status == $configStatusList['public'] || $status == $configStatusList['publish'])
+		if ($status == $configStatusList['public'] || $status == $configStatusList['publish'])
 			return true;
-		else if($status == $configStatusList['private'] || $status == $configStatusList['secret'])
+		else if ($status == $configStatusList['private'] || $status == $configStatusList['secret'])
 		{
-			if($this->get('member_srl') == $logged_info->member_srl)
+			if ($this->get('member_srl') == $logged_info->member_srl)
 				return true;
 		}
 		return false;

Braces +258 added lines, -110 removed lines

@@ -79,7 +79,9 @@ 
 	 */
 	function _loadFromDB($load_extra_vars = true)
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 
 		$document_item = false;
 		$cache_put = false;
@@ -111,8 +113,7 @@ 
 			{
 				$oCacheHandler->put($cache_key, $document_item);
 			}
-		}
-		else
+		} else
 		{
 			$document_item->readed_count = $output->data->readed_count;
 			$document_item->voted_count = $output->data->voted_count;
@@ -159,21 +160,29 @@ 
 
 	function isGranted()
 	{
-		if($_SESSION['own_document'][$this->document_srl]) return $this->grant_cache = true;
+		if($_SESSION['own_document'][$this->document_srl]) {
+			return $this->grant_cache = true;
+		}
 
 		if($this->grant_cache !== null)
 		{
 			return $this->grant_cache;
 		}
 
-		if(!Context::get('is_logged')) return $this->grant_cache = false;
+		if(!Context::get('is_logged')) {
+			return $this->grant_cache = false;
+		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return $this->grant_cache = true;
+		if($logged_info->is_admin == 'Y') {
+			return $this->grant_cache = true;
+		}
 
 		$oModuleModel = getModel('module');
 		$grant = $oModuleModel->getGrant($oModuleModel->getModuleInfoByModuleSrl($this->get('module_srl')), $logged_info);
-		if($grant->manager) return $this->grant_cache = true;
+		if($grant->manager) {
+			return $this->grant_cache = true;
+		}
 
 		if($this->get('member_srl') && abs($this->get('member_srl')) == $logged_info->member_srl)
 		{
@@ -197,7 +206,9 @@ 
 	function allowComment()
 	{
 		// init write, document is not exists. so allow comment status is true
-		if(!$this->isExists()) return true;
+		if(!$this->isExists()) {
+			return true;
+		}
 
 		return $this->get('comment_status') == 'ALLOW' ? true : false;
 	}
@@ -212,8 +223,7 @@ 
 			if(!getClass('trackback'))
 			{
 				$allow_trackback_status = false;
-			}
-			else
+			} else
 			{
 				// If the trackback module is configured to be disabled, do not allow. Otherwise, check the setting of each module.
 				$oModuleModel = getModel('module');
@@ -224,15 +234,21 @@ 
 					$trackback_config = new stdClass();
 				}
 				
-				if(!isset($trackback_config->enable_trackback)) $trackback_config->enable_trackback = 'Y';
-				if($trackback_config->enable_trackback != 'Y') $allow_trackback_status = false;
-				else
+				if(!isset($trackback_config->enable_trackback)) {
+					$trackback_config->enable_trackback = 'Y';
+				}
+				if($trackback_config->enable_trackback != 'Y') {
+					$allow_trackback_status = false;
+				} else
 				{
 					$module_srl = $this->get('module_srl');
 					// Check settings of each module
 					$module_config = $oModuleModel->getModulePartConfig('trackback', $module_srl);
-					if($module_config->enable_trackback == 'N') $allow_trackback_status = false;
-					else if($this->get('allow_trackback')=='Y' || !$this->isExists()) $allow_trackback_status = true;
+					if($module_config->enable_trackback == 'N') {
+						$allow_trackback_status = false;
+					} else if($this->get('allow_trackback')=='Y' || !$this->isExists()) {
+						$allow_trackback_status = true;
+					}
 				}
 			}
 		}
@@ -241,14 +257,18 @@ 
 
 	function isLocked()
 	{
-		if(!$this->isExists()) return false;
+		if(!$this->isExists()) {
+			return false;
+		}
 
 		return $this->get('comment_status') == 'ALLOW' ? false : true;
 	}
 
 	function isEditable()
 	{
-		if($this->isGranted() || !$this->get('member_srl')) return true;
+		if($this->isGranted() || !$this->get('member_srl')) {
+			return true;
+		}
 		return false;
 	}
 
@@ -270,9 +290,14 @@ 
 
 	function doCart()
 	{
-		if(!$this->document_srl) return false;
-		if($this->isCarted()) $this->removeCart();
-		else $this->addCart();
+		if(!$this->document_srl) {
+			return false;
+		}
+		if($this->isCarted()) {
+			$this->removeCart();
+		} else {
+			$this->addCart();
+		}
 	}
 
 	function addCart()
@@ -298,16 +323,26 @@ 
 	 */
 	function notify($type, $content)
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 		// return if it is not useNotify
-		if(!$this->useNotify()) return;
+		if(!$this->useNotify()) {
+			return;
+		}
 		// Pass if an author is not a logged-in user
-		if(!$this->get('member_srl')) return;
+		if(!$this->get('member_srl')) {
+			return;
+		}
 		// Return if the currently logged-in user is an author
 		$logged_info = Context::get('logged_info');
-		if($logged_info->member_srl == $this->get('member_srl')) return;
+		if($logged_info->member_srl == $this->get('member_srl')) {
+			return;
+		}
 		// List variables
-		if($type) $title = "[".$type."] ";
+		if($type) {
+			$title = "[".$type."] ";
+		}
 		$title .= cut_str(strip_tags($content), 10, '...');
 		$content = sprintf('%s<br /><br />from : <a href="%s" target="_blank">%s</a>',$content, getFullUrl('','document_srl',$this->document_srl), getFullUrl('','document_srl',$this->document_srl));
 		$receiver_srl = $this->get('member_srl');
@@ -334,16 +369,22 @@ 
 
 	function isExistsHomepage()
 	{
-		if(trim($this->get('homepage'))) return true;
+		if(trim($this->get('homepage'))) {
+			return true;
+		}
 		return false;
 	}
 
 	function getHomepageUrl()
 	{
 		$url = trim($this->get('homepage'));
-		if(!$url) return;
+		if(!$url) {
+			return;
+		}
 
-		if(strncasecmp('http://', $url, 7) !== 0 && strncasecmp('https://', $url, 8) !== 0)  $url = 'http://' . $url;
+		if(strncasecmp('http://', $url, 7) !== 0 && strncasecmp('https://', $url, 8) !== 0) {
+			$url = 'http://' . $url;
+		}
 
 		return $url;
 	}
@@ -375,43 +416,65 @@ 
 
 	function getTitleText($cut_size = 0, $tail='...')
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 
-		if($cut_size) $title = cut_str($this->get('title'), $cut_size, $tail);
-		else $title = $this->get('title');
+		if($cut_size) {
+			$title = cut_str($this->get('title'), $cut_size, $tail);
+		} else {
+			$title = $this->get('title');
+		}
 
 		return $title;
 	}
 
 	function getTitle($cut_size = 0, $tail='...')
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 
 		$title = $this->getTitleText($cut_size, $tail);
 
 		$attrs = array();
 		$this->add('title_color', trim($this->get('title_color')));
-		if($this->get('title_bold')=='Y') $attrs[] = "font-weight:bold;";
-		if($this->get('title_color') && $this->get('title_color') != 'N') $attrs[] = "color:#".$this->get('title_color');
+		if($this->get('title_bold')=='Y') {
+			$attrs[] = "font-weight:bold;";
+		}
+		if($this->get('title_color') && $this->get('title_color') != 'N') {
+			$attrs[] = "color:#".$this->get('title_color');
+		}
 
-		if(count($attrs)) return sprintf("<span style=\"%s\">%s</span>", implode(';',$attrs), htmlspecialchars($title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
-		else return htmlspecialchars($title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+		if(count($attrs)) {
+			return sprintf("<span style=\"%s\">%s</span>", implode(';',$attrs), htmlspecialchars($title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
+		} else {
+			return htmlspecialchars($title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+		}
 	}
 
 	function getContentText($strlen = 0)
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 
-		if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
+		if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) {
+			return Context::getLang('msg_is_secret');
+		}
 
 		$result = $this->_checkAccessibleFromStatus();
-		if($result) $_SESSION['accessible'][$this->document_srl] = true;
+		if($result) {
+			$_SESSION['accessible'][$this->document_srl] = true;
+		}
 
 		$content = $this->get('content');
 		$content = preg_replace_callback('/<(object|param|embed)[^>]*/is', array($this, '_checkAllowScriptAccess'), $content);
 		$content = preg_replace_callback('/<object[^>]*>/is', array($this, '_addAllowScriptAccess'), $content);
 
-		if($strlen) return cut_str(strip_tags($content),$strlen,'...');
+		if($strlen) {
+			return cut_str(strip_tags($content),$strlen,'...');
+		}
 
 		return htmlspecialchars($content);
 	}
@@ -444,14 +507,12 @@ 
 				}
 				$this->allowscriptaccessList[count($this->allowscriptaccessList)-1]--;
 			}
-		}
-		else if($m[1] == 'embed')
+		} else if($m[1] == 'embed')
 		{
 			if(stripos($m[0], 'allowscriptaccess'))
 			{
 				$m[0] = preg_replace('/always|samedomain/i', 'never', $m[0]);
-			}
-			else
+			} else
 			{
 				$m[0] = preg_replace('/\<embed/i', '<embed allowscriptaccess="never"', $m[0]);
 			}
@@ -461,15 +522,23 @@ 
 
 	function getContent($add_popup_menu = true, $add_content_info = true, $resource_realpath = false, $add_xe_content_class = true, $stripEmbedTagException = false)
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 
-		if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
+		if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) {
+			return Context::getLang('msg_is_secret');
+		}
 
 		$result = $this->_checkAccessibleFromStatus();
-		if($result) $_SESSION['accessible'][$this->document_srl] = true;
+		if($result) {
+			$_SESSION['accessible'][$this->document_srl] = true;
+		}
 
 		$content = $this->get('content');
-		if(!$stripEmbedTagException) stripEmbedTagForAdmin($content, $this->get('member_srl'));
+		if(!$stripEmbedTagException) {
+			stripEmbedTagForAdmin($content, $this->get('member_srl'));
+		}
 
 		// Define a link if using a rewrite module
 		$oContext = &Context::getInstance();
@@ -503,10 +572,11 @@ 
 				$this->document_srl, $memberSrl
 			);
 			// Add xe_content class although accessing content is not required
-		}
-		else
+		} else
 		{
-			if($add_xe_content_class) $content = sprintf('<div class="xe_content">%s</div>', $content);
+			if($add_xe_content_class) {
+				$content = sprintf('<div class="xe_content">%s</div>', $content);
+			}
 		}
 		// Change the image path to a valid absolute path if resource_realpath is true
 		if($resource_realpath)
@@ -625,11 +695,15 @@ 
 
 	function getTrackbackUrl()
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 
 		// Generate a key to prevent spams
 		$oTrackbackModel = getModel('trackback');
-		if($oTrackbackModel) return $oTrackbackModel->getTrackbackUrl($this->document_srl, $this->getDocumentMid());
+		if($oTrackbackModel) {
+			return $oTrackbackModel->getTrackbackUrl($this->document_srl, $this->getDocumentMid());
+		}
 	}
 
 	/**
@@ -648,7 +722,9 @@ 
 
 	function isExtraVarsExists()
 	{
-		if(!$this->get('module_srl')) return false;
+		if(!$this->get('module_srl')) {
+			return false;
+		}
 		$oDocumentModel = getModel('document');
 		$extra_keys = $oDocumentModel->getExtraKeys($this->get('module_srl'));
 		return count($extra_keys)?true:false;
@@ -656,7 +732,9 @@ 
 
 	function getExtraVars()
 	{
-		if(!$this->get('module_srl') || !$this->document_srl) return null;
+		if(!$this->get('module_srl') || !$this->document_srl) {
+			return null;
+		}
 
 		$oDocumentModel = getModel('document');
 		return $oDocumentModel->getExtraVars($this->get('module_srl'), $this->document_srl);
@@ -668,8 +746,7 @@ 
 		if(is_array($extra_vars) && array_key_exists($idx,$extra_vars))
 		{
 			return $extra_vars[$idx]->getValue();
-		}
-		else
+		} else
 		{
 			return '';
 		}
@@ -681,8 +758,7 @@ 
 		if(is_array($extra_vars) && array_key_exists($idx,$extra_vars))
 		{
 			return $extra_vars[$idx]->getValueHTML();
-		}
-		else
+		} else
 		{
 			return '';
 		}
@@ -704,8 +780,7 @@ 
 		if(is_array($extra_eid) && array_key_exists($eid,$extra_eid))
 		{
 			return $extra_eid[$eid]->getValue();
-		}
-		else
+		} else
 		{
 			return '';
 		}
@@ -723,8 +798,7 @@ 
 		if(is_array($extra_eid) && array_key_exists($eid,$extra_eid))
 		{
 			return $extra_eid[$eid]->getValueHTML();
-		}
-		else
+		} else
 		{
 			return '';
 		}
@@ -744,8 +818,12 @@ 
 
 	function getComments()
 	{
-		if(!$this->getCommentCount()) return;
-		if(!$this->isGranted() && $this->isSecret()) return;
+		if(!$this->getCommentCount()) {
+			return;
+		}
+		if(!$this->isGranted() && $this->isSecret()) {
+			return;
+		}
 		// cpage is a number of comment pages
 		$cpageStr = sprintf('%d_cpage', $this->document_srl);
 		$cpage = Context::get($cpageStr);
@@ -758,7 +836,9 @@ 
 		// Get a list of comments
 		$oCommentModel = getModel('comment');
 		$output = $oCommentModel->getCommentList($this->document_srl, $cpage, $is_admin);
-		if(!$output->toBool() || !count($output->data)) return;
+		if(!$output->toBool() || !count($output->data)) {
+			return;
+		}
 		// Create commentItem object from a comment list
 		// If admin priviledge is granted on parent posts, you can read its child posts.
 		$accessible = array();
@@ -768,7 +848,9 @@ 
 			$oCommentItem = new commentItem();
 			$oCommentItem->setAttribute($val);
 			// If permission is granted to the post, you can access it temporarily
-			if($oCommentItem->isGranted()) $accessible[$val->comment_srl] = true;
+			if($oCommentItem->isGranted()) {
+				$accessible[$val->comment_srl] = true;
+			}
 			// If the comment is set to private and it belongs child post, it is allowable to read the comment for who has a admin privilege on its parent post
 			if($val->parent_srl>0 && $val->is_secret == 'Y' && !$oCommentItem->isAccessible() && $accessible[$val->parent_srl]===true)
 			{
@@ -779,7 +861,9 @@ 
 		// Variable setting to be displayed on the skin
 		Context::set($cpageStr, $output->page_navigation->cur_page);
 		Context::set('cpage', $output->page_navigation->cur_page);
-		if($output->total_page>1) $this->comment_page_navigation = $output->page_navigation;
+		if($output->total_page>1) {
+			$this->comment_page_navigation = $output->page_navigation;
+		}
 
 		return $comment_list;
 	}
@@ -791,9 +875,13 @@ 
 
 	function getTrackbacks()
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 
-		if(!$this->allowTrackback() || !$this->get('trackback_count')) return;
+		if(!$this->allowTrackback() || !$this->get('trackback_count')) {
+			return;
+		}
 
 		$oTrackbackModel = getModel('trackback');
 		return $oTrackbackModel->getTrackbackList($this->document_srl, $is_admin);
@@ -801,15 +889,21 @@ 
 
 	function thumbnailExists($width = 80, $height = 0, $type = '')
 	{
-		if(!$this->document_srl) return false;
-		if(!$this->getThumbnail($width, $height, $type)) return false;
+		if(!$this->document_srl) {
+			return false;
+		}
+		if(!$this->getThumbnail($width, $height, $type)) {
+			return false;
+		}
 		return true;
 	}
 
 	function getThumbnail($width = 80, $height = 0, $thumbnail_type = '')
 	{
 		// Return false if the document doesn't exist
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 
 		if($this->isSecret() && !$this->isGranted())
 		{
@@ -817,7 +911,9 @@ 
 		}
 
 		// If not specify its height, create a square
-		if(!$height) $height = $width;
+		if(!$height) {
+			$height = $width;
+		}
 
 		// Return false if neither attachement nor image files in the document
 		$content = $this->get('content');
@@ -835,7 +931,9 @@ 
 				}
 			}
 
-			if(!preg_match("!<img!is", $content)) return;
+			if(!preg_match("!<img!is", $content)) {
+				return;
+			}
 		}
 		// Get thumbnai_type information from document module's configuration
 		if(!in_array($thumbnail_type, array('crop','ratio')))
@@ -862,8 +960,7 @@ 
 			if(filesize($thumbnail_file) < 1)
 			{
 				return FALSE;
-			}
-			else
+			} else
 			{
 				return $thumbnail_url;
 			}
@@ -884,7 +981,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))
 				{
@@ -892,7 +991,9 @@ 
 					break;
 				}
 
-				if($first_image) continue;
+				if($first_image) {
+					continue;
+				}
 
 				if(preg_match("/\.(jpe?g|png|gif|bmp)$/i", $file->source_filename))
 				{
@@ -919,7 +1020,9 @@ 
 			foreach($matches as $target_image)
 			{
 				$target_src = trim($target_image[1]);
-				if(preg_match('/\/(common|modules|widgets|addons|layouts|m\.layouts)\//i', $target_src)) continue;
+				if(preg_match('/\/(common|modules|widgets|addons|layouts|m\.layouts)\//i', $target_src)) {
+					continue;
+				}
 
 				if(!preg_match('/^(http|https):\/\//i',$target_src))
 				{
@@ -930,7 +1033,9 @@ 
 
 				$tmp_file = _XE_PATH_ . 'files/cache/tmp/' . $random->createSecureSalt(32, 'hex');
 				FileHandler::getRemoteFile($target_src, $tmp_file);
-				if(!file_exists($tmp_file)) continue;
+				if(!file_exists($tmp_file)) {
+					continue;
+				}
 
 				$imageinfo = getimagesize($tmp_file);
 				list($_w, $_h) = $imageinfo;
@@ -981,21 +1086,28 @@ 
 	 */
 	function getExtraImages($time_interval = 43200)
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 		// variables for icon list
 		$buffs = array();
 
 		$check_files = false;
 
 		// Check if secret post is
-		if($this->isSecret()) $buffs[] = "secret";
+		if($this->isSecret()) {
+			$buffs[] = "secret";
+		}
 
 		// Set the latest time
 		$time_check = date("YmdHis", $_SERVER['REQUEST_TIME']-$time_interval);
 
 		// Check new post
-		if($this->get('regdate')>$time_check) $buffs[] = "new";
-		else if($this->get('last_update')>$time_check) $buffs[] = "update";
+		if($this->get('regdate')>$time_check) {
+			$buffs[] = "new";
+		} else if($this->get('last_update')>$time_check) {
+			$buffs[] = "update";
+		}
 
 		/*
 		   $content = $this->get('content');
@@ -1018,7 +1130,9 @@ 
 		 */
 
 		// Check the attachment
-		if($this->hasUploadedFiles()) $buffs[] = "file";
+		if($this->hasUploadedFiles()) {
+			$buffs[] = "file";
+		}
 
 		return $buffs;
 	}
@@ -1039,22 +1153,25 @@ 
 	 */
 	function printExtraImages($time_check = 43200)
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 
 		$oDocumentModel = getModel('document');
 		$documentConfig = $oDocumentModel->getDocumentConfig();
 		if(Mobile::isFromMobilePhone())
 		{
 			$iconSkin = $documentConfig->micons;
-		}
-		else
+		} else
 		{
 			$iconSkin = $documentConfig->icons;
 		}
 		$path = sprintf('%s%s',getUrl(), "modules/document/tpl/icons/$iconSkin/");
 
 		$buffs = $this->getExtraImages($time_check);
-		if(!count($buffs)) return;
+		if(!count($buffs)) {
+			return;
+		}
 
 		$buff = array();
 		foreach($buffs as $key => $val)
@@ -1066,18 +1183,28 @@ 
 
 	function hasUploadedFiles()
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 
-		if($this->isSecret() && !$this->isGranted()) return false;
+		if($this->isSecret() && !$this->isGranted()) {
+			return false;
+		}
 		return $this->get('uploaded_count')? true : false;
 	}
 
 	function getUploadedFiles($sortIndex = 'file_srl')
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 
-		if($this->isSecret() && !$this->isGranted()) return;
-		if(!$this->get('uploaded_count')) return;
+		if($this->isSecret() && !$this->isGranted()) {
+			return;
+		}
+		if(!$this->get('uploaded_count')) {
+			return;
+		}
 
 		if(!$this->uploadedFiles[$sortIndex])
 		{
@@ -1095,7 +1222,9 @@ 
 	function getEditor()
 	{
 		$module_srl = $this->get('module_srl');
-		if(!$module_srl) $module_srl = Context::get('module_srl');
+		if(!$module_srl) {
+			$module_srl = Context::get('module_srl');
+		}
 
 		$oEditorModel = getModel('editor');
 		return $oEditorModel->getModuleEditor('document', $module_srl, $this->document_srl, 'document_srl', 'content');
@@ -1109,8 +1238,12 @@ 
 	function isEnableComment()
 	{
 		// Return false if not authorized, if a secret document, if the document is set not to allow any comment
-		if (!$this->allowComment()) return false;
-		if(!$this->isGranted() && $this->isSecret()) return false;
+		if (!$this->allowComment()) {
+			return false;
+		}
+		if(!$this->isGranted() && $this->isSecret()) {
+			return false;
+		}
 
 		return true;
 	}
@@ -1121,7 +1254,9 @@ 
 	 */
 	function getCommentEditor()
 	{
-		if(!$this->isEnableComment()) return;
+		if(!$this->isEnableComment()) {
+			return;
+		}
 
 		$oEditorModel = getModel('editor');
 		return $oEditorModel->getModuleEditor('comment', $this->get('module_srl'), $comment_srl, 'comment_srl', 'content');
@@ -1133,10 +1268,14 @@ 
 	 */
 	function getProfileImage()
 	{
-		if(!$this->isExists() || !$this->get('member_srl')) return;
+		if(!$this->isExists() || !$this->get('member_srl')) {
+			return;
+		}
 		$oMemberModel = getModel('member');
 		$profile_info = $oMemberModel->getProfileImage($this->get('member_srl'));
-		if(!$profile_info) return;
+		if(!$profile_info) {
+			return;
+		}
 
 		return $profile_info->src;
 	}
@@ -1148,7 +1287,9 @@ 
 	function getSignature()
 	{
 		// Pass if a document doesn't exist
-		if(!$this->isExists() || !$this->get('member_srl')) return;
+		if(!$this->isExists() || !$this->get('member_srl')) {
+			return;
+		}
 		// Get signature information
 		$oMemberModel = getModel('member');
 		$signature = $oMemberModel->getSignature($this->get('member_srl'));
@@ -1162,7 +1303,9 @@ 
 		if($signature)
 		{
 			$max_signature_height = $GLOBALS['__member_signature_max_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);
+			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);
+			}
 		}
 
 		return $signature;
@@ -1186,20 +1329,25 @@ 
 	function _checkAccessibleFromStatus()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return true;
+		if($logged_info->is_admin == 'Y') {
+			return true;
+		}
 
 		$status = $this->get('status');
-		if(empty($status)) return false;
+		if(empty($status)) {
+			return false;
+		}
 
 		$oDocumentModel = getModel('document');
 		$configStatusList = $oDocumentModel->getStatusList();
 
-		if($status == $configStatusList['public'] || $status == $configStatusList['publish'])
-			return true;
-		else if($status == $configStatusList['private'] || $status == $configStatusList['secret'])
+		if($status == $configStatusList['public'] || $status == $configStatusList['publish']) {
+					return true;
+		} else if($status == $configStatusList['private'] || $status == $configStatusList['secret'])
 		{
-			if($this->get('member_srl') == $logged_info->member_srl)
-				return true;
+			if($this->get('member_srl') == $logged_info->member_srl) {
+							return true;
+			}
 		}
 		return false;
 	}

modules/editor/editor.controller.php

Doc Comments +1 added lines

@@ -238,6 +238,7 @@
 
 	/**
 	 * @brief AutoSave
+	 * @param stdClass $args
 	 */
 	function doSaveDoc($args)
 	{

Spacing +76 added lines, -76 removed lines

@@ -47,28 +47,28 @@ 
 	{
 		$component = Context::get('component');
 		$method = Context::get('method');
-		if(!$component) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		if (!$component) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
 
 		$oEditorModel = getModel('editor');
 		$oComponent = &$oEditorModel->getComponentObject($component);
-		if(!$oComponent->toBool()) return $oComponent;
+		if (!$oComponent->toBool()) return $oComponent;
 
-		if(!method_exists($oComponent, $method)) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		if (!method_exists($oComponent, $method)) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
 
 		//$output = call_user_method($method, $oComponent);
 		//$output = call_user_func(array($oComponent, $method));
-		if(method_exists($oComponent, $method)) $output = $oComponent->{$method}();
-		else return new BaseObject(-1,sprintf('%s method is not exists', $method));
+		if (method_exists($oComponent, $method)) $output = $oComponent->{$method}();
+		else return new BaseObject(-1, sprintf('%s method is not exists', $method));
 
-		if((is_a($output, 'BaseObject') || is_subclass_of($output, 'BaseObject')) && !$output->toBool()) return $output;
+		if ((is_a($output, 'BaseObject') || is_subclass_of($output, 'BaseObject')) && !$output->toBool()) return $output;
 
 		$this->setError($oComponent->getError());
 		$this->setMessage($oComponent->getMessage());
 
 		$vars = $oComponent->getVariables();
-		if(count($vars))
+		if (count($vars))
 		{
-			foreach($vars as $key => $val)
+			foreach ($vars as $key => $val)
 			{
 				$this->add($key, $val);
 			}
@@ -86,18 +86,18 @@ 
 		$module_srl = array();
 		$oModuleModel = getModel('module');
 
-		foreach($target_module_srl as $srl)
+		foreach ($target_module_srl as $srl)
 		{
-			if(!$srl) continue;
+			if (!$srl) continue;
 
 			$module_info = $oModuleModel->getModuleInfoByModuleSrl($srl);
-			if(!$module_info->module_srl)
+			if (!$module_info->module_srl)
 			{
 				return new BaseObject(-1, 'msg_invalid_request');
 			}
 
 			$module_grant = $oModuleModel->getGrant($module_info, $logged_info);
-			if(!$module_grant->manager)
+			if (!$module_grant->manager)
 			{
 				return new BaseObject(-1, 'msg_not_permitted');
 			}
@@ -111,32 +111,32 @@ 
 		$editor_config->content_style = Context::get('content_style');
 		$editor_config->comment_content_style = Context::get('comment_content_style');
 		$editor_config->content_font = Context::get('content_font');
-		if($editor_config->content_font)
+		if ($editor_config->content_font)
 		{
 			$font_list = array();
-			$fonts = explode(',',$editor_config->content_font);
-			for($i=0,$c=count($fonts);$i<$c;$i++)
+			$fonts = explode(',', $editor_config->content_font);
+			for ($i = 0, $c = count($fonts); $i < $c; $i++)
 			{
-				$font = trim(str_replace(array('"','\''),'',$fonts[$i]));
-				if(!$font) continue;
+				$font = trim(str_replace(array('"', '\''), '', $fonts[$i]));
+				if (!$font) continue;
 				$font_list[] = $font;
 			}
-			if(count($font_list)) $editor_config->content_font = '"'.implode('","',$font_list).'"';
+			if (count($font_list)) $editor_config->content_font = '"'.implode('","', $font_list).'"';
 		}
 		$editor_config->content_font_size = Context::get('content_font_size');
 		$editor_config->sel_editor_colorset = Context::get('sel_editor_colorset');
 		$editor_config->sel_comment_editor_colorset = Context::get('sel_comment_editor_colorset');
 
-		$grants = array('enable_html_grant','enable_comment_html_grant','upload_file_grant','comment_upload_file_grant','enable_default_component_grant','enable_comment_default_component_grant','enable_component_grant','enable_comment_component_grant');
+		$grants = array('enable_html_grant', 'enable_comment_html_grant', 'upload_file_grant', 'comment_upload_file_grant', 'enable_default_component_grant', 'enable_comment_default_component_grant', 'enable_component_grant', 'enable_comment_component_grant');
 
-		foreach($grants as $key)
+		foreach ($grants as $key)
 		{
 			$grant = Context::get($key);
-			if(!$grant)
+			if (!$grant)
 			{
 				$editor_config->{$key} = array();
 			}
-			else if(is_array($grant))
+			else if (is_array($grant))
 			{
 				$editor_config->{$key} = $grant;
 			}
@@ -146,13 +146,13 @@ 
 			}
 		}
 
-		$editor_config->editor_height = (int)Context::get('editor_height');
-		$editor_config->comment_editor_height = (int)Context::get('comment_editor_height');
+		$editor_config->editor_height = (int) Context::get('editor_height');
+		$editor_config->comment_editor_height = (int) Context::get('comment_editor_height');
 		$editor_config->enable_autosave = Context::get('enable_autosave');
-		if($editor_config->enable_autosave != 'Y') $editor_config->enable_autosave = 'N';
+		if ($editor_config->enable_autosave != 'Y') $editor_config->enable_autosave = 'N';
 
 		$oModuleController = getController('module');
-		foreach($module_srl as $srl)
+		foreach ($module_srl as $srl)
 		{
 			$oModuleController->insertModulePartConfig('editor', $srl, $editor_config);
 		}
@@ -169,31 +169,31 @@ 
 	 */
 	function triggerEditorComponentCompile(&$content)
 	{
-		if(Context::getResponseMethod()!='HTML') return new BaseObject();
+		if (Context::getResponseMethod() != 'HTML') return new BaseObject();
 
 		$module_info = Context::get('module_info');
 		$module_srl = $module_info->module_srl;
-		if($module_srl)
+		if ($module_srl)
 		{
 			$oEditorModel = getModel('editor');
 			$editor_config = $oEditorModel->getEditorConfig($module_srl);
 			$content_style = $editor_config->content_style;
-			if($content_style)
+			if ($content_style)
 			{
-				$path = _XE_PATH_ . 'modules/editor/styles/'.$content_style.'/';
-				if(is_dir($path) && file_exists($path . 'style.ini'))
+				$path = _XE_PATH_.'modules/editor/styles/'.$content_style.'/';
+				if (is_dir($path) && file_exists($path.'style.ini'))
 				{
 					$ini = file($path.'style.ini');
-					for($i = 0, $c = count($ini); $i < $c; $i++)
+					for ($i = 0, $c = count($ini); $i < $c; $i++)
 					{
 						$file = trim($ini[$i]);
-						if(!$file) continue;
+						if (!$file) continue;
 
-						if(substr_compare($file, '.css', -4) === 0)
+						if (substr_compare($file, '.css', -4) === 0)
 						{
 							Context::addCSSFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
 						}
-						elseif(substr_compare($file, '.js', -3) === 0)
+						elseif (substr_compare($file, '.js', -3) === 0)
 						{
 							Context::addJsFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
 						}
@@ -202,12 +202,12 @@ 
 			}
 			$content_font = $editor_config->content_font;
 			$content_font_size = $editor_config->content_font_size;
-			if($content_font || $content_font_size)
+			if ($content_font || $content_font_size)
 			{
 				$buff = array();
 				$buff[] = '<style> .xe_content { ';
-				if($content_font) $buff[] = 'font-family:'.$content_font.';';
-				if($content_font_size) $buff[] = 'font-size:'.$content_font_size.';';
+				if ($content_font) $buff[] = 'font-family:'.$content_font.';';
+				if ($content_font_size) $buff[] = 'font-size:'.$content_font_size.';';
 				$buff[] = ' }</style>';
 				Context::addHtmlHeader(implode('', $buff));
 			}
@@ -222,7 +222,7 @@ 
 	 */
 	function transComponent($content)
 	{
-		$content = preg_replace_callback('!<(?:(div)|img)([^>]*)editor_component=([^>]*)>(?(1)(.*?)</div>)!is', array($this,'transEditorComponent'), $content);
+		$content = preg_replace_callback('!<(?:(div)|img)([^>]*)editor_component=([^>]*)>(?(1)(.*?)</div>)!is', array($this, 'transEditorComponent'), $content);
 		return $content;
 	}
 
@@ -237,19 +237,19 @@ 
 
 		$xml_obj = new stdClass;
 		$xml_obj->attrs = new stdClass;
-		for($i=0,$c=count($m[0]);$i<$c;$i++)
+		for ($i = 0, $c = count($m[0]); $i < $c; $i++)
 		{
-			if(!isset($xml_obj->attrs)) $xml_obj->attrs = new stdClass;
+			if (!isset($xml_obj->attrs)) $xml_obj->attrs = new stdClass;
 			$xml_obj->attrs->{$m[1][$i]} = $m[2][$i];
 		}
 		$xml_obj->body = $match[4];
 
-		if(!$xml_obj->attrs->editor_component) return $match[0];
+		if (!$xml_obj->attrs->editor_component) return $match[0];
 
 		// Get converted codes by using component::transHTML()
 		$oEditorModel = getModel('editor');
 		$oComponent = &$oEditorModel->getComponentObject($xml_obj->attrs->editor_component, 0);
-		if(!is_object($oComponent)||!method_exists($oComponent, 'transHTML')) return $match[0];
+		if (!is_object($oComponent) || !method_exists($oComponent, 'transHTML')) return $match[0];
 
 		return $oComponent->transHTML($xml_obj);
 	}
@@ -259,8 +259,8 @@ 
 	 */
 	function doSaveDoc($args)
 	{
-		if(!$args->document_srl) $args->document_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
-		if(Context::get('is_logged'))
+		if (!$args->document_srl) $args->document_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if (Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
@@ -271,11 +271,11 @@ 
 		}
 
 		// Get the current module if module_srl doesn't exist
-		if(!$args->module_srl)
+		if (!$args->module_srl)
 		{
 			$args->module_srl = Context::get('module_srl');
 		}
-		if(!$args->module_srl)
+		if (!$args->module_srl)
 		{
 			$current_module_info = Context::get('current_module_info');
 			$args->module_srl = $current_module_info->module_srl;
@@ -321,7 +321,7 @@ 
 	function deleteSavedDoc($mode = false)
 	{
 		$args = new stdClass();
-		if(Context::get('is_logged'))
+		if (Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
@@ -332,7 +332,7 @@ 
 		}
 		$args->module_srl = Context::get('module_srl');
 		// Get the current module if module_srl doesn't exist
-		if(!$args->module_srl)
+		if (!$args->module_srl)
 		{
 			$current_module_info = Context::get('current_module_info');
 			$args->module_srl = $current_module_info->module_srl;
@@ -340,13 +340,13 @@ 
 		// Check if the auto-saved document already exists
 		$output = executeQuery('editor.getSavedDocument', $args);
 		$saved_doc = $output->data;
-		if(!$saved_doc) return;
+		if (!$saved_doc) return;
 
 		$oDocumentModel = getModel('document');
 		$oSaved = $oDocumentModel->getDocument($saved_doc->document_srl);
-		if(!$oSaved->isExists())
+		if (!$oSaved->isExists())
 		{
-			if($mode)
+			if ($mode)
 			{
 				$output = executeQuery('editor.getSavedDocument', $args);
 				$output = ModuleHandler::triggerCall('editor.deleteSavedDoc', 'after', $saved_doc);
@@ -374,9 +374,9 @@ 
 		$oEditorModel = getModel('editor');
 		$args = new stdClass;
 
-		if($filter_enabled) $args->enabled = "Y";
+		if ($filter_enabled) $args->enabled = "Y";
 
-		if($site_srl)
+		if ($site_srl)
 		{
 			$args->site_srl = $site_srl;
 			$output = executeQuery('editor.getSiteComponentList', $args);
@@ -389,10 +389,10 @@ 
 
 		// Get information about log-in status and its group
 		$is_logged = Context::get('is_logged');
-		if($is_logged)
+		if ($is_logged)
 		{
 			$logged_info = Context::get('logged_info');
-			if($logged_info->group_list && is_array($logged_info->group_list))
+			if ($logged_info->group_list && is_array($logged_info->group_list))
 			{
 				$group_list = array_keys($logged_info->group_list);
 			}
@@ -400,30 +400,30 @@ 
 		}
 
 		// Get xml information for looping DB list
-		if(!is_array($db_list)) $db_list = array($db_list);
+		if (!is_array($db_list)) $db_list = array($db_list);
 		$component_list = new stdClass();
-		foreach($db_list as $component)
+		foreach ($db_list as $component)
 		{
-			if(in_array($component->component_name, array('colorpicker_text','colorpicker_bg'))) continue;
+			if (in_array($component->component_name, array('colorpicker_text', 'colorpicker_bg'))) continue;
 
 			$component_name = $component->component_name;
-			if(!$component_name) continue;
+			if (!$component_name) continue;
 
-			if(!in_array($component_name, $downloaded_list)) continue;
+			if (!in_array($component_name, $downloaded_list)) continue;
 
 			unset($xml_info);
 			$xml_info = $oEditorModel->getComponentXmlInfo($component_name);
 			$xml_info->enabled = $component->enabled;
 
-			if($component->extra_vars)
+			if ($component->extra_vars)
 			{
 				$extra_vars = unserialize($component->extra_vars);
-				if($extra_vars->target_group)
+				if ($extra_vars->target_group)
 				{
 					$xml_info->target_group = $extra_vars->target_group;
 				}
 
-				if($extra_vars->mid_list && count($extra_vars->mid_list))
+				if ($extra_vars->mid_list && count($extra_vars->mid_list))
 				{
 					$xml_info->mid_list = $extra_vars->mid_list;
 				}
@@ -450,9 +450,9 @@ 
 				if(!in_array(Context::get('mid'), $extra_vars->mid_list)) continue;
 				}*/
 				// Check the configuration of the editor component
-				if($xml_info->extra_vars)
+				if ($xml_info->extra_vars)
 				{
-					foreach($xml_info->extra_vars as $key => $val)
+					foreach ($xml_info->extra_vars as $key => $val)
 					{
 						$xml_info->extra_vars->{$key}->value = $extra_vars->{$key};
 					}
@@ -463,25 +463,25 @@ 
 			// Get buttons, icons, images
 			$icon_file = _XE_PATH_.'modules/editor/components/'.$component_name.'/icon.gif';
 			$component_icon_file = _XE_PATH_.'modules/editor/components/'.$component_name.'/component_icon.gif';
-			if(file_exists($icon_file)) $component_list->{$component_name}->icon = true;
-			if(file_exists($component_icon_file)) $component_list->{$component_name}->component_icon = true;
+			if (file_exists($icon_file)) $component_list->{$component_name}->icon = true;
+			if (file_exists($component_icon_file)) $component_list->{$component_name}->component_icon = true;
 		}
 
 		// Return if it checks enabled only
-		if($filter_enabled)
+		if ($filter_enabled)
 		{
 			$cache_file = $oEditorModel->getCacheFile($filter_enabled, $site_srl);
-			$buff = sprintf('<?php if(!defined("__XE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"','\\"',serialize($component_list)));
+			$buff = sprintf('<?php if(!defined("__XE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"', '\\"', serialize($component_list)));
 			FileHandler::writeFile($cache_file, $buff);
 			return $component_list;
 		}
 
 		// Get xml_info of downloaded list
-		foreach($downloaded_list as $component_name)
+		foreach ($downloaded_list as $component_name)
 		{
-			if(in_array($component_name, array('colorpicker_text','colorpicker_bg'))) continue;
+			if (in_array($component_name, array('colorpicker_text', 'colorpicker_bg'))) continue;
 			// Pass if configured
-			if($component_list->{$component_name}) continue;
+			if ($component_list->{$component_name}) continue;
 			// Insert data into the DB
 			$oEditorController = getAdminController('editor');
 			$oEditorController->insertComponent($component_name, false, $site_srl);
@@ -494,7 +494,7 @@ 
 		}
 
 		$cache_file = $oEditorModel->getCacheFile($filter_enabled, $site_srl);
-		$buff = sprintf('<?php if(!defined("__XE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"','\\"',serialize($component_list)));
+		$buff = sprintf('<?php if(!defined("__XE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"', '\\"', serialize($component_list)));
 		FileHandler::writeFile($cache_file, $buff);
 
 		return $component_list;
@@ -516,9 +516,9 @@ 
 		$editorConfig = $oModuleModel->getModulePartConfig('editor', $obj->originModuleSrl);
 
 		$oModuleController = getController('module');
-		if(is_array($obj->moduleSrlList))
+		if (is_array($obj->moduleSrlList))
 		{
-			foreach($obj->moduleSrlList AS $key=>$moduleSrl)
+			foreach ($obj->moduleSrlList AS $key=>$moduleSrl)
 			{
 				$oModuleController->insertModulePartConfig('editor', $moduleSrl, $editorConfig);
 			}

Braces +92 added lines, -40 removed lines

@@ -47,20 +47,31 @@ 
 	{
 		$component = Context::get('component');
 		$method = Context::get('method');
-		if(!$component) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		if(!$component) {
+			return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		}
 
 		$oEditorModel = getModel('editor');
 		$oComponent = &$oEditorModel->getComponentObject($component);
-		if(!$oComponent->toBool()) return $oComponent;
+		if(!$oComponent->toBool()) {
+			return $oComponent;
+		}
 
-		if(!method_exists($oComponent, $method)) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		if(!method_exists($oComponent, $method)) {
+			return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		}
 
 		//$output = call_user_method($method, $oComponent);
 		//$output = call_user_func(array($oComponent, $method));
-		if(method_exists($oComponent, $method)) $output = $oComponent->{$method}();
-		else return new BaseObject(-1,sprintf('%s method is not exists', $method));
+		if(method_exists($oComponent, $method)) {
+			$output = $oComponent->{$method}();
+		} else {
+			return new BaseObject(-1,sprintf('%s method is not exists', $method));
+		}
 
-		if((is_a($output, 'BaseObject') || is_subclass_of($output, 'BaseObject')) && !$output->toBool()) return $output;
+		if((is_a($output, 'BaseObject') || is_subclass_of($output, 'BaseObject')) && !$output->toBool()) {
+			return $output;
+		}
 
 		$this->setError($oComponent->getError());
 		$this->setMessage($oComponent->getMessage());
@@ -88,7 +99,9 @@ 
 
 		foreach($target_module_srl as $srl)
 		{
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 
 			$module_info = $oModuleModel->getModuleInfoByModuleSrl($srl);
 			if(!$module_info->module_srl)
@@ -118,10 +131,14 @@ 
 			for($i=0,$c=count($fonts);$i<$c;$i++)
 			{
 				$font = trim(str_replace(array('"','\''),'',$fonts[$i]));
-				if(!$font) continue;
+				if(!$font) {
+					continue;
+				}
 				$font_list[] = $font;
 			}
-			if(count($font_list)) $editor_config->content_font = '"'.implode('","',$font_list).'"';
+			if(count($font_list)) {
+				$editor_config->content_font = '"'.implode('","',$font_list).'"';
+			}
 		}
 		$editor_config->content_font_size = Context::get('content_font_size');
 		$editor_config->sel_editor_colorset = Context::get('sel_editor_colorset');
@@ -135,12 +152,10 @@ 
 			if(!$grant)
 			{
 				$editor_config->{$key} = array();
-			}
-			else if(is_array($grant))
+			} else if(is_array($grant))
 			{
 				$editor_config->{$key} = $grant;
-			}
-			else
+			} else
 			{
 				$editor_config->{$key} = explode('|@|', $grant);
 			}
@@ -149,7 +164,9 @@ 
 		$editor_config->editor_height = (int)Context::get('editor_height');
 		$editor_config->comment_editor_height = (int)Context::get('comment_editor_height');
 		$editor_config->enable_autosave = Context::get('enable_autosave');
-		if($editor_config->enable_autosave != 'Y') $editor_config->enable_autosave = 'N';
+		if($editor_config->enable_autosave != 'Y') {
+			$editor_config->enable_autosave = 'N';
+		}
 
 		$oModuleController = getController('module');
 		foreach($module_srl as $srl)
@@ -169,7 +186,9 @@ 
 	 */
 	function triggerEditorComponentCompile(&$content)
 	{
-		if(Context::getResponseMethod()!='HTML') return new BaseObject();
+		if(Context::getResponseMethod()!='HTML') {
+			return new BaseObject();
+		}
 
 		$module_info = Context::get('module_info');
 		$module_srl = $module_info->module_srl;
@@ -187,13 +206,14 @@ 
 					for($i = 0, $c = count($ini); $i < $c; $i++)
 					{
 						$file = trim($ini[$i]);
-						if(!$file) continue;
+						if(!$file) {
+							continue;
+						}
 
 						if(substr_compare($file, '.css', -4) === 0)
 						{
 							Context::addCSSFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
-						}
-						elseif(substr_compare($file, '.js', -3) === 0)
+						} elseif(substr_compare($file, '.js', -3) === 0)
 						{
 							Context::addJsFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
 						}
@@ -206,8 +226,12 @@ 
 			{
 				$buff = array();
 				$buff[] = '<style> .xe_content { ';
-				if($content_font) $buff[] = 'font-family:'.$content_font.';';
-				if($content_font_size) $buff[] = 'font-size:'.$content_font_size.';';
+				if($content_font) {
+					$buff[] = 'font-family:'.$content_font.';';
+				}
+				if($content_font_size) {
+					$buff[] = 'font-size:'.$content_font_size.';';
+				}
 				$buff[] = ' }</style>';
 				Context::addHtmlHeader(implode('', $buff));
 			}
@@ -239,17 +263,23 @@ 
 		$xml_obj->attrs = new stdClass;
 		for($i=0,$c=count($m[0]);$i<$c;$i++)
 		{
-			if(!isset($xml_obj->attrs)) $xml_obj->attrs = new stdClass;
+			if(!isset($xml_obj->attrs)) {
+				$xml_obj->attrs = new stdClass;
+			}
 			$xml_obj->attrs->{$m[1][$i]} = $m[2][$i];
 		}
 		$xml_obj->body = $match[4];
 
-		if(!$xml_obj->attrs->editor_component) return $match[0];
+		if(!$xml_obj->attrs->editor_component) {
+			return $match[0];
+		}
 
 		// Get converted codes by using component::transHTML()
 		$oEditorModel = getModel('editor');
 		$oComponent = &$oEditorModel->getComponentObject($xml_obj->attrs->editor_component, 0);
-		if(!is_object($oComponent)||!method_exists($oComponent, 'transHTML')) return $match[0];
+		if(!is_object($oComponent)||!method_exists($oComponent, 'transHTML')) {
+			return $match[0];
+		}
 
 		return $oComponent->transHTML($xml_obj);
 	}
@@ -259,13 +289,14 @@ 
 	 */
 	function doSaveDoc($args)
 	{
-		if(!$args->document_srl) $args->document_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if(!$args->document_srl) {
+			$args->document_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		}
 		if(Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
-		}
-		else
+		} else
 		{
 			$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 		}
@@ -325,8 +356,7 @@ 
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
-		}
-		else
+		} else
 		{
 			$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 		}
@@ -340,7 +370,9 @@ 
 		// Check if the auto-saved document already exists
 		$output = executeQuery('editor.getSavedDocument', $args);
 		$saved_doc = $output->data;
-		if(!$saved_doc) return;
+		if(!$saved_doc) {
+			return;
+		}
 
 		$oDocumentModel = getModel('document');
 		$oSaved = $oDocumentModel->getDocument($saved_doc->document_srl);
@@ -374,14 +406,17 @@ 
 		$oEditorModel = getModel('editor');
 		$args = new stdClass;
 
-		if($filter_enabled) $args->enabled = "Y";
+		if($filter_enabled) {
+			$args->enabled = "Y";
+		}
 
 		if($site_srl)
 		{
 			$args->site_srl = $site_srl;
 			$output = executeQuery('editor.getSiteComponentList', $args);
+		} else {
+			$output = executeQuery('editor.getComponentList', $args);
 		}
-		else $output = executeQuery('editor.getComponentList', $args);
 		$db_list = $output->data;
 
 		// Get a list of files
@@ -395,21 +430,30 @@ 
 			if($logged_info->group_list && is_array($logged_info->group_list))
 			{
 				$group_list = array_keys($logged_info->group_list);
+			} else {
+				$group_list = array();
 			}
-			else $group_list = array();
 		}
 
 		// Get xml information for looping DB list
-		if(!is_array($db_list)) $db_list = array($db_list);
+		if(!is_array($db_list)) {
+			$db_list = array($db_list);
+		}
 		$component_list = new stdClass();
 		foreach($db_list as $component)
 		{
-			if(in_array($component->component_name, array('colorpicker_text','colorpicker_bg'))) continue;
+			if(in_array($component->component_name, array('colorpicker_text','colorpicker_bg'))) {
+				continue;
+			}
 
 			$component_name = $component->component_name;
-			if(!$component_name) continue;
+			if(!$component_name) {
+				continue;
+			}
 
-			if(!in_array($component_name, $downloaded_list)) continue;
+			if(!in_array($component_name, $downloaded_list)) {
+				continue;
+			}
 
 			unset($xml_info);
 			$xml_info = $oEditorModel->getComponentXmlInfo($component_name);
@@ -463,8 +507,12 @@ 
 			// Get buttons, icons, images
 			$icon_file = _XE_PATH_.'modules/editor/components/'.$component_name.'/icon.gif';
 			$component_icon_file = _XE_PATH_.'modules/editor/components/'.$component_name.'/component_icon.gif';
-			if(file_exists($icon_file)) $component_list->{$component_name}->icon = true;
-			if(file_exists($component_icon_file)) $component_list->{$component_name}->component_icon = true;
+			if(file_exists($icon_file)) {
+				$component_list->{$component_name}->icon = true;
+			}
+			if(file_exists($component_icon_file)) {
+				$component_list->{$component_name}->component_icon = true;
+			}
 		}
 
 		// Return if it checks enabled only
@@ -479,9 +527,13 @@ 
 		// Get xml_info of downloaded list
 		foreach($downloaded_list as $component_name)
 		{
-			if(in_array($component_name, array('colorpicker_text','colorpicker_bg'))) continue;
+			if(in_array($component_name, array('colorpicker_text','colorpicker_bg'))) {
+				continue;
+			}
 			// Pass if configured
-			if($component_list->{$component_name}) continue;
+			if($component_list->{$component_name}) {
+				continue;
+			}
 			// Insert data into the DB
 			$oEditorController = getAdminController('editor');
 			$oEditorController->insertComponent($component_name, false, $site_srl);

modules/file/file.admin.model.php

Doc Comments +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
 	 * Make search parameters from object(private)
 	 *
 	 * @param object $obj Original searach options
-	 * @param object $args Result searach options
+	 * @param stdClass $args Result searach options
 	 * @return void
 	 */
 	function _makeSearchParam(&$obj, &$args)

Spacing +22 added lines, -22 removed lines

@@ -68,28 +68,28 @@ 
 		$this->_makeSearchParam($obj, $args);
 
 		// Set valid/invalid state
-		if($obj->isvalid == 'Y') $args->isvalid = 'Y';
-		elseif($obj->isvalid == 'N') $args->isvalid = 'N';
+		if ($obj->isvalid == 'Y') $args->isvalid = 'Y';
+		elseif ($obj->isvalid == 'N') $args->isvalid = 'N';
 		// Set multimedia/common file
-		if($obj->direct_download == 'Y') $args->direct_download = 'Y';
-		elseif($obj->direct_download == 'N') $args->direct_download= 'N';
+		if ($obj->direct_download == 'Y') $args->direct_download = 'Y';
+		elseif ($obj->direct_download == 'N') $args->direct_download = 'N';
 		// Set variables
 		$args->sort_index = $obj->sort_index;
-		$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->s_module_srl = $obj->module_srl;
 		$args->exclude_module_srl = $obj->exclude_module_srl;
 		// Execute the file.getFileList query
 		$output = executeQuery('file.getFileList', $args, $columnList);
 		// Return if no result or an error occurs
-		if(!$output->toBool()||!count($output->data)) return $output;
+		if (!$output->toBool() || !count($output->data)) return $output;
 
 		$oFileModel = getModel('file');
 
-		foreach($output->data as $key => $file)
+		foreach ($output->data as $key => $file)
 		{
-			if($_SESSION['file_management'][$file->file_srl]) $file->isCarted = true;
+			if ($_SESSION['file_management'][$file->file_srl]) $file->isCarted = true;
 			else $file->isCarted = false;
 
 			$file->download_url = $oFileModel->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
@@ -132,10 +132,10 @@ 
 	 */
 	function getFilesCountByDate($date = '')
 	{
-		if($date) $args->regDate = date('Ymd', strtotime($date));
+		if ($date) $args->regDate = date('Ymd', strtotime($date));
 
 		$output = executeQuery('file.getFilesCount', $args);
-		if(!$output->toBool()) return 0;
+		if (!$output->toBool()) return 0;
 
 		return $output->data->count;
 	}
@@ -150,31 +150,31 @@ 
 	function _makeSearchParam(&$obj, &$args)
 	{
 		// 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'));
+		$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 'filename' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_filename = $search_keyword;
 					break;
 				case 'filesize_more' :
-					$args->s_filesize_more = (int)$search_keyword;
+					$args->s_filesize_more = (int) $search_keyword;
 					break;
 				case 'filesize_mega_more' :
-					$args->s_filesize_more = (int)$search_keyword * 1024 * 1024;
+					$args->s_filesize_more = (int) $search_keyword * 1024 * 1024;
 					break;
 				case 'filesize_less' :
-					$args->s_filesize_less = (int)$search_keyword;
+					$args->s_filesize_less = (int) $search_keyword;
 					break;
 				case 'filesize_mega_less' :
-					$args->s_filesize_less = (int)$search_keyword * 1024 * 1024;
+					$args->s_filesize_less = (int) $search_keyword * 1024 * 1024;
 					break;
 				case 'download_count' :
-					$args->s_download_count = (int)$search_keyword;
+					$args->s_download_count = (int) $search_keyword;
 					break;
 				case 'regdate' :
 					$args->s_regdate = $search_keyword;

Braces +27 added lines, -10 removed lines

@@ -68,11 +68,17 @@ 
 		$this->_makeSearchParam($obj, $args);
 
 		// Set valid/invalid state
-		if($obj->isvalid == 'Y') $args->isvalid = 'Y';
-		elseif($obj->isvalid == 'N') $args->isvalid = 'N';
+		if($obj->isvalid == 'Y') {
+			$args->isvalid = 'Y';
+		} elseif($obj->isvalid == 'N') {
+			$args->isvalid = 'N';
+		}
 		// Set multimedia/common file
-		if($obj->direct_download == 'Y') $args->direct_download = 'Y';
-		elseif($obj->direct_download == 'N') $args->direct_download= 'N';
+		if($obj->direct_download == 'Y') {
+			$args->direct_download = 'Y';
+		} elseif($obj->direct_download == 'N') {
+			$args->direct_download= 'N';
+		}
 		// Set variables
 		$args->sort_index = $obj->sort_index;
 		$args->page = $obj->page?$obj->page:1;
@@ -83,14 +89,19 @@ 
 		// Execute the file.getFileList query
 		$output = executeQuery('file.getFileList', $args, $columnList);
 		// Return if no result or an error occurs
-		if(!$output->toBool()||!count($output->data)) return $output;
+		if(!$output->toBool()||!count($output->data)) {
+			return $output;
+		}
 
 		$oFileModel = getModel('file');
 
 		foreach($output->data as $key => $file)
 		{
-			if($_SESSION['file_management'][$file->file_srl]) $file->isCarted = true;
-			else $file->isCarted = false;
+			if($_SESSION['file_management'][$file->file_srl]) {
+				$file->isCarted = true;
+			} else {
+				$file->isCarted = false;
+			}
 
 			$file->download_url = $oFileModel->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
 			$output->data[$key] = $file;
@@ -132,10 +143,14 @@ 
 	 */
 	function getFilesCountByDate($date = '')
 	{
-		if($date) $args->regDate = date('Ymd', strtotime($date));
+		if($date) {
+			$args->regDate = date('Ymd', strtotime($date));
+		}
 
 		$output = executeQuery('file.getFilesCount', $args);
-		if(!$output->toBool()) return 0;
+		if(!$output->toBool()) {
+			return 0;
+		}
 
 		return $output->data->count;
 	}
@@ -158,7 +173,9 @@ 
 			switch($search_target)
 			{
 				case 'filename' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_filename = $search_keyword;
 					break;
 				case 'filesize_more' :

modules/importer/extract.class.php

Doc Comments +6 added lines

@@ -216,6 +216,7 @@ 
 
 	/**
 	 * Merge item
+	 * @param string $filename
 	 * @return void
 	 */
 	function mergeItems($filename)
@@ -310,6 +311,11 @@ 
 		return $this->key;
 	}
 
+	/**
+	 * @param string $str
+	 *
+	 * @return string
+	 */
 	function _addTagCRTail($str) {
 		$str = preg_replace('/<\/([^>]*)></i', "</$1>\r\n<", $str);
 		return $str;

Spacing +39 added lines, -39 removed lines

@@ -99,7 +99,7 @@ 
 		$this->filename = $filename;
 
 		$this->startTag = $startTag;
-		if($endTag) $this->endTag = $endTag;
+		if ($endTag) $this->endTag = $endTag;
 		$this->itemStartTag = $itemTag;
 		$this->itemEndTag = $itemEndTag;
 
@@ -108,7 +108,7 @@ 
 		$this->cache_path = './files/cache/importer/'.$this->key;
 		$this->cache_index_file = $this->cache_path.'/index';
 
-		if(!is_dir($this->cache_path)) FileHandler::makeDir($this->cache_path);
+		if (!is_dir($this->cache_path)) FileHandler::makeDir($this->cache_path);
 
 		return $this->openFile();
 	}
@@ -120,55 +120,55 @@ 
 	function openFile()
 	{
 		FileHandler::removeFile($this->cache_index_file);
-		$this->index_fd = fopen($this->cache_index_file,"a");
+		$this->index_fd = fopen($this->cache_index_file, "a");
 		// If local file
-		if(strncasecmp('http://', $this->filename, 7) !== 0)
+		if (strncasecmp('http://', $this->filename, 7) !== 0)
 		{
-			if(!file_exists($this->filename)) return new BaseObject(-1,'msg_no_xml_file');
-			$this->fd = fopen($this->filename,"r");
+			if (!file_exists($this->filename)) return new BaseObject(-1, 'msg_no_xml_file');
+			$this->fd = fopen($this->filename, "r");
 			// If remote file
 		}
 		else
 		{
 			$url_info = parse_url($this->filename);
-			if(!$url_info['port']) $url_info['port'] = 80;
-			if(!$url_info['path']) $url_info['path'] = '/';
+			if (!$url_info['port']) $url_info['port'] = 80;
+			if (!$url_info['path']) $url_info['path'] = '/';
 
 			$this->fd = @fsockopen($url_info['host'], $url_info['port']);
-			if(!$this->fd) return new BaseObject(-1,'msg_no_xml_file');
+			if (!$this->fd) return new BaseObject(-1, 'msg_no_xml_file');
 			// If the file name contains Korean, do urlencode(iconv required)
 			$path = $url_info['path'];
-			if(preg_match('/[\xEA-\xED][\x80-\xFF]{2}/', $path)&&function_exists('iconv'))
+			if (preg_match('/[\xEA-\xED][\x80-\xFF]{2}/', $path) && function_exists('iconv'))
 			{
-				$path_list = explode('/',$path);
+				$path_list = explode('/', $path);
 				$cnt = count($path_list);
-				$filename = $path_list[$cnt-1];
-				$filename = urlencode(iconv("UTF-8","EUC-KR",$filename));
-				$path_list[$cnt-1] = $filename;
-				$path = implode('/',$path_list);
+				$filename = $path_list[$cnt - 1];
+				$filename = urlencode(iconv("UTF-8", "EUC-KR", $filename));
+				$path_list[$cnt - 1] = $filename;
+				$path = implode('/', $path_list);
 				$url_info['path'] = $path;
 			}
 
 			$header = sprintf("GET %s?%s HTTP/1.0\r\nHost: %s\r\nReferer: %s://%s\r\nConnection: Close\r\n\r\n", $url_info['path'], $url_info['query'], $url_info['host'], $url_info['scheme'], $url_info['host']);
 			@fwrite($this->fd, $header);
 			$buff = '';
-			while(!feof($this->fd))
+			while (!feof($this->fd))
 			{
 				$buff .= $str = fgets($this->fd, 1024);
-				if(!trim($str)) break;
+				if (!trim($str)) break;
 			}
-			if(preg_match('/404 Not Found/i',$buff)) return new BaseObject(-1,'msg_no_xml_file');
+			if (preg_match('/404 Not Found/i', $buff)) return new BaseObject(-1, 'msg_no_xml_file');
 		}
 
-		if($this->startTag)
+		if ($this->startTag)
 		{
-			while(!feof($this->fd))
+			while (!feof($this->fd))
 			{
 				$str = fgets($this->fd, 1024);
 				$pos = strpos($str, $this->startTag);
-				if($pos !== false)
+				if ($pos !== false)
 				{
-					$this->buff = substr($this->buff, $pos+strlen($this->startTag));
+					$this->buff = substr($this->buff, $pos + strlen($this->startTag));
 					$this->isStarted = true;
 					$this->isFinished = false;
 					break;
@@ -208,7 +208,7 @@ 
 	{
 		FileHandler::removeDir($this->cache_path.$this->key);
 		$this->index = 0;
-		while(!$this->isFinished())
+		while (!$this->isFinished())
 		{
 			$this->getItem();
 		}
@@ -224,14 +224,14 @@ 
 
 		$filename = sprintf('%s/%s', $this->cache_path, $filename);
 
-		$index_fd = fopen($this->cache_index_file,"r");
-		$fd = fopen($filename,'w');
+		$index_fd = fopen($this->cache_index_file, "r");
+		$fd = fopen($filename, 'w');
 
 		fwrite($fd, '<items>');
-		while(!feof($index_fd))
+		while (!feof($index_fd))
 		{
-			$target_file = trim(fgets($index_fd,1024));
-			if(!file_exists($target_file)) continue;
+			$target_file = trim(fgets($index_fd, 1024));
+			if (!file_exists($target_file)) continue;
 			$buff = FileHandler::readFile($target_file);
 			fwrite($fd, FileHandler::readFile($target_file));
 
@@ -247,21 +247,21 @@ 
 	 */
 	function getItem()
 	{
-		if($this->isFinished()) return;
+		if ($this->isFinished()) return;
 
-		while(!feof($this->fd))
+		while (!feof($this->fd))
 		{
 			$startPos = strpos($this->buff, $this->itemStartTag);
-			if($startPos !== false)
+			if ($startPos !== false)
 			{
 				$this->buff = substr($this->buff, $startPos);
-				$this->buff = preg_replace("/\>/",">\r\n",$this->buff,1);
+				$this->buff = preg_replace("/\>/", ">\r\n", $this->buff, 1);
 				break;
 			}
-			elseif($this->endTag)
+			elseif ($this->endTag)
 			{
 				$endPos = strpos($this->buff, $this->endTag);
-				if($endPos !== false)
+				if ($endPos !== false)
 				{
 					$this->closeFile();
 					return;
@@ -271,21 +271,21 @@ 
 		}
 
 		$startPos = strpos($this->buff, $this->itemStartTag);
-		if($startPos === false)
+		if ($startPos === false)
 		{
 			$this->closeFile();
 			return;
 		}
 
-		$filename = sprintf('%s/%s.xml',$this->cache_path, $this->index++);
+		$filename = sprintf('%s/%s.xml', $this->cache_path, $this->index++);
 		fwrite($this->index_fd, $filename."\r\n");
 
-		$fd = fopen($filename,'w');
+		$fd = fopen($filename, 'w');
 
-		while(!feof($this->fd))
+		while (!feof($this->fd))
 		{
 			$endPos = strpos($this->buff, $this->itemEndTag);
-			if($endPos !== false)
+			if ($endPos !== false)
 			{
 				$endPos += strlen($this->itemEndTag);
 				$buff = substr($this->buff, 0, $endPos);

Braces +33 added lines, -16 removed lines

@@ -99,7 +99,9 @@ 
 		$this->filename = $filename;
 
 		$this->startTag = $startTag;
-		if($endTag) $this->endTag = $endTag;
+		if($endTag) {
+			$this->endTag = $endTag;
+		}
 		$this->itemStartTag = $itemTag;
 		$this->itemEndTag = $itemEndTag;
 
@@ -108,7 +110,9 @@ 
 		$this->cache_path = './files/cache/importer/'.$this->key;
 		$this->cache_index_file = $this->cache_path.'/index';
 
-		if(!is_dir($this->cache_path)) FileHandler::makeDir($this->cache_path);
+		if(!is_dir($this->cache_path)) {
+			FileHandler::makeDir($this->cache_path);
+		}
 
 		return $this->openFile();
 	}
@@ -124,18 +128,25 @@ 
 		// If local file
 		if(strncasecmp('http://', $this->filename, 7) !== 0)
 		{
-			if(!file_exists($this->filename)) return new BaseObject(-1,'msg_no_xml_file');
+			if(!file_exists($this->filename)) {
+				return new BaseObject(-1,'msg_no_xml_file');
+			}
 			$this->fd = fopen($this->filename,"r");
 			// If remote file
-		}
-		else
+		} else
 		{
 			$url_info = parse_url($this->filename);
-			if(!$url_info['port']) $url_info['port'] = 80;
-			if(!$url_info['path']) $url_info['path'] = '/';
+			if(!$url_info['port']) {
+				$url_info['port'] = 80;
+			}
+			if(!$url_info['path']) {
+				$url_info['path'] = '/';
+			}
 
 			$this->fd = @fsockopen($url_info['host'], $url_info['port']);
-			if(!$this->fd) return new BaseObject(-1,'msg_no_xml_file');
+			if(!$this->fd) {
+				return new BaseObject(-1,'msg_no_xml_file');
+			}
 			// If the file name contains Korean, do urlencode(iconv required)
 			$path = $url_info['path'];
 			if(preg_match('/[\xEA-\xED][\x80-\xFF]{2}/', $path)&&function_exists('iconv'))
@@ -155,9 +166,13 @@ 
 			while(!feof($this->fd))
 			{
 				$buff .= $str = fgets($this->fd, 1024);
-				if(!trim($str)) break;
+				if(!trim($str)) {
+					break;
+				}
+			}
+			if(preg_match('/404 Not Found/i',$buff)) {
+				return new BaseObject(-1,'msg_no_xml_file');
 			}
-			if(preg_match('/404 Not Found/i',$buff)) return new BaseObject(-1,'msg_no_xml_file');
 		}
 
 		if($this->startTag)
@@ -174,8 +189,7 @@ 
 					break;
 				}
 			}
-		}
-		else
+		} else
 		{
 			$this->isStarted = true;
 			$this->isFinished = false;
@@ -231,7 +245,9 @@ 
 		while(!feof($index_fd))
 		{
 			$target_file = trim(fgets($index_fd,1024));
-			if(!file_exists($target_file)) continue;
+			if(!file_exists($target_file)) {
+				continue;
+			}
 			$buff = FileHandler::readFile($target_file);
 			fwrite($fd, FileHandler::readFile($target_file));
 
@@ -247,7 +263,9 @@ 
 	 */
 	function getItem()
 	{
-		if($this->isFinished()) return;
+		if($this->isFinished()) {
+			return;
+		}
 
 		while(!feof($this->fd))
 		{
@@ -257,8 +275,7 @@ 
 				$this->buff = substr($this->buff, $startPos);
 				$this->buff = preg_replace("/\>/",">\r\n",$this->buff,1);
 				break;
-			}
-			elseif($this->endTag)
+			} elseif($this->endTag)
 			{
 				$endPos = strpos($this->buff, $this->endTag);
 				if($endPos !== false)

modules/importer/ttimport.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -450,7 +450,7 @@
 	 * @param int $upload_target_srl
 	 * @param array $files
 	 * @param string $buff
-	 * @return bool
+	 * @return null|boolean
 	 */
 	function importAttaches($fp, $module_srl, $upload_target_srl, &$files, $buff)
 	{

Braces +153 added lines, -71 removed lines

@@ -40,7 +40,9 @@ 
 		$oDocumentModel = getModel('document');
 		$category_list = $category_titles = array();
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
-		if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+		if(count($category_list)) {
+			foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+		}
 		// First handle categorty information
 		$category_file = preg_replace('/index$/i', 'category.xml', $index_file);
 		if(file_exists($category_file))
@@ -58,15 +60,21 @@ 
 				foreach($categories as $k => $v)
 				{
 					$category = $v->name;
-					if(!$category || $category_titles[$category]) continue;
+					if(!$category || $category_titles[$category]) {
+						continue;
+					}
 
 					$obj = null;
 					$obj->title = $category;
 					$obj->module_srl = $module_srl; 
-					if($v->parent) $obj->parent_srl = $match_sequence[$v->parent];
+					if($v->parent) {
+						$obj->parent_srl = $match_sequence[$v->parent];
+					}
 					$output = $oDocumentController->insertCategory($obj);
 
-					if($output->toBool()) $match_sequence[$v->sequence] = $category_titles[$category] = $output->get('category_srl');
+					if($output->toBool()) {
+						$match_sequence[$v->sequence] = $category_titles[$category] = $output->get('category_srl');
+					}
 				}
 				$oDocumentController->makeCategoryFile($module_srl);
 			}
@@ -74,28 +82,40 @@ 
 		}
 		$category_list = $category_titles = array();
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
-		if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+		if(count($category_list)) {
+			foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+		}
 		// Get administrator information
 		$oMemberModel = getModel('member');
 		$member_info = $oMemberModel->getMemberInfoByUserID($user_id);
 		$author_xml_id = 0;
 
-		if(!$cur) $cur = 0;
+		if(!$cur) {
+			$cur = 0;
+		}
 		// Open an index file
 		$f = fopen($index_file,"r");
 		// Pass if already read
-		for($i=0;$i<$cur;$i++) fgets($f, 1024);
+		for($i=0;$i<$cur;$i++) {
+			fgets($f, 1024);
+		}
 		// Read each line until the codition meets
 		for($idx=$cur;$idx<$cur+$unit_count;$idx++)
 		{
-			if(feof($f)) break;
+			if(feof($f)) {
+				break;
+			}
 			// Find a location
 			$target_file = trim(fgets($f, 1024));
 
-			if(!file_exists($target_file)) continue;
+			if(!file_exists($target_file)) {
+				continue;
+			}
 			// Start importing data
 			$fp = fopen($target_file,"r");
-			if(!$fp) continue;
+			if(!$fp) {
+				continue;
+			}
 
 			$obj = null;
 			$obj->module_srl = $module_srl;
@@ -116,14 +136,17 @@ 
 					$started = true;
 					continue;
 					// Import the attachment
-				}
-				else if(substr($str,0,12) == '<attachment ')
+				} else if(substr($str,0,12) == '<attachment ')
 				{
-					if($this->importAttaches($fp, $module_srl, $obj->document_srl, $files, $str)) $obj->uploaded_count++;
+					if($this->importAttaches($fp, $module_srl, $obj->document_srl, $files, $str)) {
+						$obj->uploaded_count++;
+					}
 					continue;
 				}
 
-				if($started) $buff .= $str;
+				if($started) {
+					$buff .= $str;
+				}
 			}
 
 			$xmlDoc = $this->oXmlParser->parse('<post>'.$buff);
@@ -134,7 +157,9 @@ 
 			{
 				$tmp_arr = explode('/',$xmlDoc->post->category->body);
 				$category = trim($tmp_arr[count($tmp_arr)-1]);
-				if($category_titles[$category]) $obj->category_srl = $category_titles[$category];
+				if($category_titles[$category]) {
+					$obj->category_srl = $category_titles[$category];
+				}
 			}
 
 			$obj->is_notice = 'N';
@@ -148,15 +173,21 @@ 
 			//$obj->allow_trackback = $xmlDoc->post->acceptTrackback->body=='1'?'Y':'N';
 			$obj->regdate = date("YmdHis",$xmlDoc->post->published->body);
 			$obj->last_update = date("YmdHis", $xmlDoc->post->modified->body);
-			if(!$obj->last_update) $obj->last_update = $obj->regdate;
+			if(!$obj->last_update) {
+				$obj->last_update = $obj->regdate;
+			}
 
 			$tag = null;
 			$tmp_tags = null;
 			$tag = $xmlDoc->post->tag;
 			if($tag)
 			{
-				if(!is_array($tag)) $tag = array($tag);
-				foreach($tag as $key => $val) $tmp_tags[] = $val->body;
+				if(!is_array($tag)) {
+					$tag = array($tag);
+				}
+				foreach($tag as $key => $val) {
+					$tmp_tags[] = $val->body;
+				}
 				$obj->tags = implode(',',$tmp_tags);
 			}
 
@@ -192,7 +223,9 @@ 
 			if($xmlDoc->post->trackback)
 			{
 				$trackbacks = $xmlDoc->post->trackback;
-				if(!is_array($trackbacks)) $trackbacks = array($trackbacks);
+				if(!is_array($trackbacks)) {
+					$trackbacks = array($trackbacks);
+				}
 				if(count($trackbacks))
 				{
 					foreach($trackbacks as $key => $val)
@@ -209,7 +242,9 @@ 
 						$tobj->ipaddress = $val->ip->body;
 						$tobj->list_order = -1*$tobj->trackback_srl;
 						$output = executeQuery('trackback.insertTrackback', $tobj);
-						if($output->toBool()) $obj->trackback_count++;
+						if($output->toBool()) {
+							$obj->trackback_count++;
+						}
 					}
 				}
 			}
@@ -218,21 +253,29 @@ 
 			if($xmlDoc->post->comment)
 			{
 				$comment = $xmlDoc->post->comment;
-				if(!is_array($comment)) $comment = array($comment);
+				if(!is_array($comment)) {
+					$comment = array($comment);
+				}
 				foreach($comment as $key => $val)
 				{
 					$parent_srl = $this->insertComment($val, $module_srl, $obj->document_srl, $member_info, 0, $author_xml_id);
-					if($parent_srl === false) continue;
+					if($parent_srl === false) {
+						continue;
+					}
 
 					$obj->comment_count++;
 					if($val->comment)
 					{
 						$child_comment = $val->comment;
-						if(!is_array($child_comment)) $child_comment = array($child_comment);
+						if(!is_array($child_comment)) {
+							$child_comment = array($child_comment);
+						}
 						foreach($child_comment as $k => $v)
 						{
 							$result = $this->insertComment($v, $module_srl, $obj->document_srl, $member_info, $parent_srl, $author_xml_id);
-							if($result !== false) $obj->comment_count++;
+							if($result !== false) {
+								$obj->comment_count++;
+							}
 						}
 					}
 				}
@@ -270,7 +313,9 @@ 
 						$args->document_srl = $obj->document_srl;
 						$args->tag = trim($tag_list[$i]);
 						$args->regdate = $obj->regdate;
-						if(!$args->tag) continue;
+						if(!$args->tag) {
+							continue;
+						}
 						$output = executeQuery('tag.insertTag', $args);
 					}
 				}
@@ -282,7 +327,9 @@ 
 
 		fclose($f);
 
-		if(count($category_list)) foreach($category_list as $key => $val) $oDocumentController->updateCategoryCount($module_srl, $val->category_srl);
+		if(count($category_list)) {
+			foreach($category_list as $key => $val) $oDocumentController->updateCategoryCount($module_srl, $val->category_srl);
+		}
 		// Guestbook information
 		$guestbook_file = preg_replace('/index$/i', 'guestbook.xml', $index_file);
 		if(file_exists($guestbook_file))
@@ -293,7 +340,9 @@ 
 			if($guestbook_module_srl && $xmlDoc->guestbook->comment)
 			{
 				$comment = $xmlDoc->guestbook->comment;
-				if(!is_array($comment)) $comment = array($comment);
+				if(!is_array($comment)) {
+					$comment = array($comment);
+				}
 
 				if($module_name =='textyle')
 				{
@@ -304,7 +353,9 @@ 
 						if($val->comment)
 						{
 							$child_comment = $val->comment;
-							if(!is_array($child_comment)) $child_comment = array($child_comment);
+							if(!is_array($child_comment)) {
+								$child_comment = array($child_comment);
+							}
 							foreach($child_comment as $k => $v)
 							{
 								$result = $this->insertTextyleGuestbookItem($v, $module_srl, $member_info,0,$textyle_guestbook_srl,$author_xml_id);
@@ -313,8 +364,7 @@ 
 
 						$result = $this->insertTextyleGuestbookItem($val, $module_srl, $member_info,$textyle_guestbook_srl,0,$author_xml_id);
 					}
-				}
-				else
+				} else
 				{
 					foreach($comment as $key => $val)
 					{
@@ -328,13 +378,17 @@ 
 
 						// Extract a title form the bocy
 						$obj->title = cut_str(strip_tags($obj->content),20,'...');
-						if ($obj->title == '') $obj->title = 'Untitled';
+						if ($obj->title == '') {
+							$obj->title = 'Untitled';
+						}
 
 						$obj->commentStatus = 'ALLOW';
 						$obj->allow_trackback = 'N';
 						$obj->regdate = date("YmdHis",$val->written->body);
 						$obj->last_update = date("YmdHis", $val->written->body);
-						if(!$obj->last_update) $obj->last_update = $obj->regdate;
+						if(!$obj->last_update) {
+							$obj->last_update = $obj->regdate;
+						}
 						$obj->tags = '';
 						$obj->readed_count = 0;
 						$obj->voted_count = 0;
@@ -347,8 +401,7 @@ 
 							$obj->member_srl = $member_info->member_srl;
 							$obj->email_address = $member_info->email_address;
 							$obj->homepage = $member_info->homepage;
-						}
-						else
+						} else
 						{
 							$obj->password = $val->password->body;
 							$obj->nick_name = $val->commenter->name->body;
@@ -364,11 +417,15 @@ 
 						if($val->comment)
 						{
 							$child_comment = $val->comment;
-							if(!is_array($child_comment)) $child_comment = array($child_comment);
+							if(!is_array($child_comment)) {
+								$child_comment = array($child_comment);
+							}
 							foreach($child_comment as $k => $v)
 							{
 								$result = $this->insertComment($v, $module_srl, $obj->document_srl, $member_info, 0,$author_xml_id);
-								if($result !== false) $obj->comment_count++;
+								if($result !== false) {
+									$obj->comment_count++;
+								}
 							}
 						}
 
@@ -399,8 +456,7 @@ 
 		if($textyle_guestbook_srl>0)
 		{
 			$tobj->textyle_guestbook_srl = $textyle_guestbook_srl;
-		}
-		else
+		} else
 		{
 			$tobj->textyle_guestbook_srl = getNextSequence();
 		}
@@ -416,8 +472,7 @@ 
 			$tobj->member_srl = $member_info->member_srl;
 			$tobj->homepage = $member_info->homepage;
 			$tobj->email_address = $member_info->email_address;
-		}
-		else
+		} else
 		{
 			$tobj->password = $val->password->body;
 			$tobj->nick_name = $val->commenter->name->body;
@@ -431,15 +486,16 @@ 
 		{
 			$tobj->parent_srl = $parent_srl;
 			$tobj->list_order = $tobj->parent_srl * -1;
-		}
-		else
+		} else
 		{
 			$tobj->list_order = $tobj->textyle_guestbook_srl*-1;
 		}
 
 		$output = executeQuery('textyle.insertTextyleGuestbook', $tobj);
 
-		if($output->toBool()) return $tobj->textyle_guestbook_srl;
+		if($output->toBool()) {
+			return $tobj->textyle_guestbook_srl;
+		}
 		return false;
 	}
 
@@ -465,7 +521,9 @@ 
 		{
 			$str = fgets($fp, 1024);
 			// If it ends with </attaches>, break
-			if(trim($str) == '</attachment>') break;
+			if(trim($str) == '</attachment>') {
+				break;
+			}
 			// If it starts with <file>, handle the attachement in the xml file
 			if(substr($str, 0, 9)=='<content>')
 			{
@@ -475,7 +533,9 @@ 
 
 			$buff .= $str;
 		}
-		if(!file_exists($file_obj->file)) return false;
+		if(!file_exists($file_obj->file)) {
+			return false;
+		}
 
 		$buff .= '</attachment>';
 
@@ -490,15 +550,16 @@ 
 			$path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3));
 			$filename = $path.$file_obj->source_filename;
 			$file_obj->direct_download = 'Y';
-		}
-		else
+		} else
 		{
 			$path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl,3));
 			$filename = $path.md5(crypt(rand(1000000,900000), rand(0,100)));
 			$file_obj->direct_download = 'N';
 		}
 		// Create a directory
-		if(!FileHandler::makeDir($path)) return;
+		if(!FileHandler::makeDir($path)) {
+			return;
+		}
 
 		FileHandler::rename($file_obj->file, $filename);
 		// Insert to the DB
@@ -515,8 +576,11 @@ 
 		{
 			$uploaded_count++;
 			$tmp_obj = null;
-			if($file_obj->direct_download == 'Y') $files[$name]->url = $file_obj->uploaded_filename; 
-			else $files[$name]->url = getUrl('','module','file','act','procFileDownload','file_srl',$file_obj->file_srl,'sid',$file_obj->sid);
+			if($file_obj->direct_download == 'Y') {
+				$files[$name]->url = $file_obj->uploaded_filename;
+			} else {
+				$files[$name]->url = getUrl('','module','file','act','procFileDownload','file_srl',$file_obj->file_srl,'sid',$file_obj->sid);
+			}
 			$files[$name]->direct_download = $file_obj->direct_download;
 			$files[$name]->source_filename = $file_obj->source_filename;
 			return true;
@@ -532,9 +596,13 @@ 
 	function getTmpFilename()
 	{
 		$path = "./files/cache/importer";
-		if(!is_dir($path)) FileHandler::makeDir($path);
+		if(!is_dir($path)) {
+			FileHandler::makeDir($path);
+		}
 		$filename = sprintf("%s/%d", $path, rand(11111111,99999999));
-		if(file_exists($filename)) $filename .= rand(111,999);
+		if(file_exists($filename)) {
+			$filename .= rand(111,999);
+		}
 		return $filename;
 	}
 
@@ -553,7 +621,9 @@ 
 		{
 			$str = trim(fgets($fp, 1024));
 			$buff .= $str;
-			if(substr($str, -10) == '</content>') break;
+			if(substr($str, -10) == '</content>') {
+				break;
+			}
 		}
 
 		$buff = substr($buff, 0, -10);
@@ -572,7 +642,9 @@ 
 	function _replaceTTAttach($matches)
 	{
 		$name = $matches[2];
-		if(!$name) return $matches[0];
+		if(!$name) {
+			return $matches[0];
+		}
 
 		$obj = $this->files[$name];
 		// If multimedia file is,
@@ -583,14 +655,12 @@ 
 			{
 				return sprintf('<img editor_component="image_link" src="%s" alt="%s" />', $obj->url, str_replace('"','\\"',$matches[4]));
 				// If other multimedia file but image is, 
-			}
-			else
+			} else
 			{
 				return sprintf('<img src="./common/img/blank.gif" editor_component="multimedia_link" multimedia_src="%s" width="400" height="320" style="display:block;width:400px;height:320px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center;" auto_start="false" alt="" />', $obj->url);
 			}
 			// If binary file is
-		}
-		else
+		} else
 		{
 			return sprintf('<a href="%s">%s</a>', $obj->url, $obj->source_filename);
 		}
@@ -603,7 +673,9 @@ 
 	function _replaceTTMovie($matches)
 	{
 		$key = $matches[1];
-		if(!$key) return $matches[0];
+		if(!$key) {
+			return $matches[0];
+		}
 
 		return 
 			'<object type="application/x-shockwave-flash" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="100%" height="402">'.
@@ -645,8 +717,7 @@ 
 			$tobj->member_srl = $member_info->member_srl;
 			$tobj->homepage = $member_info->homepage;
 			$tobj->email_address = $member_info->email_address;
-		}
-		else
+		} else
 		{
 			$tobj->password = $val->password->body;
 			$tobj->nick_name = $val->commenter->name->body;
@@ -670,24 +741,28 @@ 
 			$list_args->head = $list_args->arrange = $tobj->comment_srl;
 			$list_args->depth = 0;
 			// Get parent_srl if parent comment exists
-		}
-		else
+		} else
 		{
 			// Get parent_srl
 			$parent_args->comment_srl = $tobj->parent_srl;
 			$parent_output = executeQuery('comment.getCommentListItem', $parent_args);
 			// Return if parent comment doesn't exist
-			if(!$parent_output->toBool() || !$parent_output->data) return false;
+			if(!$parent_output->toBool() || !$parent_output->data) {
+				return false;
+			}
 			$parent = $parent_output->data;
 
 			$list_args->head = $parent->head;
 			$list_args->depth = $parent->depth+1;
-			if($list_args->depth<2) $list_args->arrange = $tobj->comment_srl;
-			else
+			if($list_args->depth<2) {
+				$list_args->arrange = $tobj->comment_srl;
+			} else
 			{
 				$list_args->arrange = $parent->arrange;
 				$output = executeQuery('comment.updateCommentListArrange', $list_args);
-				if(!$output->toBool()) return $output;
+				if(!$output->toBool()) {
+					return $output;
+				}
 			}
 		}
 
@@ -695,7 +770,9 @@ 
 		if($output->toBool())
 		{
 			$output = executeQuery('comment.insertComment', $tobj);
-			if($output->toBool()) return $tobj->comment_srl;
+			if($output->toBool()) {
+				return $tobj->comment_srl;
+			}
 		}
 		return false;
 	}
@@ -710,9 +787,14 @@ 
 	 */
 	function arrangeCategory($obj, &$category, &$idx, $parent = 0)
 	{
-		if(!$obj->category) return;
-		if(!is_array($obj->category)) $c = array($obj->category);
-		else $c = $obj->category;
+		if(!$obj->category) {
+			return;
+		}
+		if(!is_array($obj->category)) {
+			$c = array($obj->category);
+		} else {
+			$c = $obj->category;
+		}
 		foreach($c as $val)
 		{
 			$idx++;

Spacing +134 added lines, -134 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param string $module_name
 	 * @return int
 	 */
-	function importModule($key, $cur, $index_file, $unit_count, $module_srl, $guestbook_module_srl, $user_id, $module_name=null)
+	function importModule($key, $cur, $index_file, $unit_count, $module_srl, $guestbook_module_srl, $user_id, $module_name = null)
 	{
 		// Pre-create the objects needed
 		$this->oXmlParser = new XmlParser();
@@ -40,33 +40,33 @@ 
 		$oDocumentModel = getModel('document');
 		$category_list = $category_titles = array();
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
-		if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+		if (count($category_list)) foreach ($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
 		// First handle categorty information
 		$category_file = preg_replace('/index$/i', 'category.xml', $index_file);
-		if(file_exists($category_file))
+		if (file_exists($category_file))
 		{
 			// Create the xmlParser object
 			$xmlDoc = $this->oXmlParser->loadXmlFile($category_file);
 			// List category information
-			if($xmlDoc->categories->category)
+			if ($xmlDoc->categories->category)
 			{
 				$categories = array();
 				$idx = 0;
 				$this->arrangeCategory($xmlDoc->categories, $categories, $idx, 0);
 
 				$match_sequence = array();
-				foreach($categories as $k => $v)
+				foreach ($categories as $k => $v)
 				{
 					$category = $v->name;
-					if(!$category || $category_titles[$category]) continue;
+					if (!$category || $category_titles[$category]) continue;
 
 					$obj = null;
 					$obj->title = $category;
 					$obj->module_srl = $module_srl; 
-					if($v->parent) $obj->parent_srl = $match_sequence[$v->parent];
+					if ($v->parent) $obj->parent_srl = $match_sequence[$v->parent];
 					$output = $oDocumentController->insertCategory($obj);
 
-					if($output->toBool()) $match_sequence[$v->sequence] = $category_titles[$category] = $output->get('category_srl');
+					if ($output->toBool()) $match_sequence[$v->sequence] = $category_titles[$category] = $output->get('category_srl');
 				}
 				$oDocumentController->makeCategoryFile($module_srl);
 			}
@@ -74,28 +74,28 @@ 
 		}
 		$category_list = $category_titles = array();
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
-		if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+		if (count($category_list)) foreach ($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
 		// Get administrator information
 		$oMemberModel = getModel('member');
 		$member_info = $oMemberModel->getMemberInfoByUserID($user_id);
 		$author_xml_id = 0;
 
-		if(!$cur) $cur = 0;
+		if (!$cur) $cur = 0;
 		// Open an index file
-		$f = fopen($index_file,"r");
+		$f = fopen($index_file, "r");
 		// Pass if already read
-		for($i=0;$i<$cur;$i++) fgets($f, 1024);
+		for ($i = 0; $i < $cur; $i++) fgets($f, 1024);
 		// Read each line until the codition meets
-		for($idx=$cur;$idx<$cur+$unit_count;$idx++)
+		for ($idx = $cur; $idx < $cur + $unit_count; $idx++)
 		{
-			if(feof($f)) break;
+			if (feof($f)) break;
 			// Find a location
 			$target_file = trim(fgets($f, 1024));
 
-			if(!file_exists($target_file)) continue;
+			if (!file_exists($target_file)) continue;
 			// Start importing data
-			$fp = fopen($target_file,"r");
-			if(!$fp) continue;
+			$fp = fopen($target_file, "r");
+			if (!$fp) continue;
 
 			$obj = null;
 			$obj->module_srl = $module_srl;
@@ -107,57 +107,57 @@ 
 			$started = false;
 			$buff = null;
 			// Start importing from the body data
-			while(!feof($fp))
+			while (!feof($fp))
 			{
 				$str = fgets($fp, 1024);
 				// Prepare an item
-				if(substr($str,0,5) == '<post')
+				if (substr($str, 0, 5) == '<post')
 				{
 					$started = true;
 					continue;
 					// Import the attachment
 				}
-				else if(substr($str,0,12) == '<attachment ')
+				else if (substr($str, 0, 12) == '<attachment ')
 				{
-					if($this->importAttaches($fp, $module_srl, $obj->document_srl, $files, $str)) $obj->uploaded_count++;
+					if ($this->importAttaches($fp, $module_srl, $obj->document_srl, $files, $str)) $obj->uploaded_count++;
 					continue;
 				}
 
-				if($started) $buff .= $str;
+				if ($started) $buff .= $str;
 			}
 
 			$xmlDoc = $this->oXmlParser->parse('<post>'.$buff);
 
 			$author_xml_id = $xmlDoc->post->author->body;
 
-			if($xmlDoc->post->category->body)
+			if ($xmlDoc->post->category->body)
 			{
-				$tmp_arr = explode('/',$xmlDoc->post->category->body);
-				$category = trim($tmp_arr[count($tmp_arr)-1]);
-				if($category_titles[$category]) $obj->category_srl = $category_titles[$category];
+				$tmp_arr = explode('/', $xmlDoc->post->category->body);
+				$category = trim($tmp_arr[count($tmp_arr) - 1]);
+				if ($category_titles[$category]) $obj->category_srl = $category_titles[$category];
 			}
 
 			$obj->is_notice = 'N';
-			$obj->status = in_array($xmlDoc->post->visibility->body, array('public','syndicated'))?$oDocumentModel->getConfigStatus('public'):$oDocumentModel->getConfigStatus('secret');
+			$obj->status = in_array($xmlDoc->post->visibility->body, array('public', 'syndicated')) ? $oDocumentModel->getConfigStatus('public') : $oDocumentModel->getConfigStatus('secret');
 			$obj->title = $xmlDoc->post->title->body;
 			$obj->content = $xmlDoc->post->content->body;
 			$obj->password = md5($xmlDoc->post->password->body);
-			$obj->commentStatus = $xmlDoc->post->acceptcomment->body=='1'?'ALLOW':'DENY';
-			$obj->allow_trackback = $xmlDoc->post->accepttrackback->body=='1'?'Y':'N';
+			$obj->commentStatus = $xmlDoc->post->acceptcomment->body == '1' ? 'ALLOW' : 'DENY';
+			$obj->allow_trackback = $xmlDoc->post->accepttrackback->body == '1' ? 'Y' : 'N';
 			//$obj->allow_comment = $xmlDoc->post->acceptComment->body=='1'?'Y':'N';
 			//$obj->allow_trackback = $xmlDoc->post->acceptTrackback->body=='1'?'Y':'N';
-			$obj->regdate = date("YmdHis",$xmlDoc->post->published->body);
+			$obj->regdate = date("YmdHis", $xmlDoc->post->published->body);
 			$obj->last_update = date("YmdHis", $xmlDoc->post->modified->body);
-			if(!$obj->last_update) $obj->last_update = $obj->regdate;
+			if (!$obj->last_update) $obj->last_update = $obj->regdate;
 
 			$tag = null;
 			$tmp_tags = null;
 			$tag = $xmlDoc->post->tag;
-			if($tag)
+			if ($tag)
 			{
-				if(!is_array($tag)) $tag = array($tag);
-				foreach($tag as $key => $val) $tmp_tags[] = $val->body;
-				$obj->tags = implode(',',$tmp_tags);
+				if (!is_array($tag)) $tag = array($tag);
+				foreach ($tag as $key => $val) $tmp_tags[] = $val->body;
+				$obj->tags = implode(',', $tmp_tags);
 			}
 
 			$obj->readed_count = 0;
@@ -169,33 +169,33 @@ 
 			$obj->email_address = $member_info->email_address;
 			$obj->homepage = $member_info->homepage;
 			$obj->ipaddress = $_REMOTE['SERVER_ADDR'];
-			$obj->list_order = $obj->update_order = $obj->document_srl*-1;
+			$obj->list_order = $obj->update_order = $obj->document_srl * -1;
 			$obj->notify_message = 'N';
 			// Change content information (attachment)
-			$obj->content = str_replace('[##_ATTACH_PATH_##]/','',$obj->content);
-			if(count($files))
+			$obj->content = str_replace('[##_ATTACH_PATH_##]/', '', $obj->content);
+			if (count($files))
 			{
-				foreach($files as $key => $val) {
-					$obj->content = preg_replace('/(src|href)\=(["\']?)'.preg_quote($key).'(["\']?)/i','$1="'.$val->url.'"',$obj->content);
+				foreach ($files as $key => $val) {
+					$obj->content = preg_replace('/(src|href)\=(["\']?)'.preg_quote($key).'(["\']?)/i', '$1="'.$val->url.'"', $obj->content);
 				}
 			}
 
 			$obj->content = preg_replace_callback('!\[##_Movie\|([^\|]*)\|(.*?)_##\]!is', array($this, '_replaceTTMovie'), $obj->content);
 
-			if(count($files))
+			if (count($files))
 			{
 				$this->files = $files;
 				$obj->content = preg_replace_callback('!\[##_([a-z0-9]+)\|([^\|]*)\|([^\|]*)\|(.*?)_##\]!is', array($this, '_replaceTTAttach'), $obj->content);
 			}
 			// Trackback inserted
 			$obj->trackback_count = 0;
-			if($xmlDoc->post->trackback)
+			if ($xmlDoc->post->trackback)
 			{
 				$trackbacks = $xmlDoc->post->trackback;
-				if(!is_array($trackbacks)) $trackbacks = array($trackbacks);
-				if(count($trackbacks))
+				if (!is_array($trackbacks)) $trackbacks = array($trackbacks);
+				if (count($trackbacks))
 				{
-					foreach($trackbacks as $key => $val)
+					foreach ($trackbacks as $key => $val)
 					{
 						$tobj = null;
 						$tobj->trackback_srl = getNextSequence();
@@ -205,40 +205,40 @@ 
 						$tobj->title = $val->title->body;
 						$tobj->blog_name = $val->site->body;
 						$tobj->excerpt = $val->excerpt->body;
-						$tobj->regdate = date("YmdHis",$val->received->body);
+						$tobj->regdate = date("YmdHis", $val->received->body);
 						$tobj->ipaddress = $val->ip->body;
-						$tobj->list_order = -1*$tobj->trackback_srl;
+						$tobj->list_order = -1 * $tobj->trackback_srl;
 						$output = executeQuery('trackback.insertTrackback', $tobj);
-						if($output->toBool()) $obj->trackback_count++;
+						if ($output->toBool()) $obj->trackback_count++;
 					}
 				}
 			}
 			// Comment
 			$obj->comment_count = 0;
-			if($xmlDoc->post->comment)
+			if ($xmlDoc->post->comment)
 			{
 				$comment = $xmlDoc->post->comment;
-				if(!is_array($comment)) $comment = array($comment);
-				foreach($comment as $key => $val)
+				if (!is_array($comment)) $comment = array($comment);
+				foreach ($comment as $key => $val)
 				{
 					$parent_srl = $this->insertComment($val, $module_srl, $obj->document_srl, $member_info, 0, $author_xml_id);
-					if($parent_srl === false) continue;
+					if ($parent_srl === false) continue;
 
 					$obj->comment_count++;
-					if($val->comment)
+					if ($val->comment)
 					{
 						$child_comment = $val->comment;
-						if(!is_array($child_comment)) $child_comment = array($child_comment);
-						foreach($child_comment as $k => $v)
+						if (!is_array($child_comment)) $child_comment = array($child_comment);
+						foreach ($child_comment as $k => $v)
 						{
 							$result = $this->insertComment($v, $module_srl, $obj->document_srl, $member_info, $parent_srl, $author_xml_id);
-							if($result !== false) $obj->comment_count++;
+							if ($result !== false) $obj->comment_count++;
 						}
 					}
 				}
 			}
 
-			if($module_name == 'textyle')
+			if ($module_name == 'textyle')
 			{
 				$args->document_srl = $obj->document_srl;
 				$args->module_srl = $obj->module_srl;
@@ -247,7 +247,7 @@ 
 				// Visibility value of published state
 				$status_published = array('public', 'syndicated');
 				// Save state if not published
-				if(!in_array($xmlDoc->post->visibility->body, $status_published))
+				if (!in_array($xmlDoc->post->visibility->body, $status_published))
 				{
 					$obj->module_srl = $member_info->member_srl; 
 				}
@@ -255,14 +255,14 @@ 
 			// Document
 			$output = executeQuery('document.insertDocument', $obj);
 
-			if($output->toBool())
+			if ($output->toBool())
 			{
 				// Tags
-				if($obj->tags)
+				if ($obj->tags)
 				{
-					$tag_list = explode(',',$obj->tags);
+					$tag_list = explode(',', $obj->tags);
 					$tag_count = count($tag_list);
-					for($i=0;$i<$tag_count;$i++)
+					for ($i = 0; $i < $tag_count; $i++)
 					{
 						$args = new stdClass;
 						$args->tag_srl = getNextSequence();
@@ -270,7 +270,7 @@ 
 						$args->document_srl = $obj->document_srl;
 						$args->tag = trim($tag_list[$i]);
 						$args->regdate = $obj->regdate;
-						if(!$args->tag) continue;
+						if (!$args->tag) continue;
 						$output = executeQuery('tag.insertTag', $args);
 					}
 				}
@@ -282,63 +282,63 @@ 
 
 		fclose($f);
 
-		if(count($category_list)) foreach($category_list as $key => $val) $oDocumentController->updateCategoryCount($module_srl, $val->category_srl);
+		if (count($category_list)) foreach ($category_list as $key => $val) $oDocumentController->updateCategoryCount($module_srl, $val->category_srl);
 		// Guestbook information
 		$guestbook_file = preg_replace('/index$/i', 'guestbook.xml', $index_file);
-		if(file_exists($guestbook_file))
+		if (file_exists($guestbook_file))
 		{
 			// Create the xmlParser object
 			$xmlDoc = $this->oXmlParser->loadXmlFile($guestbook_file);
 			// Handle guest book information
-			if($guestbook_module_srl && $xmlDoc->guestbook->comment)
+			if ($guestbook_module_srl && $xmlDoc->guestbook->comment)
 			{
 				$comment = $xmlDoc->guestbook->comment;
-				if(!is_array($comment)) $comment = array($comment);
+				if (!is_array($comment)) $comment = array($comment);
 
-				if($module_name =='textyle')
+				if ($module_name == 'textyle')
 				{
-					foreach($comment as $key => $val)
+					foreach ($comment as $key => $val)
 					{
-						$textyle_guestbook_srl  = getNextSequence();
+						$textyle_guestbook_srl = getNextSequence();
 
-						if($val->comment)
+						if ($val->comment)
 						{
 							$child_comment = $val->comment;
-							if(!is_array($child_comment)) $child_comment = array($child_comment);
-							foreach($child_comment as $k => $v)
+							if (!is_array($child_comment)) $child_comment = array($child_comment);
+							foreach ($child_comment as $k => $v)
 							{
-								$result = $this->insertTextyleGuestbookItem($v, $module_srl, $member_info,0,$textyle_guestbook_srl,$author_xml_id);
+								$result = $this->insertTextyleGuestbookItem($v, $module_srl, $member_info, 0, $textyle_guestbook_srl, $author_xml_id);
 							}
 						}
 
-						$result = $this->insertTextyleGuestbookItem($val, $module_srl, $member_info,$textyle_guestbook_srl,0,$author_xml_id);
+						$result = $this->insertTextyleGuestbookItem($val, $module_srl, $member_info, $textyle_guestbook_srl, 0, $author_xml_id);
 					}
 				}
 				else
 				{
-					foreach($comment as $key => $val)
+					foreach ($comment as $key => $val)
 					{
 						$obj = null;
 						$obj->module_srl = $guestbook_module_srl;
 						$obj->document_srl = getNextSequence();
 						$obj->uploaded_count = 0;
 						$obj->is_notice = 'N';
-						$obj->status = $val->secret->body=='1'?$oDocumentModel->getConfigStatus('secret'):$oDocumentModel->getConfigStatus('public');
+						$obj->status = $val->secret->body == '1' ? $oDocumentModel->getConfigStatus('secret') : $oDocumentModel->getConfigStatus('public');
 						$obj->content = nl2br($val->content->body);
 
 						// Extract a title form the bocy
-						$obj->title = cut_str(strip_tags($obj->content),20,'...');
+						$obj->title = cut_str(strip_tags($obj->content), 20, '...');
 						if ($obj->title == '') $obj->title = 'Untitled';
 
 						$obj->commentStatus = 'ALLOW';
 						$obj->allow_trackback = 'N';
-						$obj->regdate = date("YmdHis",$val->written->body);
+						$obj->regdate = date("YmdHis", $val->written->body);
 						$obj->last_update = date("YmdHis", $val->written->body);
-						if(!$obj->last_update) $obj->last_update = $obj->regdate;
+						if (!$obj->last_update) $obj->last_update = $obj->regdate;
 						$obj->tags = '';
 						$obj->readed_count = 0;
 						$obj->voted_count = 0;
-						if($author_xml_id && $val->commenter->attrs->id == $author_xml_id)
+						if ($author_xml_id && $val->commenter->attrs->id == $author_xml_id)
 						{
 							$obj->password = '';
 							$obj->nick_name = $member_info->nick_name;
@@ -356,19 +356,19 @@ 
 							$homepage = $val->commenter->homepage->body;
 						}
 						$obj->ipaddress = $val->commenter->ip->body;
-						$obj->list_order = $obj->update_order = $obj->document_srl*-1;
+						$obj->list_order = $obj->update_order = $obj->document_srl * -1;
 						$obj->notify_message = 'N';
 						$obj->trackback_count = 0;
 
 						$obj->comment_count = 0;
-						if($val->comment)
+						if ($val->comment)
 						{
 							$child_comment = $val->comment;
-							if(!is_array($child_comment)) $child_comment = array($child_comment);
-							foreach($child_comment as $k => $v)
+							if (!is_array($child_comment)) $child_comment = array($child_comment);
+							foreach ($child_comment as $k => $v)
 							{
-								$result = $this->insertComment($v, $module_srl, $obj->document_srl, $member_info, 0,$author_xml_id);
-								if($result !== false) $obj->comment_count++;
+								$result = $this->insertComment($v, $module_srl, $obj->document_srl, $member_info, 0, $author_xml_id);
+								if ($result !== false) $obj->comment_count++;
 							}
 						}
 
@@ -380,7 +380,7 @@ 
 			FileHandler::removeFile($guestbook_file);
 		}
 
-		return $idx-1;
+		return $idx - 1;
 	}
 
 	/**
@@ -393,10 +393,10 @@ 
 	 * @param int $author_xml_id
 	 * @return int|bool
 	 */
-	function insertTextyleGuestbookItem($val, $module_srl, $member_info, $textyle_guestbook_srl,$parent_srl = 0, $author_xml_id=null)
+	function insertTextyleGuestbookItem($val, $module_srl, $member_info, $textyle_guestbook_srl, $parent_srl = 0, $author_xml_id = null)
 	{
 		$tobj = null;
-		if($textyle_guestbook_srl>0)
+		if ($textyle_guestbook_srl > 0)
 		{
 			$tobj->textyle_guestbook_srl = $textyle_guestbook_srl;
 		}
@@ -405,9 +405,9 @@ 
 			$tobj->textyle_guestbook_srl = getNextSequence();
 		}
 		$tobj->module_srl = $module_srl;
-		$tobj->is_secret = $val->secret->body=='1'?1:-1;
+		$tobj->is_secret = $val->secret->body == '1' ? 1 : -1;
 		$tobj->content = nl2br($val->content->body);
-		if($author_xml_id && $val->commenter->attrs->id == $author_xml_id)
+		if ($author_xml_id && $val->commenter->attrs->id == $author_xml_id)
 		{
 			$tobj->password = '';
 			$tobj->nick_name = $member_info->nick_name;
@@ -424,22 +424,22 @@ 
 			$tobj->homepage = $val->commenter->homepage->body;
 			$tobj->member_srl = 0;
 		}
-		$tobj->last_update = $tobj->regdate = date("YmdHis",$val->written->body);
+		$tobj->last_update = $tobj->regdate = date("YmdHis", $val->written->body);
 		$tobj->ipaddress = $val->commenter->ip->body;
 
-		if($parent_srl>0)
+		if ($parent_srl > 0)
 		{
 			$tobj->parent_srl = $parent_srl;
 			$tobj->list_order = $tobj->parent_srl * -1;
 		}
 		else
 		{
-			$tobj->list_order = $tobj->textyle_guestbook_srl*-1;
+			$tobj->list_order = $tobj->textyle_guestbook_srl * -1;
 		}
 
 		$output = executeQuery('textyle.insertTextyleGuestbook', $tobj);
 
-		if($output->toBool()) return $tobj->textyle_guestbook_srl;
+		if ($output->toBool()) return $tobj->textyle_guestbook_srl;
 		return false;
 	}
 
@@ -456,18 +456,18 @@ 
 	{
 		$uploaded_count = 0;
 
-		$file_obj  = null;
+		$file_obj = null;
 		$file_obj->file_srl = getNextSequence();
 		$file_obj->upload_target_srl = $upload_target_srl;
 		$file_obj->module_srl = $module_srl;
 
-		while(!feof($fp))
+		while (!feof($fp))
 		{
 			$str = fgets($fp, 1024);
 			// If it ends with </attaches>, break
-			if(trim($str) == '</attachment>') break;
+			if (trim($str) == '</attachment>') break;
 			// If it starts with <file>, handle the attachement in the xml file
-			if(substr($str, 0, 9)=='<content>')
+			if (substr($str, 0, 9) == '<content>')
 			{
 				$file_obj->file = $this->saveTemporaryFile($fp, $str);
 				continue;
@@ -475,7 +475,7 @@ 
 
 			$buff .= $str;
 		}
-		if(!file_exists($file_obj->file)) return false;
+		if (!file_exists($file_obj->file)) return false;
 
 		$buff .= '</attachment>';
 
@@ -485,20 +485,20 @@ 
 		$file_obj->download_count = $xmlDoc->attachment->downloads->body;
 		$name = $xmlDoc->attachment->name->body;
 		// Set upload path by checking if the attachement is an image or other kind of file
-		if(preg_match("/\.(asf|asf|asx|avi|flv|gif|jpeg|jpg|m4a|m4v|mid|midi|moov|mov|mp1|mp2|mp3|mp4|mpeg|mpg|ogg|png|qt|ra|ram|rm|rmm|wav|webm|webp|wma|wmv)$/i", $file_obj->source_filename))
+		if (preg_match("/\.(asf|asf|asx|avi|flv|gif|jpeg|jpg|m4a|m4v|mid|midi|moov|mov|mp1|mp2|mp3|mp4|mpeg|mpg|ogg|png|qt|ra|ram|rm|rmm|wav|webm|webp|wma|wmv)$/i", $file_obj->source_filename))
 		{
-			$path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3));
+			$path = sprintf("./files/attach/images/%s/%s", $module_srl, getNumberingPath($upload_target_srl, 3));
 			$filename = $path.$file_obj->source_filename;
 			$file_obj->direct_download = 'Y';
 		}
 		else
 		{
-			$path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl,3));
-			$filename = $path.md5(crypt(rand(1000000,900000), rand(0,100)));
+			$path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl, 3));
+			$filename = $path.md5(crypt(rand(1000000, 900000), rand(0, 100)));
 			$file_obj->direct_download = 'N';
 		}
 		// Create a directory
-		if(!FileHandler::makeDir($path)) return;
+		if (!FileHandler::makeDir($path)) return;
 
 		FileHandler::rename($file_obj->file, $filename);
 		// Insert to the DB
@@ -507,16 +507,16 @@ 
 		$file_obj->file_size = filesize($filename);
 		$file_obj->comment = NULL;
 		$file_obj->member_srl = 0;
-		$file_obj->sid = md5(rand(rand(1111111,4444444),rand(4444445,9999999)));
+		$file_obj->sid = md5(rand(rand(1111111, 4444444), rand(4444445, 9999999)));
 		$file_obj->isvalid = 'Y';
 		$output = executeQuery('file.insertFile', $file_obj);
 
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$uploaded_count++;
 			$tmp_obj = null;
-			if($file_obj->direct_download == 'Y') $files[$name]->url = $file_obj->uploaded_filename; 
-			else $files[$name]->url = getUrl('','module','file','act','procFileDownload','file_srl',$file_obj->file_srl,'sid',$file_obj->sid);
+			if ($file_obj->direct_download == 'Y') $files[$name]->url = $file_obj->uploaded_filename; 
+			else $files[$name]->url = getUrl('', 'module', 'file', 'act', 'procFileDownload', 'file_srl', $file_obj->file_srl, 'sid', $file_obj->sid);
 			$files[$name]->direct_download = $file_obj->direct_download;
 			$files[$name]->source_filename = $file_obj->source_filename;
 			return true;
@@ -532,9 +532,9 @@ 
 	function getTmpFilename()
 	{
 		$path = "./files/cache/importer";
-		if(!is_dir($path)) FileHandler::makeDir($path);
-		$filename = sprintf("%s/%d", $path, rand(11111111,99999999));
-		if(file_exists($filename)) $filename .= rand(111,999);
+		if (!is_dir($path)) FileHandler::makeDir($path);
+		$filename = sprintf("%s/%d", $path, rand(11111111, 99999999));
+		if (file_exists($filename)) $filename .= rand(111, 999);
 		return $filename;
 	}
 
@@ -549,11 +549,11 @@ 
 		$temp_filename = $this->getTmpFilename();
 		$buff = substr($buff, 9);
 
-		while(!feof($fp))
+		while (!feof($fp))
 		{
 			$str = trim(fgets($fp, 1024));
 			$buff .= $str;
-			if(substr($str, -10) == '</content>') break;
+			if (substr($str, -10) == '</content>') break;
 		}
 
 		$buff = substr($buff, 0, -10);
@@ -572,16 +572,16 @@ 
 	function _replaceTTAttach($matches)
 	{
 		$name = $matches[2];
-		if(!$name) return $matches[0];
+		if (!$name) return $matches[0];
 
 		$obj = $this->files[$name];
 		// If multimedia file is,
-		if($obj->direct_download == 'Y')
+		if ($obj->direct_download == 'Y')
 		{
 			// If image file is
-			if(preg_match('/\.(jpg|gif|jpeg|png)$/i', $obj->source_filename))
+			if (preg_match('/\.(jpg|gif|jpeg|png)$/i', $obj->source_filename))
 			{
-				return sprintf('<img editor_component="image_link" src="%s" alt="%s" />', $obj->url, str_replace('"','\\"',$matches[4]));
+				return sprintf('<img editor_component="image_link" src="%s" alt="%s" />', $obj->url, str_replace('"', '\\"', $matches[4]));
 				// If other multimedia file but image is, 
 			}
 			else
@@ -603,7 +603,7 @@ 
 	function _replaceTTMovie($matches)
 	{
 		$key = $matches[1];
-		if(!$key) return $matches[0];
+		if (!$key) return $matches[0];
 
 		return 
 			'<object type="application/x-shockwave-flash" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="100%" height="402">'.
@@ -631,12 +631,12 @@ 
 		$tobj->comment_srl = getNextSequence();
 		$tobj->module_srl = $module_srl;
 		$tobj->document_srl = $document_srl;
-		$tobj->is_secret = $val->secret->body=='1'?'Y':'N';
+		$tobj->is_secret = $val->secret->body == '1' ? 'Y' : 'N';
 		$tobj->notify_message = 'N';
 		$tobj->content = nl2br($val->content->body);
 		$tobj->voted_count = 0;
 		$tobj->status = 1;
-		if($author_xml_id && $val->commenter->attrs->id == $author_xml_id)
+		if ($author_xml_id && $val->commenter->attrs->id == $author_xml_id)
 		{
 			$tobj->password = '';
 			$tobj->nick_name = $member_info->nick_name;
@@ -653,9 +653,9 @@ 
 			$tobj->homepage = $val->commenter->homepage->body;
 			$tobj->member_srl = 0;
 		}
-		$tobj->last_update = $tobj->regdate = date("YmdHis",$val->written->body);
+		$tobj->last_update = $tobj->regdate = date("YmdHis", $val->written->body);
 		$tobj->ipaddress = $val->commenter->ip->body;
-		$tobj->list_order = $tobj->comment_srl*-1;
+		$tobj->list_order = $tobj->comment_srl * -1;
 		$tobj->sequence = $sequence;
 		$tobj->parent_srl = $parent_srl;
 		// Comment list first
@@ -665,7 +665,7 @@ 
 		$list_args->module_srl = $tobj->module_srl;
 		$list_args->regdate = $tobj->regdate;
 		// Set data directly if parent comment doesn't exist
-		if(!$tobj->parent_srl)
+		if (!$tobj->parent_srl)
 		{
 			$list_args->head = $list_args->arrange = $tobj->comment_srl;
 			$list_args->depth = 0;
@@ -677,25 +677,25 @@ 
 			$parent_args->comment_srl = $tobj->parent_srl;
 			$parent_output = executeQuery('comment.getCommentListItem', $parent_args);
 			// Return if parent comment doesn't exist
-			if(!$parent_output->toBool() || !$parent_output->data) return false;
+			if (!$parent_output->toBool() || !$parent_output->data) return false;
 			$parent = $parent_output->data;
 
 			$list_args->head = $parent->head;
-			$list_args->depth = $parent->depth+1;
-			if($list_args->depth<2) $list_args->arrange = $tobj->comment_srl;
+			$list_args->depth = $parent->depth + 1;
+			if ($list_args->depth < 2) $list_args->arrange = $tobj->comment_srl;
 			else
 			{
 				$list_args->arrange = $parent->arrange;
 				$output = executeQuery('comment.updateCommentListArrange', $list_args);
-				if(!$output->toBool()) return $output;
+				if (!$output->toBool()) return $output;
 			}
 		}
 
 		$output = executeQuery('comment.insertCommentList', $list_args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$output = executeQuery('comment.insertComment', $tobj);
-			if($output->toBool()) return $tobj->comment_srl;
+			if ($output->toBool()) return $tobj->comment_srl;
 		}
 		return false;
 	}
@@ -710,10 +710,10 @@ 
 	 */
 	function arrangeCategory($obj, &$category, &$idx, $parent = 0)
 	{
-		if(!$obj->category) return;
-		if(!is_array($obj->category)) $c = array($obj->category);
+		if (!$obj->category) return;
+		if (!is_array($obj->category)) $c = array($obj->category);
 		else $c = $obj->category;
-		foreach($c as $val)
+		foreach ($c as $val)
 		{
 			$idx++;
 			$priority = $val->priority->body;

modules/install/install.controller.php

Doc Comments +2 added lines

@@ -545,6 +545,7 @@ 
 
 	/**
 	 * @brief Install an each module
+	 * @param string $module_path
 	 */
 	function installModule($module, $module_path)
 	{
@@ -614,6 +615,7 @@ 
 	/**
 	 * @brief Create etc config file
 	 * Create the config file when all settings are completed
+	 * @param stdClass $config_info
 	 */
 	function makeEtcConfigFile($config_info)
 	{

Indentation +1 added lines, -1 removed lines

@@ -413,7 +413,7 @@
 	 * make a file to files/config and check url approach by ".htaccess" rules
 	 *
 	 * @return bool
-	*/
+	 */
 	function checkRewriteUsable() {
 		$checkString = "isApproached";
 		$checkFilePath = 'files/config/tmpRewriteCheck.txt';

Spacing +118 added lines, -118 removed lines

@@ -17,7 +17,7 @@ 
 	function init()
 	{
 		// Error occurs if already installed
-		if($this->act !== 'procInstallLicenseAggrement' && Context::isInstalled())
+		if ($this->act !== 'procInstallLicenseAggrement' && Context::isInstalled())
 		{
 			$this->stop('msg_already_installed');
 		}
@@ -86,7 +86,7 @@ 
 	function _procDBSetting()
 	{
 		// Get DB-related variables
-		$con_string = Context::gets('db_type','db_port','db_hostname','db_userid','db_password','db_database','db_table_prefix');
+		$con_string = Context::gets('db_type', 'db_port', 'db_hostname', 'db_userid', 'db_password', 'db_database', 'db_table_prefix');
 
 		$db_info = new stdClass();
 		$db_info->master_db = get_object_vars($con_string);
@@ -101,13 +101,13 @@ 
 		// Check if available to connect to the DB
 		$oDB = &DB::getInstance();
 		$output = $oDB->getError();
-		if(!$output->toBool()) return $output;
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if (!$output->toBool()) return $output;
+		if (!$oDB->isConnected()) return $oDB->getError();
 
 		// Create a db temp config file
-		if(!$this->makeDBConfigFile()) return new BaseObject(-1, 'msg_install_failed');
+		if (!$this->makeDBConfigFile()) return new BaseObject(-1, 'msg_install_failed');
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallConfigForm');
 			header('location:'.$returnUrl);
@@ -121,13 +121,13 @@ 
 	function procConfigSetting()
 	{
 		// Get variables
-		$config_info = Context::gets('use_rewrite','time_zone');
-		if($config_info->use_rewrite!='Y') $config_info->use_rewrite = 'N';
+		$config_info = Context::gets('use_rewrite', 'time_zone');
+		if ($config_info->use_rewrite != 'Y') $config_info->use_rewrite = 'N';
 
 		// Create a db temp config file
-		if(!$this->makeEtcConfigFile($config_info)) return new BaseObject(-1, 'msg_install_failed');
+		if (!$this->makeEtcConfigFile($config_info)) return new BaseObject(-1, 'msg_install_failed');
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallManagerForm');
 			header('location:'.$returnUrl);
@@ -141,13 +141,13 @@ 
 	function procInstall()
 	{
 		// Check if it is already installed
-		if(Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
+		if (Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
 
 		Context::loadLang('modules/member/lang');
 		$oMemberModel = getModel('member');
 		$vars = Context::getRequestVars();
 
-		if(!$oMemberModel->checkPasswordStrength($vars->password, 'high'))
+		if (!$oMemberModel->checkPasswordStrength($vars->password, 'high'))
 		{
 			Context::loadLang('modules/member/lang');
 			$message = Context::getLang('about_password_strength');
@@ -160,15 +160,15 @@ 
 		Context::set('logged_info', $logged_info);
 
 		// check install config
-		if(Context::get('install_config'))
+		if (Context::get('install_config'))
 		{
 			$db_info = $this->_makeDbInfoByInstallConfig();
 		}
 		// install by default XE UI
 		else
 		{
-			if(FileHandler::exists($this->db_tmp_config_file)) include $this->db_tmp_config_file;
-			if(FileHandler::exists($this->etc_tmp_config_file)) include $this->etc_tmp_config_file;
+			if (FileHandler::exists($this->db_tmp_config_file)) include $this->db_tmp_config_file;
+			if (FileHandler::exists($this->etc_tmp_config_file)) include $this->etc_tmp_config_file;
 		}
 
 		// Set DB type and information
@@ -176,30 +176,30 @@ 
 		// Create DB Instance
 		$oDB = &DB::getInstance();
 		// Check if available to connect to the DB
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if (!$oDB->isConnected()) return $oDB->getError();
 
 		// Install all the modules
 		try {
 			$oDB->begin();
 			$this->installDownloadedModule();
 			$oDB->commit();
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			$oDB->rollback();
 			return new BaseObject(-1, $e->getMessage());
 		}
 
 		// Create a config file
-		if(!$this->makeConfigFile()) return new BaseObject(-1, 'msg_install_failed');
+		if (!$this->makeConfigFile()) return new BaseObject(-1, 'msg_install_failed');
 
 		// load script
-		$scripts = FileHandler::readDir(_XE_PATH_ . 'modules/install/script', '/(\.php)$/');
-		if(count($scripts)>0)
+		$scripts = FileHandler::readDir(_XE_PATH_.'modules/install/script', '/(\.php)$/');
+		if (count($scripts) > 0)
 		{
 			sort($scripts);
-			foreach($scripts as $script)
+			foreach ($scripts as $script)
 			{
 				$script_path = FileHandler::getRealPath('./modules/install/script/');
-				$output = include($script_path . $script);
+				$output = include($script_path.$script);
 			}
 		}
 
@@ -212,7 +212,7 @@ 
 
 		unset($_SESSION['use_rewrite']);
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('');
 			header('location:'.$returnUrl);
@@ -242,7 +242,7 @@ 
 		$db_info->use_rewrite = Context::get('use_rewrite');
 		$db_info->time_zone = Context::get('time_zone');
 
-		if($_SERVER['HTTPS'] == 'on')
+		if ($_SERVER['HTTPS'] == 'on')
 		{
 			$https_port = (Context::get('https_port')) ? Context::get('https_port') : $_SERVER['SERVER_PORT'];
 			$https_port = (!$https_port != 443) ? $https_port : null;
@@ -252,8 +252,8 @@ 
 			$http_port = (Context::get('http_port')) ? Context::get('http_port') : $_SERVER['SERVER_PORT'];
 			$http_port = (!$http_port != 80) ? $http_port : null;
 		}
-		if($http_port) $db_info->http_port = $http_port;
-		if($https_port) $db_info->https_port = $https_port;
+		if ($http_port) $db_info->http_port = $http_port;
+		if ($https_port) $db_info->https_port = $https_port;
 
 		return $db_info;
 	}
@@ -263,57 +263,57 @@ 
 	 */
 	function procInstallFTP()
 	{
-		if(Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
-		$ftp_info = Context::gets('ftp_host', 'ftp_user','ftp_password','ftp_port','ftp_root_path');
-		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1';
-		if(!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/';
+		if (Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
+		$ftp_info = Context::gets('ftp_host', 'ftp_user', 'ftp_password', 'ftp_port', 'ftp_root_path');
+		$ftp_info->ftp_port = (int) $ftp_info->ftp_port;
+		if (!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
+		if (!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1';
+		if (!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/';
 
 		$buff = array('<?php if(!defined("__XE__")) exit();');
 		$buff[] = "\$ftp_info = new stdClass();";
-		foreach($ftp_info as $key => $val)
+		foreach ($ftp_info as $key => $val)
 		{
-			$buff[] = sprintf("\$ftp_info->%s='%s';", $key, str_replace("'","\\'",$val));
+			$buff[] = sprintf("\$ftp_info->%s='%s';", $key, str_replace("'", "\\'", $val));
 		}
 
 		// If safe_mode
-		if(ini_get('safe_mode'))
+		if (ini_get('safe_mode'))
 		{
-			if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1,'msg_safe_mode_ftp_needed');
+			if (!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1, 'msg_safe_mode_ftp_needed');
 
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
+			if (!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
 
-			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+			if (!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_invalid_auth_info');
+				return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 			}
 
-			if(!is_dir(_XE_PATH_.'files') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files'))
+			if (!is_dir(_XE_PATH_.'files') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files'))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_mkdir_fail');
+				return new BaseObject(-1, 'msg_ftp_mkdir_fail');
 			}
 
-			if(!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files'))
+			if (!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files'))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_chmod_fail');
+				return new BaseObject(-1, 'msg_ftp_chmod_fail');
 			}
 
-			if(!is_dir(_XE_PATH_.'files/config') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files/config'))
+			if (!is_dir(_XE_PATH_.'files/config') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files/config'))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_mkdir_fail');
+				return new BaseObject(-1, 'msg_ftp_mkdir_fail');
 			}
 
-			if(!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files/config'))
+			if (!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files/config'))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_chmod_fail');
+				return new BaseObject(-1, 'msg_ftp_chmod_fail');
 			}
 
 			$oFtp->ftp_quit();
@@ -324,31 +324,31 @@ 
 
 	function procInstallCheckFtp()
 	{
-		$ftp_info = Context::gets('ftp_user','ftp_password','ftp_port','sftp');
-		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->sftp) $ftp_info->sftp = 'N';
+		$ftp_info = Context::gets('ftp_user', 'ftp_password', 'ftp_port', 'sftp');
+		$ftp_info->ftp_port = (int) $ftp_info->ftp_port;
+		if (!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
+		if (!$ftp_info->sftp) $ftp_info->sftp = 'N';
 
-		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1,'msg_safe_mode_ftp_needed');
+		if (!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1, 'msg_safe_mode_ftp_needed');
 
-		if($ftp_info->sftp == 'Y')
+		if ($ftp_info->sftp == 'Y')
 		{
 			$connection = ssh2_connect('localhost', $ftp_info->ftp_port);
-			if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
+			if (!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
-				return new BaseObject(-1,'msg_ftp_invalid_auth_info');
+				return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 			}
 		}
 		else
 		{
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
+			if (!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
 
-			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+			if (!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_invalid_auth_info');
+				return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 			}
 			$oFtp->ftp_quit();
 		}
@@ -365,36 +365,36 @@ 
 		$checklist = array();
 		// 0. check your version of php (5.2.4 or higher)
 		$checklist['php_version'] = true;
-		if(version_compare(PHP_VERSION, __XE_MIN_PHP_VERSION__, '<'))
+		if (version_compare(PHP_VERSION, __XE_MIN_PHP_VERSION__, '<'))
 		{
 			$checklist['php_version'] = false;
 		}
 
-		if(version_compare(PHP_VERSION, __XE_RECOMMEND_PHP_VERSION__, '<'))
+		if (version_compare(PHP_VERSION, __XE_RECOMMEND_PHP_VERSION__, '<'))
 		{
 			Context::set('phpversion_warning', true);
 		}
 
 		// 1. Check permission
-		if(is_writable('./')||is_writable('./files')) $checklist['permission'] = true;
+		if (is_writable('./') || is_writable('./files')) $checklist['permission'] = true;
 		else $checklist['permission'] = false;
 		// 2. Check if xml_parser_create exists
-		if(function_exists('xml_parser_create')) $checklist['xml'] = true;
+		if (function_exists('xml_parser_create')) $checklist['xml'] = true;
 		else $checklist['xml'] = false;
 		// 3. Check if ini_get (session.auto_start) == 1
-		if(ini_get('session.auto_start')!=1) $checklist['session'] = true;
+		if (ini_get('session.auto_start') != 1) $checklist['session'] = true;
 		else $checklist['session'] = false;
 		// 4. Check if iconv exists
-		if(function_exists('iconv')) $checklist['iconv'] = true;
+		if (function_exists('iconv')) $checklist['iconv'] = true;
 		else $checklist['iconv'] = false;
 		// 5. Check gd(imagecreatefromgif function)
-		if(function_exists('imagecreatefromgif')) $checklist['gd'] = true;
+		if (function_exists('imagecreatefromgif')) $checklist['gd'] = true;
 		else $checklist['gd'] = false;
 		// 6. Check DB
-		if(DB::getEnableList()) $checklist['db'] = true;
+		if (DB::getEnableList()) $checklist['db'] = true;
 		else $checklist['db'] = false;
 
-		if(!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) $install_enable = false;
+		if (!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) $install_enable = false;
 		else $install_enable = true;
 
 		// Save the checked result to the Context
@@ -414,7 +414,7 @@ 
 
 		$license_agreement = ($vars->license_agreement == 'Y') ? true : false;
 
-		if($license_agreement)
+		if ($license_agreement)
 		{
 			$currentTime = $_SERVER['REQUEST_TIME'];
 			FileHandler::writeFile($this->flagLicenseAgreement, $currentTime);
@@ -425,7 +425,7 @@ 
 			return new BaseObject(-1, 'msg_must_accept_license_agreement');
 		}
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallCheckEnv');
 			$this->setRedirectUrl($returnUrl);
@@ -448,25 +448,25 @@ 
 		$hostname = $_SERVER['SERVER_NAME'];
 		$port = $_SERVER['SERVER_PORT'];
 		$str_port = '';
-		if($port)
+		if ($port)
 		{
-			$str_port = ':' . $port;
+			$str_port = ':'.$port;
 		}
 
 		$tmpPath = $_SERVER['DOCUMENT_ROOT'];
 
 		//if DIRECTORY_SEPARATOR is not /(IIS)
-		if(DIRECTORY_SEPARATOR !== '/')
+		if (DIRECTORY_SEPARATOR !== '/')
 		{
 			//change to slash for compare
 			$tmpPath = str_replace(DIRECTORY_SEPARATOR, '/', $_SERVER['DOCUMENT_ROOT']);
 		}
 
-		$query = "/JUST/CHECK/REWRITE/" . $checkFilePath;
+		$query = "/JUST/CHECK/REWRITE/".$checkFilePath;
 		$currentPath = str_replace($tmpPath, "", _XE_PATH_);
-		if($currentPath != "")
+		if ($currentPath != "")
 		{
-			$query = $currentPath . $query;
+			$query = $currentPath.$query;
 		}
 		$requestUrl = sprintf('%s://%s%s%s', $scheme, $hostname, $str_port, $query);
 		$requestConfig = array();
@@ -491,7 +491,7 @@ 
 			'./files/cache/template_compiled',
 		);
 
-		foreach($directory_list as $dir)
+		foreach ($directory_list as $dir)
 		{
 			FileHandler::makeDir($dir);
 		}
@@ -507,57 +507,57 @@ 
 		$oModuleModel = getModel('module');
 		// Create a table ny finding schemas/*.xml file in each module
 		$module_list = FileHandler::readDir('./modules/', NULL, false, true);
-		foreach($module_list as $module_path)
+		foreach ($module_list as $module_path)
 		{
 			// Get module name
-			$tmp_arr = explode('/',$module_path);
-			$module = $tmp_arr[count($tmp_arr)-1];
+			$tmp_arr = explode('/', $module_path);
+			$module = $tmp_arr[count($tmp_arr) - 1];
 
 			$xml_info = $oModuleModel->getModuleInfoXml($module);
-			if(!$xml_info) continue;
+			if (!$xml_info) continue;
 			$modules[$xml_info->category][] = $module;
 		}
 		// Install "module" module in advance
-		$this->installModule('module','./modules/module');
+		$this->installModule('module', './modules/module');
 		$oModule = getClass('module');
-		if($oModule->checkUpdate()) $oModule->moduleUpdate();
+		if ($oModule->checkUpdate()) $oModule->moduleUpdate();
 		// Determine the order of module installation depending on category
-		$install_step = array('system','content','member');
+		$install_step = array('system', 'content', 'member');
 		// Install all the remaining modules
-		foreach($install_step as $category)
+		foreach ($install_step as $category)
 		{
-			if(count($modules[$category]))
+			if (count($modules[$category]))
 			{
-				foreach($modules[$category] as $module)
+				foreach ($modules[$category] as $module)
 				{
-					if($module == 'module') continue;
+					if ($module == 'module') continue;
 					$this->installModule($module, sprintf('./modules/%s', $module));
 
 					$oModule = getClass($module);
-					if(is_object($oModule) && method_exists($oModule, 'checkUpdate'))
+					if (is_object($oModule) && method_exists($oModule, 'checkUpdate'))
 					{
-						if($oModule->checkUpdate()) $oModule->moduleUpdate();
+						if ($oModule->checkUpdate()) $oModule->moduleUpdate();
 					}
 				}
 				unset($modules[$category]);
 			}
 		}
 		// Install all the remaining modules
-		if(count($modules))
+		if (count($modules))
 		{
-			foreach($modules as $category => $module_list)
+			foreach ($modules as $category => $module_list)
 			{
-				if(count($module_list))
+				if (count($module_list))
 				{
-					foreach($module_list as $module)
+					foreach ($module_list as $module)
 					{
-						if($module == 'module') continue;
+						if ($module == 'module') continue;
 						$this->installModule($module, sprintf('./modules/%s', $module));
 
 						$oModule = getClass($module);
-						if($oModule && method_exists($oModule, 'checkUpdate') && method_exists($oModule, 'moduleUpdate'))
+						if ($oModule && method_exists($oModule, 'checkUpdate') && method_exists($oModule, 'moduleUpdate'))
 						{
-							if($oModule->checkUpdate()) $oModule->moduleUpdate();
+							if ($oModule->checkUpdate()) $oModule->moduleUpdate();
 						}
 					}
 				}
@@ -579,31 +579,31 @@ 
 		$schema_files = FileHandler::readDir($schema_dir, NULL, false, true);
 
 		$file_cnt = count($schema_files);
-		for($i=0;$i<$file_cnt;$i++)
+		for ($i = 0; $i < $file_cnt; $i++)
 		{
 			$file = trim($schema_files[$i]);
-			if(!$file || substr($file,-4)!='.xml') continue;
+			if (!$file || substr($file, -4) != '.xml') continue;
 			$output = $oDB->createTableByXmlFile($file);
-			if($output === false)
+			if ($output === false)
 				throw new Exception('msg_create_table_failed');
 		}
 		// Create a table and module instance and then execute install() method
 		unset($oModule);
 		$oModule = getClass($module);
-		if(method_exists($oModule, 'moduleInstall')) $oModule->moduleInstall();
+		if (method_exists($oModule, 'moduleInstall')) $oModule->moduleInstall();
 		return new BaseObject();
 	}
 
 	function _getDBConfigFileContents($db_info)
 	{
-		if(substr($db_info->master_db['db_table_prefix'], -1) != '_')
+		if (substr($db_info->master_db['db_table_prefix'], -1) != '_')
 		{
 			$db_info->master_db['db_table_prefix'] .= '_';
 		}
 
-		foreach($db_info->slave_db as &$slave)
+		foreach ($db_info->slave_db as &$slave)
 		{
-			if(substr($slave['db_table_prefix'], -1) != '_')
+			if (substr($slave['db_table_prefix'], -1) != '_')
 			{
 				$slave['db_table_prefix'] .= '_';
 			}
@@ -611,7 +611,7 @@ 
 
 		$buff = array();
 		$buff[] = '<?php if(!defined("__XE__")) exit();';
-		$buff[] = '$db_info = (object)' . var_export(get_object_vars($db_info), TRUE) . ';';
+		$buff[] = '$db_info = (object)'.var_export(get_object_vars($db_info), TRUE).';';
 
 		return implode(PHP_EOL, $buff);
 	}
@@ -625,13 +625,13 @@ 
 		$db_tmp_config_file = $this->db_tmp_config_file;
 
 		$db_info = Context::getDBInfo();
-		if(!$db_info) return;
+		if (!$db_info) return;
 
 		$buff = $this->_getDBConfigFileContents($db_info);
 
 		FileHandler::writeFile($db_tmp_config_file, $buff);
 
-		if(@file_exists($db_tmp_config_file)) return true;
+		if (@file_exists($db_tmp_config_file)) return true;
 		return false;
 	}
 
@@ -644,14 +644,14 @@ 
 		$etc_tmp_config_file = $this->etc_tmp_config_file;
 
 		$buff = '<?php if(!defined("__XE__")) exit();'."\n";
-		foreach($config_info as $key => $val)
+		foreach ($config_info as $key => $val)
 		{
-			$buff .= sprintf("\$db_info->%s = '%s';\n", $key, str_replace("'","\\'",$val));
+			$buff .= sprintf("\$db_info->%s = '%s';\n", $key, str_replace("'", "\\'", $val));
 		}
 
 		FileHandler::writeFile($etc_tmp_config_file, $buff);
 
-		if(@file_exists($etc_tmp_config_file)) return true;
+		if (@file_exists($etc_tmp_config_file)) return true;
 		return false;
 	}
 
@@ -666,13 +666,13 @@ 
 			//if(file_exists($config_file)) return;
 
 			$db_info = Context::getDBInfo();
-			if(!$db_info) return;
+			if (!$db_info) return;
 
 			$buff = $this->_getDBConfigFileContents($db_info);
 
 			FileHandler::writeFile($config_file, $buff);
 
-			if(@file_exists($config_file))
+			if (@file_exists($config_file))
 			{
 				FileHandler::removeFile($this->db_tmp_config_file);
 				FileHandler::removeFile($this->etc_tmp_config_file);
@@ -687,7 +687,7 @@ 
 	function installByConfig($install_config_file)
 	{
 		include $install_config_file;
-		if(!is_array($auto_config)) return false;
+		if (!is_array($auto_config)) return false;
 
 		$auto_config['module'] = 'install';
 		$auto_config['act'] = 'procInstall';
@@ -695,22 +695,22 @@ 
 		$fstr = "<%s><![CDATA[%s]]></%s>\r\n";
 		$fheader = "POST %s HTTP/1.1\r\nHost: %s\r\nContent-Type: application/xml\r\nContent-Length: %s\r\n\r\n%s\r\n";
 		$body = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n<methodCall>\r\n<params>\r\n";
-		foreach($auto_config as $k => $v)
+		foreach ($auto_config as $k => $v)
 		{
-			if(!in_array($k,array('host','port','path'))) $body .= sprintf($fstr,$k,$v,$k);
+			if (!in_array($k, array('host', 'port', 'path'))) $body .= sprintf($fstr, $k, $v, $k);
 		}
 		$body .= "</params>\r\n</methodCall>";
 
-		$header = sprintf($fheader,$auto_config['path'],$auto_config['host'],strlen($body),$body);
+		$header = sprintf($fheader, $auto_config['path'], $auto_config['host'], strlen($body), $body);
 		$fp = @fsockopen($auto_config['host'], $auto_config['port'], $errno, $errstr, 5);
 
-		if($fp)
+		if ($fp)
 		{
 			fputs($fp, $header);
-			while(!feof($fp))
+			while (!feof($fp))
 			{
 				$line = trim(fgets($fp, 4096));
-				if(strncmp('<error>', $line, 7) === 0)
+				if (strncmp('<error>', $line, 7) === 0)
 				{
 					fclose($fp);
 					return false;

Braces +149 added lines, -58 removed lines

@@ -101,11 +101,17 @@ 
 		// Check if available to connect to the DB
 		$oDB = &DB::getInstance();
 		$output = $oDB->getError();
-		if(!$output->toBool()) return $output;
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if(!$output->toBool()) {
+			return $output;
+		}
+		if(!$oDB->isConnected()) {
+			return $oDB->getError();
+		}
 
 		// Create a db temp config file
-		if(!$this->makeDBConfigFile()) return new BaseObject(-1, 'msg_install_failed');
+		if(!$this->makeDBConfigFile()) {
+			return new BaseObject(-1, 'msg_install_failed');
+		}
 
 		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
 		{
@@ -122,10 +128,14 @@ 
 	{
 		// Get variables
 		$config_info = Context::gets('use_rewrite','time_zone');
-		if($config_info->use_rewrite!='Y') $config_info->use_rewrite = 'N';
+		if($config_info->use_rewrite!='Y') {
+			$config_info->use_rewrite = 'N';
+		}
 
 		// Create a db temp config file
-		if(!$this->makeEtcConfigFile($config_info)) return new BaseObject(-1, 'msg_install_failed');
+		if(!$this->makeEtcConfigFile($config_info)) {
+			return new BaseObject(-1, 'msg_install_failed');
+		}
 
 		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
 		{
@@ -141,7 +151,9 @@ 
 	function procInstall()
 	{
 		// Check if it is already installed
-		if(Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
+		if(Context::isInstalled()) {
+			return new BaseObject(-1, 'msg_already_installed');
+		}
 
 		Context::loadLang('modules/member/lang');
 		$oMemberModel = getModel('member');
@@ -167,8 +179,12 @@ 
 		// install by default XE UI
 		else
 		{
-			if(FileHandler::exists($this->db_tmp_config_file)) include $this->db_tmp_config_file;
-			if(FileHandler::exists($this->etc_tmp_config_file)) include $this->etc_tmp_config_file;
+			if(FileHandler::exists($this->db_tmp_config_file)) {
+				include $this->db_tmp_config_file;
+			}
+			if(FileHandler::exists($this->etc_tmp_config_file)) {
+				include $this->etc_tmp_config_file;
+			}
 		}
 
 		// Set DB type and information
@@ -176,7 +192,9 @@ 
 		// Create DB Instance
 		$oDB = &DB::getInstance();
 		// Check if available to connect to the DB
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if(!$oDB->isConnected()) {
+			return $oDB->getError();
+		}
 
 		// Install all the modules
 		try {
@@ -189,7 +207,9 @@ 
 		}
 
 		// Create a config file
-		if(!$this->makeConfigFile()) return new BaseObject(-1, 'msg_install_failed');
+		if(!$this->makeConfigFile()) {
+			return new BaseObject(-1, 'msg_install_failed');
+		}
 
 		// load script
 		$scripts = FileHandler::readDir(_XE_PATH_ . 'modules/install/script', '/(\.php)$/');
@@ -246,14 +266,17 @@ 
 		{
 			$https_port = (Context::get('https_port')) ? Context::get('https_port') : $_SERVER['SERVER_PORT'];
 			$https_port = (!$https_port != 443) ? $https_port : null;
-		}
-		else
+		} else
 		{
 			$http_port = (Context::get('http_port')) ? Context::get('http_port') : $_SERVER['SERVER_PORT'];
 			$http_port = (!$http_port != 80) ? $http_port : null;
 		}
-		if($http_port) $db_info->http_port = $http_port;
-		if($https_port) $db_info->https_port = $https_port;
+		if($http_port) {
+			$db_info->http_port = $http_port;
+		}
+		if($https_port) {
+			$db_info->https_port = $https_port;
+		}
 
 		return $db_info;
 	}
@@ -263,12 +286,20 @@ 
 	 */
 	function procInstallFTP()
 	{
-		if(Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
+		if(Context::isInstalled()) {
+			return new BaseObject(-1, 'msg_already_installed');
+		}
 		$ftp_info = Context::gets('ftp_host', 'ftp_user','ftp_password','ftp_port','ftp_root_path');
 		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1';
-		if(!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/';
+		if(!$ftp_info->ftp_port) {
+			$ftp_info->ftp_port = 21;
+		}
+		if(!$ftp_info->ftp_host) {
+			$ftp_info->ftp_host = '127.0.0.1';
+		}
+		if(!$ftp_info->ftp_root_path) {
+			$ftp_info->ftp_root_path = '/';
+		}
 
 		$buff = array('<?php if(!defined("__XE__")) exit();');
 		$buff[] = "\$ftp_info = new stdClass();";
@@ -280,11 +311,15 @@ 
 		// If safe_mode
 		if(ini_get('safe_mode'))
 		{
-			if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1,'msg_safe_mode_ftp_needed');
+			if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) {
+				return new BaseObject(-1,'msg_safe_mode_ftp_needed');
+			}
 
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
+			if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) {
+				return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
+			}
 
 			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
@@ -326,10 +361,16 @@ 
 	{
 		$ftp_info = Context::gets('ftp_user','ftp_password','ftp_port','sftp');
 		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->sftp) $ftp_info->sftp = 'N';
+		if(!$ftp_info->ftp_port) {
+			$ftp_info->ftp_port = 21;
+		}
+		if(!$ftp_info->sftp) {
+			$ftp_info->sftp = 'N';
+		}
 
-		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1,'msg_safe_mode_ftp_needed');
+		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) {
+			return new BaseObject(-1,'msg_safe_mode_ftp_needed');
+		}
 
 		if($ftp_info->sftp == 'Y')
 		{
@@ -338,12 +379,13 @@ 
 			{
 				return new BaseObject(-1,'msg_ftp_invalid_auth_info');
 			}
-		}
-		else
+		} else
 		{
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
+			if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) {
+				return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
+			}
 
 			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
@@ -376,26 +418,47 @@ 
 		}
 
 		// 1. Check permission
-		if(is_writable('./')||is_writable('./files')) $checklist['permission'] = true;
-		else $checklist['permission'] = false;
+		if(is_writable('./')||is_writable('./files')) {
+			$checklist['permission'] = true;
+		} else {
+			$checklist['permission'] = false;
+		}
 		// 2. Check if xml_parser_create exists
-		if(function_exists('xml_parser_create')) $checklist['xml'] = true;
-		else $checklist['xml'] = false;
+		if(function_exists('xml_parser_create')) {
+			$checklist['xml'] = true;
+		} else {
+			$checklist['xml'] = false;
+		}
 		// 3. Check if ini_get (session.auto_start) == 1
-		if(ini_get('session.auto_start')!=1) $checklist['session'] = true;
-		else $checklist['session'] = false;
+		if(ini_get('session.auto_start')!=1) {
+			$checklist['session'] = true;
+		} else {
+			$checklist['session'] = false;
+		}
 		// 4. Check if iconv exists
-		if(function_exists('iconv')) $checklist['iconv'] = true;
-		else $checklist['iconv'] = false;
+		if(function_exists('iconv')) {
+			$checklist['iconv'] = true;
+		} else {
+			$checklist['iconv'] = false;
+		}
 		// 5. Check gd(imagecreatefromgif function)
-		if(function_exists('imagecreatefromgif')) $checklist['gd'] = true;
-		else $checklist['gd'] = false;
+		if(function_exists('imagecreatefromgif')) {
+			$checklist['gd'] = true;
+		} else {
+			$checklist['gd'] = false;
+		}
 		// 6. Check DB
-		if(DB::getEnableList()) $checklist['db'] = true;
-		else $checklist['db'] = false;
+		if(DB::getEnableList()) {
+			$checklist['db'] = true;
+		} else {
+			$checklist['db'] = false;
+		}
 
-		if(!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) $install_enable = false;
-		else $install_enable = true;
+		if(!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) {
+			$install_enable = false;
+		} else {
+			$install_enable = true;
+		}
 
 		// Save the checked result to the Context
 		Context::set('checklist', $checklist);
@@ -418,8 +481,7 @@ 
 		{
 			$currentTime = $_SERVER['REQUEST_TIME'];
 			FileHandler::writeFile($this->flagLicenseAgreement, $currentTime);
-		}
-		else
+		} else
 		{
 			FileHandler::removeFile($this->flagLicenseAgreement);
 			return new BaseObject(-1, 'msg_must_accept_license_agreement');
@@ -514,13 +576,17 @@ 
 			$module = $tmp_arr[count($tmp_arr)-1];
 
 			$xml_info = $oModuleModel->getModuleInfoXml($module);
-			if(!$xml_info) continue;
+			if(!$xml_info) {
+				continue;
+			}
 			$modules[$xml_info->category][] = $module;
 		}
 		// Install "module" module in advance
 		$this->installModule('module','./modules/module');
 		$oModule = getClass('module');
-		if($oModule->checkUpdate()) $oModule->moduleUpdate();
+		if($oModule->checkUpdate()) {
+			$oModule->moduleUpdate();
+		}
 		// Determine the order of module installation depending on category
 		$install_step = array('system','content','member');
 		// Install all the remaining modules
@@ -530,13 +596,17 @@ 
 			{
 				foreach($modules[$category] as $module)
 				{
-					if($module == 'module') continue;
+					if($module == 'module') {
+						continue;
+					}
 					$this->installModule($module, sprintf('./modules/%s', $module));
 
 					$oModule = getClass($module);
 					if(is_object($oModule) && method_exists($oModule, 'checkUpdate'))
 					{
-						if($oModule->checkUpdate()) $oModule->moduleUpdate();
+						if($oModule->checkUpdate()) {
+							$oModule->moduleUpdate();
+						}
 					}
 				}
 				unset($modules[$category]);
@@ -551,13 +621,17 @@ 
 				{
 					foreach($module_list as $module)
 					{
-						if($module == 'module') continue;
+						if($module == 'module') {
+							continue;
+						}
 						$this->installModule($module, sprintf('./modules/%s', $module));
 
 						$oModule = getClass($module);
 						if($oModule && method_exists($oModule, 'checkUpdate') && method_exists($oModule, 'moduleUpdate'))
 						{
-							if($oModule->checkUpdate()) $oModule->moduleUpdate();
+							if($oModule->checkUpdate()) {
+								$oModule->moduleUpdate();
+							}
 						}
 					}
 				}
@@ -582,15 +656,20 @@ 
 		for($i=0;$i<$file_cnt;$i++)
 		{
 			$file = trim($schema_files[$i]);
-			if(!$file || substr($file,-4)!='.xml') continue;
+			if(!$file || substr($file,-4)!='.xml') {
+				continue;
+			}
 			$output = $oDB->createTableByXmlFile($file);
-			if($output === false)
-				throw new Exception('msg_create_table_failed');
+			if($output === false) {
+							throw new Exception('msg_create_table_failed');
+			}
 		}
 		// Create a table and module instance and then execute install() method
 		unset($oModule);
 		$oModule = getClass($module);
-		if(method_exists($oModule, 'moduleInstall')) $oModule->moduleInstall();
+		if(method_exists($oModule, 'moduleInstall')) {
+			$oModule->moduleInstall();
+		}
 		return new BaseObject();
 	}
 
@@ -625,13 +704,17 @@ 
 		$db_tmp_config_file = $this->db_tmp_config_file;
 
 		$db_info = Context::getDBInfo();
-		if(!$db_info) return;
+		if(!$db_info) {
+			return;
+		}
 
 		$buff = $this->_getDBConfigFileContents($db_info);
 
 		FileHandler::writeFile($db_tmp_config_file, $buff);
 
-		if(@file_exists($db_tmp_config_file)) return true;
+		if(@file_exists($db_tmp_config_file)) {
+			return true;
+		}
 		return false;
 	}
 
@@ -651,7 +734,9 @@ 
 
 		FileHandler::writeFile($etc_tmp_config_file, $buff);
 
-		if(@file_exists($etc_tmp_config_file)) return true;
+		if(@file_exists($etc_tmp_config_file)) {
+			return true;
+		}
 		return false;
 	}
 
@@ -666,7 +751,9 @@ 
 			//if(file_exists($config_file)) return;
 
 			$db_info = Context::getDBInfo();
-			if(!$db_info) return;
+			if(!$db_info) {
+				return;
+			}
 
 			$buff = $this->_getDBConfigFileContents($db_info);
 
@@ -687,7 +774,9 @@ 
 	function installByConfig($install_config_file)
 	{
 		include $install_config_file;
-		if(!is_array($auto_config)) return false;
+		if(!is_array($auto_config)) {
+			return false;
+		}
 
 		$auto_config['module'] = 'install';
 		$auto_config['act'] = 'procInstall';
@@ -697,7 +786,9 @@ 
 		$body = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n<methodCall>\r\n<params>\r\n";
 		foreach($auto_config as $k => $v)
 		{
-			if(!in_array($k,array('host','port','path'))) $body .= sprintf($fstr,$k,$v,$k);
+			if(!in_array($k,array('host','port','path'))) {
+				$body .= sprintf($fstr,$k,$v,$k);
+			}
 		}
 		$body .= "</params>\r\n</methodCall>";
 

modules/layout/layout.admin.model.php

Doc Comments +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
 	/**
 	 * get layout setting view.
-	 * @return void
+	 * @return string|null
 	 */
 	public function getLayoutAdminSetInfoView()
 	{

Braces +10 added lines, -5 removed lines

@@ -115,14 +115,17 @@ 
 		{
 			$layout_file  = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
 			$layout_css_file  = $oLayoutModel->getDefaultLayoutCss($layout_info->layout);
-		}
-		else
+		} else
 		{
 			$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
 			$layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
 
-			if(!file_exists($layout_file)) $layout_file = $layout_info->path . 'layout.html';
-			if(!file_exists($layout_css_file)) $layout_css_file = $layout_info->path . 'layout.css';
+			if(!file_exists($layout_file)) {
+				$layout_file = $layout_info->path . 'layout.html';
+			}
+			if(!file_exists($layout_css_file)) {
+				$layout_css_file = $layout_info->path . 'layout.css';
+			}
 		}
 
 		if(file_exists($layout_css_file))
@@ -182,7 +185,9 @@ 
 	{
 		$target = ($viewType == 'M') ? 'mlayout_srl' : 'layout_srl';
 		$designInfoFile = sprintf(_XE_PATH_ . 'files/site_design/design_%s.php', $siteSrl);
-		if(FileHandler::exists($designInfoFile)) include($designInfoFile);
+		if(FileHandler::exists($designInfoFile)) {
+			include($designInfoFile);
+		}
 
 		if(!$designInfo || !$designInfo->{$target})
 		{

Spacing +21 added lines, -21 removed lines

@@ -30,27 +30,27 @@ 
 		preg_match_all('/<!--#JSPLUGIN:(.*)-->/', $html, $m);
 		$pluginList = $m[1];
 
-		foreach($pluginList as $plugin)
+		foreach ($pluginList as $plugin)
 		{
 			$info = Context::getJavascriptPluginInfo($plugin);
-			if(!$info)
+			if (!$info)
 			{
 				continue;
 			}
 
-			foreach($info->jsList as $js)
+			foreach ($info->jsList as $js)
 			{
 				$script .= sprintf('<script src="%s"></script>', $js);
 			}
-			foreach($info->cssList as $css)
+			foreach ($info->cssList as $css)
 			{
 				$csss .= sprintf('<link rel="stylesheet" href="%s" />', $css);
 			}
 		}
 
-		$this->add('html', $csss . $script . $html);
+		$this->add('html', $csss.$script.$html);
 
-		if($isReturn)
+		if ($isReturn)
 		{
 			return $this->get('html');
 		}
@@ -65,7 +65,7 @@ 
 		$layout_info = $oLayoutModel->getLayout($layout_srl);
 
 		// Error appears if there is no layout information is registered
-		if(!$layout_info)
+		if (!$layout_info)
 		{
 			return $this->stop('msg_invalid_request');
 		}
@@ -82,14 +82,14 @@ 
 		$layout_info = $security->encodeHTML('.', 'author..', 'extra_var..');
 
 		$layout_info->description = nl2br(trim($layout_info->description));
-		if(!is_object($layout_info->extra_var))
+		if (!is_object($layout_info->extra_var))
 		{
 			$layout_info->extra_var = new StdClass();
 		}
 
-		foreach($layout_info->extra_var as $var_name => $val)
+		foreach ($layout_info->extra_var as $var_name => $val)
 		{
-			if(isset($layout_info->{$var_name}->description))
+			if (isset($layout_info->{$var_name}->description))
 			{
 				$layout_info->{$var_name}->description = nl2br(trim($val->description));
 			}
@@ -105,27 +105,27 @@ 
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayout($layout_srl);
 		// Error appears if there is no layout information is registered
-		if(!$layout_info)
+		if (!$layout_info)
 		{
 			return $this->dispLayoutAdminInstalledList();
 		}
 
 		// Get Layout Code
-		if($oLayoutModel->useDefaultLayout($layout_info->layout_srl))
+		if ($oLayoutModel->useDefaultLayout($layout_info->layout_srl))
 		{
-			$layout_file  = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
-			$layout_css_file  = $oLayoutModel->getDefaultLayoutCss($layout_info->layout);
+			$layout_file = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
+			$layout_css_file = $oLayoutModel->getDefaultLayoutCss($layout_info->layout);
 		}
 		else
 		{
 			$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
 			$layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
 
-			if(!file_exists($layout_file)) $layout_file = $layout_info->path . 'layout.html';
-			if(!file_exists($layout_css_file)) $layout_css_file = $layout_info->path . 'layout.css';
+			if (!file_exists($layout_file)) $layout_file = $layout_info->path.'layout.html';
+			if (!file_exists($layout_css_file)) $layout_css_file = $layout_info->path.'layout.css';
 		}
 
-		if(file_exists($layout_css_file))
+		if (file_exists($layout_css_file))
 		{
 			$layout_code_css = FileHandler::readFile($layout_css_file);
 			Context::set('layout_code_css', $layout_code_css);
@@ -181,10 +181,10 @@ 
 	public function getSiteDefaultLayout($viewType = 'P', $siteSrl = 0)
 	{
 		$target = ($viewType == 'M') ? 'mlayout_srl' : 'layout_srl';
-		$designInfoFile = sprintf(_XE_PATH_ . 'files/site_design/design_%s.php', $siteSrl);
-		if(FileHandler::exists($designInfoFile)) include($designInfoFile);
+		$designInfoFile = sprintf(_XE_PATH_.'files/site_design/design_%s.php', $siteSrl);
+		if (FileHandler::exists($designInfoFile)) include($designInfoFile);
 
-		if(!$designInfo || !$designInfo->{$target})
+		if (!$designInfo || !$designInfo->{$target})
 		{
 			return 0;
 		}
@@ -192,7 +192,7 @@ 
 		$oModel = getModel('layout');
 		$layout_info = $oModel->getLayout($designInfo->{$target});
 
-		if(!$layout_info)
+		if (!$layout_info)
 		{
 			return 0;
 		}