- took over changes from stable release 2.0.2

This commit is contained in:
steinm 2010-11-05 21:43:08 +00:00
parent d02848cce6
commit 01648e3d7a
3 changed files with 5 additions and 7 deletions

View File

@ -162,6 +162,7 @@ class UI {
}
function globalNavigation($folder=null) {
global $settings, $user;
echo "<div class=\"globalBox\">\n";
@ -170,9 +171,7 @@ class UI {
echo "<li id=\"first\"><a href=\"../out/out.ViewFolder.php?folderid=".$settings->_rootFolderID."\">".getMLText("content")."</a></li>\n";
if ($settings->_enableCalendar) echo "<li><a href=\"../out/out.Calendar.php?mode=".$settings->_calendarDefaultView."\">".getMLText("calendar")."</a></li>\n";
if ($user->getID() != $settings->_guestID) echo "<li><a href=\"../out/out.MyDocuments.php?inProcess=1\">".getMLText("my_documents")."</a></li>\n";
if ($user->getID() != $settings->_guestID) echo "<li><a href=\"../out/out.MyAccount.php\">".getMLText("my_account")."</a></li>\n";
if ($user->isAdmin()) echo "<li><a href=\"../out/out.AdminTools.php\">".getMLText("admin_tools")."</a></li>\n";
echo "<li><a href=\"../out/out.Help.php\">".getMLText("help")."</a></li>\n";
echo "<li id=\"search\">\n";
@ -320,8 +319,7 @@ class UI {
if ($settings->_enableUsersView){
echo "<li><a href=\"../out/out.UsrView.php\">".getMLText("users")."</a></li>\n";
echo "<li><a href=\"../out/out.GroupView.php\">".getMLText("groups")."</a></li>\n";
}
}
echo "</ul>\n";
return;
}

View File

@ -270,9 +270,7 @@ class LetoDMS_User
$this->_isHidden = $isAdmin;
return true;
}
}
/**
* Entfernt den Benutzer aus dem System.
@ -281,6 +279,7 @@ class LetoDMS_User
* tblNotify, tblGroupMembers, tblFolders, tblDocuments und tblDocumentContent müssen berücksichtigt werden.
*/
function remove( $assignTo=-1 ) {
GLOBAL $db, $settings, $user;
if ($assignTo==-1) $assignTo=$settings->_adminID;

View File

@ -2,6 +2,7 @@
// MyDMS. Document Management System
// Copyright (C) 2002-2005 Markus Westphal
// Copyright (C) 2006-2008 Malcolm Cowe
// Copyright (C) 2010 Matteo Lucarelli
//
// 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