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

Merge #1363 PHP 5 방식의 생성자 (__construct) 사용 by kijin

Browse source 
* pr/1363:
  ExtraItem 클래스에도 PHP 5 방식의 생성자 (__construct) 사용
  PHP 5 방식의 생성자 (__construct) 사용

Conflicts:
	classes/context/Context.class.php
This commit is contained in:
Kijin Sung 2015-10-08 14:10:32 +09:00
commit a7ed4c56c8
88 changed files with 114 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

2
classes/xml/XmlJsFilter.class.php
View file

@ -79,7 +79,7 @@ class XmlJsFilter extends XmlParser
* @return void
*/
function XmlJsFilter($path, $xml_file)
function __construct($path, $xml_file)
{
if(substr($path, -1) !== '/')
{

2
classes/xml/XmlLangParser.class.php
View file

@ -53,7 +53,7 @@ class XmlLangParser extends XmlParser
* @param string $lang_type
* @return void
*/
function XmlLangParser($xml_file, $lang_type)
function __construct($xml_file, $lang_type)
{
$this->lang_type = $lang_type;
$this->xml_file = $xml_file;

2
classes/xml/XmlQueryParser.class.php
View file

@ -24,7 +24,7 @@ class XmlQueryParser extends XmlParser
* constructor
* @return void
*/
function XmlQueryParser()
function __construct()
{
}

2
classes/xml/xmlquery/DBParser.class.php
View file

@ -60,7 +60,7 @@ class DBParser
*
* @return void
*/
function DBParser($escape_char_left, $escape_char_right = "", $table_prefix = "xe_")
function __construct($escape_char_left, $escape_char_right = "", $table_prefix = "xe_")
{
$this->escape_char_left = $escape_char_left;
if($escape_char_right !== "")

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

@ -30,7 +30,7 @@ class QueryParser
* @param bool $isSubQuery
* @return void
*/
function QueryParser($query = NULL, $isSubQuery = FALSE)
function __construct($query = NULL, $isSubQuery = FALSE)
{
if($query)
{

2
classes/xml/xmlquery/argument/Argument.class.php
View file

@ -64,7 +64,7 @@ class Argument
* @return void
*/
function Argument($name, $value)
function __construct($name, $value)
{
$this->value = $value;
$this->name = $name;

4
classes/xml/xmlquery/argument/ConditionArgument.class.php
View file

@ -23,7 +23,7 @@ class ConditionArgument extends Argument
* @param string $operation
* @return void
*/
function ConditionArgument($name, $value, $operation)
function __construct($name, $value, $operation)
{
$operationList = array('in' => 1, 'notin' => 1, 'not_in' => 1, 'between' => 1);
if(isset($value) && isset($operationList[$operation]) && !is_array($value) && $value != '')
@ -32,7 +32,7 @@ class ConditionArgument extends Argument
$value = str_replace('\'', '', $value);
$value = explode(',', $value);
}
parent::Argument($name, $value);
parent::__construct($name, $value);
$this->operation = $operation;
}

2
classes/xml/xmlquery/queryargument/DefaultValue.class.php
View file

@ -58,7 +58,7 @@ class DefaultValue
* @param mixed $value value
* @return void
*/
function DefaultValue($column_name, $value)
function __construct($column_name, $value)
{
$dbParser = DB::getParser();
$this->column_name = $dbParser->parseColumnName($column_name);

2
classes/xml/xmlquery/queryargument/QueryArgument.class.php
View file

@ -58,7 +58,7 @@ class QueryArgument
* @param bool $ignore_value
* @return void
*/
function QueryArgument($tag, $ignore_value = FALSE)
function __construct($tag, $ignore_value = FALSE)
{
static $number_of_arguments = 0;

2
classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php
View file

@ -59,7 +59,7 @@ class QueryArgumentValidator
* @param QueryArgument $argument
* @return void
*/
function QueryArgumentValidator($tag, $argument)
function __construct($tag, $argument)
{
$this->argument = $argument;
$this->argument_name = $this->argument->getArgumentName();

2
classes/xml/xmlquery/tags/column/ColumnTag.class.php
View file

@ -25,7 +25,7 @@ class ColumnTag
* @param string $name
* @return void
*/
function ColumnTag($name)
function __construct($name)
{
$this->name = $name;
}

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

@ -25,9 +25,9 @@ class InsertColumnTag extends ColumnTag
*
* @return void
*/
function InsertColumnTag($column)
function __construct($column)
{
parent::ColumnTag($column->attrs->name);
parent::__construct($column->attrs->name);
$dbParser = DB::getParser();
$this->name = $dbParser->parseColumnName($this->name);
$this->argument = new QueryArgument($column);

4
classes/xml/xmlquery/tags/column/InsertColumnTagWithoutArgument.class.php
View file

@ -17,9 +17,9 @@ class InsertColumnTagWithoutArgument extends ColumnTag
* @param object $column
* @return void
*/
function InsertColumnTagWithoutArgument($column)
function __construct($column)
{
parent::ColumnTag($column->attrs->name);
parent::__construct($column->attrs->name);
$dbParser = DB::getParser();
$this->name = $dbParser->parseColumnName($this->name);
}

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

@ -24,7 +24,7 @@ class InsertColumnsTag
* @param array|string $xml_columns
* @return void
*/
function InsertColumnsTag($xml_columns)
function __construct($xml_columns)
{
$this->columns = array();

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

@ -31,16 +31,16 @@ class SelectColumnTag extends ColumnTag
* @param string|object $column
* @return void
*/
function SelectColumnTag($column)
function __construct($column)
{
if($column == "*" || $column->attrs->name == '*')
{
parent::ColumnTag(NULL);
parent::__construct(NULL);
$this->name = "*";
}
else
{
parent::ColumnTag($column->attrs->name);
parent::__construct($column->attrs->name);
$dbParser = DB::getParser();
$this->name = $dbParser->parseExpression($this->name);

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

@ -25,7 +25,7 @@ class SelectColumnsTag
* @internal param \Xml_Node_ $xml_columns
* @return void
*/
function SelectColumnsTag($xml_columns_tag)
function __construct($xml_columns_tag)
{
if(!$xml_columns_tag)
{

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

@ -31,9 +31,9 @@ class UpdateColumnTag extends ColumnTag
* @param object $column
* @return void
*/
function UpdateColumnTag($column)
function __construct($column)
{
parent::ColumnTag($column->attrs->name);
parent::__construct($column->attrs->name);
$dbParser = DB::getParser();
$this->name = $dbParser->parseColumnName($this->name);

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

@ -24,7 +24,7 @@ class UpdateColumnsTag
* @param array|object $xml_columns
* @return void
*/
function UpdateColumnsTag($xml_columns)
function __construct($xml_columns)
{
$this->columns = array();

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

@ -29,7 +29,7 @@ class ConditionGroupTag
* @param string $pipe
* @return void
*/
function ConditionGroupTag($conditions, $pipe = "")
function __construct($conditions, $pipe = "")
{
$this->pipe = $pipe;

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

@ -59,7 +59,7 @@ class ConditionTag
* @param object $condition
* @return void
*/
function ConditionTag($condition)
function __construct($condition)
{
$this->operation = $condition->attrs->operation;
$this->pipe = $condition->attrs->pipe;

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

@ -22,7 +22,7 @@ class ConditionsTag
* @param object $xml_conditions
* @return void
*/
function ConditionsTag($xml_conditions)
function __construct($xml_conditions)
{
$this->condition_groups = array();
if(!$xml_conditions)

4
classes/xml/xmlquery/tags/condition/JoinConditionsTag.class.php
View file

@ -16,9 +16,9 @@ class JoinConditionsTag extends ConditionsTag
* @param object $xml_conditions
* @return void
*/
function JoinConditionsTag($xml_conditions)
function __construct($xml_conditions)
{
parent::ConditionsTag($xml_conditions);
parent::__construct($xml_conditions);
$this->condition_groups[0]->conditions[0]->setPipe("");
}

2
classes/xml/xmlquery/tags/group/GroupsTag.class.php
View file

@ -22,7 +22,7 @@ class GroupsTag
* @param array|string $xml_groups
* @return void
*/
function GroupsTag($xml_groups)
function __construct($xml_groups)
{
$this->groups = array();

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

@ -46,7 +46,7 @@ class IndexTag
* @param object $index
* @return void
*/
function IndexTag($index)
function __construct($index)
{
$this->argument_name = $index->attrs->var;

2
classes/xml/xmlquery/tags/navigation/LimitTag.class.php
View file

@ -40,7 +40,7 @@ class LimitTag
* @param object $index
* @return void
*/
function LimitTag($index)
function __construct($index)
{
if($index->page && $index->page->attrs && $index->page_count && $index->page_count->attrs)
{

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

@ -46,7 +46,7 @@ class NavigationTag
* @param object $xml_navigation
* @return void
*/
function NavigationTag($xml_navigation)
function __construct($xml_navigation)
{
$this->order = array();
if($xml_navigation)

2
classes/xml/xmlquery/tags/query/QueryTag.class.php
View file

@ -119,7 +119,7 @@ class QueryTag
* @param bool $isSubQuery
* @return void
*/
function QueryTag($query, $isSubQuery = FALSE)
function __construct($query, $isSubQuery = FALSE)
{
$this->action = $query->attrs->action;
$this->query_id = $query->attrs->id;

4
classes/xml/xmlquery/tags/table/HintTableTag.class.php
View file

@ -25,9 +25,9 @@ class HintTableTag extends TableTag
* @param array $index
* @return void
*/
function HintTableTag($table, $index)
function __construct($table, $index)
{
parent::TableTag($table);
parent::__construct($table);
$this->index = $index;
}

2
classes/xml/xmlquery/tags/table/TableTag.class.php
View file

@ -66,7 +66,7 @@ class TableTag
* @param object $table XML <table> tag
* @return void
*/
function TableTag($table)
function __construct($table)
{
$dbParser = DB::getParser();

2
classes/xml/xmlquery/tags/table/TablesTag.class.php
View file

@ -33,7 +33,7 @@ class TablesTag
* @param object $xml_index_hints_tag
* @return void
*/
function TablesTag($xml_tables_tag, $xml_index_hints_tag = NULL)
function __construct($xml_tables_tag, $xml_index_hints_tag = NULL)
{
$this->tables = array();