xpressengine / xe-core

modules/spamfilter/spamfilter.admin.view.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 		// Get configurations (using module model object)
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('spamfilter');
-		Context::set('config',$config);
+		Context::set('config', $config);
 
 		$this->setTemplateFile('config_block');
 	}

modules/message/message.admin.view.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
 		// Get configurations (using module model object)
 		$config = $oModuleModel->getModuleConfig('message');
-		Context::set('config',$config);
+		Context::set('config', $config);
 
 		// Set a template file
 		$this->setTemplatePath($this->module_path.'tpl');

modules/comment/comment.item.php

Braces +17 added lines, -9 removed lines

@@ -333,8 +333,7 @@ 
 					'<!--BeforeComment(%d,%d)--><div class="comment_%d_%d xe_content">%s</div><!--AfterComment(%d,%d)-->', $this->comment_srl, $memberSrl, $this->comment_srl, $memberSrl, $content, $this->comment_srl, $memberSrl
 			);
 			// xe_content class name should be specified although content access is not necessary.
-		}
-		else
+		} else
 		{
 			if($add_xe_content_class)
 			{
@@ -569,7 +568,9 @@ 
 				}
 			}
 
-			if(!preg_match("!<img!is", $content)) return;
+			if(!preg_match("!<img!is", $content)) {
+				return;
+			}
 		}
 
 		// get thumbail generation info on the doc module configuration.
@@ -589,8 +590,7 @@ 
 			if(filesize($thumbnail_file) < 1)
 			{
 				return FALSE;
-			}
-			else
+			} else
 			{
 				return $thumbnail_url;
 			}
