[Fmsystem-commits] [15626] redirect

[sigurdne]

Revision: 15626
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15626
Author:   sigurdne
Date:     2016-09-08 13:27:06 +0000 (Thu, 08 Sep 2016)
Log Message:
-----------
redirect

Modified Paths:
--------------
    trunk/booking/inc/class.socommon.inc.php
    trunk/booking/inc/class.uibooking.inc.php

Modified: trunk/booking/inc/class.socommon.inc.php
===================================================================
--- trunk/booking/inc/class.socommon.inc.php    2016-09-08 13:26:49 UTC (rev 
15625)
+++ trunk/booking/inc/class.socommon.inc.php    2016-09-08 13:27:06 UTC (rev 
15626)
@@ -261,7 +261,6 @@
                        else if ($type == 'json')
                        {
                                return "'" . json_encode($value) . "'";
-                               ;
                        }
 
                        //Sanity check
@@ -293,6 +292,10 @@
                        {
                                return json_decode($value, true);
                        }
+                       else if ($type == 'string')
+                       {
+                               return 
htmlspecialchars_decode(stripslashes(str_replace(array('&#40&#59;', 
'&#41&#59;'), array('(', ')'), $value)),ENT_QUOTES);
+                       }
 
                        //Sanity check
                        if (!$this->valid_field_type($type))

Modified: trunk/booking/inc/class.uibooking.inc.php
===================================================================
--- trunk/booking/inc/class.uibooking.inc.php   2016-09-08 13:26:49 UTC (rev 
15625)
+++ trunk/booking/inc/class.uibooking.inc.php   2016-09-08 13:27:06 UTC (rev 
15626)
@@ -918,6 +918,11 @@
                                        }
                                        if ($step == 3)
                                        {
+                                               $application_id = 
$booking['application_id'] ? $booking['application_id'] : 
$allocation['application_id'];
+                                               if($application_id)
+                                               {
+                                                       
$this->redirect(array('menuaction' => 'booking.uiapplication.show', 'id' => 
$application_id));
+                                               }
                                                $building_id = 
$booking['building_id'] ? $booking['building_id'] : $allocation['building_id'];
                                                
$this->redirect(array('menuaction' => 'booking.uimassbooking.schedule', 'id' => 
$building_id));
                                        }