[Fmsystem-commits] [7346]

[Erik Holm-Larsen]

Revision: 7346
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7346
Author:   erikhl
Date:     2011-06-06 07:07:34 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------


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

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2011-06-06 07:04:23 UTC 
(rev 7345)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-06-06 07:07:34 UTC 
(rev 7346)
@@ -194,6 +194,7 @@
                        $columns[] = 'activity.contact_person_1';
                        $columns[] = 'activity.contact_person_2';
                        $columns[] = 'activity.special_adaptation';
+                       $columns[] = 'activity.secret';
                        
                        $cols = implode(',',$columns);
                }
@@ -358,6 +359,7 @@
                        
$activity->set_contact_person_2($this->unmarshal($this->db->f('contact_person_2'),
 'int'));
                        
$activity->set_last_change_date($this->unmarshal($this->db->f('last_change_date'),
 'int'));
                        
$activity->set_special_adaptation($this->unmarshal($this->db->f('special_adaptation',
 'bool')));
+                       
$activity->set_secret($this->unmarshal($this->db->f('secret'), 'string'));
                }
                return $activity;
        }

Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php       2011-06-06 
07:04:23 UTC (rev 7345)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php       2011-06-06 
07:07:34 UTC (rev 7346)
@@ -93,17 +93,18 @@
                $GLOBALS['phpgw_info']['flags']['app_header'] .= 
'::'.lang('edit');
                // Get the contract part id
                $activity_id = (int)phpgw::get_var('id');
+               $so_activity = activitycalendar_soactivity::get_instance();
                //var_dump($activity_id);
                
-               $categories = 
activitycalendar_soactivity::get_instance()->get_categories();
-               $targets = 
activitycalendar_soactivity::get_instance()->get_targets();
-               $offices = 
activitycalendar_soactivity::get_instance()->select_district_list();
-               $districts = 
activitycalendar_soactivity::get_instance()->get_districts();
+               $categories = $so_activity->get_categories();
+               $targets = $so_activity->get_targets();
+               $offices = $so_activity->select_district_list();
+               $districts = $so_activity->get_districts();
                                
                // Retrieve the activity object or create a new one
                if(isset($activity_id) && $activity_id > 0)
                {       
-                       $activity = 
activitycalendar_soactivity::get_instance()->get_single($activity_id); 
+                       $activity = $so_activity->get_single($activity_id); 
                }
                else
                {
@@ -149,7 +150,7 @@
                                $activity->set_contact_persons($persons);
                                
$activity->set_special_adaptation(phpgw::get_var('special_adaptation'));
                                
-                               
if(activitycalendar_soactivity::get_instance()->store($activity)) // ... and 
then try to store the object
+                               if($so_activity->store($activity)) // ... and 
then try to store the object
                                {
                                        $message = lang('messages_saved_form'); 
                                }
@@ -160,7 +161,7 @@
 
                                if($new_state == 3 || $new_state == 4 || 
$new_state == 5 )
                                {
-                                       $kontor = 
activitycalendar_soactivity::get_instance()->get_office_name($activity->get_office());
+                                       $kontor = 
$so_activity->get_office_name($activity->get_office());
                                        $subject = "Melding fra AktivBy";
                                        $body = lang('mail_body_state_' . 
$new_state, $kontor);
                                        
@@ -347,7 +348,7 @@
                        try
                        {
                                //var_dump('inne i try');
-                               $GLOBALS['phpgw']->send->msg('email', 
$mailtoAddress, $subject, $body, '', '', '', $from, '', 'plain');
+                               $GLOBALS['phpgw']->send->msg('email', 
$mailtoAddress, $subject, $body, '', '', '', $from, '', 'html');
                        }
                        catch (phpmailerException $e)
                        {
@@ -377,7 +378,7 @@
                {
                        try
                        {
-                               $send->msg('email', $mailtoAddress, $subject, 
$body, '', '', '', $from, '', 'plain');
+                               $send->msg('email', $mailtoAddress, $subject, 
$body, '', '', '', $from, '', 'html');
                        }
                        catch (phpmailerException $e)
                        {

Modified: trunk/activitycalendar/inc/model/class.activity.inc.php
===================================================================
--- trunk/activitycalendar/inc/model/class.activity.inc.php     2011-06-06 
07:04:23 UTC (rev 7345)
+++ trunk/activitycalendar/inc/model/class.activity.inc.php     2011-06-06 
07:07:34 UTC (rev 7346)
@@ -26,6 +26,7 @@
                protected $contact_person_1;
                protected $contact_person_2;
                protected $special_adaptation;
+               protected $secret;
                
                /**
                 * Constructor.  Takes an optional ID.  If a contract is 
created from outside
@@ -181,6 +182,13 @@
                
                public function get_special_adaptation() { return 
$this->special_adaptation; }
                
+               public function set_secret($secret)
+               {
+                       $this->secret = $secret;
+               }
+               
+               public function get_secret() { return $this->secret; }
+               
                /**
                 * Get a static reference to the storage object associated with 
this model object
                 *