[Fmsystem-commits] [6656] admin: cutom email address at testjob at asyncservice

[Sigurd Nes]

Revision: 6656
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6656
Author:   sigurdne
Date:     2010-12-08 11:47:44 +0000 (Wed, 08 Dec 2010)
Log Message:
-----------
admin: cutom email address at testjob at asyncservice

Modified Paths:
--------------
    trunk/admin/inc/class.uiasyncservice.inc.php

Modified: trunk/admin/inc/class.uiasyncservice.inc.php
===================================================================
--- trunk/admin/inc/class.uiasyncservice.inc.php        2010-12-08 09:32:55 UTC 
(rev 6655)
+++ trunk/admin/inc/class.uiasyncservice.inc.php        2010-12-08 11:47:44 UTC 
(rev 6656)
@@ -84,9 +84,19 @@
 
                                if ( $test )
                                {
-                                       $prefs = 
$GLOBALS['phpgw']->preferences->create_email_preferences();
-                                       if 
(!$async->set_timer($times,'test','admin.uiasyncservice.test',array('to' => 
$prefs['email']['address'])))
+                                       $email = phpgw::get_var('email', 
'string', 'POST');
+                                       if(!$email)
                                        {
+                                               $prefs = 
$GLOBALS['phpgw']->preferences->create_email_preferences();
+                                               $email = 
$prefs['email']['address'];
+                                       }
+                                       $validator = 
CreateObject('phpgwapi.EmailAddressValidator');
+                                       
if(!$validator->check_email_address($email))
+                                       {
+                                               echo '<p><b>'.lang("Not a not 
valid email address")."</b></p>\n";                                       
+                                       }
+                                       else if 
(!$async->set_timer($times,'test','admin.uiasyncservice.test',array('to' => 
$email)))
+                                       {
                                                echo '<p><b>'.lang("Error 
setting timer, wrong syntax or maybe there's one already running 
!!!")."</b></p>\n";
                                        }
                                        unset($prefs);
@@ -200,6 +210,7 @@
                                echo 
"<p>asyncservice::next_run(";print_r($times);echo")=".($next === False ? 
'False':"'$next'=".$GLOBALS['phpgw']->common->show_date($next))."</p>\n";
                        }
                        echo '<hr><p><input type="submit" name="cancel" 
value="'.lang('Cancel TestJob!')."\"> &nbsp;\n";
+                       echo lang('email') . '<input type="text" name="email" 
value="">'."\n";
                        echo '<input type="submit" name="test" 
value="'.lang('Start TestJob!')."\">\n";
                        echo lang('for the times above')."</p>\n";
                        echo '<p>'.lang('The TestJob sends you a mail everytime 
it is called.')."</p>\n";