aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_zebra.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2004-10-30 17:07:52 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2004-10-30 17:07:52 +0000
commitc987a54bb0bdffff48133ee38baf385eab45eacc (patch)
tree314a937da71720b79f0bd46f60cd432e77350545 /phpBB/includes/ucp/ucp_zebra.php
parent34a954eaf1b9028577717eb26a9250969aac0fcc (diff)
downloadforums-c987a54bb0bdffff48133ee38baf385eab45eacc.tar
forums-c987a54bb0bdffff48133ee38baf385eab45eacc.tar.gz
forums-c987a54bb0bdffff48133ee38baf385eab45eacc.tar.bz2
forums-c987a54bb0bdffff48133ee38baf385eab45eacc.tar.xz
forums-c987a54bb0bdffff48133ee38baf385eab45eacc.zip
more ucp updates
git-svn-id: file:///svn/phpbb/trunk@5012 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_zebra.php')
-rw-r--r--phpBB/includes/ucp/ucp_zebra.php26
1 files changed, 21 insertions, 5 deletions
diff --git a/phpBB/includes/ucp/ucp_zebra.php b/phpBB/includes/ucp/ucp_zebra.php
index b93c01a370..ca07234fc7 100644
--- a/phpBB/includes/ucp/ucp_zebra.php
+++ b/phpBB/includes/ucp/ucp_zebra.php
@@ -40,7 +40,7 @@ class ucp_zebra extends module
extract($data);
unset($data);
- if ($add)
+ if ($add && !sizeof($error))
{
$add = explode("\n", $add);
@@ -138,12 +138,21 @@ class ucp_zebra extends module
break;
}
}
+ else
+ {
+ $error[] = 'NOT_ADDED_' . strtoupper($mode);
+ }
unset($user_id_ary);
}
+ else
+ {
+ $error[] = 'USER_NOT_FOUND';
+ }
+
$db->sql_freeresult($result);
}
}
- else if ($usernames)
+ else if ($usernames && !sizeof($error))
{
// Force integer values
$usernames = array_map('intval', $usernames);
@@ -154,9 +163,16 @@ class ucp_zebra extends module
$db->sql_query($sql);
}
- meta_refresh(3, "ucp.$phpEx$SID&amp;i=$id&amp;mode=$mode");
- $message = $user->lang[strtoupper($mode) . '_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], "<a href=\"ucp.$phpEx$SID&amp;i=$id&amp;mode=$mode\">", '</a>');
- trigger_error($message);
+ if (!sizeof($error))
+ {
+ meta_refresh(3, "ucp.$phpEx$SID&amp;i=$id&amp;mode=$mode");
+ $message = $user->lang[strtoupper($mode) . '_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], "<a href=\"ucp.$phpEx$SID&amp;i=$id&amp;mode=$mode\">", '</a>');
+ trigger_error($message);
+ }
+ else
+ {
+ $template->assign_var('ERROR', implode('<br />', preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error)));
+ }
}
$sql_and = ($mode == 'friends') ? 'z.friend = 1' : 'z.foe = 1';