xpressengine / xe-core

libs/FirePHPCore/FirePHP.class.php

Doc Comments +13 added lines, -14 removed lines

@@ -226,7 +226,7 @@ 
   /**
    * When the object gets serialized only include specific object members.
    * 
-   * @return array
+   * @return string[]
    */  
   public function __sleep() {
     return array('options','objectFilters','enabled');
@@ -316,7 +316,7 @@ 
    * 
    * Will throw exceptions for each php error.
    * 
-   * @return mixed Returns a string containing the previously defined error handler (if any)
+   * @return null|callable Returns a string containing the previously defined error handler (if any)
    */
   public function registerErrorHandler($throwErrorExceptions=true)
   {
@@ -362,7 +362,7 @@ 
   /**
    * Register FirePHP as your exception handler
    * 
-   * @return mixed Returns the name of the previously defined exception handler,
+   * @return callable Returns the name of the previously defined exception handler,
    *               or NULL on error.
    *               If no previous handler was defined, NULL is also returned.
    */
@@ -467,7 +467,7 @@ 
    *
    * @param string $Name
    * @param array $Options OPTIONAL Instructions on how to log the group
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function group($Name, $Options=null) {
@@ -491,7 +491,7 @@ 
   /**
    * Ends a group you have started before
    *
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function groupEnd() {
@@ -504,7 +504,7 @@ 
    * @see FirePHP::LOG
    * @param mixes $Object
    * @param string $Label
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function log($Object, $Label=null) {
@@ -517,7 +517,7 @@ 
    * @see FirePHP::INFO
    * @param mixes $Object
    * @param string $Label
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function info($Object, $Label=null) {
@@ -530,7 +530,7 @@ 
    * @see FirePHP::WARN
    * @param mixes $Object
    * @param string $Label
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function warn($Object, $Label=null) {
@@ -543,7 +543,7 @@ 
    * @see FirePHP::ERROR
    * @param mixes $Object
    * @param string $Label
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function error($Object, $Label=null) {
@@ -556,7 +556,7 @@ 
    * @see FirePHP::DUMP
    * @param string $Key
    * @param mixed $Variable
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function dump($Key, $Variable) {
@@ -568,7 +568,7 @@ 
    *
    * @see FirePHP::TRACE
    * @param string $Label
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function trace($Label) {
@@ -581,7 +581,7 @@ 
    * @see FirePHP::TABLE
    * @param string $Label
    * @param string $Table
-   * @return true
+   * @return boolean
    * @throws Exception
    */
   public function table($Label, $Table) {
@@ -607,7 +607,7 @@ 
    * 
    * @see http://www.firephp.org/Wiki/Reference/Fb
    * @param mixed $Object The variable to be logged
-   * @return true Return TRUE if message was added to headers, FALSE otherwise
+   * @return boolean Return TRUE if message was added to headers, FALSE otherwise
    * @throws Exception
    */
   public function fb($Object) {
@@ -1005,7 +1005,6 @@ 
    * protected and private visibility
    * 
    * @param BaseObject $Object The object to be encoded
-   * @param int $Depth The current traversal depth
    * @return array All members of the object
    */
   protected function encodeObject($Object, $ObjectDepth = 1, $ArrayDepth = 1)

modules/addon/addon.controller.php

Doc Comments +1 added lines, -1 removed lines

@@ -145,7 +145,7 @@
 	 * Save setup
 	 *
 	 * @param string $addon Addon name
-	 * @param object $extra_vars Extra variables
+	 * @param BaseObject $extra_vars Extra variables
 	 * @param int $site_srl Site srl
 	 * @param string $gtype site or global
 	 * @return BaseObject

modules/admin/admin.admin.controller.php

Doc Comments +11 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
 
 	/**
 	 * initialization
-	 * @return void
+	 * @return ModuleObject|null
 	 */
 	function init()
 	{
@@ -52,7 +52,7 @@ 
 
 	/**
 	 * Regenerate all cache files
-	 * @return void
+	 * @return BaseObject|null
 	 */
 	function procAdminRecompileCacheFile()
 	{
@@ -156,6 +156,9 @@ 
 		return $this->setRedirectUrl(Context::get('error_return_url'), $output);
 	}
 
+	/**
+	 * @param BaseObject $vars
+	 */
 	public function updateDefaultDesignInfo($vars)
 	{
 		$siteDesignPath = _XE_PATH_ . 'files/site_design/';
@@ -207,6 +210,9 @@ 
 		return new BaseObject();
 	}
 
+	/**
+	 * @param stdClass $designInfo
+	 */
 	function makeDefaultDesignFile($designInfo, $site_srl = 0)
 	{
 		$buff = array();
@@ -433,6 +439,8 @@ 
 
 	/**
 	 * Insert favorite
+	 * @param string $siteSrl
+	 * @param string $module
 	 * @return object query result
 	 */
 	function _insertFavorite($siteSrl, $module, $type = 'module')
@@ -471,7 +479,7 @@ 
 
 	/**
 	 * Remove admin icon
-	 * @return object|void
+	 * @return BaseObject|null
 	 */
 	function procAdminRemoveIcons()
 	{

Braces +15 added lines, -15 removed lines

@@ -181,8 +181,7 @@ 
 		if(is_readable($siteDesignFile))
 		{
 			include($siteDesignFile);
-		}
-		else
+		} else
 		{
 			$designInfo = new stdClass();
 		}
@@ -198,7 +197,9 @@ 
 				$moduleName = 'page';
 			}
 
-			if(!isset($designInfo->module->{$moduleName})) $designInfo->module->{$moduleName} = new stdClass();
+			if(!isset($designInfo->module->{$moduleName})) {
+				$designInfo->module->{$moduleName} = new stdClass();
+			}
 			$designInfo->module->{$moduleName}->{$skinTarget} = $skinName;
 		}
 
@@ -337,8 +338,7 @@ 
 		if($isAgree == 'true')
 		{
 			$_SESSION['enviroment_gather'] = 'Y';
-		}
-		else
+		} else
 		{
 			$_SESSION['enviroment_gather'] = 'N';
 		}
@@ -374,12 +374,10 @@ 
 			if($type == 3)
 			{
 				$ext = 'png';
-			}
-			elseif($type == 2)
+			} elseif($type == 2)
 			{
 				$ext = 'jpg';
-			}
-			else
+			} else
 			{
 				$ext = 'gif';
 			}
@@ -392,8 +390,7 @@ 
 		if($adminTitle)
 		{
 			$oAdminConfig->adminTitle = strip_tags($adminTitle);
-		}
-		else
+		} else
 		{
 			unset($oAdminConfig->adminTitle);
 		}
@@ -488,8 +485,7 @@ 
 		if($file_exist)
 		{
 			@FileHandler::removeFile(_XE_PATH_ . 'files/attach/xeicon/' . $virtual_site . $iconname);
-		}
-		else
+		} else
 		{
 			return new BaseObject(-1, 'fail_to_delete');
 		}
@@ -533,7 +529,9 @@ 
 		if(!in_array(Context::getRequestMethod(), array('XMLRPC','JSON')))
 		{
 			$returnUrl = Context::get('success_return_url');
-			if(!$returnUrl) $returnUrl = getNotEncodedUrl('', 'act', 'dispAdminConfigGeneral');
+			if(!$returnUrl) {
+				$returnUrl = getNotEncodedUrl('', 'act', 'dispAdminConfigGeneral');
+			}
 			header('location:' . $returnUrl);
 			return;
 		}
@@ -577,7 +575,9 @@ 
 		if(!in_array(Context::getRequestMethod(), array('XMLRPC','JSON')))
 		{
 			$returnUrl = Context::get('success_return_url');
-			if(!$returnUrl) $returnUrl = getNotEncodedUrl('', 'act', 'dispAdminConfigGeneral');
+			if(!$returnUrl) {
+				$returnUrl = getNotEncodedUrl('', 'act', 'dispAdminConfigGeneral');
+			}
 			header('location:' . $returnUrl);
 			return;
 		}

Spacing +74 added lines, -74 removed lines

