[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17176] more on prepare for non-cookie
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17176] more on prepare for non-cookie |
|
Date: |
Fri, 20 Oct 2017 10:12:18 -0400 (EDT) |
Revision: 17176
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17176
Author: sigurdne
Date: 2017-10-20 10:12:17 -0400 (Fri, 20 Oct 2017)
Log Message:
-----------
more on prepare for non-cookie
Modified Paths:
--------------
trunk/activitycalendarfrontend/inc/class.hook_helper.inc.php
trunk/activitycalendarfrontend/templates/base/config.tpl
trunk/bookingfrontend/inc/class.hook_helper.inc.php
trunk/bookingfrontend/inc/class.uiallocation.inc.php
trunk/bookingfrontend/templates/base/allocation_info.xsl
trunk/bookingfrontend/templates/base/config.tpl
trunk/eventplannerfrontend/inc/class.hook_helper.inc.php
trunk/eventplannerfrontend/templates/base/config.tpl
trunk/mobilefrontend/inc/class.hook_helper.inc.php
trunk/phpgwapi/inc/class.sessions.inc.php
Modified: trunk/activitycalendarfrontend/inc/class.hook_helper.inc.php
===================================================================
--- trunk/activitycalendarfrontend/inc/class.hook_helper.inc.php
2017-10-20 13:37:30 UTC (rev 17175)
+++ trunk/activitycalendarfrontend/inc/class.hook_helper.inc.php
2017-10-20 14:12:17 UTC (rev 17176)
@@ -58,6 +58,7 @@
if (!empty($config->config_data['cookie_domain']))
{
$GLOBALS['phpgw_info']['server']['cookie_domain'] =
$config->config_data['cookie_domain'];
- }
+ }
+ $GLOBALS['phpgw_info']['server']['usecookies'] =
$config->config_data['usecookies'];
}
}
\ No newline at end of file
Modified: trunk/activitycalendarfrontend/templates/base/config.tpl
===================================================================
--- trunk/activitycalendarfrontend/templates/base/config.tpl 2017-10-20
13:37:30 UTC (rev 17175)
+++ trunk/activitycalendarfrontend/templates/base/config.tpl 2017-10-20
14:12:17 UTC (rev 17176)
@@ -14,6 +14,15 @@
<tr bgcolor="{row_off}">
<td colspan="2"><b>{Registration_settings}</b></td>
</tr>
+ <tr class="pure-table-odd">
+ <td>{lang_Use_cookies_to_pass_sessionid}:</td>
+ <td>
+ <select name="newsettings[usecookies]">
+ <option value="">{lang_No}</option>
+ <option
value="True"{selected_usecookies_True}>{lang_Yes}</option>
+ </select>
+ </td>
+ </tr>
<tr class="row_on">
<td>{lang_cookie_domain_for_sessions_-_if_Same_as_framework_leave_empty}</td>
<td><input name="newsettings[cookie_domain]"
value="{value_cookie_domain}"></td>
Modified: trunk/bookingfrontend/inc/class.hook_helper.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.hook_helper.inc.php 2017-10-20 13:37:30 UTC
(rev 17175)
+++ trunk/bookingfrontend/inc/class.hook_helper.inc.php 2017-10-20 14:12:17 UTC
(rev 17176)
@@ -59,5 +59,6 @@
{
$GLOBALS['phpgw_info']['server']['cookie_domain'] =
$config->config_data['cookie_domain'];
}
+ $GLOBALS['phpgw_info']['server']['usecookies'] =
$config->config_data['usecookies'];
}
}
\ No newline at end of file
Modified: trunk/bookingfrontend/inc/class.uiallocation.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.uiallocation.inc.php 2017-10-20
13:37:30 UTC (rev 17175)
+++ trunk/bookingfrontend/inc/class.uiallocation.inc.php 2017-10-20
14:12:17 UTC (rev 17176)
@@ -384,7 +384,7 @@
$allocation['resource'] = phpgw::get_var('resource');
$allocation['resource_info'] = join(', ', $res_names);
$allocation['building_link'] =
self::link(array('menuaction' => 'bookingfrontend.uibuilding.show',
- 'id' =>
$allocation['resources'][0]['building_id']));
+ 'id' => $allocation['building_id']));
$allocation['org_link'] = self::link(array('menuaction'
=> 'bookingfrontend.uiorganization.show',
'id' =>
$allocation['organization_id']));
$bouser = CreateObject('bookingfrontend.bouser');
Modified: trunk/bookingfrontend/templates/base/allocation_info.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/allocation_info.xsl 2017-10-20
13:37:30 UTC (rev 17175)
+++ trunk/bookingfrontend/templates/base/allocation_info.xsl 2017-10-20
14:12:17 UTC (rev 17176)
@@ -8,7 +8,7 @@
</dt>
<dd>
<a href="{allocation/building_link}">
- <xsl:value-of
select="allocation/resources[position()=1]/building_name"/>
+ <xsl:value-of
select="allocation/building_name"/>
</a>
(<xsl:value-of select="allocation/resource_info"/>)
</dd>
Modified: trunk/bookingfrontend/templates/base/config.tpl
===================================================================
--- trunk/bookingfrontend/templates/base/config.tpl 2017-10-20 13:37:30 UTC
(rev 17175)
+++ trunk/bookingfrontend/templates/base/config.tpl 2017-10-20 14:12:17 UTC
(rev 17176)
@@ -28,6 +28,15 @@
</select>
</td>
</tr>
+ <tr class="pure-table-odd">
+ <td>{lang_Use_cookies_to_pass_sessionid}:</td>
+ <td>
+ <select name="newsettings[usecookies]">
+ <option value="">{lang_No}</option>
+ <option
value="True"{selected_usecookies_True}>{lang_Yes}</option>
+ </select>
+ </td>
+ </tr>
<tr class="row_on">
<td>{lang_cookie_domain_for_sessions_-_if_Same_as_framework_leave_empty}</td>
<td><input name="newsettings[cookie_domain]"
value="{value_cookie_domain}"></td>
Modified: trunk/eventplannerfrontend/inc/class.hook_helper.inc.php
===================================================================
--- trunk/eventplannerfrontend/inc/class.hook_helper.inc.php 2017-10-20
13:37:30 UTC (rev 17175)
+++ trunk/eventplannerfrontend/inc/class.hook_helper.inc.php 2017-10-20
14:12:17 UTC (rev 17176)
@@ -86,7 +86,7 @@
{
$GLOBALS['phpgw_info']['server']['cookie_domain'] = $config['cookie_domain'];
}
-
+ $GLOBALS['phpgw_info']['server']['usecookies'] =
$config->config_data['usecookies'];
}
public function login( )
@@ -207,12 +207,12 @@
$message = 'Velg organisasjon';
$org_select = <<<HTML
-
+
<label for="session_org_id">Velg
Organisasjon:</label>
<select name="session_org_id"
id="session_org_id">
{$org_option}
</select>
-
+
HTML;
}
Modified: trunk/eventplannerfrontend/templates/base/config.tpl
===================================================================
--- trunk/eventplannerfrontend/templates/base/config.tpl 2017-10-20
13:37:30 UTC (rev 17175)
+++ trunk/eventplannerfrontend/templates/base/config.tpl 2017-10-20
14:12:17 UTC (rev 17176)
@@ -38,6 +38,15 @@
</select>
</td>
</tr>
+ <tr class="pure-table-odd">
+ <td>{lang_Use_cookies_to_pass_sessionid}:</td>
+ <td>
+ <select name="newsettings[usecookies]">
+ <option value="">{lang_No}</option>
+ <option
value="True"{selected_usecookies_True}>{lang_Yes}</option>
+ </select>
+ </td>
+ </tr>
<tr>
<td>{lang_cookie_domain_for_sessions_-_if_Same_as_framework_leave_empty}</td>
<td><input name="newsettings[cookie_domain]"
value="{value_cookie_domain}"></td>
Modified: trunk/mobilefrontend/inc/class.hook_helper.inc.php
===================================================================
--- trunk/mobilefrontend/inc/class.hook_helper.inc.php 2017-10-20 13:37:30 UTC
(rev 17175)
+++ trunk/mobilefrontend/inc/class.hook_helper.inc.php 2017-10-20 14:12:17 UTC
(rev 17176)
@@ -80,6 +80,6 @@
{
$GLOBALS['phpgw_info']['server']['cookie_domain'] =
$config->config_data['cookie_domain'];
}
-// $GLOBALS['phpgw_info']['server']['usecookies'] =
$config->config_data['usecookies'];
+ $GLOBALS['phpgw_info']['server']['usecookies'] =
$config->config_data['usecookies'];
}
}
\ No newline at end of file
Modified: trunk/phpgwapi/inc/class.sessions.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.sessions.inc.php 2017-10-20 13:37:30 UTC (rev
17175)
+++ trunk/phpgwapi/inc/class.sessions.inc.php 2017-10-20 14:12:17 UTC (rev
17176)
@@ -148,7 +148,7 @@
{
$this->_db =&
$GLOBALS['phpgw']->db;
$use_cookies = false;
- $GLOBALS['phpgw']->hooks->process('set_cookie_domain',
array('mobilefrontend', 'bookingfrontend', 'activitycalendarfrontend'));
+ $GLOBALS['phpgw']->hooks->process('set_cookie_domain',
array('evenplannerfrontend','mobilefrontend', 'bookingfrontend',
'activitycalendarfrontend'));
if (
isset($GLOBALS['phpgw_info']['server']['usecookies'])
&&
$GLOBALS['phpgw_info']['server']['usecookies'] == 'True' )
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17176] more on prepare for non-cookie,
sigurdne <=