fix some build fonctionnality

This commit is contained in:
Emmanuel ROY 2021-06-09 09:14:01 +02:00
parent 67ffc42769
commit fe77b35dcc
5 changed files with 40 additions and 24 deletions

View file

@ -43,15 +43,12 @@ class Controlleur
//si c'est une page de traitement PRG on appelle le fichier de controle de formulaire
} elseif ($application->url->page['control']) {
$url_params = $application->url->page['params'];
foreach($application->url->page['params'] as $key => $value){
$_GET[$key] = $value;
$url_params[$key] = $value;
}
//FIXME : Comportement anormal sur les traitements
foreach($application->url->page['params'] as $value => $key){
$_GET[$key] = $value;
$url_params[$key] = $value;
}
require TRAITEMENT_PATH . DIRECTORY_SEPARATOR . $application->url->page['name'] . '.php';
//sinon c'est une page MVC normale
} else {

View file

@ -75,7 +75,7 @@ class Url
} else {
foreach ($urlParts as $key => $value) {
$values[] = $value;
$keys[] = $value;
//$keys[] = $key;
}
//$page['params'] = array_combine($keys, $values);
$page['params'] = $values;
@ -97,11 +97,21 @@ class Url
} else {
$values = array();
$keys = array();
foreach ($urlParts as $key => $value) {
if ($key % 2 == 0) {
$values[] = $value;
} else {
$keys[] = $value;
if($page['control']){
foreach ($urlParts as $key => $value) {
if ($key % 2 == 1) {
$values[] = $value;
} else {
$keys[] = $value;
}
}
}else {
foreach ($urlParts as $key => $value) {
if ($key % 2 == 0) {
$values[] = $value;
} else {
$keys[] = $value;
}
}
}
$page['params'] = array_combine($keys, $values);
@ -217,11 +227,17 @@ class Url
} else {
$scheme = 'http';
}
$base_url = $scheme . "://" . $url;
$url = $base_url;
$scheme_tab = explode("://",PATH_URL);
if( $scheme !== $scheme_tab[0]){
$scheme = $scheme_tab[0];
}
$url = $scheme . "://" . $url;
}else{
$url = PATH_URL;
}
if( substr($url , -1) == "/"){
$url = substr($url, 0, -1);
}
if ($isControlPatern) {
$uri = self::controlLink_rewrite($page, $params);
} else {
@ -244,19 +260,21 @@ class Url
} else {
$scheme = 'http';
}
if(BASE_SERVER_DIRECTORY == "") {
$base_url = $scheme . "://" . $url . "/";
}else{
$base_url = $scheme . "://" . $url;
$scheme_tab = explode("://",PATH_URL);
if( $scheme !== $scheme_tab[0]){
$scheme = $scheme_tab[0];
}
$url = $base_url;
$url = $scheme . "://" . $url;
}else{
$url = PATH_URL;
}
if( substr($url . BASE_SERVER_DIRECTORY, -1) == "/"){
return substr($url . BASE_SERVER_DIRECTORY, 0, -1);
if( substr($url , -1) == "/"){
$url = substr($url, 0, -1);
}
if( substr($url . "/" . BASE_SERVER_DIRECTORY, -1) == "/"){
return substr($url . "/" . BASE_SERVER_DIRECTORY, 0, -1);
}else {
return $url . BASE_SERVER_DIRECTORY;
return $url . "/" . BASE_SERVER_DIRECTORY;
}
}
/**

View file

@ -53,7 +53,7 @@
</header>
<!-- end: Header -->
<!-- Subbar -->
@if($authentification == 'yes')
@if(isset($authentification) && $authentification == 'yes')
<div id="subbar" class="fullwidth">
<div class="container">
<span style="float:left;">Vous êtes connecté en tant que {{$_SESSION['user_login']}}</span>

View file

@ -39,6 +39,7 @@
@section('bottom-javascript')
@parent
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://cdn.3up.dk/in-view@0.6.1"></script>
<script type="text/javascript">
var formatThousandsNoRounding = function(n, dp){

View file

@ -2,9 +2,9 @@
namespace MVC\Command;
/**
* Class Cache
* Class Help
* Commande d'aide principale du Framework
* @package MVC\Command\Sand
* @package MVC\Command
*/
class Help
{