xpressengine / xe-core

addons/captcha_member/captcha_member.addon.php

Doc Comments +3 added lines

@@ -286,6 +286,9 @@
 			exit();
 		}
 
+		/**
+		 * @param string $string
+		 */
 		function createCaptchaAudio($string)
 		{
 			$data = '';

Spacing +36 added lines, -36 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined("__XE__")) exit();
+if (!defined("__XE__")) exit();
 
 /**
  * @file captcha.addon.php
@@ -9,10 +9,10 @@ 
  * @brief Captcha for a particular action
  * English alphabets and voice verification added
  * */
-if(!class_exists('AddonMemberCaptcha', false))
+if (!class_exists('AddonMemberCaptcha', false))
 {
 	// On the mobile mode, XE Core does not load jquery and xe.js as normal.
-	if(Mobile::isFromMobilePhone())
+	if (Mobile::isFromMobilePhone())
 	{
 		Context::loadFile(array('./common/js/jquery.min.js', 'head', NULL, -100000), true);
 		Context::loadFile(array('./common/js/xe.min.js', 'head', NULL, -100000), true);
@@ -39,7 +39,7 @@ 
 		function before_module_init(&$ModuleHandler)
 		{
 			$logged_info = Context::get('logged_info');
-			if($logged_info->is_admin == 'Y' || $logged_info->is_site_admin)
+			if ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin)
 			{
 				return false;
 			}
@@ -47,11 +47,11 @@ 
 			// {
 			// 	return false;
 			// }
-			if($_SESSION['XE_VALIDATOR_ERROR'] == -1)
+			if ($_SESSION['XE_VALIDATOR_ERROR'] == -1)
 			{
 				$_SESSION['member_captcha_authed'] = false;
 			}
-			if($_SESSION['member_captcha_authed'])
+			if ($_SESSION['member_captcha_authed'])
 			{
 				return false;
 			}
@@ -59,24 +59,24 @@ 
 			$type = Context::get('captchaType');
 
 			$this->target_acts = array();
-			if($this->addon_info->apply_find_account == 'apply')
+			if ($this->addon_info->apply_find_account == 'apply')
 			{
 				$this->target_acts[] = 'procMemberFindAccount';
 			}
-			if($this->addon_info->apply_resend_auth_mail == 'apply')
+			if ($this->addon_info->apply_resend_auth_mail == 'apply')
 			{
 				$this->target_acts[] = 'procMemberResendAuthMail';
 			}
-			if($this->addon_info->apply_signup == 'apply')
+			if ($this->addon_info->apply_signup == 'apply')
 			{
 				$this->target_acts[] = 'procMemberInsert';
 			}
 
-			if(Context::getRequestMethod() != 'XMLRPC' && Context::getRequestMethod() !== 'JSON')
+			if (Context::getRequestMethod() != 'XMLRPC' && Context::getRequestMethod() !== 'JSON')
 			{
-				if($type == 'inline')
+				if ($type == 'inline')
 				{
-					if(!$this->compareCaptcha())
+					if (!$this->compareCaptcha())
 					{
 						Context::loadLang(_XE_PATH_ . 'addons/captcha_member/lang');
 						$_SESSION['XE_VALIDATOR_ERROR'] = -1;
@@ -97,7 +97,7 @@ 
 			}
 
 			// compare session when calling actions such as writing a post or a comment on the board/issue tracker module
-			if(!$_SESSION['member_captcha_authed'] && in_array(Context::get('act'), $this->target_acts))
+			if (!$_SESSION['member_captcha_authed'] && in_array(Context::get('act'), $this->target_acts))
 			{
 				Context::loadLang(_XE_PATH_ . 'addons/captcha_member/lang');
 				$ModuleHandler->error = "captcha_denied";
@@ -109,7 +109,7 @@ 
 		function createKeyword()
 		{
 			$type = Context::get('captchaType');
-			if($type == 'inline' && $_SESSION['captcha_keyword'])
+			if ($type == 'inline' && $_SESSION['captcha_keyword'])
 			{
 				return;
 			}
@@ -122,7 +122,7 @@ 
 
 		function before_module_init_setCaptchaSession()
 		{
-			if($_SESSION['member_captcha_authed'])
+			if ($_SESSION['member_captcha_authed'])
 			{
 				return false;
 			}
@@ -151,11 +151,11 @@ 
 
 		function before_module_init_captchaImage()
 		{
-			if($_SESSION['member_captcha_authed'])
+			if ($_SESSION['member_captcha_authed'])
 			{
 				return false;
 			}
-			if(Context::get('renew'))
+			if (Context::get('renew'))
 			{
 				$this->createKeyword();
 			}
@@ -177,7 +177,7 @@ 
 		function createCaptchaImage($string)
 		{
 			$arr = array();
-			for($i = 0, $c = strlen($string); $i < $c; $i++)
+			for ($i = 0, $c = strlen($string); $i < $c; $i++)
 			{
 				$arr[] = $string{$i};
 			}
@@ -199,7 +199,7 @@ 
 			shuffle($deg);
 
 			// Create an image for each letter
-			foreach($arr as $i => $str)
+			foreach ($arr as $i => $str)
 			{
 				$im[$i + 1] = @imagecreate($w, $h);
 				$background_color = imagecolorallocate($im[$i + 1], 255, 255, 255);
@@ -209,7 +209,7 @@ 
 				$ran = range(1, 20);
 				shuffle($ran);
 
-				if(function_exists('imagerotate'))
+				if (function_exists('imagerotate'))
 				{
 					imagestring($im[$i + 1], (array_pop($ran) % 3) + 3, 2, (array_pop($ran) % 8), $str, $text_color);
 					$im[$i + 1] = imagerotate($im[$i + 1], array_pop($deg), 0);
@@ -224,7 +224,7 @@ 
 			}
 
 			// Combine images of each character
-			for($i = 1; $i < count($im); $i++)
+			for ($i = 1; $i < count($im); $i++)
 			{
 				imagecopy($im[0], $im[$i], (($w + 2) * ($i - 1)), 0, 0, 0, $w, $h);
 				imagedestroy($im[$i]);
@@ -236,7 +236,7 @@ 
 			imagecopyresized($big, $im[0], 0, 0, 0, 0, ($w + 2) * $big_count * $c, $h * $big_count, ($w + 2) * $c, $h);
 			imagedestroy($im[0]);
 
-			if(function_exists('imageantialias'))
+			if (function_exists('imageantialias'))
 			{
 				imageantialias($big, true);
 			}
@@ -248,7 +248,7 @@ 
 			$h = $h * $big_count;
 			$d = array_pop($deg);
 
-			for($i = -abs($d); $i < $h + abs($d); $i = $i + 7)
+			for ($i = -abs($d); $i < $h + abs($d); $i = $i + 7)
 			{
 				imageline($big, 0, $i + $d, $w, $i, $line_color);
 			}
@@ -256,7 +256,7 @@ 
 			$x = range(0, ($w - 10));
 			shuffle($x);
 
-			for($i = 0; $i < 200; $i++)
+			for ($i = 0; $i < 200; $i++)
 			{
 				imagesetpixel($big, $x[$i] % $w, $x[$i + 1] % $h, $line_color);
 			}
@@ -266,7 +266,7 @@ 
 
 		function before_module_init_captchaAudio()
 		{
-			if($_SESSION['member_captcha_authed'])
+			if ($_SESSION['member_captcha_authed'])
 			{
 				return false;
 			}
@@ -290,17 +290,17 @@ 
 		{
 			$data = '';
 			$_audio = './addons/captcha_member/audio/F_%s.mp3';
-			for($i = 0, $c = strlen($string); $i < $c; $i++)
+			for ($i = 0, $c = strlen($string); $i < $c; $i++)
 			{
 				$_data = FileHandler::readFile(sprintf($_audio, $string{$i}));
 
 				$start = rand(5, 68); // Random start in 4-byte header and 64 byte data
 				$datalen = strlen($_data) - $start - 256; // Last unchanged 256 bytes
 
-				for($j = $start; $j < $datalen; $j+=64)
+				for ($j = $start; $j < $datalen; $j += 64)
 				{
 					$ch = ord($_data{$j});
-					if($ch < 9 || $ch > 119)
+					if ($ch < 9 || $ch > 119)
 					{
 						continue;
 					}
@@ -315,14 +315,14 @@ 
 
 		function compareCaptcha()
 		{
-			if(!in_array(Context::get('act'), $this->target_acts)) return true;
+			if (!in_array(Context::get('act'), $this->target_acts)) return true;
 
-			if($_SESSION['member_captcha_authed'])
+			if ($_SESSION['member_captcha_authed'])
 			{
 				return true;
 			}
 
-			if(strtoupper($_SESSION['captcha_keyword']) == strtoupper(Context::get('secret_text')))
+			if (strtoupper($_SESSION['captcha_keyword']) == strtoupper(Context::get('secret_text')))
 			{
 				$_SESSION['member_captcha_authed'] = true;
 				return true;
@@ -335,7 +335,7 @@ 
 
 		function before_module_init_captchaCompare()
 		{
-			if(!$this->compareCaptcha())
+			if (!$this->compareCaptcha())
 			{
 				return false;
 			}
@@ -395,18 +395,18 @@ 
 
 $oAddonMemberCaptcha = &$GLOBALS['__AddonMemberCaptcha__'];
 
-if(method_exists($oAddonMemberCaptcha, $called_position))
+if (method_exists($oAddonMemberCaptcha, $called_position))
 {
-	if(!call_user_func_array(array(&$oAddonMemberCaptcha, $called_position), array(&$this)))
+	if (!call_user_func_array(array(&$oAddonMemberCaptcha, $called_position), array(&$this)))
 	{
 		return false;
 	}
 }
 
 $addon_act = Context::get('captcha_action');
-if($addon_act && method_exists($oAddonMemberCaptcha, $called_position . '_' . $addon_act))
+if ($addon_act && method_exists($oAddonMemberCaptcha, $called_position . '_' . $addon_act))
 {
-	if(!call_user_func_array(array(&$oAddonMemberCaptcha, $called_position . '_' . $addon_act), array(&$this)))
+	if (!call_user_func_array(array(&$oAddonMemberCaptcha, $called_position . '_' . $addon_act), array(&$this)))
 	{
 		return false;
 	}

Braces +8 added lines, -6 removed lines

@@ -1,7 +1,9 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined("__XE__")) exit();
+if(!defined("__XE__")) {
+	exit();
+}
 
 /**
  * @file captcha.addon.php
@@ -85,8 +87,7 @@ 
 						$_SESSION['XE_VALIDATOR_RETURN_URL'] = Context::get('error_return_url');
 						$ModuleHandler->_setInputValueToSession();
 					}
-				}
-				else
+				} else
 				{
 					Context::addHtmlHeader('<script>
 						if(!captchaTargetAct) {var captchaTargetAct = [];}
@@ -216,8 +217,7 @@ 
 
 					$background_color = imagecolorallocate($im[$i + 1], 255, 255, 255);
 					imagecolortransparent($im[$i + 1], $background_color);
-				}
-				else
+				} else
 				{
 					imagestring($im[$i + 1], (array_pop($ran) % 3) + 3, 2, (array_pop($ran) % 4), $str, $text_color);
 				}
@@ -315,7 +315,9 @@ 
 
 		function compareCaptcha()
 		{
-			if(!in_array(Context::get('act'), $this->target_acts)) return true;
+			if(!in_array(Context::get('act'), $this->target_acts)) {
+				return true;
+			}
 
 			if($_SESSION['member_captcha_authed'])
 			{

addons/mobile/classes/mobile.class.php

Doc Comments +13 added lines

@@ -279,6 +279,7 @@ 
 
 	/**
 	 * @brief Specify title
+	 * @param string $title
 	 */
 	function setTitle($title)
 	{
@@ -298,6 +299,7 @@ 
 	/**
 	 * @brief Content Cleanup
 	 * In HTML content, the ability to extract text and links
+	 * @param string $content
 	 */
 	function setContent($content)
 	{
@@ -371,6 +373,9 @@ 
 
 	/**
 	 * @brief cutting the number of byte functions
+	 * @param string $string
+	 * @param integer $cut_size
+	 * @return string
 	 */
 	function cutStr($string, $cut_size)
 	{
@@ -387,6 +392,8 @@ 
 
 	/**
 	 * @brief Specifies the home url
+	 * @param string $url
+	 * @param string $text
 	 */
 	function setHomeUrl($url, $text)
 	{
@@ -397,6 +404,8 @@ 
 
 	/**
 	 * @brief Specify upper url
+	 * @param string $url
+	 * @param string $text
 	 */
 	function setUpperUrl($url, $text)
 	{
@@ -407,6 +416,8 @@ 
 
 	/**
 	 * @brief Specify prev url
+	 * @param string $url
+	 * @param string $text
 	 */
 	function setPrevUrl($url, $text)
 	{
@@ -417,6 +428,8 @@ 
 
 	/**
 	 * @brief Specify next url
+	 * @param string $url
+	 * @param string $text
 	 */
 	function setNextUrl($url, $text)
 	{

Spacing +107 added lines, -107 removed lines

@@ -45,28 +45,28 @@ 
 	{
 		static $instance = null;
 
-		if(!$instance)
+		if (!$instance)
 		{
 
 			$browserType = mobileXE::getBrowserType();
-			if(!$browserType) return;
+			if (!$browserType) return;
 
 			$class_file = sprintf('%saddons/mobile/classes/%s.class.php', _XE_PATH_, $browserType);
 			require_once($class_file);
 			// Download mobile language settings (cookies, not willing to come up when you click create cache file ...- is initialized ..)
-			$this->lang = FileHandler::readFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
-			if($this->lang)
+			$this->lang = FileHandler::readFile('./files/cache/addons/mobile/setLangType/personal_settings/' . md5(trim($_SERVER['HTTP_USER_AGENT']) . trim($_SERVER['HTTP_PHONE_NUMBER']) . trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])) . '.php');
+			if ($this->lang)
 			{
 				$lang_supported = Context::get('lang_supported');
-				$this->lang = str_replace(array('<?php /**','**/ ?>'),array('',''),$this->lang);
-				if(isset($lang_supported[$this->lang])) Context::setLangType($this->lang);
+				$this->lang = str_replace(array('<?php /**', '**/ ?>'), array('', ''), $this->lang);
+				if (isset($lang_supported[$this->lang])) Context::setLangType($this->lang);
 			}
-			Context::loadLang(_XE_PATH_.'addons/mobile/lang');
+			Context::loadLang(_XE_PATH_ . 'addons/mobile/lang');
 
 			$instance = new wap();
 
-			$mobilePage = (int)Context::get('mpage');
-			if(!$mobilePage) $mobilePage = 1;
+			$mobilePage = (int) Context::get('mpage');
+			if (!$mobilePage) $mobilePage = 1;
 
 			$instance->setMobilePage($mobilePage);
 		}
@@ -79,13 +79,13 @@ 
 	function mobileXE()
 	{
 		// Check navigation mode
-		if(Context::get('nm'))
+		if (Context::get('nm'))
 		{
 			$this->navigationMode = 1;
-			$this->cmid = (int)Context::get('cmid');
+			$this->cmid = (int) Context::get('cmid');
 		}
 
-		if(Context::get('lcm'))
+		if (Context::get('lcm'))
 		{
 			$this->languageMode = 1;
 			$this->lang = Context::get('sel_lang');
@@ -98,7 +98,7 @@ 
 	 */
 	function isNavigationMode()
 	{
-		return ($this->navigationMode && $this->module_info->menu_srl)?true:false;
+		return ($this->navigationMode && $this->module_info->menu_srl) ? true : false;
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 */
 	function isLangChange()
 	{
-		if($this->languageMode) return true;
+		if ($this->languageMode) return true;
 		else return false;
 	}
 
@@ -119,12 +119,12 @@ 
 	{
 		$lang_supported = Context::get('lang_supported');
 		// Make sure that the language variables and parameters are valid
-		if($this->lang && isset($lang_supported[$this->lang]))
+		if ($this->lang && isset($lang_supported[$this->lang]))
 		{
-			$langbuff = FileHandler::readFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
-			if($langbuff) FileHandler::removeFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
-			$langbuff = '<?php /**'.$this->lang.'**/ ?>';
-			FileHandler::writeFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php',$langbuff);
+			$langbuff = FileHandler::readFile('./files/cache/addons/mobile/setLangType/personal_settings/' . md5(trim($_SERVER['HTTP_USER_AGENT']) . trim($_SERVER['HTTP_PHONE_NUMBER']) . trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])) . '.php');
+			if ($langbuff) FileHandler::removeFile('./files/cache/addons/mobile/setLangType/personal_settings/' . md5(trim($_SERVER['HTTP_USER_AGENT']) . trim($_SERVER['HTTP_PHONE_NUMBER']) . trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])) . '.php');
+			$langbuff = '<?php /**' . $this->lang . '**/ ?>';
+			FileHandler::writeFile('./files/cache/addons/mobile/setLangType/personal_settings/' . md5(trim($_SERVER['HTTP_USER_AGENT']) . trim($_SERVER['HTTP_PHONE_NUMBER']) . trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])) . '.php', $langbuff);
 		}
 	}
 
@@ -133,7 +133,7 @@ 
 	 */
 	function setModuleInfo(&$module_info)
 	{
-		if($this->module_info) return; 
+		if ($this->module_info) return; 
 		$this->module_info = $module_info;
 	}
 
@@ -142,12 +142,12 @@ 
 	 */
 	function setModuleInstance(&$oModule)
 	{
-		if($this->oModule) return;
+		if ($this->oModule) return;
 		// Save instance
 		$this->oModule = $oModule;
 		// Of the current module if there is a menu by menu
-		$menu_cache_file = sprintf(_XE_PATH_.'files/cache/menu/%d.php', $this->module_info->menu_srl);
-		if(!file_exists($menu_cache_file)) return;
+		$menu_cache_file = sprintf(_XE_PATH_ . 'files/cache/menu/%d.php', $this->module_info->menu_srl);
+		if (!file_exists($menu_cache_file)) return;
 
 		include $menu_cache_file;
 		// One-dimensional arrangement of menu changes
@@ -162,18 +162,18 @@ 
 		$this->index_mid = $k[0];
 		// The depth of the current menu, the top button to specify if one or more
 		$cur_menu_item = $listed_items[$node_list[$this->module_info->mid]];
-		if($cur_menu_item['parent_srl'])
+		if ($cur_menu_item['parent_srl'])
 		{
 			$parent_srl = $cur_menu_item['parent_srl'];
-			if($parent_srl && $listed_items[$parent_srl])
+			if ($parent_srl && $listed_items[$parent_srl])
 			{
 				$parent_item = $listed_items[$parent_srl];
-				if($parent_item) $this->setUpperUrl(getUrl('','mid',$parent_item['mid']), Context::getLang('cmd_go_upper'));
+				if ($parent_item) $this->setUpperUrl(getUrl('', 'mid', $parent_item['mid']), Context::getLang('cmd_go_upper'));
 			}
 		}
 		elseif (!$this->isNavigationMode())
 		{
-			$this->setUpperUrl(getUrl('','mid',$this->index_mid,'nm','1','cmid',0), Context::getLang('cmd_view_sitemap'));
+			$this->setUpperUrl(getUrl('', 'mid', $this->index_mid, 'nm', '1', 'cmid', 0), Context::getLang('cmd_view_sitemap'));
 		}
 	}
 
@@ -183,19 +183,19 @@ 
 	 */
 	function getBrowserType()
 	{
-		if(Context::get('smartphone')) return null;
+		if (Context::get('smartphone')) return null;
 		// Determine the type of browser
 		$browserAccept = $_SERVER['HTTP_ACCEPT'];
 		$userAgent = $_SERVER['HTTP_USER_AGENT'];
 		$wap_sid = $_SERVER['HTTP_X_UP_SUBNO'];
 
-		if(stripos($userAgent, "SKT11") !== FALSE || stripos($browserAccept, "skt") !== FALSE)
+		if (stripos($userAgent, "SKT11") !== FALSE || stripos($browserAccept, "skt") !== FALSE)
 		{
-			Context::set('mobile_skt',1);
+			Context::set('mobile_skt', 1);
 			return "wml";
 		}
-		elseif(stripos($browserAccept, "hdml") !== FALSE) return "hdml";
-		elseif(stripos($userAgent, "cellphone") !== FALSE) return  "mhtml";
+		elseif (stripos($browserAccept, "hdml") !== FALSE) return "hdml";
+		elseif (stripos($userAgent, "cellphone") !== FALSE) return  "mhtml";
 		return null;
 	}
 
@@ -204,9 +204,9 @@ 
 	 */
 	function setCharSet($charset = 'UTF-8')
 	{
-		if(!$charset) $charset = 'UTF-8';
+		if (!$charset) $charset = 'UTF-8';
 		// SKT supports the euc-kr
-		if(Context::get('mobile_skt')==1) $charset = 'euc-kr';
+		if (Context::get('mobile_skt') == 1) $charset = 'euc-kr';
 
 		$this->charset = $charset;
 	}
@@ -214,9 +214,9 @@ 
 	/**
 	 * @brief Limited capacity of mobile devices, specifying a different virtual page
 	 */
-	function setMobilePage($page=1)
+	function setMobilePage($page = 1)
 	{
-		if(!$page) $page = 1;
+		if (!$page) $page = 1;
 		$this->mobilePage = $page;
 	}
 
@@ -227,34 +227,34 @@ 
 	{
 		// If more than nine the number of menu paging processing itself
 		$menu_count = count($childs);
-		if($menu_count>9)
+		if ($menu_count > 9)
 		{
-			$startNum = ($this->mobilePage-1)*9;
+			$startNum = ($this->mobilePage - 1) * 9;
 			$idx = 0;
 			$new_childs = array();
-			foreach($childs as $k => $v)
+			foreach ($childs as $k => $v)
 			{
-				if($idx >= $startNum && $idx < $startNum+9)
+				if ($idx >= $startNum && $idx < $startNum + 9)
 				{
 					$new_childs[$k] = $v;
 				}
-				$idx ++;
+				$idx++;
 			}
 			$childs = $new_childs;
 
-			$this->totalPage = (int)(($menu_count-1)/9)+1;
+			$this->totalPage = (int) (($menu_count - 1) / 9) + 1;
 			// next/prevUrl specify
-			if($this->mobilePage>1)
+			if ($this->mobilePage > 1)
 			{
-				$url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage-1);
-				$text = sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $this->mobilePage-1, $this->totalPage);
+				$url = getUrl('mid', $_GET['mid'], 'mpage', $this->mobilePage - 1);
+				$text = sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $this->mobilePage - 1, $this->totalPage);
 				$this->setPrevUrl($url, $text);
 			}
 
-			if($this->mobilePage<$this->totalPage)
+			if ($this->mobilePage < $this->totalPage)
 			{
-				$url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage+1);
-				$text = sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $this->mobilePage+1, $this->totalPage);
+				$url = getUrl('mid', $_GET['mid'], 'mpage', $this->mobilePage + 1);
+				$text = sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $this->mobilePage + 1, $this->totalPage);
 				$this->setNextUrl($url, $text);
 			}
 		} 
@@ -266,7 +266,7 @@ 
 	 */
 	function hasChilds()
 	{
-		return count($this->childs)?true:0;
+		return count($this->childs) ? true : 0;
 	}
 
 	/**
@@ -302,7 +302,7 @@ 
 	function setContent($content)
 	{
 		$oModuleController = getController('module');
-		$allow_tag_array = array('<a>','<br>','<p>','<b>','<i>','<u>','<em>','<small>','<strong>','<big>','<table>','<tr>','<td>');
+		$allow_tag_array = array('<a>', '<br>', '<p>', '<b>', '<i>', '<u>', '<em>', '<small>', '<strong>', '<big>', '<table>', '<tr>', '<td>');
 		// Links/wrap, remove all tags except gangjoman
 		$content = strip_tags($content, implode($allow_tag_array));
 		// Margins tab removed
@@ -310,16 +310,16 @@ 
 		// Repeat two more times the space and remove julnanumeul
 		$content = preg_replace('/( ){2,}/s', '', $content);
 		$content = preg_replace("/([\r\n]+)/s", "\r\n", $content);
-		$content = preg_replace(array("/<a/i","/<\/a/i","/<b/i","/<\/b/i","/<br/i"),array('<a','</a','<b','</b','<br'),$content);
-		$content = str_replace(array("<br>","<br />"), array("<br/>","<br/>"), $content);
+		$content = preg_replace(array("/<a/i", "/<\/a/i", "/<b/i", "/<\/b/i", "/<br/i"), array('<a', '</a', '<b', '</b', '<br'), $content);
+		$content = str_replace(array("<br>", "<br />"), array("<br/>", "<br/>"), $content);
 
-		while(strpos($content, '<br/><br/>'))
+		while (strpos($content, '<br/><br/>'))
 		{
-			$content = str_replace('<br/><br/>','<br/>',$content);
+			$content = str_replace('<br/><br/>', '<br/>', $content);
 		}
 		// If the required size of a deck of mobile content to write down all the dividing pages
 		$contents = array();
-		while($content)
+		while ($content)
 		{
 			$tmp = $this->cutStr($content, $this->deckSize, '');
 			$contents[] = $tmp;
@@ -327,46 +327,46 @@ 
 
 			//$content = str_replace(array('&','<','>','"','&amp;nbsp;'), array('&amp;','&lt;','&gt;','&quot;',' '), $content);
 
-			foreach($allow_tag_array as $tag)
+			foreach ($allow_tag_array as $tag)
 			{
-				if($tag == '<br>') continue;
-				$tag_open_pos = strpos($content, str_replace('>','',$tag));
-				$tag_close_pos = strpos($content, str_replace('<','</',$tag));
-				if($tag_open_pos!==false && $tag_close_pos || $tag_close_pos < $tag_open_pos)
+				if ($tag == '<br>') continue;
+				$tag_open_pos = strpos($content, str_replace('>', '', $tag));
+				$tag_close_pos = strpos($content, str_replace('<', '</', $tag));
+				if ($tag_open_pos !== false && $tag_close_pos || $tag_close_pos < $tag_open_pos)
 				{
-					$contents[count($contents)-1] .= substr($content, 0, $tag_close_pos + strlen($tag) + 1);
+					$contents[count($contents) - 1] .= substr($content, 0, $tag_close_pos + strlen($tag) + 1);
 					$content = substr($content, $tag_close_pos + strlen($tag) + 1);
 				}
 			}
 
 			$tag_open_pos = strpos($content, '&');
 			$tag_close_pos = strpos($content, ';');
-			if($tag_open_pos!==false && $tag_close_pos || $tag_close_pos < $tag_open_pos)
+			if ($tag_open_pos !== false && $tag_close_pos || $tag_close_pos < $tag_open_pos)
 			{
-				$contents[count($contents)-1] .= substr($content, 0, $tag_close_pos + 1);
+				$contents[count($contents) - 1] .= substr($content, 0, $tag_close_pos + 1);
 				$content = substr($content, $tag_close_pos + 1);
 			}
 		}
 
 		$this->totalPage = count($contents);
 		// next/prevUrl specify
-		if($this->mobilePage>1)
+		if ($this->mobilePage > 1)
 		{
-			$url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage-1);
-			$text = sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $this->mobilePage-1, $this->totalPage);
+			$url = getUrl('mid', $_GET['mid'], 'mpage', $this->mobilePage - 1);
+			$text = sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $this->mobilePage - 1, $this->totalPage);
 			$this->setPrevUrl($url, $text);
 		}
 
-		if($this->mobilePage<$this->totalPage)
+		if ($this->mobilePage < $this->totalPage)
 		{
-			$url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage+1);
-			$text = sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $this->mobilePage+1, $this->totalPage);
+			$url = getUrl('mid', $_GET['mid'], 'mpage', $this->mobilePage + 1);
+			$text = sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $this->mobilePage + 1, $this->totalPage);
 			$this->setNextUrl($url, $text);
 		}
 
-		$this->content = $contents[$this->mobilePage-1];
+		$this->content = $contents[$this->mobilePage - 1];
 		$oModuleController->replaceDefinedLangCode($this->content);
-		$content = str_replace(array('$','\''), array('$$','&apos;'), $content);
+		$content = str_replace(array('$', '\''), array('$$', '&apos;'), $content);
 	}
 
 	/**
@@ -374,7 +374,7 @@ 
 	 */
 	function cutStr($string, $cut_size)
 	{
-		return preg_match('/.{'.$cut_size.'}/su', $string, $arr) ? $arr[0] : $string; 
+		return preg_match('/.{' . $cut_size . '}/su', $string, $arr) ? $arr[0] : $string; 
 	}
 
 	/**
@@ -390,7 +390,7 @@ 
 	 */
 	function setHomeUrl($url, $text)
 	{
-		if(!$url) $url = '#';
+		if (!$url) $url = '#';
 		$this->homeUrl->url = $url;
 		$this->homeUrl->text = $text;
 	}
@@ -400,7 +400,7 @@ 
 	 */
 	function setUpperUrl($url, $text)
 	{
-		if(!$url) $url = '#';
+		if (!$url) $url = '#';
 		$this->upperUrl->url = $url;
 		$this->upperUrl->text = $text;
 	}
@@ -410,7 +410,7 @@ 
 	 */
 	function setPrevUrl($url, $text)
 	{
-		if(!$url) $url = '#';
+		if (!$url) $url = '#';
 		$this->prevUrl->url = $url;
 		$this->prevUrl->text = $text;
 	}
@@ -420,7 +420,7 @@ 
 	 */
 	function setNextUrl($url, $text)
 	{
-		if(!$url) $url = '#';
+		if (!$url) $url = '#';
 		$this->nextUrl->url = $url;
 		$this->nextUrl->text = $text;
 	}
@@ -430,7 +430,7 @@ 
 	 */
 	function setEtcBtn($url, $text)
 	{
-		if(!$url) $url = '#';
+		if (!$url) $url = '#';
 		$etc['url'] = $url;
 		$etc['text'] = htmlspecialchars($text);
 		$this->etcBtn[] = $etc;
@@ -444,7 +444,7 @@ 
 		// Home button assignments
 		$this->setHomeUrl(getUrl(), Context::getLang('cmd_go_home'));
 		// Specify the title
-		if(!$this->title) $this->setTitle(Context::getBrowserTitle());
+		if (!$this->title) $this->setTitle(Context::getBrowserTitle());
 
 		ob_start();
 		// Output header
@@ -460,8 +460,8 @@ 
 
 		$content = ob_get_clean();
 		// After conversion output
-		if(strtolower($this->charset) == 'utf-8') print $content;
-		else print iconv('UTF-8',$this->charset."//TRANSLIT//IGNORE", $content);
+		if (strtolower($this->charset) == 'utf-8') print $content;
+		else print iconv('UTF-8', $this->charset . "//TRANSLIT//IGNORE", $content);
 
 		exit();
 	}
@@ -490,10 +490,10 @@ 
 	 */
 	function getListedItems($menu, &$listed_items, &$node_list)
 	{
-		if(!count($menu)) return;
-		foreach($menu as $node_srl => $item)
+		if (!count($menu)) return;
+		foreach ($menu as $node_srl => $item)
 		{
-			if(preg_match('/^([a-zA-Z0-9\_\-]+)$/', $item['url']))
+			if (preg_match('/^([a-zA-Z0-9\_\-]+)$/', $item['url']))
 			{
 				$mid = $item['mid'] = $item['url'];
 				$node_list[$mid] = $node_srl;
@@ -515,17 +515,17 @@ 
 	{
 		$childs = array();
 
-		if($this->cmid)
+		if ($this->cmid)
 		{
 			$cur_item = $this->listed_items[$this->cmid];
-			$upper_srl = $cur_item['parent_srl'];;
-			$list = $cur_item['list'];;
-			$this->setUpperUrl(getUrl('cmid',$upper_srl), Context::getLang('cmd_go_upper'));
-			if(preg_match('/^([a-zA-Z0-9\_\-]+)$/', $cur_item['url']))
+			$upper_srl = $cur_item['parent_srl']; ;
+			$list = $cur_item['list']; ;
+			$this->setUpperUrl(getUrl('cmid', $upper_srl), Context::getLang('cmd_go_upper'));
+			if (preg_match('/^([a-zA-Z0-9\_\-]+)$/', $cur_item['url']))
 			{
 				$obj = array();
-				$obj['href'] = getUrl('','mid',$cur_item['url']);
-				$obj['link'] = $obj['text'] = '['.$cur_item['text'].']';
+				$obj['href'] = getUrl('', 'mid', $cur_item['url']);
+				$obj['link'] = $obj['text'] = '[' . $cur_item['text'] . ']';
 				$childs[] = $obj;
 			}
 
@@ -536,19 +536,19 @@ 
 			$upper_srl = 0;
 		}
 
-		if(count($list))
+		if (count($list))
 		{
-			foreach($list as $key => $val)
+			foreach ($list as $key => $val)
 			{
-				if(!$val['text']) continue;
+				if (!$val['text']) continue;
 				$obj = array();
-				if(!count($val['list']))
+				if (!count($val['list']))
 				{
-					$obj['href'] = getUrl('','mid',$val['url']);
+					$obj['href'] = getUrl('', 'mid', $val['url']);
 				}
 				else
 				{
-					$obj['href'] = getUrl('cmid',$val['node_srl']);
+					$obj['href'] = getUrl('cmid', $val['node_srl']);
 				}
 				$obj['link'] = $obj['text'] = $val['text'];
 				$childs[] = $obj;
@@ -566,26 +566,26 @@ 
 	{
 		$childs = array();
 
-		$this->lang = FileHandler::readFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
-		if($this->lang)
+		$this->lang = FileHandler::readFile('./files/cache/addons/mobile/setLangType/personal_settings/' . md5(trim($_SERVER['HTTP_USER_AGENT']) . trim($_SERVER['HTTP_PHONE_NUMBER']) . trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])) . '.php');
+		if ($this->lang)
 		{
-			$this->lang = str_replace(array('<?php /**','**/ ?>'),array('',''),$this->lang);
+			$this->lang = str_replace(array('<?php /**', '**/ ?>'), array('', ''), $this->lang);
 			Context::setLangType($this->lang);
 		}
 		$lang_supported = Context::get('lang_supported');
 		$lang_type = Context::getLangType();
 		$obj = array();
-		$obj['link'] = $obj['text'] = Context::getLang('president_lang').' : '.$lang_supported[$lang_type];
-		$obj['href'] = getUrl('sel_lang',$lang_type);
+		$obj['link'] = $obj['text'] = Context::getLang('president_lang') . ' : ' . $lang_supported[$lang_type];
+		$obj['href'] = getUrl('sel_lang', $lang_type);
 		$childs[] = $obj;
 
-		if(is_array($lang_supported))
+		if (is_array($lang_supported))
 		{
-			foreach($lang_supported as $key => $val)
+			foreach ($lang_supported as $key => $val)
 			{
 				$obj = array();
 				$obj['link'] = $obj['text'] = $val;
-				$obj['href'] = getUrl('sel_lang',$key);
+				$obj['href'] = getUrl('sel_lang', $key);
 				$childs[] = $obj;
 			}
 		}
@@ -602,10 +602,10 @@ 
 	{
 		// Create WAP class objects of the selected module
 		$oModule = &getWap($this->module_info->module);
-		if(!$oModule || !method_exists($oModule, 'procWAP') ) return;
+		if (!$oModule || !method_exists($oModule, 'procWAP')) return;
 
 		$vars = get_object_vars($this->oModule);
-		if(count($vars)) foreach($vars as $key => $val) $oModule->{$key}  = $val;
+		if (count($vars)) foreach ($vars as $key => $val) $oModule->{$key} = $val;
 		// Run
 		$oModule->procWAP($this);
 		// Output
@@ -617,7 +617,7 @@ 
 	 */
 	function displayContent()
 	{
-		Context::set('layout','none');
+		Context::set('layout', 'none');
 		// Compile a template
 		$oTemplate = new TemplateHandler();
 		$oContext = &Context::getInstance();

Braces +87 added lines, -37 removed lines

@@ -49,7 +49,9 @@ 
 		{
 
 			$browserType = mobileXE::getBrowserType();
-			if(!$browserType) return;
+			if(!$browserType) {
+				return;
+			}
 
 			$class_file = sprintf('%saddons/mobile/classes/%s.class.php', _XE_PATH_, $browserType);
 			require_once($class_file);
@@ -59,14 +61,18 @@ 
 			{
 				$lang_supported = Context::get('lang_supported');
 				$this->lang = str_replace(array('<?php /**','**/ ?>'),array('',''),$this->lang);
-				if(isset($lang_supported[$this->lang])) Context::setLangType($this->lang);
+				if(isset($lang_supported[$this->lang])) {
+					Context::setLangType($this->lang);
+				}
 			}
 			Context::loadLang(_XE_PATH_.'addons/mobile/lang');
 
 			$instance = new wap();
 
 			$mobilePage = (int)Context::get('mpage');
-			if(!$mobilePage) $mobilePage = 1;
+			if(!$mobilePage) {
+				$mobilePage = 1;
+			}
 
 			$instance->setMobilePage($mobilePage);
 		}
@@ -107,8 +113,11 @@ 
 	 */
 	function isLangChange()
 	{
-		if($this->languageMode) return true;
-		else return false;
+		if($this->languageMode) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -122,7 +131,9 @@ 
 		if($this->lang && isset($lang_supported[$this->lang]))
 		{
 			$langbuff = FileHandler::readFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
-			if($langbuff) FileHandler::removeFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
+			if($langbuff) {
+				FileHandler::removeFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
+			}
 			$langbuff = '<?php /**'.$this->lang.'**/ ?>';
 			FileHandler::writeFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php',$langbuff);
 		}
@@ -133,7 +144,9 @@ 
 	 */
 	function setModuleInfo(&$module_info)
 	{
-		if($this->module_info) return; 
+		if($this->module_info) {
+			return;
+		}
 		$this->module_info = $module_info;
 	}
 
@@ -142,12 +155,16 @@ 
 	 */
 	function setModuleInstance(&$oModule)
 	{
-		if($this->oModule) return;
+		if($this->oModule) {
+			return;
+		}
 		// Save instance
 		$this->oModule = $oModule;
 		// Of the current module if there is a menu by menu
 		$menu_cache_file = sprintf(_XE_PATH_.'files/cache/menu/%d.php', $this->module_info->menu_srl);
-		if(!file_exists($menu_cache_file)) return;
+		if(!file_exists($menu_cache_file)) {
+			return;
+		}
 
 		include $menu_cache_file;
 		// One-dimensional arrangement of menu changes
@@ -168,10 +185,11 @@ 
 			if($parent_srl && $listed_items[$parent_srl])
 			{
 				$parent_item = $listed_items[$parent_srl];
-				if($parent_item) $this->setUpperUrl(getUrl('','mid',$parent_item['mid']), Context::getLang('cmd_go_upper'));
+				if($parent_item) {
+					$this->setUpperUrl(getUrl('','mid',$parent_item['mid']), Context::getLang('cmd_go_upper'));
+				}
 			}
-		}
-		elseif (!$this->isNavigationMode())
+		} elseif (!$this->isNavigationMode())
 		{
 			$this->setUpperUrl(getUrl('','mid',$this->index_mid,'nm','1','cmid',0), Context::getLang('cmd_view_sitemap'));
 		}
@@ -183,7 +201,9 @@ 
 	 */
 	function getBrowserType()
 	{
-		if(Context::get('smartphone')) return null;
+		if(Context::get('smartphone')) {
+			return null;
+		}
 		// Determine the type of browser
 		$browserAccept = $_SERVER['HTTP_ACCEPT'];
 		$userAgent = $_SERVER['HTTP_USER_AGENT'];
@@ -193,9 +213,11 @@ 
 		{
 			Context::set('mobile_skt',1);
 			return "wml";
+		} elseif(stripos($browserAccept, "hdml") !== FALSE) {
+			return "hdml";
+		} elseif(stripos($userAgent, "cellphone") !== FALSE) {
+			return  "mhtml";
 		}
-		elseif(stripos($browserAccept, "hdml") !== FALSE) return "hdml";
-		elseif(stripos($userAgent, "cellphone") !== FALSE) return  "mhtml";
 		return null;
 	}
 
@@ -204,9 +226,13 @@ 
 	 */
 	function setCharSet($charset = 'UTF-8')
 	{
-		if(!$charset) $charset = 'UTF-8';
+		if(!$charset) {
+			$charset = 'UTF-8';
+		}
 		// SKT supports the euc-kr
-		if(Context::get('mobile_skt')==1) $charset = 'euc-kr';
+		if(Context::get('mobile_skt')==1) {
+			$charset = 'euc-kr';
+		}
 
 		$this->charset = $charset;
 	}
@@ -216,7 +242,9 @@ 
 	 */
 	function setMobilePage($page=1)
 	{
-		if(!$page) $page = 1;
+		if(!$page) {
+			$page = 1;
+		}
 		$this->mobilePage = $page;
 	}
 
@@ -329,7 +357,9 @@ 
 
 			foreach($allow_tag_array as $tag)
 			{
-				if($tag == '<br>') continue;
+				if($tag == '<br>') {
+					continue;
+				}
 				$tag_open_pos = strpos($content, str_replace('>','',$tag));
 				$tag_close_pos = strpos($content, str_replace('<','</',$tag));
 				if($tag_open_pos!==false && $tag_close_pos || $tag_close_pos < $tag_open_pos)
@@ -390,7 +420,9 @@ 
 	 */
 	function setHomeUrl($url, $text)
 	{
-		if(!$url) $url = '#';
+		if(!$url) {
+			$url = '#';
+		}
 		$this->homeUrl->url = $url;
 		$this->homeUrl->text = $text;
 	}
@@ -400,7 +432,9 @@ 
 	 */
 	function setUpperUrl($url, $text)
 	{
-		if(!$url) $url = '#';
+		if(!$url) {
+			$url = '#';
+		}
 		$this->upperUrl->url = $url;
 		$this->upperUrl->text = $text;
 	}
@@ -410,7 +444,9 @@ 
 	 */
 	function setPrevUrl($url, $text)
 	{
-		if(!$url) $url = '#';
+		if(!$url) {
+			$url = '#';
+		}
 		$this->prevUrl->url = $url;
 		$this->prevUrl->text = $text;
 	}
@@ -420,7 +456,9 @@ 
 	 */
 	function setNextUrl($url, $text)
 	{
-		if(!$url) $url = '#';
+		if(!$url) {
+			$url = '#';
+		}
 		$this->nextUrl->url = $url;
 		$this->nextUrl->text = $text;
 	}
@@ -430,7 +468,9 @@ 
 	 */
 	function setEtcBtn($url, $text)
 	{
-		if(!$url) $url = '#';
+		if(!$url) {
+			$url = '#';
+		}
 		$etc['url'] = $url;
 		$etc['text'] = htmlspecialchars($text);
 		$this->etcBtn[] = $etc;
@@ -444,7 +484,9 @@ 
 		// Home button assignments
 		$this->setHomeUrl(getUrl(), Context::getLang('cmd_go_home'));
 		// Specify the title
-		if(!$this->title) $this->setTitle(Context::getBrowserTitle());
+		if(!$this->title) {
+			$this->setTitle(Context::getBrowserTitle());
+		}
 
 		ob_start();
 		// Output header
@@ -460,8 +502,11 @@ 
 
 		$content = ob_get_clean();
 		// After conversion output
-		if(strtolower($this->charset) == 'utf-8') print $content;
-		else print iconv('UTF-8',$this->charset."//TRANSLIT//IGNORE", $content);
+		if(strtolower($this->charset) == 'utf-8') {
+			print $content;
+		} else {
+			print iconv('UTF-8',$this->charset."//TRANSLIT//IGNORE", $content);
+		}
 
 		exit();
 	}
@@ -490,15 +535,16 @@ 
 	 */
 	function getListedItems($menu, &$listed_items, &$node_list)
 	{
-		if(!count($menu)) return;
+		if(!count($menu)) {
+			return;
+		}
 		foreach($menu as $node_srl => $item)
 		{
 			if(preg_match('/^([a-zA-Z0-9\_\-]+)$/', $item['url']))
 			{
 				$mid = $item['mid'] = $item['url'];
 				$node_list[$mid] = $node_srl;
-			}
-			else
+			} else
 			{
 				$mid = $item['mid'] = null;
 			}
@@ -529,8 +575,7 @@ 
 				$childs[] = $obj;
 			}
 
-		}
-		else
+		} else
 		{
 			$list = $this->menu;
 			$upper_srl = 0;
@@ -540,13 +585,14 @@ 
 		{
 			foreach($list as $key => $val)
 			{
-				if(!$val['text']) continue;
+				if(!$val['text']) {
+					continue;
+				}
 				$obj = array();
 				if(!count($val['list']))
 				{
 					$obj['href'] = getUrl('','mid',$val['url']);
-				}
-				else
+				} else
 				{
 					$obj['href'] = getUrl('cmid',$val['node_srl']);
 				}
@@ -602,10 +648,14 @@ 
 	{
 		// Create WAP class objects of the selected module
 		$oModule = &getWap($this->module_info->module);
-		if(!$oModule || !method_exists($oModule, 'procWAP') ) return;
+		if(!$oModule || !method_exists($oModule, 'procWAP') ) {
+			return;
+		}
 
 		$vars = get_object_vars($this->oModule);
-		if(count($vars)) foreach($vars as $key => $val) $oModule->{$key}  = $val;
+		if(count($vars)) {
+			foreach($vars as $key => $val) $oModule->{$key}  = $val;
+		}
 		// Run
 		$oModule->procWAP($this);
 		// Output

classes/cache/CacheFile.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
 	/**

 	 * Return whether support or not support cache

 	 *

-	 * @return true

+	 * @return boolean

 	 */

 	function isSupport()

 	{

@@ -164,7 +164,7 @@ 
 	/**

 	 * Truncate all existing variables at the cache

 	 *

-	 * @return bool Returns true on success or false on failure.

+	 * @return boolean|null Returns true on success or false on failure.

 	 */

 	function truncate()

 	{

Spacing +7 added lines, -7 removed lines

@@ -23,7 +23,7 @@ 
 	 */

 	function getInstance()

 	{

-		if(!$GLOBALS['__CacheFile__'])

+		if (!$GLOBALS['__CacheFile__'])

 		{

 			$GLOBALS['__CacheFile__'] = new CacheFile();

 		}

@@ -78,7 +78,7 @@ 
 		$content[] = 'if(!defined(\'__XE__\')) { exit(); }';

 		$content[] = 'return \'' . addslashes(serialize($obj)) . '\';';

 		FileHandler::writeFile($cache_file, implode(PHP_EOL, $content));

-		if(function_exists('opcache_invalidate'))
+		if (function_exists('opcache_invalidate'))
 		{
 			@opcache_invalidate($cache_file, true);
 		}
@@ -95,9 +95,9 @@ 
 	{

 		$cache_file = $this->getCacheFileName($key);

 
-		if(file_exists($cache_file))

+		if (file_exists($cache_file))

 		{

-			if($modified_time > 0 && filemtime($cache_file) < $modified_timed)
+			if ($modified_time > 0 && filemtime($cache_file) < $modified_timed)
 			{
 				FileHandler::removeFile($cache_file);
 				return false;
@@ -118,12 +118,12 @@ 
 	 */

 	function get($key, $modified_time = 0)

 	{

-		if(!$cache_file = FileHandler::exists($this->getCacheFileName($key)))
+		if (!$cache_file = FileHandler::exists($this->getCacheFileName($key)))
 		{
 			return false;
 		}
 

-		if($modified_time > 0 && filemtime($cache_file) < $modified_timed)
+		if ($modified_time > 0 && filemtime($cache_file) < $modified_timed)
 		{

 			FileHandler::removeFile($cache_file);
 			return false;

@@ -143,7 +143,7 @@ 
 	function _delete($_key)

 	{

 		$cache_file = $this->getCacheFileName($_key);

-		if(function_exists('opcache_invalidate'))
+		if (function_exists('opcache_invalidate'))
 		{
 			@opcache_invalidate($cache_file, true);
 		}

classes/cache/CacheHandler.class.php

Doc Comments +6 added lines, -6 removed lines

@@ -148,7 +148,7 @@ 
 	 * @param string $key Cache key
 	 * @param int $modified_time 	Unix time of data modified.
 	 * 								If stored time is older then modified time, return false.
-	 * @return false|mixed Return false on failure or older then modified time. Return the string associated with the $key on success.
+	 * @return boolean Return false on failure or older then modified time. Return the string associated with the $key on success.
 	 */
 	function get($key, $modified_time = 0)
 	{
@@ -170,7 +170,7 @@ 
 	 * @param int $valid_time	Time for the variable to live in the cache in seconds.
 	 * 							After the value specified in ttl has passed the stored variable will be deleted from the cache.
 	 * 							If no ttl is supplied, use the default valid time.
-	 * @return bool|void Returns true on success or false on failure. If use CacheFile, returns void.
+	 * @return boolean Returns true on success or false on failure. If use CacheFile, returns void.
 	 */
 	function put($key, $obj, $valid_time = 0)
 	{
@@ -225,7 +225,7 @@ 
 	/**
 	 * Truncate all cache
 	 *
-	 * @return bool|void Returns true on success or false on failure. If use CacheFile, returns void.
+	 * @return boolean Returns true on success or false on failure. If use CacheFile, returns void.
 	 */
 	function truncate()
 	{
@@ -297,7 +297,7 @@ 
 	 * @param string $key Cache key
 	 * @param int $modified_time 	Unix time of data modified.
 	 * 								If stored time is older then modified time, return false.
-	 * @return false|mixed Return false on failure or older then modified time. Return the string associated with the $key on success.
+	 * @return boolean Return false on failure or older then modified time. Return the string associated with the $key on success.
 	 */
 	function get($key, $modified_time = 0)
 	{
@@ -312,7 +312,7 @@ 
 	 * @param int $valid_time	Time for the variable to live in the cache in seconds.
 	 * 							After the value specified in ttl has passed the stored variable will be deleted from the cache.
 	 * 							If no ttl is supplied, use the default valid time.
-	 * @return bool|void Returns true on success or false on failure. If use CacheFile, returns void.
+	 * @return boolean Returns true on success or false on failure. If use CacheFile, returns void.
 	 */
 	function put($key, $obj, $valid_time = 0)
 	{
@@ -345,7 +345,7 @@ 
 	/**
 	 * Truncate all cache
 	 *
-	 * @return bool|void Returns true on success or false on failure. If use CacheFile, returns void.
+	 * @return boolean Returns true on success or false on failure. If use CacheFile, returns void.
 	 */
 	function truncate()
 	{

Spacing +22 added lines, -22 removed lines

@@ -31,7 +31,7 @@ 
 	function &getInstance($target = 'object', $info = null, $always_use_file = false)
 	{
 		$cache_handler_key = $target . ($always_use_file ? '_file' : '');
-		if(!$GLOBALS['__XE_CACHE_HANDLER__'][$cache_handler_key])
+		if (!$GLOBALS['__XE_CACHE_HANDLER__'][$cache_handler_key])
 		{
 			$GLOBALS['__XE_CACHE_HANDLER__'][$cache_handler_key] = new CacheHandler($target, $info, $always_use_file);
 		}
@@ -51,61 +51,61 @@ 
 	 */
 	function CacheHandler($target, $info = null, $always_use_file = false)
 	{
-		if(!$info)
+		if (!$info)
 		{
 			$info = Context::getDBInfo();
 		}
 
-		if($info)
+		if ($info)
 		{
-			if($target == 'object')
+			if ($target == 'object')
 			{
-				if($info->use_object_cache == 'apc')
+				if ($info->use_object_cache == 'apc')
 				{
 					$type = 'apc';
 				}
-				else if(substr($info->use_object_cache, 0, 8) == 'memcache')
+				else if (substr($info->use_object_cache, 0, 8) == 'memcache')
 				{
 					$type = 'memcache';
 					$url = $info->use_object_cache;
 				}
-				else if($info->use_object_cache == 'wincache')
+				else if ($info->use_object_cache == 'wincache')
 				{
 					$type = 'wincache';
 				}
-				else if($info->use_object_cache == 'file')
+				else if ($info->use_object_cache == 'file')
 				{
 					$type = 'file';
 				}
-				else if($always_use_file)
+				else if ($always_use_file)
 				{
 					$type = 'file';
 				}
 			}
-			else if($target == 'template')
+			else if ($target == 'template')
 			{
-				if($info->use_template_cache == 'apc')
+				if ($info->use_template_cache == 'apc')
 				{
 					$type = 'apc';
 				}
-				else if(substr($info->use_template_cache, 0, 8) == 'memcache')
+				else if (substr($info->use_template_cache, 0, 8) == 'memcache')
 				{
 					$type = 'memcache';
 					$url = $info->use_template_cache;
 				}
-				else if($info->use_template_cache == 'wincache')
+				else if ($info->use_template_cache == 'wincache')
 				{
 					$type = 'wincache';
 				}
 			}
 
-			if($type)
+			if ($type)
 			{
 				$class = 'Cache' . ucfirst($type);
 				include_once sprintf('%sclasses/cache/%s.class.php', _XE_PATH_, $class);
 				$this->handler = call_user_func(array($class, 'getInstance'), $url);
 				$this->keyGroupVersions = $this->handler->get('key_group_versions', 0);
-				if(!$this->keyGroupVersions)
+				if (!$this->keyGroupVersions)
 				{
 					$this->keyGroupVersions = array();
 					$this->handler->put('key_group_versions', $this->keyGroupVersions, 0);
@@ -121,7 +121,7 @@ 
 	 */
 	function isSupport()
 	{
-		if($this->handler && $this->handler->isSupport())
+		if ($this->handler && $this->handler->isSupport())
 		{
 			return true;
 		}
@@ -152,7 +152,7 @@ 
 	 */
 	function get($key, $modified_time = 0)
 	{
-		if(!$this->handler)
+		if (!$this->handler)
 		{
 			return false;
 		}
@@ -174,7 +174,7 @@ 
 	 */
 	function put($key, $obj, $valid_time = 0)
 	{
-		if(!$this->handler && !$key)
+		if (!$this->handler && !$key)
 		{
 			return false;
 		}
@@ -192,7 +192,7 @@ 
 	 */
 	function delete($key)
 	{
-		if(!$this->handler)
+		if (!$this->handler)
 		{
 			return false;
 		}
@@ -212,7 +212,7 @@ 
 	 */
 	function isValid($key, $modified_time)
 	{
-		if(!$this->handler)
+		if (!$this->handler)
 		{
 			return false;
 		}
@@ -229,7 +229,7 @@ 
 	 */
 	function truncate()
 	{
-		if(!$this->handler)
+		if (!$this->handler)
 		{
 			return false;
 		}
@@ -255,7 +255,7 @@ 
 	 */
 	function getGroupKey($keyGroupName, $key)
 	{
-		if(!$this->keyGroupVersions[$keyGroupName])
+		if (!$this->keyGroupVersions[$keyGroupName])
 		{
 			$this->keyGroupVersions[$keyGroupName] = 1;
 			$this->handler->put('key_group_versions', $this->keyGroupVersions, 0);

Braces +7 added lines, -14 removed lines

@@ -63,37 +63,30 @@
 				if($info->use_object_cache == 'apc')
 				{
 					$type = 'apc';
-				}
-				else if(substr($info->use_object_cache, 0, 8) == 'memcache')
+				} else if(substr($info->use_object_cache, 0, 8) == 'memcache')
 				{
 					$type = 'memcache';
 					$url = $info->use_object_cache;
-				}
-				else if($info->use_object_cache == 'wincache')
+				} else if($info->use_object_cache == 'wincache')
 				{
 					$type = 'wincache';
-				}
-				else if($info->use_object_cache == 'file')
+				} else if($info->use_object_cache == 'file')
 				{
 					$type = 'file';
-				}
-				else if($always_use_file)
+				} else if($always_use_file)
 				{
 					$type = 'file';
 				}
-			}
-			else if($target == 'template')
+			} else if($target == 'template')
 			{
 				if($info->use_template_cache == 'apc')
 				{
 					$type = 'apc';
-				}
-				else if(substr($info->use_template_cache, 0, 8) == 'memcache')
+				} else if(substr($info->use_template_cache, 0, 8) == 'memcache')
 				{
 					$type = 'memcache';
 					$url = $info->use_template_cache;
-				}
-				else if($info->use_template_cache == 'wincache')
+				} else if($info->use_template_cache == 'wincache')
 				{
 					$type = 'wincache';
 				}

classes/context/Context.class.php

Doc Comments +16 added lines, -12 removed lines

@@ -157,7 +157,7 @@ 
 	/**
 	 * returns static context object (Singleton). It's to use Context without declaration of an object
 	 *
-	 * @return object Instance
+	 * @return Context Instance
 	 */
 	function &getInstance()
 	{
@@ -722,7 +722,7 @@ 
 	/**
 	 * Get FTP information
 	 *
-	 * @return object FTP information
+	 * @return string FTP information
 	 */
 	function getFTPInfo()
 	{
@@ -867,6 +867,7 @@ 
 	 * Evaluation of xml language file
 	 *
 	 * @param string Path of the language file
+	 * @param string $path
 	 * @return void
 	 */
 	function _evalxmlLang($path)
@@ -1006,7 +1007,7 @@ 
 	/**
 	 * Convert strings of variables in $source_object into UTF-8
 	 *
-	 * @param object $source_obj Conatins strings to convert
+	 * @param stdClass $source_obj Conatins strings to convert
 	 * @return object converted object
 	 */
 	function convertEncoding($source_obj)
@@ -1044,11 +1045,11 @@ 
 	/**
 	 * Check flag
 	 *
-	 * @param mixed $val
+	 * @param boolean $val
 	 * @param string $key
 	 * @param mixed $charset charset
 	 * @see arrayConvWalkCallback will replaced array_walk_recursive in >=PHP5
-	 * @return void
+	 * @return null|boolean
 	 */
 	function checkConvertFlag(&$val, $key = null, $charset = null)
 	{
@@ -1101,6 +1102,9 @@ 
 		return $obj->str;
 	}
 
+	/**
+	 * @return string
+	 */
 	function decodeIdna($domain)
 	{
 		if(strpos($domain, 'xn--') !== FALSE)
@@ -1314,7 +1318,7 @@ 
 	 *
 	 * @param string $key Variable key
 	 * @param object $val Variable value
-	 * @return mixed filtered value
+	 * @return string filtered value
 	 */
 	function _filterXmlVars($key, $val)
 	{
@@ -1366,7 +1370,7 @@ 
 	 * @see Cast variables, such as _srl, page, and cpage, into interger
 	 * @param string $key Variable key
 	 * @param string $val Variable value
-	 * @param string $do_stripslashes Whether to strip slashes
+	 * @param integer $do_stripslashes Whether to strip slashes
 	 * @return mixed filtered value. Type are string or array
 	 */
 	function _filterRequestVar($key, $val, $do_stripslashes = 1)
@@ -1865,7 +1869,7 @@ 
 	 *
 	 * @param string $key Key
 	 * @param string $val Value
-	 * @param mixed $set_to_get_vars If not FALSE, Set to get vars.
+	 * @param integer $set_to_get_vars If not FALSE, Set to get vars.
 	 * @return void
 	 */
 	function set($key, $val, $set_to_get_vars = 0)
@@ -1907,7 +1911,7 @@ 
 	/**
 	 * Get one more vars in object vars with given arguments(key1, key2, key3,...)
 	 *
-	 * @return object
+	 * @return null|stdClass
 	 */
 	function gets()
 	{
@@ -1980,7 +1984,7 @@ 
 	/**
 	 * Register if actions are to be encrypted by SSL. Those actions are sent to https in common/js/xml_handler.js
 	 *
-	 * @param string $action act name
+	 * @param string[] $action_array
 	 * @return void
 	 */
 	function addSSLActions($action_array)
@@ -2150,7 +2154,7 @@ 
 	 * @param string $file File name with path
 	 * @param string $optimized optimized (That seems to not use)
 	 * @param string $targetie target IE
-	 * @param string $index index
+	 * @param integer $index index
 	 * @param string $type Added position. (head:<head>..</head>, body:<body>..</body>)
 	 * @param bool $isRuleset Use ruleset
 	 * @param string $autoPath If path not readed, set the path automatically.
@@ -2260,7 +2264,7 @@ 
 	 * @param string $optimized optimized (That seems to not use)
 	 * @param string $media Media query
 	 * @param string $targetie target IE
-	 * @param string $index index
+	 * @param integer $index index
 	 * @return void
 	 *
 	 */

Indentation +1 added lines, -1 removed lines

@@ -1094,7 +1094,7 @@
 	 */
 	function convertEncodingStr($str)
 	{
-        if(!$str) return null;
+		if(!$str) return null;
 		$obj = new stdClass();
 		$obj->str = $str;
 		$obj = self::convertEncoding($obj);

Spacing +238 added lines, -238 removed lines

@@ -162,7 +162,7 @@ 
 	function &getInstance()
 	{
 		static $theInstance = null;
-		if(!$theInstance)
+		if (!$theInstance)
 		{
 			$theInstance = new Context();
 		}
@@ -182,10 +182,10 @@ 
 
 		// include ssl action cache file
 		$this->sslActionCacheFile = FileHandler::getRealPath($this->sslActionCacheFile);
-		if(is_readable($this->sslActionCacheFile))
+		if (is_readable($this->sslActionCacheFile))
 		{
 			require($this->sslActionCacheFile);
-			if(isset($sslActions))
+			if (isset($sslActions))
 			{
 				$this->ssl_actions = $sslActions;
 			}
@@ -200,9 +200,9 @@ 
 	 */
 	function init()
 	{
-		if(!isset($GLOBALS['HTTP_RAW_POST_DATA']) && version_compare(PHP_VERSION, '5.6.0', '>=') === true) {
-			if(simplexml_load_string(file_get_contents("php://input")) !== false) $GLOBALS['HTTP_RAW_POST_DATA'] = file_get_contents("php://input");
-			if(strpos($_SERVER['CONTENT_TYPE'], 'json') || strpos($_SERVER['HTTP_CONTENT_TYPE'], 'json')) $GLOBALS['HTTP_RAW_POST_DATA'] = file_get_contents("php://input");
+		if (!isset($GLOBALS['HTTP_RAW_POST_DATA']) && version_compare(PHP_VERSION, '5.6.0', '>=') === true) {
+			if (simplexml_load_string(file_get_contents("php://input")) !== false) $GLOBALS['HTTP_RAW_POST_DATA'] = file_get_contents("php://input");
+			if (strpos($_SERVER['CONTENT_TYPE'], 'json') || strpos($_SERVER['HTTP_CONTENT_TYPE'], 'json')) $GLOBALS['HTTP_RAW_POST_DATA'] = file_get_contents("php://input");
 		}
 
 		// set context variables in $GLOBALS (to use in display handler)
@@ -221,11 +221,11 @@ 
 		$this->_setUploadedArgument();
 
 		$this->loadDBInfo();
-		if($this->db_info->use_sitelock == 'Y')
+		if ($this->db_info->use_sitelock == 'Y')
 		{
-			if(is_array($this->db_info->sitelock_whitelist)) $whitelist = $this->db_info->sitelock_whitelist;
+			if (is_array($this->db_info->sitelock_whitelist)) $whitelist = $this->db_info->sitelock_whitelist;
 
-			if(!IpFilter::filter($whitelist))
+			if (!IpFilter::filter($whitelist))
 			{
 				$title = ($this->db_info->sitelock_title) ? $this->db_info->sitelock_title : 'Maintenance in progress...';
 				$message = $this->db_info->sitelock_message;
@@ -235,7 +235,7 @@ 
 				define('_XE_SITELOCK_MESSAGE_', $message);
 
 				header("HTTP/1.1 403 Forbidden");
-				if(FileHandler::exists(_XE_PATH_ . 'common/tpl/sitelock.user.html'))
+				if (FileHandler::exists(_XE_PATH_ . 'common/tpl/sitelock.user.html'))
 				{
 					include _XE_PATH_ . 'common/tpl/sitelock.user.html';
 				}
@@ -248,39 +248,39 @@ 
 		}
 
 		// If XE is installed, get virtual site information
-		if(self::isInstalled())
+		if (self::isInstalled())
 		{
 			$oModuleModel = getModel('module');
 			$site_module_info = $oModuleModel->getDefaultMid();
 
-			if(!isset($site_module_info))
+			if (!isset($site_module_info))
 			{
 				$site_module_info = new stdClass();
 			}
 
 			// if site_srl of site_module_info is 0 (default site), compare the domain to default_url of db_config
-			if($site_module_info->site_srl == 0 && $site_module_info->domain != $this->db_info->default_url)
+			if ($site_module_info->site_srl == 0 && $site_module_info->domain != $this->db_info->default_url)
 			{
 				$site_module_info->domain = $this->db_info->default_url;
 			}
 
 			$this->set('site_module_info', $site_module_info);
-			if($site_module_info->site_srl && isSiteID($site_module_info->domain))
+			if ($site_module_info->site_srl && isSiteID($site_module_info->domain))
 			{
 				$this->set('vid', $site_module_info->domain, TRUE);
 			}
 
-			if(!isset($this->db_info))
+			if (!isset($this->db_info))
 			{
 				$this->db_info = new stdClass();
 			}
 
 			$this->db_info->lang_type = $site_module_info->default_language;
-			if(!$this->db_info->lang_type)
+			if (!$this->db_info->lang_type)
 			{
 				$this->db_info->lang_type = 'en';
 			}
-			if(!$this->db_info->use_db_session)
+			if (!$this->db_info->use_db_session)
 			{
 				$this->db_info->use_db_session = 'N';
 			}
@@ -290,30 +290,30 @@ 
 		$lang_supported = $this->loadLangSelected();
 
 		// Retrieve language type set in user's cookie
-		if($this->lang_type = $this->get('l'))
+		if ($this->lang_type = $this->get('l'))
 		{
-			if($_COOKIE['lang_type'] != $this->lang_type)
+			if ($_COOKIE['lang_type'] != $this->lang_type)
 			{
 				setcookie('lang_type', $this->lang_type, $_SERVER['REQUEST_TIME'] + 3600 * 24 * 1000, '/');
 			}
 		}
-		elseif($_COOKIE['lang_type'])
+		elseif ($_COOKIE['lang_type'])
 		{
 			$this->lang_type = $_COOKIE['lang_type'];
 		}
 
 		// If it's not exists, follow default language type set in db_info
-		if(!$this->lang_type)
+		if (!$this->lang_type)
 		{
 			$this->lang_type = $this->db_info->lang_type;
 		}
 
 		// if still lang_type has not been set or has not-supported type , set as English.
-		if(!$this->lang_type)
+		if (!$this->lang_type)
 		{
 			$this->lang_type = 'en';
 		}
-		if(is_array($lang_supported) && !isset($lang_supported[$this->lang_type]))
+		if (is_array($lang_supported) && !isset($lang_supported[$this->lang_type]))
 		{
 			$this->lang_type = 'en';
 		}
@@ -325,7 +325,7 @@ 
 		$this->loadLang(_XE_PATH_ . 'modules/module/lang');
 
 		// set session handler
-		if(self::isInstalled() && $this->db_info->use_db_session == 'Y')
+		if (self::isInstalled() && $this->db_info->use_db_session == 'Y')
 		{
 			$oSessionModel = getModel('session');
 			$oSessionController = getController('session');
@@ -334,11 +334,11 @@ 
 			);
 		}
 
-		if($sess = $_POST[session_name()]) session_id($sess);
+		if ($sess = $_POST[session_name()]) session_id($sess);
 		session_start();
 
 		// set authentication information in Context and session
-		if(self::isInstalled())
+		if (self::isInstalled())
 		{
 			$oModuleModel = getModel('module');
 			$oModuleModel->loadModuleExtends();
@@ -346,15 +346,15 @@ 
 			$oMemberModel = getModel('member');
 			$oMemberController = getController('member');
 
-			if($oMemberController && $oMemberModel)
+			if ($oMemberController && $oMemberModel)
 			{
 				// if signed in, validate it.
-				if($oMemberModel->isLogged())
+				if ($oMemberModel->isLogged())
 				{
 					$oMemberController->setSessionInfo();
 				}
 				// check auto sign-in
-				elseif($_COOKIE['xeak'])
+				elseif ($_COOKIE['xeak'])
 				{
 					$oMemberController->doAutologin();
 				}
@@ -374,28 +374,28 @@ 
 		// set locations for javascript use
 		$url = array();
 		$current_url = self::getRequestUri();
-		if($_SERVER['REQUEST_METHOD'] == 'GET')
+		if ($_SERVER['REQUEST_METHOD'] == 'GET')
 		{
-			if($this->get_vars)
+			if ($this->get_vars)
 			{
 				$url = array();
-				foreach($this->get_vars as $key => $val)
+				foreach ($this->get_vars as $key => $val)
 				{
-					if(is_array($val) && count($val) > 0)
+					if (is_array($val) && count($val) > 0)
 					{
-						foreach($val as $k => $v)
+						foreach ($val as $k => $v)
 						{
 							$url[] = $key . '[' . $k . ']=' . urlencode($v);
 						}
 					}
-					elseif($val)
+					elseif ($val)
 					{
 						$url[] = $key . '=' . urlencode($val);
 					}
 				}
 
 				$current_url = self::getRequestUri();
-				if($url) $current_url .= '?' . join('&', $url);
+				if ($url) $current_url .= '?' . join('&', $url);
 			}
 			else
 			{
@@ -410,12 +410,12 @@ 
 		$this->set('current_url', $current_url);
 		$this->set('request_uri', self::getRequestUri());
 
-		if(strpos($current_url, 'xn--') !== FALSE)
+		if (strpos($current_url, 'xn--') !== FALSE)
 		{
 			$this->set('current_url', self::decodeIdna($current_url));
 		}
 
-		if(strpos(self::getRequestUri(), 'xn--') !== FALSE)
+		if (strpos(self::getRequestUri(), 'xn--') !== FALSE)
 		{
 			$this->set('request_uri', self::decodeIdna(self::getRequestUri()));
 		}
@@ -440,19 +440,19 @@ 
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 
-		if(!$self->isInstalled())
+		if (!$self->isInstalled())
 		{
 			return;
 		}
 
 		$config_file = $self->getConfigFile();
-		if(is_readable($config_file))
+		if (is_readable($config_file))
 		{
 			include($config_file);
 		}
 
 		// If master_db information does not exist, the config file needs to be updated
-		if(!isset($db_info->master_db))
+		if (!isset($db_info->master_db))
 		{
 			$db_info->master_db = array();
 			$db_info->master_db["db_type"] = $db_info->db_type;
@@ -470,7 +470,7 @@ 
 			$db_info->master_db["db_table_prefix"] = $db_info->db_table_prefix;
 			unset($db_info->db_table_prefix);
 
-			if(isset($db_info->master_db["db_table_prefix"]) && substr_compare($db_info->master_db["db_table_prefix"], '_', -1) !== 0)
+			if (isset($db_info->master_db["db_table_prefix"]) && substr_compare($db_info->master_db["db_table_prefix"], '_', -1) !== 0)
 			{
 				$db_info->master_db["db_table_prefix"] .= '_';
 			}
@@ -482,33 +482,33 @@ 
 			$oInstallController->makeConfigFile();
 		}
 
-		if(!$db_info->use_prepared_statements)
+		if (!$db_info->use_prepared_statements)
 		{
 			$db_info->use_prepared_statements = 'Y';
 		}
 
-		if(!$db_info->time_zone)
+		if (!$db_info->time_zone)
 			$db_info->time_zone = date('O');
 		$GLOBALS['_time_zone'] = $db_info->time_zone;
 
-		if($db_info->qmail_compatibility != 'Y')
+		if ($db_info->qmail_compatibility != 'Y')
 			$db_info->qmail_compatibility = 'N';
 		$GLOBALS['_qmail_compatibility'] = $db_info->qmail_compatibility;
 
-		if(!$db_info->use_db_session)
+		if (!$db_info->use_db_session)
 			$db_info->use_db_session = 'N';
-		if(!$db_info->use_ssl)
+		if (!$db_info->use_ssl)
 			$db_info->use_ssl = 'none';
 		$this->set('_use_ssl', $db_info->use_ssl);
 
 		$self->set('_http_port', ($db_info->http_port) ? $db_info->http_port : NULL);
 		$self->set('_https_port', ($db_info->https_port) ? $db_info->https_port : NULL);
 
-		if(!$db_info->sitelock_whitelist) {
+		if (!$db_info->sitelock_whitelist) {
 			$db_info->sitelock_whitelist = '127.0.0.1';
 		}
 
-		if(is_string($db_info->sitelock_whitelist)) {
+		if (is_string($db_info->sitelock_whitelist)) {
 			$db_info->sitelock_whitelist = explode(',', $db_info->sitelock_whitelist);
 		}
 
@@ -579,10 +579,10 @@ 
 	function loadLangSupported()
 	{
 		static $lang_supported = null;
-		if(!$lang_supported)
+		if (!$lang_supported)
 		{
 			$langs = file(_XE_PATH_ . 'common/lang/lang.info');
-			foreach($langs as $val)
+			foreach ($langs as $val)
 			{
 				list($lang_prefix, $lang_text) = explode(',', $val);
 				$lang_text = trim($lang_text);
@@ -600,17 +600,17 @@ 
 	function loadLangSelected()
 	{
 		static $lang_selected = null;
-		if(!$lang_selected)
+		if (!$lang_selected)
 		{
 			$orig_lang_file = _XE_PATH_ . 'common/lang/lang.info';
 			$selected_lang_file = _XE_PATH_ . 'files/config/lang_selected.info';
-			if(!FileHandler::hasContent($selected_lang_file))
+			if (!FileHandler::hasContent($selected_lang_file))
 			{
 				$old_selected_lang_file = _XE_PATH_ . 'files/cache/lang_selected.info';
 				FileHandler::moveFile($old_selected_lang_file, $selected_lang_file);
 			}
 
-			if(!FileHandler::hasContent($selected_lang_file))
+			if (!FileHandler::hasContent($selected_lang_file))
 			{
 				$buff = FileHandler::readFile($orig_lang_file);
 				FileHandler::writeFile($selected_lang_file, $buff);
@@ -619,7 +619,7 @@ 
 			else
 			{
 				$langs = file($selected_lang_file);
-				foreach($langs as $val)
+				foreach ($langs as $val)
 				{
 					list($lang_prefix, $lang_text) = explode(',', $val);
 					$lang_text = trim($lang_text);
@@ -638,32 +638,32 @@ 
 	function checkSSO()
 	{
 		// pass if it's not GET request or XE is not yet installed
-		if($this->db_info->use_sso != 'Y' || isCrawler())
+		if ($this->db_info->use_sso != 'Y' || isCrawler())
 		{
 			return TRUE;
 		}
 		$checkActList = array('rss' => 1, 'atom' => 1);
-		if(self::getRequestMethod() != 'GET' || !self::isInstalled() || isset($checkActList[self::get('act')]))
+		if (self::getRequestMethod() != 'GET' || !self::isInstalled() || isset($checkActList[self::get('act')]))
 		{
 			return TRUE;
 		}
 
 		// pass if default URL is not set
 		$default_url = trim($this->db_info->default_url);
-		if(!$default_url)
+		if (!$default_url)
 		{
 			return TRUE;
 		}
 
-		if(substr_compare($default_url, '/', -1) !== 0)
+		if (substr_compare($default_url, '/', -1) !== 0)
 		{
 			$default_url .= '/';
 		}
 
 		// for sites recieving SSO valdiation
-		if($default_url == self::getRequestUri())
+		if ($default_url == self::getRequestUri())
 		{
-			if(self::get('default_url'))
+			if (self::get('default_url'))
 			{
 				$url = base64_decode(self::get('default_url'));
 				$url_info = parse_url($url);
@@ -671,14 +671,14 @@ 
 				$oModuleModel = getModel('module');
 				$target_domain = (stripos($url, $default_url) !== 0) ? $url_info['host'] : $default_url;
 				$site_info = $oModuleModel->getSiteInfoByDomain($target_domain);
-				if(!$site_info->site_srl) {
+				if (!$site_info->site_srl) {
 					$oModuleObject = new ModuleObject();
 					$oModuleObject->stop('msg_invalid_request');
 
 					return false;
 				}
 
-				$url_info['query'].= ($url_info['query'] ? '&' : '') . 'SSOID=' . session_id();
+				$url_info['query'] .= ($url_info['query'] ? '&' : '') . 'SSOID=' . session_id();
 				$redirect_url = sprintf('%s://%s%s%s?%s', $url_info['scheme'], $url_info['host'], $url_info['port'] ? ':' . $url_info['port'] : '', $url_info['path'], $url_info['query']);
 				header('location:' . $redirect_url);
 
@@ -689,7 +689,7 @@ 
 		else
 		{
 			// result handling : set session_name()
-			if($session_name = self::get('SSOID'))
+			if ($session_name = self::get('SSOID'))
 			{
 				setcookie(session_name(), $session_name);
 
@@ -698,7 +698,7 @@ 
 				return FALSE;
 				// send SSO request
 			}
-			else if(!self::get('SSOID') && $_COOKIE['sso'] != md5(self::getRequestUri()))
+			else if (!self::get('SSOID') && $_COOKIE['sso'] != md5(self::getRequestUri()))
 			{
 				setcookie('sso', md5(self::getRequestUri()), 0, '/');
 				$url = sprintf("%s?default_url=%s", $default_url, base64_encode(self::getRequestUrl()));
@@ -729,7 +729,7 @@ 
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 
-		if(!$self->isFTPRegisted())
+		if (!$self->isFTPRegisted())
 		{
 			return null;
 		}
@@ -747,13 +747,13 @@ 
 	 */
 	function addBrowserTitle($site_title)
 	{
-		if(!$site_title)
+		if (!$site_title)
 		{
 			return;
 		}
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 
-		if($self->site_title)
+		if ($self->site_title)
 		{
 			$self->site_title .= ' - ' . $site_title;
 		}
@@ -771,7 +771,7 @@ 
 	 */
 	function setBrowserTitle($site_title)
 	{
-		if(!$site_title)
+		if (!$site_title)
 		{
 			return;
 		}
@@ -803,7 +803,7 @@ 
 		$oModuleModel = getModel('module');
 		$moduleConfig = $oModuleModel->getModuleConfig('module');
 
-		if(isset($moduleConfig->siteTitle))
+		if (isset($moduleConfig->siteTitle))
 		{
 			return $moduleConfig->siteTitle;
 		}
@@ -830,30 +830,30 @@ 
 		global $lang;
 
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
-		if(!$self->lang_type)
+		if (!$self->lang_type)
 		{
 			return;
 		}
-		if(!is_object($lang))
+		if (!is_object($lang))
 		{
 			$lang = new stdClass;
 		}
 
-		if(!($filename = $self->_loadXmlLang($path)))
+		if (!($filename = $self->_loadXmlLang($path)))
 		{
 			$filename = $self->_loadPhpLang($path);
 		}
 
-		if(!is_array($self->loaded_lang_files))
+		if (!is_array($self->loaded_lang_files))
 		{
 			$self->loaded_lang_files = array();
 		}
-		if(in_array($filename, $self->loaded_lang_files))
+		if (in_array($filename, $self->loaded_lang_files))
 		{
 			return;
 		}
 
-		if($filename && is_readable($filename))
+		if ($filename && is_readable($filename))
 		{
 			$self->loaded_lang_files[] = $filename;
 			include($filename);
@@ -874,16 +874,16 @@ 
 	{
 		global $lang;
 
-		if(!$path) return;
+		if (!$path) return;
 
 		$_path = 'eval://' . $path;
 
-		if(in_array($_path, $this->loaded_lang_files))
+		if (in_array($_path, $this->loaded_lang_files))
 		{
 			return;
 		}
 
-		if(substr_compare($path, '/', -1) !== 0)
+		if (substr_compare($path, '/', -1) !== 0)
 		{
 			$path .= '/';
 		}
@@ -891,7 +891,7 @@ 
 		$oXmlLangParser = new XmlLangParser($path . 'lang.xml', $this->lang_type);
 		$content = $oXmlLangParser->getCompileContent();
 
-		if($content)
+		if ($content)
 		{
 			$this->loaded_lang_files[] = $_path;
 			eval($content);
@@ -906,7 +906,7 @@ 
 	 */
 	function _loadXmlLang($path)
 	{
-		if(!$path) return;
+		if (!$path) return;
 
 		$oXmlLangParser = new XmlLangParser($path . ((substr_compare($path, '/', -1) !== 0) ? '/' : '') . 'lang.xml', $this->lang_type);
 		return $oXmlLangParser->compile();
@@ -920,9 +920,9 @@ 
 	 */
 	function _loadPhpLang($path)
 	{
-		if(!$path) return;
+		if (!$path) return;
 
-		if(substr_compare($path, '/', -1) !== 0)
+		if (substr_compare($path, '/', -1) !== 0)
 		{
 			$path .= '/';
 		}
@@ -930,12 +930,12 @@ 
 		$file = sprintf($path_tpl, $this->lang_type);
 
 		$langs = array('ko', 'en'); // this will be configurable.
-		while(!is_readable($file) && $langs[0])
+		while (!is_readable($file) && $langs[0])
 		{
 			$file = sprintf($path_tpl, array_shift($langs));
 		}
 
-		if(!is_readable($file))
+		if (!is_readable($file))
 		{
 			return FALSE;
 		}
@@ -977,11 +977,11 @@ 
 	 */
 	function getLang($code)
 	{
-		if(!$code)
+		if (!$code)
 		{
 			return;
 		}
-		if($GLOBALS['lang']->{$code})
+		if ($GLOBALS['lang']->{$code})
 		{
 			return $GLOBALS['lang']->{$code};
 		}
@@ -997,7 +997,7 @@ 
 	 */
 	function setLang($code, $val)
 	{
-		if(!isset($GLOBALS['lang']))
+		if (!isset($GLOBALS['lang']))
 		{
 			$GLOBALS['lang'] = new stdClass();
 		}
@@ -1025,17 +1025,17 @@ 
 
 		$obj = clone $source_obj;
 
-		foreach($charset_list as $charset)
+		foreach ($charset_list as $charset)
 		{
-			array_walk($obj,'Context::checkConvertFlag',$charset);
+			array_walk($obj, 'Context::checkConvertFlag', $charset);
 			$flag = self::checkConvertFlag($flag = TRUE);
-			if($flag)
+			if ($flag)
 			{
-				if($charset == 'UTF-8')
+				if ($charset == 'UTF-8')
 				{
 					return $obj;
 				}
-				array_walk($obj,'Context::doConvertEncoding',$charset);
+				array_walk($obj, 'Context::doConvertEncoding', $charset);
 				return $obj;
 			}
 		}
@@ -1054,11 +1054,11 @@ 
 	function checkConvertFlag(&$val, $key = null, $charset = null)
 	{
 		static $flag = TRUE;
-		if($charset)
+		if ($charset)
 		{
-			if(is_array($val))
-				array_walk($val,'Context::checkConvertFlag',$charset);
-			else if($val && iconv($charset,$charset,$val)!=$val) $flag = FALSE;
+			if (is_array($val))
+				array_walk($val, 'Context::checkConvertFlag', $charset);
+			else if ($val && iconv($charset, $charset, $val) != $val) $flag = FALSE;
 			else $flag = FALSE;
 		}
 		else
@@ -1082,9 +1082,9 @@ 
 	{
 		if (is_array($val))
 		{
-			array_walk($val,'Context::doConvertEncoding',$charset);
+			array_walk($val, 'Context::doConvertEncoding', $charset);
 		}
-		else $val = iconv($charset,'UTF-8',$val);
+		else $val = iconv($charset, 'UTF-8', $val);
 	}
 
 	/**
@@ -1095,7 +1095,7 @@ 
 	 */
 	function convertEncodingStr($str)
 	{
-        if(!$str) return null;
+        if (!$str) return null;
 		$obj = new stdClass();
 		$obj->str = $str;
 		$obj = self::convertEncoding($obj);
@@ -1104,7 +1104,7 @@ 
 
 	function decodeIdna($domain)
 	{
-		if(strpos($domain, 'xn--') !== FALSE)
+		if (strpos($domain, 'xn--') !== FALSE)
 		{
 			require_once(_XE_PATH_ . 'libs/idna_convert/idna_convert.class.php');
 			$IDN = new idna_convert(array('idn_version' => 2008));
@@ -1137,7 +1137,7 @@ 
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 
-		if($self->response_method)
+		if ($self->response_method)
 		{
 			return $self->response_method;
 		}
@@ -1177,7 +1177,7 @@ 
 		$this->_recursiveCheckVar($_SERVER['HTTP_HOST']);
 
 		$pattern = "/[\,\"\'\{\}\[\]\(\);$]/";
-		if(preg_match($pattern, $_SERVER['HTTP_HOST']))
+		if (preg_match($pattern, $_SERVER['HTTP_HOST']))
 		{
 			$this->isSuccessInit = FALSE;
 		}
@@ -1190,30 +1190,30 @@ 
 	 */
 	function _setRequestArgument()
 	{
-		if(!count($_REQUEST))
+		if (!count($_REQUEST))
 		{
 			return;
 		}
 
 		$requestMethod = $this->getRequestMethod();
-		foreach($_REQUEST as $key => $val)
+		foreach ($_REQUEST as $key => $val)
 		{
-			if($val === '' || self::get($key))
+			if ($val === '' || self::get($key))
 			{
 				continue;
 			}
 			$key = htmlentities($key);
 			$val = $this->_filterRequestVar($key, $val);
 
-			if($requestMethod == 'GET' && isset($_GET[$key]))
+			if ($requestMethod == 'GET' && isset($_GET[$key]))
 			{
 				$set_to_vars = TRUE;
 			}
-			elseif($requestMethod == 'POST' && isset($_POST[$key]))
+			elseif ($requestMethod == 'POST' && isset($_POST[$key]))
 			{
 				$set_to_vars = TRUE;
 			}
-			elseif($requestMethod == 'JS_CALLBACK' && (isset($_GET[$key]) || isset($_POST[$key])))
+			elseif ($requestMethod == 'JS_CALLBACK' && (isset($_GET[$key]) || isset($_POST[$key])))
 			{
 				$set_to_vars = TRUE;
 			}
@@ -1222,7 +1222,7 @@ 
 				$set_to_vars = FALSE;
 			}
 
-			if($set_to_vars)
+			if ($set_to_vars)
 			{
 				$this->_recursiveCheckVar($val);
 			}
@@ -1233,20 +1233,20 @@ 
 
 	function _recursiveCheckVar($val)
 	{
-		if(is_string($val))
+		if (is_string($val))
 		{
-			foreach($this->patterns as $pattern)
+			foreach ($this->patterns as $pattern)
 			{
-				if(preg_match($pattern, $val))
+				if (preg_match($pattern, $val))
 				{
 					$this->isSuccessInit = FALSE;
 					return;
 				}
 			}
 		}
-		else if(is_array($val))
+		else if (is_array($val))
 		{
-			foreach($val as $val2)
+			foreach ($val as $val2)
 			{
 				$this->_recursiveCheckVar($val2);
 			}
@@ -1260,7 +1260,7 @@ 
 	 */
 	function _setJSONRequestArgument()
 	{
-		if($this->getRequestMethod() != 'JSON')
+		if ($this->getRequestMethod() != 'JSON')
 		{
 			return;
 		}
@@ -1268,7 +1268,7 @@ 
 		$params = array();
 		parse_str($GLOBALS['HTTP_RAW_POST_DATA'], $params);
 
-		foreach($params as $key => $val)
+		foreach ($params as $key => $val)
 		{
 			$this->set($key, $this->_filterRequestVar($key, $val, 1), TRUE);
 		}
@@ -1281,13 +1281,13 @@ 
 	 */
 	function _setXmlRpcArgument()
 	{
-		if($this->getRequestMethod() != 'XMLRPC')
+		if ($this->getRequestMethod() != 'XMLRPC')
 		{
 			return;
 		}
 
 		$xml = $GLOBALS['HTTP_RAW_POST_DATA'];
-		if(Security::detectingXEE($xml))
+		if (Security::detectingXEE($xml))
 		{
 			header("HTTP/1.0 400 Bad Request");
 			exit;
@@ -1299,12 +1299,12 @@ 
 		$params = $xml_obj->methodcall->params;
 		unset($params->node_name, $params->attrs, $params->body);
 
-		if(!count(get_object_vars($params)))
+		if (!count(get_object_vars($params)))
 		{
 			return;
 		}
 
-		foreach($params as $key => $val)
+		foreach ($params as $key => $val)
 		{
 			$this->set($key, $this->_filterXmlVars($key, $val), TRUE);
 		}
@@ -1319,10 +1319,10 @@ 
 	 */
 	function _filterXmlVars($key, $val)
 	{
-		if(is_array($val))
+		if (is_array($val))
 		{
 			$stack = array();
-			foreach($val as $k => $v)
+			foreach ($val as $k => $v)
 			{
 				$stack[$k] = $this->_filterXmlVars($k, $v);
 			}
@@ -1332,20 +1332,20 @@ 
 
 		$body = $val->body;
 		unset($val->node_name, $val->attrs, $val->body);
-		if(!count(get_object_vars($val)))
+		if (!count(get_object_vars($val)))
 		{
 			return $this->_filterRequestVar($key, $body, 0);
 		}
 
 		$stack = new stdClass();
-		foreach($val as $k => $v)
+		foreach ($val as $k => $v)
 		{
 			$output = $this->_filterXmlVars($k, $v);
-			if(is_object($v) && $v->attrs->type == 'array')
+			if (is_object($v) && $v->attrs->type == 'array')
 			{
 				$output = array($output);
 			}
-			if($k == 'value' && (is_array($v) || $v->attrs->type == 'array'))
+			if ($k == 'value' && (is_array($v) || $v->attrs->type == 'array'))
 			{
 				return $output;
 			}
@@ -1353,7 +1353,7 @@ 
 			$stack->{$k} = $output;
 		}
 
-		if(!count(get_object_vars($stack)))
+		if (!count(get_object_vars($stack)))
 		{
 			return NULL;
 		}
@@ -1372,24 +1372,24 @@ 
 	 */
 	function _filterRequestVar($key, $val, $do_stripslashes = 1)
 	{
-		if(!($isArray = is_array($val)))
+		if (!($isArray = is_array($val)))
 		{
 			$val = array($val);
 		}
 
 		$result = array();
-		foreach($val as $k => $v)
+		foreach ($val as $k => $v)
 		{
 			$k = htmlentities($k);
-			if($key === 'page' || $key === 'cpage' || substr_compare($key, 'srl', -3) === 0)
+			if ($key === 'page' || $key === 'cpage' || substr_compare($key, 'srl', -3) === 0)
 			{
 				$result[$k] = !preg_match('/^[0-9,]+$/', $v) ? (int) $v : $v;
 			}
-			elseif($key === 'mid' || $key === 'search_keyword')
+			elseif ($key === 'mid' || $key === 'search_keyword')
 			{
 				$result[$k] = htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 			}
-			elseif($key === 'vid')
+			elseif ($key === 'vid')
 			{
 				$result[$k] = urlencode($v);
 			}
@@ -1397,12 +1397,12 @@ 
 			{
 				$result[$k] = $v;
 
-				if($do_stripslashes && version_compare(PHP_VERSION, '5.4.0', '<') && get_magic_quotes_gpc())
+				if ($do_stripslashes && version_compare(PHP_VERSION, '5.4.0', '<') && get_magic_quotes_gpc())
 				{
 					$result[$k] = stripslashes($result[$k]);
 				}
 
-				if(!is_array($result[$k]))
+				if (!is_array($result[$k]))
 				{
 					$result[$k] = trim($result[$k]);
 				}
@@ -1430,17 +1430,17 @@ 
 	 */
 	function _setUploadedArgument()
 	{
-		if($_SERVER['REQUEST_METHOD'] != 'POST' || !$_FILES || (stripos($_SERVER['CONTENT_TYPE'], 'multipart/form-data') === FALSE && stripos($_SERVER['HTTP_CONTENT_TYPE'], 'multipart/form-data') === FALSE))
+		if ($_SERVER['REQUEST_METHOD'] != 'POST' || !$_FILES || (stripos($_SERVER['CONTENT_TYPE'], 'multipart/form-data') === FALSE && stripos($_SERVER['HTTP_CONTENT_TYPE'], 'multipart/form-data') === FALSE))
 		{
 			return;
 		}
 
-		foreach($_FILES as $key => $val)
+		foreach ($_FILES as $key => $val)
 		{
 			$tmp_name = $val['tmp_name'];
-			if(!is_array($tmp_name))
+			if (!is_array($tmp_name))
 			{
-				if(!$tmp_name || !is_uploaded_file($tmp_name))
+				if (!$tmp_name || !is_uploaded_file($tmp_name))
 				{
 					continue;
 				}
@@ -1450,9 +1450,9 @@ 
 			}
 			else
 			{
-				for($i = 0, $c = count($tmp_name); $i < $c; $i++)
+				for ($i = 0, $c = count($tmp_name); $i < $c; $i++)
 				{
-					if($val['size'][$i] > 0)
+					if ($val['size'][$i] > 0)
 					{
 						$file['name'] = $val['name'][$i];
 						$file['type'] = $val['type'][$i];
@@ -1484,12 +1484,12 @@ 
 	function getRequestUrl()
 	{
 		static $url = null;
-		if(is_null($url))
+		if (is_null($url))
 		{
 			$url = self::getRequestUri();
-			if(count($_GET) > 0)
+			if (count($_GET) > 0)
 			{
-				foreach($_GET as $key => $val)
+				foreach ($_GET as $key => $val)
 				{
 					$vars[] = $key . '=' . ($val ? urlencode(self::convertEncodingStr($val)) : '');
 				}
@@ -1508,7 +1508,7 @@ 
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 		$js_callback_func = isset($_GET['xe_js_callback']) ? $_GET['xe_js_callback'] : $_POST['xe_js_callback'];
 
-		if(!preg_match('/^[a-z0-9\.]+$/i', $js_callback_func))
+		if (!preg_match('/^[a-z0-9\.]+$/i', $js_callback_func))
 		{
 			unset($js_callback_func);
 			unset($_GET['xe_js_callback']);
@@ -1536,22 +1536,22 @@ 
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 
 		// retrieve virtual site information
-		if(is_null($site_module_info))
+		if (is_null($site_module_info))
 		{
 			$site_module_info = self::get('site_module_info');
 		}
 
 		// If $domain is set, handle it (if $domain is vid type, remove $domain and handle with $vid)
-		if($domain && isSiteID($domain))
+		if ($domain && isSiteID($domain))
 		{
 			$vid = $domain;
 			$domain = '';
 		}
 
 		// If $domain, $vid are not set, use current site information
-		if(!$domain && !$vid)
+		if (!$domain && !$vid)
 		{
-			if($site_module_info->domain && isSiteID($site_module_info->domain))
+			if ($site_module_info->domain && isSiteID($site_module_info->domain))
 			{
 				$vid = $site_module_info->domain;
 			}
@@ -1562,21 +1562,21 @@ 
 		}
 
 		// if $domain is set, compare current URL. If they are same, remove the domain, otherwise link to the domain.
-		if($domain)
+		if ($domain)
 		{
 			$domain_info = parse_url($domain);
-			if(is_null($current_info))
+			if (is_null($current_info))
 			{
 				$current_info = parse_url(($_SERVER['HTTPS'] == 'on' ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . getScriptPath());
 			}
-			if($domain_info['host'] . $domain_info['path'] == $current_info['host'] . $current_info['path'])
+			if ($domain_info['host'] . $domain_info['path'] == $current_info['host'] . $current_info['path'])
 			{
 				unset($domain);
 			}
 			else
 			{
 				$domain = preg_replace('/^(http|https):\/\//i', '', trim($domain));
-				if(substr_compare($domain, '/', -1) !== 0)
+				if (substr_compare($domain, '/', -1) !== 0)
 				{
 					$domain .= '/';
 				}
@@ -1586,10 +1586,10 @@ 
 		$get_vars = array();
 
 		// If there is no GET variables or first argument is '' to reset variables
-		if(!$self->get_vars || $args_list[0] == '')
+		if (!$self->get_vars || $args_list[0] == '')
 		{
 			// rearrange args_list
-			if(is_array($args_list) && $args_list[0] == '')
+			if (is_array($args_list) && $args_list[0] == '')
 			{
 				array_shift($args_list);
 			}
@@ -1601,13 +1601,13 @@ 
 		}
 
 		// arrange args_list
-		for($i = 0, $c = count($args_list); $i < $c; $i += 2)
+		for ($i = 0, $c = count($args_list); $i < $c; $i += 2)
 		{
 			$key = $args_list[$i];
 			$val = trim($args_list[$i + 1]);
 
 			// If value is not set, remove the key
-			if(!isset($val) || !strlen($val))
+			if (!isset($val) || !strlen($val))
 			{
 				unset($get_vars[$key]);
 				continue;
@@ -1618,7 +1618,7 @@ 
 
 		// remove vid, rnd
 		unset($get_vars['rnd']);
-		if($vid)
+		if ($vid)
 		{
 			$get_vars['vid'] = $vid;
 		}
@@ -1635,17 +1635,17 @@ 
 			'dispDocumentAdminManageDocument' => 'dispDocumentManageDocument',
 			'dispModuleAdminSelectList' => 'dispModuleSelectList'
 		);
-		if($act_alias[$act])
+		if ($act_alias[$act])
 		{
 			$get_vars['act'] = $act_alias[$act];
 		}
 
 		// organize URL
 		$query = '';
-		if(count($get_vars) > 0)
+		if (count($get_vars) > 0)
 		{
 			// if using rewrite mod
-			if($self->allow_rewrite)
+			if ($self->allow_rewrite)
 			{
 				$var_keys = array_keys($get_vars);
 				sort($var_keys);
@@ -1683,24 +1683,24 @@ 
 				$query = $target_map[$target];
 			}
 
-			if(!$query)
+			if (!$query)
 			{
 				$queries = array();
-				foreach($get_vars as $key => $val)
+				foreach ($get_vars as $key => $val)
 				{
-					if(is_array($val) && count($val) > 0)
+					if (is_array($val) && count($val) > 0)
 					{
-						foreach($val as $k => $v)
+						foreach ($val as $k => $v)
 						{
 							$queries[] = $key . '[' . $k . ']=' . urlencode($v);
 						}
 					}
-					elseif(!is_array($val))
+					elseif (!is_array($val))
 					{
 						$queries[] = $key . '=' . urlencode($val);
 					}
 				}
-				if(count($queries) > 0)
+				if (count($queries) > 0)
 				{
 					$query = 'index.php?' . join('&', $queries);
 				}
@@ -1709,12 +1709,12 @@ 
 
 		// If using SSL always
 		$_use_ssl = $self->get('_use_ssl');
-		if($_use_ssl == 'always')
+		if ($_use_ssl == 'always')
 		{
 			$query = $self->getRequestUri(ENFORCE_SSL, $domain) . $query;
 			// optional SSL use
 		}
-		elseif($_use_ssl == 'optional')
+		elseif ($_use_ssl == 'optional')
 		{
 			$ssl_mode = (($self->get('module') === 'admin') || ($get_vars['module'] === 'admin') || (isset($get_vars['act']) && $self->isExistsSSLAction($get_vars['act']))) ? ENFORCE_SSL : RELEASE_SSL;
 			$query = $self->getRequestUri($ssl_mode, $domain) . $query;
@@ -1723,11 +1723,11 @@ 
 		else
 		{
 			// currently on SSL but target is not based on SSL
-			if($_SERVER['HTTPS'] == 'on')
+			if ($_SERVER['HTTPS'] == 'on')
 			{
 				$query = $self->getRequestUri(ENFORCE_SSL, $domain) . $query;
 			}
-			else if($domain) // if $domain is set
+			else if ($domain) // if $domain is set
 			{
 				$query = $self->getRequestUri(FOLLOW_REQUEST_SSL, $domain) . $query;
 			}
@@ -1737,12 +1737,12 @@ 
 			}
 		}
 
-		if(!$encode)
+		if (!$encode)
 		{
 			return $query;
 		}
 
-		if(!$autoEncode)
+		if (!$autoEncode)
 		{
 			return htmlspecialchars($query, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 		}
@@ -1751,9 +1751,9 @@ 
 		$encode_queries = array();
 		$parsedUrl = parse_url($query);
 		parse_str($parsedUrl['query'], $output);
-		foreach($output as $key => $value)
+		foreach ($output as $key => $value)
 		{
-			if(preg_match('/&([a-z]{2,}|#\d+);/', urldecode($value)))
+			if (preg_match('/&([a-z]{2,}|#\d+);/', urldecode($value)))
 			{
 				$value = urlencode(htmlspecialchars_decode(urldecode($value)));
 			}
@@ -1775,17 +1775,17 @@ 
 		static $url = array();
 
 		// Check HTTP Request
-		if(!isset($_SERVER['SERVER_PROTOCOL']))
+		if (!isset($_SERVER['SERVER_PROTOCOL']))
 		{
 			return;
 		}
 
-		if(self::get('_use_ssl') == 'always')
+		if (self::get('_use_ssl') == 'always')
 		{
 			$ssl_mode = ENFORCE_SSL;
 		}
 
-		if($domain)
+		if ($domain)
 		{
 			$domain_key = md5($domain);
 		}
@@ -1794,14 +1794,14 @@ 
 			$domain_key = 'default';
 		}
 
-		if(isset($url[$ssl_mode][$domain_key]))
+		if (isset($url[$ssl_mode][$domain_key]))
 		{
 			return $url[$ssl_mode][$domain_key];
 		}
 
 		$current_use_ssl = ($_SERVER['HTTPS'] == 'on');
 
-		switch($ssl_mode)
+		switch ($ssl_mode)
 		{
 			case FOLLOW_REQUEST_SSL: $use_ssl = $current_use_ssl;
 				break;
@@ -1811,12 +1811,12 @@ 
 				break;
 		}
 
-		if($domain)
+		if ($domain)
 		{
 			$target_url = trim($domain);
-			if(substr_compare($target_url, '/', -1) !== 0)
+			if (substr_compare($target_url, '/', -1) !== 0)
 			{
-				$target_url.= '/';
+				$target_url .= '/';
 			}
 		}
 		else
@@ -1826,19 +1826,19 @@ 
 
 		$url_info = parse_url('http://' . $target_url);
 
-		if($current_use_ssl != $use_ssl)
+		if ($current_use_ssl != $use_ssl)
 		{
 			unset($url_info['port']);
 		}
 
-		if($use_ssl)
+		if ($use_ssl)
 		{
 			$port = self::get('_https_port');
-			if($port && $port != 443)
+			if ($port && $port != 443)
 			{
 				$url_info['port'] = $port;
 			}
-			elseif($url_info['port'] == 443)
+			elseif ($url_info['port'] == 443)
 			{
 				unset($url_info['port']);
 			}
@@ -1846,11 +1846,11 @@ 
 		else
 		{
 			$port = self::get('_http_port');
-			if($port && $port != 80)
+			if ($port && $port != 80)
 			{
 				$url_info['port'] = $port;
 			}
-			elseif($url_info['port'] == 80)
+			elseif ($url_info['port'] == 80)
 			{
 				unset($url_info['port']);
 			}
@@ -1873,16 +1873,16 @@ 
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 		$self->context->{$key} = $val;
-		if($set_to_get_vars === FALSE)
+		if ($set_to_get_vars === FALSE)
 		{
 			return;
 		}
-		if($val === NULL || $val === '')
+		if ($val === NULL || $val === '')
 		{
 			unset($self->get_vars->{$key});
 			return;
 		}
-		if($set_to_get_vars || $self->get_vars->{$key})
+		if ($set_to_get_vars || $self->get_vars->{$key})
 		{
 			$self->get_vars->{$key} = $val;
 		}
@@ -1898,7 +1898,7 @@ 
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 
-		if(!isset($self->context->{$key}))
+		if (!isset($self->context->{$key}))
 		{
 			return null;
 		}
@@ -1913,7 +1913,7 @@ 
 	function gets()
 	{
 		$num_args = func_num_args();
-		if($num_args < 1)
+		if ($num_args < 1)
 		{
 			return;
 		}
@@ -1921,7 +1921,7 @@ 
 
 		$args_list = func_get_args();
 		$output = new stdClass();
-		foreach($args_list as $v)
+		foreach ($args_list as $v)
 		{
 			$output->{$v} = $self->get($v);
 		}
@@ -1947,7 +1947,7 @@ 
 	function getRequestVars()
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
-		if($self->get_vars)
+		if ($self->get_vars)
 		{
 			return clone($self->get_vars);
 		}
@@ -1964,13 +1964,13 @@ 
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 
-		if(!is_readable($self->sslActionCacheFile))
+		if (!is_readable($self->sslActionCacheFile))
 		{
 			$buff = '<?php if(!defined("__XE__"))exit;';
 			FileHandler::writeFile($self->sslActionCacheFile, $buff);
 		}
 
-		if(!isset($self->ssl_actions[$action]))
+		if (!isset($self->ssl_actions[$action]))
 		{
 			$self->ssl_actions[$action] = 1;
 			$sslActionCacheString = sprintf('$sslActions[\'%s\'] = 1;', $action);
@@ -1988,16 +1988,16 @@ 
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 
-		if(!is_readable($self->sslActionCacheFile))
+		if (!is_readable($self->sslActionCacheFile))
 		{
 			unset($self->ssl_actions);
 			$buff = '<?php if(!defined("__XE__"))exit;';
 			FileHandler::writeFile($self->sslActionCacheFile, $buff);
 		}
 
-		foreach($action_array as $action)
+		foreach ($action_array as $action)
 		{
-			if(!isset($self->ssl_actions[$action]))
+			if (!isset($self->ssl_actions[$action]))
 			{
 				$self->ssl_actions[$action] = 1;
 				$sslActionCacheString = sprintf('$sslActions[\'%s\'] = 1;', $action);
@@ -2016,7 +2016,7 @@ 
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 
-		if($self->isExistsSSLAction($action))
+		if ($self->isExistsSSLAction($action))
 		{
 			$sslActionCacheString = sprintf('$sslActions[\'%s\'] = 1;', $action);
 			$buff = FileHandler::readFile($self->sslActionCacheFile);
@@ -2033,7 +2033,7 @@ 
 	function getSSLActions()
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
-		if($self->getSslStatus() == 'optional')
+		if ($self->getSslStatus() == 'optional')
 		{
 			return $self->ssl_actions;
 		}
@@ -2060,12 +2060,12 @@ 
 	 */
 	function normalizeFilePath($file)
 	{
-		if($file{0} != '/' && $file{0} != '.' && strpos($file, '://') === FALSE)
+		if ($file{0} != '/' && $file{0} != '.' && strpos($file, '://') === FALSE)
 		{
 			$file = './' . $file;
 		}
 		$file = preg_replace('@/\./|(?<!:)\/\/@', '/', $file);
-		while(strpos($file, '/../') !== FALSE)
+		while (strpos($file, '/../') !== FALSE)
 		{
 			$file = preg_replace('/\/([^\/]+)\/\.\.\//s', '/', $file, 1);
 		}
@@ -2083,11 +2083,11 @@ 
 	function getAbsFileUrl($file)
 	{
 		$file = self::normalizeFilePath($file);
-		if(strpos($file, './') === 0)
+		if (strpos($file, './') === 0)
 		{
 			$file = dirname($_SERVER['SCRIPT_NAME']) . '/' . substr($file, 2);
 		}
-		elseif(strpos($file, '../') === 0)
+		elseif (strpos($file, '../') === 0)
 		{
 			$file = self::normalizeFilePath(dirname($_SERVER['SCRIPT_NAME']) . "/{$file}");
 		}
@@ -2159,12 +2159,12 @@ 
 	 */
 	function addJsFile($file, $optimized = FALSE, $targetie = '', $index = 0, $type = 'head', $isRuleset = FALSE, $autoPath = null)
 	{
-		if($isRuleset)
+		if ($isRuleset)
 		{
-			if(strpos($file, '#') !== FALSE)
+			if (strpos($file, '#') !== FALSE)
 			{
 				$file = str_replace('#', '', $file);
-				if(!is_readable($file))
+				if (!is_readable($file))
 				{
 					$file = $autoPath;
 				}
@@ -2229,9 +2229,9 @@ 
 		ksort($files);
 		$files = array_values($files);
 		$filenames = array();
-		for($i = 0, $c = count($files); $i < $c; ++$i)
+		for ($i = 0, $c = count($files); $i < $c; ++$i)
 		{
-			if(in_array($files[$i]['file'], $filenames))
+			if (in_array($files[$i]['file'], $filenames))
 			{
 				unset($files[$i]);
 			}
@@ -2316,14 +2316,14 @@ 
 	 */
 	function getJavascriptPluginInfo($pluginName)
 	{
-		if($plugin_name == 'ui.datepicker')
+		if ($plugin_name == 'ui.datepicker')
 		{
 			$plugin_name = 'ui';
 		}
 
 		$plugin_path = './common/js/plugins/' . $pluginName . '/';
 		$info_file = $plugin_path . 'plugin.load';
-		if(!is_readable($info_file))
+		if (!is_readable($info_file))
 		{
 			return;
 		}
@@ -2333,30 +2333,30 @@ 
 		$result->jsList = array();
 		$result->cssList = array();
 
-		foreach($list as $filename)
+		foreach ($list as $filename)
 		{
 			$filename = trim($filename);
-			if(!$filename)
+			if (!$filename)
 			{
 				continue;
 			}
 
-			if(strncasecmp('./', $filename, 2) === 0)
+			if (strncasecmp('./', $filename, 2) === 0)
 			{
 				$filename = substr($filename, 2);
 			}
 
-			if(substr_compare($filename, '.js', -3) === 0)
+			if (substr_compare($filename, '.js', -3) === 0)
 			{
 				$result->jsList[] = $plugin_path . $filename;
 			}
-			elseif(substr_compare($filename, '.css', -4) === 0)
+			elseif (substr_compare($filename, '.css', -4) === 0)
 			{
 				$result->cssList[] = $plugin_path . $filename;
 			}
 		}
 
-		if(is_dir($plugin_path . 'lang'))
+		if (is_dir($plugin_path . 'lang'))
 		{
 			$result->langPath = $plugin_path . 'lang';
 		}
@@ -2374,12 +2374,12 @@ 
 		static $loaded_plugins = array();
 
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
-		if($plugin_name == 'ui.datepicker')
+		if ($plugin_name == 'ui.datepicker')
 		{
 			$plugin_name = 'ui';
 		}
 
-		if($loaded_plugins[$plugin_name])
+		if ($loaded_plugins[$plugin_name])
 		{
 			return;
 		}
@@ -2387,35 +2387,35 @@ 
 
 		$plugin_path = './common/js/plugins/' . $plugin_name . '/';
 		$info_file = $plugin_path . 'plugin.load';
-		if(!is_readable($info_file))
+		if (!is_readable($info_file))
 		{
 			return;
 		}
 
 		$list = file($info_file);
-		foreach($list as $filename)
+		foreach ($list as $filename)
 		{
 			$filename = trim($filename);
-			if(!$filename)
+			if (!$filename)
 			{
 				continue;
 			}
 
-			if(strncasecmp('./', $filename, 2) === 0)
+			if (strncasecmp('./', $filename, 2) === 0)
 			{
 				$filename = substr($filename, 2);
 			}
-			if(substr_compare($filename, '.js', -3) === 0)
+			if (substr_compare($filename, '.js', -3) === 0)
 			{
 				$self->loadFile(array($plugin_path . $filename, 'body', '', 0), TRUE);
 			}
-			if(substr_compare($filename, '.css', -4) === 0)
+			if (substr_compare($filename, '.css', -4) === 0)
 			{
 				$self->loadFile(array($plugin_path . $filename, 'all', '', 0), TRUE);
 			}
 		}
 
-		if(is_dir($plugin_path . 'lang'))
+		if (is_dir($plugin_path . 'lang'))
 		{
 			$self->loadLang($plugin_path . 'lang');
 		}
@@ -2587,14 +2587,14 @@ 
 		$_path = explode('/', $path);
 		$_base = explode('/', $base_url);
 
-		if(!$_base[count($_base) - 1])
+		if (!$_base[count($_base) - 1])
 		{
 			array_pop($_base);
 		}
 
-		foreach($_xe as $idx => $dir)
+		foreach ($_xe as $idx => $dir)
 		{
-			if($_path[0] != $dir)
+			if ($_path[0] != $dir)
 			{
 				break;
 			}
@@ -2602,9 +2602,9 @@ 
 		}
 
 		$idx = count($_xe) - $idx - 1;
-		while($idx--)
+		while ($idx--)
 		{
-			if(count($_base) > 0)
+			if (count($_base) > 0)
 			{
 				array_shift($_base);
 			}
@@ -2614,13 +2614,13 @@ 
 			}
 		}
 
-		if(count($_base) > 0)
+		if (count($_base) > 0)
 		{
 			array_unshift($_path, join('/', $_base));
 		}
 
 		$path = '/' . join('/', $_path);
-		if(substr_compare($path, '/', -1) !== 0)
+		if (substr_compare($path, '/', -1) !== 0)
 		{
 			$path .= '/';
 		}
@@ -2635,13 +2635,13 @@ 
 	{
 		is_a($this, 'Context') ? $self = $this : $self = self::getInstance();
 
-		if(!is_array($self->meta_tags))
+		if (!is_array($self->meta_tags))
 		{
 			$self->meta_tags = array();
 		}
 
 		$ret = array();
-		foreach($self->meta_tags as $key => $val)
+		foreach ($self->meta_tags as $key => $val)
 		{
 			list($name, $is_http_equiv) = explode("\t", $key);
 			$ret[] = array('name' => $name, 'is_http_equiv' => $is_http_equiv, 'content' => $val);

Braces +85 added lines, -93 removed lines

@@ -201,8 +201,12 @@ 
 	function init()
 	{
 		if(!isset($GLOBALS['HTTP_RAW_POST_DATA']) && version_compare(PHP_VERSION, '5.6.0', '>=') === true) {
-			if(simplexml_load_string(file_get_contents("php://input")) !== false) $GLOBALS['HTTP_RAW_POST_DATA'] = file_get_contents("php://input");
-			if(strpos($_SERVER['CONTENT_TYPE'], 'json') || strpos($_SERVER['HTTP_CONTENT_TYPE'], 'json')) $GLOBALS['HTTP_RAW_POST_DATA'] = file_get_contents("php://input");
+			if(simplexml_load_string(file_get_contents("php://input")) !== false) {
+				$GLOBALS['HTTP_RAW_POST_DATA'] = file_get_contents("php://input");
+			}
+			if(strpos($_SERVER['CONTENT_TYPE'], 'json') || strpos($_SERVER['HTTP_CONTENT_TYPE'], 'json')) {
+				$GLOBALS['HTTP_RAW_POST_DATA'] = file_get_contents("php://input");
+			}
 		}
 
 		// set context variables in $GLOBALS (to use in display handler)
@@ -223,7 +227,9 @@ 
 		$this->loadDBInfo();
 		if($this->db_info->use_sitelock == 'Y')
 		{
-			if(is_array($this->db_info->sitelock_whitelist)) $whitelist = $this->db_info->sitelock_whitelist;
+			if(is_array($this->db_info->sitelock_whitelist)) {
+				$whitelist = $this->db_info->sitelock_whitelist;
+			}
 
 			if(!IpFilter::filter($whitelist))
 			{
@@ -238,8 +244,7 @@ 
 				if(FileHandler::exists(_XE_PATH_ . 'common/tpl/sitelock.user.html'))
 				{
 					include _XE_PATH_ . 'common/tpl/sitelock.user.html';
-				}
-				else
+				} else
 				{
 					include _XE_PATH_ . 'common/tpl/sitelock.html';
 				}
@@ -296,8 +301,7 @@ 
 			{
 				setcookie('lang_type', $this->lang_type, $_SERVER['REQUEST_TIME'] + 3600 * 24 * 1000, '/');
 			}
-		}
-		elseif($_COOKIE['lang_type'])
+		} elseif($_COOKIE['lang_type'])
 		{
 			$this->lang_type = $_COOKIE['lang_type'];
 		}
@@ -334,7 +338,9 @@ 
 			);
 		}
 
-		if($sess = $_POST[session_name()]) session_id($sess);
+		if($sess = $_POST[session_name()]) {
+			session_id($sess);
+		}
 		session_start();
 
 		// set authentication information in Context and session
@@ -387,22 +393,21 @@ 
 						{
 							$url[] = $key . '[' . $k . ']=' . urlencode($v);
 						}
-					}
-					elseif($val)
+					} elseif($val)
 					{
 						$url[] = $key . '=' . urlencode($val);
 					}
 				}
 
 				$current_url = self::getRequestUri();
-				if($url) $current_url .= '?' . join('&', $url);
-			}
-			else
+				if($url) {
+					$current_url .= '?' . join('&', $url);
+				}
+			} else
 			{
 				$current_url = $this->getUrl();
 			}
-		}
-		else
+		} else
 		{
 			$current_url = self::getRequestUri();
 		}
@@ -487,18 +492,22 @@ 
 			$db_info->use_prepared_statements = 'Y';
 		}
 
-		if(!$db_info->time_zone)
-			$db_info->time_zone = date('O');
+		if(!$db_info->time_zone) {
+					$db_info->time_zone = date('O');
+		}
 		$GLOBALS['_time_zone'] = $db_info->time_zone;
 
-		if($db_info->qmail_compatibility != 'Y')
-			$db_info->qmail_compatibility = 'N';
+		if($db_info->qmail_compatibility != 'Y') {
+					$db_info->qmail_compatibility = 'N';
+		}
 		$GLOBALS['_qmail_compatibility'] = $db_info->qmail_compatibility;
 
-		if(!$db_info->use_db_session)
-			$db_info->use_db_session = 'N';
-		if(!$db_info->use_ssl)
-			$db_info->use_ssl = 'none';
+		if(!$db_info->use_db_session) {
+					$db_info->use_db_session = 'N';
+		}
+		if(!$db_info->use_ssl) {
+					$db_info->use_ssl = 'none';
+		}
 		$this->set('_use_ssl', $db_info->use_ssl);
 
 		$self->set('_http_port', ($db_info->http_port) ? $db_info->http_port : NULL);
@@ -615,8 +624,7 @@ 
 				$buff = FileHandler::readFile($orig_lang_file);
 				FileHandler::writeFile($selected_lang_file, $buff);
 				$lang_selected = self::loadLangSupported();
-			}
-			else
+			} else
 			{
 				$langs = file($selected_lang_file);
 				foreach($langs as $val)
@@ -685,8 +693,7 @@ 
 				return FALSE;
 			}
 			// for sites requesting SSO validation
-		}
-		else
+		} else
 		{
 			// result handling : set session_name()
 			if($session_name = self::get('SSOID'))
@@ -697,8 +704,7 @@ 
 				header('location:' . $url);
 				return FALSE;
 				// send SSO request
-			}
-			else if(!self::get('SSOID') && $_COOKIE['sso'] != md5(self::getRequestUri()))
+			} else if(!self::get('SSOID') && $_COOKIE['sso'] != md5(self::getRequestUri()))
 			{
 				setcookie('sso', md5(self::getRequestUri()), 0, '/');
 				$url = sprintf("%s?default_url=%s", $default_url, base64_encode(self::getRequestUrl()));
@@ -756,8 +762,7 @@ 
 		if($self->site_title)
 		{
 			$self->site_title .= ' - ' . $site_title;
-		}
-		else
+		} else
 		{
 			$self->site_title = $site_title;
 		}
@@ -857,8 +862,7 @@ 
 		{
 			$self->loaded_lang_files[] = $filename;
 			include($filename);
-		}
-		else
+		} else
 		{
 			$self->_evalxmlLang($path);
 		}
@@ -874,7 +878,9 @@ 
 	{
 		global $lang;
 
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		$_path = 'eval://' . $path;
 
@@ -906,7 +912,9 @@ 
 	 */
 	function _loadXmlLang($path)
 	{
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		$oXmlLangParser = new XmlLangParser($path . ((substr_compare($path, '/', -1) !== 0) ? '/' : '') . 'lang.xml', $this->lang_type);
 		return $oXmlLangParser->compile();
@@ -920,7 +928,9 @@ 
 	 */
 	function _loadPhpLang($path)
 	{
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		if(substr_compare($path, '/', -1) !== 0)
 		{
@@ -1056,12 +1066,14 @@ 
 		static $flag = TRUE;
 		if($charset)
 		{
-			if(is_array($val))
-				array_walk($val,'Context::checkConvertFlag',$charset);
-			else if($val && iconv($charset,$charset,$val)!=$val) $flag = FALSE;
-			else $flag = FALSE;
-		}
-		else
+			if(is_array($val)) {
+							array_walk($val,'Context::checkConvertFlag',$charset);
+			} else if($val && iconv($charset,$charset,$val)!=$val) {
+				$flag = FALSE;
+			} else {
+				$flag = FALSE;
+			}
+		} else
 		{
 			$return = $flag;
 			$flag = TRUE;
@@ -1083,8 +1095,9 @@ 
 		if (is_array($val))
 		{
 			array_walk($val,'Context::doConvertEncoding',$charset);
+		} else {
+			$val = iconv($charset,'UTF-8',$val);
 		}
-		else $val = iconv($charset,'UTF-8',$val);
 	}
 
 	/**
@@ -1095,7 +1108,9 @@ 
 	 */
 	function convertEncodingStr($str)
 	{
-        if(!$str) return null;
+        if(!$str) {
+        	return null;
+        }
 		$obj = new stdClass();
 		$obj->str = $str;
 		$obj = self::convertEncoding($obj);
@@ -1208,16 +1223,13 @@ 
 			if($requestMethod == 'GET' && isset($_GET[$key]))
 			{
 				$set_to_vars = TRUE;
-			}
-			elseif($requestMethod == 'POST' && isset($_POST[$key]))
+			} elseif($requestMethod == 'POST' && isset($_POST[$key]))
 			{
 				$set_to_vars = TRUE;
-			}
-			elseif($requestMethod == 'JS_CALLBACK' && (isset($_GET[$key]) || isset($_POST[$key])))
+			} elseif($requestMethod == 'JS_CALLBACK' && (isset($_GET[$key]) || isset($_POST[$key])))
 			{
 				$set_to_vars = TRUE;
-			}
-			else
+			} else
 			{
 				$set_to_vars = FALSE;
 			}
@@ -1243,8 +1255,7 @@ 
 					return;
 				}
 			}
-		}
-		else if(is_array($val))
+		} else if(is_array($val))
 		{
 			foreach($val as $val2)
 			{
@@ -1384,16 +1395,13 @@ 
 			if($key === 'page' || $key === 'cpage' || substr_compare($key, 'srl', -3) === 0)
 			{
 				$result[$k] = !preg_match('/^[0-9,]+$/', $v) ? (int) $v : $v;
-			}
-			elseif($key === 'mid' || $key === 'search_keyword')
+			} elseif($key === 'mid' || $key === 'search_keyword')
 			{
 				$result[$k] = htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
-			}
-			elseif($key === 'vid')
+			} elseif($key === 'vid')
 			{
 				$result[$k] = urlencode($v);
-			}
-			else
+			} else
 			{
 				$result[$k] = $v;
 
@@ -1447,8 +1455,7 @@ 
 				$val['name'] = htmlspecialchars($val['name'], ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 				$this->set($key, $val, TRUE);
 				$this->is_uploaded = TRUE;
-			}
-			else
+			} else
 			{
 				for($i = 0, $c = count($tmp_name); $i < $c; $i++)
 				{
@@ -1554,8 +1561,7 @@ 
 			if($site_module_info->domain && isSiteID($site_module_info->domain))
 			{
 				$vid = $site_module_info->domain;
-			}
-			else
+			} else
 			{
 				$domain = $site_module_info->domain;
 			}
@@ -1572,8 +1578,7 @@ 
 			if($domain_info['host'] . $domain_info['path'] == $current_info['host'] . $current_info['path'])
 			{
 				unset($domain);
-			}
-			else
+			} else
 			{
 				$domain = preg_replace('/^(http|https):\/\//i', '', trim($domain));
 				if(substr_compare($domain, '/', -1) !== 0)
@@ -1593,8 +1598,7 @@ 
 			{
 				array_shift($args_list);
 			}
-		}
-		else
+		} else
 		{
 			// Otherwise, make GET variables into array
 			$get_vars = get_object_vars($self->get_vars);
@@ -1621,8 +1625,7 @@ 
 		if($vid)
 		{
 			$get_vars['vid'] = $vid;
-		}
-		else
+		} else
 		{
 			unset($get_vars['vid']);
 		}
@@ -1694,8 +1697,7 @@ 
 						{
 							$queries[] = $key . '[' . $k . ']=' . urlencode($v);
 						}
-					}
-					elseif(!is_array($val))
+					} elseif(!is_array($val))
 					{
 						$queries[] = $key . '=' . urlencode($val);
 					}
@@ -1713,25 +1715,23 @@ 
 		{
 			$query = $self->getRequestUri(ENFORCE_SSL, $domain) . $query;
 			// optional SSL use
-		}
-		elseif($_use_ssl == 'optional')
+		} elseif($_use_ssl == 'optional')
 		{
 			$ssl_mode = (($self->get('module') === 'admin') || ($get_vars['module'] === 'admin') || (isset($get_vars['act']) && $self->isExistsSSLAction($get_vars['act']))) ? ENFORCE_SSL : RELEASE_SSL;
 			$query = $self->getRequestUri($ssl_mode, $domain) . $query;
 			// no SSL
-		}
-		else
+		} else
 		{
 			// currently on SSL but target is not based on SSL
 			if($_SERVER['HTTPS'] == 'on')
 			{
 				$query = $self->getRequestUri(ENFORCE_SSL, $domain) . $query;
-			}
-			else if($domain) // if $domain is set
+			} else if($domain) {
+				// if $domain is set
 			{
 				$query = $self->getRequestUri(FOLLOW_REQUEST_SSL, $domain) . $query;
 			}
-			else
+			} else
 			{
 				$query = getScriptPath() . $query;
 			}
@@ -1788,8 +1788,7 @@ 
 		if($domain)
 		{
 			$domain_key = md5($domain);
-		}
-		else
+		} else
 		{
 			$domain_key = 'default';
 		}
@@ -1818,8 +1817,7 @@ 
 			{
 				$target_url.= '/';
 			}
-		}
-		else
+		} else
 		{
 			$target_url = $_SERVER['HTTP_HOST'] . getScriptPath();
 		}
@@ -1837,20 +1835,17 @@ 
 			if($port && $port != 443)
 			{
 				$url_info['port'] = $port;
-			}
-			elseif($url_info['port'] == 443)
+			} elseif($url_info['port'] == 443)
 			{
 				unset($url_info['port']);
 			}
-		}
-		else
+		} else
 		{
 			$port = self::get('_http_port');
 			if($port && $port != 80)
 			{
 				$url_info['port'] = $port;
-			}
-			elseif($url_info['port'] == 80)
+			} elseif($url_info['port'] == 80)
 			{
 				unset($url_info['port']);
 			}
@@ -2086,8 +2081,7 @@ 
 		if(strpos($file, './') === 0)
 		{
 			$file = dirname($_SERVER['SCRIPT_NAME']) . '/' . substr($file, 2);
-		}
-		elseif(strpos($file, '../') === 0)
+		} elseif(strpos($file, '../') === 0)
 		{
 			$file = self::normalizeFilePath(dirname($_SERVER['SCRIPT_NAME']) . "/{$file}");
 		}
@@ -2349,8 +2343,7 @@ 
 			if(substr_compare($filename, '.js', -3) === 0)
 			{
 				$result->jsList[] = $plugin_path . $filename;
-			}
-			elseif(substr_compare($filename, '.css', -4) === 0)
+			} elseif(substr_compare($filename, '.css', -4) === 0)
 			{
 				$result->cssList[] = $plugin_path . $filename;
 			}
@@ -2607,8 +2600,7 @@ 
 			if(count($_base) > 0)
 			{
 				array_shift($_base);
-			}
-			else
+			} else
 			{
 				array_unshift($_base, '..');
 			}

classes/db/DB.class.php

Doc Comments +4 added lines, -4 removed lines

@@ -499,7 +499,7 @@ 
 
 	/**
 	 * Returns object of error info
-	 * @return object object of error
+	 * @return Object object of error
 	 */
 	function getError()
 	{
@@ -676,7 +676,7 @@ 
 	 * Returns counter cache data
 	 * @param array|string $tables tables to get data
 	 * @param string $condition condition to get data
-	 * @return int count of cache data
+	 * @return boolean count of cache data
 	 */
 	function getCountCache($tables, $condition)
 	{
@@ -736,7 +736,7 @@ 
 	 * @param array|string $tables tables to save data
 	 * @param string $condition condition to save data
 	 * @param int $count count of cache data to save
-	 * @return void
+	 * @return boolean
 	 */
 	function putCountCache($tables, $condition, $count = 0)
 	{
@@ -1247,7 +1247,7 @@ 
 	 * DB Connect
 	 * this method is protected
 	 * @param array $connection
-	 * @return void
+	 * @return resource
 	 */
 	function __connect($connection)
 	{

Braces +13 added lines, -21 removed lines

@@ -327,8 +327,7 @@ 
 		if(!isset($this->priority_dbms[$a->db_type]))
 		{
 			$priority_a = 0;
-		}
-		else
+		} else
 		{
 			$priority_a = $this->priority_dbms[$a->db_type];
 		}
@@ -336,8 +335,7 @@ 
 		if(!isset($this->priority_dbms[$b->db_type]))
 		{
 			$priority_b = 0;
-		}
-		else
+		} else
 		{
 			$priority_b = $this->priority_dbms[$b->db_type];
 		}
@@ -371,8 +369,7 @@ 
 		if($type == 'master')
 		{
 			return $this->master_db["is_connected"] ? TRUE : FALSE;
-		}
-		else
+		} else
 		{
 			return $this->slave_db[$indx]["is_connected"] ? TRUE : FALSE;
 		}
@@ -450,8 +447,7 @@ 
 				$buff[] = print_r($log, TRUE);
 				@file_put_contents($log_file, implode("\n", $buff) . "\n\n", FILE_APPEND|LOCK_EX);
 			}
-		}
-		else
+		} else
 		{
 			$log['result'] = 'Success';
 		}
@@ -540,8 +536,7 @@ 
 				$target = 'modules';
 				$module = $id_args[0];
 				$id = $id_args[1];
-			}
-			elseif(count($id_args) == 3)
+			} elseif(count($id_args) == 3)
 			{
 				$target = $id_args[0];
 				$typeList = array('addons' => 1, 'widgets' => 1);
@@ -615,7 +610,9 @@ 
 	{
 		global $lang;
 		
-		if(!in_array($type, array('master','slave'))) $type = 'slave';
+		if(!in_array($type, array('master','slave'))) {
+			$type = 'slave';
+		}
 
 		if(!file_exists($cache_file))
 		{
@@ -661,8 +658,7 @@ 
 		if($this->isError())
 		{
 			$output = $this->getError();
-		}
-		else if(!is_a($output, 'Object') && !is_subclass_of($output, 'Object'))
+		} else if(!is_a($output, 'Object') && !is_subclass_of($output, 'Object'))
 		{
 			$output = new Object();
 		}
@@ -1077,8 +1073,7 @@ 
 		if($type == 'master')
 		{
 			$connection = &$this->master_db;
-		}
-		else
+		} else
 		{
 			$connection = &$this->slave_db[$indx];
 		}
@@ -1173,8 +1168,7 @@ 
 		{
 			$this->transaction_started = FALSE;
 			$this->transactionNestedLevel = 0;
-		}
-		else
+		} else
 		{
 			$this->transactionNestedLevel--;
 		}
@@ -1234,8 +1228,7 @@ 
 		)
 		{
 			$this->slave_db[0] = &$this->master_db;
-		}
-		else
+		} else
 		{
 			$this->slave_db = $db_info->slave_db;
 		}
@@ -1288,8 +1281,7 @@ 
 		if($type == 'master')
 		{
 			$connection = &$this->master_db;
-		}
-		else
+		} else
 		{
 			$connection = &$this->slave_db[$indx];
 		}

Indentation +1 added lines, -1 removed lines

@@ -1284,7 +1284,7 @@
 	/**
 	 * Delete cached group data
 	 * @return void
-	*/
+	 */
 	function _deleteMemberGroupCache($site_srl = 0)
 	{
 		//remove from cache

Spacing +87 added lines, -87 removed lines

@@ -141,24 +141,24 @@ 
 	 */
 	function &getInstance($db_type = NULL)
 	{
-		if(!$db_type)
+		if (!$db_type)
 		{
 			$db_type = Context::getDBType();
 		}
-		if(!$db_type && Context::isInstalled())
+		if (!$db_type && Context::isInstalled())
 		{
 			return new Object(-1, 'msg_db_not_setted');
 		}
 
-		if(!isset($GLOBALS['__DB__']))
+		if (!isset($GLOBALS['__DB__']))
 		{
 			$GLOBALS['__DB__'] = array();
 		}
-		if(!isset($GLOBALS['__DB__'][$db_type]))
+		if (!isset($GLOBALS['__DB__'][$db_type]))
 		{
 			$class_name = 'DB' . ucfirst($db_type);
 			$class_file = _XE_PATH_ . "classes/db/$class_name.class.php";
-			if(!file_exists($class_file))
+			if (!file_exists($class_file))
 			{
 				return new Object(-1, 'msg_db_not_setted');
 			}
@@ -212,18 +212,18 @@ 
 	{
 		is_a($this, 'DB') ? $self = $this : $self = self::getInstance();
 		
-		if(!$self->supported_list)
+		if (!$self->supported_list)
 		{
 			$oDB = new DB();
 			$self->supported_list = $oDB->_getSupportedList();
 		}
 
 		$enableList = array();
-		if(is_array($self->supported_list))
+		if (is_array($self->supported_list))
 		{
-			foreach($self->supported_list AS $key => $value)
+			foreach ($self->supported_list AS $key => $value)
 			{
-				if($value->enable)
+				if ($value->enable)
 				{
 					$enableList[] = $value;
 				}
@@ -241,18 +241,18 @@ 
 	{
 		is_a($this, 'DB') ? $self = $this : $self = self::getInstance();
 		
-		if(!$self->supported_list)
+		if (!$self->supported_list)
 		{
 			$oDB = new DB();
 			$self->supported_list = $oDB->_getSupportedList();
 		}
 
 		$disableList = array();
-		if(is_array($self->supported_list))
+		if (is_array($self->supported_list))
 		{
-			foreach($self->supported_list AS $key => $value)
+			foreach ($self->supported_list AS $key => $value)
 			{
-				if(!$value->enable)
+				if (!$value->enable)
 				{
 					$disableList[] = $value;
 				}
@@ -269,7 +269,7 @@ 
 	function _getSupportedList()
 	{
 		static $get_supported_list = '';
-		if(is_array($get_supported_list))
+		if (is_array($get_supported_list))
 		{
 			$this->supported_list = $get_supported_list;
 			return $this->supported_list;
@@ -280,13 +280,13 @@ 
 		$supported_list = FileHandler::readDir($db_classes_path, $filter, TRUE);
 
 		// after creating instance of class, check is supported
-		for($i = 0; $i < count($supported_list); $i++)
+		for ($i = 0; $i < count($supported_list); $i++)
 		{
 			$db_type = $supported_list[$i];
 
 			$class_name = sprintf("DB%s%s", strtoupper(substr($db_type, 0, 1)), strtolower(substr($db_type, 1)));
 			$class_file = sprintf(_XE_PATH_ . "classes/db/%s.class.php", $class_name);
-			if(!file_exists($class_file))
+			if (!file_exists($class_file))
 			{
 				continue;
 			}
@@ -295,7 +295,7 @@ 
 			require_once($class_file);
 			$oDB = new $class_name();
 
-			if(!$oDB)
+			if (!$oDB)
 			{
 				continue;
 			}
@@ -319,7 +319,7 @@ 
 	 */
 	function _sortDBMS($a, $b)
 	{
-		if(!isset($this->priority_dbms[$a->db_type]))
+		if (!isset($this->priority_dbms[$a->db_type]))
 		{
 			$priority_a = 0;
 		}
@@ -328,7 +328,7 @@ 
 			$priority_a = $this->priority_dbms[$a->db_type];
 		}
 
-		if(!isset($this->priority_dbms[$b->db_type]))
+		if (!isset($this->priority_dbms[$b->db_type]))
 		{
 			$priority_b = 0;
 		}
@@ -337,7 +337,7 @@ 
 			$priority_b = $this->priority_dbms[$b->db_type];
 		}
 
-		if($priority_a == $priority_b)
+		if ($priority_a == $priority_b)
 		{
 			return 0;
 		}
@@ -363,7 +363,7 @@ 
 	 */
 	function isConnected($type = 'master', $indx = 0)
 	{
-		if($type == 'master')
+		if ($type == 'master')
 		{
 			return $this->master_db["is_connected"] ? TRUE : FALSE;
 		}
@@ -392,7 +392,7 @@ 
 	 */
 	function actFinish()
 	{
-		if(!$this->query)
+		if (!$this->query)
 		{
 			return;
 		}
@@ -413,37 +413,37 @@ 
 
 		$bt = version_compare(PHP_VERSION, '5.3.6', '>=') ? debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) : debug_backtrace();
 
-		foreach($bt as $no => $call)
+		foreach ($bt as $no => $call)
 		{
-			if($call['function'] == 'executeQuery' || $call['function'] == 'executeQueryArray')
+			if ($call['function'] == 'executeQuery' || $call['function'] == 'executeQueryArray')
 			{
 				$call_no = $no;
 				$call_no++;
-				$log['called_file'] = $bt[$call_no]['file'].':'.$bt[$call_no]['line'];
-				$log['called_file'] = str_replace(_XE_PATH_ , '', $log['called_file']);
+				$log['called_file'] = $bt[$call_no]['file'] . ':' . $bt[$call_no]['line'];
+				$log['called_file'] = str_replace(_XE_PATH_, '', $log['called_file']);
 				$call_no++;
-				$log['called_method'] = $bt[$call_no]['class'].$bt[$call_no]['type'].$bt[$call_no]['function'];
+				$log['called_method'] = $bt[$call_no]['class'] . $bt[$call_no]['type'] . $bt[$call_no]['function'];
 				break;
 			}
 		}
 
 		// leave error log if an error occured (if __DEBUG_DB_OUTPUT__ is defined)
-		if($this->isError())
+		if ($this->isError())
 		{
 			$log['result'] = 'Failed';
 			$log['errno'] = $this->errno;
 			$log['errstr'] = $this->errstr;
 
-			if(__DEBUG_DB_OUTPUT__ == 1)
+			if (__DEBUG_DB_OUTPUT__ == 1)
 			{
 				$debug_file = _XE_PATH_ . "files/_debug_db_query.php";
 				$buff = array();
-				if(!file_exists($debug_file))
+				if (!file_exists($debug_file))
 				{
 					$buff[] = '<?php exit(); ?' . '>';
 				}
 				$buff[] = print_r($log, TRUE);
-				@file_put_contents($log_file, implode("\n", $buff) . "\n\n", FILE_APPEND|LOCK_EX);
+				@file_put_contents($log_file, implode("\n", $buff) . "\n\n", FILE_APPEND | LOCK_EX);
 			}
 		}
 		else
@@ -514,11 +514,11 @@ 
 	{
 		static $cache_file = array();
 
-		if(!$query_id)
+		if (!$query_id)
 		{
 			return new Object(-1, 'msg_invalid_queryid');
 		}
-		if(!$this->db_type)
+		if (!$this->db_type)
 		{
 			return;
 		}
@@ -527,20 +527,20 @@ 
 
 		$this->query_id = $query_id;
 
-		if(!isset($cache_file[$query_id]) || !file_exists($cache_file[$query_id]))
+		if (!isset($cache_file[$query_id]) || !file_exists($cache_file[$query_id]))
 		{
 			$id_args = explode('.', $query_id);
-			if(count($id_args) == 2)
+			if (count($id_args) == 2)
 			{
 				$target = 'modules';
 				$module = $id_args[0];
 				$id = $id_args[1];
 			}
-			elseif(count($id_args) == 3)
+			elseif (count($id_args) == 3)
 			{
 				$target = $id_args[0];
 				$typeList = array('addons' => 1, 'widgets' => 1);
-				if(!isset($typeList[$target]))
+				if (!isset($typeList[$target]))
 				{
 					$this->actDBClassFinish();
 					return;
@@ -548,14 +548,14 @@ 
 				$module = $id_args[1];
 				$id = $id_args[2];
 			}
-			if(!$target || !$module || !$id)
+			if (!$target || !$module || !$id)
 			{
 				$this->actDBClassFinish();
 				return new Object(-1, 'msg_invalid_queryid');
 			}
 
 			$xml_file = sprintf('%s%s/%s/queries/%s.xml', _XE_PATH_, $target, $module, $id);
-			if(!file_exists($xml_file))
+			if (!file_exists($xml_file))
 			{
 				$this->actDBClassFinish();
 				return new Object(-1, 'msg_invalid_queryid');
@@ -583,13 +583,13 @@ 
 		$cache_file = sprintf('%s%s%s.%s.%s.cache.php', _XE_PATH_, $this->cache_file, $query_id, __ZBXE_VERSION__, $this->db_type);
 
 		$cache_time = -1;
-		if(file_exists($cache_file))
+		if (file_exists($cache_file))
 		{
 			$cache_time = filemtime($cache_file);
 		}
 
 		// if there is no cache file or is not new, find original xml query file and parse it
-		if($cache_time < filemtime($xml_file) || $cache_time < filemtime(_XE_PATH_ . 'classes/db/DB.class.php') || $cache_time < filemtime(_XE_PATH_ . 'classes/xml/XmlQueryParser.class.php'))
+		if ($cache_time < filemtime($xml_file) || $cache_time < filemtime(_XE_PATH_ . 'classes/db/DB.class.php') || $cache_time < filemtime(_XE_PATH_ . 'classes/xml/XmlQueryParser.class.php'))
 		{
 			$oParser = new XmlQueryParser();
 			$oParser->parse($query_id, $xml_file, $cache_file);
@@ -610,27 +610,27 @@ 
 	{
 		global $lang;
 		
-		if(!in_array($type, array('master','slave'))) $type = 'slave';
+		if (!in_array($type, array('master', 'slave'))) $type = 'slave';
 
-		if(!file_exists($cache_file))
+		if (!file_exists($cache_file))
 		{
 			return new Object(-1, 'msg_invalid_queryid');
 		}
 
-		if($source_args)
+		if ($source_args)
 		{
 			$args = clone $source_args;
 		}
 
 		$output = include($cache_file);
 
-		if((is_a($output, 'Object') || is_subclass_of($output, 'Object')) && !$output->toBool())
+		if ((is_a($output, 'Object') || is_subclass_of($output, 'Object')) && !$output->toBool())
 		{
 			return $output;
 		}
 
 		// execute appropriate query
-		switch($output->getAction())
+		switch ($output->getAction())
 		{
 			case 'insert' :
 			case 'insert-select' :
@@ -653,11 +653,11 @@ 
 				break;
 		}
 
-		if($this->isError())
+		if ($this->isError())
 		{
 			$output = $this->getError();
 		}
-		else if(!is_a($output, 'Object') && !is_subclass_of($output, 'Object'))
+		else if (!is_a($output, 'Object') && !is_subclass_of($output, 'Object'))
 		{
 			$output = new Object();
 		}
@@ -803,7 +803,7 @@ 
 	 */
 	function dropTable($table_name)
 	{
-		if(!$table_name)
+		if (!$table_name)
 		{
 			return;
 		}
@@ -820,54 +820,54 @@ 
 	function getSelectSql($query, $with_values = TRUE)
 	{
 		$select = $query->getSelectString($with_values);
-		if($select == '')
+		if ($select == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
 		$select = 'SELECT ' . $select;
 
 		$from = $query->getFromString($with_values);
-		if($from == '')
+		if ($from == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
 		$from = ' FROM ' . $from;
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
 			$where = ' WHERE ' . $where;
 		}
 
 		$tableObjects = $query->getTables();
 		$index_hint_list = '';
-		foreach($tableObjects as $tableObject)
+		foreach ($tableObjects as $tableObject)
 		{
-			if(is_a($tableObject, 'CubridTableWithHint'))
+			if (is_a($tableObject, 'CubridTableWithHint'))
 			{
 				$index_hint_list .= $tableObject->getIndexHintString() . ', ';
 			}
 		}
 		$index_hint_list = substr($index_hint_list, 0, -2);
-		if($index_hint_list != '')
+		if ($index_hint_list != '')
 		{
 			$index_hint_list = 'USING INDEX ' . $index_hint_list;
 		}
 
 		$groupBy = $query->getGroupByString();
-		if($groupBy != '')
+		if ($groupBy != '')
 		{
 			$groupBy = ' GROUP BY ' . $groupBy;
 		}
 
 		$orderBy = $query->getOrderByString();
-		if($orderBy != '')
+		if ($orderBy != '')
 		{
 			$orderBy = ' ORDER BY ' . $orderBy;
 		}
 
 		$limit = $query->getLimitString();
-		if($limit != '')
+		if ($limit != '')
 		{
 			$limit = ' LIMIT ' . $limit;
 		}
@@ -890,7 +890,7 @@ 
 	{
 		$new_update_columns = array();
 		$click_count_columns = $queryObject->getClickCountColumns();
-		foreach($click_count_columns as $click_count_column)
+		foreach ($click_count_columns as $click_count_column)
 		{
 			$click_count_column_name = $click_count_column->column_name;
 
@@ -922,14 +922,14 @@ 
 		$sql .= $tables[0]->getAlias();
 
 		$from = $query->getFromString($with_values);
-		if($from == '')
+		if ($from == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
 		$sql .= ' FROM ' . $from;
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
 			$sql .= ' WHERE ' . $where;
 		}
@@ -947,19 +947,19 @@ 
 	function getUpdateSql($query, $with_values = TRUE, $with_priority = FALSE)
 	{
 		$columnsList = $query->getUpdateString($with_values);
-		if($columnsList == '')
+		if ($columnsList == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
 
 		$tables = $query->getFromString($with_values);
-		if($tables == '')
+		if ($tables == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
 			$where = ' WHERE ' . $where;
 		}
@@ -1004,9 +1004,9 @@ 
 	 */
 	function _getConnection($type = 'master', $indx = NULL)
 	{
-		if($type == 'master')
+		if ($type == 'master')
 		{
-			if(!$this->master_db['is_connected'])
+			if (!$this->master_db['is_connected'])
 			{
 				$this->_connect($type);
 			}
@@ -1014,12 +1014,12 @@ 
 			return $this->master_db["resource"];
 		}
 
-		if($indx === NULL)
+		if ($indx === NULL)
 		{
 			$indx = $this->_getSlaveConnectionStringIndex($type);
 		}
 
-		if(!$this->slave_db[$indx]['is_connected'])
+		if (!$this->slave_db[$indx]['is_connected'])
 		{
 			$this->_connect($type, $indx);
 		}
@@ -1034,11 +1034,11 @@ 
 	 */
 	function _dbInfoExists()
 	{
-		if(!$this->master_db)
+		if (!$this->master_db)
 		{
 			return FALSE;
 		}
-		if(count($this->slave_db) === 0)
+		if (count($this->slave_db) === 0)
 		{
 			return FALSE;
 		}
@@ -1064,12 +1064,12 @@ 
 	 */
 	function close($type = 'master', $indx = 0)
 	{
-		if(!$this->isConnected($type, $indx))
+		if (!$this->isConnected($type, $indx))
 		{
 			return;
 		}
 
-		if($type == 'master')
+		if ($type == 'master')
 		{
 			$connection = &$this->master_db;
 		}
@@ -1100,12 +1100,12 @@ 
 	 */
 	function begin()
 	{
-		if(!$this->isConnected())
+		if (!$this->isConnected())
 		{
 			return;
 		}
 
-		if($this->_begin($this->transactionNestedLevel))
+		if ($this->_begin($this->transactionNestedLevel))
 		{
 			$this->transaction_started = TRUE;
 			$this->transactionNestedLevel++;
@@ -1128,15 +1128,15 @@ 
 	 */
 	function rollback()
 	{
-		if(!$this->isConnected() || !$this->transaction_started)
+		if (!$this->isConnected() || !$this->transaction_started)
 		{
 			return;
 		}
-		if($this->_rollback($this->transactionNestedLevel))
+		if ($this->_rollback($this->transactionNestedLevel))
 		{
 			$this->transactionNestedLevel--;
 
-			if(!$this->transactionNestedLevel)
+			if (!$this->transactionNestedLevel)
 			{
 				$this->transaction_started = FALSE;
 			}
@@ -1160,11 +1160,11 @@ 
 	 */
 	function commit($force = FALSE)
 	{
-		if(!$force && (!$this->isConnected() || !$this->transaction_started))
+		if (!$force && (!$this->isConnected() || !$this->transaction_started))
 		{
 			return;
 		}
-		if($this->transactionNestedLevel == 1 && $this->_commit())
+		if ($this->transactionNestedLevel == 1 && $this->_commit())
 		{
 			$this->transaction_started = FALSE;
 			$this->transactionNestedLevel = 0;
@@ -1196,7 +1196,7 @@ 
 	 */
 	function _query($query, $connection = NULL)
 	{
-		if($connection == NULL)
+		if ($connection == NULL)
 		{
 			$connection = $this->_getConnection('master');
 		}
@@ -1221,7 +1221,7 @@ 
 	{
 		$db_info = Context::getDBInfo();
 		$this->master_db = $db_info->master_db;
-		if($db_info->master_db["db_hostname"] == $db_info->slave_db[0]["db_hostname"]
+		if ($db_info->master_db["db_hostname"] == $db_info->slave_db[0]["db_hostname"]
 				&& $db_info->master_db["db_port"] == $db_info->slave_db[0]["db_port"]
 				&& $db_info->master_db["db_userid"] == $db_info->slave_db[0]["db_userid"]
 				&& $db_info->master_db["db_password"] == $db_info->slave_db[0]["db_password"]
@@ -1269,18 +1269,18 @@ 
 	 */
 	function _connect($type = 'master', $indx = 0)
 	{
-		if($this->isConnected($type, $indx))
+		if ($this->isConnected($type, $indx))
 		{
 			return;
 		}
 
 		// Ignore if no DB information exists
-		if(!$this->_dbInfoExists())
+		if (!$this->_dbInfoExists())
 		{
 			return;
 		}
 
-		if($type == 'master')
+		if ($type == 'master')
 		{
 			$connection = &$this->master_db;
 		}
@@ -1290,7 +1290,7 @@ 
 		}
 
 		$result = $this->__connect($connection);
-		if($result === NULL || $result === FALSE)
+		if ($result === NULL || $result === FALSE)
 		{
 			$connection["is_connected"] = FALSE;
 			return;
@@ -1326,7 +1326,7 @@ 
 	 */
 	function actDBClassFinish()
 	{
-		if(!$this->query)
+		if (!$this->query)
 		{
 			return;
 		}
@@ -1349,7 +1349,7 @@ 
 	function &getParser($force = FALSE)
 	{
 		static $dbParser = NULL;
-		if(!$dbParser || $force)
+		if (!$dbParser || $force)
 		{
 			$oDB = DB::getInstance();
 			$dbParser = $oDB->getParser();

classes/db/DBCubrid.class.php

Doc Comments +7 added lines, -7 removed lines

@@ -477,7 +477,7 @@ 
 	 * @param int $size column size
 	 * @param string|int $default default value
 	 * @param boolean $notnull not null status, default value is false
-	 * @return void
+	 * @return resource|null
 	 */
 	function addColumn($table_name, $column_name, $type = 'number', $size = '', $default = null, $notnull = FALSE)
 	{
@@ -693,7 +693,7 @@ 
 	/**
 	 * Creates a table by using xml contents
 	 * @param string $xml_doc xml schema contents
-	 * @return void|object
+	 * @return null|resource
 	 */
 	function createTableByXml($xml_doc)
 	{
@@ -703,7 +703,7 @@ 
 	/**
 	 * Creates a table by using xml file path
 	 * @param string $file_name xml schema file path
-	 * @return void|object
+	 * @return null|resource
 	 */
 	function createTableByXmlFile($file_name)
 	{
@@ -723,7 +723,7 @@ 
 	 * opt : notnull, default, size\n
 	 * index : primary key, index, unique\n
 	 * @param string $xml_doc xml schema contents
-	 * @return void|object
+	 * @return null|resource
 	 */
 	function _createTable($xml_doc)
 	{
@@ -951,7 +951,7 @@ 
 	 * @param Object $queryObject
 	 * @param resource $connection
 	 * @param boolean $with_values
-	 * @return Object
+	 * @return Object|null
 	 */
 	function _executeSelectAct($queryObject, $connection = NULL, $with_values = TRUE)
 	{
@@ -995,7 +995,7 @@ 
 	/**
 	 * If have a error, return error object
 	 * @param Object $queryObject
-	 * @return Object
+	 * @return Object|null
 	 */
 	function queryError($queryObject)
 	{
@@ -1018,7 +1018,7 @@ 
 	 * @param Object $queryObject
 	 * @param resource $connection
 	 * @param boolean $with_values
-	 * @return Object Object with page info containing
+	 * @return Object|null Object with page info containing
 	 */
 	function queryPageLimit($queryObject, $connection, $with_values)
 	{

Spacing +102 added lines, -102 removed lines

@@ -76,13 +76,13 @@ 
 		$result = @cubrid_connect($connection["db_hostname"], $connection["db_port"], $connection["db_database"], $connection["db_userid"], $connection["db_password"]);
 
 		// check connections
-		if(!$result)
+		if (!$result)
 		{
 			$this->setError(-1, 'database connect fail');
 			return;
 		}
 
-		if(!defined('__CUBRID_VERSION__'))
+		if (!defined('__CUBRID_VERSION__'))
 		{
 			$cubrid_version = cubrid_get_server_info($result);
 			$cubrid_version_elem = explode('.', $cubrid_version);
@@ -90,7 +90,7 @@ 
 			define('__CUBRID_VERSION__', $cubrid_version);
 		}
 
-		if(__CUBRID_VERSION__ >= '8.4.0')
+		if (__CUBRID_VERSION__ >= '8.4.0')
 			cubrid_set_autocommit($result, CUBRID_AUTOCOMMIT_TRUE);
 
 		return $result;
@@ -116,13 +116,13 @@ 
 	 */
 	function addQuotes($string)
 	{
-		if(version_compare(PHP_VERSION, "5.4.0", "<") &&
+		if (version_compare(PHP_VERSION, "5.4.0", "<") &&
 				get_magic_quotes_gpc())
 		{
 			$string = stripslashes(str_replace("\\", "\\\\", $string));
 		}
 
-		if(!is_numeric($string))
+		if (!is_numeric($string))
 		{
 			/*
 			  if ($this->isConnected()) {
@@ -146,11 +146,11 @@ 
 	 */
 	function _begin($transactionLevel)
 	{
-		if(__CUBRID_VERSION__ >= '8.4.0')
+		if (__CUBRID_VERSION__ >= '8.4.0')
 		{
 			$connection = $this->_getConnection('master');
 
-			if(!$transactionLevel)
+			if (!$transactionLevel)
 			{
 				cubrid_set_autocommit($connection, CUBRID_AUTOCOMMIT_FALSE);
 			}
@@ -173,7 +173,7 @@ 
 
 		$point = $transactionLevel - 1;
 
-		if($point)
+		if ($point)
 		{
 			$this->_query("ROLLBACK TO SP" . $point, $connection);
 		}
@@ -206,29 +206,29 @@ 
 	 */
 	function __query($query, $connection)
 	{
-		if($this->use_prepared_statements == 'Y')
+		if ($this->use_prepared_statements == 'Y')
 		{
 			$req = @cubrid_prepare($connection, $query);
-			if(!$req)
+			if (!$req)
 			{
 				$this->_setError();
 				return false;
 			}
 
 			$position = 0;
-			if($this->param)
+			if ($this->param)
 			{
-				foreach($this->param as $param)
+				foreach ($this->param as $param)
 				{
 					$value = $param->getUnescapedValue();
 					$type = $param->getType();
 
-					if($param->isColumnName())
+					if ($param->isColumnName())
 					{
 						continue;
 					}
 
-					switch($type)
+					switch ($type)
 					{
 						case 'number' :
 							$bind_type = 'numeric';
@@ -240,12 +240,12 @@ 
 							$bind_type = 'string';
 					}
 
-					if(is_array($value))
+					if (is_array($value))
 					{
-						foreach($value as $v)
+						foreach ($value as $v)
 						{
 							$bound = @cubrid_bind($req, ++$position, $v, $bind_type);
-							if(!$bound)
+							if (!$bound)
 							{
 								$this->_setError();
 								return false;
@@ -255,7 +255,7 @@ 
 					else
 					{
 						$bound = @cubrid_bind($req, ++$position, $value, $bind_type);
-						if(!$bound)
+						if (!$bound)
 						{
 							$this->_setError();
 							return false;
@@ -265,7 +265,7 @@ 
 			}
 
 			$result = @cubrid_execute($req);
-			if(!$result)
+			if (!$result)
 			{
 				$this->_setError();
 				return false;
@@ -275,7 +275,7 @@ 
 		// Execute the query
 		$result = @cubrid_execute($connection, $query);
 		// error check
-		if(!$result)
+		if (!$result)
 		{
 			$this->_setError();
 			return false;
@@ -306,12 +306,12 @@ 
 	function _fetch($result, $arrayIndexEndValue = NULL)
 	{
 		$output = array();
-		if(!$this->isConnected() || $this->isError() || !$result)
+		if (!$this->isConnected() || $this->isError() || !$result)
 		{
 			return array();
 		}
 
-		if($this->use_prepared_statements == 'Y')
+		if ($this->use_prepared_statements == 'Y')
 		{
 
 		}
@@ -322,25 +322,25 @@ 
 		$col_names = cubrid_column_names($result);
 		$max = count($col_types);
 
-		for($count = 0; $count < $max; $count++)
+		for ($count = 0; $count < $max; $count++)
 		{
-			if(preg_match("/^char/", $col_types[$count]) > 0)
+			if (preg_match("/^char/", $col_types[$count]) > 0)
 			{
 				$char_type_fields[] = $col_names[$count];
 			}
 		}
 
-		while($tmp = cubrid_fetch($result, CUBRID_OBJECT))
+		while ($tmp = cubrid_fetch($result, CUBRID_OBJECT))
 		{
-			if(is_array($char_type_fields))
+			if (is_array($char_type_fields))
 			{
-				foreach($char_type_fields as $val)
+				foreach ($char_type_fields as $val)
 				{
 					$tmp->{$val} = rtrim($tmp->{$val});
 				}
 			}
 
-			if($arrayIndexEndValue)
+			if ($arrayIndexEndValue)
 			{
 				$output[$arrayIndexEndValue--] = $tmp;
 			}
@@ -352,15 +352,15 @@ 
 
 		unset($char_type_fields);
 
-		if($result)
+		if ($result)
 		{
 			cubrid_close_request($result);
 		}
 
-		if(count($output) == 1)
+		if (count($output) == 1)
 		{
 			// If call is made for pagination, always return array
-			if(isset($arrayIndexEndValue))
+			if (isset($arrayIndexEndValue))
 			{
 				return $output;
 			}
@@ -395,7 +395,7 @@ 
 	 */
 	function _makeSequence()
 	{
-		if($_GLOBALS['XE_EXISTS_SEQUENCE'])
+		if ($_GLOBALS['XE_EXISTS_SEQUENCE'])
 			return;
 
 		// check cubrid serial
@@ -404,7 +404,7 @@ 
 		$output = $this->_fetch($result);
 
 		// if do not create serial
-		if($output->count == 0)
+		if ($output->count == 0)
 		{
 			$query = sprintf('select max("a"."srl") as "srl" from ' .
 					'( select max("document_srl") as "srl" from ' .
@@ -418,7 +418,7 @@ 
 			$result = $this->_query($query);
 			$output = $this->_fetch($result);
 			$srl = $output->srl;
-			if($srl < 1)
+			if ($srl < 1)
 			{
 				$start = 1;
 			}
@@ -442,7 +442,7 @@ 
 	 */
 	function isTableExists($target_name)
 	{
-		if($target_name == 'sequence')
+		if ($target_name == 'sequence')
 		{
 			$query = sprintf("select \"name\" from \"db_serial\" where \"name\" = '%s%s'", $this->prefix, $target_name);
 		}
@@ -452,7 +452,7 @@ 
 		}
 
 		$result = $this->_query($query);
-		if(cubrid_num_rows($result) > 0)
+		if (cubrid_num_rows($result) > 0)
 		{
 			$output = TRUE;
 		}
@@ -461,7 +461,7 @@ 
 			$output = FALSE;
 		}
 
-		if($result)
+		if ($result)
 		{
 			cubrid_close_request($result);
 		}
@@ -482,22 +482,22 @@ 
 	function addColumn($table_name, $column_name, $type = 'number', $size = '', $default = null, $notnull = FALSE)
 	{
 		$type = strtoupper($this->column_type[$type]);
-		if($type == 'INTEGER')
+		if ($type == 'INTEGER')
 		{
 			$size = '';
 		}
 
 		$query = sprintf("alter class \"%s%s\" add \"%s\" ", $this->prefix, $table_name, $column_name);
 
-		if($type == 'char' || $type == 'varchar')
+		if ($type == 'char' || $type == 'varchar')
 		{
-			if($size)
+			if ($size)
 			{
 				$size = $size * 3;
 			}
 		}
 
-		if($size)
+		if ($size)
 		{
 			$query .= sprintf("%s(%s) ", $type, $size);
 		}
@@ -506,9 +506,9 @@ 
 			$query .= sprintf("%s ", $type);
 		}
 
-		if(isset($default))
+		if (isset($default))
 		{
-			if($type == 'INTEGER' || $type == 'BIGINT' || $type == 'INT')
+			if ($type == 'INTEGER' || $type == 'BIGINT' || $type == 'INT')
 			{
 				$query .= sprintf("default %d ", $default);
 			}
@@ -518,7 +518,7 @@ 
 			}
 		}
 
-		if($notnull)
+		if ($notnull)
 		{
 			$query .= "not null ";
 		}
@@ -550,7 +550,7 @@ 
 		$query = sprintf("select \"attr_name\" from \"db_attribute\" where " . "\"attr_name\" ='%s' and \"class_name\" = '%s%s'", $column_name, $this->prefix, $table_name);
 		$result = $this->_query($query);
 
-		if(cubrid_num_rows($result) > 0)
+		if (cubrid_num_rows($result) > 0)
 		{
 			$output = TRUE;
 		}
@@ -559,7 +559,7 @@ 
 			$output = FALSE;
 		}
 
-		if($result)
+		if ($result)
 		{
 			cubrid_close_request($result);
 		}
@@ -579,7 +579,7 @@ 
 	 */
 	function addIndex($table_name, $index_name, $target_columns, $is_unique = FALSE)
 	{
-		if(!is_array($target_columns))
+		if (!is_array($target_columns))
 		{
 			$target_columns = array($target_columns);
 		}
@@ -614,14 +614,14 @@ 
 		$query = sprintf("select \"index_name\" from \"db_index\" where " . "\"class_name\" = '%s%s' and (\"index_name\" = '%s' or \"index_name\" = '%s') ", $this->prefix, $table_name, $this->prefix . $index_name, $index_name);
 		$result = $this->_query($query);
 
-		if($this->isError())
+		if ($this->isError())
 		{
 			return FALSE;
 		}
 
 		$output = $this->_fetch($result);
 
-		if(!$output)
+		if (!$output)
 		{
 			return FALSE;
 		}
@@ -660,18 +660,18 @@ 
 		);
 		$result = $this->_query($query);
 
-		if($this->isError())
+		if ($this->isError())
 		{
 			return FALSE;
 		}
 
 		$output = $this->_fetch($result);
-		if(!$output)
+		if (!$output)
 		{
 			return FALSE;
 		}
 
-		if(!is_array($output))
+		if (!is_array($output))
 		{
 			$indexes_to_be_deleted = array($output);
 		}
@@ -680,7 +680,7 @@ 
 			$indexes_to_be_deleted = $output;
 		}
 
-		foreach($indexes_to_be_deleted as $index)
+		foreach ($indexes_to_be_deleted as $index)
 		{
 			$this->dropIndex(substr($index->class_name, strlen($this->prefix))
 					, $this->prefix . $index->unprefixed_index_name
@@ -707,7 +707,7 @@ 
 	 */
 	function createTableByXmlFile($file_name)
 	{
-		if(!file_exists($file_name))
+		if (!file_exists($file_name))
 		{
 			return;
 		}
@@ -734,13 +734,13 @@ 
 		$table_name = $xml_obj->table->attrs->name;
 
 		// if the table already exists exit function
-		if($this->isTableExists($table_name))
+		if ($this->isTableExists($table_name))
 		{
 			return;
 		}
 
 		// If the table name is sequence, it creates a serial
-		if($table_name == 'sequence')
+		if ($table_name == 'sequence')
 		{
 			$query = sprintf('create serial "%s" start with 1 increment by 1' .
 					' minvalue 1 ' .
@@ -755,7 +755,7 @@ 
 		$query = sprintf('create class "%s";', $table_name);
 		$this->_query($query);
 
-		if(!is_array($xml_obj->table->column))
+		if (!is_array($xml_obj->table->column))
 		{
 			$columns[] = $xml_obj->table->column;
 		}
@@ -770,7 +770,7 @@ 
 		$unique_list = array();
 		$index_list = array();
 
-		foreach($columns as $column)
+		foreach ($columns as $column)
 		{
 			$name = $column->attrs->name;
 			$type = $column->attrs->type;
@@ -781,7 +781,7 @@ 
 			$unique = $column->attrs->unique;
 			$default = $column->attrs->default;
 
-			switch($this->column_type[$type])
+			switch ($this->column_type[$type])
 			{
 				case 'integer' :
 					$size = NULL;
@@ -791,30 +791,30 @@ 
 					break;
 			}
 
-			if(isset($default) && ($type == 'varchar' || $type == 'char' ||
+			if (isset($default) && ($type == 'varchar' || $type == 'char' ||
 					$type == 'text' || $type == 'tinytext' || $type == 'bigtext'))
 			{
 				$default = sprintf("'%s'", $default);
 			}
 
-			if($type == 'varchar' || $type == 'char')
+			if ($type == 'varchar' || $type == 'char')
 			{
-				if($size)
+				if ($size)
 					$size = $size * 3;
 			}
 
 
 			$column_schema[] = sprintf('"%s" %s%s %s %s', $name, $this->column_type[$type], $size ? '(' . $size . ')' : '', isset($default) ? "default " . $default : '', $notnull ? 'not null' : '');
 
-			if($primary_key)
+			if ($primary_key)
 			{
 				$primary_list[] = $name;
 			}
-			else if($unique)
+			else if ($unique)
 			{
 				$unique_list[$unique][] = $name;
 			}
-			else if($index)
+			else if ($index)
 			{
 				$index_list[$index][] = $name;
 			}
@@ -823,24 +823,24 @@ 
 		$query .= implode(',', $column_schema) . ';';
 		$this->_query($query);
 
-		if(count($primary_list))
+		if (count($primary_list))
 		{
 			$query = sprintf("alter class \"%s\" add attribute constraint " . "\"pkey_%s\" PRIMARY KEY(%s);", $table_name, $table_name, '"' . implode('","', $primary_list) . '"');
 			$this->_query($query);
 		}
 
-		if(count($unique_list))
+		if (count($unique_list))
 		{
-			foreach($unique_list as $key => $val)
+			foreach ($unique_list as $key => $val)
 			{
 				$query = sprintf("create unique index \"%s\" on \"%s\" " . "(%s);", $key, $table_name, '"' . implode('","', $val) . '"');
 				$this->_query($query);
 			}
 		}
 
-		if(count($index_list))
+		if (count($index_list))
 		{
-			foreach($index_list as $key => $val)
+			foreach ($index_list as $key => $val)
 			{
 				$query = sprintf("create index \"%s\" on \"%s\" (%s);", $key, $table_name, '"' . implode('","', $val) . '"');
 				$this->_query($query);
@@ -856,13 +856,13 @@ 
 	 */
 	function _executeInsertAct($queryObject, $with_values = TRUE)
 	{
-		if($this->use_prepared_statements == 'Y')
+		if ($this->use_prepared_statements == 'Y')
 		{
 			$this->param = $queryObject->getArguments();
 			$with_values = FALSE;
 		}
 		$query = $this->getInsertSql($queryObject, $with_values);
-		if(is_a($query, 'Object'))
+		if (is_a($query, 'Object'))
 		{
 			unset($this->param);
 			return;
@@ -871,7 +871,7 @@ 
 		$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
 
 		$result = $this->_query($query);
-		if($result && !$this->transaction_started)
+		if ($result && !$this->transaction_started)
 		{
 			$this->_commit();
 		}
@@ -887,13 +887,13 @@ 
 	 */
 	function _executeUpdateAct($queryObject, $with_values = TRUE)
 	{
-		if($this->use_prepared_statements == 'Y')
+		if ($this->use_prepared_statements == 'Y')
 		{
 			$this->param = $queryObject->getArguments();
 			$with_values = FALSE;
 		}
 		$query = $this->getUpdateSql($queryObject, $with_values);
-		if(is_a($query, 'Object'))
+		if (is_a($query, 'Object'))
 		{
 			unset($this->param);
 			return;
@@ -903,7 +903,7 @@ 
 
 		$result = $this->_query($query);
 
-		if($result && !$this->transaction_started)
+		if ($result && !$this->transaction_started)
 		{
 			$this->_commit();
 		}
@@ -919,13 +919,13 @@ 
 	 */
 	function _executeDeleteAct($queryObject, $with_values = TRUE)
 	{
-		if($this->use_prepared_statements == 'Y')
+		if ($this->use_prepared_statements == 'Y')
 		{
 			$this->param = $queryObject->getArguments();
 			$with_values = FALSE;
 		}
 		$query = $this->getDeleteSql($queryObject, $with_values);
-		if(is_a($query, 'Object'))
+		if (is_a($query, 'Object'))
 		{
 			unset($this->param);
 			return;
@@ -935,7 +935,7 @@ 
 
 		$result = $this->_query($query);
 
-		if($result && !$this->transaction_started)
+		if ($result && !$this->transaction_started)
 		{
 			$this->_commit();
 		}
@@ -955,20 +955,20 @@ 
 	 */
 	function _executeSelectAct($queryObject, $connection = NULL, $with_values = TRUE)
 	{
-		if($this->use_prepared_statements == 'Y')
+		if ($this->use_prepared_statements == 'Y')
 		{
 			$this->param = $queryObject->getArguments();
 			$with_values = FALSE;
 		}
 		$limit = $queryObject->getLimit();
-		if($limit && $limit->isPageHandler())
+		if ($limit && $limit->isPageHandler())
 		{
 			return $this->queryPageLimit($queryObject, $connection, $with_values);
 		}
 		else
 		{
 			$query = $this->getSelectSql($queryObject, $with_values);
-			if(is_a($query, 'Object'))
+			if (is_a($query, 'Object'))
 			{
 				unset($this->param);
 				return;
@@ -977,14 +977,14 @@ 
 			$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
 			$result = $this->_query($query, $connection);
 
-			if($this->isError())
+			if ($this->isError())
 			{
 				unset($this->param);
 				return $this->queryError($queryObject);
 			}
 
 			$data = $this->_fetch($result);
-			$buff = new Object ();
+			$buff = new Object();
 			$buff->data = $data;
 
 			unset($this->param);
@@ -1000,16 +1000,16 @@ 
 	function queryError($queryObject)
 	{
 		$limit = $queryObject->getLimit();
-		if($limit && $limit->isPageHandler())
+		if ($limit && $limit->isPageHandler())
 		{
-			$buff = new Object ();
+			$buff = new Object();
 			$buff->total_count = 0;
 			$buff->total_page = 0;
 			$buff->page = 1;
 			$buff->data = array();
 			$buff->page_navigation = new PageHandler(/* $total_count */0, /* $total_page */1, /* $page */1, /* $page_count */10); //default page handler values
 			return $buff;
-		}else
+		} else
 			return;
 	}
 
@@ -1031,7 +1031,7 @@ 
 		$temp_select = $queryObject->getSelectString($with_values);
 		$uses_distinct = stripos($temp_select, "distinct") !== FALSE;
 		$uses_groupby = $queryObject->getGroupByString() != '';
-		if($uses_distinct || $uses_groupby)
+		if ($uses_distinct || $uses_groupby)
 		{
 			$count_query = sprintf('select %s %s %s %s'
 					, $temp_select
@@ -1050,23 +1050,23 @@ 
 		$total_count = (int) (isset($count_output->count) ? $count_output->count : NULL);
 
 		$list_count = $limit->list_count->getValue();
-		if(!$list_count)
+		if (!$list_count)
 		{
 			$list_count = 20;
 		}
 		$page_count = $limit->page_count->getValue();
-		if(!$page_count)
+		if (!$page_count)
 		{
 			$page_count = 10;
 		}
 		$page = $limit->page->getValue();
-		if(!$page || $page < 1)
+		if (!$page || $page < 1)
 		{
 			$page = 1;
 		}
 
 		// total pages
-		if($total_count)
+		if ($total_count)
 		{
 			$total_page = (int) (($total_count - 1) / $list_count) + 1;
 		}
@@ -1076,11 +1076,11 @@ 
 		}
 
 		// check the page variables
-		if($page > $total_page)
+		if ($page > $total_page)
 		{
 			// If requested page is bigger than total number of pages, return empty list
 
-			$buff = new Object ();
+			$buff = new Object();
 			$buff->total_count = $total_count;
 			$buff->total_page = $total_page;
 			$buff->page = $page;
@@ -1094,7 +1094,7 @@ 
 		$query = $this->getSelectPageSql($queryObject, $with_values, $start_count, $list_count);
 		$query .= (__DEBUG_QUERY__ & 1 && $queryObject->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
 		$result = $this->_query($query, $connection);
-		if($this->isError())
+		if ($this->isError())
 		{
 			unset($this->param);
 			return $this->queryError($queryObject);
@@ -1103,7 +1103,7 @@ 
 		$virtual_no = $total_count - ($page - 1) * $list_count;
 		$data = $this->_fetch($result, $virtual_no);
 
-		$buff = new Object ();
+		$buff = new Object();
 		$buff->total_count = $total_count;
 		$buff->total_page = $total_page;
 		$buff->page = $page;
@@ -1135,39 +1135,39 @@ 
 	{
 
 		$select = $query->getSelectString($with_values);
-		if($select == '')
+		if ($select == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
 		$select = 'SELECT ' . $select;
 
 		$from = $query->getFromString($with_values);
-		if($from == '')
+		if ($from == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
 		$from = ' FROM ' . $from;
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
 			$where = ' WHERE ' . $where;
 		}
 
 		$groupBy = $query->getGroupByString();
-		if($groupBy != '')
+		if ($groupBy != '')
 		{
 			$groupBy = ' GROUP BY ' . $groupBy;
 		}
 
 		$orderBy = $query->getOrderByString();
-		if($orderBy != '')
+		if ($orderBy != '')
 		{
 			$orderBy = ' ORDER BY ' . $orderBy;
 		}
 
 		$limit = $query->getLimitString();
-		if($limit != '')
+		if ($limit != '')
 		{
 			$limit = sprintf(' LIMIT %d, %d', $start_count, $list_count);
 		}

Braces +28 added lines, -40 removed lines

@@ -90,8 +90,9 @@ 
 			define('__CUBRID_VERSION__', $cubrid_version);
 		}
 
-		if(__CUBRID_VERSION__ >= '8.4.0')
-			cubrid_set_autocommit($result, CUBRID_AUTOCOMMIT_TRUE);
+		if(__CUBRID_VERSION__ >= '8.4.0') {
+					cubrid_set_autocommit($result, CUBRID_AUTOCOMMIT_TRUE);
+		}
 
 		return $result;
 	}
@@ -153,8 +154,7 @@ 
 			if(!$transactionLevel)
 			{
 				cubrid_set_autocommit($connection, CUBRID_AUTOCOMMIT_FALSE);
-			}
-			else
+			} else
 			{
 				$this->_query("SAVEPOINT SP" . $transactionLevel, $connection);
 			}
@@ -176,8 +176,7 @@ 
 		if($point)
 		{
 			$this->_query("ROLLBACK TO SP" . $point, $connection);
-		}
-		else
+		} else
 		{
 			@cubrid_rollback($connection);
 		}
@@ -251,8 +250,7 @@ 
 								return false;
 							}
 						}
-					}
-					else
+					} else
 					{
 						$bound = @cubrid_bind($req, ++$position, $value, $bind_type);
 						if(!$bound)
@@ -343,8 +341,7 @@ 
 			if($arrayIndexEndValue)
 			{
 				$output[$arrayIndexEndValue--] = $tmp;
-			}
-			else
+			} else
 			{
 				$output[] = $tmp;
 			}
@@ -395,8 +392,9 @@ 
 	 */
 	function _makeSequence()
 	{
-		if($_GLOBALS['XE_EXISTS_SEQUENCE'])
-			return;
+		if($_GLOBALS['XE_EXISTS_SEQUENCE']) {
+					return;
+		}
 
 		// check cubrid serial
 		$query = sprintf('select count(*) as "count" from "db_serial" where name=\'%ssequence\'', $this->prefix);
@@ -421,8 +419,7 @@ 
 			if($srl < 1)
 			{
 				$start = 1;
-			}
-			else
+			} else
 			{
 				$start = $srl + 1000000;
 			}
@@ -445,8 +442,7 @@ 
 		if($target_name == 'sequence')
 		{
 			$query = sprintf("select \"name\" from \"db_serial\" where \"name\" = '%s%s'", $this->prefix, $target_name);
-		}
-		else
+		} else
 		{
 			$query = sprintf("select \"class_name\" from \"db_class\" where \"class_name\" = '%s%s'", $this->prefix, $target_name);
 		}
@@ -455,8 +451,7 @@ 
 		if(cubrid_num_rows($result) > 0)
 		{
 			$output = TRUE;
-		}
-		else
+		} else
 		{
 			$output = FALSE;
 		}
@@ -500,8 +495,7 @@ 
 		if($size)
 		{
 			$query .= sprintf("%s(%s) ", $type, $size);
-		}
-		else
+		} else
 		{
 			$query .= sprintf("%s ", $type);
 		}
@@ -511,8 +505,7 @@ 
 			if($type == 'INTEGER' || $type == 'BIGINT' || $type == 'INT')
 			{
 				$query .= sprintf("default %d ", $default);
-			}
-			else
+			} else
 			{
 				$query .= sprintf("default '%s' ", $default);
 			}
@@ -553,8 +546,7 @@ 
 		if(cubrid_num_rows($result) > 0)
 		{
 			$output = TRUE;
-		}
-		else
+		} else
 		{
 			$output = FALSE;
 		}
@@ -674,8 +666,7 @@ 
 		if(!is_array($output))
 		{
 			$indexes_to_be_deleted = array($output);
-		}
-		else
+		} else
 		{
 			$indexes_to_be_deleted = $output;
 		}
@@ -758,8 +749,7 @@ 
 		if(!is_array($xml_obj->table->column))
 		{
 			$columns[] = $xml_obj->table->column;
-		}
-		else
+		} else
 		{
 			$columns = $xml_obj->table->column;
 		}
@@ -799,8 +789,9 @@ 
 
 			if($type == 'varchar' || $type == 'char')
 			{
-				if($size)
-					$size = $size * 3;
+				if($size) {
+									$size = $size * 3;
+				}
 			}
 
 
@@ -809,12 +800,10 @@ 
 			if($primary_key)
 			{
 				$primary_list[] = $name;
-			}
-			else if($unique)
+			} else if($unique)
 			{
 				$unique_list[$unique][] = $name;
-			}
-			else if($index)
+			} else if($index)
 			{
 				$index_list[$index][] = $name;
 			}
@@ -964,8 +953,7 @@ 
 		if($limit && $limit->isPageHandler())
 		{
 			return $this->queryPageLimit($queryObject, $connection, $with_values);
-		}
-		else
+		} else
 		{
 			$query = $this->getSelectSql($queryObject, $with_values);
 			if(is_a($query, 'Object'))
@@ -1009,8 +997,9 @@ 
 			$buff->data = array();
 			$buff->page_navigation = new PageHandler(/* $total_count */0, /* $total_page */1, /* $page */1, /* $page_count */10); //default page handler values
 			return $buff;
-		}else
-			return;
+		} else {
+					return;
+		}
 	}
 
 	/**
@@ -1069,8 +1058,7 @@ 
 		if($total_count)
 		{
 			$total_page = (int) (($total_count - 1) / $list_count) + 1;
-		}
-		else
+		} else
 		{
 			$total_page = 1;
 		}

classes/db/DBMssql.class.php

Doc Comments +8 added lines, -7 removed lines

@@ -111,7 +111,7 @@ 
 	/**
 	 * DB transaction start
 	 * this method is private
-	 * @return boolean
+	 * @return null|boolean
 	 */
 	function _begin($transactionLevel)
 	{
@@ -170,7 +170,7 @@ 
 	 * this method is private
 	 * @param string $query
 	 * @param resource $connection
-	 * @return resource|boolean Returns a statement resource on success and FALSE if an error occurred.
+	 * @return resource Returns a statement resource on success and FALSE if an error occurred.
 	 */
 	function __query($query, $connection)
 	{
@@ -375,7 +375,7 @@ 
 	 * @param int $size column size
 	 * @param string|int $default default value
 	 * @param boolean $notnull not null status, default value is false
-	 * @return void
+	 * @return null|resource
 	 */
 	function addColumn($table_name, $column_name, $type = 'number', $size = '', $default = null, $notnull = false)
 	{
@@ -431,7 +431,7 @@ 
 	 * Check column exist status of the table
 	 * @param string $table_name table name
 	 * @param string $column_name column name
-	 * @return boolean
+	 * @return null|boolean
 	 */
 	function isColumnExists($table_name, $column_name)
 	{
@@ -495,7 +495,7 @@ 
 	 * Check index status of the table
 	 * @param string $table_name table name
 	 * @param string $index_name index name
-	 * @return boolean
+	 * @return null|boolean
 	 */
 	function isIndexExists($table_name, $index_name)
 	{
@@ -728,6 +728,7 @@ 
 	 * Return select query string
 	 * @param object $query
 	 * @param boolean $with_values
+	 * @param resource $connection
 	 * @return string
 	 */
 	function getSelectSql($query, $with_values = TRUE, $connection=NULL)
@@ -839,7 +840,7 @@ 
 	 * it supports a method as navigation
 	 * @param Object $queryObject
 	 * @param resource $connection
-	 * @return Object
+	 * @return Object|null
 	 */
 	function _executeSelectAct($queryObject, $connection = null)
 	{
@@ -879,7 +880,7 @@ 
 	/**
 	 * If have a error, return error object
 	 * @param Object $queryObject
-	 * @return Object
+	 * @return Object|null
 	 */
 	function queryError($queryObject)
 	{

Spacing +91 added lines, -91 removed lines

@@ -70,7 +70,7 @@ 
 		//sqlsrv_configure( 'LogSubsystems', SQLSRV_LOG_SYSTEM_ALL );
 		$result = @sqlsrv_connect($connection["db_hostname"], array('Database' => $connection["db_database"], 'UID' => $connection["db_userid"], 'PWD' => $connection["db_password"]));
 
-		if(!$result)
+		if (!$result)
 		{
 			$errors = print_r(sqlsrv_errors(), true);
 			$this->setError(-1, 'database connect fail' . PHP_EOL . $errors);
@@ -99,7 +99,7 @@ 
 	 */
 	function addQuotes($string)
 	{
-		if(version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
+		if (version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
 		{
 			$string = stripslashes(str_replace("\\", "\\\\", $string));
 		}
@@ -117,9 +117,9 @@ 
 	{
 		$connection = $this->_getConnection('master');
 
-		if(!$transactionLevel)
+		if (!$transactionLevel)
 		{
-			if(sqlsrv_begin_transaction($connection) === false)
+			if (sqlsrv_begin_transaction($connection) === false)
 			{
 				return;
 			}
@@ -142,7 +142,7 @@ 
 
 		$point = $transactionLevel - 1;
 
-		if($point)
+		if ($point)
 		{
 			$this->_query("ROLLBACK TRANS SP" . $point, $connection);
 		}
@@ -176,18 +176,18 @@ 
 	{
 		$_param = array();
 
-		if(count($this->param))
+		if (count($this->param))
 		{
-			foreach($this->param as $k => $o)
+			foreach ($this->param as $k => $o)
 			{
-				if($o->isColumnName())
+				if ($o->isColumnName())
 				{
 					continue;
 				}
-				if($o->getType() == 'number')
+				if ($o->getType() == 'number')
 				{
 					$value = $o->getUnescapedValue();
-					if(is_array($value))
+					if (is_array($value))
 					{
 						$_param = array_merge($_param, $value);
 					}
@@ -199,9 +199,9 @@ 
 				else
 				{
 					$value = $o->getUnescapedValue();
-					if(is_array($value))
+					if (is_array($value))
 					{
-						foreach($value as $v)
+						foreach ($value as $v)
 						{
 							$_param[] = array($v, SQLSRV_PARAM_IN, SQLSRV_PHPTYPE_STRING('utf-8'));
 						}
@@ -216,7 +216,7 @@ 
 
 		// Run the query statement
 		$result = false;
-		if(count($_param))
+		if (count($_param))
 		{
 			$args = $this->_getParametersByReference($_param);
 			$stmt = sqlsrv_prepare($connection, $query, $args);
@@ -226,7 +226,7 @@ 
 			$stmt = sqlsrv_prepare($connection, $query);
 		}
 
-		if(!$stmt)
+		if (!$stmt)
 		{
 			$result = false;
 		}
@@ -236,7 +236,7 @@ 
 		}
 
 		// Error Check
-		if(!$result)
+		if (!$result)
 		{
 			$this->setError(print_r(sqlsrv_errors(), true));
 		}
@@ -259,9 +259,9 @@ 
 		$copy = array();
 		$args = array();
 		$i = 0;
-		foreach($_param as $key => $value)
+		foreach ($_param as $key => $value)
 		{
-			if(is_array($value))
+			if (is_array($value))
 			{
 				$value_copy = $value;
 				$value_arg = array();
@@ -288,7 +288,7 @@ 
 	function _fetch($result, $arrayIndexEndValue = NULL)
 	{
 		$output = array();
-		if(!$this->isConnected() || $this->isError() || !$result)
+		if (!$this->isConnected() || $this->isError() || !$result)
 		{
 			return $output;
 		}
@@ -296,18 +296,18 @@ 
 		$c = sqlsrv_num_fields($result);
 		$m = null;
 
-		while(sqlsrv_fetch($result))
+		while (sqlsrv_fetch($result))
 		{
-			if(!$m)
+			if (!$m)
 			{
 				$m = sqlsrv_field_metadata($result);
 			}
 			unset($row);
-			for($i = 0; $i < $c; $i++)
+			for ($i = 0; $i < $c; $i++)
 			{
 				$row->{$m[$i]['Name']} = sqlsrv_get_field($result, $i, SQLSRV_PHPTYPE_STRING('utf-8'));
 			}
-			if($arrayIndexEndValue)
+			if ($arrayIndexEndValue)
 			{
 				$output[$arrayIndexEndValue--] = $row;
 			}
@@ -317,9 +317,9 @@ 
 			}
 		}
 
-		if(count($output) == 1)
+		if (count($output) == 1)
 		{
-			if(isset($arrayIndexEndValue))
+			if (isset($arrayIndexEndValue))
 			{
 				return $output;
 			}
@@ -360,7 +360,7 @@ 
 		$result = $this->_query($query);
 		$tmp = $this->_fetch($result);
 
-		if(!$tmp)
+		if (!$tmp)
 		{
 			return false;
 		}
@@ -379,18 +379,18 @@ 
 	 */
 	function addColumn($table_name, $column_name, $type = 'number', $size = '', $default = null, $notnull = false)
 	{
-		if($this->isColumnExists($table_name, $column_name))
+		if ($this->isColumnExists($table_name, $column_name))
 		{
 			return;
 		}
 		$type = $this->column_type[$type];
-		if(strtoupper($type) == 'INTEGER')
+		if (strtoupper($type) == 'INTEGER')
 		{
 			$size = '';
 		}
 
 		$query = sprintf("alter table %s%s add %s ", $this->prefix, $table_name, $column_name);
-		if($size)
+		if ($size)
 		{
 			$query .= sprintf(" %s(%s) ", $type, $size);
 		}
@@ -399,11 +399,11 @@ 
 			$query .= sprintf(" %s ", $type);
 		}
 
-		if(isset($default))
+		if (isset($default))
 		{
 			$query .= sprintf(" default '%s' ", $default);
 		}
-		if($notnull)
+		if ($notnull)
 		{
 			$query .= " not null ";
 		}
@@ -419,7 +419,7 @@ 
 	 */
 	function dropColumn($table_name, $column_name)
 	{
-		if(!$this->isColumnExists($table_name, $column_name))
+		if (!$this->isColumnExists($table_name, $column_name))
 		{
 			return;
 		}
@@ -437,12 +437,12 @@ 
 	{
 		$query = sprintf("select syscolumns.name as name from syscolumns, sysobjects where sysobjects.name = '%s%s' and sysobjects.id = syscolumns.id and syscolumns.name = '%s'", $this->prefix, $table_name, $column_name);
 		$result = $this->_query($query);
-		if($this->isError())
+		if ($this->isError())
 		{
 			return;
 		}
 		$tmp = $this->_fetch($result);
-		if(!$tmp->name)
+		if (!$tmp->name)
 		{
 			return false;
 		}
@@ -461,11 +461,11 @@ 
 	 */
 	function addIndex($table_name, $index_name, $target_columns, $is_unique = false)
 	{
-		if($this->isIndexExists($table_name, $index_name))
+		if ($this->isIndexExists($table_name, $index_name))
 		{
 			return;
 		}
-		if(!is_array($target_columns))
+		if (!is_array($target_columns))
 		{
 			$target_columns = array($target_columns);
 		}
@@ -483,7 +483,7 @@ 
 	 */
 	function dropIndex($table_name, $index_name, $is_unique = false)
 	{
-		if(!$this->isIndexExists($table_name, $index_name))
+		if (!$this->isIndexExists($table_name, $index_name))
 		{
 			return;
 		}
@@ -502,13 +502,13 @@ 
 		$query = sprintf("select sysindexes.name as name from sysindexes, sysobjects where sysobjects.name = '%s%s' and sysobjects.id = sysindexes.id and sysindexes.name = '%s'", $this->prefix, $table_name, $index_name);
 
 		$result = $this->_query($query);
-		if($this->isError())
+		if ($this->isError())
 		{
 			return;
 		}
 		$tmp = $this->_fetch($result);
 
-		if(!$tmp->name)
+		if (!$tmp->name)
 		{
 			return false;
 		}
@@ -532,7 +532,7 @@ 
 	 */
 	function createTableByXmlFile($file_name)
 	{
-		if(!file_exists($file_name))
+		if (!file_exists($file_name))
 		{
 			return;
 		}
@@ -557,12 +557,12 @@ 
 		$xml_obj = $oXml->parse($xml_doc);
 		// Create a table schema
 		$table_name = $xml_obj->table->attrs->name;
-		if($this->isTableExists($table_name))
+		if ($this->isTableExists($table_name))
 		{
 			return;
 		}
 
-		if($table_name == 'sequence')
+		if ($table_name == 'sequence')
 		{
 			$table_name = $this->prefix . $table_name;
 			$query = sprintf('create table %s ( sequence int identity(1,1), seq int )', $table_name);
@@ -572,7 +572,7 @@ 
 		{
 			$table_name = $this->prefix . $table_name;
 
-			if(!is_array($xml_obj->table->column))
+			if (!is_array($xml_obj->table->column))
 			{
 				$columns[] = $xml_obj->table->column;
 			}
@@ -586,7 +586,7 @@ 
 			$index_list = array();
 
 			$typeList = array('number' => 1, 'text' => 1);
-			foreach($columns as $column)
+			foreach ($columns as $column)
 			{
 				$name = $column->attrs->name;
 				$type = $column->attrs->type;
@@ -600,44 +600,44 @@ 
 
 				$column_schema[] = sprintf('[%s] %s%s %s %s %s', $name, $this->column_type[$type], !isset($typeList[$type]) && $size ? '(' . $size . ')' : '', isset($default) ? "default '" . $default . "'" : '', $notnull ? 'not null' : 'null', $auto_increment ? 'identity(1,1)' : '');
 
-				if($primary_key)
+				if ($primary_key)
 				{
 					$primary_list[] = $name;
 				}
-				else if($unique)
+				else if ($unique)
 				{
 					$unique_list[$unique][] = $name;
 				}
-				else if($index)
+				else if ($index)
 				{
 					$index_list[$index][] = $name;
 				}
 			}
 
-			if(count($primary_list))
+			if (count($primary_list))
 			{
 				$column_schema[] = sprintf("primary key (%s)", '"' . implode($primary_list, '","') . '"');
 			}
 
 			$schema = sprintf('create table [%s] (%s%s)', $this->addQuotes($table_name), "\n", implode($column_schema, ",\n"));
 			$output = $this->_query($schema);
-			if(!$output)
+			if (!$output)
 			{
 				return false;
 			}
 
-			if(count($unique_list))
+			if (count($unique_list))
 			{
-				foreach($unique_list as $key => $val)
+				foreach ($unique_list as $key => $val)
 				{
 					$query = sprintf("create unique index %s on %s (%s);", $key, $table_name, '[' . implode('],[', $val) . ']');
 					$this->_query($query);
 				}
 			}
 
-			if(count($index_list))
+			if (count($index_list))
 			{
-				foreach($index_list as $key => $val)
+				foreach ($index_list as $key => $val)
 				{
 					$query = sprintf("create index %s on %s (%s);", $key, $table_name, '[' . implode('],[', $val) . ']');
 					$this->_query($query);
@@ -682,27 +682,27 @@ 
 	function getUpdateSql($query, $with_values = true, $with_priority = false)
 	{
 		$columnsList = $query->getUpdateString($with_values);
-		if($columnsList == '')
+		if ($columnsList == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
 
 		$from = $query->getFromString($with_values);
-		if($from == '')
+		if ($from == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
 
 		$tables = $query->getTables();
 		$alias_list = '';
-		foreach($tables as $table)
+		foreach ($tables as $table)
 		{
 			$alias_list .= $table->getAlias();
 		}
 		implode(',', explode(' ', $alias_list));
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
 			$where = ' WHERE ' . $where;
 		}
@@ -730,7 +730,7 @@ 
 	 * @param boolean $with_values
 	 * @return string
 	 */
-	function getSelectSql($query, $with_values = TRUE, $connection=NULL)
+	function getSelectSql($query, $with_values = TRUE, $connection = NULL)
 	{
 		$with_values = false;
 
@@ -740,21 +740,21 @@ 
 		$limit = '';
 		$limitCount = '';
 		$limitQueryPart = $query->getLimit();
-		if($limitQueryPart)
+		if ($limitQueryPart)
 		{
 			$limitCount = $limitQueryPart->getLimit();
 		}
-		if($limitCount != '')
+		if ($limitCount != '')
 		{
 			$limit = 'SELECT TOP ' . $limitCount;
 		}
 
 		$select = $query->getSelectString($with_values);
-		if($select == '')
+		if ($select == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
-		if($limit != '')
+		if ($limit != '')
 		{
 			$select = $limit . ' ' . $select;
 		}
@@ -764,51 +764,51 @@ 
 		}
 
 		$from = $query->getFromString($with_values);
-		if($from == '')
+		if ($from == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
 		$from = ' FROM ' . $from;
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
 			$where = ' WHERE ' . $where;
 		}
 
 		$groupBy = $query->getGroupByString();
-		if($groupBy != '')
+		if ($groupBy != '')
 		{
 			$groupBy = ' GROUP BY ' . $groupBy;
 		}
 
 		$orderBy = $query->getOrderByString();
-		if($orderBy != '')
+		if ($orderBy != '')
 		{
 			$orderBy = ' ORDER BY ' . $orderBy;
 		}
 
-		if($limitCount != '' && $query->limit->start > 0)
+		if ($limitCount != '' && $query->limit->start > 0)
 		{
 			$order = $query->getOrder();
 			$first_columns = array();
-			foreach($order as $val)
+			foreach ($order as $val)
 			{
 				$tmpColumnName = $val->getPureColumnName();
-				$first_columns[] = sprintf('%s(%s) as %s', $val->getPureSortOrder()=='asc'?'max':'min', $tmpColumnName, $tmpColumnName);
+				$first_columns[] = sprintf('%s(%s) as %s', $val->getPureSortOrder() == 'asc' ? 'max' : 'min', $tmpColumnName, $tmpColumnName);
 				$first_sub_columns[] = $tmpColumnName;
 			}
 
-			$first_query = sprintf("select %s from (select top %d %s %s %s %s %s) xet", implode(',',$first_columns),  $query->limit->start, implode(',',$first_sub_columns), $from, $where, $groupBy, $orderBy);
+			$first_query = sprintf("select %s from (select top %d %s %s %s %s %s) xet", implode(',', $first_columns), $query->limit->start, implode(',', $first_sub_columns), $from, $where, $groupBy, $orderBy);
 			$this->param = $query->getArguments();
 			$result = $this->__query($first_query, $connection);
 			$tmp = $this->_fetch($result);
 
 			$sub_cond = array();
-			foreach($order as $k => $v)
+			foreach ($order as $k => $v)
 			{
 				//for example... use Document
-				if(get_class($v->sort_order) == 'SortArgument')
+				if (get_class($v->sort_order) == 'SortArgument')
 				{
 					$sort_order = $v->sort_order->value;
 				}
@@ -818,19 +818,19 @@ 
 					$sort_order = $v->sort_order;
 				}
 
-				$sub_cond[] = sprintf("%s %s '%s'", $v->getPureColumnName(), $sort_order=='asc'?'>':'<', $tmp->{$v->getPureColumnName()});
+				$sub_cond[] = sprintf("%s %s '%s'", $v->getPureColumnName(), $sort_order == 'asc' ? '>' : '<', $tmp->{$v->getPureColumnName()});
 			}
 
-			if(!$where)
+			if (!$where)
 			{
-				$sub_condition = ' WHERE ( '.implode(' and ',$sub_cond).' )';
+				$sub_condition = ' WHERE ( ' . implode(' and ', $sub_cond) . ' )';
 			}
 			else
 			{
-				$sub_condition = ' and ( '.implode(' and ',$sub_cond).' )';
+				$sub_condition = ' and ( ' . implode(' and ', $sub_cond) . ' )';
 			}
 		}
-		return $select . ' ' . $from . ' ' . $where .$sub_condition. ' ' . $groupBy . ' ' . $orderBy;
+		return $select . ' ' . $from . ' ' . $where . $sub_condition . ' ' . $groupBy . ' ' . $orderBy;
 	}
 
 	/**
@@ -845,7 +845,7 @@ 
 	{
 		$query = $this->getSelectSql($queryObject, true, $connection);
 
-		if(strpos($query, "substr"))
+		if (strpos($query, "substr"))
 		{
 			$query = str_replace("substr", "substring", $query);
 		}
@@ -856,7 +856,7 @@ 
 		$query .= (__DEBUG_QUERY__ & 1 && $output->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
 		$result = $this->_query($query, $connection);
 
-		if($this->isError())
+		if ($this->isError())
 		{
 			return $this->queryError($queryObject);
 		}
@@ -884,9 +884,9 @@ 
 	function queryError($queryObject)
 	{
 		$limit = $queryObject->getLimit();
-		if($limit && $limit->isPageHandler())
+		if ($limit && $limit->isPageHandler())
 		{
-			$buff = new Object ();
+			$buff = new Object();
 			$buff->total_count = 0;
 			$buff->total_page = 0;
 			$buff->page = 1;
@@ -910,7 +910,7 @@ 
 	function queryPageLimit($queryObject, $result, $connection)
 	{
 		$limit = $queryObject->getLimit();
-		if($limit && $limit->isPageHandler())
+		if ($limit && $limit->isPageHandler())
 		{
 			// Total count
 			$temp_where = $queryObject->getWhereString(true, false);
@@ -920,7 +920,7 @@ 
 			$temp_select = $queryObject->getSelectString(true);
 			$uses_distinct = stripos($temp_select, "distinct") !== false;
 			$uses_groupby = $queryObject->getGroupByString() != '';
-			if($uses_distinct || $uses_groupby)
+			if ($uses_distinct || $uses_groupby)
 			{
 				$count_query = sprintf('select %s %s %s %s'
 						, $temp_select
@@ -940,22 +940,22 @@ 
 			$total_count = (int) $count_output->count;
 
 			$list_count = $limit->list_count->getValue();
-			if(!$list_count)
+			if (!$list_count)
 			{
 				$list_count = 20;
 			}
 			$page_count = $limit->page_count->getValue();
-			if(!$page_count)
+			if (!$page_count)
 			{
 				$page_count = 10;
 			}
 			$page = $limit->page->getValue();
-			if(!$page || $page < 1)
+			if (!$page || $page < 1)
 			{
 				$page = 1;
 			}
 			// Total pages
-			if($total_count)
+			if ($total_count)
 			{
 				$total_page = (int) (($total_count - 1) / $list_count) + 1;
 			}
@@ -965,11 +965,11 @@ 
 			}
 
 			// check the page variables
-			if($page > $total_page)
+			if ($page > $total_page)
 			{
 				// If requested page is bigger than total number of pages, return empty list
 
-				$buff = new Object ();
+				$buff = new Object();
 				$buff->total_count = $total_count;
 				$buff->total_page = $total_page;
 				$buff->page = $page;
@@ -977,7 +977,7 @@ 
 				$buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
 				return $buff;
 
-				if($queryObject->usesClickCount())
+				if ($queryObject->usesClickCount())
 				{
 					$update_query = $this->getClickCountQuery($queryObject);
 					$this->_executeUpdateAct($update_query);
@@ -989,7 +989,7 @@ 
 			$virtual_no = $total_count - $start_count;
 			$data = $this->_fetch($result, $virtual_no);
 
-			$buff = new Object ();
+			$buff = new Object();
 			$buff->total_count = $total_count;
 			$buff->total_page = $total_page;
 			$buff->page = $page;
@@ -999,7 +999,7 @@ 
 		else
 		{
 			$data = $this->_fetch($result);
-			$buff = new Object ();
+			$buff = new Object();
 			$buff->data = $data;
 		}
 		return $buff;

Braces +21 added lines, -42 removed lines

@@ -123,8 +123,7 @@ 
 			{
 				return;
 			}
-		}
-		else
+		} else
 		{
 			$this->_query("SAVE TRANS SP" . $transactionLevel, $connection);
 		}
@@ -145,8 +144,7 @@ 
 		if($point)
 		{
 			$this->_query("ROLLBACK TRANS SP" . $point, $connection);
-		}
-		else
+		} else
 		{
 			sqlsrv_rollback($connection);
 		}
@@ -190,13 +188,11 @@ 
 					if(is_array($value))
 					{
 						$_param = array_merge($_param, $value);
-					}
-					else
+					} else
 					{
 						$_param[] = $o->getUnescapedValue();
 					}
-				}
-				else
+				} else
 				{
 					$value = $o->getUnescapedValue();
 					if(is_array($value))
@@ -205,8 +201,7 @@ 
 						{
 							$_param[] = array($v, SQLSRV_PARAM_IN, SQLSRV_PHPTYPE_STRING('utf-8'));
 						}
-					}
-					else
+					} else
 					{
 						$_param[] = array($value, SQLSRV_PARAM_IN, SQLSRV_PHPTYPE_STRING('utf-8'));
 					}
@@ -220,8 +215,7 @@ 
 		{
 			$args = $this->_getParametersByReference($_param);
 			$stmt = sqlsrv_prepare($connection, $query, $args);
-		}
-		else
+		} else
 		{
 			$stmt = sqlsrv_prepare($connection, $query);
 		}
@@ -229,8 +223,7 @@ 
 		if(!$stmt)
 		{
 			$result = false;
-		}
-		else
+		} else
 		{
 			$result = sqlsrv_execute($stmt);
 		}
@@ -268,8 +261,7 @@ 
 				$value_arg[] = &$value_copy[0];
 				$value_arg[] = $value_copy[1];
 				$value_arg[] = $value_copy[2];
-			}
-			else
+			} else
 			{
 				$value_arg = $value;
 			}
@@ -310,8 +302,7 @@ 
 			if($arrayIndexEndValue)
 			{
 				$output[$arrayIndexEndValue--] = $row;
-			}
-			else
+			} else
 			{
 				$output[] = $row;
 			}
@@ -322,8 +313,7 @@ 
 			if(isset($arrayIndexEndValue))
 			{
 				return $output;
-			}
-			else
+			} else
 			{
 				return $output[0];
 			}
@@ -393,8 +383,7 @@ 
 		if($size)
 		{
 			$query .= sprintf(" %s(%s) ", $type, $size);
-		}
-		else
+		} else
 		{
 			$query .= sprintf(" %s ", $type);
 		}
@@ -567,16 +556,14 @@ 
 			$table_name = $this->prefix . $table_name;
 			$query = sprintf('create table %s ( sequence int identity(1,1), seq int )', $table_name);
 			return $this->_query($query);
-		}
-		else
+		} else
 		{
 			$table_name = $this->prefix . $table_name;
 
 			if(!is_array($xml_obj->table->column))
 			{
 				$columns[] = $xml_obj->table->column;
-			}
-			else
+			} else
 			{
 				$columns = $xml_obj->table->column;
 			}
@@ -603,12 +590,10 @@ 
 				if($primary_key)
 				{
 					$primary_list[] = $name;
-				}
-				else if($unique)
+				} else if($unique)
 				{
 					$unique_list[$unique][] = $name;
-				}
-				else if($index)
+				} else if($index)
 				{
 					$index_list[$index][] = $name;
 				}
@@ -757,8 +742,7 @@ 
 		if($limit != '')
 		{
 			$select = $limit . ' ' . $select;
-		}
-		else
+		} else
 		{
 			$select = 'SELECT ' . $select;
 		}
@@ -824,8 +808,7 @@ 
 			if(!$where)
 			{
 				$sub_condition = ' WHERE ( '.implode(' and ',$sub_cond).' )';
-			}
-			else
+			} else
 			{
 				$sub_condition = ' and ( '.implode(' and ',$sub_cond).' )';
 			}
@@ -859,8 +842,7 @@ 
 		if($this->isError())
 		{
 			return $this->queryError($queryObject);
-		}
-		else
+		} else
 		{
 			return $this->queryPageLimit($queryObject, $result, $connection);
 		}
@@ -893,8 +875,7 @@ 
 			$buff->data = array();
 			$buff->page_navigation = new PageHandler(/* $total_count */0, /* $total_page */1, /* $page */1, /* $page_count */10); //default page handler values
 			return $buff;
-		}
-		else
+		} else
 		{
 			return;
 		}
@@ -958,8 +939,7 @@ 
 			if($total_count)
 			{
 				$total_page = (int) (($total_count - 1) / $list_count) + 1;
-			}
-			else
+			} else
 			{
 				$total_page = 1;
 			}
@@ -995,8 +975,7 @@ 
 			$buff->page = $page;
 			$buff->data = $data;
 			$buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
-		}
-		else
+		} else
 		{
 			$data = $this->_fetch($result);
 			$buff = new Object ();

classes/db/DBMysql.class.php

Doc Comments +9 added lines, -9 removed lines

@@ -297,7 +297,7 @@ 
 	 * @param int $size column size
 	 * @param string|int $default default value
 	 * @param boolean $notnull not null status, default value is false
-	 * @return void
+	 * @return resource|null
 	 */
 	function addColumn($table_name, $column_name, $type = 'number', $size = '', $default = null, $notnull = false)
 	{
@@ -344,7 +344,7 @@ 
 	 * Check column exist status of the table
 	 * @param string $table_name table name
 	 * @param string $column_name column name
-	 * @return boolean
+	 * @return null|boolean
 	 */
 	function isColumnExists($table_name, $column_name)
 	{
@@ -408,7 +408,7 @@ 
 	 * Check index status of the table
 	 * @param string $table_name table name
 	 * @param string $index_name index name
-	 * @return boolean
+	 * @return null|boolean
 	 */
 	function isIndexExists($table_name, $index_name)
 	{
@@ -442,7 +442,7 @@ 
 	/**
 	 * Creates a table by using xml contents
 	 * @param string $xml_doc xml schema contents
-	 * @return void|object
+	 * @return null|false
 	 */
 	function createTableByXml($xml_doc)
 	{
@@ -452,7 +452,7 @@ 
 	/**
 	 * Creates a table by using xml file path
 	 * @param string $file_name xml schema file path
-	 * @return void|object
+	 * @return null|false
 	 */
 	function createTableByXmlFile($file_name)
 	{
@@ -472,7 +472,7 @@ 
 	 * opt : notnull, default, size\n
 	 * index : primary key, index, unique\n
 	 * @param string $xml_doc xml schema contents
-	 * @return void|object
+	 * @return null|false
 	 */
 	function _createTable($xml_doc)
 	{
@@ -618,7 +618,7 @@ 
 	 * @param Object $queryObject
 	 * @param resource $connection
 	 * @param boolean $with_values
-	 * @return Object
+	 * @return Object|null
 	 */
 	function _executeSelectAct($queryObject, $connection = null, $with_values = true)
 	{
@@ -703,7 +703,7 @@ 
 	/**
 	 * If have a error, return error object
 	 * @param Object $queryObject
-	 * @return Object
+	 * @return Object|null
 	 */
 	function queryError($queryObject)
 	{
@@ -730,7 +730,7 @@ 
 	 * @param resource $result
 	 * @param resource $connection
 	 * @param boolean $with_values
-	 * @return Object Object with page info containing
+	 * @return Object|null Object with page info containing
 	 */
 	function queryPageLimit($queryObject, $result, $connection, $with_values = true)
 	{

Spacing +70 added lines, -70 removed lines

@@ -67,32 +67,32 @@ 
 	function __connect($connection)
 	{
 		// Ignore if no DB information exists
-		if(strpos($connection["db_hostname"], ':') === false && $connection["db_port"])
+		if (strpos($connection["db_hostname"], ':') === false && $connection["db_port"])
 		{
 			$connection["db_hostname"] .= ':' . $connection["db_port"];
 		}
 
 		// Attempt to connect
 		$result = @mysql_connect($connection["db_hostname"], $connection["db_userid"], $connection["db_password"]);
-		if(!$result)
+		if (!$result)
 		{
 			exit('XE cannot connect to DB.');
 		}
 
-		if(mysql_error())
+		if (mysql_error())
 		{
 			$this->setError(mysql_errno(), mysql_error());
 			return;
 		}
 		// Error appears if the version is lower than 4.1
-		if(version_compare(mysql_get_server_info($result), '4.1', '<'))
+		if (version_compare(mysql_get_server_info($result), '4.1', '<'))
 		{
 			$this->setError(-1, 'XE cannot be installed under the version of mysql 4.1. Current mysql version is ' . mysql_get_server_info());
 			return;
 		}
 		// select db
 		@mysql_select_db($connection["db_database"], $result);
-		if(mysql_error())
+		if (mysql_error())
 		{
 			$this->setError(mysql_errno(), mysql_error());
 			return;
@@ -131,11 +131,11 @@ 
 	 */
 	function addQuotes($string)
 	{
-		if(version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
+		if (version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
 		{
 			$string = stripslashes(str_replace("\\", "\\\\", $string));
 		}
-		if(!is_numeric($string))
+		if (!is_numeric($string))
 		{
 			$string = @mysql_real_escape_string($string);
 		}
@@ -181,14 +181,14 @@ 
 	 */
 	function __query($query, $connection)
 	{
-		if(!$connection)
+		if (!$connection)
 		{
 			exit('XE cannot handle DB connection.');
 		}
 		// Run the query statement
 		$result = mysql_query($query, $connection);
 		// Error Check
-		if(mysql_error($connection))
+		if (mysql_error($connection))
 		{
 			$this->setError(mysql_errno($connection), mysql_error($connection));
 		}
@@ -205,13 +205,13 @@ 
 	function _fetch($result, $arrayIndexEndValue = NULL)
 	{
 		$output = array();
-		if(!$this->isConnected() || $this->isError() || !$result)
+		if (!$this->isConnected() || $this->isError() || !$result)
 		{
 			return $output;
 		}
-		while($tmp = $this->db_fetch_object($result))
+		while ($tmp = $this->db_fetch_object($result))
 		{
-			if($arrayIndexEndValue)
+			if ($arrayIndexEndValue)
 			{
 				$output[$arrayIndexEndValue--] = $tmp;
 			}
@@ -220,9 +220,9 @@ 
 				$output[] = $tmp;
 			}
 		}
-		if(count($output) == 1)
+		if (count($output) == 1)
 		{
-			if(isset($arrayIndexEndValue))
+			if (isset($arrayIndexEndValue))
 			{
 				return $output;
 			}
@@ -245,7 +245,7 @@ 
 		$query = sprintf("insert into `%ssequence` (seq) values ('0')", $this->prefix);
 		$this->_query($query);
 		$sequence = $this->db_insert_id();
-		if($sequence % 10000 == 0)
+		if ($sequence % 10000 == 0)
 		{
 			$query = sprintf("delete from  `%ssequence` where seq < %d", $this->prefix, $sequence);
 			$this->_query($query);
@@ -265,7 +265,7 @@ 
 		$query = sprintf("select password('%s') as password, old_password('%s') as old_password", $this->addQuotes($password), $this->addQuotes($password));
 		$result = $this->_query($query);
 		$tmp = $this->_fetch($result);
-		if($tmp->password === $saved_password || $tmp->old_password === $saved_password)
+		if ($tmp->password === $saved_password || $tmp->old_password === $saved_password)
 		{
 			return true;
 		}
@@ -282,7 +282,7 @@ 
 		$query = sprintf("show tables like '%s%s'", $this->prefix, $this->addQuotes($target_name));
 		$result = $this->_query($query);
 		$tmp = $this->_fetch($result);
-		if(!$tmp)
+		if (!$tmp)
 		{
 			return false;
 		}
@@ -302,13 +302,13 @@ 
 	function addColumn($table_name, $column_name, $type = 'number', $size = '', $default = null, $notnull = false)
 	{
 		$type = $this->column_type[$type];
-		if(strtoupper($type) == 'INTEGER')
+		if (strtoupper($type) == 'INTEGER')
 		{
 			$size = '';
 		}
 
 		$query = sprintf("alter table `%s%s` add `%s` ", $this->prefix, $table_name, $column_name);
-		if($size)
+		if ($size)
 		{
 			$query .= sprintf(" %s(%s) ", $type, $size);
 		}
@@ -316,11 +316,11 @@ 
 		{
 			$query .= sprintf(" %s ", $type);
 		}
-		if(isset($default))
+		if (isset($default))
 		{
 			$query .= sprintf(" default '%s' ", $default);
 		}
-		if($notnull)
+		if ($notnull)
 		{
 			$query .= " not null ";
 		}
@@ -350,18 +350,18 @@ 
 	{
 		$query = sprintf("show fields from `%s%s`", $this->prefix, $table_name);
 		$result = $this->_query($query);
-		if($this->isError())
+		if ($this->isError())
 		{
 			return;
 		}
 		$output = $this->_fetch($result);
-		if($output)
+		if ($output)
 		{
 			$column_name = strtolower($column_name);
-			foreach($output as $key => $val)
+			foreach ($output as $key => $val)
 			{
 				$name = strtolower($val->Field);
-				if($column_name == $name)
+				if ($column_name == $name)
 				{
 					return true;
 				}
@@ -382,7 +382,7 @@ 
 	 */
 	function addIndex($table_name, $index_name, $target_columns, $is_unique = false)
 	{
-		if(!is_array($target_columns))
+		if (!is_array($target_columns))
 		{
 			$target_columns = array($target_columns);
 		}
@@ -415,23 +415,23 @@ 
 		//$query = sprintf("show indexes from %s%s where key_name = '%s' ", $this->prefix, $table_name, $index_name);
 		$query = sprintf("show indexes from `%s%s`", $this->prefix, $table_name);
 		$result = $this->_query($query);
-		if($this->isError())
+		if ($this->isError())
 		{
 			return;
 		}
 		$output = $this->_fetch($result);
-		if(!$output)
+		if (!$output)
 		{
 			return;
 		}
-		if(!is_array($output))
+		if (!is_array($output))
 		{
 			$output = array($output);
 		}
 
-		for($i = 0; $i < count($output); $i++)
+		for ($i = 0; $i < count($output); $i++)
 		{
-			if($output[$i]->Key_name == $index_name)
+			if ($output[$i]->Key_name == $index_name)
 			{
 				return true;
 			}
@@ -456,7 +456,7 @@ 
 	 */
 	function createTableByXmlFile($file_name)
 	{
-		if(!file_exists($file_name))
+		if (!file_exists($file_name))
 		{
 			return;
 		}
@@ -481,13 +481,13 @@ 
 		$xml_obj = $oXml->parse($xml_doc);
 		// Create a table schema
 		$table_name = $xml_obj->table->attrs->name;
-		if($this->isTableExists($table_name))
+		if ($this->isTableExists($table_name))
 		{
 			return;
 		}
 		$table_name = $this->prefix . $table_name;
 
-		if(!is_array($xml_obj->table->column))
+		if (!is_array($xml_obj->table->column))
 		{
 			$columns[] = $xml_obj->table->column;
 		}
@@ -500,7 +500,7 @@ 
 		$unique_list = array();
 		$index_list = array();
 
-		foreach($columns as $column)
+		foreach ($columns as $column)
 		{
 			$name = $column->attrs->name;
 			$type = $column->attrs->type;
@@ -514,36 +514,36 @@ 
 
 			$column_schema[] = sprintf('`%s` %s%s %s %s %s', $name, $this->column_type[$type], $size ? '(' . $size . ')' : '', isset($default) ? "default '" . $default . "'" : '', $notnull ? 'not null' : '', $auto_increment ? 'auto_increment' : '');
 
-			if($primary_key)
+			if ($primary_key)
 			{
 				$primary_list[] = $name;
 			}
-			else if($unique)
+			else if ($unique)
 			{
 				$unique_list[$unique][] = $name;
 			}
-			else if($index)
+			else if ($index)
 			{
 				$index_list[$index][] = $name;
 			}
 		}
 
-		if(count($primary_list))
+		if (count($primary_list))
 		{
 			$column_schema[] = sprintf("primary key (%s)", '`' . implode($primary_list, '`,`') . '`');
 		}
 
-		if(count($unique_list))
+		if (count($unique_list))
 		{
-			foreach($unique_list as $key => $val)
+			foreach ($unique_list as $key => $val)
 			{
 				$column_schema[] = sprintf("unique %s (%s)", $key, '`' . implode($val, '`,`') . '`');
 			}
 		}
 
-		if(count($index_list))
+		if (count($index_list))
 		{
-			foreach($index_list as $key => $val)
+			foreach ($index_list as $key => $val)
 			{
 				$column_schema[] = sprintf("index %s (%s)", $key, '`' . implode($val, '`,`') . '`');
 			}
@@ -552,7 +552,7 @@ 
 		$schema = sprintf('create table `%s` (%s%s) %s;', $this->addQuotes($table_name), "\n", implode($column_schema, ",\n"), "ENGINE = MYISAM  CHARACTER SET utf8 COLLATE utf8_general_ci");
 
 		$output = $this->_query($schema);
-		if(!$output)
+		if (!$output)
 			return false;
 	}
 
@@ -566,7 +566,7 @@ 
 	{
 		$query = $this->getInsertSql($queryObject, $with_values, true);
 		$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
-		if(is_a($query, 'Object'))
+		if (is_a($query, 'Object'))
 		{
 			return;
 		}
@@ -582,9 +582,9 @@ 
 	function _executeUpdateAct($queryObject, $with_values = true)
 	{
 		$query = $this->getUpdateSql($queryObject, $with_values, true);
-		if(is_a($query, 'Object'))
+		if (is_a($query, 'Object'))
 		{
-			if(!$query->toBool()) return $query;
+			if (!$query->toBool()) return $query;
 			else return;
 		}
 
@@ -604,7 +604,7 @@ 
 	{
 		$query = $this->getDeleteSql($queryObject, $with_values, true);
 		$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
-		if(is_a($query, 'Object'))
+		if (is_a($query, 'Object'))
 		{
 			return;
 		}
@@ -624,30 +624,30 @@ 
 	{
 		$limit = $queryObject->getLimit();
 		$result = NULL;
-		if($limit && $limit->isPageHandler())
+		if ($limit && $limit->isPageHandler())
 		{
 			return $this->queryPageLimit($queryObject, $result, $connection, $with_values);
 		}
 		else
 		{
 			$query = $this->getSelectSql($queryObject, $with_values);
-			if(is_a($query, 'Object'))
+			if (is_a($query, 'Object'))
 			{
 				return;
 			}
 			$query .= (__DEBUG_QUERY__ & 1 && $queryObject->queryID) ? sprintf(' ' . $this->comment_syntax, $queryObject->queryID) : '';
 
 			$result = $this->_query($query, $connection);
-			if($this->isError())
+			if ($this->isError())
 			{
 				return $this->queryError($queryObject);
 			}
 
 			$data = $this->_fetch($result);
-			$buff = new Object ();
+			$buff = new Object();
 			$buff->data = $data;
 
-			if($queryObject->usesClickCount())
+			if ($queryObject->usesClickCount())
 			{
 				$update_query = $this->getClickCountQuery($queryObject);
 				$this->_executeUpdateAct($update_query, $with_values);
@@ -708,9 +708,9 @@ 
 	function queryError($queryObject)
 	{
 		$limit = $queryObject->getLimit();
-		if($limit && $limit->isPageHandler())
+		if ($limit && $limit->isPageHandler())
 		{
-			$buff = new Object ();
+			$buff = new Object();
 			$buff->total_count = 0;
 			$buff->total_page = 0;
 			$buff->page = 1;
@@ -743,7 +743,7 @@ 
 		$temp_select = $queryObject->getSelectString($with_values);
 		$uses_distinct = stripos($temp_select, "distinct") !== false;
 		$uses_groupby = $queryObject->getGroupByString() != '';
-		if($uses_distinct || $uses_groupby)
+		if ($uses_distinct || $uses_groupby)
 		{
 			$count_query = sprintf('select %s %s %s %s'
 					, $temp_select == '*' ? '1' : $temp_select
@@ -762,23 +762,23 @@ 
 		$total_count = (int) (isset($count_output->count) ? $count_output->count : NULL);
 
 		$list_count = $limit->list_count->getValue();
-		if(!$list_count)
+		if (!$list_count)
 		{
 			$list_count = 20;
 		}
 		$page_count = $limit->page_count->getValue();
-		if(!$page_count)
+		if (!$page_count)
 		{
 			$page_count = 10;
 		}
 		$page = $limit->page->getValue();
-		if(!$page || $page < 1)
+		if (!$page || $page < 1)
 		{
 			$page = 1;
 		}
 
 		// total pages
-		if($total_count)
+		if ($total_count)
 		{
 			$total_page = (int) (($total_count - 1) / $list_count) + 1;
 		}
@@ -788,10 +788,10 @@ 
 		}
 
 		// check the page variables
-		if($page > $total_page)
+		if ($page > $total_page)
 		{
 			// If requested page is bigger than total number of pages, return empty list
-			$buff = new Object ();
+			$buff = new Object();
 			$buff->total_count = $total_count;
 			$buff->total_page = $total_page;
 			$buff->page = $page;
@@ -805,7 +805,7 @@ 
 
 		$query .= (__DEBUG_QUERY__ & 1 && $queryObject->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
 		$result = $this->_query($query, $connection);
-		if($this->isError())
+		if ($this->isError())
 		{
 			return $this->queryError($queryObject);
 		}
@@ -813,7 +813,7 @@ 
 		$virtual_no = $total_count - ($page - 1) * $list_count;
 		$data = $this->_fetch($result, $virtual_no);
 
-		$buff = new Object ();
+		$buff = new Object();
 		$buff->total_count = $total_count;
 		$buff->total_page = $total_page;
 		$buff->page = $page;
@@ -833,39 +833,39 @@ 
 	function getSelectPageSql($query, $with_values = true, $start_count = 0, $list_count = 0)
 	{
 		$select = $query->getSelectString($with_values);
-		if($select == '')
+		if ($select == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
 		$select = 'SELECT ' . $select;
 
 		$from = $query->getFromString($with_values);
-		if($from == '')
+		if ($from == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
 		$from = ' FROM ' . $from;
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
 			$where = ' WHERE ' . $where;
 		}
 
 		$groupBy = $query->getGroupByString();
-		if($groupBy != '')
+		if ($groupBy != '')
 		{
 			$groupBy = ' GROUP BY ' . $groupBy;
 		}
 
 		$orderBy = $query->getOrderByString();
-		if($orderBy != '')
+		if ($orderBy != '')
 		{
 			$orderBy = ' ORDER BY ' . $orderBy;
 		}
 
 		$limit = $query->getLimitString();
-		if($limit != '')
+		if ($limit != '')
 		{
 			$limit = sprintf(' LIMIT %d, %d', $start_count, $list_count);
 		}

Braces +17 added lines, -22 removed lines

@@ -214,8 +214,7 @@ 
 			if($arrayIndexEndValue)
 			{
 				$output[$arrayIndexEndValue--] = $tmp;
-			}
-			else
+			} else
 			{
 				$output[] = $tmp;
 			}
@@ -225,8 +224,7 @@ 
 			if(isset($arrayIndexEndValue))
 			{
 				return $output;
-			}
-			else
+			} else
 			{
 				return $output[0];
 			}
@@ -311,8 +309,7 @@ 
 		if($size)
 		{
 			$query .= sprintf(" %s(%s) ", $type, $size);
-		}
-		else
+		} else
 		{
 			$query .= sprintf(" %s ", $type);
 		}
@@ -490,8 +487,7 @@ 
 		if(!is_array($xml_obj->table->column))
 		{
 			$columns[] = $xml_obj->table->column;
-		}
-		else
+		} else
 		{
 			$columns = $xml_obj->table->column;
 		}
@@ -517,12 +513,10 @@ 
 			if($primary_key)
 			{
 				$primary_list[] = $name;
-			}
-			else if($unique)
+			} else if($unique)
 			{
 				$unique_list[$unique][] = $name;
-			}
-			else if($index)
+			} else if($index)
 			{
 				$index_list[$index][] = $name;
 			}
@@ -552,8 +546,9 @@ 
 		$schema = sprintf('create table `%s` (%s%s) %s;', $this->addQuotes($table_name), "\n", implode($column_schema, ",\n"), "ENGINE = MYISAM  CHARACTER SET utf8 COLLATE utf8_general_ci");
 
 		$output = $this->_query($schema);
-		if(!$output)
-			return false;
+		if(!$output) {
+					return false;
+		}
 	}
 
 	/**
@@ -584,8 +579,11 @@ 
 		$query = $this->getUpdateSql($queryObject, $with_values, true);
 		if(is_a($query, 'Object'))
 		{
-			if(!$query->toBool()) return $query;
-			else return;
+			if(!$query->toBool()) {
+				return $query;
+			} else {
+				return;
+			}
 		}
 
 		$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
@@ -627,8 +625,7 @@ 
 		if($limit && $limit->isPageHandler())
 		{
 			return $this->queryPageLimit($queryObject, $result, $connection, $with_values);
-		}
-		else
+		} else
 		{
 			$query = $this->getSelectSql($queryObject, $with_values);
 			if(is_a($query, 'Object'))
@@ -717,8 +714,7 @@ 
 			$buff->data = array();
 			$buff->page_navigation = new PageHandler(/* $total_count */0, /* $total_page */1, /* $page */1, /* $page_count */10); //default page handler values
 			return $buff;
-		}
-		else
+		} else
 		{
 			return;
 		}
@@ -781,8 +777,7 @@ 
 		if($total_count)
 		{
 			$total_page = (int) (($total_count - 1) / $list_count) + 1;
-		}
-		else
+		} else
 		{
 			$total_page = 1;
 		}