Readjusted location and size for logo, form_notice,

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

diff --git a/classes/Avatar.php b/classes/Avatar.php
index bde983d798c410913e06c16cafdf23df04cc2988..9ae920647adfbae0c7ce6e767eca7fa7ec243c91 100644 (file)
--- a/classes/Avatar.php
+++ b/classes/Avatar.php
@@ -21,14 +21,16 @@ class Avatar extends Memcached_DataObject
     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));
@@ -38,7 +40,8 @@ class Avatar extends Memcached_DataObject
     # Create and save scaled version of this avatar
     # XXX: maybe break into different methods
 
-    function scale($size) {
+    function scale($size)
+    {
 
         $image_s = imagecreatetruecolor($size, $size);
         $image_a = $this->to_image();
@@ -76,7 +79,48 @@ class Avatar extends Memcached_DataObject
         }
     }
 
-    function to_image() {
+    function scale_and_crop($size, $x, $y, $w, $h) 
+    {
+
+        $image_s = imagecreatetruecolor($size, $size);
+        $image_a = $this->to_image();
+
+        # Retain alpha channel info if possible for .pngs
+        $background = imagecolorallocate($image_s, 0, 0, 0);
+        ImageColorTransparent($image_s, $background);
+        imagealphablending($image_s, false);
+
+        imagecopyresized($image_s, $image_a, 0, 0, $x, $y, $size, $size, $w, $h);
+
+        $ext = ($this->mediattype == 'image/jpeg') ? ".jpeg" : ".png";
+
+        $filename = common_avatar_filename($this->profile_id, $ext, $size, common_timestamp());
+
+        if ($this->mediatype == 'image/jpeg') {
+            imagejpeg($image_s, common_avatar_path($filename));
+        } else {
+            imagepng($image_s, common_avatar_path($filename));
+        }
+
+        $cropped = DB_DataObject::factory('avatar');
+        $cropped->profile_id = $this->profile_id;
+        $cropped->width = $size;
+        $cropped->height = $size;
+        $cropped->original = false;
+        $cropped->mediatype = ($this->mediattype == 'image/jpeg') ? 'image/jpeg' : 'image/png';
+        $cropped->filename = $filename;
+        $cropped->url = common_avatar_url($filename);
+        $cropped->created = DB_DataObject_Cast::dateTime(); # current time
+
+        if ($cropped->insert()) {
+            return $cropped;
+        } else {
+            return NULL;
+        }
+    }
+
+    function to_image() 
+    {
         $filepath = common_avatar_path($this->filename);
         if ($this->mediatype == 'image/gif') {
             return imagecreatefromgif($filepath);
@@ -85,11 +129,13 @@ class Avatar extends Memcached_DataObject
         } else if ($this->mediatype == 'image/png') {
             return imagecreatefrompng($filepath);
         } else {
-            return null;
+            return NULL;
         }
     }
     
-    function &pkeyGet($kv) {
+    function &pkeyGet($kv) 
+    {
         return Memcached_DataObject::pkeyGet('Avatar', $kv);
     }
+
 }