Use 'StartpageAction' to determine what to show on /

diff --git a/actions/logout.php b/actions/logout.php
index 4e51271d43c95d0990b8e1b2f29a14b4019ee20f..60aec3c83a48d37a21bf435fff4d0da2aa513424 100644 (file)
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -28,9 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Logout action class.
@@ -42,7 +40,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-class LogoutAction extends Action
+class LogoutAction extends ManagedAction
 {
     /**
      * This is read only.
@@ -54,36 +52,22 @@ class LogoutAction extends Action
         return false;
     }
 
-    /**
-     * Class handler.
-     *
-     * @param array $args array of arguments
-     *
-     * @return nothing
-     */
-    function handle($args)
+    protected function doPreparation()
     {
-        parent::handle($args);
         if (!common_logged_in()) {
-            // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
-            $this->clientError(_('Not logged in.'));
-        } else {
-            if (Event::handle('StartLogout', array($this))) {
-                $this->logout();
-            }
-            Event::handle('EndLogout', array($this));
-
-            if (common_config('singleuser', 'enabled')) {
-                $user = User::singleUser();
-                common_redirect(common_local_url('showstream',
-                                                 array('nickname' => $user->nickname)));
-            } else {
-                common_redirect(common_local_url('public'), 303);
-            }
+            // TRANS: Error message displayed when trying to logout even though you are not logged in.
+            throw new AlreadyFulfilledException(_('Cannot log you out if you are not logged in.'));
         }
+        if (Event::handle('StartLogout', array($this))) {
+            $this->logout();
+        }
+        Event::handle('EndLogout', array($this));
+
+        common_redirect(common_local_url('startpage'));
     }
 
-    function logout()
+    // Accessed through the action on events
+    public function logout()
     {
         common_set_user(null);
         common_real_login(false); // not logged in

diff --git a/actions/startpage.php b/actions/startpage.php
new file mode 100644 (file)
index 0000000..9ce00d9
--- /dev/null
+++ b/actions/startpage.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Startpage action. Decides what to show on the first page.
+ */
+
+if (!defined('GNUSOCIAL')) { exit(1); }
+
+class StartpageAction extends ManagedAction
+{
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    function showPage()
+    {
+        if (common_config('singleuser', 'enabled')) {
+            $user = User::singleUser();
+            common_redirect(common_local_url('showstream', array('nickname' => $user->nickname)), 303);
+        } elseif (common_config('public', 'localonly')) {
+            common_redirect(common_local_url('public'), 303);
+        } else {
+            common_redirect(common_local_url('networkpublic'), 303);
+        }
+    }
+}

diff --git a/lib/router.php b/lib/router.php
index bcdeee80c7907a769ed3acf0fcce24614090ccbc..725ecf6d06382699c8f19ebd45b62faf4b1e2be7 100644 (file)
--- a/lib/router.php
+++ b/lib/router.php
@@ -894,8 +894,7 @@ class Router
                                   'nickname' => $nickname));
 
                 $m->connect('',
-                            array('action' => 'showstream',
-                                  'nickname' => $nickname));
+                            array('action' => 'startpage'));
 
                 // peopletags
 
@@ -948,13 +947,9 @@ class Router
                                 array('tag' => self::REGEX_TAG));
                 }
             } else {
+                $m->connect('', array('action' => 'startpage'));
                 $m->connect('main/public', array('action' => 'public'));
                 $m->connect('main/all', array('action' => 'networkpublic'));
-                if (common_config('site', 'localonly')) {
-                    $m->connect('', array('action' => 'public'));
-                } else {
-                    $m->connect('', array('action' => 'networkpublic'));
-                }
                 $m->connect('rss', array('action' => 'publicrss'));
                 $m->connect('featuredrss', array('action' => 'featuredrss'));
                 $m->connect('featured/', array('action' => 'featured'));