xpressengine / xe-core

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('', 'document_srl', $this->get('document_srl')) . '#comment_' . $this->get('comment_srl');
+		return getFullUrl('', '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}'");
 				}

modules/point/point.admin.controller.php

Braces +93 added lines, -35 removed lines

@@ -39,7 +39,9 @@ 
 
 			// Check the point name
 			$config->point_name = $args->point_name;
-			if(!$config->point_name) $config->point_name = 'point';
+			if(!$config->point_name) {
+				$config->point_name = 'point';
+			}
 			// Specify the default points
 			$config->signup_point = (int)$args->signup_point;
 			$config->login_point = (int)$args->login_point;
@@ -52,16 +54,26 @@ 
 			$config->blamed = (int)$args->blamed;
 			// The highest level
 			$config->max_level = $args->max_level;
-			if($config->max_level>1000) $config->max_level = 1000;
-			if($config->max_level<1) $config->max_level = 1;
+			if($config->max_level>1000) {
+				$config->max_level = 1000;
+			}
+			if($config->max_level<1) {
+				$config->max_level = 1;
+			}
 			// Set the level icon
 			$config->level_icon = $args->level_icon;
 			// Check if downloads are not allowed
-			if($args->disable_download == 'Y') $config->disable_download = 'Y';
-			else $config->disable_download = 'N';
+			if($args->disable_download == 'Y') {
+				$config->disable_download = 'Y';
+			} else {
+				$config->disable_download = 'N';
+			}
 			// Check if reading a document is not allowed
-			if($args->disable_read_document == 'Y') $config->disable_read_document = 'Y';
-			else $config->disable_read_document = 'N';
+			if($args->disable_read_document == 'Y') {
+				$config->disable_read_document = 'Y';
+			} else {
+				$config->disable_read_document = 'N';
+			}
 
 			$oMemberModel = getModel('member');
 			$group_list = $oMemberModel->getGroups();
@@ -71,7 +83,9 @@ 
 			foreach($group_list as $group)
 			{
 				// Admin group should not be connected to point.
-				if($group->is_admin == 'Y' || $group->is_default == 'Y') continue;
+				if($group->is_admin == 'Y' || $group->is_default == 'Y') {
+					continue;
+				}
 
 				$group_srl = $group->group_srl;
 
@@ -102,8 +116,7 @@ 
 			}
 			// A function to calculate per-level points
 			$config->expression = $args->expression;
