Changeset 4816 in subversion

Timestamp:

May 30, 2011 12:19:51 PM (2 years ago)

Author:

alec

Message:

• Add option to force spellchecking before sending a message (#1485458)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/localization/en_US/labels.inc (modified) (1 diff)
• program/localization/en_US/messages.inc (modified) (1 diff)
• program/localization/pl_PL/labels.inc (modified) (1 diff)
• program/localization/pl_PL/messages.inc (modified) (1 diff)
• program/steps/mail/sendmail.inc (modified) (2 diffs)
• program/steps/settings/func.inc (modified) (1 diff)
• program/steps/settings/save_prefs.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Added option to force spellchecking before sending a message (#1485458)
 - Fix handling of "<" character in contact data, search fields and folder names (#1487864)
 - Fix saving "<" character in identity name and organization fields (#1487864)

trunk/roundcubemail/config/main.inc.php.dist

@@ -704 +704 @@
 $rcmail_config['default_addressbook'] = null;
 
+// Enables spell checking before sending a message.
+$rcmail_config['spellcheck_before_send'] = false;
+
 // end of config file

trunk/roundcubemail/program/localization/en_US/labels.inc

@@ -414 +414 @@
 $labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
 $labels['defaultaddressbook'] = 'Add new contacts to the selected addressbook';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
 
 $labels['folder']  = 'Folder';

trunk/roundcubemail/program/localization/en_US/messages.inc

@@ -142 +142 @@
 $messages['foldercreated'] = 'Folder created successfully';
 $messages['invalidimageformat'] = 'Not a valid image format';
+$messages['mispellingsfound'] = 'Spelling errors detected in the message';
 
 ?>

trunk/roundcubemail/program/localization/pl_PL/labels.inc

@@ -458 +458 @@
 $labels['defaultaddressbook'] = 'Nowe kontakty dodawaj do wybranej ksiÄ
 ÅŒki adresowej';
+$labels['spellcheckbeforesend'] = 'Przed wysłaniem wiadomości sprawdzaj pisownię';
 
 ?>

trunk/roundcubemail/program/localization/pl_PL/messages.inc

@@ -193 +193 @@
 cych wpisów</b>';
 $messages['invalidimageformat'] = 'Niepoprawny format obrazka';
+$messages['mispellingsfound'] = 'Wykryto błędy pisowni w tej wiadomości';
 
 ?>

trunk/roundcubemail/program/steps/mail/sendmail.inc

@@ -410 +410 @@
   }
 
+  // Check spelling before send
+  if ($CONFIG['spellcheck_before_send'] && $CONFIG['enable_spellcheck']
+    && empty($_SESSION['compose']['spell_checked'])
+  ) {
+    $spellchecker = new rcube_spellchecker();
+    $spell_result = $spellchecker->check($message_body, $isHtml);
+
+    $_SESSION['compose']['spell_checked'] = true;
+
+    if (!$spell_result) {
+      $OUTPUT->show_message('mispellingsfound', 'error');
+      $OUTPUT->command('command', 'spellcheck');
+      $OUTPUT->send('iframe');
+    }
+  }
+
   // generic footer for all messages
   if ($isHtml && !empty($CONFIG['generic_message_footer_html'])) {
@@ -421 +437 @@
       $footer = '<pre>'.$footer.'</pre>';
   }
+
   if ($footer)
     $message_body .= "\r\n" . $footer;

trunk/roundcubemail/program/steps/settings/func.inc

@@ -546 +546 @@
     }
 
+    if (!isset($no_override['spellcheck_before_send']) && $config['enable_spellcheck']) {
+      $field_id = 'rcmfd_spellcheck_before_send';
+      $input_spellcheck = new html_checkbox(array('name' => '_spellcheck_before_send', 'id' => $field_id, 'value' => 1));
+
+      $blocks['main']['options']['spellcheck_before_send'] = array(
+        'title' => html::label($field_id, Q(rcube_label('spellcheckbeforesend'))),
+        'content' => $input_spellcheck->show($config['spellcheck_before_send']?1:0),
+      );
+    }
+
     if (!isset($no_override['show_sig'])) {
       $field_id = 'rcmfd_show_sig';

trunk/roundcubemail/program/steps/settings/save_prefs.inc

@@ -71 +71 @@
       'dsn_default'        => isset($_POST['_dsn_default']) ? TRUE : FALSE,
       'reply_same_folder'  => isset($_POST['_reply_same_folder']) ? TRUE : FALSE,
+      'spellcheck_before_send' => isset($_POST['_spellcheck_before_send']) ? TRUE : FALSE,
       'show_sig'           => isset($_POST['_show_sig']) ? intval($_POST['_show_sig']) : 1,
       'top_posting'        => !empty($_POST['_top_posting']),