From 60a301bb4dc5503ddcb67b8cf201554a0c459685 Mon Sep 17 00:00:00 2001 From: marcus Date: Fri, 11 Jul 2008 10:28:28 +0000 Subject: Using register_error on errors rather than system_message git-svn-id: https://code.elgg.org/elgg/trunk@1398 36083f99-b078-4883-b0ff-0f9b5a30f544 --- actions/admin/plugins/disable.php | 2 +- actions/admin/plugins/enable.php | 2 +- mod/groups/actions/addtogroup.php | 8 ++++---- mod/groups/actions/edit.php | 4 ++-- mod/groups/actions/join.php | 4 ++-- mod/groups/actions/joinrequest.php | 4 ++-- mod/groups/actions/leave.php | 4 ++-- mod/opendd/actions/opendd/feed/delete.php | 4 ++-- mod/opendd/actions/opendd/feed/subscribe.php | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/actions/admin/plugins/disable.php b/actions/admin/plugins/disable.php index ae3139ef1..f98eda84b 100644 --- a/actions/admin/plugins/disable.php +++ b/actions/admin/plugins/disable.php @@ -22,7 +22,7 @@ if (disable_plugin($plugin)) system_message(sprintf(elgg_echo('admin:plugins:disable:yes'), $plugin)); else - system_message(sprintf(elgg_echo('admin:plugins:disable:no'), $plugin)); + register_error(sprintf(elgg_echo('admin:plugins:disable:no'), $plugin)); forward($_SERVER['HTTP_REFERER']); exit; diff --git a/actions/admin/plugins/enable.php b/actions/admin/plugins/enable.php index 28b0f9f33..380e5688a 100644 --- a/actions/admin/plugins/enable.php +++ b/actions/admin/plugins/enable.php @@ -22,7 +22,7 @@ if (enable_plugin($plugin)) system_message(sprintf(elgg_echo('admin:plugins:enable:yes'), $plugin)); else - system_message(sprintf(elgg_echo('admin:plugins:enable:no'), $plugin)); + register_error(sprintf(elgg_echo('admin:plugins:enable:no'), $plugin)); forward($_SERVER['HTTP_REFERER']); exit; diff --git a/mod/groups/actions/addtogroup.php b/mod/groups/actions/addtogroup.php index b60892012..10aea2880 100644 --- a/mod/groups/actions/addtogroup.php +++ b/mod/groups/actions/addtogroup.php @@ -55,7 +55,7 @@ } else - system_message(elgg_echo("groups:cantjoin")); + register_error(elgg_echo("groups:cantjoin")); $requested = true; } @@ -75,7 +75,7 @@ // Set invite flag //if (!$user->setMetaData('group_invite', $group->getGUID(), "", true)) if (!$user->group_invite = $methods) - system_message(elgg_echo("groups:usernotinvited")); + register_error(elgg_echo("groups:usernotinvited")); else { // Send email @@ -85,12 +85,12 @@ NULL, "email")) system_message(elgg_echo("groups:userinvited")); else - system_message(elgg_echo("groups:usernotinvited")); + register_error(elgg_echo("groups:usernotinvited")); } } } else - system_message(elgg_echo("groups:notowner")); + register_error(elgg_echo("groups:notowner")); } forward($forward_url); diff --git a/mod/groups/actions/edit.php b/mod/groups/actions/edit.php index 7965625e8..75ae1f80f 100644 --- a/mod/groups/actions/edit.php +++ b/mod/groups/actions/edit.php @@ -31,7 +31,7 @@ $group = new ElggGroup($group_guid); // load if present, if not create a new group if (($group_guid) && (!$group->canEdit())) { - system_message(elgg_echo("groups:cantedit")); + register_error(elgg_echo("groups:cantedit")); forward($_SERVER['HTTP_REFERER']); exit; @@ -48,7 +48,7 @@ // Validate create if (!$group->title) { - system_message(elgg_echo("groups:notitle")); + register_error(elgg_echo("groups:notitle")); forward($_SERVER['HTTP_REFERER']); exit; diff --git a/mod/groups/actions/join.php b/mod/groups/actions/join.php index 84e770065..639ed14da 100644 --- a/mod/groups/actions/join.php +++ b/mod/groups/actions/join.php @@ -36,7 +36,7 @@ exit; } else - system_message(elgg_echo("groups:cantjoin")); + register_error(elgg_echo("groups:cantjoin")); } else { @@ -47,7 +47,7 @@ } } else - system_message(elgg_echo("groups:cantjoin")); + register_error(elgg_echo("groups:cantjoin")); forward($_SERVER['HTTP_REFERER']); exit; diff --git a/mod/groups/actions/joinrequest.php b/mod/groups/actions/joinrequest.php index 895038f9e..3539221fe 100644 --- a/mod/groups/actions/joinrequest.php +++ b/mod/groups/actions/joinrequest.php @@ -75,13 +75,13 @@ NULL, "email")) system_message(elgg_echo("groups:joinrequestmade")); else - system_message(elgg_echo("groups:joinrequestnotmade")); + register_error(elgg_echo("groups:joinrequestnotmade")); } } else - system_message(elgg_echo('groups:alreadymember')); + register_error(elgg_echo('groups:alreadymember')); forward($_SERVER['HTTP_REFERER']); exit; diff --git a/mod/groups/actions/leave.php b/mod/groups/actions/leave.php index 87f976b3e..6324b8f37 100644 --- a/mod/groups/actions/leave.php +++ b/mod/groups/actions/leave.php @@ -29,10 +29,10 @@ if ($group->leave($user)) system_message(elgg_echo("groups:left")); else - system_message(elgg_echo("groups:cantleave")); + register_error(elgg_echo("groups:cantleave")); } else - system_message(elgg_echo("groups:cantleave")); + register_error(elgg_echo("groups:cantleave")); forward($_SERVER['HTTP_REFERER']); exit; diff --git a/mod/opendd/actions/opendd/feed/delete.php b/mod/opendd/actions/opendd/feed/delete.php index 2826174bf..6e7731df3 100644 --- a/mod/opendd/actions/opendd/feed/delete.php +++ b/mod/opendd/actions/opendd/feed/delete.php @@ -28,11 +28,11 @@ $returnurl = $CONFIG->url . "mod/opendd/"; } else - system_message(elgg_echo("opendd:notdeleted")); + register_error(elgg_echo("opendd:notdeleted")); } else - system_message(elgg_echo("opendd:notobject")); + register_error(elgg_echo("opendd:notobject")); diff --git a/mod/opendd/actions/opendd/feed/subscribe.php b/mod/opendd/actions/opendd/feed/subscribe.php index 654e6aef3..d96c93218 100644 --- a/mod/opendd/actions/opendd/feed/subscribe.php +++ b/mod/opendd/actions/opendd/feed/subscribe.php @@ -33,7 +33,7 @@ if (!($feed instanceof ElggObject)) { - system_message(elgg_echo("opendd:notobject")); + register_error(elgg_echo("opendd:notobject")); forward($_SERVER['HTTP_REFERER']); exit; @@ -51,7 +51,7 @@ if ($feed->save()) system_message(elgg_echo("opendd:feedok")); else - system_message(elgg_echo("opendd:feednotok")); + register_error(elgg_echo("opendd:feednotok")); forward($_SERVER['HTTP_REFERER']); exit; -- cgit v1.2.3