xpressengine / xe-core

modules/autoinstall/autoinstall.admin.view.php

Braces +5 added lines, -10 removed lines

@@ -36,8 +36,7 @@ 
 		if(!$ftp_info->ftp_root_path)
 		{
 			Context::set('show_ftp_note', TRUE);
-		}
-		else
+		} else
 		{
 			$this->ftp_set = TRUE;
 		}
@@ -217,12 +216,10 @@ 
 				if($v->type == "core")
 				{
 					$v->avail_remove = FALSE;
-				}
-				else if($v->type == "module")
+				} else if($v->type == "module")
 				{
 					$v->avail_remove = $oModel->checkRemovable($packages[$v->package_srl]->path);
-				}
-				else
+				} else
 				{
 					$v->avail_remove = TRUE;
 				}
@@ -455,8 +452,7 @@ 
 		if($childrenList)
 		{
 			$params["category_srl"] = $childrenList;
-		}
-		else if($category_srl)
+		} else if($category_srl)
 		{
 			$params["category_srl"] = $category_srl;
 		}
@@ -565,8 +561,7 @@ 
 			$security->encodeHTML('package.');
 
 			$this->setTemplateFile('uninstall');
-		}
-		else
+		} else
 		{
 			return $this->stop('msg_connection_fail');
 		}

Spacing +51 added lines, -51 removed lines

@@ -33,7 +33,7 @@ 
 		$this->setTemplatePath($template_path);
 
 		$ftp_info = Context::getFTPInfo();
-		if(!$ftp_info->ftp_root_path)
+		if (!$ftp_info->ftp_root_path)
 		{
 			Context::set('show_ftp_note', TRUE);
 		}
