From d857c68fd91b1bcf586a30d86108b1898c2bb2d3 Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Mon, 29 Oct 2012 20:59:21 -0400
Subject: Fixes #4895: Output valid ETag and Expires headers

---
 mod/profile/icondirect.php | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'mod/profile')

diff --git a/mod/profile/icondirect.php b/mod/profile/icondirect.php
index c4439f78c..dbab5d31f 100644
--- a/mod/profile/icondirect.php
+++ b/mod/profile/icondirect.php
@@ -23,7 +23,7 @@ $guid = (int)$_GET['guid'];
 
 // If is the same ETag, content didn't changed.
 $etag = $last_cache . $guid;
-if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && trim($_SERVER['HTTP_IF_NONE_MATCH']) == $etag) {
+if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && trim($_SERVER['HTTP_IF_NONE_MATCH']) == "\"$etag\"") {
 	header("HTTP/1.1 304 Not Modified");
 	exit;
 }
@@ -55,19 +55,15 @@ if ($mysql_dblink) {
 			$user_path = date('Y/m/d/', $join_date) . $guid;
 
 			$filename = "$data_root$user_path/profile/{$guid}{$size}.jpg";
-			$contents = @file_get_contents($filename);
-			if (!empty($contents)) {
+			$size = @filesize($filename);
+			if ($size) {
 				header("Content-type: image/jpeg");
-				header('Expires: ' . date('r', strtotime("+6 months")), true);
+				header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', strtotime("+6 months")), true);
 				header("Pragma: public");
 				header("Cache-Control: public");
-				header("Content-Length: " . strlen($contents));
-				header("ETag: $etag");
-				// this chunking is done for supposedly better performance
-				$split_string = str_split($contents, 1024);
-				foreach ($split_string as $chunk) {
-					echo $chunk;
-				}
+				header("Content-Length: $size");
+				header("ETag: \"$etag\"");
+				readfile($filename);
 				exit;
 			}
 		}
-- 
cgit v1.2.3


From 9168cf7df39e404516c45f77bd64b47b3c61c75d Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Sat, 1 Dec 2012 20:09:11 -0500
Subject: Make metadata prefetch respect access

---
 engine/classes/ElggVolatileMetadataCache.php  | 3 +++
 mod/profile/views/default/profile/details.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'mod/profile')

diff --git a/engine/classes/ElggVolatileMetadataCache.php b/engine/classes/ElggVolatileMetadataCache.php
index 24ae58d42..8a33c198d 100644
--- a/engine/classes/ElggVolatileMetadataCache.php
+++ b/engine/classes/ElggVolatileMetadataCache.php
@@ -279,6 +279,9 @@ class ElggVolatileMetadataCache {
 			),
 			'selects' => array('n.string AS name', 'v.string AS value'),
 			'order_by' => 'n_table.entity_guid, n_table.time_created ASC',
+
+			// @todo don't know why this is necessary
+			'wheres' => array(get_access_sql_suffix('n_table')),
 		);
 		$data = elgg_get_metadata($options);
 
diff --git a/mod/profile/views/default/profile/details.php b/mod/profile/views/default/profile/details.php
index 3af5cb756..7b05b0e15 100644
--- a/mod/profile/views/default/profile/details.php
+++ b/mod/profile/views/default/profile/details.php
@@ -28,7 +28,7 @@ if (is_array($profile_fields) && sizeof($profile_fields) > 0) {
 			<div class="<?php echo $even_odd; ?>">
 				<b><?php echo elgg_echo("profile:{$shortname}"); ?>: </b>
 				<?php
-					echo elgg_view("output/{$valtype}", array('value' => $user->$shortname));
+					echo elgg_view("output/{$valtype}", array('value' => $value));
 				?>
 			</div>
 			<?php
-- 
cgit v1.2.3