Cleaned up some classes that weren't needed. Removed calls to getValidatorString from tags, since the argument escaping is now done directly in the QueryParser class.

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0-DB@8390 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
mosmartin 2011-05-23 08:18:19 +00:00
parent d3067703a4
commit a8bed44a83
21 changed files with 14 additions and 290 deletions

View file

@ -1,26 +0,0 @@
<?php
class ConditionQueryArgument extends QueryArgument{
var $argument_name;
var $argument_validator;
var $column_name;
function ConditionQueryArgument($tag){
$this->argument_name = $tag->attrs->var;
$name = $tag->attrs->column;
if(strpos($name, '.') === false) $this->column_name = $name;
else {
list($prefix, $name) = explode('.', $name);
$this->column_name = $name;
}
require_once(_XE_PATH_.'classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php');
require_once(_XE_PATH_.'classes/xml/xmlquery/queryargument/validator/ConditionQueryArgumentValidator.class.php');
$this->argument_validator = new ConditionQueryArgumentValidator($tag);
}
function getColumnName(){
return $this->column_name;
}
}
?>

View file

@ -1,20 +0,0 @@
<?php
class ConditionQueryArgumentValidator extends QueryArgumentValidator {
function ConditionQueryArgumentValidator($tag){
parent::QueryArgumentValidator($tag);
}
function toString(){
if(!$this->argument_name) return '';
if(!isset($this->validator_string)){
$validator = parent::toString();
require_once(_XE_PATH_.'classes/xml/xmlquery/queryargument/validator/EscapeCheck.class.php');
$v = new EscapeCheck($this->argument_name);
$validator .= $v->toString();
$this->validator_string = $validator;
}
return $this->validator_string;
}
}
?>

View file

@ -1,25 +0,0 @@
<?php
class DefaultCheck extends Validator {
var $argument_name;
var $value;
function DefaultCheck($argument_name, $value) {
$this->argument_name = $argument_name;
$this->value = $value;
}
function toString(){
if(!isset($this->argument_name)) return '';
$value = $this->value->toString();
if($this->value->isString()) {
$value = "'".$value."'";
}
return 'if(!isset($args->'.$this->argument_name.')) $args->'.$this->argument_name.' = '.$value.';'."\n";
}
}
?>

View file

@ -1,21 +0,0 @@
<?php
// TODO This is temporary for when column types will be
// used to prepare input
class EscapeCheck {
var $argument_name;
function EscapeCheck($argument_name){
$this->argument_name = $argument_name;
}
function toString(){
return sprintf("if(is_string(\$args->%s) && !is_numeric(\$args->%s)) \$args->%s = \$dbParser->escapeString(\$args->%s);\n"
, $this->argument_name
, $this->argument_name
, $this->argument_name
, $this->argument_name);
}
}
?>

View file

@ -1,16 +0,0 @@
<?php
class FilterValidator extends Validator {
var $argument_name;
var $filter;
function FilterValidator($argument_name, $filter) {
$this->argument_name = $argument_name;
$this->filter = $filter;
}
function toString(){
return sprintf('if(isset($args->%s)) { unset($_output); $_output = $this->checkFilter("%s",$args->%s,"%s"); if(!$_output->toBool()) return $_output; } %s',$this->argument_name, $this->argument_name,$this->argument_name,$this->filter,"\n");
}
}
?>

View file

@ -1,22 +0,0 @@
<?php
class MaxLengthValidator extends Validator {
var $argument_name;
var $value;
function MaxLengthValidator($argument_name, $value) {
$this->argument_name = $argument_name;
$this->value = $value;
}
function toString(){
return 'if($args->'
.$this->argument_name
.'&&strlen($args->'.$this->argument_name.')>'.$this->value
.') return new Object(-1, sprintf($lang->filter->outofrange, $lang->'
.$this->argument_name.'?$lang->'
.$this->argument_name.':\''.$this->argument_name.'\'));'."\n";
}
}
?>

View file

@ -1,22 +0,0 @@
<?php
class MinLengthValidator extends Validator{
var $argument_name;
var $value;
function MinLengthValidator($argument_name, $value) {
$this->argument_name = $argument_name;
$this->value = $value;
}
function toString(){
return 'if($args->'
.$this->argument_name
.'&&strlen($args->'.$this->argument_name.')<'.$this->value
.') return new Object(-1, sprintf($lang->filter->outofrange, $lang->'
.$this->argument_name.'?$lang->'
.$this->argument_name.':\''.$this->argument_name.'\'));'."\n";
}
}
?>

View file

@ -1,18 +0,0 @@
<?php
class NotNullValidator extends Validator {
var $argument_name;
var $value;
function NotNullValidator($argument_name, $value) {
$this->argument_name = $argument_name;
$this->value = $value;
}
function toString(){
return 'if(!isset($args->'.$this->argument_name.')) return new Object(-1, sprintf($lang->filter->isnull, $lang->'
.$this->argument_name.'?$lang->'.$this->argument_name.':\''.$this->argument_name.'\'));'."\n";
}
}
?>