Create user/group create/delete functions and have the scaffolding use them.

core/controllers/welcome.php

@@ -232,7 +232,6 @@ class Welcome_Controller extends Template_Controller {
   }
 
   private function _generateTags($number){
-
     list($usec, $sec) = explode(' ', microtime());
     srand((float) $sec + ((float) $usec * 100000));
 
@@ -385,29 +384,23 @@ class Welcome_Controller extends Template_Controller {
 
   public function add_user() {
     $name = $this->input->post("user_name");
-    $user = ORM::factory("user");
-    $user->name = $name;
-    $user->display_name = $name;
-    $user->password = $name;
-    $user->save();
+    user::create($name, $name, $name);
     url::redirect("welcome");
   }
 
   public function delete_user($name) {
-    ORM::factory("user")->where("name", $name)->find()->delete();
+    user::delete($name);
     url::redirect("welcome");
   }
 
   public function add_group() {
     $name = $this->input->post("group_name");
-    $group = ORM::factory("group");
-    $group->name = $name;
-    $group->save();
+    group::create($name);
     url::redirect("welcome");
   }
 
   public function delete_group($name) {
-    ORM::factory("group")->where("name", $name)->find()->delete();
+    group::delete($name);
     url::redirect("welcome");
   }
 

modules/user/helpers/group.php

@@ -0,0 +1,52 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 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.
+ */
+
+/**
+ * This is the API for handling groups.
+ *
+ * Note: by design, this class does not do any permission checking.
+ */
+class group_Core {
+  /**
+   * Create a new group.
+   *
+   * @param string  $name
+   * @return Group_Model
+   */
+  static function create($name) {
+    $group = ORM::factory("group");
+    if ($group->loaded) {
+      throw new Exception("@todo GROUP_ALREADY_EXISTS $name");
+    }
+
+    $group->name = $name;
+    $group->save();
+    return $group;
+  }
+
+  /**
+   * Delete a group
+   *
+   * @param string $name the group name
+   */
+  static function delete($name) {
+    ORM::factory("group")->where("name", $name)->find()->delete();
+  }
+}

modules/user/helpers/user.php

@@ -19,13 +19,11 @@
  */
 
 /**
- * This helper provides a common around the user management functions.
- *
- * @author Tim Almdal <public@timalmdal.com>
+ * This is the API for handling users.
  *
+ * Note: by design, this class does not do any permission checking.
  */
-class user {
-
+class user_Core {
   /**
    * Return the form for creating / modifying users.
    */
@@ -33,15 +31,61 @@ class user {
     $form = new Forge(
       url::site("users/{$user->id}?_method=put"), "", "post", array("id" => "gUserForm"));
     $group = $form->group(_("User Info"));
-    $group->input("name")         ->label(_("Name"))         ->id("gName")        ->value($user->name);
-    $group->input("display_name") ->label(_("Display Name")) ->id("gDisplayName") ->value($user->display_name);
-    $group->password("password")  ->label(_("Password"))     ->id("gPassword");
-    $group->input("email")        ->label(_("Email"))        ->id("gEmail")       ->value($user->email);
+
+    $group->input("name")
+      ->label(_("Name"))
+      ->id("gName")
+      ->value($user->name);
+
+    $group->input("display_name")
+      ->label(_("Display Name"))
+      ->id("gDisplayName")
+      ->value($user->display_name);
+
+    $group->password("password")
+      ->label(_("Password"))
+      ->id("gPassword");
+
+    $group->input("email")
+      ->label(_("Email"))
+      ->id("gEmail")
+      ->value($user->email);
+
     $group->submit(_("Modify"));
     $form->add_rules_from($user);
     return $form;
   }
 
+  /**
+   * Create a new user.
+   *
+   * @param string  $name
+   * @param string  $display_name
+   * @param string  $password
+   * @return User_Model
+   */
+  static function create($name, $display_name, $password) {
+    $user = ORM::factory("user");
+    if ($user->loaded) {
+      throw new Exception("@todo USER_ALREADY_EXISTS $name");
+    }
+
+    $user->name = $name;
+    $user->display_name = $name;
+    $user->password = $name;
+    $user->save();
+    return $user;
+  }
+
+  /**
+   * Delete a user
+   *
+   * @param string $name the user name
+   */
+  static function delete($name) {
+    ORM::factory("user")->where("name", $name)->find()->delete();
+  }
+
   /**
    * Is the password provided correct?
    *