xpressengine / xe-core

classes/editor/EditorHandler.class.php

Spacing +2 added lines, -2 removed lines

@@ -20,12 +20,12 @@
 	{
 		Context::set('component_info', $info);
 
-		if(!$info->extra_vars)
+		if (!$info->extra_vars)
 		{
 			return;
 		}
 
-		foreach($info->extra_vars as $key => $val)
+		foreach ($info->extra_vars as $key => $val)
 		{
 			$this->{$key} = trim($val->value);
 		}

classes/extravar/Extravar.class.php

Braces +7 added lines, -14 removed lines

@@ -215,12 +215,10 @@ 
 				if(is_array($value))
 				{
 					$values = $value;
-				}
-				elseif(strpos($value, '|@|') !== FALSE)
+				} elseif(strpos($value, '|@|') !== FALSE)
 				{
 					$values = explode('|@|', $value);
-				}
-				elseif(strpos($value, ',') !== FALSE)
+				} elseif(strpos($value, ',') !== FALSE)
 				{
 					$values = explode(',', $value);
 				}
@@ -238,16 +236,13 @@ 
 				if(is_array($value))
 				{
 					$values = $value;
-				}
-				elseif(strpos($value, '|@|') !== FALSE)
+				} elseif(strpos($value, '|@|') !== FALSE)
 				{
 					$values = explode('|@|', $value);
-				}
-				elseif(strpos($value, ',') !== FALSE)
+				} elseif(strpos($value, ',') !== FALSE)
 				{
 					$values = explode(',', $value);
-				}
-				else
+				} else
 				{
 					$values = array($value);
 				}
@@ -263,12 +258,10 @@ 
 				if(is_array($value))
 				{
 					$values = $value;
-				}
-				elseif(strpos($value, '|@|') !== false)
+				} elseif(strpos($value, '|@|') !== false)
 				{
 					$values = explode('|@|', $value);
-				}
-				else
+				} else
 				{
 					$values = array($value);
 				}

Spacing +65 added lines, -65 removed lines

