fix name for log files

This commit is contained in:
Uwe Steinmann 2018-04-03 10:57:29 +02:00
parent 156dfe9b0b
commit c539693288
5 changed files with 13 additions and 13 deletions

View File

@ -284,4 +284,4 @@ class SeedDMS_Core_File {
if($error) return false;
else return $dest;
} /* }}} */
}
}

View File

@ -41,15 +41,15 @@ if (!isset($_POST["lognames"]) || !is_array($_POST["lognames"])) {
$lognames = $_POST["lognames"];
foreach($lognames as $file) {
if(!file_exists($settings->_contentDir.$file)) {
if(!file_exists($settings->_contentDir.'log/'.$file)) {
UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
}
if (@readlink($settings->_contentDir."current.log")==$settings->_contentDir.$file){
if (@readlink($settings->_contentDir."current.log")==$settings->_contentDir.'log/'.$file){
UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
}
if (!SeedDMS_Core_File::removeFile($settings->_contentDir.$file)) {
if (!SeedDMS_Core_File::removeFile($settings->_contentDir.'log/'.$file)) {
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
}
}

View File

@ -42,7 +42,7 @@ else $mode='web';
if($view) {
$view->setParam('logname', $logname);
$view->setParam('mode', $mode);
$view->setParam('contentdir', $settings->_contentDir);
$view->setParam('logdir', $settings->_contentDir.'log/');
$view($_GET);
exit;
}

View File

@ -47,7 +47,7 @@ if(!is_array($_GET["logname"]))
else
$lognames = $_GET["logname"];
foreach($lognames as $file) {
if(!file_exists($settings->_contentDir.$file)) {
if(!file_exists($settings->_contentDir.'log/'.$file)) {
UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
}
}

View File

@ -52,8 +52,8 @@ class SeedDMS_View_LogManagement extends SeedDMS_Bootstrap_Style {
print "<td><input type=\"checkbox\" name=\"logname[]\" value=\"".$entry."\"/></td>\n";
print "<td><a href=\"out.LogManagement.php?logname=".$entry."\">".$entry."</a></td>\n";
print "\n";
print "<td>".getLongReadableDate(filectime($this->contentdir.$entry))."</td>\n";
print "<td>".SeedDMS_Core_File::format_filesize(filesize($this->contentdir.$entry))."</td>\n";
print "<td>".getLongReadableDate(filectime($this->logdir.$entry))."</td>\n";
print "<td>".SeedDMS_Core_File::format_filesize(filesize($this->logdir.$entry))."</td>\n";
print "<td>";
print "<a href=\"out.RemoveLog.php?mode=".$mode."&logname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("rm_file")."</a>";
@ -86,7 +86,7 @@ $(document).ready( function() {
function show() { /* {{{ */
$dms = $this->params['dms'];
$user = $this->params['user'];
$this->contentdir = $this->params['contentdir'];
$this->logdir = $this->params['logdir'];
$logname = $this->params['logname'];
$mode = $this->params['mode'];
@ -100,10 +100,10 @@ $(document).ready( function() {
$entries = array();
$wentries = array();
$handle = opendir($this->contentdir);
$handle = opendir($this->logdir);
if($handle) {
while ($e = readdir($handle)){
if (is_dir($this->contentdir.$e)) continue;
if (is_dir($this->logdir.$e)) continue;
if (strpos($e,".log")==FALSE) continue;
if (strcmp($e,"current.log")==0) continue;
if(substr($e, 0, 6) == 'webdav') {
@ -151,9 +151,9 @@ $(document).ready( function() {
<?php
$this->contentEnd();
$this->htmlEndPage();
} elseif(file_exists($this->contentdir.$logname)){
} elseif(file_exists($this->logdir.$logname)){
echo $logname."<pre>\n";
readfile($this->contentdir.$logname);
readfile($this->logdir.$logname);
echo "</pre>\n";
} else {
UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));