Changeset 1793 in subversion

Timestamp:

Sep 15, 2008 2:53:18 AM (5 years ago)

Author:

alec

Message:

• Added 'sendmail_delay' option to restrict messages sending interval (#1484491)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/localization/en_GB/messages.inc (modified) (1 diff)
• program/localization/en_US/messages.inc (modified) (1 diff)
• program/localization/pl_PL/messages.inc (modified) (1 diff)
• program/steps/mail/sendmail.inc (modified) (4 diffs)

trunk/roundcubemail/CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/09/15 (alec)
+----------
+- Added 'sendmail_delay' option to restrict messages sending interval (#1484491)
 
 2008/09/12 (alec)

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

@@ -107 +107 @@
 // Log sent messages
 $rcmail_config['smtp_log'] = TRUE;
+
+// how many seconds must pass between emails sent by a user
+$rcmail_config['sendmail_delay'] = 0;
 
 // these cols are shown in the message list

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

@@ -41 +41 @@
 $messages['contactnotfound'] = 'The requested contact was not found';
 $messages['sendingfailed'] = 'Failed to send message';
+$messages['senttooquickly'] = 'You have to wait $sec sec. to sent the message';
 $messages['errorsavingsent'] = 'An error occured while saving sent message';
 $messages['errorsaving'] = 'An error occured while saving';

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

@@ -41 +41 @@
 $messages['contactnotfound'] = 'The requested contact was not found';
 $messages['sendingfailed'] = 'Failed to send message';
+$messages['senttooquickly'] = 'You have to wait $sec sec. to sent the message';
 $messages['errorsavingsent'] = 'An error occured while saving sent message';
 $messages['errorsaving'] = 'An error occured while saving';

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

@@ -52 +52 @@
 $messages['contactnotfound'] = 'Szukany kontakt nie został odnaleziony';
 $messages['sendingfailed'] = 'Nie udało się wysłać wiadomości!';
+$messages['senttooquickly'] = 'Musisz poczekać $sec sek. aby móc wysłać tÄ
+ wiadomość!';
 $messages['errorsavingsent'] = 'WystÄ
 pił błÄ

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

@@ -26 +26 @@
 $OUTPUT->framed = TRUE;
 
+$savedraft = !empty($_POST['_draft']) ? TRUE : FALSE;
+
+/****** checks ********/
 
 if (!isset($_SESSION['compose']['id'])) {
@@ -34 +37 @@
 }
 
+if (!$savedraft && empty($_POST['_to']) && empty($_POST['_cc']) && empty($_POST['_bcc']) && empty($_POST['_subject']) && $_POST['_message']) {
+  $OUTPUT->show_message('sendingfailed', 'error');
+  $OUTPUT->send('iframe');
+}
+
+if(!$savedraft && !empty($CONFIG['sendmail_delay'])) {
+  $wait_sec = time() - intval($CONFIG['sendmail_delay']) - intval($_SESSION['last_message_time']);
+  if($wait_sec < 0)
+    {
+    $OUTPUT->show_message('senttooquickly', 'error', array('sec' => $wait_sec * -1));
+    $OUTPUT->send('iframe');
+    }
+}
+
 
 /****** message sending functions ********/
-
 
 // get identity record
@@ -117 +133 @@
 }
 
+
+/****** compose message ********/
+
 if (strlen($_POST['_draft_saveid']) > 3)
   $olddraftmessageid = get_input_value('_draft_saveid', RCUBE_INPUT_POST);
 
 $message_id = sprintf('<%s@%s>', md5(uniqid('rcmail'.rand(),true)), $RCMAIL->config->mail_domain($_SESSION['imap_host']));
-$savedraft = !empty($_POST['_draft']) ? TRUE : FALSE;
-
-
-/****** check submission and compose message ********/
-
-
-if (!$savedraft && empty($_POST['_to']) && empty($_POST['_cc']) && empty($_POST['_bcc']) && empty($_POST['_subject']) && $_POST['_message'])
-  {
-  $OUTPUT->show_message("sendingfailed", 'error');
-  $OUTPUT->send('iframe');
-  return;
-  }
-
 
 // set default charset
@@ -347 +353 @@
     $OUTPUT->show_message("sendingfailed", 'error'); 
     $OUTPUT->send('iframe');
-    return;
-    }
+    }
+
+  // save message sent time
+  if (!empty($CONFIG['sendmail_delay']))
+    $_SESSION['last_message_time'] = time();
   
   // set replied/forwarded flag