reindent

[quix0rs-gnu-social.git] / classes / User_group.php

diff --git a/classes/User_group.php b/classes/User_group.php
index fabb8e8d5ceb4951991bd8d4d14d2fcd4283c662..60217e960ed7460f7545a8075edca48a7f2c4403 100644 (file)
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -234,6 +234,22 @@ class User_group extends Memcached_DataObject
         return ($this->fullname) ? $this->fullname : $this->nickname;
     }
 
+    /**
+     * Gets the full name (if filled) with nickname as a parenthetical, or the nickname alone
+     * if no fullname is provided.
+     *
+     * @return string
+     */
+    function getFancyName()
+    {
+        if ($this->fullname) {
+            // TRANS: Full name of a profile or group followed by nickname in parens
+            return sprintf(_m('FANCYNAME','%1$s (%2$s)'), $this->fullname, $this->nickname);
+        } else {
+            return $this->nickname;
+        }
+    }
+
     function getAliases()
     {
         $aliases = array();
@@ -551,29 +567,54 @@ class User_group extends Memcached_DataObject
     /**
      * Handle cascading deletion, on the model of notice and profile.
      *
-     * Pretty sure some caching won't get handled properly here.
+     * This should handle freeing up cached entries for the group's
+     * id, nickname, URI, and aliases. There may be other areas that
+     * are not de-cached in the UI, including the sidebar lists on
+     * GroupsAction
      */
     function delete()
     {
         if ($this->id) {
+
+            // Safe to delete in bulk for now
+
             $related = array('Group_inbox',
-                             'Group_alias',
                              'Group_block',
                              'Group_member',
-                             'Local_group',
-                             'Related_group',
-                             );
+                             'Related_group');
+
             Event::handle('UserGroupDeleteRelated', array($this, &$related));
 
             foreach ($related as $cls) {
+
                 $inst = new $cls();
                 $inst->group_id = $this->id;
-                $inst->delete();
+
+                if ($inst->find()) {
+                    while ($inst->fetch()) {
+                        $dup = clone($inst);
+                        $dup->delete();
+                    }
+                }
             }
 
+            // And related groups in the other direction...
             $inst = new Related_group();
             $inst->related_group_id = $this->id;
             $inst->delete();
+
+            // Aliases and the local_group entry need to be cleared explicitly
+            // or we'll miss clearing some cache keys; that can make it hard
+            // to create a new group with one of those names or aliases.
+            $this->setAliases(array());
+            $local = Local_group::staticGet('group_id', $this->id);
+            if ($local) {
+                $local->delete();
+            }
+
+            // blow the cached ids
+            self::blow('user_group:notice_ids:%d', $this->id);
+
         } else {
             common_log(LOG_WARN, "Ambiguous user_group->delete(); skipping related tables.");
         }