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

merge from 1.5.1.8

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10157 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-02-21 07:42:16 +00:00
parent 2d3dfe7bc7
commit 90c18a8bb8
42 changed files with 3249 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

14
classes/db/DBCubrid.class.php
View file

@ -5,7 +5,7 @@
* @brief Cubrid DBMS to use the class
* @version 1.0
*
* Works with CUBRID up to 8.4.0
* Works with CUBRID up to 8.4.1
**/
class DBCubrid extends DB
@ -67,7 +67,7 @@
**/
function __connect($connection)
{
// attempts to connect
// attempts to connect
$result = @cubrid_connect($connection["db_hostname"], $connection["db_port"], $connection["db_database"], $connection["db_userid"], $connection["db_password"]);
// check connections
@ -75,7 +75,15 @@
$this->setError (-1, 'database connect fail');
return;
}
return $result;
if(!defined('__CUBRID_VERSION__')) {
$cubrid_version = cubrid_get_server_info($result);
$cubrid_version_elem = explode('.', $cubrid_version);
$cubrid_version = $cubrid_version_elem[0] . '.' . $cubrid_version_elem[1] . '.' . $cubrid_version_elem[2];
define('__CUBRID_VERSION__', $cubrid_version);
}
return $result;
}
/**

6
classes/db/queryparts/condition/Condition.class.php
View file

@ -108,7 +108,11 @@
case 'like_tail' :
case 'like_prefix' :
case 'like' :
return $name.' like '.$value;
if(defined('__CUBRID_VERSION__')
&& __CUBRID_VERSION__ >= '8.4.1')
return $name.' rlike '.$value;
else
return $name.' like '.$value;
break;
case 'notlike_tail' :
case 'notlike_prefix' :

9
classes/mail/Mail.class.php
View file

@ -1,5 +1,12 @@
<?php
require_once _XE_PATH_ . "libs/phpmailer/phpmailer.php";
if(version_compare(PHP_VERSION, '5.0.0', '>='))
{
require_once _XE_PATH_ . "libs/phpmailer/phpmailer.php";
}
else
{
require_once _XE_PATH_ . "libs/phpmailer/class.phpmailer.php";
}
/**
* @brief Mailing class for XpressEngine

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

@ -23,13 +23,27 @@
switch($operation) {
case 'like_prefix' :
$this->value = $value.'%';
if(defined('__CUBRID_VERSION__')
&& __CUBRID_VERSION__ >= '8.4.1') {
$this->value = '^' . str_replace('%', '(.*)', preg_quote($value));
}
else
$this->value = $value.'%';
break;
case 'like_tail' :
$this->value = '%'.$value;
if(defined('__CUBRID_VERSION__')
&& __CUBRID_VERSION__ >= '8.4.1')
$this->value = str_replace('%', '(.*)', preg_quote($value)) . '$';
else
$this->value = '%'.$value;
break;
case 'like' :
$this->value = '%'.$value.'%';
if(defined('__CUBRID_VERSION__')
&& __CUBRID_VERSION__ >= '8.4.1') {
$this->value = str_replace('%', '(.*)', preg_quote($value));
}
else
$this->value = '%'.$value.'%';
break;
case 'notlike' :
$this->value = '%'.$value.'%';