From 998a39940b27561d7a2e98b68c8929dab68fe62f Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 3 Nov 2010 19:46:47 +0000
Subject: Refs #1320. Updated core to use elgg_echo()'s native string
 replacement.

git-svn-id: http://code.elgg.org/elgg/trunk@7227 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 actions/admin/plugins/disable.php     |  5 +++--
 actions/admin/plugins/disableall.php  |  4 ++--
 actions/admin/plugins/enable.php      |  4 ++--
 actions/admin/plugins/enableall.php   |  4 ++--
 actions/admin/plugins/reorder.php     |  4 ++--
 actions/admin/user/delete.php         |  2 +-
 actions/admin/user/resetpassword.php  |  2 +-
 actions/comments/add.php              |  5 ++---
 actions/entities/delete.php           |  6 +++---
 actions/friends/add.php               |  4 ++--
 actions/friends/remove.php            |  6 +++---
 actions/likes/add.php                 |  5 ++---
 actions/plugins/settings/save.php     | 12 ++++++------
 actions/plugins/usersettings/save.php |  4 ++--
 actions/register.php                  |  2 +-
 actions/user/requestnewpassword.php   |  2 +-
 actions/useradd.php                   |  6 +++---
 17 files changed, 38 insertions(+), 39 deletions(-)

(limited to 'actions')

