[Fmsystem-commits] [17329] more on session handling

[sigurdne]

Revision: 17329
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17329
Author:   sigurdne
Date:     2017-11-18 11:05:38 -0500 (Sat, 18 Nov 2017)
Log Message:
-----------
more on session handling

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

Modified: trunk/helpdesk/inc/class.menu.inc.php
===================================================================
--- trunk/helpdesk/inc/class.menu.inc.php       2017-11-18 14:56:18 UTC (rev 
17328)
+++ trunk/helpdesk/inc/class.menu.inc.php       2017-11-18 16:05:38 UTC (rev 
17329)
@@ -242,6 +242,10 @@
                                        );
                                        foreach ($custom_menu_items as $item)
                                        {
+                                               if(empty($item['local_files']))
+                                               {
+                                                       $item['url'] .= '&' . 
get_phpgw_session_url();                                                  
+                                               }
                                                
$menus['navigation']['report']['children'][] = $item;
                                        }
                                }

Modified: trunk/property/inc/class.menu.inc.php
===================================================================
--- trunk/property/inc/class.menu.inc.php       2017-11-18 14:56:18 UTC (rev 
17328)
+++ trunk/property/inc/class.menu.inc.php       2017-11-18 16:05:38 UTC (rev 
17329)
@@ -1340,12 +1340,13 @@
                                {
                                        
$menus['navigation']['documentation']['children'][] = array
                                                (
-                                               'url' => $item['url'],
+                                               'url' => $item['url'] .=  
!empty($item['local_files']) ? '' : '&' . get_phpgw_session_url(),
                                                'text' => $item['text'],
                                                'target' => $item['target'] ? 
$item['target'] : '_blank',
                                                'local_files' => 
$item['local_files']
                                        );
                                }
+                               unset($item);
                        }
 
                        if ($acl->check('.custom', PHPGW_ACL_READ, 'property'))
@@ -1386,8 +1387,14 @@
                                                {
                                                        foreach 
($custom_menu_items as $item)
                                                        {
+                                                               
if(empty($item['local_files']))
+                                                               {
+                                                                       
$item['url'] .= '&' . get_phpgw_session_url();
+                                                               }
+
                                                                
$menus['navigation']["entity_{$entry['id']}"]['children'][] = $item;
                                                        }
+                                                       unset($item);
                                                }
 
                                                /*