@@ -20,7 +20,7 @@ 
 		// forbit access if the user is not an administrator
 		$oMemberModel = getModel('member');
 		$logged_info = $oMemberModel->getLoggedInfo();
-		if($logged_info->is_admin != 'Y')
+		if ($logged_info->is_admin != 'Y')
 		{
 			return $this->stop("msg_is_not_administrator");
 		}
@@ -33,20 +33,20 @@ 
 	function procAdminMenuReset()
 	{
 		$menuSrl = Context::get('menu_srl');
-		if(!$menuSrl)
+		if (!$menuSrl)
 		{
 			return $this->stop('msg_invalid_request');
 		}
 
 		$oMenuAdminController = getAdminController('menu');
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$cache_key = 'admin_menu_langs:' . Context::getLangType();
+			$cache_key = 'admin_menu_langs:'.Context::getLangType();
 			$oCacheHandler->delete($cache_key);
 		}
 		$output = $oMenuAdminController->deleteMenu($menuSrl);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -63,27 +63,27 @@ 
 	function procAdminRecompileCacheFile()
 	{
 		// rename cache dir
-		$temp_cache_dir = './files/cache_' . $_SERVER['REQUEST_TIME'];
+		$temp_cache_dir = './files/cache_'.$_SERVER['REQUEST_TIME'];
 		FileHandler::rename('./files/cache', $temp_cache_dir);
 		FileHandler::makeDir('./files/cache');
 
 		// remove module extend cache
-		FileHandler::removeFile(_XE_PATH_ . 'files/config/module_extend.php');
+		FileHandler::removeFile(_XE_PATH_.'files/config/module_extend.php');
 
 		// remove debug files
-		FileHandler::removeFile(_XE_PATH_ . 'files/_debug_message.php');
-		FileHandler::removeFile(_XE_PATH_ . 'files/_debug_db_query.php');
-		FileHandler::removeFile(_XE_PATH_ . 'files/_db_slow_query.php');
+		FileHandler::removeFile(_XE_PATH_.'files/_debug_message.php');
+		FileHandler::removeFile(_XE_PATH_.'files/_debug_db_query.php');
+		FileHandler::removeFile(_XE_PATH_.'files/_db_slow_query.php');
 
 		$oModuleModel = getModel('module');
 		$module_list = $oModuleModel->getModuleList();
 
 		// call recompileCache for each module
-		foreach($module_list as $module)
+		foreach ($module_list as $module)
 		{
 			$oModule = NULL;
 			$oModule = getClass($module->module);
-			if(method_exists($oModule, 'recompileCache'))
+			if (method_exists($oModule, 'recompileCache'))
 			{
 				$oModule->recompileCache();
 			}
@@ -94,37 +94,37 @@ 
 		$oObjectCacheHandler = CacheHandler::getInstance('object');
 		$oTemplateCacheHandler = CacheHandler::getInstance('template');
 
-		if($oObjectCacheHandler->isSupport())
+		if ($oObjectCacheHandler->isSupport())
 		{
 			$truncated[] = $oObjectCacheHandler->truncate();
 		}
 
-		if($oTemplateCacheHandler->isSupport())
+		if ($oTemplateCacheHandler->isSupport())
 		{
 			$truncated[] = $oTemplateCacheHandler->truncate();
 		}
 
-		if(count($truncated) && in_array(FALSE, $truncated))
+		if (count($truncated) && in_array(FALSE, $truncated))
 		{
 			return new BaseObject(-1, 'msg_self_restart_cache_engine');
 		}
 
 		// remove cache dir
 		$tmp_cache_list = FileHandler::readDir('./files', '/(^cache_[0-9]+)/');
-		if($tmp_cache_list)
+		if ($tmp_cache_list)
 		{
-			foreach($tmp_cache_list as $tmp_dir)
+			foreach ($tmp_cache_list as $tmp_dir)
 			{
-				if($tmp_dir)
+				if ($tmp_dir)
 				{
-					FileHandler::removeDir('./files/' . $tmp_dir);
+					FileHandler::removeDir('./files/'.$tmp_dir);
 				}
 			}
 		}
 
 		// remove duplicate indexes (only for CUBRID)
 		$db_type = Context::getDBType();
-		if($db_type == 'cubrid')
+		if ($db_type == 'cubrid')
 		{
 			$db = DB::getInstance();
 			$db->deleteDuplicateIndexes();
@@ -146,13 +146,13 @@ 
 		$oMemberController = getController('member');
 		$oMemberController->procMemberLogout();
 
-		header('Location: ' . getNotEncodedUrl('', 'module', 'admin'));
+		header('Location: '.getNotEncodedUrl('', 'module', 'admin'));
 	}
 
 	public function procAdminInsertDefaultDesignInfo()
 	{
 		$vars = Context::getRequestVars();
-		if(!$vars->site_srl)
+		if (!$vars->site_srl)
 		{
 			$vars->site_srl = 0;
 		}
@@ -164,27 +164,27 @@ 
 
 	public function updateDefaultDesignInfo($vars)
 	{
-		$siteDesignPath = _XE_PATH_ . 'files/site_design/';
+		$siteDesignPath = _XE_PATH_.'files/site_design/';
 
 		$vars->module_skin = json_decode($vars->module_skin);
 
-		if(!is_dir($siteDesignPath))
+		if (!is_dir($siteDesignPath))
 		{
 			FileHandler::makeDir($siteDesignPath);
 		}
 
-		$siteDesignFile = _XE_PATH_ . 'files/site_design/design_' . $vars->site_srl . '.php';
+		$siteDesignFile = _XE_PATH_.'files/site_design/design_'.$vars->site_srl.'.php';
 
 		$layoutTarget = 'layout_srl';
 		$skinTarget = 'skin';
 
-		if($vars->target_type == 'M')
+		if ($vars->target_type == 'M')
 		{
 			$layoutTarget = 'mlayout_srl';
 			$skinTarget = 'mskin';
 		}
 
-		if(is_readable($siteDesignFile))
+		if (is_readable($siteDesignFile))
 		{
 			include($siteDesignFile);
 		}
@@ -197,14 +197,14 @@ 
 
 		$designInfo->{$layoutTarget} = $layoutSrl;
 
-		foreach($vars->module_skin as $moduleName => $skinName)
+		foreach ($vars->module_skin as $moduleName => $skinName)
 		{
-			if($moduleName == 'ARTICLE')
+			if ($moduleName == 'ARTICLE')
 			{
 				$moduleName = 'page';
 			}
 
-			if(!isset($designInfo->module->{$moduleName})) $designInfo->module->{$moduleName} = new stdClass();
+			if (!isset($designInfo->module->{$moduleName})) $designInfo->module->{$moduleName} = new stdClass();
 			$designInfo->module->{$moduleName}->{$skinTarget} = $skinName;
 		}
 
@@ -219,28 +219,28 @@ 
 		$buff[] = '<?php if(!defined("__XE__")) exit();';
 		$buff[] = '$designInfo = new stdClass;';
 
-		if($designInfo->layout_srl)
+		if ($designInfo->layout_srl)
 		{
 			$buff[] = sprintf('$designInfo->layout_srl = %s; ', $designInfo->layout_srl);
 		}
 
-		if($designInfo->mlayout_srl)
+		if ($designInfo->mlayout_srl)
 		{
 			$buff[] = sprintf('$designInfo->mlayout_srl = %s;', $designInfo->mlayout_srl);
 		}
 
 		$buff[] = '$designInfo->module = new stdClass;';
 
-		foreach($designInfo->module as $moduleName => $skinInfo)
+		foreach ($designInfo->module as $moduleName => $skinInfo)
 		{
 			$buff[] = sprintf('$designInfo->module->%s = new stdClass;', $moduleName);
-			foreach($skinInfo as $target => $skinName)
+			foreach ($skinInfo as $target => $skinName)
 			{
 				$buff[] = sprintf('$designInfo->module->%s->%s = \'%s\';', $moduleName, $target, $skinName);
 			}
 		}
 
-		$siteDesignFile = _XE_PATH_ . 'files/site_design/design_' . $site_srl . '.php';
+		$siteDesignFile = _XE_PATH_.'files/site_design/design_'.$site_srl.'.php';
 		FileHandler::writeFile($siteDesignFile, implode(PHP_EOL, $buff));
 	}
 
@@ -256,13 +256,13 @@ 
 		// check favorite exists
 		$oModel = getAdminModel('admin');
 		$output = $oModel->isExistsFavorite($siteSrl, $moduleName);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		// if exists, delete favorite
-		if($output->get('result'))
+		if ($output->get('result'))
 		{
 			$favoriteSrl = $output->get('favoriteSrl');
 			$output = $this->_deleteFavorite($favoriteSrl);
@@ -275,7 +275,7 @@ 
 			$result = 'on';
 		}
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -293,31 +293,31 @@ 
 	{
 		$oModel = getAdminModel('admin');
 		$output = $oModel->getFavoriteList();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		$favoriteList = $output->get('favoriteList');
-		if(!$favoriteList)
+		if (!$favoriteList)
 		{
 			return new BaseObject();
 		}
 
 		$deleteTargets = array();
-		foreach($favoriteList as $favorite)
+		foreach ($favoriteList as $favorite)
 		{
-			if($favorite->type == 'module')
+			if ($favorite->type == 'module')
 			{
-				$modulePath = _XE_PATH_ . 'modules/' . $favorite->module;
-				if(!is_dir($modulePath))
+				$modulePath = _XE_PATH_.'modules/'.$favorite->module;
+				if (!is_dir($modulePath))
 				{
 					$deleteTargets[] = $favorite->admin_favorite_srl;
 				}
 			}
 		}
 
-		if(!count($deleteTargets))
+		if (!count($deleteTargets))
 		{
 			return new BaseObject();
 		}
@@ -325,7 +325,7 @@ 
 		$args = new stdClass();
 		$args->admin_favorite_srls = $deleteTargets;
 		$output = executeQuery('admin.deleteFavorites', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -340,7 +340,7 @@ 
 	function procAdminEnviromentGatheringAgreement()
 	{
 		$isAgree = Context::get('is_agree');
-		if($isAgree == 'true')
+		if ($isAgree == 'true')
 		{
 			$_SESSION['enviroment_gather'] = 'Y';
 		}
@@ -365,23 +365,23 @@ 
 		$oModuleModel = getModel('module');
 		$oAdminConfig = $oModuleModel->getModuleConfig('admin');
 
-		if(!is_object($oAdminConfig))
+		if (!is_object($oAdminConfig))
 		{
 			$oAdminConfig = new stdClass();
 		}
 
-		if($file['tmp_name'])
+		if ($file['tmp_name'])
 		{
 			$target_path = 'files/attach/images/admin/';
 			FileHandler::makeDir($target_path);
 
 			// Get file information
 			list($width, $height, $type, $attrs) = @getimagesize($file['tmp_name']);
-			if($type == 3)
+			if ($type == 3)
 			{
 				$ext = 'png';
 			}
-			elseif($type == 2)
+			elseif ($type == 2)
 			{
 				$ext = 'jpg';
 			}
@@ -395,7 +395,7 @@ 
 
 			$oAdminConfig->adminLogo = $target_filename;
 		}
-		if($adminTitle)
+		if ($adminTitle)
 		{
 			$oAdminConfig->adminTitle = strip_tags($adminTitle);
 		}
@@ -404,7 +404,7 @@ 
 			unset($oAdminConfig->adminTitle);
 		}
 
-		if($oAdminConfig)
+		if ($oAdminConfig)
 		{
 			$oModuleController = getController('module');
 			$oModuleController->insertModuleConfig('admin', $oAdminConfig);
@@ -425,7 +425,7 @@ 
 		$oModuleModel = getModel('module');
 		$oAdminConfig = $oModuleModel->getModuleConfig('admin');
 
-		FileHandler::removeFile(_XE_PATH_ . $oAdminConfig->adminLogo);
+		FileHandler::removeFile(_XE_PATH_.$oAdminConfig->adminLogo);
 		unset($oAdminConfig->adminLogo);
 
 		$oModuleController = getController('module');
@@ -484,16 +484,16 @@ 
 
 		$site_info = Context::get('site_module_info');
 		$virtual_site = '';
-		if($site_info->site_srl) 
+		if ($site_info->site_srl) 
 		{
-			$virtual_site = $site_info->site_srl . '/';
+			$virtual_site = $site_info->site_srl.'/';
 		}
 
 		$iconname = Context::get('iconname');
-		$file_exist = FileHandler::readFile(_XE_PATH_ . 'files/attach/xeicon/' . $virtual_site . $iconname);
-		if($file_exist)
+		$file_exist = FileHandler::readFile(_XE_PATH_.'files/attach/xeicon/'.$virtual_site.$iconname);
+		if ($file_exist)
 		{
-			@FileHandler::removeFile(_XE_PATH_ . 'files/attach/xeicon/' . $virtual_site . $iconname);
+			@FileHandler::removeFile(_XE_PATH_.'files/attach/xeicon/'.$virtual_site.$iconname);
 		}
 		else
 		{
@@ -514,33 +514,33 @@ 
 		$db_info->sitelock_message = $vars->sitelock_message;
 
 		$whitelist = $vars->sitelock_whitelist;
-		$whitelist = preg_replace("/[\r|\n|\r\n]+/",",",$whitelist);
-		$whitelist = preg_replace("/\s+/","",$whitelist);
-		if(preg_match('/(<\?|<\?php|\?>)/xsm', $whitelist))
+		$whitelist = preg_replace("/[\r|\n|\r\n]+/", ",", $whitelist);
+		$whitelist = preg_replace("/\s+/", "", $whitelist);
+		if (preg_match('/(<\?|<\?php|\?>)/xsm', $whitelist))
 		{
 			$whitelist = '';
 		}
-		$whitelist .= ',127.0.0.1,' . $_SERVER['REMOTE_ADDR'];
-		$whitelist = explode(',',trim($whitelist, ','));
+		$whitelist .= ',127.0.0.1,'.$_SERVER['REMOTE_ADDR'];
+		$whitelist = explode(',', trim($whitelist, ','));
 		$whitelist = array_unique($whitelist);
 
-		if(!IpFilter::validate($whitelist)) {
+		if (!IpFilter::validate($whitelist)) {
 			return new BaseObject(-1, 'msg_invalid_ip');
 		}
 
 		$db_info->sitelock_whitelist = $whitelist;
 
 		$oInstallController = getController('install');
-		if(!$oInstallController->makeConfigFile())
+		if (!$oInstallController->makeConfigFile())
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
-		if(!in_array(Context::getRequestMethod(), array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url');
-			if(!$returnUrl) $returnUrl = getNotEncodedUrl('', 'act', 'dispAdminConfigGeneral');
-			header('location:' . $returnUrl);
+			if (!$returnUrl) $returnUrl = getNotEncodedUrl('', 'act', 'dispAdminConfigGeneral');
+			header('location:'.$returnUrl);
 			return;
 		}
 	}
@@ -571,20 +571,20 @@ 
 		$db_info->embed_white_iframe = $white_iframe;
 
 		$oInstallController = getController('install');
-		if(!$oInstallController->makeConfigFile())
+		if (!$oInstallController->makeConfigFile())
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
-		require_once(_XE_PATH_ . 'classes/security/EmbedFilter.class.php');
+		require_once(_XE_PATH_.'classes/security/EmbedFilter.class.php');
 		$oEmbedFilter = EmbedFilter::getInstance();
 		$oEmbedFilter->_makeWhiteDomainList($whitelist);
 
-		if(!in_array(Context::getRequestMethod(), array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url');
-			if(!$returnUrl) $returnUrl = getNotEncodedUrl('', 'act', 'dispAdminConfigGeneral');
-			header('location:' . $returnUrl);
+			if (!$returnUrl) $returnUrl = getNotEncodedUrl('', 'act', 'dispAdminConfigGeneral');
+			header('location:'.$returnUrl);
 			return;
 		}
 	}

modules/admin/admin.admin.model.php

Doc Comments +6 added lines

@@ -867,6 +867,7 @@ 
 	 * Returns a list of all sites that contain modules
 	 * For each site domain and site_srl are retrieved
 	 *
+	 * @param string $domain
 	 * @return array
 	 */
 	function getAllSitesThatHaveModules($domain = NULL)
@@ -945,6 +946,11 @@ 
 		return $this->iconUrlCheck('mobicon.png', 'mobiconSample.png', $default);
 	}
 
+	/**
+	 * @param string $iconname
+	 * @param string $default_icon_name
+	 * @param boolean $default
+	 */
 	function iconUrlCheck($iconname, $default_icon_name, $default)
 	{
 		$site_info = Context::get('site_module_info');

Spacing +141 added lines, -141 removed lines

@@ -30,18 +30,18 @@ 
 	{
 		$ftp_info = Context::getRequestVars();
 
-		if(!$ftp_info->ftp_host)
+		if (!$ftp_info->ftp_host)
 		{
 			$ftp_info->ftp_host = "127.0.0.1";
 		}
 
-		if(!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
+		if (!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
 		{
 			$ftp_info->ftp_port = '22';
 		}
 
 		$connection = ssh2_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
-		if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
+		if (!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
 		{
 			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 		}
@@ -58,29 +58,29 @@ 
 		$path_candidate = array();
 
 		$temp = '';
-		foreach($path_info as $path)
+		foreach ($path_info as $path)
 		{
-			$temp = '/' . $path . $temp;
+			$temp = '/'.$path.$temp;
 			$path_candidate[] = $temp;
 		}
 
 		// try
-		foreach($path_candidate as $path)
+		foreach ($path_candidate as $path)
 		{
 			// upload check file
-			if(!@ssh2_scp_send($connection, FileHandler::getRealPath('./files/cache/ftp_check'), $path . 'ftp_check.html'))
+			if (!@ssh2_scp_send($connection, FileHandler::getRealPath('./files/cache/ftp_check'), $path.'ftp_check.html'))
 			{
 				continue;
 			}
 
 			// get check file
-			$result = FileHandler::getRemoteResource(getNotencodedFullUrl() . 'ftp_check.html');
+			$result = FileHandler::getRemoteResource(getNotencodedFullUrl().'ftp_check.html');
 
 			// delete temp check file
-			@ssh2_sftp_unlink($sftp, $path . 'ftp_check.html');
+			@ssh2_sftp_unlink($sftp, $path.'ftp_check.html');
 
 			// found
-			if($result == $pin)
+			if ($result == $pin)
 			{
 				$found_path = $path;
 				break;
@@ -89,7 +89,7 @@ 
 
 		FileHandler::removeFile('./files/cache/ftp_check', $pin);
 
-		if($found_path)
+		if ($found_path)
 		{
 			$this->add('found_path', $found_path);
 		}
@@ -99,24 +99,24 @@ 
 	{
 		$ftp_info = Context::getRequestVars();
 
-		if(!$ftp_info->ftp_host)
+		if (!$ftp_info->ftp_host)
 		{
 			$ftp_info->ftp_host = "127.0.0.1";
 		}
 
-		if(!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
+		if (!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
 		{
 			$ftp_info->ftp_port = '22';
 		}
 
 		$connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
-		if(!$connection)
+		if (!$connection)
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
 		}
 
 		$login_result = @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password);
-		if(!$login_result)
+		if (!$login_result)
 		{
 			ftp_close($connection);
 			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
@@ -133,29 +133,29 @@ 
 		$path_candidate = array();
 
 		$temp = '';
-		foreach($path_info as $path)
+		foreach ($path_info as $path)
 		{
-			$temp = '/' . $path . $temp;
+			$temp = '/'.$path.$temp;
 			$path_candidate[] = $temp;
 		}
 
 		// try
-		foreach($path_candidate as $path)
+		foreach ($path_candidate as $path)
 		{
 			// upload check file
-			if(!ftp_put($connection, $path . 'ftp_check.html', FileHandler::getRealPath('./files/cache/ftp_check'), FTP_BINARY))
+			if (!ftp_put($connection, $path.'ftp_check.html', FileHandler::getRealPath('./files/cache/ftp_check'), FTP_BINARY))
 			{
 				continue;
 			}
 
 			// get check file
-			$result = FileHandler::getRemoteResource(getNotencodedFullUrl() . 'ftp_check.html');
+			$result = FileHandler::getRemoteResource(getNotencodedFullUrl().'ftp_check.html');
 
 			// delete temp check file
-			ftp_delete($connection, $path . 'ftp_check.html');
+			ftp_delete($connection, $path.'ftp_check.html');
 
 			// found
-			if($result == $pin)
+			if ($result == $pin)
 			{
 				$found_path = $path;
 				break;
@@ -164,7 +164,7 @@ 
 
 		FileHandler::removeFile('./files/cache/ftp_check', $pin);
 
-		if($found_path)
+		if ($found_path)
 		{
 			$this->add('found_path', $found_path);
 		}
@@ -175,39 +175,39 @@ 
 	 */
 	function getAdminFTPPath()
 	{
-		Context::loadLang(_XE_PATH_ . 'modules/autoinstall/lang');
+		Context::loadLang(_XE_PATH_.'modules/autoinstall/lang');
 		@set_time_limit(5);
-		require_once(_XE_PATH_ . 'libs/ftp.class.php');
+		require_once(_XE_PATH_.'libs/ftp.class.php');
 
 		$ftp_info = Context::getRequestVars();
 
-		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password)
+		if (!$ftp_info->ftp_user || !$ftp_info->ftp_password)
 		{
 			return new BaseObject(1, 'msg_ftp_invalid_auth_info');
 		}
 
-		if(!$ftp_info->ftp_host)
+		if (!$ftp_info->ftp_host)
 		{
 			$ftp_info->ftp_host = '127.0.0.1';
 		}
 
-		if(!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
+		if (!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
 		{
 			$ftp_info->ftp_port = '21';
 		}
 
-		if($ftp_info->sftp == 'Y')
+		if ($ftp_info->sftp == 'Y')
 		{
-			if(!function_exists('ssh2_sftp'))
+			if (!function_exists('ssh2_sftp'))
 			{
 				return new BaseObject(-1, 'disable_sftp_support');
 			}
 			return $this->getSFTPPath();
 		}
 
-		if($ftp_info->ftp_pasv == 'N')
+		if ($ftp_info->ftp_pasv == 'N')
 		{
-			if(function_exists('ftp_connect'))
+			if (function_exists('ftp_connect'))
 			{
 				return $this->getFTPPath();
 			}
@@ -215,12 +215,12 @@ 
 		}
 
 		$oFTP = new ftp();
-		if(!$oFTP->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
+		if (!$oFTP->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
 		{
 			return new BaseObject(1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
 		}
 
-		if(!$oFTP->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+		if (!$oFTP->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 		{
 			return new BaseObject(1, 'msg_ftp_invalid_auth_info');
 		}
@@ -236,29 +236,29 @@ 
 		$path_candidate = array();
 
 		$temp = '';
-		foreach($path_info as $path)
+		foreach ($path_info as $path)
 		{
-			$temp = '/' . $path . $temp;
+			$temp = '/'.$path.$temp;
 			$path_candidate[] = $temp;
 		}
 
 		// try
-		foreach($path_candidate as $path)
+		foreach ($path_candidate as $path)
 		{
 			// upload check file
-			if(!$oFTP->ftp_put($path . 'ftp_check.html', FileHandler::getRealPath('./files/cache/ftp_check')))
+			if (!$oFTP->ftp_put($path.'ftp_check.html', FileHandler::getRealPath('./files/cache/ftp_check')))
 			{
 				continue;
 			}
 
 			// get check file
-			$result = FileHandler::getRemoteResource(getNotencodedFullUrl() . 'ftp_check.html');
+			$result = FileHandler::getRemoteResource(getNotencodedFullUrl().'ftp_check.html');
 
 			// delete temp check file
-			$oFTP->ftp_delete($path . 'ftp_check.html');
+			$oFTP->ftp_delete($path.'ftp_check.html');
 
 			// found
-			if($result == $pin)
+			if ($result == $pin)
 			{
 				$found_path = $path;
 				break;
@@ -267,7 +267,7 @@ 
 
 		FileHandler::removeFile('./files/cache/ftp_check', $pin);
 
-		if($found_path)
+		if ($found_path)
 		{
 			$this->add('found_path', $found_path);
 		}
@@ -280,27 +280,27 @@ 
 	function getSFTPList()
 	{
 		$ftp_info = Context::getRequestVars();
-		if(!$ftp_info->ftp_host)
+		if (!$ftp_info->ftp_host)
 		{
 			$ftp_info->ftp_host = "127.0.0.1";
 		}
 		$connection = ssh2_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
-		if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
+		if (!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
 		{
 			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 		}
 
 		$sftp = ssh2_sftp($connection);
-		$curpwd = "ssh2.sftp://$sftp" . $this->pwd;
+		$curpwd = "ssh2.sftp://$sftp".$this->pwd;
 		$dh = @opendir($curpwd);
-		if(!$dh)
+		if (!$dh)
 		{
 			return new BaseObject(-1, 'msg_ftp_invalid_path');
 		}
 		$list = array();
-		while(($file = readdir($dh)) !== FALSE)
+		while (($file = readdir($dh)) !== FALSE)
 		{
-			if(is_dir($curpwd . $file))
+			if (is_dir($curpwd.$file))
 			{
 				$file .= "/";
 			}
@@ -320,32 +320,32 @@ 
 	 */
 	function getAdminFTPList()
 	{
-		Context::loadLang(_XE_PATH_ . 'modules/autoinstall/lang');
+		Context::loadLang(_XE_PATH_.'modules/autoinstall/lang');
 		@set_time_limit(5);
 
-		require_once(_XE_PATH_ . 'libs/ftp.class.php');
+		require_once(_XE_PATH_.'libs/ftp.class.php');
 
 		$ftp_info = Context::getRequestVars();
-		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password)
+		if (!$ftp_info->ftp_user || !$ftp_info->ftp_password)
 		{
 			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 		}
 
 		$this->pwd = $ftp_info->ftp_root_path;
 
-		if(!$ftp_info->ftp_host)
+		if (!$ftp_info->ftp_host)
 		{
 			$ftp_info->ftp_host = "127.0.0.1";
 		}
 
-		if(!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
+		if (!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
 		{
 			$ftp_info->ftp_port = "21";
 		}
 
-		if($ftp_info->sftp == 'Y')
+		if ($ftp_info->sftp == 'Y')
 		{
-			if(!function_exists('ssh2_sftp'))
+			if (!function_exists('ssh2_sftp'))
 			{
 				return new BaseObject(-1, 'disable_sftp_support');
 			}
@@ -353,9 +353,9 @@ 
 		}
 
 		$oFtp = new ftp();
-		if($oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
+		if ($oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
 		{
-			if($oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+			if ($oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
 				$_list = $oFtp->ftp_rawlist($this->pwd);
 				$oFtp->ftp_quit();
@@ -367,17 +367,17 @@ 
 		}
 		$list = array();
 
-		if($_list)
+		if ($_list)
 		{
-			foreach($_list as $k => $v)
+			foreach ($_list as $k => $v)
 			{
 				$src = new stdClass();
 				$src->data = $v;
 				$res = Context::convertEncoding($src);
 				$v = $res->data;
-				if(strpos($v, 'd') === 0 || strpos($v, '<DIR>'))
+				if (strpos($v, 'd') === 0 || strpos($v, '<DIR>'))
 				{
-					$list[] = substr(strrchr($v, ' '), 1) . '/';
+					$list[] = substr(strrchr($v, ' '), 1).'/';
 				}
 			}
 		}
@@ -400,7 +400,7 @@ 
 			, 'module' => array('addon', 'admin', 'autoinstall', 'comment', 'communication', 'counter', 'document', 'editor', 'file', 'importer', 'install', 'integration_search', 'layout', 'member', 'menu', 'message', 'module', 'opage', 'page', 'point', 'poll', 'rss', 'session', 'spamfilter', 'tag', 'trackback', 'trash', 'widget')
 			, 'addon' => array('autolink', 'blogapi', 'captcha', 'counter', 'member_communication', 'member_extra_info', 'mobile', 'openid_delegation_id', 'point_level_icon', 'resize_image')
 			, 'layout' => array('default')
-			, 'widget' => array('content', 'language_select', 'login_info','mcontent')
+			, 'widget' => array('content', 'language_select', 'login_info', 'mcontent')
 			, 'widgetstyle' => array(),
 		);
 		$info = array();
@@ -420,86 +420,86 @@ 
 		$info['use_ssl'] = $db_info->use_ssl;
 		
 		$info['phpext'] = '';
-		foreach(get_loaded_extensions() as $ext)
+		foreach (get_loaded_extensions() as $ext)
 		{
 			$ext = strtolower($ext);
-			if(in_array($ext, $skip['ext']))
+			if (in_array($ext, $skip['ext']))
 			{
 				continue;
 			}
-			$info['phpext'] .= '|' . $ext;
+			$info['phpext'] .= '|'.$ext;
 		}
 		$info['phpext'] = substr($info['phpext'], 1);
 
 		$info['module'] = '';
 		$oModuleModel = getModel('module');
 		$module_list = $oModuleModel->getModuleList();
-		if($module_list) foreach($module_list as $module)
+		if ($module_list) foreach ($module_list as $module)
 		{
-			if(in_array($module->module, $skip['module']))
+			if (in_array($module->module, $skip['module']))
 			{
 				continue;
 			}
-			$info['module'] .= '|' . $module->module;
+			$info['module'] .= '|'.$module->module;
 		}
 		$info['module'] = substr($info['module'], 1);
 
 		$info['addon'] = '';
 		$oAddonAdminModel = getAdminModel('addon');
 		$addon_list = $oAddonAdminModel->getAddonList();
-		if($addon_list) foreach($addon_list as $addon)
+		if ($addon_list) foreach ($addon_list as $addon)
 		{
-			if(in_array($addon->addon, $skip['addon']))
+			if (in_array($addon->addon, $skip['addon']))
 			{
 				continue;
 			}
-			$info['addon'] .= '|' . $addon->addon;
+			$info['addon'] .= '|'.$addon->addon;
 		}
 		$info['addon'] = substr($info['addon'], 1);
 
 		$info['layout'] = "";
 		$oLayoutModel = getModel('layout');
 		$layout_list = $oLayoutModel->getDownloadedLayoutList();
-		if($layout_list) foreach($layout_list as $layout)
+		if ($layout_list) foreach ($layout_list as $layout)
 		{
-			if(in_array($layout->layout, $skip['layout']))
+			if (in_array($layout->layout, $skip['layout']))
 			{
 				continue;
 			}
-			$info['layout'] .= '|' . $layout->layout;
+			$info['layout'] .= '|'.$layout->layout;
 		}
 		$info['layout'] = substr($info['layout'], 1);
 
 		$info['widget'] = "";
 		$oWidgetModel = getModel('widget');
 		$widget_list = $oWidgetModel->getDownloadedWidgetList();
-		if($widget_list) foreach($widget_list as $widget)
+		if ($widget_list) foreach ($widget_list as $widget)
 		{
-			if(in_array($widget->widget, $skip['widget']))
+			if (in_array($widget->widget, $skip['widget']))
 			{
 				continue;
 			}
-			$info['widget'] .= '|' . $widget->widget;
+			$info['widget'] .= '|'.$widget->widget;
 		}
 		$info['widget'] = substr($info['widget'], 1);
 
 		$info['widgetstyle'] = "";
 		$oWidgetModel = getModel('widget');
 		$widgetstyle_list = $oWidgetModel->getDownloadedWidgetStyleList();
-		if($widgetstyle_list) foreach($widgetstyle_list as $widgetstyle)
+		if ($widgetstyle_list) foreach ($widgetstyle_list as $widgetstyle)
 		{
-			if(in_array($widgetstyle->widgetStyle, $skip['widgetstyle']))
+			if (in_array($widgetstyle->widgetStyle, $skip['widgetstyle']))
 			{
 				continue;
 			}
-			$info['widgetstyle'] .= '|' . $widgetstyle->widgetStyle;
+			$info['widgetstyle'] .= '|'.$widgetstyle->widgetStyle;
 		}
 		$info['widgetstyle'] = substr($info['widgetstyle'], 1);
 
 		$param = '';
-		foreach($info as $k => $v)
+		foreach ($info as $k => $v)
 		{
-			if($v)
+			if ($v)
 			{
 				$param .= sprintf('&%s=%s', $k, urlencode($v));
 			}
@@ -515,13 +515,13 @@ 
 	 */
 	function getThemeList()
 	{
-		$path = _XE_PATH_ . 'themes';
+		$path = _XE_PATH_.'themes';
 		$list = FileHandler::readDir($path);
 
 		$theme_info = array();
-		if(count($list) > 0)
+		if (count($list) > 0)
 		{
-			foreach($list as $val)
+			foreach ($list as $val)
 			{
 				$theme_info[$val] = $this->getThemeInfo($val);
 			}
@@ -538,20 +538,20 @@ 
 	 */
 	function getThemeInfo($theme_name, $layout_list = NULL)
 	{
-		if($GLOBALS['__ThemeInfo__'][$theme_name])
+		if ($GLOBALS['__ThemeInfo__'][$theme_name])
 		{
 			return $GLOBALS['__ThemeInfo__'][$theme_name];
 		}
 
-		$info_file = _XE_PATH_ . 'themes/' . $theme_name . '/conf/info.xml';
-		if(!file_exists($info_file))
+		$info_file = _XE_PATH_.'themes/'.$theme_name.'/conf/info.xml';
+		if (!file_exists($info_file))
 		{
 			return;
 		}
 
 		$oXmlParser = new XmlParser();
 		$_xml_obj = $oXmlParser->loadXmlFile($info_file);
-		if(!$_xml_obj->theme)
+		if (!$_xml_obj->theme)
 		{
 			return;
 		}
@@ -562,16 +562,16 @@ 
 		$theme_info = new stdClass();
 		$theme_info->name = $theme_name;
 		$theme_info->title = $xml_obj->title->body;
-		$thumbnail = './themes/' . $theme_name . '/thumbnail.png';
+		$thumbnail = './themes/'.$theme_name.'/thumbnail.png';
 		$theme_info->thumbnail = (FileHandler::exists($thumbnail)) ? $thumbnail : NULL;
 		$theme_info->version = $xml_obj->version->body;
 		$date_obj = new stdClass();
 		sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
 		$theme_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
 		$theme_info->description = $xml_obj->description->body;
-		$theme_info->path = './themes/' . $theme_name . '/';
+		$theme_info->path = './themes/'.$theme_name.'/';
 
-		if(!is_array($xml_obj->publisher))
+		if (!is_array($xml_obj->publisher))
 		{
 			$publisher_list = array();
 			$publisher_list[] = $xml_obj->publisher;
@@ -582,7 +582,7 @@ 
 		}
 
 		$theme_info->publisher = array();
-		foreach($publisher_list as $publisher)
+		foreach ($publisher_list as $publisher)
 		{
 			$publisher_obj = new stdClass();
 			$publisher_obj->name = $publisher->name->body;
@@ -595,10 +595,10 @@ 
 		$layout_path = $layout->directory->attrs->path;
 		$layout_parse = explode('/', $layout_path);
 		$layout_info = new stdClass();
-		switch($layout_parse[1])
+		switch ($layout_parse[1])
 		{
 			case 'themes' :
-					$layout_info->name = $theme_name . '|@|' . $layout_parse[count($layout_parse) - 1];
+					$layout_info->name = $theme_name.'|@|'.$layout_parse[count($layout_parse) - 1];
 					break;
 
 			case 'layouts' :
@@ -615,11 +615,11 @@ 
 		$oLayoutModel = getModel('layout');
 		$layout_info_list = array();
 		$layout_list = $oLayoutModel->getLayoutList($site_info->site_srl);
-		if($layout_list)
+		if ($layout_list)
 		{
-			foreach($layout_list as $val)
+			foreach ($layout_list as $val)
 			{
-				if($val->layout == $layout_info->name)
+				if ($val->layout == $layout_info->name)
 				{
 					$is_new_layout = FALSE;
 					$layout_info->layout_srl = $val->layout_srl;
@@ -628,7 +628,7 @@ 
 			}
 		}
 
-		if($is_new_layout)
+		if ($is_new_layout)
 		{
 			$site_module_info = Context::get('site_module_info');
 			$args = new stdClass();
@@ -646,7 +646,7 @@ 
 		$theme_info->layout_info = $layout_info;
 
 		$skin_infos = $xml_obj->skininfos;
-		if(is_array($skin_infos->skininfo))
+		if (is_array($skin_infos->skininfo))
 		{
 			$skin_list = $skin_infos->skininfo;
 		}
@@ -657,17 +657,17 @@ 
 
 		$oModuleModel = getModel('module');
 		$skins = array();
-		foreach($skin_list as $val)
+		foreach ($skin_list as $val)
 		{
 			$skin_info = new stdClass();
 			unset($skin_parse);
 			$skin_parse = explode('/', $val->directory->attrs->path);
-			switch($skin_parse[1])
+			switch ($skin_parse[1])
 			{
 				case 'themes' :
 						$is_theme = TRUE;
 						$module_name = $skin_parse[count($skin_parse) - 1];
-						$skin_info->name = $theme_name . '|@|' . $module_name;
+						$skin_info->name = $theme_name.'|@|'.$module_name;
 						break;
 
 				case 'modules' :
@@ -681,9 +681,9 @@ 
 			$skin_info->is_theme = $is_theme;
 			$skins[$module_name] = $skin_info;
 
-			if($is_theme)
+			if ($is_theme)
 			{
-				if(!$GLOBALS['__ThemeModuleSkin__'][$module_name])
+				if (!$GLOBALS['__ThemeModuleSkin__'][$module_name])
 				{
 					$GLOBALS['__ThemeModuleSkin__'][$module_name] = array();
 					$GLOBALS['__ThemeModuleSkin__'][$module_name]['skins'] = array();
@@ -705,7 +705,7 @@ 
 	 */
 	function getModulesSkinList()
 	{
-		if($GLOBALS['__ThemeModuleSkin__']['__IS_PARSE__'])
+		if ($GLOBALS['__ThemeModuleSkin__']['__IS_PARSE__'])
 		{
 			return $GLOBALS['__ThemeModuleSkin__'];
 		}
@@ -713,7 +713,7 @@ 
 		sort($searched_list);
 
 		$searched_count = count($searched_list);
-		if(!$searched_count)
+		if (!$searched_count)
 		{
 			return;
 		}
@@ -721,13 +721,13 @@ 
 		$exceptionModule = array('editor', 'poll', 'homepage', 'textyle');
 
 		$oModuleModel = getModel('module');
-		foreach($searched_list as $val)
+		foreach ($searched_list as $val)
 		{
-			$skin_list = $oModuleModel->getSkins(_XE_PATH_ . 'modules/' . $val);
+			$skin_list = $oModuleModel->getSkins(_XE_PATH_.'modules/'.$val);
 
-			if(is_array($skin_list) && count($skin_list) > 0 && !in_array($val, $exceptionModule))
+			if (is_array($skin_list) && count($skin_list) > 0 && !in_array($val, $exceptionModule))
 			{
-				if(!$GLOBALS['__ThemeModuleSkin__'][$val])
+				if (!$GLOBALS['__ThemeModuleSkin__'][$val])
 				{
 					$GLOBALS['__ThemeModuleSkin__'][$val] = array();
 					$moduleInfo = $oModuleModel->getModuleInfoXml($val);
@@ -751,23 +751,23 @@ 
 		static $lang = false;
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($lang === false && $oCacheHandler->isSupport())
+		if ($lang === false && $oCacheHandler->isSupport())
 		{
-			$cache_key = 'admin_menu_langs:' . Context::getLangType();
+			$cache_key = 'admin_menu_langs:'.Context::getLangType();
 			$lang = $oCacheHandler->get($cache_key);
 
-			if($lang === false)
+			if ($lang === false)
 			{
 				$lang = array();
 				$oModuleModel = getModel('module');
 				$installed_module_list = $oModuleModel->getModulesXmlInfo();
 
-				foreach($installed_module_list as $key => $value)
+				foreach ($installed_module_list as $key => $value)
 				{
 					$moduleActionInfo = $oModuleModel->getModuleActionXml($value->module);
-					if(is_object($moduleActionInfo->menu))
+					if (is_object($moduleActionInfo->menu))
 					{
-						foreach($moduleActionInfo->menu as $key2 => $value2)
+						foreach ($moduleActionInfo->menu as $key2 => $value2)
 						{
 							$lang[$key2] = $value2->title;
 						}
@@ -792,19 +792,19 @@ 
 		$args = new stdClass();
 		$args->site_srl = $siteSrl;
 		$output = executeQueryArray('admin.getFavoriteList', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return new BaseObject();
 		}
 
-		if($isGetModuleInfo && is_array($output->data))
+		if ($isGetModuleInfo && is_array($output->data))
 		{
 			$oModuleModel = getModel('module');
-			foreach($output->data AS $key => $value)
+			foreach ($output->data AS $key => $value)
 			{
 				$moduleInfo = $oModuleModel->getModuleInfoXml($value->module);
 				$output->data[$key]->admin_index_act = $moduleInfo->admin_index_act;
@@ -829,13 +829,13 @@ 
 		$args->site_srl = $siteSrl;
 		$args->module = $module;
 		$output = executeQuery('admin.getFavorite', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		$returnObject = new BaseObject();
-		if($output->data)
+		if ($output->data)
 		{
 			$returnObject->add('result', TRUE);
 			$returnObject->add('favoriteSrl', $output->data->admin_favorite_srl);
@@ -854,7 +854,7 @@ 
 	 */
 	function getSiteAllList()
 	{
-		if(Context::get('domain'))
+		if (Context::get('domain'))
 		{
 			$domain = Context::get('domain');
 		}
@@ -871,7 +871,7 @@ 
 	function getAllSitesThatHaveModules($domain = NULL)
 	{
 		$args = new stdClass();
-		if($domain)
+		if ($domain)
 		{
 			$args->domain = $domain;
 		}
@@ -879,31 +879,31 @@ 
 
 		$siteList = array();
 		$output = executeQueryArray('admin.getSiteAllList', $args, $columnList);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$siteList = $output->data;
 		}
 
 		$oModuleModel = getModel('module');
-		foreach($siteList as $key => $value)
+		foreach ($siteList as $key => $value)
 		{
 			$args->site_srl = $value->site_srl;
 			$list = $oModuleModel->getModuleSrlList($args);
 
-			if(!is_array($list))
+			if (!is_array($list))
 			{
 				$list = array($list);
 			}
 
-			foreach($list as $k => $v)
+			foreach ($list as $k => $v)
 			{
-				if(!is_dir(_XE_PATH_ . 'modules/' . $v->module))
+				if (!is_dir(_XE_PATH_.'modules/'.$v->module))
 				{
 					unset($list[$k]);
 				}
 			}
 
-			if(!count($list))
+			if (!count($list))
 			{
 				unset($siteList[$key]);
 			}
@@ -920,13 +920,13 @@ 
 	{
 		$args = new stdClass();
 
-		if($date)
+		if ($date)
 		{
 			$args->regDate = date('Ymd', strtotime($date));
 		}
 
 		$output = executeQuery('admin.getSiteCountByDate', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return 0;
 		}
@@ -948,21 +948,21 @@ 
 	{
 		$site_info = Context::get('site_module_info');
 		$virtual_site = '';
-		if($site_info->site_srl) 
+		if ($site_info->site_srl) 
 		{
-			$virtual_site = $site_info->site_srl . '/';
+			$virtual_site = $site_info->site_srl.'/';
 		}
 
-		$file_exsit = FileHandler::readFile(_XE_PATH_ . 'files/attach/xeicon/' . $virtual_site . $iconname);
-		if(!$file_exsit && $default === true)
+		$file_exsit = FileHandler::readFile(_XE_PATH_.'files/attach/xeicon/'.$virtual_site.$iconname);
+		if (!$file_exsit && $default === true)
         {
-            $icon_url = './modules/admin/tpl/img/' . $default_icon_name;
+            $icon_url = './modules/admin/tpl/img/'.$default_icon_name;
         }
-        elseif($file_exsit)
+        elseif ($file_exsit)
 		{
 			$default_url = Context::getDefaultUrl();
-			if($default_url && substr_compare($default_url, '/', -1) === 0) $default_url = substr($default_url, 0, -1);
-			$icon_url = $default_url . '/files/attach/xeicon/' . $virtual_site . $iconname;
+			if ($default_url && substr_compare($default_url, '/', -1) === 0) $default_url = substr($default_url, 0, -1);
+			$icon_url = $default_url.'/files/attach/xeicon/'.$virtual_site.$iconname;
 		}
 		return $icon_url;
 	}

Braces +25 added lines, -20 removed lines

@@ -303,8 +303,7 @@ 
 			if(is_dir($curpwd . $file))
 			{
 				$file .= "/";
-			}
-			else
+			} else
 			{
 				continue;
 			}
@@ -359,8 +358,7 @@ 
 			{
 				$_list = $oFtp->ftp_rawlist($this->pwd);
 				$oFtp->ftp_quit();
-			}
-			else
+			} else
 			{
 				return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 			}
@@ -380,8 +378,7 @@ 
 					$list[] = substr(strrchr($v, ' '), 1) . '/';
 				}
 			}
-		}
-		else
+		} else
 		{
 			return new BaseObject(-1, 'msg_ftp_no_directory');
 		}
@@ -434,11 +431,13 @@ 
 		$info['module'] = '';
 		$oModuleModel = getModel('module');
 		$module_list = $oModuleModel->getModuleList();
-		if($module_list) foreach($module_list as $module)
+		if($module_list) {
+			foreach($module_list as $module)
 		{
 			if(in_array($module->module, $skip['module']))
 			{
 				continue;
+		}
 			}
 			$info['module'] .= '|' . $module->module;
 		}
@@ -447,11 +446,13 @@ 
 		$info['addon'] = '';
 		$oAddonAdminModel = getAdminModel('addon');
 		$addon_list = $oAddonAdminModel->getAddonList();
-		if($addon_list) foreach($addon_list as $addon)
+		if($addon_list) {
+			foreach($addon_list as $addon)
 		{
 			if(in_array($addon->addon, $skip['addon']))
 			{
 				continue;
+		}
 			}
 			$info['addon'] .= '|' . $addon->addon;
 		}
@@ -460,11 +461,13 @@ 
 		$info['layout'] = "";
 		$oLayoutModel = getModel('layout');
 		$layout_list = $oLayoutModel->getDownloadedLayoutList();
-		if($layout_list) foreach($layout_list as $layout)
+		if($layout_list) {
+			foreach($layout_list as $layout)
 		{
 			if(in_array($layout->layout, $skip['layout']))
 			{
 				continue;
+		}
 			}
 			$info['layout'] .= '|' . $layout->layout;
 		}
@@ -473,11 +476,13 @@ 
 		$info['widget'] = "";
 		$oWidgetModel = getModel('widget');
 		$widget_list = $oWidgetModel->getDownloadedWidgetList();
-		if($widget_list) foreach($widget_list as $widget)
+		if($widget_list) {
+			foreach($widget_list as $widget)
 		{
 			if(in_array($widget->widget, $skip['widget']))
 			{
 				continue;
+		}
 			}
 			$info['widget'] .= '|' . $widget->widget;
 		}
@@ -486,11 +491,13 @@ 
 		$info['widgetstyle'] = "";
 		$oWidgetModel = getModel('widget');
 		$widgetstyle_list = $oWidgetModel->getDownloadedWidgetStyleList();
-		if($widgetstyle_list) foreach($widgetstyle_list as $widgetstyle)
+		if($widgetstyle_list) {
+			foreach($widgetstyle_list as $widgetstyle)
 		{
 			if(in_array($widgetstyle->widgetStyle, $skip['widgetstyle']))
 			{
 				continue;
+		}
 			}
 			$info['widgetstyle'] .= '|' . $widgetstyle->widgetStyle;
 		}
@@ -575,8 +582,7 @@ 
 		{
 			$publisher_list = array();
 			$publisher_list[] = $xml_obj->publisher;
-		}
-		else
+		} else
 		{
 			$publisher_list = $xml_obj->publisher;
 		}
@@ -649,8 +655,7 @@ 
 		if(is_array($skin_infos->skininfo))
 		{
 			$skin_list = $skin_infos->skininfo;
-		}
-		else
+		} else
 		{
 			$skin_list = array($skin_infos->skininfo);
 		}
@@ -839,8 +844,7 @@ 
 		{
 			$returnObject->add('result', TRUE);
 			$returnObject->add('favoriteSrl', $output->data->admin_favorite_srl);
-		}
-		else
+		} else
 		{
 			$returnObject->add('result', FALSE);
 		}
@@ -957,11 +961,12 @@ 
 		if(!$file_exsit && $default === true)
         {
             $icon_url = './modules/admin/tpl/img/' . $default_icon_name;
-        }
-        elseif($file_exsit)
+        } elseif($file_exsit)
 		{
 			$default_url = Context::getDefaultUrl();
-			if($default_url && substr_compare($default_url, '/', -1) === 0) $default_url = substr($default_url, 0, -1);
+			if($default_url && substr_compare($default_url, '/', -1) === 0) {
+				$default_url = substr($default_url, 0, -1);
+			}
 			$icon_url = $default_url . '/files/attach/xeicon/' . $virtual_site . $iconname;
 		}
 		return $icon_url;

modules/autoinstall/autoinstall.admin.controller.php

Doc Comments +1 added lines

@@ -332,6 +332,7 @@
 	/**
 	 * Uninstall package by package serial number
 	 *
+	 * @param string $package_srl
 	 * @return BaseObject
 	 */
 	function uninstallPackageByPackageSrl($package_srl)

modules/autoinstall/autoinstall.admin.view.php

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/comment/comment.controller.php

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()
 	{

Spacing +153 added lines, -153 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 = removeHackTag($obj->homepage);
-				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 = removeHackTag($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);
@@ -1100,7 +1100,7 @@ 
 		$oDB->begin();
 
 		// update the number of votes
-		if($point < 0)
+		if ($point < 0)
 		{
 			$args->blamed_count = $oComment->get('blamed_count') + $point;
 			$output = executeQuery('comment.updateBlamedCount', $args);
@@ -1124,7 +1124,7 @@ 
 		$obj->before_point = ($point < 0) ? $oComment->get('blamed_count') : $oComment->get('voted_count');
 		$obj->after_point = ($point < 0) ? $args->blamed_count : $args->voted_count;
 		$trigger_output = ModuleHandler::triggerCall('comment.updateVotedCount', 'after', $obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			$oDB->rollback();
 			return $trigger_output;
@@ -1137,7 +1137,7 @@ 
 
 		// Return the result
 		$output = new BaseObject(0, $success_message);
-		if($point > 0)
+		if ($point > 0)
 		{
 			$output->add('voted_count', $obj->after_point);
 		}
@@ -1157,7 +1157,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');
 		}
@@ -1166,7 +1166,7 @@ 
 		$args = new stdClass();
 		$args->comment_srl = $comment_srl;
 		$output = executeQuery('comment.getDeclaredComment', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -1178,7 +1178,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;
 		}
@@ -1188,21 +1188,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');
@@ -1210,7 +1210,7 @@ 
 		}
 
 		// If logged-in, use the member_srl. otherwise use the ipaddress.
-		if($member_srl)
+		if ($member_srl)
 		{
 			$args->member_srl = $member_srl;
 		}
@@ -1222,7 +1222,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');
@@ -1233,7 +1233,7 @@ 
 		$oDB->begin();
 
 		// execute insert
-		if($output->data->declared_count > 0)
+		if ($output->data->declared_count > 0)
 		{
 			$output = executeQuery('comment.updateDeclaredComment', $args);
 		}
@@ -1242,7 +1242,7 @@ 
 			$output = executeQuery('comment.insertDeclaredComment', $args);
 		}
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -1254,7 +1254,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;
@@ -1279,7 +1279,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();
 		}
@@ -1301,7 +1301,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);
 		}
@@ -1312,33 +1312,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;
 			}
@@ -1372,25 +1372,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);
 				}
@@ -1415,9 +1415,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);
 			}

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'];
 		}
@@ -1104,8 +1088,7 @@ 
 		{
 			$args->blamed_count = $oComment->get('blamed_count') + $point;
 			$output = executeQuery('comment.updateBlamedCount', $args);
-		}
-		else
+		} else
 		{
 			$args->voted_count = $oComment->get('voted_count') + $point;
 			$output = executeQuery('comment.updateVotedCount', $args);
@@ -1140,8 +1123,7 @@ 
 		if($point > 0)
 		{
 			$output->add('voted_count', $obj->after_point);
-		}
-		else
+		} else
 		{
 			$output->add('blamed_count', $obj->after_point);
 		}
@@ -1213,8 +1195,7 @@ 
 		if($member_srl)
 		{
 			$args->member_srl = $member_srl;
-		}
-		else
+		} else
 		{
 			$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 		}
@@ -1236,8 +1217,7 @@ 
 		if($output->data->declared_count > 0)
 		{
 			$output = executeQuery('comment.updateDeclaredComment', $args);
-		}
-		else
+		} else
 		{
 			$output = executeQuery('comment.insertDeclaredComment', $args);
 		}
@@ -1304,8 +1284,7 @@ 
 		if(preg_match('/^([0-9,]+)$/', $module_srl))
 		{
 			$module_srl = explode(',', $module_srl);
-		}
-		else
+		} else
 		{
 			$module_srl = array($module_srl);
 		}
@@ -1395,8 +1374,7 @@ 
 					$value->content = strip_tags($value->content);
 				}
 			}
-		}
-		else
+		} else
 		{
 			global $lang;
 			$commentList = array();

modules/comment/comment.view.php

Doc Comments +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	/**
 	 * Add a form fot comment setting on the additional setting of module
 	 * @param string $obj
-	 * @return string
+	 * @return BaseObject
 	 */
 	function triggerDispCommentAdditionSetup(&$obj)
 	{

Spacing +3 added lines, -3 removed lines

@@ -31,12 +31,12 @@ 
 		$current_module_srl = Context::get('module_srl');
 		$current_module_srls = Context::get('module_srls');
 
-		if(!$current_module_srl && !$current_module_srls)
+		if (!$current_module_srl && !$current_module_srls)
 		{
 			// get information of the selected module
 			$current_module_info = Context::get('current_module_info');
 			$current_module_srl = $current_module_info->module_srl;
-			if(!$current_module_srl)
+			if (!$current_module_srl)
 			{
 				return new BaseObject();
 			}
@@ -54,7 +54,7 @@ 
 
 		// Set a template file
 		$oTemplate = TemplateHandler::getInstance();
-		$tpl = $oTemplate->compile($this->module_path . 'tpl', 'comment_module_config');
+		$tpl = $oTemplate->compile($this->module_path.'tpl', 'comment_module_config');
 		$obj .= $tpl;
 
 		return new BaseObject();

modules/communication/communication.mobile.php

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()
 	{