merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545

classes/xml/xmlquery/argument/Argument.class.php

@@ -1,50 +1,60 @@
 <?php
+
 /**
  * Argument class
  * @author NHN (developers@xpressengine.com)
  * @package /classes/xml/xmlquery/argument
  * @version 0.1
  */
-class Argument {
+class Argument
+{
+
 	/**
 	 * argument value
 	 * @var mixed
 	 */
 	var $value;
+
 	/**
 	 * argument name
 	 * @var string
 	 */
 	var $name;
+
 	/**
 	 * argument type
 	 * @var string
 	 */
 	var $type;
+
 	/**
 	 * result of argument type check
 	 * @var bool
 	 */
 	var $isValid;
+
 	/**
 	 * error message
 	 * @var Object
 	 */
 	var $errorMessage;
+
 	/**
 	 * column operation
 	 */
 	var $column_operation;
+
 	/**
 	 * Check if arg value is user submnitted or default
 	 * @var mixed
 	 */
 	var $uses_default_value;
+
 	/**
 	 * Caches escaped and toString value so that the parsing won't happen multiple times
 	 * @var mixed
 	 */
-	var $_value; // 
+	var $_value; //
 
 	/**
 	 * constructor
@@ -52,52 +62,74 @@ class Argument {
 	 * @param mixed $value
 	 * @return void
 	 */
-	function Argument($name, $value) {
+
+	function Argument($name, $value)
+	{
 		$this->value = $value;
 		$this->name = $name;
-		$this->isValid = true;
+		$this->isValid = TRUE;
 	}
 
-	function getType() {
-		if (isset($this->type))
+	function getType()
+	{
+		if(isset($this->type))
 		{
 			return $this->type;
 		}
-		if (is_string($this->value))
+		if(is_string($this->value))
+		{
 			return 'column_name';
+		}
+
 		return 'number';
 	}
 
-	function setColumnType($value) {
+	function setColumnType($value)
+	{
 		$this->type = $value;
 	}
-	
-	function setColumnOperation($operation) {
+
+	function setColumnOperation($operation)
+	{
 		$this->column_operation = $operation;
 	}
 
-	function getName() {
+	function getName()
+	{
 		return $this->name;
 	}
 
-	function getValue() {
-		if (!isset($this->_value)) {
+	function getValue()
+	{
+		if(!isset($this->_value))
+		{
 			$value = $this->getEscapedValue();
 			$this->_value = $this->toString($value);
 		}
 		return $this->_value;
 	}
 
-	function getColumnOperation() {
+	function getPureValue()
+	{
+		return $this->value;
+	}
+
+	function getColumnOperation()
+	{
 		return $this->column_operation;
 	}
 
-	function getEscapedValue() {
+	function getEscapedValue()
+	{
 		return $this->escapeValue($this->value);
 	}
 
-	function getUnescapedValue() {
-		if($this->value === 'null') return null;
+	function getUnescapedValue()
+	{
+		if($this->value === 'null')
+		{
+			return null;
+		}
 		return $this->value;
 	}
 
@@ -106,12 +138,18 @@ class Argument {
 	 * @param mixed $value
 	 * @return string
 	 */
-	function toString($value) {
-		if (is_array($value)) {
-			if (count($value) === 0)
+	function toString($value)
+	{
+		if(is_array($value))
+		{
+			if(count($value) === 0)
+			{
 				return '';
-			if (count($value) === 1 && $value[0] === '')
+			}
+			if(count($value) === 1 && $value[0] === '')
+			{
 				return '';
+			}
 			return '(' . implode(',', $value) . ')';
 		}
 		return $value;
@@ -122,35 +160,54 @@ class Argument {
 	 * @param mixed $value
 	 * @return mixed
 	 */
-	function escapeValue($value) {
+	function escapeValue($value)
+	{
 		$column_type = $this->getType();
-		if ($column_type == 'column_name') {
+		if($column_type == 'column_name')
+		{
 			$dbParser = DB::getParser();
 			return $dbParser->parseExpression($value);
 		}
-		if (!isset($value))
+		if(!isset($value))
+		{
 			return null;
+		}
 
-		$columnTypeList = array('date'=>1, 'varchar'=>1, 'char'=>1, 'text'=>1, 'bigtext'=>1);
-		if (isset($columnTypeList[$column_type])) {
-			if (!is_array($value))
+		$columnTypeList = array('date' => 1, 'varchar' => 1, 'char' => 1, 'text' => 1, 'bigtext' => 1);
+		if(isset($columnTypeList[$column_type]))
+		{
+			if(!is_array($value))
+			{
 				$value = $this->_escapeStringValue($value);
-			else {
+			}
+			else
+			{
 				$total = count($value);
-				for ($i = 0; $i < $total; $i++)
+				for($i = 0; $i < $total; $i++)
+				{
 					$value[$i] = $this->_escapeStringValue($value[$i]);
+				}
 				//$value[$i] = '\''.$value[$i].'\'';
 			}
 		}
-		if($this->uses_default_value) return $value;
-		if ($column_type == 'number') {
-			if (is_array($value)) {
-				foreach ($value AS $key => $val) {
-					if (isset($val) && $val !== '') {
+		if($this->uses_default_value)
+		{
+			return $value;
+		}
+		if($column_type == 'number')
+		{
+			if(is_array($value))
+			{
+				foreach($value AS $key => $val)
+				{
+					if(isset($val) && $val !== '')
+					{
 						$value[$key] = (int) $val;
 					}
 				}
-			} else {
+			}
+			else
+			{
 				$value = (int) $value;
 			}
 		}
@@ -163,23 +220,25 @@ class Argument {
 	 * @param string $value
 	 * @return string
 	 */
-	function _escapeStringValue($value) {
+	function _escapeStringValue($value)
+	{
 		// Remove non-utf8 chars.
 		$regex = '@((?:[\x00-\x7F]|[\xC0-\xDF][\x80-\xBF]|[\xE0-\xEF][\x80-\xBF]{2}){1,100})|([\xF0-\xF7][\x80-\xBF]{3})|([\x80-\xBF])|([\xC0-\xFF])@x';
 
 		$value = preg_replace_callback($regex, array($this, 'utf8Replacer'), $value);
-		$db = &DB::getInstance();
+		$db = DB::getInstance();
 		$value = $db->addQuotes($value);
 		return '\'' . $value . '\'';
 	}
 
-	function utf8Replacer($captures) {
-		if (!empty($captures[1]))
+	function utf8Replacer($captures)
+	{
+		if(strlen($captures[1]))
 		{
 			// Valid byte sequence. Return unmodified.
 			return $captures[1];
 		}
-		elseif(!empty($captures[2]))
+		else if(strlen($captures[2]))
 		{
 			// Remove user defined area
 			if("\xF3\xB0\x80\x80" <= $captures[2])
@@ -195,28 +254,41 @@ class Argument {
 		}
 	}
 
-	function isValid() {
+	function isValid()
+	{
 		return $this->isValid;
 	}
-	
-	function isColumnName(){
+
+	function isColumnName()
+	{
 		$type = $this->getType();
 		$value = $this->getUnescapedValue();
-		if($type == 'column_name') return true;
-		if($type == 'number' && is_null($value)) return false;
-		if($type == 'number' && !is_numeric($value) && $this->uses_default_value) return true;
-		return false;
+		if($type == 'column_name')
+		{
+			return TRUE;
+		}
+		if($type == 'number' && is_null($value))
+		{
+			return FALSE;
+		}
+		if($type == 'number' && !is_numeric($value) && $this->uses_default_value)
+		{
+			return TRUE;
+		}
+		return FALSE;
 	}
 
-	function getErrorMessage() {
+	function getErrorMessage()
+	{
 		return $this->errorMessage;
 	}
 
-	function ensureDefaultValue($default_value) {
-		if (!isset($this->value) || $this->value == '')
+	function ensureDefaultValue($default_value)
+	{
+		if(!isset($this->value) || $this->value == '')
 		{
 			$this->value = $default_value;
-			$this->uses_default_value = true;
+			$this->uses_default_value = TRUE;
 		}
 	}
 
@@ -225,50 +297,61 @@ class Argument {
 	 * @param string $filter_type
 	 * @return void
 	 */
-	function checkFilter($filter_type) {
-		if (isset($this->value) && $this->value != '') {
+	function checkFilter($filter_type)
+	{
+		if(isset($this->value) && $this->value != '')
+		{
 			global $lang;
 			$val = $this->value;
 			$key = $this->name;
-			switch ($filter_type) {
+			switch($filter_type)
+			{
 				case 'email' :
 				case 'email_address' :
-					if (!preg_match('/^[\w-]+((?:\.|\+|\~)[\w-]+)*@[\w-]+(\.[\w-]+)+$/is', $val)) {
-						$this->isValid = false;
+					if(!preg_match('/^[\w-]+((?:\.|\+|\~)[\w-]+)*@[\w-]+(\.[\w-]+)+$/is', $val))
+					{
+						$this->isValid = FALSE;
 						$this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_email, $lang->{$key} ? $lang->{$key} : $key));
 					}
 					break;
 				case 'homepage' :
-					if (!preg_match('/^(http|https)+(:\/\/)+[0-9a-z_-]+\.[^ ]+$/is', $val)) {
-						$this->isValid = false;
+					if(!preg_match('/^(http|https)+(:\/\/)+[0-9a-z_-]+\.[^ ]+$/is', $val))
+					{
+						$this->isValid = FALSE;
 						$this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_homepage, $lang->{$key} ? $lang->{$key} : $key));
 					}
 					break;
 				case 'userid' :
 				case 'user_id' :
-					if (!preg_match('/^[a-zA-Z]+([_0-9a-zA-Z]+)*$/is', $val)) {
-						$this->isValid = false;
+					if(!preg_match('/^[a-zA-Z]+([_0-9a-zA-Z]+)*$/is', $val))
+					{
+						$this->isValid = FALSE;
 						$this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_userid, $lang->{$key} ? $lang->{$key} : $key));
 					}
 					break;
 				case 'number' :
 				case 'numbers' :
-					if (is_array($val))
+					if(is_array($val))
+					{
 						$val = join(',', $val);
-					if (!preg_match('/^(-?)[0-9]+(,\-?[0-9]+)*$/is', $val)) {
-						$this->isValid = false;
+					}
+					if(!preg_match('/^(-?)[0-9]+(,\-?[0-9]+)*$/is', $val))
+					{
+						$this->isValid = FALSE;
 						$this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_number, $lang->{$key} ? $lang->{$key} : $key));
 					}
 					break;
 				case 'alpha' :
-					if (!preg_match('/^[a-z]+$/is', $val)) {
-						$this->isValid = false;
+					if(!preg_match('/^[a-z]+$/is', $val))
+					{
+						$this->isValid = FALSE;
 						$this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_alpha, $lang->{$key} ? $lang->{$key} : $key));
 					}
 					break;
 				case 'alpha_number' :
-					if (!preg_match('/^[0-9a-z]+$/is', $val)) {
-						$this->isValid = false;
+					if(!preg_match('/^[0-9a-z]+$/is', $val))
+					{
+						$this->isValid = FALSE;
 						$this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_alpha_number, $lang->{$key} ? $lang->{$key} : $key));
 					}
 					break;
@@ -276,33 +359,39 @@ class Argument {
 		}
 	}
 
-	function checkMaxLength($length) {
-		if ($this->value && (strlen($this->value) > $length)) {
+	function checkMaxLength($length)
+	{
+		if($this->value && (strlen($this->value) > $length))
+		{
 			global $lang;
-			$this->isValid = false;
+			$this->isValid = FALSE;
 			$key = $this->name;
 			$this->errorMessage = new Object(-1, sprintf($lang->filter->outofrange, $lang->{$key} ? $lang->{$key} : $key));
 		}
 	}
 
-	function checkMinLength($length) {
-		if ($this->value && (strlen($this->value) < $length)) {
+	function checkMinLength($length)
+	{
+		if($this->value && (strlen($this->value) < $length))
+		{
 			global $lang;
-			$this->isValid = false;
+			$this->isValid = FALSE;
 			$key = $this->name;
 			$this->errorMessage = new Object(-1, sprintf($lang->filter->outofrange, $lang->{$key} ? $lang->{$key} : $key));
 		}
 	}
 
-	function checkNotNull() {
-		if (!isset($this->value)) {
+	function checkNotNull()
+	{
+		if(!isset($this->value))
+		{
 			global $lang;
-			$this->isValid = false;
+			$this->isValid = FALSE;
 			$key = $this->name;
 			$this->errorMessage = new Object(-1, sprintf($lang->filter->isnull, $lang->{$key} ? $lang->{$key} : $key));
 		}
 	}
 
 }
-
-?>
+/* End of file Argument.class.php */
+/* Location: ./classes/xml/xmlquery/argument/Argument.class.php */