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

[sigurdne]

Revision: 16404
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16404
Author:   sigurdne
Date:     2017-03-07 05:02:04 -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-07 
08:46:00 UTC (rev 16403)
+++ trunk/eventplannerfrontend/inc/class.hook_helper.inc.php    2017-03-07 
10:02:04 UTC (rev 16404)
@@ -124,7 +124,6 @@
                        {
                                return;
                        }
-                       
                        $session_org_id = phpgw::get_var('session_org_id','int' 
, 'POST');
                        if($session_org_id)
                        {
@@ -137,6 +136,10 @@
                                        $_SESSION['org_id'] = '';
                                }
                        }
+                       else if ($_POST['session_org_id'])
+                       {
+                               $_SESSION['org_id'] = '';
+                       }
 
                        /**
                         * $_SESSION['orgs'] is set in 
eventplannerfrontend_external_user::get_user_org_id()
@@ -171,12 +174,19 @@
 
                        if ($orgs)
                        {
-                               $action_data = array();
                                if(!empty($_GET['menuaction']))
                                {
-                                       $action_data['menuaction'] = 
phpgw::get_var('menuaction');
+                                       $action = 
$GLOBALS['phpgw']->link('/eventplannerfrontend/',
+                                               array
+                                               (
+                                                       'menuaction' => 
phpgw::get_var('menuaction')
+                                               )
+                                       );
                                }
-                               $action = 
$GLOBALS['phpgw']->link('/eventplannerfrontend/',$action_data);
+                               else
+                               {
+                                       $action = 
$GLOBALS['phpgw']->link('/eventplannerfrontend/home.php');
+                               }
 
                                $message = 'Velg organisasjon';