-		}
-		else
+		} else
 		{
 			//module IO config is OFF, Other settings will not be modified.
 			$config->able_module = 'N';
@@ -165,16 +178,23 @@ 
 	function procPointAdminInsertPointModuleConfig()
 	{
 		$module_srl = Context::get('target_module_srl');
-		if(!$module_srl) return new Object(-1, 'msg_invalid_request');
+		if(!$module_srl) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 		// In case of batch configuration of several modules
-		if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
-		else $module_srl = array($module_srl);
+		if(preg_match('/^([0-9,]+)$/',$module_srl)) {
+			$module_srl = explode(',',$module_srl);
+		} else {
+			$module_srl = array($module_srl);
+		}
 		// Save configurations
 		$oModuleController = getController('module');
 		for($i=0;$i<count($module_srl);$i++)
 		{
 			$srl = trim($module_srl[$i]);
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 			unset($config);
 			$config['insert_document'] = (int)Context::get('insert_document');
 			$config['insert_comment'] = (int)Context::get('insert_comment');
@@ -244,29 +264,40 @@ 
 
 		// Get member infomation
 		$output = executeQueryArray('point.getMemberCount');
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		if($output->data)
 		{
 			foreach($output->data as $key => $val)
 			{
-				if(!$val->member_srl) continue;
+				if(!$val->member_srl) {
+					continue;
+				}
 				$member[$val->member_srl] = 0;
 			}
 		}
 
 		// Get post information
 		$output = executeQueryArray('point.getDocumentPoint');
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		if($output->data)
 		{
 			foreach($output->data as $key => $val)
 			{
-				if($module_config[$val->module_srl]['insert_document']) $insert_point = $module_config[$val->module_srl]['insert_document'];
-				else $insert_point = $config->insert_document;
+				if($module_config[$val->module_srl]['insert_document']) {
+					$insert_point = $module_config[$val->module_srl]['insert_document'];
+				} else {
+					$insert_point = $config->insert_document;
+				}
 
-				if(!$val->member_srl) continue;
+				if(!$val->member_srl) {
+					continue;
+				}
 				$point = $insert_point * $val->count;
 				$member[$val->member_srl] += $point;
 			}
@@ -275,16 +306,23 @@ 
 		$output = null;
 		// Get comments information
 		$output = executeQueryArray('point.getCommentPoint');
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		if($output->data)
 		{
 			foreach($output->data as $key => $val)
 			{
-				if($module_config[$val->module_srl]['insert_comment']) $insert_point = $module_config[$val->module_srl]['insert_comment'];
-				else $insert_point = $config->insert_comment;
+				if($module_config[$val->module_srl]['insert_comment']) {
+					$insert_point = $module_config[$val->module_srl]['insert_comment'];
+				} else {
+					$insert_point = $config->insert_comment;
+				}
 
-				if(!$val->member_srl) continue;
+				if(!$val->member_srl) {
+					continue;
+				}
 				$point = $insert_point * $val->count;
 				$member[$val->member_srl] += $point;
 			}
@@ -292,16 +330,23 @@ 
 		$output = null;
 		// Get the attached files' information
 		$output = executeQueryArray('point.getFilePoint');
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		if($output->data)
 		{
 			foreach($output->data as $key => $val)
 			{
-				if($module_config[$val->module_srl]['upload_file']) $insert_point = $module_config[$val->module_srl]['upload_file'];
-				else $insert_point = $config->upload_file;
+				if($module_config[$val->module_srl]['upload_file']) {
+					$insert_point = $module_config[$val->module_srl]['upload_file'];
+				} else {
+					$insert_point = $config->upload_file;
+				}
 
-				if(!$val->member_srl) continue;
+				if(!$val->member_srl) {
+					continue;
+				}
 				$point = $insert_point * $val->count;
 				$member[$val->member_srl] += $point;
 			}
@@ -309,7 +354,9 @@ 
 		$output = null;
 		// Set all members' points to 0
 		$output = executeQuery("point.initMemberPoint");
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Save the file temporarily
 		
 		$str = '';
@@ -334,7 +381,9 @@ 
 		$position = (int)Context::get('position');
 		$total = (int)Context::get('total');
 
-		if(!file_exists('./files/cache/pointRecal.txt')) return new Object(-1, 'msg_invalid_request');
+		if(!file_exists('./files/cache/pointRecal.txt')) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 
 		$idx = 0;
 		$f = fopen("./files/cache/pointRecal.txt","r");
@@ -350,7 +399,9 @@ 
 				$args->member_srl = $member_srl;
 				$args->point = $point;
 				$output = executeQuery('point.insertPoint',$args);
-				if($idx%5000==0) break;
+				if($idx%5000==0) {
+					break;
+				}
 			}
 		}
 
@@ -377,16 +428,23 @@ 
 	function procPointAdminReset()
 	{
 		$module_srl = Context::get('module_srls');
-		if(!$module_srl) return new Object(-1, 'msg_invalid_request');
+		if(!$module_srl) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 		// In case of batch configuration of several modules
-		if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
-		else $module_srl = array($module_srl);
+		if(preg_match('/^([0-9,]+)$/',$module_srl)) {
+			$module_srl = explode(',',$module_srl);
+		} else {
+			$module_srl = array($module_srl);
+		}
 		// Save configurations
 		$oModuleController = getController('module');
 		for($i=0;$i<count($module_srl);$i++)
 		{
 			$srl = trim($module_srl[$i]);
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 			$args = new stdClass();
 			$args->module = 'point';
 			$args->module_srl = $srl;

Spacing +83 added lines, -83 removed lines

@@ -26,10 +26,10 @@ 
 		$args = Context::getRequestVars();
 
 		//if module IO config is off
-		if($args->able_module == 'Y')
+		if ($args->able_module == 'Y')
 		{
 			// Re-install triggers, if it was disabled.
-			if($config->able_module == 'N')
+			if ($config->able_module == 'N')
 			{
 				$this->moduleUpdate();
 			}
@@ -39,28 +39,28 @@ 
 
 			// Check the point name
 			$config->point_name = $args->point_name;
-			if(!$config->point_name) $config->point_name = 'point';
+			if (!$config->point_name) $config->point_name = 'point';
 			// Specify the default points
-			$config->signup_point = (int)$args->signup_point;
-			$config->login_point = (int)$args->login_point;
-			$config->insert_document = (int)$args->insert_document;
-			$config->read_document = (int)$args->read_document;
-			$config->insert_comment = (int)$args->insert_comment;
-			$config->upload_file = (int)$args->upload_file;
-			$config->download_file = (int)$args->download_file;
-			$config->voted = (int)$args->voted;
-			$config->blamed = (int)$args->blamed;
+			$config->signup_point = (int) $args->signup_point;
+			$config->login_point = (int) $args->login_point;
+			$config->insert_document = (int) $args->insert_document;
+			$config->read_document = (int) $args->read_document;
+			$config->insert_comment = (int) $args->insert_comment;
+			$config->upload_file = (int) $args->upload_file;
+			$config->download_file = (int) $args->download_file;
+			$config->voted = (int) $args->voted;
+			$config->blamed = (int) $args->blamed;
 			// The highest level
 			$config->max_level = $args->max_level;
-			if($config->max_level>1000) $config->max_level = 1000;
-			if($config->max_level<1) $config->max_level = 1;
+			if ($config->max_level > 1000) $config->max_level = 1000;
+			if ($config->max_level < 1) $config->max_level = 1;
 			// Set the level icon
 			$config->level_icon = $args->level_icon;
 			// Check if downloads are not allowed
-			if($args->disable_download == 'Y') $config->disable_download = 'Y';
+			if ($args->disable_download == 'Y') $config->disable_download = 'Y';
 			else $config->disable_download = 'N';
 			// Check if reading a document is not allowed
-			if($args->disable_read_document == 'Y') $config->disable_read_document = 'Y';
+			if ($args->disable_read_document == 'Y') $config->disable_read_document = 'Y';
 			else $config->disable_read_document = 'N';
 
 			$oMemberModel = getModel('member');
@@ -68,23 +68,23 @@ 
 			$config->point_group = array();
 
 			// Per-level group configurations
-			foreach($group_list as $group)
+			foreach ($group_list as $group)
 			{
 				// Admin group should not be connected to point.
-				if($group->is_admin == 'Y' || $group->is_default == 'Y') continue;
+				if ($group->is_admin == 'Y' || $group->is_default == 'Y') continue;
 
 				$group_srl = $group->group_srl;
 
-				if(isset($args->{'point_group_'.$group_srl}))
+				if (isset($args->{'point_group_'.$group_srl}))
 				{
 					//if group level is higher than max level, change to max level
-					if($args->{'point_group_'.$group_srl} > $args->max_level)
+					if ($args->{'point_group_'.$group_srl} > $args->max_level)
 					{
 						$args->{'point_group_'.$group_srl} = $args->max_level;
 					}
 
 					//if group level is lower than 1, change to 1
-					if($args->{'point_group_'.$group_srl} < 1)
+					if ($args->{'point_group_'.$group_srl} < 1)
 					{
 						$args->{'point_group_'.$group_srl} = 1;
 					}
@@ -95,10 +95,10 @@ 
 			$config->group_reset = $args->group_reset;
 			// Per-level point configurations
 			unset($config->level_step);
-			for($i=1;$i<=$config->max_level;$i++)
+			for ($i = 1; $i <= $config->max_level; $i++)
 			{
 				$key = "level_step_".$i;
-				$config->level_step[$i] = (int)$args->{$key};
+				$config->level_step[$i] = (int) $args->{$key};
 			}
 			// A function to calculate per-level points
 			$config->expression = $args->expression;
@@ -130,11 +130,11 @@ 
 		$args = Context::getRequestVars();
 
 		$configTypeList = array('insert_document', 'insert_comment', 'upload_file', 'download_file', 'read_document', 'voted', 'blamed');
-		foreach($configTypeList AS $config)
+		foreach ($configTypeList AS $config)
 		{
-			if(is_array($args->{$config}))
+			if (is_array($args->{$config}))
 			{
-				foreach($args->{$config} AS $key=>$value)
+				foreach ($args->{$config} AS $key=>$value)
 				{
 					$module_config[$key][$config] = $value;
 				}
@@ -142,16 +142,16 @@ 
 		}
 
 		$oModuleController = getController('module');
-		if(count($module_config))
+		if (count($module_config))
 		{
-			foreach($module_config as $module_srl => $config)
+			foreach ($module_config as $module_srl => $config)
 			{
-				$oModuleController->insertModulePartConfig('point',$module_srl,$config);
+				$oModuleController->insertModulePartConfig('point', $module_srl, $config);
 			}
 		}
 
 		$this->setMessage('success_updated');
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPointAdminModuleConfig');
 			header('location:'.$returnUrl);
@@ -165,24 +165,24 @@ 
 	function procPointAdminInsertPointModuleConfig()
 	{
 		$module_srl = Context::get('target_module_srl');
-		if(!$module_srl) return new Object(-1, 'msg_invalid_request');
+		if (!$module_srl) return new Object(-1, 'msg_invalid_request');
 		// In case of batch configuration of several modules
-		if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
+		if (preg_match('/^([0-9,]+)$/', $module_srl)) $module_srl = explode(',', $module_srl);
 		else $module_srl = array($module_srl);
 		// Save configurations
 		$oModuleController = getController('module');
-		for($i=0;$i<count($module_srl);$i++)
+		for ($i = 0; $i < count($module_srl); $i++)
 		{
 			$srl = trim($module_srl[$i]);
-			if(!$srl) continue;
+			if (!$srl) continue;
 			unset($config);
-			$config['insert_document'] = (int)Context::get('insert_document');
-			$config['insert_comment'] = (int)Context::get('insert_comment');
-			$config['upload_file'] = (int)Context::get('upload_file');
-			$config['download_file'] = (int)Context::get('download_file');
-			$config['read_document'] = (int)Context::get('read_document');
-			$config['voted'] = (int)Context::get('voted');
-			$config['blamed'] = (int)Context::get('blamed');
+			$config['insert_document'] = (int) Context::get('insert_document');
+			$config['insert_comment'] = (int) Context::get('insert_comment');
+			$config['upload_file'] = (int) Context::get('upload_file');
+			$config['download_file'] = (int) Context::get('download_file');
+			$config['read_document'] = (int) Context::get('read_document');
+			$config['voted'] = (int) Context::get('voted');
+			$config['blamed'] = (int) Context::get('blamed');
 			$oModuleController->insertModulePartConfig('point', $srl, $config);
 		}
 
@@ -204,7 +204,7 @@ 
 		preg_match('/^(\+|-)?([1-9][0-9]*)$/', $point, $m);
 
 		$action = '';
-		switch($m[1])
+		switch ($m[1])
 		{
 			case '+':
 				$action = 'add';
@@ -219,7 +219,7 @@ 
 		$point = $m[2];
 
 		$oPointController = getController('point');
-		$output = $oPointController->setPoint($member_srl, (int)$point, $action);
+		$output = $oPointController->setPoint($member_srl, (int) $point, $action);
 
 		$this->setError(-1);
 		$this->setMessage('success_updated', 'info');
@@ -244,29 +244,29 @@ 
 
 		// Get member infomation
 		$output = executeQueryArray('point.getMemberCount');
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
-				if(!$val->member_srl) continue;
+				if (!$val->member_srl) continue;
 				$member[$val->member_srl] = 0;
 			}
 		}
 
 		// Get post information
 		$output = executeQueryArray('point.getDocumentPoint');
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
-				if($module_config[$val->module_srl]['insert_document']) $insert_point = $module_config[$val->module_srl]['insert_document'];
+				if ($module_config[$val->module_srl]['insert_document']) $insert_point = $module_config[$val->module_srl]['insert_document'];
 				else $insert_point = $config->insert_document;
 
-				if(!$val->member_srl) continue;
+				if (!$val->member_srl) continue;
 				$point = $insert_point * $val->count;
 				$member[$val->member_srl] += $point;
 			}
@@ -275,16 +275,16 @@ 
 		$output = null;
 		// Get comments information
 		$output = executeQueryArray('point.getCommentPoint');
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
-				if($module_config[$val->module_srl]['insert_comment']) $insert_point = $module_config[$val->module_srl]['insert_comment'];
+				if ($module_config[$val->module_srl]['insert_comment']) $insert_point = $module_config[$val->module_srl]['insert_comment'];
 				else $insert_point = $config->insert_comment;
 
-				if(!$val->member_srl) continue;
+				if (!$val->member_srl) continue;
 				$point = $insert_point * $val->count;
 				$member[$val->member_srl] += $point;
 			}
@@ -292,16 +292,16 @@ 
 		$output = null;
 		// Get the attached files' information
 		$output = executeQueryArray('point.getFilePoint');
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
-				if($module_config[$val->module_srl]['upload_file']) $insert_point = $module_config[$val->module_srl]['upload_file'];
+				if ($module_config[$val->module_srl]['upload_file']) $insert_point = $module_config[$val->module_srl]['upload_file'];
 				else $insert_point = $config->upload_file;
 
-				if(!$val->member_srl) continue;
+				if (!$val->member_srl) continue;
 				$point = $insert_point * $val->count;
 				$member[$val->member_srl] += $point;
 			}
@@ -309,13 +309,13 @@ 
 		$output = null;
 		// Set all members' points to 0
 		$output = executeQuery("point.initMemberPoint");
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Save the file temporarily
 		
 		$str = '';
-		foreach($member as $key => $val)
+		foreach ($member as $key => $val)
 		{
-			$val += (int)$config->signup_point;
+			$val += (int) $config->signup_point;
 			$str .= $key.','.$val."\r\n";
 		}
 
@@ -323,7 +323,7 @@ 
 
 		$this->add('total', count($member));
 		$this->add('position', 0);
-		$this->setMessage( sprintf(Context::getLang('point_recal_message'), 0, $this->get('total')) );
+		$this->setMessage(sprintf(Context::getLang('point_recal_message'), 0, $this->get('total')));
 	}
 
 	/**
@@ -331,35 +331,35 @@ 
 	 */
 	function procPointAdminApplyPoint()
 	{
-		$position = (int)Context::get('position');
-		$total = (int)Context::get('total');
+		$position = (int) Context::get('position');
+		$total = (int) Context::get('total');
 
-		if(!file_exists('./files/cache/pointRecal.txt')) return new Object(-1, 'msg_invalid_request');
+		if (!file_exists('./files/cache/pointRecal.txt')) return new Object(-1, 'msg_invalid_request');
 
 		$idx = 0;
-		$f = fopen("./files/cache/pointRecal.txt","r");
-		while(!feof($f))
+		$f = fopen("./files/cache/pointRecal.txt", "r");
+		while (!feof($f))
 		{
 			$str = trim(fgets($f, 1024));
-			$idx ++;
-			if($idx > $position)
+			$idx++;
+			if ($idx > $position)
 			{
-				list($member_srl, $point) = explode(',',$str);
+				list($member_srl, $point) = explode(',', $str);
 
 				$args = new stdClass();
 				$args->member_srl = $member_srl;
 				$args->point = $point;
-				$output = executeQuery('point.insertPoint',$args);
-				if($idx%5000==0) break;
+				$output = executeQuery('point.insertPoint', $args);
+				if ($idx % 5000 == 0) break;
 			}
 		}
 
-		if(feof($f))
+		if (feof($f))
 		{
 			FileHandler::removeFile('./files/cache/pointRecal.txt');
 			$idx = $total;
 
-			FileHandler::rename('./files/member_extra_info/point','./files/member_extra_info/point.old');
+			FileHandler::rename('./files/member_extra_info/point', './files/member_extra_info/point.old');
 
 			FileHandler::removeDir('./files/member_extra_info/point.old');
 		}
@@ -377,16 +377,16 @@ 
 	function procPointAdminReset()
 	{
 		$module_srl = Context::get('module_srls');
-		if(!$module_srl) return new Object(-1, 'msg_invalid_request');
+		if (!$module_srl) return new Object(-1, 'msg_invalid_request');
 		// In case of batch configuration of several modules
-		if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
+		if (preg_match('/^([0-9,]+)$/', $module_srl)) $module_srl = explode(',', $module_srl);
 		else $module_srl = array($module_srl);
 		// Save configurations
 		$oModuleController = getController('module');
-		for($i=0;$i<count($module_srl);$i++)
+		for ($i = 0; $i < count($module_srl); $i++)
 		{
 			$srl = trim($module_srl[$i]);
-			if(!$srl) continue;
+			if (!$srl) continue;
 			$args = new stdClass();
 			$args->module = 'point';
 			$args->module_srl = $srl;
@@ -394,7 +394,7 @@ 
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}

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/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 ();

Doc Comments +8 added lines, -7 removed lines

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

classes/frontendfile/FrontEndFileHandler.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -394,7 +394,7 @@
 	 * Arrage css index
 	 *
 	 * @param string $dirName First directory  name of css path
-	 * @param array $file file info.
+	 * @param stdClass $file file info.
 	 * @return void
 	 */
 	function _arrangeCssIndex($dirName, &$file)

Indentation +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 	 * Check SSL
 	 *
 	 * @return bool If using ssl returns true, otherwise returns false.
-     * @deprecated
+	 * @deprecated
 	 */
 	function isSsl()
 	{

Braces +15 added lines, -20 removed lines

@@ -108,15 +108,13 @@ 
 			$mapIndex = &$this->cssMapIndex;
 
 			$this->_arrangeCssIndex($pathInfo['dirname'], $file);
-		}
-		else if($file->fileExtension == 'js')
+		} else if($file->fileExtension == 'js')
 		{
 			if($args[1] == 'body')
 			{
 				$map = &$this->jsBodyMap;
 				$mapIndex = &$this->jsBodyMapIndex;
-			}
-			else
+			} else
 			{
 				$map = &$this->jsHeadMap;
 				$mapIndex = &$this->jsHeadMapIndex;
@@ -174,8 +172,7 @@ 
 				{
 					$file->fileName = $minifiedFileName;
 				}
-			}
-			else
+			} else
 			{
 				// Remove .min
 				if(file_exists(implode('/', array($file->fileRealPath, $file->keyName))))
@@ -195,8 +192,7 @@ 
 				$file->media = 'all';
 			}
 			$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;
 		}
@@ -223,8 +219,7 @@ 
 				$index = $this->cssMapIndex[$file->key];
 				unset($this->cssMap[$index][$file->key], $this->cssMapIndex[$file->key]);
 			}
-		}
-		else
+		} else
 		{
 			if(isset($this->jsHeadMapIndex[$file->key]))
 			{
@@ -286,7 +281,9 @@ 
 				}
 				if($file->query)
 				{
-					if($query) $query .= '&';
+					if($query) {
+						$query .= '&';
+					}
 					$query .= $file->query;
 				}
 				$query = ($query) ? '?' . $query : '';
@@ -315,8 +312,7 @@ 
 		{
 			$map = &$this->jsHeadMap;
 			$mapIndex = &$this->jsHeadMapIndex;
-		}
-		else
+		} else
 		{
 			$map = &$this->jsBodyMap;
 			$mapIndex = &$this->jsBodyMapIndex;
@@ -336,7 +332,9 @@ 
 				}
 				if($file->query)
 				{
-					if($query) $query .= '&';
+					if($query) {
+						$query .= '&';
+					}
 					$query .= $file->query;
 				}
 				$query = ($query) ? '?' . $query : '';
@@ -375,8 +373,7 @@ 
 		if(strpos($path, '://') === FALSE && $path{0} != '/' && $path{0} != '.')
 		{
 			$path = './' . $path;
-		}
-		elseif(!strncmp($path, '//', 2))
+		} elseif(!strncmp($path, '//', 2))
 		{
 			return preg_replace('#^//+#', '//', $path);
 		}
@@ -407,13 +404,11 @@ 
 			if($script_path == '/' || $script_path == '\\')
 			{
 				$path = '/' . substr($path, 2);
-			}
-			else
+			} else
 			{
 				$path = $script_path . substr($path, 2);
 			}
-		}
-		else if(strpos($file, '../') === 0)
+		} else if(strpos($file, '../') === 0)
 		{
 			$path = $this->_normalizeFilePath($script_path . $path);
 		}

Spacing +52 added lines, -52 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,
@@ -312,7 +312,7 @@ 
 	 */
 	function getJsFileList($type = 'head')
 	{
-		if($type == 'head')
+		if ($type == 'head')
 		{
 			$map = &$this->jsHeadMap;
 			$mapIndex = &$this->jsHeadMapIndex;
@@ -326,23 +326,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,
 					'targetie' => $file->targetIe
@@ -373,18 +373,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);
 		}
@@ -403,20 +403,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;
@@ -431,7 +431,7 @@ 
 	 */
 	function _arrangeCssIndex($dirName, &$file)
 	{
-		if($file->index !== 0)
+		if ($file->index !== 0)
 		{
 			return;
 		}