Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

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

diff --git a/classes/User_group.php b/classes/User_group.php
index 98ad77cc0174a0191eabd58ba5b12952ec03e429..d152f9d567be0fa2996a7d7a9934c9d7cdc7f96e 100755 (executable)
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -74,94 +74,30 @@ class User_group extends Memcached_DataObject
           'WHERE group_member.group_id = %d ' .
           'ORDER BY group_member.created DESC ';
 
-        if (common_config('db','type') == 'pgsql') {
-            $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
-        } else {
-            $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+        if ($limit != null) {
+            if (common_config('db','type') == 'pgsql') {
+                $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
+            } else {
+                $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+            }
         }
 
         $members = new Profile();
 
-        $cnt = $members->query(sprintf($qry, $this->id));
-
+        $members->query(sprintf($qry, $this->id));
         return $members;
     }
 
-    function setOriginal($filename, $type)
+    function setOriginal($filename)
     {
+        $imagefile = new ImageFile($this->id, Avatar::path($filename));
+        
         $orig = clone($this);
-        $this->original_logo = common_avatar_url($filename);
-        $this->homepage_logo = common_avatar_url($this->scale($filename,
-                                                                      AVATAR_PROFILE_SIZE,
-                                                                      $type));
-        $this->stream_logo = common_avatar_url($this->scale($filename,
-                                                                    AVATAR_STREAM_SIZE,
-                                                                      $type));
-        $this->mini_logo = common_avatar_url($this->scale($filename,
-                                                                  AVATAR_MINI_SIZE,
-                                                                  $type));
+        $this->original_logo = Avatar::url($filename);
+        $this->homepage_logo = Avatar::url($imagefile->resize(AVATAR_PROFILE_SIZE));
+        $this->stream_logo = Avatar::url($imagefile->resize(AVATAR_STREAM_SIZE));
+        $this->mini_logo = Avatar::url($imagefile->resize(AVATAR_MINI_SIZE));
         common_debug(common_log_objstring($this));
         return $this->update($orig);
     }
-
-    function scale($filename, $size, $type)
-    {
-        $filepath = common_avatar_path($filename);
-
-        if (!file_exists($filepath)) {
-            $this->serverError(_('Lost our file.'));
-            return;
-        }
-
-        $info = @getimagesize($filepath);
-
-        switch ($type) {
-        case IMAGETYPE_GIF:
-            $image_src = imagecreatefromgif($filepath);
-            break;
-        case IMAGETYPE_JPEG:
-            $image_src = imagecreatefromjpeg($filepath);
-            break;
-        case IMAGETYPE_PNG:
-            $image_src = imagecreatefrompng($filepath);
-            break;
-         default:
-            $this->serverError(_('Unknown file type'));
-            return;
-        }
-
-        $image_dest = imagecreatetruecolor($size, $size);
-
-        $background = imagecolorallocate($image_dest, 0, 0, 0);
-        ImageColorTransparent($image_dest, $background);
-        imagealphablending($image_dest, false);
-
-        imagecopyresized($image_dest, $image_src, 0, 0, $x, $y, $size, $size, $info[0], $info[1]);
-
-        $cur = common_current_user();
-
-        $outname = common_avatar_filename($cur->id,
-                                          image_type_to_extension($type),
-                                          null,
-                                          common_timestamp());
-
-        $outpath = common_avatar_path($outname);
-
-        switch ($type) {
-        case IMAGETYPE_GIF:
-            imagegif($image_dest, $outpath);
-            break;
-        case IMAGETYPE_JPEG:
-            imagejpeg($image_dest, $outpath);
-            break;
-        case IMAGETYPE_PNG:
-            imagepng($image_dest, $outpath);
-            break;
-         default:
-            $this->serverError(_('Unknown file type'));
-            return;
-        }
-
-        return $outname;
-    }
 }