The overloaded DB_DataObject function staticGet is now called getKV

[quix0rs-gnu-social.git] / plugins / GroupPrivateMessage / Group_message.php

diff --git a/plugins/GroupPrivateMessage/Group_message.php b/plugins/GroupPrivateMessage/Group_message.php
index 800cd105755d4c8526813251d55e71058871eebc..05fcdc5c43aa56cb8b7862a4ad79831f7b941fb6 100644 (file)
--- a/plugins/GroupPrivateMessage/Group_message.php
+++ b/plugins/GroupPrivateMessage/Group_message.php
@@ -44,8 +44,7 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
  *
  * @see      DB_DataObject
  */
-
-class Group_message extends Memcached_DataObject
+class Group_message extends Managed_DataObject
 {
     public $__table = 'group_message'; // table name
     public $id;                        // char(36)  primary_key not_null
@@ -57,22 +56,6 @@ class Group_message extends Memcached_DataObject
     public $url;
     public $created;
 
-    /**
-     * Get an instance by key
-     *
-     * This is a utility method to get a single instance with a given key value.
-     *
-     * @param string $k Key to use to lookup (usually 'user_id' for this class)
-     * @param mixed  $v Value to lookup
-     *
-     * @return Group_message object found, or null for no hits
-     *
-     */
-    function staticGet($k, $v=null)
-    {
-        return Memcached_DataObject::staticGet('Group_message', $k, $v);
-    }
-
     /**
      * return table definition for DB_DataObject
      *
@@ -123,6 +106,8 @@ class Group_message extends Memcached_DataObject
     {
         if (!$user->hasRight(Right::NEWMESSAGE)) {
             // XXX: maybe break this out into a separate right
+            // TRANS: Exception thrown when trying to send group private message without having the right to do that.
+            // TRANS: %s is a user nickname.
             throw new Exception(sprintf(_m('User %s is not allowed to send private messages.'),
                                         $user->nickname));
         }
@@ -134,6 +119,8 @@ class Group_message extends Memcached_DataObject
         // We use the same limits as for 'regular' private messages.
 
         if (Message::contentTooLong($text)) {
+            // TRANS: Exception thrown when trying to send group private message that is too long.
+            // TRANS: %d is the maximum meggage length.
             throw new Exception(sprintf(_m('That\'s too long. Maximum message size is %d character.',
                                            'That\'s too long. Maximum message size is %d characters.',
                                            Message::maxContent()),
@@ -143,7 +130,7 @@ class Group_message extends Memcached_DataObject
         // Valid! Let's do this thing!
 
         $gm = new Group_message();
-        
+
         $gm->id           = UUID::gen();
         $gm->uri          = common_local_url('showgroupmessage', array('id' => $gm->id));
         $gm->from_profile = $user->id;
@@ -164,8 +151,8 @@ class Group_message extends Memcached_DataObject
 
     function distribute()
     {
-        $group = User_group::staticGet('id', $this->to_group);
-        
+        $group = User_group::getKV('id', $this->to_group);
+
         $member = $group->getMembers();
 
         while ($member->fetch()) {
@@ -175,8 +162,9 @@ class Group_message extends Memcached_DataObject
 
     function getGroup()
     {
-        $group = User_group::staticGet('id', $this->to_group);
+        $group = User_group::getKV('id', $this->to_group);
         if (empty($group)) {
+            // TRANS: Exception thrown when trying to send group private message to a non-existing group.
             throw new ServerException(_m('No group for group message.'));
         }
         return $group;
@@ -184,8 +172,9 @@ class Group_message extends Memcached_DataObject
 
     function getSender()
     {
-        $sender = Profile::staticGet('id', $this->from_profile);
+        $sender = Profile::getKV('id', $this->from_profile);
         if (empty($sender)) {
+            // TRANS: Exception thrown when trying to send group private message without having a sender.
             throw new ServerException(_m('No sender for group message.'));
         }
         return $sender;
@@ -204,5 +193,4 @@ class Group_message extends Memcached_DataObject
 
         return $gm;
     }
-
 }