cosmetic fixes.

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

diff --git a/classes/Avatar.php b/classes/Avatar.php
index bde983d798c410913e06c16cafdf23df04cc2988..db9d78e47fc1e8f2c137ac6eb9a67d707b2a15fb 100644 (file)
--- a/classes/Avatar.php
+++ b/classes/Avatar.php
@@ -4,92 +4,80 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Avatar extends Memcached_DataObject 
+class Avatar extends Memcached_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
 
     public $__table = 'avatar';                          // table name
     public $profile_id;                      // int(4)  primary_key not_null
-    public $original;                        // tinyint(1)  
+    public $original;                        // tinyint(1)
     public $width;                           // int(4)  primary_key not_null
     public $height;                          // int(4)  primary_key not_null
     public $mediatype;                       // varchar(32)   not_null
-    public $filename;                        // varchar(255)  
+    public $filename;                        // varchar(255)
     public $url;                             // varchar(255)  unique_key
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
-    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Avatar',$k,$v); }
+    function staticGet($k,$v=null)
+    { return Memcached_DataObject::staticGet('Avatar',$k,$v); }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
     # We clean up the file, too
 
-    function delete() {
+    function delete()
+    {
         $filename = $this->filename;
         if (parent::delete()) {
-            @unlink(common_avatar_path($filename));
+            @unlink(Avatar::path($filename));
         }
     }
 
-    # Create and save scaled version of this avatar
-    # XXX: maybe break into different methods
-
-    function scale($size) {
-
-        $image_s = imagecreatetruecolor($size, $size);
-        $image_a = $this->to_image();
-        $square = min($this->width, $this->height);
-        imagecolortransparent($image_s, imagecolorallocate($image_s, 0, 0, 0));
-        imagealphablending($image_s, false);
-        imagesavealpha($image_s, true);
-        imagecopyresampled($image_s, $image_a, 0, 0, 0, 0,
-                           $size, $size, $square, $square);
-
-        $ext = ($this->mediattype == 'image/jpeg') ? ".jpeg" : ".png";
+    function &pkeyGet($kv)
+    {
+        return Memcached_DataObject::pkeyGet('Avatar', $kv);
+    }
 
-        $filename = common_avatar_filename($this->profile_id, $ext, $size, common_timestamp());
+    // where should the avatar go for this user?
 
-        if ($this->mediatype == 'image/jpeg') {
-            imagejpeg($image_s, common_avatar_path($filename));
+    static function filename($id, $extension, $size=null, $extra=null)
+    {
+        if ($size) {
+            return $id . '-' . $size . (($extra) ? ('-' . $extra) : '') . $extension;
         } else {
-            imagepng($image_s, common_avatar_path($filename));
+            return $id . '-original' . (($extra) ? ('-' . $extra) : '') . $extension;
         }
+    }
 
-        $scaled = DB_DataObject::factory('avatar');
-        $scaled->profile_id = $this->profile_id;
-        $scaled->width = $size;
-        $scaled->height = $size;
-        $scaled->original = false;
-        $scaled->mediatype = ($this->mediattype == 'image/jpeg') ? 'image/jpeg' : 'image/png';
-        $scaled->filename = $filename;
-        $scaled->url = common_avatar_url($filename);
-        $scaled->created = DB_DataObject_Cast::dateTime(); # current time
+    static function path($filename)
+    {
+        return INSTALLDIR . '/avatar/' . $filename;
+    }
 
-        if ($scaled->insert()) {
-            return $scaled;
-        } else {
-            return null;
-        }
+    static function url($filename)
+    {
+        return common_path('avatar/'.$filename);
     }
 
-    function to_image() {
-        $filepath = common_avatar_path($this->filename);
-        if ($this->mediatype == 'image/gif') {
-            return imagecreatefromgif($filepath);
-        } else if ($this->mediatype == 'image/jpeg') {
-            return imagecreatefromjpeg($filepath);
-        } else if ($this->mediatype == 'image/png') {
-            return imagecreatefrompng($filepath);
+    function displayUrl()
+    {
+        $server = common_config('avatar', 'server');
+        if ($server) {
+            return 'http://'.$server.'/'.$this->filename;
         } else {
-            return null;
+            return $this->url;
         }
     }
-    
-    function &pkeyGet($kv) {
-        return Memcached_DataObject::pkeyGet('Avatar', $kv);
+
+    static function defaultImage($size)
+    {
+        static $sizenames = array(AVATAR_PROFILE_SIZE => 'profile',
+                                  AVATAR_STREAM_SIZE => 'stream',
+                                  AVATAR_MINI_SIZE => 'mini');
+        return theme_path('default-avatar-'.$sizenames[$size].'.png');
     }
 }