handle anonymous permissions more gracefully.

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5707 c91229c3-7414-0410-bfa2-8a42b809f60b

handle anonymous permissions more gracefully.
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5707 c91229c3-7414-0410-bfa2-8a42b809f60b
Brad Shuttleworth
1 parent 498a807a
Showing 2 changed files with 14 additions and 11 deletions
lib/dispatcher.inc.php
view.php
@@ -204,11 +204,16 @@ class KTStandardDispatcher extends KTDispatcher {
     }
     function permissionDenied () {
-        global $default;
-            
-        $msg = '<h2>' . _kt('Permission Denied') . '</h2>';
-        $msg .= '<p>' . _kt('If you feel that this is incorrect, please report both the action and your username to a system administrator.') . '</p>';
-            
+        // handle anonymous specially. 
+        if ($this->oUser->getId() == -2) {
+            redirect(KTUtil::ktLink('login.php','',sprintf("redirect=%s&errorMessage=%s", urlencode($_SERVER['REQUEST_URI']), urlencode(_kt("You must be logged in to perform this action"))))); exit(0);
+        }    
+    
+	    global $default;
+		
+		$msg = '<h2>' . _kt('Permission Denied') . '</h2>';
+		$msg .= '<p>' . _kt('If you feel that this is incorrect, please report both the action and your username to a system administrator.') . '</p>';
+		
         $this->oPage->setPageContents($msg);
         $this->oPage->setUser($this->oUser);
         $this->oPage->hideSection();
@@ -111,7 +111,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
                 return $this->do_error();
             } else if (!Permission::userHasDocumentReadPermission($oDocument)) {
                 $this->oPage->addError(_kt('You are not allowed to view this document'));
-                return $this->do_error();
+                return $this->permissionDenied();
             }
         }
@@ -350,7 +350,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
     if (!Permission::userHasDocumentReadPermission($oDocument)) {
         // FIXME inconsistent.
         $this->oPage->addError(_kt('You are not allowed to view this document'));
-        return $this->do_error();
+        return $this->permissionDenied();
     }
     $this->oDocument =& $oDocument;
@@ -457,10 +457,8 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
     return $oTemplate->render($aTemplateData);
     }
-    /* we have a lot of error handling.  this one is the absolute final failure. */
     function do_error() {
-        return ''; // allow normal rendering of errors.
-        // FIXME show something useful / generic.
+        return '&nbsp;'; // don't actually do anything.
     }
     function do_startComparison() {
@@ -487,7 +485,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
         if (!Permission::userHasDocumentReadPermission($oDocument)) {
             // FIXME inconsistent.
             $this->oPage->addError(_kt('You are not allowed to view this document'));
-            return $this->do_error();
+            return $this->permissionDenied();
         }
         $this->oDocument =& $oDocument;
         $this->oPage->setSecondaryTitle($oDocument->getName());