diff --git a/actions/admin/plugins/disable.php b/actions/admin/plugins/disable.php
index 48116e43a..9db5aec11 100644
--- a/actions/admin/plugins/disable.php
+++ b/actions/admin/plugins/disable.php
@@ -20,10 +20,11 @@ if (!is_array($plugin)) {
 
 foreach ($plugin as $p) {
 	if (disable_plugin($p)) {
-		system_message(sprintf(elgg_echo('admin:plugins:disable:yes'), $p));
+		system_message(elgg_echo('admin:plugins:disable:yes', array($p)));
+
 		elgg_delete_admin_notice('first_installation_plugin_reminder');
 	} else {
-		register_error(sprintf(elgg_echo('admin:plugins:disable:no'), $p));
+		register_error(elgg_echo('admin:plugins:disable:no', array($p)));
 	}
 }
 
diff --git a/actions/admin/plugins/disableall.php b/actions/admin/plugins/disableall.php
index bd68c17b1..21938727e 100644
--- a/actions/admin/plugins/disableall.php
+++ b/actions/admin/plugins/disableall.php
@@ -16,9 +16,9 @@ $plugins = get_installed_plugins();
 foreach ($plugins as $p => $data) {
 	if (disable_plugin($p)) {
 		elgg_delete_admin_notice('first_installation_plugin_reminder');
-		system_message(sprintf(elgg_echo('admin:plugins:disable:yes'), $p));
+		system_message(elgg_echo('admin:plugins:disable:yes', array($p)));
 	} else {
-		register_error(sprintf(elgg_echo('admin:plugins:disable:no'), $p));
+		register_error(elgg_echo('admin:plugins:disable:no', array($p)));
 	}
 }
 
diff --git a/actions/admin/plugins/enable.php b/actions/admin/plugins/enable.php
index b15666093..d3ad5606d 100644
--- a/actions/admin/plugins/enable.php
+++ b/actions/admin/plugins/enable.php
@@ -22,9 +22,9 @@ if (!is_array($plugin)) {
 foreach ($plugin as $p) {
 	if (enable_plugin($p)) {
 		elgg_delete_admin_notice('first_installation_plugin_reminder');
-		system_message(sprintf(elgg_echo('admin:plugins:enable:yes'), $p));
+		system_message(elgg_echo('admin:plugins:enable:yes', array($p)));
 	} else {
-		register_error(sprintf(elgg_echo('admin:plugins:enable:no'), $p));
+		register_error(elgg_echo('admin:plugins:enable:no', array($p)));
 	}
 }
 
diff --git a/actions/admin/plugins/enableall.php b/actions/admin/plugins/enableall.php
index b959c235f..9a2df00dc 100644
--- a/actions/admin/plugins/enableall.php
+++ b/actions/admin/plugins/enableall.php
@@ -16,9 +16,9 @@ $plugins = get_installed_plugins();
 foreach ($plugins as $p => $data) {
 	if (enable_plugin($p)) {
 		elgg_delete_admin_notice('first_installation_plugin_reminder');
-		system_message(sprintf(elgg_echo('admin:plugins:enable:yes'), $p));
+		system_message(elgg_echo('admin:plugins:enable:yes', array($p)));
 	} else {
-		register_error(sprintf(elgg_echo('admin:plugins:enable:no'), $p));
+		register_error(elgg_echo('admin:plugins:enable:no', array($p)));
 	}
 }
 
diff --git a/actions/admin/plugins/reorder.php b/actions/admin/plugins/reorder.php
index e3c65f6e5..2158653e1 100644
--- a/actions/admin/plugins/reorder.php
+++ b/actions/admin/plugins/reorder.php
@@ -40,9 +40,9 @@ if ($key = array_search($mod, $plugins)) {
 // Disable
 if (regenerate_plugin_list($plugins)) {
 	elgg_delete_admin_notice('first_installation_plugin_reminder');
-	system_message(sprintf(elgg_echo('admin:plugins:reorder:yes'), $plugin));
+	system_message(elgg_echo('admin:plugins:reorder:yes', array($plugin)));
 } else {
-	register_error(sprintf(elgg_echo('admin:plugins:reorder:no'), $plugin));
+	register_error(elgg_echo('admin:plugins:reorder:no', array($plugin)));
 }
 
 // don't regenerate the simplecache because the plugin won't be
diff --git a/actions/admin/user/delete.php b/actions/admin/user/delete.php
index 375f8b809..e8d835722 100644
--- a/actions/admin/user/delete.php
+++ b/actions/admin/user/delete.php
@@ -22,7 +22,7 @@ $username = $obj->username;
 
 if (($obj instanceof ElggUser) && ($obj->canEdit())) {
 	if ($obj->delete()) {
-		system_message(sprintf(elgg_echo('admin:user:delete:yes'), $name));
+		system_message(elgg_echo('admin:user:delete:yes', array($name)));
 	} else {
 		register_error(elgg_echo('admin:user:delete:no'));
 	}
diff --git a/actions/admin/user/resetpassword.php b/actions/admin/user/resetpassword.php
index 46a983c86..24127eb8b 100644
--- a/actions/admin/user/resetpassword.php
+++ b/actions/admin/user/resetpassword.php
@@ -32,7 +32,7 @@ if (($obj instanceof ElggUser) && ($obj->canEdit())) {
 		notify_user($obj->guid,
 			$CONFIG->site->guid,
 			elgg_echo('email:resetpassword:subject'),
-			sprintf(elgg_echo('email:resetpassword:body'), $obj->username, $password),
+			elgg_echo('email:resetpassword:body', array($obj->username, $password)),
 			NULL,
 			'email');
 	} else {
diff --git a/actions/comments/add.php b/actions/comments/add.php
index b7feb4b66..11418a2e2 100644
--- a/actions/comments/add.php
+++ b/actions/comments/add.php
@@ -47,15 +47,14 @@ if ($entity->owner_guid != $user->guid) {
 	notify_user($entity->owner_guid,
 				$user->guid,
 				elgg_echo('generic_comment:email:subject'),
-				sprintf(
-					elgg_echo('generic_comment:email:body'),
+				elgg_echo('generic_comment:email:body', array(
 					$entity->title,
 					$user->name,
 					$comment_text,
 					$entity->getURL(),
 					$user->name,
 					$user->getURL()
-				)
+				))
 			);
 }
 
diff --git a/actions/entities/delete.php b/actions/entities/delete.php
index 3ec88bd04..823e85c59 100644
--- a/actions/entities/delete.php
+++ b/actions/entities/delete.php
@@ -13,12 +13,12 @@ $entity = get_entity($guid);
 
 if (($entity) && ($entity->canEdit())) {
 	if ($entity->delete()) {
-		system_message(sprintf(elgg_echo('entity:delete:success'), $guid));
+		system_message(elgg_echo('entity:delete:success', array($guid)));
 	} else {
-		register_error(sprintf(elgg_echo('entity:delete:fail'), $guid));
+		register_error(elgg_echo('entity:delete:fail', array($guid)));
 	}
 } else {
-	register_error(sprintf(elgg_echo('entity:delete:fail'), $guid));
+	register_error(elgg_echo('entity:delete:fail', array($guid)));
 }
 
 forward(REFERER);
diff --git a/actions/friends/add.php b/actions/friends/add.php
index 60431a27d..d0a0d3d7c 100644
--- a/actions/friends/add.php
+++ b/actions/friends/add.php
@@ -21,13 +21,13 @@ try {
 		$errors = true;
 	}
 } catch (Exception $e) {
-	register_error(sprintf(elgg_echo("friends:add:failure"), $friend->name));
+	register_error(elgg_echo("friends:add:failure", array($friend->name)));
 	$errors = true;
 }
 if (!$errors) {
 	// add to river
 	add_to_river('friends/river/create', 'friend', get_loggedin_userid(), $friend_guid);
-	system_message(sprintf(elgg_echo("friends:add:successful"), $friend->name));
+	system_message(elgg_echo("friends:add:successful", array($friend->name)));
 }
 
 // Forward back to the page you friended the user on
diff --git a/actions/friends/remove.php b/actions/friends/remove.php
index 786b5975b..1230b12af 100644
--- a/actions/friends/remove.php
+++ b/actions/friends/remove.php
@@ -19,16 +19,16 @@ try{
 	if ($friend instanceof ElggUser) {
 		get_loggedin_user()->removeFriend($friend_guid);
 	} else {
-		register_error(sprintf(elgg_echo("friends:remove:failure"), $friend->name));
+		register_error(elgg_echo("friends:remove:failure", array($friend->name)));
 		$errors = true;
 	}
 } catch (Exception $e) {
-	register_error(sprintf(elgg_echo("friends:remove:failure"), $friend->name));
+	register_error(elgg_echo("friends:remove:failure", array($friend->name)));
 	$errors = true;
 }
 
 if (!$errors) {
-	system_message(sprintf(elgg_echo("friends:remove:successful"), $friend->name));
+	system_message(elgg_echo("friends:remove:successful", array($friend->name)));
 }
 
 // Forward back to the page you made the friend on
diff --git a/actions/likes/add.php b/actions/likes/add.php
index 211cb340b..b8c2f18b8 100644
--- a/actions/likes/add.php
+++ b/actions/likes/add.php
@@ -41,15 +41,14 @@ if ($entity->owner_guid != $user->guid) {
 	notify_user($entity->owner_guid,
 				$user->guid,
 				elgg_echo('likes:email:subject'),
-				sprintf(
-					elgg_echo('likes:email:body'),
+				elgg_echo('likes:email:body', array(
 					$user->name,
 					$entity->title,
 					//$comment_text,
 					$entity->getURL(),
 					$user->name,
 					$user->getURL()
-				)
+				))
 			);
 }
 
diff --git a/actions/plugins/settings/save.php b/actions/plugins/settings/save.php
index 1a8b2db3d..b67fa401f 100644
--- a/actions/plugins/settings/save.php
+++ b/actions/plugins/settings/save.php
@@ -9,7 +9,7 @@
 $params = get_input('params');
 $plugin = get_input('plugin');
 if (!$plugin_info = load_plugin_manifest($plugin)) {
-	register_error(sprintf(elgg_echo('plugins:settings:save:fail'), $plugin));
+	register_error(elgg_echo('plugins:settings:save:fail', array($plugin)));
 	forward(REFERER);
 }
 
@@ -31,29 +31,29 @@ if (elgg_action_exist("settings/$plugin/save")) {
 } else {
 	foreach ($params as $k => $v) {
 		if (!$result = set_plugin_setting($k, $v, $plugin)) {
-			register_error(sprintf(elgg_echo('plugins:settings:save:fail'), $plugin_name));
+			register_error(elgg_echo('plugins:settings:save:fail', array($plugin_name)));
 			forward(REFERER);
 			exit;
 		}
 	}
 }
 
-system_message(sprintf(elgg_echo('plugins:settings:save:ok'), $plugin_name));
+system_message(elgg_echo('plugins:settings:save:ok', array($plugin_name)));
 forward(REFERER);
 //
 //$trigger = trigger_plugin_hook('plugin:save_settings', $plugin, $options, NULL);
 //if ($trigger === NULL) {
 //	foreach ($params as $k => $v) {
 //		if (!$result = set_plugin_setting($k, $v, $plugin)) {
-//			register_error(sprintf(elgg_echo('plugins:settings:save:fail'), $plugin_name));
+//			register_error(elgg_echo('plugins:settings:save:fail', array($plugin_name)));
 //			forward(REFERER);
 //			exit;
 //		}
 //	}
 //} elseif ($trigger === FALSE) {
-//	register_error(sprintf(elgg_echo('plugins:settings:save:fail'), $plugin_name));
+//	register_error(elgg_echo('plugins:settings:save:fail', array($plugin_name)));
 //	forward(REFERER);
 //}
 //
-//system_message(sprintf(elgg_echo('plugins:settings:save:ok'), $plugin_name));
+//system_message(elgg_echo('plugins:settings:save:ok', array($plugin_name)));
 //forward(REFERER);
\ No newline at end of file
diff --git a/actions/plugins/usersettings/save.php b/actions/plugins/usersettings/save.php
index 27f549184..705871fac 100644
--- a/actions/plugins/usersettings/save.php
+++ b/actions/plugins/usersettings/save.php
@@ -19,11 +19,11 @@ foreach ($params as $k => $v) {
 
 	// Error?
 	if (!$result) {
-		register_error(sprintf(elgg_echo('plugins:usersettings:save:fail'), $plugin));
+		register_error(elgg_echo('plugins:usersettings:save:fail', array($plugin)));
 		forward(REFERER);
 		exit;
 	}
 }
 
-system_message(sprintf(elgg_echo('plugins:usersettings:save:ok'), $plugin));
+system_message(elgg_echo('plugins:usersettings:save:ok', array($plugin)));
 forward(REFERER);
diff --git a/actions/register.php b/actions/register.php
index fcb25de35..3a45cb69b 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -52,7 +52,7 @@ if ($CONFIG->allow_registration) {
 				throw new RegistrationException(elgg_echo('registerbad'));
 			}
 
-			system_message(sprintf(elgg_echo("registerok"), $CONFIG->sitename));
+			system_message(elgg_echo("registerok", array($CONFIG->sitename)));
 
 			// Forward on success, assume everything else is an error...
 			login($new_user);
diff --git a/actions/user/requestnewpassword.php b/actions/user/requestnewpassword.php
index 22b4008e8..5dfa24952 100644
--- a/actions/user/requestnewpassword.php
+++ b/actions/user/requestnewpassword.php
@@ -16,7 +16,7 @@ if ($user) {
 		register_error(elgg_echo('user:password:resetreq:fail'));
 	}
 } else {
-	register_error(sprintf(elgg_echo('user:username:notfound'), $username));
+	register_error(elgg_echo('user:username:notfound', array($username)));
 }
 
 forward();
diff --git a/actions/useradd.php b/actions/useradd.php
index 54def11b3..82625ad1b 100644
--- a/actions/useradd.php
+++ b/actions/useradd.php
@@ -35,12 +35,12 @@ try {
 		$new_user->created_by_guid = get_loggedin_userid();
 
 		$subject = elgg_echo('useradd:subject');
-		$body = sprintf(elgg_echo('useradd:body'), $name,
-			$CONFIG->site->name, $CONFIG->site->url, $username, $password);
+		$body = elgg_echo('useradd:body', array($name,
+			$CONFIG->site->name, $CONFIG->site->url, $username, $password));
 
 		notify_user($new_user->guid, $CONFIG->site->guid, $subject, $body);
 
-		system_message(sprintf(elgg_echo("adduser:ok"), $CONFIG->sitename));
+		system_message(elgg_echo("adduser:ok", array($CONFIG->sitename)));
 	} else {
 		register_error(elgg_echo("adduser:bad"));
 	}
-- 
cgit v1.2.3