From ecbd7718d57fc427d2aeac885d8be0321b3cf1fe Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 14 Jun 2009 23:37:24 -0700
Subject: Code for adding and saving group aliases

Added code to add and save group aliases. Like tags, aliases are
free-texted in to the group admin page. configurable max number of
aliases, default is three.
---
 lib/common.php        |  2 ++
 lib/groupeditform.php | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/common.php b/lib/common.php
index 6bf4ad21f..b4e87445e 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -198,6 +198,8 @@ $config =
         'user_quota' => 50000000,
         'monthly_quota' => 15000000,
         ),
+        'group' =>
+        array('maxaliases' => 3),
         );
 
 $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');
diff --git a/lib/groupeditform.php b/lib/groupeditform.php
index ca674f3c8..7e8d6eea3 100644
--- a/lib/groupeditform.php
+++ b/lib/groupeditform.php
@@ -111,7 +111,6 @@ class GroupEditForm extends Form
         }
     }
 
-
     /**
      * Name of the form
      *
@@ -157,6 +156,16 @@ class GroupEditForm extends Form
                      ($this->out->arg('location')) ? $this->out->arg('location') : $this->group->location,
                      _('Location for the group, if any, like "City, State (or Region), Country"'));
         $this->out->elementEnd('li');
+        if (common_config('group', 'maxaliases') > 0) {
+            $aliases = (empty($this->group)) ? array() : $this->group->getAliases();
+            $this->out->elementStart('li');
+            $this->out->input('aliases', _('Aliases'),
+                              ($this->out->arg('aliases')) ? $this->out->arg('aliases') :
+                              (!empty($aliases)) ? implode(' ', $aliases) : '',
+                              sprintf(_('Extra nicknames for the group, comma- or space- separated, max %d'),
+                                      common_config('group', 'maxaliases')));;
+            $this->out->elementEnd('li');
+        }
         $this->out->elementEnd('ul');
     }
 
-- 
cgit v1.2.3-54-g00ecf


From 1b6b00a6d05ad646a9137a872af8d8fdeeaf260f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 14 Jun 2009 23:43:47 -0700
Subject: Link and distribute notices tagged for a group alias

Correctly link and distribute notices tagged for a group alias. Added
a helper function, getForNickname(), to User_group, to make it easier
to get a group by its nickname or aliases.
---
 classes/Notice.php     |  6 +++---
 classes/User_group.php | 14 ++++++++++++++
 lib/util.php           |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/classes/Notice.php b/classes/Notice.php
index 78786b27d..68602b1f7 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -752,16 +752,16 @@ class Notice extends Memcached_DataObject
 
         foreach (array_unique($match[1]) as $nickname) {
             /* XXX: remote groups. */
-            $group = User_group::staticGet('nickname', $nickname);
+            $group = User_group::getForNickname($nickname);
 
-            if (!$group) {
+            if (empty($group)) {
                 continue;
             }
 
             // we automatically add a tag for every group name, too
 
             $tag = Notice_tag::pkeyGet(array('tag' => common_canonical_tag($nickname),
-                                           'notice_id' => $this->id));
+                                             'notice_id' => $this->id));
 
             if (is_null($tag)) {
                 $this->saveTag($nickname);
diff --git a/classes/User_group.php b/classes/User_group.php
index 0fcfee8c6..1a24124bb 100644
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -225,4 +225,18 @@ class User_group extends Memcached_DataObject
 
         return true;
     }
+
+    static function getForNickname($nickname)
+    {
+        $nickname = common_canonical_nickname($nickname);
+        $group = User_group::staticGet('nickname', $nickname);
+        if (!empty($group)) {
+            return $group;
+        }
+        $alias = Group_alias::staticGet('alias', $nickname);
+        if (!empty($alias)) {
+            return User_group::staticGet('id', $alias->group_id);
+        }
+        return null;
+    }
 }
diff --git a/lib/util.php b/lib/util.php
index b3a94a5a0..49c6ae108 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -591,7 +591,7 @@ function common_at_link($sender_id, $nickname)
 function common_group_link($sender_id, $nickname)
 {
     $sender = Profile::staticGet($sender_id);
-    $group = User_group::staticGet('nickname', common_canonical_nickname($nickname));
+    $group = User_group::getForNickname($nickname);
     if ($group && $sender->isMember($group)) {
         $attrs = array('href' => $group->permalink(),
                        'class' => 'url');
-- 
cgit v1.2.3-54-g00ecf