Fixes #1320: Bundled mods use elgg_echo()'s internal string substitution.

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

1 files changed, 71 insertions, 71 deletions

diff --git a/mod/file/start.php b/mod/file/start.php
index 3d66dcc21..64e890626 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -1,50 +1,50 @@
 <?php
 	/**
 	 * Elgg file browser
-	 * 
+	 *
 	 * @package ElggFile
 	 */
 
 	/**
-	 * Override the ElggFile so that 
+	 * Override the ElggFile so that
 	 */
 	class FilePluginFile extends ElggFile {
 		protected function initialise_attributes() {
 			parent::initialise_attributes();
-			
+
 			$this->attributes['subtype'] = "file";
 		}
-		
-		public function __construct($guid = null) {			
+
+		public function __construct($guid = null) {
 			parent::__construct($guid);
 		}
 	}
-	
+
 
 	/**
 	 * File plugin initialisation functions.
 	 */
 	function file_init() {
 		global $CONFIG;
-				
+
 		// Set up menu (tools dropdown)
 		add_menu(elgg_echo('files'), "pg/file/");
-				
+
 		// Extend CSS
 		elgg_extend_view('css', 'file/css');
-		
-	    // extend group main page
+
+		// extend group main page
 		elgg_extend_view('groups/tool_latest','file/groupprofile_files');
-		
+
 		// Register a page handler, so we can have nice URLs
 		register_page_handler('file','file_page_handler');
-			
+
 		// Add a new file widget
 		add_widget_type('filerepo',elgg_echo("file"),elgg_echo("file:widget:description"));
-		
+
 		// Register a URL handler for files
 		register_entity_url_handler('file_url','object','file');
-		
+
 		// Register granular notification for this object type
 		if (is_callable('register_notification_object')) {
 			register_notification_object('object', 'file', elgg_echo('file:newupload'));
@@ -52,8 +52,8 @@
 
 		// Listen to notification events and supply a more useful message
 		register_plugin_hook('notify:entity:message', 'object', 'file_notify_message');
-		
-		// add the group files tool option     
+
+		// add the group files tool option
 		add_group_tool_option('file',elgg_echo('groups:enablefiles'),true);
 
 		// Register entity type
@@ -63,24 +63,24 @@
 		register_plugin_hook('embed_get_sections', 'all', 'file_embed_get_sections');
 		register_plugin_hook('embed_get_items', 'file', 'file_embed_get_items');
 		register_plugin_hook('embed_get_upload_sections', 'all', 'file_embed_get_upload_sections');
-		
+
 	}
-	
+
 	/**
 	 * Sets up submenus for the file system.  Triggered on pagesetup.
 	 *
 	 */
 	function file_submenus() {
-		
+
 		global $CONFIG;
-		
+
 		$page_owner = elgg_get_page_owner();
-		
-		// Group submenu option	
+
+		// Group submenu option
 			if ($page_owner instanceof ElggGroup && elgg_get_context() == "groups") {
-    			if($page_owner->file_enable != "no"){ 
-				    add_submenu_item(sprintf(elgg_echo("file:group"),$page_owner->name), $CONFIG->wwwroot . "pg/file/" . $page_owner->username);
-			    }
+				if($page_owner->file_enable != "no"){
+					add_submenu_item(elgg_echo("file:group",array($page_owner->name)), $CONFIG->wwwroot . "pg/file/" . $page_owner->username);
+				}
 			}
 	}
 
@@ -90,37 +90,37 @@
 	 * @param array $page Array of page elements, forwarded by the page handling mechanism
 	 */
 	function file_page_handler($page) {
-		
+
 		global $CONFIG;
-		
+
 		// The username should be the file we're getting
 		if (isset($page[0])) {
 			set_input('username',$page[0]);
 		}
-		
+
 		if (isset($page[1])) {
-    		switch($page[1]) {
-    			case "read":
-    				set_input('guid',$page[2]);
+			switch($page[1]) {
+				case "read":
+					set_input('guid',$page[2]);
 					include(dirname(dirname(dirname(__FILE__))) . "/pages/entities/index.php");
 				break;
-    			case "friends":  
-    				include($CONFIG->pluginspath . "file/friends.php");
-          		break;
-   				case "world":  
-   					include($CONFIG->pluginspath . "file/world.php");
-          		break;
-    			case "new":  
-    				include($CONFIG->pluginspath . "file/upload.php");
-          		break;
-    		}
+				case "friends":
+					include($CONFIG->pluginspath . "file/friends.php");
+				  break;
+				case "world":
+					include($CONFIG->pluginspath . "file/world.php");
+				  break;
+				case "new":
+					include($CONFIG->pluginspath . "file/upload.php");
+				  break;
+			}
 		} else {
 			// Include the standard profile index
 			include($CONFIG->pluginspath . "file/index.php");
 		}
-		
+
 	}
-	
+
 	/**
 		 * Returns a more meaningful message
 		 *
@@ -128,7 +128,7 @@
 		 * @param unknown_type $entity_type
 		 * @param unknown_type $returnvalue
 		 * @param unknown_type $params
-    */
+	*/
 		function file_notify_message($hook, $entity_type, $returnvalue, $params) {
 			$entity = $params['entity'];
 			$to_entity = $params['to_entity'];
@@ -162,7 +162,7 @@
 	 * @return string The overall type
 	 */
 	function get_general_file_type($mimetype) {
-		
+
 		switch($mimetype) {
 			case "application/msword":
 				return "document";
@@ -171,34 +171,34 @@
 				return "document";
 				break;
 		}
-		
+
 		if (substr_count($mimetype,'text/'))
 			return "document";
-			
+
 		if (substr_count($mimetype,'audio/'))
 			return "audio";
-			
+
 		if (substr_count($mimetype,'image/'))
 			return "image";
-			
+
 		if (substr_count($mimetype,'video/'))
 			return "video";
 
 		if (substr_count($mimetype,'opendocument'))
-			return "document";	
-			
-		return "general";	
+			return "document";
+
+		return "general";
 	}
-	
+
 	/**
 	 * Returns a list of filetypes to search specifically on
 	 *
-	 * @param int|array $owner_guid The GUID(s) of the owner(s) of the files 
+	 * @param int|array $owner_guid The GUID(s) of the owner(s) of the files
 	 * @param true|false $friends Whether we're looking at the owner or the owner's friends
 	 * @return string The typecloud
 	 */
 	function get_filetype_cloud($owner_guid = "", $friends = false) {
-		
+
 		if ($friends) {
 			if ($friendslist = get_user_friends($user_guid, "", 999999, 0)) {
 				$friendguids = array();
@@ -217,7 +217,7 @@
 
 		return elgg_view('file/typecloud',array('owner_guid' => $owner_guid, 'friend_guid' => $friendofguid, 'types' => $types));
 	}
-	
+
 	/**
 	 * Register file as an embed type.
 	 *
@@ -232,10 +232,10 @@
 			'layout' => 'list',
 			'icon_size' => 'small',
 		);
-	
+
 		return $value;
 	}
-	
+
 	/**
 	 * Return a list of files for embedding
 	 *
@@ -250,22 +250,22 @@
 			'type_subtype_pair' => array('object' => 'file'),
 			'count' => TRUE
 		);
-	
+
 		if ($count = elgg_get_entities($options)) {
 			$value['count'] += $count;
-		
+
 			unset($options['count']);
 			$options['offset'] = $params['offset'];
 			$options['limit'] = $params['limit'];
-		
+
 			$items = elgg_get_entities($options);
-		
+
 			$value['items'] = array_merge($items, $value['items']);
 		}
-	
+
 		return $value;
 	}
-	
+
 	/**
 	 * Register file as an embed type.
 	 *
@@ -279,11 +279,11 @@
 			'name' => elgg_echo('file'),
 			'view' => 'file/embed_upload'
 		);
-	
+
 		return $value;
 	}
-	
-	
+
+
 	/**
 	 * Populates the ->getUrl() method for file objects
 	 *
@@ -293,13 +293,13 @@
 		function file_url($entity) {
 			$title = $entity->title;
 			$title = elgg_get_friendly_title($title);
-			return "pg/file/" . $entity->getOwnerEntity()->username . "/read/" . $entity->getGUID() . "/" . $title;	
+			return "pg/file/" . $entity->getOwnerEntity()->username . "/read/" . $entity->getGUID() . "/" . $title;
 		}
-	
+
 	// Make sure test_init is called on initialisation
 	register_elgg_event_handler('init','system','file_init');
 	register_elgg_event_handler('pagesetup','system','file_submenus');
-	
+
 	// Register actions
 	register_action("file/upload", false, $CONFIG->pluginspath . "file/actions/upload.php");
 	register_action("file/save", false, $CONFIG->pluginspath . "file/actions/save.php");
@@ -307,5 +307,5 @@
 
 	// temporary - see #2010
 	register_action("file/download", false, $CONFIG->pluginspath. "file/actions/download.php");
-	
+
 ?>