Move all the edit/update forms for users and groups back to the user module.

3 files changed, 0 insertions, 189 deletions

diff --git a/modules/gallery/controllers/users.php b/modules/gallery/controllers/users.php
deleted file mode 100644
index 07c5a457..00000000
--- a/modules/gallery/controllers/users.php
+++ /dev/null
@@ -1,68 +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 Users_Controller extends Controller {
-  public function update($id) {
-    $user = user::lookup($id);
-
-    if ($user->guest || $user->id != user::active()->id) {
-      access::forbidden();
-    }
-
-    $form = user::get_edit_form($user);
-    $valid = $form->validate();
-    if ($valid) {
-      $user->full_name = $form->edit_user->full_name->value;
-      if ($form->edit_user->password->value) {
-        $user->password = $form->edit_user->password->value;
-      }
-      $user->email = $form->edit_user->email->value;
-      $user->url = $form->edit_user->url->value;
-      if ($form->edit_user->locale) {
-        $desired_locale = $form->edit_user->locale->value;
-        $new_locale = $desired_locale == "none" ? null : $desired_locale;
-        if ($new_locale != $user->locale) {
-          // Delete the session based locale preference
-          setcookie("g_locale", "", time() - 24 * 3600, "/");
-        }
-        $user->locale = $new_locale;
-      }
-      $user->save();
-      module::event("user_edit_form_completed", $user, $form);
-
-      message::success(t("User information updated."));
-      print json_encode(
-        array("result" => "success",
-              "resource" => url::site("users/{$user->id}")));
-    } else {
-      print json_encode(
-        array("result" => "error",
-              "form" => $form->__toString()));
-    }
-  }
-
-  public function form_edit($id) {
-    $user = user::lookup($id);
-    if ($user->guest || $user->id != user::active()->id) {
-      access::forbidden();
-    }
-
-    print user::get_edit_form($user);
-  }
-}
diff --git a/modules/gallery/helpers/group.php b/modules/gallery/helpers/group.php
index dbfa03fe..1702fb87 100644
--- a/modules/gallery/helpers/group.php
+++ b/modules/gallery/helpers/group.php
@@ -117,37 +117,4 @@ class group_Core {
     }
     return $group->find_all();
   }
-
-  static function get_edit_form_admin($group) {
-    $form = new Forge("admin/users/edit_group/$group->id", "", "post", array("id" => "g-edit-group-form"));
-    $form_group = $form->group("edit_group")->label(t("Edit Group"));
-    $form_group->input("name")->label(t("Name"))->id("g-name")->value($group->name);
-    $form_group->inputs["name"]->error_messages(
-      "in_use", t("There is already a group with that name"));
-    $form_group->submit("")->value(t("Save"));
-    $form->add_rules_from($group);
-    return $form;
-  }
-
-  static function get_add_form_admin() {
-    $form = new Forge("admin/users/add_group", "", "post", array("id" => "g-add-group-form"));
-    $form->set_attr('class', "g-narrow");
-    $form_group = $form->group("add_group")->label(t("Add Group"));
-    $form_group->input("name")->label(t("Name"))->id("g-name");
-    $form_group->inputs["name"]->error_messages(
-      "in_use", t("There is already a group with that name"));
-    $form_group->submit("")->value(t("Add Group"));
-    $group = ORM::factory("group");
-    $form->add_rules_from($group);
-    return $form;
-  }
-
-  static function get_delete_form_admin($group) {
-    $form = new Forge("admin/users/delete_group/$group->id", "", "post",
-                      array("id" => "g-delete-group-form"));
-    $form_group = $form->group("delete_group")->label(
-      t("Are you sure you want to delete group %group_name?", array("group_name" => $group->name)));
-    $form_group->submit("")->value(t("Delete"));
-    return $form;
-  }
 }
