|
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 ---- |