[Fmsystem-commits] [15815] Stable: Merge 15812:15814 from trunk

[sigurdne]

Revision: 15815
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15815
Author:   sigurdne
Date:     2016-10-12 11:56:11 +0000 (Wed, 12 Oct 2016)
Log Message:
-----------
Stable: Merge 15812:15814 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/bookingfrontend/login.php

Property Changed:
----------------
    branches/Version-2_0-branch/
    branches/Version-2_0-branch/bookingfrontend/


Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-15747
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811
   + /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-15747
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814


Property changes on: branches/Version-2_0-branch/bookingfrontend
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind-2/bookingfrontend:14933-15747
/branches/stavangerkommune/bookingfrontend:9468-12740,12986
/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919,14924-14978,14980-15258,15297,15312-15335,15585-15617,15621-15630,15714-15764
   + /branches/dev-syncromind-2/bookingfrontend:14933-15747
/branches/stavangerkommune/bookingfrontend:9468-12740,12986
/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919,14924-14978,14980-15258,15297,15312-15335,15585-15617,15621-15630,15714-15764,15813-15814

Modified: branches/Version-2_0-branch/bookingfrontend/login.php
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/login.php       2016-10-12 
11:53:22 UTC (rev 15814)
+++ branches/Version-2_0-branch/bookingfrontend/login.php       2016-10-12 
11:56:11 UTC (rev 15815)
@@ -17,11 +17,14 @@
                $GLOBALS['phpgw']->sessions = createObject('phpgwapi.sessions');
        }
 
-       $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);
-       $GLOBALS['phpgw']->session->appsession('tenant_id', 'property', 
$tenant_id);
 
        $GLOBALS['phpgw']->hooks->process('login');