[Fmsystem-commits] [9400]

[Erik Holm-Larsen]

Revision: 9400
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9400
Author:   erikhl
Date:     2012-05-14 12:31:19 +0000 (Mon, 14 May 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/class.uiactivities.inc.php
    trunk/activitycalendarfrontend/setup/phpgw_no.lang

Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php       2012-05-14 
12:23:46 UTC (rev 9399)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php       2012-05-14 
12:31:19 UTC (rev 9400)
@@ -422,12 +422,18 @@
     
     function send_email_to_selection($activities)
     {
+        $c = createobject('phpgwapi.config','activitycalendarfrontend');
+               $c->read();
+               $config = $c->config_data;
+               
+               $mailBaseURL = $c->config_data['mailBaseURL'];
        foreach($activities as $activity)
        {
                //$activity = 
activitycalendar_soactivity::get_instance()->get_single($activity_id);
                $subject = lang('mail_subject_update');
                //$link_text = "<a 
href='http://www.bergen.kommune.no/aktivby/registreringsskjema/ny/?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/registreringsskjema/endre/?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='{$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());
                if($activity->get_state() == 2)
                {
@@ -466,6 +472,11 @@
     
     public function send_mail()
     {
+        $c = createobject('phpgwapi.config','activitycalendarfrontend');
+               $c->read();
+               $config = $c->config_data;
+               
+               $mailBaseURL = $c->config_data['mailBaseURL'];
        $activity_id = (int)phpgw::get_var('activity_id');
        $activity = 
activitycalendar_soactivity::get_instance()->get_single($activity_id);
        
@@ -475,7 +486,9 @@
                //$subject = lang('mail_subject_update', $avtivity->get_id() . 
'-' . $activity->get_title(), $activity->get_link());
                $subject = lang('mail_subject_update');
                //$link_text = 
"http://www.bergen.kommune.no/aktivby/registreringsskjema/ny/?menuaction=activitycalendarfrontend.uiactivity.edit&amp;id={$activity->get_id()}&amp;secret={$activity->get_secret()}";
-               $link_text = 
"http://www.bergen.kommune.no/aktivitetsoversikt/registreringsskjema/endre/?menuaction=activitycalendarfrontend.uiactivity.edit&amp;id={$activity->get_id()}&amp;secret={$activity->get_secret()}";
+               //$link_text = 
"{$mailBaseURL}?menuaction=activitycalendarfrontend.uiactivity.edit&amp;id={$activity->get_id()}&amp;secret={$activity->get_secret()}";
+               //$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);
        }

Modified: trunk/activitycalendarfrontend/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendarfrontend/setup/phpgw_no.lang  2012-05-14 12:23:46 UTC 
(rev 9399)
+++ trunk/activitycalendarfrontend/setup/phpgw_no.lang  2012-05-14 12:31:19 UTC 
(rev 9400)
@@ -98,4 +98,8 @@
 save_organization_next activitycalendarfrontend        no      Lagre 
organisasjon og gå videre til Ny aktivitet
 new_organization       activitycalendarfrontend        no      Ny organisasjon
 organization_saved_form        activitycalendarfrontend        no      
Organisasjonen er opprettet i aktivitetsoversikten.<br/>Du kan nå registrere en 
aktivitet tilknyttet den nye organisasjonen.
-required_fields        activitycalendarfrontend        no      Felter merket 
med (*) er påkrevde felt.
\ No newline at end of file
+required_fields        activitycalendarfrontend        no      Felter merket 
med (*) er påkrevde felt.
+mailBaseURL    activitycalendarfrontend        no      Base-URL for e-post
+ajaxURL        activitycalendarfrontend        no      URL for AJAX-kall
+Anonymous_user activitycalendarfrontend        no      Brukernavn for frontend
+Anonymous_password     activitycalendarfrontend        no      Passord for 
frontend
\ No newline at end of file