[Fmsystem-commits] [15852] more on cookies

[sigurdne]

Revision: 15852
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15852
Author:   sigurdne
Date:     2016-10-18 12:37:24 +0000 (Tue, 18 Oct 2016)
Log Message:
-----------
more on cookies

Modified Paths:
--------------
    trunk/helpdesk/inc/class.menu.inc.php
    trunk/phpgwapi/inc/class.sessions.inc.php

Modified: trunk/helpdesk/inc/class.menu.inc.php
===================================================================
--- trunk/helpdesk/inc/class.menu.inc.php       2016-10-18 12:37:01 UTC (rev 
15851)
+++ trunk/helpdesk/inc/class.menu.inc.php       2016-10-18 12:37:24 UTC (rev 
15852)
@@ -45,12 +45,21 @@
                        $acl = & $GLOBALS['phpgw']->acl;
                        $menus = array();
 
+                       $config = CreateObject('phpgwapi.config', 
'helpdesk')->read();
+                       if (!empty($config['app_name']))
+                       {
+                               $lang_app_name = $config['app_name'];
+                       }
+                       else
+                       {
+                               $lang_app_name = lang('helpdesk');
+                       }
 
                        $menus['navbar'] = array
                                (
                                        'helpdesk' => array
                                        (
-                                               'text'  => lang('helpdesk'),
+                                               'text'  => $lang_app_name,
                                                'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
"helpdesk.uitts.index") ),
                                                'image' => array('helpdesk', 
'navbar'),
                                                'order' => 35,

Modified: trunk/phpgwapi/inc/class.sessions.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.sessions.inc.php   2016-10-18 12:37:01 UTC (rev 
15851)
+++ trunk/phpgwapi/inc/class.sessions.inc.php   2016-10-18 12:37:24 UTC (rev 
15852)
@@ -154,10 +154,7 @@
                                $use_cookies = true;
                                $this->_sessionid       = 
phpgw::get_var(session_name(), 'string', 'COOKIE');
 
-                               if(!$this->_sessionid)
-                               {
-                                       
$GLOBALS['phpgw']->hooks->process('set_cookie_domain', array('mobilefrontend', 
'bookingfrontend', 'activitycalendarfrontend'));
-                               }
+                               
$GLOBALS['phpgw']->hooks->process('set_cookie_domain', array('mobilefrontend', 
'bookingfrontend', 'activitycalendarfrontend'));
 
                                $this->_phpgw_set_cookie_params();
                        }