correction retour à la page précédente

GIP-RECIA · May 31, 2024 · af73204 · af73204
1 parent c7d6979
commit af73204
Show file tree

Hide file tree

Showing 55 changed files with 149 additions and 194 deletions.
diff --git a/admin/admin_access_area.php b/admin/admin_access_area.php
@@ -29,9 +29,7 @@
 $msg = '';
 
 
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 $day   = date("d");
 $month = date("m");
 $year  = date("Y");

diff --git a/admin/admin_accueil.php b/admin/admin_accueil.php
@@ -17,9 +17,7 @@
  */
 include "../include/admin.inc.php";
 $grr_script_name = "admin_accueil.php";
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 if ((authGetUserLevel(getUserName(), -1, 'area') < 4) && (authGetUserLevel(getUserName(), -1, 'user') !=  1))
 {
 	showAccessDenied($back);

diff --git a/admin/admin_admin_site.php b/admin/admin_admin_site.php
@@ -23,9 +23,8 @@
 	$id_site = get_default_site();
 if (!isset($id_site))
 	settype($id_site, "integer");
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
+
 check_access(6, $back);
 if (Settings::get("module_multisite") != "Oui")
 {
@@ -174,4 +173,4 @@ function site_go()
 		echo "</td></tr></table>";
 		?>
 	</body>
-	</html>
+	</html>
diff --git a/admin/admin_calend.php b/admin/admin_calend.php
@@ -19,8 +19,7 @@
 include "../include/admin.inc.php";
 $grr_script_name = "admin_calend.php";
 
-$back = '';
-if (isset($_SERVER['HTTP_REFERER'])) $back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 
 // vérification des droits d'accès 
 if(authGetUserLevel(getUserName(),-1,'area') < 5)

diff --git a/admin/admin_calend2.php b/admin/admin_calend2.php
@@ -18,9 +18,7 @@
 include "../include/admin.inc.php";
 $grr_script_name = "admin_calend2.php";
 
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 check_access(4, $back);
 // Initialisation
 $etape = isset($_POST["etape"]) ? $_POST["etape"] : NULL;
@@ -509,4 +507,4 @@ function validate_and_submit ()
 	echo "</td></tr></table>";
 	?>
 </body>
-</html>
+</html>
diff --git a/admin/admin_calend_ignore.php b/admin/admin_calend_ignore.php
@@ -18,9 +18,9 @@
 
 include "../include/admin.inc.php";
 $grr_script_name = "admin_calend_ignore.php";
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+
+$back = getBackUri();
+
 check_access(6, $back);
 # print the page header
 print_header("", "", "", $type="with_session");

diff --git a/admin/admin_calend_jour_cycle.php b/admin/admin_calend_jour_cycle.php
@@ -18,9 +18,7 @@
 
 include "../include/admin.inc.php";
 $grr_script_name = "admin_calend_jour_cycle.php";
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 $_SESSION['chemin_retour'] = "admin_calend_jour_cycle.php";
 $day   = date("d");
 $month = date("m");

diff --git a/admin/admin_calend_vacances_feries.php b/admin/admin_calend_vacances_feries.php
@@ -18,9 +18,7 @@
 
 include "../include/admin.inc.php";
 $grr_script_name = "admin_calend_vacances_feries.php";
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 check_access(6, $back);
 # print the page header
 print_header("", "", "", $type="with_session");

diff --git a/admin/admin_cgu.php b/admin/admin_cgu.php
@@ -19,9 +19,7 @@
 include "../include/admin.inc.php";
 require_once("../include/pages.class.php");
 $grr_script_name = "admin_cgu.php";
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 $_SESSION['chemin_retour'] = "admin_cgu.php";
 $day   = date("d");
 $month = date("m");
@@ -96,4 +94,4 @@
 
 // fin de l'affichage de la colonne de droite
 echo '</td></tr></table>';
-?>
+?>
diff --git a/admin/admin_change_pwd.php b/admin/admin_change_pwd.php
@@ -18,9 +18,7 @@
 
 include "../include/admin.inc.php";
 $grr_script_name = "admin_change_pwd.php";
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-    $back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 check_access(6, $back);
 // Restriction dans le cas d'une démo
 VerifyModeDemo();

diff --git a/admin/admin_config.php b/admin/admin_config.php
@@ -18,9 +18,7 @@
 
 include "../include/admin.inc.php";
 $grr_script_name = "admin_config.php";
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 $_SESSION['chemin_retour'] = "admin_config.php";
 $day   = date("d");
 $month = date("m");

diff --git a/admin/admin_config_calend2.php b/admin/admin_config_calend2.php
@@ -17,9 +17,7 @@
  */
 
 $grr_script_name = "admin_config_calend2.php";
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 check_access(6, $back);
 # print the page header
 print_header("", "", "", $type="with_session");
@@ -144,4 +142,4 @@
 echo "</td></tr></table>";
 ?>
 </body>
-</html>
+</html>
diff --git a/admin/admin_config_calend3.php b/admin/admin_config_calend3.php
@@ -96,8 +96,7 @@ function cal3($month, $year)
     $s .= "</table>\n";
     return $s;
 }
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 	check_access(6, $back);
 	print_header("", "", "", $type = "with_session");
 	// Affichage de la colonne de gauche
@@ -230,4 +229,4 @@ function check (select)
 		}
 	</script>
 </body>
