xpressengine / xe-core

modules/admin/admin.admin.model.php

Doc Comments +8 added lines, -2 removed lines

@@ -275,7 +275,7 @@ 
 
 	/**
 	 * Add file list to Object after sftp connect
-	 * @return void|Object
+	 * @return Object|null
 	 */
 	function getSFTPList()
 	{
@@ -316,7 +316,7 @@ 
 
 	/**
 	 * Add file list to Object after ftp connect
-	 * @return void|Object
+	 * @return Object|null
 	 */
 	function getAdminFTPList()
 	{
@@ -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');

Indentation +4 added lines, -4 removed lines

@@ -956,10 +956,10 @@
 
 		$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;
-        }
-        elseif($file_exsit)
+		{
+			$icon_url = './modules/admin/tpl/img/' . $default_icon_name;
+		}
+		elseif($file_exsit)
 		{
 			$default_url = Context::getDefaultUrl();
 			$icon_url = $default_url . 'files/attach/xeicon/' . $virtual_site . $iconname;

Spacing +107 added lines, -107 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 Object(-1, 'msg_ftp_invalid_auth_info');
 		}
@@ -58,17 +58,17 @@ 
 		$path_candidate = array();
 
 		$temp = '';
-		foreach($path_info as $path)
+		foreach ($path_info as $path)
 		{
 			$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;
 			}
@@ -80,7 +80,7 @@ 
 			@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 Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_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 Object(-1, 'msg_ftp_invalid_auth_info');
@@ -133,17 +133,17 @@ 
 		$path_candidate = array();
 
 		$temp = '';
-		foreach($path_info as $path)
+		foreach ($path_info as $path)
 		{
 			$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;
 			}
@@ -155,7 +155,7 @@ 
 			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);
 		}
@@ -181,33 +181,33 @@ 
 
 		$ftp_info = Context::getRequestVars();
 
-		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password)
+		if (!$ftp_info->ftp_user || !$ftp_info->ftp_password)
 		{
 			return new Object(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 Object(-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 Object(1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_info->ftp_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 Object(1, 'msg_ftp_invalid_auth_info');
 		}
@@ -236,17 +236,17 @@ 
 		$path_candidate = array();
 
 		$temp = '';
-		foreach($path_info as $path)
+		foreach ($path_info as $path)
 		{
 			$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;
 			}
@@ -258,7 +258,7 @@ 
 			$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,12 +280,12 @@ 
 	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 Object(-1, 'msg_ftp_invalid_auth_info');
 		}
@@ -293,14 +293,14 @@ 
 		$sftp = ssh2_sftp($connection);
 		$curpwd = "ssh2.sftp://$sftp" . $this->pwd;
 		$dh = @opendir($curpwd);
-		if(!$dh)
+		if (!$dh)
 		{
 			return new Object(-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 .= "/";
 			}
@@ -326,26 +326,26 @@ 
 		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 Object(-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 Object(-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,15 +367,15 @@ 
 		}
 		$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) . '/';
 				}
@@ -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,10 +420,10 @@ 
 		$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;
 			}
@@ -434,9 +434,9 @@ 
 		$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;
 			}
@@ -447,9 +447,9 @@ 
 		$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;
 			}
@@ -460,9 +460,9 @@ 
 		$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;
 			}
@@ -473,9 +473,9 @@ 
 		$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;
 			}
@@ -486,9 +486,9 @@ 
 		$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;
 			}
@@ -497,9 +497,9 @@ 
 		$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));
 			}
@@ -519,9 +519,9 @@ 
 		$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))
+		if (!file_exists($info_file))
 		{
 			return;
 		}
 
 		$oXmlParser = new XmlParser();
 		$_xml_obj = $oXmlParser->loadXmlFile($info_file);
-		if(!$_xml_obj->theme)
+		if (!$_xml_obj->theme)
 		{
 			return;
 		}
@@ -571,7 +571,7 @@ 
 		$theme_info->description = $xml_obj->description->body;
 		$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,7 +595,7 @@ 
 		$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];
@@ -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,12 +657,12 @@ 
 
 		$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;
@@ -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);
 
-			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);
@@ -752,22 +752,22 @@ 
 		$cacheFile = sprintf('./files/cache/menu/admin_lang/adminMenu.%s.lang.php', $currentLang);
 
 		// Update if no cache file exists or it is older than xml file
-		if(!is_readable($cacheFile))
+		if (!is_readable($cacheFile))
 		{
 			$lang = new stdClass();
 			$oModuleModel = getModel('module');
 			$installed_module_list = $oModuleModel->getModulesXmlInfo();
 
 			$this->gnbLangBuffer = '<?php $lang = new stdClass();';
-			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->menu_gnb_sub[$key2] = $value2->title;
-						$this->gnbLangBuffer .=sprintf('$lang->menu_gnb_sub[\'%s\'] = \'%s\';', $key2, $value2->title);
+						$this->gnbLangBuffer .= sprintf('$lang->menu_gnb_sub[\'%s\'] = \'%s\';', $key2, $value2->title);
 					}
 				}
 			}
@@ -793,19 +793,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 Object();
 		}
 
-		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;
@@ -830,13 +830,13 @@ 
 		$args->site_srl = $siteSrl;
 		$args->module = $module;
 		$output = executeQuery('admin.getFavorite', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		$returnObject = new Object();
-		if($output->data)
+		if ($output->data)
 		{
 			$returnObject->add('result', TRUE);
 			$returnObject->add('favoriteSrl', $output->data->admin_favorite_srl);
@@ -855,7 +855,7 @@ 
 	 */
 	function getSiteAllList()
 	{
-		if(Context::get('domain'))
+		if (Context::get('domain'))
 		{
 			$domain = Context::get('domain');
 		}
@@ -872,7 +872,7 @@ 
 	function getAllSitesThatHaveModules($domain = NULL)
 	{
 		$args = new stdClass();
-		if($domain)
+		if ($domain)
 		{
 			$args->domain = $domain;
 		}
@@ -880,31 +880,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]);
 			}
@@ -921,13 +921,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;
 		}
@@ -949,17 +949,17 @@ 
 	{
 		$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 . '/';
 		}
 
 		$file_exsit = FileHandler::readFile(_XE_PATH_ . 'files/attach/xeicon/' . $virtual_site . $iconname);
-		if(!$file_exsit && $default === true)
+		if (!$file_exsit && $default === true)
         {
             $icon_url = './modules/admin/tpl/img/' . $default_icon_name;
         }
-        elseif($file_exsit)
+        elseif ($file_exsit)
 		{
 			$default_url = Context::getDefaultUrl();
 			$icon_url = $default_url . 'files/attach/xeicon/' . $virtual_site . $iconname;

Braces +23 added lines, -21 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 Object(-1, 'msg_ftp_invalid_auth_info');
 			}
@@ -380,8 +378,7 @@ 
 					$list[] = substr(strrchr($v, ' '), 1) . '/';
 				}
 			}
-		}
-		else
+		} else
 		{
 			return new Object(-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);
 		}
@@ -773,8 +778,7 @@ 
 			}
 			$this->gnbLangBuffer .= ' ?>';
 			FileHandler::writeFile($cacheFile, $this->gnbLangBuffer);
-		}
-		else
+		} else
 		{
 			include $cacheFile;
 		}
@@ -840,8 +844,7 @@ 
 		{
 			$returnObject->add('result', TRUE);
 			$returnObject->add('favoriteSrl', $output->data->admin_favorite_srl);
-		}
-		else
+		} else
 		{
 			$returnObject->add('result', FALSE);
 		}
