On init errors, use an ErrorDispatcher which tries to pretty-print the

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

On init errors, use an ErrorDispatcher which tries to pretty-print the
error message. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4923 c91229c3-7414-0410-bfa2-8a42b809f60b
Neil Blakey-Milner
1 parent 4749ccf0
Showing 3 changed files with 68 additions and 6 deletions
config/dmsDefaults.php
lib/dispatcher.inc.php
lib/validation/errorviewer.inc.php
@@ -265,8 +265,10 @@ class KTInit {
         if ($checkup === true) {
             return;
         }
-        // XXX: Make it look pretty
-        die($oError->toString());
+        require_once(KT_LIB_DIR . '/dispatcher.inc.php');
+        $oDispatcher =& new KTErrorDispatcher($oError);
+        $oDispatcher->dispatch();
+        exit(0);
     }
     // }}}
@@ -276,5 +276,23 @@ class KTAdminDispatcher extends KTStandardDispatcher {
     }
 }
+class KTErrorDispatcher extends KTStandardDispatcher {
+    var $bLogonRequired = true;
+
+    function KTErrorDispatcher($oError) {
+        parent::KTStandardDispatcher();
+        $this->oError =& $oError;
+    }
+
+    function dispatch() {
+        require_once(KT_LIB_DIR . '/validation/errorviewer.inc.php');
+        $oRegistry =& KTErrorViewerRegistry::getSingleton();
+        $oViewer =& $oRegistry->getViewer($this->oError);
+        $this->oPage->setTitle($oViewer->view());
+        $this->oPage->hideSection();
+        $this->handleOutput($oViewer->page());
+    }
+}
+
 ?>
@@ -13,11 +13,11 @@ class KTErrorViewerRegistry {
     }
     function register($sViewerClassName, $sHandledClass) {
-        $this->aViewers[$sHandledClass] = $sViewerClassName;
+        $this->aViewers[strtolower($sHandledClass)] = $sViewerClassName;
     }
     function getViewer($oError) {
-        $sErrorClass = get_class($oError);
+        $sErrorClass = strtolower(get_class($oError));
         // Try for direct hit first
         $sClass = $sErrorClass;
@@ -77,14 +77,56 @@ class KTErrorViewer {
     }
     function viewFull() {
-        return $this->oError->getString();
+        return $this->oError->toString();
+    }
+
+    function page() {
+        $ret  = "<h2>Error</h2>\n\n";
+        $ret .= "<dl>\n";
+        $ret .= "\t<dt>Error type</dt>\n";
+        $ret .= "\t<dd>" . $this->oError->getMessage() . "</dd>\n";
+        $sInfo = $this->parseUserInfo();
+        if ($sInfo) {
+            $ret .= "\t<dt>Additional information</dt>\n";
+            $ret .= "\t<dd>" . $sInfo . "</dd>\n";
+        }
+        $ret .= "</dl>\n";
+        return $ret;
+    }
+
+    function parseUserInfo() {
+        $sUserInfo = $this->oError->getUserInfo();
+        return $sUserInfo;
     }
 }
 $oEVRegistry->register("KTErrorViewer", "PEAR_Error");
 class KTDBErrorViewer extends KTErrorViewer {
     function view() {
-        return _("Database error:") . " " . $this->oError->errorMessage();
+        return _("Database error:") . " " . $this->oError->getMessage();
+    }
+
+    function page() {
+        $ret  = "<h2>Database Error</h2>\n\n";
+        $ret .= "<dl>\n";
+        $ret .= "\t<dt>Error type</dt>\n";
+        $ret .= "\t<dd>" . $this->oError->getMessage() . "</dd>\n";
+        $sInfo = $this->parseUserInfo();
+        if ($sInfo) {
+            $ret .= "\t<dt>Additional information</dt>\n";
+            $ret .= "\t<dd>" . $sInfo . "</dd>\n";
+        }
+        $ret .= "</dl>\n";
+        return $ret;
+    }
+
+    function parseUserInfo() {
+        $sUserInfo = $this->oError->getUserInfo();
+        $aMatches = array();
+        if (preg_match("#^ ?\[nativecode=(Can't connect to local.*) \(13\)#", $sUserInfo, $aMatches)) {
+            return $aMatches[1];
+        }
+        return $sUserInfo;
     }
 }
 $oEVRegistry->register("KTDBErrorViewer", "DB_Error");