- 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(); UI::contentContainerEnd();
// verify if file exists // 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::contentHeading(getMLText("details_version", array ("version" => $version->getVersion())));
UI::contentContainerStart(); UI::contentContainerStart();
@ -138,7 +138,7 @@ print "<td class=\"center\">".$version->getVersion()."</td>\n";
print "<td><ul class=\"documentDetail\">\n"; print "<td><ul class=\"documentDetail\">\n";
print "<li>".$version->getOriginalFileName()."</li>\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>"; else print "<li><span class=\"warning\">".getMLText("document_deleted")."</span></li>";
$updatingUser = $version->getUser(); $updatingUser = $version->getUser();

View File

@ -1,64 +1,64 @@
<?php <?php
// MyDMS. Document Management System // MyDMS. Document Management System
// Copyright (C) 2010 Matteo Lucarelli // Copyright (C) 2010 Matteo Lucarelli
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or // the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// This program is distributed in the hope that it will be useful, // This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php"); include("../inc/inc.Settings.php");
include("../inc/inc.DBInit.php"); include("../inc/inc.DBInit.php");
include("../inc/inc.Utils.php"); include("../inc/inc.Utils.php");
include("../inc/inc.Language.php"); include("../inc/inc.Language.php");
include("../inc/inc.ClassUI.php"); include("../inc/inc.ClassUI.php");
include("../inc/inc.Authentication.php"); include("../inc/inc.Authentication.php");
// TODO: javascript open/close folder // TODO: javascript open/close folder
if (!$user->isAdmin()) { if (!$user->isAdmin()) {
UI::exitError(getMLText("admin_tools"),getMLText("access_denied")); UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
} }
UI::htmlStartPage(getMLText("folders_and_documents_statistic")); UI::htmlStartPage(getMLText("folders_and_documents_statistic"));
UI::globalNavigation(); UI::globalNavigation();
UI::pageNavigation(getMLText("admin_tools"), "admin_tools"); UI::pageNavigation(getMLText("admin_tools"), "admin_tools");
?> ?>
<style type="text/css"> <style type="text/css">
.folderClass { .folderClass {
list-style-image : url(<?php UI::printImgPath("folder_closed.gif");?>); list-style-image : url(<?php UI::printImgPath("folder_closed.gif");?>);
list-style : url(<?php UI::printImgPath("folder_closed.gif");?>); list-style : url(<?php UI::printImgPath("folder_closed.gif");?>);
} }
.documentClass { .documentClass {
list-style-image : url(<?php UI::printImgPath("file.gif");?>); list-style-image : url(<?php UI::printImgPath("file.gif");?>);
list-style : url(<?php UI::printImgPath("file.gif");?>); list-style : url(<?php UI::printImgPath("file.gif");?>);
} }
</style> </style>
<script language="JavaScript"> <script language="JavaScript">
function showDocument(id) { function showDocument(id) {
url = "out.DetailedStatistic.php?documentid=" + id; url = "out.DetailedStatistic.php?documentid=" + id;
alert(url); alert(url);
} }
function showFolder(id) { function showFolder(id) {
url = "out.DetailedStatistic.php?folderid=" + id; url = "out.DetailedStatistic.php?folderid=" + id;
alert(url); alert(url);
} }
</script> </script>
<?php <?php
$folder_count=0; $folder_count=0;
@ -66,128 +66,123 @@ $document_count=0;
$file_count=0; $file_count=0;
$storage_size=0; $storage_size=0;
function getAccessColor($mode) function getAccessColor($mode) {
{ if ($mode == M_NONE)
if ($mode == M_NONE) return "gray";
return "gray"; else if ($mode == M_READ)
else if ($mode == M_READ) return "green";
return "green"; else if ($mode == M_READWRITE)
else if ($mode == M_READWRITE) return "blue";
return "blue"; else // if ($mode == M_ALL)
else // if ($mode == M_ALL) return "red";
return "red"; }
}
function printFolder($folder) {
function printFolder($folder)
{
global $folder_count,$settings; global $folder_count,$settings;
$folder_count++; $folder_count++;
$folder_size=0; $folder_size=0;
$doc_count=0; $doc_count=0;
$color = $folder->inheritsAccess() ? "black" : getAccessColor($folder->getDefaultAccess()); $color = $folder->inheritsAccess() ? "black" : getAccessColor($folder->getDefaultAccess());
print "<li class=\"folderClass\">"; print "<li class=\"folderClass\">";
print "<a style=\"color: $color\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."\">".$folder->getName() ."</a>"; print "<a style=\"color: $color\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."\">".$folder->getName() ."</a>";
$owner = $folder->getOwner(); $owner = $folder->getOwner();
$color = getAccessColor(M_ALL); $color = getAccessColor(M_ALL);
print " [<span style=\"color: $color\">".$owner->getFullName()."</span>] "; print " [<span style=\"color: $color\">".$owner->getFullName()."</span>] ";
if (! $folder->inheritsAccess()) if (! $folder->inheritsAccess())
printAccessList($folder); printAccessList($folder);
$subFolders = $folder->getSubFolders(); $subFolders = $folder->getSubFolders();
$documents = $folder->getDocuments(); $documents = $folder->getDocuments();
print "<ul>"; print "<ul>";
foreach ($subFolders as $sub) $folder_size += printFolder($sub); foreach ($subFolders as $sub) $folder_size += printFolder($sub);
foreach ($documents as $document){ foreach ($documents as $document){
$doc_count++; $doc_count++;
$folder_size += printDocument($document); $folder_size += printDocument($document);
} }
print "</ul>"; print "</ul>";
print "<small>".formatted_size($folder_size).", ".$doc_count." ".getMLText("documents")."</small>\n"; print "<small>".formatted_size($folder_size).", ".$doc_count." ".getMLText("documents")."</small>\n";
print "</li>"; print "</li>";
return $folder_size; return $folder_size;
} }
function printDocument($document) function printDocument($document) {
{ global $document_count, $file_count, $storage_size, $dms;
global $document_count,$file_count,$settings,$storage_size;
$document_count++; $document_count++;
$local_file_count=0; $local_file_count=0;
$folder_size=0; $folder_size=0;
if (file_exists($settings->_contentDir.$document->getDir())){ if (file_exists($dms->contentDir.$document->getDir())) {
$handle = opendir($settings->_contentDir.$document->getDir()); $handle = opendir($dms->contentDir.$document->getDir());
while ($entry = readdir($handle) ) while ($entry = readdir($handle) ) {
{ if (is_dir($dms->contentDir.$document->getDir().$entry)) continue;
if (is_dir($settings->_contentDir.$document->getDir().$entry)) continue;
else{ else{
$local_file_count++; $local_file_count++;
$folder_size += filesize($settings->_contentDir.$document->getDir().$entry); $folder_size += filesize($dms->contentDir.$document->getDir().$entry);
} }
} }
closedir($handle); closedir($handle);
} }
$storage_size += $folder_size; $storage_size += $folder_size;
$color = $document->inheritsAccess() ? "black" : getAccessColor($document->getDefaultAccess()); $color = $document->inheritsAccess() ? "black" : getAccessColor($document->getDefaultAccess());
print "<li class=\"documentClass\">"; print "<li class=\"documentClass\">";
print "<a style=\"color: $color\" href=\"out.ViewDocument.php?documentid=".$document->getID()."\">".$document->getName()."</a>"; print "<a style=\"color: $color\" href=\"out.ViewDocument.php?documentid=".$document->getID()."\">".$document->getName()."</a>";
$owner = $document->getOwner(); $owner = $document->getOwner();
$color = getAccessColor(M_ALL); $color = getAccessColor(M_ALL);
print " [<span style=\"color: $color\">".$owner->getFullName()."</span>] "; print " [<span style=\"color: $color\">".$owner->getFullName()."</span>] ";
if (! $document->inheritsAccess()) printAccessList($document); if (! $document->inheritsAccess()) printAccessList($document);
print "<small>".formatted_size($folder_size).", ".$local_file_count." ".getMLText("files")."</small>\n"; print "<small>".formatted_size($folder_size).", ".$local_file_count." ".getMLText("files")."</small>\n";
print "</li>"; print "</li>";
$file_count += $local_file_count; $file_count += $local_file_count;
return $folder_size; return $folder_size;
}
function printAccessList($obj)
{
$accessList = $obj->getAccessList();
if (count($accessList["users"]) == 0 && count($accessList["groups"]) == 0)
return;
print " <span>(";
for ($i = 0; $i < count($accessList["groups"]); $i++)
{
$group = $accessList["groups"][$i]->getGroup();
$color = getAccessColor($accessList["groups"][$i]->getMode());
print "<span style=\"color: $color\">".$group->getName()."</span>";
if ($i+1 < count($accessList["groups"]) || count($accessList["users"]) > 0)
print ", ";
}
for ($i = 0; $i < count($accessList["users"]); $i++)
{
$user = $accessList["users"][$i]->getUser();
$color = getAccessColor($accessList["users"][$i]->getMode());
print "<span style=\"color: $color\">".$user->getFullName()."</span>";
if ($i+1 < count($accessList["users"]))
print ", ";
}
print ")</span>";
} }
UI::contentHeading(getMLText("folders_and_documents_statistic")); function printAccessList($obj) {
$accessList = $obj->getAccessList();
if (count($accessList["users"]) == 0 && count($accessList["groups"]) == 0)
return;
print " <span>(";
for ($i = 0; $i < count($accessList["groups"]); $i++)
{
$group = $accessList["groups"][$i]->getGroup();
$color = getAccessColor($accessList["groups"][$i]->getMode());
print "<span style=\"color: $color\">".$group->getName()."</span>";
if ($i+1 < count($accessList["groups"]) || count($accessList["users"]) > 0)
print ", ";
}
for ($i = 0; $i < count($accessList["users"]); $i++)
{
$user = $accessList["users"][$i]->getUser();
$color = getAccessColor($accessList["users"][$i]->getMode());
print "<span style=\"color: $color\">".$user->getFullName()."</span>";
if ($i+1 < count($accessList["users"]))
print ", ";
}
print ")</span>";
}
UI::contentHeading(getMLText("folders_and_documents_statistic"));
UI::contentContainerStart(); UI::contentContainerStart();
print "<table><tr><td>\n"; print "<table><tr><td>\n";
@ -202,8 +197,8 @@ print "</ul>\n";
print "</td><td>\n"; print "</td><td>\n";
print "<ul>\n"; print "<ul>\n";
printFolder($dms->getFolder($settings->_rootFolderID)); printFolder($dms->getFolder($settings->_rootFolderID));
print "</ul>\n"; print "</ul>\n";
print "</td></tr>"; print "</td></tr>";
@ -221,8 +216,8 @@ print "</ul>\n";
print "</td></tr>"; print "</td></tr>";
print "</table>\n"; print "</table>\n";
UI::contentContainerEnd(); UI::contentContainerEnd();
UI::htmlEndPage(); UI::htmlEndPage();
?> ?>

View File

@ -119,8 +119,8 @@ foreach($documents as $document) {
$status = $latestContent->getStatus(); $status = $latestContent->getStatus();
print "<tr>"; 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>"; 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>"; else print "<td><img class=\"mimeicon\" src=\"images/icons/".UI::getMimeIcon($latestContent->getFileType())."\" title=\"".$latestContent->getMimeType()."\"></td>";