diff options
author | Evan Prodromou <evan@status.net> | 2009-11-20 02:50:43 -0800 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-11-20 02:50:43 -0800 |
commit | 224d82793c769c06d1e4f39c19cd5f2e9cf519b0 (patch) | |
tree | 4e80725739ecae1a196f7f5517b33060d6fe3518 /lib | |
parent | c0d4e0990ff4dfaa8eb6b8864be7bb07ea64551d (diff) |
Revert "Added 'login' command that gives you a link that can be used to login to the website"
This reverts commit b9d40f723bce8e01ddcbbb989bd7035b92cd9af8.
Conflicts:
actions/login.php
classes/statusnet.ini
db/08to09.sql
db/08to09_pg.sql
db/statusnet_pg.sql
lib/command.php
lib/commandinterpreter.php
Diffstat (limited to 'lib')
-rw-r--r-- | lib/command.php | 27 | ||||
-rw-r--r-- | lib/commandinterpreter.php | 6 | ||||
-rw-r--r-- | lib/router.php | 2 |
3 files changed, 0 insertions, 35 deletions
diff --git a/lib/command.php b/lib/command.php index 7e98156b6..bcc551c81 100644 --- a/lib/command.php +++ b/lib/command.php @@ -579,32 +579,6 @@ class OnCommand extends Command } } -class LoginCommand extends Command -{ - function execute($channel) - { - $login_token = Login_token::staticGet('user_id',$this->user->id); - if($login_token){ - $login_token->delete(); - } - $login_token = new Login_token(); - $login_token->user_id = $this->user->id; - $login_token->token = common_good_rand(16); - $login_token->created = common_sql_now(); - $result = $login_token->insert(); - if (!$result) { - common_log_db_error($login_token, 'INSERT', __FILE__); - $channel->error($this->user, sprintf(_('Could not create login token for %s'), - $this->user->nickname)); - return; - } - $channel->output($this->user, - sprintf(_('This link is useable only once, and is good for only 2 minutes: %s'), - common_local_url('login', - array('user_id'=>$login_token->user_id, 'token'=>$login_token->token)))); - } -} - class SubscriptionsCommand extends Command { function execute($channel) @@ -692,7 +666,6 @@ class HelpCommand extends Command "reply #<notice_id> - reply to notice with a given id\n". "reply <nickname> - reply to the last notice from user\n". "join <group> - join group\n". - "login - Get a link to login to the web interface\n". "drop <group> - leave group\n". "stats - get your stats\n". "stop - same as 'off'\n". diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php index 665015afc..25f2e4b3e 100644 --- a/lib/commandinterpreter.php +++ b/lib/commandinterpreter.php @@ -41,12 +41,6 @@ class CommandInterpreter return null; } return new HelpCommand($user); - case 'login': - if ($arg) { - return null; - } else { - return new LoginCommand($user); - } case 'subscribers': if ($arg) { return null; diff --git a/lib/router.php b/lib/router.php index b22185126..beb98eb04 100644 --- a/lib/router.php +++ b/lib/router.php @@ -88,8 +88,6 @@ class Router $m->connect('doc/:title', array('action' => 'doc')); - $m->connect('main/login?user_id=:user_id&token=:token', array('action'=>'login'), array('user_id'=> '[0-9]+', 'token'=>'.+')); - // main stuff is repetitive $main = array('login', 'logout', 'register', 'subscribe', |