diff --git a/modules/gallery/helpers/user.php b/modules/gallery/helpers/user.php
index cb205170..e7e75d64 100644
--- a/modules/gallery/helpers/user.php
+++ b/modules/gallery/helpers/user.php
@@ -24,94 +24,6 @@
  * Note: by design, this class does not do any permission checking.
  */
 class user_Core {
-  static function get_edit_form($user) {
-    $form = new Forge("users/update/$user->id", "", "post", array("id" => "g-edit-user-form"));
-    $form->set_attr("class", "g-narrow");
-    $group = $form->group("edit_user")->label(t("Edit User: %name", array("name" => $user->name)));
-    $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
-    self::_add_locale_dropdown($group, $user);
-    $group->password("password")->label(t("Password"))->id("g-password");
-    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
-      ->matches($group->password);
-    $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
-    $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
-    $form->add_rules_from($user);
-
-    module::event("user_edit_form", $user, $form);
-    $group->submit("")->value(t("Save"));
-    return $form;
-  }
-
-  static function get_edit_form_admin($user) {
-    $form = new Forge(
-      "admin/users/edit_user/$user->id", "", "post", array("id" => "g-edit-user-form"));
-    $group = $form->group("edit_user")->label(t("Edit User"));
-    $group->input("name")->label(t("Username"))->id("g-username")->value($user->name);
-    $group->inputs["name"]->error_messages(
-      "in_use", t("There is already a user with that username"));
-    $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
-    self::_add_locale_dropdown($group, $user);
-    $group->password("password")->label(t("Password"))->id("g-password");
-    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
-      ->matches($group->password);
-    $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
-    $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
-    $group->checkbox("admin")->label(t("Admin"))->id("g-admin")->checked($user->admin);
-    $form->add_rules_from($user);
-    $form->edit_user->password->rules("-required");
-
-    module::event("user_edit_form_admin", $user, $form);
-    $group->submit("")->value(t("Modify User"));
-    return $form;
-  }
-
-  static function get_add_form_admin() {
-    $form = new Forge("admin/users/add_user", "", "post", array("id" => "g-add-user-form"));
-    $form->set_attr('class', "g-narrow");
-    $group = $form->group("add_user")->label(t("Add User"));
-    $group->input("name")->label(t("Username"))->id("g-username")
-      ->error_messages("in_use", t("There is already a user with that username"));
-    $group->input("full_name")->label(t("Full Name"))->id("g-fullname");
-    $group->password("password")->label(t("Password"))->id("g-password");
-    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
-      ->matches($group->password);
-    $group->input("email")->label(t("Email"))->id("g-email");
-    $group->input("url")->label(t("URL"))->id("g-url");
-    self::_add_locale_dropdown($group);
-    $group->checkbox("admin")->label(t("Admin"))->id("g-admin");
-    $user = ORM::factory("user");
-    $form->add_rules_from($user);
-
-    module::event("user_add_form_admin", $user, $form);
-    $group->submit("")->value(t("Add User"));
-    return $form;
-  }
-
-  private static function _add_locale_dropdown(&$form, $user=null) {
-    $locales = locales::installed();
-    foreach ($locales as $locale => $display_name) {
-      $locales[$locale] = SafeString::of_safe_html($display_name);
-    }
-    if (count($locales) > 1) {
-      // Put "none" at the first position in the array
-      $locales = array_merge(array("" => t("« none »")), $locales);
-      $selected_locale = ($user && $user->locale) ? $user->locale : "";
-      $form->dropdown("locale")
-        ->label(t("Language Preference"))
-        ->options($locales)
-        ->selected($selected_locale);
-    }
-  }
-
-  static function get_delete_form_admin($user) {
-    $form = new Forge("admin/users/delete_user/$user->id", "", "post",
-                      array("id" => "g-delete-user-form"));
-    $group = $form->group("delete_user")->label(
-      t("Are you sure you want to delete user %name?", array("name" => $user->name)));
-    $group->submit("")->value(t("Delete user %name", array("name" => $user->name)));
-    return $form;
-  }
-
   static function get_login_form($url) {
     $form = new Forge($url, "", "post", array("id" => "g-login-form"));
     $form->set_attr('class', "g-narrow");