[Fmsystem-commits] [14655] more on bookingfrontend

[Sigurd Nes]

Revision: 14655
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14655
Author:   sigurdne
Date:     2016-01-17 14:51:15 +0000 (Sun, 17 Jan 2016)
Log Message:
-----------
more on bookingfrontend

Modified Paths:
--------------
    branches/dev-syncromind/activitycalendar/setup/setup.inc.php
    branches/dev-syncromind/activitycalendarfrontend/index.php
    branches/dev-syncromind/activitycalendarfrontend/setup/setup.inc.php
    branches/dev-syncromind/activitycalendarfrontend/templates/base/config.tpl
    branches/dev-syncromind/bookingfrontend/index.php
    branches/dev-syncromind/bookingfrontend/setup/phpgw_no.lang
    branches/dev-syncromind/bookingfrontend/setup/setup.inc.php
    branches/dev-syncromind/bookingfrontend/templates/base/config.tpl

Modified: branches/dev-syncromind/activitycalendar/setup/setup.inc.php
===================================================================
--- branches/dev-syncromind/activitycalendar/setup/setup.inc.php        
2016-01-16 17:11:11 UTC (rev 14654)
+++ branches/dev-syncromind/activitycalendar/setup/setup.inc.php        
2016-01-17 14:51:15 UTC (rev 14655)
@@ -30,7 +30,7 @@
 
        $setup_info['activitycalendar']['depends'][] = array(
                'appname' => 'booking',
-               'versions' => array('0.2.20','0.2.21','0.2.22')
+               'versions' => 
array('0.2.20','0.2.21','0.2.22','0.2.23','0.2.24','0.2.25')
        );
 
        $setup_info['activitycalendar']['depends'][] = array(

Modified: branches/dev-syncromind/activitycalendarfrontend/index.php
===================================================================
--- branches/dev-syncromind/activitycalendarfrontend/index.php  2016-01-16 
17:11:11 UTC (rev 14654)
+++ branches/dev-syncromind/activitycalendarfrontend/index.php  2016-01-17 
14:51:15 UTC (rev 14655)
@@ -15,10 +15,9 @@
 
                $c               = createobject('phpgwapi.config', 
'activitycalendarfrontend');
                $c->read();
-               $config  = $c->config_data;
 
                $login                           = 
$c->config_data['anonymous_user'];
-               $passwd                          = 
$c->config_data['anonymous_pass'];
+               $passwd                          = 
$c->config_data['anonymous_passwd'];
                $_POST['submitit']       = "";
 
                /*              $login = "activitycalendar_guest";

Modified: branches/dev-syncromind/activitycalendarfrontend/setup/setup.inc.php
===================================================================
--- branches/dev-syncromind/activitycalendarfrontend/setup/setup.inc.php        
2016-01-16 17:11:11 UTC (rev 14654)
+++ branches/dev-syncromind/activitycalendarfrontend/setup/setup.inc.php        
2016-01-17 14:51:15 UTC (rev 14655)
@@ -1,7 +1,7 @@
 <?php
 
 $setup_info['activitycalendarfrontend']['name'] = 'activitycalendarfrontend';
-$setup_info['activitycalendarfrontend']['version'] = '0.1';
+$setup_info['activitycalendarfrontend']['version'] = '0.1.1';
 $setup_info['activitycalendarfrontend']['app_order'] = 61;
 $setup_info['activitycalendarfrontend']['enable'] = 1;
 $setup_info['activitycalendarfrontend']['app_group'] = 'office';
@@ -22,7 +22,7 @@
 
 $setup_info['activitycalendarfrontend']['depends'][] = array(
     'appname' => 'booking',
-       'versions' => array('0.2.20','0.2.21','0.2.22')
+       'versions' => 
array('0.2.20','0.2.21','0.2.22','0.2.23','0.2.24','0.2.25')
 );
 
 $setup_info['activitycalendarfrontend']['depends'][] = array(

Modified: 
branches/dev-syncromind/activitycalendarfrontend/templates/base/config.tpl
===================================================================
--- branches/dev-syncromind/activitycalendarfrontend/templates/base/config.tpl  
2016-01-16 17:11:11 UTC (rev 14654)
+++ branches/dev-syncromind/activitycalendarfrontend/templates/base/config.tpl  
2016-01-17 14:51:15 UTC (rev 14655)
@@ -27,7 +27,7 @@
                </tr>
                <tr bgcolor="{row_off}">
                        <td>{lang_Anonymous_password}:</td>
-                       <td><input type="password" 
name="newsettings[anonymous_pass]" value="{value_anonymous_pass}"></td>
+                       <td><input type="password" 
name="newsettings[anonymous_passwd]" value="{value_anonymous_passwd}"></td>
                </tr>
                <tr bgcolor="{row_on}">
 

Modified: branches/dev-syncromind/bookingfrontend/index.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/index.php   2016-01-16 17:11:11 UTC 
(rev 14654)
+++ branches/dev-syncromind/bookingfrontend/index.php   2016-01-17 14:51:15 UTC 
(rev 14655)
@@ -45,8 +45,13 @@
        // Make sure we're always logged in
        if(!phpgw::get_var(session_name()) || 
!$GLOBALS['phpgw']->session->verify())
        {
-               $login                           = "bookingguest";
-               $passwd                          = "bkbooking";
+//             $login                           = "bookingguest";
+               $c               = createobject('phpgwapi.config', 
'bookingfrontend');
+               $c->read();
+               $config  = $c->config_data;
+
+               $login                           = 
$c->config_data['anonymous_user'];
+               $passwd                          = 
$c->config_data['anonymous_passwd'];
                $_POST['submitit']       = "";
 
                $GLOBALS['sessionid'] = 
$GLOBALS['phpgw']->session->create($login, $passwd);

Modified: branches/dev-syncromind/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- branches/dev-syncromind/bookingfrontend/setup/phpgw_no.lang 2016-01-16 
17:11:11 UTC (rev 14654)
+++ branches/dev-syncromind/bookingfrontend/setup/phpgw_no.lang 2016-01-17 
14:51:15 UTC (rev 14655)
@@ -1,3 +1,10 @@
+attachment     bookingfrontend no      Vedlegg
+please enter a descripction    bookingfrontend no      Vennligst angi en 
beskrivelse
+please enter a contact name    bookingfrontend no      Vennligst angi 
kontaktnavn
+please enter a contact email   bookingfrontend no      Vennligst angi epost
+customer identifier type is required   bookingfrontend no      Vennligst angi 
identifikasjon
+number of participants is required     bookingfrontend no      Vennligst angi 
antall deltakere
+please choose at least 1 target audience       bookingfrontend no      
Vennligst angi målgruppe
 part of town   common  no      Bydel
 fetching data  bookingfrontend no      Henter data
 please wait    bookingfrontend no      Vent litt...

Modified: branches/dev-syncromind/bookingfrontend/setup/setup.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/setup/setup.inc.php 2016-01-16 
17:11:11 UTC (rev 14654)
+++ branches/dev-syncromind/bookingfrontend/setup/setup.inc.php 2016-01-17 
14:51:15 UTC (rev 14655)
@@ -1,6 +1,6 @@
 <?php
        $setup_info['bookingfrontend']['name'] = 'bookingfrontend';
-       $setup_info['bookingfrontend']['version'] = '0.1';
+       $setup_info['bookingfrontend']['version'] = '0.1.1';
        $setup_info['bookingfrontend']['app_order'] = 9;
        $setup_info['bookingfrontend']['enable'] = 1;
        $setup_info['bookingfrontend']['app_group']     = 'office';
@@ -21,7 +21,7 @@
 
        $setup_info['bookingfrontend']['depends'][] = array(
                'appname' => 'booking',
-               'versions' => array('0.2.20','0.2.21','0.2.22')
+               'versions' => 
array('0.2.20','0.2.21','0.2.22','0.2.23','0.2.24','0.2.25')
        );
 
        $setup_info['bookingfrontend']['depends'][] = array(

Modified: branches/dev-syncromind/bookingfrontend/templates/base/config.tpl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/config.tpl   
2016-01-16 17:11:11 UTC (rev 14654)
+++ branches/dev-syncromind/bookingfrontend/templates/base/config.tpl   
2016-01-17 14:51:15 UTC (rev 14655)
@@ -21,6 +21,14 @@
                        </td>
                </tr>
                <tr class="row_on">
+                       <td>{lang_Anonymous_user}:</td>
+                       <td><input name="newsettings[anonymous_user]" 
value="{value_anonymous_user}"></td>
+               </tr>
+               <tr class="row_off">
+                       <td>{lang_Anonymous_password}:</td>
+                       <td><input type="password" 
name="newsettings[anonymous_passwd]" value="{value_anonymous_passwd}"></td>
+               </tr>
+               <tr class="row_on">
                        <td>{lang_custom_login_url}:</td>
                        <td><input name="newsettings[custom_login_url]" 
value="{value_custom_login_url}"></td>
                </tr>