[Fmsystem-commits] [12243] bkbooking: stavanger bugfix

[Kjell Arne Espedal]

Revision: 12243
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12243
Author:   kjell
Date:     2014-10-28 08:14:45 +0000 (Tue, 28 Oct 2014)
Log Message:
-----------
bkbooking: stavanger bugfix

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

Modified: branches/stavangerkommune/booking/inc/class.boapplication.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.boapplication.inc.php   
2014-10-27 23:30:49 UTC (rev 12242)
+++ branches/stavangerkommune/booking/inc/class.boapplication.inc.php   
2014-10-28 08:14:45 UTC (rev 12243)
@@ -112,7 +112,7 @@
         /**
          * @ Send message about comment on application to case officer.
          */
-        function send_admin_notification($application, $message = null)
+        function send_admin_notification:_($application, $message = null)
         {
             if (!(isset($GLOBALS['phpgw_info']['server']['smtp_server']) && 
$GLOBALS['phpgw_info']['server']['smtp_server']))
                 return;
@@ -130,7 +130,10 @@
             $mailadresses = $config->config_data['emails'];
             $mailadresses = explode("\n", $mailadresses);
 
-            $link = $external_site_address . 
'/index.php?menuaction=booking.uiapplication.show&id=' . $application['id'];
+            if ($GLOBALS['phpgw_info']['server']['webserver_url'] != '' && 
isset($config->config_data['external_site_address']))
+                $link = $external_site_address . 
$GLOBALS['phpgw_info']['server']['webserver_url'] . 
'/index.php?menuaction=booking.uiapplication.show&id=' . $application['id'];
+            else
+                $link = $external_site_address . 
'/index.php?menuaction=booking.uiapplication.show&id=' . $application['id'];
 
             $activity = 
$this->activity_bo->read_single($application['activity_id']);