Merged interface changes to profile in.

git-svn-id: http://code.elgg.org/elgg/trunk@5284 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 50 insertions, 56 deletions

diff --git a/mod/profile/icon.php b/mod/profile/icon.php
index 802cc3756..463eb3db5 100644
--- a/mod/profile/icon.php
+++ b/mod/profile/icon.php
@@ -1,58 +1,52 @@
 <?php
+/**
+* Elgg profile icon
+* 
+* @package ElggProfile
+* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+* @author Curverider Ltd <info@elgg.com>
+* @copyright Curverider Ltd 2008-2010
+* @link http://elgg.com/
+*/
 
-	/**
-	 * Elgg profile icon
-	 * 
-	 * @package ElggProfile
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 */
-
-	// Load the Elgg framework
-		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-
-	// Get the owning user
-
-		$user = page_owner_entity(); // page_owner_entity();
-		$username = $user->username;
-		
-	// Get the size
-		$size = strtolower(get_input('size'));
-		if (!in_array($size,array('large','medium','small','tiny','master','topbar')))
-			$size = "medium";
-		
-	// Try and get the icon
-	
-		$filehandler = new ElggFile();
-		$filehandler->owner_guid = $user->getGUID();
-		$filehandler->setFilename("profile/" . $username . $size . ".jpg");
-		
-		$success = false;
-		if ($filehandler->open("read")) {
-			if ($contents = $filehandler->read($filehandler->size())) {
-				$success = true;
-			} 
-		}
-		
-		if (!$success) {
-			
-			global $CONFIG;
-			$path = elgg_view('icon/user/default/'.$size);
-			header("Location: {$path}");
-			exit;
-			//$contents = @file_get_contents($CONFIG-pluginspath . "profile/graphics/default{$size}.jpg");
-			
-		}
-		
-		header("Content-type: image/jpeg");
-		header('Expires: ' . date('r',time() + 864000));
-		header("Pragma: public");
-		header("Cache-Control: public");
-		header("Content-Length: " . strlen($contents));
-		$splitString = str_split($contents, 1024);
-		foreach($splitString as $chunk)
-			echo $chunk;
-
-?>
\ No newline at end of file
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+// Get the owning user
+$user = page_owner_entity();
+$username = $user->username;
+
+// Get the size
+$size = strtolower(get_input('size'));
+if (!in_array($size,array('large','medium','small','tiny','master','topbar')))
+	$size = "medium";
+
+// Try and get the icon
+$filehandler = new ElggFile();
+$filehandler->owner_guid = $user->getGUID();
+$filehandler->setFilename("profile/" . $username . $size . ".jpg");
+
+$success = false;
+if ($filehandler->open("read")) {
+	if ($contents = $filehandler->read($filehandler->size())) {
+		$success = true;
+	} 
+}
+
+if (!$success) {
+	global $CONFIG;
+	$path = elgg_view('icon/user/default/'.$size);
+	header("Location: {$path}");
+	exit;
+}
+
+header("Content-type: image/jpeg");
+header('Expires: ' . date('r',time() + 864000));
+header("Pragma: public");
+header("Cache-Control: public");
+header("Content-Length: " . strlen($contents));
+
+$splitString = str_split($contents, 1024);
+
+foreach($splitString as $chunk) {
+	echo $chunk;
+}
\ No newline at end of file