From 2295351bbcad6e54bc24d460219a14791b3c64f5 Mon Sep 17 00:00:00 2001
From: SofianeLasri <alasri250@gmail.com>
Date: Sat, 31 Jul 2021 15:15:42 +0200
Subject: [PATCH] 15H15 - Remplacement des ancienne variables
---
vbcms-admin/backTasks.php | 14 +++++++-------
vbcms-admin/includes/settings/general.php | 12 ++++++------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/vbcms-admin/backTasks.php b/vbcms-admin/backTasks.php
index 7d407ef..25f20cc 100644
--- a/vbcms-admin/backTasks.php
+++ b/vbcms-admin/backTasks.php
@@ -6,18 +6,18 @@ if (isset($_GET["getNotifications"])) {
echo json_encode($response);
} elseif (isset($_GET["updateVBcms"])) {/*
$curentUpdateCanal = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='updateCanal'")->fetchColumn();
- $serverId = $bdd->query("SELECT value FROM `vbcms-settings` WHERE name='serverId'")->fetchColumn();
+ VBcmsGetSetting("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();
- $updateInfos = file_get_contents("https://api.vbcms.net/updater/lastest?serverId=".$serverId."&key=".$key."&version=".$vbcmsVer."&canal=".$curentUpdateCanal);
+ $updateInfos = file_get_contents("https://api.vbcms.net/updater/lastest?serverId=".VBcmsGetSetting("serverId")."&key=".$key."&version=".$vbcmsVer."&canal=".$curentUpdateCanal);
$updateInfosData = json_decode($updateInfos, true);
$updateFilename = $GLOBALS['vbcmsRootPath']."/vbcms-content/updates/vbcms-update-v".$updateInfosData['version']."_from-".$vbcmsVer.".zip";
if (!file_exists($GLOBALS['vbcmsRootPath']."/vbcms-content/updates")) mkdir($GLOBALS['vbcmsRootPath']."/vbcms-content/updates", 0755);
- //echo $updateInfosData["downloadLink"]."?serverId=".$serverId."&key=".$key;
- file_put_contents($updateFilename, file_get_contents($updateInfosData["downloadLink"]."?serverId=".$serverId."&key=".$key));
+ //echo $updateInfosData["downloadLink"]."?serverId=".VBcmsGetSetting("serverId")."&key=".$key;
+ file_put_contents($updateFilename, file_get_contents($updateInfosData["downloadLink"]."?serverId=".VBcmsGetSetting("serverId")."&key=".$key));
if (file_exists($updateFilename)) {
$zip = new ZipArchive;
if ($zip->open($updateFilename) === TRUE) {
@@ -25,7 +25,7 @@ if (isset($_GET["getNotifications"])) {
$zip->close();
$response["success"] = true;
- $response["link"] = $websiteUrl."update.php";
+ $response["link"] = VBcmsGetSetting("websiteUrl")."update.php";
} else {
$response["success"] = false;
$response["code"] = 1; // Impossible d'ouvrir l'archive
@@ -183,7 +183,7 @@ if (isset($_GET["getNotifications"])) {
<html>
<head>
<meta charset="utf-8">
- <title><?=$websiteName?> | Tâches de fond</title>
+ <title><?=VBcmsGetSetting("websiteName")?> | Tâches de fond</title>
<?php include 'includes/depedencies.php';?>
</head>
<body>
@@ -195,7 +195,7 @@ if (isset($_GET["getNotifications"])) {
<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">Tâches de fond</h1>
<p>Cette page n'est pas accessible en tant que telle. Seuls les addons peuvent communiquer avec. :D</p>
</div>
diff --git a/vbcms-admin/includes/settings/general.php b/vbcms-admin/includes/settings/general.php
index 046a88f..3c878d0 100644
--- a/vbcms-admin/includes/settings/general.php
+++ b/vbcms-admin/includes/settings/general.php
@@ -42,23 +42,23 @@
<div class="col-sm">
<div class="form-group">
<label>Nom du site internet</label>
- <input required type="text" value="<?=$GLOBALS['websiteName']?>" class="form-control" name="websiteName">
+ <input required type="text" value="<?=VBcmsGetSetting("websiteName")?>" class="form-control" name="websiteName">
</div>
<div class="form-group">
<label>Couleur globale du site</label>
- <input required type="text" value="<?=$GLOBALS['websiteMetaColor']?>" name="websiteMetaColor" class="pick-a-color form-control">
+ <input required type="text" value="<?=VBcmsGetSetting("websiteMetaColor")?>" name="websiteMetaColor" class="pick-a-color form-control">
</div>
</div>
<div class="col-sm">
<div class="form-group">
<label>Courte description du internet</label>
- <input required type="text" class="form-control" value="<?=$GLOBALS['websiteDescription']?>" name="websiteDescription">
+ <input required type="text" class="form-control" value="<?=VBcmsGetSetting("websiteDescription")?>" name="websiteDescription">
</div>
<div class="form-group">
<label>Icône du internet</label>
<div class="d-flex">
- <input id="websiteLogo" type="text" class="form-control" value="<?=$GLOBALS['websiteLogo']?>" name="websiteLogo">
+ <input id="websiteLogo" type="text" class="form-control" value="<?=VBcmsGetSetting("websiteLogo")?>" name="websiteLogo">
<button type="button" class="btn btn-sm btn-brown ml-2" data-toggle="modal" data-target="#websiteLogoPicker"><i class="fas fa-image"></i></button>
</div>
@@ -74,13 +74,13 @@
<div class="col-sm">
<div class="form-group">
<label>Steam API Key</label>
- <input type="text" value="<?=$steamApiKey?>" class="form-control" name="steamApiKey">
+ <input type="text" value="<?=VBcmsGetSetting("steamApiKey")?>" class="form-control" name="steamApiKey">
</div>
</div>
<div class="col-sm">
<div class="form-check">
- <input class="form-check-input" type="checkbox" name="debugMode" <?=$debugMode?>>
+ <input class="form-check-input" type="checkbox" name="debugMode" <?=$debugModeChecked?>>
<label class="form-check-label"><i class="fas fa-bug"></i> Debug mode</label>
</div>
--
GitLab