From: jwalker <jwalker>
Date: Fri, 23 Dec 2005 13:05:23 +0000 (+0000)
Subject: Added option that lets the user to decide either to send or to not send the entry... 
X-Git-Tag: 1.0~216
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=a1dbf978edd5f6fde094955ec457d0ae51edcf56;p=s9y.git

Added option that lets the user to decide either to send or to not send the entry via e-mail at entry publishing time. By default the option is to send and thus this will not disturb someone that decided always to send entries.
---

diff --git a/plugins/serendipity_event_mailer/UTF-8/lang_bg.inc.php b/plugins/serendipity_event_mailer/UTF-8/lang_bg.inc.php
index 2b4b265..392b0f3 100644
--- a/plugins/serendipity_event_mailer/UTF-8/lang_bg.inc.php
+++ b/plugins/serendipity_event_mailer/UTF-8/lang_bg.inc.php
@@ -17,5 +17,8 @@
 @define('PLUGIN_EVENT_MAILER_CONVERTP', 'Преобразуване на HTML параграфите в нови редове ?');
 @define('PLUGIN_EVENT_MAILER_CONVERTPDESC', 'При избор \'Да\' добавя нов ред след всеки HTML параграф. Това е много удобно в случай на премахване на HTML, защото запазва структурата на статиите и подобрява читаемостта им.');
 @define('PLUGIN_EVENT_MAILER_RECIPIENTS', 'Получател (повече от един адреса разделете с интервал)');
+@define('PLUGIN_EVENT_MAILER_NOTSENDDECISION', 'Статията не беше изпратена, понеже вие избрахте да не я изпращате по e-mail.');
+@define('PLUGIN_EVENT_MAILER_SENDING', 'Изпращане');
+@define('PLUGIN_EVENT_MAILER_ISTOSENDIT', 'Изпращане на тази статия по e-mail');
 
 ?>
diff --git a/plugins/serendipity_event_mailer/lang_bg.inc.php b/plugins/serendipity_event_mailer/lang_bg.inc.php
index 3956c92..f6ef6d3 100644
--- a/plugins/serendipity_event_mailer/lang_bg.inc.php
+++ b/plugins/serendipity_event_mailer/lang_bg.inc.php
@@ -17,5 +17,8 @@
 @define('PLUGIN_EVENT_MAILER_CONVERTP', 'Ïðåîáðàçóâàíå íà HTML ïàðàãðàôèòå â íîâè ðåäîâå ?');
 @define('PLUGIN_EVENT_MAILER_CONVERTPDESC', 'Ïðè èçáîð \'Äà\' äîáàâÿ íîâ ðåä ñëåä âñåêè HTML ïàðàãðàô. Òîâà å ìíîãî óäîáíî â ñëó÷àé íà ïðåìàõâàíå íà HTML, çàùîòî çàïàçâà ñòðóêòóðàòà íà ñòàòèèòå è ïîäîáðÿâà ÷èòàåìîñòòà èì.');
 @define('PLUGIN_EVENT_MAILER_RECIPIENTS', 'Ïîëó÷àòåë (ïîâå÷å îò åäèí àäðåñà ðàçäåëåòå ñ èíòåðâàë)');
+@define('PLUGIN_EVENT_MAILER_NOTSENDDECISION', 'Ñòàòèÿòà íå áåøå èçïðàòåíà, ïîíåæå âèå èçáðàõòå äà íå ÿ èçïðàùàòå ïî e-mail.');
+@define('PLUGIN_EVENT_MAILER_SENDING', 'Èçïðàùàíå');
+@define('PLUGIN_EVENT_MAILER_ISTOSENDIT', 'Èçïðàùàíå íà òàçè ñòàòèÿ ïî e-mail');
 
 ?>
diff --git a/plugins/serendipity_event_mailer/serendipity_event_mailer.php b/plugins/serendipity_event_mailer/serendipity_event_mailer.php
index c860368..495eecc 100644
--- a/plugins/serendipity_event_mailer/serendipity_event_mailer.php
+++ b/plugins/serendipity_event_mailer/serendipity_event_mailer.php
@@ -94,6 +94,8 @@ class serendipity_event_mailer extends serendipity_event
 ?>
                     <fieldset style="margin: 5px">
                         <legend><?php echo PLUGIN_EVENT_MAILER_NAME; ?></legend>
+                            <input type="checkbox" name="serendipity[properties][sendentry]" id="properties_sendentry" value="true" checked="checked" />
+                            <label title="<?php echo PLUGIN_EVENT_MAILER_SENDING; ?>" for="properties_sendentry">&nbsp;<?php echo PLUGIN_EVENT_MAILER_ISTOSENDIT; ?></label><br />
                             <label title="<?php echo PLUGIN_EVENT_MAILER_RECIPIENT; ?>" for="properties_mailto">&nbsp;<?php echo PLUGIN_EVENT_MAILER_RECIPIENTS; ?>&nbsp;&nbsp;</label>&nbsp;
                             <input type="text" name="serendipity[properties][mailto]" id="properties_mailto" value="<?php echo htmlspecialchars($mailto); ?>" />
                     </fieldset>
