From 6b51941056a361327e8717ede1194df3abe430a9 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Thu, 11 Dec 2008 23:30:18 -0500
Subject: Actually crop your avatar when hitting 'crop' button on profile

darcs-hash:20081212043018-7b5ce-bc83b66e19007aa0a04fbb40053217ef92c44779.gz
---
 classes/Avatar.php  | 34 ++++++++++++++++------------------
 classes/Profile.php | 19 +++++++++----------
 2 files changed, 25 insertions(+), 28 deletions(-)

(limited to 'classes')

diff --git a/classes/Avatar.php b/classes/Avatar.php
index 3c754ec2d..4fdb99d35 100644
--- a/classes/Avatar.php
+++ b/classes/Avatar.php
@@ -79,22 +79,20 @@ class Avatar extends Memcached_DataObject
         }
     }
 
-    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);
-        } else {
-            return null;
-        }
-    }
-    
-    function &pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Avatar', $kv);
-    }
+	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);
+		} else {
+			return NULL;
+		}
+	}
+	
+	function &pkeyGet($kv) {
+		return Memcached_DataObject::pkeyGet('Avatar', $kv);
+	}
 }
diff --git a/classes/Profile.php b/classes/Profile.php
index fb6ff90f1..3b6ac1d7f 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -121,16 +121,15 @@ class Profile extends Memcached_DataObject
         return $avatar;
     }
 
-    function delete_avatars()
-    {
-        $avatar = new Avatar();
-        $avatar->profile_id = $this->id;
-        $avatar->find();
-        while ($avatar->fetch()) {
-            $avatar->delete();
-        }
-        return true;
-    }
+	function delete_avatars() {
+		$avatar = new Avatar();
+		$avatar->profile_id = $this->id;
+		$avatar->find();
+		while ($avatar->fetch()) {
+			$avatar->delete();
+		}
+		return true;
+	}
 
     function getBestName()
     {
-- 
cgit v1.2.3-54-g00ecf