mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-02-06 07:04:57 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
988dc9deff
|
@ -228,6 +228,7 @@
|
|||
- output splash message when removing, editing, adding a category or keyword
|
||||
- extensions cannot be disabled/enabled if configuration file is not writeable
|
||||
- prevent cross site scripting in views/bootstrap/class.DefaultKeywords.php
|
||||
- fix possible DoS in op/op.RemoveLog.php
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
Changes in version 5.1.24
|
||||
|
|
|
@ -129,7 +129,7 @@ elseif (isset($_GET["arkname"])) { /* {{{ */
|
|||
$controller->archive();
|
||||
} /* }}} */
|
||||
elseif (isset($_GET["logname"])) { /* {{{ */
|
||||
$filename = basename($_GET["logname"]);
|
||||
$filename = basename($_GET["logname"], '.log').'.log';
|
||||
|
||||
// log download
|
||||
|
||||
|
|
|
@ -41,6 +41,7 @@ if (!isset($_POST["lognames"]) || !is_array($_POST["lognames"])) {
|
|||
|
||||
$lognames = $_POST["lognames"];
|
||||
foreach($lognames as $file) {
|
||||
$file = basename($file, '.log').'.log';
|
||||
if(!file_exists($settings->_contentDir.'log/'.$file)) {
|
||||
UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
|
||||
}
|
||||
|
|
|
@ -35,7 +35,7 @@ if (!$accessop->check_view_access($view, $_GET)) {
|
|||
UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
|
||||
}
|
||||
|
||||
if (isset($_GET["logname"])) $logname=basename($_GET["logname"]);
|
||||
if (isset($_GET["logname"])) $logname=basename($_GET["logname"], '.log').'.log';
|
||||
else $logname=NULL;
|
||||
|
||||
if (isset($_GET["mode"])) $mode=$_GET["mode"];
|
||||
|
|
|
@ -49,6 +49,7 @@ if(!is_array($_GET["logname"]))
|
|||
else
|
||||
$lognames = $_GET["logname"];
|
||||
foreach($lognames as $file) {
|
||||
$file = basename($file, '.log').'.log';
|
||||
if(!file_exists($settings->_contentDir.'log/'.$file)) {
|
||||
UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user