Refs #2428 almost done removing CONFIG access - mostly plugin start.php left

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

1 files changed, 38 insertions, 39 deletions

diff --git a/mod/groups/icon.php b/mod/groups/icon.php
index a6ceaf3b5..59247e9f8 100644
--- a/mod/groups/icon.php
+++ b/mod/groups/icon.php
@@ -1,41 +1,40 @@
 <?php
-	/**
-	 * Icon display
-	 * 
-	 * @package ElggGroups
-	 */
-
-	global $CONFIG;
-	require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
-
-	$group_guid = get_input('group_guid');
-	$group = get_entity($group_guid);
-	
-	$size = strtolower(get_input('size'));
-	if (!in_array($size,array('large','medium','small','tiny','master','topbar')))
-		$size = "medium";
-	
-	$success = false;
-	
-	$filehandler = new ElggFile();
-	$filehandler->owner_guid = $group->owner_guid;
-	$filehandler->setFilename("groups/" . $group->guid . $size . ".jpg");
-	
-	$success = false;
-	if ($filehandler->open("read")) {
-		if ($contents = $filehandler->read($filehandler->size())) {
-			$success = true;
-		} 
-	}
-	
-	if (!$success) {
-		$contents = @file_get_contents($CONFIG->pluginspath . "groups/graphics/default{$size}.jpg");
+/**
+ * Icon display
+ *
+ * @package ElggGroups
+ */
+
+require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
+
+$group_guid = get_input('group_guid');
+$group = get_entity($group_guid);
+
+$size = strtolower(get_input('size'));
+if (!in_array($size,array('large','medium','small','tiny','master','topbar')))
+	$size = "medium";
+
+$success = false;
+
+$filehandler = new ElggFile();
+$filehandler->owner_guid = $group->owner_guid;
+$filehandler->setFilename("groups/" . $group->guid . $size . ".jpg");
+
+$success = false;
+if ($filehandler->open("read")) {
+	if ($contents = $filehandler->read($filehandler->size())) {
+		$success = true;
 	}
-	
-	header("Content-type: image/jpeg");
-	header('Expires: ' . date('r',time() + 864000));
-	header("Pragma: public");
-	header("Cache-Control: public");
-	header("Content-Length: " . strlen($contents));
-	echo $contents;
-?>
\ No newline at end of file
+}
+
+if (!$success) {
+	$location = elgg_get_plugin_path() . "groups/graphics/default{$size}.jpg";
+	$contents = @file_get_contents($location);
+}
+
+header("Content-type: image/jpeg");
+header('Expires: ' . date('r',time() + 864000));
+header("Pragma: public");
+header("Cache-Control: public");
+header("Content-Length: " . strlen($contents));
+echo $contents;