mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-06 23:55:26 +02:00
more ucp updates
git-svn-id: file:///svn/phpbb/trunk@5012 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
34a954eaf1
commit
c987a54bb0
@ -137,6 +137,7 @@ class ucp_attachments extends module
|
||||
$template->assign_vars(array(
|
||||
'PAGE_NUMBER' => on_page($num_attachments, $config['posts_per_page'], $start),
|
||||
'PAGINATION' => generate_pagination("{$phpbb_root_path}ucp.$phpEx$SID&i=$id&sk=$sort_key&sd=$sort_dir", $num_attachments, $config['posts_per_page'], $start),
|
||||
'TOTAL_ATTACHMENTS' => $num_attachments,
|
||||
|
||||
'L_TITLE' => $user->lang['UCP_ATTACHMENTS'],
|
||||
|
||||
|
@ -231,8 +231,8 @@ class ucp_prefs extends module
|
||||
$sort_by_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 'r' => $user->lang['REPLIES'], 's' => $user->lang['SUBJECT'], 'v' => $user->lang['VIEWS']);
|
||||
$sort_by_sql = array('a' => 't.topic_first_poster_name', 't' => 't.topic_last_post_time', 'r' => 't.topic_replies', 's' => 't.topic_title', 'v' => 't.topic_views');
|
||||
|
||||
$s_limit_days = $s_sort_key = $s_sort_dir = '';
|
||||
gen_sort_selects($limit_days, $sort_by_text, $st, $sk, $sd, &$s_limit_days, &$s_sort_key, &$s_sort_dir);
|
||||
$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
|
||||
gen_sort_selects($limit_days, $sort_by_text, $st, $sk, $sd, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
|
||||
|
||||
$images = (isset($images)) ? $images : $user->optionget('viewimg');
|
||||
$images_yes = ($images) ? ' checked="checked"' : '';
|
||||
|
@ -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&i=$id&mode=$mode");
|
||||
$message = $user->lang[strtoupper($mode) . '_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], "<a href=\"ucp.$phpEx$SID&i=$id&mode=$mode\">", '</a>');
|
||||
trigger_error($message);
|
||||
if (!sizeof($error))
|
||||
{
|
||||
meta_refresh(3, "ucp.$phpEx$SID&i=$id&mode=$mode");
|
||||
$message = $user->lang[strtoupper($mode) . '_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], "<a href=\"ucp.$phpEx$SID&i=$id&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';
|
||||
|
Loading…
x
Reference in New Issue
Block a user