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-07-05 22:50:25
|
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7415/modules/mx_pafiledb/pafiledb/includes Modified Files: functions.php functions_comment.php functions_pafiledb.php pafiledb_constants.php Log Message: massive update Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** functions.php 4 Jul 2006 22:35:12 -0000 1.26 --- functions.php 5 Jul 2006 22:50:22 -0000 1.27 *************** *** 15,19 **** /** ! * mx_pa_functions. * * This class is used for general pa handling --- 15,19 ---- /** ! * pafiledb_functions. * [...1532 lines suppressed...] - { - $mxurl = $mx_root_path . 'index.' . $phpEx; - if ( is_numeric( $page_id ) ) - { - $mxurl .= '?page=' . $page_id . ( $args == '' ? '' : '&' . $args ); - } - else - { - $mxurl .= ( $args == '' ? '' : '?' . $args ); - } - } - return $mxurl; - } - - /** - * Enter description here... - * * @param unknown_type $rating * @return unknown --- 1076,1079 ---- Index: pafiledb_constants.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/pafiledb_constants.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** pafiledb_constants.php 4 Jul 2006 18:02:11 -0000 1.19 --- pafiledb_constants.php 5 Jul 2006 22:50:22 -0000 1.20 *************** *** 30,33 **** --- 30,34 ---- define( 'PAGE_DOWNLOAD', -501 ); // If this id generates a conflict with other mods, change it ;) + define( 'ICONS_DIR', 'pafiledb/images/icons/' ); // *************** *** 78,83 **** define( 'CHECKBOX', 5 ); - define( 'ICONS_DIR', 'pafiledb/images/icons/' ); - if ( !MXBB_MODULE || MXBB_27x ) { --- 79,82 ---- Index: functions_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions_comment.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** functions_comment.php 25 Jun 2006 21:55:56 -0000 1.21 --- functions_comment.php 5 Jul 2006 22:50:22 -0000 1.22 *************** *** 163,172 **** // ! // Instatiate text tools ! // ! $mx_pa_text_tools = new mx_pa_text_tools(); ! ! // ! // Instantiate the mx_text class // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); --- 163,167 ---- // ! // Instantiate the mx_text and mx_text_formatting classes // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); *************** *** 175,178 **** --- 170,175 ---- $mx_text->allow_all_html_tags = $pafiledb_config['allow_wysiwyg'] ? true : false; + $mx_text_formatting = new mx_text_formatting(); + $pafiledb_template->assign_block_vars( 'use_comments', array( 'L_COMMENTS' => $lang['Comments'], *************** *** 202,206 **** if (!$pafiledb_config['allow_comment_images'] || !$pafiledb_config['allow_comment_links']) { ! $comments_text = $mx_pa_text_tools->remove_images_links( $comments_text, $pafiledb_config['allow_comment_images'], $pafiledb_config['no_comment_image_message'], $pafiledb_config['allow_comment_links'], $pafiledb_config['no_comment_link_message'] ); } --- 199,203 ---- if (!$pafiledb_config['allow_comment_images'] || !$pafiledb_config['allow_comment_links']) { ! $comments_text = $mx_text_formatting->remove_images_links( $comments_text, $pafiledb_config['allow_comment_images'], $pafiledb_config['no_comment_image_message'], $pafiledb_config['allow_comment_links'], $pafiledb_config['no_comment_link_message'] ); } *************** *** 260,274 **** if ( $pafiledb_config['max_comment_subject_chars'] > 0 ) { ! $comments_title = $mx_pa_text_tools->truncate_text( $comments_title, $pafiledb_config['max_comment_subject_chars'], true ); } if ( $pafiledb_config['max_comment_chars'] > 0 ) { ! $comments_text = $mx_pa_text_tools->truncate_text( $comments_text, $pafiledb_config['max_comment_chars'], true ); } if ( $pafiledb_config['formatting_comment_truncate_links'] || $pafiledb_config['formatting_comment_image_resize'] > 0 || $pafiledb_config['formatting_comment_wordwrap'] ) { ! $comments_text = $mx_pa_text_tools->decode( $comments_text, $pafiledb_config['formatting_comment_truncate_links'], intval($pafiledb_config['formatting_comment_image_resize']), $pafiledb_config['formatting_comment_wordwrap'] ); } --- 257,271 ---- if ( $pafiledb_config['max_comment_subject_chars'] > 0 ) { ! $comments_title = $mx_text_formatting->truncate_text( $comments_title, $pafiledb_config['max_comment_subject_chars'], true ); } if ( $pafiledb_config['max_comment_chars'] > 0 ) { ! $comments_text = $mx_text_formatting->truncate_text( $comments_text, $pafiledb_config['max_comment_chars'], true ); } if ( $pafiledb_config['formatting_comment_truncate_links'] || $pafiledb_config['formatting_comment_image_resize'] > 0 || $pafiledb_config['formatting_comment_wordwrap'] ) { ! $comments_text = $mx_text_formatting->decode( $comments_text, $pafiledb_config['formatting_comment_truncate_links'], intval($pafiledb_config['formatting_comment_image_resize']), $pafiledb_config['formatting_comment_wordwrap'] ); } *************** *** 292,296 **** $pafiledb_template->assign_block_vars( 'use_comments.text.auth_edit', array( 'L_COMMENT_EDIT' => $lang['Comment_edit'], ! 'U_COMMENT_EDIT' => append_sid( pa_this_mxurl( 'action=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id . '&cid='.$this->comments_row['comments_id'] ) ), 'EDIT_IMG' => $images['pa_icon_edit'], )); --- 289,293 ---- $pafiledb_template->assign_block_vars( 'use_comments.text.auth_edit', array( 'L_COMMENT_EDIT' => $lang['Comment_edit'], ! 'U_COMMENT_EDIT' => append_sid( $pafiledb->this_mxurl( 'action=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id . '&cid='.$this->comments_row['comments_id'] ) ), 'EDIT_IMG' => $images['pa_icon_edit'], )); *************** *** 301,305 **** $pafiledb_template->assign_block_vars( 'use_comments.text.auth_delete', array( 'L_COMMENT_DELETE' => $lang['Comment_delete'], ! 'U_COMMENT_DELETE' => append_sid( pa_this_mxurl( "action=post_comment&cid=".$this->comments_row['comments_id']."&delete=do&item_id=".$this->item_id . '&cat_id=' . $this->cat_id )), 'DELETE_IMG' => $images['pa_icon_delpost'], )); --- 298,302 ---- $pafiledb_template->assign_block_vars( 'use_comments.text.auth_delete', array( 'L_COMMENT_DELETE' => $lang['Comment_delete'], ! 'U_COMMENT_DELETE' => append_sid( $pafiledb->this_mxurl( "action=post_comment&cid=".$this->comments_row['comments_id']."&delete=do&item_id=".$this->item_id . '&cat_id=' . $this->cat_id )), 'DELETE_IMG' => $images['pa_icon_delpost'], )); *************** *** 312,316 **** $pafiledb_template->assign_block_vars( 'use_comments.auth_post', array( 'L_COMMENT_ADD' => $lang['Comment_add'], ! 'U_COMMENT_POST' => append_sid( pa_this_mxurl( 'action=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id) ), 'REPLY_IMG' => $images['pa_comment_post'], )); --- 309,313 ---- $pafiledb_template->assign_block_vars( 'use_comments.auth_post', array( 'L_COMMENT_ADD' => $lang['Comment_add'], ! 'U_COMMENT_POST' => append_sid( $pafiledb->this_mxurl( 'action=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id) ), 'REPLY_IMG' => $images['pa_comment_post'], )); *************** *** 318,322 **** $num_of_replies = intval( $this->total_comments ); ! $pagination = generate_pagination( pa_this_mxurl( $this->pagination_action . "&" . $this->pagination_target . $this->item_id . $page_num ), $num_of_replies, $this->pagination_num, $this->start ) . ' '; if ($num_of_replies > 0) { --- 315,319 ---- $num_of_replies = intval( $this->total_comments ); ! $pagination = generate_pagination( $pafiledb->this_mxurl( $this->pagination_action . "&" . $this->pagination_target . $this->item_id . $page_num ), $num_of_replies, $this->pagination_num, $this->start ) . ' '; if ($num_of_replies > 0) { *************** *** 371,380 **** // ! // Instatiate text tools ! // ! $mx_pa_text_tools = new mx_pa_text_tools(); ! ! // ! // Instantiate the mx_text class // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); --- 368,372 ---- // ! // Instantiate the mx_text and mx_text_formatting classes // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); *************** *** 383,386 **** --- 375,380 ---- $mx_text->allow_all_html_tags = $pafiledb_config['allow_wysiwyg'] ? true : false; + $mx_text_formatting = new mx_text_formatting(); + $pafiledb_template->assign_block_vars( 'use_comments', array( 'L_COMMENTS' => $lang['Comments'], *************** *** 425,429 **** if (!$pafiledb_config['allow_comment_images'] || !$pafiledb_config['allow_comment_links']) { ! $comments_text = $mx_pa_text_tools->remove_images_links( $comments_text, $pafiledb_config['allow_comment_images'], $pafiledb_config['no_comment_image_message'], $pafiledb_config['allow_comment_links'], $pafiledb_config['no_comment_link_message'] ); } --- 419,423 ---- if (!$pafiledb_config['allow_comment_images'] || !$pafiledb_config['allow_comment_links']) { ! $comments_text = $mx_text_formatting->remove_images_links( $comments_text, $pafiledb_config['allow_comment_images'], $pafiledb_config['no_comment_image_message'], $pafiledb_config['allow_comment_links'], $pafiledb_config['no_comment_link_message'] ); } *************** *** 433,447 **** if ( $pafiledb_config['max_comment_subject_chars'] > 0 ) { ! $comments_title = $mx_pa_text_tools->truncate_text( $comments_title, $pafiledb_config['max_comment_subject_chars'], true ); } if ( $pafiledb_config['max_comment_chars'] > 0 ) { ! $comments_text = $mx_pa_text_tools->truncate_text( $comments_text, $pafiledb_config['max_comment_chars'], true ); } if ( $pafiledb_config['formatting_comment_truncate_links'] || $pafiledb_config['formatting_comment_image_resize'] > 0 || $pafiledb_config['formatting_comment_wordwrap'] ) { ! $comments_text = $mx_pa_text_tools->decode( $comments_text, $pafiledb_config['formatting_comment_truncate_links'], intval($pafiledb_config['formatting_comment_image_resize']), $pafiledb_config['formatting_comment_wordwrap'] ); } --- 427,441 ---- if ( $pafiledb_config['max_comment_subject_chars'] > 0 ) { ! $comments_title = $mx_text_formatting->truncate_text( $comments_title, $pafiledb_config['max_comment_subject_chars'], true ); } if ( $pafiledb_config['max_comment_chars'] > 0 ) { ! $comments_text = $mx_text_formatting->truncate_text( $comments_text, $pafiledb_config['max_comment_chars'], true ); } if ( $pafiledb_config['formatting_comment_truncate_links'] || $pafiledb_config['formatting_comment_image_resize'] > 0 || $pafiledb_config['formatting_comment_wordwrap'] ) { ! $comments_text = $mx_text_formatting->decode( $comments_text, $pafiledb_config['formatting_comment_truncate_links'], intval($pafiledb_config['formatting_comment_image_resize']), $pafiledb_config['formatting_comment_wordwrap'] ); } *************** *** 528,532 **** $pafiledb_template->assign_block_vars( 'use_comments.text.auth_edit', array( 'L_COMMENT_EDIT' => $lang['Comment_edit'], ! 'U_COMMENT_EDIT' => append_sid( pa_this_mxurl( 'action=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id . '&cid='.$this->comments_row['post_id'] ) ), 'EDIT_IMG' => $images['pa_icon_edit'], )); --- 522,526 ---- $pafiledb_template->assign_block_vars( 'use_comments.text.auth_edit', array( 'L_COMMENT_EDIT' => $lang['Comment_edit'], ! 'U_COMMENT_EDIT' => append_sid( $pafiledb->this_mxurl( 'action=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id . '&cid='.$this->comments_row['post_id'] ) ), 'EDIT_IMG' => $images['pa_icon_edit'], )); *************** *** 537,541 **** $pafiledb_template->assign_block_vars( 'use_comments.text.auth_delete', array( 'L_COMMENT_DELETE' => $lang['Comment_delete'], ! 'U_COMMENT_DELETE' => append_sid( pa_this_mxurl( "action=post_comment&cid=".$this->comments_row['post_id']."&delete=do&item_id=".$this->item_id . '&cat_id=' . $this->cat_id )), 'DELETE_IMG' => $images['pa_icon_delpost'], )); --- 531,535 ---- $pafiledb_template->assign_block_vars( 'use_comments.text.auth_delete', array( 'L_COMMENT_DELETE' => $lang['Comment_delete'], ! 'U_COMMENT_DELETE' => append_sid( $pafiledb->this_mxurl( "action=post_comment&cid=".$this->comments_row['post_id']."&delete=do&item_id=".$this->item_id . '&cat_id=' . $this->cat_id )), 'DELETE_IMG' => $images['pa_icon_delpost'], )); *************** *** 548,552 **** $pafiledb_template->assign_block_vars( 'use_comments.auth_post', array( 'L_COMMENT_ADD' => $lang['Comment_add'], ! 'U_COMMENT_POST' => append_sid( pa_this_mxurl( 'action=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id ) ), 'REPLY_IMG' => $images['pa_comment_post'], )); --- 542,546 ---- $pafiledb_template->assign_block_vars( 'use_comments.auth_post', array( 'L_COMMENT_ADD' => $lang['Comment_add'], ! 'U_COMMENT_POST' => append_sid( $pafiledb->this_mxurl( 'action=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id ) ), 'REPLY_IMG' => $images['pa_comment_post'], )); *************** *** 554,558 **** $num_of_replies = intval( $this->total_comments ); ! $pagination = generate_pagination( pa_this_mxurl( $this->pagination_action . "&" . $this->pagination_target . $this->item_id . $page_num ), $num_of_replies, $this->pagination_num, $this->start ) . ' '; if ($num_of_replies > 0) --- 548,552 ---- $num_of_replies = intval( $this->total_comments ); ! $pagination = generate_pagination( $pafiledb->this_mxurl( $this->pagination_action . "&" . $this->pagination_target . $this->item_id . $page_num ), $num_of_replies, $this->pagination_num, $this->start ) . ' '; if ($num_of_replies > 0) Index: functions_pafiledb.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions_pafiledb.php,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** functions_pafiledb.php 4 Jul 2006 22:35:12 -0000 1.33 --- functions_pafiledb.php 5 Jul 2006 22:50:22 -0000 1.34 *************** *** 15,19 **** /** ! * public pafiledb class * */ --- 15,19 ---- /** ! * Public pafiledb class * [...1026 lines suppressed...] - $this->auth_can_list = '<br />' . ( ( $this->auth[$cat_id]['auth_upload'] ) ? $lang['PA_Rules_upload_can'] : $lang['PA_Rules_upload_cannot'] ) . '<br />'; - $this->auth_can_list .= ( ( $this->auth[$cat_id]['auth_view_file'] ) ? $lang['PA_Rules_view_file_can'] : $lang['PA_Rules_view_file_cannot'] ) . '<br />'; - $this->auth_can_list .= ( ( $this->auth[$cat_id]['auth_edit_file'] ) ? $lang['PA_Rules_edit_file_can'] : $lang['PA_Rules_edit_file_cannot'] ) . '<br />'; - $this->auth_can_list .= ( ( $this->auth[$cat_id]['auth_delete_file'] ) ? $lang['PA_Rules_delete_file_can'] : $lang['PA_Rules_delete_file_cannot'] ) . '<br />'; - $this->auth_can_list .= ( ( $this->comments[$cat_id]['activated'] ? ( ( $this->auth[$cat_id]['auth_view_comment'] ? $lang['PA_Rules_view_comment_can'] : $lang['PA_Rules_view_comment_cannot'] ) . '<br />') : '')); - $this->auth_can_list .= ( ( $this->comments[$cat_id]['activated'] ? ( ( $this->auth[$cat_id]['auth_post_comment'] ? $lang['PA_Rules_post_comment_can'] : $lang['PA_Rules_post_comment_cannot'] ) . '<br />') : '')); - $this->auth_can_list .= ( ( $this->ratings[$cat_id]['activated'] ? ( ( $this->auth[$cat_id]['auth_rate'] ? $lang['PA_Rules_rate_can'] : $lang['PA_Rules_rate_cannot'] ) . '<br />') : '')); - $this->auth_can_list .= ( ( $this->auth[$cat_id]['auth_download'] ) ? $lang['PA_Rules_download_can'] : $lang['PA_Rules_download_cannot'] ) . '<br />'; - - if ( $this->auth[$cat_id]['auth_mod'] ) - { - $this->auth_can_list .= $lang['PA_Rules_moderate_can']; - } - } } - - ?> \ No newline at end of file --- 2763,2766 ---- |
|
From: Jon O. <jon...@us...> - 2006-07-05 22:50:25
|
Update of /cvsroot/mxbb/mx_pafiledb/templates/subSilver/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7415/modules/mx_pafiledb/templates/subSilver/admin Modified Files: pa_admin_settings.tpl Log Message: massive update Index: pa_admin_settings.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/templates/subSilver/admin/pa_admin_settings.tpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** pa_admin_settings.tpl 17 Jun 2006 20:13:22 -0000 1.10 --- pa_admin_settings.tpl 5 Jul 2006 22:50:22 -0000 1.11 *************** *** 73,76 **** --- 73,80 ---- <td class="row2"><input type="text" class="post" size="5" maxlength="5" name="settings_topnumber" value="{SETTINGS_TOPNUMBER}" /></td> </tr> + <tr> + <td class="row1"><span class="genmed">{L_CAT_COL}</span></td> + <td class="row2"><input class="post" type="text" maxlength="2" size="5" name="cat_col" value="{CAT_COL}" /></td> + </tr> <tr> <td class="row1">{L_NFDAYS}<br><span class="gensmall">{L_NFDAYSINFO}</span></td> |
|
From: Jon O. <jon...@us...> - 2006-07-05 22:50:25
|
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7415/modules/mx_pafiledb/pafiledb Modified Files: pafiledb_common.php Log Message: massive update Index: pafiledb_common.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/pafiledb_common.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** pafiledb_common.php 17 Jun 2006 20:13:22 -0000 1.15 --- pafiledb_common.php 5 Jul 2006 22:50:22 -0000 1.16 *************** *** 88,92 **** $pafiledb_template->set_template( $theme['template_name'] ); ! $pafiledb_user = new pafiledb_user_info(); $pafiledb = new pafiledb_public(); ?> \ No newline at end of file --- 88,92 ---- $pafiledb_template->set_template( $theme['template_name'] ); ! $pafiledb_user = new mx_user_info(); $pafiledb = new pafiledb_public(); ?> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2006-07-05 22:50:25
|
Update of /cvsroot/mxbb/mx_pafiledb/language/lang_english In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7415/modules/mx_pafiledb/language/lang_english Modified Files: lang_admin.php Log Message: massive update Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/language/lang_english/lang_admin.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** lang_admin.php 3 Jul 2006 12:24:07 -0000 1.10 --- lang_admin.php 5 Jul 2006 22:50:22 -0000 1.11 *************** *** 116,125 **** $lang['Topnuminfo'] = 'This is how many files will be displayed on the Top X Downloaded files list'; - $lang['Nfdays'] = 'New File Days'; - $lang['Nfdaysinfo'] = 'How many days a new file is to be listed with a \'New File\' icon. If this is set to 5, then all files added within the past 5 days will have the \'New File\' icon'; - $lang['Showva'] = 'Show \'View All Files\''; $lang['Showvainfo'] = 'Choose whether or not you wish to have the \'View All Files\' category displayed with the other categories on the main page'; // // Comments --- 116,127 ---- $lang['Topnuminfo'] = 'This is how many files will be displayed on the Top X Downloaded files list'; $lang['Showva'] = 'Show \'View All Files\''; $lang['Showvainfo'] = 'Choose whether or not you wish to have the \'View All Files\' category displayed with the other categories on the main page'; + $lang['cat_col'] = 'How many column of categories are to be listed'; + + $lang['Nfdays'] = 'New File Days'; + $lang['Nfdaysinfo'] = 'How many days a new file is to be listed with a \'New File\' icon. If this is set to 5, then all files added within the past 5 days will have the \'New File\' icon'; + // // Comments |
|
From: Jon O. <jon...@us...> - 2006-07-05 22:49:27
|
Update of /cvsroot/mxbb/mx_linkdb/templates/subSilver In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6984/modules/mx_linkdb/templates/subSilver Modified Files: link_footer.tpl subSilver.cfg Log Message: massive update Index: subSilver.cfg =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/templates/subSilver/subSilver.cfg,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** subSilver.cfg 4 Jul 2006 18:00:33 -0000 1.2 --- subSilver.cfg 5 Jul 2006 22:49:20 -0000 1.3 *************** *** 38,41 **** // ------------------------------------------------------------------------- $mx_images['linkdb_folder'] = $images['folder']; ! $mx_images['linkdb_link_new'] = $images['pa_file_new']; ?> \ No newline at end of file --- 38,41 ---- // ------------------------------------------------------------------------- $mx_images['linkdb_folder'] = $images['folder']; ! $mx_images['linkdb_folder_new'] = $images['folder_new']; ?> \ No newline at end of file Index: link_footer.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/templates/subSilver/link_footer.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** link_footer.tpl 1 Jul 2006 21:32:19 -0000 1.1 --- link_footer.tpl 5 Jul 2006 22:49:20 -0000 1.2 *************** *** 20,29 **** </td> </tr> ! </table> ! ! <!-- ! <div align="center"><span class="copyright"><br /> ! Based on linkdb {LINKDB_VERSION} © 2003 <a href="http://www.phpbb.com/phpBB/viewtopic.php?p=1183059" target="_blank">CRLin</a>, ! <a href="http://www.hostsector.com/~mohd/" target="_blank">pafiledb</a> and <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=110836" target="_blank">Advanced Links Mod</a><br /> ! This script (LinkDb v. 1.0.0 :: mxBB Portal Module 2004) is modified by the <a href="http://www.mx-system.com/" target="_blank">mxBB Team</a></span></div> ! --> \ No newline at end of file --- 20,22 ---- </td> </tr> ! </table> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2006-07-05 22:49:25
|
Update of /cvsroot/mxbb/mx_linkdb/linkdb/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6984/modules/mx_linkdb/linkdb/includes Modified Files: functions.php functions_comment.php functions_linkdb.php Log Message: massive update Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/includes/functions.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** functions.php 4 Jul 2006 22:34:37 -0000 1.11 --- functions.php 5 Jul 2006 22:49:20 -0000 1.12 *************** *** 14,19 **** --- 14,34 ---- } + /** + * linkdb_functions. + * + * This class is used for general linkdb handling + * + * @access public + * @author Jon Ohlsson [...1365 lines suppressed...] ! $mxurl .= '?page=' . $page_id . ( $args == '' ? '' : ( $non_html_amp ? '&' : '&' ) . $args ); ! } ! else ! { ! $mxurl .= ( $args == '' ? '' : '?' . $args ); ! } } - return $mxurl; } ?> \ No newline at end of file --- 502,508 ---- $this->data['item_editor_id'] = $userdata['user_id']; $this->data['item_editor'] = ( $userdata['user_id'] != '-1' ) ? $userdata['username'] : $lang['Guest']; ! $this->temp_url = PORTAL_URL . $linkdb->this_mxurl("action=" . "link&link_id=" . $this->data['item_id'], false, true); } } ?> \ No newline at end of file Index: functions_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/includes/functions_comment.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** functions_comment.php 1 Jul 2006 21:32:19 -0000 1.1 --- functions_comment.php 5 Jul 2006 22:49:20 -0000 1.2 *************** *** 163,172 **** // ! // Instatiate text tools ! // ! $mx_pa_text_tools = new mx_pa_text_tools(); ! ! // ! // Instantiate the mx_text class // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); --- 163,167 ---- // ! // Instantiate the mx_text and mx_text_formatting classes // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); *************** *** 175,178 **** --- 170,175 ---- $mx_text->allow_all_html_tags = $linkdb_config['allow_wysiwyg'] ? true : false; + $mx_text_formatting = new mx_text_formatting(); + $template->assign_block_vars( 'use_comments', array( 'L_COMMENTS' => $lang['Comments'], *************** *** 202,206 **** if (!$linkdb_config['allow_comment_images'] || !$linkdb_config['allow_comment_links']) { ! $comments_text = $mx_pa_text_tools->remove_images_links( $comments_text, $linkdb_config['allow_comment_images'], $linkdb_config['no_comment_image_message'], $linkdb_config['allow_comment_links'], $linkdb_config['no_comment_link_message'] ); } --- 199,203 ---- if (!$linkdb_config['allow_comment_images'] || !$linkdb_config['allow_comment_links']) { ! $comments_text = $mx_text_formatting->remove_images_links( $comments_text, $linkdb_config['allow_comment_images'], $linkdb_config['no_comment_image_message'], $linkdb_config['allow_comment_links'], $linkdb_config['no_comment_link_message'] ); } *************** *** 260,274 **** if ( $linkdb_config['max_comment_subject_chars'] > 0 ) { ! $comments_title = $mx_pa_text_tools->truncate_text( $comments_title, $linkdb_config['max_comment_subject_chars'], true ); } if ( $linkdb_config['max_comment_chars'] > 0 ) { ! $comments_text = $mx_pa_text_tools->truncate_text( $comments_text, $linkdb_config['max_comment_chars'], true ); } if ( $linkdb_config['formatting_comment_truncate_links'] || $linkdb_config['formatting_comment_image_resize'] > 0 || $linkdb_config['formatting_comment_wordwrap'] ) { ! $comments_text = $mx_pa_text_tools->decode( $comments_text, $linkdb_config['formatting_comment_truncate_links'], intval($linkdb_config['formatting_comment_image_resize']), $linkdb_config['formatting_comment_wordwrap'] ); } --- 257,271 ---- if ( $linkdb_config['max_comment_subject_chars'] > 0 ) { ! $comments_title = $mx_text_formatting->truncate_text( $comments_title, $linkdb_config['max_comment_subject_chars'], true ); } if ( $linkdb_config['max_comment_chars'] > 0 ) { ! $comments_text = $mx_text_formatting->truncate_text( $comments_text, $linkdb_config['max_comment_chars'], true ); } if ( $linkdb_config['formatting_comment_truncate_links'] || $linkdb_config['formatting_comment_image_resize'] > 0 || $linkdb_config['formatting_comment_wordwrap'] ) { ! $comments_text = $mx_text_formatting->decode( $comments_text, $linkdb_config['formatting_comment_truncate_links'], intval($linkdb_config['formatting_comment_image_resize']), $linkdb_config['formatting_comment_wordwrap'] ); } *************** *** 278,282 **** 'L_COMMENTS_NAME' => $lang['Name'], 'POSTER' => $poster, ! 'ICON_MINIPOST_IMG' => $images['pa_icon_minipost'], 'ICON_SPACER' => $images['mx_spacer'], 'POSTER_RANK' => $poster_rank, --- 275,279 ---- 'L_COMMENTS_NAME' => $lang['Name'], 'POSTER' => $poster, ! 'ICON_MINIPOST_IMG' => $images['linkdb_icon_minipost'], 'ICON_SPACER' => $images['mx_spacer'], 'POSTER_RANK' => $poster_rank, *************** *** 292,297 **** $template->assign_block_vars( 'use_comments.text.auth_edit', array( 'L_COMMENT_EDIT' => $lang['Comment_edit'], ! 'U_COMMENT_EDIT' => append_sid( pa_this_mxurl( 'action=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id . '&cid='.$this->comments_row['comments_id'] ) ), ! 'EDIT_IMG' => $images['pa_icon_edit'], )); } --- 289,294 ---- $template->assign_block_vars( 'use_comments.text.auth_edit', array( 'L_COMMENT_EDIT' => $lang['Comment_edit'], ! 'U_COMMENT_EDIT' => append_sid( $linkdb->this_mxurl( 'action=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id . '&cid='.$this->comments_row['comments_id'] ) ), ! 'EDIT_IMG' => $images['linkdb_icon_edit'], )); } *************** *** 301,306 **** $template->assign_block_vars( 'use_comments.text.auth_delete', array( 'L_COMMENT_DELETE' => $lang['Comment_delete'], ! 'U_COMMENT_DELETE' => append_sid( pa_this_mxurl( "action=post_comment&cid=".$this->comments_row['comments_id']."&delete=do&item_id=".$this->item_id . '&cat_id=' . $this->cat_id )), ! 'DELETE_IMG' => $images['pa_icon_delpost'], )); } --- 298,303 ---- $template->assign_block_vars( 'use_comments.text.auth_delete', array( 'L_COMMENT_DELETE' => $lang['Comment_delete'], ! 'U_COMMENT_DELETE' => append_sid( $linkdb->this_mxurl( "action=post_comment&cid=".$this->comments_row['comments_id']."&delete=do&item_id=".$this->item_id . '&cat_id=' . $this->cat_id )), ! 'DELETE_IMG' => $images['linkdb_icon_delpost'], )); } *************** *** 312,322 **** $template->assign_block_vars( 'use_comments.auth_post', array( 'L_COMMENT_ADD' => $lang['Comment_add'], ! 'U_COMMENT_POST' => append_sid( pa_this_mxurl( 'action=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id) ), ! 'REPLY_IMG' => $images['pa_comment_post'], )); } $num_of_replies = intval( $this->total_comments ); ! $pagination = generate_pagination( pa_this_mxurl( $this->pagination_action . "&" . $this->pagination_target . $this->item_id . $page_num ), $num_of_replies, $this->pagination_num, $this->start ) . ' '; if ($num_of_replies > 0) { --- 309,319 ---- $template->assign_block_vars( 'use_comments.auth_post', array( 'L_COMMENT_ADD' => $lang['Comment_add'], ! 'U_COMMENT_POST' => append_sid( $linkdb->this_mxurl( 'action=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id) ), ! 'REPLY_IMG' => $images['linkdb_comment_post'], )); } $num_of_replies = intval( $this->total_comments ); ! $pagination = generate_pagination( $linkdb->this_mxurl( $this->pagination_action . "&" . $this->pagination_target . $this->item_id . $page_num ), $num_of_replies, $this->pagination_num, $this->start ) . ' '; if ($num_of_replies > 0) { *************** *** 371,380 **** // ! // Instatiate text tools ! // ! $mx_pa_text_tools = new mx_pa_text_tools(); ! ! // ! // Instantiate the mx_text class // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); --- 368,372 ---- // ! // Instantiate the mx_text and mx_text_formatting classes // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); *************** *** 383,386 **** --- 375,380 ---- $mx_text->allow_all_html_tags = $linkdb_config['allow_wysiwyg'] ? true : false; + $mx_text_formatting = new mx_text_formatting(); + $template->assign_block_vars( 'use_comments', array( 'L_COMMENTS' => $lang['Comments'], *************** *** 425,429 **** if (!$linkdb_config['allow_comment_images'] || !$linkdb_config['allow_comment_links']) { ! $comments_text = $mx_pa_text_tools->remove_images_links( $comments_text, $linkdb_config['allow_comment_images'], $linkdb_config['no_comment_image_message'], $linkdb_config['allow_comment_links'], $linkdb_config['no_comment_link_message'] ); } --- 419,423 ---- if (!$linkdb_config['allow_comment_images'] || !$linkdb_config['allow_comment_links']) { ! $comments_text = $mx_text_formatting->remove_images_links( $comments_text, $linkdb_config['allow_comment_images'], $linkdb_config['no_comment_image_message'], $linkdb_config['allow_comment_links'], $linkdb_config['no_comment_link_message'] ); } *************** *** 433,447 **** if ( $linkdb_config['max_comment_subject_chars'] > 0 ) { ! $comments_title = $mx_pa_text_tools->truncate_text( $comments_title, $linkdb_config['max_comment_subject_chars'], true ); } if ( $linkdb_config['max_comment_chars'] > 0 ) { ! $comments_text = $mx_pa_text_tools->truncate_text( $comments_text, $linkdb_config['max_comment_chars'], true ); } if ( $linkdb_config['formatting_comment_truncate_links'] || $linkdb_config['formatting_comment_image_resize'] > 0 || $linkdb_config['formatting_comment_wordwrap'] ) { ! $comments_text = $mx_pa_text_tools->decode( $comments_text, $linkdb_config['formatting_comment_truncate_links'], intval($linkdb_config['formatting_comment_image_resize']), $linkdb_config['formatting_comment_wordwrap'] ); } --- 427,441 ---- if ( $linkdb_config['max_comment_subject_chars'] > 0 ) { ! $comments_title = $mx_text_formatting->truncate_text( $comments_title, $linkdb_config['max_comment_subject_chars'], true ); } if ( $linkdb_config['max_comment_chars'] > 0 ) { ! $comments_text = $mx_text_formatting->truncate_text( $comments_text, $linkdb_config['max_comment_chars'], true ); } if ( $linkdb_config['formatting_comment_truncate_links'] || $linkdb_config['formatting_comment_image_resize'] > 0 || $linkdb_config['formatting_comment_wordwrap'] ) { ! $comments_text = $mx_text_formatting->decode( $comments_text, $linkdb_config['formatting_comment_truncate_links'], intval($linkdb_config['formatting_comment_image_resize']), $linkdb_config['formatting_comment_wordwrap'] ); } *************** *** 514,518 **** 'L_COMMENTS_NAME' => $lang['Name'], 'POSTER' => $poster, ! 'ICON_MINIPOST_IMG' => $images['pa_icon_minipost'], 'ICON_SPACER' => $images['mx_spacer'], 'POSTER_RANK' => $poster_rank, --- 508,512 ---- 'L_COMMENTS_NAME' => $lang['Name'], 'POSTER' => $poster, ! 'ICON_MINIPOST_IMG' => $images['linkdb_icon_minipost'], 'ICON_SPACER' => $images['mx_spacer'], 'POSTER_RANK' => $poster_rank, *************** *** 528,533 **** $template->assign_block_vars( 'use_comments.text.auth_edit', array( 'L_COMMENT_EDIT' => $lang['Comment_edit'], ! 'U_COMMENT_EDIT' => append_sid( pa_this_mxurl( 'action=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id . '&cid='.$this->comments_row['post_id'] ) ), ! 'EDIT_IMG' => $images['pa_icon_edit'], )); } --- 522,527 ---- $template->assign_block_vars( 'use_comments.text.auth_edit', array( 'L_COMMENT_EDIT' => $lang['Comment_edit'], ! 'U_COMMENT_EDIT' => append_sid( $linkdb->this_mxurl( 'action=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id . '&cid='.$this->comments_row['post_id'] ) ), ! 'EDIT_IMG' => $images['linkdb_icon_edit'], )); } *************** *** 537,542 **** $template->assign_block_vars( 'use_comments.text.auth_delete', array( 'L_COMMENT_DELETE' => $lang['Comment_delete'], ! 'U_COMMENT_DELETE' => append_sid( pa_this_mxurl( "action=post_comment&cid=".$this->comments_row['post_id']."&delete=do&item_id=".$this->item_id . '&cat_id=' . $this->cat_id )), ! 'DELETE_IMG' => $images['pa_icon_delpost'], )); } --- 531,536 ---- $template->assign_block_vars( 'use_comments.text.auth_delete', array( 'L_COMMENT_DELETE' => $lang['Comment_delete'], ! 'U_COMMENT_DELETE' => append_sid( $linkdb->this_mxurl( "action=post_comment&cid=".$this->comments_row['post_id']."&delete=do&item_id=".$this->item_id . '&cat_id=' . $this->cat_id )), ! 'DELETE_IMG' => $images['linkdb_icon_delpost'], )); } *************** *** 548,558 **** $template->assign_block_vars( 'use_comments.auth_post', array( 'L_COMMENT_ADD' => $lang['Comment_add'], ! 'U_COMMENT_POST' => append_sid( pa_this_mxurl( 'action=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id ) ), ! 'REPLY_IMG' => $images['pa_comment_post'], )); } $num_of_replies = intval( $this->total_comments ); ! $pagination = generate_pagination( pa_this_mxurl( $this->pagination_action . "&" . $this->pagination_target . $this->item_id . $page_num ), $num_of_replies, $this->pagination_num, $this->start ) . ' '; if ($num_of_replies > 0) --- 542,552 ---- $template->assign_block_vars( 'use_comments.auth_post', array( 'L_COMMENT_ADD' => $lang['Comment_add'], ! 'U_COMMENT_POST' => append_sid( $linkdb->this_mxurl( 'action=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id ) ), ! 'REPLY_IMG' => $images['linkdb_comment_post'], )); } $num_of_replies = intval( $this->total_comments ); ! $pagination = generate_pagination( $linkdb->this_mxurl( $this->pagination_action . "&" . $this->pagination_target . $this->item_id . $page_num ), $num_of_replies, $this->pagination_num, $this->start ) . ' '; if ($num_of_replies > 0) Index: functions_linkdb.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/includes/functions_linkdb.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** functions_linkdb.php 4 Jul 2006 18:00:33 -0000 1.12 --- functions_linkdb.php 5 Jul 2006 22:49:20 -0000 1.13 *************** *** 14,20 **** } ! // ! // public linkdb class ! // class linkdb_public extends linkdb { --- 14,21 ---- } [...981 lines suppressed...] - global $lang; - - $this->auth_can_list = '<br />' . ( ( $this->auth_user[$cat_id]['auth_upload'] ) ? $lang['PA_Rules_upload_can'] : $lang['PA_Rules_upload_cannot'] ) . '<br />'; - $this->auth_can_list .= ( ( $this->auth_user[$cat_id]['auth_view_file'] ) ? $lang['PA_Rules_view_file_can'] : $lang['PA_Rules_view_file_cannot'] ) . '<br />'; - $this->auth_can_list .= ( ( $this->auth_user[$cat_id]['auth_edit_file'] ) ? $lang['PA_Rules_edit_file_can'] : $lang['PA_Rules_edit_file_cannot'] ) . '<br />'; - $this->auth_can_list .= ( ( $this->auth_user[$cat_id]['auth_delete_file'] ) ? $lang['PA_Rules_delete_file_can'] : $lang['PA_Rules_delete_file_cannot'] ) . '<br />'; - $this->auth_can_list .= ( ( $this->comments[$cat_id]['activated'] ? ( ( $this->auth_user[$cat_id]['auth_view_comment'] ? $lang['PA_Rules_view_comment_can'] : $lang['PA_Rules_view_comment_cannot'] ) . '<br />') : '')); - $this->auth_can_list .= ( ( $this->comments[$cat_id]['activated'] ? ( ( $this->auth_user[$cat_id]['auth_post_comment'] ? $lang['PA_Rules_post_comment_can'] : $lang['PA_Rules_post_comment_cannot'] ) . '<br />') : '')); - $this->auth_can_list .= ( ( $this->ratings[$cat_id]['activated'] ? ( ( $this->auth_user[$cat_id]['auth_rate'] ? $lang['PA_Rules_rate_can'] : $lang['PA_Rules_rate_cannot'] ) . '<br />') : '')); - $this->auth_can_list .= ( ( $this->auth_user[$cat_id]['auth_download'] ) ? $lang['PA_Rules_download_can'] : $lang['PA_Rules_download_cannot'] ) . '<br />'; - - if ( $this->auth_user[$cat_id]['auth_mod'] ) - { - $this->auth_can_list .= $lang['PA_Rules_moderate_can']; - } - } } ?> \ No newline at end of file --- 2050,2053 ---- |
|
From: Jon O. <jon...@us...> - 2006-07-05 22:49:25
|
Update of /cvsroot/mxbb/mx_linkdb/linkdb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6984/modules/mx_linkdb/linkdb Modified Files: linkdb_common.php Log Message: massive update Index: linkdb_common.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/linkdb_common.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** linkdb_common.php 1 Jul 2006 21:32:19 -0000 1.1 --- linkdb_common.php 5 Jul 2006 22:49:20 -0000 1.2 *************** *** 84,88 **** } ! $linkdb_user = new linkdb_user_info(); $linkdb = new linkdb_public(); ?> \ No newline at end of file --- 84,88 ---- } ! //$linkdb_user = new mx_user_info(); $linkdb = new linkdb_public(); ?> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2006-07-05 22:49:24
|
Update of /cvsroot/mxbb/mx_linkdb/language/lang_english In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6984/modules/mx_linkdb/language/lang_english Modified Files: lang_admin.php lang_main.php Log Message: massive update Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/language/lang_english/lang_main.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lang_main.php 4 Jul 2006 22:34:37 -0000 1.4 --- lang_main.php 5 Jul 2006 22:49:20 -0000 1.5 *************** *** 9,12 **** --- 9,14 ---- */ + $lang['linkdb_disable'] = 'Linkdb is disabled.'; + // // Main Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/language/lang_english/lang_admin.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** lang_admin.php 3 Jul 2006 20:11:30 -0000 1.6 --- lang_admin.php 5 Jul 2006 22:49:20 -0000 1.7 *************** *** 81,86 **** $lang['cat_col'] = 'How many column of categories are to be listed'; ! $lang['Nfdays'] = 'New File Days'; ! $lang['Nfdaysinfo'] = 'How many days a new file is to be listed with a \'New File\' icon. If this is set to 5, then all files added within the past 5 days will have the \'New File\' icon'; // --- 81,86 ---- $lang['cat_col'] = 'How many column of categories are to be listed'; ! $lang['Nfdays'] = 'New Link Days'; ! $lang['Nfdaysinfo'] = 'How many days a new link is to be listed with a \'New Link\' icon. If this is set to 5, then all links added within the past 5 days will have the \'New Link\' icon'; // |
Update of /cvsroot/mxbb/mx_linkdb/linkdb/modules In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6984/modules/mx_linkdb/linkdb/modules Modified Files: link_category.php link_main.php link_rate.php link_search.php link_user_upload.php link_viewall.php Log Message: massive update Index: link_category.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_category.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** link_category.php 4 Jul 2006 18:09:40 -0000 1.9 --- link_category.php 5 Jul 2006 22:49:20 -0000 1.10 *************** *** 98,102 **** 'U_INDEX' => append_sid( 'index.' . $phpEx ), ! 'U_LINK' => append_sid( linkdb_this_mxurl() ), 'LINKS' => $lang['Links_Title'] ) --- 98,102 ---- 'U_INDEX' => append_sid( 'index.' . $phpEx ), ! 'U_LINK' => append_sid( $this->this_mxurl() ), 'LINKS' => $lang['Links_Title'] ) Index: link_user_upload.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_user_upload.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** link_user_upload.php 4 Jul 2006 18:09:40 -0000 1.8 --- link_user_upload.php 5 Jul 2006 22:49:20 -0000 1.9 *************** *** 44,50 **** { $message = $lang['Lock_submit_site']; ! $message .= '<br /><br />' . sprintf( $lang['Click_return_links'], '<a href="' . append_sid( linkdb_this_mxurl() ) . '">', '</a>' ); ! $template->assign_vars( array( 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid( linkdb_this_mxurl() ) . '">' ) ); --- 44,50 ---- { $message = $lang['Lock_submit_site']; ! $message .= '<br /><br />' . sprintf( $lang['Click_return_links'], '<a href="' . append_sid( $this->this_mxurl() ) . '">', '</a>' ); ! $template->assign_vars( array( 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid( $this->this_mxurl() ) . '">' ) ); *************** *** 57,61 **** if ( UPDATEUPDATE ) { ! $redirect = linkdb_this_mxurl( "action=user_upload" ); if ( !empty( $cat_id ) ) { --- 57,61 ---- if ( UPDATEUPDATE ) { ! $redirect = $this->this_mxurl( "action=user_upload" ); if ( !empty( $cat_id ) ) { *************** *** 73,77 **** elseif ( !$userdata['session_logged_in'] ) { ! $redirect = linkdb_this_mxurl( "action=user_upload" ); if ( !empty( $cat_id ) ) { --- 73,77 ---- elseif ( !$userdata['session_logged_in'] ) { ! $redirect = $this->this_mxurl( "action=user_upload" ); if ( !empty( $cat_id ) ) { *************** *** 146,150 **** } ! $message = $lang['Linkadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( linkdb_this_mxurl( "action=user_upload" ) ) . '">', '</a>' ); } else --- 146,150 ---- } ! $message = $lang['Linkadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( $this->this_mxurl( "action=user_upload" ) ) . '">', '</a>' ); } else *************** *** 153,161 **** $custom_field->file_update_data( $temp_id ); $this->_linkdb(); ! $message = $lang['Linkedited'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( linkdb_this_mxurl( "action=user_upload" ) ) . '">', '</a>' ); } $template->assign_vars( array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . linkdb_this_mxurl( "action=category&cat_id=$cat_id" ) . '">' ) ); --- 153,161 ---- $custom_field->file_update_data( $temp_id ); $this->_linkdb(); ! $message = $lang['Linkedited'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( $this->this_mxurl( "action=user_upload" ) ) . '">', '</a>' ); } $template->assign_vars( array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . $this->this_mxurl( "action=category&cat_id=$cat_id" ) . '">' ) ); *************** *** 249,253 **** $template->assign_vars( array( ! 'S_ADD_FILE_ACTION' => append_sid( linkdb_this_mxurl() ), 'LINK_CAT_NOT_ALLOW' => $lang['Cat_not_allow'], 'LINKS' => $lang['Links_Title'], --- 249,253 ---- $template->assign_vars( array( ! 'S_ADD_FILE_ACTION' => append_sid( $this->this_mxurl() ), 'LINK_CAT_NOT_ALLOW' => $lang['Cat_not_allow'], 'LINKS' => $lang['Links_Title'], *************** *** 297,301 **** 'U_INDEX' => append_sid( 'index.' . $phpEx ), ! 'U_LINK' => append_sid( linkdb_this_mxurl() ) ) ); --- 297,301 ---- 'U_INDEX' => append_sid( 'index.' . $phpEx ), ! 'U_LINK' => append_sid( $this->this_mxurl() ) ) ); Index: link_rate.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_rate.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** link_rate.php 4 Jul 2006 22:34:37 -0000 1.11 --- link_rate.php 5 Jul 2006 22:49:20 -0000 1.12 *************** *** 65,69 **** if ( !$userdata['session_logged_in'] ) { ! // $redirect = linkdb_this_mxurl("action=rate&link_id=$link_id"); // redirect(append_sid("login.$phpEx?redirect=" . $redirect, true)); mx_message_die( GENERAL_MESSAGE, 'not logged in' ); --- 65,69 ---- if ( !$userdata['session_logged_in'] ) { ! // $redirect = $this->this_mxurl("action=rate&link_id=$link_id"); // redirect(append_sid("login.$phpEx?redirect=" . $redirect, true)); mx_message_die( GENERAL_MESSAGE, 'not logged in' ); *************** *** 77,82 **** 'U_INDEX' => append_sid( 'index.' . $phpEx ), ! 'U_LINK' => append_sid( linkdb_this_mxurl() ), ! 'U_FILE_NAME' => append_sid( linkdb_this_mxurl( 'action=link&link_id=' . $link_id ) ), 'FILE_NAME' => $link_data['link_name'], --- 77,82 ---- 'U_INDEX' => append_sid( 'index.' . $phpEx ), ! 'U_LINK' => append_sid( $this->this_mxurl() ), ! 'U_FILE_NAME' => append_sid( $this->this_mxurl( 'action=link&link_id=' . $link_id ) ), 'FILE_NAME' => $link_data['link_name'], *************** *** 100,104 **** } ! $linkdb_user->update_voter_info( $link_id, $rating, $link_data['link_catid'] ); $rate_info = $linkdb_functions->get_rating( $link_id ); --- 100,104 ---- } ! $this->update_voter_info( $link_id, $rating, $link_data['link_catid'] ); $rate_info = $linkdb_functions->get_rating( $link_id ); *************** *** 107,111 **** $cat_id = $link_data['link_catid']; ! $message = $result_msg . '<br /><br />' . sprintf( $lang['Click_return'], "<a href=\"" . ( !empty($cat_id) ? append_sid( linkdb_this_mxurl( "action=category&cat_id=$cat_id" ) ) : append_sid( linkdb_this_mxurl( "action=link&link_id=$link_id" ) ) ) . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 107,111 ---- $cat_id = $link_data['link_catid']; ! $message = $result_msg . '<br /><br />' . sprintf( $lang['Click_return'], "<a href=\"" . ( !empty($cat_id) ? append_sid( $this->this_mxurl( "action=category&cat_id=$cat_id" ) ) : append_sid( $this->this_mxurl( "action=link&link_id=$link_id" ) ) ) . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 115,119 **** $template->assign_vars( array( ! 'S_RATE_ACTION' => append_sid( linkdb_this_mxurl( 'action=rate&link_id=' . $link_id ) ), 'L_RATE' => $lang['Rate'], 'L_RERROR' => $lang['Rerror'], --- 115,119 ---- $template->assign_vars( array( ! 'S_RATE_ACTION' => append_sid( $this->this_mxurl( 'action=rate&link_id=' . $link_id ) ), 'L_RATE' => $lang['Rate'], 'L_RERROR' => $lang['Rerror'], Index: link_search.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_search.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** link_search.php 4 Jul 2006 18:09:40 -0000 1.10 --- link_search.php 5 Jul 2006 22:49:20 -0000 1.11 *************** *** 451,456 **** for( $i = 0; $i < count( $searchset ); $i++ ) { ! $cat_url = append_sid( linkdb_this_mxurl( 'action=category&cat_id=' . $searchset[$i]['cat_id'] ) ); ! $file_url = append_sid( linkdb_this_mxurl( 'action=link&link_id=' . $searchset[$i]['link_id'] ) ); // --- 451,456 ---- for( $i = 0; $i < count( $searchset ); $i++ ) { ! $cat_url = append_sid( $this->this_mxurl( 'action=category&cat_id=' . $searchset[$i]['cat_id'] ) ); ! $file_url = append_sid( $this->this_mxurl( 'action=link&link_id=' . $searchset[$i]['link_id'] ) ); // *************** *** 488,492 **** 'DATE' => $date, 'FILE_DLS' => $searchset[$i]['link_hits'], ! 'L_RATING' => '<a href="' . append_sid( linkdb_this_mxurl( 'action=rate&link_id=' . $searchset[$i]['link_id'] ) ) . '">' . $lang['LinkRating'] . '</a>', 'RATING' => $rating, 'FILE_VOTES' => $searchset[$i]['total_votes'], --- 488,492 ---- 'DATE' => $date, 'FILE_DLS' => $searchset[$i]['link_hits'], ! 'L_RATING' => '<a href="' . append_sid( $this->this_mxurl( 'action=rate&link_id=' . $searchset[$i]['link_id'] ) ) . '">' . $lang['LinkRating'] . '</a>', 'RATING' => $rating, 'FILE_VOTES' => $searchset[$i]['total_votes'], *************** *** 503,507 **** } } ! $base_url = append_sid( linkdb_this_mxurl( "action=search&search_id=$search_id" ) ); $template->assign_vars( array( --- 503,507 ---- } } ! $base_url = append_sid( $this->this_mxurl( "action=search&search_id=$search_id" ) ); $template->assign_vars( array( *************** *** 511,515 **** 'U_INDEX' => append_sid( 'index.' . $phpEx ), ! 'U_LINK' => append_sid( linkdb_this_mxurl() ), 'L_INDEX' => sprintf( $lang['Forum_Index'], $board_config['sitename'] ), --- 511,515 ---- 'U_INDEX' => append_sid( 'index.' . $phpEx ), ! 'U_LINK' => append_sid( $this->this_mxurl() ), 'L_INDEX' => sprintf( $lang['Forum_Index'], $board_config['sitename'] ), *************** *** 536,540 **** $template->assign_vars( array( ! 'S_SEARCH_ACTION' => append_sid( linkdb_this_mxurl() ), 'S_CAT_MENU' => $dropmenu, --- 536,540 ---- $template->assign_vars( array( ! 'S_SEARCH_ACTION' => append_sid( $this->this_mxurl() ), 'S_CAT_MENU' => $dropmenu, *************** *** 542,546 **** 'U_INDEX' => append_sid( 'index.' . $phpEx ), ! 'U_LINK' => append_sid( linkdb_this_mxurl() ), 'L_YES' => $lang['Yes'], --- 542,546 ---- 'U_INDEX' => append_sid( 'index.' . $phpEx ), ! 'U_LINK' => append_sid( $this->this_mxurl() ), 'L_YES' => $lang['Yes'], Index: link_viewall.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_viewall.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** link_viewall.php 4 Jul 2006 18:09:40 -0000 1.7 --- link_viewall.php 5 Jul 2006 22:49:20 -0000 1.8 *************** *** 90,94 **** 'U_INDEX' => append_sid( 'index.' . $phpEx ), ! 'U_LINK' => append_sid( linkdb_this_mxurl() ), 'SEARCH_TYPE' => $sort_type, --- 90,94 ---- 'U_INDEX' => append_sid( 'index.' . $phpEx ), ! 'U_LINK' => append_sid( $this->this_mxurl() ), 'SEARCH_TYPE' => $sort_type, Index: link_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_main.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** link_main.php 4 Jul 2006 18:09:40 -0000 1.8 --- link_main.php 5 Jul 2006 22:49:20 -0000 1.9 *************** *** 35,39 **** 'L_INDEX' => sprintf( $lang['Forum_Index'], $board_config['sitename'] ), 'U_INDEX' => append_sid( 'index.' . $phpEx ), ! 'U_LINK' => append_sid( linkdb_this_mxurl() ), 'LINKS' => $lang['Links_Title'], 'TREE' => $menu_output, --- 35,39 ---- 'L_INDEX' => sprintf( $lang['Forum_Index'], $board_config['sitename'] ), 'U_INDEX' => append_sid( 'index.' . $phpEx ), ! 'U_LINK' => append_sid( $this->this_mxurl() ), 'LINKS' => $lang['Links_Title'], 'TREE' => $menu_output, |
|
From: Jon O. <jon...@us...> - 2006-07-05 22:49:23
|
Update of /cvsroot/mxbb/mx_linkdb/linkdb/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6984/modules/mx_linkdb/linkdb/admin Modified Files: admin_setting.php Log Message: massive update Index: admin_setting.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/admin/admin_setting.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** admin_setting.php 4 Jul 2006 18:00:32 -0000 1.9 --- admin_setting.php 5 Jul 2006 22:49:20 -0000 1.10 *************** *** 108,111 **** --- 108,112 ---- $settings_newdays = $new['settings_newdays']; + $cat_col = $new['cat_col']; // *************** *** 277,281 **** 'SORT_ORDER' => $sort_order_list, ! 'CAT_COL' => $new['cat_col'], 'L_CAT_COL' => $lang['cat_col'], --- 278,282 ---- 'SORT_ORDER' => $sort_order_list, ! 'CAT_COL' => $cat_col, 'L_CAT_COL' => $lang['cat_col'], |
|
From: Jon O. <jon...@us...> - 2006-07-05 22:49:23
|
Update of /cvsroot/mxbb/mx_linkdb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6984/modules/mx_linkdb Modified Files: db_install.php linkdb.php Log Message: massive update Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/db_install.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** db_install.php 3 Jul 2006 20:11:30 -0000 1.12 --- db_install.php 5 Jul 2006 22:49:20 -0000 1.13 *************** *** 38,42 **** if ( MXBB_27x ) { ! include_once( $mx_root_path . 'modules/mx_pafiledb/pafiledb/includes/functions_mx.' . $phpEx ); } --- 38,42 ---- if ( MXBB_27x ) { ! include_once( $mx_root_path . 'modules/mx_linkdb/linkdb/includes/functions_mx.' . $phpEx ); } *************** *** 197,204 **** "INSERT INTO " . $mx_table_prefix . "linkdb_config VALUES ('sort_order', 'DESC')", "INSERT INTO " . $mx_table_prefix . "linkdb_config VALUES ('pagination', '10')", "INSERT INTO " . $mx_table_prefix . "linkdb_config VALUES ('cat_col', '2')", "INSERT INTO " . $mx_table_prefix . "linkdb_config VALUES ('settings_newdays', '1')", - // New -------------------- // Comments --- 197,204 ---- "INSERT INTO " . $mx_table_prefix . "linkdb_config VALUES ('sort_order', 'DESC')", "INSERT INTO " . $mx_table_prefix . "linkdb_config VALUES ('pagination', '10')", + "INSERT INTO " . $mx_table_prefix . "linkdb_config VALUES ('cat_col', '2')", "INSERT INTO " . $mx_table_prefix . "linkdb_config VALUES ('settings_newdays', '1')", // New -------------------- // Comments Index: linkdb.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** linkdb.php 1 Jul 2006 21:32:18 -0000 1.10 --- linkdb.php 5 Jul 2006 22:49:20 -0000 1.11 *************** *** 58,62 **** if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Could not query PafileDB module information", "", __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); --- 58,62 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Could not query linkdb module information", "", __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); *************** *** 115,124 **** // if the database disabled give them a nice message // =================================================== ! /* ! if ( intval( $pafiledb_config['module_enable'] ) ) { ! mx_message_die( GENERAL_MESSAGE, $lang['pafiledb_disable'] ); } - */ // --- 115,122 ---- // if the database disabled give them a nice message // =================================================== ! if ( intval( $linkdb_config['module_enable'] ) ) { ! mx_message_die( GENERAL_MESSAGE, $lang['linkdb_disable'] ); } // *************** *** 144,148 **** $linkdb->modules[$actions[$action]]->main( $action ); ! linkdb_page_header(); // --- 142,146 ---- $linkdb->modules[$actions[$action]]->main( $action ); ! $linkdb_functions->page_header(); // *************** *** 153,157 **** $template->pparse( 'body' ); ! linkdb_page_footer(); if ( !$is_block ) --- 151,155 ---- $template->pparse( 'body' ); ! $linkdb_functions->page_footer(); if ( !$is_block ) |
|
From: Jon O. <jon...@us...> - 2006-07-05 22:48:33
|
Update of /cvsroot/mxbb/mx_kb/kb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6489/modules/mx_kb/kb Modified Files: kb_common.php Log Message: massive fix Index: kb_common.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/kb_common.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** kb_common.php 17 Jun 2006 20:11:24 -0000 1.5 --- kb_common.php 5 Jul 2006 22:48:26 -0000 1.6 *************** *** 61,65 **** // =================================================== ! // Include pafiledb data file // =================================================== include_once( $module_root_path . 'kb/includes/kb_constants.' . $phpEx ); --- 61,65 ---- // =================================================== ! // Include kb data // =================================================== include_once( $module_root_path . 'kb/includes/kb_constants.' . $phpEx ); *************** *** 84,89 **** } - $mx_kb_user = new mx_kb_user_info(); - // // options --- 84,87 ---- |
|
From: Jon O. <jon...@us...> - 2006-07-05 22:48:32
|
Update of /cvsroot/mxbb/mx_kb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6489/modules/mx_kb Modified Files: db_install.php db_upgrade.php kb.php kb_article_reader.php kb_lists.php Log Message: massive fix Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/db_install.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** db_install.php 4 Jul 2006 22:33:31 -0000 1.42 --- db_install.php 5 Jul 2006 22:48:25 -0000 1.43 *************** *** 60,64 **** --- 60,66 ---- category_details text, parent int(50) default NULL, + parents_data text NOT NULL default '', cat_order int(50) default NULL, + cat_allow_file tinyint(2) NOT NULL default '1', cat_allow_comments tinyint(2) NOT NULL default '-1', *************** *** 132,136 **** // -------------------------------------------------------- - // Table structure for table `phpbb_pa_comments` "CREATE TABLE " . $mx_table_prefix . "kb_comments ( comments_id int(10) NOT NULL auto_increment, --- 134,137 ---- *************** *** 163,167 **** // -------------------------------------------------------- - // Table structure for table `phpbb_pa_custom` "CREATE TABLE " . $mx_table_prefix . "kb_custom ( custom_id int(50) NOT NULL auto_increment, --- 164,167 ---- *************** *** 175,179 **** )", // -------------------------------------------------------- - // Table structure for table `phpbb_pa_customdata` "CREATE TABLE " . $mx_table_prefix . "kb_customdata ( customdata_file int(50) NOT NULL default '0', --- 175,178 ---- *************** *** 209,217 **** // Appearance - "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('stats_list', '1')", - "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('header_banner', '0')", - "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('pagination', '10')", // art_pagination "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('sort_method', 'Alphabetic')", // news_sort "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('sort_order', 'ASC')", // news_sort_par // Comments --- 208,220 ---- // Appearance "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('sort_method', 'Alphabetic')", // news_sort "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('sort_order', 'ASC')", // news_sort_par + "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('pagination', '10')", // art_pagination + + "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('stats_list', '1')", + "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('header_banner', '0')", + + "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('cat_col', '2')", + "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('settings_newdays', '1')", // Comments Index: kb.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** kb.php 1 Jul 2006 21:30:30 -0000 1.36 --- kb.php 5 Jul 2006 22:48:25 -0000 1.37 *************** *** 153,157 **** if ( intval( $kb_config['module_enable'] ) ) { ! mx_message_die( GENERAL_MESSAGE, $lang['pafiledb_disable'] ); } --- 153,157 ---- if ( intval( $kb_config['module_enable'] ) ) { ! mx_message_die( GENERAL_MESSAGE, $lang['kb_disable'] ); } *************** *** 187,191 **** if ( !$print_version ) { ! kb_page_header(); } --- 187,191 ---- if ( !$print_version ) { ! $mx_kb_functions->page_header(); } *************** *** 196,200 **** 'U_PORTAL' => $mx_root_path, 'L_PORTAL' => "<<", ! 'U_KB' => append_sid( this_kb_mxurl() ), 'L_KB' => $lang['KB_title'] ) ); --- 196,200 ---- 'U_PORTAL' => $mx_root_path, 'L_PORTAL' => "<<", ! 'U_KB' => append_sid( $mx_kb->this_mxurl() ), 'L_KB' => $lang['KB_title'] ) ); *************** *** 207,211 **** if ( !$print_version ) { ! kb_page_footer(); } --- 207,211 ---- if ( !$print_version ) { ! $mx_kb_functions->page_footer(); } Index: kb_article_reader.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb_article_reader.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** kb_article_reader.php 28 Jun 2006 21:18:14 -0000 1.18 --- kb_article_reader.php 5 Jul 2006 22:48:25 -0000 1.19 *************** *** 153,157 **** if ( intval( $kb_config['module_enable'] ) ) { ! mx_message_die( GENERAL_MESSAGE, $lang['pafiledb_disable'] ); } --- 153,157 ---- if ( intval( $kb_config['module_enable'] ) ) { ! mx_message_die( GENERAL_MESSAGE, $lang['kb_disable'] ); } *************** *** 183,187 **** if ( !$print_version ) { ! //kb_page_header( $page_title ); } --- 183,187 ---- if ( !$print_version ) { ! //$mx_kb_functions->page_header( $page_title ); } *************** *** 189,193 **** 'U_PORTAL' => $mx_root_path, 'L_PORTAL' => "<<", ! 'U_KB' => append_sid( this_kb_mxurl() ), 'L_KB' => $lang['KB_title'] ) ); --- 189,193 ---- 'U_PORTAL' => $mx_root_path, 'L_PORTAL' => "<<", ! 'U_KB' => append_sid( $mx_kb->this_mxurl() ), 'L_KB' => $lang['KB_title'] ) ); *************** *** 200,204 **** if ( !$print_version ) { ! //kb_page_footer(); } --- 200,204 ---- if ( !$print_version ) { ! //$mx_kb_functions->page_footer(); } Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/db_upgrade.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** db_upgrade.php 4 Jul 2006 22:33:31 -0000 1.35 --- db_upgrade.php 5 Jul 2006 22:48:25 -0000 1.36 *************** *** 249,253 **** // -------------------------------------------------------- - // Table structure for table `phpbb_pa_custom` $sql[] = "CREATE TABLE " . $mx_table_prefix . "kb_custom ( custom_id int(50) NOT NULL auto_increment, --- 249,252 ---- *************** *** 261,265 **** )"; // -------------------------------------------------------- - // Table structure for table `phpbb_pa_customdata` $sql[] = "CREATE TABLE " . $mx_table_prefix . "kb_customdata ( customdata_file int(50) NOT NULL default '0', --- 260,263 ---- *************** *** 288,292 **** { // -------------------------------------------------------- - // Table structure for table `phpbb_pa_comments` $sql[] = "CREATE TABLE " . $mx_table_prefix . "kb_comments ( comments_id int(10) NOT NULL auto_increment, --- 286,289 ---- *************** *** 414,417 **** --- 411,416 ---- $sql[] = "ALTER TABLE " . $mx_table_prefix . "kb_categories MODIFY category_details text "; $sql[] = "ALTER TABLE " . $mx_table_prefix . "kb_categories MODIFY parent int(50) default NULL "; + $sql[] = "ALTER TABLE " . $mx_table_prefix . "kb_categories ADD parents_data text NOT NULL default '' "; + $sql[] = "ALTER TABLE " . $mx_table_prefix . "kb_categories ADD cat_allow_file tinyint(2) NOT NULL default '1' "; $sql[] = "ALTER TABLE " . $mx_table_prefix . "kb_categories MODIFY cat_order int(50) default NULL "; *************** *** 420,423 **** --- 419,427 ---- $sql[] = "ALTER TABLE " . $mx_table_prefix . "kb_votes CHANGE votes_file votes_article int(50) NOT NULL default '0' "; + // Appearance + $sql[] = "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('cat_col', '2') "; + $sql[] = "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('settings_newdays', '1') "; + + // Delete kb_article table article_rating and article_totalvotes Index: kb_lists.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb_lists.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kb_lists.php 17 Jun 2006 22:12:50 -0000 1.1 --- kb_lists.php 5 Jul 2006 22:48:25 -0000 1.2 *************** *** 2,12 **** /** * ! * @package mxBB Portal Module - mx_pafiledb * @version $Id$ ! * @copyright (c) 2002-2006 [Mohd Basri, PHP Arena, pafileDB, Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * */ if ( !function_exists( 'read_block_config' ) ) { --- 2,15 ---- /** * ! * @package mxBB Portal Module - mx_kb * @version $Id$ ! * @copyright (c) 2002-2006 [wGEric, Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * */ + // + // This block is not yet ported to KB + // if ( !function_exists( 'read_block_config' ) ) { *************** *** 174,181 **** $file_screenshot_url = trim( $recentrow[$j]['file_ssurl'] ); $template->assign_block_vars( 'recent_pics_block.recent_pics.recent_col', array( ! // 'U_PIC' => ($album_config['fullpic_popup']) ? append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=". $recentrow[$j]['pic_id'])) : append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=". $recentrow[$j]['pic_id'])), ! // 'THUMBNAIL' => append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=". $recentrow[$j]['pic_id'], TRUE)), // 'DESC' => $recentrow[$j]['pic_desc'] ! 'SS' => ( !empty( $file_screenshot_url ) ) ? '<hr><a href="' . append_sid( this_pa_mxurl( "action=file&file_id=" . $recentrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '"><img src="' . $file_screenshot_url . '" width="100" border="0"></a><br /><span class="genmed"><i><a href="' . append_sid( this_pa_mxurl( "action=file&file_id=" . $recentrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $recentrow[$j]['file_name'] . '</a></i></span>' : '' )); --- 177,184 ---- $file_screenshot_url = trim( $recentrow[$j]['file_ssurl'] ); $template->assign_block_vars( 'recent_pics_block.recent_pics.recent_col', array( ! // 'U_PIC' => ($album_config['fullpic_popup']) ? append_sid($this->this_mxurl("smartor_mode=album_pic&pic_id=". $recentrow[$j]['pic_id'])) : append_sid($this->this_mxurl("smartor_mode=album_showpage&pic_id=". $recentrow[$j]['pic_id'])), ! // 'THUMBNAIL' => append_sid($this->this_mxurl("smartor_mode=album_thumbnail&pic_id=". $recentrow[$j]['pic_id'], TRUE)), // 'DESC' => $recentrow[$j]['pic_desc'] ! 'SS' => ( !empty( $file_screenshot_url ) ) ? '<hr><a href="' . append_sid( $this->this_mxurl( "action=file&file_id=" . $recentrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '"><img src="' . $file_screenshot_url . '" width="100" border="0"></a><br /><span class="genmed"><i><a href="' . append_sid( $this->this_mxurl( "action=file&file_id=" . $recentrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $recentrow[$j]['file_name'] . '</a></i></span>' : '' )); *************** *** 192,196 **** $template->assign_block_vars( 'recent_pics_block.recent_pics.recent_detail', array( ! 'TITLE' => ( empty( $file_screenshot_url ) ) ? '<b>' . $lang['File_Title'] . ': <a href="' . append_sid( this_pa_mxurl( "action=file&file_id=" . $recentrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $recentrow[$j]['file_name'] . '</a></b><br />' : '', 'DESC' => $recentrow[$j]['file_desc'], 'POSTER' => $recent_poster, --- 195,199 ---- $template->assign_block_vars( 'recent_pics_block.recent_pics.recent_detail', array( ! 'TITLE' => ( empty( $file_screenshot_url ) ) ? '<b>' . $lang['File_Title'] . ': <a href="' . append_sid( $this->this_mxurl( "action=file&file_id=" . $recentrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $recentrow[$j]['file_name'] . '</a></b><br />' : '', 'DESC' => $recentrow[$j]['file_desc'], 'POSTER' => $recent_poster, *************** *** 199,203 **** 'VIEW' => $recentrow[$j]['file_dls'], 'RATING' => ( $album_config['rate'] == 1 ) ? ( $lang['Rating'] . ': ' . $rating_image . ', ' ) : '', ! 'COMMENTS' => ( $album_config['comment'] == 1 ) ? ( '<a href="' . append_sid( this_pa_mxurl( "action=file&file_id=" . $recentrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $lang['Comments'] . '</a>: ' . $recentrow[$j]['comments'] . '<br />' ) : '' // 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($recentrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip($recentrow[$j]['pic_user_ip']) .'</a><br />' : '' )); --- 202,206 ---- 'VIEW' => $recentrow[$j]['file_dls'], 'RATING' => ( $album_config['rate'] == 1 ) ? ( $lang['Rating'] . ': ' . $rating_image . ', ' ) : '', ! 'COMMENTS' => ( $album_config['comment'] == 1 ) ? ( '<a href="' . append_sid( $this->this_mxurl( "action=file&file_id=" . $recentrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $lang['Comments'] . '</a>: ' . $recentrow[$j]['comments'] . '<br />' ) : '' // 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($recentrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip($recentrow[$j]['pic_user_ip']) .'</a><br />' : '' )); *************** *** 269,276 **** $file_screenshot_url = trim( $mostrow[$j]['file_ssurl'] ); $template->assign_block_vars( 'most_pics_block.most_pics.most_col', array( ! // 'U_PIC' => ($album_config['fullpic_popup']) ? append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=". $recentrow[$j]['pic_id'])) : append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=". $recentrow[$j]['pic_id'])), ! // 'THUMBNAIL' => append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=". $recentrow[$j]['pic_id'], TRUE)), // 'DESC' => $recentrow[$j]['pic_desc'] ! 'SS' => ( !empty( $file_screenshot_url ) ) ? '<hr><a href="' . append_sid( this_pa_mxurl( "action=file&file_id=" . $mostrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '"><img src="' . $file_screenshot_url . '" width="100" border="0"></a><br /><span class="genmed"><i><a href="' . append_sid( this_pa_mxurl( "action=file&file_id=" . $mostrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $mostrow[$j]['file_name'] . '</a></i></span>' : '' )); --- 272,279 ---- $file_screenshot_url = trim( $mostrow[$j]['file_ssurl'] ); $template->assign_block_vars( 'most_pics_block.most_pics.most_col', array( ! // 'U_PIC' => ($album_config['fullpic_popup']) ? append_sid($this->this_mxurl("smartor_mode=album_pic&pic_id=". $recentrow[$j]['pic_id'])) : append_sid($this->this_mxurl("smartor_mode=album_showpage&pic_id=". $recentrow[$j]['pic_id'])), ! // 'THUMBNAIL' => append_sid($this->this_mxurl("smartor_mode=album_thumbnail&pic_id=". $recentrow[$j]['pic_id'], TRUE)), // 'DESC' => $recentrow[$j]['pic_desc'] ! 'SS' => ( !empty( $file_screenshot_url ) ) ? '<hr><a href="' . append_sid( $this->this_mxurl( "action=file&file_id=" . $mostrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '"><img src="' . $file_screenshot_url . '" width="100" border="0"></a><br /><span class="genmed"><i><a href="' . append_sid( $this->this_mxurl( "action=file&file_id=" . $mostrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $mostrow[$j]['file_name'] . '</a></i></span>' : '' )); *************** *** 287,291 **** $template->assign_block_vars( 'most_pics_block.most_pics.most_detail', array( ! 'TITLE' => ( empty( $file_screenshot_url ) ) ? '<b>' . $lang['File_Title'] . ': <a href="' . append_sid( this_pa_mxurl( "action=file&file_id=" . $mostrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $mostrow[$j]['file_name'] . '</a></b><br />' : '', 'DESC' => $mostrow[$j]['file_desc'], 'POSTER' => $most_poster, --- 290,294 ---- $template->assign_block_vars( 'most_pics_block.most_pics.most_detail', array( ! 'TITLE' => ( empty( $file_screenshot_url ) ) ? '<b>' . $lang['File_Title'] . ': <a href="' . append_sid( $this->this_mxurl( "action=file&file_id=" . $mostrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $mostrow[$j]['file_name'] . '</a></b><br />' : '', 'DESC' => $mostrow[$j]['file_desc'], 'POSTER' => $most_poster, *************** *** 294,298 **** 'VIEW' => $mostrow[$j]['file_dls'], 'RATING' => ( $album_config['rate'] == 1 ) ? ( $lang['Rating'] . ': ' . $rating_image . ', ' ) : '', ! 'COMMENTS' => ( $album_config['comment'] == 1 ) ? ( '<a href="' . append_sid( this_pa_mxurl( "action=file&file_id=" . $mostrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $lang['Comments'] . '</a>: ' . $mostrow[$j]['comments'] . '<br />' ) : '' // 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($recentrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip($recentrow[$j]['pic_user_ip']) .'</a><br />' : '' )); --- 297,301 ---- 'VIEW' => $mostrow[$j]['file_dls'], 'RATING' => ( $album_config['rate'] == 1 ) ? ( $lang['Rating'] . ': ' . $rating_image . ', ' ) : '', ! 'COMMENTS' => ( $album_config['comment'] == 1 ) ? ( '<a href="' . append_sid( $this->this_mxurl( "action=file&file_id=" . $mostrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $lang['Comments'] . '</a>: ' . $mostrow[$j]['comments'] . '<br />' ) : '' // 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($recentrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip($recentrow[$j]['pic_user_ip']) .'</a><br />' : '' )); *************** *** 365,372 **** $file_screenshot_url = trim( $highestrow[$j]['file_ssurl'] ); $template->assign_block_vars( 'highest_pics_block.highest_pics.highest_col', array( ! // 'U_PIC' => ($album_config['fullpic_popup']) ? append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=". $highestrow[$j]['pic_id'])) : append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=". $highestrow[$j]['pic_id'])), ! // 'THUMBNAIL' => append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=". $highestrow[$j]['pic_id'], TRUE)), // 'DESC' => $highestrow[$j]['pic_desc'] ! 'SS' => ( !empty( $file_screenshot_url ) ) ? '<hr><a href="' . append_sid( this_pa_mxurl( "action=file&file_id=" . $highestrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '"><img src="' . $file_screenshot_url . '" width="100" border="0"></a><br /><span class="genmed"><i><a href="' . append_sid( this_pa_mxurl( "action=file&file_id=" . $highestrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $highestrow[$j]['file_name'] . '</a></i></span>' : '' )); --- 368,375 ---- $file_screenshot_url = trim( $highestrow[$j]['file_ssurl'] ); $template->assign_block_vars( 'highest_pics_block.highest_pics.highest_col', array( ! // 'U_PIC' => ($album_config['fullpic_popup']) ? append_sid($this->this_mxurl("smartor_mode=album_pic&pic_id=". $highestrow[$j]['pic_id'])) : append_sid($this->this_mxurl("smartor_mode=album_showpage&pic_id=". $highestrow[$j]['pic_id'])), ! // 'THUMBNAIL' => append_sid($this->this_mxurl("smartor_mode=album_thumbnail&pic_id=". $highestrow[$j]['pic_id'], TRUE)), // 'DESC' => $highestrow[$j]['pic_desc'] ! 'SS' => ( !empty( $file_screenshot_url ) ) ? '<hr><a href="' . append_sid( $this->this_mxurl( "action=file&file_id=" . $highestrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '"><img src="' . $file_screenshot_url . '" width="100" border="0"></a><br /><span class="genmed"><i><a href="' . append_sid( $this->this_mxurl( "action=file&file_id=" . $highestrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $highestrow[$j]['file_name'] . '</a></i></span>' : '' )); *************** *** 383,387 **** $template->assign_block_vars( 'highest_pics_block.highest_pics.highest_detail', array( ! 'H_TITLE' => ( empty( $file_screenshot_url ) ) ? '<b>' . $lang['File_Title'] . ': <a href="' . append_sid( this_pa_mxurl( "action=file&file_id=" . $highestrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $highestrow[$j]['file_name'] . '</a></b><br />' : '', 'H_DESC' => $highestrow[$j]['file_desc'], 'H_POSTER' => $highest_poster, --- 386,390 ---- $template->assign_block_vars( 'highest_pics_block.highest_pics.highest_detail', array( ! 'H_TITLE' => ( empty( $file_screenshot_url ) ) ? '<b>' . $lang['File_Title'] . ': <a href="' . append_sid( $this->this_mxurl( "action=file&file_id=" . $highestrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $highestrow[$j]['file_name'] . '</a></b><br />' : '', 'H_DESC' => $highestrow[$j]['file_desc'], 'H_POSTER' => $highest_poster, *************** *** 390,394 **** 'H_VIEW' => $highestrow[$j]['file_dls'], 'H_RATING' => ( $album_config['rate'] == 1 ) ? ( $lang['Rating'] . ': ' . $rating_image . ', ' ) : '', ! 'H_COMMENTS' => ( $album_config['comment'] == 1 ) ? ( '<a href="' . append_sid( this_pa_mxurl( "action=file&file_id=" . $highestrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $lang['Comments'] . '</a>: ' . $highestrow[$j]['comments'] . '<br />' ) : '' // 'H_IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($highestrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip($highestrow[$j]['pic_user_ip']) .'</a><br />' : '' )); --- 393,397 ---- 'H_VIEW' => $highestrow[$j]['file_dls'], 'H_RATING' => ( $album_config['rate'] == 1 ) ? ( $lang['Rating'] . ': ' . $rating_image . ', ' ) : '', ! 'H_COMMENTS' => ( $album_config['comment'] == 1 ) ? ( '<a href="' . append_sid( $this->this_mxurl( "action=file&file_id=" . $highestrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $lang['Comments'] . '</a>: ' . $highestrow[$j]['comments'] . '<br />' ) : '' // 'H_IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($highestrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip($highestrow[$j]['pic_user_ip']) .'</a><br />' : '' )); *************** *** 462,469 **** $file_screenshot_url = trim( $randrow[$j]['file_ssurl'] ); $template->assign_block_vars( 'random_pics_block.rand_pics.rand_col', array( ! // 'U_PIC' => ($album_config['fullpic_popup']) ? append_sid(this_pa_mxurl("smartor_mode=album_pic&pic_id=". $randrow[$j]['pic_id'])) : append_sid(this_pa_mxurl("smartor_mode=album_showpage&pic_id=". $randrow[$j]['pic_id'])), ! // 'THUMBNAIL' => append_sid(this_pa_mxurl("smartor_mode=album_thumbnail&pic_id=". $randrow[$j]['pic_id'], TRUE)), // 'DESC' => $randrow[$j]['file_desc'] ! 'SS' => ( !empty( $file_screenshot_url ) ) ? '<hr><a href="' . append_sid( this_pa_mxurl( "action=file&file_id=" . $randrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '"><img src="' . $file_screenshot_url . '" width="100" border="0"></a><br /><span class="genmed"><i><a href="' . append_sid( this_pa_mxurl( "action=file&file_id=" . $randrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $randrow[$j]['file_name'] . '</a></i></span>' : '' )); --- 465,472 ---- $file_screenshot_url = trim( $randrow[$j]['file_ssurl'] ); $template->assign_block_vars( 'random_pics_block.rand_pics.rand_col', array( ! // 'U_PIC' => ($album_config['fullpic_popup']) ? append_sid($this->this_mxurl("smartor_mode=album_pic&pic_id=". $randrow[$j]['pic_id'])) : append_sid($this->this_mxurl("smartor_mode=album_showpage&pic_id=". $randrow[$j]['pic_id'])), ! // 'THUMBNAIL' => append_sid($this->this_mxurl("smartor_mode=album_thumbnail&pic_id=". $randrow[$j]['pic_id'], TRUE)), // 'DESC' => $randrow[$j]['file_desc'] ! 'SS' => ( !empty( $file_screenshot_url ) ) ? '<hr><a href="' . append_sid( $this->this_mxurl( "action=file&file_id=" . $randrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '"><img src="' . $file_screenshot_url . '" width="100" border="0"></a><br /><span class="genmed"><i><a href="' . append_sid( $this->this_mxurl( "action=file&file_id=" . $randrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $randrow[$j]['file_name'] . '</a></i></span>' : '' )); *************** *** 480,484 **** $template->assign_block_vars( 'random_pics_block.rand_pics.rand_detail', array( ! 'TITLE' => ( empty( $file_screenshot_url ) ) ? '<b>' . $lang['File_Title'] . ': <a href="' . append_sid( this_pa_mxurl( "action=file&file_id=" . $randrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $randrow[$j]['file_name'] . '</a></b><br />' : '', 'DESC' => $randrow[$j]['file_desc'], 'POSTER' => $rand_poster, --- 483,487 ---- $template->assign_block_vars( 'random_pics_block.rand_pics.rand_detail', array( ! 'TITLE' => ( empty( $file_screenshot_url ) ) ? '<b>' . $lang['File_Title'] . ': <a href="' . append_sid( $this->this_mxurl( "action=file&file_id=" . $randrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $randrow[$j]['file_name'] . '</a></b><br />' : '', 'DESC' => $randrow[$j]['file_desc'], 'POSTER' => $rand_poster, *************** *** 487,491 **** 'VIEW' => $randrow[$j]['file_dls'], 'RATING' => ( $album_config['rate'] == 1 ) ? ( $lang['Rating'] . ': ' . $rating_image . ', ' ) : '', ! 'COMMENTS' => ( $album_config['comment'] == 1 ) ? ( '<a href="' . append_sid( this_pa_mxurl( "action=file&file_id=" . $randrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $lang['Comments'] . '</a>: ' . $randrow[$j]['comments'] . '<br />' ) : '' // 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($randrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip($randrow[$j]['pic_user_ip']) .'</a><br />' : '' )); --- 490,494 ---- 'VIEW' => $randrow[$j]['file_dls'], 'RATING' => ( $album_config['rate'] == 1 ) ? ( $lang['Rating'] . ': ' . $rating_image . ', ' ) : '', ! 'COMMENTS' => ( $album_config['comment'] == 1 ) ? ( '<a href="' . append_sid( $this->this_mxurl( "action=file&file_id=" . $randrow[$j]['file_id'], false, $pafiledb_page_id ) ) . '">' . $lang['Comments'] . '</a>: ' . $randrow[$j]['comments'] . '<br />' ) : '' // 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($randrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip($randrow[$j]['pic_user_ip']) .'</a><br />' : '' )); *************** *** 529,536 **** 'L_LAST_PIC' => $lang['Last_Pic'], ! 'U_YOUR_PERSONAL_GALLERY' => append_sid( this_pa_mxurl( "smartor_mode=album_personal&user_id=" . $userdata['user_id'] ) ), 'L_YOUR_PERSONAL_GALLERY' => $lang['Your_Personal_Gallery'], ! 'U_USERS_PERSONAL_GALLERIES' => append_sid( this_pa_mxurl( "smartor_mode=album_personal_index" ) ), 'L_USERS_PERSONAL_GALLERIES' => $lang['Users_Personal_Galleries'], --- 532,539 ---- 'L_LAST_PIC' => $lang['Last_Pic'], ! 'U_YOUR_PERSONAL_GALLERY' => append_sid( $this->this_mxurl( "smartor_mode=album_personal&user_id=" . $userdata['user_id'] ) ), 'L_YOUR_PERSONAL_GALLERY' => $lang['Your_Personal_Gallery'], ! 'U_USERS_PERSONAL_GALLERIES' => append_sid( $this->this_mxurl( "smartor_mode=album_personal_index" ) ), 'L_USERS_PERSONAL_GALLERIES' => $lang['Users_Personal_Galleries'], *************** *** 570,574 **** * @return unknown */ ! function this_pa_mxurl( $args = '', $force_standalone_mode = false, $page_id = 1 ) { global $mx_root_path, $module_root_path, $phpEx, $is_block; --- 573,577 ---- * @return unknown */ ! function this_kb_mxurl( $args = '', $force_standalone_mode = false, $page_id = 1 ) { global $mx_root_path, $module_root_path, $phpEx, $is_block; |
Update of /cvsroot/mxbb/mx_kb/kb/modules In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6489/modules/mx_kb/kb/modules Modified Files: kb_article.php kb_cat.php kb_moderator.php kb_post.php kb_post_comment.php kb_rate.php kb_search.php kb_stats.php Log Message: massive fix Index: kb_stats.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_stats.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** kb_stats.php 4 Jul 2006 22:33:32 -0000 1.4 --- kb_stats.php 5 Jul 2006 22:48:26 -0000 1.5 *************** *** 66,70 **** 'L_ARTICLES' => $lang['Articles'], 'PATH' => '» ' . $path_kb, ! 'U_CAT' => append_sid( this_kb_mxurl( 'mode=cat&cat=' . $category_id ) ) )); --- 66,70 ---- 'L_ARTICLES' => $lang['Articles'], 'PATH' => '» ' . $path_kb, ! 'U_CAT' => append_sid( $this->this_mxurl( 'mode=cat&cat=' . $category_id ) ) )); *************** *** 77,81 **** if ( $total_articles > 0 ) { ! // $pagination = generate_pagination( this_kb_mxurl( "mode=cat&cat=$category_id" ), $total_articles, $kb_config['pagination'], $start ) . ' '; } --- 77,81 ---- if ( $total_articles > 0 ) { ! // $pagination = generate_pagination( $this->this_mxurl( "mode=cat&cat=$category_id" ), $total_articles, $kb_config['pagination'], $start ) . ' '; } Index: kb_post.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_post.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** kb_post.php 29 Jun 2006 13:14:20 -0000 1.7 --- kb_post.php 5 Jul 2006 22:48:26 -0000 1.8 *************** *** 125,129 **** // ! // Instantiate the mx_text class // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); --- 125,129 ---- // ! // Instantiate the mx_text and mx_text_formatting classes // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); *************** *** 131,134 **** --- 131,136 ---- $mx_text->init($html_on, $bbcode_on, $smilies_on); + $mx_text_formatting = new mx_text_formatting(); + // // Allow all html tags *************** *** 144,148 **** if ( !$mx_request_vars->is_request('article_name') || !$mx_request_vars->is_request('article_desc') || !$mx_request_vars->is_request('message') ) { ! $message = $lang['Empty_fields'] . '<br /><br />' . sprintf( $lang['Empty_fields_return'], '<a href="' . append_sid( this_kb_mxurl( 'mode=add' ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 146,150 ---- if ( !$mx_request_vars->is_request('article_name') || !$mx_request_vars->is_request('article_desc') || !$mx_request_vars->is_request('message') ) { ! $message = $lang['Empty_fields'] . '<br /><br />' . sprintf( $lang['Empty_fields_return'], '<a href="' . append_sid( $this->this_mxurl( 'mode=add' ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 166,170 **** if ( !($this->auth_user[$category_id]['auth_edit'] || $this->auth_user[$category_id]['auth_mod']) ) { ! $message = $lang['No_edit'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 168,172 ---- if ( !($this->auth_user[$category_id]['auth_edit'] || $this->auth_user[$category_id]['auth_mod']) ) { ! $message = $lang['No_edit'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 199,203 **** if ( !($this->auth_user[$category_id]['auth_post'] || $this->auth_user[$category_id]['auth_mod']) ) { ! $message = $lang['No_add'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 201,205 ---- if ( !($this->auth_user[$category_id]['auth_post'] || $this->auth_user[$category_id]['auth_mod']) ) { ! $message = $lang['No_add'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 264,272 **** if ( $approve == 1 ) { ! $message = $lang['Article_submitted'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf($lang['Click_return_article'], '<a href="' . append_sid(this_kb_mxurl("mode=article&k=" . $article_id)). '">', '</a>') . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); } else { ! $message = $lang['Article_submitted_Approve'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); } mx_message_die( GENERAL_MESSAGE, $message ); --- 266,274 ---- if ( $approve == 1 ) { ! $message = $lang['Article_submitted'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf($lang['Click_return_article'], '<a href="' . append_sid($this->this_mxurl("mode=article&k=" . $article_id)). '">', '</a>') . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); } else { ! $message = $lang['Article_submitted_Approve'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); } mx_message_die( GENERAL_MESSAGE, $message ); *************** *** 278,286 **** // - // Instatiate text tools - // - $mx_kb_text_tools = new mx_kb_text_tools(); - - // // PreText HIDE/SHOW // --- 280,283 ---- *************** *** 307,311 **** if ( $kb_post_mode == 'edit' && !$this->auth_user[$category_id]['auth_edit'] ) { ! $message = $lang['No_edit'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 304,308 ---- if ( $kb_post_mode == 'edit' && !$this->auth_user[$category_id]['auth_edit'] ) { ! $message = $lang['No_edit'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 313,317 **** if ( $kb_post_mode == 'add' && ( !$this->auth_user[$category_id]['auth_post'] || $kb_config['enable_module'] == 0 ) ) { ! $message = $lang['No_add'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 310,314 ---- if ( $kb_post_mode == 'add' && ( !$this->auth_user[$category_id]['auth_post'] || $kb_config['enable_module'] == 0 ) ) { ! $message = $lang['No_add'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 329,333 **** if (!$kb_config['allow_images'] || !$kb_config['allow_links']) { ! $preview_text = $mx_kb_text_tools->remove_images_links( $preview_text, $kb_config['allow_images'], $kb_config['no_image_message'], $kb_config['allow_links'], $kb_config['no_link_message'] ); } --- 326,330 ---- if (!$kb_config['allow_images'] || !$kb_config['allow_links']) { ! $preview_text = $mx_text_formatting->remove_images_links( $preview_text, $kb_config['allow_images'], $kb_config['no_image_message'], $kb_config['allow_links'], $kb_config['no_link_message'] ); } *************** *** 393,397 **** } ! $kb_action_url = $kb_post_mode == 'add' ? this_kb_mxurl( 'mode=add' ) : this_kb_mxurl( 'mode=edit' ); $custom_data = $kb_post_mode == 'add' ? $mx_kb_custom_field->display_edit() : $mx_kb_custom_field->display_edit( $article_id ); --- 390,394 ---- } ! $kb_action_url = $kb_post_mode == 'add' ? $this->this_mxurl( 'mode=add' ) : $this->this_mxurl( 'mode=edit' ); $custom_data = $kb_post_mode == 'add' ? $mx_kb_custom_field->display_edit() : $mx_kb_custom_field->display_edit( $article_id ); *************** *** 495,499 **** ) ); ! $this->get_kb_type_list( $type_id ); if ( $kb_post_mode == 'edit' ) --- 492,496 ---- ) ); ! $mx_kb_functions->get_kb_type_list( $type_id ); if ( $kb_post_mode == 'edit' ) Index: kb_moderator.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_moderator.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** kb_moderator.php 17 Jun 2006 20:11:24 -0000 1.4 --- kb_moderator.php 5 Jul 2006 22:48:26 -0000 1.5 *************** *** 59,63 **** if ( !( ($this->auth_user[$category_id]['auth_delete'] || $this->auth_user[$category_id]['auth_mod']) && $userdata['session_logged_in'] ) ) { ! $message = $lang['No_add'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 59,63 ---- if ( !( ($this->auth_user[$category_id]['auth_delete'] || $this->auth_user[$category_id]['auth_mod']) && $userdata['session_logged_in'] ) ) { ! $message = $lang['No_add'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 118,122 **** $this->update_add_article_notify($article_id, 'approve'); ! $message = $lang['Article_approved'] . '<br /><br />' . sprintf( $lang['Click_return_article_manager'], '<a href="' . append_sid( this_kb_mxurl( "page=$page_id&mode=cat&cat=$category_id&start=$start" ) ) . '">', '</a>' ) ; break; --- 118,122 ---- $this->update_add_article_notify($article_id, 'approve'); ! $message = $lang['Article_approved'] . '<br /><br />' . sprintf( $lang['Click_return_article_manager'], '<a href="' . append_sid( $this->this_mxurl( "page=$page_id&mode=cat&cat=$category_id&start=$start" ) ) . '">', '</a>' ) ; break; *************** *** 140,144 **** $this->update_add_article_notify($article_id, 'unapprove'); ! $message = $lang['Article_unapproved'] . '<br /><br />' . sprintf( $lang['Click_return_article_manager'], '<a href="' . append_sid( this_kb_mxurl( "page=$page_id&mode=cat&cat=$category_id&start=$start") ) . '">', '</a>' ) ; break; --- 140,144 ---- $this->update_add_article_notify($article_id, 'unapprove'); ! $message = $lang['Article_unapproved'] . '<br /><br />' . sprintf( $lang['Click_return_article_manager'], '<a href="' . append_sid( $this->this_mxurl( "page=$page_id&mode=cat&cat=$category_id&start=$start") ) . '">', '</a>' ) ; break; *************** *** 200,204 **** $this->_kb(); ! $message = $lang['Article_deleted'] . '<br /><br />' . sprintf( $lang['Click_return_article_manager'], '<a href="' . append_sid( this_kb_mxurl( "page=$page_id&mode=cat&cat=$category_id&start=$start") ) . '">', '</a>' ) ; } --- 200,204 ---- $this->_kb(); ! $message = $lang['Article_deleted'] . '<br /><br />' . sprintf( $lang['Click_return_article_manager'], '<a href="' . append_sid( $this->this_mxurl( "page=$page_id&mode=cat&cat=$category_id&start=$start") ) . '">', '</a>' ) ; } *************** *** 207,211 **** $category_id = ( $ref_stats ? 1 : $category_id ); ! $message = $lang['Confirm_art_delete'] . '<br /><br />' . sprintf( $lang['Confirm_art_delete_yes'], '<a href="' . append_sid( this_kb_mxurl( "mode=moderate&action=delete&page=$page_id&cat=$category_id&c=yes&a=$article_id&start=$start" ) ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Confirm_art_delete_no'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx?page=$page_id&mode=cat&cat=$category_id&start=$start" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 207,211 ---- $category_id = ( $ref_stats ? 1 : $category_id ); ! $message = $lang['Confirm_art_delete'] . '<br /><br />' . sprintf( $lang['Confirm_art_delete_yes'], '<a href="' . append_sid( $this->this_mxurl( "mode=moderate&action=delete&page=$page_id&cat=$category_id&c=yes&a=$article_id&start=$start" ) ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Confirm_art_delete_no'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx?page=$page_id&mode=cat&cat=$category_id&start=$start" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } Index: kb_article.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_article.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** kb_article.php 4 Jul 2006 22:33:32 -0000 1.9 --- kb_article.php 5 Jul 2006 22:48:26 -0000 1.10 *************** *** 29,33 **** global $template, $lang, $db, $phpEx, $kb_config, $mx_request_vars, $userdata; global $phpbb_root_path, $mx_root_path, $module_root_path, $is_block, $phpEx, $images; ! global $mx_kb_custom_field, $print_version, $board_config, $mx_block; // --- 29,33 ---- global $template, $lang, $db, $phpEx, $kb_config, $mx_request_vars, $userdata; global $phpbb_root_path, $mx_root_path, $module_root_path, $is_block, $phpEx, $images; ! global $mx_kb_custom_field, $mx_kb_functions, $print_version, $board_config, $mx_block; // *************** *** 52,58 **** { case 'oracle': ! $sql = "SELECT f.*, AVG(r.rate_point) AS rating, COUNT(r.votes_article) AS total_votes, u.user_id, u.username ! FROM " . KB_ARTICLES_TABLE . " AS f, " . KB_VOTES_TABLE . " AS r, " . USERS_TABLE . " AS u WHERE f.article_id = r.votes_article(+) AND f.article_author_id = u.user_id(+) AND f.article_id = $article_id --- 52,59 ---- { case 'oracle': ! $sql = "SELECT f.*, AVG(r.rate_point) AS rating, COUNT(r.votes_article) AS total_votes, u.user_id, u.username, typ.type ! FROM " . KB_ARTICLES_TABLE . " AS f, " . KB_VOTES_TABLE . " AS r, " . USERS_TABLE . " AS u, " . KB_TYPES_TABLE . " AS typ WHERE f.article_id = r.votes_article(+) + AND f.article_type = typ.id(+) AND f.article_author_id = u.user_id(+) AND f.article_id = $article_id *************** *** 62,68 **** default: ! $sql = "SELECT f.*, AVG(r.rate_point) AS rating, COUNT(r.votes_article) AS total_votes, u.user_id, u.username FROM " . KB_ARTICLES_TABLE . " AS f LEFT JOIN " . KB_VOTES_TABLE . " AS r ON f.article_id = r.votes_article LEFT JOIN " . USERS_TABLE . " AS u ON f.article_author_id = u.user_id WHERE f.article_id = $article_id --- 63,70 ---- default: ! $sql = "SELECT f.*, AVG(r.rate_point) AS rating, COUNT(r.votes_article) AS total_votes, u.user_id, u.username, typ.type FROM " . KB_ARTICLES_TABLE . " AS f LEFT JOIN " . KB_VOTES_TABLE . " AS r ON f.article_id = r.votes_article + LEFT JOIN " . KB_TYPES_TABLE . " AS typ ON f.article_type = typ.id LEFT JOIN " . USERS_TABLE . " AS u ON f.article_author_id = u.user_id WHERE f.article_id = $article_id *************** *** 87,91 **** if ( ( !$this->auth_user[$kb_row['article_category_id']]['auth_view'] ) ) { ! $message = $lang['Article_not_exsist'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $phpbb_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 89,93 ---- if ( ( !$this->auth_user[$kb_row['article_category_id']]['auth_view'] ) ) { ! $message = $lang['Article_not_exsist'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $phpbb_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 101,107 **** $approved = $kb_row['approved']; $date = create_date( $board_config['default_dateformat'], $kb_row['article_date'], $board_config['board_timezone'] ); ! ! $type_id = $kb_row['article_type']; ! $type = $this->get_kb_type( $type_id ); $new_views = $kb_row['views'] + 1; --- 103,107 ---- $approved = $kb_row['approved']; $date = create_date( $board_config['default_dateformat'], $kb_row['article_date'], $board_config['board_timezone'] ); ! $type = $kb_row['type']; $new_views = $kb_row['views'] + 1; *************** *** 123,127 **** // ! // Instantiate the mx_text class // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); --- 123,127 ---- // ! // Instantiate the mx_text and mx_text_formatting classes // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); *************** *** 130,133 **** --- 130,135 ---- $mx_text->allow_all_html_tags = $kb_config['allow_wysiwyg'] ? true : false; + $mx_text_formatting = new mx_text_formatting(); + // // Decode article for display *************** *** 137,146 **** $article = $mx_text->display($article, $bbcode_uid); ! $article = $this->article_formatting( $article ); ! ! // ! // Instatiate text tools ! // ! $mx_kb_text_tools = new mx_kb_text_tools(); // --- 139,143 ---- $article = $mx_text->display($article, $bbcode_uid); ! $article = $mx_kb_functions->article_formatting( $article ); // *************** *** 149,153 **** if (!$kb_config['allow_images'] || !$kb_config['allow_inks']) { ! $article = $mx_kb_text_tools->remove_images_links( $article, $kb_config['allow_images'], $kb_config['no_image_message'], $kb_config['allow_links'], $kb_config['no_link_message'] ); } --- 146,150 ---- if (!$kb_config['allow_images'] || !$kb_config['allow_inks']) { ! $article = $mx_text_formatting->remove_images_links( $article, $kb_config['allow_images'], $kb_config['no_image_message'], $kb_config['allow_links'], $kb_config['no_link_message'] ); } *************** *** 157,176 **** if ( $kb_config['max_subject_chars'] > 0 ) { ! $article_title = $mx_kb_text_tools->truncate_text( $article_title, $kb_config['max_subject_chars'], true ); } if ( $kb_config['max_description_chars'] > 0 ) { ! $article_description = $mx_kb_text_tools->truncate_text( $article_description, $kb_config['max_description_chars'], true ); } if ( $kb_config['max_chars'] > 0 ) { ! $article = $mx_kb_text_tools->truncate_text( $article, $kb_config['max_chars'], true ); } if ( $kb_config['formatting_truncate_links'] || $kb_config['formatting_image_resize'] > 0 || $kb_config['formatting_wordwrap'] ) { ! $article = $mx_kb_text_tools->decode( $article, $kb_config['formatting_truncate_links'], intval($kb_config['formatting_image_resize']), $kb_config['formatting_wordwrap'] ); } --- 154,173 ---- if ( $kb_config['max_subject_chars'] > 0 ) { ! $article_title = $mx_text_formatting->truncate_text( $article_title, $kb_config['max_subject_chars'], true ); } if ( $kb_config['max_description_chars'] > 0 ) { ! $article_description = $mx_text_formatting->truncate_text( $article_description, $kb_config['max_description_chars'], true ); } if ( $kb_config['max_chars'] > 0 ) { ! $article = $mx_text_formatting->truncate_text( $article, $kb_config['max_chars'], true ); } if ( $kb_config['formatting_truncate_links'] || $kb_config['formatting_image_resize'] > 0 || $kb_config['formatting_wordwrap'] ) { ! $article = $mx_text_formatting->decode( $article, $kb_config['formatting_truncate_links'], intval($kb_config['formatting_image_resize']), $kb_config['formatting_wordwrap'] ); } *************** *** 178,182 **** // Format text and data // ! $temp_url = append_sid( this_kb_mxurl( "mode=cat&cat=$article_category_id" ) ); $category = '<a href="' . $temp_url . '" class="gensmall">' . $article_category_name . '</a>'; --- 175,179 ---- // Format text and data // ! $temp_url = append_sid( $this->this_mxurl( "mode=cat&cat=$article_category_id" ) ); $category = '<a href="' . $temp_url . '" class="gensmall">' . $article_category_name . '</a>'; *************** *** 187,191 **** else { ! $author_name = $this->get_kb_author( $author_id ); $temp_url = append_sid( $phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$author_id" ); $author_kb_art = '<a href="' . $temp_url . '" class="gensmall">' . $author_name . '</a>'; --- 184,188 ---- else { ! $author_name = $kb_row['username']; $temp_url = append_sid( $phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$author_id" ); $author_kb_art = '<a href="' . $temp_url . '" class="gensmall">' . $author_name . '</a>'; *************** *** 210,214 **** if ( ( $userdata['user_id'] == $author_id && $this->auth_user[$article_category_id]['auth_edit'] ) || $this->auth_user[$article_category_id]['auth_mod'] ) { ! $temp_url = append_sid( this_kb_mxurl( "mode=edit&k=" . $article_id ) ); $edit_img = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_edit'] . '" alt="' . $lang['Edit_delete_post'] . '" title="' . $lang['Edit_delete_post'] . '" border="0" /></a>'; $edit = '<a href="' . $temp_url . '">' . $lang['Edit_delete_post'] . '</a>'; --- 207,211 ---- if ( ( $userdata['user_id'] == $author_id && $this->auth_user[$article_category_id]['auth_edit'] ) || $this->auth_user[$article_category_id]['auth_mod'] ) { ! $temp_url = append_sid( $this->this_mxurl( "mode=edit&k=" . $article_id ) ); $edit_img = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_edit'] . '" alt="' . $lang['Edit_delete_post'] . '" title="' . $lang['Edit_delete_post'] . '" border="0" /></a>'; $edit = '<a href="' . $temp_url . '">' . $lang['Edit_delete_post'] . '</a>'; *************** *** 225,229 **** if ( !$this->auth_user[$article_category_id]['auth_view'] || !$article_title || ( !$approved && !$this->auth_user[$article_category_id]['auth_mod'] ) || ( !$this->ns_auth_cat( $article_category_id ) && !$print_version ) ) { ! $message = $lang['Article_not_exsist'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $phpbb_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 222,226 ---- if ( !$this->auth_user[$article_category_id]['auth_view'] || !$article_title || ( !$approved && !$this->auth_user[$article_category_id]['auth_mod'] ) || ( !$this->ns_auth_cat( $article_category_id ) && !$print_version ) ) { ! $message = $lang['Article_not_exsist'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $phpbb_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 249,253 **** } ! $print_url = append_sid( this_kb_mxurl( "mode=article&k=" . $article_id ."&page_num=".($page_num+1)."&start=".$start ."&print=true", true ) ); $template->assign_vars( array( --- 246,250 ---- } ! $print_url = append_sid( $this->this_mxurl( "mode=article&k=" . $article_id ."&page_num=".($page_num+1)."&start=".$start ."&print=true", true ) ); $template->assign_vars( array( *************** *** 339,347 **** if ( !$print_version ) { ! $temp_url = append_sid( this_kb_mxurl( "mode=article&k=$article_id&page_num=$page_number" . $start_pag . $original_highlight) ); } else { ! $temp_url = append_sid( this_kb_mxurl( "mode=article&k=$article_id&page_num=$page_number&print=true" . $start_pag . $original_highlight, true ) ); } $page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . '</a>'; --- 336,344 ---- if ( !$print_version ) { ! $temp_url = append_sid( $this->this_mxurl( "mode=article&k=$article_id&page_num=$page_number" . $start_pag . $original_highlight) ); } else { ! $temp_url = append_sid( $this->this_mxurl( "mode=article&k=$article_id&page_num=$page_number&print=true" . $start_pag . $original_highlight, true ) ); } $page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . '</a>'; *************** *** 394,398 **** // 'RATE_IMG' => $rate_img, ! 'U_RATE' => append_sid( this_kb_mxurl( 'mode=rate&k=' . $article_id ) ), )); } --- 391,395 ---- // 'RATE_IMG' => $rate_img, ! 'U_RATE' => append_sid( $this->this_mxurl( 'mode=rate&k=' . $article_id ) ), )); } Index: kb_search.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_search.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** kb_search.php 4 Jul 2006 22:33:32 -0000 1.5 --- kb_search.php 5 Jul 2006 22:48:26 -0000 1.6 *************** *** 36,40 **** if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".this_kb_mxurl("action=stats"), true)); } --- 36,40 ---- if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("action=stats"), true)); } *************** *** 531,536 **** for( $i = 0; $i < count( $searchset ); $i++ ) { ! $cat_url = append_sid( this_kb_mxurl( 'mode=cat&cat=' . $searchset[$i]['category_id'] ) ); ! $file_url = append_sid( this_kb_mxurl( 'mode=article&k=' . $searchset[$i]['article_id'] ) ); // =================================================== // Format the date for the given article --- 531,536 ---- for( $i = 0; $i < count( $searchset ); $i++ ) { ! $cat_url = append_sid( $this->this_mxurl( 'mode=cat&cat=' . $searchset[$i]['category_id'] ) ); ! $file_url = append_sid( $this->this_mxurl( 'mode=article&k=' . $searchset[$i]['article_id'] ) ); // =================================================== // Format the date for the given article *************** *** 563,567 **** ); } ! $base_url = append_sid( this_kb_mxurl( "mode=search&search_id=$search_id" ) ); $template->assign_vars( array( --- 563,567 ---- ); } ! $base_url = append_sid( $this->this_mxurl( "mode=search&search_id=$search_id" ) ); $template->assign_vars( array( *************** *** 571,575 **** 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD' => append_sid( this_kb_mxurl() ), 'L_INDEX' => "<<", --- 571,575 ---- 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD' => append_sid( $this->this_mxurl() ), 'L_INDEX' => "<<", *************** *** 597,601 **** $template->assign_vars( array( ! 'S_SEARCH_ACTION' => append_sid( this_kb_mxurl() ), 'S_CAT_MENU' => $dropmenu, --- 597,601 ---- $template->assign_vars( array( ! 'S_SEARCH_ACTION' => append_sid( $this->this_mxurl() ), 'S_CAT_MENU' => $dropmenu, *************** *** 603,607 **** 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD' => append_sid( this_kb_mxurl() ), 'L_YES' => $lang['Yes'], --- 603,607 ---- 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD' => append_sid( $this->this_mxurl() ), 'L_YES' => $lang['Yes'], Index: kb_rate.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_rate.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** kb_rate.php 4 Jul 2006 22:33:32 -0000 1.6 --- kb_rate.php 5 Jul 2006 22:48:26 -0000 1.7 *************** *** 73,78 **** 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD_HOME' => append_sid( this_kb_mxurl() ), ! 'U_FILE_NAME' => append_sid( this_kb_mxurl( 'mode=article&k=' . $article_id ) ), 'FILE_NAME' => $article_data['file_name'], --- 73,78 ---- 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD_HOME' => append_sid( $this->this_mxurl() ), ! 'U_FILE_NAME' => append_sid( $this->this_mxurl( 'mode=article&k=' . $article_id ) ), 'FILE_NAME' => $article_data['file_name'], *************** *** 91,95 **** } ! $mx_kb_user->update_voter_info( $article_id, $rating, $article_data['article_category_id'] ); $rate_info = $mx_kb_functions->get_rating( $article_id ); --- 91,95 ---- } ! $this->update_voter_info( $article_id, $rating, $article_data['article_category_id'] ); $rate_info = $mx_kb_functions->get_rating( $article_id ); *************** *** 97,101 **** $result_msg = str_replace( "{newrating}", $rate_info, $result_msg ); ! $message = $result_msg . '<br /><br />' . sprintf( $lang['Click_return'], "<a href=\"" . append_sid( this_kb_mxurl( "action=link&link_id=$article_id" ) ) . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 97,101 ---- $result_msg = str_replace( "{newrating}", $rate_info, $result_msg ); ! $message = $result_msg . '<br /><br />' . sprintf( $lang['Click_return'], "<a href=\"" . append_sid( $this->this_mxurl( "action=link&link_id=$article_id" ) ) . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 105,109 **** $template->assign_vars( array( ! 'S_RATE_ACTION' => append_sid( this_kb_mxurl( 'mode=rate&k=' . $article_id ) ), 'L_RATE' => $lang['Rate'], 'L_RERROR' => $lang['Rerror'], --- 105,109 ---- $template->assign_vars( array( ! 'S_RATE_ACTION' => append_sid( $this->this_mxurl( 'mode=rate&k=' . $article_id ) ), 'L_RATE' => $lang['Rate'], 'L_RERROR' => $lang['Rerror'], Index: kb_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_cat.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** kb_cat.php 4 Jul 2006 22:33:32 -0000 1.5 --- kb_cat.php 5 Jul 2006 22:48:26 -0000 1.6 *************** *** 62,66 **** if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=". pa_this_mxurl("action=category&cat_id=" . $cat_id, true), true)); } --- 62,66 ---- if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=". $this->this_mxurl("mode=cat&cat=" . $cat_id, true), true)); } *************** *** 71,75 **** if ( !isset( $this->cat_rowset[$category_id] ) ) { ! $message = $lang['Category_not_exsist'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 71,75 ---- if ( !isset( $this->cat_rowset[$category_id] ) ) { ! $message = $lang['Category_not_exsist'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( $this->this_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 111,115 **** { $total_articles = $total['total']; ! $pagination = generate_pagination( this_kb_mxurl( "mode=cat&cat=$category_id" ), $total_articles, $kb_config['pagination'], $start ) . ' '; } --- 111,115 ---- { $total_articles = $total['total']; ! $pagination = generate_pagination( $this->this_mxurl( "mode=cat&cat=$category_id" ), $total_articles, $kb_config['pagination'], $start ) . ' '; } *************** *** 135,139 **** 'L_ARTICLES' => $lang['Articles'], ! 'U_CAT' => append_sid( this_kb_mxurl( 'mode=cat&cat=' . $category_id ) ) ) ); --- 135,139 ---- 'L_ARTICLES' => $lang['Articles'], ! 'U_CAT' => append_sid( $this->this_mxurl( 'mode=cat&cat=' . $category_id ) ) ) ); Index: kb_post_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_post_comment.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** kb_post_comment.php 29 Jun 2006 13:14:20 -0000 1.7 --- kb_post_comment.php 5 Jul 2006 22:48:26 -0000 1.8 *************** *** 70,74 **** if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".this_kb_mxurl("action=post_comment&item_id=" . $item_id), true)); } --- 70,74 ---- if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("action=post_comment&item_id=" . $item_id), true)); } *************** *** 133,137 **** // ! // Instantiate the mx_text class // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); --- 133,137 ---- // ! // Instantiate the mx_text and mx_text_formatting classes // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); *************** *** 139,142 **** --- 139,143 ---- $mx_text->init($html_on, $bbcode_on, $smilies_on); + $mx_text_formatting = new mx_text_formatting(); // // Allow all html tags *************** *** 181,185 **** $this->_kb(); ! $message = $lang['Comment_deleted'] . '<br /><br />' . sprintf( $lang['Click_return_article'], '<a href="' . append_sid( this_kb_mxurl( "mode=article&k=$item_id" ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 182,186 ---- $this->_kb(); ! $message = $lang['Comment_deleted'] . '<br /><br />' . sprintf( $lang['Click_return_article'], '<a href="' . append_sid( $this->this_mxurl( "mode=article&k=$item_id" ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 198,202 **** $this->update_add_comment($article_data, $item_id, $cid, '', '', $html_on, $bbcode_on, $smilies_on); ! $message = $lang['Comment_posted'] . '<br /><br />' . sprintf( $lang['Click_return_article'], '<a href="' . append_sid( this_kb_mxurl( 'mode=article&k=' . $item_id ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 199,203 ---- $this->update_add_comment($article_data, $item_id, $cid, '', '', $html_on, $bbcode_on, $smilies_on); ! $message = $lang['Comment_posted'] . '<br /><br />' . sprintf( $lang['Click_return_article'], '<a href="' . append_sid( $this->this_mxurl( 'mode=article&k=' . $item_id ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 205,212 **** // Main // ======================================================= - // - // Instatiate text tools - // - $mx_kb_text_tools = new mx_kb_text_tools(); // --- 206,209 ---- *************** *** 231,235 **** if (!$kb_config['allow_images'] || !$kb_config['allow_links']) { ! $preview_text = $mx_kb_text_tools->remove_images_links( $preview_text, $kb_config['allow_images'], $kb_config['no_image_message'], $kb_config['allow_links'], $kb_config['no_link_message'] ); } --- 228,232 ---- if (!$kb_config['allow_images'] || !$kb_config['allow_links']) { ! $preview_text = $mx_text_formatting->remove_images_links( $preview_text, $kb_config['allow_images'], $kb_config['no_image_message'], $kb_config['allow_links'], $kb_config['no_link_message'] ); } *************** *** 358,364 **** 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD_HOME' => append_sid( this_kb_mxurl() ), ! 'U_FILE_NAME' => append_sid( this_kb_mxurl( 'mode=article&item_id=' . $item_id ) ), ! 'S_POST_ACTION' => append_sid( this_kb_mxurl() ), 'S_HIDDEN_FORM_FIELDS' => $hidden_form_fields ) ); --- 355,361 ---- 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD_HOME' => append_sid( $this->this_mxurl() ), ! 'U_FILE_NAME' => append_sid( $this->this_mxurl( 'mode=article&item_id=' . $item_id ) ), ! 'S_POST_ACTION' => append_sid( $this->this_mxurl() ), 'S_HIDDEN_FORM_FIELDS' => $hidden_form_fields ) ); |
|
From: Jon O. <jon...@us...> - 2006-07-05 22:48:31
|
Update of /cvsroot/mxbb/mx_kb/kb/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6489/modules/mx_kb/kb/includes Modified Files: functions.php functions_comment.php functions_kb.php Log Message: massive fix Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** functions.php 4 Jul 2006 22:33:31 -0000 1.10 --- functions.php 5 Jul 2006 22:48:26 -0000 1.11 *************** *** 26,30 **** { /** ! * Enter description here... * * @param unknown_type $config_name --- 26,30 ---- { /** ! * This class is used for general kb handling * [...1722 lines suppressed...] ! $mxurl .= '?page=' . $page_id . ( $args == '' ? '' : ( $non_html_amp ? '&' : '&' ) . $args ); ! } ! else ! { ! $mxurl .= ( $args == '' ? '' : '?' . $args ); ! } } - return $mxurl; } ?> \ No newline at end of file --- 806,812 ---- $this->data['item_editor_id'] = $userdata['user_id']; $this->data['item_editor'] = ( $userdata['user_id'] != '-1' ) ? $userdata['username'] : $lang['Guest']; ! $this->temp_url = PORTAL_URL . $mx_kb->this_mxurl("mode=" . "article&k=" . $this->data['item_id'], false, true); } } ?> \ No newline at end of file Index: functions_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions_comment.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** functions_comment.php 25 Jun 2006 21:55:12 -0000 1.7 --- functions_comment.php 5 Jul 2006 22:48:26 -0000 1.8 *************** *** 90,94 **** // ! // This is specific for pafileDB // $this->forum_id = $mx_kb->modules[$mx_kb->module_name]->comments[$this->cat_id]['comments_forum_id']; --- 90,94 ---- // ! // Auth // $this->forum_id = $mx_kb->modules[$mx_kb->module_name]->comments[$this->cat_id]['comments_forum_id']; *************** *** 170,179 **** // ! // Instatiate text tools ! // ! $mx_kb_text_tools = new mx_kb_text_tools(); ! ! // ! // Instantiate the mx_text class // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); --- 170,174 ---- // ! // Instantiate the mx_text and mx_text_formatting classes // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); *************** *** 182,185 **** --- 177,183 ---- $mx_text->allow_all_html_tags = $kb_config['allow_wysiwyg'] ? true : false; + $mx_text_formatting = new mx_text_formatting(); + + $template->assign_block_vars( 'use_comments', array( 'L_COMMENTS' => $lang['Comments'], *************** *** 209,213 **** if (!$kb_config['allow_comment_images'] || !$kb_config['allow_comment_links']) { ! $comments_text = $mx_kb_text_tools->remove_images_links( $comments_text, $kb_config['allow_comment_images'], $kb_config['no_comment_image_message'], $kb_config['allow_comment_links'], $kb_config['no_comment_link_message'] ); } --- 207,211 ---- if (!$kb_config['allow_comment_images'] || !$kb_config['allow_comment_links']) { ! $comments_text = $mx_text_formatting->remove_images_links( $comments_text, $kb_config['allow_comment_images'], $kb_config['no_comment_image_message'], $kb_config['allow_comment_links'], $kb_config['no_comment_link_message'] ); } *************** *** 267,281 **** if ( $kb_config['max_comment_subject_chars'] > 0 ) { ! $comments_title = $mx_kb_text_tools->truncate_text( $comments_title, $kb_config['max_comment_subject_chars'], true ); } if ( $kb_config['max_comment_chars'] > 0 ) { ! $comments_text = $mx_kb_text_tools->truncate_text( $comments_text, $kb_config['max_comment_chars'], true ); } if ( $kb_config['formatting_comment_truncate_links'] || $kb_config['formatting_comment_image_resize'] > 0 || $kb_config['formatting_comment_wordwrap'] ) { ! $comments_text = $mx_kb_text_tools->decode( $comments_text, $kb_config['formatting_comment_truncate_links'], intval($kb_config['formatting_comment_image_resize']), $kb_config['formatting_comment_wordwrap'] ); } --- 265,279 ---- if ( $kb_config['max_comment_subject_chars'] > 0 ) { ! $comments_title = $mx_text_formatting->truncate_text( $comments_title, $kb_config['max_comment_subject_chars'], true ); } if ( $kb_config['max_comment_chars'] > 0 ) { ! $comments_text = $mx_text_formatting->truncate_text( $comments_text, $kb_config['max_comment_chars'], true ); } if ( $kb_config['formatting_comment_truncate_links'] || $kb_config['formatting_comment_image_resize'] > 0 || $kb_config['formatting_comment_wordwrap'] ) { ! $comments_text = $mx_text_formatting->decode( $comments_text, $kb_config['formatting_comment_truncate_links'], intval($kb_config['formatting_comment_image_resize']), $kb_config['formatting_comment_wordwrap'] ); } *************** *** 299,303 **** $template->assign_block_vars( 'use_comments.text.auth_edit', array( 'L_COMMENT_EDIT' => $lang['Comment_edit'], ! 'U_COMMENT_EDIT' => append_sid( this_kb_mxurl( 'mode=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id . '&cid='.$this->comments_row['comments_id'] ) ), 'EDIT_IMG' => $images['kb_icon_edit'], )); --- 297,301 ---- $template->assign_block_vars( 'use_comments.text.auth_edit', array( 'L_COMMENT_EDIT' => $lang['Comment_edit'], ! 'U_COMMENT_EDIT' => append_sid( $mx_kb->this_mxurl( 'mode=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id . '&cid='.$this->comments_row['comments_id'] ) ), 'EDIT_IMG' => $images['kb_icon_edit'], )); *************** *** 308,312 **** $template->assign_block_vars( 'use_comments.text.auth_delete', array( 'L_COMMENT_DELETE' => $lang['Comment_delete'], ! 'U_COMMENT_DELETE' => append_sid( this_kb_mxurl( "mode=post_comment&cid=".$this->comments_row['comments_id']."&delete=do&item_id=".$this->item_id . '&cat_id=' . $this->cat_id )), 'DELETE_IMG' => $images['kb_icon_delpost'], )); --- 306,310 ---- $template->assign_block_vars( 'use_comments.text.auth_delete', array( 'L_COMMENT_DELETE' => $lang['Comment_delete'], ! 'U_COMMENT_DELETE' => append_sid( $mx_kb->this_mxurl( "mode=post_comment&cid=".$this->comments_row['comments_id']."&delete=do&item_id=".$this->item_id . '&cat_id=' . $this->cat_id )), 'DELETE_IMG' => $images['kb_icon_delpost'], )); *************** *** 319,323 **** $template->assign_block_vars( 'use_comments.auth_post', array( 'L_COMMENT_ADD' => $lang['Comment_add'], ! 'U_COMMENT_POST' => append_sid( this_kb_mxurl( 'mode=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id) ), 'REPLY_IMG' => $images['kb_icon_reply'], )); --- 317,321 ---- $template->assign_block_vars( 'use_comments.auth_post', array( 'L_COMMENT_ADD' => $lang['Comment_add'], ! 'U_COMMENT_POST' => append_sid( $mx_kb->this_mxurl( 'mode=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id) ), 'REPLY_IMG' => $images['kb_icon_reply'], )); *************** *** 325,329 **** $num_of_replies = intval( $this->total_comments ); ! $pagination = generate_pagination( this_kb_mxurl( $this->pagination_action . "&" . $this->pagination_target . $this->item_id . $page_num ), $num_of_replies, $this->pagination_num, $this->start ) . ' '; if ($num_of_replies > 0) { --- 323,327 ---- $num_of_replies = intval( $this->total_comments ); ! $pagination = generate_pagination( $mx_kb->this_mxurl( $this->pagination_action . "&" . $this->pagination_target . $this->item_id . $page_num ), $num_of_replies, $this->pagination_num, $this->start ) . ' '; if ($num_of_replies > 0) { *************** *** 344,348 **** function display_phpbb_comments( ) { ! global $template, $mx_kb, $lang, $board_config, $phpEx, $kb_config, $db, $userdata, $images; global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars; --- 342,346 ---- function display_phpbb_comments( ) { ! global $template, $mx_kb, $mx_kb_functions, $lang, $board_config, $phpEx, $kb_config, $db, $userdata, $images; global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars; *************** *** 378,387 **** // ! // Instatiate text tools ! // ! $mx_kb_text_tools = new mx_kb_text_tools(); ! ! // ! // Instantiate the mx_text class // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); --- 376,380 ---- // ! // Instantiate the mx_text and mx_text_formatting classes // include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); *************** *** 390,393 **** --- 383,388 ---- $mx_text->allow_all_html_tags = $kb_config['allow_wysiwyg'] ? true : false; + $mx_text_formatting = new mx_text_formatting(); + $template->assign_block_vars( 'use_comments', array( 'L_COMMENTS' => $lang['Comments'], *************** *** 432,436 **** if (!$kb_config['allow_comment_images'] || !$kb_config['allow_comment_links']) { ! $comments_text = $mx_kb_text_tools->remove_images_links( $comments_text, $kb_config['allow_comment_images'], $kb_config['no_comment_image_message'], $kb_config['allow_comment_links'], $kb_config['no_comment_link_message'] ); } --- 427,431 ---- if (!$kb_config['allow_comment_images'] || !$kb_config['allow_comment_links']) { ! $comments_text = $mx_text_formatting->remove_images_links( $comments_text, $kb_config['allow_comment_images'], $kb_config['no_comment_image_message'], $kb_config['allow_comment_links'], $kb_config['no_comment_link_message'] ); } *************** *** 440,454 **** if ( $kb_config['max_comment_subject_chars'] > 0 ) { ! $comments_title = $mx_kb_text_tools->truncate_text( $comments_title, $kb_config['max_comment_subject_chars'], true ); } if ( $kb_config['max_comment_chars'] > 0 ) { ! $comments_text = $mx_kb_text_tools->truncate_text( $comments_text, $kb_config['max_comment_chars'], true ); } if ( $kb_config['formatting_comment_truncate_links'] || $kb_config['formatting_comment_image_resize'] > 0 || $kb_config['formatting_comment_wordwrap'] ) { ! $comments_text = $mx_kb_text_tools->decode( $comments_text, $kb_config['formatting_comment_truncate_links'], intval($kb_config['formatting_comment_image_resize']), $kb_config['formatting_comment_wordwrap'] ); } --- 435,449 ---- if ( $kb_config['max_comment_subject_chars'] > 0 ) { ! $comments_title = $mx_text_formatting->truncate_text( $comments_title, $kb_config['max_comment_subject_chars'], true ); } if ( $kb_config['max_comment_chars'] > 0 ) { ! $comments_text = $mx_text_formatting->truncate_text( $comments_text, $kb_config['max_comment_chars'], true ); } if ( $kb_config['formatting_comment_truncate_links'] || $kb_config['formatting_comment_image_resize'] > 0 || $kb_config['formatting_comment_wordwrap'] ) { ! $comments_text = $mx_text_formatting->decode( $comments_text, $kb_config['formatting_comment_truncate_links'], intval($kb_config['formatting_comment_image_resize']), $kb_config['formatting_comment_wordwrap'] ); } *************** *** 535,539 **** $template->assign_block_vars( 'use_comments.text.auth_edit', array( 'L_COMMENT_EDIT' => $lang['Comment_edit'], ! 'U_COMMENT_EDIT' => append_sid( this_kb_mxurl( 'mode=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id . '&cid='.$this->comments_row['post_id'] ) ), 'EDIT_IMG' => $images['kb_icon_edit'], )); --- 530,534 ---- $template->assign_block_vars( 'use_comments.text.auth_edit', array( 'L_COMMENT_EDIT' => $lang['Comment_edit'], ! 'U_COMMENT_EDIT' => append_sid( $mx_kb->this_mxurl( 'mode=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id . '&cid='.$this->comments_row['post_id'] ) ), 'EDIT_IMG' => $images['kb_icon_edit'], )); *************** *** 544,548 **** $template->assign_block_vars( 'use_comments.text.auth_delete', array( 'L_COMMENT_DELETE' => $lang['Comment_delete'], ! 'U_COMMENT_DELETE' => append_sid( this_kb_mxurl( "mode=post_comment&cid=".$this->comments_row['post_id']."&delete=do&item_id=".$this->item_id . '&cat_id=' . $this->cat_id )), 'DELETE_IMG' => $images['kb_icon_delpost'], )); --- 539,543 ---- $template->assign_block_vars( 'use_comments.text.auth_delete', array( 'L_COMMENT_DELETE' => $lang['Comment_delete'], ! 'U_COMMENT_DELETE' => append_sid( $mx_kb->this_mxurl( "mode=post_comment&cid=".$this->comments_row['post_id']."&delete=do&item_id=".$this->item_id . '&cat_id=' . $this->cat_id )), 'DELETE_IMG' => $images['kb_icon_delpost'], )); *************** *** 555,559 **** $template->assign_block_vars( 'use_comments.auth_post', array( 'L_COMMENT_ADD' => $lang['Comment_add'], ! 'U_COMMENT_POST' => append_sid( this_kb_mxurl( 'mode=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id ) ), 'REPLY_IMG' => $images['kb_comment_post'], )); --- 550,554 ---- $template->assign_block_vars( 'use_comments.auth_post', array( 'L_COMMENT_ADD' => $lang['Comment_add'], ! 'U_COMMENT_POST' => append_sid( $mx_kb->this_mxurl( 'mode=post_comment&item_id=' . $this->item_id . '&cat_id=' . $this->cat_id ) ), 'REPLY_IMG' => $images['kb_comment_post'], )); *************** *** 561,565 **** $num_of_replies = intval( $this->total_comments ); ! $pagination = generate_pagination( this_kb_mxurl( $this->pagination_action . "&" . $this->pagination_target . $this->item_id . $page_num ), $num_of_replies, $this->pagination_num, $this->start ) . ' '; if ($num_of_replies > 0) --- 556,560 ---- $num_of_replies = intval( $this->total_comments ); ! $pagination = generate_pagination( $mx_kb->this_mxurl( $this->pagination_action . "&" . $this->pagination_target . $this->item_id . $page_num ), $num_of_replies, $this->pagination_num, $this->start ) . ' '; if ($num_of_replies > 0) Index: functions_kb.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions_kb.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** functions_kb.php 4 Jul 2006 22:33:31 -0000 1.12 --- functions_kb.php 5 Jul 2006 22:48:26 -0000 1.13 *************** *** 15,19 **** /** ! * public mx_kb class. * */ --- 15,19 ---- /** ! * Public mx_kb class. * [...1592 lines suppressed...] ! break; ! case 'delete': ! $mx_notification_action = MX_DELETED_NOTIFICATION; ! break; ! } ! $html_entities_match = array('#&(?!(\#[0-9]+;))#', '#<#', '#>#', '#"#'); ! $html_entities_replace = array('&', '<', '>', '"'); ! ! $mx_kb_notification->notify( $mx_notification_mode, $mx_notification_action ); ! ! if ( $this->notification[$cat_id]['notify_group'] > 0 ) ! { ! $mx_kb_notification->notify( $mx_notification_mode, $mx_notification_action, - intval($this->notification[$catId]['notify_group']) ); ! } ! } ! } ! } } } |
Update of /cvsroot/mxbb/mx_kb/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6489/modules/mx_kb/admin Modified Files: admin_kb_art.php admin_kb_auth.php admin_kb_cat.php admin_kb_custom.php admin_kb_settings.php admin_kb_types.php Log Message: massive fix Index: admin_kb_settings.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_settings.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin_kb_settings.php 17 Jun 2006 20:11:23 -0000 1.5 --- admin_kb_settings.php 5 Jul 2006 22:48:25 -0000 1.6 *************** *** 9,12 **** --- 9,14 ---- */ + return; + if ( file_exists( './../viewtopic.php' ) ) { *************** *** 214,217 **** --- 216,222 ---- $stats_list_no = ( !$new['stats_list'] ) ? "checked=\"checked\"" : ""; + $settings_newdays = $new['settings_newdays']; + $cat_col = $new['cat_col']; + // // Instructions *************** *** 429,432 **** --- 434,444 ---- 'S_HEADER_BANNER_NO' => $header_banner_no, + 'CAT_COL' => $cat_col, + 'L_CAT_COL' => $lang['cat_col'], + + 'L_NFDAYS' => $lang['Nfdays'], + 'L_NFDAYSINFO' => $lang['Nfdaysinfo'], + 'SETTINGS_NEWDAYS' => $settings_newdays, + // // Comments Index: admin_kb_art.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_art.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** admin_kb_art.php 17 Jun 2006 20:11:23 -0000 1.31 --- admin_kb_art.php 5 Jul 2006 22:48:25 -0000 1.32 *************** *** 9,12 **** --- 9,14 ---- */ + return; + if ( file_exists( './../viewtopic.php' ) ) { *************** *** 16,20 **** $phpbb_root_path = $module_root_path = $mx_root_path = "./../"; ! require_once( $phpbb_root_path . 'extension.inc' ); if ( !empty( $setmodules ) ) --- 18,22 ---- $phpbb_root_path = $module_root_path = $mx_root_path = "./../"; ! require( $phpbb_root_path . 'extension.inc' ); if ( !empty( $setmodules ) ) *************** *** 32,35 **** --- 34,38 ---- include( $phpbb_root_path . 'kb/kb_common.' . $phpEx ); + } else *************** *** 68,77 **** { include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx ); - include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); // Notification } else { include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); - include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); // Notification } --- 71,78 ---- *************** *** 82,85 **** --- 83,91 ---- // + // Init + // + $mx_kb->init(); + + // // Get vars/mode // *************** *** 139,143 **** // $mx_kb->update_add_article_notify($article_id, 'approve'); - $message = $lang['Article_approved'] . '<br /><br />' . sprintf( $lang['Click_return_article_manager'], '<a href="' . append_sid( "admin_kb_art.$phpEx" ) . "&start=" . $start . '">', '</a>' ) ; mx_message_die( GENERAL_MESSAGE, $message ); --- 145,148 ---- Index: admin_kb_types.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_types.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** admin_kb_types.php 17 Jun 2006 20:11:23 -0000 1.22 --- admin_kb_types.php 5 Jul 2006 22:48:25 -0000 1.23 *************** *** 9,12 **** --- 9,14 ---- */ + return; + if ( file_exists( './../viewtopic.php' ) ) { Index: admin_kb_auth.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_auth.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** admin_kb_auth.php 17 Jun 2006 20:11:23 -0000 1.16 --- admin_kb_auth.php 5 Jul 2006 22:48:25 -0000 1.17 *************** *** 9,12 **** --- 9,14 ---- */ + return; + if ( file_exists( './../viewtopic.php' ) ) { Index: admin_kb_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_cat.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** admin_kb_cat.php 3 Jul 2006 12:24:44 -0000 1.26 --- admin_kb_cat.php 5 Jul 2006 22:48:25 -0000 1.27 *************** *** 9,12 **** --- 9,14 ---- */ + return; + if ( file_exists( './../viewtopic.php' ) ) { Index: admin_kb_custom.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_custom.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** admin_kb_custom.php 17 Jun 2006 20:11:23 -0000 1.16 --- admin_kb_custom.php 5 Jul 2006 22:48:25 -0000 1.17 *************** *** 9,12 **** --- 9,14 ---- */ + return; + if ( file_exists( './../viewtopic.php' ) ) { |
|
From: Jon O. <jon...@us...> - 2006-07-05 22:48:31
|
Update of /cvsroot/mxbb/mx_kb/templates/subSilver/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6489/modules/mx_kb/templates/subSilver/admin Modified Files: kb_config_body.tpl Removed Files: kb_config.tpl Log Message: massive fix --- kb_config.tpl DELETED --- Index: kb_config_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/admin/kb_config_body.tpl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** kb_config_body.tpl 17 Jun 2006 20:11:24 -0000 1.14 --- kb_config_body.tpl 5 Jul 2006 22:48:26 -0000 1.15 *************** *** 109,112 **** --- 109,120 ---- <td class="row2" width="50%">{SORT_ORDER} </td> </tr> + <tr> + <td class="row1"><span class="genmed">{L_CAT_COL}</span></td> + <td class="row2"><input class="post" type="text" maxlength="2" size="5" name="cat_col" value="{CAT_COL}" /></td> + </tr> + <tr> + <td class="row1">{L_NFDAYS}<br><span class="gensmall">{L_NFDAYSINFO}</span></td> + <td class="row2"><input type="text" class="post" size="5" maxlength="5" name="settings_newdays" value="{SETTINGS_NEWDAYS}" /></td> + </tr> <tr> <!-- TITLE ------------------------------------------------------------------------------------------- --> |
|
From: Jon O. <jon...@us...> - 2006-07-05 22:48:31
|
Update of /cvsroot/mxbb/mx_kb/language/lang_english In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6489/modules/mx_kb/language/lang_english Modified Files: lang_admin.php lang_main.php Log Message: massive fix Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/language/lang_english/lang_main.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** lang_main.php 4 Jul 2006 22:33:32 -0000 1.11 --- lang_main.php 5 Jul 2006 22:48:26 -0000 1.12 *************** *** 9,12 **** --- 9,14 ---- */ + $lang['kb_disable'] = 'Knowledge base is disabled.'; + $lang['KB_title'] = 'Knowledge Base'; $lang['Article'] = 'Article'; Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/language/lang_english/lang_admin.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lang_admin.php 17 Jun 2006 20:11:24 -0000 1.4 --- lang_admin.php 5 Jul 2006 22:48:26 -0000 1.5 *************** *** 83,86 **** --- 83,91 ---- $lang['Header_banner_explain'] = 'Show KB logo in the header.'; + $lang['cat_col'] = 'How many column of categories are to be listed'; + + $lang['Nfdays'] = 'New Article Days'; + $lang['Nfdaysinfo'] = 'How many days a new article is to be listed with a \'New Article\' icon. If this is set to 5, then all articles added within the past 5 days will have the \'New Article\' icon'; + // // Comments |
|
From: Jon O. <jon...@us...> - 2006-07-05 22:48:30
|
Update of /cvsroot/mxbb/mx_kb/templates/subSilver In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6489/modules/mx_kb/templates/subSilver Modified Files: kb_comment_posting.tpl kb_header.tpl Log Message: massive fix Index: kb_header.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/kb_header.tpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** kb_header.tpl 27 Jun 2006 18:13:46 -0000 1.9 --- kb_header.tpl 5 Jul 2006 22:48:26 -0000 1.10 *************** *** 26,29 **** --- 26,30 ---- </tr> </table> + <br /> <table width="100%" cellspacing="0" cellpadding="0" border="0"> Index: kb_comment_posting.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/kb_comment_posting.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** kb_comment_posting.tpl 28 Jun 2006 21:43:32 -0000 1.3 --- kb_comment_posting.tpl 5 Jul 2006 22:48:26 -0000 1.4 *************** *** 1,3 **** - <!-- INCLUDE pa_header.tpl --> <script language="JavaScript" type="text/javascript"> <!-- --- 1,2 ---- *************** *** 393,398 **** </table> - <!-- INCLUDE pa_footer.tpl --> - --- 392,395 ---- |
|
From: Jon O. <jon...@us...> - 2006-07-04 22:35:18
|
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/modules In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13662/modules/mx_pafiledb/pafiledb/modules Modified Files: pa_category.php pa_rate.php Log Message: fixes Index: pa_category.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_category.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** pa_category.php 4 Jul 2006 18:02:12 -0000 1.14 --- pa_category.php 4 Jul 2006 22:35:12 -0000 1.15 *************** *** 163,166 **** } } - ?> \ No newline at end of file --- 163,165 ---- Index: pa_rate.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_rate.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** pa_rate.php 17 Jun 2006 20:13:22 -0000 1.14 --- pa_rate.php 4 Jul 2006 22:35:12 -0000 1.15 *************** *** 28,32 **** { global $pafiledb_template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $userdata; ! global $_REQUEST, $_POST, $phpbb_root_path, $pafiledb_user, $pafiledb_functions; global $mx_root_path, $module_root_path, $is_block, $phpEx, $mx_request_vars; --- 28,32 ---- { global $pafiledb_template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $userdata; ! global $phpbb_root_path, $pafiledb_user, $pafiledb_functions; global $mx_root_path, $module_root_path, $is_block, $phpEx, $mx_request_vars; *************** *** 70,109 **** } - $ipaddy = getenv ( "REMOTE_ADDR" ); - - if ( $kb_config['votes_check_ip'] == 1 ) - { - $sql = "SELECT * FROM " . KB_VOTES_TABLE . " WHERE votes_ip = '" . $ipaddy . "' AND votes_file = '" . $article_id . "'"; - if ( !( $result = $db->sql_query( $sql ) ) ) - { - mx_message_die( GENERAL_ERROR, 'Couldnt Query rate ip', '', __LINE__, __FILE__, $sql ); - } - - if ( $db->sql_numrows( $result ) > 0 ) - { - $template->assign_vars( array( "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid( this_kb_mxurl( "action=url&k=" . $article_id ) ) . '">' ) - ); - $message = $lang['Rerror'] . "<br /><br />" . sprintf( $lang['Click_return_rate'], "<a href=\"" . append_sid( this_kb_mxurl( "mode=article&k=$article_id" ) ) . "\">", "</a>" ); - mx_message_die( GENERAL_MESSAGE, $message ); - } - } - - if ( $kb_config['votes_check_userid'] == 1 ) - { - $sql = "SELECT * FROM " . KB_VOTES_TABLE . " WHERE votes_userid = '" . $userdata['user_id'] . "' AND votes_file = '" . $article_id . "'"; - if ( !( $result = $db->sql_query( $sql ) ) ) - { - mx_message_die( GENERAL_ERROR, 'Couldnt Query rate ip', '', __LINE__, __FILE__, $sql ); - } - - if ( $db->sql_numrows( $result ) > 0 ) - { - $template->assign_vars( array( "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid( this_kb_mxurl( "action=url&k=" . $article_id ) ) . '">' ) - ); - $message = $lang['Rerror'] . "<br /><br />" . sprintf( $lang['Click_return_rate'], "<a href=\"" . append_sid( this_kb_mxurl( "mode=article&k=$article_id" ) ) . "\">", "</a>" ); - mx_message_die( GENERAL_MESSAGE, $message ); - } - } - $pafiledb_template->assign_vars( array( 'L_INDEX' => "<<", --- 70,73 ---- *************** *** 135,139 **** $result_msg = str_replace( "{newrating}", $rate_info, $result_msg ); ! $message = $result_msg . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( pa_this_mxurl( 'action=file&file_id=' . $file_id ) ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_forum'], '<a href="' . append_sid( $mx_root_path . 'index.' . $phpEx ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 99,103 ---- $result_msg = str_replace( "{newrating}", $rate_info, $result_msg ); ! $message = $result_msg . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( pa_this_mxurl( 'action=file&file_id=' . $file_id ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } |
|
From: Jon O. <jon...@us...> - 2006-07-04 22:35:17
|
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13662/modules/mx_pafiledb/pafiledb/includes Modified Files: functions.php functions_pafiledb.php Log Message: fixes Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** functions.php 4 Jul 2006 18:02:11 -0000 1.25 --- functions.php 4 Jul 2006 22:35:12 -0000 1.26 *************** *** 797,808 **** function update_voter_info( $file_id, $rating ) { ! global $user_ip, $db, $userdata, $lang; ! $where_sql = ( $userdata['user_id'] != ANONYMOUS ) ? "user_id = '" . $userdata['user_id'] . "'" : "votes_ip = '" . $user_ip . "'"; $sql = "SELECT user_id, votes_ip FROM " . PA_VOTES_TABLE . " WHERE $where_sql - AND votes_file = '" . $file_id . "' LIMIT 1"; --- 797,825 ---- function update_voter_info( $file_id, $rating ) { ! global $db, $userdata, $lang, $pafiledb_config; ! $ipaddy = getenv ( "REMOTE_ADDR" ); ! ! if ($pafiledb_config['votes_check_ip'] && $pafiledb_config['votes_check_userid']) ! { ! $where_sql = ( $userdata['user_id'] != ANONYMOUS ) ? "(user_id = '" . $userdata['user_id'] . "' OR votes_ip = '" . $ipaddy . "')": "votes_ip = '" . $ipaddy . "'"; ! } ! else if($pafiledb_config['votes_check_ip']) ! { ! $where_sql = ( $pafiledb_config['votes_check_ip'] ) ? "votes_ip = '" . $ipaddy . "'" : ''; ! } ! else if($pafiledb_config['votes_check_userid']) ! { ! $where_sql = ( $userdata['user_id'] != ANONYMOUS ) ? "user_id = '" . $userdata['user_id'] . "'" : ''; ! } ! else ! { ! $where_sql = "user_id = '-99'"; ! } ! $where_sql .= !empty($where_sql) ? " AND votes_file = '" . $file_id . "'" : "votes_file = '" . $file_id . "'"; $sql = "SELECT user_id, votes_ip FROM " . PA_VOTES_TABLE . " WHERE $where_sql LIMIT 1"; *************** *** 812,819 **** } if ( !$db->sql_numrows( $result ) ) { ! $sql = "INSERT INTO " . PA_VOTES_TABLE . " (user_id, votes_ip, votes_file, rate_point, voter_os, voter_browser, browser_version) ! VALUES('" . $userdata['user_id'] . "', '" . $user_ip . "', '" . $file_id . "','" . $rating . "', '" . $this->platform . "', '" . $this->agent . "', '" . $this->ver . "')"; if ( !( $db->sql_query( $sql ) ) ) { --- 829,840 ---- } + // + // Has already voted. Should we care? + // if ( !$db->sql_numrows( $result ) ) { ! $sql = "INSERT INTO " . PA_VOTES_TABLE . " (user_id, votes_ip, votes_file, rate_point) ! VALUES('" . $userdata['user_id'] . "', '" . $ipaddy . "', '" . $file_id . "','" . $rating . "')"; ! if ( !( $db->sql_query( $sql ) ) ) { *************** *** 823,827 **** else { ! mx_message_die( GENERAL_MESSAGE, $lang['Rerror'] ); } --- 844,849 ---- else { ! $message = $lang['Rerror'] . "<br /><br />" . sprintf( $lang['Click_return'], "<a href=\"" . append_sid( linkdb_this_mxurl( "action=link&link_id=$file_id" ) ) . "\">", "</a>" ); ! mx_message_die( GENERAL_MESSAGE, $message ); } Index: functions_pafiledb.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions_pafiledb.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** functions_pafiledb.php 4 Jul 2006 18:02:11 -0000 1.32 --- functions_pafiledb.php 4 Jul 2006 22:35:12 -0000 1.33 *************** *** 1115,1121 **** --- 1115,1167 ---- } + switch ( SQL_LAYER ) + { + case 'oracle': + $sql = "SELECT f1.*, f1.file_id, r.votes_file, AVG(r.rate_point) AS rating, COUNT(r.votes_file) AS total_votes, u.user_id, u.username, COUNT(c.comments_id) AS total_comments, cat.cat_allow_ratings, cat.cat_allow_comments + FROM " . PA_FILES_TABLE . " AS f1, " . PA_VOTES_TABLE . " AS r, " . USERS_TABLE . " AS u, " . PA_COMMENTS_TABLE . " AS c, " . PA_CATEGORY_TABLE . " AS cat + WHERE f1.file_id = r.votes_file(+) + AND f1.user_id = u.user_id(+) + AND f1.file_id = c.file_id(+) + AND f1.file_pin = " . FILE_PINNED . " + AND f1.file_approved = 1 + AND f1.file_catid = cat.cat_id + $cat_where + GROUP BY f1.file_id + ORDER BY $sort_method $sort_order"; + break; + + default: + $sql = "SELECT f1.*, f1.file_id, r.votes_file, AVG(r.rate_point) AS rating, COUNT(r.votes_file) AS total_votes, u.user_id, u.username, COUNT(c.comments_id) AS total_comments, cat.cat_allow_ratings, cat.cat_allow_comments + FROM " . PA_FILES_TABLE . " AS f1 + LEFT JOIN " . PA_VOTES_TABLE . " AS r ON f1.file_id = r.votes_file + LEFT JOIN " . USERS_TABLE . " AS u ON f1.user_id = u.user_id + LEFT JOIN " . PA_COMMENTS_TABLE . " AS c ON f1.file_id = c.file_id + LEFT JOIN " . PA_CATEGORY_TABLE . " AS cat ON f1.file_catid = cat.cat_id + WHERE f1.file_pin = " . FILE_PINNED . " + AND f1.file_approved = 1 + $cat_where + GROUP BY f1.file_id + ORDER BY $sort_method $sort_order"; + break; + } + + if ( !( $result = $db->sql_query( $sql ) ) ) + { + mx_message_die( GENERAL_ERROR, 'Couldn\'t get file info for this category', '', __LINE__, __FILE__, $sql ); + } + $file_rowset = array(); $total_file = 0; + while ( $row = $db->sql_fetchrow( $result ) ) + { + if ( $this->auth[$row['file_catid']]['auth_read'] ) + { + $file_rowset[] = $row; + } + } + + $db->sql_freeresult( $result ); + switch ( SQL_LAYER ) { *************** *** 1350,1353 **** --- 1396,1448 ---- { case 'oracle': + $sql = "SELECT f1.*, f1.file_id, r.votes_file, AVG(r.rate_point) AS rating, COUNT(r.votes_file) AS total_votes, u.user_id, u.username, COUNT(c.comments_id) AS total_comments, cat.cat_allow_ratings, cat.cat_allow_comments + FROM " . PA_FILES_TABLE . " AS f1, " . PA_VOTES_TABLE . " AS r, " . USERS_TABLE . " AS u, " . PA_COMMENTS_TABLE . " AS c, " . PA_CATEGORY_TABLE . " AS cat + WHERE f1.file_id = r.votes_file(+) + AND f1.user_id = u.user_id(+) + AND f1.file_id = c.file_id(+) + AND f1.file_pin = " . FILE_PINNED . " + AND f1.file_approved = 1 + AND f1.file_catid = cat.cat_id + $cat_where + GROUP BY f1.file_id + ORDER BY $sort_method $sort_order"; + break; + + default: + $sql = "SELECT f1.*, f1.file_id, r.votes_file, AVG(r.rate_point) AS rating, COUNT(r.votes_file) AS total_votes, u.user_id, u.username, COUNT(c.comments_id) AS total_comments, cat.cat_allow_ratings, cat.cat_allow_comments + FROM " . PA_FILES_TABLE . " AS f1 + LEFT JOIN " . PA_VOTES_TABLE . " AS r ON f1.file_id = r.votes_file + LEFT JOIN " . USERS_TABLE . " AS u ON f1.user_id = u.user_id + LEFT JOIN " . PA_COMMENTS_TABLE . " AS c ON f1.file_id = c.file_id + LEFT JOIN " . PA_CATEGORY_TABLE . " AS cat ON f1.file_catid = cat.cat_id + WHERE f1.file_pin = " . FILE_PINNED . " + AND f1.file_approved = 1 + $cat_where + GROUP BY f1.file_id + ORDER BY $sort_method $sort_order"; + break; + } + + if ( !( $result = $db->sql_query( $sql ) ) ) + { + mx_message_die( GENERAL_ERROR, 'Couldn\'t get file info for this category', '', __LINE__, __FILE__, $sql ); + } + + $file_rowset = array(); + $total_file = 0; + + while ( $row = $db->sql_fetchrow( $result ) ) + { + if ( $this->auth[$row['file_catid']]['auth_read'] ) + { + $file_rowset[] = $row; + } + } + + $db->sql_freeresult( $result ); + + switch ( SQL_LAYER ) + { + case 'oracle': $sql = "SELECT f1.*, f1.file_id, r.votes_file, AVG(r.rate_point) AS rating, COUNT(r.votes_file) AS total_votes, u.user_id, u.username, COUNT(c.comments_id) AS total_comments FROM " . PA_FILES_TABLE . " AS f1, " . PA_VOTES_TABLE . " AS r, " . USERS_TABLE . " AS u, " . PA_COMMENTS_TABLE . " AS c |
|
From: Jon O. <jon...@us...> - 2006-07-04 22:34:41
|
Update of /cvsroot/mxbb/mx_linkdb/language/lang_english In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13289/modules/mx_linkdb/language/lang_english Modified Files: lang_main.php Log Message: working... Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/language/lang_english/lang_main.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lang_main.php 30 Jun 2006 19:54:14 -0000 1.3 --- lang_main.php 4 Jul 2006 22:34:37 -0000 1.4 *************** *** 22,25 **** --- 22,27 ---- $lang['Link_us_syntax'] = '<a href="%s" target="_blank"><img src="%s" width="%d" height="%d" border="0" alt="%s" /></a>'; + $lang['Click_return'] = 'Click %sHere%s to return to the previous page'; + // // Sort |
|
From: Jon O. <jon...@us...> - 2006-07-04 22:34:40
|
Update of /cvsroot/mxbb/mx_linkdb/linkdb/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13289/modules/mx_linkdb/linkdb/includes Modified Files: functions.php Log Message: working... Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/includes/functions.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** functions.php 4 Jul 2006 18:00:33 -0000 1.10 --- functions.php 4 Jul 2006 22:34:37 -0000 1.11 *************** *** 51,55 **** FROM " . LINK_CONFIG_TABLE; ! if ( !( $result = $db->sql_query( $sql, 300 ) ) ) { mx_message_die( GENERAL_ERROR, 'Couldnt query linkdb configuration', '', __LINE__, __FILE__, $sql ); --- 51,55 ---- FROM " . LINK_CONFIG_TABLE; ! if ( !( $result = $db->sql_query( $sql ) ) ) { mx_message_die( GENERAL_ERROR, 'Couldnt query linkdb configuration', '', __LINE__, __FILE__, $sql ); *************** *** 96,133 **** return ( $link_rating != 0 ) ? round( $link_rating, 2 ) . ' / 10' : $lang['Not_rated']; } - - function update_voter_info( $link_id, $rating ) - { - global $user_ip, $db, $userdata, $lang; - - $where_sql = ( $userdata['user_id'] != ANONYMOUS ) ? "user_id = '" . $userdata['user_id'] . "'" : "votes_ip = '" . $user_ip . "'"; - - $sql = "SELECT user_id, votes_ip - FROM " . LINK_VOTES_TABLE . " - WHERE $where_sql - AND votes_link = '" . $link_id . "' - LIMIT 1"; - - if ( !( $result = $db->sql_query( $sql ) ) ) - { - mx_message_die( GENERAL_ERROR, 'Couldnt Query User id', '', __LINE__, __FILE__, $sql ); - } - - if ( !$db->sql_numrows( $result ) ) - { - $sql = "INSERT INTO " . LINK_VOTES_TABLE . " (user_id, votes_ip, votes_link, rate_point) - VALUES('" . $userdata['user_id'] . "', '" . $user_ip . "', '" . $link_id . "','" . $rating . "')"; - if ( !( $db->sql_query( $sql ) ) ) - { - mx_message_die( GENERAL_ERROR, 'Couldnt Update Votes Table Info', '', __LINE__, __FILE__, $sql ); - } - } - else - { - mx_message_die( GENERAL_MESSAGE, $lang['Rerror'] ); - } - - $db->sql_freeresult( $result ); - } } --- 96,99 ---- *************** *** 291,307 **** * Enter description here... * ! * @param unknown_type $file_id * @param unknown_type $rating */ ! function update_voter_info( $file_id, $rating ) { ! global $user_ip, $db, $userdata, $lang; ! $where_sql = ( $userdata['user_id'] != ANONYMOUS ) ? "user_id = '" . $userdata['user_id'] . "'" : "votes_ip = '" . $user_ip . "'"; $sql = "SELECT user_id, votes_ip ! FROM " . PA_VOTES_TABLE . " WHERE $where_sql - AND votes_file = '" . $file_id . "' LIMIT 1"; --- 257,290 ---- * Enter description here... * ! * @param unknown_type $link_id * @param unknown_type $rating */ ! function update_voter_info( $link_id, $rating, $cat_id = 0 ) { ! global $db, $userdata, $lang, $linkdb_config; ! $ipaddy = getenv ( "REMOTE_ADDR" ); ! ! if ($linkdb_config['votes_check_ip'] && $linkdb_config['votes_check_userid']) ! { ! $where_sql = ( $userdata['user_id'] != ANONYMOUS ) ? "(user_id = '" . $userdata['user_id'] . "' OR votes_ip = '" . $ipaddy . "')": "votes_ip = '" . $ipaddy . "'"; ! } ! else if($linkdb_config['votes_check_ip']) ! { ! $where_sql = ( $linkdb_config['votes_check_ip'] ) ? "votes_ip = '" . $ipaddy . "'" : ''; ! } ! else if($linkdb_config['votes_check_userid']) ! { ! $where_sql = ( $userdata['user_id'] != ANONYMOUS ) ? "user_id = '" . $userdata['user_id'] . "'" : ''; ! } ! else ! { ! $where_sql = "user_id = '-99'"; ! } ! $where_sql .= !empty($where_sql) ? " AND votes_link = '" . $link_id . "'" : "votes_link = '" . $link_id . "'"; $sql = "SELECT user_id, votes_ip ! FROM " . LINK_VOTES_TABLE . " WHERE $where_sql LIMIT 1"; *************** *** 311,318 **** } if ( !$db->sql_numrows( $result ) ) { ! $sql = "INSERT INTO " . PA_VOTES_TABLE . " (user_id, votes_ip, votes_file, rate_point, voter_os, voter_browser, browser_version) ! VALUES('" . $userdata['user_id'] . "', '" . $user_ip . "', '" . $file_id . "','" . $rating . "', '" . $this->platform . "', '" . $this->agent . "', '" . $this->ver . "')"; if ( !( $db->sql_query( $sql ) ) ) { --- 294,305 ---- } + // + // Has already voted. Should we care? + // if ( !$db->sql_numrows( $result ) ) { ! $sql = "INSERT INTO " . LINK_VOTES_TABLE . " (user_id, votes_ip, votes_link, rate_point) ! VALUES('" . $userdata['user_id'] . "', '" . $ipaddy . "', '" . $link_id . "','" . $rating . "')"; ! if ( !( $db->sql_query( $sql ) ) ) { *************** *** 322,326 **** else { ! mx_message_die( GENERAL_MESSAGE, $lang['Rerror'] ); } --- 309,314 ---- else { ! $message = $lang['Rerror'] . "<br /><br />" . sprintf( $lang['Click_return'], "<a href=\"" . ( !empty($cat_id) ? append_sid( linkdb_this_mxurl( "action=category&cat_id=$cat_id" ) ) : append_sid( linkdb_this_mxurl( "action=link&link_id=$link_id" ) ) ) . "\">", "</a>" ); ! mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 1425,1485 **** $template->pparse( 'linkdb_header' ); - - /* - $mx_kb->debug('kb_page_header', basename( __FILE__ )); - - $template->set_filenames( array( 'kb_header' => 'kb_header.tpl' ) ); - - if ( isset ( $HTTP_GET_VARS['cat'] ) ) - { - $category_id = intval ($HTTP_GET_VARS['cat'] ); - - if ( $mx_kb->modules[$mx_kb->module_name]->auth_user[$category_id]['auth_post'] || $mx_kb->modules[$mx_kb->module_name]->auth_user[$category_id]['auth_mod'] ) - { - $temp_url = append_sid( this_kb_mxurl( "mode=add&cat=" . $category_id ) ); - $add_article = '<a href="' . $temp_url . '">' . $lang['Add_article'] . '</a>'; - } - } - else - { - $add_article = $lang['Click_cat_to_add']; - } - - $template->assign_block_vars( 'switch_add_article', array() ); - - $temp_url = append_sid( this_kb_mxurl( "mode=search" ) ); - $search = '<a href="' . $temp_url . '">' . $lang['Search'] . '</a>'; - - if ( $kb_config['header_banner'] == 1 ) - { - $temp_url = append_sid( this_kb_mxurl() ); - $block_title = '<td align="center" class="row1"><a href="' . $temp_url . '"><img src="' . $images['kb_title'] . '" width="285" height="45" border="0" alt="' . $title . '"></a></td>'; - } - else - { - $block_title = MXBB_MODULE ? '' : '<td align="center"><b>' . $lang['KB_title'] . '</b></td>'; - } - - $template->assign_vars( array( - 'L_KB_TITLE' => $block_title, - 'L_ADD_ARTICLE' => $add_article, - 'L_SEARCH_MODULE' => $search, - 'SPACER_IMG' => $images['mx_spacer'], - - 'U_TOPRATED' => append_sid( this_kb_mxurl( "mode=stats&stats=toprated" ) ), - 'L_TOPRATED' => $lang['Top_toprated'], - 'U_MOST_POPULAR' => append_sid( this_kb_mxurl( "mode=stats&stats=mostpopular" ) ), - 'L_MOST_POPULAR' => $lang['Top_most_popular'], - 'U_LATEST' => append_sid( this_kb_mxurl( "mode=stats&stats=latest" ) ), - 'L_LATEST' => $lang['Top_latest'] - )); - - if ( $kb_config['stats_list'] == 1 ) - { - $mx_kb->get_quick_stats( $category_id ); - } - - $template->pparse( 'kb_header' ); - */ } --- 1413,1416 ---- *************** *** 1499,1530 **** $template->set_filenames( array( 'link_footer' => "link_footer.tpl" ) ); - /* - if ( !empty($mx_kb->modules[$mx_kb->module_name]->auth_can_list) ) - { - $template->assign_block_vars( 'auth_can_list', array() ); - } - - if ( !empty($mx_kb->modules[$mx_kb->module_name]->jumpbox) ) - { - $template->assign_block_vars( 'jumpbox', array() ); - } - - if ( !MXBB_MODULE || MXBB_27x ) - { - $template->assign_block_vars( 'copy_footer', array() ); - } - */ - - // $s_hidden_vars = '<input type="hidden" name="action" value="category"><input type="hidden" name="page" value="' . $page_id . '">'; - - /* - // - // Generate debug message - // - $debug_message_top = $mx_kb->display_debug(); - $debug_message_module = $mx_kb->modules[$mx_kb->module_name]->display_debug(); - $debug_message = $debug_message_top . '<br><br>' . $debug_message_module; - */ - $template->assign_vars( array( 'L_JUMP' => $lang['Jump'], --- 1430,1433 ---- *************** *** 1550,1606 **** $linkdb_cache->unload(); - - /* - $mx_kb->debug('kb_page_footer', basename( __FILE__ )); - - $template->set_filenames( array( 'kb_footer' => 'kb_footer.tpl' ) ); - - if ( !empty($mx_kb->modules[$mx_kb->module_name]->auth_can_list) ) - { - $template->assign_block_vars( 'auth_can_list', array() ); - } - - if ( !empty($mx_kb->modules[$mx_kb->module_name]->jumpbox) ) - { - $template->assign_block_vars( 'jumpbox', array() ); - } - - if ( !MXBB_MODULE || MXBB_27x ) - { - $template->assign_block_vars( 'copy_footer', array() ); - } - - $s_hidden_vars = '<input type="hidden" name="mode" value="cat"><input type="hidden" name="page" value="' . $page_id . '">'; - - // - // Generate debug message - // - $debug_message_top = $mx_kb->display_debug(); - $debug_message_module = $mx_kb->modules[$mx_kb->module_name]->display_debug(); - $debug_message = $debug_message_top . '<br><br>' . $debug_message_module; - - $template->assign_vars( array( - 'QUICK_JUMP_ACTION' => this_kb_mxurl(), - 'S_HIDDEN_VARS' => $s_hidden_vars, - - 'L_QUICK_GO' => $lang['Quick_go'], - 'L_QUICK_NAV' => $lang['Quick_nav'], - 'L_QUICK_JUMP' => $lang['Quick_jump'], - 'QUICK_NAV' => $mx_kb->modules[$mx_kb->module_name]->jumpbox, - - 'S_AUTH_LIST' => $mx_kb->modules[$mx_kb->module_name]->auth_can_list, - - 'L_MODULE_VERSION' => $kb_module_version, - 'L_MODULE_ORIG_AUTHOR' => $kb_module_orig_author, - 'L_MODULE_AUTHOR' => $kb_module_author, - 'DEBUG' => !empty($debug_message) && $mx_kb->debug ? '<div style="overflow:auto; height:100px;"><span class="gensmall">' . $debug_message . '<br/> -::-</span></div>': '', - )); - - $template->pparse( 'kb_footer' ); - - $mx_kb->modules[$mx_kb->module_name]->_kb(); - - $mx_kb_cache->unload(); - */ } --- 1453,1456 ---- |
|
From: Jon O. <jon...@us...> - 2006-07-04 22:34:40
|
Update of /cvsroot/mxbb/mx_linkdb/linkdb/modules In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13289/modules/mx_linkdb/linkdb/modules Modified Files: link_rate.php Log Message: working... Index: link_rate.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_rate.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** link_rate.php 4 Jul 2006 18:09:40 -0000 1.10 --- link_rate.php 4 Jul 2006 22:34:37 -0000 1.11 *************** *** 28,38 **** { global $template, $lang, $board_config, $phpEx, $linkdb_config, $db, $userdata; ! global $_REQUEST, $_POST, $phpbb_root_path, $linkdb_functions; ! if ( isset( $_REQUEST['link_id'] ) ) ! { ! $link_id = intval( $_REQUEST['link_id'] ); ! } ! else { mx_message_die( GENERAL_MESSAGE, $lang['Link_not_exist'] ); --- 28,40 ---- { global $template, $lang, $board_config, $phpEx, $linkdb_config, $db, $userdata; ! global $phpbb_root_path, $linkdb_user, $linkdb_functions; ! global $mx_root_path, $module_root_path, $is_block, $phpEx, $mx_request_vars; ! // ======================================================= ! // Request vars ! // ======================================================= ! $link_id = $mx_request_vars->request('link_id', MX_TYPE_INT, ''); ! ! if ( empty( $link_id ) ) { mx_message_die( GENERAL_MESSAGE, $lang['Link_not_exist'] ); *************** *** 61,75 **** if ( !$this->auth_user[$link_data['link_catid']]['auth_rate'] ) { mx_message_die( GENERAL_MESSAGE, $lang['Not_allow_vote'] ); } - if ( !$userdata['session_logged_in'] ) - { - // $redirect = linkdb_this_mxurl("action=rate&link_id=$link_id"); - // redirect(append_sid("login.$phpEx?redirect=" . $redirect, true)); - mx_message_die( GENERAL_MESSAGE, 'not logged in' ); - } - - $this->generate_navigation( $link_data['link_catid'] ); $template->assign_vars( array( 'L_INDEX' => sprintf( $lang['Forum_Index'], $board_config['sitename'] ), --- 63,75 ---- if ( !$this->auth_user[$link_data['link_catid']]['auth_rate'] ) { + if ( !$userdata['session_logged_in'] ) + { + // $redirect = linkdb_this_mxurl("action=rate&link_id=$link_id"); + // redirect(append_sid("login.$phpEx?redirect=" . $redirect, true)); + mx_message_die( GENERAL_MESSAGE, 'not logged in' ); + } mx_message_die( GENERAL_MESSAGE, $lang['Not_allow_vote'] ); } $template->assign_vars( array( 'L_INDEX' => sprintf( $lang['Forum_Index'], $board_config['sitename'] ), *************** *** 100,104 **** } ! $linkdb_functions->update_voter_info( $link_id, $rating ); $rate_info = $linkdb_functions->get_rating( $link_id ); --- 100,104 ---- } ! $linkdb_user->update_voter_info( $link_id, $rating, $link_data['link_catid'] ); $rate_info = $linkdb_functions->get_rating( $link_id ); *************** *** 106,110 **** $result_msg = str_replace( "{newrating}", $rate_info, $result_msg ); ! $message = $result_msg . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( linkdb_this_mxurl( 'action=rate&link_id=' . $link_id ) ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_forum'], '<a href="' . append_sid( 'index.' . $phpEx ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 106,111 ---- $result_msg = str_replace( "{newrating}", $rate_info, $result_msg ); ! $cat_id = $link_data['link_catid']; ! $message = $result_msg . '<br /><br />' . sprintf( $lang['Click_return'], "<a href=\"" . ( !empty($cat_id) ? append_sid( linkdb_this_mxurl( "action=category&cat_id=$cat_id" ) ) : append_sid( linkdb_this_mxurl( "action=link&link_id=$link_id" ) ) ) . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 131,134 **** --- 132,140 ---- ); } + + // =================================================== + // assign var for navigation + // =================================================== + $this->generate_navigation( $link_data['link_catid'] ); $this->display( $lang['Links_Title'], 'link_rate_body.tpl' ); } |
|
From: Jon O. <jon...@us...> - 2006-07-04 22:34:07
|
Update of /cvsroot/mxbb/mx_kb/kb/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12783/modules/mx_kb/kb/includes Modified Files: functions.php functions_kb.php Log Message: lots of optimizations Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** functions.php 1 Jul 2006 21:30:30 -0000 1.9 --- functions.php 4 Jul 2006 22:33:31 -0000 1.10 *************** *** 202,205 **** --- 202,248 ---- } } + + /** + * Enter description here... + * + * @param unknown_type $link_id + * @param unknown_type $link_rating + * @return unknown + */ + function get_rating( $article_id, $article_rating = '' ) + { + global $db, $lang; + + $sql = "SELECT AVG(rate_point) AS rating + FROM " . KB_VOTES_TABLE . " + WHERE votes_article = '" . $article_id . "'"; + + if ( !( $result = $db->sql_query( $sql ) ) ) + { + mx_message_die( GENERAL_ERROR, 'Couldnt rating info for the giving article', '', __LINE__, __FILE__, $sql ); + } + + $row = $db->sql_fetchrow( $result ); + $db->sql_freeresult( $result ); + $link_rating = $row['rating']; + + return ( $link_rating != 0 ) ? round( $link_rating, 2 ) . ' / 10' : $lang['Not_rated']; + } + + /** + * Enter description here... + * + * @param unknown_type $query + * @param unknown_type $total + * @param unknown_type $offset + * @return unknown + */ + function sql_query_limit( $query, $total, $offset = 0, $sql_cache = false ) + { + global $db; + + $query .= ' LIMIT ' . ( ( !empty( $offset ) ) ? $offset . ', ' . $total : $total ); + return $sql_cache ? $db->sql_query( $query, $sql_cache ) : $db->sql_query( $query ); + } } *************** *** 369,387 **** * Enter description here... * ! * @param unknown_type $file_id * @param unknown_type $rating */ ! function update_voter_info( $file_id, $rating ) { ! global $user_ip, $db, $userdata, $lang, $mx_kb; ! $mx_kb->debug('user_info->update_voter_info', basename( __FILE__ )); ! $where_sql = ( $userdata['user_id'] != ANONYMOUS ) ? "user_id = '" . $userdata['user_id'] . "'" : "votes_ip = '" . $user_ip . "'"; $sql = "SELECT user_id, votes_ip ! FROM " . PA_VOTES_TABLE . " WHERE $where_sql - AND votes_file = '" . $file_id . "' LIMIT 1"; --- 412,445 ---- * Enter description here... * ! * @param unknown_type $article_id * @param unknown_type $rating */ ! function update_voter_info( $article_id, $rating ) { ! global $db, $userdata, $lang, $kb_config; ! $ipaddy = getenv ( "REMOTE_ADDR" ); ! if ($kb_config['votes_check_ip'] && $kb_config['votes_check_userid']) ! { ! $where_sql = ( $userdata['user_id'] != ANONYMOUS ) ? "(user_id = '" . $userdata['user_id'] . "' OR votes_ip = '" . $ipaddy . "')": "votes_ip = '" . $ipaddy . "'"; ! } ! else if($kb_config['votes_check_ip']) ! { ! $where_sql = ( $kb_config['votes_check_ip'] ) ? "votes_ip = '" . $ipaddy . "'" : ''; ! } ! else if($kb_config['votes_check_userid']) ! { ! $where_sql = ( $userdata['user_id'] != ANONYMOUS ) ? "user_id = '" . $userdata['user_id'] . "'" : ''; ! } ! else ! { ! $where_sql = "user_id = '-99'"; ! } ! $where_sql .= !empty($where_sql) ? " AND votes_article = '" . $article_id . "'" : "votes_article = '" . $article_id . "'"; $sql = "SELECT user_id, votes_ip ! FROM " . KB_VOTES_TABLE . " WHERE $where_sql LIMIT 1"; *************** *** 391,398 **** } if ( !$db->sql_numrows( $result ) ) { ! $sql = "INSERT INTO " . PA_VOTES_TABLE . " (user_id, votes_ip, votes_file, rate_point, voter_os, voter_browser, browser_version) ! VALUES('" . $userdata['user_id'] . "', '" . $user_ip . "', '" . $file_id . "','" . $rating . "', '" . $this->platform . "', '" . $this->agent . "', '" . $this->ver . "')"; if ( !( $db->sql_query( $sql ) ) ) { --- 449,460 ---- } + // + // Has already voted. Should we care? + // if ( !$db->sql_numrows( $result ) ) { ! $sql = "INSERT INTO " . KB_VOTES_TABLE . " (user_id, votes_ip, votes_article, rate_point) ! VALUES('" . $userdata['user_id'] . "', '" . $ipaddy . "', '" . $article_id . "','" . $rating . "')"; ! if ( !( $db->sql_query( $sql ) ) ) { *************** *** 402,406 **** else { ! mx_message_die( GENERAL_MESSAGE, $lang['Rerror'] ); } --- 464,469 ---- else { ! $message = $lang['Rerror'] . "<br /><br />" . sprintf( $lang['Click_return'], "<a href=\"" . append_sid( linkdb_this_mxurl( "action=link&link_id=$article_id" ) ) . "\">", "</a>" ); ! mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 888,894 **** { case 'oracle': ! $sql = "SELECT a.*, a.article_rating AS rating, a.article_totalvotes AS total_votes, u.user_id, u.username, c.category_id, c.category_name, COUNT(cm.comments_id) AS total_comments FROM " . KB_ARTICLES_TABLE . " AS a, " . KB_VOTES_TABLE . " AS r, " . USERS_TABLE . " AS u, " . KB_CATEGORIES_TABLE . " AS c, " . KB_COMMENTS_TABLE . " AS cm ! WHERE a.article_id = r.votes_file(+) AND a.article_author_id = u.user_id(+) AND a.article_id = cm.article_id(+) --- 951,957 ---- { case 'oracle': ! $sql = "SELECT a.*, AVG(r.rate_point) AS rating, COUNT(r.votes_article) AS total_votes, u.user_id, u.username, c.category_id, c.category_name, COUNT(cm.comments_id) AS total_comments FROM " . KB_ARTICLES_TABLE . " AS a, " . KB_VOTES_TABLE . " AS r, " . USERS_TABLE . " AS u, " . KB_CATEGORIES_TABLE . " AS c, " . KB_COMMENTS_TABLE . " AS cm ! WHERE a.article_id = r.votes_article(+) AND a.article_author_id = u.user_id(+) AND a.article_id = cm.article_id(+) *************** *** 899,905 **** default: ! $sql = "SELECT a.*, a.article_rating AS rating, a.article_totalvotes AS total_votes, u.user_id, u.username, c.category_id, c.category_name, COUNT(cm.comments_id) AS total_comments FROM " . KB_ARTICLES_TABLE . " AS a, " . KB_CATEGORIES_TABLE . " AS c ! LEFT JOIN " . KB_VOTES_TABLE . " AS r ON a.article_id = r.votes_file LEFT JOIN " . USERS_TABLE . " AS u ON a.article_author_id = u.user_id LEFT JOIN " . KB_COMMENTS_TABLE . " AS cm ON a.article_id = cm.article_id --- 962,968 ---- default: ! $sql = "SELECT a.*, AVG(r.rate_point) AS rating, COUNT(r.votes_article) AS total_votes, u.user_id, u.username, c.category_id, c.category_name, COUNT(cm.comments_id) AS total_comments FROM " . KB_ARTICLES_TABLE . " AS a, " . KB_CATEGORIES_TABLE . " AS c ! LEFT JOIN " . KB_VOTES_TABLE . " AS r ON a.article_id = r.votes_article LEFT JOIN " . USERS_TABLE . " AS u ON a.article_author_id = u.user_id LEFT JOIN " . KB_COMMENTS_TABLE . " AS cm ON a.article_id = cm.article_id Index: functions_kb.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions_kb.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** functions_kb.php 3 Jul 2006 20:12:06 -0000 1.11 --- functions_kb.php 4 Jul 2006 22:33:31 -0000 1.12 *************** *** 685,755 **** /** ! * Get all category articles. * - * @param unknown_type $id - * @param unknown_type $approve - * @param unknown_type $block_name * @param unknown_type $start ! * @param unknown_type $articles_in_cat ! * @return unknown */ ! function display_articles( $id = false, $approve, $block_name, $start = -1, $articles_in_cat = 0 ) { ! global $db, $template, $images, $phpEx, $module_root_path, $phpbb_root_path, $mx_root_path, $board_config, $lang, $is_block, $page_id, $is_admin, $userdata; ! global $kb_config; ! ! $this->debug('mx_kb->display_articles', basename( __FILE__ )); ! $sql = "SELECT t.*, u.user_id, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_allowsmile ! FROM " . KB_ARTICLES_TABLE . " t, " . USERS_TABLE . " u ! WHERE "; ! if ( $id ) { ! $sql .= " t.article_category_id = " . $id . " AND"; } ! $sql .= " u.user_id = t.article_author_id"; ! ! if ( !$this->auth_user[$id]['auth_mod'] ) { ! $sql .= " AND t.approved = " . $approve; } if ( defined( 'IN_ADMIN' ) ) { ! $sql .= " ORDER BY t.article_id"; } else { ! $sql .= " ORDER BY " . $this->sort_method_extra . $this->sort_method . " " . $this->sort_order; } ! if ( $start > -1 && $articles_in_cat > 0 ) { ! $sql .= " LIMIT $start, $articles_in_cat"; } ! if ( !( $article_result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Could not obtain article data", '', __LINE__, __FILE__, $sql ); } ! $i = 0; ! while ( $article = $db->sql_fetchrow( $article_result ) ) { ! $i++; ! $article_description = $article['article_description'] ; ! $article_cat = $article['article_category_id']; ! $article_approved = $article['approved']; // type ! $type_id = $article['article_type']; $article_type = $this->get_kb_type( $type_id ); ! $article_date = create_date( $board_config['default_dateformat'], $article['article_date'], $board_config['board_timezone'] ); // author information ! $author_id = $article['article_author_id']; if ( $author_id == -1 ) { ! $author = ( $article['username'] == '' ) ? $lang['Guest'] : $article['username']; } else --- 685,835 ---- /** ! * Enter description here... * * @param unknown_type $start ! * @param unknown_type $cat_id */ ! function display_articles( $start, $cat_id = false, $block_name = 'articlerow', $approve = '1' ) { ! global $db, $kb_config, $template, $board_config; ! global $images, $lang, $phpEx, $mx_kb_functions; ! global $phpbb_root_path, $mx_root_path, $module_root_path, $is_block, $phpEx; ! $filelist = false; ! $approved_sql = ''; ! if ( empty( $cat_id ) ) { ! $approved_sql = " t.approved = '1'"; ! $cat_where = ''; } ! else { ! if ( !$this->auth_user[$cat_id]['auth_mod'] ) ! { ! $approved_sql = " t.approved = " . $approve; ! } ! $cat_where = !empty($approved_sql) ? "AND t.article_category_id = $cat_id" : " t.article_category_id = $cat_id"; } + $order_sql = ''; if ( defined( 'IN_ADMIN' ) ) { ! $order_sql = " ORDER BY t.article_id"; } else { ! $order_sql = " ORDER BY " . $this->sort_method_extra . $this->sort_method . " " . $this->sort_order; } ! ! switch ( SQL_LAYER ) { ! case 'oracle': ! $sql = "SELECT t.*, t.article_id, r.votes_article, AVG(r.rate_point) AS rating, COUNT(r.votes_article) AS total_votes, u.user_id, u.username, COUNT(c.comments_id) AS total_comments, cat.cat_allow_ratings, cat.cat_allow_comments ! FROM " . KB_ARTICLES_TABLE . " AS t, " . KB_VOTES_TABLE . " AS r, " . USERS_TABLE . " AS u, " . KB_COMMENTS_TABLE . " AS c, " . KB_CATEGORIES_TABLE . " AS cat ! WHERE t.article_id = r.votes_article(+) ! AND t.article_author_id = u.user_id(+) ! AND t.article_id = c.article_id(+) ! $approved_sql ! AND t.article_category_id = cat.category_id ! $cat_where ! GROUP BY t.article_id ! $order_sql"; ! break; ! ! default: ! $sql = "SELECT t.*, t.article_id, r.votes_article, AVG(r.rate_point) AS rating, COUNT(r.votes_article) AS total_votes, u.user_id, u.username, COUNT(c.comments_id) AS total_comments, cat.cat_allow_ratings, cat.cat_allow_comments ! FROM " . KB_ARTICLES_TABLE . " AS t ! LEFT JOIN " . KB_VOTES_TABLE . " AS r ON t.article_id = r.votes_article ! LEFT JOIN " . USERS_TABLE . " AS u ON t.article_author_id = u.user_id ! LEFT JOIN " . KB_COMMENTS_TABLE . " AS c ON t.article_id = c.article_id ! LEFT JOIN " . KB_CATEGORIES_TABLE . " AS cat ON t.article_category_id = cat.category_id ! WHERE $approved_sql ! $cat_where ! GROUP BY t.article_id ! $order_sql"; ! break; } ! if ( !( $result = $mx_kb_functions->sql_query_limit( $sql, $kb_config['pagination'], $start ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldn\'t get file info for this category', '', __LINE__, __FILE__, $sql ); } ! $file_rowset = array(); ! $total_file = 0; ! while ( $row = $db->sql_fetchrow( $result ) ) { ! if ( $this->auth_user[$row['article_category_id']]['auth_view'] ) ! { ! $file_rowset[] = $row; ! } ! } ! ! $db->sql_freeresult( $result ); ! ! $where_sql = ( !empty( $cat_id ) ) ? "AND article_category_id = $cat_id" : ''; ! $sql = "SELECT COUNT(article_id) as total_articles ! FROM " . KB_ARTICLES_TABLE . " ! WHERE approved='1' ! $where_sql"; ! ! if ( !( $result = $db->sql_query( $sql ) ) ) ! { ! mx_message_die( GENERAL_ERROR, 'Couldn\'t get number of article', '', __LINE__, __FILE__, $sql ); ! } ! ! $row = $db->sql_fetchrow( $result ); ! $db->sql_freeresult( $result ); ! ! $total_file = $row['total_articles']; ! unset( $row ); ! ! // ! // Ratings ! // ! $pa_use_ratings = false; ! for ( $i = 0; $i < count( $file_rowset ); $i++ ) ! { ! if ( $this->ratings[$file_rowset[$i]['article_category_id']]['activated'] ) ! { ! $pa_use_ratings = true; ! break; ! } ! } ! ! for ( $i = 0; $i < count( $file_rowset ); $i++ ) ! { ! // =================================================== ! // Format the date for the given file ! // =================================================== ! $article_date = create_date( $board_config['default_dateformat'], $file_rowset[$i]['article_date'], $board_config['board_timezone'] ); ! // =================================================== ! // Get rating for the file and format it ! // =================================================== ! $rating_message = ( $file_rowset[$i]['rating'] != 0 ) ? round( $file_rowset[$i]['rating'], 2 ) . ' / 10' : $lang['Not_rated']; ! ! $cat_name = ( empty( $cat_id ) ) ? $this->cat_rowset[$file_rowset[$i]['file_catid']]['category_name'] : ''; ! $cat_url = append_sid( this_kb_mxurl( 'action=category&cat_id=' . $file_rowset[$i]['article_category_id'] ) ); ! ! $article_description = $file_rowset[$i]['article_description'] ; ! $article_cat_id = $file_rowset[$i]['article_category_id']; ! $article_approved = $file_rowset[$i]['approved']; ! ! // // type ! // ! $type_id = $file_rowset[$i]['article_type']; $article_type = $this->get_kb_type( $type_id ); ! // // author information ! // ! $author_id = $file_rowset[$i]['article_author_id']; ! if ( $author_id == -1 ) { ! $author = ( $file_rowset[$i]['username'] == '' ) ? $lang['Guest'] : $file_rowset[$i]['username']; } else *************** *** 761,768 **** } ! $article_id = $article['article_id']; ! $views = $article['views']; ! $article_title = $article['article_title']; $temp_url = append_sid( this_kb_mxurl( "mode=article&k=$article_id" ) ); $article = '<a href="' . $temp_url . '" class="gen">' . $article_title . '</a>'; --- 841,848 ---- } ! $article_id = $file_rowset[$i]['article_id']; ! $views = $file_rowset[$i]['views']; ! $article_title = $file_rowset[$i]['article_title']; $temp_url = append_sid( this_kb_mxurl( "mode=article&k=$article_id" ) ); $article = '<a href="' . $temp_url . '" class="gen">' . $article_title . '</a>'; *************** *** 770,776 **** $approve = ''; $delete = ''; - $category_name = ''; - $category = $this->cat_rowset[$article_cat]; - $category_name = $category['category_name']; if ( defined( 'IN_ADMIN' ) ) --- 850,853 ---- *************** *** 779,783 **** { // approve ! $temp_url = append_sid( $module_root_path . "admin/admin_kb_art.$phpEx?mode=approve&a=$article_id&cat=$article_cat" . "&start=" . $start); $approve = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_approve'] . '" border="0" alt="' . $lang['Approve'] . '"></a>'; } --- 856,860 ---- { // approve ! $temp_url = append_sid( $module_root_path . "admin/admin_kb_art.$phpEx?mode=approve&a=$article_id&cat=$article_cat_id" . "&start=" . $start); $approve = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_approve'] . '" border="0" alt="' . $lang['Approve'] . '"></a>'; } *************** *** 785,803 **** { // unapprove ! $temp_url = append_sid( $module_root_path . "admin/admin_kb_art.$phpEx?mode=unapprove&a=$article_id&cat=$article_cat" . "&start=" . $start); $approve = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_unapprove'] . '" border="0" alt="' . $lang['Un_approve'] . '"></a>'; } // delete ! $temp_url = append_sid( $module_root_path . "admin/admin_kb_art.$phpEx?mode=delete&a=$article_id&cat=$article_cat" . "&start=" . $start); $delete = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_delpost'] . '" border="0" alt="' . $lang['Delete'] . '"></a>'; } else { ! if ( $this->auth_user[$id]['auth_mod'] ) { if ( $article_approved == 2 || $article_approved == 0 ) { // approve ! $temp_url = append_sid( this_kb_mxurl( "mode=moderate&action=approve&a=$article_id&cat=$article_cat&page=$page_id" . "&start=" . $start) ); $approve = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_approve'] . '" border="0" alt="' . $lang['Approve'] . '"></a>'; } --- 862,880 ---- { // unapprove ! $temp_url = append_sid( $module_root_path . "admin/admin_kb_art.$phpEx?mode=unapprove&a=$article_id&cat=$article_cat_id" . "&start=" . $start); $approve = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_unapprove'] . '" border="0" alt="' . $lang['Un_approve'] . '"></a>'; } // delete ! $temp_url = append_sid( $module_root_path . "admin/admin_kb_art.$phpEx?mode=delete&a=$article_id&cat=$article_cat_id" . "&start=" . $start); $delete = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_delpost'] . '" border="0" alt="' . $lang['Delete'] . '"></a>'; } else { ! if ( $this->auth_user[$cat_id]['auth_mod'] ) { if ( $article_approved == 2 || $article_approved == 0 ) { // approve ! $temp_url = append_sid( this_kb_mxurl( "mode=moderate&action=approve&a=$article_id&cat=$article_cat_id&page=$page_id" . "&start=" . $start) ); $approve = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_approve'] . '" border="0" alt="' . $lang['Approve'] . '"></a>'; } *************** *** 805,934 **** { // unapprove ! $temp_url = append_sid( this_kb_mxurl( "mode=moderate&action=unapprove&a=$article_id&cat=$article_cat&page=$page_id" . "&start=" . $start) ); $approve = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_unapprove'] . '" border="0" alt="' . $lang['Un_approve'] . '"></a>'; } } ! if ( $this->auth_user[$id]['auth_delete'] || $this->auth_user[$id]['auth_mod']) { // delete ! $temp_url = append_sid( this_kb_mxurl( "mode=moderate&action=delete&a=$article_id&cat=$article_cat&page=$page_id" . "&start=" . $start) ); $delete = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_delpost'] . '" border="0" alt="' . $lang['Delete'] . '"></a>'; } } ! if ( $article['article_rating'] == 0 || $article['article_totalvotes'] == 0 ) ! { ! $rating = 0; ! $rating_votes = 0; ! $rating_message = ''; ! } ! else ! { ! $rating = round( $postrow[$i]['link_rating'] / $postrow[$i]['link_totalvotes'], 2 ); ! $rating_votes = $postrow[$i]['link_totalvotes']; ! $rating_message = '(' . $rating . '/10, </span><span class="gensmall">' . $rating_votes . ' votes)'; ! } ! $template->assign_block_vars( $block_name, array( 'ARTICLE' => $article , ! 'ARTICLE_DESCRIPTION' => $article_description, ! 'ARTICLE_TYPE' => $article_type, ! 'ARTICLE_DATE' => $article_date, ! 'ARTICLE_AUTHOR' => $author, ! 'CATEGORY' => $category_name, ! 'ART_VIEWS' => $views, ! 'ART_VOTES' => $rating_message, ! 'U_APPROVE' => $approve, ! 'U_DELETE' => $delete ) ! ); ! } // end loop ! if ( $i == 0 ) { $template->assign_block_vars( 'no_articles', array( 'COMMENT' => $lang['No_Articles'] ) ); } - - return $i; } /** ! * Get Stats. * - * @param unknown_type $type - * @param unknown_type $approve - * @param unknown_type $block_name * @param unknown_type $start ! * @param unknown_type $articles_in_cat */ ! function display_stats( $type = false, $approve, $block_name, $start = -1, $articles_in_cat = 0 ) { ! global $db, $template, $images, $phpEx, $module_root_path, $phpbb_root_path, $mx_root_path, $board_config, $lang, $is_block, $page_id, $is_admin, $userdata; ! ! $this->debug('mx_kb->display_stats', basename( __FILE__ )); ! $sql = "SELECT * FROM " . KB_ARTICLES_TABLE . " WHERE"; ! $sql .= " approved = " . $approve; if ( $type ) { if ( $type == 'toprated' ) { ! $sql .= " AND article_totalvotes > 0"; ! $sql .= " ORDER BY article_rating/article_totalvotes DESC"; ! }elseif ( $type == 'latest' ) { ! $sql .= " ORDER BY article_date DESC"; ! }elseif ( $type == 'mostpopular' ) { ! $sql .= " AND views > 0"; ! $sql .= " ORDER BY views DESC"; } } ! if ( $start > -1 && $articles_in_cat > 0 ) { ! $sql .= " LIMIT $start, $articles_in_cat"; } ! if ( !( $article_result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Could not obtain article data", '', __LINE__, __FILE__, $sql ); } ! $i = 0; ! while ( $article = $db->sql_fetchrow( $article_result ) ) { ! if ( $i == $articles_in_cat ) { break; } ! $article_description = $article['article_description']; ! $article_cat = $article['article_category_id']; ! $article_approved = $article['approved']; // type ! $type_id = $article['article_type']; $article_type = $this->get_kb_type( $type_id ); ! $article_date = create_date( $board_config['default_dateformat'], $article['article_date'], $board_config['board_timezone'] ); // author information ! $author_id = $article['article_author_id']; if ( $author_id == -1 ) { ! $author = ( $article['username'] == '' ) ? $lang['Guest'] : $article['username']; } else { ! $author = $this->get_kb_author( $author_id ); $temp_url = append_sid( $phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$author_id" ); ! $author = '<a href="' . $temp_url . '" class="gen">' . $author . '</a>'; } ! $article_id = $article['article_id']; ! $views = $article['views']; ! $article_title = $article['article_title']; $temp_url = append_sid( this_kb_mxurl( "mode=article&k=$article_id" ) ); $article = '<a href="' . $temp_url . '" class="gen">' . $article_title . '</a>'; --- 882,1099 ---- { // unapprove ! $temp_url = append_sid( this_kb_mxurl( "mode=moderate&action=unapprove&a=$article_id&cat=$article_cat_id&page=$page_id" . "&start=" . $start) ); $approve = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_unapprove'] . '" border="0" alt="' . $lang['Un_approve'] . '"></a>'; } } ! if ( $this->auth_user[$cat_id]['auth_delete'] || $this->auth_user[$cat_id]['auth_mod']) { // delete ! $temp_url = append_sid( this_kb_mxurl( "mode=moderate&action=delete&a=$article_id&cat=$article_cat_id&page=$page_id" . "&start=" . $start) ); $delete = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_delpost'] . '" border="0" alt="' . $lang['Delete'] . '"></a>'; } } ! // =================================================== ! // Assign Vars ! // =================================================== ! $template->assign_block_vars( $block_name, array( ! 'ARTICLE' => $article , ! 'ARTICLE_DESCRIPTION' => $article_description, ! 'ARTICLE_TYPE' => $article_type, ! 'ARTICLE_DATE' => $article_date, ! 'ARTICLE_AUTHOR' => $author, ! 'CATEGORY' => $cat_name, ! 'ART_VIEWS' => $views, ! 'ART_VOTES' => $rating_message, ! 'U_APPROVE' => $approve, ! 'U_DELETE' => $delete ) ! ); ! $filelist = true; ! $pa_use_ratings = $this->ratings[$file_rowset[$i]['file_catid']]['activated']; ! } ! ! if ( !$filelist ) { $template->assign_block_vars( 'no_articles', array( 'COMMENT' => $lang['No_Articles'] ) ); } } /** ! * Enter description here... * * @param unknown_type $start ! * @param unknown_type $cat_id */ ! function display_stats( $start, $type = false, $cat_id = false, $block_name = 'articlerow', $approve = '1' ) { ! global $db, $kb_config, $template, $board_config; ! global $images, $lang, $phpEx, $mx_kb_functions; ! global $phpbb_root_path, $mx_root_path, $module_root_path, $is_block, $phpEx; ! $filelist = false; ! $approved_sql = ''; ! if ( empty( $cat_id ) ) ! { ! $approved_sql = " t.approved = '1'"; ! $cat_where = ''; ! } ! else ! { ! if ( !$this->auth_user[$cat_id]['auth_mod'] ) ! { ! $approved_sql = " t.approved = " . $approve; ! } ! $cat_where = !empty($approved_sql) ? "AND t.article_category_id = $cat_id" : " t.article_category_id = $cat_id"; ! } + $order_sql = ''; if ( $type ) { if ( $type == 'toprated' ) { ! $order_sql = " ORDER BY rating DESC "; ! } ! elseif ( $type == 'latest' ) { ! $order_sql = " ORDER BY article_date DESC "; ! } ! elseif ( $type == 'mostpopular' ) { ! $order_xtra = !empty($cat_where) || !empty($approved_sql)? " AND views > 0" : " views > 0 "; ! $order_sql = " ORDER BY views DESC "; } } + else + { ! } ! ! switch ( SQL_LAYER ) { ! case 'oracle': ! $sql = "SELECT t.*, t.article_id, r.votes_article, AVG(r.rate_point) AS rating, COUNT(r.votes_article) AS total_votes, u.user_id, u.username, COUNT(c.comments_id) AS total_comments, cat.cat_allow_ratings, cat.cat_allow_comments ! FROM " . KB_ARTICLES_TABLE . " AS t, " . KB_VOTES_TABLE . " AS r, " . USERS_TABLE . " AS u, " . KB_COMMENTS_TABLE . " AS c, " . KB_CATEGORIES_TABLE . " AS cat ! WHERE t.article_id = r.votes_article(+) ! AND t.article_author_id = u.user_id(+) ! AND t.article_id = c.article_id(+) ! AND t.article_category_id = cat.category_id ! $approved_sql ! $cat_where ! $order_xtra ! GROUP BY t.article_id ! $order_sql"; ! break; ! ! default: ! $sql = "SELECT t.*, t.article_id, r.votes_article, AVG(r.rate_point) AS rating, COUNT(r.votes_article) AS total_votes, u.user_id, u.username, COUNT(c.comments_id) AS total_comments, cat.cat_allow_ratings, cat.cat_allow_comments ! FROM " . KB_ARTICLES_TABLE . " AS t ! LEFT JOIN " . KB_VOTES_TABLE . " AS r ON t.article_id = r.votes_article ! LEFT JOIN " . USERS_TABLE . " AS u ON t.article_author_id = u.user_id ! LEFT JOIN " . KB_COMMENTS_TABLE . " AS c ON t.article_id = c.article_id ! LEFT JOIN " . KB_CATEGORIES_TABLE . " AS cat ON t.article_category_id = cat.category_id ! WHERE $approved_sql ! $cat_where ! $order_xtra ! GROUP BY t.article_id ! $order_sql"; ! break; } ! if ( !( $result = $mx_kb_functions->sql_query_limit( $sql, $kb_config['pagination'], $start ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldn\'t get file info for this category', '', __LINE__, __FILE__, $sql ); } ! $file_rowset = array(); ! $total_file = 0; ! while ( $row = $db->sql_fetchrow( $result ) ) { ! if ( $this->auth_user[$row['article_category_id']]['auth_view'] ) ! { ! $file_rowset[] = $row; ! } ! } ! ! $db->sql_freeresult( $result ); ! ! $where_sql = ( !empty( $cat_id ) ) ? "AND article_category_id = $cat_id" : ''; ! $sql = "SELECT COUNT(article_id) as total_articles ! FROM " . KB_ARTICLES_TABLE . " ! WHERE approved='1' ! $where_sql"; ! ! if ( !( $result = $db->sql_query( $sql ) ) ) ! { ! mx_message_die( GENERAL_ERROR, 'Couldn\'t get number of article', '', __LINE__, __FILE__, $sql ); ! } ! ! $row = $db->sql_fetchrow( $result ); ! $db->sql_freeresult( $result ); ! ! $total_file = $row['total_articles']; ! unset( $row ); ! ! // ! // Ratings ! // ! $pa_use_ratings = false; ! for ( $i = 0; $i < count( $file_rowset ); $i++ ) ! { ! if ( $this->ratings[$file_rowset[$i]['article_category_id']]['activated'] ) { + $pa_use_ratings = true; break; } + } ! for ( $i = 0; $i < count( $file_rowset ); $i++ ) ! { ! // =================================================== ! // Format the date for the given file ! // =================================================== ! $article_date = create_date( $board_config['default_dateformat'], $file_rowset[$i]['article_date'], $board_config['board_timezone'] ); ! // =================================================== ! // Get rating for the file and format it ! // =================================================== ! $rating_message = ( $file_rowset[$i]['rating'] != 0 ) ? round( $file_rowset[$i]['rating'], 2 ) . ' / 10' : $lang['Not_rated']; ! ! $cat_name = ( empty( $cat_id ) ) ? $this->cat_rowset[$file_rowset[$i]['file_catid']]['category_name'] : ''; ! $cat_url = append_sid( this_kb_mxurl( 'action=category&cat_id=' . $file_rowset[$i]['article_category_id'] ) ); ! ! $article_description = $file_rowset[$i]['article_description'] ; ! $article_cat_id = $file_rowset[$i]['article_category_id']; ! $article_approved = $file_rowset[$i]['approved']; ! ! // // type ! // ! $type_id = $file_rowset[$i]['article_type']; $article_type = $this->get_kb_type( $type_id ); ! // // author information ! // ! $author_id = $file_rowset[$i]['article_author_id']; ! if ( $author_id == -1 ) { ! $author = ( $file_rowset[$i]['username'] == '' ) ? $lang['Guest'] : $file_rowset[$i]['username']; } else { ! $author_name = $this->get_kb_author( $author_id ); $temp_url = append_sid( $phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$author_id" ); ! $author = '<a href="' . $temp_url . '" class="gen">' . $author_name . '</a>'; } ! $article_id = $file_rowset[$i]['article_id']; ! $views = $file_rowset[$i]['views']; ! $article_title = $file_rowset[$i]['article_title']; $temp_url = append_sid( this_kb_mxurl( "mode=article&k=$article_id" ) ); $article = '<a href="' . $temp_url . '" class="gen">' . $article_title . '</a>'; *************** *** 936,958 **** $approve = ''; $delete = ''; - $category_name = ''; ! //$category = $this->get_kb_cat( $article_cat ); ! $category = $this->cat_rowset[$article_cat]; ! $category_id = $category['category_id']; ! $category_name = $category['category_name']; ! $category_temp = append_sid( this_kb_mxurl( "mode=cat&cat=$category_id" ) ); ! $category_url = '<a href="' . $category_temp . '" class="genmed">' . $category_name . '</a>'; ! ! if ( defined( 'IN_ADMIN' ) || $userdata['user_level'] == ADMIN ) { - //$category = $this->get_kb_cat( $article_cat ); - $category = $this->cat_rowset[$article_cat]; - $category_name = $category['category_name']; - if ( $article_approved == 2 || $article_approved == 0 ) { // approve ! $temp_url = append_sid( $module_root_path . "admin/admin_kb_art.$phpEx?mode=approve&a=$article_id" ); $approve = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_approve'] . '" border="0" alt="' . $lang['Approve'] . '"></a>'; } --- 1101,1111 ---- $approve = ''; $delete = ''; ! if ( defined( 'IN_ADMIN' ) ) { if ( $article_approved == 2 || $article_approved == 0 ) { // approve ! $temp_url = append_sid( $module_root_path . "admin/admin_kb_art.$phpEx?mode=approve&a=$article_id&cat=$article_cat_id" . "&start=" . $start); $approve = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_approve'] . '" border="0" alt="' . $lang['Approve'] . '"></a>'; } *************** *** 960,1006 **** { // unapprove ! $temp_url = append_sid( $module_root_path . "admin/admin_kb_art.$phpEx?mode=unapprove&a=$article_id" ); $approve = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_unapprove'] . '" border="0" alt="' . $lang['Un_approve'] . '"></a>'; } // delete ! $temp_url = append_sid( $module_root_path . "admin/admin_kb_art.$phpEx?mode=delete&a=$article_id" ); $delete = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_delpost'] . '" border="0" alt="' . $lang['Delete'] . '"></a>'; } - - if ( $article['article_rating'] == 0 || $article['article_totalvotes'] == 0 ) - { - $rating = 0; - $rating_votes = 0; - $rating_message = ''; - } else { ! $rating = round( $postrow[$i]['link_rating'] / $postrow[$i]['link_totalvotes'], 2 ); ! $rating_votes = $postrow[$i]['link_totalvotes']; ! $rating_message = '(' . $rating . '/10, </span><span class="gensmall">' . $rating_votes . ' votes)'; } ! if ( $this->ns_auth_cat( $article_cat ) && $this->auth_user[$article_cat]['auth_view'] ) ! { ! $i++; ! $template->assign_block_vars( $block_name, array( 'ARTICLE' => $article , ! 'ARTICLE_DESCRIPTION' => $article_description, ! 'ARTICLE_TYPE' => $article_type, ! 'ARTICLE_DATE' => $article_date, ! 'ARTICLE_AUTHOR' => $author, ! 'CATEGORY' => $category_url, ! 'ART_VIEWS' => $views, ! 'ART_VOTES' => $rating_message, ! 'U_APPROVE' => $approve, ! 'U_DELETE' => $delete ) ! ); ! } } ! if ( $i == 0 ) { $template->assign_block_vars( 'no_articles', array( 'COMMENT' => $lang['No_Articles'] ) ); } - } --- 1113,1173 ---- { // unapprove ! $temp_url = append_sid( $module_root_path . "admin/admin_kb_art.$phpEx?mode=unapprove&a=$article_id&cat=$article_cat_id" . "&start=" . $start); $approve = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_unapprove'] . '" border="0" alt="' . $lang['Un_approve'] . '"></a>'; } // delete ! $temp_url = append_sid( $module_root_path . "admin/admin_kb_art.$phpEx?mode=delete&a=$article_id&cat=$article_cat_id" . "&start=" . $start); $delete = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_delpost'] . '" border="0" alt="' . $lang['Delete'] . '"></a>'; } else { ! if ( $this->auth_user[$cat_id]['auth_mod'] ) ! { ! if ( $article_approved == 2 || $article_approved == 0 ) ! { ! // approve ! $temp_url = append_sid( this_kb_mxurl( "mode=moderate&action=approve&a=$article_id&cat=$article_cat_id&page=$page_id" . "&start=" . $start) ); ! $approve = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_approve'] . '" border="0" alt="' . $lang['Approve'] . '"></a>'; ! } ! elseif ( $article_approved == 1 ) ! { ! // unapprove ! $temp_url = append_sid( this_kb_mxurl( "mode=moderate&action=unapprove&a=$article_id&cat=$article_cat_id&page=$page_id" . "&start=" . $start) ); ! $approve = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_unapprove'] . '" border="0" alt="' . $lang['Un_approve'] . '"></a>'; ! } ! } ! if ( $this->auth_user[$cat_id]['auth_delete'] || $this->auth_user[$cat_id]['auth_mod']) ! { ! // delete ! $temp_url = append_sid( this_kb_mxurl( "mode=moderate&action=delete&a=$article_id&cat=$article_cat_id&page=$page_id" . "&start=" . $start) ); ! $delete = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_delpost'] . '" border="0" alt="' . $lang['Delete'] . '"></a>'; ! } } ! // =================================================== ! // Assign Vars ! // =================================================== ! $template->assign_block_vars( $block_name, array( ! 'ARTICLE' => $article , ! 'ARTICLE_DESCRIPTION' => $article_description, ! 'ARTICLE_TYPE' => $article_type, ! 'ARTICLE_DATE' => $article_date, ! 'ARTICLE_AUTHOR' => $author, ! 'CATEGORY' => $cat_name, ! 'ART_VIEWS' => $views, ! 'ART_VOTES' => $rating_message, ! 'U_APPROVE' => $approve, ! 'U_DELETE' => $delete ) ! ); ! ! $filelist = true; ! $pa_use_ratings = $this->ratings[$file_rowset[$i]['file_catid']]['activated']; } ! ! if ( !$filelist ) { $template->assign_block_vars( 'no_articles', array( 'COMMENT' => $lang['No_Articles'] ) ); } } |
2 messages has been excluded from this view by a project administrator.
