diff --git a/vbcms-admin/404.php b/vbcms-admin/404.php
index 4a8fc2bf7fd88b0a6463c5e4ea09e0a94dfa62cc..d14a71bd4f9d165c85e7fce8ca15b437fe792c70 100644
--- a/vbcms-admin/404.php
+++ b/vbcms-admin/404.php
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
- <title><?=$websiteName?> | 404 :/</title>
+ <title><?=VBcmsGetSetting("websiteName")?> | 404 :/</title>
<?php include 'includes/depedencies.php';?>
</head>
<body>
@@ -14,7 +14,7 @@
<div class="page-content" leftSidebar="240" rightSidebar="0">
<div class="d-flex flex-column">
<div class="align-self-center text-center">
- <img src="<?=$websiteUrl?>/vbcms-admin/images/vbcms-logo/raccoon-512x.png">
+ <img src="<?=VBcmsGetSetting("websiteUrl")?>/vbcms-admin/images/vbcms-logo/raccoon-512x.png">
<h1 class="mt-5"><?=translate("404oups")?></h1>
<p><?=translate("404message")?></p>
</div>
diff --git a/vbcms-admin/includes/depedencies.php b/vbcms-admin/includes/depedencies.php
index 10b73aec3b191610d5a99de17aaaf041575b8f29..433a7119328e77d3a1ffae50b2413a2290d5b28d 100644
--- a/vbcms-admin/includes/depedencies.php
+++ b/vbcms-admin/includes/depedencies.php
@@ -1,27 +1,27 @@
-<meta name="theme-color" content="#<?=$websiteMetaColor?>">
-<link rel="icon" href="<?=$websiteLogo?>" type="image/png">
+<meta name="theme-color" content="#<?=VBcmsGetSetting("websiteMetaColor")?>">
+<link rel="icon" href="<?=VBcmsGetSetting("websiteLogo")?>" type="image/png">
<meta content="VBcms" property="og:title">
-<meta content="<?=$websiteDescription?>" property="og:description">
-<meta content='<?=$websiteLogo?>' property='og:image'>
+<meta content="<?=VBcmsGetSetting("websiteDescription")?>" property="og:description">
+<meta content='<?=VBcmsGetSetting("websiteLogo")?>' property='og:image'>
<!-- Intégration de Bootstrap, Font Awesome & jQuery depuis nos dépôts -->
-<link rel="stylesheet" href="<?=$websiteUrl?>vbcms-admin/vendors/bootstrap/css/bootstrap.min.css">
-<link rel="stylesheet" type="text/css" href="<?=$websiteUrl?>vbcms-admin/vendors/fontawesome/css/all.min.css">
-<script src="<?=$websiteUrl?>vbcms-admin/vendors/jquery/jquery-3.5.1.min.js"></script>
+<link rel="stylesheet" href="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/vendors/bootstrap/css/bootstrap.min.css">
+<link rel="stylesheet" type="text/css" href="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/vendors/fontawesome/css/all.min.css">
+<script src="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/vendors/jquery/jquery-3.5.1.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
-<script src="<?=$websiteUrl?>vbcms-admin/vendors/bootstrap/js/bootstrap.bundle.min.js"></script>
-<script src="<?=$websiteUrl?>vbcms-admin/vendors/fontawesome/js/all.min.js" data-auto-replace-svg="nest"></script>
+<script src="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/vendors/bootstrap/js/bootstrap.bundle.min.js"></script>
+<script src="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/vendors/fontawesome/js/all.min.js" data-auto-replace-svg="nest"></script>
<!-- Animate CSS -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css"/>
<!-- Intégration de JS Snackbar -->
-<link rel="stylesheet" href="<?=$websiteUrl?>vbcms-admin/vendors/js-snackbar/css/js-snackbar.css?v=2.0.0" />
-<script src="<?=$websiteUrl?>vbcms-admin/vendors/js-snackbar/js/js-snackbar.js?v=1.2.0"></script>
+<link rel="stylesheet" href="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/vendors/js-snackbar/css/js-snackbar.css?v=2.0.0" />
+<script src="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/vendors/js-snackbar/js/js-snackbar.js?v=1.2.0"></script>
<!-- Fonction JS du panel -->
-<script src="<?=$websiteUrl?>vbcms-admin/js/manager.js"></script>
+<script src="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/js/manager.js"></script>
-<link rel="stylesheet" type="text/css" href="<?=$websiteUrl?>vbcms-admin/css/manager.css">
+<link rel="stylesheet" type="text/css" href="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/css/manager.css">
diff --git a/vbcms-admin/includes/emptyPage.php b/vbcms-admin/includes/emptyPage.php
index 3d45ca8954e8c2007b488671337978cadc5f8c79..157c3499f76ff6e05e4a99ccfaa482bf38c48ac5 100644
--- a/vbcms-admin/includes/emptyPage.php
+++ b/vbcms-admin/includes/emptyPage.php
@@ -7,7 +7,7 @@ if(isset($vbcmsRequest)){
<html>
<head>
<meta charset="utf-8">
- <title><?=$websiteName?> | <?=$title?></title>
+ <title><?=VBcmsGetSetting("websiteName")?> | <?=$title?></title>
<?php include 'depedencies.php';?>
<?=$depedencies?>
</head>
diff --git a/vbcms-admin/includes/navbar.php b/vbcms-admin/includes/navbar.php
index a434789d23eebf0c2f0a5cabcb3266622ec337f8..1d1355a7a5e2dd3ce30cc27bb35f8f73649b9ecc 100644
--- a/vbcms-admin/includes/navbar.php
+++ b/vbcms-admin/includes/navbar.php
@@ -1,6 +1,5 @@
<?php
$vbcmsVer = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='vbcmsVersion'")->fetchColumn();
-$debugMode = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='debugMode'")->fetchColumn();
?>
<header>
<div class="navbar managerHeader d-flex">
@@ -8,7 +7,7 @@ $debugMode = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='debugMo
<div class="desktop-toggler mx-2">
<a href="#" class="menu-toggler" data-action="toggle" data-side="left"><i class="fas fa-bars"></i></a>
</div>
- <a href="index.php" class="brand-name"><?=$websiteName?></a>
+ <a href="index.php" class="brand-name"><?=VBcmsGetSetting("websiteName")?></a>
</div>
<div class="menu d-flex ml-auto justify-content-end">
@@ -77,7 +76,7 @@ $debugMode = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='debugMo
<?php } ?>
<?php
- if($debugMode == "1" && verifyUserPermission($_SESSION['user_id'], 'vbcms', 'accessDebug')){
+ if(VBcmsGetSetting("debugMode") == "1" && verifyUserPermission($_SESSION['user_id'], 'vbcms', 'accessDebug')){
echo '<div class="menu-item">
<a href="/vbcms-admin/debug" class="menu-link">
<span class="menu-icon"><i class="fas fa-bug"></i></span>
@@ -154,7 +153,7 @@ $debugMode = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='debugMo
}
});
async function loadNotifications(){
- await $.get("<?=$websiteUrl?>vbcms-admin/backTasks/?getNotifications", function(data){
+ await $.get("<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/backTasks/?getNotifications", function(data){
var notifications = JSON.parse(data);
if (notifications.length!=0) {
$("#notificationsNumber").html(notifications.length);
diff --git a/vbcms-admin/includes/settings/users.php b/vbcms-admin/includes/settings/users.php
index 4c35383c5672206fa251f4c0de2941bc5db4e372..958eb8653ab488613ce989f4e784b78a636f9fbc 100644
--- a/vbcms-admin/includes/settings/users.php
+++ b/vbcms-admin/includes/settings/users.php
@@ -42,7 +42,7 @@
}else{
// Ici l'utilisateur n'existe pas dans la liste des comptes locaux
// Donc on va lui mettre une image placeholder
- $userProfilPic = $GLOBALS['websiteUrl']."vbcms-admin/images/misc/programmer.png";
+ $userProfilPic = VBcmsGetSetting("websiteUrl")."vbcms-admin/images/misc/programmer.png";
}
}
diff --git a/vbcms-admin/includes/settingsPage.php b/vbcms-admin/includes/settingsPage.php
index ed216e31cbc589adfbdd0edc7a51382185c7729b..955d1d86c532e266de480994e1384e3b37e33c8e 100644
--- a/vbcms-admin/includes/settingsPage.php
+++ b/vbcms-admin/includes/settingsPage.php
@@ -6,14 +6,11 @@
function getSettingsHTML($params){
global $bdd, $translation;
$curentUpdateCanal = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='updateCanal'")->fetchColumn();
- $steamApiKey = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='steamApiKey'")->fetchColumn();
$autoUpdatesSearch = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='autoUpdatesSearch'")->fetchColumn();
$autoUpdatesInstall = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='autoUpdatesInstall'")->fetchColumn();
$autoInstallCriticalUpdates = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='autoInstallCriticalUpdates'")->fetchColumn();
- $debugMode = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='debugMode'")->fetchColumn();
-
if($autoUpdatesSearch == 1) $autoUpdatesSearch = "checked";
else $autoUpdatesSearch = null;
if($autoUpdatesInstall == 1) $autoUpdatesInstall = "checked";
@@ -21,8 +18,8 @@ function getSettingsHTML($params){
if($autoInstallCriticalUpdates == 1) $autoInstallCriticalUpdates = "checked";
else $autoInstallCriticalUpdates = null;
- if($debugMode == 1) $debugMode = "checked";
- else $debugMode = null;
+ if(VBcmsGetSetting("debugMode") == 1) $debugModeChecked = "checked";
+ else $debugModeChecked = null;
?>
<div class="d-flex">
<div class="flex-grow-1" >
@@ -107,7 +104,7 @@ function getSettingsHTML($params){
}
function saveChanges(){
- $.post( "<?=$GLOBALS['websiteUrl']?>vbcms-admin/backTasks?saveSettings", $( "#form" ).serialize() )
+ $.post( "<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/backTasks?saveSettings", $( "#form" ).serialize() )
.done(function( data ) {
if(data!=""){
SnackBar({
diff --git a/vbcms-admin/index.php b/vbcms-admin/index.php
index bc3c3021d1cc98211ae2e1235683c7a326e6d9fb..9f932d4b1f28d296d3cdc472435861ed30cddcfd 100644
--- a/vbcms-admin/index.php
+++ b/vbcms-admin/index.php
@@ -37,7 +37,7 @@ if($_SESSION['loginType']=='vbcms-account'){
<html>
<head>
<meta charset="utf-8">
- <title><?=$websiteName?> | <?=translate("dashboard")?></title>
+ <title><?=VBcmsGetSetting("websiteName")?> | <?=translate("dashboard")?></title>
<?php include 'includes/depedencies.php';?>
</head>
<body>
@@ -65,7 +65,7 @@ if($_SESSION['loginType']=='vbcms-account'){
<div id="indexCards" class="row" style="">
<div class="col-xl-6">
<div id="indexCardOne" class="indexCard mb-3 overflow-hidden">
- <div style="position: absolute; z-index: 1;height: 100%; width: 100%; background-image: url(<?=$websiteUrl?>vbcms-admin/images/misc/mainIndexCardBg.png); background-position: right bottom; background-repeat: no-repeat; background-size: 100%;"></div>
+ <div style="position: absolute; z-index: 1;height: 100%; width: 100%; background-image: url(<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/images/misc/mainIndexCardBg.png); background-position: right bottom; background-repeat: no-repeat; background-size: 100%;"></div>
<div class="indexCardBody">
<h5>Nouvelles licences</h5>
<h3>15</h3>
@@ -79,7 +79,7 @@ if($_SESSION['loginType']=='vbcms-account'){
<div class="col-sm-6">
<div id="indexCardTwo" class="indexCard overflow-hidden">
<div class="indexCardImg">
- <img src="<?=$websiteUrl?>vbcms-admin/images/misc/globe.png">
+ <img src="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/images/misc/globe.png">
</div>
<div class="indexCardBody">
<h5>Visites</h5>
@@ -90,7 +90,7 @@ if($_SESSION['loginType']=='vbcms-account'){
</div>
<div id="indexCardThree" class="indexCard overflow-hidden">
<div class="indexCardImg">
- <img src="<?=$websiteUrl?>vbcms-admin/images/misc/ticket.png">
+ <img src="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/images/misc/ticket.png">
</div>
<div class="indexCardBody">
<h5>Tickets support</h5>
@@ -103,7 +103,7 @@ if($_SESSION['loginType']=='vbcms-account'){
<div class="col-sm-6">
<div id="indexCardFour" class="indexCard overflow-hidden">
<div class="indexCardImg">
- <img src="<?=$websiteUrl?>vbcms-admin/images/misc/puzzle.png">
+ <img src="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/images/misc/puzzle.png">
</div>
<div class="indexCardBody">
<h5>Nouveaux addons</h5>
@@ -114,7 +114,7 @@ if($_SESSION['loginType']=='vbcms-account'){
</div>
<div id="indexCardFive" class="indexCard overflow-hidden">
<div class="indexCardImg">
- <img src="<?=$websiteUrl?>vbcms-admin/images/misc/hourglass.png">
+ <img src="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/images/misc/hourglass.png">
</div>
<div class="indexCardBody">
<h5>Inscriptions en attente</h5>
@@ -162,7 +162,7 @@ if($_SESSION['loginType']=='vbcms-account'){
<label><?=translate('password')?></label>
<input type="password" class="form-control" name="localUserPassword1" id="localUserPassword1" placeholder="" required>
<div class="invalid-feedback" id="localUserPassword1Alert">
- <?=translate('localAccountCreation_youCreateAnAccountWithoutPassword')?> <img height="16" src="<?=$websiteUrl?>vbcms-admin/images/emojis/thinkingHard.png">
+ <?=translate('localAccountCreation_youCreateAnAccountWithoutPassword')?> <img height="16" src="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/images/emojis/thinkingHard.png">
</div>
</div>
<div class="form-group">
@@ -224,7 +224,7 @@ if($_SESSION['loginType']=='vbcms-account'){
} else {
var passw = /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,32}$/;
if($("#localUserPassword1").val().match(passw)) {
- $("#localUserPassword1Alert").html('<?=translate('localAccountCreation_youCreateAnAccountWithoutPassword')?> <img height="16" src="<?=$websiteUrl?>vbcms-admin/images/emojis/thinkingHard.png">');
+ $("#localUserPassword1Alert").html('<?=translate('localAccountCreation_youCreateAnAccountWithoutPassword')?> <img height="16" src="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/images/emojis/thinkingHard.png">');
$("#localUserPassword1Alert").css("display","");
$("#localUserPassword2Alert").html('<?=translate("localAccountCreation_pleaseRewriteYourPassword")?>');
$("#localUserPassword2Alert").css("display","");
diff --git a/vbcms-admin/login.php b/vbcms-admin/login.php
index 1af4808987938322935698f9a377ed37f45f655a..fe8353a0851751fb02122a9c93ed65a88f45c0d1 100644
--- a/vbcms-admin/login.php
+++ b/vbcms-admin/login.php
@@ -25,7 +25,7 @@ if (isset($_POST['login'])) { // Ne s'éxécute que si le formulaire de connexio
$_SESSION['user_id'] = $user['id'];
$_SESSION['user_username'] = $user['username'];
$_SESSION['user_role'] = $user['role'];
- $_SESSION['user_profilePic'] = "$websiteUrl/vbcms-admin/images/misc/programmer.png";
+ $_SESSION['user_profilePic'] = "VBcmsGetSetting("websiteUrl")/vbcms-admin/images/misc/programmer.png";
$geoPlugin_array = unserialize( file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $_SERVER['REMOTE_ADDR']) );
$_SESSION['language'] = $geoPlugin_array['geoplugin_countryCode'];
header('Location: '.urldecode($redirect));
diff --git a/vbcms-admin/manage-ws-addons.php b/vbcms-admin/manage-ws-addons.php
index dc0060694173d79c34b7c79254cb3b7ff03846bd..c43b914656642a929801ef569a36331ab16ebe55 100644
--- a/vbcms-admin/manage-ws-addons.php
+++ b/vbcms-admin/manage-ws-addons.php
@@ -22,9 +22,9 @@ foreach ($extensionsFolderContent as $extensionFolder){
}
// On vérifie que l'extension dispose d'une icône
if(file_exists($extensionsFolder.$extensionFolder.'/extension-logo.jpg')){
- $extensionsList[$extensionInfos['type']][$extensionListIndex]['extensionLogo'] = $GLOBALS['websiteUrl'].'vbcms-content/extensions/'.$extensionFolder.'/extension-logo.jpg';
+ $extensionsList[$extensionInfos['type']][$extensionListIndex]['extensionLogo'] = VBcmsGetSetting("websiteUrl").'vbcms-content/extensions/'.$extensionFolder.'/extension-logo.jpg';
}elseif(file_exists($extensionsFolder.$extensionFolder.'/extension-logo.png')){
- $extensionsList[$extensionInfos['type']][$extensionListIndex]['extensionLogo'] = $GLOBALS['websiteUrl'].'vbcms-content/extensions/'.$extensionFolder.'/extension-logo.png';
+ $extensionsList[$extensionInfos['type']][$extensionListIndex]['extensionLogo'] = VBcmsGetSetting("websiteUrl").'vbcms-content/extensions/'.$extensionFolder.'/extension-logo.png';
}else{
$extensionsList[$extensionInfos['type']][$extensionListIndex]['extensionLogo'] = null;
}
@@ -75,7 +75,7 @@ $emptyBaseModules = $bdd->query("SELECT * FROM `vbcms-baseModulesAssoc` WHERE ex
<html>
<head>
<meta charset="utf-8">
- <title><?=$websiteName?> | <?=translate("ws_addonsLists")?></title>
+ <title><?=VBcmsGetSetting("websiteName")?> | <?=translate("ws_addonsLists")?></title>
<?php include 'includes/depedencies.php';?>
</head>
<body>
@@ -90,7 +90,7 @@ $emptyBaseModules = $bdd->query("SELECT * FROM `vbcms-baseModulesAssoc` WHERE ex
<div class="width-50em d-flex flex-column">
<?php
- if($debugMode == "1"){ ?>
+ if(VBcmsGetSetting("debugMode") == "1"){ ?>
<h5>Debug</h5>
<div class="border rounded my-2">
<pre><code><?php echo 'extensionsFolderContent:<br>'; print_r($extensionsFolderContent); echo '<br>extensionsList:<br>'; print_r($extensionsList); ?></code></pre>
@@ -165,12 +165,12 @@ $emptyBaseModules = $bdd->query("SELECT * FROM `vbcms-baseModulesAssoc` WHERE ex
<div class="tip">
<h5>Créer une extension</h5>
<p><b>Créer une extension pour VBcms est un jeu d'enfant!</b><br><a href="#" class="text-brown">Check la documentation</a> pour en savoir plus, les créateurs sont régulièrement mis en avant sur le Workshop!</p>
- <img class="mt-n3" width="96" src="<?=$websiteUrl?>vbcms-admin/images/misc/create-addon.jpg">
+ <img class="mt-n3" width="96" src="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/images/misc/create-addon.jpg">
</div>
<div class="tip">
<h5>Quèsaco une dépendance?</h5>
<p>Tu as très probablement déjà du voir ce message d'avertissement lors de l'activation de la désactivation d'une extension, sans trop savoir ce qu'est une dépendance.</p>
- <img class="mt-n1 mb-1" src="<?=$websiteUrl?>vbcms-admin/images/misc/alerte-dependance.jpg">
+ <img class="mt-n1 mb-1" src="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/images/misc/alerte-dependance.jpg">
<p><b>Une dépendance est une extension nécessaire au bon fonctionnement d'autres extensions</b>. La désactiver pourrait provoquer une erreur fatale, c'est pour cela que VBcms désactive tous ses liens par défaut.</p>
</div>
</div>
@@ -293,7 +293,7 @@ $emptyBaseModules = $bdd->query("SELECT * FROM `vbcms-baseModulesAssoc` WHERE ex
adminAccess: $("#adminAccessInput").val(),
clientAccess: $("#clientAccessInput").val()
};
- $.get("<?=$websiteUrl?>vbcms-admin/backTasks/?checkModulesAliases="+encodeURIComponent(JSON.stringify(array)), function(data) {
+ $.get("<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/backTasks/?checkModulesAliases="+encodeURIComponent(JSON.stringify(array)), function(data) {
if (!isJson(data)) {
SnackBar({
message: "<?=translate('ws_cantVerifyModulesAlias')?>: "+data,
@@ -355,7 +355,7 @@ $emptyBaseModules = $bdd->query("SELECT * FROM `vbcms-baseModulesAssoc` WHERE ex
array.adminAccess=adminAccess;
array.clientAccess=clientAccess;
}
- $.get("<?=$websiteUrl?>vbcms-admin/backTasks/?enableExtension="+encodeURIComponent(JSON.stringify(array)), function(data) {
+ $.get("<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/backTasks/?enableExtension="+encodeURIComponent(JSON.stringify(array)), function(data) {
if (data != "") {
SnackBar({
message: "<?=translate('ws_errorEnableAddon')?>: "+data,
@@ -378,7 +378,7 @@ $emptyBaseModules = $bdd->query("SELECT * FROM `vbcms-baseModulesAssoc` WHERE ex
var array = {};
array.name=name;
array.deleteData=deleteData;
- $.get("<?=$websiteUrl?>vbcms-admin/backTasks/?disableExtension="+encodeURIComponent(JSON.stringify(array)), function(data) {
+ $.get("<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/backTasks/?disableExtension="+encodeURIComponent(JSON.stringify(array)), function(data) {
if (data != "") {
SnackBar({
message: "<?=translate('ws_errorDisableAddon')?>: "+data,
@@ -397,7 +397,7 @@ $emptyBaseModules = $bdd->query("SELECT * FROM `vbcms-baseModulesAssoc` WHERE ex
}
function fixBaseFunctionAssoc(){
- $.post( "<?=$GLOBALS['websiteUrl']?>vbcms-admin/backTasks?fixBaseFunctionAssoc", $( "#unsatisfiedBaseFunctionsModalBody" ).serialize() )
+ $.post( "<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/backTasks?fixBaseFunctionAssoc", $( "#unsatisfiedBaseFunctionsModalBody" ).serialize() )
.done(function( data ) {
if(data!=""){
SnackBar({
diff --git a/vbcms-admin/settings.php b/vbcms-admin/settings.php
index 17093d15550352cb76c6c5f65214a9ad7f02195a..cd1133c9b22d6078483d8aa63fd7c933898c7b1a 100644
--- a/vbcms-admin/settings.php
+++ b/vbcms-admin/settings.php
@@ -16,9 +16,9 @@ foreach ($activatedExtensions as $activatedExtension){
<html>
<head>
<meta charset="utf-8">
- <title><?=$websiteName?> | <?=translate("settings")?></title>
+ <title><?=VBcmsGetSetting("websiteName")?> | <?=translate("settings")?></title>
<?php include 'includes/depedencies.php';?>
- <link rel="stylesheet" href="<?=$websiteUrl?>vbcms-admin/vendors/pick-a-color/css/pick-a-color-1.2.3.min.css">
+ <link rel="stylesheet" href="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/vendors/pick-a-color/css/pick-a-color-1.2.3.min.css">
</head>
<body>
<?php
@@ -63,8 +63,8 @@ foreach ($activatedExtensions as $activatedExtension){
</div>
</div>
- <script src="<?=$websiteUrl?>vbcms-admin/vendors/pick-a-color/js/tinycolor-0.9.15.min.js"></script>
- <script src="<?=$websiteUrl?>vbcms-admin/vendors/pick-a-color/js/pick-a-color-1.2.3.min.js"></script>
+ <script src="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/vendors/pick-a-color/js/tinycolor-0.9.15.min.js"></script>
+ <script src="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/vendors/pick-a-color/js/pick-a-color-1.2.3.min.js"></script>
<script type="text/javascript">
// S'éxecute une fois la page chargée
$( document ).ready(function() {
@@ -106,9 +106,9 @@ foreach ($activatedExtensions as $activatedExtension){
$("#ext-"+extSettingsQuery.moduleName).addClass("active");
// Pour le debug
- console.log("Debug - call:<?=$websiteUrl?>vbcms-admin/backTasks/?getSettingsHTML="+encodeURIComponent(search_params.get('p')));
+ console.log("Debug - call:<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/backTasks/?getSettingsHTML="+encodeURIComponent(search_params.get('p')));
// On récupère le contenu de la page
- $.get("<?=$websiteUrl?>vbcms-admin/backTasks/?getSettingsHTML="+encodeURIComponent(search_params.get('p')), function(data) {
+ $.get("<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/backTasks/?getSettingsHTML="+encodeURIComponent(search_params.get('p')), function(data) {
// On supprime l'animation de chargement
$("#settingsContent").removeClass("centerVerHori");
// Et on insère le contenu
diff --git a/vbcms-content/extensions/vbcms-filemanager/pageHandler.php b/vbcms-content/extensions/vbcms-filemanager/pageHandler.php
index cb8f68cf510125cd5d2e1de3c13b6e33ef267bb9..e6e6ec3a7d21177f70c770869176ca9bf5de2b5c 100644
--- a/vbcms-content/extensions/vbcms-filemanager/pageHandler.php
+++ b/vbcms-content/extensions/vbcms-filemanager/pageHandler.php
@@ -4,7 +4,7 @@ if($type =="admin"){
case 'browse':
if(verifyUserPermission($_SESSION['user_id'], $this->name, 'access-browse')){
$pageToInclude = $extensionFullPath."/admin/browse.php";
- extensionCreatePage($type, 0, $pageToInclude, translate("gallery_filemanager"), "", "");
+ $this->extensionCreatePage($type, 0, $pageToInclude, translate("gallery_filemanager"), "", "");
}
break;
@@ -14,7 +14,7 @@ if($type =="admin"){
if(isJson(urldecode($parameters[2]))){
// Ici on les paramètres sont les mêmes que ceux du gestionnaire de fichiers
// Donc pas besoin de faire d'association, on va simplement les sortir
- echo $GLOBALS['websiteUrl']."vbcms-content/extensions/vbcms-filemanager/includes/responsivefilemanager/dialog.php?".http_build_query(json_decode(urldecode($parameters[2]), true));
+ echo VBcmsGetSetting("websiteUrl")."vbcms-content/extensions/vbcms-filemanager/includes/responsivefilemanager/dialog.php?".http_build_query(json_decode(urldecode($parameters[2]), true));
}
}else{
echo "ERREUR: Aucun paramètre de spécifié.";
diff --git a/vbcms-content/extensions/vbcms-loadingscreens/admin/browse.php b/vbcms-content/extensions/vbcms-loadingscreens/admin/browse.php
index 77303f2fa84769eaa96164d6edfde01daafddb76..62e8ac4875fa0efa41965616532948e1b8f7a8b5 100644
--- a/vbcms-content/extensions/vbcms-loadingscreens/admin/browse.php
+++ b/vbcms-content/extensions/vbcms-loadingscreens/admin/browse.php
@@ -13,12 +13,12 @@
<?php
$loadingscreens = $bdd->query('SELECT * FROM `vbcmsLoadingScreens_list`')->fetchAll(PDO::FETCH_ASSOC);
foreach ($loadingscreens as $loadingscreen){
- $backgroundImage = 'https://api.apiflash.com/v1/urltoimage?access_key=65e037cb81b44087ba537b58dd19e4ff&format=jpeg&quality=80&response_type=image&url='.urlencode($GLOBALS['websiteUrl'].$this->clientAccess.'/'.$loadingscreen['identifier']).'/&width=1920&height=1080';
+ $backgroundImage = 'https://api.apiflash.com/v1/urltoimage?access_key=65e037cb81b44087ba537b58dd19e4ff&format=jpeg&quality=80&response_type=image&url='.urlencode(VBcmsGetSetting("websiteUrl").$this->clientAccess.'/'.$loadingscreen['identifier']).'/&width=1920&height=1080';
echo('
<div class="ld-card border rounded mx-1 my-1" style="background-image: url(\''.$backgroundImage.'\');">
<div class="ld-card-content p-2">
<span><strong>'.$loadingscreen['showName'].'</strong></span>
- <a href="'.$GLOBALS['websiteUrl'].'vbcms-admin/'.$this->adminAccess.'/edit?id='.$loadingscreen['identifier'].'" class="btn btn-sm btn-brown float-right">'.translate('modify').'</a>
+ <a href="'.VBcmsGetSetting("websiteUrl").'vbcms-admin/'.$this->adminAccess.'/edit?id='.$loadingscreen['identifier'].'" class="btn btn-sm btn-brown float-right">'.translate('modify').'</a>
</div>
</div>');
}
@@ -95,7 +95,7 @@
let array = {};
array.type="showName";
array.name=this.value;
- $.get("<?=$websiteUrl?>vbcms-admin/<?=$urlPath[2]?>/backTasks?checkIdentifierOrName="+encodeURIComponent(JSON.stringify(array)), function(data) {
+ $.get("<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/<?=$urlPath[2]?>/backTasks?checkIdentifierOrName="+encodeURIComponent(JSON.stringify(array)), function(data) {
let json = JSON.parse(data);
if(typeof json.error === 'undefined'){
if(json.used == false){
@@ -129,7 +129,7 @@
let array = {};
array.type="identifier";
array.name=this.value;
- $.get("<?=$websiteUrl?>vbcms-admin/<?=$urlPath[2]?>/backTasks?checkIdentifierOrName="+encodeURIComponent(JSON.stringify(array)), function(data) {
+ $.get("<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/<?=$urlPath[2]?>/backTasks?checkIdentifierOrName="+encodeURIComponent(JSON.stringify(array)), function(data) {
let json = JSON.parse(data);
if(typeof json.error === 'undefined'){
if(json.used == false){
@@ -160,10 +160,10 @@
});
function createLoadingScreen(){
- $.post( "<?=$GLOBALS['websiteUrl']?>vbcms-admin/<?=$urlPath[2]?>/backTasks?createLoadingScreen", $( "#createLoadingScreenForm" ).serialize() )
+ $.post( "<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/<?=$urlPath[2]?>/backTasks?createLoadingScreen", $( "#createLoadingScreenForm" ).serialize() )
.done(function( data ) {
if(data == ""){
- window.location.href = "<?=$GLOBALS['websiteUrl']?>vbcms-admin/<?=$urlPath[2]?>/edit?id="+$("#identifier").val();
+ window.location.href = "<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/<?=$urlPath[2]?>/edit?id="+$("#identifier").val();
} else {
SnackBar({
message: data,
diff --git a/vbcms-content/extensions/vbcms-loadingscreens/admin/edit.php b/vbcms-content/extensions/vbcms-loadingscreens/admin/edit.php
index b641e5722c3bd9c57dd068babca3ed77bdd44135..2af4b0838768a10339375d0a84f1e41c1866c258 100644
--- a/vbcms-content/extensions/vbcms-loadingscreens/admin/edit.php
+++ b/vbcms-content/extensions/vbcms-loadingscreens/admin/edit.php
@@ -38,7 +38,7 @@ if(isset($_GET['id'])){
</div>
<div class="flex-grow-1 ">
<h4>Prévisualisation</h4>
- <div id="loadingScreenPreview" class="rounded" style="background-image: url('https://api.apiflash.com/v1/urltoimage?access_key=65e037cb81b44087ba537b58dd19e4ff&format=jpeg&quality=80&response_type=image&url=<?php echo urlencode($websiteUrl."loadingscreen/".$loadingScreenIdentifier."?preview"); ?>&width=1920&height=1080');"></div>
+ <div id="loadingScreenPreview" class="rounded" style="background-image: url('https://api.apiflash.com/v1/urltoimage?access_key=65e037cb81b44087ba537b58dd19e4ff&format=jpeg&quality=80&response_type=image&url=<?php echo urlencode(VBcmsGetSetting("websiteUrl")."loadingscreen/".$loadingScreenIdentifier."?preview"); ?>&width=1920&height=1080');"></div>
</div>
</div>
</div>
@@ -84,7 +84,7 @@ if(isset($_GET['id'])){
$( document ).ready(function() {
<?php
if(isset($redirectToList)){
- echo 'window.location.href = "'.$GLOBALS['websiteUrl'].'vbcms-admin/'.$urlPath[2].'/browse";';
+ echo 'window.location.href = "'.VBcmsGetSetting("websiteUrl").'vbcms-admin/'.$urlPath[2].'/browse";';
}
?>
resizePreview();
diff --git a/vbcms-content/extensions/vbcms-loadingscreens/pageHandler.php b/vbcms-content/extensions/vbcms-loadingscreens/pageHandler.php
index b18e1a19d3bb738adfd46c38f82e9b3357e59100..0cbfe77a4fb7289f590de65906dff77eba474e98 100644
--- a/vbcms-content/extensions/vbcms-loadingscreens/pageHandler.php
+++ b/vbcms-content/extensions/vbcms-loadingscreens/pageHandler.php
@@ -1,6 +1,6 @@
<?php
if($type =="admin"){
- $pageDepedencies = '<link href="'.$GLOBALS['websiteUrl'].'vbcms-content/extensions/'.$this->path.'/assets/css/admin.css" rel="stylesheet">';
+ $pageDepedencies = '<link href="'.VBcmsGetSetting("websiteUrl").'vbcms-content/extensions/'.$this->path.'/assets/css/admin.css" rel="stylesheet">';
switch($parameters[1]){
case 'browse':
if(verifyUserPermission($_SESSION['user_id'], $this->name, 'access-browse')){
diff --git a/vbcms-core/adminAutomatedTasks.php b/vbcms-core/adminAutomatedTasks.php
index 9187685ae0cb72c16ed07ab889a1e2e508827dfb..4c9a26feef834f0288e40a42bf8ca827809e8f83 100644
--- a/vbcms-core/adminAutomatedTasks.php
+++ b/vbcms-core/adminAutomatedTasks.php
@@ -8,12 +8,11 @@ $datetime = new DateTime(date("Y-m-d H:i:s"));
$lastUpdateCheck = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name = 'lastUpdateCheck'")->fetchColumn();
$lastUpdateCheck = DateTime::createFromFormat('Y-m-d H:i:s', $lastUpdateCheck);
if ((abs($datetime->getTimestamp()-$lastUpdateCheck->getTimestamp())) > 1800){
- $serverId = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='serverId'")->fetchColumn();
$key = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='encryptionKey'")->fetchColumn();
$vbcmsVer = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='vbcmsVersion'")->fetchColumn();
$curentUpdateCanal = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='updateCanal'")->fetchColumn();
- $json = file_get_contents("https://api.vbcms.net/updater/lastest?serverId=".$serverId."&key=".$key."&version=".$vbcmsVer."&canal=".$curentUpdateCanal);
+ $json = file_get_contents("https://api.vbcms.net/updater/lastest?serverId=".VBcmsGetSetting("serverId")."&key=".$key."&version=".$vbcmsVer."&canal=".$curentUpdateCanal);
$jsonData = json_decode($json, true);
if (!empty($jsonData) && !$jsonData["upToDate"]) {
diff --git a/vbcms-core/classes.php b/vbcms-core/classes.php
index 5e7b83d418ebd805657ab57f9cfa41644a41ac92..7b25c8bd6c1949b59caad5f6e32eacbc21572a56 100644
--- a/vbcms-core/classes.php
+++ b/vbcms-core/classes.php
@@ -414,10 +414,6 @@ class module {
// Le mode 1 correspond à l'inclusion d'une page qui ne fait que passer des paramètres
// Le mode 2 correspond à l'inclusion d'une page qui n'utilise pas la maquette du thème, qui renvoie sa propre page
global $bdd;
- $websiteUrl = VBcmsGetSetting("websiteUrl");
- $websiteName = VBcmsGetSetting("websiteName");
- $websiteDescription = VBcmsGetSetting("websiteDescription");
- $websiteLogo = VBcmsGetSetting("websiteLogo");
// Ici on ne peut pas récupérer $http et $urlPath, on va réécrire le code ici
if(isset($_SERVER['HTTPS'])) $http = "https"; else $http = "http";
diff --git a/vbcms-core/defaultPages/404.php b/vbcms-core/defaultPages/404.php
index 3968ba8df96c9b7e1bc1327f16fc9c97b9c8b5c7..20e7b14f010408ec388ce78744e1c6c7ce2b9f3e 100644
--- a/vbcms-core/defaultPages/404.php
+++ b/vbcms-core/defaultPages/404.php
@@ -1,9 +1,9 @@
<?php
// Arrive si on charge la page seule, ce n'est pas censé arriver
-if(!isset($websiteUrl)){
+if(!isset(VBcmsGetSetting("websiteUrl"))){
if(isset($_SERVER['HTTPS'])) $http = "https"; else $http = "http";
$url = parse_url("$http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
- $websiteUrl = $url["scheme"]."://".$url["host"]."/";
+ VBcmsGetSetting("websiteUrl") = $url["scheme"]."://".$url["host"]."/";
}
?>
<!DOCTYPE html>
@@ -12,7 +12,7 @@ if(!isset($websiteUrl)){
<meta charset="utf-8">
<title>VBcms</title>
<link rel="icon" type="image/png" href="https://vbcms.net/vbcms-content/uploads/vbcms-logo/raccoon-in-box-512x.png" />
- <link rel="stylesheet" href="<?=$websiteUrl?>vbcms-admin/fonts/fonts.css">
+ <link rel="stylesheet" href="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/fonts/fonts.css">
</head>
<body>
<style type="text/css">
diff --git a/vbcms-core/defaultPages/ext404.php b/vbcms-core/defaultPages/ext404.php
index 0f188677d7692d0b0595915672e67f9c631db6f0..5e1fac72464b65f00d7eace36da4d3fbc0d7267e 100644
--- a/vbcms-core/defaultPages/ext404.php
+++ b/vbcms-core/defaultPages/ext404.php
@@ -1,9 +1,9 @@
<?php
// Arrive si on charge la page seule, ce n'est pas censé arriver
-if(!isset($websiteUrl)){
+if(!isset(VBcmsGetSetting("websiteUrl"))){
if(isset($_SERVER['HTTPS'])) $http = "https"; else $http = "http";
$url = parse_url("$http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
- $websiteUrl = $url["scheme"]."://".$url["host"]."/";
+ VBcmsGetSetting("websiteUrl") = $url["scheme"]."://".$url["host"]."/";
}
?>
<!DOCTYPE html>
@@ -12,7 +12,7 @@ if(!isset($websiteUrl)){
<meta charset="utf-8">
<title>VBcms</title>
<link rel="icon" type="image/png" href="https://vbcms.net/vbcms-content/uploads/vbcms-logo/raccoon-in-box-512x.png" />
- <link rel="stylesheet" href="<?=$websiteUrl?>vbcms-admin/fonts/fonts.css">
+ <link rel="stylesheet" href="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/fonts/fonts.css">
</head>
<body>
<style type="text/css">
diff --git a/vbcms-core/defaultPages/index.php b/vbcms-core/defaultPages/index.php
index b921806b123d266d3e2021747190be8a46866f17..fb5d325bd824d4e3ba2b22652f1ec7ff2c88babf 100644
--- a/vbcms-core/defaultPages/index.php
+++ b/vbcms-core/defaultPages/index.php
@@ -1,9 +1,9 @@
<?php
// Arrive si on charge la page seule, ce n'est pas censé arriver
-if(!isset($websiteUrl)){
+if(!isset(VBcmsGetSetting("websiteUrl"))){
if(isset($_SERVER['HTTPS'])) $http = "https"; else $http = "http";
$url = parse_url("$http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
- $websiteUrl = $url["scheme"]."://".$url["host"]."/";
+ VBcmsGetSetting("websiteUrl") = $url["scheme"]."://".$url["host"]."/";
}
?>
<!DOCTYPE html>
@@ -12,7 +12,7 @@ if(!isset($websiteUrl)){
<meta charset="utf-8">
<title>VBcms</title>
<link rel="icon" type="image/png" href="https://vbcms.net/vbcms-content/uploads/vbcms-logo/raccoon-in-box-512x.png" />
- <link rel="stylesheet" href="<?=$websiteUrl?>vbcms-admin/fonts/fonts.css">
+ <link rel="stylesheet" href="<?=VBcmsGetSetting("websiteUrl")?>vbcms-admin/fonts/fonts.css">
</head>
<body>
<style type="text/css">
diff --git a/vbcms-core/functions.php b/vbcms-core/functions.php
index 90f3d41a74721a1ff44cbcac86cb6989e4a5021d..470d91020ca16931054d27939badeefa1950ccca 100644
--- a/vbcms-core/functions.php
+++ b/vbcms-core/functions.php
@@ -1,5 +1,5 @@
<?php
-// Cette fonctions permettra de récupérer des variables propres au panel dans des endroits où les variables de variables.php ne sont plus accessibles
+// Cette fonctions permettra de récupérer des variables propres au panel
function VBcmsGetSetting($setting){
global $bdd;
@@ -122,7 +122,7 @@ function show404($type){
} elseif($type=="admin") {
// A REFAIRE
- global $bdd, $http, $websiteUrl, $translation, $websiteName, $websiteMetaColor, $websiteDescription, $websiteLogo;
+ global $bdd;
// Affiche la page 404 du panel admin
include $GLOBALS['vbcmsRootPath']."/vbcms-admin/404.php";
@@ -226,7 +226,7 @@ function openFilemanager($mode, $parameters = array()){
global $bdd;
$filemanagerAssoc = $bdd->query("SELECT extensionName FROM `vbcms-baseModulesAssoc`")->fetchColumn();
if(empty($filemanagerAssoc)){
- return $GLOBALS['websiteUrl'].'/vbcms-core/defaultPages/ext404.php';
+ return VBcmsGetSetting("websiteUrl").'/vbcms-core/defaultPages/ext404.php';
}else{
$filemanagerExt = $bdd->prepare("SELECT * FROM `vbcms-activatedExtensions` WHERE name = ?");
$filemanagerExt->execute([$filemanagerAssoc]);
diff --git a/vbcms-core/sessionHandler.php b/vbcms-core/sessionHandler.php
index 533a6a155de8403dca4befe0a09eecd4c3e6fb28..504ce34490da60c38817212e167994aff60df86b 100644
--- a/vbcms-core/sessionHandler.php
+++ b/vbcms-core/sessionHandler.php
@@ -6,7 +6,7 @@ if (isset($_GET["session"]) && !empty($_GET["session"])){
if (isset($_SESSION["user_id"])) session_unset(); // Utilisateur déjà connecté -> je réinitialise les variables de la session
- $sessionJson = file_get_contents("https://api.vbcms.net/auth/v1/checkToken/?token=".$_GET["session"]."&ip=".urlencode($ip)."&serverId=".$serverId);
+ $sessionJson = file_get_contents("https://api.vbcms.net/auth/v1/checkToken/?token=".$_GET["session"]."&ip=".urlencode($ip)."&serverId=".VBcmsGetSetting("serverId"));
//echo $json;
$sessionData = json_decode($sessionJson, true);
diff --git a/vbcms-core/variables.php b/vbcms-core/variables.php
index 1cb74afec92619060d74d779047d4e9ea767408c..f245a1a1b93e7ab19388ec9e2f5070caf28e0902 100644
--- a/vbcms-core/variables.php
+++ b/vbcms-core/variables.php
@@ -16,17 +16,3 @@ 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]");
$urlPath = explode("/", $url["path"]);
-
-// Variables propres à l'installation
-$encryptionKey = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='encryptionKey'")->fetchColumn();
-$serverId = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='serverId'")->fetchColumn();
-
-// Variables pour le site
-$websiteUrl = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='websiteUrl'")->fetchColumn();
-$websiteName = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='websiteName'")->fetchColumn();
-if(empty($websiteUrl)) $websiteName = "VBcms";
-$websiteDescription = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='websiteDescription'")->fetchColumn();
-$websiteMetaColor = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='websiteMetaColor'")->fetchColumn();
-$websiteLogo = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='websiteLogo'")->fetchColumn();
-
-$debugMode = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='debugMode'")->fetchColumn();
\ No newline at end of file