fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-25 13:22:16 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'hotfix/1.7.11'

Browse source
This commit is contained in:
bnu 2015-02-17 14:57:26 +09:00
commit 07c28ac41e
6 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -367,6 +367,8 @@ class Context
$this->allow_rewrite = ($this->db_info->use_rewrite == 'Y' ? TRUE : FALSE);
// set locations for javascript use
$url = array();
$current_url = self::getRequestUri();
if($_SERVER['REQUEST_METHOD'] == 'GET')
{
if($this->get_vars)
@ -386,17 +388,21 @@ class Context
$url[] = $key . '=' . urlencode($val);
}
}
$this->set('current_url', self::getRequestUri() . '?' . join('&', $url));
$current_url = self::getRequestUri();
if($url) $current_url .= '?' . join('&', $url);
}
else
{
$this->set('current_url', $this->getUrl());
$current_url = $this->getUrl();
}
}
else
{
$this->set('current_url', self::getRequestUri());
$current_url = self::getRequestUri();
}
$this->set('current_url', $current_url);
$this->set('request_uri', self::getRequestUri());
}
@ -1157,6 +1163,7 @@ class Context
{
continue;
}
$key = htmlentities($key);
$val = $this->_filterRequestVar($key, $val);
if($requestMethod == 'GET' && isset($_GET[$key]))

7
common/tpl/redirect.html
View file

@ -5,8 +5,9 @@
</head>
<body>
<script>
var idx = location.href.indexOf('?');
var url = parent.location.href;
var url = location.href;
var idx = url.indexOf('?');
if(idx > -1 ) {
var query_string = location.href.substr(idx+1, location.href.length);
var args = {};
@ -23,4 +24,4 @@
}
</script>
</body>
</html>
</html>

2
config/config.inc.php
View file

@ -29,7 +29,7 @@ define('__ZBXE__', __XE__);
/**
* Display XE's full version.
*/
define('__XE_VERSION__', '1.7.10');
define('__XE_VERSION__', '1.7.11');
define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));

9
modules/board/board.view.php
View file

@ -267,6 +267,15 @@ class boardView extends board
}
}
// if the document is TEMP saved, check Grant
if($oDocument->getStatus() == 'TEMP')
{
if(!$oDocument->isGranted())
{
$oDocument = $oDocumentModel->getDocument(0);
}
}
}
else
{

5
modules/document/document.controller.php
View file

@ -876,7 +876,10 @@ class documentController extends document
}
// Register session
$_SESSION['readed_document'][$document_srl] = true;
if(!$_SESSION['banned_document'][$document_srl])
{
$_SESSION['readed_document'][$document_srl] = true;
}
return TRUE;
}

2
modules/point/point.controller.php
View file

@ -420,10 +420,12 @@ class pointController extends point
// Get the defaul configurations of the Point Module
$config = $oModuleModel->getModuleConfig('point');
// When the requested points are negative, compared it with the current point
$_SESSION['banned_document'][$obj->document_srl] = false;
if($config->disable_read_document == 'Y' && $point < 0 && abs($point)>$cur_point)
{
$message = sprintf(Context::getLang('msg_disallow_by_point'), abs($point), $cur_point);
$obj->add('content', $message);
$_SESSION['banned_document'][$obj->document_srl] = true;
return new Object(-1, $message);
}
// If not logged in, pass