fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-14 00:39:57 +09:00
Code Issues Projects Releases Packages Wiki Activity

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.

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

7
classes/xml/xmlquery/QueryParser.class.php
View file

@ -118,15 +118,8 @@ class QueryParser {
$arguments = array_merge($arguments, $columns->getArguments());
$arguments = array_merge($arguments, $conditions->getArguments());
$arguments = array_merge($arguments, $navigation->getArguments());
//foreach($arguments as $argument){
// var_dump($argument);
// var_dump($this->column_type[$this->getQueryId()][$argument->getColumnName()]);
//}
$prebuff = '';
//$prebuff .= $columns->getValidatorString();
//$prebuff .= $conditions->getValidatorString();
//$prebuff .= $navigation->getValidatorString();
foreach($arguments as $argument){
if($argument->getArgumentName()){
$prebuff .= $argument->toString();

26
classes/xml/xmlquery/queryargument/ConditionQueryArgument.class.php
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;
}
}
?>

20
classes/xml/xmlquery/queryargument/validator/ConditionQueryArgumentValidator.class.php
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;
}
}
?>

25
classes/xml/xmlquery/queryargument/validator/DefaultCheck.class.php
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";
}
}
?>

21
classes/xml/xmlquery/queryargument/validator/EscapeCheck.class.php
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);
}
}
?>

16
classes/xml/xmlquery/queryargument/validator/FilterValidator.class.php
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");
}
}
?>

22
classes/xml/xmlquery/queryargument/validator/MaxLengthValidator.class.php
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";
}
}
?>

22
classes/xml/xmlquery/queryargument/validator/MinLengthValidator.class.php
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";
}
}
?>

18
classes/xml/xmlquery/queryargument/validator/NotNullValidator.class.php
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";
}
}
?>

16
classes/xml/xmlquery/tags/column/DeleteColumnTag.class.php
View file

@ -16,15 +16,7 @@
require_once(_XE_PATH_.'classes/xml/xmlquery/queryargument/QueryArgument.class.php');
$this->argument = new QueryArgument($column);
}
function toString(){
$output_columns = 'array(' . PHP_EOL;
foreach($this->argument as $argument){
$output_columns .= $argument->getExpressionString() . PHP_EOL . ',';
}
$output_columns = substr($output_columns, 0, -1);
$output_columns .= ')';
return $output_columns;
}
function getExpressionString(){
return sprintf('new DeleteExpression(\'%s\', $args->%s)'
, $this->name
@ -33,11 +25,7 @@
function getArgument(){
return $this->argument;
}
function getValidatorString(){
return $this->argument->getValidatorString();
}
}
}
?>

11
classes/xml/xmlquery/tags/column/DeleteColumnsTag.class.php
View file

@ -27,6 +27,7 @@
$this->columns[] = new DeleteColumnTag($column, $this->dbParser);
}
}
function toString(){
$output_columns = 'array(' . PHP_EOL;
foreach($this->columns as $column){
@ -43,15 +44,7 @@
$arguments[] = $column->getArgument();
}
return $arguments;
}
function getValidatorString(){
$validator = '';
foreach($this->columns as $column){
$validator .= $column->getValidatorString();
}
return $validator;
}
}
}

18
classes/xml/xmlquery/tags/column/InsertColumnTag.class.php
View file

@ -15,17 +15,7 @@
$this->name = $this->dbParser->parseColumnName($this->name);
require_once(_XE_PATH_.'classes/xml/xmlquery/queryargument/QueryArgument.class.php');
$this->argument = new QueryArgument($column);
}
function toString(){
$output_columns = 'array(' . PHP_EOL;
foreach($this->argument as $argument){
$output_columns .= $argument->getExpressionString() . PHP_EOL . ',';
}
$output_columns = substr($output_columns, 0, -1);
$output_columns .= ')';
return $output_columns;
}
}
function getExpressionString(){
return sprintf('new InsertExpression(\'%s\', $%s_argument->getValue())'
@ -35,11 +25,7 @@
function getArgument(){
return $this->argument;
}
function getValidatorString(){
return $this->argument->getValidatorString();
}
}
}
?>

11
classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php
View file

@ -27,6 +27,7 @@
$this->columns[] = new InsertColumnTag($column, $this->dbParser);
}
}
function toString(){
$output_columns = 'array(' . PHP_EOL;
foreach($this->columns as $column){
@ -43,15 +44,7 @@
$arguments[] = $column->getArgument();
}
return $arguments;
}
function getValidatorString(){
$validator = '';
foreach($this->columns as $column){
$validator .= $column->getValidatorString();
}
return $validator;
}
}
}

6
classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php
View file

@ -36,10 +36,6 @@
function getArguments(){
return array();
}
function getValidatorString(){
return '';
}
}
}
?>

15
classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php
View file

@ -19,15 +19,6 @@
$this->argument = new QueryArgument($column);
}
function toString(){
$output_columns = 'array(' . PHP_EOL;
foreach($this->argument as $argument){
$output_columns .= $argument->getExpressionString() . PHP_EOL . ',';
}
$output_columns = substr($output_columns, 0, -1);
$output_columns .= ')';
return $output_columns;
}
function getExpressionString(){
return sprintf('new UpdateExpression(\'%s\', $%s_argument->getValue())'
, $this->name
@ -36,11 +27,7 @@
function getArgument(){
return $this->argument;
}
function getValidatorString(){
return $this->argument->getValidatorString();
}
}
}
?>

9
classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php
View file

@ -48,14 +48,7 @@
}
return $arguments;
}
function getValidatorString(){
$validator = '';
foreach($this->columns as $column){
$validator .= $column->getValidatorString();
}
return $validator;
}
}
?>

8
classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php
View file

@ -39,14 +39,6 @@
}
return $arguments;
}
function getValidatorString(){
$validator = '';
foreach($this->conditions as $condition){
$validator .= $condition->getValidatorString();
}
return $validator;
}
}
?>

6
classes/xml/xmlquery/tags/condition/ConditionTag.class.php
View file

@ -44,10 +44,6 @@
, '"'.$this->operation.'"'
, $this->pipe ? ", '" . $this->pipe . "'" : ''
);
}
function getValidatorString(){
return $this->argument->getValidatorString();
}
}
}
?>

10
classes/xml/xmlquery/tags/condition/ConditionsTag.class.php
View file

@ -39,14 +39,6 @@
$arguments = array_merge($arguments, $condition->getArguments());
}
return $arguments;
}
function getValidatorString(){
$validator = '';
foreach($this->condition_groups as $condition){
$validator .= $condition->getValidatorString();
}
return $validator;
}
}
}
?>

9
classes/xml/xmlquery/tags/navigation/IndexTag.class.php
View file

@ -36,14 +36,7 @@
if($this->sort_order_argument)
$arguments[] = $this->sort_order_argument;
return $arguments;
}
function getValidatorString(){
$validator = $this->argument->getValidatorString();
if($this->sort_order_argument)
$validator .= $this->sort_order_argument->getValidatorString();
return $validator;
}
}
}
?>

8
classes/xml/xmlquery/tags/navigation/NavigationTag.class.php
View file

@ -46,14 +46,6 @@
$arguments = array_merge($order->getArguments(), $arguments);
}
return $arguments;
}
function getValidatorString(){
$validator = '';
foreach ($this->order as $order){
$validator .= $order->getValidatorString();
}
return $validator;
}
}