- use $dms->contentDir

This commit is contained in:
steinm 2011-01-28 08:03:54 +00:00
parent 38760a712d
commit 6ebfb6470a
3 changed files with 152 additions and 157 deletions

View File

@ -110,7 +110,7 @@ if ($document->isLocked()) {
UI::contentContainerEnd();
// verify if file exists
$file_exists=file_exists($settings->_contentDir . $version->getPath());
$file_exists=file_exists($dms->contentDir . $version->getPath());
UI::contentHeading(getMLText("details_version", array ("version" => $version->getVersion())));
UI::contentContainerStart();
@ -138,7 +138,7 @@ print "<td class=\"center\">".$version->getVersion()."</td>\n";
print "<td><ul class=\"documentDetail\">\n";
print "<li>".$version->getOriginalFileName()."</li>\n";
if ($file_exists) print "<li>". formatted_size(filesize($settings->_contentDir . $version->getPath())) ." ".$version->getMimeType()."</li>";
if ($file_exists) print "<li>". formatted_size(filesize($dms->contentDir . $version->getPath())) ." ".$version->getMimeType()."</li>";
else print "<li><span class=\"warning\">".getMLText("document_deleted")."</span></li>";
$updatingUser = $version->getUser();

View File

@ -66,8 +66,7 @@ $document_count=0;
$file_count=0;
$storage_size=0;
function getAccessColor($mode)
{
function getAccessColor($mode) {
if ($mode == M_NONE)
return "gray";
else if ($mode == M_READ)
@ -78,8 +77,7 @@ function getAccessColor($mode)
return "red";
}
function printFolder($folder)
{
function printFolder($folder) {
global $folder_count,$settings;
$folder_count++;
@ -118,23 +116,21 @@ function printFolder($folder)
return $folder_size;
}
function printDocument($document)
{
global $document_count,$file_count,$settings,$storage_size;
function printDocument($document) {
global $document_count, $file_count, $storage_size, $dms;
$document_count++;
$local_file_count=0;
$folder_size=0;
if (file_exists($settings->_contentDir.$document->getDir())){
$handle = opendir($settings->_contentDir.$document->getDir());
while ($entry = readdir($handle) )
{
if (is_dir($settings->_contentDir.$document->getDir().$entry)) continue;
if (file_exists($dms->contentDir.$document->getDir())) {
$handle = opendir($dms->contentDir.$document->getDir());
while ($entry = readdir($handle) ) {
if (is_dir($dms->contentDir.$document->getDir().$entry)) continue;
else{
$local_file_count++;
$folder_size += filesize($settings->_contentDir.$document->getDir().$entry);
$folder_size += filesize($dms->contentDir.$document->getDir().$entry);
}
}
@ -160,8 +156,7 @@ function printDocument($document)
return $folder_size;
}
function printAccessList($obj)
{
function printAccessList($obj) {
$accessList = $obj->getAccessList();
if (count($accessList["users"]) == 0 && count($accessList["groups"]) == 0)
return;

View File

@ -120,7 +120,7 @@ foreach($documents as $document) {
print "<tr>";
if (file_exists($settings->_contentDir . $latestContent->getPath()))
if (file_exists($dms->contentDir . $latestContent->getPath()))
print "<td><a href=\"../op/op.Download.php?documentid=".$docID."&version=".$version."\"><img class=\"mimeicon\" src=\"images/icons/".UI::getMimeIcon($latestContent->getFileType())."\" title=\"".$latestContent->getMimeType()."\"></a></td>";
else print "<td><img class=\"mimeicon\" src=\"images/icons/".UI::getMimeIcon($latestContent->getFileType())."\" title=\"".$latestContent->getMimeType()."\"></td>";