[Fmsystem-commits] [16402] correcting url for changing org representation

[sigurdne]

Revision: 16402
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16402
Author:   sigurdne
Date:     2017-03-07 03:42:09 -0500 (Tue, 07 Mar 2017)
Log Message:
-----------
correcting url for changing org representation

Modified Paths:
--------------
    trunk/eventplannerfrontend/inc/class.hook_helper.inc.php

Modified: trunk/eventplannerfrontend/inc/class.hook_helper.inc.php
===================================================================
--- trunk/eventplannerfrontend/inc/class.hook_helper.inc.php    2017-03-01 
13:23:16 UTC (rev 16401)
+++ trunk/eventplannerfrontend/inc/class.hook_helper.inc.php    2017-03-07 
08:42:09 UTC (rev 16402)
@@ -138,6 +138,10 @@
                                }
                        }
 
+                       /**
+                        * $_SESSION['orgs'] is set in 
eventplannerfrontend_external_user::get_user_org_id()
+                        */
+
                        if(!empty($_SESSION['orgs']) && 
is_array($_SESSION['orgs']))
                        {
                                $orgs = phpgw::get_var('orgs', 'string', 
'SESSION');
@@ -167,7 +171,13 @@
 
                        if ($orgs)
                        {
-                               $action = 
"{$_SERVER['REQUEST_SCHEME']}://{$_SERVER['SERVER_NAME']}{$_SERVER['REQUEST_URI']}";
+                               $action_data = array();
+                               if(!empty($_GET['menuaction']))
+                               {
+                                       $action_data['menuaction'] = 
phpgw::get_var('menuaction');
+                               }
+                               $action = 
$GLOBALS['phpgw']->link('/eventplannerfrontend/',$action_data);
+
                                $message = 'Velg organisasjon';
 
                                $org_select = <<<HTML