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

11H43 - Filemanager finished & bugs fix

parent 35292624
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 190 additions and 58 deletions
jsonEncode.php
+ 5
− 7
View file @ af35f786
<?php
// Fichier de test
$deTest = function($index){
$translation['test1'] = "Magnifique premier test";
$translation['test2'] = "Magnifique premier test";
$deTest['type'] = 1;
$deTest['fldr'] = "";
$deTest['sort_by'] = "name";
$deTest['ascending'] = 1;
return $translation[$index];
}
?>
<p>La phrase traduite est la suivante: <?=$deTest('test1')?></p>
\ No newline at end of file
echo urlencode(json_encode($deTest));
\ No newline at end of file
vbcms-admin/backTasks.php
+ 4
− 2
View file @ af35f786
......@@ -150,8 +150,10 @@ if (isset($_GET["getNotifications"])) {
$response = $bdd->prepare("UPDATE `vbcms-settings` SET value=? WHERE name='websiteMetaColor'");
$response->execute([$_POST["websiteMetaColor"]]);
//$response = $bdd->prepare("UPDATE `vbcms-settings` SET value=? WHERE name='websiteLogo'");
//$response->execute([$_POST["websiteLogo"]]);
if(isset($_POST["websiteLogo"])){
$response = $bdd->prepare("UPDATE `vbcms-settings` SET value=? WHERE name='websiteLogo'");
$response->execute([$_POST["websiteLogo"]]);
}
$response = $bdd->prepare("UPDATE `vbcms-settings` SET value=? WHERE name='steamApiKey'");
$response->execute([$_POST["steamApiKey"]]);
......
vbcms-admin/includes/settingsPage.php
+ 29
− 0
View file @ af35f786
......@@ -121,6 +121,14 @@ function getSettingsHTML($params){
<label>Courte description du internet</label>
<input required type="text" class="form-control" value="<?=$GLOBALS['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">
<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>
</div>
</div>
</div>
......@@ -269,6 +277,27 @@ function getSettingsHTML($params){
<?php } ?>
</div>
<?php if(verifyUserPermission($_SESSION['user_id'], "vbcms", 'editWebsiteIdentity')){ ?>
<!-- MODAL POUR LOGO DU SITE -->
<div class="modal fade" id="websiteLogoPicker">
<div class="modal-dialog" style="max-width: 50em;">
<div class="modal-content">
<div class="modal-header bg-brown text-white">
<h5 class="modal-title"><?=translate("chooseAPicture")?></h5>
<button type="button" class="close text-white" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body d-flex">
<iframe class="flex-grow-1" style="height: 25em;" src="<?=openFilemanager('admin', array('field_id' => 'websiteLogo', 'type' => 1))?>"></iframe>
</div>
</div>
</div>
</div>
<?php } ?>
<script type="text/javascript">
// S'éxecute une fois la page chargée
$( document ).ready(function() {
......
vbcms-admin/manage-ws-addons.php
+ 3
− 0
View file @ af35f786
......@@ -213,6 +213,9 @@ $emptyBaseModules = $bdd->query("SELECT * FROM `vbcms-baseModulesAssoc` WHERE ex
<small class="form-text text-muted"><?=translate("ws_adminAccessExplaination")?></small>
<div class="invalid-feedback">Veuillez renter un alias unique</div>
</div>
<h5><?=translate('note')?></h5>
<p><?=translate('noneFieldForModuleActivation')?></p>
</div>
<div id="depedenciesInfosDiv">
......
vbcms-content/extensions/vbcms-filemanager/admin/browse.php
+ 1
− 1
View file @ af35f786
......@@ -2,7 +2,7 @@
<div class="page-content d-flex flex-column" leftSidebar="240" rightSidebar="0" style="height:calc(100% - 60px);">
<h3><?=translate("gallery_filemanager")?></h3>
<p>La taille maximale d'envoie est de <code><?=(int)(ini_get('upload_max_filesize'))?> MB</code>.</p>
<iframe class="flex-grow-1" src="<?=$websiteUrl?>vbcms-content/extensions/vbcms-filemanager/includes/responsivefilemanager/dialog.php"></iframe>
<iframe class="flex-grow-1" src="<?=openFilemanager('admin')?>"></iframe>
<script type="text/javascript">
......
vbcms-content/extensions/vbcms-filemanager/extensionInfos.json
+ 1
− 1
View file @ af35f786
......@@ -8,7 +8,7 @@
"compatible": "48",
"author": "1",
"description": "Il s'agit du gestionnaire de fichers inclu avec VBcms. ",
"clientAccess": "",
"clientAccess": "none",
"adminAccess": "filemanager",
"permissions": ""
}
\ No newline at end of file
vbcms-content/extensions/vbcms-filemanager/includes/responsivefilemanager/config/config.php
+ 1
− 1
View file @ af35f786
......@@ -76,7 +76,7 @@ $config = array(
| with start and final /
|
*/
'upload_dir' => '/source/',
'upload_dir' => '/vbcms-content/uploads/',
/*
|--------------------------------------------------------------------------
| relative path from filemanager folder to upload folder
......
vbcms-content/extensions/vbcms-filemanager/pageHandler.php
+ 5
− 4
View file @ af35f786
......@@ -9,11 +9,12 @@ if($type =="admin"){
break;
case 'backTasks':
case 'openFilemanager':
if(isset($parameters[2]) && !empty($parameters[2])){
if($parameters[2]=="include"){
// On ne peut pas inclure le gestionnaire de fichier ici car cela créé bcp de problèmes à cause du fait qu'il s'agisse d'une classe
echo $GLOBALS['websiteUrl']."vbcms-content/extensions/vbcms-filemanager/includes/responsivefilemanager/dialog.php";
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));
}
}else{
echo "ERREUR: Aucun paramètre de spécifié.";
......
vbcms-content/translations/FR.php
+ 1
− 1
View file @ af35f786
......@@ -83,7 +83,7 @@ $translation["younHaveOneOrMoreUnsatisfiedBaseModuleAssotiation"] = "Tu as une o
$translation["clickHereToSolveThoseAssiociations"] = "Clique ici pour résoudre les associations";
$translation["fixAssoc"] = "Corriger les associations";
$translation["chooseAnExtForEachNonSatisfiedFunc"] = "Choisi une extension pour chaque fonction non associée.";
$translation["sample"] = "sample";
$translation["noneFieldForModuleActivation"] = "Pour désactiver l'accès au module ou si ce dernier ne gère pas une partie, tu dois mettre <code>none</code> dans le champs d'accès correspondant.<br><strong class='text-danger'>Laisser le champ vide reviendra à demander la gestion de l'index.</strong>";
$translation["sample"] = "sample";
$translation["sample"] = "sample";
$translation["sample"] = "sample";
......
vbcms-core/defaultPages/ext404.php 0 → 100644
+ 71
− 0
View file @ af35f786
<?php
// Arrive si on charge la page seule, ce n'est pas censé arriver
if(!isset($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"]."/";
}
?>
<!DOCTYPE html>
<html lang="fr">
<head>
<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">
</head>
<body>
<style type="text/css">
body{
margin: 0;
background-color: #bf946f;
}
.pageContent{
display: flex;
flex-direction: column;
position: absolute;
z-index: 10;
margin: 0 auto;
width: 100%;
margin-top: 50vh;
transform: translateY(-50%);
text-align: center;
color: white;
font-family: "Inter Regular";
}
.vbcmsLogo{
display: flex;
align-self: center;
flex-direction: row;
align-items: center;
}
.vbcmsLogo img{
width:7em;
height:7em;
}
.vbcmsLogo span{
font-family: "Linotype Kaliber Bold";
font-size: 2em;
}
.vbcmsLogo .sub{
font-family: "Linotype Kaliber Bold";
font-size: 1em;
}
.vbcmsLogo .text{
display:flex;
flex-direction:column;
align-items: start;
margin-left: .5em;
}
</style>
<div class="pageContent">
<div class="vbcmsLogo">
<img src="https://vbcms.net/vbcms-content/uploads/vbcms-logo/raccoon-in-box-512x.png">
<div class="text">
<span>VBcms</span>
<span class="sub">Erreur 404: L'extension demandée n'existe pas</span>
</div>
</div>
</div>
</body>
</html>
\ No newline at end of file
vbcms-core/functions.php
+ 69
− 41
View file @ af35f786
......@@ -7,6 +7,7 @@ function loadModule($type, $moduleAlias, $moduleParams){
$response->execute([null, date("Y-m-d H:i:s"), $moduleAlias, "loadModule($type, $moduleAlias, ".json_encode($moduleParams).")", $GLOBALS['http']."://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]", $GLOBALS['ip']]);
if ($type=="client") {
if($moduleAlias != "none"){
// On cherche le module correspondant à l'alias clientAccess dans la liste des modules activés
$response = $bdd->prepare("SELECT * FROM `vbcms-activatedExtensions` WHERE clientAccess=? AND type='module'");
$response->execute([$moduleAlias]);
......@@ -39,8 +40,10 @@ function loadModule($type, $moduleAlias, $moduleParams){
}
}
} else show404($type);
} elseif($type=="admin") {
if($moduleAlias != "none"){
// On cherche le module correspondant à l'alias adminAccess dans la liste des modules activés
$response = $bdd->prepare("SELECT * FROM `vbcms-activatedExtensions` WHERE adminAccess=? AND type='module'");
$response->execute([$moduleAlias]);
......@@ -53,7 +56,7 @@ function loadModule($type, $moduleAlias, $moduleParams){
} else {
show404($type);
}
} else show404($type);
}
}
......@@ -210,3 +213,28 @@ function verifyUserPermission($userId, $extensionName, $action){
return false;
}
}
/////////////////////////////////
// FONCTIONS DES MODULES DE BASES
/////////////////////////////////
function openFilemanager($mode, $parameters = array()){
// Mode pour client ou admin, mais c'est pas encore prévu pour les clients
// Parameters est une liste
global $bdd;
$filemanagerAssoc = $bdd->query("SELECT extensionName FROM `vbcms-baseModulesAssoc`")->fetchColumn();
if(empty($filemanagerAssoc)){
return $GLOBALS['websiteUrl'].'/vbcms-core/defaultPages/ext404.php';
}else{
$filemanagerExt = $bdd->prepare("SELECT * FROM `vbcms-activatedExtensions` WHERE name = ?");
$filemanagerExt->execute([$filemanagerAssoc]);
$filemanagerExt=$filemanagerExt->fetch(PDO::FETCH_ASSOC);
$callParams[1] = "openFilemanager";
$callParams[2] = json_encode($parameters);
$filemanagerModule = new module($filemanagerExt["name"]);
$filemanagerModule->call($callParams, 'admin');
}
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment