|
From: Jon O. <jon...@us...> - 2008-07-06 22:10:36
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25295 Modified Files: Tag: core28x mx_functions_tools.php Log Message: comments, notifications, etc Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.15.2.10 retrieving revision 1.15.2.11 diff -C2 -d -r1.15.2.10 -r1.15.2.11 *** mx_functions_tools.php 6 Jul 2008 19:22:53 -0000 1.15.2.10 --- mx_functions_tools.php 6 Jul 2008 22:10:32 -0000 1.15.2.11 *************** *** 2059,2074 **** global $lang, $phpEx; // // Compose phpBB post header // ! //$this->temp_url = PORTAL_URL . this_kb_mxurl("mode=" . "article&k=" . $this->data['item_id'], false, true); ! ! $this->auto_message = $this->langs['item_title'] . ": " . $this->data['item_title'] . "\n"; ! $this->auto_message .= $this->langs['author'] . ": " . $this->data['item_author'] . "\n"; ! $this->auto_message .= $this->langs['item_description'] . ": " . $this->data['item_desc'] . "\n"; if ($action != MX_DELETED_NOTIFICATION) { ! $this->auto_message .= "\n" . $this->langs['read_full_item'] . ": \n" . $this->temp_url . "\n"; } --- 2059,2074 ---- global $lang, $phpEx; + $new_line_char = $this->allow_comment_wysiwyg ? '<br />' : "\n"; + // // Compose phpBB post header // ! $this->auto_message = $this->langs['item_title'] . ": " . $this->data['item_title'] . $new_line_char; ! $this->auto_message .= $this->langs['author'] . ": " . $this->data['item_author'] . $new_line_char; ! $this->auto_message .= $this->langs['item_description'] . ": " . $this->data['item_desc'] . $new_line_char; if ($action != MX_DELETED_NOTIFICATION) { ! $this->auto_message .= $new_line_char . $this->langs['read_full_item'] . ": " . $new_line_char . $this->temp_url . $new_line_char; } *************** *** 2076,2080 **** // Update message // ! $this->auto_message_update = $this->langs['edited_item_info'] . $this->data['item_editor'] . "\n"; // --- 2076,2080 ---- // Update message // ! $this->auto_message_update = $this->langs['edited_item_info'] . $this->data['item_editor'] . $new_line_char; // *************** *** 2086,2090 **** $this->topic_title = $this->langs['module_title'] . ' - ' . $this->data['item_title']; $this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_new']; ! $this->message = $this->langs['notify_new_body'] . "\n\n" . $this->auto_message; break; --- 2086,2090 ---- $this->topic_title = $this->langs['module_title'] . ' - ' . $this->data['item_title']; $this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_new']; ! $this->message = $this->langs['notify_new_body'] . $new_line_char . $new_line_char . $this->auto_message; break; *************** *** 2092,2111 **** $this->topic_title = $this->langs['module_title'] . ' - ' . $this->data['item_title']; $this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_edited']; ! $this->message = $this->langs['notify_edited_body'] . "\n\n" . $this->auto_message_update . $this->auto_message; break; case MX_APPROVED_NOTIFICATION: $this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_approved']; ! $this->message = $this->langs['notify_approved_body'] . "\n\n". $this->auto_message; break; case MX_UNAPPROVED_NOTIFICATION: $this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_unapproved']; ! $this->message = $this->langs['notify_unapproved_body'] . "\n\n" . $this->auto_message; break; case MX_DELETED_NOTIFICATION: $this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_deleted']; ! $this->message = $this->langs['notify_deleted_body'] . "\n\n" . $this->auto_message; break; --- 2092,2111 ---- $this->topic_title = $this->langs['module_title'] . ' - ' . $this->data['item_title']; $this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_edited']; ! $this->message = $this->langs['notify_edited_body'] . $new_line_char . $new_line_char . $this->auto_message_update . $this->auto_message; break; case MX_APPROVED_NOTIFICATION: $this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_approved']; ! $this->message = $this->langs['notify_approved_body'] . $new_line_char . $new_line_char . $this->auto_message; break; case MX_UNAPPROVED_NOTIFICATION: $this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_unapproved']; ! $this->message = $this->langs['notify_unapproved_body'] . $new_line_char . $new_line_char . $this->auto_message; break; case MX_DELETED_NOTIFICATION: $this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_deleted']; ! $this->message = $this->langs['notify_deleted_body'] . $new_line_char . $new_line_char . $this->auto_message; break; *************** *** 3825,3836 **** // - // Little temp fix for autogenerated comments, with newlines. - // - if ($this->allow_comment_wysiwyg) - { - $comments_text = str_replace("\n", "\n<br />\n", $comments_text); - } - - // // Remove Images and/or links // --- 3825,3828 ---- *************** *** 4073,4084 **** // - // Little temp fix for autogenerated comments, with newlines. - // - if ($this->allow_comment_wysiwyg) - { - $comments_text = str_replace("\n", "\n<br />\n", $comments_text); - } - - // // Remove Images and/or links // --- 4065,4068 ---- |