[DEV] Merge from last version

master
Cédric BOUHOURS 1 year ago
parent b1e38a435a
commit ff0f489a06

@ -23,7 +23,7 @@ if (isset($_SESSION["promotion_page"])) {
openBloc($template, "specific");
affectToXHTML($template, array(
"STYLE_SPECIFIQUE" => "$nom_fichier",
"STYLE_SPECIFIQUE" => (getenv("CONTAINER_PATH")??"")."$nom_fichier",
"AGE_STYLE_SPECIFIQUE" => filemtime($nom_fichier)
));
}
@ -33,7 +33,7 @@ if (isset($_SESSION["promotion_page"])) {
openBloc($template, "specific_js");
affectToXHTML($template, array(
"JS_SPECIFIQUE" => "$nom_fichier",
"JS_SPECIFIQUE" => (getenv("CONTAINER_PATH")??"")."$nom_fichier",
"AGE_JS_SPECIFIQUE" => filemtime($nom_fichier)
));
}
@ -48,9 +48,9 @@ require_once "bfmw/css/bfmw.php";
affectToXHTML($template, array(
"BFMW_STYLE" => getBFMWcss(),
"LOCAL_STYLE" => "$local_style?v=".filemtime($local_style),
"BFMW_JS" => "$bfmw_js?v=".filemtime($bfmw_js),
"LOCAL_JS" => "$local_js?v=".filemtime($local_js)
"LOCAL_STYLE" => (getenv("CONTAINER_PATH")??"")."$local_style?v=".filemtime($local_style),
"BFMW_JS" => (getenv("CONTAINER_PATH")??"")."$bfmw_js?v=".filemtime($bfmw_js),
"LOCAL_JS" => (getenv("CONTAINER_PATH")??"")."$local_js?v=".filemtime($local_js)
));
generateCompleteXHTML($template, "header");

@ -33,12 +33,12 @@ function getBFMWcss() : string{
$retour = "";
foreach ($les_fichiers as $un_fichier) {
$retour .= "\t\t<link href=\"bfmw/css/".$un_fichier."?v=".filemtime(__DIR__."/".$un_fichier)."\" rel=\"stylesheet\" type=\"text/css\">\n";
$retour .= "\t\t<link href=\"".(getenv("CONTAINER_PATH")??"")."bfmw/css/".$un_fichier."?v=".filemtime(__DIR__."/".$un_fichier)."\" rel=\"stylesheet\" type=\"text/css\">\n";
}
$fichier_print = "print.css";
$retour .= "\t\t<link href=\"bfmw/css/".$fichier_print."?v=".filemtime(__DIR__."/".$fichier_print)."\" rel=\"stylesheet\" type=\"text/css\" media=\"print\">\n";
$retour .= "\t\t<link href=\"".(getenv("CONTAINER_PATH")??"")."bfmw/css/".$fichier_print."?v=".filemtime(__DIR__."/".$fichier_print)."\" rel=\"stylesheet\" type=\"text/css\" media=\"print\">\n";
return $retour;
}

@ -15,6 +15,7 @@
*
*/
const BASE_URL_LIBRARY = "https://codefirst.iut.uca.fr/containers/mchCICD-openlibraryws_wrapper/";
define("BASE_URL_LIBRARY", getenv("LIBRARY_URL")??"");
define("BASE_URL_BACKEND", getenv("BACKEND_URL")??"");
const GET_BOOKS_BY_TITLE = "book/getbooksbytitle";
const GET_BOOKS_BY_AUTHOR = "book/getbooksbyauthor";

@ -1,4 +1,5 @@
<?php
class WS_Util
{
public static function CallWebService(string $base_url,string $endpoint, string $method,array $queryParams = [], $requestBody = [], string $login = "", string $pwd = "" ) : array {

Loading…
Cancel
Save