makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ticket/p/6855' into develop

Browse source 
* ticket/p/6855:
  [ticket/6855] Changed 'seperator' to 'separator'. [Igor Wiedler]
This commit is contained in:
Andreas Fischer 2010-08-22 17:48:44 +02:00
commit dfa53bfe9a
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/includes/functions.php
View file

@ -2038,7 +2038,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
// Make sure $per_page is a valid value // Make sure $per_page is a valid value
$per_page = ($per_page <= 0) ? 1 : $per_page; $per_page = ($per_page <= 0) ? 1 : $per_page;
$seperator = '<span class="page-sep">' . $user->lang['COMMA_SEPARATOR'] . '</span>'; $separator = '<span class="page-sep">' . $user->lang['COMMA_SEPARATOR'] . '</span>';
$total_pages = ceil($num_items / $per_page); $total_pages = ceil($num_items / $per_page);
if ($total_pages == 1 || !$num_items) if ($total_pages == 1 || !$num_items)
@ -2056,29 +2056,29 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
$start_cnt = min(max(1, $on_page - 4), $total_pages - 5); $start_cnt = min(max(1, $on_page - 4), $total_pages - 5);
$end_cnt = max(min($total_pages, $on_page + 4), 6); $end_cnt = max(min($total_pages, $on_page + 4), 6);
$page_string .= ($start_cnt > 1) ? ' ... ' : $seperator; $page_string .= ($start_cnt > 1) ? ' ... ' : $separator;
for ($i = $start_cnt + 1; $i < $end_cnt; $i++) for ($i = $start_cnt + 1; $i < $end_cnt; $i++)
{ {
$page_string .= ($i == $on_page) ? '<strong>' . $i . '</strong>' : '<a href="' . $base_url . "{$url_delim}start=" . (($i - 1) * $per_page) . '">' . $i . '</a>'; $page_string .= ($i == $on_page) ? '<strong>' . $i . '</strong>' : '<a href="' . $base_url . "{$url_delim}start=" . (($i - 1) * $per_page) . '">' . $i . '</a>';
if ($i < $end_cnt - 1) if ($i < $end_cnt - 1)
{ {
$page_string .= $seperator; $page_string .= $separator;
} }
} }
$page_string .= ($end_cnt < $total_pages) ? ' ... ' : $seperator; $page_string .= ($end_cnt < $total_pages) ? ' ... ' : $separator;
} }
else else
{ {
$page_string .= $seperator; $page_string .= $separator;
for ($i = 2; $i < $total_pages; $i++) for ($i = 2; $i < $total_pages; $i++)
{ {
$page_string .= ($i == $on_page) ? '<strong>' . $i . '</strong>' : '<a href="' . $base_url . "{$url_delim}start=" . (($i - 1) * $per_page) . '">' . $i . '</a>'; $page_string .= ($i == $on_page) ? '<strong>' . $i . '</strong>' : '<a href="' . $base_url . "{$url_delim}start=" . (($i - 1) * $per_page) . '">' . $i . '</a>';
if ($i < $total_pages) if ($i < $total_pages)
{ {
$page_string .= $seperator; $page_string .= $separator;
} }
} }
} }

8
phpBB/includes/functions_user.php
View file

@ -1774,15 +1774,15 @@ function validate_jabber($jid)
return false; return false;
} }
$seperator_pos = strpos($jid, '@'); $separator_pos = strpos($jid, '@');
if ($seperator_pos === false) if ($separator_pos === false)
{ {
return 'WRONG_DATA'; return 'WRONG_DATA';
} }
$username = substr($jid, 0, $seperator_pos); $username = substr($jid, 0, $separator_pos);
$realm = substr($jid, $seperator_pos + 1); $realm = substr($jid, $separator_pos + 1);
if (strlen($username) == 0 || strlen($realm) < 3) if (strlen($username) == 0 || strlen($realm) < 3)
{ {