Using register_error on errors rather than system_message.

Also, fixed widget save to handle arrays (Refs #135)

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

19 files changed, 30 insertions, 27 deletions

diff --git a/actions/comments/add.php b/actions/comments/add.php
index d89fd7866..bdc7fd06f 100644
--- a/actions/comments/add.php
+++ b/actions/comments/add.php
@@ -39,12 +39,12 @@
 					system_message(elgg_echo("generic_comment:posted"));

 					

 				} else {

-					system_message(elgg_echo("generic_comment:failure"));

+					register_error(elgg_echo("generic_comment:failure"));

 				}

 				

 		} else {

 		

-			system_message(elgg_echo("generic_comment:notfound"));

+			register_error(elgg_echo("generic_comment:notfound"));

 			

 		}

 		

diff --git a/actions/comments/delete.php b/actions/comments/delete.php
index 26875942c..4b5af9e18 100644
--- a/actions/comments/delete.php
+++ b/actions/comments/delete.php
@@ -29,7 +29,7 @@
 			$url = "";

 		}

 		

-		system_message(elgg_echo("generic_comment:notdeleted"));

+		register_error(elgg_echo("generic_comment:notdeleted"));

 		forward($entity->getURL());

 

 ?>
\ No newline at end of file
diff --git a/actions/email/confirm.php b/actions/email/confirm.php
index 8ba54347e..b11c790d7 100644
--- a/actions/email/confirm.php
+++ b/actions/email/confirm.php
@@ -29,10 +29,10 @@
 			notify_user($user_guid, $CONFIG->site->guid, elgg_echo('email:validate:success:subject'), sprintf(elgg_echo('email:validate:success:body'), $user->username), NULL, 'email');
 			
 		} else
-			system_message(elgg_echo('email:confirm:fail'));
+			register_error(elgg_echo('email:confirm:fail'));
 	}
 	else
-		system_message(elgg_echo('email:confirm:fail'));
+		register_error(elgg_echo('email:confirm:fail'));
 	
 	forward($_SERVER['HTTP_REFERER']);
 	exit;
diff --git a/actions/email/save.php b/actions/email/save.php
index 79cc40c6d..a3eb5e3cf 100644
--- a/actions/email/save.php
+++ b/actions/email/save.php
@@ -34,11 +34,11 @@
 				system_message(elgg_echo('email:save:success'));
 			}
 			else
-				system_message(elgg_echo('email:save:fail'));

+				register_error(elgg_echo('email:save:fail'));

 		}
 	}
 	else
-		system_message(elgg_echo('email:save:fail'));
+		register_error(elgg_echo('email:save:fail'));
 	
 	//forward($_SERVER['HTTP_REFERER']);
 	//exit;
diff --git a/actions/friends/add.php b/actions/friends/add.php
index ab413a6ba..f51aacefd 100644
--- a/actions/friends/add.php
+++ b/actions/friends/add.php
@@ -25,7 +25,7 @@
 			

 		} else {

 			

-			system_message(sprintf(elgg_echo("friends:add:failure"),$friend->name));

+			register_error(sprintf(elgg_echo("friends:add:failure"),$friend->name));

 			

 		}

 		

diff --git a/actions/friends/remove.php b/actions/friends/remove.php
index b6a846fa6..66ed020a5 100644
--- a/actions/friends/remove.php
+++ b/actions/friends/remove.php
@@ -25,7 +25,7 @@
 			

 		} else {

 			

-			system_message(sprintf(elgg_echo("friends:remove:failure"),$friend->name));

+			register_error(sprintf(elgg_echo("friends:remove:failure"),$friend->name));

 			

 		}

 		

diff --git a/actions/import/odd.php b/actions/import/odd.php
index 7e7615095..8b3f3ac3f 100644
--- a/actions/import/odd.php
+++ b/actions/import/odd.php
@@ -24,4 +24,6 @@
 	
 	if ($return)
 		system_message(elgg_echo('importsuccess'));
+	else
+		register_error(elgg_echo('importfail'));
 ?>
\ No newline at end of file
diff --git a/actions/login.php b/actions/login.php
index 769a2e671..4d4f3c098 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -31,7 +31,7 @@
             system_message(elgg_echo('loginok'));

             forward("pg/dashboard/");

         } else {

-            system_message(elgg_echo('loginerror'));

+            register_error(elgg_echo('loginerror'));

         }

       

 ?>
\ No newline at end of file
diff --git a/actions/logout.php b/actions/logout.php
index 2bcb538de..8d4eaa16d 100644
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -19,7 +19,7 @@
         if ($result) {

             system_message(elgg_echo('logoutok'));

         } else {

-            system_message(elgg_echo('logouterror'));

+            register_error(elgg_echo('logouterror'));

         }

 

 ?>
