Menu
▾
▴
[mxbb-commits] mx_glance mx_glance.php,1.5,1.6
|
From: OryNider <ory...@us...> - 2007-08-11 07:01:02
|
Update of /cvsroot/mxbb/mx_glance In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29659 Modified Files: mx_glance.php Log Message: a fix for previous added feature. Index: mx_glance.php =================================================================== RCS file: /cvsroot/mxbb/mx_glance/mx_glance.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mx_glance.php 5 Aug 2007 19:42:07 -0000 1.5 --- mx_glance.php 11 Aug 2007 07:00:57 -0000 1.6 *************** *** 457,460 **** --- 457,462 ---- } + $recent_news_total_info = count($i); + if (($recent_news_offset > 0) or ($recent_news_offset+$recent_num_news < $overall_news_topics)) { *************** *** 468,472 **** $prev_news_url = ''; } ! if ($recent_news_offset+$recent_num_news < $overall_total_topics) { $next_news_url = ($recent_forums_offset > 0) ? $new_url . ($recent_news_offset+$recent_num_news) . '&recent_posts_offset=' . $recent_forums_offset . '" class="th">Next ' . $recent_num_news . ' >></a>' : $new_url . ($recent_news_offset+$recent_num_news).'" class="th">Next ' . $recent_num_news . ' >></a>'; --- 470,474 ---- $prev_news_url = ''; } ! if ( ($recent_news_offset+$recent_num_news < $overall_total_topics) && ($recent_news_offset < $recent_num_news+recent_news_total_info) ) { $next_news_url = ($recent_forums_offset > 0) ? $new_url . ($recent_news_offset+$recent_num_news) . '&recent_posts_offset=' . $recent_forums_offset . '" class="th">Next ' . $recent_num_news . ' >></a>' : $new_url . ($recent_news_offset+$recent_num_news).'" class="th">Next ' . $recent_num_news . ' >></a>'; *************** *** 482,487 **** $next_news_url = ''; } ! $recent_news_total_info = count($i); ! $template->assign_block_vars('latest_news', array( 'NEWEST_POST_IMG' => $$bullet_full, 'TOPIC_FOLDER_IMG_SRC' => $$bullet_src, --- 484,489 ---- $next_news_url = ''; } ! ! $template->assign_block_vars('latest_news', array( 'NEWEST_POST_IMG' => $$bullet_full, 'TOPIC_FOLDER_IMG_SRC' => $$bullet_src, *************** *** 509,513 **** 'SWITCH_RECENT_NEWS' => (!empty($recent_num_news)) ? 1 : false, 'S_ROW_COUNT' => $i) ! ); } --- 511,515 ---- 'SWITCH_RECENT_NEWS' => (!empty($recent_num_news)) ? 1 : false, 'S_ROW_COUNT' => $i) ! ); } *************** *** 516,519 **** --- 518,542 ---- { $recent_news_total_info = 'None'; + + if (($recent_news_offset > 0) or ($recent_news_offset+$recent_num_news < $overall_news_topics)) + { + $new_url = '<a href="' . mx_append_sid(this_recent_url('recent_news_offset=')); + if ($recent_news_offset > 0) + { + $prev_news_url = ($recent_forums_offset > 0) ? $new_url . ($recent_news_offset-$recent_num_news) . '&recent_posts_offset=' . $recent_forums_offset . '" class="th"><< Prev ' . $recent_num_news . '</a>' : $new_url . ($recent_news_offset-$recent_num_news).'" class="th"><< Prev ' . $recent_num_news . '</a>'; + } + else + { + $prev_news_url = ''; + } + + $next_news_url = ''; + } + else + { + $prev_news_url = ''; + $next_news_url = ''; + } + $template->assign_block_vars('latest_news', array( 'TOPIC_FOLDER_IMG_SRC' => $recent_forums_bullet_old, *************** *** 609,612 **** --- 632,636 ---- } + $recent_forums_total_info = count($i); if (($recent_forums_offset > 0) or ($recent_forums_offset+$recent_num_topics < $overall_total_topics)) *************** *** 621,625 **** $prev_recent_url = ''; } ! if ($recent_forums_offset+$recent_num_topics < $overall_total_topics) { $next_recent_url = ($recent_news_offset > 0) ? $new_url . ($recent_forums_offset+$recent_num_topics) . '&recent_news_offset=' . $recent_news_offset . '" class="th">Next ' . $recent_num_topics . ' >></a>' : $new_url . ($recent_forums_offset+$recent_num_topics).'" class="th">Next ' . $recent_num_topics . ' >></a>'; --- 645,649 ---- $prev_recent_url = ''; } ! if ( ($recent_forums_offset+$recent_num_topics < $overall_total_topics) && ($recent_forums_offset < $recent_num_topics+$recent_forums_total_info) ) { $next_recent_url = ($recent_news_offset > 0) ? $new_url . ($recent_forums_offset+$recent_num_topics) . '&recent_news_offset=' . $recent_news_offset . '" class="th">Next ' . $recent_num_topics . ' >></a>' : $new_url . ($recent_forums_offset+$recent_num_topics).'" class="th">Next ' . $recent_num_topics . ' >></a>'; *************** *** 635,640 **** $next_recent_url = ''; } ! $recent_forums_total_info = count($i); ! $template->assign_block_vars('latest_topics', array( 'NEWEST_POST_IMG' => $$bullet_full, 'TOPIC_FOLDER_IMG_SRC' => $$bullet_src, --- 659,664 ---- $next_recent_url = ''; } ! ! $template->assign_block_vars('latest_topics', array( 'NEWEST_POST_IMG' => $$bullet_full, 'TOPIC_FOLDER_IMG_SRC' => $$bullet_src, *************** *** 662,666 **** 'SWITCH_RECENT_POSTS' => (!empty($recent_num_topics)) ? 1 : false, 'S_ROW_COUNT' => $i) ! ); } } --- 686,690 ---- 'SWITCH_RECENT_POSTS' => (!empty($recent_num_topics)) ? 1 : false, 'S_ROW_COUNT' => $i) ! ); } } *************** *** 668,671 **** --- 692,716 ---- { $recent_forums_total_info = 'None'; + + if (($recent_forums_offset > 0) or ($recent_forums_offset+$recent_num_topics < $overall_total_topics)) + { + $new_url = '<a href="' . mx_append_sid(this_recent_url('recent_posts_offset=')); + if ($recent_forums_offset > 0) + { + $prev_recent_url = ($recent_news_offset > 0) ? $new_url . ($recent_forums_offset-$recent_num_topics) . '&recent_news_offset=' . $recent_news_offset . '" class="th"><< Prev ' . $recent_num_topics . '</a>' : $new_url . ($recent_forums_offset-$recent_num_topics).'" class="th"><< Prev ' . $recent_num_topics . '</a>'; + } + else + { + $prev_recent_url = ''; + } + + $next_recent_url = ''; + } + else + { + $prev_recent_url = ''; + $next_recent_url = ''; + } + $template->assign_block_vars('latest_topics', array( 'BULLET' => $recent_forums_bullet_old, |
