Fixed varchar length verification in update(). Improved some debug me…

…ssages.

git-svn-id: http://voip.null.ro/svn/ansql/trunk@297 dbfed7de-b0aa-0410-b6a1-c7e608b77fc9

framework.php

@@ -1520,11 +1520,11 @@ protected function buildInsertParts($with_serials=false)
 				$res = $this->isValidVarchar($var->_type, $value);
 				if (!$res[0])
 				{
-					$error .= " "._("Field ")." '"._($var_name)."' "._("must be at most ".$res[1]." characters long").".";
+					$error .= " "._("Field ")." '"._($var_name)."' "._("must be at most ".$res[1]." characters long but has '").$res[2]."'.";
 					$error_fields[] = $var_name;
 					continue;
 				}
-			}                 	
+			}
 			if ($columns != "")
 			{
 				$columns .= ",";
@@ -1554,8 +1554,9 @@ private function isValidVarchar($type, $value)
 		$var_length = strlen($value);
 		$allowed_length = explode("(", $type);
 		$allowed_length = substr($allowed_length[1],0,-1);
-		if ($var_length > (int)$allowed_length)
-			return array(false,$allowed_length);
+		$allowed_length = (int)$allowed_length;
+		if ($var_length > $allowed_length)
+			return array(false,$allowed_length,$var_length);
 		return array(true);
 	}
 
@@ -1638,15 +1639,16 @@ public function update($conditions = array(), $verifications = array())
 				$error_fields[] = $var_name;
 				continue;
 			}
-			$value = $var->escape($this->{$var_name});
+			$value = $this->{$var_name};
 			if (substr($var->_type,0,7) == "varchar") {
 				$res = $this->isValidVarchar($var->_type,$value);
 			   	if (!$res[0]) {
-					$error .= " "._("Field ")." '"._($var_name)."' "._("must be at most ".$res[1]." characters long").".";
+					$error .= " "._("Field ")." '"._($var_name)."' "._("must be at most ".$res[1]." characters long but has '").$res[2]."'.";
 					$error_fields[] = $var_name;
 					continue;
 				}
-			}                 	
+			}
+			$value = $var->escape($value);
 
 			$variables .= esc($var_name)."=".$value."";
 			if ($var_name!="password")
@@ -1738,7 +1740,7 @@ public function fieldUpdate($conditions = array(), $fields = array(), $verificat
 			if (substr($var->_type,0,7) == "varchar") {
 				$res = $this->isValidVarchar($var->_type,$value);
 			   	if (!$res[0]) {
-					$error .= " "._("Field ")." '"._($var_name)."' "._("must be at most ".$res[1]." characters long").".";
+					$error .= " "._("Field ")." '"._($var_name)."' "._("must be at most ".$res[1]." characters long but has '").$res[2]."'.";
 					$error_fields[] = $var_name;
 					continue;
 				}