mutliples bugfixes related to connector

bb3f7954 · Sofiane Lasri · 90942895 · bb3f7954 · bb3f7954 · bb3f7954
Commit bb3f7954 authored 3 years ago by Sofiane Lasri
--- a/vbcms-core/defaultPages/404.php
+++ b/vbcms-core/defaultPages/404.php
 <?php
+if(isset($bdd)){
+    $websiteUrl = VBcmsGetSetting("websiteUrl");
+}else{
    if(isset($_SERVER['HTTPS'])) $http = "https"; else $http = "http";
    $url = parse_url("$http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
    $websiteUrl = $url["scheme"]."://".$url["host"]."/";
+}
 ?>
 <!DOCTYPE html>
 <html lang="fr">

--- a/vbcms-core/defaultPages/ext404.php
+++ b/vbcms-core/defaultPages/ext404.php
 <?php
+if(isset($bdd)){
+    $websiteUrl = VBcmsGetSetting("websiteUrl");
+}else{
    if(isset($_SERVER['HTTPS'])) $http = "https"; else $http = "http";
    $url = parse_url("$http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
    $websiteUrl = $url["scheme"]."://".$url["host"]."/";
+}
 ?>
 <!DOCTYPE html>
 <html lang="fr">

--- a/vbcms-core/defaultPages/index.php
+++ b/vbcms-core/defaultPages/index.php
 <?php
+if(isset($bdd)){
+    $websiteUrl = VBcmsGetSetting("websiteUrl");
+}else{
    if(isset($_SERVER['HTTPS'])) $http = "https"; else $http = "http";
    $url = parse_url("$http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
    $websiteUrl = $url["scheme"]."://".$url["host"]."/";
+}
 ?>
 <!DOCTYPE html>
 <html lang="fr">

--- a/vbcms-core/functions.php
+++ b/vbcms-core/functions.php
@@ -152,6 +152,7 @@ function show404($type){
 	if ($type=="client") {
 		// Affiche la page 404 du site client
        // A savoir que les pages 404 des modules sont gérées par ces derniers
+        global $bdd;
 		include $GLOBALS['vbcmsRootPath'].'/vbcms-core/defaultPages/404.php';
        
 	} elseif($type=="admin") {

--- a/vbcms-core/variables.php
+++ b/vbcms-core/variables.php
@@ -15,4 +15,7 @@ if(isset($_SERVER['HTTPS'])) $http = "https"; else $http = "http";

 // Variables permettant la gestion des pages à afficher
 $url = parse_url("$http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
+if(!isset($urlPath)){
    $urlPath = explode("/", $url["path"]);
+}
+