Update of /cvsroot/helpmeict/Helpdesk/system
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv9918/system
Modified Files:
db.php security.php
Log Message:
bug fixes
Index: db.php
===================================================================
RCS file: /cvsroot/helpmeict/Helpdesk/system/db.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** db.php 11 Mar 2007 15:23:48 -0000 1.3
--- db.php 11 Mar 2007 16:32:12 -0000 1.4
***************
*** 86,90 ****
// Query database
$data =& $helpdeskdb->getAll(filter_sql($sql));
!
// Check that result is not an error
if (PEAR::isError($data))
--- 86,90 ----
// Query database
$data =& $helpdeskdb->getAll(filter_sql($sql));
!
// Check that result is not an error
if (PEAR::isError($data))
Index: security.php
===================================================================
RCS file: /cvsroot/helpmeict/Helpdesk/system/security.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** security.php 11 Mar 2007 15:23:48 -0000 1.4
--- security.php 11 Mar 2007 16:32:12 -0000 1.5
***************
*** 27,35 ****
*/
// Deny a user access, and display the login sidebar
function ThrowOut() {
global $helpdeskdb, $_lang, $conf;
- $redirect = $_SERVER["REQUEST_URI"];
- $ptitle = 'Access Error';
include "header.php";
AccessDenied();
--- 27,38 ----
*/
+ require_once 'system/db.php';
+ require_once 'system/lang.php';
+ require_once 'config/global.conf.php';
+
// Deny a user access, and display the login sidebar
function ThrowOut() {
+ session_destroy();
global $helpdeskdb, $_lang, $conf;
include "header.php";
AccessDenied();
***************
*** 38,42 ****
// Deny access to a user - use after sidebar has been displayed
function AccessDenied() {
! global $helpdeskdb;
// Set Language
set_text_domain("security");
--- 41,45 ----
// Deny access to a user - use after sidebar has been displayed
function AccessDenied() {
! global $helpdeskdb, $_lang;
// Set Language
set_text_domain("security");
***************
*** 44,51 ****
print "<h1>".gettext("Access Error")."</h1>\n";
print "<h2>".gettext("Either you do not have permission to access this page or you are not currently logged in.")."</h2>\n";
! print "<div class=\"block\" align=\"center\"><p>".gettext("Please choose another option or log in as a user who does have permission to access the page.")."</p></div>";
// Include
! require 'footer.php';
exit;
}
--- 47,54 ----
print "<h1>".gettext("Access Error")."</h1>\n";
print "<h2>".gettext("Either you do not have permission to access this page or you are not currently logged in.")."</h2>\n";
! print "<div class=\"block\" align=\"center\"><p>".sprintf(gettext('Please choose another option or %slog in%s as a user who does have permission to access the page.'), '<a href="index.php?redirect='.urlencode($_SERVER["REQUEST_URI"]).'">', '</a>')."</p></div>";
// Include
! include 'footer.php';
exit;
}
|
