[Fmsystem-commits] [11254] bkbooking: stavanger bugfix mail to tilsynsvakt

[Kjell Arne Espedal]

Revision: 11254
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11254
Author:   kjell
Date:     2013-08-08 11:58:59 +0000 (Thu, 08 Aug 2013)
Log Message:
-----------
bkbooking: stavanger bugfix mail to tilsynsvakt

Modified Paths:
--------------
    branches/stavangerkommune/booking/inc/class.boapplication.inc.php
    branches/stavangerkommune/booking/inc/class.soapplication.inc.php

Modified: branches/stavangerkommune/booking/inc/class.boapplication.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.boapplication.inc.php   
2013-08-07 11:12:51 UTC (rev 11253)
+++ branches/stavangerkommune/booking/inc/class.boapplication.inc.php   
2013-08-08 11:58:59 UTC (rev 11254)
@@ -60,25 +60,29 @@
                                $body .= "<pre>Avvist: ".$rdates."</pre>";
 
                                if ($application['comment'] != '') {
-                                       $body .= '<p>Kommentar fra 
saksbehandler:<br />'.$application['comment'].'</p>';
+                                       $body .= "<p>Kommentar fra 
saksbehandler:<br />".$application['comment']."</p>";
                                }
-                               $buildingemail = 
$this->get_tilsyn_email($application['building_id']);
 
-                               if ($buildingemail != '') {
+                               $buildingemail = 
$this->get_tilsyn_email($application['building_name']);
+                               if ($buildingemail['email1'] != '') {
                                        $resourcename = 
implode(",",$this->get_resource_name($application['resources']));
-                                       $bbody = 
"<p>".$application['contact_name']." sin søknad  om leie/lån av 
".$resourcename." i ".$application[building_name]."</p>"; 
+                                       $bsubject = "Aktivby: En søknad om 
leie/lån av ".$resourcename." på ".$application['building_name']." er godkjent";
+                                       $bbody = 
"<p>".$application['contact_name']." sin søknad  om leie/lån av 
".$resourcename." på ".$application['building_name']."</p>"; 
                                        $bbody .= "<p>Den ".$adates."er 
Godkjent</p>";
                                
-                                       try
+                                       foreach ($buildingemail as $bemail)
                                        {
-                                               $send->msg('email', 
$buildingemail, $subject, $bbody, '', '', '', $from, '', 'html');
+                                               try
+                                               {
+                                                       $send->msg('email', 
$bemail, $bsubject, $bbody, '', '', '', $from, '', 'html');
+                                               }
+                                               catch (phpmailerException $e)
+                                               {
+                                               // TODO: Inform user if 
something goes wrong
+                                               }
+
                                        }
-                                       catch (phpmailerException $e)
-                                       {
-                                       // TODO: Inform user if something goes 
wrong
-                                       }
                                }
-               
                        } elseif ($application['status'] == 'REJECTED') {
                                $body = "<p>Din søknad i 
".$config->config_data['application_mail_systemname']." om leie/lån er 
".lang($application['status']); 
                                $body .= 
'</p><pre>'.$config->config_data['application_mail_rejected'].' <a 
href="'.$link.'">Link til 
'.$config->config_data['application_mail_systemname'].': søknad 
#'.$application['id'].'</a></pre>';

Modified: branches/stavangerkommune/booking/inc/class.soapplication.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.soapplication.inc.php   
2013-08-07 11:12:51 UTC (rev 11253)
+++ branches/stavangerkommune/booking/inc/class.soapplication.inc.php   
2013-08-08 11:58:59 UTC (rev 11254)
@@ -158,12 +158,15 @@
 
                function get_tilsyn_email($id)
                {
-                       $this->db->limit_query("SELECT tilsyn_email FROM 
bb_building where id=" . intval($id), 0, __LINE__, __FILE__, 1);
+                       $sql = "SELECT tilsyn_email, tilsyn_email2 FROM 
bb_building where id=(select id from bb_building where name = '$id' AND active 
= 1)";
+                       $this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
                        if(!$this->db->next_record())
                        {
                                return False;
                        }
-                       return $this->db->f('email', false);
+                       return array('email1' => $this->db->f('tilsyn_email', 
false),
+                                                'email2' => 
$this->db->f('tilsyn_email2', false));
+
                }
 
                function get_resource_name($id)