First Twitter-compat API call works! /api/help/test.format

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

diff --git a/index.php b/index.php
index c40eca7876bbd41353e996d64875ba23b41e727f..21d5ed275354a052ed3df81dad4bff1b4b2c706c 100644 (file)
--- a/index.php
+++ b/index.php
@@ -24,32 +24,17 @@ require_once(INSTALLDIR . "/lib/common.php");
 
 $action = $_REQUEST['action'];
 
-if (!$action) {
-       common_redirect(common_local_url('public'));
-}
-
-# Do an OpenID immediate request if they're not logged in
-# and they have an OpenID cookie
-
-if (!common_logged_in() &&
-       $_SERVER['REQUEST_METHOD'] == 'GET' &&
-       $action != 'finishimmediate')
-{
-       require_once(INSTALLDIR.'/lib/openid.php');
-       $openid_url = oid_get_last();
-       if ($openid_url) {
-               oid_check_immediate($openid_url);
-               return;
-       }
+if (!$action || !preg_match('/^[a-zA-Z0-9_-]*$/', $action)) {
+    common_redirect(common_local_url('public'));
 }
 
 $actionfile = INSTALLDIR."/actions/$action.php";
 
 if (file_exists($actionfile)) {
-       require_once($actionfile);
-       $action_class = ucfirst($action)."Action";
-       $action_obj = new $action_class();
-       call_user_func(array($action_obj, 'handle'), $_REQUEST);
+    require_once($actionfile);
+    $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'));
+    common_user_error(_('Unknown action'));
 }
\ No newline at end of file