@@ -608,7 +608,9 @@ 
 			$first_image = null;
 			foreach($file_list as $file)
 			{
-				if($file->direct_download !== 'Y') continue;
+				if($file->direct_download !== 'Y') {
+					continue;
+				}
 
 				if($file->cover_image === 'Y' && file_exists($file->uploaded_filename))
 				{
@@ -616,7 +618,9 @@ 
 					break;
 				}
 
-				if($first_image) continue;
+				if($first_image) {
+					continue;
+				}
 
 				if(preg_match("/\.(jpe?g|png|gif|bmp)$/i", $file->source_filename))
 				{
@@ -644,7 +648,9 @@ 
 			foreach($matches as $target_image)
 			{
 				$target_src = trim($target_image[1]);
-				if(preg_match('/\/(common|modules|widgets|addons|layouts|m\.layouts)\//i', $target_src)) continue;
+				if(preg_match('/\/(common|modules|widgets|addons|layouts|m\.layouts)\//i', $target_src)) {
+					continue;
+				}
 
 				if(!preg_match('/^(http|https):\/\//i',$target_src))
 				{
@@ -655,7 +661,9 @@ 
 
 				$tmp_file = _XE_PATH_ . 'files/cache/tmp/' . $random->createSecureSalt(32, 'hex');
 				FileHandler::getRemoteFile($target_src, $tmp_file);
-				if(!file_exists($tmp_file)) continue;
+				if(!file_exists($tmp_file)) {
+					continue;
+				}
 
 				$imageinfo = getimagesize($tmp_file);
 				list($_w, $_h) = $imageinfo;

Spacing +73 added lines, -73 removed lines

@@ -49,7 +49,7 @@ 
 	 */
 	function _loadFromDB()
 	{
-		if(!$this->comment_srl)
+		if (!$this->comment_srl)
 		{
 			return;
 		}
@@ -67,7 +67,7 @@ 
 	 */
 	function setAttribute($attribute)
 	{
-		if(!$attribute->comment_srl)
+		if (!$attribute->comment_srl)
 		{
 			$this->comment_srl = NULL;
 			return;
@@ -77,9 +77,9 @@ 
 		$this->adds($attribute);
 
 		// define vars on the object for backward compatibility of skins
-		if(count($attribute))
+		if (count($attribute))
 		{
-			foreach($attribute as $key => $val)
+			foreach ($attribute as $key => $val)
 			{
 				$this->{$key} = $val;
 			}
@@ -93,29 +93,29 @@ 
 
 	function isGranted()
 	{
-		if($_SESSION['own_comment'][$this->comment_srl])
+		if ($_SESSION['own_comment'][$this->comment_srl])
 		{
 			return TRUE;
 		}
 
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return FALSE;
 		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
 			return TRUE;
 		}
 
 		$grant = Context::get('grant');
-		if($grant->manager)
+		if ($grant->manager)
 		{
 			return TRUE;
 		}
 
-		if($this->get('member_srl') && ($this->get('member_srl') == $logged_info->member_srl || $this->get('member_srl') * -1 == $logged_info->member_srl))
+		if ($this->get('member_srl') && ($this->get('member_srl') == $logged_info->member_srl || $this->get('member_srl') * -1 == $logged_info->member_srl))
 		{
 			return TRUE;
 		}
@@ -136,7 +136,7 @@ 
 
 	function isEditable()
 	{
-		if($this->isGranted() || !$this->get('member_srl'))
+		if ($this->isGranted() || !$this->get('member_srl'))
 		{
 			return TRUE;
 		}
@@ -150,12 +150,12 @@ 
 
 	function isAccessible()
 	{
-		if($_SESSION['accessibled_comment'][$this->comment_srl])
+		if ($_SESSION['accessibled_comment'][$this->comment_srl])
 		{
 			return TRUE;
 		}
 
-		if($this->isGranted() || !$this->isSecret())
+		if ($this->isGranted() || !$this->isSecret())
 		{
 			$this->setAccessible();
 			return TRUE;
@@ -163,7 +163,7 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($this->get('document_srl'));
-		if($oDocument->isGranted())
+		if ($oDocument->isGranted())
 		{
 			$this->setAccessible();
 			return TRUE;
@@ -184,20 +184,20 @@ 
 	function notify($type, $content)
 	{
 		// return if not useNotify
-		if(!$this->useNotify())
+		if (!$this->useNotify())
 		{
 			return;
 		}
 
 		// pass if the author is not logged-in user 
-		if(!$this->get('member_srl'))
+		if (!$this->get('member_srl'))
 		{
 			return;
 		}
 
 		// return if the currently logged-in user is an author of the comment.
 		$logged_info = Context::get('logged_info');
-		if($logged_info->member_srl == $this->get('member_srl'))
+		if ($logged_info->member_srl == $this->get('member_srl'))
 		{
 			return;
 		}
@@ -207,9 +207,9 @@ 
 		$oDocument = $oDocumentModel->getDocument($this->get('document_srl'));
 
 		// Variables
-		if($type)
+		if ($type)
 		{
-			$title = "[" . $type . "] ";
+			$title = "[".$type."] ";
 		}
 
 		$title .= cut_str(strip_tags($content), 30, '...');
@@ -224,17 +224,17 @@ 
 
 	function getIpAddress()
 	{
-		if($this->isGranted())
+		if ($this->isGranted())
 		{
 			return $this->get('ipaddress');
 		}
 
-		return '*' . strstr($this->get('ipaddress'), '.');
+		return '*'.strstr($this->get('ipaddress'), '.');
 	}
 
 	function isExistsHomepage()
 	{
-		if(trim($this->get('homepage')))
+		if (trim($this->get('homepage')))
 		{
 			return TRUE;
 		}
@@ -245,14 +245,14 @@ 
 	function getHomepageUrl()
 	{
 		$url = trim($this->get('homepage'));
-		if(!$url)
+		if (!$url)
 		{
 			return;
 		}
 
-		if(strncasecmp('http://', $url, 7) !== 0)
+		if (strncasecmp('http://', $url, 7) !== 0)
 		{
-			$url = "http://" . $url;
+			$url = "http://".$url;
 		}
 
 		return htmlspecialchars($url, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
@@ -284,14 +284,14 @@ 
 	 */
 	function getContentText($strlen = 0)
 	{
-		if($this->isSecret() && !$this->isAccessible())
+		if ($this->isSecret() && !$this->isAccessible())
 		{
 			return Context::getLang('msg_is_secret');
 		}
 
 		$content = $this->get('content');
 
-		if($strlen)
+		if ($strlen)
 		{
 			return cut_str(strip_tags($content), $strlen, '...');
 		}
@@ -305,7 +305,7 @@ 
 	 */
 	function getContent($add_popup_menu = TRUE, $add_content_info = TRUE, $add_xe_content_class = TRUE)
 	{
-		if($this->isSecret() && !$this->isAccessible())
+		if ($this->isSecret() && !$this->isAccessible())
 		{
 			return Context::getLang('msg_is_secret');
 		}
@@ -314,7 +314,7 @@ 
 		stripEmbedTagForAdmin($content, $this->get('member_srl'));
 
 		// when displaying the comment on the pop-up menu
-		if($add_popup_menu && Context::get('is_logged'))
+		if ($add_popup_menu && Context::get('is_logged'))
 		{
 			$content = sprintf(
 					'%s<div class="comment_popup_menu"><a href="#popup_menu_area" class="comment_%d" onclick="return false">%s</a></div>', $content, $this->comment_srl, Context::getLang('cmd_comment_do')
@@ -322,10 +322,10 @@ 
 		}
 
 		// if additional information which can access contents is set
-		if($add_content_info)
+		if ($add_content_info)
 		{
 			$memberSrl = $this->get('member_srl');
-			if($memberSrl < 0)
+			if ($memberSrl < 0)
 			{
 				$memberSrl = 0;
 			}
@@ -336,7 +336,7 @@ 
 		}
 		else
 		{
-			if($add_xe_content_class)
+			if ($add_xe_content_class)
 			{
 				$content = sprintf('<div class="xe_content">%s</div>', $content);
 			}
@@ -396,7 +396,7 @@ 
 
 	function getRegdateGM()
 	{
-		return $this->getRegdate('D, d M Y H:i:s') . ' ' . $GLOBALS['_time_zone'];
+		return $this->getRegdate('D, d M Y H:i:s').' '.$GLOBALS['_time_zone'];
 	}
 
 	function getUpdate($format = 'Y.m.d H:i:s')
@@ -406,7 +406,7 @@ 
 
 	function getPermanentUrl()
 	{
-		return getFullUrl('', 'mid', $this->getCommentMid(), 'document_srl', $this->get('document_srl')) . '#comment_' . $this->get('comment_srl');
+		return getFullUrl('', 'mid', $this->getCommentMid(), 'document_srl', $this->get('document_srl')).'#comment_'.$this->get('comment_srl');
 	}
 
 	function getUpdateTime()
@@ -427,7 +427,7 @@ 
 
 	function hasUploadedFiles()
 	{
-		if(($this->isSecret() && !$this->isAccessible()) && !$this->isGranted())
+		if (($this->isSecret() && !$this->isAccessible()) && !$this->isGranted())
 		{
 			return FALSE;
 		}
@@ -436,12 +436,12 @@ 
 
 	function getUploadedFiles()
 	{
-		if(($this->isSecret() && !$this->isAccessible()) && !$this->isGranted())
+		if (($this->isSecret() && !$this->isAccessible()) && !$this->isGranted())
 		{
 			return;
 		}
 
-		if(!$this->get('uploaded_count'))
+		if (!$this->get('uploaded_count'))
 		{
 			return;
 		}
@@ -458,7 +458,7 @@ 
 	function getEditor()
 	{
 		$module_srl = $this->get('module_srl');
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			$module_srl = Context::get('module_srl');
 		}
@@ -472,13 +472,13 @@ 
 	 */
 	function getProfileImage()
 	{
-		if(!$this->isExists() || !$this->get('member_srl'))
+		if (!$this->isExists() || !$this->get('member_srl'))
 		{
 			return;
 		}
 		$oMemberModel = getModel('member');
 		$profile_info = $oMemberModel->getProfileImage($this->get('member_srl'));
-		if(!$profile_info)
+		if (!$profile_info)
 		{
 			return;
 		}
@@ -493,7 +493,7 @@ 
 	function getSignature()
 	{
 		// pass if the posting not exists.
-		if(!$this->isExists() || !$this->get('member_srl'))
+		if (!$this->isExists() || !$this->get('member_srl'))
 		{
 			return;
 		}
@@ -503,7 +503,7 @@ 
 		$signature = $oMemberModel->getSignature($this->get('member_srl'));
 
 		// check if max height of the signiture is specified on the member module
-		if(!isset($GLOBALS['__member_signature_max_height']))
+		if (!isset($GLOBALS['__member_signature_max_height']))
 		{
 			$oModuleModel = getModel('module');
 			$member_config = $oModuleModel->getModuleConfig('member');
@@ -512,7 +512,7 @@ 
 
 		$max_signature_height = $GLOBALS['__member_signature_max_height'];
 
-		if($max_signature_height)
+		if ($max_signature_height)
 		{
 			$signature = sprintf('<div style="max-height:%dpx;overflow:auto;overflow-x:hidden;height:expression(this.scrollHeight > %d ? \'%dpx\': \'auto\')">%s</div>', $max_signature_height, $max_signature_height, $max_signature_height, $signature);
 		}
@@ -522,12 +522,12 @@ 
 
 	function thumbnailExists($width = 80, $height = 0, $type = '')
 	{
-		if(!$this->comment_srl)
+		if (!$this->comment_srl)
 		{
 			return FALSE;
 		}
 
-		if(!$this->getThumbnail($width, $height, $type))
+		if (!$this->getThumbnail($width, $height, $type))
 		{
 			return FALSE;
 		}
@@ -538,42 +538,42 @@ 
 	function getThumbnail($width = 80, $height = 0, $thumbnail_type = '')
 	{
 		// return false if no doc exists
-		if(!$this->comment_srl)
+		if (!$this->comment_srl)
 		{
 			return;
 		}
 
-		if($this->isSecret() && !$this->isGranted())
+		if ($this->isSecret() && !$this->isGranted())
 		{
 			return;
 		}
 
 		// If signiture height setting is omitted, create a square
-		if(!$height)
+		if (!$height)
 		{
 			$height = $width;
 		}
 
 		$content = $this->get('content');
-		if(!$this->hasUploadedFiles())
+		if (!$this->hasUploadedFiles())
 		{
-			if(!$content)
+			if (!$content)
 			{
 				$args = new stdClass();
 				$args->comment_srl = $this->comment_srl;
 				$output = executeQuery('document.getComment', $args, array('content'));
-				if($output->toBool() && $output->data)
+				if ($output->toBool() && $output->data)
 				{
 					$content = $output->data->content;
 					$this->add('content', $content);
 				}
 			}
 
-			if(!preg_match("!<img!is", $content)) return;
+			if (!preg_match("!<img!is", $content)) return;
 		}
 
 		// get thumbail generation info on the doc module configuration.
-		if(!in_array($thumbnail_type, array('crop', 'ratio')))
+		if (!in_array($thumbnail_type, array('crop', 'ratio')))
 		{
 			$thumbnail_type = 'crop';
 		}
@@ -582,12 +582,12 @@ 
 		$thumbnail_path = sprintf('files/thumbnails/%s', getNumberingPath($this->comment_srl, 3));
 		$thumbnail_file = sprintf('%s%dx%d.%s.jpg', $thumbnail_path, $width, $height, $thumbnail_type);
 		$thumbnail_lockfile = sprintf('%s%dx%d.%s.lock', $thumbnail_path, $width, $height, $thumbnail_type);
-		$thumbnail_url = Context::getRequestUri() . $thumbnail_file;
+		$thumbnail_url = Context::getRequestUri().$thumbnail_file;
 
 		// return false if a size of existing thumbnail file is 0. otherwise return the file path
-		if(file_exists($thumbnail_file) || file_exists($thumbnail_lockfile))
+		if (file_exists($thumbnail_file) || file_exists($thumbnail_lockfile))
 		{
-			if(filesize($thumbnail_file) < 1)
+			if (filesize($thumbnail_file) < 1)
 			{
 				return FALSE;
 			}
@@ -605,33 +605,33 @@ 
 		$is_tmp_file = FALSE;
 
 		// find an image file among attached files
-		if($this->hasUploadedFiles())
+		if ($this->hasUploadedFiles())
 		{
 			$file_list = $this->getUploadedFiles();
 
 			$first_image = null;
-			foreach($file_list as $file)
+			foreach ($file_list as $file)
 			{
-				if($file->direct_download !== 'Y') continue;
+				if ($file->direct_download !== 'Y') continue;
 
-				if($file->cover_image === 'Y' && file_exists($file->uploaded_filename))
+				if ($file->cover_image === 'Y' && file_exists($file->uploaded_filename))
 				{
 					$source_file = $file->uploaded_filename;
 					break;
 				}
 
-				if($first_image) continue;
+				if ($first_image) continue;
 
-				if(preg_match("/\.(jpe?g|png|gif|bmp)$/i", $file->source_filename))
+				if (preg_match("/\.(jpe?g|png|gif|bmp)$/i", $file->source_filename))
 				{
-					if(file_exists($file->uploaded_filename))
+					if (file_exists($file->uploaded_filename))
 					{
 						$first_image = $file->uploaded_filename;
 					}
 				}
 			}
 
-			if(!$source_file && $first_image)
+			if (!$source_file && $first_image)
 			{
 				$source_file = $first_image;
 			}
@@ -639,31 +639,31 @@ 
 
 		// get an image file from the doc content if no file attached. 
 		$is_tmp_file = false;
-		if(!$source_file)
+		if (!$source_file)
 		{
 			$random = new Password();
 
 			preg_match_all("!<img[^>]*src=(?:\"|\')([^\"\']*?)(?:\"|\')!is", $content, $matches, PREG_SET_ORDER);
 
-			foreach($matches as $target_image)
+			foreach ($matches as $target_image)
 			{
 				$target_src = trim($target_image[1]);
-				if(preg_match('/\/(common|modules|widgets|addons|layouts|m\.layouts)\//i', $target_src)) continue;
+				if (preg_match('/\/(common|modules|widgets|addons|layouts|m\.layouts)\//i', $target_src)) continue;
 
-				if(!preg_match('/^(http|https):\/\//i',$target_src))
+				if (!preg_match('/^(http|https):\/\//i', $target_src))
 				{
 					$target_src = Context::getRequestUri().$target_src;
 				}
 
 				$target_src = htmlspecialchars_decode($target_src);
 
-				$tmp_file = _XE_PATH_ . 'files/cache/tmp/' . $random->createSecureSalt(32, 'hex');
+				$tmp_file = _XE_PATH_.'files/cache/tmp/'.$random->createSecureSalt(32, 'hex');
 				FileHandler::getRemoteFile($target_src, $tmp_file);
-				if(!file_exists($tmp_file)) continue;
+				if (!file_exists($tmp_file)) continue;
 
 				$imageinfo = getimagesize($tmp_file);
 				list($_w, $_h) = $imageinfo;
-				if($imageinfo === false || ($_w < ($width * 0.3) && $_h < ($height * 0.3))) {
+				if ($imageinfo === false || ($_w < ($width * 0.3) && $_h < ($height * 0.3))) {
 					FileHandler::removeFile($tmp_file);
 					continue;
 				}
@@ -677,7 +677,7 @@ 
 		$output = FileHandler::createImageFile($source_file, $thumbnail_file, $width, $height, 'jpg', $thumbnail_type);
 
 		// Remove source file if it was temporary
-		if($is_tmp_file)
+		if ($is_tmp_file)
 		{
 			FileHandler::removeFile($source_file);
 		}
@@ -686,14 +686,14 @@ 
 		FileHandler::removeFile($thumbnail_lockfile);
 
 		// Return the thumbnail path if it was successfully generated
-		if($output)
+		if ($output)
 		{
 			return $thumbnail_url;
 		}
 		// Create an empty file if thumbnail generation failed
 		else
 		{
-			FileHandler::writeFile($thumbnail_file, '','w');
+			FileHandler::writeFile($thumbnail_file, '', 'w');
 		}
 
 		return;

libs/PEAR.1.9.5/HTTP/Request2/Observer/Download.php

Spacing +2 added lines, -2 removed lines

@@ -19,11 +19,11 @@
 	{
 		$event = $subject->getLastEvent();
 
-		switch($event['name'])
+		switch ($event['name'])
 		{
 			case 'receivedHeaders':
 				$this->fp = @fopen($this->filename, 'wb');
-				if(!$this->fp)
+				if (!$this->fp)
 				{
 					throw new Exception("Cannot open target file '{$filename}'");
 				}

addons/member_extra_info/member_extra_info.lib.php

Spacing +13 added lines, -13 removed lines

@@ -8,12 +8,12 @@ 
 {
 	// If member_srl < 0, then return text only in the body
 	$member_srl = $matches[3];
-	if($member_srl < 0)
+	if ($member_srl < 0)
 	{
 		return $matches[5];
 	}
 	// If member_srl=o(not a member), return the entire body
-	if(!$member_srl)
+	if (!$member_srl)
 	{
 		return $matches[0];
 	}
@@ -22,22 +22,22 @@ 
 	$nick_name = $matches[5];
 
 	// Initialize global variable for cache
-	if(!isset($GLOBALS['_transImageNameList'][$member_srl]))
+	if (!isset($GLOBALS['_transImageNameList'][$member_srl]))
 	{
 		$GLOBALS['_transImageNameList'][$member_srl] = new stdClass();
 	}
 	$_tmp = &$GLOBALS['_transImageNameList'][$member_srl];
 	
 	// If pre-defined data in the global variables, return it
-	if(!$_tmp->cached)
+	if (!$_tmp->cached)
 	{
 		$_tmp->cached = true;
 		$image_name_file = sprintf('files/member_extra_info/image_name/%s%d.gif', getNumberingPath($member_srl), $member_srl);
 		$image_mark_file = sprintf('files/member_extra_info/image_mark/%s%d.gif', getNumberingPath($member_srl), $member_srl);
 
-		if(file_exists(_XE_PATH_ . $image_name_file))
+		if (file_exists(_XE_PATH_.$image_name_file))
 		{
-			$_tmp->image_name_file = $image_name_file . '?' . date('YmdHis', filemtime(_XE_PATH_ . $image_name_file));
+			$_tmp->image_name_file = $image_name_file.'?'.date('YmdHis', filemtime(_XE_PATH_.$image_name_file));
 			$image_name_file = $_tmp->image_name_file;
 		}
 		else
@@ -45,9 +45,9 @@ 
 			$image_name_file = '';
 		}
 
-		if(file_exists(_XE_PATH_ . $image_mark_file))
+		if (file_exists(_XE_PATH_.$image_mark_file))
 		{
-			$_tmp->image_mark_file = $image_mark_file . '?' . date('YmdHis', filemtime(_XE_PATH_ . $image_mark_file));
+			$_tmp->image_mark_file = $image_mark_file.'?'.date('YmdHis', filemtime(_XE_PATH_.$image_mark_file));
 			$image_mark_file = $_tmp->image_mark_file;
 		}
 		else
@@ -67,7 +67,7 @@ 
 	}
 
 	// If image name and mark doesn't exist, set the original information
-	if(!$image_name_file && !$image_mark_file && !$group_image)
+	if (!$image_name_file && !$image_mark_file && !$group_image)
 	{
 		return $matches[0];
 	}
@@ -76,21 +76,21 @@ 
 
 	$config = $oMemberModel->getMemberConfig();
 
-	if($config->image_name == 'Y' && $image_name_file)
+	if ($config->image_name == 'Y' && $image_name_file)
 	{
 		$nick_name = sprintf('<img src="%s%s" alt="id: %s" title="id: %s" style="border:0;vertical-align:middle;margin-right:3px" />', Context::getRequestUri(), $image_name_file, strip_tags($nick_name), strip_tags($nick_name));
 	}
-	if($config->image_mark == 'Y' && $image_mark_file)
+	if ($config->image_mark == 'Y' && $image_mark_file)
 	{
 		$nick_name = sprintf('<img src="%s%s" alt="id: %s" title="id : %s" style="border:0;vertical-align:middle;margin-right:3px"/>%s', Context::getRequestUri(), $image_mark_file, strip_tags($nick_name), strip_tags($nick_name), $nick_name);
 	}
 
-	if($group_image)
+	if ($group_image)
 	{
 		$nick_name = sprintf('<img src="%s" style="border:0;max-height:16px;vertical-align:middle;margin-right:3px" alt="%s" title="%s" />%s', $group_image->src, $group_image->title, $group_image->description, $nick_name);
 	}
 
-	return preg_replace('/' . preg_quote($matches[5], '/') . '<\/' . $matches[6] . '>$/', '', $matches[0]) . $nick_name . '</' . $matches[6] . '>';
+	return preg_replace('/'.preg_quote($matches[5], '/').'<\/'.$matches[6].'>$/', '', $matches[0]).$nick_name.'</'.$matches[6].'>';
 }
 
 /* End of file member_extra_info.lib.php */

Braces +3 added lines, -6 removed lines

@@ -39,8 +39,7 @@ 
 		{
 			$_tmp->image_name_file = $image_name_file . '?' . date('YmdHis', filemtime(_XE_PATH_ . $image_name_file));
 			$image_name_file = $_tmp->image_name_file;
-		}
-		else
+		} else
 		{
 			$image_name_file = '';
 		}
@@ -49,8 +48,7 @@ 
 		{
 			$_tmp->image_mark_file = $image_mark_file . '?' . date('YmdHis', filemtime(_XE_PATH_ . $image_mark_file));
 			$image_mark_file = $_tmp->image_mark_file;
-		}
-		else
+		} else
 		{
 			$image_mark_file = '';
 		}
@@ -58,8 +56,7 @@ 
 		$site_module_info = Context::get('site_module_info');
 		$group_image = $oMemberModel->getGroupImageMark($member_srl, $site_module_info->site_srl);
 		$_tmp->group_image = $group_image;
-	}
-	else
+	} else
 	{
 		$group_image = $_tmp->group_image;
 		$image_name_file = $_tmp->image_name_file;

classes/xml/xmlquery/tags/navigation/LimitTag.class.php

Spacing +7 added lines, -7 removed lines

@@ -48,11 +48,11 @@ 
 	 */

 	function LimitTag($index)

 	{

-		if($index->page && $index->page->attrs && $index->page_count && $index->page_count->attrs)

+		if ($index->page && $index->page->attrs && $index->page_count && $index->page_count->attrs)

 		{

-			if(!isset($index->page->attrs->default))

+			if (!isset($index->page->attrs->default))

 				$index->page->attrs->default = 1;

-			if(!isset($index->page_count->attrs->default))

+			if (!isset($index->page_count->attrs->default))

 				$index->page_count->attrs->default = 10;

 			$this->page = new QueryArgument($index->page);

 			$this->page_count = new QueryArgument($index->page_count);

@@ -60,12 +60,12 @@ 
 			$this->arguments[] = $this->page_count;

 		}

 

-		if(!isset($index->list_count->attrs->default))

+		if (!isset($index->list_count->attrs->default))

 			$index->list_count->attrs->default = 0;

 		$this->list_count = new QueryArgument($index->list_count);

 		$this->arguments[] = $this->list_count;

 		

-		if(isset($index->offset) && isset($index->offset->attrs))

+		if (isset($index->offset) && isset($index->offset->attrs))

 		{

 			$this->offset = new QueryArgument($index->offset);

 			$this->arguments[] = $this->offset;

@@ -74,11 +74,11 @@ 
 

 	function toString()

 	{

-		if($this->page)

+		if ($this->page)

 		{

 			return sprintf('new Limit(${\'%s_argument\'}, ${\'%s_argument\'}, ${\'%s_argument\'})', $this->list_count->getArgumentName(), $this->page->getArgumentName(), $this->page_count->getArgumentName());

 		}

-		elseif($this->offset)

+		elseif ($this->offset)

 		{

 			return sprintf('new Limit(${\'%s_argument\'}, NULL, NULL, ${\'%s_argument\'})', $this->list_count->getArgumentName(), $this->offset->getArgumentName());

 		}

Braces +11 added lines, -10 removed lines

@@ -50,18 +50,21 @@ 
 	{

 		if($index->page && $index->page->attrs && $index->page_count && $index->page_count->attrs)

 		{

-			if(!isset($index->page->attrs->default))

-				$index->page->attrs->default = 1;

-			if(!isset($index->page_count->attrs->default))

-				$index->page_count->attrs->default = 10;

+			if(!isset($index->page->attrs->default)) {
+							$index->page->attrs->default = 1;
+			}
+			if(!isset($index->page_count->attrs->default)) {
+							$index->page_count->attrs->default = 10;
+			}
 			$this->page = new QueryArgument($index->page);

 			$this->page_count = new QueryArgument($index->page_count);

 			$this->arguments[] = $this->page;

 			$this->arguments[] = $this->page_count;

 		}

 

-		if(!isset($index->list_count->attrs->default))

-			$index->list_count->attrs->default = 0;

+		if(!isset($index->list_count->attrs->default)) {
+					$index->list_count->attrs->default = 0;
+		}
 		$this->list_count = new QueryArgument($index->list_count);

 		$this->arguments[] = $this->list_count;

 		

@@ -77,12 +80,10 @@ 
 		if($this->page)

 		{

 			return sprintf('new Limit(${\'%s_argument\'}, ${\'%s_argument\'}, ${\'%s_argument\'})', $this->list_count->getArgumentName(), $this->page->getArgumentName(), $this->page_count->getArgumentName());

-		}

-		elseif($this->offset)

+		} elseif($this->offset)

 		{

 			return sprintf('new Limit(${\'%s_argument\'}, NULL, NULL, ${\'%s_argument\'})', $this->list_count->getArgumentName(), $this->offset->getArgumentName());

-		}

-		else

+		} else

 		{

 			return sprintf('new Limit(${\'%s_argument\'})', $this->list_count->getArgumentName());

 		}

classes/db/queryparts/limit/Limit.class.php

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
 	function Limit($list_count, $page = NULL, $page_count = NULL, $offset = NULL)

 	{

 		$this->list_count = $list_count;

-		if($page)

+		if ($page)

 		{

 			$list_count_value = $list_count->getValue();

 			$page_value = $page->getValue();

@@ -52,7 +52,7 @@ 
 			$this->page_count = $page_count;

 			$this->page = $page;

 		}
-		elseif($offset)
+		elseif ($offset)
 		{
 			$this->start = $offset->getValue();
 		}

@@ -64,7 +64,7 @@ 
 	 */

 	function isPageHandler()

 	{

-		if($this->page)

+		if ($this->page)

 		{

 			return true;

 		}

@@ -86,9 +86,9 @@ 
 

 	function toString()

 	{

-		if($this->page || $this->start)

+		if ($this->page || $this->start)

 		{

-			return $this->start . ' , ' . $this->list_count->getValue();

+			return $this->start.' , '.$this->list_count->getValue();

 		}

 		else

 		{

Braces +3 added lines, -6 removed lines

@@ -51,8 +51,7 @@ 
 			$this->start = ($page_value - 1) * $list_count_value;

 			$this->page_count = $page_count;

 			$this->page = $page;

-		}
-		elseif($offset)
+		} elseif($offset)
 		{
 			$this->start = $offset->getValue();
 		}

@@ -67,8 +66,7 @@ 
 		if($this->page)

 		{

 			return true;

-		}

-		else

+		} else

 		{

 			return false;

 		}

@@ -89,8 +87,7 @@ 
 		if($this->page || $this->start)

 		{

 			return $this->start . ' , ' . $this->list_count->getValue();

-		}

-		else

+		} else

 		{

 			return $this->list_count->getValue();

 		}

classes/db/DBMysqli.class.php

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];
 			}

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

classes/db/DBMysqli_innodb.class.php

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

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

Doc Comments +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 	 * opt : notnull, default, size\n
 	 * index : primary key, index, unique\n
 	 * @param string $xml_doc xml schema contents
-	 * @return void|object
+	 * @return null|false
 	 */
 	function _createTable($xml_doc)
 	{