[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14293] fix email routine
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [14293] fix email routine |
Date: |
Sun, 08 Nov 2015 14:16:28 +0000 |
Revision: 14293
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14293
Author: sigurdne
Date: 2015-11-08 14:16:27 +0000 (Sun, 08 Nov 2015)
Log Message:
-----------
fix email routine
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-06
21:46:59 UTC (rev 14292)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php 2015-11-08
14:16:27 UTC (rev 14293)
@@ -14,8 +14,11 @@
protected $so_contact;
protected $so_activity;
protected $so_arena;
+ private $validator;
+ private $config_booking;
+ private $debug;
- public $public_functions = array
+ public $public_functions = array
(
'index' => true,
'index_json' => true,
@@ -43,6 +46,13 @@
self::set_active_menu('activitycalendar::activities');
$config = CreateObject('phpgwapi.config','activitycalendar');
$config->read();
+ $this->config_booking = CreateObject('phpgwapi.config','booking');
+ $this->config_booking->read();
+
+ $this->validator =
CreateObject('phpgwapi.EmailAddressValidator');
+
+ $this->debug = true;
+
}
/**
@@ -379,7 +389,8 @@
{
$user_rows_per_page =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
}
- else {
+ else
+ {
$user_rows_per_page = 10;
}
// YUI variables for paging and sorting
@@ -407,6 +418,7 @@
$email = false;
if(isset($email_param)){
$email=true;
+ $num_of_objects = null;
}
$uid = $GLOBALS['phpgw_info']['user']['account_id'];
@@ -513,12 +525,13 @@
$c = createobject('phpgwapi.config','activitycalendarfrontend');
$c->read();
$config = $c->config_data;
+ $_subject = lang('mail_subject_update');
$mailBaseURL = $c->config_data['mailBaseURL'];
foreach($activities as $activity)
{
- //$activity =
activitycalendar_soactivity::get_instance()->get_single($activity_id);
- $subject = lang('mail_subject_update');
+ $subject = "{$_subject}::" .$activity->get_title();
+ //$activity =
activitycalendar_soactivity::get_instance()->get_single($activity_id);
//$link_text = "<a
href='http://www.bergen.kommune.no/aktivby/registreringsskjema/ny/?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}'>Rediger
opplysninger for {$activity->get_title()}</a>";
//$link_text = "<a
href='{$mailBaseURL}?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}'>Rediger
opplysninger for {$activity->get_title()}</a>";
$link_text = "<a
href='http://www.bergen.kommune.no/aktivitetsoversikt/?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}'>Rediger
opplysninger for {$activity->get_title()}</a>";
@@ -530,11 +543,17 @@
*/
$office_id = $activity->get_office();
if($office_id == 1)
+ {
$office_id_new = 2;
+ }
else if($office_id == 2)
+ {
$office_id_new = 1;
+ }
else
+ {
$office_id_new = (int)$office_id;
+ }
$office_footer =
activitycalendar_soactivity::get_instance()->get_office_description($office_id_new);
if($activity->get_state() == 2)
{
@@ -553,19 +572,27 @@
{
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_group_id(),
true));
/* if($activity->get_contact_person_2() &&
$activity->get_contact_person_2()->get_email())
+ {
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_2(),
$subject, $body);
+ }
else*/
if($activity->get_contact_person_1() &&
$activity->get_contact_person_1()->get_email())
+ {
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_1(),
$subject, $body);
+ }
}
else if($activity->get_organization_id() &&
$activity->get_organization_id() > 0)
{
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_organization_id()));
/* if($activity->get_contact_person_2() &&
$activity->get_contact_person_2()->get_email())
-
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_2(),
$subject, $body);
+ {
+
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_2(),
$subject, $body);
+ }
else*/
if($activity->get_contact_person_1() &&
$activity->get_contact_person_1()->get_email())
+ {
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_1(),
$subject, $body);
+ }
}
}
@@ -621,7 +648,9 @@
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_2(),
$subject, $body);
else */
if($activity->get_contact_person_1() &&
$activity->get_contact_person_1()->get_email())
+ {
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_1(),
$subject, $body);
+ }
}
else if($activity->get_organization_id() &&
$activity->get_organization_id() > 0)
{
@@ -631,7 +660,9 @@
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_2(),
$subject, $body);
else */
if($activity->get_contact_person_1() &&
$activity->get_contact_person_1()->get_email())
+ {
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_1(),
$subject, $body);
+ }
}
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'activitycalendar.uiactivities.index', 'message' => 'E-post sendt'));
@@ -647,8 +678,7 @@
$GLOBALS['phpgw']->send = CreateObject('phpgwapi.send');
}
- $config = CreateObject('phpgwapi.config','booking');
- $config->read();
+ $config = $this->config_booking;
$from = isset($config->config_data['email_sender']) &&
$config->config_data['email_sender'] ? $config->config_data['email_sender'] :
"noreply<address@hidden'phpgw_info']['server']['hostname']}>";
//$from = "address@hidden";
@@ -664,10 +694,24 @@
//var_dump($mailtoAddress.';'.$from.';'.$subject);
if (strlen($mailtoAddress) > 0)
{
- try
+ if
(!$this->validator->check_email_address($mailtoAddress))
+ {
+ $GLOBALS['phpgw']->log->error(array(
+ 'text' =>
'uiactivities::send_mailnotification_to_group() : not a valid address.: %1',
+ 'p1' => $mailtoAddress,
+ 'line' => __LINE__,
+ 'file' => __FILE__
+ ));
+ return false;
+ }
+ if($this->debug)
+ {
+ _debug_array($mailtoAddress);
+ return false;
+ }
+
+ try
{
- //var_dump('inne i try');
-// var_dump('inne i try - org;');
$GLOBALS['phpgw']->send->msg('email', $mailtoAddress,
$subject, $body, '', '', '', $from, '', 'html');
}
catch (phpmailerException $e)
@@ -693,8 +737,7 @@
$GLOBALS['phpgw']->send = CreateObject('phpgwapi.send');
}
- $config = CreateObject('phpgwapi.config','booking');
- $config->read();
+ $config = $this->config_booking;
$from = isset($config->config_data['email_sender']) &&
$config->config_data['email_sender'] ? $config->config_data['email_sender'] :
"noreply<address@hidden'phpgw_info']['server']['hostname']}>";
//$from = "address@hidden";
@@ -708,10 +751,26 @@
//var_dump($mailtoAddress.';'.$from.';'.$subject);
if (strlen($mailtoAddress) > 0)
{
- try
+ if
(!$this->validator->check_email_address($mailtoAddress))
+ {
+ $GLOBALS['phpgw']->log->error(array(
+ 'text' =>
'uiactivities::send_mailnotification_to_group() : not a valid address.: %1',
+ 'p1' => $mailtoAddress,
+ 'line' => __LINE__,
+ 'file' => __FILE__
+ ));
+ return false;
+ }
+
+ if($this->debug)
+ {
+ _debug_array($mailtoAddress);
+ _debug_array($subject);
+ return false;
+ }
+
+ try
{
-// var_dump('inne i try - group;');
-// $send->msg('email', $mailtoAddress, $subject, $body, '', '',
'', $from, '', 'html');
$GLOBALS['phpgw']->send->msg('email', $mailtoAddress,
$subject, $body, '', '', '', $from, '', 'html');
}
catch (phpmailerException $e)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14293] fix email routine,
Sigurd Nes <=