@@ -958,8 +961,7 @@ 
 		if(!$file_exsit && $default === true)
         {
             $icon_url = './modules/admin/tpl/img/' . $default_icon_name;
-        }
-        elseif($file_exsit)
+        } elseif($file_exsit)
 		{
 			$default_url = Context::getDefaultUrl();
 			$icon_url = $default_url . 'files/attach/xeicon/' . $virtual_site . $iconname;

modules/admin/admin.admin.view.php

Doc Comments +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
 	/**
 	 * Initilization
-	 * @return void
+	 * @return ModuleObject|null
 	 */
 	function init()
 	{

Indentation +1 added lines, -1 removed lines

@@ -566,7 +566,7 @@
 	/**
 	 * Retrun server environment to XML string
 	 * @return object
-	*/
+	 */
 	function dispAdminViewServerEnv()
 	{
 		$info = array();

Spacing +69 added lines, -69 removed lines

@@ -28,7 +28,7 @@ 
 	{
 		$db_info = Context::getDBInfo();
 
-		if(strpos($db_info->default_url, 'xn--') !== FALSE)
+		if (strpos($db_info->default_url, 'xn--') !== FALSE)
 		{
 			$xe_default_url = Context::decodeIdna($db_info->default_url);
 		}
@@ -48,7 +48,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");
 		}
@@ -74,11 +74,11 @@ 
 		Context::set('use_db_session', $db_info->use_db_session == 'N' ? 'N' : 'Y');
 		Context::set('use_mobile_view', $db_info->use_mobile_view == 'Y' ? 'Y' : 'N');
 		Context::set('use_ssl', $db_info->use_ssl ? $db_info->use_ssl : "none");
-		if($db_info->http_port)
+		if ($db_info->http_port)
 		{
 			Context::set('http_port', $db_info->http_port);
 		}
-		if($db_info->https_port)
+		if ($db_info->https_port)
 		{
 			Context::set('https_port', $db_info->https_port);
 		}
@@ -94,7 +94,7 @@ 
 	function checkEasyinstall()
 	{
 		$lastTime = (int) FileHandler::readFile($this->easyinstallCheckFile);
-		if($lastTime > $_SERVER['REQUEST_TIME'] - 60 * 60 * 24 * 30)
+		if ($lastTime > $_SERVER['REQUEST_TIME'] - 60 * 60 * 24 * 30)
 		{
 			return;
 		}
@@ -108,14 +108,14 @@ 
 		$lUpdateDoc = $xml_lUpdate->parse($buff);
 		$updateDate = $lUpdateDoc->response->updatedate->body;
 
-		if(!$updateDate)
+		if (!$updateDate)
 		{
 			$this->_markingCheckEasyinstall();
 			return;
 		}
 
 		$item = $oAutoinstallModel->getLatestPackage();
-		if(!$item || $item->updatedate < $updateDate)
+		if (!$item || $item->updatedate < $updateDate)
 		{
 			$oController = getAdminController('autoinstall');
 			$oController->_updateinfo();
@@ -144,7 +144,7 @@ 
 
 		// Check is_shortcut column
 		$oDB = DB::getInstance();
-		if(!$oDB->isColumnExists('menu_item', 'is_shortcut'))
+		if (!$oDB->isColumnExists('menu_item', 'is_shortcut'))
 		{
 			return;
 		}
@@ -162,9 +162,9 @@ 
 		$currentAct = Context::get('act');
 		$subMenuTitle = '';
 
-		foreach((array) $moduleActionInfo->menu as $key => $value)
+		foreach ((array) $moduleActionInfo->menu as $key => $value)
 		{
-			if(isset($value->acts) && is_array($value->acts) && in_array($currentAct, $value->acts))
+			if (isset($value->acts) && is_array($value->acts) && in_array($currentAct, $value->acts))
 			{
 				$subMenuTitle = $value->title;
 				break;
@@ -173,21 +173,21 @@ 
 		// get current menu's srl(=parentSrl)
 		$parentSrl = 0;
 		$oMenuAdminConroller = getAdminController('menu');
-		foreach((array) $menu->list as $parentKey => $parentMenu)
+		foreach ((array) $menu->list as $parentKey => $parentMenu)
 		{
-			if(!is_array($parentMenu['list']) || !count($parentMenu['list']))
+			if (!is_array($parentMenu['list']) || !count($parentMenu['list']))
 			{
 				continue;
 			}
-			if($parentMenu['href'] == '#' && count($parentMenu['list']))
+			if ($parentMenu['href'] == '#' && count($parentMenu['list']))
 			{
 				$firstChild = current($parentMenu['list']);
 				$menu->list[$parentKey]['href'] = $firstChild['href'];
 			}
 
-			foreach($parentMenu['list'] as $childKey => $childMenu)
+			foreach ($parentMenu['list'] as $childKey => $childMenu)
 			{
-				if($subMenuTitle == $childMenu['text'] && $parentSrl == 0)
+				if ($subMenuTitle == $childMenu['text'] && $parentSrl == 0)
 				{
 					$parentSrl = $childMenu['parent_srl'];
 				}
@@ -211,7 +211,7 @@ 
 		// move from index method, because use in admin footer
 		$newest_news_url = sprintf("http://news.xpressengine.com/%s/news.php?version=%s&package=%s", _XE_LOCATION_, __XE_VERSION__, _XE_PACKAGE_);
 		$cache_file = sprintf("%sfiles/cache/newest_news.%s.cache.php", _XE_PATH_, _XE_LOCATION_);
-		if(!file_exists($cache_file) || filemtime($cache_file) + 60 * 60 < $_SERVER['REQUEST_TIME'])
+		if (!file_exists($cache_file) || filemtime($cache_file) + 60 * 60 < $_SERVER['REQUEST_TIME'])
 		{
 			// Considering if data cannot be retrieved due to network problem, modify filemtime to prevent trying to reload again when refreshing administration page
 			// Ensure to access the administration page even though news cannot be displayed
@@ -219,20 +219,20 @@ 
 			FileHandler::getRemoteFile($newest_news_url, $cache_file, null, 1, 'GET', 'text/html', array('REQUESTURL' => getFullUrl('')));
 		}
 
-		if(file_exists($cache_file))
+		if (file_exists($cache_file))
 		{
 			$oXml = new XmlParser();
 			$buff = $oXml->parse(FileHandler::readFile($cache_file));
 
 			$item = $buff->zbxe_news->item;
-			if($item)
+			if ($item)
 			{
-				if(!is_array($item))
+				if (!is_array($item))
 				{
 					$item = array($item);
 				}
 
-				foreach($item as $key => $val)
+				foreach ($item as $key => $val)
 				{
 					$obj = new stdClass();
 					$obj->title = $val->body;
@@ -241,7 +241,7 @@ 
 					$news[] = $obj;
 				}
 				Context::set('news', $news);
-				if(isset($news) && is_array($news))
+				if (isset($news) && is_array($news))
 				{
 					Context::set('latestVersion', array_shift($news));
 				}
@@ -264,7 +264,7 @@ 
 	function dispAdminIndex()
 	{
 		$db_info = Context::getDBInfo();
-		Context::set('db_info',$db_info);
+		Context::set('db_info', $db_info);
 
 		// Get statistics
 		$args = new stdClass();
@@ -301,9 +301,9 @@ 
 		$args = new stdClass();
 		$args->list_count = 5;
 		$output = $oCommentModel->getNewestCommentList($args, $columnList);
-		if(is_array($output))
+		if (is_array($output))
 		{
-			foreach($output AS $key => $value)
+			foreach ($output AS $key => $value)
 			{
 				$value->content = strip_tags($value->content);
 			}
@@ -314,17 +314,17 @@ 
 		// Get list of modules
 		$oModuleModel = getModel('module');
 		$module_list = $oModuleModel->getModuleList();
-		if(is_array($module_list))
+		if (is_array($module_list))
 		{
 			$needUpdate = FALSE;
 			$addTables = FALSE;
-			foreach($module_list AS $key => $value)
+			foreach ($module_list AS $key => $value)
 			{
-				if($value->need_install)
+				if ($value->need_install)
 				{
 					$addTables = TRUE;
 				}
-				if($value->need_update)
+				if ($value->need_update)
 				{
 					$needUpdate = TRUE;
 				}
@@ -335,12 +335,12 @@ 
 		$oAutoinstallAdminModel = getAdminModel('autoinstall');
 		$needUpdateList = $oAutoinstallAdminModel->getNeedUpdateList();
 
-		if(is_array($needUpdateList))
+		if (is_array($needUpdateList))
 		{
-			foreach($needUpdateList AS $key => $value)
+			foreach ($needUpdateList AS $key => $value)
 			{
 				$helpUrl = './admin/help/index.html#';
-				switch($value->type)
+				switch ($value->type)
 				{
 					case 'addon':
 						$helpUrl .= 'UMAN_terminology_addon';
@@ -367,8 +367,8 @@ 
 
 		$site_module_info = Context::get('site_module_info');
 		$oAddonAdminModel = getAdminModel('addon');
-		$counterAddonActivated = $oAddonAdminModel->isActivatedAddon('counter', $site_module_info->site_srl );
-		if(!$counterAddonActivated)
+		$counterAddonActivated = $oAddonAdminModel->isActivatedAddon('counter', $site_module_info->site_srl);
+		if (!$counterAddonActivated)
 		{
 			$columnList = array('member_srl', 'nick_name', 'user_name', 'user_id', 'email_address');
 			$args = new stdClass;
@@ -393,7 +393,7 @@ 
 		$mainVersion = join('.', array_slice(explode('.', __XE_VERSION__), 0, 2));
 		$path = FileHandler::getRealPath('./files/env/' . $mainVersion);
 		$isEnviromentGatheringAgreement = FALSE;
-		if(file_exists($path))
+		if (file_exists($path))
 		{
 			$isEnviromentGatheringAgreement = TRUE;
 		}
@@ -403,7 +403,7 @@ 
 		$isLicenseAgreement = FALSE;
 		$path = FileHandler::getRealPath('./files/env/license_agreement');
 		$isLicenseAgreement = FALSE;
-		if(file_exists($path))
+		if (file_exists($path))
 		{
 			$isLicenseAgreement = TRUE;
 		}
@@ -425,7 +425,7 @@ 
 
 		Context::set('selected_lang', $db_info->lang_type);
 
-		if(strpos($db_info->default_url, 'xn--') !== FALSE)
+		if (strpos($db_info->default_url, 'xn--') !== FALSE)
 		{
 			$db_info->default_url = Context::decodeIdna($db_info->default_url);
 		}
@@ -434,9 +434,9 @@ 
 
 		// site lock
 		Context::set('IP', $_SERVER['REMOTE_ADDR']);
-		if(!$db_info->sitelock_title) $db_info->sitelock_title = 'Maintenance in progress...';
-		if(!in_array('127.0.0.1', $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = '127.0.0.1';
-		if(!in_array($_SERVER['REMOTE_ADDR'], $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = $_SERVER['REMOTE_ADDR'];
+		if (!$db_info->sitelock_title) $db_info->sitelock_title = 'Maintenance in progress...';
+		if (!in_array('127.0.0.1', $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = '127.0.0.1';
+		if (!in_array($_SERVER['REMOTE_ADDR'], $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = $_SERVER['REMOTE_ADDR'];
 		$db_info->sitelock_whitelist = array_unique($db_info->sitelock_whitelist);
 		Context::set('remote_addr', $_SERVER['REMOTE_ADDR']);
 		Context::set('use_sitelock', $db_info->use_sitelock);
@@ -447,7 +447,7 @@ 
 		Context::set('sitelock_whitelist', $whitelist);
 
 
-		if($db_info->admin_ip_list) $admin_ip_list = implode("\r\n", $db_info->admin_ip_list);
+		if ($db_info->admin_ip_list) $admin_ip_list = implode("\r\n", $db_info->admin_ip_list);
 		else $admin_ip_list = '';
 		Context::set('admin_ip_list', $admin_ip_list);
 
@@ -456,8 +456,8 @@ 
 		$oAdminModel = getAdminModel('admin');
 		$favicon_url = $oAdminModel->getFaviconUrl();
 		$mobicon_url = $oAdminModel->getMobileIconUrl();
-		Context::set('favicon_url', $favicon_url.'?'.$_SERVER['REQUEST_TIME']);
-		Context::set('mobicon_url', $mobicon_url.'?'.$_SERVER['REQUEST_TIME']);
+		Context::set('favicon_url', $favicon_url . '?' . $_SERVER['REQUEST_TIME']);
+		Context::set('mobicon_url', $mobicon_url . '?' . $_SERVER['REQUEST_TIME']);
 
 		$oDocumentModel = getModel('document');
 		$config = $oDocumentModel->getDocumentConfig();
@@ -529,7 +529,7 @@ 
 	 */
 	function showSendEnv()
 	{
-		if(Context::getResponseMethod() != 'HTML')
+		if (Context::getResponseMethod() != 'HTML')
 		{
 			return;
 		}
@@ -539,7 +539,7 @@ 
 		$install_env = $path . 'install';
 		$mainVersion = join('.', array_slice(explode('.', __XE_VERSION__), 0, 2));
 
-		if(file_exists(FileHandler::getRealPath($install_env)))
+		if (file_exists(FileHandler::getRealPath($install_env)))
 		{
 			$oAdminAdminModel = getAdminModel('admin');
 			$params = $oAdminAdminModel->getEnv('INSTALL');
@@ -548,9 +548,9 @@ 
 
 			FileHandler::writeFile($path . $mainVersion, '1');
 		}
-		else if(isset($_SESSION['enviroment_gather']) && !file_exists(FileHandler::getRealPath($path . $mainVersion)))
+		else if (isset($_SESSION['enviroment_gather']) && !file_exists(FileHandler::getRealPath($path . $mainVersion)))
 		{
-			if($_SESSION['enviroment_gather'] == 'Y')
+			if ($_SESSION['enviroment_gather'] == 'Y')
 			{
 				$oAdminAdminModel = getAdminModel('admin');
 				$params = $oAdminAdminModel->getEnv();
@@ -576,64 +576,64 @@ 
 		$tmp = explode("&", $envInfo);
 		$arrInfo = array();
 		$xe_check_env = array();
-		foreach($tmp as $value) {
+		foreach ($tmp as $value) {
 			$arr = explode("=", $value);
-			if($arr[0]=="type") {
+			if ($arr[0] == "type") {
 				continue;
-			}elseif($arr[0]=="phpext" ) {
+			}elseif ($arr[0] == "phpext") {
 				$str = urldecode($arr[1]);
-				$xe_check_env[$arr[0]]= str_replace("|", ", ", $str);
-			} elseif($arr[0]=="module" ) {
+				$xe_check_env[$arr[0]] = str_replace("|", ", ", $str);
+			} elseif ($arr[0] == "module") {
 				$str = urldecode($arr[1]);
 				$arrModuleName = explode("|", $str);
 				$oModuleModel = getModel("module");
 				$mInfo = array();
-				foreach($arrModuleName as $moduleName) {
+				foreach ($arrModuleName as $moduleName) {
 					$moduleInfo = $oModuleModel->getModuleInfoXml($moduleName);
 					$mInfo[] = "{$moduleName}({$moduleInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
-			} elseif($arr[0]=="addon") {
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
+			} elseif ($arr[0] == "addon") {
 				$str = urldecode($arr[1]);
 				$arrAddonName = explode("|", $str);
 				$oAddonModel = getAdminModel("addon");
 				$mInfo = array();
-				foreach($arrAddonName as $addonName) {
+				foreach ($arrAddonName as $addonName) {
 					$addonInfo = $oAddonModel->getAddonInfoXml($addonName);
 					$mInfo[] = "{$addonName}({$addonInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
-			} elseif($arr[0]=="widget") {
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
+			} elseif ($arr[0] == "widget") {
 				$str = urldecode($arr[1]);
 				$arrWidgetName = explode("|", $str);
 				$oWidgetModel = getModel("widget");
 				$mInfo = array();
-				foreach($arrWidgetName as $widgetName) {
+				foreach ($arrWidgetName as $widgetName) {
 					$widgetInfo = $oWidgetModel->getWidgetInfo($widgetName);
 					$mInfo[] = "{$widgetName}({$widgetInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
-			} elseif($arr[0]=="widgetstyle") {
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
+			} elseif ($arr[0] == "widgetstyle") {
 				$str = urldecode($arr[1]);
 				$arrWidgetstyleName = explode("|", $str);
 				$oWidgetModel = getModel("widget");
 				$mInfo = array();
-				foreach($arrWidgetstyleName as $widgetstyleName) {
+				foreach ($arrWidgetstyleName as $widgetstyleName) {
 					$widgetstyleInfo = $oWidgetModel->getWidgetStyleInfo($widgetstyleName);
 					$mInfo[] = "{$widgetstyleName}({$widgetstyleInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
 
-			} elseif($arr[0]=="layout") {
+			} elseif ($arr[0] == "layout") {
 				$str = urldecode($arr[1]);
 				$arrLayoutName = explode("|", $str);
 				$oLayoutModel = getModel("layout");
 				$mInfo = array();
-				foreach($arrLayoutName as $layoutName) {
+				foreach ($arrLayoutName as $layoutName) {
 					$layoutInfo = $oLayoutModel->getLayoutInfo($layoutName);
 					$mInfo[] = "{$layoutName}({$layoutInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
 			} else {
 				$xe_check_env[$arr[0]] = urldecode($arr[1]);
 			}
@@ -648,14 +648,14 @@ 
 		$info['PHP_Core'] = $php_core;
 
 		$str_info = "[XE Server Environment " . date("Y-m-d") . "]\n\n";
-		$str_info .= "realpath : ".realpath('./')."\n";
-		foreach( $info as $key=>$value )
+		$str_info .= "realpath : " . realpath('./') . "\n";
+		foreach ($info as $key=>$value)
 		{
-			if( is_array( $value ) == false ) {
+			if (is_array($value) == false) {
 				$str_info .= "{$key} : {$value}\n";
 			} else {
 				//$str_info .= "\n{$key} \n";
-				foreach( $value as $key2=>$value2 )
+				foreach ($value as $key2=>$value2)
 					$str_info .= "{$key2} : {$value2}\n";
 			}
 		}

Braces +20 added lines, -12 removed lines

@@ -31,8 +31,7 @@ 
 		if(strpos($db_info->default_url, 'xn--') !== FALSE)
 		{
 			$xe_default_url = Context::decodeIdna($db_info->default_url);
-		}
-		else
+		} else
 		{
 			$xe_default_url = $db_info->default_url;
 		}
@@ -434,9 +433,15 @@ 
 
 		// site lock
 		Context::set('IP', $_SERVER['REMOTE_ADDR']);
-		if(!$db_info->sitelock_title) $db_info->sitelock_title = 'Maintenance in progress...';
-		if(!in_array('127.0.0.1', $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = '127.0.0.1';
-		if(!in_array($_SERVER['REMOTE_ADDR'], $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = $_SERVER['REMOTE_ADDR'];
+		if(!$db_info->sitelock_title) {
+			$db_info->sitelock_title = 'Maintenance in progress...';
+		}
+		if(!in_array('127.0.0.1', $db_info->sitelock_whitelist)) {
+			$db_info->sitelock_whitelist[] = '127.0.0.1';
+		}
+		if(!in_array($_SERVER['REMOTE_ADDR'], $db_info->sitelock_whitelist)) {
+			$db_info->sitelock_whitelist[] = $_SERVER['REMOTE_ADDR'];
+		}
 		$db_info->sitelock_whitelist = array_unique($db_info->sitelock_whitelist);
 		Context::set('remote_addr', $_SERVER['REMOTE_ADDR']);
 		Context::set('use_sitelock', $db_info->use_sitelock);
@@ -447,8 +452,11 @@ 
 		Context::set('sitelock_whitelist', $whitelist);
 
 
-		if($db_info->admin_ip_list) $admin_ip_list = implode("\r\n", $db_info->admin_ip_list);
-		else $admin_ip_list = '';
+		if($db_info->admin_ip_list) {
+			$admin_ip_list = implode("\r\n", $db_info->admin_ip_list);
+		} else {
+			$admin_ip_list = '';
+		}
 		Context::set('admin_ip_list', $admin_ip_list);
 
 		Context::set('lang_selected', Context::loadLangSelected());
@@ -547,8 +555,7 @@ 
 			Context::addHtmlFooter($img);
 
 			FileHandler::writeFile($path . $mainVersion, '1');
-		}
-		else if(isset($_SESSION['enviroment_gather']) && !file_exists(FileHandler::getRealPath($path . $mainVersion)))
+		} else if(isset($_SESSION['enviroment_gather']) && !file_exists(FileHandler::getRealPath($path . $mainVersion)))
 		{
 			if($_SESSION['enviroment_gather'] == 'Y')
 			{
@@ -580,7 +587,7 @@ 
 			$arr = explode("=", $value);
 			if($arr[0]=="type") {
 				continue;
-			}elseif($arr[0]=="phpext" ) {
+			} elseif($arr[0]=="phpext" ) {
 				$str = urldecode($arr[1]);
 				$xe_check_env[$arr[0]]= str_replace("|", ", ", $str);
 			} elseif($arr[0]=="module" ) {
@@ -655,8 +662,9 @@ 
 				$str_info .= "{$key} : {$value}\n";
 			} else {
 				//$str_info .= "\n{$key} \n";
-				foreach( $value as $key2=>$value2 )
-					$str_info .= "{$key2} : {$value2}\n";
+				foreach( $value as $key2=>$value2 ) {
+									$str_info .= "{$key2} : {$value2}\n";
+				}
 			}
 		}
 

modules/adminlogging/adminlogging.controller.php

Doc Comments +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 	/**
 	 * Initialization
-	 * @return void
+	 * @return ModuleObject|null
 	 */
 	function init()
 	{

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,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,7 +33,7 @@ 
 	 */
 	function insertLog($module, $act)
 	{
-		if(!$module || !$act)
+		if (!$module || !$act)
 		{
 			return;
 		}

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 Object
 	 */
 	function uninstallPackageByPackageSrl($package_srl)

Spacing +30 added lines, -30 removed lines

@@ -64,7 +64,7 @@ 
 	{
 		$oModel = getModel('autoinstall');
 		$item = $oModel->getLatestPackage();
-		if($item)
+		if ($item)
 		{
 			$params["updatedate"] = $item->updatedate;
 		}
@@ -92,23 +92,23 @@ 
 		executeQuery("autoinstall.deleteInstalledPackage");
 		$oModel = getModel('autoinstall');
 		$packages = $oModel->getPackages();
-		foreach($packages as $package)
+		foreach ($packages as $package)
 		{
 			$real_path = FileHandler::getRealPath($package->path);
-			if(!file_exists($real_path))
+			if (!file_exists($real_path))
 			{
 				continue;
 			}
 
 			$type = $oModel->getTypeFromPath($package->path);
-			if($type == "core")
+			if ($type == "core")
 			{
 				$version = __XE_VERSION__;
 			}
 			else
 			{
 				$config_file = NULL;
-				switch($type)
+				switch ($type)
 				{
 					case "m.layout":
 						$type = "layout";
@@ -138,7 +138,7 @@ 
 						break;
 				}
 
-				if(!$config_file)
+				if (!$config_file)
 				{
 					continue;
 				}
@@ -146,7 +146,7 @@ 
 				$xml = new XmlParser();
 				$xmlDoc = $xml->loadXmlFile($real_path . $config_file);
 
-				if(!$xmlDoc)
+				if (!$xmlDoc)
 				{
 					continue;
 				}
@@ -158,7 +158,7 @@ 
 			$args->package_srl = $package->package_srl;
 			$args->version = $package->version;
 			$args->current_version = $version;
-			if(version_compare($args->version, $args->current_version, ">"))
+			if (version_compare($args->version, $args->current_version, ">"))
 			{
 				$args->need_update = "Y";
 			}
@@ -184,7 +184,7 @@ 
 		$oAdminModel = getAdminModel('autoinstall');
 		$packages = explode(',', $package_srls);
 		$ftp_info = Context::getFTPInfo();
-		if(!$_SESSION['ftp_password'])
+		if (!$_SESSION['ftp_password'])
 		{
 			$ftp_password = Context::get('ftp_password');
 		}
@@ -194,18 +194,18 @@ 
 		}
 
 		$isSftpSupported = function_exists(ssh2_sftp);
-		foreach($packages as $package_srl)
+		foreach ($packages as $package_srl)
 		{
 			$package = $oModel->getPackage($package_srl);
-			if($oAdminModel->checkUseDirectModuleInstall($package)->toBool())
+			if ($oAdminModel->checkUseDirectModuleInstall($package)->toBool())
 			{
 				$oModuleInstaller = new DirectModuleInstaller($package);
 			}
-			else if($ftp_info->sftp && $ftp_info->sftp == 'Y' && $isSftpSupported)
+			else if ($ftp_info->sftp && $ftp_info->sftp == 'Y' && $isSftpSupported)
 			{
 				$oModuleInstaller = new SFTPModuleInstaller($package);
 			}
-			else if(function_exists(ftp_connect))
+			else if (function_exists(ftp_connect))
 			{
 				$oModuleInstaller = new PHPFTPModuleInstaller($package);
 			}
@@ -217,7 +217,7 @@ 
 			$oModuleInstaller->setServerUrl(_XE_DOWNLOAD_SERVER_);
 			$oModuleInstaller->setPassword($ftp_password);
 			$output = $oModuleInstaller->install();
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return $output;
 			}
@@ -227,7 +227,7 @@ 
 
 		$this->setMessage('success_installed', 'update');
 
-		if(Context::get('return_url'))
+		if (Context::get('return_url'))
 		{
 			$this->setRedirectUrl(Context::get('return_url'));
 		}
@@ -246,30 +246,30 @@ 
 	function updatePackages(&$xmlDoc)
 	{
 		$oModel = getModel('autoinstall');
-		if(!$xmlDoc->response->packages->item)
+		if (!$xmlDoc->response->packages->item)
 		{
 			return;
 		}
-		if(!is_array($xmlDoc->response->packages->item))
+		if (!is_array($xmlDoc->response->packages->item))
 		{
 			$xmlDoc->response->packages->item = array($xmlDoc->response->packages->item);
 		}
 		$targets = array('package_srl', 'updatedate', 'latest_item_srl', 'path', 'version', 'category_srl', 'have_instance');
-		foreach($xmlDoc->response->packages->item as $item)
+		foreach ($xmlDoc->response->packages->item as $item)
 		{
 			$args = new stdClass();
-			foreach($targets as $target)
+			foreach ($targets as $target)
 			{
 				$args->{$target} = $item->{$target}->body;
 			}
-			if($oModel->getPackage($args->package_srl))
+			if ($oModel->getPackage($args->package_srl))
 			{
 				$output = executeQuery("autoinstall.updatePackage", $args);
 			}
 			else
 			{
 				$output = executeQuery("autoinstall.insertPackage", $args);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$output = executeQuery("autoinstall.deletePackage", $args);
 					$output = executeQuery("autoinstall.insertPackage", $args);
@@ -288,12 +288,12 @@ 
 	{
 		executeQuery("autoinstall.deleteCategory");
 		$oModel = getModel('autoinstall');
-		if(!is_array($xmlDoc->response->categorylist->item))
+		if (!is_array($xmlDoc->response->categorylist->item))
 		{
 			$xmlDoc->response->categorylist->item = array($xmlDoc->response->categorylist->item);
 		}
 		$list_order = 0;
-		foreach($xmlDoc->response->categorylist->item as $item)
+		foreach ($xmlDoc->response->categorylist->item as $item)
 		{
 			$args = new stdClass();
 			$args->category_srl = $item->category_srl->body;
@@ -314,12 +314,12 @@ 
 		$package_srl = Context::get('package_srl');
 
 		$output = $this->uninstallPackageByPackageSrl($package_srl);
-		if($output->toBool()==FALSE)
+		if ($output->toBool() == FALSE)
 		{
 			return $output;
 		}
 
-		if(Context::get('return_url'))
+		if (Context::get('return_url'))
 		{
 			$this->setRedirectUrl(Context::get('return_url'));
 		}
@@ -359,7 +359,7 @@ 
 
 		$oAdminModel = getAdminModel('autoinstall');
 
-		if(!$_SESSION['ftp_password'])
+		if (!$_SESSION['ftp_password'])
 		{
 			$ftp_password = Context::get('ftp_password');
 		}
@@ -370,15 +370,15 @@ 
 		$ftp_info = Context::getFTPInfo();
 
 		$isSftpSupported = function_exists(ssh2_sftp);
-		if($oAdminModel->checkUseDirectModuleInstall($package)->toBool())
+		if ($oAdminModel->checkUseDirectModuleInstall($package)->toBool())
 		{
 			$oModuleInstaller = new DirectModuleInstaller($package);
 		}
-		else if($ftp_info->sftp && $ftp_info->sftp == 'Y' && $isSftpSupported)
+		else if ($ftp_info->sftp && $ftp_info->sftp == 'Y' && $isSftpSupported)
 		{
 			$oModuleInstaller = new SFTPModuleInstaller($package);
 		}
-		else if(function_exists('ftp_connect'))
+		else if (function_exists('ftp_connect'))
 		{
 			$oModuleInstaller = new PHPFTPModuleInstaller($package);
 		}
@@ -391,7 +391,7 @@ 
 
 		$oModuleInstaller->setPassword($ftp_password);
 		$output = $oModuleInstaller->uninstall();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}

Braces +13 added lines, -26 removed lines

@@ -104,8 +104,7 @@ 
 			if($type == "core")
 			{
 				$version = __XE_VERSION__;
-			}
-			else
+			} else
 			{
 				$config_file = NULL;
 				switch($type)
@@ -161,8 +160,7 @@ 
 			if(version_compare($args->version, $args->current_version, ">"))
 			{
 				$args->need_update = "Y";
-			}
-			else
+			} else
 			{
 				$args->need_update = "N";
 			}
@@ -187,8 +185,7 @@ 
 		if(!$_SESSION['ftp_password'])
 		{
 			$ftp_password = Context::get('ftp_password');
-		}
-		else
+		} else
 		{
 			$ftp_password = $_SESSION['ftp_password'];
 		}
@@ -200,16 +197,13 @@ 
 			if($oAdminModel->checkUseDirectModuleInstall($package)->toBool())
 			{
 				$oModuleInstaller = new DirectModuleInstaller($package);
-			}
-			else if($ftp_info->sftp && $ftp_info->sftp == 'Y' && $isSftpSupported)
+			} else if($ftp_info->sftp && $ftp_info->sftp == 'Y' && $isSftpSupported)
 			{
 				$oModuleInstaller = new SFTPModuleInstaller($package);
-			}
-			else if(function_exists(ftp_connect))
+			} else if(function_exists(ftp_connect))
 			{
 				$oModuleInstaller = new PHPFTPModuleInstaller($package);
-			}
-			else
+			} else
 			{
 				$oModuleInstaller = new FTPModuleInstaller($package);
 			}
@@ -230,8 +224,7 @@ 
 		if(Context::get('return_url'))
 		{
 			$this->setRedirectUrl(Context::get('return_url'));
-		}
-		else
+		} else
 		{
 			$this->setRedirectUrl(preg_replace('/act=[^&]*/', 'act=dispAutoinstallAdminIndex', Context::get('error_return_url')));
 		}
@@ -265,8 +258,7 @@ 
 			if($oModel->getPackage($args->package_srl))
 			{
 				$output = executeQuery("autoinstall.updatePackage", $args);
-			}
-			else
+			} else
 			{
 				$output = executeQuery("autoinstall.insertPackage", $args);
 				if(!$output->toBool())
@@ -322,8 +314,7 @@ 
 		if(Context::get('return_url'))
 		{
 			$this->setRedirectUrl(Context::get('return_url'));
-		}
-		else
+		} else
 		{
 			$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminInstalledPackages'));
 		}
@@ -362,8 +353,7 @@ 
 		if(!$_SESSION['ftp_password'])
 		{
 			$ftp_password = Context::get('ftp_password');
-		}
-		else
+		} else
 		{
 			$ftp_password = $_SESSION['ftp_password'];
 		}
@@ -373,16 +363,13 @@ 
 		if($oAdminModel->checkUseDirectModuleInstall($package)->toBool())
 		{
 			$oModuleInstaller = new DirectModuleInstaller($package);
-		}
-		else if($ftp_info->sftp && $ftp_info->sftp == 'Y' && $isSftpSupported)
+		} else if($ftp_info->sftp && $ftp_info->sftp == 'Y' && $isSftpSupported)
 		{
 			$oModuleInstaller = new SFTPModuleInstaller($package);
-		}
-		else if(function_exists('ftp_connect'))
+		} else if(function_exists('ftp_connect'))
 		{
 			$oModuleInstaller = new PHPFTPModuleInstaller($package);
-		}
-		else
+		} else
 		{
 			$oModuleInstaller = new FTPModuleInstaller($package);
 		}

modules/autoinstall/autoinstall.admin.model.php

Doc Comments +7 added lines

@@ -15,6 +15,9 @@ 
 
 	/**
 	 * Pre process parameters
+	 * @param string $order_target
+	 * @param string $order_type
+	 * @param string $page
 	 */
 	function preProcParam(&$order_target, &$order_type, &$page)
 	{
@@ -115,6 +118,10 @@ 
 
 	/**
 	 * Get Package List
+	 * @param string $type
+	 * @param string $search_keyword
+	 * @param integer $category_srl
+	 * @param string $parent_program
 	 */
 	function getPackageList($type, $order_target = 'newest', $order_type = 'desc', $page = '1', $search_keyword = NULL, $category_srl = NULL, $parent_program = NULL)
 	{

Spacing +38 added lines, -38 removed lines

@@ -19,19 +19,19 @@ 
 	function preProcParam(&$order_target, &$order_type, &$page)
 	{
 		$order_target_array = array('newest' => 1, 'download' => 1, 'popular' => 1);
-		if(!isset($order_target_array[$order_target]))
+		if (!isset($order_target_array[$order_target]))
 		{
 			$order_target = 'newest';
 		}
 
 		$order_type_array = array('asc' => 1, 'desc' => 1);
-		if(!isset($order_type_array[$order_type]))
+		if (!isset($order_type_array[$order_type]))
 		{
 			$order_type = 'desc';
 		}
 
 		$page = (int) $page;
-		if($page < 1)
+		if ($page < 1)
 		{
 			$page = 1;
 		}
@@ -63,12 +63,12 @@ 
 
 		$type_array = array('M' => 1, 'P' => 1);
 		$type = Context::get('type');
-		if(!isset($type_array[$type]))
+		if (!isset($type_array[$type]))
 		{
 			$type = 'P';
 		}
 
-		if($type == 'P')
+		if ($type == 'P')
 		{
 			$category_srl = $this->layout_category_srl;
 		}
@@ -95,12 +95,12 @@ 
 
 		$type_array = array('M' => 1, 'P' => 1);
 		$type = Context::get('type');
-		if(!isset($type_array[$type]))
+		if (!isset($type_array[$type]))
 		{
 			$type = 'P';
 		}
 
-		if($type == 'P')
+		if ($type == 'P')
 		{
 			$category_srl = $this->module_skin_category_srl;
 		}
@@ -118,11 +118,11 @@ 
 	 */
 	function getPackageList($type, $order_target = 'newest', $order_type = 'desc', $page = '1', $search_keyword = NULL, $category_srl = NULL, $parent_program = NULL)
 	{
-		if($type == 'menu')
+		if ($type == 'menu')
 		{
 			$params["act"] = "getResourceapiMenuPackageList";
 		}
-		elseif($type == 'skin')
+		elseif ($type == 'skin')
 		{
 			$params["act"] = "getResourceapiSkinPackageList";
 			$params['parent_program'] = $parent_program;
@@ -137,18 +137,18 @@ 
 		$params["order_type"] = $order_type;
 		$params["page"] = $page;
 
-		if($category_srl)
+		if ($category_srl)
 		{
 			$params["category_srl"] = $category_srl;
 		}
 
-		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 = $oAdminView->rearranges($xmlDoc->response->packagelist->item);
 			$this->add('item_list', $item_list);
@@ -167,7 +167,7 @@ 
 		$is_authed = 0;
 
 		$ftp_info = Context::getFTPInfo();
-		if(!$ftp_info->ftp_root_path)
+		if (!$ftp_info->ftp_root_path)
 		{
 			$is_authed = -1;
 		}
@@ -186,14 +186,14 @@ 
 	{
 		$oModel = getModel('autoinstall');
 		$output = executeQueryArray('autoinstall.getNeedUpdate');
-		if(!is_array($output->data))
+		if (!is_array($output->data))
 		{
 			return NULL;
 		}
 
 		$result = array();
 		$xml = new XmlParser();
-		foreach($output->data as $package)
+		foreach ($output->data as $package)
 		{
 			$packageSrl = $package->package_srl;
 
@@ -203,7 +203,7 @@ 
 			$packageInfo->type = $oModel->getTypeFromPath($package->path);
 			$packageInfo->url = $oModel->getUpdateUrlByPackageSrl($package->package_srl);
 
-			if($packageInfo->type == 'core')
+			if ($packageInfo->type == 'core')
 			{
 				$title = 'XpressEngine';
 			}
@@ -212,18 +212,18 @@ 
 				$configFile = $oModel->getConfigFilePath($packageInfo->type);
 				$xmlDoc = $xml->loadXmlFile(FileHandler::getRealPath($package->path) . $configFile);
 
-				if($xmlDoc)
+				if ($xmlDoc)
 				{
 					$type = $packageInfo->type;
-					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";
 					}
@@ -257,7 +257,7 @@ 
 		$oModel = getModel('autoinstall');
 
 		$targetpackages = array();
-		if($xmlDoc)
+		if ($xmlDoc)
 		{
 			$xmlPackage = $xmlDoc->response->package;
 			$package = new stdClass();
@@ -266,15 +266,15 @@ 
 			$package->package_description = $xmlPackage->package_description->body;
 			$package->version = $xmlPackage->version->body;
 			$package->path = $xmlPackage->path->body;
-			if($xmlPackage->depends)
+			if ($xmlPackage->depends)
 			{
-				if(!is_array($xmlPackage->depends->item))
+				if (!is_array($xmlPackage->depends->item))
 				{
 					$xmlPackage->depends->item = array($xmlPackage->depends->item);
 				}
 
 				$package->depends = array();
-				foreach($xmlPackage->depends->item as $item)
+				foreach ($xmlPackage->depends->item as $item)
 				{
 					$dep_item = new stdClass();
 					$dep_item->package_srl = $item->package_srl->body;
@@ -287,9 +287,9 @@ 
 
 				$packages = $oModel->getInstalledPackages(array_keys($targetpackages));
 				$package->deplist = "";
-				foreach($package->depends as $key => $dep)
+				foreach ($package->depends as $key => $dep)
 				{
-					if(!$packages[$dep->package_srl])
+					if (!$packages[$dep->package_srl])
 					{
 						$package->depends[$key]->installed = FALSE;
 						$package->package_srl .= "," . $dep->package_srl;
@@ -298,12 +298,12 @@ 
 					{
 						$package->depends[$key]->installed = TRUE;
 						$package->depends[$key]->cur_version = $packages[$dep->package_srl]->current_version;
-						if(version_compare($dep->version, $packages[$dep->package_srl]->current_version, ">"))
+						if (version_compare($dep->version, $packages[$dep->package_srl]->current_version, ">"))
 						{
 							$package->depends[$key]->need_update = TRUE;
 							$package->package_srl .= "," . $dep->package_srl;
 
-							if($dep->path === '.')
+							if ($dep->path === '.')
 							{
 								$package->contain_core = TRUE;
 								$package->contain_core_version = $dep->version;
@@ -318,14 +318,14 @@ 
 			}
 
 			$installedPackage = $oModel->getInstalledPackage($packageSrl);
-			if($installedPackage)
+			if ($installedPackage)
 			{
 				$package->installed = TRUE;
 				$package->cur_version = $installedPackage->current_version;
 				$package->need_update = version_compare($package->version, $installedPackage->current_version, ">");
 			}
 
-			if($package->path === '.')
+			if ($package->path === '.')
 			{
 				$package->contain_core = TRUE;
 				$package->contain_core_version = $package->version;
@@ -341,7 +341,7 @@ 
 	public function getAutoInstallAdminInstallInfo()
 	{
 		$packageSrl = Context::get('package_srl');
-		if(!$packageSrl)
+		if (!$packageSrl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -355,23 +355,23 @@ 
 		$directModuleInstall = TRUE;
 		$arrUnwritableDir = array();
 		$output = $this->isWritableDir($package->path);
-		if($output->toBool()==FALSE)
+		if ($output->toBool() == FALSE)
 		{
 			$directModuleInstall = FALSE;
 			$arrUnwritableDir[] = $output->get('path');
 		}
 
-		foreach($package->depends as $dep)
+		foreach ($package->depends as $dep)
 		{
 			$output = $this->isWritableDir($dep->path);
-			if($output->toBool()==FALSE)
+			if ($output->toBool() == FALSE)
 			{
 				$directModuleInstall = FALSE;
 				$arrUnwritableDir[] = $output->get('path');
 			}
 		}
 
-		if($directModuleInstall==FALSE)
+		if ($directModuleInstall == FALSE)
 		{
 			$output = new Object(-1, 'msg_direct_inall_invalid');
 			$output->add('path', $arrUnwritableDir);
@@ -386,17 +386,17 @@ 
 		$path_list = explode('/', dirname($path));
 		$real_path = './';
 
-		while($path_list)
+		while ($path_list)
 		{
 			$check_path = realpath($real_path . implode('/', $path_list));
-			if(FileHandler::isDir($check_path))
+			if (FileHandler::isDir($check_path))
 			{
 				break;
 			}
 			array_pop($path_list);
 		}
 
-		if(FileHandler::isWritableDir($check_path)==FALSE)
+		if (FileHandler::isWritableDir($check_path) == FALSE)
 		{
 			$output = new Object(-1, 'msg_unwritable_directory');
 			$output->add('path', FileHandler::getRealPath($check_path));

Braces +9 added lines, -18 removed lines

@@ -71,8 +71,7 @@ 
 		if($type == 'P')
 		{
 			$category_srl = $this->layout_category_srl;
-		}
-		else
+		} else
 		{
 			$category_srl = $this->mobile_layout_category_srl;
 		}
@@ -103,8 +102,7 @@ 
 		if($type == 'P')
 		{
 			$category_srl = $this->module_skin_category_srl;
-		}
-		else
+		} else
 		{
 			$category_srl = $this->module_mobile_skin_category_srl;
 		}
@@ -121,13 +119,11 @@ 
 		if($type == 'menu')
 		{
 			$params["act"] = "getResourceapiMenuPackageList";
-		}
-		elseif($type == 'skin')
+		} elseif($type == 'skin')
 		{
 			$params["act"] = "getResourceapiSkinPackageList";
 			$params['parent_program'] = $parent_program;
-		}
-		else
+		} else
 		{
 			$params["act"] = "getResourceapiPackagelist";
 		}
@@ -170,8 +166,7 @@ 
 		if(!$ftp_info->ftp_root_path)
 		{
 			$is_authed = -1;
-		}
-		else
+		} else
 		{
 			$is_authed = (int) isset($_SESSION['ftp_password']);
 		}
@@ -206,8 +201,7 @@ 
 			if($packageInfo->type == 'core')
 			{
 				$title = 'XpressEngine';
-			}
-			else
+			} else
 			{
 				$configFile = $oModel->getConfigFilePath($packageInfo->type);
 				$xmlDoc = $xml->loadXmlFile(FileHandler::getRealPath($package->path) . $configFile);
@@ -228,8 +222,7 @@ 
 						$type = "layout";
 					}
 					$title = $xmlDoc->{$type}->title->body;
-				}
-				else
+				} else
 				{
 					$pathInfo = explode('/', $package->path);
 					$title = $pathInfo[count($pathInfo) - 1];
@@ -293,8 +286,7 @@ 
 					{
 						$package->depends[$key]->installed = FALSE;
 						$package->package_srl .= "," . $dep->package_srl;
-					}
-					else
+					} else
 					{
 						$package->depends[$key]->installed = TRUE;
 						$package->depends[$key]->cur_version = $packages[$dep->package_srl]->current_version;
@@ -308,8 +300,7 @@ 
 								$package->contain_core = TRUE;
 								$package->contain_core_version = $dep->version;
 							}
-						}
-						else
+						} else
 						{
 							$package->need_update = FALSE;
 						}

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 Object
+	 * @return ModuleObject|null
 	 */
 	function dispAutoinstallAdminInstall()
 	{
@@ -384,7 +384,7 @@ 
 	/**
 	 * Display package list
 	 *
-	 * @return Object
+	 * @return ModuleObject|null
 	 */
 	function dispAutoinstallAdminIndex()
 	{

Spacing +47 added lines, -47 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;
 
-			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)
+				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,19 +406,19 @@ 
 		$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'));
 				$_SESSION['__XE_EASYINSTALL_REDIRECT__'] = TRUE;
@@ -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;

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');
 		}

modules/board/board.admin.model.php

Doc Comments +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 	/**
 	 * Get the board module admin simple setting page
-	 * @return void
+	 * @return null|string
 	 */
 	public function getBoardAdminSimpleSetup($moduleSrl, $setupUrl)
 	{

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
 	 */
 	public function getBoardAdminSimpleSetup($moduleSrl, $setupUrl)
 	{
-		if(!$moduleSrl)
+		if (!$moduleSrl)
 		{
 			return;
 		}
@@ -35,7 +35,7 @@ 
 		$oModuleModel = getModel('module');
 		$moduleInfo = $oModuleModel->getModuleInfoByModuleSrl($moduleSrl);
 		$moduleInfo->use_status = explode('|@|', $moduleInfo->use_status);
-		if($moduleInfo)
+		if ($moduleInfo)
 		{
 			Context::set('module_info', $moduleInfo);
 		}
@@ -46,7 +46,7 @@ 
 		Context::set('document_status_list', $documentStatusList);
 
 		// set order target list
-		foreach($this->order_target AS $key)
+		foreach ($this->order_target AS $key)
 		{
 			$order_target[$key] = Context::getLang($key);
 		}
@@ -63,7 +63,7 @@ 
 		Context::set('admin_member', $admin_member);
 
 		$oTemplate = &TemplateHandler::getInstance();
-		$html = $oTemplate->compile($this->module_path.'tpl/', 'board_setup_basic');
+		$html = $oTemplate->compile($this->module_path . 'tpl/', 'board_setup_basic');
 
 		return $html;
 	}

modules/board/board.api.php

Doc Comments +9 added lines

@@ -87,6 +87,9 @@ 
 		$oModule->add('comment_list',$this->arrangeComment(Context::get('comment_list')));

 	}

 

+	/**
+	 * @param string $content_list
+	 */
 	function arrangeContentList($content_list) {

 		$output = array();

 		if(count($content_list)) {

@@ -120,6 +123,9 @@ 
 		return $output;

 	}

 

+	/**
+	 * @param string $comment_list
+	 */
 	function arrangeComment($comment_list) {

 		$output = array();

 		if(count($comment_list) > 0 ) {

@@ -133,6 +139,9 @@ 
 	}

 

 

+	/**
+	 * @param string $file_list
+	 */
 	function arrangeFile($file_list) {

 		$output = array();

 		if(count($file_list) > 0) {

Spacing +24 added lines, -24 removed lines

@@ -18,7 +18,7 @@ 
 	 * @brief notice list

 	 **/

 	function dispBoardNoticeList(&$oModule) {

-		 $oModule->add('notice_list',$this->arrangeContentList(Context::get('notice_list')));

+		 $oModule->add('notice_list', $this->arrangeContentList(Context::get('notice_list')));

 	}

 

 

@@ -29,11 +29,11 @@ 
 		$api_type = Context::get('api_type');

 		$document_list = $this->arrangeContentList(Context::get('document_list'));

 

-		if($api_type =='summary')

+		if ($api_type == 'summary')

 		{

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

-			$content_cut_size = $content_cut_size?$content_cut_size:50;

-			foreach($document_list as $k=>$v)

+			$content_cut_size = $content_cut_size ? $content_cut_size : 50;

+			foreach ($document_list as $k=>$v)

 			{

 				$oDocument = new documentItem();

 				$oDocument->setAttribute($v, false);

@@ -42,8 +42,8 @@ 
 			}

 		}

 

-		$oModule->add('document_list',$document_list);

-		$oModule->add('page_navigation',Context::get('page_navigation'));

+		$oModule->add('document_list', $document_list);

+		$oModule->add('page_navigation', Context::get('page_navigation'));

 	}

 

 

@@ -51,7 +51,7 @@ 
 	 * @brief category list

 	 **/

 	function dispBoardCategoryList(&$oModule) {

-		$oModule->add('category_list',Context::get('category_list'));

+		$oModule->add('category_list', Context::get('category_list'));

 	}

 

 	/**

@@ -60,8 +60,8 @@ 
 	function dispBoardContentView(&$oModule) {

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

 		$extra_vars = $oDocument->getExtraVars();

-		$oDocument->add('extra_vars',$this->arrangeExtraVars($extra_vars));

-		$oModule->add('oDocument',$this->arrangeContent($oDocument));

+		$oDocument->add('extra_vars', $this->arrangeExtraVars($extra_vars));

+		$oModule->add('oDocument', $this->arrangeContent($oDocument));

 	}

 

 

@@ -69,7 +69,7 @@ 
 	 * @brief contents file list

 	 **/

 	function dispBoardContentFileList(&$oModule) {

-		$oModule->add('file_list',$this->arrangeFile(Context::get('file_list')));

+		$oModule->add('file_list', $this->arrangeFile(Context::get('file_list')));

 	}

 

 

@@ -77,20 +77,20 @@ 
 	 * @brief tag list

 	 **/

 	function dispBoardTagList(&$oModule) {

-		$oModule->add('tag_list',Context::get('tag_list'));

+		$oModule->add('tag_list', Context::get('tag_list'));

 	}

 

 	/**

 	 * @brief comments list

 	 **/

 	function dispBoardContentCommentList(&$oModule) {

-		$oModule->add('comment_list',$this->arrangeComment(Context::get('comment_list')));

+		$oModule->add('comment_list', $this->arrangeComment(Context::get('comment_list')));

 	}

 

 	function arrangeContentList($content_list) {

 		$output = array();

-		if(count($content_list)) {

-			foreach($content_list as $key => $val) $output[] = $this->arrangeContent($val);

+		if (count($content_list)) {

+			foreach ($content_list as $key => $val) $output[] = $this->arrangeContent($val);

 		}

 		return $output;

 	}

@@ -99,10 +99,10 @@ 
 	function arrangeContent($content) {

 		$oBoardView = getView('board');

 		$output = new stdClass;

-		if($content){

-			$output = $content->gets('document_srl','category_srl','member_srl','nick_name','user_id','user_name','title','content','tags','readed_count','voted_count','blamed_count','comment_count','regdate','last_update','extra_vars','status');

+		if ($content) {

+			$output = $content->gets('document_srl', 'category_srl', 'member_srl', 'nick_name', 'user_id', 'user_name', 'title', 'content', 'tags', 'readed_count', 'voted_count', 'blamed_count', 'comment_count', 'regdate', 'last_update', 'extra_vars', 'status');

 

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

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

 			{

 				unset($output->content);

 				unset($output->tags);

@@ -122,10 +122,10 @@ 
 

 	function arrangeComment($comment_list) {

 		$output = array();

-		if(count($comment_list) > 0 ) {

-			foreach($comment_list as $key => $val){

+		if (count($comment_list) > 0) {

+			foreach ($comment_list as $key => $val) {

 				$item = null;

-				$item = $val->gets('comment_srl','parent_srl','depth','is_secret','content','voted_count','blamed_count','user_id','user_name','nick_name','email_address','homepage','regdate','last_update');

+				$item = $val->gets('comment_srl', 'parent_srl', 'depth', 'is_secret', 'content', 'voted_count', 'blamed_count', 'user_id', 'user_name', 'nick_name', 'email_address', 'homepage', 'regdate', 'last_update');

 				$output[] = $item;

 			}

 		}

@@ -135,8 +135,8 @@ 
 

 	function arrangeFile($file_list) {

 		$output = array();

-		if(count($file_list) > 0) {

-			foreach($file_list as $key => $val){

+		if (count($file_list) > 0) {

+			foreach ($file_list as $key => $val) {

 				$item = new stdClass;

 				$item->sid = $val->sid;

 				$item->download_count = $val->download_count;

@@ -153,8 +153,8 @@ 
 

 	function arrangeExtraVars($list) {

 		$output = array();

-		if(count($list)) {

-			foreach($list as $key => $val){

+		if (count($list)) {

+			foreach ($list as $key => $val) {

 				$item = new stdClass;

 				$item->name = $val->name;

 				$item->type = $val->type;

Braces +3 added lines, -1 removed lines

@@ -90,7 +90,9 @@
 	function arrangeContentList($content_list) {

 		$output = array();

 		if(count($content_list)) {

-			foreach($content_list as $key => $val) $output[] = $this->arrangeContent($val);

+			foreach($content_list as $key => $val) {
+				$output[] = $this->arrangeContent($val);
+			}
 		}

 		return $output;

 	}

modules/board/board.view.php

Doc Comments +3 added lines

@@ -747,6 +747,9 @@
 		$this->setTemplateFile('write_form');
 	}
 
+	/**
+	 * @param ModuleObject $oDocumentModel
+	 */
 	function _getStatusNameList(&$oDocumentModel)
 	{
 		$resultList = array();

Spacing +160 added lines, -160 removed lines

@@ -23,15 +23,15 @@ 
 		/**
 		 * setup the module general information
 		 **/
-		if($this->module_info->list_count)
+		if ($this->module_info->list_count)
 		{
 			$this->list_count = $this->module_info->list_count;
 		}
-		if($this->module_info->search_list_count)
+		if ($this->module_info->search_list_count)
 		{
 			$this->search_list_count = $this->module_info->search_list_count;
 		}
-		if($this->module_info->page_count)
+		if ($this->module_info->page_count)
 		{
 			$this->page_count = $this->module_info->page_count;
 		}
@@ -41,20 +41,20 @@ 
 		$oDocumentModel = getModel('document');
 
 		$statusList = $this->_getStatusNameList($oDocumentModel);
-		if(isset($statusList['SECRET']))
+		if (isset($statusList['SECRET']))
 		{
 			$this->module_info->secret = 'Y';
 		}
 
 		// use_category <=1.5.x, hide_category >=1.7.x
 		$count_category = count($oDocumentModel->getCategoryList($this->module_info->module_srl));
-		if($count_category)
+		if ($count_category)
 		{
-			if($this->module_info->hide_category)
+			if ($this->module_info->hide_category)
 			{
 				$this->module_info->use_category = ($this->module_info->hide_category == 'Y') ? 'N' : 'Y';
 			}
-			else if($this->module_info->use_category)
+			else if ($this->module_info->use_category)
 			{
 				$this->module_info->hide_category = ($this->module_info->use_category == 'Y') ? 'N' : 'Y';
 			}
@@ -74,10 +74,10 @@ 
 		 * check the consultation function, if the user is admin then swich off consultation function
 		 * if the user is not logged, then disppear write document/write comment./ view document
 		 **/
-		if($this->module_info->consultation == 'Y' && !$this->grant->manager)
+		if ($this->module_info->consultation == 'Y' && !$this->grant->manager)
 		{
 			$this->consultation = TRUE;
-			if(!Context::get('is_logged'))
+			if (!Context::get('is_logged'))
 			{
 				$this->grant->list = FALSE;
 				$this->grant->write_document = FALSE;
@@ -94,11 +94,11 @@ 
 		 * setup the template path based on the skin
 		 * the default skin is default
 		 **/
-		$template_path = sprintf("%sskins/%s/",$this->module_path, $this->module_info->skin);
-		if(!is_dir($template_path)||!$this->module_info->skin)
+		$template_path = sprintf("%sskins/%s/", $this->module_path, $this->module_info->skin);
+		if (!is_dir($template_path) || !$this->module_info->skin)
 		{
 			$this->module_info->skin = 'default';
-			$template_path = sprintf("%sskins/%s/",$this->module_path, $this->module_info->skin);
+			$template_path = sprintf("%sskins/%s/", $this->module_path, $this->module_info->skin);
 		}
 		$this->setTemplatePath($template_path);
 
@@ -114,7 +114,7 @@ 
 		 **/
 		if (is_array($extra_keys))
 		{
-			foreach($extra_keys as $val)
+			foreach ($extra_keys as $val)
 			{
 				$this->order_target[] = $val->eid;
 			}
@@ -122,14 +122,14 @@ 
 		/**
 		 * load javascript, JS filters
 		 **/
-		Context::addJsFilter($this->module_path.'tpl/filter', 'input_password.xml');
-		Context::addJsFile($this->module_path.'tpl/js/board.js');
+		Context::addJsFilter($this->module_path . 'tpl/filter', 'input_password.xml');
+		Context::addJsFile($this->module_path . 'tpl/js/board.js');
 
 		// remove [document_srl]_cpage from get_vars
 		$args = Context::getRequestVars();
-		foreach($args as $name => $value)
+		foreach ($args as $name => $value)
 		{
-			if(preg_match('/[0-9]+_cpage/', $name))
+			if (preg_match('/[0-9]+_cpage/', $name))
 			{
 				Context::set($name, '', TRUE);
 				Context::set($name, $value);
@@ -145,7 +145,7 @@ 
 		/**
 		 * check the access grant (all the grant has been set by the module object)
 		 **/
-		if(!$this->grant->access || !$this->grant->list)
+		if (!$this->grant->access || !$this->grant->list)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -160,22 +160,22 @@ 
 		 * add extra vaiables to the search options
 		 **/
 		// use search options on the template (the search options key has been declared, based on the language selected)
-		foreach($this->search_option as $opt) $search_option[$opt] = Context::getLang($opt);
+		foreach ($this->search_option as $opt) $search_option[$opt] = Context::getLang($opt);
 		$extra_keys = Context::get('extra_keys');
-		if($extra_keys)
+		if ($extra_keys)
 		{
-			foreach($extra_keys as $key => $val)
+			foreach ($extra_keys as $key => $val)
 			{
-				if($val->search == 'Y') $search_option['extra_vars'.$val->idx] = $val->name;
+				if ($val->search == 'Y') $search_option['extra_vars' . $val->idx] = $val->name;
 			}
 		}
 		// remove a search option that is not public in member config
 		$memberConfig = getModel('module')->getModuleConfig('member');
-		foreach($memberConfig->signupForm as $signupFormElement)
+		foreach ($memberConfig->signupForm as $signupFormElement)
 		{
-			if(in_array($signupFormElement->title, $search_option))
+			if (in_array($signupFormElement->title, $search_option))
 			{
-				if($signupFormElement->isPublic == 'N')
+				if ($signupFormElement->isPublic == 'N')
 					unset($search_option[$signupFormElement->name]);
 			}
 		}
@@ -183,7 +183,7 @@ 
 
 		$oDocumentModel = getModel('document');
 		$statusNameList = $this->_getStatusNameList($oDocumentModel);
-		if(count($statusNameList) > 0)
+		if (count($statusNameList) > 0)
 		{
 			Context::set('status_list', $statusNameList);
 		}
@@ -194,7 +194,7 @@ 
 		// list config, columnList setting
 		$oBoardModel = getModel('board');
 		$this->listConfig = $oBoardModel->getListConfig($this->module_info->module_srl);
-		if(!$this->listConfig) $this->listConfig = array();
+		if (!$this->listConfig) $this->listConfig = array();
 		$this->_makeListColumnList();
 
 		// display the notice list
@@ -206,7 +206,7 @@ 
 		/**
 		 * add javascript filters
 		 **/
-		Context::addJsFilter($this->module_path.'tpl/filter', 'search.xml');
+		Context::addJsFilter($this->module_path . 'tpl/filter', 'search.xml');
 
 		$oSecurity = new Security();
 		$oSecurity->encodeHTML('search_option.');
@@ -218,12 +218,12 @@ 
 	/**
 	 * @brief display the category list
 	 **/
-	function dispBoardCategoryList(){
+	function dispBoardCategoryList() {
 		// check if the use_category option is enabled
-		if($this->module_info->use_category=='Y')
+		if ($this->module_info->use_category == 'Y')
 		{
 			// check the grant
-			if(!$this->grant->list)
+			if (!$this->grant->list)
 			{
 				Context::set('category_list', array());
 				return;
@@ -240,7 +240,7 @@ 
 	/**
 	 * @brief display the board conent view
 	 **/
-	function dispBoardContentView(){
+	function dispBoardContentView() {
 		// get the variable value
 		$document_srl = Context::get('document_srl');
 		$page = Context::get('page');
@@ -251,36 +251,36 @@ 
 		/**
 		 * if the document exists, then get the document information
 		 **/
-		if($document_srl)
+		if ($document_srl)
 		{
 			$oDocument = $oDocumentModel->getDocument($document_srl, false, true);
 
 			// if the document is existed
-			if($oDocument->isExists())
+			if ($oDocument->isExists())
 			{
 				// if the module srl is not consistent
-				if($oDocument->get('module_srl')!=$this->module_info->module_srl )
+				if ($oDocument->get('module_srl') != $this->module_info->module_srl)
 				{
 					return $this->stop('msg_invalid_request');
 				}
 
 				// check the manage grant
-				if($this->grant->manager) $oDocument->setGrant();
+				if ($this->grant->manager) $oDocument->setGrant();
 
 				// if the consultation function is enabled, and the document is not a notice
-				if($this->consultation && !$oDocument->isNotice())
+				if ($this->consultation && !$oDocument->isNotice())
 				{
 					$logged_info = Context::get('logged_info');
-					if($oDocument->get('member_srl')!=$logged_info->member_srl)
+					if ($oDocument->get('member_srl') != $logged_info->member_srl)
 					{
 						$oDocument = $oDocumentModel->getDocument(0);
 					}
 				}
 
 				// if the document is TEMP saved, check Grant
-				if($oDocument->getStatus() == 'TEMP')
+				if ($oDocument->getStatus() == 'TEMP')
 				{
-					if(!$oDocument->isGranted())
+					if (!$oDocument->isGranted())
 					{
 						$oDocument = $oDocumentModel->getDocument(0);
 					}
@@ -290,7 +290,7 @@ 
 			else
 			{
 				// if the document is not existed, then alert a warning message
-				Context::set('document_srl','',true);
+				Context::set('document_srl', '', true);
 				$this->alertMessage('msg_not_founded');
 			}
 
@@ -306,12 +306,12 @@ 
 		/**
 		 *check the document view grant
 		 **/
-		if($oDocument->isExists())
+		if ($oDocument->isExists())
 		{
-			if(!$this->grant->view && !$oDocument->isGranted())
+			if (!$this->grant->view && !$oDocument->isGranted())
 			{
 				$oDocument = $oDocumentModel->getDocument(0);
-				Context::set('document_srl','',true);
+				Context::set('document_srl', '', true);
 				$this->alertMessage('msg_not_permitted');
 			}
 			else
@@ -320,15 +320,15 @@ 
 				Context::addBrowserTitle($oDocument->getTitleText());
 
 				// update the document view count (if the document is not secret)
-				if(!$oDocument->isSecret() || $oDocument->isGranted())
+				if (!$oDocument->isSecret() || $oDocument->isGranted())
 				{
 					$oDocument->updateReadedCount();
 				}
 
 				// disappear the document if it is secret
-				if($oDocument->isSecret() && !$oDocument->isGranted())
+				if ($oDocument->isSecret() && !$oDocument->isGranted())
 				{
-					$oDocument->add('content',Context::getLang('thisissecret'));
+					$oDocument->add('content', Context::getLang('thisissecret'));
 				}
 			}
 		}
@@ -340,7 +340,7 @@ 
 		/**
 		 * add javascript filters
 		 **/
-		Context::addJsFilter($this->module_path.'tpl/filter', 'insert_comment.xml');
+		Context::addJsFilter($this->module_path . 'tpl/filter', 'insert_comment.xml');
 
 //            return new Object();
 	}
@@ -348,11 +348,11 @@ 
 	/**
 	 * @brief  display the document file list (can be used by API)
 	 **/
-	function dispBoardContentFileList(){
+	function dispBoardContentFileList() {
 		/**
 		 * check the access grant (all the grant has been set by the module object)
 		 **/
-		if(!$this->grant->access)
+		if (!$this->grant->access)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -363,41 +363,41 @@ 
 		// Check if a permission for file download is granted
 		// Get configurations (using module model object)
 		$oModuleModel = getModel('module');
-		$file_module_config = $oModuleModel->getModulePartConfig('file',$this->module_srl);
+		$file_module_config = $oModuleModel->getModulePartConfig('file', $this->module_srl);
 		
 		$downloadGrantCount = 0;
-		if(is_array($file_module_config->download_grant))
+		if (is_array($file_module_config->download_grant))
 		{
-			foreach($file_module_config->download_grant AS $value)
-				if($value) $downloadGrantCount++;
+			foreach ($file_module_config->download_grant AS $value)
+				if ($value) $downloadGrantCount++;
 		}
 
-		if(is_array($file_module_config->download_grant) && $downloadGrantCount>0)
+		if (is_array($file_module_config->download_grant) && $downloadGrantCount > 0)
 		{
-			if(!Context::get('is_logged')) return $this->stop('msg_not_permitted_download');
+			if (!Context::get('is_logged')) return $this->stop('msg_not_permitted_download');
 			$logged_info = Context::get('logged_info');
-			if($logged_info->is_admin != 'Y')
+			if ($logged_info->is_admin != 'Y')
 			{
-				$oModuleModel =& getModel('module');
+				$oModuleModel = & getModel('module');
 				$columnList = array('module_srl', 'site_srl');
 				$module_info = $oModuleModel->getModuleInfoByModuleSrl($this->module_srl, $columnList);
 
-				if(!$oModuleModel->isSiteAdmin($logged_info, $module_info->site_srl))
+				if (!$oModuleModel->isSiteAdmin($logged_info, $module_info->site_srl))
 				{
-					$oMemberModel =& getModel('member');
+					$oMemberModel = & getModel('member');
 					$member_groups = $oMemberModel->getMemberGroups($logged_info->member_srl, $module_info->site_srl);
 
 					$is_permitted = false;
-					for($i=0;$i<count($file_module_config->download_grant);$i++)
+					for ($i = 0; $i < count($file_module_config->download_grant); $i++)
 					{
 						$group_srl = $file_module_config->download_grant[$i];
-						if($member_groups[$group_srl])
+						if ($member_groups[$group_srl])
 						{
 							$is_permitted = true;
 							break;
 						}
 					}
-					if(!$is_permitted) return $this->stop('msg_not_permitted_download');
+					if (!$is_permitted) return $this->stop('msg_not_permitted_download');
 				}
 			}
 		}
@@ -405,7 +405,7 @@ 
 		$oDocumentModel = getModel('document');
 		$document_srl = Context::get('document_srl');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		Context::set('file_list',$oDocument->getUploadedFiles());
+		Context::set('file_list', $oDocument->getUploadedFiles());
 
 		$oSecurity = new Security();
 		$oSecurity->encodeHTML('file_list..source_filename');
@@ -414,7 +414,7 @@ 
 	/**
 	 * @brief display the document comment list (can be used by API)
 	 **/
-	function dispBoardContentCommentList(){
+	function dispBoardContentCommentList() {
 		// check document view grant
 		$this->dispBoardContentView();
 
@@ -424,26 +424,26 @@ 
 		$comment_list = $oDocument->getComments();
 
 		// setup the comment list
-		if(is_array($comment_list))
+		if (is_array($comment_list))
 		{
-			foreach($comment_list as $key => $val)
+			foreach ($comment_list as $key => $val)
 			{
-				if(!$val->isAccessible())
+				if (!$val->isAccessible())
 				{
-					$val->add('content',Context::getLang('thisissecret'));
+					$val->add('content', Context::getLang('thisissecret'));
 				}
 			}
 		}
-		Context::set('comment_list',$comment_list);
+		Context::set('comment_list', $comment_list);
 
 	}
 
 	/**
 	 * @brief display notice list (can be used by API)
 	 **/
-	function dispBoardNoticeList(){
+	function dispBoardNoticeList() {
 		// check the grant
-		if(!$this->grant->list)
+		if (!$this->grant->list)
 		{
 			Context::set('notice_list', array());
 			return;
@@ -459,15 +459,15 @@ 
 	/**
 	 * @brief display board content list
 	 **/
-	function dispBoardContentList(){
+	function dispBoardContentList() {
 		// check the grant
-		if(!$this->grant->list)
+		if (!$this->grant->list)
 		{
 			Context::set('document_list', array());
 			Context::set('total_count', 0);
 			Context::set('total_page', 1);
 			Context::set('page', 1);
-			Context::set('page_navigation', new PageHandler(0,0,1,10));
+			Context::set('page_navigation', new PageHandler(0, 0, 1, 10));
 			return;
 		}
 
@@ -485,17 +485,17 @@ 
 		$args->search_keyword = Context::get('search_keyword');
 
 		$search_option = Context::get('search_option');
-		if($search_option==FALSE)
+		if ($search_option == FALSE)
 		{
 			$search_option = $this->search_option;
 		}
-		if(isset($search_option[$args->search_target])==FALSE)
+		if (isset($search_option[$args->search_target]) == FALSE)
 		{
 			$args->search_target = '';
 		}
 
 		// if the category is enabled, then get the category
-		if($this->module_info->use_category=='Y')
+		if ($this->module_info->use_category == 'Y')
 		{
 			$args->category_srl = Context::get('category');
 		}
@@ -503,21 +503,21 @@ 
 		// setup the sort index and order index
 		$args->sort_index = Context::get('sort_index');
 		$args->order_type = Context::get('order_type');
-		if(!in_array($args->sort_index, $this->order_target))
+		if (!in_array($args->sort_index, $this->order_target))
 		{
-			$args->sort_index = $this->module_info->order_target?$this->module_info->order_target:'list_order';
+			$args->sort_index = $this->module_info->order_target ? $this->module_info->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 = $this->module_info->order_type?$this->module_info->order_type:'asc';
+			$args->order_type = $this->module_info->order_type ? $this->module_info->order_type : 'asc';
 		}
 
 		// set the current page of documents
 		$document_srl = Context::get('document_srl');
-		if(!$args->page && $document_srl)
+		if (!$args->page && $document_srl)
 		{
 			$oDocument = $oDocumentModel->getDocument($document_srl);
-			if($oDocument->isExists() && !$oDocument->isNotice())
+			if ($oDocument->isExists() && !$oDocument->isNotice())
 			{
 				$page = $oDocumentModel->getDocumentPage($oDocument, $args);
 				Context::set('page', $page);
@@ -526,13 +526,13 @@ 
 		}
 
 		// setup the list count to be serach list count, if the category or search keyword has been set
-		if($args->category_srl || $args->search_keyword)
+		if ($args->category_srl || $args->search_keyword)
 		{
 			$args->list_count = $this->search_list_count;
 		}
 
 		// if the consultation function is enabled,  the get the logged user information
-		if($this->consultation)
+		if ($this->consultation)
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
@@ -560,18 +560,18 @@ 
 				'allow_trackback', 'notify_message', 'status', 'comment_status');
 		$this->columnList = array_intersect($configColumList, $tableColumnList);
 
-		if(in_array('summary', $configColumList)) array_push($this->columnList, 'content');
+		if (in_array('summary', $configColumList)) array_push($this->columnList, 'content');
 
 		// default column list add
 		$defaultColumn = array('document_srl', 'module_srl', 'category_srl', 'lang_code', 'member_srl', 'last_update', 'comment_count', 'trackback_count', 'uploaded_count', 'status', 'regdate', 'title_bold', 'title_color');
 
 		//TODO guestbook, blog style supports legacy codes.
-		if($this->module_info->skin == 'xe_guestbook' || $this->module_info->default_style == 'blog')
+		if ($this->module_info->skin == 'xe_guestbook' || $this->module_info->default_style == 'blog')
 		{
 			$defaultColumn = $tableColumnList;
 		}
 
-		if (in_array('last_post', $configColumList)){
+		if (in_array('last_post', $configColumList)) {
 			array_push($this->columnList, 'last_updater');
 		}
 
@@ -583,7 +583,7 @@ 
 		$this->columnList = array_unique(array_merge($this->columnList, $defaultColumn));
 
 		// add table name
-		foreach($this->columnList as $no => $value)
+		foreach ($this->columnList as $no => $value)
 		{
 			$this->columnList[$no] = 'documents.' . $value;
 		}
@@ -595,7 +595,7 @@ 
 	function dispBoardTagList()
 	{
 		// check if there is not grant fot view list, then alert an warning message
-		if(!$this->grant->list)
+		if (!$this->grant->list)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -609,14 +609,14 @@ 
 		$output = $oTagModel->getTagList($obj);
 
 		// automatically order
-		if(count($output->data))
+		if (count($output->data))
 		{
 			$numbers = array_keys($output->data);
 			shuffle($numbers);
 
-			if(count($output->data))
+			if (count($output->data))
 			{
-				foreach($numbers as $k => $v)
+				foreach ($numbers as $k => $v)
 				{
 					$tag_list[] = $output->data[$v];
 				}
@@ -637,7 +637,7 @@ 
 	function dispBoardWrite()
 	{
 		// check grant
-		if(!$this->grant->write_document)
+		if (!$this->grant->write_document)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -647,10 +647,10 @@ 
 		/**
 		 * check if the category option is enabled not not
 		 **/
-		if($this->module_info->use_category=='Y')
+		if ($this->module_info->use_category == 'Y')
 		{
 			// get the user group information
-			if(Context::get('is_logged'))
+			if (Context::get('is_logged'))
 			{
 				$logged_info = Context::get('logged_info');
 				$group_srls = array_keys($logged_info->group_list);
@@ -663,19 +663,19 @@ 
 
 			// check the grant after obtained the category list
 			$normal_category_list = $oDocumentModel->getCategoryList($this->module_srl);
-			if(count($normal_category_list))
+			if (count($normal_category_list))
 			{
-				foreach($normal_category_list as $category_srl => $category)
+				foreach ($normal_category_list as $category_srl => $category)
 				{
 					$is_granted = TRUE;
-					if($category->group_srls)
+					if ($category->group_srls)
 					{
-						$category_group_srls = explode(',',$category->group_srls);
+						$category_group_srls = explode(',', $category->group_srls);
 						$is_granted = FALSE;
-						if(count(array_intersect($group_srls, $category_group_srls))) $is_granted = TRUE;
+						if (count(array_intersect($group_srls, $category_group_srls))) $is_granted = TRUE;
 
 					}
-					if($is_granted) $category_list[$category_srl] = $category;
+					if ($is_granted) $category_list[$category_srl] = $category;
 				}
 			}
 			Context::set('category_list', $category_list);
@@ -686,46 +686,46 @@ 
 		$oDocument = $oDocumentModel->getDocument(0, $this->grant->manager);
 		$oDocument->setDocument($document_srl);
 
-		if($oDocument->get('module_srl') == $oDocument->get('member_srl')) $savedDoc = TRUE;
+		if ($oDocument->get('module_srl') == $oDocument->get('member_srl')) $savedDoc = TRUE;
 		$oDocument->add('module_srl', $this->module_srl);
 
-		if($oDocument->isExists() && $this->module_info->protect_content=="Y" && $oDocument->get('comment_count')>0 && $this->grant->manager==false)
+		if ($oDocument->isExists() && $this->module_info->protect_content == "Y" && $oDocument->get('comment_count') > 0 && $this->grant->manager == false)
 		{
 			return new Object(-1, 'msg_protect_content');
 		}
 
 		// if the document is not granted, then back to the password input form
 		$oModuleModel = getModel('module');
-		if($oDocument->isExists()&&!$oDocument->isGranted())
+		if ($oDocument->isExists() && !$oDocument->isGranted())
 		{
 			return $this->setTemplateFile('input_password_form');
 		}
 
-		if(!$oDocument->isExists())
+		if (!$oDocument->isExists())
 		{
-			$point_config = $oModuleModel->getModulePartConfig('point',$this->module_srl);
+			$point_config = $oModuleModel->getModulePartConfig('point', $this->module_srl);
 			$logged_info = Context::get('logged_info');
 			$oPointModel = getModel('point');
 			$pointForInsert = $point_config["insert_document"];
-			if($pointForInsert < 0)
+			if ($pointForInsert < 0)
 			{
-				if( !$logged_info )
+				if (!$logged_info)
 				{
 					return $this->dispBoardMessage('msg_not_permitted');
 				}
-				else if (($oPointModel->getPoint($logged_info->member_srl) + $pointForInsert )< 0 )
+				else if (($oPointModel->getPoint($logged_info->member_srl) + $pointForInsert) < 0)
 				{
 					return $this->dispBoardMessage('msg_not_enough_point');
 				}
 			}
 		}
-		if(!$oDocument->get('status')) $oDocument->add('status', $oDocumentModel->getDefaultStatus());
+		if (!$oDocument->get('status')) $oDocument->add('status', $oDocumentModel->getDefaultStatus());
 
 		$statusList = $this->_getStatusNameList($oDocumentModel);
-		if(count($statusList) > 0) Context::set('status_list', $statusList);
+		if (count($statusList) > 0) Context::set('status_list', $statusList);
 
 		// get Document status config value
-		Context::set('document_srl',$document_srl);
+		Context::set('document_srl', $document_srl);
 		Context::set('oDocument', $oDocument);
 
 		// apply xml_js_filter on header
@@ -733,13 +733,13 @@ 
 		$oDocumentController->addXmlJsFilter($this->module_info->module_srl);
 
 		// if the document exists, then setup extra variabels on context
-		if($oDocument->isExists() && !$savedDoc) Context::set('extra_keys', $oDocument->getExtraVars());
+		if ($oDocument->isExists() && !$savedDoc) Context::set('extra_keys', $oDocument->getExtraVars());
 
 		/**
 		 * add JS filters
 		 **/
-		if(Context::get('logged_info')->is_admin=='Y') Context::addJsFilter($this->module_path.'tpl/filter', 'insert_admin.xml');
-		else Context::addJsFilter($this->module_path.'tpl/filter', 'insert.xml');
+		if (Context::get('logged_info')->is_admin == 'Y') Context::addJsFilter($this->module_path . 'tpl/filter', 'insert_admin.xml');
+		else Context::addJsFilter($this->module_path . 'tpl/filter', 'insert.xml');
 
 		$oSecurity = new Security();
 		$oSecurity->encodeHTML('category_list.text', 'category_list.title');
@@ -750,14 +750,14 @@ 
 	function _getStatusNameList(&$oDocumentModel)
 	{
 		$resultList = array();
-		if(!empty($this->module_info->use_status))
+		if (!empty($this->module_info->use_status))
 		{
 			$statusNameList = $oDocumentModel->getStatusNameList();
 			$statusList = explode('|@|', $this->module_info->use_status);
 
-			if(is_array($statusList))
+			if (is_array($statusList))
 			{
-				foreach($statusList as $key => $value)
+				foreach ($statusList as $key => $value)
 				{
 					$resultList[$value] = $statusNameList[$value];
 				}
@@ -772,7 +772,7 @@ 
 	function dispBoardDelete()
 	{
 		// check grant
-		if(!$this->grant->write_document)
+		if (!$this->grant->write_document)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -781,35 +781,35 @@ 
 		$document_srl = Context::get('document_srl');
 
 		// if document exists, get the document information
-		if($document_srl)
+		if ($document_srl)
 		{
 			$oDocumentModel = getModel('document');
 			$oDocument = $oDocumentModel->getDocument($document_srl);
 		}
 
 		// if the document is not existed, then back to the board content page
-		if(!$oDocument->isExists())
+		if (!$oDocument->isExists())
 		{
 			return $this->dispBoardContent();
 		}
 
 		// if the document is not granted, then back to the password input form
-		if(!$oDocument->isGranted())
+		if (!$oDocument->isGranted())
 		{
 			return $this->setTemplateFile('input_password_form');
 		}
 
-		if($this->module_info->protect_content=="Y" && $oDocument->get('comment_count')>0 && $this->grant->manager==false)
+		if ($this->module_info->protect_content == "Y" && $oDocument->get('comment_count') > 0 && $this->grant->manager == false)
 		{
 			return $this->dispBoardMessage('msg_protect_content');
 		}
 
-		Context::set('oDocument',$oDocument);
+		Context::set('oDocument', $oDocument);
 
 		/**
 		 * add JS filters
 		 **/
-		Context::addJsFilter($this->module_path.'tpl/filter', 'delete_document.xml');
+		Context::addJsFilter($this->module_path . 'tpl/filter', 'delete_document.xml');
 
 		$this->setTemplateFile('delete_form');
 	}
@@ -822,7 +822,7 @@ 
 		$document_srl = Context::get('document_srl');
 
 		// check grant
-		if(!$this->grant->write_comment)
+		if (!$this->grant->write_comment)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -830,13 +830,13 @@ 
 		// get the document information
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists())
+		if (!$oDocument->isExists())
 		{
 			return $this->dispBoardMessage('msg_invalid_request');
 		}
 
 		// Check allow comment
-		if(!$oDocument->allowComment())
+		if (!$oDocument->allowComment())
 		{
 			return $this->dispBoardMessage('msg_not_allow_comment');
 		}
@@ -848,14 +848,14 @@ 
 		$oComment->add('module_srl', $this->module_srl);
 
 		// setup document variables on context
-		Context::set('oDocument',$oDocument);
-		Context::set('oSourceComment',$oSourceComment);
-		Context::set('oComment',$oComment);
+		Context::set('oDocument', $oDocument);
+		Context::set('oSourceComment', $oSourceComment);
+		Context::set('oComment', $oComment);
 
 		/**
 		 * add JS filter
 		 **/
-		Context::addJsFilter($this->module_path.'tpl/filter', 'insert_comment.xml');
+		Context::addJsFilter($this->module_path . 'tpl/filter', 'insert_comment.xml');
 
 		$this->setTemplateFile('comment_form');
 	}
@@ -866,7 +866,7 @@ 
 	function dispBoardReplyComment()
 	{
 		// check grant
-		if(!$this->grant->write_comment)
+		if (!$this->grant->write_comment)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -875,7 +875,7 @@ 
 		$parent_srl = Context::get('comment_srl');
 
 		// if the parent comment is not existed
-		if(!$parent_srl)
+		if (!$parent_srl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -885,11 +885,11 @@ 
 		$oSourceComment = $oCommentModel->getComment($parent_srl, $this->grant->manager);
 
 		// if the comment is not existed, opoup an error message
-		if(!$oSourceComment->isExists())
+		if (!$oSourceComment->isExists())
 		{
 			return $this->dispBoardMessage('msg_invalid_request');
 		}
-		if(Context::get('document_srl') && $oSourceComment->get('document_srl') != Context::get('document_srl'))
+		if (Context::get('document_srl') && $oSourceComment->get('document_srl') != Context::get('document_srl'))
 		{
 			return $this->dispBoardMessage('msg_invalid_request');
 		}
@@ -897,7 +897,7 @@ 
 		// Check allow comment
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($oSourceComment->get('document_srl'));
-		if(!$oDocument->allowComment())
+		if (!$oDocument->allowComment())
 		{
 			return $this->dispBoardMessage('msg_not_allow_comment');
 		}
@@ -908,14 +908,14 @@ 
 		$oComment->add('document_srl', $oSourceComment->get('document_srl'));
 
 		// setup comment variables
-		Context::set('oSourceComment',$oSourceComment);
-		Context::set('oComment',$oComment);
-		Context::set('module_srl',$this->module_info->module_srl);
+		Context::set('oSourceComment', $oSourceComment);
+		Context::set('oComment', $oComment);
+		Context::set('module_srl', $this->module_info->module_srl);
 
 		/**
 		 * add JS filters
 		 **/
-		Context::addJsFilter($this->module_path.'tpl/filter', 'insert_comment.xml');
+		Context::addJsFilter($this->module_path . 'tpl/filter', 'insert_comment.xml');
 
 		$this->setTemplateFile('comment_form');
 	}
@@ -926,7 +926,7 @@ 
 	function dispBoardModifyComment()
 	{
 		// check grant
-		if(!$this->grant->write_comment)
+		if (!$this->grant->write_comment)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -936,7 +936,7 @@ 
 		$comment_srl = Context::get('comment_srl');
 
 		// if the comment is not existed
-		if(!$comment_srl)
+		if (!$comment_srl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -946,13 +946,13 @@ 
 		$oComment = $oCommentModel->getComment($comment_srl, $this->grant->manager);
 
 		// if the comment is not exited, alert an error message
-		if(!$oComment->isExists())
+		if (!$oComment->isExists())
 		{
 			return $this->dispBoardMessage('msg_invalid_request');
 		}
 
 		// if the comment is not granted, then back to the password input form
-		if(!$oComment->isGranted())
+		if (!$oComment->isGranted())
 		{
 			return $this->setTemplateFile('input_password_form');
 		}
@@ -964,7 +964,7 @@ 
 		/**
 		 * add JS fitlers
 		 **/
-		Context::addJsFilter($this->module_path.'tpl/filter', 'insert_comment.xml');
+		Context::addJsFilter($this->module_path . 'tpl/filter', 'insert_comment.xml');
 
 		$this->setTemplateFile('comment_form');
 	}
@@ -975,7 +975,7 @@ 
 	function dispBoardDeleteComment()
 	{
 		// check grant
-		if(!$this->grant->write_comment)
+		if (!$this->grant->write_comment)
 		{
 			return $this->dispBoardMessage('msg_not_permitted');
 		}
@@ -984,30 +984,30 @@ 
 		$comment_srl = Context::get('comment_srl');
 
 		// if the comment exists, then get the comment information
-		if($comment_srl)
+		if ($comment_srl)
 		{
 			$oCommentModel = getModel('comment');
 			$oComment = $oCommentModel->getComment($comment_srl, $this->grant->manager);
 		}
 
 		// if the comment is not existed, then back to the board content page
-		if(!$oComment->isExists() )
+		if (!$oComment->isExists())
 		{
 			return $this->dispBoardContent();
 		}
 
 		// if the comment is not granted, then back to the password input form
-		if(!$oComment->isGranted())
+		if (!$oComment->isGranted())
 		{
 			return $this->setTemplateFile('input_password_form');
 		}
 
-		Context::set('oComment',$oComment);
+		Context::set('oComment', $oComment);
 
 		/**
 		 * add JS filters
 		 **/
-		Context::addJsFilter($this->module_path.'tpl/filter', 'delete_comment.xml');
+		Context::addJsFilter($this->module_path . 'tpl/filter', 'delete_comment.xml');
 
 		$this->setTemplateFile('delete_comment_form');
 	}
@@ -1019,7 +1019,7 @@ 
 	{
 		$oTrackbackModel = getModel('trackback');
 
-		if(!$oTrackbackModel)
+		if (!$oTrackbackModel)
 		{
 			return;
 		}
@@ -1033,7 +1033,7 @@ 
 		$trackback = $output->data;
 
 		// if no trackback, then display the board content
-		if(!$trackback)
+		if (!$trackback)
 		{
 			return $this->dispBoardContent();
 		}
@@ -1043,7 +1043,7 @@ 
 		/**
 		 * add JS filters
 		 **/
-		Context::addJsFilter($this->module_path.'tpl/filter', 'delete_trackback.xml');
+		Context::addJsFilter($this->module_path . 'tpl/filter', 'delete_trackback.xml');
 
 		$this->setTemplateFile('delete_trackback_form');
 	}
@@ -1054,7 +1054,7 @@ 
 	function dispBoardMessage($msg_code)
 	{
 		$msg = Context::getLang($msg_code);
-		if(!$msg) $msg = $msg_code;
+		if (!$msg) $msg = $msg_code;
 		Context::set('message', $msg);
 		$this->setTemplateFile('message');
 	}
@@ -1065,8 +1065,8 @@ 
 	 **/
 	function alertMessage($message)
 	{
-		$script =  sprintf('<script> jQuery(function(){ alert("%s"); } );</script>', Context::getLang($message));
-		Context::addHtmlFooter( $script );
+		$script = sprintf('<script> jQuery(function(){ alert("%s"); } );</script>', Context::getLang($message));
+		Context::addHtmlFooter($script);
 	}
 
 }

Braces +62 added lines, -38 removed lines

@@ -53,18 +53,15 @@ 
 			if($this->module_info->hide_category)
 			{
 				$this->module_info->use_category = ($this->module_info->hide_category == 'Y') ? 'N' : 'Y';
-			}
-			else if($this->module_info->use_category)
+			} else if($this->module_info->use_category)
 			{
 				$this->module_info->hide_category = ($this->module_info->use_category == 'Y') ? 'N' : 'Y';
-			}
-			else
+			} else
 			{
 				$this->module_info->hide_category = 'N';
 				$this->module_info->use_category = 'Y';
 			}
-		}
-		else
+		} else
 		{
 			$this->module_info->hide_category = 'Y';
 			$this->module_info->use_category = 'N';
@@ -84,8 +81,7 @@ 
 				$this->grant->write_comment = FALSE;
 				$this->grant->view = FALSE;
 			}
-		}
-		else
+		} else
 		{
 			$this->consultation = FALSE;
 		}
@@ -160,13 +156,17 @@ 
 		 * add extra vaiables to the search options
 		 **/
 		// use search options on the template (the search options key has been declared, based on the language selected)
-		foreach($this->search_option as $opt) $search_option[$opt] = Context::getLang($opt);
+		foreach($this->search_option as $opt) {
+			$search_option[$opt] = Context::getLang($opt);
+		}
 		$extra_keys = Context::get('extra_keys');
 		if($extra_keys)
 		{
 			foreach($extra_keys as $key => $val)
 			{
-				if($val->search == 'Y') $search_option['extra_vars'.$val->idx] = $val->name;
+				if($val->search == 'Y') {
+					$search_option['extra_vars'.$val->idx] = $val->name;
+				}
 			}
 		}
 		// remove a search option that is not public in member config
@@ -175,8 +175,9 @@ 
 		{
 			if(in_array($signupFormElement->title, $search_option))
 			{
-				if($signupFormElement->isPublic == 'N')
-					unset($search_option[$signupFormElement->name]);
+				if($signupFormElement->isPublic == 'N') {
+									unset($search_option[$signupFormElement->name]);
+				}
 			}
 		}
 		Context::set('search_option', $search_option);
@@ -194,7 +195,9 @@ 
 		// list config, columnList setting
 		$oBoardModel = getModel('board');
 		$this->listConfig = $oBoardModel->getListConfig($this->module_info->module_srl);
-		if(!$this->listConfig) $this->listConfig = array();
+		if(!$this->listConfig) {
+			$this->listConfig = array();
+		}
 		$this->_makeListColumnList();
 
 		// display the notice list
@@ -265,7 +268,9 @@ 
 				}
 
 				// check the manage grant
-				if($this->grant->manager) $oDocument->setGrant();
+				if($this->grant->manager) {
+					$oDocument->setGrant();
+				}
 
 				// if the consultation function is enabled, and the document is not a notice
 				if($this->consultation && !$oDocument->isNotice())
@@ -286,8 +291,7 @@ 
 					}
 				}
 
-			}
-			else
+			} else
 			{
 				// if the document is not existed, then alert a warning message
 				Context::set('document_srl','',true);
@@ -297,8 +301,7 @@ 
 		/**
 		 * if the document is not existed, get an empty document
 		 **/
-		}
-		else
+		} else
 		{
 			$oDocument = $oDocumentModel->getDocument(0);
 		}
@@ -313,8 +316,7 @@ 
 				$oDocument = $oDocumentModel->getDocument(0);
 				Context::set('document_srl','',true);
 				$this->alertMessage('msg_not_permitted');
-			}
-			else
+			} else
 			{
 				// add the document title to the browser
 				Context::addBrowserTitle($oDocument->getTitleText());
@@ -368,13 +370,16 @@ 
 		$downloadGrantCount = 0;
 		if(is_array($file_module_config->download_grant))
 		{
-			foreach($file_module_config->download_grant AS $value)
-				if($value) $downloadGrantCount++;
+			foreach($file_module_config->download_grant AS $value) {
+							if($value) $downloadGrantCount++;
+			}
 		}
 
 		if(is_array($file_module_config->download_grant) && $downloadGrantCount>0)
 		{
-			if(!Context::get('is_logged')) return $this->stop('msg_not_permitted_download');
+			if(!Context::get('is_logged')) {
+				return $this->stop('msg_not_permitted_download');
+			}
 			$logged_info = Context::get('logged_info');
 			if($logged_info->is_admin != 'Y')
 			{
@@ -397,7 +402,9 @@ 
 							break;
 						}
 					}
-					if(!$is_permitted) return $this->stop('msg_not_permitted_download');
+					if(!$is_permitted) {
+						return $this->stop('msg_not_permitted_download');
+					}
 				}
 			}
 		}
@@ -560,7 +567,9 @@ 
 				'allow_trackback', 'notify_message', 'status', 'comment_status');
 		$this->columnList = array_intersect($configColumList, $tableColumnList);
 
-		if(in_array('summary', $configColumList)) array_push($this->columnList, 'content');
+		if(in_array('summary', $configColumList)) {
+			array_push($this->columnList, 'content');
+		}
 
 		// default column list add
 		$defaultColumn = array('document_srl', 'module_srl', 'category_srl', 'lang_code', 'member_srl', 'last_update', 'comment_count', 'trackback_count', 'uploaded_count', 'status', 'regdate', 'title_bold', 'title_color');
@@ -654,8 +663,7 @@ 
 			{
 				$logged_info = Context::get('logged_info');
 				$group_srls = array_keys($logged_info->group_list);
-			}
-			else
+			} else
 			{
 				$group_srls = array();
 			}
@@ -672,10 +680,14 @@ 
 					{
 						$category_group_srls = explode(',',$category->group_srls);
 						$is_granted = FALSE;
-						if(count(array_intersect($group_srls, $category_group_srls))) $is_granted = TRUE;
+						if(count(array_intersect($group_srls, $category_group_srls))) {
+							$is_granted = TRUE;
+						}
 
 					}
-					if($is_granted) $category_list[$category_srl] = $category;
+					if($is_granted) {
+						$category_list[$category_srl] = $category;
+					}
 				}
 			}
 			Context::set('category_list', $category_list);
@@ -686,7 +698,9 @@ 
 		$oDocument = $oDocumentModel->getDocument(0, $this->grant->manager);
 		$oDocument->setDocument($document_srl);
 
-		if($oDocument->get('module_srl') == $oDocument->get('member_srl')) $savedDoc = TRUE;
+		if($oDocument->get('module_srl') == $oDocument->get('member_srl')) {
+			$savedDoc = TRUE;
+		}
 		$oDocument->add('module_srl', $this->module_srl);
 
 		if($oDocument->isExists() && $this->module_info->protect_content=="Y" && $oDocument->get('comment_count')>0 && $this->grant->manager==false)
@@ -712,17 +726,20 @@ 
 				if( !$logged_info )
 				{
 					return $this->dispBoardMessage('msg_not_permitted');
-				}
-				else if (($oPointModel->getPoint($logged_info->member_srl) + $pointForInsert )< 0 )
+				} else if (($oPointModel->getPoint($logged_info->member_srl) + $pointForInsert )< 0 )
 				{
 					return $this->dispBoardMessage('msg_not_enough_point');
 				}
 			}
 		}
-		if(!$oDocument->get('status')) $oDocument->add('status', $oDocumentModel->getDefaultStatus());
+		if(!$oDocument->get('status')) {
+			$oDocument->add('status', $oDocumentModel->getDefaultStatus());
+		}
 
 		$statusList = $this->_getStatusNameList($oDocumentModel);
-		if(count($statusList) > 0) Context::set('status_list', $statusList);
+		if(count($statusList) > 0) {
+			Context::set('status_list', $statusList);
+		}
 
 		// get Document status config value
 		Context::set('document_srl',$document_srl);
@@ -733,13 +750,18 @@ 
 		$oDocumentController->addXmlJsFilter($this->module_info->module_srl);
 
 		// if the document exists, then setup extra variabels on context
-		if($oDocument->isExists() && !$savedDoc) Context::set('extra_keys', $oDocument->getExtraVars());
+		if($oDocument->isExists() && !$savedDoc) {
+			Context::set('extra_keys', $oDocument->getExtraVars());
+		}
 
 		/**
 		 * add JS filters
 		 **/
-		if(Context::get('logged_info')->is_admin=='Y') Context::addJsFilter($this->module_path.'tpl/filter', 'insert_admin.xml');
-		else Context::addJsFilter($this->module_path.'tpl/filter', 'insert.xml');
+		if(Context::get('logged_info')->is_admin=='Y') {
+			Context::addJsFilter($this->module_path.'tpl/filter', 'insert_admin.xml');
+		} else {
+			Context::addJsFilter($this->module_path.'tpl/filter', 'insert.xml');
+		}
 
 		$oSecurity = new Security();
 		$oSecurity->encodeHTML('category_list.text', 'category_list.title');
@@ -1054,7 +1076,9 @@ 
 	function dispBoardMessage($msg_code)
 	{
 		$msg = Context::getLang($msg_code);
-		if(!$msg) $msg = $msg_code;
+		if(!$msg) {
+			$msg = $msg_code;
+		}
 		Context::set('message', $msg);
 		$this->setTemplateFile('message');
 	}