[Fmsystem-commits] [17170] session handling

[sigurdne]

Revision: 17170
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17170
Author:   sigurdne
Date:     2017-10-19 15:30:04 -0400 (Thu, 19 Oct 2017)
Log Message:
-----------
session handling

Modified Paths:
--------------
    trunk/mobilefrontend/inc/class.hook_helper.inc.php
    trunk/mobilefrontend/templates/base/config.tpl
    trunk/phpgwapi/inc/class.sessions.inc.php

Modified: trunk/mobilefrontend/inc/class.hook_helper.inc.php
===================================================================
--- trunk/mobilefrontend/inc/class.hook_helper.inc.php  2017-10-19 13:49:59 UTC 
(rev 17169)
+++ trunk/mobilefrontend/inc/class.hook_helper.inc.php  2017-10-19 19:30:04 UTC 
(rev 17170)
@@ -79,6 +79,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/mobilefrontend/templates/base/config.tpl
===================================================================
--- trunk/mobilefrontend/templates/base/config.tpl      2017-10-19 13:49:59 UTC 
(rev 17169)
+++ trunk/mobilefrontend/templates/base/config.tpl      2017-10-19 19:30:04 UTC 
(rev 17170)
@@ -22,6 +22,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_off">
                        
<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/phpgwapi/inc/class.sessions.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.sessions.inc.php   2017-10-19 13:49:59 UTC (rev 
17169)
+++ trunk/phpgwapi/inc/class.sessions.inc.php   2017-10-19 19:30:04 UTC (rev 
17170)
@@ -148,6 +148,7 @@
                {
                        $this->_db                      =& 
$GLOBALS['phpgw']->db;
                        $use_cookies = false;
+                       $GLOBALS['phpgw']->hooks->process('set_cookie_domain', 
array('mobilefrontend', 'bookingfrontend', 'activitycalendarfrontend'));
                        if ( 
isset($GLOBALS['phpgw_info']['server']['usecookies'])
                                && 
$GLOBALS['phpgw_info']['server']['usecookies'] == 'True' )
                        {
@@ -154,8 +155,6 @@
                                $use_cookies = true;
                                $this->_sessionid       = 
phpgw::get_var(session_name(), 'string', 'COOKIE');
 
-                               
$GLOBALS['phpgw']->hooks->process('set_cookie_domain', array('mobilefrontend', 
'bookingfrontend', 'activitycalendarfrontend'));
-
                                $this->_phpgw_set_cookie_params();
                        }
                        else
@@ -914,12 +913,11 @@
                 */
                public function read_session($sessionid)
                {
-/*
                        if($sessionid)
                        {
                                session_id($sessionid);
                        }
-*/
+
                        session_start();
 
                        if(!session_id() == $sessionid)