From 199ccdb53fbd732eeced3edf734e39687729da9b Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Wed, 18 Nov 2009 15:53:33 -0500
Subject: [PATCH] Consolidate group creation into static function in User_group

---
 actions/apigroupcreate.php | 62 +++++---------------------------------
 actions/newgroup.php       | 46 +++++-----------------------
 classes/User_group.php     | 62 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 76 insertions(+), 94 deletions(-)

diff --git a/actions/apigroupcreate.php b/actions/apigroupcreate.php
index 895dfb7aba..8827d1c5ce 100644
--- a/actions/apigroupcreate.php
+++ b/actions/apigroupcreate.php
@@ -117,61 +117,13 @@ class ApiGroupCreateAction extends ApiAuthAction
             return;
         }
 
-        $group = new User_group();
-
-        $group->query('BEGIN');
-
-        $group->nickname    = $this->nickname;
-        $group->fullname    = $this->fullname;
-        $group->homepage    = $this->homepage;
-        $group->description = $this->description;
-        $group->location    = $this->location;
-        $group->created     = common_sql_now();
-
-        $result = $group->insert();
-
-        if (!$result) {
-            common_log_db_error($group, 'INSERT', __FILE__);
-            $this->serverError(
-                _('Could not create group.'),
-                500,
-                $this->format
-            );
-            return;
-        }
-
-        $result = $group->setAliases($this->aliases);
-
-        if (!$result) {
-            $this->serverError(
-                _('Could not create aliases.'),
-                500,
-                $this->format
-            );
-            return;
-        }
-
-        $member = new Group_member();
-
-        $member->group_id   = $group->id;
-        $member->profile_id = $this->user->id;
-        $member->is_admin   = 1;
-        $member->created    = $group->created;
-
-        $result = $member->insert();
-
-        if (!$result) {
-            common_log_db_error($member, 'INSERT', __FILE__);
-            $this->serverError(
-                _('Could not set group membership.'),
-                500,
-                $this->format
-            );
-            return;
-        }
-
-        $group->query('COMMIT');
-
+        $group = User_group::register(array('nickname' => $this->nickname,
+                                            'fullname' => $this->fullname,
+                                            'homepage' => $this->homepage,
+                                            'description' => $this->description,
+                                            'location' => $this->location,
+                                            'aliases'  => $this->aliases,
+                                            'userid'   => $this->user->id));
         switch($this->format) {
         case 'xml':
             $this->showSingleXmlGroup($group);
diff --git a/actions/newgroup.php b/actions/newgroup.php
index 80da9861a0..25da7f8fc7 100644
--- a/actions/newgroup.php
+++ b/actions/newgroup.php
@@ -186,45 +186,13 @@ class NewgroupAction extends Action
 
         assert(!is_null($cur));
 
-        $group = new User_group();
-
-        $group->query('BEGIN');
-
-        $group->nickname    = $nickname;
-        $group->fullname    = $fullname;
-        $group->homepage    = $homepage;
-        $group->description = $description;
-        $group->location    = $location;
-        $group->created     = common_sql_now();
-
-        $result = $group->insert();
-
-        if (!$result) {
-            common_log_db_error($group, 'INSERT', __FILE__);
-            $this->serverError(_('Could not create group.'));
-        }
-
-        $result = $group->setAliases($aliases);
-
-        if (!$result) {
-            $this->serverError(_('Could not create aliases.'));
-        }
-
-        $member = new Group_member();
-
-        $member->group_id   = $group->id;
-        $member->profile_id = $cur->id;
-        $member->is_admin   = 1;
-        $member->created    = $group->created;
-
-        $result = $member->insert();
-
-        if (!$result) {
-            common_log_db_error($member, 'INSERT', __FILE__);
-            $this->serverError(_('Could not set group membership.'));
-        }
-
-        $group->query('COMMIT');
+        $group = User_group::register(array('nickname' => $nickname,
+                                            'fullname' => $fullname,
+                                            'homepage' => $homepage,
+                                            'description' => $description,
+                                            'location' => $location,
+                                            'aliases'  => $aliases,
+                                            'userid'   => $cur->id));
 
         common_redirect($group->homeUrl(), 303);
     }
diff --git a/classes/User_group.php b/classes/User_group.php
index b92638f7aa..c86eadf8fa 100644
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -354,4 +354,66 @@ class User_group extends Memcached_DataObject
 
         return $xs->getString();
     }
+
+    static function register($fields) {
+
+        // MAGICALLY put fields into current scope
+
+        extract($fields);
+
+        $group = new User_group();
+
+        $group->query('BEGIN');
+
+        $group->nickname    = $nickname;
+        $group->fullname    = $fullname;
+        $group->homepage    = $homepage;
+        $group->description = $description;
+        $group->location    = $location;
+        $group->created     = common_sql_now();
+
+        $result = $group->insert();
+
+        if (!$result) {
+            common_log_db_error($group, 'INSERT', __FILE__);
+            $this->serverError(
+                _('Could not create group.'),
+                500,
+                $this->format
+            );
+            return;
+        }
+        $result = $group->setAliases($aliases);
+
+        if (!$result) {
+            $this->serverError(
+                _('Could not create aliases.'),
+                500,
+                $this->format
+            );
+            return;
+        }
+
+        $member = new Group_member();
+
+        $member->group_id   = $group->id;
+        $member->profile_id = $userid;
+        $member->is_admin   = 1;
+        $member->created    = $group->created;
+
+        $result = $member->insert();
+
+        if (!$result) {
+            common_log_db_error($member, 'INSERT', __FILE__);
+            $this->serverError(
+                _('Could not set group membership.'),
+                500,
+                $this->format
+            );
+            return;
+        }
+
+        $group->query('COMMIT');
+        return $group;
+    }
 }