xpressengine / xe-core

modules/admin/admin.admin.view.php

Spacing +77 added lines, -77 removed lines

@@ -28,7 +28,7 @@ 
 	{
 		$db_info = Context::getDBInfo();
 
-		if(strpos($db_info->default_url, 'xn--') !== FALSE)
+		if (strpos($db_info->default_url, 'xn--') !== FALSE)
 		{
 			$xe_default_url = Context::decodeIdna($db_info->default_url);
 		}
@@ -48,13 +48,13 @@ 
 		// forbit access if the user is not an administrator
 		$oMemberModel = getModel('member');
 		$logged_info = $oMemberModel->getLoggedInfo();
-		if($logged_info->is_admin != 'Y')
+		if ($logged_info->is_admin != 'Y')
 		{
 			return $this->stop("msg_is_not_administrator");
 		}
 
 		// change into administration layout
-		$this->setTemplatePath($this->module_path . 'tpl');
+		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setLayoutPath($this->getTemplatePath());
 		$this->setLayoutFile('layout.html');
 
@@ -74,11 +74,11 @@ 
 		Context::set('use_db_session', $db_info->use_db_session == 'N' ? 'N' : 'Y');
 		Context::set('use_mobile_view', $db_info->use_mobile_view == 'Y' ? 'Y' : 'N');
 		Context::set('use_ssl', $db_info->use_ssl ? $db_info->use_ssl : "none");
-		if($db_info->http_port)
+		if ($db_info->http_port)
 		{
 			Context::set('http_port', $db_info->http_port);
 		}
-		if($db_info->https_port)
+		if ($db_info->https_port)
 		{
 			Context::set('https_port', $db_info->https_port);
 		}
@@ -94,7 +94,7 @@ 
 	function checkEasyinstall()
 	{
 		$lastTime = (int) FileHandler::readFile($this->easyinstallCheckFile);
-		if($lastTime > $_SERVER['REQUEST_TIME'] - 60 * 60 * 24 * 30)
+		if ($lastTime > $_SERVER['REQUEST_TIME'] - 60 * 60 * 24 * 30)
 		{
 			return;
 		}
@@ -108,14 +108,14 @@ 
 		$lUpdateDoc = $xml_lUpdate->parse($buff);
 		$updateDate = $lUpdateDoc->response->updatedate->body;
 
-		if(!$updateDate)
+		if (!$updateDate)
 		{
 			$this->_markingCheckEasyinstall();
 			return;
 		}
 
 		$item = $oAutoinstallModel->getLatestPackage();
-		if(!$item || $item->updatedate < $updateDate)
+		if (!$item || $item->updatedate < $updateDate)
 		{
 			$oController = getAdminController('autoinstall');
 			$oController->_updateinfo();
@@ -144,7 +144,7 @@ 
 
 		// Check is_shortcut column
 		$oDB = DB::getInstance();
-		if(!$oDB->isColumnExists('menu_item', 'is_shortcut'))
+		if (!$oDB->isColumnExists('menu_item', 'is_shortcut'))
 		{
 			return;
 		}
@@ -162,9 +162,9 @@ 
 		$currentAct = Context::get('act');
 		$subMenuTitle = '';
 
-		foreach((array) $moduleActionInfo->menu as $key => $value)
+		foreach ((array) $moduleActionInfo->menu as $key => $value)
 		{
-			if(isset($value->acts) && is_array($value->acts) && in_array($currentAct, $value->acts))
+			if (isset($value->acts) && is_array($value->acts) && in_array($currentAct, $value->acts))
 			{
 				$subMenuTitle = $value->title;
 				break;
@@ -173,21 +173,21 @@ 
 		// get current menu's srl(=parentSrl)
 		$parentSrl = 0;
 		$oMenuAdminConroller = getAdminController('menu');
-		foreach((array) $menu->list as $parentKey => $parentMenu)
+		foreach ((array) $menu->list as $parentKey => $parentMenu)
 		{
-			if(!is_array($parentMenu['list']) || !count($parentMenu['list']))
+			if (!is_array($parentMenu['list']) || !count($parentMenu['list']))
 			{
 				continue;
 			}
-			if($parentMenu['href'] == '#' && count($parentMenu['list']))
+			if ($parentMenu['href'] == '#' && count($parentMenu['list']))
 			{
 				$firstChild = current($parentMenu['list']);
 				$menu->list[$parentKey]['href'] = $firstChild['href'];
 			}
 
-			foreach($parentMenu['list'] as $childKey => $childMenu)
+			foreach ($parentMenu['list'] as $childKey => $childMenu)
 			{
-				if($subMenuTitle == $childMenu['text'] && $parentSrl == 0)
+				if ($subMenuTitle == $childMenu['text'] && $parentSrl == 0)
 				{
 					$parentSrl = $childMenu['parent_srl'];
 				}
@@ -200,7 +200,7 @@ 
 		$gnbTitleInfo->adminTitle = $objConfig->adminTitle ? $objConfig->adminTitle : 'XE Admin';
 		$gnbTitleInfo->adminLogo = $objConfig->adminLogo ? $objConfig->adminLogo : 'modules/admin/tpl/img/xe.h1.png';
 
-		$browserTitle = ($subMenuTitle ? $subMenuTitle : 'Dashboard') . ' - ' . $gnbTitleInfo->adminTitle;
+		$browserTitle = ($subMenuTitle ? $subMenuTitle : 'Dashboard').' - '.$gnbTitleInfo->adminTitle;
 
 		// Get list of favorite
 		$oAdminAdminModel = getAdminModel('admin');
@@ -211,7 +211,7 @@ 
 		// move from index method, because use in admin footer
 		$newest_news_url = sprintf("http://news.xpressengine.com/%s/news.php?version=%s&package=%s", _XE_LOCATION_, __XE_VERSION__, _XE_PACKAGE_);
 		$cache_file = sprintf("%sfiles/cache/newest_news.%s.cache.php", _XE_PATH_, _XE_LOCATION_);
-		if(!file_exists($cache_file) || filemtime($cache_file) + 60 * 60 < $_SERVER['REQUEST_TIME'])
+		if (!file_exists($cache_file) || filemtime($cache_file) + 60 * 60 < $_SERVER['REQUEST_TIME'])
 		{
 			// Considering if data cannot be retrieved due to network problem, modify filemtime to prevent trying to reload again when refreshing administration page
 			// Ensure to access the administration page even though news cannot be displayed
@@ -219,20 +219,20 @@ 
 			FileHandler::getRemoteFile($newest_news_url, $cache_file, null, 1, 'GET', 'text/html', array('REQUESTURL' => getFullUrl('')));
 		}
 
-		if(file_exists($cache_file))
+		if (file_exists($cache_file))
 		{
 			$oXml = new XmlParser();
 			$buff = $oXml->parse(FileHandler::readFile($cache_file));
 
 			$item = $buff->zbxe_news->item;
-			if($item)
+			if ($item)
 			{
-				if(!is_array($item))
+				if (!is_array($item))
 				{
 					$item = array($item);
 				}
 
-				foreach($item as $key => $val)
+				foreach ($item as $key => $val)
 				{
 					$obj = new stdClass();
 					$obj->title = $val->body;
@@ -241,7 +241,7 @@ 
 					$news[] = $obj;
 				}
 				Context::set('news', $news);
-				if(isset($news) && is_array($news))
+				if (isset($news) && is_array($news))
 				{
 					Context::set('latestVersion', array_shift($news));
 				}
@@ -264,7 +264,7 @@ 
 	function dispAdminIndex()
 	{
 		$db_info = Context::getDBInfo();
-		Context::set('db_info',$db_info);
+		Context::set('db_info', $db_info);
 
 		// Get statistics
 		$args = new stdClass();
@@ -301,9 +301,9 @@ 
 		$args = new stdClass();
 		$args->list_count = 5;
 		$output = $oCommentModel->getNewestCommentList($args, $columnList);
-		if(is_array($output))
+		if (is_array($output))
 		{
-			foreach($output AS $key => $value)
+			foreach ($output AS $key => $value)
 			{
 				$value->content = strip_tags($value->content);
 			}
@@ -314,17 +314,17 @@ 
 		// Get list of modules
 		$oModuleModel = getModel('module');
 		$module_list = $oModuleModel->getModuleList();
-		if(is_array($module_list))
+		if (is_array($module_list))
 		{
 			$needUpdate = FALSE;
 			$addTables = FALSE;
-			foreach($module_list AS $key => $value)
+			foreach ($module_list AS $key => $value)
 			{
-				if($value->need_install)
+				if ($value->need_install)
 				{
 					$addTables = TRUE;
 				}
-				if($value->need_update)
+				if ($value->need_update)
 				{
 					$needUpdate = TRUE;
 				}
@@ -335,12 +335,12 @@ 
 		$oAutoinstallAdminModel = getAdminModel('autoinstall');
 		$needUpdateList = $oAutoinstallAdminModel->getNeedUpdateList();
 
-		if(is_array($needUpdateList))
+		if (is_array($needUpdateList))
 		{
-			foreach($needUpdateList AS $key => $value)
+			foreach ($needUpdateList AS $key => $value)
 			{
 				$helpUrl = './admin/help/index.html#';
-				switch($value->type)
+				switch ($value->type)
 				{
 					case 'addon':
 						$helpUrl .= 'UMAN_terminology_addon';
@@ -367,8 +367,8 @@ 
 
 		$site_module_info = Context::get('site_module_info');
 		$oAddonAdminModel = getAdminModel('addon');
-		$counterAddonActivated = $oAddonAdminModel->isActivatedAddon('counter', $site_module_info->site_srl );
-		if(!$counterAddonActivated)
+		$counterAddonActivated = $oAddonAdminModel->isActivatedAddon('counter', $site_module_info->site_srl);
+		if (!$counterAddonActivated)
 		{
 			$columnList = array('member_srl', 'nick_name', 'user_name', 'user_id', 'email_address');
 			$args = new stdClass;
@@ -391,9 +391,9 @@ 
 
 		// gathering enviroment check
 		$mainVersion = join('.', array_slice(explode('.', __XE_VERSION__), 0, 2));
-		$path = FileHandler::getRealPath('./files/env/' . $mainVersion);
+		$path = FileHandler::getRealPath('./files/env/'.$mainVersion);
 		$isEnviromentGatheringAgreement = FALSE;
-		if(file_exists($path))
+		if (file_exists($path))
 		{
 			$isEnviromentGatheringAgreement = TRUE;
 		}
@@ -403,7 +403,7 @@ 
 		$isLicenseAgreement = FALSE;
 		$path = FileHandler::getRealPath('./files/env/license_agreement');
 		$isLicenseAgreement = FALSE;
-		if(file_exists($path))
+		if (file_exists($path))
 		{
 			$isLicenseAgreement = TRUE;
 		}
@@ -425,7 +425,7 @@ 
 
 		Context::set('selected_lang', $db_info->lang_type);
 
-		if(strpos($db_info->default_url, 'xn--') !== FALSE)
+		if (strpos($db_info->default_url, 'xn--') !== FALSE)
 		{
 			$db_info->default_url = Context::decodeIdna($db_info->default_url);
 		}
@@ -434,9 +434,9 @@ 
 
 		// site lock
 		Context::set('IP', $_SERVER['REMOTE_ADDR']);
-		if(!$db_info->sitelock_title) $db_info->sitelock_title = 'Maintenance in progress...';
-		if(!in_array('127.0.0.1', $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = '127.0.0.1';
-		if(!in_array($_SERVER['REMOTE_ADDR'], $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = $_SERVER['REMOTE_ADDR'];
+		if (!$db_info->sitelock_title) $db_info->sitelock_title = 'Maintenance in progress...';
+		if (!in_array('127.0.0.1', $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = '127.0.0.1';
+		if (!in_array($_SERVER['REMOTE_ADDR'], $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = $_SERVER['REMOTE_ADDR'];
 		$db_info->sitelock_whitelist = array_unique($db_info->sitelock_whitelist);
 		Context::set('remote_addr', $_SERVER['REMOTE_ADDR']);
 		Context::set('use_sitelock', $db_info->use_sitelock);
@@ -447,7 +447,7 @@ 
 		Context::set('sitelock_whitelist', $whitelist);
 
 
-		if($db_info->admin_ip_list) $admin_ip_list = implode("\r\n", $db_info->admin_ip_list);
+		if ($db_info->admin_ip_list) $admin_ip_list = implode("\r\n", $db_info->admin_ip_list);
 		else $admin_ip_list = '';
 		Context::set('admin_ip_list', $admin_ip_list);
 
@@ -470,7 +470,7 @@ 
 		Context::set('htmlFooter', htmlspecialchars($config->htmlFooter));
 
 		// embed filter
-		require_once(_XE_PATH_ . 'classes/security/EmbedFilter.class.php');
+		require_once(_XE_PATH_.'classes/security/EmbedFilter.class.php');
 		$oEmbedFilter = EmbedFilter::getInstance();
 		context::set('embed_white_object', implode(PHP_EOL, $oEmbedFilter->whiteUrlList));
 		context::set('embed_white_iframe', implode(PHP_EOL, $oEmbedFilter->whiteIframeUrlList));
@@ -529,36 +529,36 @@ 
 	 */
 	function showSendEnv()
 	{
-		if(Context::getResponseMethod() != 'HTML')
+		if (Context::getResponseMethod() != 'HTML')
 		{
 			return;
 		}
 
 		$server = 'http://collect.xpressengine.com/env/img.php?';
 		$path = './files/env/';
-		$install_env = $path . 'install';
+		$install_env = $path.'install';
 		$mainVersion = join('.', array_slice(explode('.', __XE_VERSION__), 0, 2));
 
-		if(file_exists(FileHandler::getRealPath($install_env)))
+		if (file_exists(FileHandler::getRealPath($install_env)))
 		{
 			$oAdminAdminModel = getAdminModel('admin');
 			$params = $oAdminAdminModel->getEnv('INSTALL');
-			$img = sprintf('<img src="%s" alt="" style="height:0px;width:0px" />', $server . $params);
+			$img = sprintf('<img src="%s" alt="" style="height:0px;width:0px" />', $server.$params);
 			Context::addHtmlFooter($img);
 
-			FileHandler::writeFile($path . $mainVersion, '1');
+			FileHandler::writeFile($path.$mainVersion, '1');
 		}
-		else if(isset($_SESSION['enviroment_gather']) && !file_exists(FileHandler::getRealPath($path . $mainVersion)))
+		else if (isset($_SESSION['enviroment_gather']) && !file_exists(FileHandler::getRealPath($path.$mainVersion)))
 		{
-			if($_SESSION['enviroment_gather'] == 'Y')
+			if ($_SESSION['enviroment_gather'] == 'Y')
 			{
 				$oAdminAdminModel = getAdminModel('admin');
 				$params = $oAdminAdminModel->getEnv();
-				$img = sprintf('<img src="%s" alt="" style="height:0px;width:0px" />', $server . $params);
+				$img = sprintf('<img src="%s" alt="" style="height:0px;width:0px" />', $server.$params);
 				Context::addHtmlFooter($img);
 			}
 
-			FileHandler::writeFile($path . $mainVersion, '1');
+			FileHandler::writeFile($path.$mainVersion, '1');
 			unset($_SESSION['enviroment_gather']);
 		}
 	}
@@ -576,64 +576,64 @@ 
 		$tmp = explode("&", $envInfo);
 		$arrInfo = array();
 		$xe_check_env = array();
-		foreach($tmp as $value) {
+		foreach ($tmp as $value) {
 			$arr = explode("=", $value);
-			if($arr[0]=="type") {
+			if ($arr[0] == "type") {
 				continue;
-			}elseif($arr[0]=="phpext" ) {
+			}elseif ($arr[0] == "phpext") {
 				$str = urldecode($arr[1]);
-				$xe_check_env[$arr[0]]= str_replace("|", ", ", $str);
-			} elseif($arr[0]=="module" ) {
+				$xe_check_env[$arr[0]] = str_replace("|", ", ", $str);
+			} elseif ($arr[0] == "module") {
 				$str = urldecode($arr[1]);
 				$arrModuleName = explode("|", $str);
 				$oModuleModel = getModel("module");
 				$mInfo = array();
-				foreach($arrModuleName as $moduleName) {
+				foreach ($arrModuleName as $moduleName) {
 					$moduleInfo = $oModuleModel->getModuleInfoXml($moduleName);
 					$mInfo[] = "{$moduleName}({$moduleInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
-			} elseif($arr[0]=="addon") {
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
+			} elseif ($arr[0] == "addon") {
 				$str = urldecode($arr[1]);
 				$arrAddonName = explode("|", $str);
 				$oAddonModel = getAdminModel("addon");
 				$mInfo = array();
-				foreach($arrAddonName as $addonName) {
+				foreach ($arrAddonName as $addonName) {
 					$addonInfo = $oAddonModel->getAddonInfoXml($addonName);
 					$mInfo[] = "{$addonName}({$addonInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
-			} elseif($arr[0]=="widget") {
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
+			} elseif ($arr[0] == "widget") {
 				$str = urldecode($arr[1]);
 				$arrWidgetName = explode("|", $str);
 				$oWidgetModel = getModel("widget");
 				$mInfo = array();
-				foreach($arrWidgetName as $widgetName) {
+				foreach ($arrWidgetName as $widgetName) {
 					$widgetInfo = $oWidgetModel->getWidgetInfo($widgetName);
 					$mInfo[] = "{$widgetName}({$widgetInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
-			} elseif($arr[0]=="widgetstyle") {
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
+			} elseif ($arr[0] == "widgetstyle") {
 				$str = urldecode($arr[1]);
 				$arrWidgetstyleName = explode("|", $str);
 				$oWidgetModel = getModel("widget");
 				$mInfo = array();
-				foreach($arrWidgetstyleName as $widgetstyleName) {
+				foreach ($arrWidgetstyleName as $widgetstyleName) {
 					$widgetstyleInfo = $oWidgetModel->getWidgetStyleInfo($widgetstyleName);
 					$mInfo[] = "{$widgetstyleName}({$widgetstyleInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
 
-			} elseif($arr[0]=="layout") {
+			} elseif ($arr[0] == "layout") {
 				$str = urldecode($arr[1]);
 				$arrLayoutName = explode("|", $str);
 				$oLayoutModel = getModel("layout");
 				$mInfo = array();
-				foreach($arrLayoutName as $layoutName) {
+				foreach ($arrLayoutName as $layoutName) {
 					$layoutInfo = $oLayoutModel->getLayoutInfo($layoutName);
 					$mInfo[] = "{$layoutName}({$layoutInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
 			} else {
 				$xe_check_env[$arr[0]] = urldecode($arr[1]);
 			}
@@ -647,15 +647,15 @@ 
 		$php_core['memory_limit'] = "{$ini_info['memory_limit']['local_value']}";
 		$info['PHP_Core'] = $php_core;
 
-		$str_info = "[XE Server Environment " . date("Y-m-d") . "]\n\n";
+		$str_info = "[XE Server Environment ".date("Y-m-d")."]\n\n";
 		$str_info .= "realpath : ".realpath('./')."\n";
-		foreach( $info as $key=>$value )
+		foreach ($info as $key=>$value)
 		{
-			if( is_array( $value ) == false ) {
+			if (is_array($value) == false) {
 				$str_info .= "{$key} : {$value}\n";
 			} else {
 				//$str_info .= "\n{$key} \n";
-				foreach( $value as $key2=>$value2 )
+				foreach ($value as $key2=>$value2)
 					$str_info .= "{$key2} : {$value2}\n";
 			}
 		}
@@ -672,7 +672,7 @@ 
 		Context::set('use_rewrite', $useRewrite); 
 
 		// nginx 체크, rewrite 사용법 안내
-		if($useRewrite == 'N' && stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) Context::set('use_nginx', 'Y');
+		if ($useRewrite == 'N' && stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) Context::set('use_nginx', 'Y');
 		
 		Context::set('useable', $oInstallController->checkInstallEnv());
 		$this->setTemplateFile('check_env.html');

Braces +23 added lines, -13 removed lines

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

classes/db/DBCubrid.class.php

Spacing +144 added lines, -144 removed lines

@@ -52,7 +52,7 @@ 
 	function DBCubrid($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if ($auto_connect) $this->_connect();
 	}
 
 	/**
@@ -76,21 +76,21 @@ 
 		$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);
-			$cubrid_version = $cubrid_version_elem[0] . '.' . $cubrid_version_elem[1] . '.' . $cubrid_version_elem[2];
+			$cubrid_version = $cubrid_version_elem[0].'.'.$cubrid_version_elem[1].'.'.$cubrid_version_elem[2];
 			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,17 +146,17 @@ 
 	 */
 	function _begin($transactionLevel = 0)
 	{
-		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);
 			}
 			else
 			{
-				$this->_query("SAVEPOINT SP" . $transactionLevel, $connection);
+				$this->_query("SAVEPOINT SP".$transactionLevel, $connection);
 			}
 		}
 		return TRUE;
@@ -173,9 +173,9 @@ 
 
 		$point = $transactionLevel - 1;
 
-		if($point)
+		if ($point)
 		{
-			$this->_query("ROLLBACK TO SP" . $point, $connection);
+			$this->_query("ROLLBACK TO SP".$point, $connection);
 		}
 		else
 		{
@@ -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,21 +404,21 @@ 
 		$output = $this->_fetch($result);
 
 		// if do not create serial
-		if($output->count == 0)
-		{
-			$query = sprintf('select max("a"."srl") as "srl" from ' .
-					'( select max("document_srl") as "srl" from ' .
-					'"%sdocuments" UNION ' .
-					'select max("comment_srl") as "srl" from ' .
-					'"%scomments" UNION ' .
-					'select max("member_srl") as "srl" from ' .
-					'"%smember"' .
+		if ($output->count == 0)
+		{
+			$query = sprintf('select max("a"."srl") as "srl" from '.
+					'( select max("document_srl") as "srl" from '.
+					'"%sdocuments" UNION '.
+					'select max("comment_srl") as "srl" from '.
+					'"%scomments" UNION '.
+					'select max("member_srl") as "srl" from '.
+					'"%smember"'.
 					') as "a"', $this->prefix, $this->prefix, $this->prefix);
 
 			$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 ";
 		}
@@ -547,10 +547,10 @@ 
 	 */
 	function isColumnExists($table_name, $column_name)
 	{
-		$query = sprintf("select \"attr_name\" from \"db_attribute\" where " . "\"attr_name\" ='%s' and \"class_name\" = '%s%s'", $column_name, $this->prefix, $table_name);
+		$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,12 +579,12 @@ 
 	 */
 	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);
 		}
 
-		$query = sprintf("create %s index \"%s\" on \"%s%s\" (%s);", $is_unique ? 'unique' : '', $index_name, $this->prefix, $table_name, '"' . implode('","', $target_columns) . '"');
+		$query = sprintf("create %s index \"%s\" on \"%s%s\" (%s);", $is_unique ? 'unique' : '', $index_name, $this->prefix, $table_name, '"'.implode('","', $target_columns).'"');
 
 		$this->_query($query);
 	}
@@ -611,17 +611,17 @@ 
 	 */
 	function isIndexExists($table_name, $index_name)
 	{
-		$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);
+		$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;
 		}
@@ -653,25 +653,25 @@ 
 				", strlen($this->prefix)
 				, $this->prefix
 				, strlen($this->prefix) + 1
-				, "'" . $this->prefix . '%' . "'"
+				, "'".$this->prefix.'%'."'"
 				, strlen($this->prefix)
 				, $this->prefix
 				, strlen($this->prefix) + 1
 		);
 		$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,10 +680,10 @@ 
 			$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
+					, $this->prefix.$index->unprefixed_index_name
 					, $index->is_unique == 'YES' ? TRUE : FALSE);
 		}
 
@@ -707,7 +707,7 @@ 
 	 */
 	function createTableByXmlFile($file_name)
 	{
-		if(!file_exists($file_name))
+		if (!file_exists($file_name))
 		{
 			return;
 		}
@@ -734,28 +734,28 @@ 
 		$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 ' .
-					'maxvalue 10000000000000000000000000000000000000' . ' nocycle;', $this->prefix . $table_name);
+			$query = sprintf('create serial "%s" start with 1 increment by 1'.
+					' minvalue 1 '.
+					'maxvalue 10000000000000000000000000000000000000'.' nocycle;', $this->prefix.$table_name);
 
 			return $this->_query($query);
 		}
 
 
-		$table_name = $this->prefix . $table_name;
+		$table_name = $this->prefix.$table_name;
 
 		$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,58 +791,58 @@ 
 					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' : '');
+			$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;
 			}
 		}
 
-		$query .= implode(',', $column_schema) . ';';
+		$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) . '"');
+			$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) . '"');
+				$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) . '"');
+				$query = sprintf("create index \"%s\" on \"%s\" (%s);", $key, $table_name, '"'.implode('","', $val).'"');
 				$this->_query($query);
 			}
 		}
@@ -856,22 +856,22 @@ 
 	 */
 	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;
 		}
 
-		$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
+		$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,23 +887,23 @@ 
 	 */
 	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;
 		}
 
-		$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
+		$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();
 		}
@@ -919,23 +919,23 @@ 
 	 */
 	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;
 		}
 
-		$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
+		$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();
 		}
@@ -955,36 +955,36 @@ 
 	 */
 	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;
 			}
 
-			$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
+			$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;
 	}
 
@@ -1025,48 +1025,48 @@ 
 		$limit = $queryObject->getLimit();
 		// Total count
 		$temp_where = $queryObject->getWhereString($with_values, FALSE);
-		$count_query = sprintf('select count(*) as "count" %s %s', 'FROM ' . $queryObject->getFromString($with_values), ($temp_where === '' ? '' : ' WHERE ' . $temp_where));
+		$count_query = sprintf('select count(*) as "count" %s %s', 'FROM '.$queryObject->getFromString($with_values), ($temp_where === '' ? '' : ' WHERE '.$temp_where));
 
 		// Check for distinct query and if found update count query structure
 		$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
-					, 'FROM ' . $queryObject->getFromString($with_values)
-					, ($temp_where === '' ? '' : ' WHERE ' . $temp_where)
-					, ($uses_groupby ? ' GROUP BY ' . $queryObject->getGroupByString() : '')
+					, 'FROM '.$queryObject->getFromString($with_values)
+					, ($temp_where === '' ? '' : ' WHERE '.$temp_where)
+					, ($uses_groupby ? ' GROUP BY '.$queryObject->getGroupByString() : '')
 			);
 
 			// If query uses grouping or distinct, count from original select
 			$count_query = sprintf('select count(*) as "count" from (%s) xet', $count_query);
 		}
 
-		$count_query .= (__DEBUG_QUERY__ & 1 && $queryObject->queryID) ? sprintf(' ' . $this->comment_syntax, $queryObject->queryID) : '';
+		$count_query .= (__DEBUG_QUERY__ & 1 && $queryObject->queryID) ? sprintf(' '.$this->comment_syntax, $queryObject->queryID) : '';
 		$result = $this->_query($count_query, $connection);
 		$count_output = $this->_fetch($result);
 		$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;
@@ -1092,9 +1092,9 @@ 
 		$start_count = ($page - 1) * $list_count;
 
 		$query = $this->getSelectPageSql($queryObject, $with_values, $start_count, $list_count);
-		$query .= (__DEBUG_QUERY__ & 1 && $queryObject->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
+		$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,44 +1135,44 @@ 
 	{
 
 		$select = $query->getSelectString($with_values);
-		if($select == '')
+		if ($select == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
-		$select = 'SELECT ' . $select;
+		$select = 'SELECT '.$select;
 
 		$from = $query->getFromString($with_values);
-		if($from == '')
+		if ($from == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
-		$from = ' FROM ' . $from;
+		$from = ' FROM '.$from;
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
-			$where = ' WHERE ' . $where;
+			$where = ' WHERE '.$where;
 		}
 
 		$groupBy = $query->getGroupByString();
-		if($groupBy != '')
+		if ($groupBy != '')
 		{
-			$groupBy = ' GROUP BY ' . $groupBy;
+			$groupBy = ' GROUP BY '.$groupBy;
 		}
 
 		$orderBy = $query->getOrderByString();
-		if($orderBy != '')
+		if ($orderBy != '')
 		{
-			$orderBy = ' ORDER BY ' . $orderBy;
+			$orderBy = ' ORDER BY '.$orderBy;
 		}
 
 		$limit = $query->getLimitString();
-		if($limit != '')
+		if ($limit != '')
 		{
 			$limit = sprintf(' LIMIT %d, %d', $start_count, $list_count);
 		}
 
-		return $select . ' ' . $from . ' ' . $where . ' ' . $groupBy . ' ' . $orderBy . ' ' . $limit;
+		return $select.' '.$from.' '.$where.' '.$groupBy.' '.$orderBy.' '.$limit;
 	}
 
 }

Braces +31 added lines, -41 removed lines

@@ -52,7 +52,9 @@ 
 	function DBCubrid($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if($auto_connect) {
+			$this->_connect();
+		}
 	}
 
 	/**
@@ -90,8 +92,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 +156,7 @@ 
 			if(!$transactionLevel)
 			{
 				cubrid_set_autocommit($connection, CUBRID_AUTOCOMMIT_FALSE);
-			}
-			else
+			} else
 			{
 				$this->_query("SAVEPOINT SP" . $transactionLevel, $connection);
 			}
@@ -176,8 +178,7 @@ 
 		if($point)
 		{
 			$this->_query("ROLLBACK TO SP" . $point, $connection);
-		}
-		else
+		} else
 		{
 			@cubrid_rollback($connection);
 		}
@@ -251,8 +252,7 @@ 
 								return false;
 							}
 						}
-					}
-					else
+					} else
 					{
 						$bound = @cubrid_bind($req, ++$position, $value, $bind_type);
 						if(!$bound)
@@ -343,8 +343,7 @@ 
 			if($arrayIndexEndValue)
 			{
 				$output[$arrayIndexEndValue--] = $tmp;
-			}
-			else
+			} else
 			{
 				$output[] = $tmp;
 			}
@@ -395,8 +394,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 +421,7 @@ 
 			if($srl < 1)
 			{
 				$start = 1;
-			}
-			else
+			} else
 			{
 				$start = $srl + 1000000;
 			}
@@ -445,8 +444,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 +453,7 @@ 
 		if(cubrid_num_rows($result) > 0)
 		{
 			$output = TRUE;
-		}
-		else
+		} else
 		{
 			$output = FALSE;
 		}
@@ -500,8 +497,7 @@ 
 		if($size)
 		{
 			$query .= sprintf("%s(%s) ", $type, $size);
-		}
-		else
+		} else
 		{
 			$query .= sprintf("%s ", $type);
 		}
@@ -511,8 +507,7 @@ 
 			if($type == 'INTEGER' || $type == 'BIGINT' || $type == 'INT')
 			{
 				$query .= sprintf("default %d ", $default);
-			}
-			else
+			} else
 			{
 				$query .= sprintf("default '%s' ", $default);
 			}
@@ -553,8 +548,7 @@ 
 		if(cubrid_num_rows($result) > 0)
 		{
 			$output = TRUE;
-		}
-		else
+		} else
 		{
 			$output = FALSE;
 		}
@@ -674,8 +668,7 @@ 
 		if(!is_array($output))
 		{
 			$indexes_to_be_deleted = array($output);
-		}
-		else
+		} else
 		{
 			$indexes_to_be_deleted = $output;
 		}
@@ -758,8 +751,7 @@ 
 		if(!is_array($xml_obj->table->column))
 		{
 			$columns[] = $xml_obj->table->column;
-		}
-		else
+		} else
 		{
 			$columns = $xml_obj->table->column;
 		}
@@ -799,8 +791,9 @@ 
 
 			if($type == 'varchar' || $type == 'char')
 			{
-				if($size)
-					$size = $size * 3;
+				if($size) {
+									$size = $size * 3;
+				}
 			}
 
 
@@ -809,12 +802,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 +955,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 +999,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 +1060,7 @@ 
 		if($total_count)
 		{
 			$total_page = (int) (($total_count - 1) / $list_count) + 1;
-		}
-		else
+		} else
 		{
 			$total_page = 1;
 		}

classes/db/DBMysqli.class.php

Spacing +39 added lines, -39 removed lines

@@ -23,7 +23,7 @@ 
 	function DBMysqli($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if ($auto_connect) $this->_connect();
 	}
 
 	/**
@@ -44,7 +44,7 @@ 
 	function __connect($connection)
 	{
 		// Attempt to connect
-		if($connection["db_port"])
+		if ($connection["db_port"])
 		{
 			$result = @mysqli_connect($connection["db_hostname"]
 							, $connection["db_userid"]
@@ -60,7 +60,7 @@ 
 							, $connection["db_database"]);
 		}
 		$error = mysqli_connect_errno();
-		if($error)
+		if ($error)
 		{
 			$this->setError($error, mysqli_connect_error());
 			return;
@@ -87,11 +87,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))
 		{
 			$connection = $this->_getConnection('master');
 			$string = mysqli_escape_string($connection, $string);
@@ -108,23 +108,23 @@ 
 	 */
 	function __query($query, $connection)
 	{
-		if($this->use_prepared_statements == 'Y')
+		if ($this->use_prepared_statements == 'Y')
 		{
 			// 1. Prepare query
 			$stmt = mysqli_prepare($connection, $query);
-			if($stmt)
+			if ($stmt)
 			{
 				$types = '';
 				$params = array();
 				$this->_prepareQueryParameters($types, $params);
 
-				if(!empty($params))
+				if (!empty($params))
 				{
 					$args[0] = $stmt;
 					$args[1] = $types;
 
 					$i = 2;
-					foreach($params as $key => $param)
+					foreach ($params as $key => $param)
 					{
 						$copy[$key] = $param;
 						$args[$i++] = &$copy[$key];
@@ -132,18 +132,18 @@ 
 
 					// 2. Bind parameters
 					$status = call_user_func_array('mysqli_stmt_bind_param', $args);
-					if(!$status)
+					if (!$status)
 					{
-						$this->setError(-1, "Invalid arguments: $query" . mysqli_error($connection) . PHP_EOL . print_r($args, true));
+						$this->setError(-1, "Invalid arguments: $query".mysqli_error($connection).PHP_EOL.print_r($args, true));
 					}
 				}
 
 				// 3. Execute query
 				$status = mysqli_stmt_execute($stmt);
 
-				if(!$status)
+				if (!$status)
 				{
-					$this->setError(-1, "Prepared statement failed: $query" . mysqli_error($connection) . PHP_EOL . print_r($args, true));
+					$this->setError(-1, "Prepared statement failed: $query".mysqli_error($connection).PHP_EOL.print_r($args, true));
 				}
 
 				// Return stmt for other processing - like retrieving resultset (_fetch)
@@ -155,7 +155,7 @@ 
 		$result = mysqli_query($connection, $query);
 		// Error Check
 		$error = mysqli_error($connection);
-		if($error)
+		if ($error)
 		{
 			$this->setError(mysqli_errno($connection), $error);
 		}
@@ -174,23 +174,23 @@ 
 	{
 		$types = '';
 		$params = array();
-		if(!$this->param)
+		if (!$this->param)
 		{
 			return;
 		}
 
-		foreach($this->param as $k => $o)
+		foreach ($this->param as $k => $o)
 		{
 			$value = $o->getUnescapedValue();
 			$type = $o->getType();
 
 			// Skip column names -> this should be concatenated to query string
-			if($o->isColumnName())
+			if ($o->isColumnName())
 			{
 				continue;
 			}
 
-			switch($type)
+			switch ($type)
 			{
 				case 'number' :
 					$type = 'i';
@@ -202,9 +202,9 @@ 
 					$type = 's';
 			}
 
-			if(is_array($value))
+			if (is_array($value))
 			{
-				foreach($value as $v)
+				foreach ($value as $v)
 				{
 					$params[] = $v;
 					$types .= $type;
@@ -226,12 +226,12 @@ 
 	 */
 	function _fetch($result, $arrayIndexEndValue = NULL)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_fetch($result, $arrayIndexEndValue);
 		}
 		$output = array();
-		if(!$this->isConnected() || $this->isError() || !$result)
+		if (!$this->isConnected() || $this->isError() || !$result)
 		{
 			return $output;
 		}
@@ -247,25 +247,25 @@ 
 		 * MYSQLI_TYPE for longtext is 252
 		 */
 		$longtext_exists = false;
-		foreach($fields as $field)
+		foreach ($fields as $field)
 		{
-			if(isset($resultArray[$field->name])) // When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
+			if (isset($resultArray[$field->name])) // When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
 			{
-				$field->name = 'repeat_' . $field->name;
+				$field->name = 'repeat_'.$field->name;
 			}
 
 			// Array passed needs to contain references, not values
 			$row[$field->name] = "";
 			$resultArray[$field->name] = &$row[$field->name];
 
-			if($field->type == 252)
+			if ($field->type == 252)
 			{
 				$longtext_exists = true;
 			}
 		}
 		$resultArray = array_merge(array($stmt), $resultArray);
 
-		if($longtext_exists)
+		if ($longtext_exists)
 		{
 			mysqli_stmt_store_result($stmt);
 		}
@@ -273,17 +273,17 @@ 
 		call_user_func_array('mysqli_stmt_bind_result', $resultArray);
 
 		$rows = array();
-		while(mysqli_stmt_fetch($stmt))
+		while (mysqli_stmt_fetch($stmt))
 		{
 			$resultObject = new stdClass();
 
-			foreach($resultArray as $key => $value)
+			foreach ($resultArray as $key => $value)
 			{
-				if($key === 0)
+				if ($key === 0)
 				{
 					continue; // Skip stmt object
 				}
-				if(strpos($key, 'repeat_'))
+				if (strpos($key, 'repeat_'))
 				{
 					$key = substr($key, 6);
 				}
@@ -295,9 +295,9 @@ 
 
 		mysqli_stmt_close($stmt);
 
-		if($arrayIndexEndValue)
+		if ($arrayIndexEndValue)
 		{
-			foreach($rows as $row)
+			foreach ($rows as $row)
 			{
 				$output[$arrayIndexEndValue--] = $row;
 			}
@@ -307,9 +307,9 @@ 
 			$output = $rows;
 		}
 
-		if(count($output) == 1)
+		if (count($output) == 1)
 		{
-			if(isset($arrayIndexEndValue))
+			if (isset($arrayIndexEndValue))
 			{
 				return $output;
 			}
@@ -330,7 +330,7 @@ 
 	 */
 	function _executeInsertAct($queryObject, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeInsertAct($queryObject);
 		}
@@ -348,7 +348,7 @@ 
 	 */
 	function _executeUpdateAct($queryObject, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeUpdateAct($queryObject);
 		}
@@ -366,7 +366,7 @@ 
 	 */
 	function _executeDeleteAct($queryObject, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeDeleteAct($queryObject);
 		}
@@ -387,7 +387,7 @@ 
 	 */
 	function _executeSelectAct($queryObject, $connection = null, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeSelectAct($queryObject, $connection);
 		}

Braces +10 added lines, -10 removed lines

@@ -23,7 +23,9 @@ 
 	function DBMysqli($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if($auto_connect) {
+			$this->_connect();
+		}
 	}
 
 	/**
@@ -51,8 +53,7 @@ 
 							, $connection["db_password"]
 							, $connection["db_database"]
 							, $connection["db_port"]);
-		}
-		else
+		} else
 		{
 			$result = @mysqli_connect($connection["db_hostname"]
 							, $connection["db_userid"]
@@ -209,8 +210,7 @@ 
 					$params[] = $v;
 					$types .= $type;
 				}
-			}
-			else
+			} else
 			{
 				$params[] = $value;
 				$types .= $type;
@@ -249,10 +249,12 @@ 
 		$longtext_exists = false;
 		foreach($fields as $field)
 		{
-			if(isset($resultArray[$field->name])) // When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
+			if(isset($resultArray[$field->name])) {
+				// When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
 			{
 				$field->name = 'repeat_' . $field->name;
 			}
+			}
 
 			// Array passed needs to contain references, not values
 			$row[$field->name] = "";
@@ -301,8 +303,7 @@ 
 			{
 				$output[$arrayIndexEndValue--] = $row;
 			}
-		}
-		else
+		} else
 		{
 			$output = $rows;
 		}
@@ -312,8 +313,7 @@ 
 			if(isset($arrayIndexEndValue))
 			{
 				return $output;
-			}
-			else
+			} else
 			{
 				return $output[0];
 			}

classes/db/DBMssql.class.php

Spacing +116 added lines, -116 removed lines

@@ -45,7 +45,7 @@ 
 	function DBMssql($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if ($auto_connect) $this->_connect();
 	}
 
 	/**
@@ -70,10 +70,10 @@ 
 		//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);
+			$this->setError(-1, 'database connect fail'.PHP_EOL.$errors);
 			return;
 		}
 		return $result;
@@ -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,16 +117,16 @@ 
 	{
 		$connection = $this->_getConnection('master');
 
-		if(!$transactionLevel)
+		if (!$transactionLevel)
 		{
-			if(sqlsrv_begin_transaction($connection) === false)
+			if (sqlsrv_begin_transaction($connection) === false)
 			{
 				return;
 			}
 		}
 		else
 		{
-			$this->_query("SAVE TRANS SP" . $transactionLevel, $connection);
+			$this->_query("SAVE TRANS SP".$transactionLevel, $connection);
 		}
 		return true;
 	}
@@ -142,9 +142,9 @@ 
 
 		$point = $transactionLevel - 1;
 
-		if($point)
+		if ($point)
 		{
-			$this->_query("ROLLBACK TRANS SP" . $point, $connection);
+			$this->_query("ROLLBACK TRANS SP".$point, $connection);
 		}
 		else
 		{
@@ -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,22 +557,22 @@ 
 		$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;
+			$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
 		{
-			$table_name = $this->prefix . $table_name;
+			$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;
@@ -598,48 +598,48 @@ 
 				$default = $column->attrs->default;
 				$auto_increment = $column->attrs->auto_increment;
 
-				$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)' : '');
+				$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, '","') . '"');
+				$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) . ']');
+					$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) . ']');
+					$query = sprintf("create index %s on %s (%s);", $key, $table_name, '['.implode('],[', $val).']');
 					$this->_query($query);
 				}
 			}
@@ -682,34 +682,34 @@ 
 	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;
+			$where = ' WHERE '.$where;
 		}
 
 		$priority = $with_priority ? $query->getPriority() : '';
 
-		return "UPDATE $priority $alias_list SET $columnsList FROM " . $from . $where;
+		return "UPDATE $priority $alias_list SET $columnsList FROM ".$from.$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,75 +740,75 @@ 
 		$limit = '';
 		$limitCount = '';
 		$limitQueryPart = $query->getLimit();
-		if($limitQueryPart)
+		if ($limitQueryPart)
 		{
 			$limitCount = $limitQueryPart->getLimit();
 		}
-		if($limitCount != '')
+		if ($limitCount != '')
 		{
-			$limit = 'SELECT TOP ' . $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;
+			$select = $limit.' '.$select;
 		}
 		else
 		{
-			$select = 'SELECT ' . $select;
+			$select = 'SELECT '.$select;
 		}
 
 		$from = $query->getFromString($with_values);
-		if($from == '')
+		if ($from == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
-		$from = ' FROM ' . $from;
+		$from = ' FROM '.$from;
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
-			$where = ' WHERE ' . $where;
+			$where = ' WHERE '.$where;
 		}
 
 		$groupBy = $query->getGroupByString();
-		if($groupBy != '')
+		if ($groupBy != '')
 		{
-			$groupBy = ' GROUP BY ' . $groupBy;
+			$groupBy = ' GROUP BY '.$groupBy;
 		}
 
 		$orderBy = $query->getOrderByString();
-		if($orderBy != '')
+		if ($orderBy != '')
 		{
-			$orderBy = ' ORDER BY ' . $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);
 		}
@@ -853,10 +853,10 @@ 
 		// TODO Decide if we continue to pass parameters like this
 		$this->param = $queryObject->getArguments();
 
-		$query .= (__DEBUG_QUERY__ & 1 && $output->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
+		$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,52 +910,52 @@ 
 	function queryPageLimit($queryObject, $result, $connection)
 	{
 		$limit = $queryObject->getLimit();
-		if($limit && $limit->isPageHandler())
+		if ($limit && $limit->isPageHandler())
 		{
 			// Total count
 			$temp_where = $queryObject->getWhereString(true, false);
-			$count_query = sprintf('select count(*) as "count" %s %s', 'FROM ' . $queryObject->getFromString(), ($temp_where === '' ? '' : ' WHERE ' . $temp_where));
+			$count_query = sprintf('select count(*) as "count" %s %s', 'FROM '.$queryObject->getFromString(), ($temp_where === '' ? '' : ' WHERE '.$temp_where));
 
 			// Check for distinct query and if found update count query structure
 			$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
-						, 'FROM ' . $queryObject->getFromString(true)
-						, ($temp_where === '' ? '' : ' WHERE ' . $temp_where)
-						, ($uses_groupby ? ' GROUP BY ' . $queryObject->getGroupByString() : '')
+						, 'FROM '.$queryObject->getFromString(true)
+						, ($temp_where === '' ? '' : ' WHERE '.$temp_where)
+						, ($uses_groupby ? ' GROUP BY '.$queryObject->getGroupByString() : '')
 				);
 
 				// If query uses grouping or distinct, count from original select
 				$count_query = sprintf('select count(*) as "count" from (%s) xet', $count_query);
 			}
 
-			$count_query .= (__DEBUG_QUERY__ & 1 && $queryObject->queryID) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
+			$count_query .= (__DEBUG_QUERY__ & 1 && $queryObject->queryID) ? sprintf(' '.$this->comment_syntax, $this->query_id) : '';
 			$this->param = $queryObject->getArguments();
 			$result_count = $this->_query($count_query, $connection);
 			$count_output = $this->_fetch($result_count);
 			$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 +24 added lines, -43 removed lines

@@ -45,7 +45,9 @@ 
 	function DBMssql($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if($auto_connect) {
+			$this->_connect();
+		}
 	}
 
 	/**
@@ -123,8 +125,7 @@ 
 			{
 				return;
 			}
-		}
-		else
+		} else
 		{
 			$this->_query("SAVE TRANS SP" . $transactionLevel, $connection);
 		}
@@ -145,8 +146,7 @@ 
 		if($point)
 		{
 			$this->_query("ROLLBACK TRANS SP" . $point, $connection);
-		}
-		else
+		} else
 		{
 			sqlsrv_rollback($connection);
 		}
@@ -190,13 +190,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 +203,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 +217,7 @@ 
 		{
 			$args = $this->_getParametersByReference($_param);
 			$stmt = sqlsrv_prepare($connection, $query, $args);
-		}
-		else
+		} else
 		{
 			$stmt = sqlsrv_prepare($connection, $query);
 		}
@@ -229,8 +225,7 @@ 
 		if(!$stmt)
 		{
 			$result = false;
-		}
-		else
+		} else
 		{
 			$result = sqlsrv_execute($stmt);
 		}
@@ -268,8 +263,7 @@ 
 				$value_arg[] = &$value_copy[0];
 				$value_arg[] = $value_copy[1];
 				$value_arg[] = $value_copy[2];
-			}
-			else
+			} else
 			{
 				$value_arg = $value;
 			}
@@ -310,8 +304,7 @@ 
 			if($arrayIndexEndValue)
 			{
 				$output[$arrayIndexEndValue--] = $row;
-			}
-			else
+			} else
 			{
 				$output[] = $row;
 			}
@@ -322,8 +315,7 @@ 
 			if(isset($arrayIndexEndValue))
 			{
 				return $output;
-			}
-			else
+			} else
 			{
 				return $output[0];
 			}
@@ -393,8 +385,7 @@ 
 		if($size)
 		{
 			$query .= sprintf(" %s(%s) ", $type, $size);
-		}
-		else
+		} else
 		{
 			$query .= sprintf(" %s ", $type);
 		}
@@ -567,16 +558,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 +592,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 +744,7 @@ 
 		if($limit != '')
 		{
 			$select = $limit . ' ' . $select;
-		}
-		else
+		} else
 		{
 			$select = 'SELECT ' . $select;
 		}
@@ -824,8 +810,7 @@ 
 			if(!$where)
 			{
 				$sub_condition = ' WHERE ( '.implode(' and ',$sub_cond).' )';
-			}
-			else
+			} else
 			{
 				$sub_condition = ' and ( '.implode(' and ',$sub_cond).' )';
 			}
@@ -859,8 +844,7 @@ 
 		if($this->isError())
 		{
 			return $this->queryError($queryObject);
-		}
-		else
+		} else
 		{
 			return $this->queryPageLimit($queryObject, $result, $connection);
 		}
@@ -893,8 +877,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 +941,7 @@ 
 			if($total_count)
 			{
 				$total_page = (int) (($total_count - 1) / $list_count) + 1;
-			}
-			else
+			} else
 			{
 				$total_page = 1;
 			}
@@ -995,8 +977,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/DBMysqli_innodb.class.php

Spacing +62 added lines, -62 removed lines

@@ -23,7 +23,7 @@ 
 	function DBMysqli_innodb($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if ($auto_connect) $this->_connect();
 	}
 
 	/**
@@ -44,7 +44,7 @@ 
 	function __connect($connection)
 	{
 		// Attempt to connect
-		if($connection["db_port"])
+		if ($connection["db_port"])
 		{
 			$result = @mysqli_connect($connection["db_hostname"]
 							, $connection["db_userid"]
@@ -60,7 +60,7 @@ 
 							, $connection["db_database"]);
 		}
 		$error = mysqli_connect_errno();
-		if($error)
+		if ($error)
 		{
 			$this->setError($error, mysqli_connect_error());
 			return;
@@ -89,13 +89,13 @@ 
 	{
 		$connection = $this->_getConnection('master');
 
-		if(!$transactionLevel)
+		if (!$transactionLevel)
 		{
 			$this->_query("begin");
 		}
 		else
 		{
-			$this->_query("SAVEPOINT SP" . $transactionLevel, $connection);
+			$this->_query("SAVEPOINT SP".$transactionLevel, $connection);
 		}
 		return true;
 	}
@@ -111,14 +111,14 @@ 
 
 		$point = $transactionLevel - 1;
 
-		if($point)
+		if ($point)
 		{
-			$this->_query("ROLLBACK TO SP" . $point, $connection);
+			$this->_query("ROLLBACK TO SP".$point, $connection);
 		}
 		else
 		{
 			mysqli_rollback($connection);
-			$this->setQueryLog( array("query"=>"rollback") );
+			$this->setQueryLog(array("query"=>"rollback"));
 		}
 		return true;
 	}
@@ -132,7 +132,7 @@ 
 	{
 		$connection = $this->_getConnection('master');
 		mysqli_commit($connection);
-		$this->setQueryLog( array("query"=>"commit") );
+		$this->setQueryLog(array("query"=>"commit"));
 		return true;
 	}
 
@@ -145,11 +145,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))
 		{
 			$connection = $this->_getConnection('master');
 			$string = mysqli_escape_string($connection, $string);
@@ -166,23 +166,23 @@ 
 	 */
 	function __query($query, $connection)
 	{
-		if($this->use_prepared_statements == 'Y')
+		if ($this->use_prepared_statements == 'Y')
 		{
 			// 1. Prepare query
 			$stmt = mysqli_prepare($connection, $query);
-			if($stmt)
+			if ($stmt)
 			{
 				$types = '';
 				$params = array();
 				$this->_prepareQueryParameters($types, $params);
 
-				if(!empty($params))
+				if (!empty($params))
 				{
 					$args[0] = $stmt;
 					$args[1] = $types;
 
 					$i = 2;
-					foreach($params as $key => $param)
+					foreach ($params as $key => $param)
 					{
 						$copy[$key] = $param;
 						$args[$i++] = &$copy[$key];
@@ -190,18 +190,18 @@ 
 
 					// 2. Bind parameters
 					$status = call_user_func_array('mysqli_stmt_bind_param', $args);
-					if(!$status)
+					if (!$status)
 					{
-						$this->setError(-1, "Invalid arguments: $query" . mysqli_error($connection) . PHP_EOL . print_r($args, true));
+						$this->setError(-1, "Invalid arguments: $query".mysqli_error($connection).PHP_EOL.print_r($args, true));
 					}
 				}
 
 				// 3. Execute query
 				$status = mysqli_stmt_execute($stmt);
 
-				if(!$status)
+				if (!$status)
 				{
-					$this->setError(-1, "Prepared statement failed: $query" . mysqli_error($connection) . PHP_EOL . print_r($args, true));
+					$this->setError(-1, "Prepared statement failed: $query".mysqli_error($connection).PHP_EOL.print_r($args, true));
 				}
 
 				// Return stmt for other processing - like retrieving resultset (_fetch)
@@ -213,7 +213,7 @@ 
 		$result = mysqli_query($connection, $query);
 		// Error Check
 		$error = mysqli_error($connection);
-		if($error)
+		if ($error)
 		{
 			$this->setError(mysqli_errno($connection), $error);
 		}
@@ -232,23 +232,23 @@ 
 	{
 		$types = '';
 		$params = array();
-		if(!$this->param)
+		if (!$this->param)
 		{
 			return;
 		}
 
-		foreach($this->param as $k => $o)
+		foreach ($this->param as $k => $o)
 		{
 			$value = $o->getUnescapedValue();
 			$type = $o->getType();
 
 			// Skip column names -> this should be concatenated to query string
-			if($o->isColumnName())
+			if ($o->isColumnName())
 			{
 				continue;
 			}
 
-			switch($type)
+			switch ($type)
 			{
 				case 'number' :
 					$type = 'i';
@@ -260,9 +260,9 @@ 
 					$type = 's';
 			}
 
-			if(is_array($value))
+			if (is_array($value))
 			{
-				foreach($value as $v)
+				foreach ($value as $v)
 				{
 					$params[] = $v;
 					$types .= $type;
@@ -284,12 +284,12 @@ 
 	 */
 	function _fetch($result, $arrayIndexEndValue = NULL)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_fetch($result, $arrayIndexEndValue);
 		}
 		$output = array();
-		if(!$this->isConnected() || $this->isError() || !$result)
+		if (!$this->isConnected() || $this->isError() || !$result)
 		{
 			return $output;
 		}
@@ -305,25 +305,25 @@ 
 		 * MYSQLI_TYPE for longtext is 252
 		 */
 		$longtext_exists = false;
-		foreach($fields as $field)
+		foreach ($fields as $field)
 		{
-			if(isset($resultArray[$field->name])) // When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
+			if (isset($resultArray[$field->name])) // When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
 			{
-				$field->name = 'repeat_' . $field->name;
+				$field->name = 'repeat_'.$field->name;
 			}
 
 			// Array passed needs to contain references, not values
 			$row[$field->name] = "";
 			$resultArray[$field->name] = &$row[$field->name];
 
-			if($field->type == 252)
+			if ($field->type == 252)
 			{
 				$longtext_exists = true;
 			}
 		}
 		$resultArray = array_merge(array($stmt), $resultArray);
 
-		if($longtext_exists)
+		if ($longtext_exists)
 		{
 			mysqli_stmt_store_result($stmt);
 		}
@@ -331,17 +331,17 @@ 
 		call_user_func_array('mysqli_stmt_bind_result', $resultArray);
 
 		$rows = array();
-		while(mysqli_stmt_fetch($stmt))
+		while (mysqli_stmt_fetch($stmt))
 		{
 			$resultObject = new stdClass();
 
-			foreach($resultArray as $key => $value)
+			foreach ($resultArray as $key => $value)
 			{
-				if($key === 0)
+				if ($key === 0)
 				{
 					continue; // Skip stmt object
 				}
-				if(strpos($key, 'repeat_'))
+				if (strpos($key, 'repeat_'))
 				{
 					$key = substr($key, 6);
 				}
@@ -353,9 +353,9 @@ 
 
 		mysqli_stmt_close($stmt);
 
-		if($arrayIndexEndValue)
+		if ($arrayIndexEndValue)
 		{
-			foreach($rows as $row)
+			foreach ($rows as $row)
 			{
 				$output[$arrayIndexEndValue--] = $row;
 			}
@@ -365,9 +365,9 @@ 
 			$output = $rows;
 		}
 
-		if(count($output) == 1)
+		if (count($output) == 1)
 		{
-			if(isset($arrayIndexEndValue))
+			if (isset($arrayIndexEndValue))
 			{
 				return $output;
 			}
@@ -388,7 +388,7 @@ 
 	 */
 	function _executeInsertAct($queryObject, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeInsertAct($queryObject);
 		}
@@ -406,7 +406,7 @@ 
 	 */
 	function _executeUpdateAct($queryObject, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeUpdateAct($queryObject);
 		}
@@ -424,7 +424,7 @@ 
 	 */
 	function _executeDeleteAct($queryObject, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeDeleteAct($queryObject);
 		}
@@ -445,7 +445,7 @@ 
 	 */
 	function _executeSelectAct($queryObject, $connection = null, $with_values = false)
 	{
-		if($this->use_prepared_statements != 'Y')
+		if ($this->use_prepared_statements != 'Y')
 		{
 			return parent::_executeSelectAct($queryObject, $connection);
 		}
@@ -503,13 +503,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;
+		$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;
 		}
@@ -518,7 +518,7 @@ 
 			$columns = $xml_obj->table->column;
 		}
 
-		foreach($columns as $column)
+		foreach ($columns as $column)
 		{
 			$name = $column->attrs->name;
 			$type = $column->attrs->type;
@@ -530,47 +530,47 @@ 
 			$default = $column->attrs->default;
 			$auto_increment = $column->attrs->auto_increment;
 
-			$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' : '');
+			$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, '`,`') . '`');
+			$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, '`,`') . '`');
+				$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, '`,`') . '`');
+				$column_schema[] = sprintf("index %s (%s)", $key, '`'.implode($val, '`,`').'`');
 			}
 		}
 
 		$schema = sprintf('create table `%s` (%s%s) %s;', $this->addQuotes($table_name), "\n", implode($column_schema, ",\n"), "ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_general_ci");
 
 		$output = $this->_query($schema);
-		if(!$output)
+		if (!$output)
 		{
 			return false;
 		}

Braces +15 added lines, -20 removed lines

@@ -23,7 +23,9 @@ 
 	function DBMysqli_innodb($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if($auto_connect) {
+			$this->_connect();
+		}
 	}
 
 	/**
@@ -51,8 +53,7 @@ 
 							, $connection["db_password"]
 							, $connection["db_database"]
 							, $connection["db_port"]);
-		}
-		else
+		} else
 		{
 			$result = @mysqli_connect($connection["db_hostname"]
 							, $connection["db_userid"]
@@ -92,8 +93,7 @@ 
 		if(!$transactionLevel)
 		{
 			$this->_query("begin");
-		}
-		else
+		} else
 		{
 			$this->_query("SAVEPOINT SP" . $transactionLevel, $connection);
 		}
@@ -114,8 +114,7 @@ 
 		if($point)
 		{
 			$this->_query("ROLLBACK TO SP" . $point, $connection);
-		}
-		else
+		} else
 		{
 			mysqli_rollback($connection);
 			$this->setQueryLog( array("query"=>"rollback") );
@@ -267,8 +266,7 @@ 
 					$params[] = $v;
 					$types .= $type;
 				}
-			}
-			else
+			} else
 			{
 				$params[] = $value;
 				$types .= $type;
@@ -307,10 +305,12 @@ 
 		$longtext_exists = false;
 		foreach($fields as $field)
 		{
-			if(isset($resultArray[$field->name])) // When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
+			if(isset($resultArray[$field->name])) {
+				// When joined tables are used and the same column name appears twice, we should add it separately, otherwise bind_result fails
 			{
 				$field->name = 'repeat_' . $field->name;
 			}
+			}
 
 			// Array passed needs to contain references, not values
 			$row[$field->name] = "";
@@ -359,8 +359,7 @@ 
 			{
 				$output[$arrayIndexEndValue--] = $row;
 			}
-		}
-		else
+		} else
 		{
 			$output = $rows;
 		}
@@ -370,8 +369,7 @@ 
 			if(isset($arrayIndexEndValue))
 			{
 				return $output;
-			}
-			else
+			} else
 			{
 				return $output[0];
 			}
@@ -512,8 +510,7 @@ 
 		if(!is_array($xml_obj->table->column))
 		{
 			$columns[] = $xml_obj->table->column;
-		}
-		else
+		} else
 		{
 			$columns = $xml_obj->table->column;
 		}
@@ -535,12 +532,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;
 			}

classes/db/DBMysql.class.php

Spacing +94 added lines, -94 removed lines

@@ -46,7 +46,7 @@ 
 	function DBMysql($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if ($auto_connect) $this->_connect();
 	}
 
 	/**
@@ -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"];
+			$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());
+			$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;
+		$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;
@@ -512,47 +512,47 @@ 
 			$default = $column->attrs->default;
 			$auto_increment = $column->attrs->auto_increment;
 
-			$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' : '');
+			$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, '`,`') . '`');
+			$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, '`,`') . '`');
+				$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, '`,`') . '`');
+				$column_schema[] = sprintf("index %s (%s)", $key, '`'.implode($val, '`,`').'`');
 			}
 		}
 
 		$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;
 	}
 
@@ -565,8 +565,8 @@ 
 	function _executeInsertAct($queryObject, $with_values = true)
 	{
 		$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'))
+		$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' '.$this->comment_syntax, $this->query_id) : '';
+		if (is_a($query, 'Object'))
 		{
 			return;
 		}
@@ -582,13 +582,13 @@ 
 	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;
 		}
 
-		$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
+		$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' '.$this->comment_syntax, $this->query_id) : '';
 
 
 		return $this->_query($query);
@@ -603,8 +603,8 @@ 
 	function _executeDeleteAct($queryObject, $with_values = true)
 	{
 		$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'))
+		$query .= (__DEBUG_QUERY__ & 1 && $this->query_id) ? sprintf(' '.$this->comment_syntax, $this->query_id) : '';
+		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) : '';
+			$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;
@@ -737,48 +737,48 @@ 
 		$limit = $queryObject->getLimit();
 		// Total count
 		$temp_where = $queryObject->getWhereString($with_values, false);
-		$count_query = sprintf('select count(*) as "count" %s %s', 'FROM ' . $queryObject->getFromString($with_values), ($temp_where === '' ? '' : ' WHERE ' . $temp_where));
+		$count_query = sprintf('select count(*) as "count" %s %s', 'FROM '.$queryObject->getFromString($with_values), ($temp_where === '' ? '' : ' WHERE '.$temp_where));
 
 		// Check for distinct query and if found update count query structure
 		$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
-					, 'FROM ' . $queryObject->getFromString($with_values)
-					, ($temp_where === '' ? '' : ' WHERE ' . $temp_where)
-					, ($uses_groupby ? ' GROUP BY ' . $queryObject->getGroupByString() : '')
+					, 'FROM '.$queryObject->getFromString($with_values)
+					, ($temp_where === '' ? '' : ' WHERE '.$temp_where)
+					, ($uses_groupby ? ' GROUP BY '.$queryObject->getGroupByString() : '')
 			);
 
 			// If query uses grouping or distinct, count from original select
 			$count_query = sprintf('select count(*) as "count" from (%s) xet', $count_query);
 		}
 
-		$count_query .= (__DEBUG_QUERY__ & 1 && $queryObject->queryID) ? sprintf(' ' . $this->comment_syntax, $queryObject->queryID) : '';
+		$count_query .= (__DEBUG_QUERY__ & 1 && $queryObject->queryID) ? sprintf(' '.$this->comment_syntax, $queryObject->queryID) : '';
 		$result_count = $this->_query($count_query, $connection);
 		$count_output = $this->_fetch($result_count);
 		$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;
@@ -803,9 +803,9 @@ 
 
 		$query = $this->getSelectPageSql($queryObject, $with_values, $start_count, $list_count);
 
-		$query .= (__DEBUG_QUERY__ & 1 && $queryObject->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
+		$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,44 +833,44 @@ 
 	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;
+		$select = 'SELECT '.$select;
 
 		$from = $query->getFromString($with_values);
-		if($from == '')
+		if ($from == '')
 		{
 			return new Object(-1, "Invalid query");
 		}
-		$from = ' FROM ' . $from;
+		$from = ' FROM '.$from;
 
 		$where = $query->getWhereString($with_values);
-		if($where != '')
+		if ($where != '')
 		{
-			$where = ' WHERE ' . $where;
+			$where = ' WHERE '.$where;
 		}
 
 		$groupBy = $query->getGroupByString();
-		if($groupBy != '')
+		if ($groupBy != '')
 		{
-			$groupBy = ' GROUP BY ' . $groupBy;
+			$groupBy = ' GROUP BY '.$groupBy;
 		}
 
 		$orderBy = $query->getOrderByString();
-		if($orderBy != '')
+		if ($orderBy != '')
 		{
-			$orderBy = ' ORDER BY ' . $orderBy;
+			$orderBy = ' ORDER BY '.$orderBy;
 		}
 
 		$limit = $query->getLimitString();
-		if($limit != '')
+		if ($limit != '')
 		{
 			$limit = sprintf(' LIMIT %d, %d', $start_count, $list_count);
 		}
 
-		return $select . ' ' . $from . ' ' . $where . ' ' . $groupBy . ' ' . $orderBy . ' ' . $limit;
+		return $select.' '.$from.' '.$where.' '.$groupBy.' '.$orderBy.' '.$limit;
 	}
 
 }

Braces +20 added lines, -23 removed lines

@@ -46,7 +46,9 @@ 
 	function DBMysql($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if($auto_connect) {
+			$this->_connect();
+		}
 	}
 
 	/**
@@ -214,8 +216,7 @@ 
 			if($arrayIndexEndValue)
 			{
 				$output[$arrayIndexEndValue--] = $tmp;
-			}
-			else
+			} else
 			{
 				$output[] = $tmp;
 			}
@@ -225,8 +226,7 @@ 
 			if(isset($arrayIndexEndValue))
 			{
 				return $output;
-			}
-			else
+			} else
 			{
 				return $output[0];
 			}
@@ -311,8 +311,7 @@ 
 		if($size)
 		{
 			$query .= sprintf(" %s(%s) ", $type, $size);
-		}
-		else
+		} else
 		{
 			$query .= sprintf(" %s ", $type);
 		}
@@ -490,8 +489,7 @@ 
 		if(!is_array($xml_obj->table->column))
 		{
 			$columns[] = $xml_obj->table->column;
-		}
-		else
+		} else
 		{
 			$columns = $xml_obj->table->column;
 		}
@@ -517,12 +515,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 +548,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 +581,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 +627,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 +716,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 +779,7 @@ 
 		if($total_count)
 		{
 			$total_page = (int) (($total_count - 1) / $list_count) + 1;
-		}
-		else
+		} else
 		{
 			$total_page = 1;
 		}

classes/db/DBMysql_innodb.class.php

Spacing +24 added lines, -24 removed lines

@@ -23,7 +23,7 @@ 
 	function DBMysql_innodb($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if ($auto_connect) $this->_connect();
 	}
 
 	/**
@@ -55,13 +55,13 @@ 
 	{
 		$connection = $this->_getConnection('master');
 
-		if(!$transactionLevel)
+		if (!$transactionLevel)
 		{
 			$this->_query("START TRANSACTION", $connection);
 		}
 		else
 		{
-			$this->_query("SAVEPOINT SP" . $transactionLevel, $connection);
+			$this->_query("SAVEPOINT SP".$transactionLevel, $connection);
 		}
 		return true;
 	}
@@ -77,9 +77,9 @@ 
 
 		$point = $transactionLevel - 1;
 
-		if($point)
+		if ($point)
 		{
-			$this->_query("ROLLBACK TO SP" . $point, $connection);
+			$this->_query("ROLLBACK TO SP".$point, $connection);
 		}
 		else
 		{
@@ -109,14 +109,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));
 		}
@@ -140,13 +140,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;
+		$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;
 		}
@@ -155,7 +155,7 @@ 
 			$columns = $xml_obj->table->column;
 		}
 
-		foreach($columns as $column)
+		foreach ($columns as $column)
 		{
 			$name = $column->attrs->name;
 			$type = $column->attrs->type;
@@ -167,47 +167,47 @@ 
 			$default = $column->attrs->default;
 			$auto_increment = $column->attrs->auto_increment;
 
-			$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' : '');
+			$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, '`,`') . '`');
+			$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, '`,`') . '`');
+				$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, '`,`') . '`');
+				$column_schema[] = sprintf("index %s (%s)", $key, '`'.implode($val, '`,`').'`');
 			}
 		}
 
 		$schema = sprintf('create table `%s` (%s%s) %s;', $this->addQuotes($table_name), "\n", implode($column_schema, ",\n"), "ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_general_ci");
 
 		$output = $this->_query($schema);
-		if(!$output)
+		if (!$output)
 		{
 			return false;
 		}

Braces +8 added lines, -11 removed lines

@@ -23,7 +23,9 @@ 
 	function DBMysql_innodb($auto_connect = TRUE)
 	{
 		$this->_setDBInfo();
-		if($auto_connect) $this->_connect();
+		if($auto_connect) {
+			$this->_connect();
+		}
 	}
 
 	/**
@@ -58,8 +60,7 @@ 
 		if(!$transactionLevel)
 		{
 			$this->_query("START TRANSACTION", $connection);
-		}
-		else
+		} else
 		{
 			$this->_query("SAVEPOINT SP" . $transactionLevel, $connection);
 		}
@@ -80,8 +81,7 @@ 
 		if($point)
 		{
 			$this->_query("ROLLBACK TO SP" . $point, $connection);
-		}
-		else
+		} else
 		{
 			$this->_query("ROLLBACK", $connection);
 		}
@@ -149,8 +149,7 @@ 
 		if(!is_array($xml_obj->table->column))
 		{
 			$columns[] = $xml_obj->table->column;
-		}
-		else
+		} else
 		{
 			$columns = $xml_obj->table->column;
 		}
@@ -172,12 +171,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;
 			}