Menu
▾
▴
mxbb-commits — Internal Mailing List for CVS Commit Messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(95) |
Apr
(270) |
May
(111) |
Jun
|
Jul
|
Aug
(64) |
Sep
(130) |
Oct
(319) |
Nov
(17) |
Dec
(191) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(53) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(387) |
Jul
(102) |
Aug
(247) |
Sep
(120) |
Oct
(1) |
Nov
(8) |
Dec
(21) |
| 2007 |
Jan
(38) |
Feb
(36) |
Mar
|
Apr
(32) |
May
(135) |
Jun
(523) |
Jul
(192) |
Aug
(103) |
Sep
(533) |
Oct
(77) |
Nov
(23) |
Dec
(203) |
| 2008 |
Jan
(312) |
Feb
(1193) |
Mar
(404) |
Apr
(67) |
May
(62) |
Jun
(497) |
Jul
(297) |
Aug
(110) |
Sep
(335) |
Oct
(256) |
Nov
(50) |
Dec
(118) |
| 2009 |
Jan
(67) |
Feb
(10) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(10) |
Jul
(61) |
Aug
|
Sep
(16) |
Oct
(45) |
Nov
(12) |
Dec
(14) |
| 2010 |
Jan
(30) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
(7) |
Aug
(7) |
Sep
(5) |
Oct
(5) |
Nov
|
Dec
|
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
(89) |
Apr
(11) |
May
(5) |
Jun
|
Jul
(8) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(89) |
| 2012 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(42) |
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
(90) |
May
(38) |
Jun
(235) |
Jul
(38) |
Aug
(10) |
Sep
|
Oct
(29) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(52) |
Jun
|
Jul
(7) |
Aug
|
Sep
(17) |
Oct
|
Nov
|
Dec
|
|
From: Jon O. <jon...@us...> - 2006-08-16 20:29:49
|
Update of /cvsroot/mxbb/mx_newssuite/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv5971/modules/mx_newssuite/includes Modified Files: news.php Log Message: removed some php warnings... Index: news.php =================================================================== RCS file: /cvsroot/mxbb/mx_newssuite/includes/news.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** news.php 5 Apr 2006 22:35:24 -0000 1.19 --- news.php 16 Aug 2006 20:29:45 -0000 1.20 *************** *** 18,22 **** $is_auth = array(); ! // // Here we have the (*very* simplified) sql statement ;) // I knew there was an easy way :roll: --- 18,22 ---- $is_auth = array(); ! // // Here we have the (*very* simplified) sql statement ;) // I knew there was an easy way :roll: *************** *** 24,28 **** // Get number of forums in db // ! $sql = "SELECT * FROM " . $news_cat_table . " ORDER BY $cat_extract_order"; --- 24,28 ---- // Get number of forums in db // ! $sql = "SELECT * FROM " . $news_cat_table . " ORDER BY $cat_extract_order"; *************** *** 44,48 **** for( $j = 0; $j < ( count( $forums ) ); $j++ ) { ! if ( $news_type_select_data[$item_types_all][$forums[$j][$cool_array_category_id]] ) { $topic_show[$j] = $forums[$j][$cool_array_category_id]; --- 44,48 ---- for( $j = 0; $j < ( count( $forums ) ); $j++ ) { ! if ( isset($news_type_select_data[$item_types_all][$forums[$j][$cool_array_category_id]]) ) { $topic_show[$j] = $forums[$j][$cool_array_category_id]; *************** *** 53,57 **** for( $z = 0; $z < ( count( $item_types_array ) ); $z++ ) { ! if ( $news_type_select_data[$item_types_array[$z]][$forums[$j][$cool_array_category_id]] ) { $topic_type[$j] .= $t_commas . $item_types_id_array[$z]; --- 53,57 ---- for( $z = 0; $z < ( count( $item_types_array ) ); $z++ ) { ! if ( isset($news_type_select_data[$item_types_array[$z]][$forums[$j][$cool_array_category_id]]) ) { $topic_type[$j] .= $t_commas . $item_types_id_array[$z]; *************** *** 59,64 **** } } ! ! if ( !empty( $topic_show[$j] ) && $topic_type[$j] != '' ) { --- 59,64 ---- } } ! ! if ( !empty( $topic_show[$j] ) && $topic_type[$j] != '' ) { *************** *** 67,72 **** $sql_find = " AND (( " . $item_table_category_id . " = " . $topic_show[$j] . " ! AND ( ! " . $item_table_item_type . " in ( " . $topic_type[$j] . " ) ) )"; --- 67,72 ---- $sql_find = " AND (( " . $item_table_category_id . " = " . $topic_show[$j] . " ! AND ( ! " . $item_table_item_type . " in ( " . $topic_type[$j] . " ) ) )"; *************** *** 76,81 **** $sql_find .= " OR ( " . $item_table_category_id . " = " . $topic_show[$j] . " ! AND ( ! " . $item_table_item_type . " in ( " . $topic_type[$j] . " ) ) )"; --- 76,81 ---- $sql_find .= " OR ( " . $item_table_category_id . " = " . $topic_show[$j] . " ! AND ( ! " . $item_table_item_type . " in ( " . $topic_type[$j] . " ) ) )"; *************** *** 92,96 **** // switch ( $news_sort_method ) ! { case 'Id': $news_sort_method = $item_table_item_id; --- 92,96 ---- // switch ( $news_sort_method ) ! { case 'Id': $news_sort_method = $item_table_item_id; *************** *** 115,121 **** } ! $news_today = date('mdY'); switch ( $news_filter_time ) ! { case 'no limit': $news_time_filter_lo = "no"; --- 115,121 ---- } ! $news_today = date('mdY'); switch ( $news_filter_time ) ! { case 'no limit': $news_time_filter_lo = "no"; *************** *** 129,136 **** case '3 days': $news_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($news_today, 0, 2)), intval(substr($news_today, 2, 2) - 1), intval(substr($news_today, 4, 4)) ); ! break; case '1 week': $news_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($news_today, 0, 2)), intval(substr($news_today, 2, 2) - 7), intval(substr($news_today, 4, 4)) ); ! break; case '2 weeks': $news_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($news_today, 0, 2)), intval(substr($news_today, 2, 2) - 14), intval(substr($news_today, 4, 4)) ); --- 129,136 ---- case '3 days': $news_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($news_today, 0, 2)), intval(substr($news_today, 2, 2) - 1), intval(substr($news_today, 4, 4)) ); ! break; case '1 week': $news_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($news_today, 0, 2)), intval(substr($news_today, 2, 2) - 7), intval(substr($news_today, 4, 4)) ); ! break; case '2 weeks': $news_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($news_today, 0, 2)), intval(substr($news_today, 2, 2) - 14), intval(substr($news_today, 4, 4)) ); *************** *** 141,145 **** case '1 month': $news_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($news_today, 0, 2) - 1), intval(substr($news_today, 2, 2)), intval(substr($news_today, 4, 4)) ); ! break; case '2 months': $news_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($news_today, 0, 2) - 2), intval(substr($news_today, 2, 2)), intval(substr($news_today, 4, 4)) ); --- 141,145 ---- case '1 month': $news_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($news_today, 0, 2) - 1), intval(substr($news_today, 2, 2)), intval(substr($news_today, 4, 4)) ); ! break; case '2 months': $news_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($news_today, 0, 2) - 2), intval(substr($news_today, 2, 2)), intval(substr($news_today, 4, 4)) ); *************** *** 180,188 **** // $block_rows[$block]['show_title'] = 0; ! $block_rows[$block]['show_block'] = 0; ! } for( $i = 0; $i < @count( $news ); $i++ ) ! { // // Stop from trying to display a non-existant topic and make sure we have --- 180,188 ---- // $block_rows[$block]['show_title'] = 0; ! $block_rows[$block]['show_block'] = 0; ! } for( $i = 0; $i < @count( $news ); $i++ ) ! { // // Stop from trying to display a non-existant topic and make sure we have *************** *** 193,198 **** break; } ! $newssuite_items[] = $news[$i][$item_id]; ! // // Main part where bbcode is parsed and stuff like that regarding the post text --- 193,198 ---- break; } ! $newssuite_items[] = $news[$i][$item_id]; ! // // Main part where bbcode is parsed and stuff like that regarding the post text *************** *** 205,210 **** $user_sig = ( $news[$i]['enable_sig'] && $news[$i]['user_sig'] != '' && $newssuite_config['news_display_signature'] ) ? $news[$i]['user_sig'] : ""; ! $user_sig_bbcode_uid = $news[$i]['user_sig_bbcode_uid']; ! // // Define censored word matches --- 205,210 ---- $user_sig = ( $news[$i]['enable_sig'] && $news[$i]['user_sig'] != '' && $newssuite_config['news_display_signature'] ) ? $news[$i]['user_sig'] : ""; ! $user_sig_bbcode_uid = $news[$i]['user_sig_bbcode_uid']; ! // // Define censored word matches *************** *** 212,217 **** $orig_word = array(); $replacement_word = array(); ! obtain_word_list( $orig_word, $replacement_word ); ! // // Parse smilies --- 212,217 ---- $orig_word = array(); $replacement_word = array(); ! obtain_word_list( $orig_word, $replacement_word ); ! // // Parse smilies *************** *** 234,239 **** } ! $message = make_clickable( $message ); ! // // Replace naughty words --- 234,239 ---- } ! $message = make_clickable( $message ); ! // // Replace naughty words *************** *** 253,263 **** $poster_id = $news[$i]['user_id']; ! $poster = $news[$i]['username']; ! // // Edit by info // if ( $newssuite_config['news_display_edit_info'] ) ! { // // Editing information --- 253,263 ---- $poster_id = $news[$i]['user_id']; ! $poster = $news[$i]['username']; ! // // Edit by info // if ( $newssuite_config['news_display_edit_info'] ) ! { // // Editing information *************** *** 275,280 **** } ! $message = str_replace( "\n", "\n<br />\n", $message ); ! // // Replace newlines (we use this rather than nl2br because --- 275,280 ---- } ! $message = str_replace( "\n", "\n<br />\n", $message ); ! // // Replace newlines (we use this rather than nl2br because *************** *** 286,291 **** } ! $message = stripslashes( $message ); ! // // OK, do some formatting fixes for the news block :-) --- 286,291 ---- } ! $message = stripslashes( $message ); ! // // OK, do some formatting fixes for the news block :-) *************** *** 296,301 **** $message = $message[0]; $message .= ' <span> ... :: <a class="gensmall" href="' . append_sid( PHPBB_URL . "viewtopic.$phpEx?t=" . $news[$i]['topic_id'] ) . '">' . $lang['Read more'] . '</a> </span>'; ! } ! // // truncate text --- 296,301 ---- $message = $message[0]; $message .= ' <span> ... :: <a class="gensmall" href="' . append_sid( PHPBB_URL . "viewtopic.$phpEx?t=" . $news[$i]['topic_id'] ) . '">' . $lang['Read more'] . '</a> </span>'; ! } ! // // truncate text *************** *** 305,347 **** $category_title_tmp = ns_truncate_text( $news[$i][$catt_name], $newssuite_config['news_truncate_num_subject'], true ); $category_title = $category_title_tmp[0]; ! $message_tmp = ns_truncate_text( $message, $newssuite_config['news_truncate_num'], true ); $message = $message_tmp[0]; ! // // Removes the [toc] and [page] markup // ! $message = ns_decode_KB_markup( $message ); ! // // enable/disable html ! // $post_subject = ns_decode_HTML( $post_subject ); $message = ns_decode_HTML( $message ); ! $user_sig = ns_decode_HTML( $user_sig ); ! ! // // replaces common bbcodes with slicker substitutes ! // $post_subject = ns_decode_BBCODE_fixup( $post_subject ); $message = ns_decode_BBCODE_fixup( $message ); ! $user_sig = ns_decode_BBCODE_fixup( $user_sig ); ! ! // // parse bbcode or removes bbcode ! // $post_subject = ns_decode_BBCODE( $post_subject, '', true ); $message = ns_decode_BBCODE( $message, $bbcode_uid ); ! $user_sig = ns_decode_BBCODE( $user_sig, $user_sig_bbcode_uid ); ! ! // // fixup (truncates) urls, images and words for a narrow column layout ! // $post_subject = ns_decode_truncate_fixup( $post_subject ); $message = ns_decode_truncate_fixup( $message ); $user_sig = ns_decode_truncate_fixup( $user_sig ); ! ! // // Add reame_more link if truncated ! // $message .= $message_tmp[1] ? readmore_link( $i, $newssuite_config, $news, $item_id, $page_id ) : ''; --- 305,347 ---- $category_title_tmp = ns_truncate_text( $news[$i][$catt_name], $newssuite_config['news_truncate_num_subject'], true ); $category_title = $category_title_tmp[0]; ! $message_tmp = ns_truncate_text( $message, $newssuite_config['news_truncate_num'], true ); $message = $message_tmp[0]; ! // // Removes the [toc] and [page] markup // ! $message = ns_decode_KB_markup( $message ); ! // // enable/disable html ! // $post_subject = ns_decode_HTML( $post_subject ); $message = ns_decode_HTML( $message ); ! $user_sig = ns_decode_HTML( $user_sig ); ! ! // // replaces common bbcodes with slicker substitutes ! // $post_subject = ns_decode_BBCODE_fixup( $post_subject ); $message = ns_decode_BBCODE_fixup( $message ); ! $user_sig = ns_decode_BBCODE_fixup( $user_sig ); ! ! // // parse bbcode or removes bbcode ! // $post_subject = ns_decode_BBCODE( $post_subject, '', true ); $message = ns_decode_BBCODE( $message, $bbcode_uid ); ! $user_sig = ns_decode_BBCODE( $user_sig, $user_sig_bbcode_uid ); ! ! // // fixup (truncates) urls, images and words for a narrow column layout ! // $post_subject = ns_decode_truncate_fixup( $post_subject ); $message = ns_decode_truncate_fixup( $message ); $user_sig = ns_decode_truncate_fixup( $user_sig ); ! ! // // Add reame_more link if truncated ! // $message .= $message_tmp[1] ? readmore_link( $i, $newssuite_config, $news, $item_id, $page_id ) : ''; *************** *** 432,441 **** $newest_post_img = '<a href="' . topic_last_post_link( $i, $newssuite_config, $news ) . '"><img src="' . $images['newssuite_icon_latest_reply'] . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>'; ! } ! // // Types info // KB ! // switch ( $newssuite_config['news_source_switch'] ) { --- 432,441 ---- $newest_post_img = '<a href="' . topic_last_post_link( $i, $newssuite_config, $news ) . '"><img src="' . $images['newssuite_icon_latest_reply'] . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>'; ! } ! // // Types info // KB ! // switch ( $newssuite_config['news_source_switch'] ) { *************** *** 449,453 **** } break; ! case 'phpbb'; --- 449,453 ---- } break; ! case 'phpbb'; *************** *** 465,476 **** } break; ! } ! ! // // Assign replacement variables to template ! // $template->assign_block_vars( 'newsrow', array( 'CAT_ID' => intval( $news[$i][$item_cat_id] ), 'TOPIC_ID' => intval( $news[$i][$item_id] ), ! 'TOPIC_TIME' => $topic_time, 'TOPIC_VIEWS' => intval( $news[$i][$item_views] ), 'POSTER_NAME' => $poster_name, --- 465,476 ---- } break; ! } ! ! // // Assign replacement variables to template ! // $template->assign_block_vars( 'newsrow', array( 'CAT_ID' => intval( $news[$i][$item_cat_id] ), 'TOPIC_ID' => intval( $news[$i][$item_id] ), ! 'TOPIC_TIME' => $topic_time, 'TOPIC_VIEWS' => intval( $news[$i][$item_views] ), 'POSTER_NAME' => $poster_name, *************** *** 480,489 **** 'EDITED_MESSAGE' => $l_edited_by, 'NEWS_POLL_DISPLAY' => $poll, ! 'NEWS_BLOCK_BORDER_STYLE' => $news_block_border_style ! ) ); ! ! // // Title info ------------- ! // if ( $news_display_block_title ) { --- 480,489 ---- 'EDITED_MESSAGE' => $l_edited_by, 'NEWS_POLL_DISPLAY' => $poll, ! 'NEWS_BLOCK_BORDER_STYLE' => $news_block_border_style ! ) ); ! ! // // Title info ------------- ! // if ( $news_display_block_title ) { *************** *** 491,500 **** { $template->assign_block_vars( 'newsrow.news_display_block_title', array( 'NEWS_BLOCK_HEADER_STYLE' => $news_block_header_style, ! 'TOPIC_TITLE' => $post_subject ) ); } else { ! $template->assign_block_vars( 'newsrow.news_display_block_title_nostyle', array( 'TOPIC_TITLE' => $post_subject ) ); } --- 491,500 ---- { $template->assign_block_vars( 'newsrow.news_display_block_title', array( 'NEWS_BLOCK_HEADER_STYLE' => $news_block_header_style, ! 'TOPIC_TITLE' => $post_subject ) ); } else { ! $template->assign_block_vars( 'newsrow.news_display_block_title_nostyle', array( 'TOPIC_TITLE' => $post_subject ) ); } *************** *** 505,543 **** 'TOPIC_LINK' => topic_link( $i, $newssuite_config, $news, $item_id, $page_id ), 'TOPIC_TITLE_IMG' => '<img align="absmiddle" src="' . $folder_image . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>', ! 'TOPIC_TITLE' => $post_subject ) ); ! if ( $news[$i][$item_type] != $news[$i-1][$item_type] || $news[$i][$item_cat_id] != $news[$i-1][$item_cat_id] ) { ! $template->assign_block_vars( 'newsrow.newspaper_display_title_type_nav', array( ! 'TOPIC_TITLE_IMG' => '<img align="absmiddle" src="' . $folder_image . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>', ! 'TYPE' => $topic_type ) ); ! } } else { ! $template->assign_block_vars( 'newsrow.newspaper_display_title', array( ! 'TOPIC_TITLE_IMG' => '<img align="absmiddle" src="' . $folder_image . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>', ! 'TOPIC_TITLE' => $post_subject ) ); ! if ( $news[$i][$item_type] != '0' ) { ! $template->assign_block_vars( 'newsrow.newspaper_display_title_type_nav', array( ! 'TOPIC_TITLE_IMG' => '<img align="absmiddle" src="' . $folder_image . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>', ! 'TYPE' => $topic_type ) ); ! } ! } ! ! } ! ! // // Footer info -------------------- ! // if ( $news_block_footer ) { --- 505,543 ---- 'TOPIC_LINK' => topic_link( $i, $newssuite_config, $news, $item_id, $page_id ), 'TOPIC_TITLE_IMG' => '<img align="absmiddle" src="' . $folder_image . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>', ! 'TOPIC_TITLE' => $post_subject ) ); ! if ( $news[$i][$item_type] != $news[$i-1][$item_type] || $news[$i][$item_cat_id] != $news[$i-1][$item_cat_id] ) { ! $template->assign_block_vars( 'newsrow.newspaper_display_title_type_nav', array( ! 'TOPIC_TITLE_IMG' => '<img align="absmiddle" src="' . $folder_image . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>', ! 'TYPE' => $topic_type ) ); ! } } else { ! $template->assign_block_vars( 'newsrow.newspaper_display_title', array( ! 'TOPIC_TITLE_IMG' => '<img align="absmiddle" src="' . $folder_image . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>', ! 'TOPIC_TITLE' => $post_subject ) ); ! if ( $news[$i][$item_type] != '0' ) { ! $template->assign_block_vars( 'newsrow.newspaper_display_title_type_nav', array( ! 'TOPIC_TITLE_IMG' => '<img align="absmiddle" src="' . $folder_image . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>', ! 'TYPE' => $topic_type ) ); ! } ! } ! ! } ! ! // // Footer info -------------------- ! // if ( $news_block_footer ) { *************** *** 549,553 **** 'L_COMMENT' => $l_comment, 'TOPIC_LINK' => topic_link( $i, $newssuite_config, $news, $item_id, $page_id ), ! 'TOPIC_LAST_POST_LINK' => topic_last_post_link( $i, $newssuite_config, $news ) ) ); } --- 549,553 ---- 'L_COMMENT' => $l_comment, 'TOPIC_LINK' => topic_link( $i, $newssuite_config, $news, $item_id, $page_id ), ! 'TOPIC_LAST_POST_LINK' => topic_last_post_link( $i, $newssuite_config, $news ) ) ); } *************** *** 557,582 **** 'READS' => sprintf( $lang['Reads'], $news[$i][$item_views] ), 'ORIGINAL_POST' => ' (' . $poster_name . ')', ! 'LATEST_POST' => $last_post_author . $newest_post_img . ' (' . $last_post_time . ')' ) ); } ! } ! ! // // Mode switch: Default, Newspager, Category Nav ! // if ( $newssuite_config['news_mode_switch'] != "Default_Block_Mode" ) ! { ! // // Show only topic titles ! // if ( !$category_nav_mode ) { $template->assign_block_vars( 'newsrow.category_nav_off', array( ) ); ! } ! // // Find new category ! // if ( $news[$i][$item_cat_id] != $news[$i-1][$item_cat_id] && $newssuite_config['news_sort_style'] == "Categorized") { --- 557,582 ---- 'READS' => sprintf( $lang['Reads'], $news[$i][$item_views] ), 'ORIGINAL_POST' => ' (' . $poster_name . ')', ! 'LATEST_POST' => $last_post_author . $newest_post_img . ' (' . $last_post_time . ')' ) ); } ! } ! ! // // Mode switch: Default, Newspager, Category Nav ! // if ( $newssuite_config['news_mode_switch'] != "Default_Block_Mode" ) ! { ! // // Show only topic titles ! // if ( !$category_nav_mode ) { $template->assign_block_vars( 'newsrow.category_nav_off', array( ) ); ! } ! // // Find new category ! // if ( $news[$i][$item_cat_id] != $news[$i-1][$item_cat_id] && $newssuite_config['news_sort_style'] == "Categorized") { *************** *** 587,591 **** 'CAT_ID' => intval( $news[$i][$item_cat_id] ), 'BLOCK_ID' => intval( $block_id ), ! 'CATEGORY_URL' => cat_link( $i, $newssuite_config, $news, $item_id, $page_id, $item_cat_id ) ) ); --- 587,591 ---- 'CAT_ID' => intval( $news[$i][$item_cat_id] ), 'BLOCK_ID' => intval( $block_id ), ! 'CATEGORY_URL' => cat_link( $i, $newssuite_config, $news, $item_id, $page_id, $item_cat_id ) ) ); *************** *** 597,602 **** { $template->assign_block_vars( 'newsrow.news_mode_category.switch_cat_link_on', array() ); ! } ! // // Generate the fold/unfold categories switches --- 597,602 ---- { $template->assign_block_vars( 'newsrow.news_mode_category.switch_cat_link_on', array() ); ! } ! // // Generate the fold/unfold categories switches *************** *** 614,624 **** else if ( $newssuite_config['news_sort_style'] != "Categorized" ) { ! $template->assign_block_vars( 'newsrow.newspaper_display_category_title', array( 'CATEGORY_TITLE' => $category_title, ! 'CATEGORY_URL' => cat_link( $i, $newssuite_config, $news, $item_id, $page_id, $item_cat_id ) ) ); } ! } ! // // Does this topic contain a poll? --- 614,624 ---- else if ( $newssuite_config['news_sort_style'] != "Categorized" ) { ! $template->assign_block_vars( 'newsrow.newspaper_display_category_title', array( 'CATEGORY_TITLE' => $category_title, ! 'CATEGORY_URL' => cat_link( $i, $newssuite_config, $news, $item_id, $page_id, $item_cat_id ) ) ); } ! } ! // // Does this topic contain a poll? *************** *** 676,680 **** if ( $user_voted || $view_result || $poll_expired || !$is_auth[$news[$i]['forum_id']]['auth_vote'] || $news[$i]['topic_status'] == TOPIC_LOCKED ) { ! $template->assign_vars( array( 'L_TOTAL_VOTES' => $lang['Total_votes'] ) ); --- 676,680 ---- if ( $user_voted || $view_result || $poll_expired || !$is_auth[$news[$i]['forum_id']]['auth_vote'] || $news[$i]['topic_status'] == TOPIC_LOCKED ) { ! $template->assign_vars( array( 'L_TOTAL_VOTES' => $lang['Total_votes'] ) ); *************** *** 689,693 **** 'TOTAL_VOTES' => $vote_results_sum, ! 'S_POLL_ACTION' => append_sid( $phpbb_root_path . "posting.$phpEx?" . POST_TOPIC_URL . "=$topic_id" ) ) ); --- 689,693 ---- 'TOTAL_VOTES' => $vote_results_sum, ! 'S_POLL_ACTION' => append_sid( $phpbb_root_path . "posting.$phpEx?" . POST_TOPIC_URL . "=$topic_id" ) ) ); *************** *** 719,723 **** 'POLL_OPTION_IMG_RCAP' => $vote_graphic_img_rcap, ! 'POLL_OPTION_IMG_WIDTH' => $vote_graphic_length ) ); } --- 719,723 ---- 'POLL_OPTION_IMG_RCAP' => $vote_graphic_img_rcap, ! 'POLL_OPTION_IMG_WIDTH' => $vote_graphic_length ) ); } *************** *** 726,730 **** { $template->assign_vars( array( 'L_SUBMIT_VOTE' => $lang['Submit_vote'], ! 'L_VIEW_RESULTS' => $lang['View_results'] ) ); --- 726,730 ---- { $template->assign_vars( array( 'L_SUBMIT_VOTE' => $lang['Submit_vote'], ! 'L_VIEW_RESULTS' => $lang['View_results'] ) ); *************** *** 734,738 **** 'S_POLL_ACTION' => append_sid( $phpbb_root_path . "posting.$phpEx?" . POST_TOPIC_URL . '=' . $news[$i]['topic_id'] ), ! 'U_VIEW_RESULTS' => append_sid( $mx_root_path . 'index.php?page=' . $page_id . '&' . ( $cat_id ? POST_CAT_URL . '=' . $cat_id . '&' : '' ) . "vote=viewresult" ) ) ); --- 734,738 ---- 'S_POLL_ACTION' => append_sid( $phpbb_root_path . "posting.$phpEx?" . POST_TOPIC_URL . '=' . $news[$i]['topic_id'] ), ! 'U_VIEW_RESULTS' => append_sid( $mx_root_path . 'index.php?page=' . $page_id . '&' . ( $cat_id ? POST_CAT_URL . '=' . $cat_id . '&' : '' ) . "vote=viewresult" ) ) ); *************** *** 745,749 **** $template->assign_block_vars( 'newsrow.switch_poll_vote.poll_option', array( 'POLL_OPTION_ID' => $vote_info[$j]['vote_option_id'], ! 'POLL_OPTION_CAPTION' => $vote_info[$j]['vote_option_text'] ) ); } --- 745,749 ---- $template->assign_block_vars( 'newsrow.switch_poll_vote.poll_option', array( 'POLL_OPTION_ID' => $vote_info[$j]['vote_option_id'], ! 'POLL_OPTION_CAPTION' => $vote_info[$j]['vote_option_text'] ) ); } *************** *** 802,810 **** $temp_tracking_next[$block_id] = $temp_next_url; $temp_tracking_previous[$block_id] = $temp_previous_url; ! $temp_tracking_home[$block_id] = 1; ! // // Assign some basic language variables ! // $template->assign_vars( array( 'L_READ_HOME' => $l_read_home, 'L_READ_NEXT' => $l_read_next, --- 802,810 ---- $temp_tracking_next[$block_id] = $temp_next_url; $temp_tracking_previous[$block_id] = $temp_previous_url; ! $temp_tracking_home[$block_id] = 1; ! // // Assign some basic language variables ! // $template->assign_vars( array( 'L_READ_HOME' => $l_read_home, 'L_READ_NEXT' => $l_read_next, *************** *** 818,822 **** 'U_READ_HOME' => $read_home_url . $more_vars, 'U_READ_NEXT' => $read_next_url . $more_vars, ! 'U_READ_PREVIOUS' => $read_previous_url . $more_vars ) ); --- 818,822 ---- 'U_READ_HOME' => $read_home_url . $more_vars, 'U_READ_NEXT' => $read_next_url . $more_vars, ! 'U_READ_PREVIOUS' => $read_previous_url . $more_vars ) ); |
|
From: Jon O. <jon...@us...> - 2006-08-16 20:29:49
|
Update of /cvsroot/mxbb/mx_newssuite In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv5971/modules/mx_newssuite Modified Files: news.php Log Message: removed some php warnings... Index: news.php =================================================================== RCS file: /cvsroot/mxbb/mx_newssuite/news.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** news.php 17 Jun 2006 20:49:02 -0000 1.15 --- news.php 16 Aug 2006 20:29:45 -0000 1.16 *************** *** 132,136 **** 'L_COMMENTS' => $lang['Comments'], 'L_NEWS_ARCHIVE' => $lang['News_Archive'], ! 'L_NEWS_NONE' => $lang['News_none'], 'NEWS_BLOCK_BORDER_STYLE' => $news_block_border_style --- 132,136 ---- 'L_COMMENTS' => $lang['Comments'], 'L_NEWS_ARCHIVE' => $lang['News_Archive'], ! //'L_NEWS_NONE' => $lang['News_none'], ?? 'NEWS_BLOCK_BORDER_STYLE' => $news_block_border_style |
|
From: Jon O. <jon...@us...> - 2006-08-16 20:29:04
|
Update of /cvsroot/mxbb/mx_linkdb/linkdb/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv5550/modules/mx_linkdb/linkdb/includes Modified Files: functions_linkdb.php Log Message: banner fix Index: functions_linkdb.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/includes/functions_linkdb.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** functions_linkdb.php 15 Aug 2006 19:43:27 -0000 1.21 --- functions_linkdb.php 16 Aug 2006 20:29:01 -0000 1.22 *************** *** 1064,1068 **** { $banner = "<a href=" . append_sid( $this->this_mxurl( "action=jump&link_id=" . $link_rowset['link_id'] ) ) . " alt='" . $row['link_desc'] . "' target='_blank'><img src='"; ! if ( $link_rowset['link_logo_src'] ) { $banner .= $link_rowset['link_logo_src']; --- 1064,1068 ---- { $banner = "<a href=" . append_sid( $this->this_mxurl( "action=jump&link_id=" . $link_rowset['link_id'] ) ) . " alt='" . $row['link_desc'] . "' target='_blank'><img src='"; ! if ( $link_rowset['link_logo_src'] && $link_rowset['link_logo_src'] != 'http://' ) { $banner .= $link_rowset['link_logo_src']; |
|
From: Jon O. <jon...@us...> - 2006-08-16 20:01:47
|
Update of /cvsroot/mxbb/mx_phpbb/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26790/modules/mx_phpbb/includes Modified Files: forum_hack.php Log Message: Finally!! A fix for phpBB new functions_post.php tweaks. Index: forum_hack.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/includes/forum_hack.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** forum_hack.php 29 Jun 2006 19:10:53 -0000 1.13 --- forum_hack.php 16 Aug 2006 20:01:43 -0000 1.14 *************** *** 17,20 **** --- 17,23 ---- include_once($phpbb_root_path . 'includes/functions_selects.' . $phpEx); + include_once($phpbb_root_path . 'includes/functions_post.' . $phpEx); + include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); + include_once($phpbb_root_path . 'includes/auth.' . $phpEx); // -------------------------------------------------------------------------------- *************** *** 306,310 **** 'memberlist' => $this->phpbb_config['memberlist'], //'modcp' => $this->phpbb_config['index'], ! 'modcp' => $this->phpbb_config['standalone'], 'posting' => $this->phpbb_config['index'], 'privmsg' => $this->phpbb_config['privmsg'], --- 309,313 ---- 'memberlist' => $this->phpbb_config['memberlist'], //'modcp' => $this->phpbb_config['index'], ! 'modcp' => $this->phpbb_config['index'], //'standalone' ??? 'posting' => $this->phpbb_config['index'], 'privmsg' => $this->phpbb_config['privmsg'], *************** *** 345,348 **** --- 348,352 ---- // Tricky but useful method to retrieve Portal Table names from phpBB scope... // -------------------------------------------------------------------------------- + /* function _get_mx_table_name( $table_suffix ) { *************** *** 351,354 **** --- 355,369 ---- return $mx_table_prefix . $table_suffix; } + */ + + function _get_mx_table_name( $table_suffix ) + { + global $mx_root_path, $phpEx, $mx_table_prefix; + if (!isset($mx_table_prefix)) + { + include( $mx_root_path . 'config.' . $phpEx ); + } + return $mx_table_prefix . $table_suffix; + } // -------------------------------------------------------------------------------- *************** *** 1217,1220 **** --- 1232,1240 ---- // + // Remove def of IN_PHPBB + // + $code = preg_replace('#^(.?define).*(IN_PHPBB).*(\r\n?|\n)#m','// mxBB: Removed IN_PHPBB def' . "\n", $code); + + // // Remove php tags // *************** *** 1263,1268 **** // Remove some includes already included by mxBB // - $code = preg_replace ("/include(.*)bbcode/", "//", $code); $code = preg_replace ("/include(.*)functions_select/", "//", $code); // --- 1283,1290 ---- // Remove some includes already included by mxBB // $code = preg_replace ("/include(.*)functions_select/", "//", $code); + $code = preg_replace ("/include(.*)functions_post/", "//", $code); + $code = preg_replace ("/include(.*)bbcode/", "//", $code); + $code = preg_replace ("/include(.*)auth/", "//", $code); // *************** *** 1334,1337 **** --- 1356,1360 ---- else { + //die(str_replace("\n", '<br>', htmlspecialchars($code))); eval($code); |
|
From: Jon O. <jon...@us...> - 2006-08-16 20:00:38
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26281/modules/mx_navmenu/includes Modified Files: navmenu_functions.php Log Message: A couple of PHP warnings solved Index: navmenu_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/includes/navmenu_functions.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** navmenu_functions.php 17 Jun 2006 20:45:22 -0000 1.2 --- navmenu_functions.php 16 Aug 2006 20:00:33 -0000 1.3 *************** *** 196,200 **** unset($mx_nav_data); - $db->sql_freeresult( $result ); return ( array('pagemapping' => $pageMapping, 'navcategory' => $navCategory) ); --- 196,199 ---- |
|
From: Jon O. <jon...@us...> - 2006-08-16 20:00:38
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26281/includes Modified Files: mx_functions_core.php mx_functions_phpbb.php Log Message: A couple of PHP warnings solved Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** mx_functions_core.php 28 Jun 2006 20:51:20 -0000 1.32 --- mx_functions_core.php 16 Aug 2006 20:00:33 -0000 1.33 *************** *** 1178,1182 **** $temp = $this->block_config[$this->block_id]; $this->block_info = $temp['block_info']; ! $this->block_parameters = $temp['block_parameters']; unset($temp); --- 1178,1182 ---- $temp = $this->block_config[$this->block_id]; $this->block_info = $temp['block_info']; ! $this->block_parameters = isset($temp['block_parameters']) ? $temp['block_parameters'] : ''; unset($temp); Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** mx_functions_phpbb.php 26 Jun 2006 21:32:22 -0000 1.25 --- mx_functions_phpbb.php 16 Aug 2006 20:00:33 -0000 1.26 *************** *** 930,937 **** } $userdata[$userdata_key] = $db->sql_fetchrowset($result); } - $db->sql_freeresult($result); - $group_ids_array = explode(',', $group_ids); --- 930,936 ---- } $userdata[$userdata_key] = $db->sql_fetchrowset($result); + $db->sql_freeresult($result); } $group_ids_array = explode(',', $group_ids); |
|
From: Jon O. <jon...@us...> - 2006-08-16 20:00:38
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26281/modules/mx_navmenu Modified Files: mx_menu_nav.php Log Message: A couple of PHP warnings solved Index: mx_menu_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** mx_menu_nav.php 16 Aug 2006 14:47:50 -0000 1.13 --- mx_menu_nav.php 16 Aug 2006 20:00:33 -0000 1.14 *************** *** 157,166 **** // For overall_header navigation // - is this current page category? ! $current_cat = ($pageMapping[$mx_page->page_id] == $cat_id || intval($HTTP_GET_VARS['cat_link']) == $cat_id) ? true : false; // // Update cookie - if this was a cat link // ! if (isset($HTTP_GET_VARS['cat_link']) && intval($HTTP_GET_VARS['cat_link']) == $cat_id || $current_cat) { setcookie('mxNavCat_' . intval($block_id) . intval($cat_id), true, (time()+21600), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); --- 157,166 ---- // For overall_header navigation // - is this current page category? ! $current_cat = ($pageMapping[$mx_page->page_id] == $cat_id || ( isset($HTTP_GET_VARS['cat_link']) ? intval($HTTP_GET_VARS['cat_link']) == $cat_id : false) ) ? true : false; // // Update cookie - if this was a cat link // ! if ( (isset($HTTP_GET_VARS['cat_link']) ? intval($HTTP_GET_VARS['cat_link']) == $cat_id : false) || $current_cat) { setcookie('mxNavCat_' . intval($block_id) . intval($cat_id), true, (time()+21600), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); *************** *** 179,183 **** 'CATEGORY_URL' => $cat_url, 'CATEGORY_NAME' => $cat, ! 'U_CAT_ICON' => $cat_icon, 'U_CAT_NAV_CONTRACT' => $images['mx_contract'], 'U_CAT_NAV_EXPAND' => $images['mx_expand'], --- 179,183 ---- 'CATEGORY_URL' => $cat_url, 'CATEGORY_NAME' => $cat, ! //'U_CAT_ICON' => $cat_icon, 'U_CAT_NAV_CONTRACT' => $images['mx_contract'], 'U_CAT_NAV_EXPAND' => $images['mx_expand'], *************** *** 217,221 **** if ( $menu_page_sync ) { ! if ( $menuData['block_id'] == $HTTP_GET_VARS['dynamic_block'] ) { $style = 'cattitle'; --- 217,221 ---- if ( $menu_page_sync ) { ! if ( isset($HTTP_GET_VARS['dynamic_block']) ? $menuData['block_id'] == $HTTP_GET_VARS['dynamic_block'] : false ) { $style = 'cattitle'; *************** *** 249,252 **** --- 249,253 ---- { $icon_url = $icon_tmp; + $icon_style = ''; } |
|
From: Jon O. <jon...@us...> - 2006-08-16 20:00:38
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26281 Modified Files: index.php Log Message: A couple of PHP warnings solved Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/index.php,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** index.php 16 Aug 2006 14:47:50 -0000 1.58 --- index.php 16 Aug 2006 20:00:33 -0000 1.59 *************** *** 118,121 **** --- 118,122 ---- // Toggle mode: default, dynamic, sub // + unset($mx_dynamic_block); if ( $mx_block->is_dynamic ) { *************** *** 132,135 **** --- 133,137 ---- } + unset($mx_parent_block); if ( $mx_block->is_sub ) { *************** *** 224,228 **** // Output editcp controls/buttons // ! if ( is_object($mx_dynamic_block) && $subblock == $total_subs - 1 ) { if ($mx_dynamic_block->dynamic_block_id > 0 && $mx_dynamic_block->auth_edit) --- 226,230 ---- // Output editcp controls/buttons // ! if ( isset($mx_dynamic_block) && $subblock == $total_subs - 1 ) { if ($mx_dynamic_block->dynamic_block_id > 0 && $mx_dynamic_block->auth_edit) *************** *** 232,236 **** } ! if ( is_object($mx_parent_block) && $subblock == $total_subs - 1 && $mx_parent_block->auth_edit ) { $mx_parent_block->output_cp_button(); --- 234,238 ---- } ! if ( isset($mx_parent_block) && $subblock == $total_subs - 1 && $mx_parent_block->auth_edit ) { $mx_parent_block->output_cp_button(); *************** *** 267,271 **** // Output some subblock wrappers // ! if (is_object($mx_parent_block)) { if ( $mx_parent_block->is_sub ) --- 269,273 ---- // Output some subblock wrappers // ! if (isset($mx_parent_block)) { if ( $mx_parent_block->is_sub ) *************** *** 299,308 **** // Destroy parent block data // ! if ( is_object($mx_parent_block) && $mx_parent_block->is_sub ) { unset( $mx_parent_block ); } ! if ( is_object($mx_dynamic_block) ) { unset( $mx_dynamic_block ); --- 301,310 ---- // Destroy parent block data // ! if ( isset($mx_parent_block) && $mx_parent_block->is_sub ) { unset( $mx_parent_block ); } ! if ( isset($mx_dynamic_block) ) { unset( $mx_dynamic_block ); |
|
From: Jon O. <jon...@us...> - 2006-08-16 15:50:43
|
Update of /cvsroot/mxbb/mx_calsnails/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3502/modules/mx_calsnails/includes Modified Files: cal_functions.php Log Message: bugfix Index: cal_functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/includes/cal_functions.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** cal_functions.php 16 Aug 2006 14:48:31 -0000 1.8 --- cal_functions.php 16 Aug 2006 15:15:20 -0000 1.9 *************** *** 595,598 **** --- 595,599 ---- include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); + include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx ); if ( !$bbcode_uid ) |
|
From: Jon O. <jon...@us...> - 2006-08-16 14:49:33
|
Update of /cvsroot/mxbb/mx_phpbb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22650/modules/mx_phpbb Modified Files: mx_phpbb.php Log Message: testing... Index: mx_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/mx_phpbb.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mx_phpbb.php 5 Apr 2006 22:36:11 -0000 1.8 --- mx_phpbb.php 16 Aug 2006 14:49:30 -0000 1.9 *************** *** 8,12 **** * */ ! if( !defined('IN_PORTAL') ) { --- 8,12 ---- * */ ! if( !defined('IN_PORTAL') ) { *************** *** 25,29 **** // trying to break out of a SQL statement. // - if( !get_magic_quotes_gpc() ) { --- 25,28 ---- *************** *** 52,59 **** include_once($mx_root_path . "modules/mx_phpbb/includes/phpbb_constants.$phpEx"); ! ob_start(); $mx_forum->read_file( $mx_forum->phpbb_script ); $phpbb_output = ob_get_contents(); ! ob_end_clean(); // --- 51,58 ---- include_once($mx_root_path . "modules/mx_phpbb/includes/phpbb_constants.$phpEx"); ! ob_start(); $mx_forum->read_file( $mx_forum->phpbb_script ); $phpbb_output = ob_get_contents(); ! ob_end_clean(); // *************** *** 68,87 **** //$phpbb_output = str_replace('"templates/'.$theme['template_name'].'/images/whosonline.gif', '"' . $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/whosonline.gif', $phpbb_output); break; ! case 'viewforum': break; ! case 'viewtopic': //$phpbb_output = str_replace('templates/'.$theme['template_name'].'/images/vote_lcap.gif', $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/vote_lcap.gif', $phpbb_output); //$phpbb_output = str_replace('templates/'.$theme['template_name'].'/images/vote_rcap.gif', $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/vote_rcap.gif', $phpbb_output); break; ! case 'posting': ! break; ! case 'faq': $phpbb_output = str_replace('#top', $phpbb_root_path . 'faq.php#top', $phpbb_output); ! break; ! } --- 67,86 ---- //$phpbb_output = str_replace('"templates/'.$theme['template_name'].'/images/whosonline.gif', '"' . $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/whosonline.gif', $phpbb_output); break; ! case 'viewforum': break; ! case 'viewtopic': //$phpbb_output = str_replace('templates/'.$theme['template_name'].'/images/vote_lcap.gif', $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/vote_lcap.gif', $phpbb_output); //$phpbb_output = str_replace('templates/'.$theme['template_name'].'/images/vote_rcap.gif', $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/vote_rcap.gif', $phpbb_output); break; ! case 'posting': ! break; ! case 'faq': $phpbb_output = str_replace('#top', $phpbb_root_path . 'faq.php#top', $phpbb_output); ! break; ! } *************** *** 91,94 **** echo($phpbb_output); unset($phpbb_output); - ?> \ No newline at end of file --- 90,92 ---- |
|
From: Jon O. <jon...@us...> - 2006-08-16 14:48:35
|
Update of /cvsroot/mxbb/mx_calsnails/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22211/modules/mx_calsnails/includes Modified Files: cal_functions.php Log Message: cache fix Index: cal_functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/includes/cal_functions.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** cal_functions.php 29 Jun 2006 22:03:22 -0000 1.7 --- cal_functions.php 16 Aug 2006 14:48:31 -0000 1.8 *************** *** 684,688 **** } ! if ( !( $result = $db->sql_query( $sql, 300 ) ) ) { mx_message_die( GENERAL_ERROR, 'Could not select Event data', '', __LINE__, __FILE__, $sql ); --- 684,688 ---- } ! if ( !( $result = $db->sql_query( $sql ) ) ) { mx_message_die( GENERAL_ERROR, 'Could not select Event data', '', __LINE__, __FILE__, $sql ); *************** *** 900,904 **** $sql .= " ORDER BY stamp"; ! if ( !( $query = $db->sql_query( $sql, 300 ) ) ) { echo "<BR>$sql<BR>" . mysql_error(); --- 900,904 ---- $sql .= " ORDER BY stamp"; ! if ( !( $query = $db->sql_query( $sql ) ) ) { echo "<BR>$sql<BR>" . mysql_error(); |
|
From: Jon O. <jon...@us...> - 2006-08-16 14:47:56
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21818 Modified Files: index.php Log Message: PHP varnings... Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/index.php,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** index.php 17 Jun 2006 20:09:06 -0000 1.57 --- index.php 16 Aug 2006 14:47:50 -0000 1.58 *************** *** 152,156 **** for( $subblock = 0; $subblock < $total_subs; $subblock++ ) { ! if ( is_object($mx_parent_block) ) { if ($mx_parent_block->is_sub) --- 152,156 ---- for( $subblock = 0; $subblock < $total_subs; $subblock++ ) { ! if ( isset($mx_parent_block) ) { if ($mx_parent_block->is_sub) |
|
From: Jon O. <jon...@us...> - 2006-08-16 14:47:56
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21818/modules/mx_navmenu Modified Files: mx_menu_nav.php Log Message: PHP varnings... Index: mx_menu_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** mx_menu_nav.php 29 Jun 2006 13:13:44 -0000 1.12 --- mx_menu_nav.php 16 Aug 2006 14:47:50 -0000 1.13 *************** *** 28,32 **** // Setup config parameters // ! $config_name = array('menu_mode', 'menu_display_style', 'menu_display_mode', 'menu_page_sync'); for( $i = 0; $i < count($config_name); $i++ ) --- 28,32 ---- // Setup config parameters // ! $config_name = array('menu_display_style', 'menu_display_mode', 'menu_page_sync'); for( $i = 0; $i < count($config_name); $i++ ) |
|
From: Jon O. <jon...@us...> - 2006-08-15 19:43:31
|
Update of /cvsroot/mxbb/mx_linkdb/linkdb/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv8243/modules/mx_linkdb/linkdb/includes Modified Files: functions_linkdb.php Log Message: updated toplist pagination Index: functions_linkdb.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/includes/functions_linkdb.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** functions_linkdb.php 13 Aug 2006 19:43:51 -0000 1.20 --- functions_linkdb.php 15 Aug 2006 19:43:27 -0000 1.21 *************** *** 1046,1049 **** --- 1046,1051 ---- } } + + return $total_file; } |
|
From: Jon O. <jon...@us...> - 2006-08-15 19:43:31
|
Update of /cvsroot/mxbb/mx_linkdb/templates/subSilver In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv8243/modules/mx_linkdb/templates/subSilver Modified Files: link_lists.tpl Log Message: updated toplist pagination Index: link_lists.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/templates/subSilver/link_lists.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** link_lists.tpl 13 Aug 2006 18:52:33 -0000 1.1 --- link_lists.tpl 15 Aug 2006 19:43:28 -0000 1.2 *************** *** 5,15 **** <!-- BEGIN file_rows --> <tr> ! <td rowspan="2" class="{FILELIST.file_rows.COLOR}" valign="top"> {FILELIST.file_rows.PIN_IMAGE}</td> ! <td width="100%" class="{FILELIST.file_rows.COLOR}"> ! <a href="{FILELIST.file_rows.U_FILE}" class="topictitle" target="_blank">{FILELIST.file_rows.FILE_NAME}</a> ! <!-- BEGIN is_new_file --> ! <img src="{FILELIST.file_rows.FILE_NEW_IMAGE}" border="0" alt="{L_NEW_FILE}"> ! <!-- END is_new_file --> ! <br><span class="genmed">{FILELIST.file_rows.FILE_DESC}</span> </td> </tr> --- 5,19 ---- <!-- BEGIN file_rows --> <tr> ! <td class="{FILELIST.file_rows.COLOR}" align="center"> ! {FILELIST.file_rows.PIN_IMAGE} ! </td> ! </tr> ! <tr> ! <td class="{FILELIST.file_rows.COLOR}" valign="top"> ! <a href="{FILELIST.file_rows.U_FILE}" class="topictitle" target="_blank">{FILELIST.file_rows.FILE_NAME}</a> ! <!-- BEGIN is_new_file --> ! <img src="{FILELIST.file_rows.FILE_NEW_IMAGE}" border="0" alt="{L_NEW_FILE}"> ! <!-- END is_new_file --> ! <br><span class="genmed">{FILELIST.file_rows.FILE_DESC}</span> </td> </tr> *************** *** 30,33 **** --- 34,38 ---- <!-- END display_rate --> </span> + <hr> </td> </tr> *************** *** 35,39 **** <!-- BEGIN toplist_pagination --> <tr valign="middle"> ! <td align="right" colspan="2" valign="top" nowrap="nowrap" height="28" class="cat"><span class="gensmall">{BLOCK_PAGINATION}</span></td> </tr> <!-- END toplist_pagination --> --- 40,44 ---- <!-- BEGIN toplist_pagination --> <tr valign="middle"> ! <td align="right" valign="top" nowrap="nowrap" height="28" class="cat"><span class="gensmall">{BLOCK_PAGINATION}</span></td> </tr> <!-- END toplist_pagination --> |
|
From: Jon O. <jon...@us...> - 2006-08-15 19:43:31
|
Update of /cvsroot/mxbb/mx_linkdb/linkdb/modules In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv8243/modules/mx_linkdb/linkdb/modules Modified Files: link_lists.php Log Message: updated toplist pagination Index: link_lists.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_lists.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** link_lists.php 13 Aug 2006 19:43:51 -0000 1.2 --- link_lists.php 15 Aug 2006 19:43:28 -0000 1.3 *************** *** 138,144 **** )); ! if ($toplist_config['toplist_use_pagination'] == 'TRUE') { ! $template->assign_block_vars( "toplist_pagination", array()); } --- 138,144 ---- )); ! if ($toplist_config['toplist_use_pagination'] == 'TRUE' || true) { ! $template->assign_block_vars( "FILELIST.toplist_pagination", array()); } |
|
From: Jon O. <jon...@us...> - 2006-08-15 19:42:53
|
Update of /cvsroot/mxbb/mx_kb/kb/modules In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7849/modules/mx_kb/kb/modules Modified Files: kb_lists.php Log Message: updated toplist pagination Index: kb_lists.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_lists.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** kb_lists.php 13 Aug 2006 19:43:07 -0000 1.2 --- kb_lists.php 15 Aug 2006 19:42:50 -0000 1.3 *************** *** 135,144 **** 'L_KB' => $kb_config['module_name'], ! 'BLOCK_PAGINATION' => mx_generate_pagination(append_sid( $this->this_mxurl( '', false, false ) ), $total_num_items, $toplist_config['toplist_pagination'], $start, true, true, true, false, 'kb_start'), )); if ($toplist_config['toplist_use_pagination'] == 'TRUE') { ! $template->assign_block_vars( "toplist_pagination", array()); } } --- 135,144 ---- 'L_KB' => $kb_config['module_name'], ! 'BLOCK_PAGINATION' => mx_generate_pagination(append_sid( $this->this_mxurl( '', false, false ) ), $total_num_items, $toplist_config['toplist_pagination'], $start, true, true, true, false, 'kb_start',), )); if ($toplist_config['toplist_use_pagination'] == 'TRUE') { ! $template->assign_block_vars( "ARTICLELIST.toplist_pagination", array()); } } |
|
From: Jon O. <jon...@us...> - 2006-08-15 19:42:53
|
Update of /cvsroot/mxbb/mx_kb/kb/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7849/modules/mx_kb/kb/includes Modified Files: functions_kb.php Log Message: updated toplist pagination Index: functions_kb.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions_kb.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** functions_kb.php 13 Aug 2006 18:51:37 -0000 1.18 --- functions_kb.php 15 Aug 2006 19:42:50 -0000 1.19 *************** *** 1122,1125 **** --- 1122,1127 ---- } } + + return $total_file; } |
|
From: Jon O. <jon...@us...> - 2006-08-15 19:08:50
|
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/modules In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26301/modules/mx_pafiledb/pafiledb/modules Modified Files: pa_quickdl.php Log Message: Fix for the quickdl block, to keep in sync with dynamic blocks Index: pa_quickdl.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_quickdl.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** pa_quickdl.php 13 Aug 2006 19:44:45 -0000 1.12 --- pa_quickdl.php 15 Aug 2006 19:08:33 -0000 1.13 *************** *** 161,172 **** } ! $map_xtra = !empty( $pa_get_dynamic[$pafiledb_quickdl['pa_quick_cat']] ) ? '&dynamic_block=' . $pa_get_dynamic[$pafiledb_quickdl['pa_quick_cat']] : ''; $pafiledb_template->assign_vars( array( ! 'U_DOWNLOAD' => append_sid( $this->this_mxurl( 'actionqdl=quickdl&cat_id=' . $pafiledb_quickdl['pa_quick_cat'] . $map_xtra ) ), ! 'DOWNLOAD' => $quickdl['cat_name'], ! 'BACK' => $quickdl_back ! ) ! ); $no_file_message = true; --- 161,176 ---- } ! ! // ! // Xtra Get vars ! // ! $map_xtra = (!empty($_GET['dynamic_block']) ? '&dynamic_block=' . $_GET['dynamic_block'] : ''); ! //$map_xtra = !empty( $pa_get_dynamic[$pafiledb_quickdl['pa_quick_cat']] ) ? '&dynamic_block=' . $pa_get_dynamic[$pafiledb_quickdl['pa_quick_cat']] : ''; $pafiledb_template->assign_vars( array( ! 'U_DOWNLOAD' => append_sid( $this->this_mxurl( 'actionqdl=quickdl&cat_id=' . $pafiledb_quickdl['pa_quick_cat'] . $map_xtra ) ), ! 'DOWNLOAD' => $quickdl['cat_name'], ! 'BACK' => $quickdl_back ! )); $no_file_message = true; *************** *** 178,185 **** $no_file_message = false; ! $this->display_categories_quickdl( $pa_cat_id, $pa_get_dynamic ); } - //$this->display_items_quickdl( $sort_method, $sort_order, $start, $no_file_message, $pa_cat_id ); $this->display_items( $sort_method, $sort_order, $start, $pa_cat_id, $no_file_message ); --- 182,189 ---- $no_file_message = false; ! //$this->display_categories_quickdl( $pa_cat_id, $pa_get_dynamic ); ! $this->display_categories_original( $pa_cat_id, 'actionqdl', 'quickdl', $map_xtra ); } $this->display_items( $sort_method, $sort_order, $start, $pa_cat_id, $no_file_message ); |
|
From: Jon O. <jon...@us...> - 2006-08-15 19:08:43
|
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26301/modules/mx_pafiledb/pafiledb/includes Modified Files: functions_pafiledb.php Log Message: Fix for the quickdl block, to keep in sync with dynamic blocks Index: functions_pafiledb.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions_pafiledb.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** functions_pafiledb.php 15 Aug 2006 14:09:54 -0000 1.41 --- functions_pafiledb.php 15 Aug 2006 19:08:33 -0000 1.42 *************** *** 731,735 **** * @param unknown_type $cat_id */ ! function display_categories_original( $cat_id = PA_ROOT_CAT ) { global $db, $pafiledb_template, $lang, $userdata, $phpEx, $images; --- 731,735 ---- * @param unknown_type $cat_id */ ! function display_categories_original( $cat_id = PA_ROOT_CAT, $action_name = 'action', $action_default = 'category', $map_xtra = '' ) { global $db, $pafiledb_template, $lang, $userdata, $phpEx, $images; *************** *** 741,745 **** if ( !$userdata['session_logged_in'] ) { ! $redirect = ( $cat_id != PA_ROOT_CAT ) ? $this->this_mxurl( "action=category&cat_id=$cat_id" ) : $this->this_mxurl(); redirect( append_sid( "login.$phpEx?redirect=$redirect", true ) ); } --- 741,745 ---- if ( !$userdata['session_logged_in'] ) { ! $redirect = ( $cat_id != PA_ROOT_CAT ) ? $this->this_mxurl( "$action_name=$action_default&cat_id=$cat_id" ) : $this->this_mxurl(); redirect( append_sid( "login.$phpEx?redirect=$redirect", true ) ); } *************** *** 791,795 **** $pafiledb_template->assign_block_vars( 'no_cat_parent', array( 'IS_HIGHER_CAT' => false, ! 'U_CAT' => append_sid( $this->this_mxurl( 'action=category&cat_id=' . $subcat_id ) ), 'SUB_CAT' => ( !empty( $sub_cat ) ) ? '<br /><b>' . $lang['Sub_category'] . ': </b>' . $sub_cat : '', 'CAT_IMAGE' => ( $is_new ) ? $images['pa_folder_new'] : $images['pa_folder'], --- 791,795 ---- $pafiledb_template->assign_block_vars( 'no_cat_parent', array( 'IS_HIGHER_CAT' => false, ! 'U_CAT' => append_sid( $this->this_mxurl( "$action_name=$action_default&cat_id=" . $subcat_id . $map_xtra ) ), 'SUB_CAT' => ( !empty( $sub_cat ) ) ? '<br /><b>' . $lang['Sub_category'] . ': </b>' . $sub_cat : '', 'CAT_IMAGE' => ( $is_new ) ? $images['pa_folder_new'] : $images['pa_folder'], *************** *** 834,838 **** $pafiledb_template->assign_block_vars( 'no_cat_parent', array( 'IS_HIGHER_CAT' => true, ! 'U_CAT' => append_sid( $this->this_mxurl( 'action=category&cat_id=' . $subcat_id ) ), 'CAT_NAME' => $subcat_row['cat_name'] ) ); --- 834,838 ---- $pafiledb_template->assign_block_vars( 'no_cat_parent', array( 'IS_HIGHER_CAT' => true, ! 'U_CAT' => append_sid( $this->this_mxurl( "$action_name=$action_default&cat_id=" . $subcat_id . $map_xtra) ), 'CAT_NAME' => $subcat_row['cat_name'] ) ); *************** *** 870,874 **** $pafiledb_template->assign_block_vars( 'no_cat_parent', array( 'IS_HIGHER_CAT' => false, ! 'U_CAT' => append_sid( $this->this_mxurl( 'action=category&cat_id=' . $sub_cat_rowset[$k]['cat_id'] ) ), 'SUB_CAT' => ( !empty( $sub_cat ) ) ? '<br /><b>' . $lang['Sub_category'] . ': </b>' . $sub_cat : '', 'CAT_IMAGE' => ( $is_new ) ? $images['pa_folder_new'] : $images['pa_folder'], --- 870,874 ---- $pafiledb_template->assign_block_vars( 'no_cat_parent', array( 'IS_HIGHER_CAT' => false, ! 'U_CAT' => append_sid( $this->this_mxurl( "$action_name=$action_default&cat_id=" . $sub_cat_rowset[$k]['cat_id'] . $map_xtra ) ), 'SUB_CAT' => ( !empty( $sub_cat ) ) ? '<br /><b>' . $lang['Sub_category'] . ': </b>' . $sub_cat : '', 'CAT_IMAGE' => ( $is_new ) ? $images['pa_folder_new'] : $images['pa_folder'], *************** *** 887,1042 **** /** - * display_categories - quickdl. - * - * @param unknown_type $cat_id - * @param unknown_type $pa_get_dynamic - */ - function display_categories_quickdl( $cat_id = PA_ROOT_CAT, $pa_get_dynamic = array() ) - { - global $db, $pafiledb_template, $lang, $userdata, $phpEx, $images; - global $pafiledb_config, $board_config, $debug; - global $phpbb_root_path, $mx_root_path, $module_root_path, $is_block, $phpEx; - - if ( $this->cat_empty() ) - { - mx_message_die( GENERAL_ERROR, 'Either you are not allowed to view any category, or there is no category in the database' ); - } - - $pafiledb_template->assign_vars( array( - 'CAT_PARENT' => true, - 'L_SUB_CAT' => $lang['Sub_category'], - 'L_CATEGORY' => $lang['Category'], - 'L_LAST_FILE' => $lang['Last_file'], - 'L_FILES' => $lang['Files'] ) - ); - - // - // output the root level category that allow file - // - if ( isset( $this->subcat_rowset[$cat_id] ) ) - { - foreach( $this->subcat_rowset[$cat_id] as $subcat_id => $subcat_row ) - { - if ( ( $subcat_row['cat_allow_file'] == PA_CAT_ALLOW_FILE ) ) - { - $last_file_info = array(); - $this->last_item_in_cat( $subcat_id, $last_file_info ); - - if ( !empty( $last_file_info['file_id'] ) && $this->auth_user[$subcat_id]['auth_read'] ) - { - $last_file_time = create_date( $board_config['default_dateformat'], $last_file_info['file_time'], $board_config['board_timezone'] ); - $last_file = $last_file_time . '<br />'; - $last_file_name = ( strlen( stripslashes( $last_file_info['file_name'] ) ) > 20 ) ? substr( stripslashes( $last_file_info['file_name'] ), 0, 20 ) . '...' : stripslashes( $last_file_info['file_name'] ); - $last_file .= '<a href="' . append_sid( $this->this_mxurl( 'actionqdl=download&file_id=' . $last_file_info['file_id'], true ) ) . '" alt="' . stripslashes( $last_file_info['file_name'] ) . '" title="' . stripslashes( $last_file_info['file_name'] ) . '">' . $last_file_name . '</a> '; - $last_file .= '<a href="' . append_sid( $this->this_mxurl( 'actionqdl=download&file_id=' . $last_file_info['file_id'], true ) ) . '"><img src="' . $images['pa_icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_file'] . '" title="' . $lang['View_latest_file'] . '" /></a>'; - } - else - { - $last_file = $lang['No_file']; - } - $is_new = false; - - if ( $this->new_item_in_cat( $subcat_id ) ) - { - $is_new = true; - } - - $sub_cat = $this->get_sub_cat( $subcat_id ); - - $map_xtra = !empty( $pa_get_dynamic[$subcat_id] ) ? '&dynamic_block=' . $pa_get_dynamic[$subcat_id] : ''; - - $pafiledb_template->assign_block_vars( 'no_cat_parent', array( - 'IS_HIGHER_CAT' => false, - 'U_CAT' => append_sid( $this->this_mxurl( 'actionqdl=quickdl&cat_id=' . $subcat_id . $map_xtra ) ), - 'SUB_CAT' => ( !empty( $sub_cat ) ) ? '<b>' . $lang['Sub_category'] . ': </b>' . $sub_cat : '', - 'CAT_IMAGE' => ( $is_new ) ? $images['pa_folder_new'] : $images['pa_folder'], - 'CAT_NEW_FILE' => ( $is_new ) ? $lang['New_file'] : $lang['No_new_file'], - 'CAT_NAME' => $subcat_row['cat_name'], - 'FILECAT' => $this->items_in_cat( $subcat_id ), - 'LAST_FILE' => $last_file, - 'CAT_DESC' => $subcat_row['cat_desc'] ) - ); - } - } - } - - if ( isset( $this->subcat_rowset[$cat_id] ) ) - { - foreach( $this->subcat_rowset[$cat_id] as $subcat_id => $subcat_row ) - { - $total_sub_cat = 0; - if ( isset( $this->subcat_rowset[$subcat_id] ) ) - { - foreach( $this->subcat_rowset[$subcat_id] as $sub_no_cat_id => $sub_no_cat_row ) - { - if ( $sub_no_cat_row['cat_allow_file'] == PA_CAT_ALLOW_FILE ) - { - $sub_cat_rowset[$total_sub_cat] = $sub_no_cat_row; - $total_sub_cat++; - } - } - } - - // - // Category container - // - if ( ( $subcat_row['cat_allow_file'] != PA_CAT_ALLOW_FILE ) ) - { - if ( $total_sub_cat ) - { - $pafiledb_template->assign_block_vars( 'no_cat_parent', array( - 'IS_HIGHER_CAT' => true, - 'U_CAT' => append_sid( $this->this_mxurl( 'actionqdl=category&cat_id=' . $subcat_id ) ), - 'CAT_NAME' => $subcat_row['cat_name'] ) - ); - } - for( $k = 0; $k < $total_sub_cat; $k++ ) - { - $last_file_info = array(); - $this->last_item_in_cat( $sub_cat_rowset[$k]['cat_id'], $last_file_info ); - - if ( $sub_cat_rowset[$k]['cat_parent'] == $subcat_id ) - { - if ( !empty( $last_file_info['file_id'] ) && $this->auth_user[$sub_cat_rowset[$k]['cat_id']]['auth_read'] ) - { - $last_file_time = create_date( $board_config['default_dateformat'], $last_file_info['file_time'], $board_config['board_timezone'] ); - $last_file = $last_file_time . '<br />'; - $last_file_name = ( strlen( $last_file_info['file_name'] ) > 20 ) ? substr( $last_file_info['file_name'], 0, 20 ) . '...' : $last_file_info['file_name']; - $last_file .= '<a href="' . append_sid( $this->this_mxurl( 'actionqdl=file&file_id=' . $last_file_info['file_id'] ) ) . '">' . $last_file_name . '</a> '; - $last_file .= '<a href="' . append_sid( $this->this_mxurl( 'actionqdl=file&file_id=' . $last_file_info['file_id'] ) ) . '"><img src="' . $images['pa_icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_file'] . '" title="' . $lang['View_latest_file'] . '" /></a>'; - } - else - { - $last_file = $lang['No_file']; - } - - $is_new = false; - - if ( $this->new_item_in_cat( $sub_cat_rowset[$k]['cat_id'] ) ) - { - $is_new = true; - } - - $sub_cat = $this->get_sub_cat( $sub_cat_rowset[$k]['cat_id'] ); - - $pafiledb_template->assign_block_vars( 'no_cat_parent', array( - 'IS_HIGER_CAT' => false, - 'U_CAT' => append_sid( $this->this_mxurl( 'actionqdl=category&cat_id=' . $sub_cat_rowset[$k]['cat_id'] ) ), - 'SUB_CAT' => ( !empty( $sub_cat ) ) ? '<b>' . $lang['Sub_category'] . ': </b>' . $sub_cat : '', - 'CAT_IMAGE' => ( $is_new ) ? $images['pa_folder_new'] : $images['pa_folder'], - 'CAT_NEW_FILE' => ( $is_new ) ? $lang['New_file'] : $lang['No_new_file'], - 'CAT_NAME' => $sub_cat_rowset[$k]['cat_name'], - 'FILECAT' => $this->items_in_cat( $sub_cat_rowset[$k]['cat_id'] ), - 'LAST_FILE' => $last_file, - 'CAT_DESC' => $sub_cat_rowset[$k]['cat_desc'] ) - ); - } // Have a permission to view the category - } // It is not parent category - } - } - } //higher Category - } - - /** * display items. * --- 887,890 ---- |
|
From: Jon O. <jon...@us...> - 2006-08-15 19:08:43
|
Update of /cvsroot/mxbb/mx_pafiledb/templates/subSilver In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26301/modules/mx_pafiledb/templates/subSilver Modified Files: pa_quickdl_cat_body.tpl Log Message: Fix for the quickdl block, to keep in sync with dynamic blocks Index: pa_quickdl_cat_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/templates/subSilver/pa_quickdl_cat_body.tpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** pa_quickdl_cat_body.tpl 15 Aug 2006 14:09:54 -0000 1.8 --- pa_quickdl_cat_body.tpl 15 Aug 2006 19:08:33 -0000 1.9 *************** *** 11,15 **** </table> ! <!-- IF CAT_PARENT --> <table width="100%" cellpadding="3" cellspacing="0" > <!-- BEGIN no_cat_parent --> --- 11,15 ---- </table> ! <!-- IF CAT_NAV_STANDARD --> <table width="100%" cellpadding="3" cellspacing="0" > <!-- BEGIN no_cat_parent --> |
|
From: Jon O. <jon...@us...> - 2006-08-15 14:09:57
|
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30497/modules/mx_pafiledb/pafiledb/includes Modified Files: functions_pafiledb.php Log Message: fix quickdl block Index: functions_pafiledb.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions_pafiledb.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** functions_pafiledb.php 13 Aug 2006 18:53:09 -0000 1.40 --- functions_pafiledb.php 15 Aug 2006 14:09:54 -0000 1.41 *************** *** 1283,1287 **** 'SHOW_RATINGS' => ( $pa_use_ratings ? true : false ), 'U_FILE' => append_sid( $this->this_mxurl( 'action=file&file_id=' . $file_rowset[$i]['file_id'], false, false, $target_page_id ) ), ! 'U_FILE_JUMP' => append_sid( $this->this_mxurl( 'action=download&file_id=' . $file_rowset[$i]['file_id'], false, false, $target_page_id ) ), 'COLOR' => ( ( $i % 2 ) ? "row2" : "row1" ), 'POSTER' => $file_poster, --- 1283,1287 ---- 'SHOW_RATINGS' => ( $pa_use_ratings ? true : false ), 'U_FILE' => append_sid( $this->this_mxurl( 'action=file&file_id=' . $file_rowset[$i]['file_id'], false, false, $target_page_id ) ), ! 'U_FILE_JUMP' => append_sid( $this->this_mxurl( 'action=download&file_id=' . $file_rowset[$i]['file_id'], true, false ) ), 'COLOR' => ( ( $i % 2 ) ? "row2" : "row1" ), 'POSTER' => $file_poster, |
|
From: Jon O. <jon...@us...> - 2006-08-15 14:09:57
|
Update of /cvsroot/mxbb/mx_pafiledb/templates/subSilver In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30497/modules/mx_pafiledb/templates/subSilver Modified Files: pa_quickdl_cat_body.tpl Log Message: fix quickdl block Index: pa_quickdl_cat_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/templates/subSilver/pa_quickdl_cat_body.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pa_quickdl_cat_body.tpl 15 Aug 2006 14:01:37 -0000 1.7 --- pa_quickdl_cat_body.tpl 15 Aug 2006 14:09:54 -0000 1.8 *************** *** 38,42 **** <tr> <td class="row1" align="center" width="20" valign="middle"><a href="{file_rows.U_FILE_JUMP}" class="topictitle"><img src="{file_rows.PIN_IMAGE}" border="0"></a></td> ! <td class="row1" valign="middle" onmouseout="this.className='row1';" onmouseover="this.className='row2';" onclick="window.location.href='{file_rows.U_FILE}';"><a href="{file_rows.U_FILE}" class="topictitle">{file_rows.FILE_NAME}</a><br><span class="gensmall">{file_rows.FILE_DESC} ({file_rows.UPDATED})</span></td> </tr> <!-- END file_rows --> --- 38,42 ---- <tr> <td class="row1" align="center" width="20" valign="middle"><a href="{file_rows.U_FILE_JUMP}" class="topictitle"><img src="{file_rows.PIN_IMAGE}" border="0"></a></td> ! <td class="row1" valign="middle" onmouseout="this.className='row1';" onmouseover="this.className='row2';" onclick="window.location.href='{file_rows.U_FILE_JUMP}';"><a href="{file_rows.U_FILE_JUMP}" class="topictitle">{file_rows.FILE_NAME}</a><br><span class="gensmall">{file_rows.FILE_DESC} ({file_rows.UPDATED})</span></td> </tr> <!-- END file_rows --> |
|
From: Jon O. <jon...@us...> - 2006-08-15 14:01:41
|
Update of /cvsroot/mxbb/mx_pafiledb/templates/subSilver In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27134/modules/mx_pafiledb/templates/subSilver Modified Files: pa_quickdl_cat_body.tpl Log Message: fix quickdl block Index: pa_quickdl_cat_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/templates/subSilver/pa_quickdl_cat_body.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pa_quickdl_cat_body.tpl 13 Aug 2006 18:53:10 -0000 1.6 --- pa_quickdl_cat_body.tpl 15 Aug 2006 14:01:37 -0000 1.7 *************** *** 37,41 **** <!-- BEGIN file_rows --> <tr> ! <td class="row1" align="center" width="20" valign="middle"><a href="{file_rows.U_FILE}" class="topictitle"><img src="{file_rows.PIN_IMAGE}" border="0"></a></td> <td class="row1" valign="middle" onmouseout="this.className='row1';" onmouseover="this.className='row2';" onclick="window.location.href='{file_rows.U_FILE}';"><a href="{file_rows.U_FILE}" class="topictitle">{file_rows.FILE_NAME}</a><br><span class="gensmall">{file_rows.FILE_DESC} ({file_rows.UPDATED})</span></td> </tr> --- 37,41 ---- <!-- BEGIN file_rows --> <tr> ! <td class="row1" align="center" width="20" valign="middle"><a href="{file_rows.U_FILE_JUMP}" class="topictitle"><img src="{file_rows.PIN_IMAGE}" border="0"></a></td> <td class="row1" valign="middle" onmouseout="this.className='row1';" onmouseover="this.className='row2';" onclick="window.location.href='{file_rows.U_FILE}';"><a href="{file_rows.U_FILE}" class="topictitle">{file_rows.FILE_NAME}</a><br><span class="gensmall">{file_rows.FILE_DESC} ({file_rows.UPDATED})</span></td> </tr> |
|
From: Jon O. <jon...@us...> - 2006-08-15 09:11:39
|
Update of /cvsroot/mxbb/core/install/schemas In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv1479/install/schemas Modified Files: upgrade_schemas_map.php Log Message: upgrade fix mx search optimize tables fix Index: upgrade_schemas_map.php =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/upgrade_schemas_map.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** upgrade_schemas_map.php 3 May 2006 09:17:29 -0000 1.11 --- upgrade_schemas_map.php 15 Aug 2006 09:11:34 -0000 1.12 *************** *** 41,45 **** array('schema' => 'upgrade_to_2.7.1' , 'sql' => "SELECT link_target FROM mx_table_menu_nav"), array('schema' => 'upgrade_to_2.8_rc5' , 'sql' => "SELECT parameter_order FROM mx_table_parameter"), ! array('schema' => 'upgrade_to_2.8_rc7' , 'sql' => "SELECT ip_filter FROM mx_table_page"), array('schema' => 'upgrade_to_2.8_b2' , 'sql' => "SELECT overall_header FROM mx_table_portal"), array('schema' => 'upgrade_to_2.8_b3' , 'sql' => "SELECT main_layout FROM mx_table_portal") --- 41,45 ---- array('schema' => 'upgrade_to_2.7.1' , 'sql' => "SELECT link_target FROM mx_table_menu_nav"), array('schema' => 'upgrade_to_2.8_rc5' , 'sql' => "SELECT parameter_order FROM mx_table_parameter"), ! array('schema' => 'upgrade_to_2.8_rc7' , 'sql' => "SELECT phpbb_stats FROM mx_table_page"), array('schema' => 'upgrade_to_2.8_b2' , 'sql' => "SELECT overall_header FROM mx_table_portal"), array('schema' => 'upgrade_to_2.8_b3' , 'sql' => "SELECT main_layout FROM mx_table_portal") |
2 messages has been excluded from this view by a project administrator.
