diff --git a/upload/admin/admin_attach_cp.php b/upload/admin/admin_attach_cp.php index fc56a70a5..0f44b11d2 100644 --- a/upload/admin/admin_attach_cp.php +++ b/upload/admin/admin_attach_cp.php @@ -581,12 +581,7 @@ if ($view == 'attachments') // Generate Pagination if ($do_pagination && $total_rows > $bb_cfg['topics_per_page']) { - $pagination = generate_pagination('admin_attach_cp.php?view=' . $view . '&mode=' . $mode . '&order=' . $sort_order . '&uid=' . $uid, $total_rows, $bb_cfg['topics_per_page'], $start).' '; - - $template->assign_vars(array( - 'PAGINATION' => $pagination, - 'PAGE_NUMBER' => sprintf($lang['PAGE_OF'], ( floor( $start / $bb_cfg['topics_per_page'] ) + 1 ), ceil( $total_rows / $bb_cfg['topics_per_page'] )), - )); + generate_pagination('admin_attach_cp.php?view=' . $view . '&mode=' . $mode . '&order=' . $sort_order . '&uid=' . $uid, $total_rows, $bb_cfg['topics_per_page'], $start).' '; } print_page('admin_attach_cp.tpl', 'admin'); \ No newline at end of file diff --git a/upload/admin/admin_log.php b/upload/admin/admin_log.php index 28eb3bd9d..5590da6c2 100644 --- a/upload/admin/admin_log.php +++ b/upload/admin/admin_log.php @@ -243,10 +243,7 @@ else $pages = (!$log_count) ? 1 : ceil($items_count / $per_page); } -$template->assign_vars(array( - 'PAGINATION' => generate_pagination($url, $items_count, $per_page, $start), - 'PAGE_NUMBER' => sprintf($lang['PAGE_OF'], floor($start / $per_page) + 1, $pages), -)); +generate_pagination($url, $items_count, $per_page, $start); $filter = array(); diff --git a/upload/ajax/posts.php b/upload/ajax/posts.php index 16296a1be..1a4119904 100644 --- a/upload/ajax/posts.php +++ b/upload/ajax/posts.php @@ -231,6 +231,9 @@ switch($this->request['type']) $this->ajax_die(sprintf($lang['SORRY_AUTH_REPLY'], strip_tags($is_auth['auth_reply_type']))); } + $message = (string) $this->request['message']; + $message = prepare_message($message); + // Flood control $where_sql = (IS_GUEST) ? "p.poster_ip = '". USER_IP ."'" : "p.poster_id = {$userdata['user_id']}"; @@ -263,16 +266,13 @@ switch($this->request['type']) { $last_msg = DB()->escape($row['post_text']); - if ($last_msg == $post_message) + if ($last_msg == $message) { $this->ajax_die($lang['DOUBLE_POST_ERROR']); } } } - $message = (string) $this->request['message']; - $message = prepare_message($message); - if($bb_cfg['max_smilies']) { $count_smilies = substr_count(bbcode2html($message), 'assign_vars(array( - 'PAGINATION' => generate_pagination(GROUP_URL . $group_id, $items_count, $per_page, $start), - 'PAGE_NUMBER' => sprintf($lang['PAGE_OF'], floor($start / $per_page) + 1, $pages), - )); + generate_pagination(GROUP_URL . $group_id, $items_count, $per_page, $start); // Pending if ($is_moderator) diff --git a/upload/includes/functions.php b/upload/includes/functions.php index fb8481aea..13eda4958 100644 --- a/upload/includes/functions.php +++ b/upload/includes/functions.php @@ -1670,7 +1670,7 @@ function birthday_age($date) // function generate_pagination($base_url, $num_items, $per_page, $start_item, $add_prevnext_text = TRUE) { - global $lang; + global $lang, $template; // Pagination Mod $begin_end = 3; @@ -1772,9 +1772,17 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add } - $return = ($page_string) ? $lang['GOTO_PAGE'] .':  '. $page_string : ''; + $pagination = ($page_string) ? 'Страницы :  '. $page_string : ''; + $pagination = str_replace('&start=0', '', $pagination); - return str_replace('&start=0', '', $return); + $template->assign_vars(array( + 'PAGINATION' => $pagination, + 'PAGE_NUMBER' => sprintf('Страница %d из %s', ( floor($start_item/$per_page) + 1 ), ceil( $num_items / $per_page )), + 'PG_BASE_URL' => $base_url, + 'PG_PER_PAGE' => $per_page, + )); + + return $pagination; } // diff --git a/upload/includes/ucp/usercp_attachcp.php b/upload/includes/ucp/usercp_attachcp.php index 1e37d3042..5b202355a 100644 --- a/upload/includes/ucp/usercp_attachcp.php +++ b/upload/includes/ucp/usercp_attachcp.php @@ -321,12 +321,7 @@ if (sizeof($attachments) > 0) // Generate Pagination if ($do_pagination && $total_rows > $bb_cfg['topics_per_page']) { - $pagination = generate_pagination(BB_ROOT ."profile.php?mode=attachcp&mode_a=$mode&order=$sort_order&" . POST_USERS_URL . '=' . $profiledata['user_id'] . '&sid=' . $userdata['session_id'], $total_rows, $bb_cfg['topics_per_page'], $start).' '; - - $template->assign_vars(array( - 'PAGINATION' => $pagination, - 'PAGE_NUMBER' => sprintf($lang['PAGE_OF'], (floor($start / $bb_cfg['topics_per_page']) + 1), ceil($total_rows / $bb_cfg['topics_per_page'])), - )); + generate_pagination(BB_ROOT ."profile.php?mode=attachcp&mode_a=$mode&order=$sort_order&" . POST_USERS_URL . '=' . $profiledata['user_id'] . '&sid=' . $userdata['session_id'], $total_rows, $bb_cfg['topics_per_page'], $start).' '; } print_page('usercp_attachcp.tpl'); diff --git a/upload/memberlist.php b/upload/memberlist.php index e86a3341b..41725c4bd 100644 --- a/upload/memberlist.php +++ b/upload/memberlist.php @@ -229,19 +229,13 @@ if ( $mode != 'topten' || $bb_cfg['topics_per_page'] < 10 ) if ($total = DB()->sql_fetchrow($result)) { $total_members = $total['total']; - $pagination = generate_pagination($paginationurl, $total_members, $bb_cfg['topics_per_page'], $start). ' '; + generate_pagination($paginationurl, $total_members, $bb_cfg['topics_per_page'], $start). ' '; } DB()->sql_freeresult($result); } -else -{ - $pagination = ' '; - $total_members = 10; -} + $template->assign_vars(array( 'PAGE_TITLE' => $lang['MEMBERLIST'], - 'PAGINATION' => $pagination, - 'PAGE_NUMBER' => sprintf($lang['PAGE_OF'], ( floor( $start / $bb_cfg['topics_per_page'] ) + 1 ), ceil( $total_members / $bb_cfg['topics_per_page'] )), )); print_page('memberlist.tpl'); diff --git a/upload/privmsg.php b/upload/privmsg.php index 9d2edc87d..1ec8cabc7 100644 --- a/upload/privmsg.php +++ b/upload/privmsg.php @@ -1751,11 +1751,7 @@ else } while( $row = DB()->sql_fetchrow($result) ); - $template->assign_vars(array( - 'PAGINATION' => generate_pagination("privmsg.php?folder=$folder", $pm_total, $bb_cfg['topics_per_page'], $start), - 'PAGE_NUMBER' => sprintf($lang['PAGE_OF'], ( floor( $start / $bb_cfg['topics_per_page'] ) + 1 ), ceil( $pm_total / $bb_cfg['topics_per_page'] )), - )); - + generate_pagination("privmsg.php?folder=$folder", $pm_total, $bb_cfg['topics_per_page'], $start); } else { diff --git a/upload/search.php b/upload/search.php index c2e696618..e12fcb740 100644 --- a/upload/search.php +++ b/upload/search.php @@ -752,10 +752,10 @@ if ($items_display) $pages = (!$items_count) ? 1 : ceil($items_count / $per_page); $url = ($search_id) ? url_arg($url, 'id', $search_id) : $url; + generate_pagination($url, $items_count, $per_page, $start); + $template->assign_vars(array( 'PAGE_TITLE' => $lang['SEARCH'], - 'PAGINATION' => generate_pagination($url, $items_count, $per_page, $start), - 'PAGE_NUMBER' => sprintf($lang['PAGE_OF'], floor($start / $per_page) + 1, $pages), 'SEARCH_MATCHES' => ($items_count) ? sprintf($lang['FOUND_SEARCH_MATCHES'], $items_count) : '', 'DISPLAY_AS_POSTS' => $post_mode, diff --git a/upload/templates/default/page_header.tpl b/upload/templates/default/page_header.tpl index 5a1e1b4d6..bf5ddb759 100644 --- a/upload/templates/default/page_header.tpl +++ b/upload/templates/default/page_header.tpl @@ -436,6 +436,29 @@ important_info + + + + +