@@ -90,7 +90,7 @@ 
 	function rearrange(&$item, &$targets)
 	{
 		$ret = new stdClass();
-		foreach($targets as $target)
+		foreach ($targets as $target)
 		{
 			$ret->{$target} = $item->{$target}->body;
 		}
@@ -169,7 +169,7 @@ 
 	 */
 	function rearranges($items, $packages = null)
 	{
-		if(!is_array($items))
+		if (!is_array($items))
 		{
 			$items = array($items);
 		}
@@ -178,47 +178,47 @@ 
 		$targets = array('category_srl', 'package_srl', 'item_screenshot_url', 'package_voted', 'package_voter', 'package_description', 'package_downloaded', 'item_regdate', 'title', 'item_version', 'package_star', 'depfrom');
 		$targetpackages = array();
 
-		foreach($items as $item)
+		foreach ($items as $item)
 		{
 			$targetpackages[$item->package_srl->body] = 0;
 		}
 
 		$oModel = getModel('autoinstall');
 		
-		if($package == null)
+		if ($package == null)
 		{
 			$packages = $oModel->getInstalledPackages(array_keys($targetpackages));
 		}
 
 		$depto = array();
 
-		foreach($items as $item)
+		foreach ($items as $item)
 		{
 			$v = $this->rearrange($item, $targets);
 			$v->item_screenshot_url = str_replace('./', _XE_DOWNLOAD_SERVER_, $v->item_screenshot_url);
 			$v->category = $this->categories[$v->category_srl]->title;
-			$v->url = _XE_LOCATION_SITE_ . '?mid=download&package_srl=' . $v->package_srl;
+			$v->url = _XE_LOCATION_SITE_.'?mid=download&package_srl='.$v->package_srl;
 
-			if($packages[$v->package_srl])
+			if ($packages[$v->package_srl])
 			{
 				$v->current_version = $packages[$v->package_srl]->current_version;
 				$v->need_update = $packages[$v->package_srl]->need_update;
 				$v->type = $oModel->getTypeFromPath($packages[$v->package_srl]->path);
 
-				if($this->ftp_set && $v->depfrom)
+				if ($this->ftp_set && $v->depfrom)
 				{
 					$depfrom = explode(",", $v->depfrom);
-					foreach($depfrom as $package_srl)
+					foreach ($depfrom as $package_srl)
 					{
 						$depto[$package_srl][] = $v->package_srl;
 					}
 				}
 
-				if($v->type == "core")
+				if ($v->type == "core")
 				{
 					$v->avail_remove = FALSE;
 				}
-				else if($v->type == "module")
+				else if ($v->type == "module")
 				{
 					$v->avail_remove = $oModel->checkRemovable($packages[$v->package_srl]->path);
 				}
@@ -230,41 +230,41 @@ 
 			$item_list[$v->package_srl] = $v;
 		}
 
-		if(count($depto) > 0)
+		if (count($depto) > 0)
 		{
 			$installed = $oModel->getInstalledPackages(implode(",", array_keys($depto)));
-			foreach($installed as $key => $val)
+			foreach ($installed as $key => $val)
 			{
 				$path = $val->path;
 				$type = $oModel->getTypeFromPath($path);
 
-				if(!$type || $type == "core")
+				if (!$type || $type == "core")
 				{
 					continue;
 				}
 
 				$config_file = $oModel->getConfigFilePath($type);
-				if(!$config_file)
+				if (!$config_file)
 				{
 					continue;
 				}
 
 				$xml = new XmlParser();
-				$xmlDoc = $xml->loadXmlFile(FileHandler::getRealPath($path) . $config_file);
-				if(!$xmlDoc)
+				$xmlDoc = $xml->loadXmlFile(FileHandler::getRealPath($path).$config_file);
+				if (!$xmlDoc)
 				{
 					continue;
 				}
 
-				if($type == "drcomponent")
+				if ($type == "drcomponent")
 				{
 					$type = "component";
 				}
-				if($type == "style" || $type == "m.skin")
+				if ($type == "style" || $type == "m.skin")
 				{
 					$type = "skin";
 				}
-				if($type == "m.layout")
+				if ($type == "m.layout")
 				{
 					$type = "layout";
 				}
@@ -276,9 +276,9 @@ 
 			$oSecurity = new Security();
 			$oSecurity->encodeHTML('installed..');
 
-			foreach($installed as $key => $val)
+			foreach ($installed as $key => $val)
 			{
-				foreach($depto[$key] as $package_srl)
+				foreach ($depto[$key] as $package_srl)
 				{
 					$item_list[$package_srl]->avail_remove = false;
 					$item_list[$package_srl]->deps[] = $key;
@@ -297,7 +297,7 @@ 
 	function dispAutoinstallAdminInstalledPackages()
 	{
 		$page = Context::get('page');
-		if(!$page)
+		if (!$page)
 		{
 			$page = 1;
 		}
@@ -313,13 +313,13 @@ 
 		$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml");
 		$xml_lUpdate = new XmlParser();
 		$xmlDoc = $xml_lUpdate->parse($buff);
-		if($xmlDoc && $xmlDoc->response->packagelist->item)
+		if ($xmlDoc && $xmlDoc->response->packagelist->item)
 		{
 			$item_list = $this->rearranges($xmlDoc->response->packagelist->item, $package_list);
 			$res = array();
-			foreach($package_list as $package_srl => $package)
+			foreach ($package_list as $package_srl => $package)
 			{
-				if($item_list[$package_srl])
+				if ($item_list[$package_srl])
 				{
 					$res[] = $item_list[$package_srl];
 				}
@@ -327,7 +327,7 @@ 
 			Context::set('item_list', $res);
 		}
 
-		if(count($package_list) != count($res))
+		if (count($package_list) != count($res))
 		{
 			$localPackageSrls = array_keys($package_list);
 			$remotePackageSrls = array_keys($item_list);
@@ -352,7 +352,7 @@ 
 	function dispAutoinstallAdminInstall()
 	{
 		$package_srl = Context::get('package_srl');
-		if(!$package_srl)
+		if (!$package_srl)
 		{
 			return $this->dispAutoinstallAdminIndex();
 		}
@@ -363,13 +363,13 @@ 
 		Context::set("package", $package);
 		Context::set('contain_core', $package->contain_core);
 
-		if(!$_SESSION['ftp_password'])
+		if (!$_SESSION['ftp_password'])
 		{
 			Context::set('need_password', TRUE);
 		}
 
 		$output = $oAdminModel->checkUseDirectModuleInstall($package);
-		if($output->toBool()==TRUE)
+		if ($output->toBool() == TRUE)
 		{
 			Context::set('show_ftp_note', FALSE);
 		}
@@ -391,7 +391,7 @@ 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('autoinstall');
 		$ftp_info = Context::getFTPInfo();
-		if(!$ftp_info->ftp_root_path)
+		if (!$ftp_info->ftp_root_path)
 		{
 			Context::set('show_ftp_note', TRUE);
 		}
@@ -406,21 +406,21 @@ 
 		$lUpdateDoc = $xml_lUpdate->parse($buff);
 		$updateDate = $lUpdateDoc->response->updatedate->body;
 
-		if(!$updateDate)
+		if (!$updateDate)
 		{
 			return $this->stop('msg_connection_fail');
 		}
 
 		$oModel = getModel('autoinstall');
 		$item = $oModel->getLatestPackage();
-		if(!$item || $item->updatedate < $updateDate || count($this->categories) < 1)
+		if (!$item || $item->updatedate < $updateDate || count($this->categories) < 1)
 		{
 			$oController = getAdminController('autoinstall');
 			$oController->_updateinfo();
 
-			if(!$_SESSION['__XE_EASYINSTALL_REDIRECT__'])
+			if (!$_SESSION['__XE_EASYINSTALL_REDIRECT__'])
 			{
-				header('location: ' . getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminIndex'));
+				header('location: '.getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminIndex'));
 				$_SESSION['__XE_EASYINSTALL_REDIRECT__'] = TRUE;
 				return;
 			}
@@ -428,21 +428,21 @@ 
 		unset($_SESSION['__XE_EASYINSTALL_REDIRECT__']);
 
 		$page = Context::get('page');
-		if(!$page)
+		if (!$page)
 		{
 			$page = 1;
 		}
 		Context::set('page', $page);
 
 		$order_type = Context::get('order_type');
-		if(!in_array($order_type, array('asc', 'desc')))
+		if (!in_array($order_type, array('asc', 'desc')))
 		{
 			$order_type = 'desc';
 		}
 		Context::set('order_type', $order_type);
 
 		$order_target = Context::get('order_target');
-		if(!in_array($order_target, array('newest', 'download', 'popular')))
+		if (!in_array($order_target, array('newest', 'download', 'popular')))
 		{
 			$order_target = 'newest';
 		}
@@ -452,11 +452,11 @@ 
 
 		$childrenList = Context::get('childrenList');
 		$category_srl = Context::get('category_srl');
-		if($childrenList)
+		if ($childrenList)
 		{
 			$params["category_srl"] = $childrenList;
 		}
-		else if($category_srl)
+		else if ($category_srl)
 		{
 			$params["category_srl"] = $category_srl;
 		}
@@ -465,12 +465,12 @@ 
 		$params["order_target"] = $order_target;
 		$params["order_type"] = $order_type;
 		$params["page"] = $page;
-		if($search_keyword)
+		if ($search_keyword)
 		{
 			$params["search_keyword"] = $search_keyword;
 		}
 		$xmlDoc = XmlGenerater::getXmlDoc($params);
-		if($xmlDoc && $xmlDoc->response->packagelist->item)
+		if ($xmlDoc && $xmlDoc->response->packagelist->item)
 		{
 			$item_list = $this->rearranges($xmlDoc->response->packagelist->item);
 			Context::set('item_list', $item_list);
@@ -504,7 +504,7 @@ 
 	function dispAutoinstallAdminUninstall()
 	{
 		$package_srl = Context::get('package_srl');
-		if(!$package_srl)
+		if (!$package_srl)
 		{
 			return $this->dispAutoinstallAdminIndex();
 		}
@@ -512,12 +512,12 @@ 
 		$oModel = getModel('autoinstall');
 		$oAdminModel = getAdminModel('autoinstall');
 		$installedPackage = $oModel->getInstalledPackage($package_srl);
-		if(!$installedPackage)
+		if (!$installedPackage)
 		{
 			return $this->dispAutoinstallAdminInstalledPackages();
 		}
 
-		if(!$_SESSION['ftp_password'])
+		if (!$_SESSION['ftp_password'])
 		{
 			Context::set('need_password', TRUE);
 		}
@@ -526,19 +526,19 @@ 
 		$path = $installedPackage->path;
 		$type = $oModel->getTypeFromPath($path);
 
-		if(!$type || $type == "core")
+		if (!$type || $type == "core")
 		{
 			return $this->stop("msg_invalid_request");
 		}
 
 		$config_file = $oModel->getConfigFilePath($type);
-		if(!$config_file)
+		if (!$config_file)
 		{
 			return $this->stop("msg_invalid_request");
 		}
 
 		$output = $oAdminModel->checkUseDirectModuleInstall($installedPackage);
-		if($output->toBool()==TRUE)
+		if ($output->toBool() == TRUE)
 		{
 			Context::set('show_ftp_note', FALSE);
 		}
@@ -550,7 +550,7 @@ 
 		$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml");
 		$xml_lUpdate = new XmlParser();
 		$xmlDoc = $xml_lUpdate->parse($buff);
-		if($xmlDoc && $xmlDoc->response->packagelist->item)
+		if ($xmlDoc && $xmlDoc->response->packagelist->item)
 		{
 			$item_list = $this->rearranges($xmlDoc->response->packagelist->item);
 			$installedPackage->title = $item_list[$package_srl]->title;
@@ -559,7 +559,7 @@ 
 			$installedPackage->deps = $item_list[$package_srl]->deps;
 			Context::set('package', $installedPackage);
 			$this->setTemplateFile('uninstall');
-			Context::addJsFilter($this->module_path . 'tpl/filter', 'uninstall_package.xml');
+			Context::addJsFilter($this->module_path.'tpl/filter', 'uninstall_package.xml');
 
 			$security = new Security();
 			$security->encodeHTML('package.');

Doc Comments +3 added lines, -3 removed lines

@@ -85,7 +85,7 @@ 
 	 *
 	 * @param object $item
 	 * @param object $targets
-	 * @return object
+	 * @return stdClass
 	 */
 	function rearrange(&$item, &$targets)
 	{
@@ -347,7 +347,7 @@ 
 	/**
 	 * Display install package
 	 *
-	 * @return BaseObject
+	 * @return ModuleObject|null
 	 */
 	function dispAutoinstallAdminInstall()
 	{
@@ -384,7 +384,7 @@ 
 	/**
 	 * Display package list
 	 *
-	 * @return BaseObject
+	 * @return ModuleObject|null
 	 */
 	function dispAutoinstallAdminIndex()
 	{

modules/autoinstall/autoinstall.model.php

Braces +2 added lines, -4 removed lines

@@ -103,8 +103,7 @@ 
 			if($category->parent_srl)
 			{
 				$categoryList[$category->parent_srl]->children[] = & $categoryList[$key];
-			}
-			else
+			} else
 			{
 				$depth0[] = $key;
 			}
@@ -324,8 +323,7 @@ 
 		if(method_exists($oModule, "moduleUninstall"))
 		{
 			return TRUE;
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}

Spacing +38 added lines, -38 removed lines

@@ -19,7 +19,7 @@ 
 		$args = new stdClass();
 		$args->category_srl = $category_srl;
 		$output = executeQueryArray("autoinstall.getCategory", $args);
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return null;
 		}
@@ -34,7 +34,7 @@ 
 	function getPackages()
 	{
 		$output = executeQueryArray("autoinstall.getPackages");
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return array();
 		}
@@ -52,7 +52,7 @@ 
 		$args = new stdClass();
 		$args->package_srl = $package_srl;
 		$output = executeQueryArray("autoinstall.getInstalledPackage", $args);
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return null;
 		}
@@ -70,7 +70,7 @@ 
 		$args = new stdClass();
 		$args->package_srl = $package_srl;
 		$output = executeQueryArray("autoinstall.getPackage", $args);
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return null;
 		}
@@ -85,22 +85,22 @@ 
 	function getCategoryList()
 	{
 		$output = executeQueryArray("autoinstall.getCategories");
-		if(!$output->toBool() || !$output->data)
+		if (!$output->toBool() || !$output->data)
 		{
 			return array();
 		}
 
 		$categoryList = array();
-		foreach($output->data as $category)
+		foreach ($output->data as $category)
 		{
 			$category->children = array();
 			$categoryList[$category->category_srl] = $category;
 		}
 
 		$depth0 = array();
-		foreach($categoryList as $key => $category)
+		foreach ($categoryList as $key => $category)
 		{
-			if($category->parent_srl)
+			if ($category->parent_srl)
 			{
 				$categoryList[$category->parent_srl]->children[] = & $categoryList[$key];
 			}
@@ -110,7 +110,7 @@ 
 			}
 		}
 		$resultList = array();
-		foreach($depth0 as $category_srl)
+		foreach ($depth0 as $category_srl)
 		{
 			$this->setDepth($categoryList[$category_srl], 0, $categoryList, $resultList);
 		}
@@ -128,7 +128,7 @@ 
 		$args = new stdClass();
 		$args->category_srl = $category_srl;
 		$output = executeQuery("autoinstall.getPackageCount", $args);
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return 0;
 		}
@@ -143,7 +143,7 @@ 
 	function getInstalledPackageCount()
 	{
 		$output = executeQuery("autoinstall.getInstalledPackageCount");
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return 0;
 		}
@@ -164,11 +164,11 @@ 
 		$resultList[$item->category_srl] = &$item;
 		$item->depth = $depth;
 		$siblingList = $item->category_srl;
-		foreach($item->children as $child)
+		foreach ($item->children as $child)
 		{
-			$siblingList .= "," . $this->setDepth($list[$child->category_srl], $depth + 1, $list, $resultList);
+			$siblingList .= ",".$this->setDepth($list[$child->category_srl], $depth + 1, $list, $resultList);
 		}
-		if(count($item->children) < 1)
+		if (count($item->children) < 1)
 		{
 			$item->nPackages = $this->getPackageCount($item->category_srl);
 		}
@@ -184,7 +184,7 @@ 
 	function getLatestPackage()
 	{
 		$output = executeQueryArray("autoinstall.getLatestPackage");
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return null;
 		}
@@ -203,11 +203,11 @@ 
 		$args->package_list = $package_list;
 		$output = executeQueryArray("autoinstall.getInstalledPackages", $args);
 		$result = array();
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return $result;
 		}
-		foreach($output->data as $value)
+		foreach ($output->data as $value)
 		{
 			$result[$value->package_srl] = $value;
 		}
@@ -226,15 +226,15 @@ 
 		$args->page = $page;
 		$args->list_count = 10;
 		$args->page_count = 5;
-		if(Context::getDBType() == 'mssql')
+		if (Context::getDBType() == 'mssql')
 		{
 			$args->sort_index = 'package_srl';
 		}
 		$output = executeQueryArray("autoinstall.getInstalledPackageList", $args);
 		$res = array();
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $val)
+			foreach ($output->data as $val)
 			{
 				$res[$val->package_srl] = $val;
 			}
@@ -251,19 +251,19 @@ 
 	 */
 	function getTypeFromPath($path)
 	{
-		if(!$path)
+		if (!$path)
 		{
 			return NULL;
 		}
 
-		if($path == ".")
+		if ($path == ".")
 		{
 			return "core";
 		}
 
 		$path_array = explode("/", $path);
 		$target_name = array_pop($path_array);
-		if(!$target_name)
+		if (!$target_name)
 		{
 			$target_name = array_pop($path_array);
 		}
@@ -280,7 +280,7 @@ 
 	function getConfigFilePath($type)
 	{
 		$config_file = NULL;
-		switch($type)
+		switch ($type)
 		{
 			case "m.layout":
 			case "module":
@@ -317,11 +317,11 @@ 
 		$path_array = explode("/", $path);
 		$target_name = array_pop($path_array);
 		$oModule = getModule($target_name, "class");
-		if(!$oModule)
+		if (!$oModule)
 		{
 			return FALSE;
 		}
-		if(method_exists($oModule, "moduleUninstall"))
+		if (method_exists($oModule, "moduleUninstall"))
 		{
 			return TRUE;
 		}
@@ -339,17 +339,17 @@ 
 	 */
 	function getPackageSrlByPath($path)
 	{
-		if(!$path)
+		if (!$path)
 		{
 			return;
 		}
 
-		if(substr($path, -1) == '/')
+		if (substr($path, -1) == '/')
 		{
 			$path = substr($path, 0, strlen($path) - 1);
 		}
 
-		if(!$GLOBLAS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path])
+		if (!$GLOBLAS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path])
 		{
 			$args = new stdClass();
 			$args->path = $path;
@@ -370,12 +370,12 @@ 
 	function getRemoveUrlByPackageSrl($packageSrl)
 	{
 		$ftp_info = Context::getFTPInfo();
-		if(!$ftp_info->ftp_root_path)
+		if (!$ftp_info->ftp_root_path)
 		{
 			return;
 		}
 
-		if(!$packageSrl)
+		if (!$packageSrl)
 		{
 			return;
 		}
@@ -391,19 +391,19 @@ 
 	 */
 	function getRemoveUrlByPath($path)
 	{
-		if(!$path)
+		if (!$path)
 		{
 			return;
 		}
 
 		$ftp_info = Context::getFTPInfo();
-		if(!$ftp_info->ftp_root_path)
+		if (!$ftp_info->ftp_root_path)
 		{
 			return;
 		}
 
 		$packageSrl = $this->getPackageSrlByPath($path);
-		if(!$packageSrl)
+		if (!$packageSrl)
 		{
 			return;
 		}
@@ -419,7 +419,7 @@ 
 	 */
 	function getUpdateUrlByPackageSrl($packageSrl)
 	{
-		if(!$packageSrl)
+		if (!$packageSrl)
 		{
 			return;
 		}
@@ -435,13 +435,13 @@ 
 	 */
 	function getUpdateUrlByPath($path)
 	{
-		if(!$path)
+		if (!$path)
 		{
 			return;
 		}
 
 		$packageSrl = $this->getPackageSrlByPath($path);
-		if(!$packageSrl)
+		if (!$packageSrl)
 		{
 			return;
 		}
@@ -452,7 +452,7 @@ 
 	function getHaveInstance($columnList = array())
 	{
 		$output = executeQueryArray('autoinstall.getHaveInstance', NULL, $columnList);
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return array();
 		}

modules/board/board.admin.controller.php

Braces +41 added lines, -16 removed lines

@@ -27,7 +27,9 @@ 
 		$args = Context::getRequestVars();
 		$args->module = 'board';
 		$args->mid = $args->board_name;
-		if(is_array($args->use_status)) $args->use_status = implode('|@|', $args->use_status);
+		if(is_array($args->use_status)) {
+			$args->use_status = implode('|@|', $args->use_status);
+		}
 		unset($args->board_name);
 
 		// setup extra_order_target
@@ -43,17 +45,31 @@ 
 		}
 
 		// setup other variables
-		if($args->except_notice != 'Y') $args->except_notice = 'N';
-		if($args->use_anonymous != 'Y') $args->use_anonymous = 'N';
-		if($args->consultation != 'Y') $args->consultation = 'N';
-		if($args->protect_content!= 'Y') $args->protect_content = 'N';
-		if(!in_array($args->order_target,$this->order_target) && !array_key_exists($args->order_target, $extra_order_target)) $args->order_target = 'list_order';
-		if(!in_array($args->order_type, array('asc', 'desc'))) $args->order_type = 'asc';
+		if($args->except_notice != 'Y') {
+			$args->except_notice = 'N';
+		}
+		if($args->use_anonymous != 'Y') {
+			$args->use_anonymous = 'N';
+		}
+		if($args->consultation != 'Y') {
+			$args->consultation = 'N';
+		}
+		if($args->protect_content!= 'Y') {
+			$args->protect_content = 'N';
+		}
+		if(!in_array($args->order_target,$this->order_target) && !array_key_exists($args->order_target, $extra_order_target)) {
+			$args->order_target = 'list_order';
+		}
+		if(!in_array($args->order_type, array('asc', 'desc'))) {
+			$args->order_type = 'asc';
+		}
 
 		// if there is an existed module
 		if($args->module_srl) {
 			$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
-			if($module_info->module_srl != $args->module_srl) unset($args->module_srl);
+			if($module_info->module_srl != $args->module_srl) {
+				unset($args->module_srl);
+			}
 		}
 
 		// insert/update the board module based on module_srl
@@ -67,7 +83,9 @@ 
 			$msg_code = 'success_updated';
 		}
 
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// setup list config
 		$list = explode(',',Context::get('list'));
@@ -77,8 +95,12 @@ 
 			foreach($list as $val)
 			{
 				$val = trim($val);
-				if(!$val) continue;
-				if(substr($val,0,10)=='extra_vars') $val = substr($val,10);
+				if(!$val) {
+					continue;
+				}
+				if(substr($val,0,10)=='extra_vars') {
+					$val = substr($val,10);
+				}
 				$list_arr[] = $val;
 			}
 			$oModuleController = getController('module');
@@ -89,7 +111,7 @@ 
 		if (Context::get('success_return_url')){
 			changeValueInUrl('mid', $args->mid, $module_info->mid);
 			$this->setRedirectUrl(Context::get('success_return_url'));
-		}else{
+		} else{
 			$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminBoardInfo', 'module_srl', $output->get('module_srl')));
 		}
 	}
@@ -131,7 +153,9 @@ 
 			for($i=0;$i<count($admin_members);$i++)
 			{
 				$admin_id = trim($admin_members[$i]);
-				if(!$admin_id) continue;
+				if(!$admin_id) {
+					continue;
+				}
 				$oModuleController->insertAdminId($args->module_srl, $admin_id);
 			}
 		}
@@ -146,7 +170,9 @@ 
 		// get the current module
 		$oModuleController = getController('module');
 		$output = $oModuleController->deleteModule($module_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->add('module','board');
 		$this->add('page',Context::get('page'));
@@ -177,8 +203,7 @@ 
 		if (Context::get('success_return_url'))
 		{
 			$this->setRedirectUrl(Context::get('success_return_url'));
-		}
-		else
+		} else
 		{
 			$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminCategoryInfo', 'module_srl', $output->get('module_srl')));
 		}

Spacing +32 added lines, -32 removed lines

@@ -27,37 +27,37 @@ 
 		$args = Context::getRequestVars();
 		$args->module = 'board';
 		$args->mid = $args->board_name;
-		if(is_array($args->use_status)) $args->use_status = implode('|@|', $args->use_status);
+		if (is_array($args->use_status)) $args->use_status = implode('|@|', $args->use_status);
 		unset($args->board_name);
 
 		// setup extra_order_target
 		$extra_order_target = array();
-		if($args->module_srl)
+		if ($args->module_srl)
 		{
 			$oDocumentModel = getModel('document');
 			$module_extra_vars = $oDocumentModel->getExtraKeys($args->module_srl);
-			foreach($module_extra_vars as $oExtraItem)
+			foreach ($module_extra_vars as $oExtraItem)
 			{
 				$extra_order_target[$oExtraItem->eid] = $oExtraItem->name;
 			}
 		}
 
 		// setup other variables
-		if($args->except_notice != 'Y') $args->except_notice = 'N';
-		if($args->use_anonymous != 'Y') $args->use_anonymous = 'N';
-		if($args->consultation != 'Y') $args->consultation = 'N';
-		if($args->protect_content!= 'Y') $args->protect_content = 'N';
-		if(!in_array($args->order_target,$this->order_target) && !array_key_exists($args->order_target, $extra_order_target)) $args->order_target = 'list_order';
-		if(!in_array($args->order_type, array('asc', 'desc'))) $args->order_type = 'asc';
+		if ($args->except_notice != 'Y') $args->except_notice = 'N';
+		if ($args->use_anonymous != 'Y') $args->use_anonymous = 'N';
+		if ($args->consultation != 'Y') $args->consultation = 'N';
+		if ($args->protect_content != 'Y') $args->protect_content = 'N';
+		if (!in_array($args->order_target, $this->order_target) && !array_key_exists($args->order_target, $extra_order_target)) $args->order_target = 'list_order';
+		if (!in_array($args->order_type, array('asc', 'desc'))) $args->order_type = 'asc';
 
 		// if there is an existed module
-		if($args->module_srl) {
+		if ($args->module_srl) {
 			$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
-			if($module_info->module_srl != $args->module_srl) unset($args->module_srl);
+			if ($module_info->module_srl != $args->module_srl) unset($args->module_srl);
 		}
 
 		// insert/update the board module based on module_srl
-		if(!$args->module_srl) {
+		if (!$args->module_srl) {
 			$args->hide_category = 'N';
 			$output = $oModuleController->insertModule($args);
 			$msg_code = 'success_registed';
@@ -67,18 +67,18 @@ 
 			$msg_code = 'success_updated';
 		}
 
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// setup list config
-		$list = explode(',',Context::get('list'));
-		if(count($list))
+		$list = explode(',', Context::get('list'));
+		if (count($list))
 		{
 			$list_arr = array();
-			foreach($list as $val)
+			foreach ($list as $val)
 			{
 				$val = trim($val);
-				if(!$val) continue;
-				if(substr($val,0,10)=='extra_vars') $val = substr($val,10);
+				if (!$val) continue;
+				if (substr($val, 0, 10) == 'extra_vars') $val = substr($val, 10);
 				$list_arr[] = $val;
 			}
 			$oModuleController = getController('module');
@@ -86,10 +86,10 @@ 
 		}
 
 		$this->setMessage($msg_code);
-		if (Context::get('success_return_url')){
+		if (Context::get('success_return_url')) {
 			changeValueInUrl('mid', $args->mid, $module_info->mid);
 			$this->setRedirectUrl(Context::get('success_return_url'));
-		}else{
+		} else {
 			$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminBoardInfo', 'module_srl', $output->get('module_srl')));
 		}
 	}
@@ -105,17 +105,17 @@ 
 		// for board info
 		$args->module = 'board';
 		$args->mid = $args->board_name;
-		if(is_array($args->use_status))
+		if (is_array($args->use_status))
 		{
 			$args->use_status = implode('|@|', $args->use_status);
 		}
 		unset($args->board_name);
 
-		if(!in_array($args->order_target, $this->order_target))
+		if (!in_array($args->order_target, $this->order_target))
 		{
 			$args->order_target = 'list_order';
 		}
-		if(!in_array($args->order_type, array('asc', 'desc')))
+		if (!in_array($args->order_type, array('asc', 'desc')))
 		{
 			$args->order_type = 'asc';
 		}
@@ -125,13 +125,13 @@ 
 
 		// for grant info, Register Admin ID
 		$oModuleController->deleteAdminId($args->module_srl);
-		if($args->admin_member)
+		if ($args->admin_member)
 		{
-			$admin_members = explode(',',$args->admin_member);
-			for($i=0;$i<count($admin_members);$i++)
+			$admin_members = explode(',', $args->admin_member);
+			for ($i = 0; $i < count($admin_members); $i++)
 			{
 				$admin_id = trim($admin_members[$i]);
-				if(!$admin_id) continue;
+				if (!$admin_id) continue;
 				$oModuleController->insertAdminId($args->module_srl, $admin_id);
 			}
 		}
@@ -146,10 +146,10 @@ 
 		// get the current module
 		$oModuleController = getController('module');
 		$output = $oModuleController->deleteModule($module_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		$this->add('module','board');
-		$this->add('page',Context::get('page'));
+		$this->add('module', 'board');
+		$this->add('page', Context::get('page'));
 		$this->setMessage('success_deleted');
 	}
 
@@ -160,7 +160,7 @@ 
 
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if($module_info->mid != $mid)
+		if ($module_info->mid != $mid)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -168,7 +168,7 @@ 
 		$module_info->hide_category = Context::get('hide_category') == 'Y' ? 'Y' : 'N';
 		$oModuleController = getController('module'); /* @var $oModuleController moduleController */
 		$output = $oModuleController->updateModule($module_info);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}

modules/board/board.admin.view.php

Spacing +29 added lines, -29 removed lines

@@ -17,7 +17,7 @@ 
 	function init() {
 		// check module_srl is existed or not
 		$module_srl = Context::get('module_srl');
-		if(!$module_srl && $this->module_srl) {
+		if (!$module_srl && $this->module_srl) {
 			$module_srl = $this->module_srl;
 			Context::set('module_srl', $module_srl);
 		}
@@ -26,20 +26,20 @@ 
 		$oModuleModel = getModel('module');
 
 		// get the module infomation based on the module_srl
-		if($module_srl) {
+		if ($module_srl) {
 			$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-			if(!$module_info) {
-				Context::set('module_srl','');
+			if (!$module_info) {
+				Context::set('module_srl', '');
 				$this->act = 'list';
 			} else {
 				ModuleModel::syncModuleToSite($module_info);
 				$this->module_info = $module_info;
 				$this->module_info->use_status = explode('|@|', $module_info->use_status);
-				Context::set('module_info',$module_info);
+				Context::set('module_info', $module_info);
 			}
 		}
 
-		if($module_info && $module_info->module != 'board') return $this->stop("msg_invalid_request");
+		if ($module_info && $module_info->module != 'board') return $this->stop("msg_invalid_request");
 
 		// get the module category list
 		$module_category = $oModuleModel->getModuleCategories();
@@ -50,11 +50,11 @@ 
 		$security->encodeHTML('module_category..');
 
 		// setup template path (board admin panel templates is resided in the tpl folder)
-		$template_path = sprintf("%stpl/",$this->module_path);
+		$template_path = sprintf("%stpl/", $this->module_path);
 		$this->setTemplatePath($template_path);
 
 		// install order (sorting) options
-		foreach($this->order_target as $key) $order_target[$key] = Context::getLang($key);
+		foreach ($this->order_target as $key) $order_target[$key] = Context::getLang($key);
 		$order_target['list_order'] = Context::getLang('document_srl');
 		$order_target['update_order'] = Context::getLang('last_update');
 		Context::set('order_target', $order_target);
@@ -75,7 +75,7 @@ 
 		$search_target = Context::get('search_target');
 		$search_keyword = Context::get('search_keyword');
 
-		switch ($search_target){
+		switch ($search_target) {
 			case 'mid':
 				$args->s_mid = $search_keyword;
 				break;
@@ -90,7 +90,7 @@ 
 		// get the skins path
 		$oModuleModel = getModel('module');
 		$skin_list = $oModuleModel->getSkins($this->module_path);
-		Context::set('skin_list',$skin_list);
+		Context::set('skin_list', $skin_list);
 
 		$mskin_list = $oModuleModel->getSkins($this->module_path, "m.skins");
 		Context::set('mskin_list', $mskin_list);
@@ -100,7 +100,7 @@ 
 		$layout_list = $oLayoutModel->getLayoutList();
 		Context::set('layout_list', $layout_list);
 
-		$mobile_layout_list = $oLayoutModel->getLayoutList(0,"M");
+		$mobile_layout_list = $oLayoutModel->getLayoutList(0, "M");
 		Context::set('mlayout_list', $mobile_layout_list);
 
 		$oModuleAdminModel = getAdminModel('module');
@@ -115,10 +115,10 @@ 
 		Context::set('page_navigation', $output->page_navigation);
 
 		$security = new Security();
-		$security->encodeHTML('board_list..browser_title','board_list..mid');
-		$security->encodeHTML('skin_list..title','mskin_list..title');
-		$security->encodeHTML('layout_list..title','layout_list..layout');
-		$security->encodeHTML('mlayout_list..title','mlayout_list..layout');
+		$security->encodeHTML('board_list..browser_title', 'board_list..mid');
+		$security->encodeHTML('skin_list..title', 'mskin_list..title');
+		$security->encodeHTML('layout_list..title', 'layout_list..layout');
+		$security->encodeHTML('mlayout_list..title', 'mlayout_list..layout');
 
 		// 템플릿 파일 지정
 		$this->setTemplateFile('index');
@@ -135,14 +135,14 @@ 
 	 * @brief display the module insert form
 	 **/
 	function dispBoardAdminInsertBoard() {
-		if(!in_array($this->module_info->module, array('admin', 'board','blog','guestbook'))) {
+		if (!in_array($this->module_info->module, array('admin', 'board', 'blog', 'guestbook'))) {
 			return $this->alertMessage('msg_invalid_request');
 		}
 
 		// get the skins list
 		$oModuleModel = getModel('module');
 		$skin_list = $oModuleModel->getSkins($this->module_path);
-		Context::set('skin_list',$skin_list);
+		Context::set('skin_list', $skin_list);
 
 		$mskin_list = $oModuleModel->getSkins($this->module_path, "m.skins");
 		Context::set('mskin_list', $mskin_list);
@@ -152,13 +152,13 @@ 
 		$layout_list = $oLayoutModel->getLayoutList();
 		Context::set('layout_list', $layout_list);
 
-		$mobile_layout_list = $oLayoutModel->getLayoutList(0,"M");
+		$mobile_layout_list = $oLayoutModel->getLayoutList(0, "M");
 		Context::set('mlayout_list', $mobile_layout_list);
 
 		$security = new Security();
-		$security->encodeHTML('skin_list..title','mskin_list..title');
-		$security->encodeHTML('layout_list..title','layout_list..layout');
-		$security->encodeHTML('mlayout_list..title','mlayout_list..layout');
+		$security->encodeHTML('skin_list..title', 'mskin_list..title');
+		$security->encodeHTML('layout_list..title', 'layout_list..layout');
+		$security->encodeHTML('mlayout_list..title', 'mlayout_list..layout');
 
 		// get document status list
 		$oDocumentModel = getModel('document');
@@ -177,14 +177,14 @@ 
 		// setup extra_order_target
 		$module_extra_vars = $oDocumentModel->getExtraKeys($this->module_info->module_srl);
 		$extra_order_target = array();
-		foreach($module_extra_vars as $oExtraItem)
+		foreach ($module_extra_vars as $oExtraItem)
 		{
 			$extra_order_target[$oExtraItem->eid] = $oExtraItem->name;
 		}
 		Context::set('extra_order_target', $extra_order_target);
 
 		$security = new Security();
-		$security->encodeHTML('extra_vars..name','list_config..name');
+		$security->encodeHTML('extra_vars..name', 'list_config..name');
 
 		// set the template file
 		$this->setTemplateFile('board_insert');
@@ -212,8 +212,8 @@ 
 	 * @brief display the board mdoule delete page
 	 **/
 	function dispBoardAdminDeleteBoard() {
-		if(!Context::get('module_srl')) return $this->dispBoardAdminContent();
-		if(!in_array($this->module_info->module, array('admin', 'board','blog','guestbook'))) {
+		if (!Context::get('module_srl')) return $this->dispBoardAdminContent();
+		if (!in_array($this->module_info->module, array('admin', 'board', 'blog', 'guestbook'))) {
 			return $this->alertMessage('msg_invalid_request');
 		}
 
@@ -223,10 +223,10 @@ 
 		$document_count = $oDocumentModel->getDocumentCount($module_info->module_srl);
 		$module_info->document_count = $document_count;
 
-		Context::set('module_info',$module_info);
+		Context::set('module_info', $module_info);
 
 		$security = new Security();
-		$security->encodeHTML('module_info..mid','module_info..module','module_info..document_count');
+		$security->encodeHTML('module_info..mid', 'module_info..module', 'module_info..document_count');
 
 		// setup the template file
 		$this->setTemplateFile('board_delete');
@@ -295,7 +295,7 @@ 
 	 * @brief board module message
 	 **/
 	function alertMessage($message) {
-		$script =  sprintf('<script> xAddEventListener(window,"load", function() { alert("%s"); } );</script>', Context::getLang($message));
-		Context::addHtmlHeader( $script );
+		$script = sprintf('<script> xAddEventListener(window,"load", function() { alert("%s"); } );</script>', Context::getLang($message));
+		Context::addHtmlHeader($script);
 	}
 }

Braces +9 added lines, -3 removed lines

@@ -39,7 +39,9 @@ 
 			}
 		}
 
-		if($module_info && $module_info->module != 'board') return $this->stop("msg_invalid_request");
+		if($module_info && $module_info->module != 'board') {
+			return $this->stop("msg_invalid_request");
+		}
 
 		// get the module category list
 		$module_category = $oModuleModel->getModuleCategories();
@@ -54,7 +56,9 @@ 
 		$this->setTemplatePath($template_path);
 
 		// install order (sorting) options
-		foreach($this->order_target as $key) $order_target[$key] = Context::getLang($key);
+		foreach($this->order_target as $key) {
+			$order_target[$key] = Context::getLang($key);
+		}
 		$order_target['list_order'] = Context::getLang('document_srl');
 		$order_target['update_order'] = Context::getLang('last_update');
 		Context::set('order_target', $order_target);
@@ -212,7 +216,9 @@ 
 	 * @brief display the board mdoule delete page
 	 **/
 	function dispBoardAdminDeleteBoard() {
-		if(!Context::get('module_srl')) return $this->dispBoardAdminContent();
+		if(!Context::get('module_srl')) {
+			return $this->dispBoardAdminContent();
+		}
 		if(!in_array($this->module_info->module, array('admin', 'board','blog','guestbook'))) {
 			return $this->alertMessage('msg_invalid_request');
 		}

modules/comment/comment.controller.php

Indentation +1 added lines, -1 removed lines

@@ -581,7 +581,7 @@
 				//mail to author of thread - START
 				/**
 				 * @todo Removed code send email to document author.
-				*/
+				 */
 				/*
 				if($document_author_email != $obj->email_address && $logged_info->email_address != $document_author_email)
 				{

Doc Comments +3 added lines, -4 removed lines

@@ -160,7 +160,6 @@ 
 
 	/**
 	 * Check if module is using comment validation system
-	 * @param int $document_srl
 	 * @param int $module_srl
 	 * @return bool
 	 */
@@ -1151,7 +1150,7 @@ 
 
 	/**
 	 * Report a blamed comment
-	 * @param $comment_srl
+	 * @param string $comment_srl
 	 * @return void
 	 */
 	function declaredComment($comment_srl)
@@ -1356,7 +1355,7 @@ 
 	/**
 	 * Comment module config setting
 	 * @param int $srl
-	 * @param object $comment_config
+	 * @param stdClass $comment_config
 	 * @return BaseObject
 	 */
 	function setCommentModuleConfig($srl, $comment_config)
@@ -1368,7 +1367,7 @@ 
 
 	/**
 	 * Get comment all list
-	 * @return void
+	 * @return BaseObject|null
 	 */
 	function procCommentGetList()
 	{

Braces +22 added lines, -44 removed lines

@@ -211,14 +211,12 @@ 
 				if($logged_info->is_admin == 'Y')
 				{
 					$is_admin = TRUE;
-				}
-				else
+				} else
 				{
 					$is_admin = FALSE;
 				}
 			}
-		}
-		else
+		} else
 		{
 			$is_admin = FALSE;
 		}
@@ -226,14 +224,12 @@ 
 		if(!$using_validation)
 		{
 			$obj->status = 1;
-		}
-		else
+		} else
 		{
 			if($is_admin)
 			{
 				$obj->status = 1;
-			}
-			else
+			} else
 			{
 				$obj->status = 0;
 			}
@@ -310,8 +306,7 @@ 
 		if(!$obj->comment_srl)
 		{
 			$obj->comment_srl = getNextSequence();
-		}
-		elseif(!$is_admin && !$manual_inserted && !checkUserSequence($obj->comment_srl)) 
+		} elseif(!$is_admin && !$manual_inserted && !checkUserSequence($obj->comment_srl)) 
 		{
 			return new BaseObject(-1, 'msg_not_permitted');
 		}
@@ -369,8 +364,7 @@ 
 			$list_args->head = $list_args->arrange = $obj->comment_srl;
 			$list_args->depth = 0;
 			// If parent comment exists, get information of the parent comment
-		}
-		else
+		} else
 		{
 			// get information of the parent comment posting
 			$parent_args = new stdClass();
@@ -393,8 +387,7 @@ 
 			{
 				$list_args->arrange = $obj->comment_srl;
 				// if the depth of comments is greater than 2, execute update.
-			}
-			else
+			} else
 			{
 				// get the top listed comment among those in lower depth and same head with parent's.
 				$p_args = new stdClass();
@@ -407,8 +400,7 @@ 
 				{
 					$list_args->arrange = $output->data->arrange;
 					$output = executeQuery('comment.updateCommentListArrange', $list_args);
-				}
-				else
+				} else
 				{
 					$list_args->arrange = $obj->comment_srl;
 				}
@@ -442,8 +434,7 @@ 
 		if(!$using_validation)
 		{
 			$output = $oDocumentController->updateCommentCount($document_srl, $comment_count, $obj->nick_name, TRUE);
-		}
-		else
+		} else
 		{
 			if($is_admin)
 			{
@@ -511,8 +502,7 @@ 
 		if(isset($obj->member_srl) && !is_null($obj->member_srl))
 		{
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($obj->member_srl);
-		}
-		else
+		} else
 		{
 			$member_info = new stdClass();
 			$member_info->is_admin = "N";
@@ -558,8 +548,7 @@ 
 					<br /><a href=\"" . getFullUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_target', 'module', 'search_keyword', $obj->module_srl) . "\">" . getFullUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_target', 'module', 'search_keyword', $obj->module_srl) . "</a>
 					";
 				$oMail->setContent($mail_content);
-			}
-			else
+			} else
 			{
 				$mail_content = "
 					Author: " . $member_info->nick_name . "
@@ -832,8 +821,7 @@ 
 			if(!$deleteAllComment)
 			{
 				return new BaseObject(-1, 'fail_to_delete_have_children');
-			}
-			else
+			} else
 			{
 				foreach($childs as $val)
 				{
@@ -897,8 +885,7 @@ 
 		{
 			$this->_deleteDeclaredComments($args);
 			$this->_deleteVotedComments($args);
-		} 
-		else 
+		} else 
 		{
 			$args = new stdClass();
 			$args->upload_target_srl = $comment_srl;
@@ -941,8 +928,7 @@ 
 		{
 			$oDocument = new documentItem();
 			$oDocument->setAttribute($obj);
-		}
-		else
+		} else
 		{
 			$oDocument = $oDocumentModel->getDocument($document_srl);
 		}
@@ -1035,8 +1021,7 @@ 
 		{
 			$failed_voted = 'failed_voted';
 			$success_message = 'success_voted';
-		}
-		else
+		} else
 		{
 			$failed_voted = 'failed_blamed';
 			$success_message = 'success_blamed';
@@ -1079,8 +1064,7 @@ 
 		if($member_srl)
 		{
 			$args->member_srl = $member_srl;
-		}
-		else
+		} else
 		{
 			$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 		}
@@ -1120,8 +1104,7 @@ 
 		{
 			$args->blamed_count = $trigger_obj->after_point;
 			$output = executeQuery('comment.updateBlamedCount', $args);
-		}
-		else
+		} else
 		{
 			$args->voted_count = $trigger_obj->after_point;
 			$output = executeQuery('comment.updateVotedCount', $args);
@@ -1149,8 +1132,7 @@ 
 		if($trigger_obj->update_target === 'voted_count')
 		{
 			$output->add('voted_count', $trigger_obj->after_point);
-		}
-		else
+		} else
 		{
 			$output->add('blamed_count', $trigger_obj->after_point);
 		}
@@ -1222,8 +1204,7 @@ 
 		if($member_srl)
 		{
 			$args->member_srl = $member_srl;
-		}
-		else
+		} else
 		{
 			$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 		}
@@ -1245,8 +1226,7 @@ 
 		if($output->data->declared_count > 0)
 		{
 			$output = executeQuery('comment.updateDeclaredComment', $args);
-		}
-		else
+		} else
 		{
 			$output = executeQuery('comment.insertDeclaredComment', $args);
 		}
@@ -1313,8 +1293,7 @@ 
 		if(preg_match('/^([0-9,]+)$/', $module_srl))
 		{
 			$module_srl = explode(',', $module_srl);
-		}
-		else
+		} else
 		{
 			$module_srl = array($module_srl);
 		}
@@ -1404,8 +1383,7 @@ 
 					$value->content = strip_tags($value->content);
 				}
 			}
-		}
-		else
+		} else
 		{
 			global $lang;
 			$commentList = array();

Spacing +154 added lines, -154 removed lines

@@ -27,13 +27,13 @@ 
 	 */
 	function procCommentVoteUp()
 	{
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		$comment_srl = Context::get('target_srl');
-		if(!$comment_srl)
+		if (!$comment_srl)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -41,14 +41,14 @@ 
 		$oCommentModel = getModel('comment');
 		$oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE);
 		$module_srl = $oComment->get('module_srl');
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		$oModuleModel = getModel('module');
 		$comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl);
-		if($comment_config->use_vote_up == 'N')
+		if ($comment_config->use_vote_up == 'N')
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -65,13 +65,13 @@ 
 	 */
 	function procCommentVoteDown()
 	{
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		$comment_srl = Context::get('target_srl');
-		if(!$comment_srl)
+		if (!$comment_srl)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -79,14 +79,14 @@ 
 		$oCommentModel = getModel('comment');
 		$oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE);
 		$module_srl = $oComment->get('module_srl');
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		$oModuleModel = getModel('module');
 		$comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl);
-		if($comment_config->use_vote_down == 'N')
+		if ($comment_config->use_vote_down == 'N')
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -103,13 +103,13 @@ 
 	 */
 	function procCommentDeclare()
 	{
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		$comment_srl = Context::get('target_srl');
-		if(!$comment_srl)
+		if (!$comment_srl)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -124,7 +124,7 @@ 
 	function triggerDeleteDocumentComments(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl)
+		if (!$document_srl)
 		{
 			return new BaseObject();
 		}
@@ -139,7 +139,7 @@ 
 	function triggerDeleteModuleComments(&$obj)
 	{
 		$module_srl = $obj->module_srl;
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			return new BaseObject();
 		}
@@ -166,7 +166,7 @@ 
 	 */
 	function isModuleUsingPublishValidation($module_srl = NULL)
 	{
-		if($module_srl == NULL)
+		if ($module_srl == NULL)
 		{
 			return FALSE;
 		}
@@ -175,7 +175,7 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
 		$module_part_config = $oModuleModel->getModulePartConfig('comment', $module_info->module_srl);
 		$use_validation = FALSE;
-		if(isset($module_part_config->use_comment_validation) && $module_part_config->use_comment_validation == "Y")
+		if (isset($module_part_config->use_comment_validation) && $module_part_config->use_comment_validation == "Y")
 		{
 			$use_validation = TRUE;
 		}
@@ -190,12 +190,12 @@ 
 	 */
 	function insertComment($obj, $manual_inserted = FALSE)
 	{
-		if(!$manual_inserted && !checkCSRF())
+		if (!$manual_inserted && !checkCSRF())
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
-		if(!is_object($obj))
+		if (!is_object($obj))
 		{
 			$obj = new stdClass();
 		}
@@ -203,12 +203,12 @@ 
 		// check if comment's module is using comment validation and set the publish status to 0 (false)
 		// for inserting query, otherwise default is 1 (true - means comment is published)
 		$using_validation = $this->isModuleUsingPublishValidation($obj->module_srl);
-		if(!$manual_inserted)
+		if (!$manual_inserted)
 		{
-			if(Context::get('is_logged'))
+			if (Context::get('is_logged'))
 			{
 				$logged_info = Context::get('logged_info');
-				if($logged_info->is_admin == 'Y')
+				if ($logged_info->is_admin == 'Y')
 				{
 					$is_admin = TRUE;
 				}
@@ -223,13 +223,13 @@ 
 			$is_admin = FALSE;
 		}
 
-		if(!$using_validation)
+		if (!$using_validation)
 		{
 			$obj->status = 1;
 		}
 		else
 		{
-			if($is_admin)
+			if ($is_admin)
 			{
 				$obj->status = 1;
 			}
@@ -242,14 +242,14 @@ 
 
 		// call a trigger (before)
 		$output = ModuleHandler::triggerCall('comment.insertComment', 'before', $obj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		// check if a posting of the corresponding document_srl exists
 		$document_srl = $obj->document_srl;
-		if(!$document_srl)
+		if (!$document_srl)
 		{
 			return new BaseObject(-1, 'msg_invalid_document');
 		}
@@ -258,36 +258,36 @@ 
 		$oDocumentModel = getModel('document');
 
 		// even for manual_inserted if password exists, hash it.
-		if($obj->password)
+		if ($obj->password)
 		{
 			$obj->password = getModel('member')->hashPassword($obj->password);
 		}
 
 		// get the original posting
-		if(!$manual_inserted)
+		if (!$manual_inserted)
 		{
 			$oDocument = $oDocumentModel->getDocument($document_srl);
 
-			if($document_srl != $oDocument->document_srl)
+			if ($document_srl != $oDocument->document_srl)
 			{
 				return new BaseObject(-1, 'msg_invalid_document');
 			}
-			if($oDocument->isLocked())
+			if ($oDocument->isLocked())
 			{
 				return new BaseObject(-1, 'msg_invalid_request');
 			}
 
-			if($obj->homepage)
+			if ($obj->homepage)
 			{
 				$obj->homepage = escape($obj->homepage, false);
-				if(!preg_match('/^[a-z]+:\/\//i',$obj->homepage))
+				if (!preg_match('/^[a-z]+:\/\//i', $obj->homepage))
 				{
 					$obj->homepage = 'http://'.$obj->homepage;
 				}
 			}
 
 			// input the member's information if logged-in
-			if(Context::get('is_logged'))
+			if (Context::get('is_logged'))
 			{
 				$logged_info = Context::get('logged_info');
 				$obj->member_srl = $logged_info->member_srl;
@@ -302,16 +302,16 @@ 
 		}
 
 		// error display if neither of log-in info and user name exist.
-		if(!$logged_info->member_srl && !$obj->nick_name)
+		if (!$logged_info->member_srl && !$obj->nick_name)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
-		if(!$obj->comment_srl)
+		if (!$obj->comment_srl)
 		{
 			$obj->comment_srl = getNextSequence();
 		}
-		elseif(!$is_admin && !$manual_inserted && !checkUserSequence($obj->comment_srl)) 
+		elseif (!$is_admin && !$manual_inserted && !checkUserSequence($obj->comment_srl)) 
 		{
 			return new BaseObject(-1, 'msg_not_permitted');
 		}
@@ -322,32 +322,32 @@ 
 		// remove XE's own tags from the contents
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
 
-		if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
+		if (Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
 		{
-			if($obj->use_html != 'Y')
+			if ($obj->use_html != 'Y')
 			{
 				$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 			}
 			$obj->content = nl2br($obj->content);
 		}
 
-		if(!$obj->regdate)
+		if (!$obj->regdate)
 		{
 			$obj->regdate = date("YmdHis");
 		}
 
 		// remove iframe and script if not a top administrator on the session.
-		if($logged_info->is_admin != 'Y')
+		if ($logged_info->is_admin != 'Y')
 		{
 			$obj->content = removeHackTag($obj->content);
 		}
 
-		if(!$obj->notify_message)
+		if (!$obj->notify_message)
 		{
 			$obj->notify_message = 'N';
 		}
 
-		if(!$obj->is_secret)
+		if (!$obj->is_secret)
 		{
 			$obj->is_secret = 'N';
 		}
@@ -364,7 +364,7 @@ 
 		$list_args->regdate = $obj->regdate;
 
 		// If parent comment doesn't exist, set data directly
-		if(!$obj->parent_srl)
+		if (!$obj->parent_srl)
 		{
 			$list_args->head = $list_args->arrange = $obj->comment_srl;
 			$list_args->depth = 0;
@@ -378,7 +378,7 @@ 
 			$parent_output = executeQuery('comment.getCommentListItem', $parent_args);
 
 			// return if no parent comment exists
-			if(!$parent_output->toBool() || !$parent_output->data)
+			if (!$parent_output->toBool() || !$parent_output->data)
 			{
 				return;
 			}
@@ -389,7 +389,7 @@ 
 			$list_args->depth = $parent->depth + 1;
 
 			// if the depth of comments is less than 2, execute insert.
-			if($list_args->depth < 2)
+			if ($list_args->depth < 2)
 			{
 				$list_args->arrange = $obj->comment_srl;
 				// if the depth of comments is greater than 2, execute update.
@@ -403,7 +403,7 @@ 
 				$p_args->depth = $parent->depth;
 				$output = executeQuery('comment.getCommentParentNextSibling', $p_args);
 
-				if($output->data->arrange)
+				if ($output->data->arrange)
 				{
 					$list_args->arrange = $output->data->arrange;
 					$output = executeQuery('comment.updateCommentListArrange', $list_args);
@@ -416,14 +416,14 @@ 
 		}
 
 		$output = executeQuery('comment.insertCommentList', $list_args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		// insert comment
 		$output = executeQuery('comment.insertComment', $obj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -439,29 +439,29 @@ 
 		$oDocumentController = getController('document');
 
 		// Update the number of comments in the post
-		if(!$using_validation)
+		if (!$using_validation)
 		{
 			$output = $oDocumentController->updateCommentCount($document_srl, $comment_count, $obj->nick_name, TRUE);
 		}
 		else
 		{
-			if($is_admin)
+			if ($is_admin)
 			{
 				$output = $oDocumentController->updateCommentCount($document_srl, $comment_count, $obj->nick_name, TRUE);
 			}
 		}
 
 		// grant autority of the comment
-		if(!$manual_inserted)
+		if (!$manual_inserted)
 		{
 			$this->addGrant($obj->comment_srl);
 		}
 
 		// call a trigger(after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('comment.insertComment', 'after', $obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -471,16 +471,16 @@ 
 		// commit
 		$oDB->commit();
 
-		if(!$manual_inserted)
+		if (!$manual_inserted)
 		{
 			// send a message if notify_message option in enabled in the original article
 			$oDocument->notify(Context::getLang('comment'), $obj->content);
 
 			// send a message if notify_message option in enabled in the original comment
-			if($obj->parent_srl)
+			if ($obj->parent_srl)
 			{
 				$oParent = $oCommentModel->getComment($obj->parent_srl);
-				if($oParent->get('member_srl') != $oDocument->get('member_srl'))
+				if ($oParent->get('member_srl') != $oDocument->get('member_srl'))
 				{
 					$oParent->notify(Context::getLang('comment'), $obj->content);
 				}
@@ -508,7 +508,7 @@ 
 		$oDocument = $oDocumentModel->getDocument($obj->document_srl);
 
 		$oMemberModel = getModel("member");
-		if(isset($obj->member_srl) && !is_null($obj->member_srl))
+		if (isset($obj->member_srl) && !is_null($obj->member_srl))
 		{
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($obj->member_srl);
 		}
@@ -528,47 +528,47 @@ 
 		$module_info = $oModuleModel->getModuleInfoByDocumentSrl($obj->document_srl);
 
 		// If there is no problem to register comment then send an email to all admin were set in module admin panel
-		if($module_info->admin_mail && $member_info->is_admin != 'Y')
+		if ($module_info->admin_mail && $member_info->is_admin != 'Y')
 		{
 			$oMail = new Mail();
 			$oMail->setSender($obj->email_address, $obj->email_address);
-			$mail_title = "[XE - " . Context::get('mid') . "] A new comment was posted on document: \"" . $oDocument->getTitleText() . "\"";
+			$mail_title = "[XE - ".Context::get('mid')."] A new comment was posted on document: \"".$oDocument->getTitleText()."\"";
 			$oMail->setTitle($mail_title);
-			$url_comment = getFullUrl('','document_srl',$obj->document_srl).'#comment_'.$obj->comment_srl;
-			if($using_validation)
+			$url_comment = getFullUrl('', 'document_srl', $obj->document_srl).'#comment_'.$obj->comment_srl;
+			if ($using_validation)
 			{
 				$url_approve = getFullUrl('', 'module', 'admin', 'act', 'procCommentAdminChangePublishedStatusChecked', 'cart[]', $obj->comment_srl, 'will_publish', '1', 'search_target', 'is_published', 'search_keyword', 'N');
 				$url_trash = getFullUrl('', 'module', 'admin', 'act', 'procCommentAdminDeleteChecked', 'cart[]', $obj->comment_srl, 'search_target', 'is_trash', 'search_keyword', 'true');
 				$mail_content = "
-					A new comment on the document \"" . $oDocument->getTitleText() . "\" is waiting for your approval.
+					A new comment on the document \"" . $oDocument->getTitleText()."\" is waiting for your approval.
 					<br />
 					<br />
-					Author: " . $member_info->nick_name . "
-					<br />Author e-mail: " . $member_info->email_address . "
-					<br />From : <a href=\"" . $url_comment . "\">" . $url_comment . "</a>
+					Author: " . $member_info->nick_name."
+					<br />Author e-mail: " . $member_info->email_address."
+					<br />From : <a href=\"" . $url_comment."\">".$url_comment."</a>
 					<br />Comment:
-					<br />\"" . $obj->content . "\"
+					<br />\"" . $obj->content."\"
 					<br />Document:
-					<br />\"" . $oDocument->getContentText(). "\"
+					<br />\"" . $oDocument->getContentText()."\"
 					<br />
 					<br />
-					Approve it: <a href=\"" . $url_approve . "\">" . $url_approve . "</a>
-					<br />Trash it: <a href=\"" . $url_trash . "\">" . $url_trash . "</a>
-					<br />Currently " . $nr_comments_not_approved . " comments on \"" . Context::get('mid') . "\" module are waiting for approval. Please visit the moderation panel:
-					<br /><a href=\"" . getFullUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_target', 'module', 'search_keyword', $obj->module_srl) . "\">" . getFullUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_target', 'module', 'search_keyword', $obj->module_srl) . "</a>
+					Approve it: <a href=\"" . $url_approve."\">".$url_approve."</a>
+					<br />Trash it: <a href=\"" . $url_trash."\">".$url_trash."</a>
+					<br />Currently " . $nr_comments_not_approved." comments on \"".Context::get('mid')."\" module are waiting for approval. Please visit the moderation panel:
+					<br /><a href=\"" . getFullUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_target', 'module', 'search_keyword', $obj->module_srl)."\">".getFullUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_target', 'module', 'search_keyword', $obj->module_srl)."</a>
 					";
 				$oMail->setContent($mail_content);
 			}
 			else
 			{
 				$mail_content = "
-					Author: " . $member_info->nick_name . "
-					<br />Author e-mail: " . $member_info->email_address . "
-					<br />From : <a href=\"" . $url_comment . "\">" . $url_comment . "</a>
+					Author: " . $member_info->nick_name."
+					<br />Author e-mail: " . $member_info->email_address."
+					<br />From : <a href=\"" . $url_comment."\">".$url_comment."</a>
 					<br />Comment:
-					<br />\"" . $obj->content . "\"
+					<br />\"" . $obj->content."\"
 					<br />Document:
-					<br />\"" . $oDocument->getContentText(). "\"
+					<br />\"" . $oDocument->getContentText()."\"
 					";
 				$oMail->setContent($mail_content);
 
@@ -597,10 +597,10 @@ 
 			$target_mail = explode(',', $admins_emails);
 
 			// send email to all admins - START
-			for($i = 0; $i < count($target_mail); $i++)
+			for ($i = 0; $i < count($target_mail); $i++)
 			{
 				$email_address = trim($target_mail[$i]);
-				if(!$email_address)
+				if (!$email_address)
 				{
 					continue;
 				}
@@ -646,12 +646,12 @@ 
 	 */
 	function updateComment($obj, $is_admin = FALSE, $manual_updated = FALSE)
 	{
-		if(!$manual_updated && !checkCSRF())
+		if (!$manual_updated && !checkCSRF())
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
-		if(!is_object($obj))
+		if (!is_object($obj))
 		{
 			$obj = new stdClass();
 		}
@@ -660,7 +660,7 @@ 
 
 		// call a trigger (before)
 		$output = ModuleHandler::triggerCall('comment.updateComment', 'before', $obj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -670,7 +670,7 @@ 
 
 		// get the original data
 		$source_obj = $oCommentModel->getComment($obj->comment_srl);
-		if(!$source_obj->getMemberSrl())
+		if (!$source_obj->getMemberSrl())
 		{
 			$obj->member_srl = $source_obj->get('member_srl');
 			$obj->user_name = $source_obj->get('user_name');
@@ -680,30 +680,30 @@ 
 		}
 
 		// check if permission is granted
-		if(!$is_admin && !$source_obj->isGranted())
+		if (!$is_admin && !$source_obj->isGranted())
 		{
 			return new BaseObject(-1, 'msg_not_permitted');
 		}
 
-		if($obj->password)
+		if ($obj->password)
 		{
 			$obj->password = getModel('member')->hashPassword($obj->password);
 		}
 
-		if($obj->homepage) 
+		if ($obj->homepage) 
 		{
 			$obj->homepage = escape($obj->homepage);
-			if(!preg_match('/^[a-z]+:\/\//i',$obj->homepage))
+			if (!preg_match('/^[a-z]+:\/\//i', $obj->homepage))
 			{
 				$obj->homepage = 'http://'.$obj->homepage;
 			}
 		}
 
 		// set modifier's information if logged-in and posting author and modifier are matched.
-		if(Context::get('is_logged'))
+		if (Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
-			if($source_obj->member_srl == $logged_info->member_srl)
+			if ($source_obj->member_srl == $logged_info->member_srl)
 			{
 				$obj->member_srl = $logged_info->member_srl;
 				$obj->user_name = $logged_info->user_name;
@@ -714,7 +714,7 @@ 
 		}
 
 		// if nick_name of the logged-in author doesn't exist
-		if($source_obj->get('member_srl') && !$obj->nick_name)
+		if ($source_obj->get('member_srl') && !$obj->nick_name)
 		{
 			$obj->member_srl = $source_obj->get('member_srl');
 			$obj->user_name = $source_obj->get('user_name');
@@ -723,7 +723,7 @@ 
 			$obj->homepage = $source_obj->get('homepage');
 		}
 
-		if(!$obj->content)
+		if (!$obj->content)
 		{
 			$obj->content = $source_obj->get('content');
 		}
@@ -731,9 +731,9 @@ 
 		// remove XE's wn tags from contents
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
 
-		if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
+		if (Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
 		{
-			if($obj->use_html != 'Y')
+			if ($obj->use_html != 'Y')
 			{
 				$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 			}
@@ -741,7 +741,7 @@ 
 		}
 
 		// remove iframe and script if not a top administrator on the session
-		if($logged_info->is_admin != 'Y')
+		if ($logged_info->is_admin != 'Y')
 		{
 			$obj->content = removeHackTag($obj->content);
 		}
@@ -752,17 +752,17 @@ 
 
 		// Update
 		$output = executeQuery('comment.updateComment', $obj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		// call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('comment.updateComment', 'after', $obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -791,7 +791,7 @@ 
 
 		// check if comment already exists
 		$comment = $oCommentModel->getComment($comment_srl);
-		if($comment->comment_srl != $comment_srl)
+		if ($comment->comment_srl != $comment_srl)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -800,28 +800,28 @@ 
 
 		// call a trigger (before)
 		$output = ModuleHandler::triggerCall('comment.deleteComment', 'before', $comment);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		// check if permission is granted
-		if(!$is_admin && !$comment->isGranted())
+		if (!$is_admin && !$comment->isGranted())
 		{
 			return new BaseObject(-1, 'msg_not_permitted');
 		}
 
 		// check if child comment exists on the comment
 		$childs = $oCommentModel->getChildComments($comment_srl);
-		if(count($childs) > 0)
+		if (count($childs) > 0)
 		{
 			$deleteAllComment = TRUE;
-			if(!$is_admin)
+			if (!$is_admin)
 			{
 				$logged_info = Context::get('logged_info');
-				foreach($childs as $val)
+				foreach ($childs as $val)
 				{
-					if($val->member_srl != $logged_info->member_srl)
+					if ($val->member_srl != $logged_info->member_srl)
 					{
 						$deleteAllComment = FALSE;
 						break;
@@ -829,16 +829,16 @@ 
 				}
 			}
 
-			if(!$deleteAllComment)
+			if (!$deleteAllComment)
 			{
 				return new BaseObject(-1, 'fail_to_delete_have_children');
 			}
 			else
 			{
-				foreach($childs as $val)
+				foreach ($childs as $val)
 				{
 					$output = $this->deleteComment($val->comment_srl, $is_admin, $isMoveToTrash);
-					if(!$output->toBool())
+					if (!$output->toBool())
 					{
 						return $output;
 					}
@@ -854,7 +854,7 @@ 
 		$args = new stdClass();
 		$args->comment_srl = $comment_srl;
 		$output = executeQuery('comment.deleteComment', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -866,14 +866,14 @@ 
 		$comment_count = $oCommentModel->getCommentCount($document_srl);
 
 		// only document is exists
-		if(isset($comment_count))
+		if (isset($comment_count))
 		{
 			// create the controller object of the document
 			$oDocumentController = getController('document');
 
 			// update comment count of the article posting
 			$output = $oDocumentController->updateCommentCount($document_srl, $comment_count, NULL, FALSE);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -881,11 +881,11 @@ 
 		}
 
 		// call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$comment->isMoveToTrash = $isMoveToTrash;
 			$trigger_output = ModuleHandler::triggerCall('comment.deleteComment', 'after', $comment);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -893,7 +893,7 @@ 
 			unset($comment->isMoveToTrash);
 		}
 
-		if(!$isMoveToTrash)
+		if (!$isMoveToTrash)
 		{
 			$this->_deleteDeclaredComments($args);
 			$this->_deleteVotedComments($args);
@@ -937,7 +937,7 @@ 
 		$oCommentModel = getModel('comment');
 
 		// check if permission is granted
-		if(is_object($obj))
+		if (is_object($obj))
 		{
 			$oDocument = new documentItem();
 			$oDocument->setAttribute($obj);
@@ -947,7 +947,7 @@ 
 			$oDocument = $oDocumentModel->getDocument($document_srl);
 		}
 
-		if(!$oDocument->isExists() || !$oDocument->isGranted())
+		if (!$oDocument->isExists() || !$oDocument->isGranted())
 		{
 			return new BaseObject(-1, 'msg_not_permitted');
 		}
@@ -956,23 +956,23 @@ 
 		$args = new stdClass();
 		$args->document_srl = $document_srl;
 		$comments = executeQueryArray('comment.getAllComments', $args);
-		if($comments->data)
+		if ($comments->data)
 		{
 			$commentSrlList = array();
-			foreach($comments->data as $comment)
+			foreach ($comments->data as $comment)
 			{
 				$commentSrlList[] = $comment->comment_srl;
 
 				// call a trigger (before)
 				$output = ModuleHandler::triggerCall('comment.deleteComment', 'before', $comment);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					continue;
 				}
 
 				// call a trigger (after)
 				$output = ModuleHandler::triggerCall('comment.deleteComment', 'after', $comment);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					continue;
 				}
@@ -982,7 +982,7 @@ 
 		// delete the comment
 		$args->document_srl = $document_srl;
 		$output = executeQuery('comment.deleteComments', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -991,7 +991,7 @@ 
 		$output = executeQuery('comment.deleteCommentsList', $args);
 
 		//delete declared, declared_log, voted_log
-		if(is_array($commentSrlList) && count($commentSrlList) > 0)
+		if (is_array($commentSrlList) && count($commentSrlList) > 0)
 		{
 			$args = new stdClass();
 			$args->comment_srl = join(',', $commentSrlList);
@@ -1031,7 +1031,7 @@ 
 	 */
 	function updateVotedCount($comment_srl, $point = 1)
 	{
-		if($point > 0)
+		if ($point > 0)
 		{
 			$failed_voted = 'failed_voted';
 			$success_message = 'success_voted';
@@ -1043,7 +1043,7 @@ 
 		}
 
 		// invalid vote if vote info exists in the session info.
-		if($_SESSION['voted_comment'][$comment_srl])
+		if ($_SESSION['voted_comment'][$comment_srl])
 		{
 			return new BaseObject(-1, $failed_voted);
 		}
@@ -1052,21 +1052,21 @@ 
 		$oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE);
 
 		// invalid vote if both ip addresses between author's and the current user are same.
-		if($oComment->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
+		if ($oComment->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
 		{
 			$_SESSION['voted_comment'][$comment_srl] = TRUE;
 			return new BaseObject(-1, $failed_voted);
 		}
 
 		// if the comment author is a member
-		if($oComment->get('member_srl'))
+		if ($oComment->get('member_srl'))
 		{
 			// create the member model object
 			$oMemberModel = getModel('member');
 			$member_srl = $oMemberModel->getLoggedMemberSrl();
 
 			// session registered if the author information matches to the current logged-in user's.
-			if($member_srl && $member_srl == abs($oComment->get('member_srl')))
+			if ($member_srl && $member_srl == abs($oComment->get('member_srl')))
 			{
 				$_SESSION['voted_comment'][$comment_srl] = TRUE;
 				return new BaseObject(-1, $failed_voted);
@@ -1076,7 +1076,7 @@ 
 		$args = new stdClass();
 
 		// If logged-in, use the member_srl. otherwise use the ipaddress.
-		if($member_srl)
+		if ($member_srl)
 		{
 			$args->member_srl = $member_srl;
 		}
@@ -1089,7 +1089,7 @@ 
 		$output = executeQuery('comment.getCommentVotedLogInfo', $args);
 
 		// session registered if log info contains recommendation vote log.
-		if($output->data->count)
+		if ($output->data->count)
 		{
 			$_SESSION['voted_comment'][$comment_srl] = TRUE;
 			return new BaseObject(-1, $failed_voted);
@@ -1106,7 +1106,7 @@ 
 		$trigger_obj->before_point = ($point < 0) ? $oComment->get('blamed_count') : $oComment->get('voted_count');
 		$trigger_obj->after_point = $trigger_obj->before_point + $point;
 		$trigger_output = ModuleHandler::triggerCall('comment.updateVotedCount', 'before', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			return $trigger_output;
 		}
@@ -1116,7 +1116,7 @@ 
 		$oDB->begin();
 
 		// update the number of votes
-		if($trigger_obj->update_target === 'blamed_count')
+		if ($trigger_obj->update_target === 'blamed_count')
 		{
 			$args->blamed_count = $trigger_obj->after_point;
 			$output = executeQuery('comment.updateBlamedCount', $args);
@@ -1133,7 +1133,7 @@ 
 
 		// Call a trigger (after)
 		$trigger_output = ModuleHandler::triggerCall('comment.updateVotedCount', 'after', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			$oDB->rollback();
 			return $trigger_output;
@@ -1146,7 +1146,7 @@ 
 
 		// Return the result
 		$output = new BaseObject(0, $success_message);
-		if($trigger_obj->update_target === 'voted_count')
+		if ($trigger_obj->update_target === 'voted_count')
 		{
 			$output->add('voted_count', $trigger_obj->after_point);
 		}
@@ -1166,7 +1166,7 @@ 
 	function declaredComment($comment_srl)
 	{
 		// Fail if session information already has a reported document
-		if($_SESSION['declared_comment'][$comment_srl])
+		if ($_SESSION['declared_comment'][$comment_srl])
 		{
 			return new BaseObject(-1, 'failed_declared');
 		}
@@ -1175,7 +1175,7 @@ 
 		$args = new stdClass();
 		$args->comment_srl = $comment_srl;
 		$output = executeQuery('comment.getDeclaredComment', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -1187,7 +1187,7 @@ 
 
 		// Call a trigger (before)
 		$trigger_output = ModuleHandler::triggerCall('comment.declaredComment', 'before', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			return $trigger_output;
 		}
@@ -1197,21 +1197,21 @@ 
 		$oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE);
 
 		// failed if both ip addresses between author's and the current user are same.
-		if($oComment->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
+		if ($oComment->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
 		{
 			$_SESSION['declared_comment'][$comment_srl] = TRUE;
 			return new BaseObject(-1, 'failed_declared');
 		}
 
 		// if the comment author is a member
-		if($oComment->get('member_srl'))
+		if ($oComment->get('member_srl'))
 		{
 			// create the member model object
 			$oMemberModel = getModel('member');
 			$member_srl = $oMemberModel->getLoggedMemberSrl();
 
 			// session registered if the author information matches to the current logged-in user's.
-			if($member_srl && $member_srl == abs($oComment->get('member_srl')))
+			if ($member_srl && $member_srl == abs($oComment->get('member_srl')))
 			{
 				$_SESSION['declared_comment'][$comment_srl] = TRUE;
 				return new BaseObject(-1, 'failed_declared');
@@ -1219,7 +1219,7 @@ 
 		}
 
 		// If logged-in, use the member_srl. otherwise use the ipaddress.
-		if($member_srl)
+		if ($member_srl)
 		{
 			$args->member_srl = $member_srl;
 		}
@@ -1231,7 +1231,7 @@ 
 		$log_output = executeQuery('comment.getCommentDeclaredLogInfo', $args);
 
 		// session registered if log info contains report log.
-		if($log_output->data->count)
+		if ($log_output->data->count)
 		{
 			$_SESSION['declared_comment'][$comment_srl] = TRUE;
 			return new BaseObject(-1, 'failed_declared');
@@ -1242,7 +1242,7 @@ 
 		$oDB->begin();
 
 		// execute insert
-		if($output->data->declared_count > 0)
+		if ($output->data->declared_count > 0)
 		{
 			$output = executeQuery('comment.updateDeclaredComment', $args);
 		}
@@ -1251,7 +1251,7 @@ 
 			$output = executeQuery('comment.insertDeclaredComment', $args);
 		}
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -1263,7 +1263,7 @@ 
 		// Call a trigger (after)
 		$trigger_obj->declared_count = $declared_count + 1;
 		$trigger_output = ModuleHandler::triggerCall('comment.declaredComment', 'after', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			$oDB->rollback();
 			return $trigger_output;
@@ -1288,7 +1288,7 @@ 
 	function addCommentPopupMenu($url, $str, $icon = '', $target = 'self')
 	{
 		$comment_popup_menu_list = Context::get('comment_popup_menu_list');
-		if(!is_array($comment_popup_menu_list))
+		if (!is_array($comment_popup_menu_list))
 		{
 			$comment_popup_menu_list = array();
 		}
@@ -1310,7 +1310,7 @@ 
 	function procCommentInsertModuleConfig()
 	{
 		$module_srl = Context::get('target_module_srl');
-		if(preg_match('/^([0-9,]+)$/', $module_srl))
+		if (preg_match('/^([0-9,]+)$/', $module_srl))
 		{
 			$module_srl = explode(',', $module_srl);
 		}
@@ -1321,33 +1321,33 @@ 
 
 		$comment_config = new stdClass();
 		$comment_config->comment_count = (int) Context::get('comment_count');
-		if(!$comment_config->comment_count)
+		if (!$comment_config->comment_count)
 		{
 			$comment_config->comment_count = 50;
 		}
 
 		$comment_config->use_vote_up = Context::get('use_vote_up');
-		if(!$comment_config->use_vote_up)
+		if (!$comment_config->use_vote_up)
 		{
 			$comment_config->use_vote_up = 'Y';
 		}
 
 		$comment_config->use_vote_down = Context::get('use_vote_down');
-		if(!$comment_config->use_vote_down)
+		if (!$comment_config->use_vote_down)
 		{
 			$comment_config->use_vote_down = 'Y';
 		}
 
 		$comment_config->use_comment_validation = Context::get('use_comment_validation');
-		if(!$comment_config->use_comment_validation)
+		if (!$comment_config->use_comment_validation)
 		{
 			$comment_config->use_comment_validation = 'N';
 		}
 
-		for($i = 0; $i < count($module_srl); $i++)
+		for ($i = 0; $i < count($module_srl); $i++)
 		{
 			$srl = trim($module_srl[$i]);
-			if(!$srl)
+			if (!$srl)
 			{
 				continue;
 			}
@@ -1381,25 +1381,25 @@ 
 	 */
 	function procCommentGetList()
 	{
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new BaseObject(-1, 'msg_not_permitted');
 		}
 
 		$commentSrls = Context::get('comment_srls');
-		if($commentSrls)
+		if ($commentSrls)
 		{
 			$commentSrlList = explode(',', $commentSrls);
 		}
 
-		if(count($commentSrlList) > 0)
+		if (count($commentSrlList) > 0)
 		{
 			$oCommentModel = getModel('comment');
 			$commentList = $oCommentModel->getComments($commentSrlList);
 
-			if(is_array($commentList))
+			if (is_array($commentList))
 			{
-				foreach($commentList as $value)
+				foreach ($commentList as $value)
 				{
 					$value->content = strip_tags($value->content);
 				}
@@ -1424,9 +1424,9 @@ 
 		$commentConfig = $oModuleModel->getModulePartConfig('comment', $obj->originModuleSrl);
 
 		$oModuleController = getController('module');
-		if(is_array($obj->moduleSrlList))
+		if (is_array($obj->moduleSrlList))
 		{
-			foreach($obj->moduleSrlList as $moduleSrl)
+			foreach ($obj->moduleSrlList as $moduleSrl)
 			{
 				$oModuleController->insertModulePartConfig('comment', $moduleSrl, $commentConfig);
 			}

modules/comment/comment.model.php

Braces +15 added lines, -20 removed lines

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

Spacing +99 added lines, -99 removed lines

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

modules/communication/communication.admin.controller.php

Spacing +6 added lines, -6 removed lines

@@ -24,31 +24,31 @@
 	function procCommunicationAdminInsertConfig()
 	{
 		// get the default information
-		$args = Context::gets('skin', 'colorset', 'editor_skin', 'sel_editor_colorset', 'mskin', 'mcolorset', 'layout_srl', 'mlayout_srl', 'grant_write_default','grant_write_group');
+		$args = Context::gets('skin', 'colorset', 'editor_skin', 'sel_editor_colorset', 'mskin', 'mcolorset', 'layout_srl', 'mlayout_srl', 'grant_write_default', 'grant_write_group');
 		$args->editor_colorset = $args->sel_editor_colorset;
 		unset($args->sel_editor_colorset);
 
-		if(!$args->skin)
+		if (!$args->skin)
 		{
 			$args->skin = 'default';
 		}
 
-		if(!$args->colorset)
+		if (!$args->colorset)
 		{
 			$args->colorset = 'white';
 		}
 
-		if(!$args->editor_skin)
+		if (!$args->editor_skin)
 		{
 			$args->editor_skin = 'default';
 		}
 
-		if(!$args->mskin)
+		if (!$args->mskin)
 		{
 			$args->mskin = 'default';
 		}
 
-		if(!$args->layout_srl)
+		if (!$args->layout_srl)
 		{
 			$args->layout_srl = NULL;
 		}

modules/communication/communication.admin.model.php

Braces +5 added lines, -5 removed lines

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

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
 		$type = Context::get('type') == 'P' ? 'P' : 'M';
 		Context::set('type', $type);
 
-		if($type == 'P')
+		if ($type == 'P')
 		{
 			$dir = 'skins';
 		}
@@ -36,7 +36,7 @@ 
 			$dir = 'm.skins';
 		}
 
-		if(!$skin)
+		if (!$skin)
 		{
 			$tpl = "";
 		}
@@ -48,8 +48,8 @@ 
 
 			$oModuleModel = getModel('module');
 			$communication_config = $oModuleModel->getModuleConfig('communication');
-			if(!is_object($communication_config)) $communication_config = new stdClass;
-			if(!$communication_config->colorset)
+			if (!is_object($communication_config)) $communication_config = new stdClass;
+			if (!$communication_config->colorset)
 			{
 				$communication_config->colorset = "white";
 			}
@@ -60,7 +60,7 @@ 
 			$security->encodeHTML('skin_info.colorset..name');
 
 			$oTemplate = TemplateHandler::getInstance();
-			$tpl = $oTemplate->compile($this->module_path . 'tpl', 'colorset_list');
+			$tpl = $oTemplate->compile($this->module_path.'tpl', 'colorset_list');
 		}
 
 		$this->add('tpl', $tpl);

modules/communication/communication.mobile.php

Braces +1 added lines, -2 removed lines

@@ -96,8 +96,7 @@
 				stripEmbedTagForAdmin($message->content, $message->sender_srl);
 				Context::set('message', $message);
 			}
-		}
-		else
+		} else
 		{
 			$templateFile = 'messages';
 		}

Doc Comments +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
 
 	/**
 	 * Display message box
-	 * @return void|BaseObject (void : success, BaseObject : fail)
+	 * @return ModuleObject|null (void : success, BaseObject : fail)
 	 */
 	function dispCommunicationMessages()
 	{
@@ -130,7 +130,7 @@ 
 
 	/**
 	 * Display message sending
-	 * @return void|BaseObject (void : success, BaseObject : fail)
+	 * @return ModuleObject|null (void : success, BaseObject : fail)
 	 */
 	function dispCommunicationSendMessage()
 	{

Spacing +19 added lines, -19 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) XEHub <https://www.xehub.io> */
 
-require_once(_XE_PATH_ . 'modules/communication/communication.view.php');
+require_once(_XE_PATH_.'modules/communication/communication.view.php');
 
 /**
  * @class  communicationMobile
@@ -25,7 +25,7 @@ 
 
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayout($this->communication_config->mlayout_srl);
-		if($layout_info)
+		if ($layout_info)
 		{
 			$this->module_info->mlayout_srl = $this->communication_config->mlayout_srl;
 			$this->setLayoutPath($layout_info->path);
@@ -39,13 +39,13 @@ 
 	function dispCommunicationMessages()
 	{
 		// Error appears if not logged-in
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return $this->stop('msg_not_logged');
 		}
 
 		$logged_info = Context::get('logged_info');
-		if(!array_key_exists('dispCommunicationMessages', $logged_info->menu_list))
+		if (!array_key_exists('dispCommunicationMessages', $logged_info->menu_list))
 		{
 			return $this->stop('msg_invalid_request');
 		}
@@ -53,7 +53,7 @@ 
 		// Set the variables
 		$message_srl = Context::get('message_srl');
 		$message_type = Context::get('message_type');
-		if(!in_array($message_type, array('R', 'S', 'T')))
+		if (!in_array($message_type, array('R', 'S', 'T')))
 		{
 			$message_type = 'R';
 			Context::set('message_type', $message_type);
@@ -61,37 +61,37 @@ 
 		$oCommunicationModel = getModel('communication');
 
 		// extract contents if message_srl exists
-		if($message_srl)
+		if ($message_srl)
 		{
 			$templateFile = 'read_message';
 			$columnList = array('message_srl', 'sender_srl', 'receiver_srl', 'message_type', 'title', 'content', 'readed', 'regdate');
 			$message = $oCommunicationModel->getSelectedMessage($message_srl, $columnList);
 
-			switch($message->message_type)
+			switch ($message->message_type)
 			{
 				case 'R':
-					if($message->receiver_srl != $logged_info->member_srl)
+					if ($message->receiver_srl != $logged_info->member_srl)
 					{
 						return $this->stop('msg_invalid_request');
 					}
 					break;
 
 				case 'S':
-					if($message->sender_srl != $logged_info->member_srl)
+					if ($message->sender_srl != $logged_info->member_srl)
 					{
 						return $this->stop('msg_invalid_request');
 					}
 					break;
 
 				case 'T':
-					if($message->receiver_srl != $logged_info->member_srl && $message->sender_srl != $logged_info->member_srl)
+					if ($message->receiver_srl != $logged_info->member_srl && $message->sender_srl != $logged_info->member_srl)
 					{
 						return $this->stop('msg_invalid_request');
 					}
 					break;
 			}
 
-			if($message->message_srl == $message_srl && ($message->receiver_srl == $logged_info->member_srl || $message->sender_srl == $logged_info->member_srl))
+			if ($message->message_srl == $message_srl && ($message->receiver_srl == $logged_info->member_srl || $message->sender_srl == $logged_info->member_srl))
 			{
 				stripEmbedTagForAdmin($message->content, $message->sender_srl);
 				Context::set('message', $message);
@@ -138,7 +138,7 @@ 
 		$oMemberModel = getModel('member');
 
 		// Error appears if not logged-in
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return $this->stop('msg_not_logged');
 		}
@@ -148,32 +148,32 @@ 
 		// get receipient's information
 		// check inalid request
 		$receiver_srl = Context::get('receiver_srl');
-		if(!$receiver_srl)
+		if (!$receiver_srl)
 		{
 			return $this->stop('msg_invalid_request');
 		}
 
 		// check receiver and sender are same
-		if($logged_info->member_srl == $receiver_srl)
+		if ($logged_info->member_srl == $receiver_srl)
 		{
 			return $this->stop('msg_cannot_send_to_yourself');
 		}
 
 		// get message_srl of the original message if it is a reply
 		$message_srl = Context::get('message_srl');
-		if($message_srl)
+		if ($message_srl)
 		{
 			$source_message = $oCommunicationModel->getSelectedMessage($message_srl);
-			if($source_message->message_srl == $message_srl && $source_message->sender_srl == $receiver_srl)
+			if ($source_message->message_srl == $message_srl && $source_message->sender_srl == $receiver_srl)
 			{
-				$source_message->title = "[re] " . $source_message->title;
-				$source_message->content = "\r\n<br />\r\n<br /><div style=\"padding-left:5px; border-left:5px solid #DDDDDD;\">" . trim($source_message->content) . "</div>";
+				$source_message->title = "[re] ".$source_message->title;
+				$source_message->content = "\r\n<br />\r\n<br /><div style=\"padding-left:5px; border-left:5px solid #DDDDDD;\">".trim($source_message->content)."</div>";
 				Context::set('source_message', $source_message);
 			}
 		}
 
 		$receiver_info = $oMemberModel->getMemberInfoByMemberSrl($receiver_srl);
-		if(!$receiver_info)
+		if (!$receiver_info)
 		{
 			return $this->stop('msg_invalid_request');
 		}