merge from 1.4.5 branche

git-svn-id: http://xe-core.googlecode.com/svn/trunk@8239 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-04-01 01:12:26 +00:00
parent 7d10ebd968
commit 825ccd8328
57 changed files with 932 additions and 645 deletions

View file

@ -842,7 +842,7 @@ class Context {
// optional SSL use
} elseif($_use_ssl == 'optional') {
$ssl_mode = RELEASE_SSL;
if($get_vars['act'] && $self->_isExistsSSLAction($get_vars['act'])) $ssl_mode = ENFORCE_SSL;
if($get_vars['act'] && $self->isExistsSSLAction($get_vars['act'])) $ssl_mode = ENFORCE_SSL;
$query = $self->getRequestUri($ssl_mode, $domain).$query;
// no SSL
} else {
@ -1299,4 +1299,4 @@ class Context {
return $path;
}
}
?>
?>

View file

@ -67,6 +67,10 @@
return $GLOBALS['__DB__'][$db_type];
}
function create() {
return new DB;
}
/**
* @brief constructor
* @return none

View file

@ -6,7 +6,6 @@
**/
class FileHandler extends Handler {
/**
* @brief changes path of target file, directory into absolute path
* @param[in] $source path

View file

@ -60,6 +60,14 @@ class Mobile {
return $this->ismobile;
}
function isMobileCheckByAgent()
{
if(preg_match('/(iPod|iPhone|Android|BlackBerry|SymbianOS|SCH\-M[0-9]+)/',$_SERVER['HTTP_USER_AGENT']))
return true;
else
return false;
}
function setMobile($ismobile)
{
$oMobile =& Mobile::getInstance();