xpressengine / xe-core

classes/xml/xmlquery/tags/table/TableTag.class.php

Spacing +6 added lines, -6 removed lines

@@ -74,7 +74,7 @@ 
 		$this->name = $dbParser->parseTableName($table->attrs->name);

 

 		$this->alias = $table->attrs->alias;

-		if(!$this->alias)

+		if (!$this->alias)

 		{

 			$this->alias = $table->attrs->name;

 		}

@@ -83,7 +83,7 @@ 
 

 		$this->conditions = $table->conditions;

 

-		if($this->isJoinTable())

+		if ($this->isJoinTable())

 		{

 			$this->conditionsTag = new JoinConditionsTag($this->conditions);

 		}

@@ -92,7 +92,7 @@ 
 	function isJoinTable()

 	{

 		$joinList = array('left join' => 1, 'left outer join' => 1, 'right join' => 1, 'right outer join' => 1);

-		if(isset($joinList[$this->join_type]) && count($this->conditions))

+		if (isset($joinList[$this->join_type]) && count($this->conditions))

 		{

 			return true;

 		}

@@ -119,7 +119,7 @@ 
 	{

 		$dbParser = DB::getParser();

 

-		if($this->isJoinTable())

+		if ($this->isJoinTable())

 		{

 			return sprintf('new JoinTable(\'%s\', \'%s\', "%s", %s)'

 							, $dbParser->escape($this->name)

@@ -128,12 +128,12 @@ 
 		}

 		return sprintf('new Table(\'%s\'%s)'

 						, $dbParser->escape($this->name)

-						, $this->alias ? ', \'' . $dbParser->escape($this->alias) . '\'' : '');

+						, $this->alias ? ', \''.$dbParser->escape($this->alias).'\'' : '');

 	}

 

 	function getArguments()

 	{

-		if(!isset($this->conditionsTag))

+		if (!isset($this->conditionsTag))

 		{

 			return array();

 		}

classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php

Spacing +7 added lines, -7 removed lines

@@ -33,12 +33,12 @@ 
 	{

 		$this->pipe = $pipe;

 

-		if(!is_array($conditions))

+		if (!is_array($conditions))

 		{

 			$conditions = array($conditions);

 		}

 

-		foreach($conditions as $condition)

+		foreach ($conditions as $condition)

 		{

 			//if($condition->node_name === 'query') $this->conditions[] = new QueryTag($condition, true);

 			$this->conditions[] = new ConditionTag($condition);

@@ -56,21 +56,21 @@ 
 	 */

 	function getConditionGroupString()

 	{

-		$conditions_string = 'array(' . PHP_EOL;

-		foreach($this->conditions as $condition)

+		$conditions_string = 'array('.PHP_EOL;

+		foreach ($this->conditions as $condition)

 		{

-			$conditions_string .= $condition->getConditionString() . PHP_EOL . ',';

+			$conditions_string .= $condition->getConditionString().PHP_EOL.',';

 		}

 		$conditions_string = substr($conditions_string, 0, -2); //remove ','

 		$conditions_string .= ')';

 

-		return sprintf("new ConditionGroup(%s%s)", $conditions_string, $this->pipe ? ',\'' . $this->pipe . '\'' : '');

+		return sprintf("new ConditionGroup(%s%s)", $conditions_string, $this->pipe ? ',\''.$this->pipe.'\'' : '');

 	}

 

 	function getArguments()

 	{

 		$arguments = array();

-		foreach($this->conditions as $condition)

+		foreach ($this->conditions as $condition)

 		{

 			$arguments = array_merge($arguments, $condition->getArguments());

 		}

classes/xml/xmlquery/tags/condition/ConditionsTag.class.php

Spacing +13 added lines, -13 removed lines

@@ -25,42 +25,42 @@ 
 	function ConditionsTag($xml_conditions)

 	{

 		$this->condition_groups = array();

-		if(!$xml_conditions)

+		if (!$xml_conditions)

 		{

 			return;

 		}

 

 		$xml_condition_list = array();

-		if($xml_conditions->condition)

+		if ($xml_conditions->condition)

 		{

 			$xml_condition_list = $xml_conditions->condition;

 		}

 

-		if($xml_conditions->query)

+		if ($xml_conditions->query)

 		{

-			if(!is_array($xml_condition_list))

+			if (!is_array($xml_condition_list))

 			{

 				$xml_condition_list = array($xml_condition_list);

 			}

-			if(!is_array($xml_conditions->query))

+			if (!is_array($xml_conditions->query))

 			{

 				$xml_conditions->query = array($xml_conditions->query);

 			}

 			$xml_condition_list = array_merge($xml_condition_list, $xml_conditions->query);

 		}

-		if($xml_condition_list)

+		if ($xml_condition_list)

 		{

 			$this->condition_groups[] = new ConditionGroupTag($xml_condition_list);

 		}

 

 		$xml_groups = $xml_conditions->group;

-		if($xml_groups)

+		if ($xml_groups)

 		{

-			if(!is_array($xml_groups))

+			if (!is_array($xml_groups))

 			{

 				$xml_groups = array($xml_groups);

 			}

-			foreach($xml_groups as $group)

+			foreach ($xml_groups as $group)

 			{

 				$this->condition_groups[] = new ConditionGroupTag($group->condition, $group->attrs->pipe);

 			}

@@ -73,10 +73,10 @@ 
 	 */

 	function toString()

 	{

-		$output_conditions = 'array(' . PHP_EOL;

-		foreach($this->condition_groups as $condition)

+		$output_conditions = 'array('.PHP_EOL;

+		foreach ($this->condition_groups as $condition)

 		{

-			$output_conditions .= $condition->getConditionGroupString() . PHP_EOL . ',';

+			$output_conditions .= $condition->getConditionGroupString().PHP_EOL.',';

 		}

 		$output_conditions = substr($output_conditions, 0, -1);

 		$output_conditions .= ')';

@@ -86,7 +86,7 @@ 
 	function getArguments()

 	{

 		$arguments = array();

-		foreach($this->condition_groups as $condition)

+		foreach ($this->condition_groups as $condition)

 		{

 			$arguments = array_merge($arguments, $condition->getArguments());

 		}

classes/xml/xmlquery/tags/group/GroupsTag.class.php

Spacing +7 added lines, -7 removed lines

@@ -26,19 +26,19 @@ 
 	{

 		$this->groups = array();

 

-		if($xml_groups)

+		if ($xml_groups)

 		{

-			if(!is_array($xml_groups))

+			if (!is_array($xml_groups))

 			{

 				$xml_groups = array($xml_groups);

 			}

 

 			$dbParser = &DB::getParser();

-			for($i = 0; $i < count($xml_groups); $i++)

+			for ($i = 0; $i < count($xml_groups); $i++)

 			{

 				$group = $xml_groups[$i];

 				$column = trim($group->attrs->column);

-				if(!$column)

+				if (!$column)

 				{

 					continue;

 				}

@@ -51,10 +51,10 @@ 
 

 	function toString()

 	{

-		$output = 'array(' . PHP_EOL;

-		foreach($this->groups as $group)

+		$output = 'array('.PHP_EOL;

+		foreach ($this->groups as $group)

 		{

-			$output .= "'" . $group . "' ,";

+			$output .= "'".$group."' ,";

 		}

 		$output = substr($output, 0, -1);

 		$output .= ')';

classes/xml/xmlquery/queryargument/SortQueryArgument.class.php

Spacing +3 added lines, -3 removed lines

@@ -16,13 +16,13 @@
 	 */
 	function toString()
 	{
-		$arg = sprintf("\n" . '${\'%s_argument\'} = new SortArgument(\'%s\', %s);' . "\n"
+		$arg = sprintf("\n".'${\'%s_argument\'} = new SortArgument(\'%s\', %s);'."\n"
 				, $this->argument_name
 				, $this->argument_name
-				, '$args->' . $this->variable_name);
+				, '$args->'.$this->variable_name);
 		$arg .= $this->argument_validator->toString();
 
-		$arg .= sprintf('if(!${\'%s_argument\'}->isValid()) return ${\'%s_argument\'}->getErrorMessage();' . "\n"
+		$arg .= sprintf('if(!${\'%s_argument\'}->isValid()) return ${\'%s_argument\'}->getErrorMessage();'."\n"
 				, $this->argument_name
 				, $this->argument_name
 		);

classes/xml/xmlquery/queryargument/DefaultValue.class.php

Spacing +7 added lines, -7 removed lines

@@ -70,7 +70,7 @@ 
 	{

 		return $this->_is_string;

 		$str_pos = strpos($this->value, '(');

-		if($str_pos === false)

+		if ($str_pos === false)

 		{

 			return TRUE;

 		}

@@ -99,31 +99,31 @@ 
 

 	function _setValue()

 	{

-		if(!isset($this->value))

+		if (!isset($this->value))

 		{

 			return;

 		}

 

 		// If value contains comma separated values and does not contain paranthesis

 		//  -> default value is an array

-		if(strpos($this->value, ',') !== FALSE && strpos($this->value, '(') === FALSE)

+		if (strpos($this->value, ',') !== FALSE && strpos($this->value, '(') === FALSE)

 		{

 			return sprintf('array(%s)', $this->value);

 		}

 

 		$str_pos = strpos($this->value, '(');

 		// // TODO Replace this with parseExpression

-		if($str_pos === FALSE)

+		if ($str_pos === FALSE)

 		{

 			$this->_is_string = TRUE;

-			return '\'' . $this->value . '\'';

+			return '\''.$this->value.'\'';

 		}

 		//if($str_pos===false) return $this->value;

 

 		$func_name = substr($this->value, 0, $str_pos);

 		$args = substr($this->value, $str_pos + 1, -1);

 

-		switch($func_name)

+		switch ($func_name)

 		{

 			case 'ipaddress' :

 				$val = '$_SERVER[\'REMOTE_ADDR\']';

@@ -159,7 +159,7 @@ 
 				$val = sprintf('%d', $args);

 				break;

 			default :

-				$val = '\'' . $this->value . '\'';

+				$val = '\''.$this->value.'\'';

 			//$val = $this->value;

 		}

 

addons/point_level_icon/point_level_icon.lib.php

Spacing +13 added lines, -13 removed lines

@@ -7,24 +7,24 @@ 
 function pointLevelIconTrans($matches)
 {
 	$member_srl = $matches[3];
-	if($member_srl < 1)
+	if ($member_srl < 1)
 	{
 		return $matches[0];
 	}
 
-	$orig_text = preg_replace('/' . preg_quote($matches[5], '/') . '<\/' . $matches[6] . '>$/', '', $matches[0]);
+	$orig_text = preg_replace('/'.preg_quote($matches[5], '/').'<\/'.$matches[6].'>$/', '', $matches[0]);
 
 	// Check Group Image Mark
 	$oMemberModel = getModel('member');
-	if($oMemberModel->getGroupImageMark($member_srl))
+	if ($oMemberModel->getGroupImageMark($member_srl))
 	{
-		return $orig_text . $matches[5] . '</' . $matches[6] . '>';
+		return $orig_text.$matches[5].'</'.$matches[6].'>';
 	}
 
-	if(!isset($GLOBALS['_pointLevelIcon'][$member_srl]))
+	if (!isset($GLOBALS['_pointLevelIcon'][$member_srl]))
 	{
 		// Get point configuration
-		if(!$GLOBALS['_pointConfig'])
+		if (!$GLOBALS['_pointConfig'])
 		{
 			$oModuleModel = getModel('module');
 			$GLOBALS['_pointConfig'] = $oModuleModel->getModuleConfig('point');
@@ -32,14 +32,14 @@ 
 		$config = $GLOBALS['_pointConfig'];
 
 		// Get point model
-		if(!$GLOBALS['_pointModel'])
+		if (!$GLOBALS['_pointModel'])
 		{
 			$GLOBALS['_pointModel'] = getModel('point');
 		}
 		$oPointModel = &$GLOBALS['_pointModel'];
 
 		// Get points
-		if(!$oPointModel->isExistsPoint($member_srl))
+		if (!$oPointModel->isExistsPoint($member_srl))
 		{
 			return $matches[0];
 		}
@@ -55,25 +55,25 @@ 
 
 		// Get per to go to the next level if not a top level
 		$per = NULL;
-		if($level < $config->max_level)
+		if ($level < $config->max_level)
 		{
 			$next_point = $config->level_step[$level + 1];
 			$present_point = $config->level_step[$level];
-			if($next_point > 0)
+			if ($next_point > 0)
 			{
 				$per = (int) (($point - $present_point) / ($next_point - $present_point) * 100);
-				$per = $per . '%';
+				$per = $per.'%';
 			}
 		}
 
-		$title = sprintf('%s:%s%s%s, %s:%s/%s', Context::getLang('point'), $point, $config->point_name, $per ? ' (' . $per . ')' : '', Context::getLang('level'), $level, $config->max_level);
+		$title = sprintf('%s:%s%s%s, %s:%s/%s', Context::getLang('point'), $point, $config->point_name, $per ? ' ('.$per.')' : '', Context::getLang('level'), $level, $config->max_level);
 		$alt = sprintf('[%s:%s]', Context::getLang('level'), $level);
 
 		$GLOBALS['_pointLevelIcon'][$member_srl] = sprintf('<img src="%s" alt="%s" title="%s" class="xe_point_level_icon" style="vertical-align:middle;margin-right:3px;" />', $level_icon, $alt, $title);
 	}
 	$text = $GLOBALS['_pointLevelIcon'][$member_srl];
 
-	return $orig_text . $text . $matches[5] . '</' . $matches[6] . '>';
+	return $orig_text.$text.$matches[5].'</'.$matches[6].'>';
 }
 
 /* End of file point_level_icon.lib.php */

modules/communication/communication.admin.view.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 		Context::set('group_list', $group_list);
 
 		// specify a template
-		$this->setTemplatePath($this->module_path . 'tpl');
+		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile('index');
 	}
 

modules/addon/addon.controller.php

Spacing +22 added lines, -22 removed lines

@@ -26,7 +26,7 @@ 
 	function getCacheFilePath($type = "pc")
 	{
 		static $addon_file;
-		if(isset($addon_file))
+		if (isset($addon_file))
 		{
 			return $addon_file;
 		}
@@ -34,10 +34,10 @@ 
 		$site_module_info = Context::get('site_module_info');
 		$site_srl = $site_module_info->site_srl;
 
-		$addon_path = _XE_PATH_ . 'files/cache/addons/';
-		$addon_file = $addon_path . $site_srl . $type . '.acivated_addons.cache.php';
+		$addon_path = _XE_PATH_.'files/cache/addons/';
+		$addon_file = $addon_path.$site_srl.$type.'.acivated_addons.cache.php';
 
-		if($this->addon_file_called)
+		if ($this->addon_file_called)
 		{
 			return $addon_file;
 		}
@@ -46,7 +46,7 @@ 
 
 		FileHandler::makeDir($addon_path);
 
-		if(!file_exists($addon_file))
+		if (!file_exists($addon_file))
 		{
 			$this->makeCacheFile($site_srl, $type);
 		}
@@ -82,30 +82,30 @@ 
 		$buff = array('<?php if(!defined("__XE__")) exit();', '$_m = Context::get(\'mid\');');
 		$oAddonModel = getAdminModel('addon');
 		$addon_list = $oAddonModel->getInsertedAddons($site_srl, $gtype);
-		foreach($addon_list as $addon => $val)
+		foreach ($addon_list as $addon => $val)
 		{
-			if($val->addon == "smartphone"
+			if ($val->addon == "smartphone"
 				|| ($type == "pc" && $val->is_used != 'Y') 
 				|| ($type == "mobile" && $val->is_used_m != 'Y') 
 				|| ($gtype == 'global' && $val->is_fixed != 'Y')
-				|| !is_dir(_XE_PATH_ . 'addons/' . $addon))
+				|| !is_dir(_XE_PATH_.'addons/'.$addon))
 			{
 				continue;
 			}
 
 			$extra_vars = unserialize($val->extra_vars);
 			$mid_list = $extra_vars->mid_list;
-			if(!is_array($mid_list) || count($mid_list) < 1)
+			if (!is_array($mid_list) || count($mid_list) < 1)
 			{
 				$mid_list = NULL;
 			}
 
 			$buff[] = '$before_time = microtime(true);';
-			$buff[] = '$rm = \'' . $extra_vars->xe_run_method . "';";
+			$buff[] = '$rm = \''.$extra_vars->xe_run_method."';";
 			$buff[] = '$ml = array(';
-			if($mid_list)
+			if ($mid_list)
 			{
-				foreach($mid_list as $mid)
+				foreach ($mid_list as $mid)
 				{
 					$buff[] = "'$mid' => 1,";
 				}
@@ -113,7 +113,7 @@ 
 			$buff[] = ');';
 			$buff[] = sprintf('$addon_file = \'./addons/%s/%s.addon.php\';', $addon, $addon);
 
-			if($val->extra_vars)
+			if ($val->extra_vars)
 			{
 				unset($extra_vars);
 				$extra_vars = base64_encode($val->extra_vars);
@@ -131,13 +131,13 @@ 
 			$buff[] = '$after_time = microtime(true);';
 			$buff[] = '$addon_time_log = new stdClass();';
 			$buff[] = '$addon_time_log->caller = $called_position;';
-			$buff[] = '$addon_time_log->called = "' . $addon . '";';
-			$buff[] = '$addon_time_log->called_extension = "' . $addon . '";';
+			$buff[] = '$addon_time_log->called = "'.$addon.'";';
+			$buff[] = '$addon_time_log->called_extension = "'.$addon.'";';
 			$buff[] = 'writeSlowlog("addon",$after_time-$before_time,$addon_time_log);';
 		}
-		$addon_path = _XE_PATH_ . 'files/cache/addons/';
+		$addon_path = _XE_PATH_.'files/cache/addons/';
 		FileHandler::makeDir($addon_path);
-		$addon_file = $addon_path . ($gtype == 'site' ? $site_srl : '') . $type . '.acivated_addons.cache.php';
+		$addon_file = $addon_path.($gtype == 'site' ? $site_srl : '').$type.'.acivated_addons.cache.php';
 		FileHandler::writeFile($addon_file, join(PHP_EOL, $buff));
 	}
 
@@ -152,7 +152,7 @@ 
 	 */
 	function doSetup($addon, $extra_vars, $site_srl = 0, $gtype = 'site')
 	{
-		if(!is_array($extra_vars->mid_list))
+		if (!is_array($extra_vars->mid_list))
 		{
 			unset($extra_vars->mid_list);
 		}
@@ -160,7 +160,7 @@ 
 		$args = new stdClass();
 		$args->addon = $addon;
 		$args->extra_vars = serialize($extra_vars);
-		if($gtype == 'global')
+		if ($gtype == 'global')
 		{
 			return executeQuery('addon.updateAddon', $args);
 		}
@@ -176,9 +176,9 @@ 
 	 */
 	function removeAddonConfig($site_srl)
 	{
-		$addon_path = _XE_PATH_ . 'files/cache/addons/';
-		$addon_file = $addon_path . $site_srl . '.acivated_addons.cache.php';
-		if(file_exists($addon_file))
+		$addon_path = _XE_PATH_.'files/cache/addons/';
+		$addon_file = $addon_path.$site_srl.'.acivated_addons.cache.php';
+		if (file_exists($addon_file))
 		{
 			FileHandler::removeFile($addon_file);
 		}

Doc Comments +1 added lines, -1 removed lines

@@ -145,7 +145,7 @@
 	 * Save setup
 	 *
 	 * @param string $addon Addon name
-	 * @param object $extra_vars Extra variables
+	 * @param BaseObject $extra_vars Extra variables
 	 * @param int $site_srl Site srl
 	 * @param string $gtype site or global
 	 * @return BaseObject