xpressengine / xe-core

classes/frontendfile/FrontEndFileHandler.class.php

Spacing +54 added lines, -54 removed lines

@@ -54,7 +54,7 @@ 
 	 */
 	function isSsl()
 	{
-		if(!is_null(self::$isSSL))
+		if (!is_null(self::$isSSL))
 		{
 			return self::$isSSL;
 		}
@@ -88,30 +88,30 @@ 
 	 * */
 	function loadFile($args)
 	{
-		if(!is_array($args))
+		if (!is_array($args))
 		{
 			$args = array($args);
 		}
 		$file = $this->getFileInfo($args[0], $args[2], $args[1]);
 
 		$availableExtension = array('css' => 1, 'js' => 1);
-		if(!isset($availableExtension[$file->fileExtension]))
+		if (!isset($availableExtension[$file->fileExtension]))
 		{
 			return;
 		}
 
 		$file->index = (int) $args[3];
 
-		if($file->fileExtension == 'css')
+		if ($file->fileExtension == 'css')
 		{
 			$map = &$this->cssMap;
 			$mapIndex = &$this->cssMapIndex;
 
 			$this->_arrangeCssIndex($pathInfo['dirname'], $file);
 		}
-		else if($file->fileExtension == 'js')
+		else if ($file->fileExtension == 'js')
 		{
-			if($args[1] == 'body')
+			if ($args[1] == 'body')
 			{
 				$map = &$this->jsBodyMap;
 				$mapIndex = &$this->jsBodyMapIndex;
@@ -124,7 +124,7 @@ 
 		}
 
 		(is_null($file->index)) ? $file->index = 0 : $file->index = $file->index;
-		if(!isset($mapIndex[$file->key]) || $mapIndex[$file->key] > $file->index)
+		if (!isset($mapIndex[$file->key]) || $mapIndex[$file->key] > $file->index)
 		{
 			$this->unloadFile($args[0], $args[2], $args[1]);
 			$map[$file->index][$file->key] = $file;
@@ -144,14 +144,14 @@ 
 	{
 		static $existsInfo = array();
 
-		if(isset($existsInfo[$existsKey]))
+		if (isset($existsInfo[$existsKey]))
 		{
 			return $existsInfo[$existsKey];
 		}
 
 		$fileName = preg_replace('/(?:[\/]{3,})(.*)/', '//$1', $fileName);
 		$url_info = parse_url($fileName);
-		$pathInfo = pathinfo(str_replace('?' . $url_info['query'], '', $fileName));
+		$pathInfo = pathinfo(str_replace('?'.$url_info['query'], '', $fileName));
 
 		$file = new stdClass();
 		$file->fileName = basename($url_info['path']);
@@ -164,14 +164,14 @@ 
 		$file->keyName = implode('.', array($file->fileNameNoExt, $file->fileExtension));
 		$file->cdnPath = $this->_normalizeFilePath($pathInfo['dirname']);
 
-		if(!$file->external)
+		if (!$file->external)
 		{
-			if(!__DEBUG__ && __XE_VERSION_STABLE__)
+			if (!__DEBUG__ && __XE_VERSION_STABLE__)
 			{
 				// if no debug mode, load minifed file
 				$minifiedFileName = implode('.', array($file->fileNameNoExt, 'min', $file->fileExtension));
 				$minifiedRealPath = implode('/', array($file->fileRealPath, $minifiedFileName));
-				if(file_exists($minifiedRealPath))
+				if (file_exists($minifiedRealPath))
 				{
 					$file->fileName = $minifiedFileName;
 				}
@@ -179,7 +179,7 @@ 
 			else
 			{
 				// Remove .min
-				if(file_exists(implode('/', array($file->fileRealPath, $file->keyName))))
+				if (file_exists(implode('/', array($file->fileRealPath, $file->keyName))))
 				{
 					$file->fileName = $file->keyName;
 				}
@@ -188,18 +188,18 @@ 
 
 		$file->targetIe = $targetIe;
 
-		if($file->fileExtension == 'css')
+		if ($file->fileExtension == 'css')
 		{
 			$file->media = $media;
-			if(!$file->media)
+			if (!$file->media)
 			{
 				$file->media = 'all';
 			}
-			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe . "\t" . $file->media;
+			$file->key = $file->filePath.$file->keyName."\t".$file->targetIe."\t".$file->media;
 		}
-		else if($file->fileExtension == 'js')
+		else if ($file->fileExtension == 'js')
 		{
-			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe;
+			$file->key = $file->filePath.$file->keyName."\t".$file->targetIe;
 		}
 
 		return $file;
@@ -217,9 +217,9 @@ 
 	{
 		$file = $this->getFileInfo($fileName, $targetIe, $media);
 
-		if($file->fileExtension == 'css')
+		if ($file->fileExtension == 'css')
 		{
-			if(isset($this->cssMapIndex[$file->key]))
+			if (isset($this->cssMapIndex[$file->key]))
 			{
 				$index = $this->cssMapIndex[$file->key];
 				unset($this->cssMap[$index][$file->key], $this->cssMapIndex[$file->key]);
@@ -227,12 +227,12 @@ 
 		}
 		else
 		{
-			if(isset($this->jsHeadMapIndex[$file->key]))
+			if (isset($this->jsHeadMapIndex[$file->key]))
 			{
 				$index = $this->jsHeadMapIndex[$file->key];
 				unset($this->jsHeadMap[$index][$file->key], $this->jsHeadMapIndex[$file->key]);
 			}
-			if(isset($this->jsBodyMapIndex[$file->key]))
+			if (isset($this->jsBodyMapIndex[$file->key]))
 			{
 				$index = $this->jsBodyMapIndex[$file->key];
 				unset($this->jsBodyMap[$index][$file->key], $this->jsBodyMapIndex[$file->key]);
@@ -248,13 +248,13 @@ 
 	 */
 	function unloadAllFiles($type = 'all')
 	{
-		if($type == 'css' || $type == 'all')
+		if ($type == 'css' || $type == 'all')
 		{
 			$this->cssMap = array();
 			$this->cssMapIndex = array();
 		}
 
-		if($type == 'js' || $type == 'all')
+		if ($type == 'js' || $type == 'all')
 		{
 			$this->jsHeadMap = array();
 			$this->jsBodyMap = array();
@@ -276,23 +276,23 @@ 
 		$this->_sortMap($map, $mapIndex);
 
 		$result = array();
-		foreach($map as $indexedMap)
+		foreach ($map as $indexedMap)
 		{
-			foreach($indexedMap as $file)
+			foreach ($indexedMap as $file)
 			{
 				$query = '';
-				if(!$file->external && is_readable($file->cdnPath . '/' . $file->fileName))
+				if (!$file->external && is_readable($file->cdnPath.'/'.$file->fileName))
 				{
-					$query = date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName));
+					$query = date('YmdHis', filemtime($file->cdnPath.'/'.$file->fileName));
 				}
-				if($file->query)
+				if ($file->query)
 				{
-					if($query) $query .= '&';
+					if ($query) $query .= '&';
 					$query .= $file->query;
 				}
-				$query = ($query) ? '?' . $query : '';
+				$query = ($query) ? '?'.$query : '';
 
-				$fullFilePath = $file->filePath . '/' . $file->fileName . $query;
+				$fullFilePath = $file->filePath.'/'.$file->fileName.$query;
 				$result[] = array(
 					'file' => $fullFilePath,
 					'media' => $file->media,
@@ -315,7 +315,7 @@ 
 
 		$ignore = array('modernizr.js', 'common.js', 'js_app.js', 'xml2json.js', 'xml_handler.js', 'xml_js_filter.js');
 
-		if($type == 'head')
+		if ($type == 'head')
 		{
 			$map = &$this->jsHeadMap;
 			$mapIndex = &$this->jsHeadMapIndex;
@@ -329,31 +329,31 @@ 
 		$this->_sortMap($map, $mapIndex);
 
 		$result = array();
-		foreach($map as $indexedMap)
+		foreach ($map as $indexedMap)
 		{
-			foreach($indexedMap as $file)
+			foreach ($indexedMap as $file)
 			{
-				if((!__DEBUG__ && __XE_VERSION_STABLE__) && $file->filePath === '/common/js')
+				if ((!__DEBUG__ && __XE_VERSION_STABLE__) && $file->filePath === '/common/js')
 				{
-					if(in_array($file->fileName, $ignore))
+					if (in_array($file->fileName, $ignore))
 					{
 						continue;
 					}
 				}
 
 				$query = '';
-				if(!$file->external && is_readable($file->cdnPath . '/' . $file->fileName))
+				if (!$file->external && is_readable($file->cdnPath.'/'.$file->fileName))
 				{
-					$query = date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName));
+					$query = date('YmdHis', filemtime($file->cdnPath.'/'.$file->fileName));
 				}
-				if($file->query)
+				if ($file->query)
 				{
-					if($query) $query .= '&';
+					if ($query) $query .= '&';
 					$query .= $file->query;
 				}
-				$query = ($query) ? '?' . $query : '';
+				$query = ($query) ? '?'.$query : '';
 
-				$fullFilePath = $file->filePath . '/' . $file->fileName . $query;
+				$fullFilePath = $file->filePath.'/'.$file->fileName.$query;
 				$result[] = array(
 					'file' => $fullFilePath,
 					'targetie' => $file->targetIe
@@ -384,18 +384,18 @@ 
 	 */
 	function _normalizeFilePath($path)
 	{
-		if(strpos($path, '://') === FALSE && $path{0} != '/' && $path{0} != '.')
+		if (strpos($path, '://') === FALSE && $path{0} != '/' && $path{0} != '.')
 		{
-			$path = './' . $path;
+			$path = './'.$path;
 		}
-		elseif(!strncmp($path, '//', 2))
+		elseif (!strncmp($path, '//', 2))
 		{
 			return preg_replace('#^//+#', '//', $path);
 		}
 
 		$path = preg_replace('@/\./|(?<!:)\/\/@', '/', $path);
 
-		while(strpos($path, '/../'))
+		while (strpos($path, '/../'))
 		{
 			$path = preg_replace('/\/([^\/]+)\/\.\.\//s', '/', $path, 1);
 		}
@@ -414,20 +414,20 @@ 
 		$path = $this->_normalizeFilePath($path);
 		$script_path = getScriptPath();
 
-		if(strpos($path, './') === 0)
+		if (strpos($path, './') === 0)
 		{
-			if($script_path == '/' || $script_path == '\\')
+			if ($script_path == '/' || $script_path == '\\')
 			{
-				$path = '/' . substr($path, 2);
+				$path = '/'.substr($path, 2);
 			}
 			else
 			{
-				$path = $script_path . substr($path, 2);
+				$path = $script_path.substr($path, 2);
 			}
 		}
-		else if(strpos($file, '../') === 0)
+		else if (strpos($file, '../') === 0)
 		{
-			$path = $this->_normalizeFilePath($script_path . $path);
+			$path = $this->_normalizeFilePath($script_path.$path);
 		}
 
 		return $path;
@@ -442,7 +442,7 @@ 
 	 */
 	function _arrangeCssIndex($dirName, &$file)
 	{
-		if($file->index !== 0)
+		if ($file->index !== 0)
 		{
 			return;
 		}

classes/display/HTMLDisplayHandler.php

Braces +11 added lines, -22 removed lines

@@ -24,8 +24,7 @@ 
 			if($oModule->module_info->module == $oModule->module)
 			{
 				$skin = $oModule->origin_module_info->skin;
-			}
-			else
+			} else
 			{
 				$skin = $oModule->module_config->skin;
 			}
@@ -45,13 +44,11 @@ 
 							$template_path = sprintf('%s/modules/%s/', $theme_path, $theme_skin[1]);
 						}
 					}
-				}
-				else
+				} else
 				{
 					$template_path = $oModule->getTemplatePath();
 				}
-			}
-			else
+			} else
 			{
 				$template_path = $oModule->getTemplatePath();
 			}
@@ -224,8 +221,7 @@ 
 		{
 			$this->_loadMobileJSCSS();
 			$output = $oTemplate->compile('./common/tpl', 'mobile_layout');
-		}
-		else
+		} else
 		{
 			$this->_loadJSCSS();
 			$output = $oTemplate->compile('./common/tpl', 'common_layout');
@@ -403,13 +399,11 @@ 
 			if(!__DISABLE_DEFAULT_CSS__)
 			{
 				$oContext->loadFile(array('./common/css/xe.css', '', '', -10000000), true);
-			}
-			else
+			} else
 			{
 				$oContext->unloadFile(array('./common/css/xe.css', '', '', -10000000), true);
 			}
-		}
-		else
+		} else
 		{
 			$oContext->loadFile(array('./common/js/jquery-1.x.min.js', 'head', 'lt IE 9', -1110000), true);
 			$oContext->loadFile(array('./common/js/jquery.min.js', 'head', 'gte IE 9', -1100000), true);
@@ -418,8 +412,7 @@ 
 			if(!__DISABLE_DEFAULT_CSS__)
 			{
 				$oContext->loadFile(array('./common/css/xe.min.css', '', '', -10000000), true);
-			}
-			else
+			} else
 			{
 				$oContext->unloadFile(array('./common/css/xe.min.css', '', '', -10000000), true);
 			}
@@ -437,8 +430,7 @@ 
 				$oContext->loadFile(array('./modules/admin/tpl/css/admin.bootstrap.css', '', '', 1), true);
 				$oContext->loadFile(array('./modules/admin/tpl/js/jquery.tmpl.js', '', '', 1), true);
 				$oContext->loadFile(array('./modules/admin/tpl/js/jquery.jstree.js', '', '', 1), true);
-			}
-			else
+			} else
 			{
 				$oContext->loadFile(array('./modules/admin/tpl/css/admin.min.css', '', '', 10), true);
 				$oContext->loadFile(array("./modules/admin/tpl/css/admin_{$lang_type}.css", '', '', 10), true);
@@ -476,14 +468,12 @@ 
 			{
 				$oContext->loadFile(array('./common/css/xe.css', '', '', -10000000), true);
 				$oContext->loadFile(array('./common/css/mobile.css', '', '', -10000000), true);
-			}
-			else
+			} else
 			{
 				$oContext->unloadFile(array('./common/css/xe.css', '', '', -10000000), true);
 				$oContext->unloadFile(array('./common/css/mobile.css', '', '', -10000000), true);
 			}
-		}
-		else
+		} else
 		{
 			$oContext->loadFile(array('./common/js/jquery.min.js', 'head', '', -1100000), true);
 			$oContext->loadFile(array('./common/js/x.min.js', 'head', '', -1000000), true);
@@ -492,8 +482,7 @@ 
 			{
 				$oContext->loadFile(array('./common/css/xe.min.css', '', '', -10000000), true);
 				$oContext->loadFile(array('./common/css/mobile.min.css', '', '', -10000000), true);
-			}
-			else
+			} else
 			{
 				$oContext->unloadFile(array('./common/css/xe.min.css', '', '', -10000000), true);
 				$oContext->unloadFile(array('./common/css/mobile.min.css', '', '', -10000000), true);

Spacing +52 added lines, -52 removed lines

@@ -19,9 +19,9 @@ 
 
 		$template_path = $oModule->getTemplatePath();
 
-		if(!is_dir($template_path))
+		if (!is_dir($template_path))
 		{
-			if($oModule->module_info->module == $oModule->module)
+			if ($oModule->module_info->module == $oModule->module)
 			{
 				$skin = $oModule->origin_module_info->skin;
 			}
@@ -30,17 +30,17 @@ 
 				$skin = $oModule->module_config->skin;
 			}
 
-			if(Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') === false)
+			if (Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') === false)
 			{
-				if($skin && is_string($skin))
+				if ($skin && is_string($skin))
 				{
 					$theme_skin = explode('|@|', $skin);
 					$template_path = $oModule->getTemplatePath();
-					if(count($theme_skin) == 2)
+					if (count($theme_skin) == 2)
 					{
 						$theme_path = sprintf('./themes/%s', $theme_skin[0]);
 						// FIXME $theme_path $theme_path $theme_path ??
-						if(substr($theme_path, 0, strlen($theme_path)) != $theme_path)
+						if (substr($theme_path, 0, strlen($theme_path)) != $theme_path)
 						{
 							$template_path = sprintf('%s/modules/%s/', $theme_path, $theme_skin[1]);
 						}
@@ -61,16 +61,16 @@ 
 		$output = $oTemplate->compile($template_path, $tpl_file);
 
 		// add .x div for adminitration pages
-		if(Context::getResponseMethod() == 'HTML')
+		if (Context::getResponseMethod() == 'HTML')
 		{
-			if(Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') > 0 && Context::get('act') != 'dispPageAdminContentModify' && Context::get('act') != 'dispPageAdminMobileContentModify')
+			if (Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') > 0 && Context::get('act') != 'dispPageAdminContentModify' && Context::get('act') != 'dispPageAdminMobileContentModify')
 			{
-				$output = '<div class="x">' . $output . '</div>';
+				$output = '<div class="x">'.$output.'</div>';
 			}
 
-			if(Context::get('layout') != 'none')
+			if (Context::get('layout') != 'none')
 			{
-				if(__DEBUG__ == 3)
+				if (__DEBUG__ == 3)
 				{
 					$start = getMicroTime();
 				}
@@ -88,11 +88,11 @@ 
 				$layout_srl = $layout_info->layout_srl;
 
 				// compile if connected to the layout
-				if($layout_srl > 0)
+				if ($layout_srl > 0)
 				{
 
 					// handle separately if the layout is faceoff
-					if($layout_info && $layout_info->type == 'faceoff')
+					if ($layout_info && $layout_info->type == 'faceoff')
 					{
 						$oLayoutModel->doActivateFaceOff($layout_info);
 						Context::set('layout_info', $layout_info);
@@ -101,16 +101,16 @@ 
 					// search if the changes CSS exists in the admin layout edit window
 					$edited_layout_css = $oLayoutModel->getUserLayoutCss($layout_srl);
 
-					if(FileHandler::exists($edited_layout_css))
+					if (FileHandler::exists($edited_layout_css))
 					{
 						Context::loadFile(array($edited_layout_css, 'all', '', 100));
 					}
 				}
-				if(!$layout_path)
+				if (!$layout_path)
 				{
 					$layout_path = './common/tpl';
 				}
-				if(!$layout_file)
+				if (!$layout_file)
 				{
 					$layout_file = 'default_layout';
 				}
@@ -118,7 +118,7 @@ 
 
 				// if popup_layout, remove admin bar.
 				$realLayoutPath = FileHandler::getRealPath($layout_path);
-				if(substr_compare($realLayoutPath, '/', -1) !== 0)
+				if (substr_compare($realLayoutPath, '/', -1) !== 0)
 				{
 					$realLayoutPath .= '/';
 				}
@@ -126,12 +126,12 @@ 
 				$pathInfo = pathinfo($layout_file);
 				$onlyLayoutFile = $pathInfo['filename'];
 
-				if(__DEBUG__ == 3)
+				if (__DEBUG__ == 3)
 				{
 					$GLOBALS['__layout_compile_elapsed__'] = getMicroTime() - $start;
 				}
 
-				if(stripos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE && (Context::get('_use_ssl') == 'optional' || Context::get('_use_ssl') == 'always'))
+				if (stripos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE && (Context::get('_use_ssl') == 'optional' || Context::get('_use_ssl') == 'always'))
 				{
 					Context::addHtmlFooter('<iframe id="xeTmpIframe" name="xeTmpIframe" style="width:1px;height:1px;position:absolute;top:-2px;left:-2px;"></iframe>');
 				}
@@ -147,12 +147,12 @@ 
 	 */
 	function prepareToPrint(&$output)
 	{
-		if(Context::getResponseMethod() != 'HTML')
+		if (Context::getResponseMethod() != 'HTML')
 		{
 			return;
 		}
 
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$start = getMicroTime();
 		}
@@ -170,20 +170,20 @@ 
 		$output = preg_replace_callback('/<!--(#)?Meta:([a-z0-9\_\-\/\.\@\:]+)-->/is', array($this, '_transMeta'), $output);
 
 		// handles a relative path generated by using the rewrite module
-		if(Context::isAllowRewrite())
+		if (Context::isAllowRewrite())
 		{
 			$url = parse_url(Context::getRequestUri());
 			$real_path = $url['path'];
 
 			$pattern = '/src=("|\'){1}(\.\/)?(files\/attach|files\/cache|files\/faceOff|files\/member_extra_info|modules|common|widgets|widgetstyle|layouts|addons)\/([^"\']+)\.(jpg|jpeg|png|gif)("|\'){1}/s';
-			$output = preg_replace($pattern, 'src=$1' . $real_path . '$3/$4.$5$6', $output);
+			$output = preg_replace($pattern, 'src=$1'.$real_path.'$3/$4.$5$6', $output);
 
 			$pattern = '/href=("|\'){1}(\?[^"\']+)/s';
-			$output = preg_replace($pattern, 'href=$1' . $real_path . '$2', $output);
+			$output = preg_replace($pattern, 'href=$1'.$real_path.'$2', $output);
 
-			if(Context::get('vid'))
+			if (Context::get('vid'))
 			{
-				$pattern = '/\/' . Context::get('vid') . '\?([^=]+)=/is';
+				$pattern = '/\/'.Context::get('vid').'\?([^=]+)=/is';
 				$output = preg_replace($pattern, '/?$1=', $output);
 			}
 		}
@@ -191,18 +191,18 @@ 
 		// prevent the 2nd request due to url(none) of the background-image
 		$output = preg_replace('/url\((["\']?)none(["\']?)\)/is', 'none', $output);
 
-		if(is_array(Context::get('INPUT_ERROR')))
+		if (is_array(Context::get('INPUT_ERROR')))
 		{
 			$INPUT_ERROR = Context::get('INPUT_ERROR');
 			$keys = array_keys($INPUT_ERROR);
-			$keys = '(' . implode('|', $keys) . ')';
+			$keys = '('.implode('|', $keys).')';
 
-			$output = preg_replace_callback('@(<input)([^>]*?)\sname="' . $keys . '"([^>]*?)/?>@is', array(&$this, '_preserveValue'), $output);
-			$output = preg_replace_callback('@<select[^>]*\sname="' . $keys . '".+</select>@isU', array(&$this, '_preserveSelectValue'), $output);
-			$output = preg_replace_callback('@<textarea[^>]*\sname="' . $keys . '".+</textarea>@isU', array(&$this, '_preserveTextAreaValue'), $output);
+			$output = preg_replace_callback('@(<input)([^>]*?)\sname="'.$keys.'"([^>]*?)/?>@is', array(&$this, '_preserveValue'), $output);
+			$output = preg_replace_callback('@<select[^>]*\sname="'.$keys.'".+</select>@isU', array(&$this, '_preserveSelectValue'), $output);
+			$output = preg_replace_callback('@<textarea[^>]*\sname="'.$keys.'".+</textarea>@isU', array(&$this, '_preserveTextAreaValue'), $output);
 		}
 
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$GLOBALS['__trans_content_elapsed__'] = getMicroTime() - $start;
 		}
@@ -220,7 +220,7 @@ 
 		// convert the final layout
 		Context::set('content', $output);
 		$oTemplate = TemplateHandler::getInstance();
-		if(Mobile::isFromMobilePhone())
+		if (Mobile::isFromMobilePhone())
 		{
 			$this->_loadMobileJSCSS();
 			$output = $oTemplate->compile('./common/tpl', 'mobile_layout');
@@ -245,16 +245,16 @@ 
 	{
 		$INPUT_ERROR = Context::get('INPUT_ERROR');
 
-		$str = $match[1] . $match[2] . ' name="' . $match[3] . '"' . $match[4];
+		$str = $match[1].$match[2].' name="'.$match[3].'"'.$match[4];
 
 		// get type
 		$type = 'text';
-		if(preg_match('/\stype="([a-z]+)"/i', $str, $m))
+		if (preg_match('/\stype="([a-z]+)"/i', $str, $m))
 		{
 			$type = strtolower($m[1]);
 		}
 
-		switch($type)
+		switch ($type)
 		{
 			case 'text':
 			case 'hidden':
@@ -272,7 +272,7 @@ 
 			case 'number':
 			case 'range':
 			case 'color':
-				$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str) . ' value="' . htmlspecialchars($INPUT_ERROR[$match[3]], ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . '"';
+				$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str).' value="'.htmlspecialchars($INPUT_ERROR[$match[3]], ENT_COMPAT | ENT_HTML401, 'UTF-8', false).'"';
 				break;
 			case 'password':
 				$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str);
@@ -280,14 +280,14 @@ 
 			case 'radio':
 			case 'checkbox':
 				$str = preg_replace('@\schecked(="[^"]*?")?@', ' ', $str);
-				if(@preg_match('@\s(?i:value)="' . $INPUT_ERROR[$match[3]] . '"@', $str))
+				if (@preg_match('@\s(?i:value)="'.$INPUT_ERROR[$match[3]].'"@', $str))
 				{
 					$str .= ' checked="checked"';
 				}
 				break;
 		}
 
-		return $str . ' />';
+		return $str.' />';
 	}
 
 	/**
@@ -304,14 +304,14 @@ 
 		preg_match_all('@<option[^>]*\svalue="([^"]*)".+</option>@isU', $matches[0], $m);
 
 		$key = array_search($INPUT_ERROR[$matches[1]], $m[1]);
-		if($key === FALSE)
+		if ($key === FALSE)
 		{
 			return $matches[0];
 		}
 
 		$m[0][$key] = preg_replace('@(\svalue=".*?")@is', '$1 selected="selected"', $m[0][$key]);
 
-		return $mm[0] . implode('', $m[0]) . '</select>';
+		return $mm[0].implode('', $m[0]).'</select>';
 	}
 
 	/**
@@ -323,7 +323,7 @@ 
 	{
 		$INPUT_ERROR = Context::get('INPUT_ERROR');
 		preg_match('@<textarea.*?>@is', $matches[0], $mm);
-		return $mm[0] . $INPUT_ERROR[$matches[1]] . '</textarea>';
+		return $mm[0].$INPUT_ERROR[$matches[1]].'</textarea>';
 	}
 
 	/**
@@ -334,7 +334,7 @@ 
 	 */
 	function _moveStyleToHeader($matches)
 	{
-		if(isset($matches[1]) && stristr($matches[1], 'scoped'))
+		if (isset($matches[1]) && stristr($matches[1], 'scoped'))
 		{
 			return $matches[0];
 		}
@@ -370,7 +370,7 @@ 
 	 */
 	function _transMeta($matches)
 	{
-		if($matches[1])
+		if ($matches[1])
 		{
 			return '';
 		}
@@ -387,7 +387,7 @@ 
 		$lang_type = Context::getLangType();
 
 		// add common JS/CSS files
-		if(__DEBUG__ || !__XE_VERSION_STABLE__)
+		if (__DEBUG__ || !__XE_VERSION_STABLE__)
 		{
 			$oContext->loadFile(array('./common/js/jquery-1.x.js', 'head', 'lt IE 9', -1110000), true);
 			$oContext->loadFile(array('./common/js/jquery.js', 'head', 'gte IE 9', -1100000), true);
@@ -400,7 +400,7 @@ 
 			$oContext->loadFile(array('./common/js/xml2json.js', 'head', '', -1000000), true);
 			$oContext->loadFile(array('./common/js/xml_handler.js', 'head', '', -1000000), true);
 			$oContext->loadFile(array('./common/js/xml_js_filter.js', 'head', '', -1000000), true);
-			if(!__DISABLE_DEFAULT_CSS__)
+			if (!__DISABLE_DEFAULT_CSS__)
 			{
 				$oContext->loadFile(array('./common/css/xe.css', '', '', -10000000), true);
 			}
@@ -415,7 +415,7 @@ 
 			$oContext->loadFile(array('./common/js/jquery.min.js', 'head', 'gte IE 9', -1100000), true);
 			$oContext->loadFile(array('./common/js/x.min.js', 'head', '', -1000000), true);
 			$oContext->loadFile(array('./common/js/xe.min.js', 'head', '', -1000000), true);
-			if(!__DISABLE_DEFAULT_CSS__)
+			if (!__DISABLE_DEFAULT_CSS__)
 			{
 				$oContext->loadFile(array('./common/css/xe.min.css', '', '', -10000000), true);
 			}
@@ -426,9 +426,9 @@ 
 		}
 
 		// for admin page, add admin css
-		if(Context::get('module') == 'admin' || strpos(Context::get('act'), 'Admin') > 0)
+		if (Context::get('module') == 'admin' || strpos(Context::get('act'), 'Admin') > 0)
 		{
-			if(__DEBUG__ || !__XE_VERSION_STABLE__)
+			if (__DEBUG__ || !__XE_VERSION_STABLE__)
 			{
 				$oContext->loadFile(array('./modules/admin/tpl/css/admin.css', '', '', 10), true);
 				$oContext->loadFile(array("./modules/admin/tpl/css/admin_{$lang_type}.css", '', '', 10), true);
@@ -460,7 +460,7 @@ 
 		$lang_type = Context::getLangType();
 
 		// add common JS/CSS files
-		if(__DEBUG__ || !__XE_VERSION_STABLE__)
+		if (__DEBUG__ || !__XE_VERSION_STABLE__)
 		{
 			$oContext->loadFile(array('./common/js/jquery.js', 'head', '', -1100000), true);
 			$oContext->loadFile(array('./common/js/modernizr.js', 'head', '', -1000000), true);
@@ -472,7 +472,7 @@ 
 			$oContext->loadFile(array('./common/js/xml2json.js', 'head', '', -1000000), true);
 			$oContext->loadFile(array('./common/js/xml_handler.js', 'head', '', -1000000), true);
 			$oContext->loadFile(array('./common/js/xml_js_filter.js', 'head', '', -1000000), true);
-			if(!__DISABLE_DEFAULT_CSS__)
+			if (!__DISABLE_DEFAULT_CSS__)
 			{
 				$oContext->loadFile(array('./common/css/xe.css', '', '', -10000000), true);
 				$oContext->loadFile(array('./common/css/mobile.css', '', '', -10000000), true);
@@ -488,7 +488,7 @@ 
 			$oContext->loadFile(array('./common/js/jquery.min.js', 'head', '', -1100000), true);
 			$oContext->loadFile(array('./common/js/x.min.js', 'head', '', -1000000), true);
 			$oContext->loadFile(array('./common/js/xe.min.js', 'head', '', -1000000), true);
-			if(!__DISABLE_DEFAULT_CSS__)
+			if (!__DISABLE_DEFAULT_CSS__)
 			{
 				$oContext->loadFile(array('./common/css/xe.min.css', '', '', -10000000), true);
 				$oContext->loadFile(array('./common/css/mobile.min.css', '', '', -10000000), true);

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));
+						$this->setError(-1, "Invalid arguments: $query".mysqli_error($connection));
 					}
 				}
 
 				// 3. Execute query
 				$status = mysqli_stmt_execute($stmt);
 
-				if(!$status)
+				if (!$status)
 				{
-					$this->setError(-1, "Prepared statement failed: $query" . mysqli_error($connection));
+					$this->setError(-1, "Prepared statement failed: $query".mysqli_error($connection));
 				}
 
 				// 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;
 		}

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));
+						$this->setError(-1, "Invalid arguments: $query".mysqli_error($connection));
 					}
 				}
 
 				// 3. Execute query
 				$status = mysqli_stmt_execute($stmt);
 
-				if(!$status)
+				if (!$status)
 				{
-					$this->setError(-1, "Prepared statement failed: $query" . mysqli_error($connection));
+					$this->setError(-1, "Prepared statement failed: $query".mysqli_error($connection));
 				}
 
 				// 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);
 		}