Merged [5623]:head from 1.7 to trunk.

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

1 files changed, 87 insertions, 26 deletions

diff --git a/mod/profile/icondirect.php b/mod/profile/icondirect.php
index 353ce389c..8a46786ab 100644
--- a/mod/profile/icondirect.php
+++ b/mod/profile/icondirect.php
@@ -1,28 +1,89 @@
 <?php
 
-	/**
-	 * Elgg profile icon cache/bypass
-	 * 
-	 * @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/
-	 */
-
-	// This should provide faster access to profile icons by not loading the
-	// engine but directly grabbing the file from the user's profile directory.
-	// The speedup was broken in Elgg 1.7 because of a change in directory structure.
-	// The link to this script is provided in profile_usericon_hook(). To work
-	// in 1.7 forward, the link has to be updated to provide more information.
-	// The profile icon filename should also be changed to not use username.
-
-	// To see previous code, see svn history.
-
-	// At the moment, this does not serve much of a purpose other than provide
-	// continuity. It currently just includes icon.php which uses the engine.
-
-	// see #1989 and #2035
-
-	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-	require_once(dirname(__FILE__).'/icon.php');
+/**
+ * Elgg profile icon cache/bypass
+ * 
+ * @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/
+ */
+
+
+// Get DB settings
+require_once(dirname(dirname(dirname(__FILE__))). '/engine/settings.php');
+
+global $CONFIG;
+
+
+$username = $_GET['username'];
+$joindate = (int)$_GET['joindate'];
+$guid = (int)$_GET['guid'];
+
+$size = strtolower($_GET['size']);
+if (!in_array($size,array('large','medium','small','tiny','master','topbar'))) {
+	$size = "medium";
+}
+
+// security check on username string
+if (	(strpos($username, '/')!==false) ||
+		(strpos($username, '\\')!==false) ||
+		(strpos($username, '"')!==false) ||
+		(strpos($username, '\'')!==false) ||
+		(strpos($username, '*')!==false) ||
+		(strpos($username, '&')!==false) ||
+		(strpos($username, ' ')!==false) ) {
+	// these characters are not allowed in usernames
+	exit;
+}
+
+
+
+$mysql_dblink = @mysql_connect($CONFIG->dbhost,$CONFIG->dbuser,$CONFIG->dbpass, true);
+if ($mysql_dblink) {
+	if (@mysql_select_db($CONFIG->dbname,$mysql_dblink)) {
+
+		// get dataroot and simplecache_enabled in one select for efficiency
+		if ($result = mysql_query("select name, value from {$CONFIG->dbprefix}datalists where name in ('dataroot','simplecache_enabled')",$mysql_dblink)) {
+			$simplecache_enabled = true;
+			$row = mysql_fetch_object($result);
+			while ($row) {
+				if ($row->name == 'dataroot') {
+					$dataroot = $row->value;
+				} else if ($row->name == 'simplecache_enabled') {
+					$simplecache_enabled = $row->value;
+				}
+				$row = mysql_fetch_object($result);
+			}
+		}
+
+		@mysql_close($mysql_dblink);
+
+		// if the simplecache is enabled, we get icon directly
+		if ($simplecache_enabled) {
+
+			// first try to read icon directly
+			$user_path = date('Y/m/d/', $joindate) . $guid;
+			$filename = $dataroot . $user_path . "/profile/" . $username . $size . ".jpg";
+			$contents = @file_get_contents($filename);
+			if (!empty($contents)) {
+				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;
+				}
+				exit;
+			}
+		}
+	}
+
+}
+
+// simplecache is not turned on or something went wrong so load engine and try that way
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+require_once(dirname(__FILE__).'/icon.php');