[php-blog-cvs] serendipity/plugins/serendipity_event_mailer serendipity_event_mailer.php,1.4,1.5

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_mailer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28720/plugins/serendipity_event_mailer

Modified Files:
	serendipity_event_mailer.php 
Log Message:
immediately show plugin defaults in configuration screen instead of leaving
everything blank.

!!!!PLEASE TEST!!!!


Index: serendipity_event_mailer.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_mailer/serendipity_event_mailer.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_event_mailer.php	22 Jun 2004 09:44:50 -0000	1.4
+++ serendipity_event_mailer.php	22 Jun 2004 13:45:45 -0000	1.5
@@ -11,7 +11,7 @@
         @define('PLUGIN_EVENT_MAILER_STRIPTAGS', 'HTML entfernen?');
         @define('PLUGIN_EVENT_MAILER_STRIPTAGSDESC', 'Entfernt HTML-Anweisungen aus der Mail.');
         break;
-    
+
     case 'en':
     case 'es':
     default:
@@ -31,7 +31,7 @@
     function introspect(&$propbag)
     {
         global $serendipity;
-        
+
         $propbag->add('name',          PLUGIN_EVENT_MAILER_NAME);
         $propbag->add('description',   PLUGIN_EVENT_MAILER_DESC);
         $propbag->add('event_hooks',    array(
@@ -48,21 +48,27 @@
                 $propbag->add('type',        'string');
                 $propbag->add('name',        PLUGIN_EVENT_MAILER_RECIPIENT);
                 $propbag->add('description', PLUGIN_EVENT_MAILER_RECIPIENTDESC);
+                $propbag->add('default', '');
                 break;
+
             case 'includelink':
                 $propbag->add('type',        'boolean');
                 $propbag->add('name',        PLUGIN_EVENT_MAILER_LINK);
                 $propbag->add('description', PLUGIN_EVENT_MAILER_LINKDESC);
+                $propbag->add('default',     'false');
                 break;
+
             case 'striptags':
                 $propbag->add('type',        'boolean');
                 $propbag->add('name',        PLUGIN_EVENT_MAILER_STRIPTAGS);
                 $propbag->add('description', PLUGIN_EVENT_MAILER_STRIPTAGSDESC);
+                $propbag->add('default',     'false');
                 break;
+
             default:
                 break;
         }
-        
+
         return true;
     }
 
@@ -72,7 +78,7 @@
 
     function event_hook($event, &$bag, &$eventData) {
         global $serendipity;
-        
+
         $hooks = &$bag->get('event_hooks');
 
         if (isset($hooks[$event])) {
@@ -85,16 +91,18 @@
                       'from'    => $serendipity['blogTitle'] . ' - ' . $eventData['author'] . ' <' . $serendipity['serendipityEmail'] . '>'
                     );
                     
-                    if($this->get_config('includelink') == true)
+                    if($this->get_config('includelink') == true) {
                        $mail['body'] = serendipity_archiveURL($eventData['id'], $eventData['title']) . "\n\n" . $mail['body'];
+                    }
 
-                    if($this->get_config('striptags') == true)
+                    if($this->get_config('striptags') == true) {
                        $mail['body'] = strip_tags($mail['body']);
+                    }
 
                     mail($mail['to'], $mail['subject'], $mail['body'], "From: {$mail['from']}\r\n{$serendipity['mailheaders']}");
                     return true;
                     break;
-                
+
                 default:
                     return false;
                     break;