[Fmsystem-commits] [14302] more on email

[Sigurd Nes]

Revision: 14302
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14302
Author:   sigurdne
Date:     2015-11-09 09:28:38 +0000 (Mon, 09 Nov 2015)
Log Message:
-----------
more on email

Modified Paths:
--------------
    trunk/activitycalendar/inc/class.uiactivities.inc.php

Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php       2015-11-08 
15:32:53 UTC (rev 14301)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php       2015-11-09 
09:28:38 UTC (rev 14302)
@@ -51,7 +51,7 @@
 
                $this->validator = 
CreateObject('phpgwapi.EmailAddressValidator');
 
-               $this->debug = true;
+               $this->debug = false;
 
     }
 
@@ -596,7 +596,7 @@
             }
         }
 
-       //$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' => 
'activitycalendar.uiactivities.index', 'message' => 'E-post sendt'));
+               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'activitycalendar.uiactivities.index', 'message' => 
'E-post sendt'));
 
     }
 
@@ -687,7 +687,7 @@
             return false;
         }
 
-        $mailtoAddress = 
activitycalendar_socontactperson::get_instance()->get_mailaddress_for_org_contact($contact_person->get_id());
+        $mailtoAddress = 
trim(activitycalendar_socontactperson::get_instance()->get_mailaddress_for_org_contact($contact_person->get_id()));
         //$mailtoAddress = "address@hidden";
 
         //var_dump($mailtoAddress);
@@ -702,11 +702,16 @@
                                        'line'  => __LINE__,
                                        'file'  => __FILE__
                                ));
+                               $msg = "Overskrift: \"{$subject}\"; Adressen 
feiler på validering:\"{$mailtoAddress}\"";
+                               _debug_array($msg);
                    return false;
                        }
+
+                       _debug_array($mailtoAddress);
+                       _debug_array($subject);
+
                        if($this->debug)
                        {
-                               _debug_array($mailtoAddress);
                    return false;
                        }
 
@@ -746,7 +751,7 @@
             return false;
         }
 
-        $mailtoAddress = 
activitycalendar_socontactperson::get_instance()->get_mailaddress_for_group_contact($contact_person->get_id());
+        $mailtoAddress = 
trim(activitycalendar_socontactperson::get_instance()->get_mailaddress_for_group_contact($contact_person->get_id()));
         //$mailtoaddress = "address@hidden";
         //var_dump($mailtoAddress.';'.$from.';'.$subject);
         if (strlen($mailtoAddress) > 0)
@@ -759,13 +764,17 @@
                                        'line'  => __LINE__,
                                        'file'  => __FILE__
                                ));
-                   return false;
+                               $msg = "Overskrift: \"{$subject}\"; Adressen 
feiler på validering:\"{$mailtoAddress}\"";
+                               _debug_array($msg);
+
+                               return false;
                        }
 
+                       _debug_array($mailtoAddress);
+                       _debug_array($subject);
+
                        if($this->debug)
                        {
-                               _debug_array($mailtoAddress);
-                               _debug_array($subject);
                    return false;
                        }