Skip to content
Snippets Groups Projects
Commit 8cbfb806 authored by Sofiane Lasri's avatar Sofiane Lasri
Browse files

11-05-2021

parent f98d02f2
No related branches found
No related tags found
No related merge requests found
php_flag display_errors on
Options +FollowSymLinks -MultiViews
php_value upload_max_filesize 2048M
php_value post_max_size 2048M
Header set Access-Control-Allow-Origin: *
<IfModule mod_rewrite.c>
RewriteEngine on
......
......@@ -14,7 +14,7 @@ function loadModule($type, $moduleAlias, $moduleParams){
$response = $response->fetch(PDO::FETCH_ASSOC);
if (!empty($response)) {
include $vbcmsRootPath.'/vbcms-content/modules'.$response["path"]."/moduleLoadPage.php"; //module.php a été remplacé par divers fichiers représentant les fonctions
include $GLOBALS['vbcmsRootPath'].'/vbcms-content/modules'.$response["path"]."/moduleLoadPage.php"; //module.php a été remplacé par divers fichiers représentant les fonctions
// moduleLoadPage($type, $moduleParams); // Plus d'appel de fonction du coup
} else {
include 'clientPagesAssoc.php';
......@@ -44,7 +44,7 @@ function loadModule($type, $moduleAlias, $moduleParams){
$response = $response->fetch(PDO::FETCH_ASSOC);
if (!empty($response)) {
include $vbcmsRootPath.'/vbcms-content/modules'.$response["path"]."/moduleLoadPage.php"; //module.php a été remplacé par divers fichiers représentant les fonctions
include $GLOBALS['vbcmsRootPath'].'/vbcms-content/modules'.$response["path"]."/moduleLoadPage.php"; //module.php a été remplacé par divers fichiers représentant les fonctions
// moduleLoadPage($type, $moduleParams); // Plus d'appel de fonction du coup
} else {
show404($type);
......@@ -61,7 +61,7 @@ function show404($type){
} elseif($type=="admin") {
global $bdd, $http, $websiteUrl, $translation, $websiteName, $websiteMetaColor, $websiteDescription, $websiteLogo;
// Affiche la page 404 du panel admin
include $vbcmsRootPath."/vbcms-admin/404.php";
include $GLOBALS['vbcmsRootPath']."/vbcms-admin/404.php";
}
}
......@@ -79,7 +79,7 @@ function createModulePage($title, $description, $depedencies, $pageToInclude, $m
// On charge la page template du thème utilisé
$response = $bdd->query("SELECT * FROM `vbcms-themes` WHERE activated = 1");
$theme = $response->fetch(PDO::FETCH_ASSOC);
include $vbcmsRootPath.'/vbcms-content/themes'.$theme["path"].'/pages/template.php';
include $GLOBALS['vbcmsRootPath'].'/vbcms-content/themes'.$theme["path"].'/pages/template.php';
}
}
......@@ -90,7 +90,7 @@ function loadThemePage($page){
$response = $bdd->query("SELECT * FROM `vbcms-themes` WHERE activated = 1");
$theme = $response->fetch(PDO::FETCH_ASSOC);
include $vbcmsRootPath.'/vbcms-content/themes'.$theme["path"]."/pages/".$page;
include $GLOBALS['vbcmsRootPath'].'/vbcms-content/themes'.$theme["path"]."/pages/".$page;
}
function loadClientNavbar($parentId){
......@@ -150,7 +150,7 @@ if (isset($_SESSION["user_id"])){
$response = $bdd->prepare("SELECT * FROM `vbcms-modules` WHERE workshopId=?");
$response->execute([$workshopId]);
$response = $response->fetch(PDO::FETCH_ASSOC);
include $vbcmsRootPath.'/vbcms-content/modules'.$response["path"]."/init.php";
include $GLOBALS['vbcmsRootPath'].'/vbcms-content/modules'.$response["path"]."/init.php";
} else {
//il s'agit d'un thème
$response = $bdd->prepare("SELECT * FROM `vbcms-themes` WHERE workshopId=?");
......@@ -170,7 +170,7 @@ if (isset($_SESSION["user_id"])){
$response = $bdd->prepare("SELECT * FROM `vbcms-themes` WHERE workshopId=?");
$response->execute([$workshopId]);
$response = $response->fetch(PDO::FETCH_ASSOC);
include $vbcmsRootPath.'/vbcms-content/themes'.$response["path"]."/init.php";
include $GLOBALS['vbcmsRootPath'].'/vbcms-content/themes'.$response["path"]."/init.php";
}
}
}
......
......@@ -27,8 +27,10 @@ $isUpToDate = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name = 'upTo
$lastUpdateCheck = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name = 'lastUpdateCheck'")->fetchColumn();
if ($isUpToDate == 1) {
$updateMessage = $translation["isUpToDate"];
$textColor = "success";
} else {
$updateMessage = $translation["isNotUpToDate"];
$textColor = "danger";
}
?>
......@@ -70,7 +72,38 @@ if ($isUpToDate == 1) {
</div>
<div class="page-content notTop" leftSidebar="240" rightSidebar="0">
<h3><?=$translation["update"]?></h3>
<div class="row">
<div class="col">
<h5>Détail de la mise à jour</h5>
<p><span class="text-muted">Installée: </span><span class="text-<?=$textColor?>"><?=$vbcmsVer?></span>
<?php
if ($isUpToDate == 0) echo '<br><span class="text-muted">Disponible: </span><span class="text-success"><?=$updateInfosData["version"]?></span>';
?>
<br><span class="text-muted">Canal de mise à jour: </span>
<?php
if ($curentUpdateCanal == "release") {
echo '<span class="text-success">Release</span>';
} elseif ($curentUpdateCanal == "dev") {
echo '<span class="text-danger">Développement</span>';
} elseif ($curentUpdateCanal == "nightly") {
echo '<span class="text-warning">Bêta</span>';
}
?></p>
</div>
<div class="col-8"">
<h4>Détail de la mise à jour</h4>
</div>
<div class="col">
<h5>Obtenir de l'aide</h5>
<a class="text-dark" target="_blank" href="https://vbcms.net/doc"><i class="fas fa-book"></i> Documentation</a><br>
<a class="text-dark" target="_blank" href="https://vbcms.net/doc/faq"><i class="fas fa-question-circle"></i> Questions réponses</a><br>
<a class="text-dark" target="_blank" href="https://vbcms.net/manager/support"><i class="fas fa-life-ring"></i> Support</a><br>
<a class="text-dark" target="_blank" href="https://discord.gg/DpfF8Kz"><i class="fab fa-discord"></i> Notre discord</a>
</div>
</div>
</div>
</body>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment