gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 00:45:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2018-04-03 11:00:08 +02:00
commit 8ecc721f3c
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SeedDMS_Core/Core/inc.FileUtils.php
View File

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

6
op/op.RemoveLog.php
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"));
}
}

2
out/out.LogManagement.php
View File

@ -43,7 +43,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->setParam('accessobject', $accessop);
$view($_GET);
exit;

2
out/out.RemoveLog.php
View File

@ -48,7 +48,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"));
}
}

14
views/bootstrap/class.LogManagement.php
View File

@ -53,8 +53,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>";
if($accessop->check_view_access('RemoveLog')) {
@ -92,7 +92,7 @@ $(document).ready( function() {
$dms = $this->params['dms'];
$user = $this->params['user'];
$accessop = $this->params['accessobject'];
$this->contentdir = $this->params['contentdir'];
$this->logdir = $this->params['logdir'];
$logname = $this->params['logname'];
$mode = $this->params['mode'];
@ -106,10 +106,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') {
@ -157,9 +157,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"));