FIX Redirection après suppression réservation #343

JeromeDevome · Mar 3, 2024 · 294971f · 294971f
1 parent 6e529d1
commit 294971f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/day.php b/day.php
@@ -189,7 +189,7 @@
 grr_sql_free($res);
 
 // Détermination des ressources à afficher
-if($room_back != 'all')
+if($room_back != 'all' && $room_back != 0)
 	$sql = "SELECT room_name, capacity, id, description, statut_room, show_fic_room, delais_option_reservation, moderate, who_can_book, show_comment, comment_room FROM ".TABLE_PREFIX."_room WHERE id = '".protect_data_sql($room_back)."' ";
 else
 	$sql = "SELECT room_name, capacity, id, description, statut_room, show_fic_room, delais_option_reservation, moderate, who_can_book, show_comment, comment_room FROM ".TABLE_PREFIX."_room WHERE area_id='".protect_data_sql($area)."' ORDER BY order_display, room_name";
@@ -359,7 +359,7 @@
 		affiche_ressource_empruntee($id_room[$i]);
 		echo '<span id="boutonSelection'.$a.'" style="display:none;">'.PHP_EOL;
 		echo '<input type="button" class="btn btn-default btn-xs" title="'.htmlspecialchars(get_vocab("see_week_for_this_room")).'" onclick="charger();javascript: location.href=\'week.php?year='.$year.'&amp;month='.$month.'&amp;day='.$day.'&amp;room='.$id_room[$i].'\';" value="'.get_vocab('week').'"/>'.PHP_EOL;
-		echo '<input type="button" class="btn btn-default btn-xs" title="'.htmlspecialchars(get_vocab("see_month_for_this_room")).'" onclick="charger();javascript: location.href=\'month.php?year='.$year.'&amp;month='.$month.'&amp;day='.$day.'&amp;room='.$id_room[$i].'\';" value="'.get_vocab('month').'"/>'.PHP_EOL;
+		echo '<input type="button" class="btn btn-default btn-xs" title="'.htmlspecialchars(get_vocab("see_month_for_this_room")).'" onclick="charger();javascript: location.href=\'app.php?p=mois&year='.$year.'&amp;month='.$month.'&amp;day='.$day.'&amp;room='.$id_room[$i].'\';" value="'.get_vocab('month').'"/>'.PHP_EOL;
 		echo '</span>'.PHP_EOL;
 		if (htmlspecialchars($row["description"]).$temp != '')
 		{

diff --git a/include/functions.inc.php b/include/functions.inc.php
@@ -336,7 +336,7 @@ function decode_options($a,$modele){
 function Definition_ressource_domaine_site()
 {
 	global $room, $area, $id_site;
-	if (isset($_GET['room']))
+	if (isset($_GET['room']) && $_GET['room'] != 'all')
 	{
 		$room = intval(clean_input($_GET['room']));
 		$area = mrbsGetRoomArea($room);