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

r8189 적용 후 로그인이 안되는 문제 수정

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@8190 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
taggon 2011-03-16 06:14:06 +00:00
parent 8b64a98058
commit c706e33901
2 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
classes/context/Context.class.php
View file

@ -550,8 +550,12 @@ class Context {
function getResponseMethod() {
$self = ($this instanceof Context)?$this:Context::getInstance();
if($self->response_method) return $self->response_method;
$method = $self->getRequestMethod();
$methods = array('HTML','XMLRPC','JSON');
return in_array($self->response_method, $method)?$self->response_method:$methods[0];
return in_array($method, $methods)?$method:$methods[0];
}
/**
@ -977,8 +981,8 @@ class Context {
$self = ($this instanceof Context)?$this:Context::getInstance();
$avail_types = array('head', 'body');
if(!in_array($type, $avail_types)) $type = $avail_types[0];
if(strpos($file,'://')===false && $file{0}!='/' && $file{0}!='.') $file = './'.$file;
$file = preg_replace('@/\./|(?<!:)\/\/@', '/', $file);
while(strpos($file,'/../')) $file = preg_replace('/\/([^\/]+)\/\.\.\//s','/',$file,1);
@ -1274,4 +1278,4 @@ class Context {
return $path;
}
}
?>
?>

22
classes/display/HTMLDisplayHandler.php
View file

@ -136,20 +136,20 @@ class HTMLDisplayHandler {
{
$oContext =& Context::getInstance();
// add common JS/CSS files
$oContext->addJsFile("./common/js/jquery.js", '', -100000);
$oContext->addJsFile("./common/js/x.js", '', -100000);
$oContext->addJsFile("./common/js/common.js", '', -100000);
$oContext->addJsFile("./common/js/js_app.js", '', -100000);
$oContext->addJsFile("./common/js/xml_handler.js", '', -100000);
$oContext->addJsFile("./common/js/xml_js_filter.js", '', -100000);
$oContext->addCSSFile("./common/css/default.css", 'all', '', -100000);
$oContext->addCSSFile("./common/css/button.css", 'all', '', -100000);
$oContext->addJsFile('./common/js/jquery.js', false, '', -100000);
$oContext->addJsFile('./common/js/x.js', false, '', -100000);
$oContext->addJsFile('./common/js/common.js', false, '', -100000);
$oContext->addJsFile('./common/js/js_app.js', false, '', -100000);
$oContext->addJsFile('./common/js/xml_handler.js', false, '', -100000);
$oContext->addJsFile('./common/js/xml_js_filter.js', false, '', -100000);
$oContext->addCSSFile('./common/css/default.css', false, 'all', '', -100000);
$oContext->addCSSFile('./common/css/button.css', false, 'all', '', -100000);
// for admin page, add admin css
if(Context::get('module')=='admin' || strpos(Context::get('act'),'Admin')>0){
$oContext->addCSSFile("./modules/admin/tpl/css/font.css", 'all', '',10000);
$oContext->addCSSFile("./modules/admin/tpl/css/pagination.css", 'all', '', 100001);
$oContext->addCSSFile("./modules/admin/tpl/css/admin.css", 'all', '', 100002);
$oContext->addCSSFile('./modules/admin/tpl/css/font.css', false, 'all', '',10000);
$oContext->addCSSFile('./modules/admin/tpl/css/pagination.css', false, 'all', '', 100001);
$oContext->addCSSFile('./modules/admin/tpl/css/admin.css', false, 'all', '', 100002);
}
}
}