Introduced isCurrentProfileInScope() which shall check if current profile is

[quix0rs-gnu-social.git] / lib / error.php

diff --git a/lib/error.php b/lib/error.php
index 762425dc44ade45ccb3e46c77aec6bfcf07cda1b..e7bdd0570703efc048c2e4b7481e3e9514132ad4 100644 (file)
--- a/lib/error.php
+++ b/lib/error.php
@@ -33,8 +33,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/info.php';
-
 /**
  * Base class for displaying HTTP errors
  *
@@ -68,7 +66,11 @@ class ErrorAction extends InfoAction
 
     function showPage()
     {
-        if ($this->minimal) {
+        if (StatusNet::isAjax()) {
+            $this->extraHeaders();
+            $this->ajaxErrorMsg();
+            exit();
+        } if ($this->minimal) {
             // Even more minimal -- we're in a machine API
             // and don't want to flood the output.
             $this->extraHeaders();
@@ -91,6 +93,30 @@ class ErrorAction extends InfoAction
         $this->element('div', array('class' => 'error'), $this->message);
     }
 
+    function showNoticeForm()
+    {
+    }
 
+    /**
+     * Show an Ajax-y error message
+     *
+     * Goes back to the browser, where it's shown in a popup.
+     *
+     * @param string $msg Message to show
+     *
+     * @return void
+     */
 
+    function ajaxErrorMsg()
+    {
+        $this->startHTML('text/xml;charset=utf-8', true);
+        $this->elementStart('head');
+        // TRANS: Page title after an AJAX error occurs on the send notice page.
+        $this->element('title', null, _('Ajax Error'));
+        $this->elementEnd('head');
+        $this->elementStart('body');
+        $this->element('p', array('id' => 'error'), $this->message);
+        $this->elementEnd('body');
+        $this->endHTML();
+    }
 }