[Fmsystem-commits] [9899] Added optional footer to mail from offices

[Erik Holm-Larsen]

Revision: 9899
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9899
Author:   erikhl
Date:     2012-08-22 10:43:37 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
Added optional footer to mail from offices

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

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2012-08-22 09:05:54 UTC 
(rev 9898)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2012-08-22 10:43:37 UTC 
(rev 9899)
@@ -189,7 +189,14 @@
                                $activity_district = 
$this->get_office_from_user($filters['user_id']);
                                if($activity_district && $activity_district != 
'')
                                {
-                                       $filter_clauses[] = "activity.office = 
'{$activity_district}'";
+                                    if($activity_district == 1)
+                                        $activity_district_corr = 2;
+                                    else if ($activity_district == 2)
+                                        $activity_district_corr = 1;
+                                    else
+                                        $activity_district_corr = 
(int)$activity_district;
+                                    
+                                    $filter_clauses[] = "activity.office = 
'{$activity_district_corr}'";
                                }
                        }
                        if(isset($filters['updated_date_hidden']) && 
$filters['updated_date_hidden'] != "")
@@ -224,7 +231,12 @@
                                $activity_district = 
$this->get_office_from_user($filters['user_id']);
                                if($activity_district && $activity_district != 
'')
                                {
-                                       $filter_clauses[] = "activity.office = 
'{$activity_district}'";
+                                    if($activity_district == 1)
+                                        $activity_district = 2;
+                                    else if ($activity_district == 2)
+                                        $activity_district = 1;
+                                    
+                                    $filter_clauses[] = "activity.office = 
'{$activity_district}'";
                                }
                        }
                        if(isset($filters['updated_date_hidden']) && 
$filters['updated_date_hidden'] != "")
@@ -622,7 +634,7 @@
        
         function get_office_description($office_id)
        {
-            $result = "Ingen";
+            $result = "";
             if($office_id != null)
             {
                $sql = "SELECT description FROM bb_office where id=$office_id";

Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php       2012-08-22 
09:05:54 UTC (rev 9898)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php       2012-08-22 
10:43:37 UTC (rev 9899)
@@ -522,9 +522,19 @@
                //$link_text = "<a 
href='{$mailBaseURL}?menuaction=activitycalendarfrontend.uiactivity.edit&amp;id={$activity->get_id()}&amp;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&amp;id={$activity->get_id()}&amp;secret={$activity->get_secret()}'>Rediger
 opplysninger for {$activity->get_title()}</a>";
                 $office_name = 
activitycalendar_soactivity::get_instance()->get_office_name($activity->get_office());
+                /*
                 $uid = $GLOBALS['phpgw_info']['user']['account_id'];
                $user_office_id =  
activitycalendar_soactivity::get_instance()->get_office_from_user($uid);
                 $office_footer = 
activitycalendar_soactivity::get_instance()->get_office_description($user_office_id);
+                 */
+                $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)
                {
                        $body = lang('mail_body_update_frontend', 
$activity->get_title(), $link_text, $office_name) . '<br/><br/>'.$office_footer;
@@ -582,7 +592,15 @@
                //$link_text = 
"http://www.bergen.kommune.no/aktivitetsoversikt/?menuaction=activitycalendarfrontend.uiactivity.edit&amp;id={$activity->get_id()}&amp;secret={$activity->get_secret()}";
                $link_text = "<a 
href='http://www.bergen.kommune.no/aktivitetsoversikt/?menuaction=activitycalendarfrontend.uiactivity.edit&amp;id={$activity->get_id()}&amp;secret={$activity->get_secret()}'>Rediger
 opplysninger for {$activity->get_title()}</a>";
                $office_name = 
activitycalendar_soactivity::get_instance()->get_office_name($activity->get_office());
-               $body = lang('mail_body_update', $activity->get_title(), 
$link_text, $office_name);
+                $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);
+               $body = lang('mail_body_update', $activity->get_title(), 
$link_text, $office_name) . $office_footer;
        }
        else
        {