Rework our exception framework to fit into Kohana's model better.

Instead of overwriting Kohana_Exception::handle() (which we were doing
in MY_Kohana_Exception) we instead use their existing template system.

gallery/views/kohana/error.php overrides system/views/kohana/error.php
and is the standard error template for all exceptions.  Our version of
error.php figures out the appropriate view based on context (cli,
authenticated admin, guest viewing a 404, guest viewing a system
error) and delegates appropriately.  Each delegated view has a narrow
responsibility.

This paves the way for us to add new error views per module.  For
example, the rest module will define its own template in
Rest_Exception and then its exceptions can be rendered the way that it
wants (json encoded, in that case).

1 files changed, 0 insertions, 62 deletions

diff --git a/modules/gallery/libraries/MY_Kohana_Exception.php b/modules/gallery/libraries/MY_Kohana_Exception.php
index 11556f7a..72cb2ac0 100644
--- a/modules/gallery/libraries/MY_Kohana_Exception.php
+++ b/modules/gallery/libraries/MY_Kohana_Exception.php
@@ -29,68 +29,6 @@ class Kohana_Exception extends Kohana_Exception_Core {
       $e->getTraceAsString());
   }
 
-  public static function handle(Exception $e) {
-    if ($e instanceof ORM_Validation_Exception) {
-      Kohana_Log::add("error", "Validation errors: " . print_r($e->validation->errors(), 1));
-    }
-    try {
-      $user = identity::active_user();
-      $try_themed_view = $user && !$user->admin;
-    } catch (Exception $e2) {
-      $try_themed_view = false;
-    }
-
-    if ($try_themed_view) {
-      try {
-        return self::_show_themed_error_page($e);
-      } catch (Exception $e3) {
-        Kohana_Log::add("error", "Exception in exception handling code: " . self::text($e3));
-        return parent::handle($e);
-      }
-    } else {
-      return parent::handle($e);
-    }
-  }
-
-  /**
-   * Shows a themed error page.
-   * @see Kohana_Exception::handle
-   */
-  private static function _show_themed_error_page(Exception $e) {
-    // Create a text version of the exception
-    $error = Kohana_Exception::text($e);
-
-    // Add this exception to the log
-    Kohana_Log::add("error", $error);
-
-    // Manually save logs after exceptions
-    Kohana_Log::save();
-
-    if (!headers_sent()) {
-      if ($e instanceof Kohana_Exception) {
-        $e->sendHeaders();
-      } else {
-        header("HTTP/1.1 500 Internal Server Error");
-      }
-    }
-
-    $view = new Theme_View("page.html", "other", "error");
-    if ($e instanceof Kohana_404_Exception) {
-      $view->page_title = t("Dang...  Page not found!");
-      $view->content = new View("error_404.html");
-      $user = identity::active_user();
-      $view->content->is_guest = $user && $user->guest;
-      if ($view->content->is_guest) {
-        $view->content->login_form = new View("login_ajax.html");
-        $view->content->login_form->form = auth::get_login_form("login/auth_html");
-      }
-    } else {
-      $view->page_title = t("Dang...  Something went wrong!");
-      $view->content = new View("error.html");
-    }
-    print $view;
-  }
-
   /**
    * @see Kohana_Exception::dump()
    */