\ No newline at end of file
diff --git a/actions/notifications/settings/usersettings/save.php b/actions/notifications/settings/usersettings/save.php
index 2748a7150..5f486553d 100644
--- a/actions/notifications/settings/usersettings/save.php
+++ b/actions/notifications/settings/usersettings/save.php
@@ -21,7 +21,7 @@
 		
 		if (!$result)
 		{
-			system_message(elgg_echo('notifications:usersettings:save:fail'));
+			register_error(elgg_echo('notifications:usersettings:save:fail'));
 			//forward($_SERVER['HTTP_REFERER']);
 			
 			//exit;
@@ -31,7 +31,7 @@
 	if ($result)
 		system_message(elgg_echo('notifications:usersettings:save:ok'));
 	else
-		system_message(elgg_echo('notifications:usersettings:save:fail'));
+		register_error(elgg_echo('notifications:usersettings:save:fail'));
 	
 	//forward($_SERVER['HTTP_REFERER']);
 ?>
\ No newline at end of file
diff --git a/actions/plugins/settings/save.php b/actions/plugins/settings/save.php
index e1e53a2a6..c6c0bbaa5 100644
--- a/actions/plugins/settings/save.php
+++ b/actions/plugins/settings/save.php
@@ -25,7 +25,7 @@
 		// Error?
 		if (!$result)
 		{
-			system_message(sprintf(elgg_echo('plugins:settings:save:fail'), $plugin));
+			register_error(sprintf(elgg_echo('plugins:settings:save:fail'), $plugin));
 			
 			forward($_SERVER['HTTP_REFERER']);
 			
diff --git a/actions/plugins/usersettings/save.php b/actions/plugins/usersettings/save.php
index aba759ea2..f8721f2e2 100644
--- a/actions/plugins/usersettings/save.php
+++ b/actions/plugins/usersettings/save.php
@@ -25,7 +25,7 @@
 		// Error?
 		if (!$result)
 		{
-			system_message(sprintf(elgg_echo('plugins:usersettings:save:fail'), $plugin));
+			register_error(sprintf(elgg_echo('plugins:usersettings:save:fail'), $plugin));
 			
 			forward($_SERVER['HTTP_REFERER']);
 			
diff --git a/actions/register.php b/actions/register.php
index 7f49f4924..6f4009aaf 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -39,7 +39,7 @@
 			

 			system_message(sprintf(elgg_echo("registerok"),$CONFIG->sitename));

 		} else {

-			system_message(elgg_echo("registerbad"));

+			register_error(elgg_echo("registerbad"));

 		}

 

 ?>
\ No newline at end of file
diff --git a/actions/user/language.php b/actions/user/language.php
index f0b91791e..77168cd34 100644
--- a/actions/user/language.php
+++ b/actions/user/language.php
@@ -30,10 +30,10 @@
 		if ($user->save())
 			system_message(elgg_echo('user:language:success'));
 		else
-			system_message(elgg_echo('user:language:fail'));
+			register_error(elgg_echo('user:language:fail'));
 	}
 	else
-		system_message(elgg_echo('user:language:fail'));
+		register_error(elgg_echo('user:language:fail'));
 	
 	//forward($_SERVER['HTTP_REFERER']);
 	//exit;
diff --git a/actions/user/name.php b/actions/user/name.php
index b93c804b3..5bda16ebc 100644
--- a/actions/user/name.php
+++ b/actions/user/name.php
@@ -30,10 +30,10 @@
 		if ($user->save())
 			system_message(elgg_echo('user:name:success'));
 		else
-			system_message(elgg_echo('user:name:fail'));
+			register_error(elgg_echo('user:name:fail'));
 	}
 	else
-		system_message(elgg_echo('user:name:fail'));
+		register_error(elgg_echo('user:name:fail'));
 	
 	//forward($_SERVER['HTTP_REFERER']);
 	//exit;
diff --git a/actions/user/password.php b/actions/user/password.php
index ec3252644..c53188a00 100644
--- a/actions/user/password.php
+++ b/actions/user/password.php
@@ -35,13 +35,13 @@
 				if ($user->save())
 					system_message(elgg_echo('user:password:success'));
 				else
-					system_message(elgg_echo('user:password:fail'));
+					register_error(elgg_echo('user:password:fail'));
 			}
 			else
-				system_message(elgg_echo('user:password:fail:notsame'));
+				register_error(elgg_echo('user:password:fail:notsame'));
 		}
 		else
-			system_message(elgg_echo('user:password:fail:tooshort'));
+			register_error(elgg_echo('user:password:fail:tooshort'));
 	}
 	
 	//forward($_SERVER['HTTP_REFERER']);
diff --git a/actions/useradd.php b/actions/useradd.php
index fd89f0b5d..dea49f84a 100644
--- a/actions/useradd.php
+++ b/actions/useradd.php
@@ -41,7 +41,7 @@
 		
 		system_message(sprintf(elgg_echo("adduser:ok"),$CONFIG->sitename));
 	} else {
-		system_message(elgg_echo("adduser:bad"));
+		register_error(elgg_echo("adduser:bad"));
 	}
 
 	forward($_SERVER['HTTP_REFERER']);
diff --git a/actions/widgets/save.php b/actions/widgets/save.php
index 5032f8a0e..40d62c735 100644
--- a/actions/widgets/save.php
+++ b/actions/widgets/save.php
@@ -16,7 +16,7 @@
 		$params = $_REQUEST['params'];

 		$pageurl = get_input('pageurl');

 		$noforward = get_input('noforward',false);

-		

+

 		$result = false;

 		

 		if (!empty($guid)) {

@@ -28,7 +28,7 @@
 		if ($result) {

 			system_message(elgg_echo('widgets:save:success'));

 		} else {

-			system_message(elgg_echo('widgets:save:failure'));

+			register_error(elgg_echo('widgets:save:failure'));

 		}

 		

 		if (!$noforward)

diff --git a/languages/en.php b/languages/en.php
index a9b6fd95d..4c4075db3 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -407,7 +407,8 @@
 		/**

 		 * Import / export

 		 */

-			'importsuccess' => "Import of data was successful",

+			'importsuccess' => "Import of data was successful",
+			'importfail' => "OpenDD import of data failed.",

 			

 		/**

 		 * Widgets