@@ -101,46 +103,50 @@ class serendipity_event_mailer extends serendipity_event
                     break;
 
                 case 'backend_publish':
-                    $mails = explode(' ', $this->get_config('mailto'));
-                    $to = array();
-                    foreach($mails AS $mailto) {
-                        $to[] = trim($mailto);
-                    }
-
-                    $mail = array(
-                      'subject' => $eventData['title'],
-                      'body'    => $eventData['body'] . $eventData['extended'],
-//                      'from'    => $serendipity['blogTitle'] . ' - ' . $eventData['author'] . ' <' . $serendipity['serendipityEmail'] . '>'
-                      'from'    => $serendipity['serendipityEmail']
-                    );
+                    if ($serendipity['POST']['properties']['sendentry'] == false) {
+                        echo PLUGIN_EVENT_MAILER_NOTSENDDECISION . '<br />';
+                    } else {
+                        $mails = explode(' ', $this->get_config('mailto'));
+                        $to = array();
+                        foreach($mails AS $mailto) {
+                            $to[] = trim($mailto);
+                        }
 
-                    if (isset($serendipity['POST']['properties']['mailto'])) {
-                        $mails = explode(' ', $serendipity['POST']['properties']['mailto']);
-                        foreach($mails as $mailto) {
-                            $mailto = trim($mailto);
-                            if (!in_array($mailto, $to)) {
-                                $to[] = $mailto;
+                        $mail = array(
+                        'subject' => $eventData['title'],
+                        'body'    => $eventData['body'] . $eventData['extended'],
+    //                      'from'    => $serendipity['blogTitle'] . ' - ' . $eventData['author'] . ' <' . $serendipity['serendipityEmail'] . '>'
+                        'from'    => $serendipity['serendipityEmail']
+                        );
+
+                        if (isset($serendipity['POST']['properties']['mailto'])) {
+                            $mails = explode(' ', $serendipity['POST']['properties']['mailto']);
+                            foreach($mails as $mailto) {
+                                $mailto = trim($mailto);
+                                if (!in_array($mailto, $to)) {
+                                    $to[] = $mailto;
+                                }
                             }
                         }
-                    }
 
-                    if (serendipity_db_bool($this->get_config('convertp', false)) == true) {
-                        $mail['body'] = str_replace('</p>', "</p>\n", $mail['body']);
-                    }
+                        if (serendipity_db_bool($this->get_config('convertp', false)) == true) {
+                            $mail['body'] = str_replace('</p>', "</p>\n", $mail['body']);
+                        }
 
-                    if (serendipity_db_bool($this->get_config('striptags', false)) == true) {
-                        $mail['body'] = preg_replace('§<a[^>]+href=["\']([^"\']*)["\'][^>]*>([^<]*)</a>§i', "$2 [$1]", $mail['body']);
-                        $mail['body'] = preg_replace('§<img[^>]+src=["\']([^"\']*)["\'][^>]*>§i', "[" . IMAGE . ": $1]", $mail['body']);
-                        $mail['body'] = strip_tags($mail['body']);
-                    }
+                        if (serendipity_db_bool($this->get_config('striptags', false)) == true) {
+                            $mail['body'] = preg_replace('§<a[^>]+href=["\']([^"\']*)["\'][^>]*>([^<]*)</a>§i', "$2 [$1]", $mail['body']);
+                            $mail['body'] = preg_replace('§<img[^>]+src=["\']([^"\']*)["\'][^>]*>§i', "[" . IMAGE . ": $1]", $mail['body']);
+                            $mail['body'] = strip_tags($mail['body']);
+                        }
 
-                    if (serendipity_db_bool($this->get_config('includelink', false)) == true) {
-                       $mail['body'] = serendipity_archiveURL($eventData['id'], $eventData['title'], 'baseURL', true, array('timestamp' => $eventData['timestamp'])) . "\n\n" . $mail['body'];
-                    }
+                        if (serendipity_db_bool($this->get_config('includelink', false)) == true) {
+                        $mail['body'] = serendipity_archiveURL($eventData['id'], $eventData['title'], 'baseURL', true, array('timestamp' => $eventData['timestamp'])) . "\n\n" . $mail['body'];
+                        }
 
-                    foreach($to AS $mailto) {
-                        echo htmlspecialchars($mailto) . '...<br />';
-                        serendipity_sendMail($mailto, $mail['subject'], $mail['body'], $mail['from']);
+                        foreach($to AS $mailto) {
+                            echo htmlspecialchars($mailto) . '...<br />';
+                            serendipity_sendMail($mailto, $mail['subject'], $mail['body'], $mail['from']);
+                        }
                     }
                     return true;
                     break;