-</html>
+</html>
diff --git a/admin/admin_config_imap.php b/admin/admin_config_imap.php
@@ -45,9 +45,7 @@
 		$grrSettings['imap_statut'] = $_POST['imap_statut'];
 	}
 }
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 if ((isset($imap_restrictions)) && ($imap_restrictions == true))
 {
 	showAccessDenied($back);
@@ -311,4 +309,4 @@
 	echo "</td></tr></table>";
 ?>
 </body>
-</html>
+</html>
diff --git a/admin/admin_config_ldap.php b/admin/admin_config_ldap.php
@@ -162,9 +162,7 @@
 			<?php
 			die();
 		};
-		$back = '';
-		if (isset($_SERVER['HTTP_REFERER']))
-			$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+		$back = getBackUri();
 		if ((isset($ldap_restrictions)) && ($ldap_restrictions == true))
 		{
 			showAccessDenied($back);

diff --git a/admin/admin_config_sso.php b/admin/admin_config_sso.php
@@ -19,9 +19,7 @@
 include "../include/admin.inc.php";
 $grr_script_name = "admin_config_sso.php";
 
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 if ((isset($sso_restrictions)) && ($sso_restrictions==true))
 {
 	showAccessDenied($back);
@@ -138,8 +136,7 @@
 		echo "Erreur lors de l'enregistrement de sso_redirection_accueil_grr !<br />";
 }
 
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 if ((authGetUserLevel(getUserName(), -1) < 6) && ($valid != 'yes'))
 {
 	showAccessDenied($back);

diff --git a/admin/admin_confirm_change_date_bookings.php b/admin/admin_confirm_change_date_bookings.php
@@ -19,9 +19,8 @@
 
 include "../include/admin.inc.php";
 $grr_script_name = "admin_confirm_change_date_bookings.php";
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+
+$back = getBackUri();
 unset($display);
 $display = isset($_GET["display"]) ? $_GET["display"] : NULL;
 $day   = date("d");

diff --git a/admin/admin_corresp_statut.php b/admin/admin_corresp_statut.php
@@ -17,9 +17,7 @@
 
 include "../include/admin.inc.php";
 $grr_script_name = "admin_config_sso.php";
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 if (Settings::get("sso_ac_corr_profil_statut") != 'y')
 {
 	showAccessDenied($back);
@@ -76,9 +74,7 @@
 	else
 		$msg = get_vocab("message_records");
 }
-$back = "";
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 //print the page header
 print_header("", "", "", $type="with_session");
 // Affichage de la colonne de gauche

diff --git a/admin/admin_delete_entry_after.php b/admin/admin_delete_entry_after.php
@@ -17,9 +17,7 @@
 
 include "../include/admin.inc.php";
 $grr_script_name = "admin_delete_entry_after.php";
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 $_SESSION['chemin_retour'] = "admin_config.php";
 
 if (!Settings::load()) {
@@ -132,4 +130,4 @@
 
 echo "<a href=\"admin_calend.php\">".get_vocab('returnprev')."</a><p>";
 
-include "../include/trailer.inc.php"; ?>
+include "../include/trailer.inc.php"; ?>
diff --git a/admin/admin_delete_entry_before.php b/admin/admin_delete_entry_before.php
@@ -17,9 +17,7 @@
 
 include "../include/admin.inc.php";
 $grr_script_name = "admin_delete_entry_before.php";
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 $_SESSION['chemin_retour'] = "admin_config.php";
 
 if (!Settings::load()) {
@@ -130,4 +128,4 @@
 
 echo "<a href=\"admin_calend.php\">".get_vocab('returnprev')."</a><p>";
 
-include "../include/trailer.inc.php"; ?>
+include "../include/trailer.inc.php"; ?>
diff --git a/admin/admin_edit_room.php b/admin/admin_edit_room.php
@@ -86,9 +86,7 @@
 	$moderate = 0;
 settype($type_affichage_reser, "integer");
 
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 
 if (isset($_POST["change_room_and_back"]))
 {

diff --git a/admin/admin_email_manager.php b/admin/admin_email_manager.php
@@ -24,9 +24,8 @@
 	settype($room,"integer");
 if (!isset($id_area))
 	settype($id_area,"integer");
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+
+$back = getBackUri();
 check_access(4, $back);
 // tableau des ressources auxquelles l'utilisateur n'a pas accès
 $tab_rooms_noaccess = verif_acces_ressource(getUserName(), 'all');
@@ -278,4 +277,4 @@ function room_go()
 echo "</td></tr></table>";
 ?>
 </body>
-</html>
+</html>
diff --git a/admin/admin_import_entries_csv_udt.php b/admin/admin_import_entries_csv_udt.php
@@ -18,9 +18,7 @@
 include "../include/admin.inc.php";
 $grr_script_name = "admin_import_entries_csv_udt.php";
 
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 $_SESSION['chemin_retour'] = "admin_config.php";
 
 if (!Settings::load()) {
@@ -604,4 +602,4 @@ function entre_reservation($room_id,$jour_semaine,$name,$description,
 		// Retour au calendrier
 }
 
-?>
+?>
diff --git a/admin/admin_import_users_csv.php b/admin/admin_import_users_csv.php
@@ -19,9 +19,7 @@
 include "../include/admin.inc.php";
 $grr_script_name = "admin_import_users_csv.php";
 
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 if ((authGetUserLevel(getUserName(), -1) < 6) && (authGetUserLevel(getUserName(), -1, 'user') !=  1))
 {
 	showAccessDenied($back);

diff --git a/admin/admin_import_users_elycee.php b/admin/admin_import_users_elycee.php
@@ -18,9 +18,7 @@
 include "../include/admin.inc.php";
 $grr_script_name = "admin_import_users_elycee.php";
 
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 if ((authGetUserLevel(getUserName(), -1) < 6) && (authGetUserLevel(getUserName(), -1, 'user') !=  1))
 {
 	showAccessDenied($back);
@@ -286,4 +284,4 @@
 	 echo "</td></tr></table>"; // fin de la colonne droite
     ?>
     </body>
-	</html>
+	</html>
diff --git a/admin/admin_import_xml_edt.php b/admin/admin_import_xml_edt.php
@@ -18,9 +18,7 @@
 include "../include/admin.inc.php";
 $grr_script_name = "admin_import_xml_edt.php";
 
-$back = '';
-if (isset($_SERVER['HTTP_REFERER']))
-	$back = htmlspecialchars($_SERVER['HTTP_REFERER']);
+$back = getBackUri();
 $_SESSION['chemin_retour'] = "admin_config.php";
 
 if (!Settings::load()) {
@@ -539,4 +537,4 @@ function entre_reservation($room_id,$jour_semaine,$name,$description,
 		// Retour au calendrier
 }
 
-?>
+?>