correct order of params in get_token

[quix0rs-gnu-social.git] / index.php

diff --git a/index.php b/index.php
index 812239e3d56931ae2754cccc71bcbd08c1a2baae..53fd1bfe668c78d6a9944f50353e9b53c7736847 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,18 +1,18 @@
 <?php
-/* 
+/*
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -20,18 +20,21 @@
 define('INSTALLDIR', dirname(__FILE__));
 define('LACONICA', true);
 
-require_once(INSTALLDIR . "/common.php");
+require_once(INSTALLDIR . "/lib/common.php");
 
 $action = $_REQUEST['action'];
+
+if (!$action) {
+       common_redirect(common_local_url('public'));
+}
+
 $actionfile = INSTALLDIR."/actions/$action.php";
 
 if (file_exists($actionfile)) {
        require_once($actionfile);
-       $action_class = ucfirst($action) . "Action";
-       if (function_exists($action_function)) {
-       call_user_func($action_function);
+       $action_class = ucfirst($action)."Action";
+       $action_obj = new $action_class();
+       call_user_func(array($action_obj, 'handle'), $_REQUEST);
 } else {
        common_user_error(_t('Unknown action'));
-}
-
-?>
\ No newline at end of file
+}
\ No newline at end of file