certerror added

3 files changed, 13 insertions, 1 deletions

diff --git a/application/modules/fbgui/controllers/AuthController.php b/application/modules/fbgui/controllers/AuthController.php
index c9f750a..5841356 100644
--- a/application/modules/fbgui/controllers/AuthController.php
+++ b/application/modules/fbgui/controllers/AuthController.php
@@ -41,7 +41,7 @@ class Fbgui_AuthController extends Zend_Controller_Action {
 	            return;
 	    	}
     	}
-    	$this->_redirect('/fbgui/');
+    	$this->_redirect('/fbgui/index/error/certresult/forbidden');
     	
     } 
     else {
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php
index 5651796..61af3dc 100644
--- a/application/modules/fbgui/controllers/IndexController.php
+++ b/application/modules/fbgui/controllers/IndexController.php
@@ -28,6 +28,11 @@ class Fbgui_IndexController extends Zend_Controller_Action {
 
 			$this->view->notification = Pbs_Notifier::notify('serial', $result);
 		}
+		$result = $this->_request->getParam('certresult');
+		if($result != "") {
+
+			$this->view->notification = Pbs_Notifier::notify('certificate', $result);
+		}
 	}
 
 	public function indexAction() {
diff --git a/library/Pbs/Notifier.php b/library/Pbs/Notifier.php
index 46dfd48..5e685fd 100644
--- a/library/Pbs/Notifier.php
+++ b/library/Pbs/Notifier.php
@@ -46,6 +46,13 @@ class Pbs_Notifier {
         break;
       }
       break;
+    case "certificate":
+      switch($result) {
+      case "forbidden":
+        $result = "<div class='errorbox'>Your certificate has either expired or was revoked. Please contact a PBS Administrator</div>";
+        break;
+      }
+      break;
     case "view":
       switch($result) {
       case "forbidden":