@@ -51,12 +51,12 @@ 
 	 */
 	function setExtraVarKeys($extra_keys)
 	{
-		if(!is_array($extra_keys) || count($extra_keys) < 1)
+		if (!is_array($extra_keys) || count($extra_keys) < 1)
 		{
 			return;
 		}
 
-		foreach($extra_keys as $val)
+		foreach ($extra_keys as $val)
 		{
 			$obj = new ExtraItem($val->module_srl, $val->idx, $val->name, $val->type, $val->default, $val->desc, $val->is_required, $val->search, $val->value, $val->eid);
 			$this->keys[$val->idx] = $obj;
@@ -159,7 +159,7 @@ 
 	 */
 	function ExtraItem($module_srl, $idx, $name, $type = 'text', $default = null, $desc = '', $is_required = 'N', $search = 'N', $value = null, $eid = '')
 	{
-		if(!$idx)
+		if (!$idx)
 		{
 			return;
 		}
@@ -197,36 +197,36 @@ 
 	function _getTypeValue($type, $value)
 	{
 		$value = trim($value);
-		if(!isset($value))
+		if (!isset($value))
 		{
 			return;
 		}
 
-		switch($type)
+		switch ($type)
 		{
 			case 'homepage' :
-				if($value && !preg_match('/^([a-z]+):\/\//i', $value))
+				if ($value && !preg_match('/^([a-z]+):\/\//i', $value))
 				{
-					$value = 'http://' . $value;
+					$value = 'http://'.$value;
 				}
 				return htmlspecialchars($value, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 
 			case 'tel' :
-				if(is_array($value))
+				if (is_array($value))
 				{
 					$values = $value;
 				}
-				elseif(strpos($value, '|@|') !== FALSE)
+				elseif (strpos($value, '|@|') !== FALSE)
 				{
 					$values = explode('|@|', $value);
 				}
-				elseif(strpos($value, ',') !== FALSE)
+				elseif (strpos($value, ',') !== FALSE)
 				{
 					$values = explode(',', $value);
 				}
 
 				$values = array_values($values);
-				for($i = 0, $c = count($values); $i < $c; $i++)
+				for ($i = 0, $c = count($values); $i < $c; $i++)
 				{
 					$values[$i] = trim(htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 				}
@@ -235,15 +235,15 @@ 
 			case 'checkbox' :
 			case 'radio' :
 			case 'select' :
-				if(is_array($value))
+				if (is_array($value))
 				{
 					$values = $value;
 				}
-				elseif(strpos($value, '|@|') !== FALSE)
+				elseif (strpos($value, '|@|') !== FALSE)
 				{
 					$values = explode('|@|', $value);
 				}
-				elseif(strpos($value, ',') !== FALSE)
+				elseif (strpos($value, ',') !== FALSE)
 				{
 					$values = explode(',', $value);
 				}
@@ -253,18 +253,18 @@ 
 				}
 
 				$values = array_values($values);
-				for($i = 0, $c = count($values); $i < $c; $i++)
+				for ($i = 0, $c = count($values); $i < $c; $i++)
 				{
 					$values[$i] = trim(htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 				}
 				return $values;
 
 			case 'kr_zip' :
-				if(is_array($value))
+				if (is_array($value))
 				{
 					$values = $value;
 				}
-				elseif(strpos($value, '|@|') !== false)
+				elseif (strpos($value, '|@|') !== false)
 				{
 					$values = explode('|@|', $value);
 				}
@@ -274,7 +274,7 @@ 
 				}
 
 				$values = array_values($values);
-				for($i = 0, $c = count($values); $i < $c; $i++)
+				for ($i = 0, $c = count($values); $i < $c; $i++)
 				{
 					$values[$i] = trim(htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 				}
@@ -308,10 +308,10 @@ 
 	{
 		$value = $this->_getTypeValue($this->type, $this->value);
 
-		switch($this->type)
+		switch ($this->type)
 		{
 			case 'homepage' :
-				return ($value) ? (sprintf('<a href="%s" target="_blank">%s</a>', $value, strlen($value) > 60 ? substr($value, 0, 40) . '...' . substr($value, -10) : $value)) : "";
+				return ($value) ? (sprintf('<a href="%s" target="_blank">%s</a>', $value, strlen($value) > 60 ? substr($value, 0, 40).'...'.substr($value, -10) : $value)) : "";
 
 			case 'email_address' :
 				return ($value) ? sprintf('<a href="mailto:%s">%s</a>', $value, $value) : "";
@@ -328,14 +328,14 @@ 
 			case 'checkbox' :
 			case 'select' :
 			case 'radio' :
-				if(is_array($value))
+				if (is_array($value))
 				{
 					return implode(',', $value);
 				}
 				return $value;
 
 			case 'kr_zip' :
-				if(is_array($value))
+				if (is_array($value))
 				{
 					return implode(' ', $value);
 				}
@@ -360,77 +360,77 @@ 
 		$name = $this->name;
 		$value = $this->_getTypeValue($this->type, $this->value);
 		$default = $this->_getTypeValue($this->type, $this->default);
-		$column_name = 'extra_vars' . $this->idx;
-		$tmp_id = $column_name . '-' . $id_num++;
+		$column_name = 'extra_vars'.$this->idx;
+		$tmp_id = $column_name.'-'.$id_num++;
 
 		$buff = array();
-		switch($type)
+		switch ($type)
 		{
 			// Homepage
 			case 'homepage' :
-				$buff[] = '<input type="text" name="' . $column_name . '" value="' . $value . '" class="homepage" />';
+				$buff[] = '<input type="text" name="'.$column_name.'" value="'.$value.'" class="homepage" />';
 				break;
 			// Email Address
 			case 'email_address' :
-				$buff[] = '<input type="text" name="' . $column_name . '" value="' . $value . '" class="email_address" />';
+				$buff[] = '<input type="text" name="'.$column_name.'" value="'.$value.'" class="email_address" />';
 				break;
 			// Phone Number
 			case 'tel' :
-				$buff[] = '<input type="text" name="' . $column_name . '[]" value="' . $value[0] . '" size="4" maxlength="4" class="tel" />';
-				$buff[] = '<input type="text" name="' . $column_name . '[]" value="' . $value[1] . '" size="4" maxlength="4" class="tel" />';
-				$buff[] = '<input type="text" name="' . $column_name . '[]" value="' . $value[2] . '" size="4" maxlength="4" class="tel" />';
+				$buff[] = '<input type="text" name="'.$column_name.'[]" value="'.$value[0].'" size="4" maxlength="4" class="tel" />';
+				$buff[] = '<input type="text" name="'.$column_name.'[]" value="'.$value[1].'" size="4" maxlength="4" class="tel" />';
+				$buff[] = '<input type="text" name="'.$column_name.'[]" value="'.$value[2].'" size="4" maxlength="4" class="tel" />';
 				break;
 			// textarea
 			case 'textarea' :
-				$buff[] = '<textarea name="' . $column_name . '" rows="8" cols="42">' . $value . '</textarea>';
+				$buff[] = '<textarea name="'.$column_name.'" rows="8" cols="42">'.$value.'</textarea>';
 				break;
 			// multiple choice
 			case 'checkbox' :
 				$buff[] = '<ul>';
-				foreach($default as $v)
+				foreach ($default as $v)
 				{
 					$checked = '';
-					if($value && in_array(trim($v), $value))
+					if ($value && in_array(trim($v), $value))
 					{
 						$checked = ' checked="checked"';
 					}
 
 					// Temporary ID for labeling
-					$tmp_id = $column_name . '-' . $id_num++;
+					$tmp_id = $column_name.'-'.$id_num++;
 
-					$buff[] ='  <li><input type="checkbox" name="' . $column_name . '[]" id="' . $tmp_id . '" value="' . htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . '" ' . $checked . ' /><label for="' . $tmp_id . '">' . $v . '</label></li>';
+					$buff[] = '  <li><input type="checkbox" name="'.$column_name.'[]" id="'.$tmp_id.'" value="'.htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', false).'" '.$checked.' /><label for="'.$tmp_id.'">'.$v.'</label></li>';
 				}
 				$buff[] = '</ul>';
 				break;
 			// single choice
 			case 'select' :
-				$buff[] = '<select name="' . $column_name . '" class="select">';
-				foreach($default as $v)
+				$buff[] = '<select name="'.$column_name.'" class="select">';
+				foreach ($default as $v)
 				{
 					$selected = '';
-					if($value && in_array(trim($v), $value))
+					if ($value && in_array(trim($v), $value))
 					{
 						$selected = ' selected="selected"';
 					}
-					$buff[] = '  <option value="' . $v . '" ' . $selected . '>' . $v . '</option>';
+					$buff[] = '  <option value="'.$v.'" '.$selected.'>'.$v.'</option>';
 				}
 				$buff[] = '</select>';
 				break;
 			// radio
 			case 'radio' :
 				$buff[] = '<ul>';
-				foreach($default as $v)
+				foreach ($default as $v)
 				{
 					$checked = '';
-					if($value && in_array(trim($v), $value))
+					if ($value && in_array(trim($v), $value))
 					{
 						$checked = ' checked="checked"';
 					}
 
 					// Temporary ID for labeling
-					$tmp_id = $column_name . '-' . $id_num++;
+					$tmp_id = $column_name.'-'.$id_num++;
 
-					$buff[] = '<li><input type="radio" name="' . $column_name . '" id="' . $tmp_id . '" ' . $checked . ' value="' . $v . '"  class="radio" /><label for="' . $tmp_id . '">' . $v . '</label></li>';
+					$buff[] = '<li><input type="radio" name="'.$column_name.'" id="'.$tmp_id.'" '.$checked.' value="'.$v.'"  class="radio" /><label for="'.$tmp_id.'">'.$v.'</label></li>';
 				}
 				$buff[] = '</ul>';
 				break;
@@ -439,43 +439,43 @@ 
 				// datepicker javascript plugin load
 				Context::loadJavascriptPlugin('ui.datepicker');
 
-				$buff[] = '<input type="hidden" name="' . $column_name . '" value="' . $value . '" />'; 
-				$buff[] =	'<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" />';
-				$buff[] =	'<input type="button" value="' . Context::getLang('cmd_delete') . '" class="btn" id="dateRemover_' . $column_name . '" />';
-				$buff[] =	'<script type="text/javascript">';
+				$buff[] = '<input type="hidden" name="'.$column_name.'" value="'.$value.'" />'; 
+				$buff[] = '<input type="text" id="date_'.$column_name.'" value="'.zdate($value, 'Y-m-d').'" class="date" />';
+				$buff[] = '<input type="button" value="'.Context::getLang('cmd_delete').'" class="btn" id="dateRemover_'.$column_name.'" />';
+				$buff[] = '<script type="text/javascript">';
 				$buff[] = '//<![CDATA[';
-				$buff[] =	'(function($){';
-				$buff[] =	'$(function(){';
-				$buff[] =	'  var option = { dateFormat: "yy-mm-dd", changeMonth:true, changeYear:true, gotoCurrent:false, yearRange:\'-100:+10\', onSelect:function(){';
-				$buff[] =	'    $(this).prev(\'input[type="hidden"]\').val(this.value.replace(/-/g,""))}';
-				$buff[] =	'  };';
-				$buff[] =	'  $.extend(option,$.datepicker.regional[\'' . Context::getLangType() . '\']);';
-				$buff[] =	'  $("#date_' . $column_name . '").datepicker(option);';
-				$buff[] =	'  $("#dateRemover_' . $column_name . '").click(function(){';
-				$buff[] =	'    $(this).siblings("input").val("");';
-				$buff[] =	'    return false;';
-				$buff[] =	'  })';
-				$buff[] =	'});';
-				$buff[] =	'})(jQuery);';
+				$buff[] = '(function($){';
+				$buff[] = '$(function(){';
+				$buff[] = '  var option = { dateFormat: "yy-mm-dd", changeMonth:true, changeYear:true, gotoCurrent:false, yearRange:\'-100:+10\', onSelect:function(){';
+				$buff[] = '    $(this).prev(\'input[type="hidden"]\').val(this.value.replace(/-/g,""))}';
+				$buff[] = '  };';
+				$buff[] = '  $.extend(option,$.datepicker.regional[\''.Context::getLangType().'\']);';
+				$buff[] = '  $("#date_'.$column_name.'").datepicker(option);';
+				$buff[] = '  $("#dateRemover_'.$column_name.'").click(function(){';
+				$buff[] = '    $(this).siblings("input").val("");';
+				$buff[] = '    return false;';
+				$buff[] = '  })';
+				$buff[] = '});';
+				$buff[] = '})(jQuery);';
 				$buff[] = '//]]>';
 				$buff[] = '</script>';
 				break;
 			// address
 			case "kr_zip" :
-				if(($oKrzipModel = getModel('krzip')) && method_exists($oKrzipModel , 'getKrzipCodeSearchHtml' ))
+				if (($oKrzipModel = getModel('krzip')) && method_exists($oKrzipModel, 'getKrzipCodeSearchHtml'))
 				{
-					$buff[] =  $oKrzipModel->getKrzipCodeSearchHtml($column_name, $value);
+					$buff[] = $oKrzipModel->getKrzipCodeSearchHtml($column_name, $value);
 				}
 				break;
 			// General text
 			default :
-				$buff[] =' <input type="text" name="' . $column_name . '" value="' . ($value ? $value : $default) . '" class="text" />';
+				$buff[] = ' <input type="text" name="'.$column_name.'" value="'.($value ? $value : $default).'" class="text" />';
 		}
-		if($this->desc)
+		if ($this->desc)
 		{
 			$oModuleController = getController('module');
 			$oModuleController->replaceDefinedLangCode($this->desc);
-			$buff[] = '<p>' . htmlspecialchars($this->desc, ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . '</p>';
+			$buff[] = '<p>'.htmlspecialchars($this->desc, ENT_COMPAT | ENT_HTML401, 'UTF-8', false).'</p>';
 		}
 		
 		return join(PHP_EOL, $buff);

classes/file/FileObject.class.php

Spacing +8 added lines, -8 removed lines

@@ -36,7 +36,7 @@ 
 	 */
 	function FileObject($path, $mode)
 	{
-		if($path != NULL)
+		if ($path != NULL)
 		{
 			$this->Open($path, $mode);
 		}
@@ -51,7 +51,7 @@ 
 	function append($file_name)
 	{
 		$target = new FileObject($file_name, "r");
-		while(!$target->feof())
+		while (!$target->feof())
 		{
 			$readstr = $target->read();
 			$this->write($readstr);
@@ -89,11 +89,11 @@ 
 	function write($str)
 	{
 		$len = strlen($str);
-		if(!$str || $len <= 0)
+		if (!$str || $len <= 0)
 		{
 			return FALSE;
 		}
-		if(!$this->fp)
+		if (!$this->fp)
 		{
 			return FALSE;
 		}
@@ -112,12 +112,12 @@ 
 	 */
 	function open($path, $mode)
 	{
-		if($this->fp != NULL)
+		if ($this->fp != NULL)
 		{
 			$this->close();
 		}
 		$this->fp = fopen($path, $mode);
-		if(!is_resource($this->fp))
+		if (!is_resource($this->fp))
 		{
 			$this->fp = NULL;
 			return FALSE;
@@ -133,7 +133,7 @@ 
 	 */
 	function getPath()
 	{
-		if($this->fp != NULL)
+		if ($this->fp != NULL)
 		{
 			return $this->path;
 		}
@@ -150,7 +150,7 @@ 
 	 */
 	function close()
 	{
-		if($this->fp != NULL)
+		if ($this->fp != NULL)
 		{
 			fclose($this->fp);
 			$this->fp = NULL;

Braces +1 added lines, -2 removed lines

@@ -136,8 +136,7 @@
 		if($this->fp != NULL)
 		{
 			return $this->path;
-		}
-		else
+		} else
 		{
 			return NULL;
 		}

classes/page/PageHandler.class.php

Spacing +5 added lines, -5 removed lines

@@ -39,18 +39,18 @@ 
 		$this->point = 0;
 
 		$first_page = $cur_page - (int) ($page_count / 2);
-		if($first_page < 1)
+		if ($first_page < 1)
 		{
 			$first_page = 1;
 		}
 
-		if($total_page > $page_count && $first_page + $page_count - 1 > $total_page)
+		if ($total_page > $page_count && $first_page + $page_count - 1 > $total_page)
 		{
 			$first_page -= $first_page + $page_count - 1 - $total_page;
 		}
 
 		$last_page = $total_page;
-		if($last_page > $total_page)
+		if ($last_page > $total_page)
 		{
 			$last_page = $total_page;
 		}
@@ -58,7 +58,7 @@ 
 		$this->first_page = $first_page;
 		$this->last_page = $last_page;
 
-		if($total_page < $this->page_count)
+		if ($total_page < $this->page_count)
 		{
 			$this->page_count = $total_page;
 		}
@@ -71,7 +71,7 @@ 
 	function getNextPage()
 	{
 		$page = $this->first_page + $this->point++;
-		if($this->point > $this->page_count || $page > $this->last_page)
+		if ($this->point > $this->page_count || $page > $this->last_page)
 		{
 			$page = 0;
 		}

classes/security/IpFilter.class.php

Spacing +10 added lines, -10 removed lines

@@ -5,24 +5,24 @@ 
 {
 	public function filter($ip_list, $ip = NULL)
 	{
-		if(!$ip) $ip = $_SERVER['REMOTE_ADDR'];
+		if (!$ip) $ip = $_SERVER['REMOTE_ADDR'];
 		$long_ip = ip2long($ip);
-		foreach($ip_list as $filter_ip)
+		foreach ($ip_list as $filter_ip)
 		{	
 			$range = explode('-', $filter_ip);
-			if(!$range[1]) // single address type
+			if (!$range[1]) // single address type
 			{
 				$star_pos = strpos($filter_ip, '*');
-				if($star_pos !== FALSE ) // wild card exist 
+				if ($star_pos !== FALSE) // wild card exist 
 				{
-					if(strncmp($filter_ip, $ip, $star_pos)===0) return true;
+					if (strncmp($filter_ip, $ip, $star_pos) === 0) return true;
 				}
-				else if(strcmp($filter_ip, $ip)===0)
+				else if (strcmp($filter_ip, $ip) === 0)
 				{
 					return true;
 				}
 			}
-			else if(ip2long($range[0]) <= $long_ip && ip2long($range[1]) >= $long_ip)
+			else if (ip2long($range[0]) <= $long_ip && ip2long($range[1]) >= $long_ip)
 			{
 				return true;
 			}
@@ -74,12 +74,12 @@ 
 					)
 				)
 			$/";
-		$regex = str_replace(array("\r\n", "\n", "\r","\t"," "), '', $regex);
+		$regex = str_replace(array("\r\n", "\n", "\r", "\t", " "), '', $regex);
 		
-		foreach($ip_list as $i => $ip)
+		foreach ($ip_list as $i => $ip)
 		{
 			preg_match($regex, $ip, $matches);
-			if(!count($matches)) return false;
+			if (!count($matches)) return false;
 		}
 		
 		return true;

Braces +13 added lines, -7 removed lines

@@ -5,24 +5,28 @@ 
 {
 	public function filter($ip_list, $ip = NULL)
 	{
-		if(!$ip) $ip = $_SERVER['REMOTE_ADDR'];
+		if(!$ip) {
+			$ip = $_SERVER['REMOTE_ADDR'];
+		}
 		$long_ip = ip2long($ip);
 		foreach($ip_list as $filter_ip)
 		{	
 			$range = explode('-', $filter_ip);
-			if(!$range[1]) // single address type
+			if(!$range[1]) {
+				// single address type
 			{
 				$star_pos = strpos($filter_ip, '*');
-				if($star_pos !== FALSE ) // wild card exist 
+			}
+				if($star_pos !== FALSE ) {
+					// wild card exist 
 				{
 					if(strncmp($filter_ip, $ip, $star_pos)===0) return true;
 				}
-				else if(strcmp($filter_ip, $ip)===0)
+				} else if(strcmp($filter_ip, $ip)===0)
 				{
 					return true;
 				}
-			}
-			else if(ip2long($range[0]) <= $long_ip && ip2long($range[1]) >= $long_ip)
+			} else if(ip2long($range[0]) <= $long_ip && ip2long($range[1]) >= $long_ip)
 			{
 				return true;
 			}
@@ -79,7 +83,9 @@ 
 		foreach($ip_list as $i => $ip)
 		{
 			preg_match($regex, $ip, $matches);
-			if(!count($matches)) return false;
+			if(!count($matches)) {
+				return false;
+			}
 		}
 		
 		return true;

classes/security/Password.class.php

Braces +17 added lines, -29 removed lines

@@ -55,8 +55,7 @@ 
 			{
 				$algorithm = 'md5';  // Historical default for XE
 			}
-		}
-		else
+		} else
 		{
 			$algorithm = 'md5';
 		}
@@ -77,8 +76,7 @@ 
 			{
 				$work_factor = 8;  // Reasonable default
 			}
-		}
-		else
+		} else
 		{
 			$work_factor = 8;
 		}
@@ -176,24 +174,19 @@ 
 		if(preg_match('/^\$2[axy]\$([0-9]{2})\$/', $hash, $matches))
 		{
 			return 'bcrypt';
-		}
-		elseif(preg_match('/^sha[0-9]+:([0-9]+):/', $hash, $matches))
+		} elseif(preg_match('/^sha[0-9]+:([0-9]+):/', $hash, $matches))
 		{
 			return 'pbkdf2';
-		}
-		elseif(strlen($hash) === 32 && ctype_xdigit($hash))
+		} elseif(strlen($hash) === 32 && ctype_xdigit($hash))
 		{
 			return 'md5';
-		}
-		elseif(strlen($hash) === 16 && ctype_xdigit($hash))
+		} elseif(strlen($hash) === 16 && ctype_xdigit($hash))
 		{
 			return 'mysql_old_password';
-		}
-		elseif(strlen($hash) === 41 && $hash[0] === '*')
+		} elseif(strlen($hash) === 41 && $hash[0] === '*')
 		{
 			return 'mysql_password';
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -209,12 +202,10 @@ 
 		if(preg_match('/^\$2[axy]\$([0-9]{2})\$/', $hash, $matches))
 		{
 			return intval($matches[1], 10);
-		}
-		elseif(preg_match('/^sha[0-9]+:([0-9]+):/', $hash, $matches))
+		} elseif(preg_match('/^sha[0-9]+:([0-9]+):/', $hash, $matches))
 		{
 			return max(0, round(log($matches[1], 2)) - 5);
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -250,22 +241,18 @@ 
 		if(function_exists('openssl_random_pseudo_bytes') && (!$is_windows || version_compare(PHP_VERSION, '5.4', '>=')))
 		{
 			$entropy = openssl_random_pseudo_bytes($entropy_capped_bytes);
-		}
-		elseif(function_exists('mcrypt_create_iv') && (!$is_windows || version_compare(PHP_VERSION, '5.3.7', '>=')))
+		} elseif(function_exists('mcrypt_create_iv') && (!$is_windows || version_compare(PHP_VERSION, '5.3.7', '>=')))
 		{
 			$entropy = mcrypt_create_iv($entropy_capped_bytes, MCRYPT_DEV_URANDOM);
-		}
-		elseif(function_exists('mcrypt_create_iv') && $is_windows)
+		} elseif(function_exists('mcrypt_create_iv') && $is_windows)
 		{
 			$entropy = mcrypt_create_iv($entropy_capped_bytes, MCRYPT_RAND);
-		}
-		elseif(!$is_windows && @is_readable('/dev/urandom'))
+		} elseif(!$is_windows && @is_readable('/dev/urandom'))
 		{
 			$fp = fopen('/dev/urandom', 'rb');
 			$entropy = fread($fp, $entropy_capped_bytes);
 			fclose($fp);
-		}
-		else
+		} else
 		{
 			$entropy = '';
 			for($i = 0; $i < $entropy_capped_bytes; $i += 2)
@@ -341,8 +328,7 @@ 
 		if(function_exists('hash_pbkdf2'))
 		{
 			return hash_pbkdf2($algorithm, $password, $salt, $iterations, $length, true);
-		}
-		else
+		} else
 		{
 			$output = '';
 			$block_count = ceil($length / strlen(hash($algorithm, '', true)));  // key length divided by the length of one hash
@@ -350,10 +336,12 @@ 
 			{
 				$last = $salt . pack('N', $i);  // $i encoded as 4 bytes, big endian
 				$last = $xorsum = hash_hmac($algorithm, $last, $password, true);  // first iteration
-				for($j = 1; $j < $iterations; $j++)  // The other $count - 1 iterations
+				for($j = 1; $j < $iterations; $j++) {
+					// The other $count - 1 iterations
 				{
 					$xorsum ^= ($last = hash_hmac($algorithm, $last, $password, true));
 				}
+				}
 				$output .= $xorsum;
 			}
 			return substr($output, 0, $length);

Spacing +46 added lines, -46 removed lines

@@ -19,11 +19,11 @@ 
 	public function getSupportedAlgorithms()
 	{
 		$retval = array();
-		if(function_exists('hash_hmac') && in_array('sha256', hash_algos()))
+		if (function_exists('hash_hmac') && in_array('sha256', hash_algos()))
 		{
 			$retval['pbkdf2'] = 'pbkdf2';
 		}
-		if(version_compare(PHP_VERSION, '5.3.7', '>=') && defined('CRYPT_BLOWFISH'))
+		if (version_compare(PHP_VERSION, '5.3.7', '>=') && defined('CRYPT_BLOWFISH'))
 		{
 			$retval['bcrypt'] = 'bcrypt';
 		}
@@ -47,13 +47,13 @@ 
 	 */
 	public function getCurrentlySelectedAlgorithm()
 	{
-		if(function_exists('getModel'))
+		if (function_exists('getModel'))
 		{
 			$config = getModel('member')->getMemberConfig();
 			$algorithm = $config->password_hashing_algorithm;
-			if(strval($algorithm) === '')
+			if (strval($algorithm) === '')
 			{
-				$algorithm = 'md5';  // Historical default for XE
+				$algorithm = 'md5'; // Historical default for XE
 			}
 		}
 		else
@@ -69,13 +69,13 @@ 
 	 */
 	public function getWorkFactor()
 	{
-		if(function_exists('getModel'))
+		if (function_exists('getModel'))
 		{
 			$config = getModel('member')->getMemberConfig();
 			$work_factor = $config->password_hashing_work_factor;
-			if(!$work_factor || $work_factor < 4 || $work_factor > 31)
+			if (!$work_factor || $work_factor < 4 || $work_factor > 31)
 			{
-				$work_factor = 8;  // Reasonable default
+				$work_factor = 8; // Reasonable default
 			}
 		}
 		else
@@ -93,18 +93,18 @@ 
 	 */
 	public function createHash($password, $algorithm = null)
 	{
-		if($algorithm === null)
+		if ($algorithm === null)
 		{
 			$algorithm = $this->getCurrentlySelectedAlgorithm();
 		}
-		if(!array_key_exists($algorithm, $this->getSupportedAlgorithms()))
+		if (!array_key_exists($algorithm, $this->getSupportedAlgorithms()))
 		{
 			return false;
 		}
 
 		$password = trim($password);
 
-		switch($algorithm)
+		switch ($algorithm)
 		{
 			case 'md5':
 				return md5($password);
@@ -132,14 +132,14 @@ 
 	 */
 	public function checkPassword($password, $hash, $algorithm = null)
 	{
-		if($algorithm === null)
+		if ($algorithm === null)
 		{
 			$algorithm = $this->checkAlgorithm($hash);
 		}
 
 		$password = trim($password);
 
-		switch($algorithm)
+		switch ($algorithm)
 		{
 			case 'md5':
 				return md5($password) === $hash || md5(sha1(md5($password))) === $hash;
@@ -173,23 +173,23 @@ 
 	 */
 	function checkAlgorithm($hash)
 	{
-		if(preg_match('/^\$2[axy]\$([0-9]{2})\$/', $hash, $matches))
+		if (preg_match('/^\$2[axy]\$([0-9]{2})\$/', $hash, $matches))
 		{
 			return 'bcrypt';
 		}
-		elseif(preg_match('/^sha[0-9]+:([0-9]+):/', $hash, $matches))
+		elseif (preg_match('/^sha[0-9]+:([0-9]+):/', $hash, $matches))
 		{
 			return 'pbkdf2';
 		}
-		elseif(strlen($hash) === 32 && ctype_xdigit($hash))
+		elseif (strlen($hash) === 32 && ctype_xdigit($hash))
 		{
 			return 'md5';
 		}
-		elseif(strlen($hash) === 16 && ctype_xdigit($hash))
+		elseif (strlen($hash) === 16 && ctype_xdigit($hash))
 		{
 			return 'mysql_old_password';
 		}
-		elseif(strlen($hash) === 41 && $hash[0] === '*')
+		elseif (strlen($hash) === 41 && $hash[0] === '*')
 		{
 			return 'mysql_password';
 		}
@@ -206,11 +206,11 @@ 
 	 */
 	function checkWorkFactor($hash)
 	{
-		if(preg_match('/^\$2[axy]\$([0-9]{2})\$/', $hash, $matches))
+		if (preg_match('/^\$2[axy]\$([0-9]{2})\$/', $hash, $matches))
 		{
 			return intval($matches[1], 10);
 		}
-		elseif(preg_match('/^sha[0-9]+:([0-9]+):/', $hash, $matches))
+		elseif (preg_match('/^sha[0-9]+:([0-9]+):/', $hash, $matches))
 		{
 			return max(0, round(log($matches[1], 2)) - 5);
 		}
@@ -229,7 +229,7 @@ 
 	public function createSecureSalt($length, $format = 'hex')
 	{
 		// Find out how many bytes of entropy we really need
-		switch($format)
+		switch ($format)
 		{
 			case 'hex':
 				$entropy_required_bytes = ceil($length / 2);
@@ -247,19 +247,19 @@ 
 
 		// Find and use the most secure way to generate a random string
 		$is_windows = (defined('PHP_OS') && strtoupper(substr(PHP_OS, 0, 3)) === 'WIN');
-		if(function_exists('openssl_random_pseudo_bytes') && (!$is_windows || version_compare(PHP_VERSION, '5.4', '>=')))
+		if (function_exists('openssl_random_pseudo_bytes') && (!$is_windows || version_compare(PHP_VERSION, '5.4', '>=')))
 		{
 			$entropy = openssl_random_pseudo_bytes($entropy_capped_bytes);
 		}
-		elseif(function_exists('mcrypt_create_iv') && (!$is_windows || version_compare(PHP_VERSION, '5.3.7', '>=')))
+		elseif (function_exists('mcrypt_create_iv') && (!$is_windows || version_compare(PHP_VERSION, '5.3.7', '>=')))
 		{
 			$entropy = mcrypt_create_iv($entropy_capped_bytes, MCRYPT_DEV_URANDOM);
 		}
-		elseif(function_exists('mcrypt_create_iv') && $is_windows)
+		elseif (function_exists('mcrypt_create_iv') && $is_windows)
 		{
 			$entropy = mcrypt_create_iv($entropy_capped_bytes, MCRYPT_RAND);
 		}
-		elseif(!$is_windows && @is_readable('/dev/urandom'))
+		elseif (!$is_windows && @is_readable('/dev/urandom'))
 		{
 			$fp = fopen('/dev/urandom', 'rb');
 			$entropy = fread($fp, $entropy_capped_bytes);
@@ -268,7 +268,7 @@ 
 		else
 		{
 			$entropy = '';
-			for($i = 0; $i < $entropy_capped_bytes; $i += 2)
+			for ($i = 0; $i < $entropy_capped_bytes; $i += 2)
 			{
 				$entropy .= pack('S', rand(0, 65536) ^ mt_rand(0, 65535));
 			}
@@ -276,13 +276,13 @@ 
 
 		// Mixing (see RFC 4086 section 5)
 		$output = '';
-		for($i = 0; $i < $entropy_required_bytes; $i += 32)
+		for ($i = 0; $i < $entropy_required_bytes; $i += 32)
 		{
-			$output .= hash('sha256', $entropy . $i . rand(), true);
+			$output .= hash('sha256', $entropy.$i.rand(), true);
 		}
 
 		// Encode and return the random string
-		switch($format)
+		switch ($format)
 		{
 			case 'hex':
 				return substr(bin2hex($output), 0, $length);
@@ -290,15 +290,15 @@ 
 				return substr($output, 0, $length);
 			case 'printable':
 				$salt = '';
-				for($i = 0; $i < $length; $i++)
+				for ($i = 0; $i < $length; $i++)
 				{
-					$salt .= chr(33 + (crc32(sha1($i . $output)) % 94));
+					$salt .= chr(33 + (crc32(sha1($i.$output)) % 94));
 				}
 				return $salt;
 			case 'alnum':
 			default:
 				$salt = substr(base64_encode($output), 0, $length);
-				$replacements = chr(rand(65, 90)) . chr(rand(97, 122)) . rand(0, 9);
+				$replacements = chr(rand(65, 90)).chr(rand(97, 122)).rand(0, 9);
 				return strtr($salt, '+/=', $replacements);
 		}
 	}
@@ -310,15 +310,15 @@ 
 	 */
 	public function createTemporaryPassword($length = 16)
 	{
-		while(true)
+		while (true)
 		{
 			$source = base64_encode($this->createSecureSalt(64, 'binary'));
 			$source = strtr($source, 'iIoOjl10/', '@#$%&*-!?');
 			$source_length = strlen($source);
-			for($i = 0; $i < $source_length - $length; $i++)
+			for ($i = 0; $i < $source_length - $length; $i++)
 			{
 				$candidate = substr($source, $i, $length);
-				if(preg_match('/[a-z]/', $candidate) && preg_match('/[A-Z]/', $candidate) &&
+				if (preg_match('/[a-z]/', $candidate) && preg_match('/[A-Z]/', $candidate) &&
 					preg_match('/[0-9]/', $candidate) && preg_match('/[^a-zA-Z0-9]/', $candidate))
 				{
 					return $candidate;
@@ -337,7 +337,7 @@ 
 		$key = self::getSecretKey();
 		$salt = self::createSecureSalt(8, 'alnum');
 		$hash = substr(base64_encode(hash_hmac('sha256', hash_hmac('sha256', $string, $salt), $key, true)), 0, 32);
-		return $salt . strtr($hash, '+/', '-_');
+		return $salt.strtr($hash, '+/', '-_');
 	}
 	
 	/**
@@ -348,7 +348,7 @@ 
 	 */
 	public static function checkSignature($string, $signature)
 	{
-		if(strlen($signature) !== 40)
+		if (strlen($signature) !== 40)
 		{
 			return false;
 		}
@@ -367,7 +367,7 @@ 
 	{
 		// If the secret key does not exist, the config file needs to be updated
 		$db_info = Context::getDbInfo();
-		if(!isset($db_info->secret_key))
+		if (!isset($db_info->secret_key))
 		{
 			$db_info->secret_key = self::createSecureSalt(48, 'alnum');
 			Context::setDBInfo($db_info);
@@ -387,19 +387,19 @@ 
 	 */
 	public function pbkdf2($password, $salt, $algorithm = 'sha256', $iterations = 8192, $length = 24)
 	{
-		if(function_exists('hash_pbkdf2'))
+		if (function_exists('hash_pbkdf2'))
 		{
 			return hash_pbkdf2($algorithm, $password, $salt, $iterations, $length, true);
 		}
 		else
 		{
 			$output = '';
-			$block_count = ceil($length / strlen(hash($algorithm, '', true)));  // key length divided by the length of one hash
-			for($i = 1; $i <= $block_count; $i++)
+			$block_count = ceil($length / strlen(hash($algorithm, '', true))); // key length divided by the length of one hash
+			for ($i = 1; $i <= $block_count; $i++)
 			{
-				$last = $salt . pack('N', $i);  // $i encoded as 4 bytes, big endian
-				$last = $xorsum = hash_hmac($algorithm, $last, $password, true);  // first iteration
-				for($j = 1; $j < $iterations; $j++)  // The other $count - 1 iterations
+				$last = $salt.pack('N', $i); // $i encoded as 4 bytes, big endian
+				$last = $xorsum = hash_hmac($algorithm, $last, $password, true); // first iteration
+				for ($j = 1; $j < $iterations; $j++)  // The other $count - 1 iterations
 				{
 					$xorsum ^= ($last = hash_hmac($algorithm, $last, $password, true));
 				}
@@ -417,7 +417,7 @@ 
 	 */
 	public function bcrypt($password, $salt = null)
 	{
-		if($salt === null)
+		if ($salt === null)
 		{
 			$salt = '$2y$'.sprintf('%02d', $this->getWorkFactor()).'$'.$this->createSecureSalt(22, 'alnum');
 		}
@@ -434,7 +434,7 @@ 
 	{
 		$diff = strlen($a) ^ strlen($b);
 		$maxlen = min(strlen($a), strlen($b));
-		for($i = 0; $i < $maxlen; $i++)
+		for ($i = 0; $i < $maxlen; $i++)
 		{
 			$diff |= ord($a[$i]) ^ ord($b[$i]);
 		}

classes/security/Security.class.php

Braces +10 added lines, -15 removed lines

@@ -60,12 +60,10 @@ 
 			if($use_context)
 			{
 				$var = Context::get($varName0);
-			}
-			elseif($varName0)
+			} elseif($varName0)
 			{
 				$var = $is_object ? $this->_targetVar->{$varName0} : $this->_targetVar[$varName0];
-			}
-			else
+			} else
 			{
 				$var = $this->_targetVar;
 			}
@@ -79,19 +77,16 @@ 
 			if($use_context)
 			{
 				Context::set($varName0, $var);
-			}
-			elseif($varName0)
+			} elseif($varName0)
 			{
 				if($is_object)
 				{
 					$this->_targetVar->{$varName0} = $var;
-				}
-				else
+				} else
 				{
 					$this->_targetVar[$varName0] = $var;
 				}
-			}
-			else
+			} else
 			{
 				$this->_targetVar = $var;
 			}
@@ -142,8 +137,7 @@ 
 			if($is_object)
 			{
 				$var->{$name0} = $target;
-			}
-			else
+			} else
 			{
 				$var[$name0] = $target;
 			}
@@ -165,8 +159,7 @@ 
 			if($is_object)
 			{
 				$var->{$key} = $target;
-			}
-			else
+			} else
 			{
 				$var[$key] = $target;
 			}
@@ -185,7 +178,9 @@ 
 	 */
 	static function detectingXEE($xml)
 	{
-		if(!$xml) return FALSE;
+		if(!$xml) {
+			return FALSE;
+		}
 
 		if(strpos($xml, '<!ENTITY') !== FALSE)
 		{

Spacing +26 added lines, -26 removed lines

@@ -37,15 +37,15 @@ 
 	function encodeHTML(/* , $varName1, $varName2, ... */)
 	{
 		$varNames = func_get_args();
-		if(count($varNames) < 0)
+		if (count($varNames) < 0)
 		{
 			return FALSE;
 		}
 
 		$use_context = is_null($this->_targetVar);
-		if(!$use_context)
+		if (!$use_context)
 		{
-			if(!count($varNames) || (!is_object($this->_targetVar) && !is_array($this->_targetVar)))
+			if (!count($varNames) || (!is_object($this->_targetVar) && !is_array($this->_targetVar)))
 			{
 				return $this->_encodeHTML($this->_targetVar);
 			}
@@ -53,15 +53,15 @@ 
 			$is_object = is_object($this->_targetVar);
 		}
 
-		foreach($varNames as $varName)
+		foreach ($varNames as $varName)
 		{
 			$varName = explode('.', $varName);
 			$varName0 = array_shift($varName);
-			if($use_context)
+			if ($use_context)
 			{
 				$var = Context::get($varName0);
 			}
-			elseif($varName0)
+			elseif ($varName0)
 			{
 				$var = $is_object ? $this->_targetVar->{$varName0} : $this->_targetVar[$varName0];
 			}
@@ -71,18 +71,18 @@ 
 			}
 			$var = $this->_encodeHTML($var, $varName);
 
-			if($var === FALSE)
+			if ($var === FALSE)
 			{
 				continue;
 			}
 
-			if($use_context)
+			if ($use_context)
 			{
 				Context::set($varName0, $var);
 			}
-			elseif($varName0)
+			elseif ($varName0)
 			{
-				if($is_object)
+				if ($is_object)
 				{
 					$this->_targetVar->{$varName0} = $var;
 				}
@@ -97,7 +97,7 @@ 
 			}
 		}
 
-		if(!$use_context)
+		if (!$use_context)
 		{
 			return $this->_targetVar;
 		}
@@ -111,9 +111,9 @@ 
 	 */
 	function _encodeHTML($var, $name = array())
 	{
-		if(is_string($var))
+		if (is_string($var))
 		{
-			if(strncmp('$user_lang->', $var, 12) !== 0)
+			if (strncmp('$user_lang->', $var, 12) !== 0)
 			{
 				$var = htmlspecialchars($var, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 			}
@@ -121,7 +121,7 @@ 
 			return $var;
 		}
 
-		if(!count($name) || (!is_array($var) && !is_object($var)))
+		if (!count($name) || (!is_array($var) && !is_object($var)))
 		{
 			return false;
 		}
@@ -129,17 +129,17 @@ 
 		$is_object = is_object($var);
 		$name0 = array_shift($name);
 
-		if(strlen($name0))
+		if (strlen($name0))
 		{
 			$target = $is_object ? $var->{$name0} : $var[$name0];
 			$target = $this->_encodeHTML($target, $name);
 
-			if($target === false)
+			if ($target === false)
 			{
 				return $var;
 			}
 
-			if($is_object)
+			if ($is_object)
 			{
 				$var->{$name0} = $target;
 			}
@@ -151,18 +151,18 @@ 
 			return $var;
 		}
 
-		foreach($var as $key => $target)
+		foreach ($var as $key => $target)
 		{
 			$cloned_name = array_slice($name, 0);
 			$target = $this->_encodeHTML($target, $name);
 			$name = $cloned_name;
 
-			if($target === false)
+			if ($target === false)
 			{
 				continue;
 			}
 
-			if($is_object)
+			if ($is_object)
 			{
 				$var->{$key} = $target;
 			}
@@ -185,9 +185,9 @@ 
 	 */
 	static function detectingXEE($xml)
 	{
-		if(!$xml) return FALSE;
+		if (!$xml) return FALSE;
 
-		if(strpos($xml, '<!ENTITY') !== FALSE)
+		if (strpos($xml, '<!ENTITY') !== FALSE)
 		{
 			return TRUE;
 		}
@@ -195,7 +195,7 @@ 
 		// Strip XML declaration.
 		$header = preg_replace('/<\?xml.*?\?'.'>/s', '', substr($xml, 0, 100), 1);
 		$xml = trim(substr_replace($xml, $header, 0, 100));
-		if($xml == '')
+		if ($xml == '')
 		{
 			return TRUE;
 		}
@@ -203,7 +203,7 @@ 
 		// Strip DTD.
 		$header = preg_replace('/^<!DOCTYPE[^>]*+>/i', '', substr($xml, 0, 200), 1);
 		$xml = trim(substr_replace($xml, $header, 0, 200));
-		if($xml == '')
+		if ($xml == '')
 		{
 			return TRUE;
 		}
@@ -212,12 +212,12 @@ 
 		$root_tag = substr($xml, 0, strcspn(substr($xml, 0, 20), "> \t\r\n"));
 
 		// Reject a second DTD.
-		if(strtoupper($root_tag) == '<!DOCTYPE')
+		if (strtoupper($root_tag) == '<!DOCTYPE')
 		{
 			return TRUE;
 		}
 
-		if(!in_array($root_tag, array('<methodCall', '<methodResponse', '<fault')))
+		if (!in_array($root_tag, array('<methodCall', '<methodResponse', '<fault')))
 		{
 			return TRUE;
 		}

classes/security/htmlpurifier/library/HTMLPurifier.autoload.php

Indentation +10 added lines, -10 removed lines

@@ -7,20 +7,20 @@
  */
 
 if (function_exists('spl_autoload_register') && function_exists('spl_autoload_unregister')) {
-    // We need unregister for our pre-registering functionality
-    HTMLPurifier_Bootstrap::registerAutoload();
-    if (function_exists('__autoload')) {
-        // Be polite and ensure that userland autoload gets retained
-        spl_autoload_register('__autoload');
-    }
+	// We need unregister for our pre-registering functionality
+	HTMLPurifier_Bootstrap::registerAutoload();
+	if (function_exists('__autoload')) {
+		// Be polite and ensure that userland autoload gets retained
+		spl_autoload_register('__autoload');
+	}
 } elseif (!function_exists('__autoload')) {
-    function __autoload($class) {
-        return HTMLPurifier_Bootstrap::autoload($class);
-    }
+	function __autoload($class) {
+		return HTMLPurifier_Bootstrap::autoload($class);
+	}
 }
 
 if (ini_get('zend.ze1_compatibility_mode')) {
-    trigger_error("HTML Purifier is not compatible with zend.ze1_compatibility_mode; please turn it off", E_USER_ERROR);
+	trigger_error("HTML Purifier is not compatible with zend.ze1_compatibility_mode; please turn it off", E_USER_ERROR);
 }
 
 // vim: et sw=4 sts=4

classes/security/htmlpurifier/library/HTMLPurifier.func.php

Indentation +5 added lines, -5 removed lines

@@ -13,11 +13,11 @@
  *        HTMLPurifier_Config::create()
  */
 function HTMLPurifier($html, $config = null) {
-    static $purifier = false;
-    if (!$purifier) {
-        $purifier = new HTMLPurifier();
-    }
-    return $purifier->purify($html, $config);
+	static $purifier = false;
+	if (!$purifier) {
+		$purifier = new HTMLPurifier();
+	}
+	return $purifier->purify($html, $config);
 }
 
 // vim: et sw=4 sts=4