xpressengine / xe-core

modules/counter/counter.model.php

Braces +29 added lines, -23 removed lines

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

Spacing +48 added lines, -48 removed lines

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

modules/document/document.admin.controller.php

Indentation +4 added lines, -4 removed lines

@@ -721,10 +721,10 @@
 	}
 
 	/**
-	  * @fn procDocumentAdminMoveToTrash
-	  * @brief move a document to trash.
-	  * @see documentModel::getDocumentMenu
-	  */
+	 * @fn procDocumentAdminMoveToTrash
+	 * @brief move a document to trash.
+	 * @see documentModel::getDocumentMenu
+	 */
 	function procDocumentAdminMoveToTrash()
 	{
 		$document_srl = Context::get('document_srl');

Doc Comments +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
 
 	/**
 	 * Remove the selected docs from admin page
-	 * @return void
+	 * @return ModuleObject|null
 	 */
 	function procDocumentAdminDeleteChecked()
 	{
@@ -869,8 +869,8 @@ 
 	/**
 	 * Restore document from trash module, called by trash module
 	 * This method is passived
-	 * @param object|array $originObject
-	 * @return object
+	 * @param string $originObject
+	 * @return BaseObject
 	 */
 	function restoreTrash($originObject)
 	{

Spacing +127 added lines, -127 removed lines

@@ -27,21 +27,21 @@ 
 	{
 		// error appears if no doc is selected
 		$cart = Context::get('cart');
-		if(!$cart) return $this->stop('msg_cart_is_null');
-		$document_srl_list= explode('|@|', $cart);
+		if (!$cart) return $this->stop('msg_cart_is_null');
+		$document_srl_list = explode('|@|', $cart);
 		$document_count = count($document_srl_list);
-		if(!$document_count) return $this->stop('msg_cart_is_null');
+		if (!$document_count) return $this->stop('msg_cart_is_null');
 		// Delete a doc
 		$oDocumentController = getController('document');
-		for($i=0;$i<$document_count;$i++)
+		for ($i = 0; $i < $document_count; $i++)
 		{
 			$document_srl = trim($document_srl_list[$i]);
-			if(!$document_srl) continue;
+			if (!$document_srl) continue;
 
 			$oDocumentController->deleteDocument($document_srl, true);
 		}
 
-		$this->setMessage(sprintf(Context::getLang('msg_checked_document_is_deleted'), $document_count) );
+		$this->setMessage(sprintf(Context::getLang('msg_checked_document_is_deleted'), $document_count));
 	}
 
 	/**
@@ -53,7 +53,7 @@ 
 	 */
 	function moveDocumentModule($document_srl_list, $module_srl, $category_srl)
 	{
-		if(!count($document_srl_list)) return;
+		if (!count($document_srl_list)) return;
 
 		$oDocumentModel = getModel('document');
 		$oDocumentController = getController('document');
@@ -62,24 +62,24 @@ 
 		$oDB->begin();
 
 		$triggerObj = new stdClass();
-		$triggerObj->document_srls = implode(',',$document_srl_list);
+		$triggerObj->document_srls = implode(',', $document_srl_list);
 		$triggerObj->module_srl = $module_srl;
 		$triggerObj->source_module_srl = array();
 		$triggerObj->category_srl = $category_srl;
 
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.moveDocumentModule', 'before', $triggerObj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		for($i=count($document_srl_list)-1;$i>=0;$i--)
+		for ($i = count($document_srl_list) - 1; $i >= 0; $i--)
 		{
 			$document_srl = $document_srl_list[$i];
 			$oDocument = $oDocumentModel->getDocument($document_srl);
-			if(!$oDocument->isExists()) continue;
+			if (!$oDocument->isExists()) continue;
 
 			$triggerObj->source_module_srl[$document_srl] = $oDocument->get('module_srl');
 
@@ -94,27 +94,27 @@ 
 			$obj->content = $output_ori->data->content;
 
 			// Move the attached file if the target module is different
-			if($module_srl != $obj->module_srl && $oDocument->hasUploadedFiles())
+			if ($module_srl != $obj->module_srl && $oDocument->hasUploadedFiles())
 			{
 				$oFileController = getController('file');
 
 				$files = $oDocument->getUploadedFiles();
 				$delete_file_srls = array();
-				if(is_array($files))
+				if (is_array($files))
 				{
-					foreach($files as $val)
+					foreach ($files as $val)
 					{
 						$file_info = array();
 						$file_info['tmp_name'] = $val->uploaded_filename;
 						$file_info['name'] = $val->source_filename;
 						$inserted_file = $oFileController->insertFile($file_info, $module_srl, $obj->document_srl, $val->download_count, true);
-						if($inserted_file && $inserted_file->toBool())
+						if ($inserted_file && $inserted_file->toBool())
 						{
 							// for image/video files
-							if($val->direct_download == 'Y')
+							if ($val->direct_download == 'Y')
 							{
-								$source_filename = substr($val->uploaded_filename,2);
-								$target_filename = substr($inserted_file->get('uploaded_filename'),2);
+								$source_filename = substr($val->uploaded_filename, 2);
+								$target_filename = substr($inserted_file->get('uploaded_filename'), 2);
 								$obj->content = str_replace($source_filename, $target_filename, $obj->content);
 								// For binary files
 							}
@@ -133,7 +133,7 @@ 
 				$oFileController->setFilesValid($obj->document_srl);
 			}
 
-			if($module_srl != $obj->module_srl)
+			if ($module_srl != $obj->module_srl)
 			{
 				$oDocumentController->deleteDocumentAliasByDocument($obj->document_srl);
 			}
@@ -141,48 +141,48 @@ 
 			$obj->module_srl = $module_srl;
 			$obj->category_srl = $category_srl;
 			$output = executeQuery('document.updateDocumentModule', $obj);
-			if(!$output->toBool()) {
+			if (!$output->toBool()) {
 				$oDB->rollback();
 				return $output;
 			}
 
 			//Move a module of the extra vars
 			$output = executeQuery('document.moveDocumentExtraVars', $obj);
-			if(!$output->toBool()) {
+			if (!$output->toBool()) {
 				$oDB->rollback();
 				return $output;
 			}
 			// Set 0 if a new category doesn't exist after catergory change
-			if($source_category_srl != $category_srl)
+			if ($source_category_srl != $category_srl)
 			{
-				if($source_category_srl) $oDocumentController->updateCategoryCount($oDocument->get('module_srl'), $source_category_srl);
-				if($category_srl) $oDocumentController->updateCategoryCount($module_srl, $category_srl);
+				if ($source_category_srl) $oDocumentController->updateCategoryCount($oDocument->get('module_srl'), $source_category_srl);
+				if ($category_srl) $oDocumentController->updateCategoryCount($module_srl, $category_srl);
 			}
 		}
 
 		$args = new stdClass();
-		$args->document_srls = implode(',',$document_srl_list);
+		$args->document_srls = implode(',', $document_srl_list);
 		$args->module_srl = $module_srl;
 		// move the comment
 		$output = executeQuery('comment.updateCommentModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		$output = executeQuery('comment.updateCommentListModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 		
 		// move the trackback
-		if(getClass('trackback'))
+		if (getClass('trackback'))
 		{
 			$output = executeQuery('trackback.updateTrackbackModule', $args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -191,14 +191,14 @@ 
 
 		// Tags
 		$output = executeQuery('tag.updateTagModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.moveDocumentModule', 'after', $triggerObj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -207,11 +207,11 @@ 
 		$oDB->commit();
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			foreach($document_srl_list as $document_srl)
+			foreach ($document_srl_list as $document_srl)
 			{
-				$cache_key_item = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+				$cache_key_item = 'document_item:'.getNumberingPath($document_srl).$document_srl;
 				$oCacheHandler->delete($cache_key_item);
 			}
 		}
@@ -227,7 +227,7 @@ 
 	 */
 	function copyDocumentModule($document_srl_list, $module_srl, $category_srl)
 	{
-		if(count($document_srl_list) < 1) return;
+		if (count($document_srl_list) < 1) return;
 
 		$oDocumentModel = getModel('document');
 		$oDocumentController = getController('document');
@@ -238,12 +238,12 @@ 
 		$oDB->begin();
 
 		$triggerObj = new stdClass();
-		$triggerObj->document_srls = implode(',',$document_srl_list);
+		$triggerObj->document_srls = implode(',', $document_srl_list);
 		$triggerObj->module_srl = $module_srl;
 		$triggerObj->category_srl = $category_srl;
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.copyDocumentModule', 'before', $triggerObj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -251,11 +251,11 @@ 
 
 		$extraVarsList = $oDocumentModel->getDocumentExtraVarsFromDB($document_srl_list);
 		$extraVarsListByDocumentSrl = array();
-		if(is_array($extraVarsList->data))
+		if (is_array($extraVarsList->data))
 		{
-			foreach($extraVarsList->data as $value)
+			foreach ($extraVarsList->data as $value)
 			{
-				if(!isset($extraVarsListByDocumentSrl[$value->document_srl]))
+				if (!isset($extraVarsListByDocumentSrl[$value->document_srl]))
 				{
 					$extraVarsListByDocumentSrl[$value->document_srl] = array();
 				}
@@ -264,22 +264,22 @@ 
 			}
 		}
 
-		for($i=count($document_srl_list)-1;$i>=0;$i--)
+		for ($i = count($document_srl_list) - 1; $i >= 0; $i--)
 		{
 			$document_srl = $document_srl_list[$i];
 			$oDocument = $oDocumentModel->getDocument($document_srl);
-			if(!$oDocument->isExists()) continue;
+			if (!$oDocument->isExists()) continue;
 
 			$obj = $oDocument->getObjectVars();
 
 			$extraVars = $extraVarsListByDocumentSrl[$document_srl];
-			if($module_srl == $obj->module_srl)
+			if ($module_srl == $obj->module_srl)
 			{
-				if(is_array($extraVars))
+				if (is_array($extraVars))
 				{
-					foreach($extraVars as $extraItem)
+					foreach ($extraVars as $extraItem)
 					{
-						if($extraItem->var_idx >= 0) $obj->{'extra_vars'.$extraItem->var_idx} = $extraItem->value;
+						if ($extraItem->var_idx >= 0) $obj->{'extra_vars'.$extraItem->var_idx} = $extraItem->value;
 					}
 				}
 			}
@@ -291,10 +291,10 @@ 
 			$obj->trackback_count = 0;
 
 			// Pre-register the attachment
-			if($oDocument->hasUploadedFiles())
+			if ($oDocument->hasUploadedFiles())
 			{
 				$files = $oDocument->getUploadedFiles();
-				foreach($files as $val)
+				foreach ($files as $val)
 				{
 					$file_info = array();
 					$file_info['tmp_name'] = $val->uploaded_filename;
@@ -302,10 +302,10 @@ 
 					$oFileController = getController('file');
 					$inserted_file = $oFileController->insertFile($file_info, $module_srl, $obj->document_srl, 0, true);
 					// if image/video files
-					if($val->direct_download == 'Y')
+					if ($val->direct_download == 'Y')
 					{
-						$source_filename = substr($val->uploaded_filename,2);
-						$target_filename = substr($inserted_file->get('uploaded_filename'),2);
+						$source_filename = substr($val->uploaded_filename, 2);
+						$target_filename = substr($inserted_file->get('uploaded_filename'), 2);
 						$obj->content = str_replace($source_filename, $target_filename, $obj->content);
 						// If binary file
 					}
@@ -319,23 +319,23 @@ 
 
 			// Write a post
 			$output = $oDocumentController->insertDocument($obj, true, true);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
 			}
 
 			// copy multi language contents
-			if(is_array($extraVars))
+			if (is_array($extraVars))
 			{
-				foreach($extraVars as $value)
+				foreach ($extraVars as $value)
 				{
-					if($value->idx >= 0 && $value->lang_code == Context::getLangType())
+					if ($value->idx >= 0 && $value->lang_code == Context::getLangType())
 					{
 						continue;
 					}
 
-					if( $value->var_idx < 0 || ($module_srl == $value->module_srl && $value->var_idx >= 0) )
+					if ($value->var_idx < 0 || ($module_srl == $value->module_srl && $value->var_idx >= 0))
 					{
 						$oDocumentController->insertDocumentExtraVar($value->module_srl, $obj->document_srl, $value->var_idx, $value->value, $value->eid, $value->lang_code);
 					}
@@ -343,26 +343,26 @@ 
 			}
 
 			// Move the comments
-			if($oDocument->getCommentCount())
+			if ($oDocument->getCommentCount())
 			{
 				$oCommentModel = getModel('comment');
 				$comment_output = $oCommentModel->getCommentList($document_srl, 0, true, 99999999);
 				$comments = $comment_output->data;
-				if(count($comments) > 0)
+				if (count($comments) > 0)
 				{
 					$oCommentController = getController('comment');
 					$success_count = 0;
 					$p_comment_srl = array();
-					foreach($comments as $comment_obj)
+					foreach ($comments as $comment_obj)
 					{
 						$comment_srl = getNextSequence();
 						$p_comment_srl[$comment_obj->comment_srl] = $comment_srl;
 
 						// Pre-register the attachment
-						if($comment_obj->uploaded_count)
+						if ($comment_obj->uploaded_count)
 						{
 							$files = $oFileModel->getFiles($comment_obj->comment_srl, true);
-							foreach($files as $val)
+							foreach ($files as $val)
 							{
 								$file_info = array();
 								$file_info['tmp_name'] = $val->uploaded_filename;
@@ -370,10 +370,10 @@ 
 								$oFileController = getController('file');
 								$inserted_file = $oFileController->insertFile($file_info, $module_srl, $comment_srl, 0, true);
 								// if image/video files
-								if($val->direct_download == 'Y')
+								if ($val->direct_download == 'Y')
 								{
-									$source_filename = substr($val->uploaded_filename,2);
-									$target_filename = substr($inserted_file->get('uploaded_filename'),2);
+									$source_filename = substr($val->uploaded_filename, 2);
+									$target_filename = substr($inserted_file->get('uploaded_filename'), 2);
 									$comment_obj->content = str_replace($source_filename, $target_filename, $comment_obj->content);
 									// If binary file
 								}
@@ -389,10 +389,10 @@ 
 						$comment_obj->document_srl = $obj->document_srl;
 						$comment_obj->comment_srl = $comment_srl;
 
-						if($comment_obj->parent_srl) $comment_obj->parent_srl = $p_comment_srl[$comment_obj->parent_srl];
+						if ($comment_obj->parent_srl) $comment_obj->parent_srl = $p_comment_srl[$comment_obj->parent_srl];
 
 						$output = $oCommentController->insertComment($comment_obj, true);
-						if($output->toBool()) $success_count ++;
+						if ($output->toBool()) $success_count++;
 					}
 					$oDocumentController->updateCommentCount($obj->document_srl, $success_count, $comment_obj->nick_name, true);
 				}
@@ -400,19 +400,19 @@ 
 
 			// Move the trackbacks
 			$oTrackbackModel = getModel('trackback');
-			if($oTrackbackModel && $oDocument->getTrackbackCount())
+			if ($oTrackbackModel && $oDocument->getTrackbackCount())
 			{
 				$trackbacks = $oTrackbackModel->getTrackbackList($oDocument->document_srl);
-				if(count($trackbacks))
+				if (count($trackbacks))
 				{
 					$success_count = 0;
-					foreach($trackbacks as $trackback_obj)
+					foreach ($trackbacks as $trackback_obj)
 					{
 						$trackback_obj->trackback_srl = getNextSequence();
 						$trackback_obj->module_srl = $obj->module_srl;
 						$trackback_obj->document_srl = $obj->document_srl;
 						$output = executeQuery('trackback.insertTrackback', $trackback_obj);
-						if($output->toBool()) $success_count++;
+						if ($output->toBool()) $success_count++;
 					}
 					// Update the number of trackbacks
 					$oDocumentController->updateTrackbackCount($obj->document_srl, $success_count);
@@ -425,7 +425,7 @@ 
 		// Call a trigger (before)
 		$triggerObj->copied_srls = $copied_srls;
 		$output = ModuleHandler::triggerCall('document.copyDocumentModule', 'after', $triggerObj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -452,7 +452,7 @@ 
 		$document_list = $oDocumentModel->getDocumentList($args);
 		$documents = $document_list->data;
 		$output = executeQuery('document.deleteModuleDocument', $args);
-		if(is_array($documents))
+		if (is_array($documents))
 		{
 			foreach ($documents as $oDocument)
 			{
@@ -461,13 +461,13 @@ 
 		}
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			if(is_array($document_srl_list))
+			if (is_array($document_srl_list))
 			{
-				foreach($document_srl_list as $document_srl)
+				foreach ($document_srl_list as $document_srl)
 				{
-					$cache_key_item = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+					$cache_key_item = 'document_item:'.getNumberingPath($document_srl).$document_srl;
 					$oCacheHandler->delete($cache_key_item);
 				}
 			}
@@ -486,8 +486,8 @@ 
 		$config = getModel('document')->getDocumentConfig();
 		$config->icons = Context::get('icons');
 		$config->micons = Context::get('micons');
-		$output = $oModuleController->insertModuleConfig('document',$config);
-		if(!$output->toBool())
+		$output = $oModuleController->insertModuleConfig('document', $config);
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -506,11 +506,11 @@ 
 	{
 		$document_srl = trim(Context::get('document_srl'));
 
-		if($document_srl)
+		if ($document_srl)
 		{
 			$args->document_srl = $document_srl;
 			$output = executeQuery('document.deleteDeclaredDocuments', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 	}
 
@@ -520,7 +520,7 @@ 
 	 */
 	function procDocumentAdminDeleteAllThumbnail()
 	{
-		$temp_cache_dir = './files/thumbnails_' . $_SERVER['REQUEST_TIME'];
+		$temp_cache_dir = './files/thumbnails_'.$_SERVER['REQUEST_TIME'];
 		FileHandler::rename('./files/thumbnails', $temp_cache_dir);
 		FileHandler::makeDir('./files/thumbnails');
 
@@ -536,12 +536,12 @@ 
 	function deleteThumbnailFile($path)
 	{
 		$directory = dir($path);
-		while($entry = $directory->read()) {
+		while ($entry = $directory->read()) {
 			if ($entry != "." && $entry != "..") {
 				if (is_dir($path."/".$entry)) {
 					$this->deleteThumbnailFile($path."/".$entry);
 				} else {
-					if(!preg_match('/^thumbnail_([^\.]*)\.jpg$/i',$entry)) continue;
+					if (!preg_match('/^thumbnail_([^\.]*)\.jpg$/i', $entry)) continue;
 					FileHandler::removeFile($path.'/'.$entry);
 				}
 			}
@@ -566,13 +566,13 @@ 
 		$eid = Context::get('eid');
 		$obj = new stdClass();
 
-		if(!$module_srl || !$name || !$eid) return new BaseObject(-1,'msg_invalid_request');
+		if (!$module_srl || !$name || !$eid) return new BaseObject(-1, 'msg_invalid_request');
 		// set the max value if idx is not specified
-		if(!$var_idx)
+		if (!$var_idx)
 		{
 			$obj->module_srl = $module_srl;
 			$output = executeQuery('document.getDocumentMaxExtraKeyIdx', $obj);
-			$var_idx = $output->data->var_idx+1;
+			$var_idx = $output->data->var_idx + 1;
 		}
 
 		// Check if the module name already exists
@@ -580,7 +580,7 @@ 
 		$obj->var_idx = $var_idx;
 		$obj->eid = $eid;
 		$output = executeQuery('document.isExistsExtraKey', $obj);
-		if(!$output->toBool() || $output->data->count)
+		if (!$output->toBool() || $output->data->count)
 		{
 			return new BaseObject(-1, 'msg_extra_name_exists');
 		}
@@ -588,7 +588,7 @@ 
 		// insert or update
 		$oDocumentController = getController('document');
 		$output = $oDocumentController->insertDocumentExtraKey($module_srl, $var_idx, $name, $type, $is_required, $search, $default, $desc, $eid);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage('success_registed');
 
@@ -604,11 +604,11 @@ 
 	{
 		$module_srl = Context::get('module_srl');
 		$var_idx = Context::get('var_idx');
-		if(!$module_srl || !$var_idx) return new BaseObject(-1,'msg_invalid_request');
+		if (!$module_srl || !$var_idx) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oDocumentController = getController('document');
 		$output = $oDocumentController->deleteDocumentExtraKeys($module_srl, $var_idx);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage('success_deleted');
 	}
@@ -623,19 +623,19 @@ 
 		$module_srl = Context::get('module_srl');
 		$var_idx = Context::get('var_idx');
 
-		if(!$type || !$module_srl || !$var_idx) return new BaseObject(-1,'msg_invalid_request');
+		if (!$type || !$module_srl || !$var_idx) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if(!$module_info->module_srl) return new BaseObject(-1,'msg_invalid_request');
+		if (!$module_info->module_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oDocumentModel = getModel('document');
 		$extra_keys = $oDocumentModel->getExtraKeys($module_srl);
-		if(!$extra_keys[$var_idx]) return new BaseObject(-1,'msg_invalid_request');
+		if (!$extra_keys[$var_idx]) return new BaseObject(-1, 'msg_invalid_request');
 
-		if($type == 'up') $new_idx = $var_idx-1;
-		else $new_idx = $var_idx+1;
-		if($new_idx<1) return new BaseObject(-1,'msg_invalid_request');
+		if ($type == 'up') $new_idx = $var_idx - 1;
+		else $new_idx = $var_idx + 1;
+		if ($new_idx < 1) return new BaseObject(-1, 'msg_invalid_request');
 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
@@ -646,16 +646,16 @@ 
 		unset($args);
 
 		// update immediately if there is no idx to change
-		if(!$extra_keys[$new_idx])
+		if (!$extra_keys[$new_idx])
 		{
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$args->var_idx = $var_idx;
 			$args->new_idx = $new_idx;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 			// replace if exists
 		}
 		else
@@ -665,27 +665,27 @@ 
 			$args->var_idx = $new_idx;
 			$args->new_idx = -10000;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 
 			$args->var_idx = $var_idx;
 			$args->new_idx = $new_idx;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 
 			$args->var_idx = -10000;
 			$args->new_idx = $var_idx;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'module_document_extra_keys:'.$module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
@@ -699,9 +699,9 @@ 
 	 */
 	function procDocumentAdminInsertAlias()
 	{
-		$args = Context::gets('module_srl','document_srl', 'alias_title');
+		$args = Context::gets('module_srl', 'document_srl', 'alias_title');
 		$alias_srl = Context::get('alias_srl');
-		if(!$alias_srl)
+		if (!$alias_srl)
 		{
 			$args->alias_srl = getNextSequence();
 			$query = "document.insertAlias";
@@ -744,7 +744,7 @@ 
 		$oDocumentModel = getModel('document');
 		$oDocumentController = getController('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
-		if(!$oDocument->isGranted()) return $this->stop('msg_not_permitted');
+		if (!$oDocument->isGranted()) return $this->stop('msg_not_permitted');
 	
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByDocumentSrl($document_srl);
@@ -756,31 +756,31 @@ 
 		$oDocumentController->moveDocumentToTrash($args);
 
 		$returnUrl = Context::get('success_return_url');
-		if(!$returnUrl)	
+		if (!$returnUrl)	
 		{
 			$arrUrl = parse_url(Context::get('cur_url'));
 			$query = "";
 
-			if($arrUrl['query'])
+			if ($arrUrl['query'])
 			{
 				parse_str($arrUrl['query'], $arrQuery);
 
 				// set query
-				if(isset($arrQuery['document_srl']))
+				if (isset($arrQuery['document_srl']))
 					unset($arrQuery['document_srl']);
 
 				$searchArgs = new stdClass;
-				foreach($arrQuery as $key=>$val)
+				foreach ($arrQuery as $key=>$val)
 				{
 					$searchArgs->{$key} = $val;
 				}
 
-				if(!isset($searchArgs->sort_index))
+				if (!isset($searchArgs->sort_index))
 					$searchArgs->sort_index = $module_info->order_target;
 
-				foreach($module_info as $key=>$val)
+				foreach ($module_info as $key=>$val)
 				{
-					if(!isset($searchArgs->{$key}))
+					if (!isset($searchArgs->{$key}))
 						$searchArgs->{$key} = $val;
 				}
 
@@ -788,20 +788,20 @@ 
 				$output = $oDocumentModel->getDocumentList($searchArgs, $module_info->except_notice, TRUE, array('document_srl'));
 
 				$cur_page = 1;
-				if(isset($arrQuery['page'])) {
-					$cur_page = (int)$arrQuery['page'];
+				if (isset($arrQuery['page'])) {
+					$cur_page = (int) $arrQuery['page'];
 				}
 
 
-				if($cur_page>1 && count($output->data) == 0)
+				if ($cur_page > 1 && count($output->data) == 0)
 					$arrQuery['page'] = $cur_page - 1;
 
 				$query = "?";
-				foreach($arrQuery as $key=>$val)
+				foreach ($arrQuery as $key=>$val)
 					$query .= sprintf("%s=%s&", $key, $val);
 				$query = substr($query, 0, -1);
 			}
-			$returnUrl = $arrUrl['path'] . $query;
+			$returnUrl = $arrUrl['path'].$query;
 		}
 
 		$this->add('redirect_url', $returnUrl);
@@ -878,7 +878,7 @@ 
 	 */
 	function restoreTrash($originObject)
 	{
-		if(is_array($originObject)) $originObject = (object)$originObject;
+		if (is_array($originObject)) $originObject = (object) $originObject;
 
 		$oDocumentController = getController('document');
 		$oDocumentModel = getModel('document');
@@ -888,12 +888,12 @@ 
 
 		//DB restore
 		$output = $oDocumentController->insertDocument($originObject, false, true, false);
-		if(!$output->toBool()) return new BaseObject(-1, $output->getMessage());
+		if (!$output->toBool()) return new BaseObject(-1, $output->getMessage());
 
 		//FILE restore
 		$oDocument = $oDocumentModel->getDocument($originObject->document_srl);
 		// If the post was not temorarily saved, set the attachment's status to be valid
-		if($oDocument->hasUploadedFiles() && $originObject->member_srl != $originObject->module_srl)
+		if ($oDocument->hasUploadedFiles() && $originObject->member_srl != $originObject->module_srl)
 		{
 			$args = new stdClass();
 			$args->upload_target_srl = $oDocument->document_srl;
@@ -902,10 +902,10 @@ 
 		}
 
 		// call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('document.restoreTrash', 'after', $originObject);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -926,7 +926,7 @@ 
 	function emptyTrash($originObject)
 	{
 		$originObject = unserialize($originObject);
-		if(is_array($originObject)) $originObject = (object) $originObject;
+		if (is_array($originObject)) $originObject = (object) $originObject;
 
 		$oDocument = new documentItem();
 		$oDocument->setAttribute($originObject);

Braces +136 added lines, -59 removed lines

@@ -27,16 +27,22 @@ 
 	{
 		// error appears if no doc is selected
 		$cart = Context::get('cart');
-		if(!$cart) return $this->stop('msg_cart_is_null');
+		if(!$cart) {
+			return $this->stop('msg_cart_is_null');
+		}
 		$document_srl_list= explode('|@|', $cart);
 		$document_count = count($document_srl_list);
-		if(!$document_count) return $this->stop('msg_cart_is_null');
+		if(!$document_count) {
+			return $this->stop('msg_cart_is_null');
+		}
 		// Delete a doc
 		$oDocumentController = getController('document');
 		for($i=0;$i<$document_count;$i++)
 		{
 			$document_srl = trim($document_srl_list[$i]);
-			if(!$document_srl) continue;
+			if(!$document_srl) {
+				continue;
+			}
 
 			$oDocumentController->deleteDocument($document_srl, true);
 		}
@@ -53,7 +59,9 @@ 
 	 */
 	function moveDocumentModule($document_srl_list, $module_srl, $category_srl)
 	{
-		if(!count($document_srl_list)) return;
+		if(!count($document_srl_list)) {
+			return;
+		}
 
 		$oDocumentModel = getModel('document');
 		$oDocumentController = getController('document');
@@ -79,7 +87,9 @@ 
 		{
 			$document_srl = $document_srl_list[$i];
 			$oDocument = $oDocumentModel->getDocument($document_srl);
-			if(!$oDocument->isExists()) continue;
+			if(!$oDocument->isExists()) {
+				continue;
+			}
 
 			$triggerObj->source_module_srl[$document_srl] = $oDocument->get('module_srl');
 
@@ -117,8 +127,7 @@ 
 								$target_filename = substr($inserted_file->get('uploaded_filename'),2);
 								$obj->content = str_replace($source_filename, $target_filename, $obj->content);
 								// For binary files
-							}
-							else
+							} else
 							{
 								$obj->content = str_replace('file_srl='.$val->file_srl, 'file_srl='.$inserted_file->get('file_srl'), $obj->content);
 								$obj->content = str_replace('sid='.$val->sid, 'sid='.$inserted_file->get('sid'), $obj->content);
@@ -155,8 +164,12 @@ 
 			// Set 0 if a new category doesn't exist after catergory change
 			if($source_category_srl != $category_srl)
 			{
-				if($source_category_srl) $oDocumentController->updateCategoryCount($oDocument->get('module_srl'), $source_category_srl);
-				if($category_srl) $oDocumentController->updateCategoryCount($module_srl, $category_srl);
+				if($source_category_srl) {
+					$oDocumentController->updateCategoryCount($oDocument->get('module_srl'), $source_category_srl);
+				}
+				if($category_srl) {
+					$oDocumentController->updateCategoryCount($module_srl, $category_srl);
+				}
 			}
 		}
 
@@ -227,7 +240,9 @@ 
 	 */
 	function copyDocumentModule($document_srl_list, $module_srl, $category_srl)
 	{
-		if(count($document_srl_list) < 1) return;
+		if(count($document_srl_list) < 1) {
+			return;
+		}
 
 		$oDocumentModel = getModel('document');
 		$oDocumentController = getController('document');
@@ -268,7 +283,9 @@ 
 		{
 			$document_srl = $document_srl_list[$i];
 			$oDocument = $oDocumentModel->getDocument($document_srl);
-			if(!$oDocument->isExists()) continue;
+			if(!$oDocument->isExists()) {
+				continue;
+			}
 
 			$obj = $oDocument->getObjectVars();
 
@@ -279,7 +296,9 @@ 
 				{
 					foreach($extraVars as $extraItem)
 					{
-						if($extraItem->var_idx >= 0) $obj->{'extra_vars'.$extraItem->var_idx} = $extraItem->value;
+						if($extraItem->var_idx >= 0) {
+							$obj->{'extra_vars'.$extraItem->var_idx} = $extraItem->value;
+						}
 					}
 				}
 			}
@@ -308,8 +327,7 @@ 
 						$target_filename = substr($inserted_file->get('uploaded_filename'),2);
 						$obj->content = str_replace($source_filename, $target_filename, $obj->content);
 						// If binary file
-					}
-					else
+					} else
 					{
 						$obj->content = str_replace('file_srl='.$val->file_srl, 'file_srl='.$inserted_file->get('file_srl'), $obj->content);
 						$obj->content = str_replace('sid='.$val->sid, 'sid='.$inserted_file->get('sid'), $obj->content);
@@ -376,8 +394,7 @@ 
 									$target_filename = substr($inserted_file->get('uploaded_filename'),2);
 									$comment_obj->content = str_replace($source_filename, $target_filename, $comment_obj->content);
 									// If binary file
-								}
-								else
+								} else
 								{
 									$comment_obj->content = str_replace('file_srl='.$val->file_srl, 'file_srl='.$inserted_file->get('file_srl'), $comment_obj->content);
 									$comment_obj->content = str_replace('sid='.$val->sid, 'sid='.$inserted_file->get('sid'), $comment_obj->content);
@@ -389,10 +406,14 @@ 
 						$comment_obj->document_srl = $obj->document_srl;
 						$comment_obj->comment_srl = $comment_srl;
 
-						if($comment_obj->parent_srl) $comment_obj->parent_srl = $p_comment_srl[$comment_obj->parent_srl];
+						if($comment_obj->parent_srl) {
+							$comment_obj->parent_srl = $p_comment_srl[$comment_obj->parent_srl];
+						}
 
 						$output = $oCommentController->insertComment($comment_obj, true);
-						if($output->toBool()) $success_count ++;
+						if($output->toBool()) {
+							$success_count ++;
+						}
 					}
 					$oDocumentController->updateCommentCount($obj->document_srl, $success_count, $comment_obj->nick_name, true);
 				}
@@ -412,7 +433,9 @@ 
 						$trackback_obj->module_srl = $obj->module_srl;
 						$trackback_obj->document_srl = $obj->document_srl;
 						$output = executeQuery('trackback.insertTrackback', $trackback_obj);
-						if($output->toBool()) $success_count++;
+						if($output->toBool()) {
+							$success_count++;
+						}
 					}
 					// Update the number of trackbacks
 					$oDocumentController->updateTrackbackCount($obj->document_srl, $success_count);
@@ -510,7 +533,9 @@ 
 		{
 			$args->document_srl = $document_srl;
 			$output = executeQuery('document.deleteDeclaredDocuments', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 	}
 
@@ -541,7 +566,9 @@ 
 				if (is_dir($path."/".$entry)) {
 					$this->deleteThumbnailFile($path."/".$entry);
 				} else {
-					if(!preg_match('/^thumbnail_([^\.]*)\.jpg$/i',$entry)) continue;
+					if(!preg_match('/^thumbnail_([^\.]*)\.jpg$/i',$entry)) {
+						continue;
+					}
 					FileHandler::removeFile($path.'/'.$entry);
 				}
 			}
@@ -566,7 +593,9 @@ 
 		$eid = Context::get('eid');
 		$obj = new stdClass();
 
-		if(!$module_srl || !$name || !$eid) return new BaseObject(-1,'msg_invalid_request');
+		if(!$module_srl || !$name || !$eid) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 		// set the max value if idx is not specified
 		if(!$var_idx)
 		{
@@ -588,7 +617,9 @@ 
 		// insert or update
 		$oDocumentController = getController('document');
 		$output = $oDocumentController->insertDocumentExtraKey($module_srl, $var_idx, $name, $type, $is_required, $search, $default, $desc, $eid);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage('success_registed');
 
@@ -604,11 +635,15 @@ 
 	{
 		$module_srl = Context::get('module_srl');
 		$var_idx = Context::get('var_idx');
-		if(!$module_srl || !$var_idx) return new BaseObject(-1,'msg_invalid_request');
+		if(!$module_srl || !$var_idx) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$oDocumentController = getController('document');
 		$output = $oDocumentController->deleteDocumentExtraKeys($module_srl, $var_idx);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage('success_deleted');
 	}
@@ -623,26 +658,41 @@ 
 		$module_srl = Context::get('module_srl');
 		$var_idx = Context::get('var_idx');
 
-		if(!$type || !$module_srl || !$var_idx) return new BaseObject(-1,'msg_invalid_request');
+		if(!$type || !$module_srl || !$var_idx) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if(!$module_info->module_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$module_info->module_srl) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$oDocumentModel = getModel('document');
 		$extra_keys = $oDocumentModel->getExtraKeys($module_srl);
-		if(!$extra_keys[$var_idx]) return new BaseObject(-1,'msg_invalid_request');
+		if(!$extra_keys[$var_idx]) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
-		if($type == 'up') $new_idx = $var_idx-1;
-		else $new_idx = $var_idx+1;
-		if($new_idx<1) return new BaseObject(-1,'msg_invalid_request');
+		if($type == 'up') {
+			$new_idx = $var_idx-1;
+		} else {
+			$new_idx = $var_idx+1;
+		}
+		if($new_idx<1) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$args->var_idx = $new_idx;
 		$output = executeQuery('document.getDocumentExtraKeys', $args);
-		if (!$output->toBool()) return $output;
-		if (!$output->data) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$output->toBool()) {
+			return $output;
+		}
+		if (!$output->data) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 		unset($args);
 
 		// update immediately if there is no idx to change
@@ -653,35 +703,50 @@ 
 			$args->var_idx = $var_idx;
 			$args->new_idx = $new_idx;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			// replace if exists
-		}
-		else
+		} else
 		{
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$args->var_idx = $new_idx;
 			$args->new_idx = -10000;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			$args->var_idx = $var_idx;
 			$args->new_idx = $new_idx;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			$args->var_idx = -10000;
 			$args->new_idx = $var_idx;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
@@ -705,8 +770,7 @@ 
 		{
 			$args->alias_srl = getNextSequence();
 			$query = "document.insertAlias";
-		}
-		else
+		} else
 		{
 			$args->alias_srl = $alias_srl;
 			$query = "document.updateAlias";
@@ -744,7 +808,9 @@ 
 		$oDocumentModel = getModel('document');
 		$oDocumentController = getController('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
-		if(!$oDocument->isGranted()) return $this->stop('msg_not_permitted');
+		if(!$oDocument->isGranted()) {
+			return $this->stop('msg_not_permitted');
+		}
 	
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByDocumentSrl($document_srl);
@@ -766,8 +832,9 @@ 
 				parse_str($arrUrl['query'], $arrQuery);
 
 				// set query
-				if(isset($arrQuery['document_srl']))
-					unset($arrQuery['document_srl']);
+				if(isset($arrQuery['document_srl'])) {
+									unset($arrQuery['document_srl']);
+				}
 
 				$searchArgs = new stdClass;
 				foreach($arrQuery as $key=>$val)
@@ -775,13 +842,15 @@ 
 					$searchArgs->{$key} = $val;
 				}
 
-				if(!isset($searchArgs->sort_index))
-					$searchArgs->sort_index = $module_info->order_target;
+				if(!isset($searchArgs->sort_index)) {
+									$searchArgs->sort_index = $module_info->order_target;
+				}
 
 				foreach($module_info as $key=>$val)
 				{
-					if(!isset($searchArgs->{$key}))
-						$searchArgs->{$key} = $val;
+					if(!isset($searchArgs->{$key})) {
+											$searchArgs->{$key} = $val;
+					}
 				}
 
 				$oDocumentModel = getModel('document');
@@ -793,12 +862,14 @@ 
 				}
 
 
-				if($cur_page>1 && count($output->data) == 0)
-					$arrQuery['page'] = $cur_page - 1;
+				if($cur_page>1 && count($output->data) == 0) {
+									$arrQuery['page'] = $cur_page - 1;
+				}
 
 				$query = "?";
-				foreach($arrQuery as $key=>$val)
-					$query .= sprintf("%s=%s&", $key, $val);
+				foreach($arrQuery as $key=>$val) {
+									$query .= sprintf("%s=%s&", $key, $val);
+				}
 				$query = substr($query, 0, -1);
 			}
 			$returnUrl = $arrUrl['path'] . $query;
@@ -878,7 +949,9 @@ 
 	 */
 	function restoreTrash($originObject)
 	{
-		if(is_array($originObject)) $originObject = (object)$originObject;
+		if(is_array($originObject)) {
+			$originObject = (object)$originObject;
+		}
 
 		$oDocumentController = getController('document');
 		$oDocumentModel = getModel('document');
@@ -888,7 +961,9 @@ 
 
 		//DB restore
 		$output = $oDocumentController->insertDocument($originObject, false, true, false);
-		if(!$output->toBool()) return new BaseObject(-1, $output->getMessage());
+		if(!$output->toBool()) {
+			return new BaseObject(-1, $output->getMessage());
+		}
 
 		//FILE restore
 		$oDocument = $oDocumentModel->getDocument($originObject->document_srl);
@@ -926,7 +1001,9 @@ 
 	function emptyTrash($originObject)
 	{
 		$originObject = unserialize($originObject);
-		if(is_array($originObject)) $originObject = (object) $originObject;
+		if(is_array($originObject)) {
+			$originObject = (object) $originObject;
+		}
 
 		$oDocument = new documentItem();
 		$oDocument->setAttribute($originObject);

modules/document/document.admin.model.php

Spacing +15 added lines, -15 removed lines

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

Braces +32 added lines, -11 removed lines

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

modules/document/document.admin.view.php

Braces +7 added lines, -4 removed lines

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

Spacing +15 added lines, -15 removed lines

@@ -19,9 +19,9 @@ 
 		// check current location in admin menu
 		$oModuleModel = getModel('module');
 		$info = $oModuleModel->getModuleActionXml('document');
-		foreach($info->menu AS $key => $menu)
+		foreach ($info->menu AS $key => $menu)
 		{
-			if(in_array($this->act, $menu->acts))
+			if (in_array($this->act, $menu->acts))
 			{
 				Context::set('currentMenu', $key);
 				break;
@@ -66,7 +66,7 @@ 
 
 		// set a search option used in the template
 		$count_search_option = count($this->search_option);
-		for($i=0;$i<$count_search_option;$i++)
+		for ($i = 0; $i < $count_search_option; $i++)
 		{
 			$search_option[$this->search_option[$i]] = Context::getLang($this->search_option[$i]);
 		}
@@ -75,20 +75,20 @@ 
 		$oModuleModel = getModel('module');
 		$module_list = array();
 		$mod_srls = array();
-		foreach($output->data as $oDocument)
+		foreach ($output->data as $oDocument)
 		{
 			$mod_srls[] = $oDocument->get('module_srl');
 		}
 		$mod_srls = array_unique($mod_srls);
 		// Module List
 		$mod_srls_count = count($mod_srls);
-		if($mod_srls_count)
+		if ($mod_srls_count)
 		{
 			$columnList = array('module_srl', 'mid', 'browser_title');
 			$module_output = $oModuleModel->getModulesInfo($mod_srls, $columnList);
-			if($module_output && is_array($module_output))
+			if ($module_output && is_array($module_output))
 			{
-				foreach($module_output as $module)
+				foreach ($module_output as $module)
 				{
 					$module_list[$module->module_srl] = $module;
 				}
@@ -115,8 +115,8 @@ 
 		Context::set('config', $config);
 
 		$oModuleModel = getModel('module');
-		$pcIconSkinList = $oModuleModel->getSkins($this->module_path . 'tpl', 'icons');
-		$mobileIconSkinList = $oModuleModel->getSkins($this->module_path . 'tpl', 'm.icons');
+		$pcIconSkinList = $oModuleModel->getSkins($this->module_path.'tpl', 'icons');
+		$mobileIconSkinList = $oModuleModel->getSkins($this->module_path.'tpl', 'm.icons');
 
 		Context::set('pcIconSkinList', $pcIconSkinList);
 		Context::set('mobileIconSkinList', $mobileIconSkinList);
@@ -133,7 +133,7 @@ 
 	function dispDocumentAdminDeclared()
 	{
 		// option for a list
-		$args =new stdClass();
+		$args = new stdClass();
 		$args->page = Context::get('page'); // /< Page
 		$args->list_count = 30; // /< the number of posts to display on a single page
 		$args->page_count = 10; // /< the number of pages that appear in the page navigation
@@ -147,11 +147,11 @@ 
 
 		// get a list
 		$declared_output = executeQuery('document.getDeclaredList', $args);
-		if($declared_output->data && count($declared_output->data))
+		if ($declared_output->data && count($declared_output->data))
 		{
 			$document_list = array();
 
-			foreach($declared_output->data as $key => $document)
+			foreach ($declared_output->data as $key => $document)
 			{
 				$document_list[$key] = new documentItem();
 				$document_list[$key]->setAttribute($document);
@@ -178,15 +178,15 @@ 
 	function dispDocumentAdminAlias()
 	{
 		$args->document_srl = Context::get('document_srl');
-		if(!$args->document_srl) return $this->dispDocumentAdminList();
+		if (!$args->document_srl) return $this->dispDocumentAdminList();
 
 		$oModel = getModel('document');
 		$oDocument = $oModel->getDocument($args->document_srl);
-		if(!$oDocument->isExists()) return $this->dispDocumentAdminList();
+		if (!$oDocument->isExists()) return $this->dispDocumentAdminList();
 		Context::set('oDocument', $oDocument);
 
 		$output = executeQueryArray('document.getAliases', $args);
-		if(!$output->data)
+		if (!$output->data)
 		{
 			$aliases = array();
 		}

modules/editor/components/image_gallery/image_gallery.class.php

Braces +8 added lines, -3 removed lines

@@ -75,15 +75,20 @@
 		// HTML gallery output, the output settings via the template for the conversion to generate the html code should
 		preg_match_all('/(width|height)([^[:digit:]]+)([0-9]+)/i',$xml_obj->attrs->style,$matches);
 		$gallery_info->width = trim($matches[3][0]);
-		if(!$gallery_info->width) $gallery_info->width = 400;
+		if(!$gallery_info->width) {
+			$gallery_info->width = 400;
+		}
 
 		Context::set('gallery_info', $gallery_info);
 
 		$tpl_path = $this->component_path.'tpl';
 		Context::set("tpl_path", $tpl_path);
 
-		if($gallery_info->gallery_style == "list") $tpl_file = 'list_gallery.html';
-		else $tpl_file = 'slide_gallery.html';
+		if($gallery_info->gallery_style == "list") {
+			$tpl_file = 'list_gallery.html';
+		} else {
+			$tpl_file = 'slide_gallery.html';
+		}
 
 		$oTemplate = &TemplateHandler::getInstance();
 		return $oTemplate->compile($tpl_path, $tpl_file);

Spacing +9 added lines, -9 removed lines

@@ -45,14 +45,14 @@ 
 	{
 		$gallery_info = new stdClass();
 		$gallery_info->srl = rand(111111, 999999);
-		$gallery_info->border_thickness = (int)$xml_obj->attrs->border_thickness;
+		$gallery_info->border_thickness = (int) $xml_obj->attrs->border_thickness;
 		$gallery_info->gallery_style = $xml_obj->attrs->gallery_style;
 		$color_preg = "/^([a-fA-F0-9]{6})/";
-		$gallery_info->border_color = preg_replace($color_preg,"#$1",$xml_obj->attrs->border_color);
-		$gallery_info->bg_color = preg_replace($color_preg,"#$1",$xml_obj->attrs->bg_color);
+		$gallery_info->border_color = preg_replace($color_preg, "#$1", $xml_obj->attrs->border_color);
+		$gallery_info->bg_color = preg_replace($color_preg, "#$1", $xml_obj->attrs->bg_color);
 		$gallery_info->gallery_align = $xml_obj->attrs->gallery_align;
 
-		if(!in_array($gallery_info->gallery_align, array('left', 'center', 'right'))) {
+		if (!in_array($gallery_info->gallery_align, array('left', 'center', 'right'))) {
 			$gallery_info->gallery_align = 'center';
 		}
 
@@ -62,10 +62,10 @@ 
 		$gallery_info->images_list = preg_grep("/^[a-z0-9\/]+\.(gif|jpe?g|png)+$/i", $images_list);
 
 		// If you set the output to output the XML code generated a list of the image
-		if(Context::getResponseMethod() == 'XMLRPC')
+		if (Context::getResponseMethod() == 'XMLRPC')
 		{
 			$output = array();
-			for($i=0;$i<count($gallery_info->images_list);$i++)
+			for ($i = 0; $i < count($gallery_info->images_list); $i++)
 			{
 				$output[] = sprintf('<img src="%s" alt="" />', $gallery_info->images_list[$i]);
 			}
@@ -73,16 +73,16 @@ 
 			return implode('<br />', $output);
 		}
 		// HTML gallery output, the output settings via the template for the conversion to generate the html code should
-		preg_match_all('/(width|height)([^[:digit:]]+)([0-9]+)/i',$xml_obj->attrs->style,$matches);
+		preg_match_all('/(width|height)([^[:digit:]]+)([0-9]+)/i', $xml_obj->attrs->style, $matches);
 		$gallery_info->width = trim($matches[3][0]);
-		if(!$gallery_info->width) $gallery_info->width = 400;
+		if (!$gallery_info->width) $gallery_info->width = 400;
 
 		Context::set('gallery_info', $gallery_info);
 
 		$tpl_path = $this->component_path.'tpl';
 		Context::set("tpl_path", $tpl_path);
 
-		if($gallery_info->gallery_style == "list") $tpl_file = 'list_gallery.html';
+		if ($gallery_info->gallery_style == "list") $tpl_file = 'list_gallery.html';
 		else $tpl_file = 'slide_gallery.html';
 
 		$oTemplate = &TemplateHandler::getInstance();

modules/editor/components/poll_maker/poll_maker.class.php

Braces +6 added lines, -2 removed lines

@@ -47,11 +47,15 @@
 	{
 		$poll_srl = $xml_obj->attrs->poll_srl;
 		$skin = $xml_obj->attrs->skin;
-		if(!$skin) $skin = 'default';
+		if(!$skin) {
+			$skin = 'default';
+		}
 
 		preg_match('/width([^[:digit:]]+)([0-9]+)/i',$xml_obj->attrs->style,$matches);
 		$width = $matches[2];
-		if(!$width) $width = 400;
+		if(!$width) {
+			$width = 400;
+		}
 		$style = sprintf('width:%dpx', $width);
 		// poll model object creation to come get it return html
 		$oPollModel = getModel('poll');

Spacing +4 added lines, -4 removed lines

@@ -27,7 +27,7 @@ 
 	{
 		// Wanted Skins survey
 		$oModuleModel = getModel('module');
-		$skin_list = $oModuleModel->getSkins(_XE_PATH_ . 'modules/poll/');
+		$skin_list = $oModuleModel->getSkins(_XE_PATH_.'modules/poll/');
 		Context::set('skin_list', $skin_list);
 		// Pre-compiled source code to compile template return to
 		$tpl_path = $this->component_path.'tpl';
@@ -47,11 +47,11 @@ 
 	{
 		$poll_srl = $xml_obj->attrs->poll_srl;
 		$skin = $xml_obj->attrs->skin;
-		if(!$skin) $skin = 'default';
+		if (!$skin) $skin = 'default';
 
-		preg_match('/width([^[:digit:]]+)([0-9]+)/i',$xml_obj->attrs->style,$matches);
+		preg_match('/width([^[:digit:]]+)([0-9]+)/i', $xml_obj->attrs->style, $matches);
 		$width = $matches[2];
-		if(!$width) $width = 400;
+		if (!$width) $width = 400;
 		$style = sprintf('width:%dpx', $width);
 		// poll model object creation to come get it return html
 		$oPollModel = getModel('poll');

modules/editor/editor.admin.view.php

Braces +34 added lines, -13 removed lines

@@ -35,12 +35,24 @@ 
 		}
 
 		//editor_config init
-		if(!$editor_config->editor_height) $editor_config->editor_height = 300;
-		if(!$editor_config->comment_editor_height) $editor_config->comment_editor_height = 100;
-		if(!$editor_config->editor_skin) $editor_config->editor_skin = 'ckeditor';
-		if(!$editor_config->comment_editor_skin) $editor_config->comment_editor_skin = 'ckeditor';
-		if(!$editor_config->sel_editor_colorset) $editor_config->sel_editor_colorset= 'moono';
-		if(!$editor_config->sel_comment_editor_colorset) $editor_config->sel_comment_editor_colorset= 'moono';
+		if(!$editor_config->editor_height) {
+			$editor_config->editor_height = 300;
+		}
+		if(!$editor_config->comment_editor_height) {
+			$editor_config->comment_editor_height = 100;
+		}
+		if(!$editor_config->editor_skin) {
+			$editor_config->editor_skin = 'ckeditor';
+		}
+		if(!$editor_config->comment_editor_skin) {
+			$editor_config->comment_editor_skin = 'ckeditor';
+		}
+		if(!$editor_config->sel_editor_colorset) {
+			$editor_config->sel_editor_colorset= 'moono';
+		}
+		if(!$editor_config->sel_comment_editor_colorset) {
+			$editor_config->sel_comment_editor_colorset= 'moono';
+		}
 
 		$component_list = $oEditorModel->getComponentList(false, $site_srl, true);
 		$editor_skin_list = FileHandler::readDir(_XE_PATH_.'modules/editor/skins');
@@ -65,14 +77,20 @@ 
 			$xml_info->path = './modules/editor/components/'.$xml_info->component_name;
 			$xml_info->delete_url = $oAutoinstallModel->getRemoveUrlByPath($xml_info->path);
 			$xml_info->package_srl = $oAutoinstallModel->getPackageSrlByPath($xml_info->path);
-			if($xml_info->package_srl) $targetpackages[$xml_info->package_srl] = 0;
+			if($xml_info->package_srl) {
+				$targetpackages[$xml_info->package_srl] = 0;
+			}
 		}
 
-		if(is_array($targetpackages))	$packages = $oAutoinstallModel->getInstalledPackages(array_keys($targetpackages));
+		if(is_array($targetpackages)) {
+			$packages = $oAutoinstallModel->getInstalledPackages(array_keys($targetpackages));
+		}
 
 		foreach($component_list as $component_name => $xml_info)
 		{
-			if($packages[$xml_info->package_srl])	$xml_info->need_update = $packages[$xml_info->package_srl]->need_update;
+			if($packages[$xml_info->package_srl]) {
+				$xml_info->need_update = $packages[$xml_info->package_srl]->need_update;
+			}
 		}
 		$editor_config_default = array( "editor_height" => "300", "comment_editor_height" => "100","content_font_size"=>"13");
 
@@ -162,13 +180,16 @@ 
 			// Get a list of module category
 			$module_categories = $oModuleModel->getModuleCategories();
 
-			if(!is_array($mid_list)) $mid_list = array($mid_list);
+			if(!is_array($mid_list)) {
+				$mid_list = array($mid_list);
+			}
 			foreach($mid_list as $module_srl => $module)
 			{
-				if($module) $module_categories[$module->module_category_srl]->list[$module_srl] = $module; 
+				if($module) {
+					$module_categories[$module->module_category_srl]->list[$module_srl] = $module;
+				}
 			}
-		}
-		else
+		} else
 		{
 			$module_categories[0]->list = $mid_list;
 		}

Spacing +27 added lines, -27 removed lines

@@ -22,59 +22,59 @@ 
 	{
 		$component_count = 0;
 		$site_module_info = Context::get('site_module_info');
-		$site_srl = (int)$site_module_info->site_srl;
+		$site_srl = (int) $site_module_info->site_srl;
 
 		// Get a type of component
 		$oEditorModel = getModel('editor');
 		$oModuleModel = getModel('module');
 		$editor_config = $oModuleModel->getModuleConfig('editor');
 
-		if(!$editor_config)
+		if (!$editor_config)
 		{
 			$editor_config = new stdClass();
 		}
 
 		//editor_config init
-		if(!$editor_config->editor_height) $editor_config->editor_height = 300;
-		if(!$editor_config->comment_editor_height) $editor_config->comment_editor_height = 100;
-		if(!$editor_config->editor_skin) $editor_config->editor_skin = 'ckeditor';
-		if(!$editor_config->comment_editor_skin) $editor_config->comment_editor_skin = 'ckeditor';
-		if(!$editor_config->sel_editor_colorset) $editor_config->sel_editor_colorset= 'moono';
-		if(!$editor_config->sel_comment_editor_colorset) $editor_config->sel_comment_editor_colorset= 'moono';
+		if (!$editor_config->editor_height) $editor_config->editor_height = 300;
+		if (!$editor_config->comment_editor_height) $editor_config->comment_editor_height = 100;
+		if (!$editor_config->editor_skin) $editor_config->editor_skin = 'ckeditor';
+		if (!$editor_config->comment_editor_skin) $editor_config->comment_editor_skin = 'ckeditor';
+		if (!$editor_config->sel_editor_colorset) $editor_config->sel_editor_colorset = 'moono';
+		if (!$editor_config->sel_comment_editor_colorset) $editor_config->sel_comment_editor_colorset = 'moono';
 
 		$component_list = $oEditorModel->getComponentList(false, $site_srl, true);
 		$editor_skin_list = FileHandler::readDir(_XE_PATH_.'modules/editor/skins');
 
-		$skin_info = $oModuleModel->loadSkinInfo($this->module_path,$editor_config->editor_skin);
+		$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $editor_config->editor_skin);
 
 		$contents = FileHandler::readDir(_XE_PATH_.'modules/editor/styles');
 		$content_style_list = array();
-		for($i=0,$c=count($contents);$i<$c;$i++)
+		for ($i = 0, $c = count($contents); $i < $c; $i++)
 		{
 			$style = $contents[$i];
-			$info = $oModuleModel->loadSkinInfo($this->module_path,$style,'styles');
+			$info = $oModuleModel->loadSkinInfo($this->module_path, $style, 'styles');
 			$content_style_list[$style] = new stdClass();
 			$content_style_list[$style]->title = $info->title;
 		}
 
 		// Get install info, update info, count
 		$oAutoinstallModel = getModel('autoinstall');
-		foreach($component_list as $component_name => $xml_info)
+		foreach ($component_list as $component_name => $xml_info)
 		{
 			$component_count++;
 			$xml_info->path = './modules/editor/components/'.$xml_info->component_name;
 			$xml_info->delete_url = $oAutoinstallModel->getRemoveUrlByPath($xml_info->path);
 			$xml_info->package_srl = $oAutoinstallModel->getPackageSrlByPath($xml_info->path);
-			if($xml_info->package_srl) $targetpackages[$xml_info->package_srl] = 0;
+			if ($xml_info->package_srl) $targetpackages[$xml_info->package_srl] = 0;
 		}
 
-		if(is_array($targetpackages))	$packages = $oAutoinstallModel->getInstalledPackages(array_keys($targetpackages));
+		if (is_array($targetpackages))	$packages = $oAutoinstallModel->getInstalledPackages(array_keys($targetpackages));
 
-		foreach($component_list as $component_name => $xml_info)
+		foreach ($component_list as $component_name => $xml_info)
 		{
-			if($packages[$xml_info->package_srl])	$xml_info->need_update = $packages[$xml_info->package_srl]->need_update;
+			if ($packages[$xml_info->package_srl])	$xml_info->need_update = $packages[$xml_info->package_srl]->need_update;
 		}
-		$editor_config_default = array( "editor_height" => "300", "comment_editor_height" => "100","content_font_size"=>"13");
+		$editor_config_default = array("editor_height" => "300", "comment_editor_height" => "100", "content_font_size"=>"13");
 
 		//editor preview
 		$config = $oEditorModel->getEditorConfig();
@@ -138,14 +138,14 @@ 
 	function dispEditorAdminSetupComponent()
 	{
 		$site_module_info = Context::get('site_module_info');
-		$site_srl = (int)$site_module_info->site_srl;
+		$site_srl = (int) $site_module_info->site_srl;
 
 		$component_name = Context::get('component_name');
 		// Get information of the editor component
 		$oEditorModel = getModel('editor');
-		$component = $oEditorModel->getComponent($component_name,$site_srl);
+		$component = $oEditorModel->getComponent($component_name, $site_srl);
 
-		if(!$component->component_name) {
+		if (!$component->component_name) {
 			$this->stop('msg_invalid_request');
 			return;
 		}
@@ -158,20 +158,20 @@ 
 		// Get a mid list
 		$oModuleModel = getModel('module');
 
-		$args =new stdClass();
+		$args = new stdClass();
 		$args->site_srl = $site_srl;
 		$columnList = array('module_srl', 'mid', 'module_category_srl', 'browser_title');
 		$mid_list = $oModuleModel->getMidList($args, $columnList);
 		// Combination of module_category and module
-		if(!$args->site_srl)
+		if (!$args->site_srl)
 		{
 			// Get a list of module category
 			$module_categories = $oModuleModel->getModuleCategories();
 
-			if(!is_array($mid_list)) $mid_list = array($mid_list);
-			foreach($mid_list as $module_srl => $module)
+			if (!is_array($mid_list)) $mid_list = array($mid_list);
+			foreach ($mid_list as $module_srl => $module)
 			{
-				if($module) $module_categories[$module->module_category_srl]->list[$module_srl] = $module; 
+				if ($module) $module_categories[$module->module_category_srl]->list[$module_srl] = $module; 
 			}
 		}
 		else
@@ -179,13 +179,13 @@ 
 			$module_categories[0]->list = $mid_list;
 		}
 
-		Context::set('mid_list',$module_categories);
+		Context::set('mid_list', $module_categories);
 
 		//Security
 		$security = new Security();
 		$security->encodeHTML('group_list..title');
 		$security->encodeHTML('component...', 'component_name');
-		$security->encodeHTML('mid_list..title','mid_list..list..browser_title');
+		$security->encodeHTML('mid_list..title', 'mid_list..list..browser_title');
 
 		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile('setup_component');

modules/file/file.admin.view.php

Braces +12 added lines, -9 removed lines

@@ -64,16 +64,13 @@ 
 					if($document_list[$target_srl])
 					{
 						$file->upload_target_type = 'doc';
-					}
-					else if($comment_list[$target_srl])
+					} else if($comment_list[$target_srl])
 					{
 						$file->upload_target_type = 'com';
-					}
-					else if($module_list[$target_srl])
+					} else if($module_list[$target_srl])
 					{
 						$file->upload_target_type = 'mod';
-					}
-					else
+					} else
 					{
 						// document
 						$document = $oDocumentModel->getDocument($target_srl);
@@ -115,15 +112,21 @@ 
 					// Check if data is already obtained
 					for($i = 0; $i < $com_srls_count; ++$i)
 					{
-						if($comment_list[$com_srls[$i]]) delete($com_srls[$i]);
+						if($comment_list[$com_srls[$i]]) {
+							delete($com_srls[$i]);
+						}
 					}
 					for($i = 0; $i < $doc_srls_count; ++$i)
 					{
-						if($document_list[$doc_srls[$i]]) delete($doc_srls[$i]);
+						if($document_list[$doc_srls[$i]]) {
+							delete($doc_srls[$i]);
+						}
 					}
 					for($i = 0; $i < $mod_srls_count; ++$i)
 					{
-						if($module_list[$mod_srls[$i]]) delete($mod_srls[$i]);
+						if($module_list[$mod_srls[$i]]) {
+							delete($mod_srls[$i]);
+						}
 					}
 				}
 

Spacing +33 added lines, -33 removed lines

@@ -36,7 +36,7 @@ 
 				, 'source_filename', 'isvalid', 'file_size', 'download_count', 'files.regdate', 'ipaddress', 'member.member_srl', 'member.nick_name', 'uploaded_filename');
 		$output = $oFileAdminModel->getFileList($args, $columnList);
 		// Get the document for looping a list
-		if($output->data)
+		if ($output->data)
 		{
 			$oCommentModel = getModel('comment');
 			$oDocumentModel = getModel('document');
@@ -45,31 +45,31 @@ 
 			$file_list = array();
 			$document_list = array();
 			$comment_list = array();
-			$module_list= array();
+			$module_list = array();
 
 			$doc_srls = array();
 			$com_srls = array();
-			$mod_srls= array();
+			$mod_srls = array();
 
-			foreach($output->data as $file)
+			foreach ($output->data as $file)
 			{
 				$file_srl = $file->file_srl;
 				$target_srl = $file->upload_target_srl;
 				$file_update_args = new stdClass();
 				$file_update_args->file_srl = $file_srl;
 				// Find and update if upload_target_type doesn't exist
-				if(!$file->upload_target_type)
+				if (!$file->upload_target_type)
 				{
 					// Pass if upload_target_type is already found 
-					if($document_list[$target_srl])
+					if ($document_list[$target_srl])
 					{
 						$file->upload_target_type = 'doc';
 					}
-					else if($comment_list[$target_srl])
+					else if ($comment_list[$target_srl])
 					{
 						$file->upload_target_type = 'com';
 					}
-					else if($module_list[$target_srl])
+					else if ($module_list[$target_srl])
 					{
 						$file->upload_target_type = 'mod';
 					}
@@ -77,17 +77,17 @@ 
 					{
 						// document
 						$document = $oDocumentModel->getDocument($target_srl);
-						if($document->isExists())
+						if ($document->isExists())
 						{
 							$file->upload_target_type = 'doc';
 							$file_update_args->upload_target_type = $file->upload_target_type;
 							$document_list[$target_srl] = $document;
 						}
 						// comment
-						if(!$file->upload_target_type)
+						if (!$file->upload_target_type)
 						{
 							$comment = $oCommentModel->getComment($target_srl);
-							if($comment->isExists())
+							if ($comment->isExists())
 							{
 								$file->upload_target_type = 'com';
 								$file->target_document_srl = $comment->document_srl;
@@ -97,39 +97,39 @@ 
 							}
 						}
 						// module (for a page)
-						if(!$file->upload_target_type)
+						if (!$file->upload_target_type)
 						{
 							$module = $oModuleModel->getModulesInfo($target_srl);
-							if($module)
+							if ($module)
 							{
 								$file->upload_target_type = 'mod';
 								$file_update_args->upload_target_type = $file->upload_target_type;
 								$module_list[$module->comment_srl] = $module;
 							}
 						}
-						if($file_update_args->upload_target_type)
+						if ($file_update_args->upload_target_type)
 						{
 							executeQuery('file.updateFileTargetType', $file_update_args);
 						}
 					}
 					// Check if data is already obtained
-					for($i = 0; $i < $com_srls_count; ++$i)
+					for ($i = 0; $i < $com_srls_count; ++$i)
 					{
-						if($comment_list[$com_srls[$i]]) delete($com_srls[$i]);
+						if ($comment_list[$com_srls[$i]]) delete($com_srls[$i]);
 					}
-					for($i = 0; $i < $doc_srls_count; ++$i)
+					for ($i = 0; $i < $doc_srls_count; ++$i)
 					{
-						if($document_list[$doc_srls[$i]]) delete($doc_srls[$i]);
+						if ($document_list[$doc_srls[$i]]) delete($doc_srls[$i]);
 					}
-					for($i = 0; $i < $mod_srls_count; ++$i)
+					for ($i = 0; $i < $mod_srls_count; ++$i)
 					{
-						if($module_list[$mod_srls[$i]]) delete($mod_srls[$i]);
+						if ($module_list[$mod_srls[$i]]) delete($mod_srls[$i]);
 					}
 				}
 
-				if($file->upload_target_type)
+				if ($file->upload_target_type)
 				{
-					if(!in_array($file->upload_target_srl, ${$file->upload_target_type.'_srls'}))
+					if (!in_array($file->upload_target_srl, ${$file->upload_target_type.'_srls'}))
 					{
 						${$file->upload_target_type.'_srls'}[] = $target_srl;
 					}
@@ -144,10 +144,10 @@ 
 			$mod_srls = array_unique($mod_srls);
 			// Comment list
 			$com_srls_count = count($com_srls);
-			if($com_srls_count)
+			if ($com_srls_count)
 			{
 				$comment_output = $oCommentModel->getComments($com_srls);
-				foreach($comment_output as $comment)
+				foreach ($comment_output as $comment)
 				{
 					$comment_list[$comment->comment_srl] = $comment;
 					$doc_srls[] = $comment->document_srl;
@@ -155,12 +155,12 @@ 
 			}
 			// Document list
 			$doc_srls_count = count($doc_srls);
-			if($doc_srls_count)
+			if ($doc_srls_count)
 			{
 				$document_output = $oDocumentModel->getDocuments($doc_srls);
-				if(is_array($document_output))
+				if (is_array($document_output))
 				{
-					foreach($document_output as $document)
+					foreach ($document_output as $document)
 					{
 						$document_list[$document->document_srl] = $document;
 					}
@@ -168,22 +168,22 @@ 
 			}
 			// Module List
 			$mod_srls_count = count($mod_srls);
-			if($mod_srls_count)
+			if ($mod_srls_count)
 			{
 				$columnList = array('module_srl', 'mid', 'browser_title');
 				$module_output = $oModuleModel->getModulesInfo($mod_srls, $columnList);
-				if($module_output && is_array($module_output))
+				if ($module_output && is_array($module_output))
 				{
-					foreach($module_output as $module)
+					foreach ($module_output as $module)
 					{
 						$module_list[$module->module_srl] = $module;
 					}
 				}
 			}
 
-			foreach($file_list as $srl => $file)
+			foreach ($file_list as $srl => $file)
 			{
-				if($file->upload_target_type == 'com')
+				if ($file->upload_target_type == 'com')
 				{
 					$file_list[$srl]->target_document_srl = $comment_list[$file->upload_target_srl]->document_srl;
 				}
@@ -216,7 +216,7 @@ 
 	{
 		$oFileModel = getModel('file');
 		$config = $oFileModel->getFileConfig();
-		Context::set('config',$config);
+		Context::set('config', $config);
 		$iniPostMaxSize = FileHandler::returnbytes(ini_get('post_max_size'));
 		$iniUploadMaxSize = FileHandler::returnbytes(ini_get('upload_max_filesize'));
 		$iniMinSize = min($iniPostMaxSize, $iniUploadMaxSize);

modules/install/install.view.php

Braces +34 added lines, -13 removed lines

@@ -19,12 +19,16 @@ 
 		// Specify the template path
 		$this->setTemplatePath($this->module_path.'tpl');
 		// Error occurs if already installed
-		if(Context::isInstalled()) return $this->stop('msg_already_installed');
+		if(Context::isInstalled()) {
+			return $this->stop('msg_already_installed');
+		}
 		// Install a controller
 		$oInstallController = getController('install');
 		$this->install_enable = $oInstallController->checkInstallEnv();
 		// If the environment is installable, execute installController::makeDefaultDirectory()
-		if($this->install_enable) $oInstallController->makeDefaultDirectory();
+		if($this->install_enable) {
+			$oInstallController->makeDefaultDirectory();
+		}
 	}
 
 	/**
@@ -68,7 +72,9 @@ 
 				Context::set('install_config', true, true);
 				$oInstallController = getController('install');
 				$output = $oInstallController->procInstall();
-				if (!$output->toBool()) return $output;
+				if (!$output->toBool()) {
+					return $output;
+				}
 				header("location: ./");
 				Context::close();
 				exit;
@@ -101,7 +107,9 @@ 
 		Context::set('use_rewrite', $useRewrite); 
 
 		// nginx 체크, rewrite 사용법 안내
-		if($useRewrite == 'N' && stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) Context::set('use_nginx', 'Y');
+		if($useRewrite == 'N' && stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) {
+			Context::set('use_nginx', 'Y');
+		}
 		
 		$this->setTemplateFile('check_env');
 	}
@@ -112,14 +120,15 @@ 
 	function dispInstallSelectDB()
 	{
 		// Display check_env if it is not installable
-		if(!$this->install_enable) return $this->dispInstallCheckEnv();
+		if(!$this->install_enable) {
+			return $this->dispInstallCheckEnv();
+		}
 		// Enter ftp information
 		if(ini_get('safe_mode') && !Context::isFTPRegisted())
 		{
 			Context::set('progressMenu', '3');
 			$this->setTemplateFile('ftp');
-		}
-		else
+		} else
 		{
 			$defaultDatabase = 'mysqli';
 			$disableList = DB::getDisableList();
@@ -147,9 +156,13 @@ 
 	function dispInstallDBForm()
 	{
 		// Display check_env if not installable
-		if(!$this->install_enable) return $this->dispInstallCheckEnv();
+		if(!$this->install_enable) {
+			return $this->dispInstallCheckEnv();
+		}
 		// Return to the start-up screen if db_type is not specified
-		if(!Context::get('db_type')) return $this->dispInstallSelectDB();
+		if(!Context::get('db_type')) {
+			return $this->dispInstallSelectDB();
+		}
 
 		// Output the file, disp_db_info_form.html
 		$tpl_filename = sprintf('form.%s', Context::get('db_type'));
@@ -163,9 +176,15 @@ 
 			// Error occured when using https protocol at "ModuleHandler::init() '
 			$parsedUrl = parse_url($error_return_url);
 			$error_return_url = '';
-			if(isset($parsedUrl['path'])) $error_return_url .= $parsedUrl['path'];
-			if(isset($parsedUrl['query'])) $error_return_url .= '?' . $parsedUrl['query'];
-			if(isset($parsedUrl['fragment'])) $error_return_url .= '?' . $parsedUrl['fragment'];
+			if(isset($parsedUrl['path'])) {
+				$error_return_url .= $parsedUrl['path'];
+			}
+			if(isset($parsedUrl['query'])) {
+				$error_return_url .= '?' . $parsedUrl['query'];
+			}
+			if(isset($parsedUrl['fragment'])) {
+				$error_return_url .= '?' . $parsedUrl['fragment'];
+			}
 		}
 		Context::set('error_return_url', $error_return_url);
 
@@ -178,7 +197,9 @@ 
 	function dispInstallConfigForm()
 	{
 		// Display check_env if not installable
-		if(!$this->install_enable) return $this->dispInstallCheckEnv();
+		if(!$this->install_enable) {
+			return $this->dispInstallCheckEnv();
+		}
 
 		include _XE_PATH_.'files/config/tmpDB.config.php';
 

Spacing +21 added lines, -21 removed lines

@@ -19,12 +19,12 @@ 
 		// Specify the template path
 		$this->setTemplatePath($this->module_path.'tpl');
 		// Error occurs if already installed
-		if(Context::isInstalled()) return $this->stop('msg_already_installed');
+		if (Context::isInstalled()) return $this->stop('msg_already_installed');
 		// Install a controller
 		$oInstallController = getController('install');
 		$this->install_enable = $oInstallController->checkInstallEnv();
 		// If the environment is installable, execute installController::makeDefaultDirectory()
-		if($this->install_enable) $oInstallController->makeDefaultDirectory();
+		if ($this->install_enable) $oInstallController->makeDefaultDirectory();
 	}
 
 	/**
@@ -33,7 +33,7 @@ 
 	function dispInstallIntroduce()
 	{
 		$install_config_file = FileHandler::getRealPath('./config/install.config.php');
-		if(file_exists($install_config_file))
+		if (file_exists($install_config_file))
 		{
 			/**
 			 * If './config/install.config.php' file created  and write array shown in the example below, XE installed using config file.
@@ -57,12 +57,12 @@ 
 			  );
 			 */
 			include $install_config_file;
-			if(is_array($install_config))
+			if (is_array($install_config))
 			{
-				foreach($install_config as $k => $v) 
+				foreach ($install_config as $k => $v) 
 				{
 					$v = ($k == 'db_table_prefix') ? $v.'_' : $v;
-					Context::set($k,$v,true);
+					Context::set($k, $v, true);
 				}
 				unset($GLOBALS['__DB__']);
 				Context::set('install_config', true, true);
@@ -101,7 +101,7 @@ 
 		Context::set('use_rewrite', $useRewrite); 
 
 		// nginx 체크, rewrite 사용법 안내
-		if($useRewrite == 'N' && stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) Context::set('use_nginx', 'Y');
+		if ($useRewrite == 'N' && stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) Context::set('use_nginx', 'Y');
 		
 		$this->setTemplateFile('check_env');
 	}
@@ -112,9 +112,9 @@ 
 	function dispInstallSelectDB()
 	{
 		// Display check_env if it is not installable
-		if(!$this->install_enable) return $this->dispInstallCheckEnv();
+		if (!$this->install_enable) return $this->dispInstallCheckEnv();
 		// Enter ftp information
-		if(ini_get('safe_mode') && !Context::isFTPRegisted())
+		if (ini_get('safe_mode') && !Context::isFTPRegisted())
 		{
 			Context::set('progressMenu', '3');
 			$this->setTemplateFile('ftp');
@@ -123,11 +123,11 @@ 
 		{
 			$defaultDatabase = 'mysqli';
 			$disableList = DB::getDisableList();
-			if(is_array($disableList))
+			if (is_array($disableList))
 			{
-				foreach($disableList AS $key=>$value)
+				foreach ($disableList AS $key=>$value)
 				{
-					if($value->db_type == $defaultDatabase)
+					if ($value->db_type == $defaultDatabase)
 					{
 						$defaultDatabase = 'mysql';
 						break;
@@ -147,9 +147,9 @@ 
 	function dispInstallDBForm()
 	{
 		// Display check_env if not installable
-		if(!$this->install_enable) return $this->dispInstallCheckEnv();
+		if (!$this->install_enable) return $this->dispInstallCheckEnv();
 		// Return to the start-up screen if db_type is not specified
-		if(!Context::get('db_type')) return $this->dispInstallSelectDB();
+		if (!Context::get('db_type')) return $this->dispInstallSelectDB();
 
 		// Output the file, disp_db_info_form.html
 		$tpl_filename = sprintf('form.%s', Context::get('db_type'));
@@ -158,14 +158,14 @@ 
 		Context::set('title', $title);
 
 		$error_return_url = getNotEncodedUrl('', 'act', Context::get('act'), 'db_type', Context::get('db_type'));
-		if($_SERVER['HTTPS'] == 'on')
+		if ($_SERVER['HTTPS'] == 'on')
 		{
 			// Error occured when using https protocol at "ModuleHandler::init() '
 			$parsedUrl = parse_url($error_return_url);
 			$error_return_url = '';
-			if(isset($parsedUrl['path'])) $error_return_url .= $parsedUrl['path'];
-			if(isset($parsedUrl['query'])) $error_return_url .= '?' . $parsedUrl['query'];
-			if(isset($parsedUrl['fragment'])) $error_return_url .= '?' . $parsedUrl['fragment'];
+			if (isset($parsedUrl['path'])) $error_return_url .= $parsedUrl['path'];
+			if (isset($parsedUrl['query'])) $error_return_url .= '?'.$parsedUrl['query'];
+			if (isset($parsedUrl['fragment'])) $error_return_url .= '?'.$parsedUrl['fragment'];
 		}
 		Context::set('error_return_url', $error_return_url);
 
@@ -178,7 +178,7 @@ 
 	function dispInstallConfigForm()
 	{
 		// Display check_env if not installable
-		if(!$this->install_enable) return $this->dispInstallCheckEnv();
+		if (!$this->install_enable) return $this->dispInstallCheckEnv();
 
 		include _XE_PATH_.'files/config/tmpDB.config.php';
 
@@ -190,7 +190,7 @@ 
 
 	function useRewriteModule()
 	{
-		if(function_exists('apache_get_modules') && in_array('mod_rewrite',apache_get_modules()))
+		if (function_exists('apache_get_modules') && in_array('mod_rewrite', apache_get_modules()))
 		{
 			return true;
 		}
@@ -209,7 +209,7 @@ 
 	function dispInstallManagerForm()
 	{
 		// Display check_env if not installable
-		if(!$this->install_enable)
+		if (!$this->install_enable)
 		{
 			return $this->dispInstallCheckEnv();
 		}