|
From: Jon O. <jon...@us...> - 2006-08-04 16:30:35
|
Update of /cvsroot/mxbb/mx_kb/kb/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25418/modules/mx_kb/kb/includes Modified Files: functions.php functions_comment.php functions_kb.php Log Message: finetuning of - notifications - approval Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** functions.php 1 Aug 2006 21:00:37 -0000 1.12 --- functions.php 4 Aug 2006 16:30:30 -0000 1.13 *************** *** 756,764 **** { 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(+) AND c.category_id = a.article_category_id AND a.article_id = '" . $item_id . "' --- 756,763 ---- { 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 ! FROM " . KB_ARTICLES_TABLE . " AS a, " . KB_VOTES_TABLE . " AS r, " . USERS_TABLE . " AS u, " . KB_CATEGORIES_TABLE . " AS c WHERE a.article_id = r.votes_article(+) AND a.article_author_id = u.user_id(+) AND c.category_id = a.article_category_id AND a.article_id = '" . $item_id . "' *************** *** 767,775 **** 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 WHERE c.category_id = a.article_category_id AND a.article_id = '" . $item_id . "' --- 766,773 ---- 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 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 WHERE c.category_id = a.article_category_id AND a.article_id = '" . $item_id . "' Index: functions_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions_comment.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** functions_comment.php 1 Aug 2006 21:00:37 -0000 1.9 --- functions_comment.php 4 Aug 2006 16:30:30 -0000 1.10 *************** *** 153,159 **** // Toggles // ! $bbcode_on = !$kb_config['allow_wysiwyg'] ? ($kb_config['allow_bbcode'] ? true : false) : false; ! $html_on = !$kb_config['allow_wysiwyg'] ? ($kb_config['allow_html'] ? true : false) : true; ! $smilies_on = !$kb_config['allow_wysiwyg'] ? ($kb_config['allow_smilies'] ? true : false) : false; // --- 153,159 ---- // Toggles // ! $bbcode_on = !$kb_config['allow_comment_wysiwyg'] ? ($kb_config['allow_comment_bbcode'] ? true : false) : false; ! $html_on = !$kb_config['allow_comment_wysiwyg'] ? ($kb_config['allow_comment_html'] ? true : false) : true; ! $smilies_on = !$kb_config['allow_comment_wysiwyg'] ? ($kb_config['allow_comment_smilies'] ? true : false) : false; // *************** *** 172,176 **** // Instantiate the mx_text and mx_text_formatting classes // - include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); $mx_text = new mx_text(); $mx_text->init($html_on, $bbcode_on, $smilies_on); // Note: allowed_html_tags is altered above --- 172,175 ---- *************** *** 179,183 **** $mx_text_formatting = new mx_text_formatting(); - $template->assign_block_vars( 'use_comments', array( 'L_COMMENTS' => $lang['Comments'], --- 178,181 ---- *************** *** 318,322 **** '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'], )); } --- 316,320 ---- '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'], )); } *************** *** 359,365 **** // Toggles // ! $bbcode_on = !$kb_config['allow_wysiwyg'] ? ($kb_config['allow_bbcode'] ? true : false) : false; ! $html_on = !$kb_config['allow_wysiwyg'] ? ($kb_config['allow_html'] ? true : false) : true; ! $smilies_on = !$kb_config['allow_wysiwyg'] ? ($kb_config['allow_smilies'] ? true : false) : false; // --- 357,363 ---- // Toggles // ! $bbcode_on = !$kb_config['allow_comment_wysiwyg'] ? ($kb_config['allow_comment_bbcode'] ? true : false) : false; ! $html_on = !$kb_config['allow_comment_wysiwyg'] ? ($kb_config['allow_comment_html'] ? true : false) : true; ! $smilies_on = !$kb_config['allow_comment_wysiwyg'] ? ($kb_config['allow_comment_smilies'] ? true : false) : false; // Index: functions_kb.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions_kb.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** functions_kb.php 1 Aug 2006 21:00:37 -0000 1.15 --- functions_kb.php 4 Aug 2006 16:30:30 -0000 1.16 *************** *** 1834,1838 **** $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']) ); --- 1834,1838 ---- $mx_kb_notification->notify( $mx_notification_mode, $mx_notification_action ); ! if ( $this->notification[$catId]['notify_group'] > 0 ) { $mx_kb_notification->notify( $mx_notification_mode, $mx_notification_action, - intval($this->notification[$catId]['notify_group']) ); |