Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

1 files changed, 0 insertions, 82 deletions

diff --git a/modules/user/controllers/login.php b/modules/user/controllers/login.php
deleted file mode 100644
index 8bee7db5..00000000
--- a/modules/user/controllers/login.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class Login_Controller extends Controller {
-
-  public function ajax() {
-    $view = new View("login_ajax.html");
-    $view->form = user::get_login_form("login/auth_ajax");
-    print $view;
-  }
-
-  public function auth_ajax() {
-    access::verify_csrf();
-
-    list ($valid, $form) = $this->_auth("login/auth_ajax");
-    if ($valid) {
-      print json_encode(
-        array("result" => "success"));
-    } else {
-      print json_encode(
-        array("result" => "error",
-              "form" => $form->__toString()));
-    }
-  }
-
-  public function html() {
-    print user::get_login_form("login/auth_html");
-  }
-
-  public function auth_html() {
-    access::verify_csrf();
-
-    list ($valid, $form) = $this->_auth("login/auth_html");
-    if ($valid) {
-      url::redirect(item::root()->abs_url());
-    } else {
-      print $form;
-    }
-  }
-
-  private function _auth($url) {
-    $form = user::get_login_form($url);
-    $valid = $form->validate();
-    if ($valid) {
-      $user = ORM::factory("user")->where("name", $form->login->inputs["name"]->value)->find();
-      if (!$user->loaded || !user::is_correct_password($user, $form->login->password->value)) {
-        log::warning(
-          "user",
-          t("Failed login for %name",
-            array("name" => $form->login->inputs["name"]->value)));
-        $form->login->inputs["name"]->add_error("invalid_login", 1);
-        $valid = false;
-      }
-    }
-
-    if ($valid) {
-      user::login($user);
-      log::info("user", t("User %name logged in", array("name" => $user->name)));
-    }
-
-    // Either way, regenerate the session id to avoid session trapping
-    Session::instance()->regenerate();
-
-    return array($valid, $form);
-  }
-}
\ No newline at end of file