Reange and optimize
This commit is contained in:
parent
cbe1959e4f
commit
cb635858f1
36
index.php
36
index.php
@ -1,4 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace base;
|
namespace base;
|
||||||
|
|
||||||
use base\API\APIRouter;
|
use base\API\APIRouter;
|
||||||
@ -7,38 +8,37 @@ use base\Controller\Site\SiteRouter;
|
|||||||
use base\Model\BDD;
|
use base\Model\BDD;
|
||||||
|
|
||||||
session_start();
|
session_start();
|
||||||
date_default_timezone_set('Europe/Paris');
|
date_default_timezone_set( 'Europe/Paris' );
|
||||||
setlocale(LC_TIME, "fr_FR.UTF-8");
|
setlocale( LC_TIME, "fr_FR.UTF-8" );
|
||||||
error_reporting(E_ALL);
|
error_reporting( E_ALL );
|
||||||
|
|
||||||
require ('src/lib/functions.php');
|
require( 'src/lib/functions.php' );
|
||||||
require ('src/config.php');
|
require( 'src/config.php' );
|
||||||
|
|
||||||
require 'src/Autoloader.php';
|
require 'src/Autoloader.php';
|
||||||
Autoloader::register();
|
Autoloader::register();
|
||||||
|
|
||||||
new BDD();
|
new BDD();
|
||||||
|
|
||||||
$parts = explode('?', $_SERVER['REQUEST_URI']);
|
$parts = explode( '?', $_SERVER['REQUEST_URI'] );
|
||||||
$urlA = ltrim($parts[0], '/');
|
$urlA = ltrim( $parts[0], '/' );
|
||||||
$pages = explode('/', $urlA);
|
$pages = explode( '/', $urlA );
|
||||||
|
|
||||||
//Si il y a un / en fin d'url on redirige vers la meme page sans le /
|
//Si il y a un / en fin d'url on redirige vers la meme page sans le /
|
||||||
if (count($pages) > 1 && $pages[count($pages) - 1] == '')
|
if ( count( $pages ) > 1 && $pages[ count( $pages ) - 1 ] == '' ) {
|
||||||
{
|
$args = ( count( $parts ) > 1 ? '?' . $parts[1] : '' );
|
||||||
$args = (count($parts) > 1 ? '?'.$parts[1] : '');
|
header( $_SERVER['SERVER_PROTOCOL'] . ' 301 Moved Permanently' );
|
||||||
header($_SERVER['SERVER_PROTOCOL'].' 301 Moved Permanently');
|
header( 'Location: /' . rtrim( $urlA, '/' ) . $args );
|
||||||
header('Location: /'.rtrim($urlA, '/').$args);
|
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($pages[0] == 'api' && isset($pages[1]) && preg_match('#^([a-z]+)$#', $pages[1], $api1) && isset($pages[2]) && preg_match('#^([a-z-]+)$#', $pages[2], $api2)) {
|
if ( $pages[0] == 'api' && isset( $pages[1] ) && preg_match( '#^([a-z]+)$#', $pages[1], $api1 ) && isset( $pages[2] ) && preg_match( '#^([a-z-]+)$#', $pages[2], $api2 ) ) {
|
||||||
new APIRouter($api1[0], $api2[0]);
|
new APIRouter( $api1[0], $api2[0] );
|
||||||
|
|
||||||
} else if (preg_match('#^test\.dev$#', $_SERVER['SERVER_NAME'])) {
|
} else if ( preg_match( '#^test\.dev$#', $_SERVER['SERVER_NAME'] ) ) {
|
||||||
new SiteRouter($pages);
|
new SiteRouter( $pages );
|
||||||
} else {
|
} else {
|
||||||
new Error(404);
|
new Error( 404 );
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -10,9 +10,10 @@ class API extends Controller {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* API constructor.
|
* API constructor.
|
||||||
|
*
|
||||||
* @param array $declaredFunctions
|
* @param array $declaredFunctions
|
||||||
*/
|
*/
|
||||||
public function __construct(array $declaredFunctions) {
|
public function __construct( array $declaredFunctions ) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
$this->declaredFunctions = $declaredFunctions;
|
$this->declaredFunctions = $declaredFunctions;
|
||||||
}
|
}
|
||||||
|
@ -8,77 +8,83 @@ class APIError extends Controller {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* APIError constructor.
|
* APIError constructor.
|
||||||
|
*
|
||||||
* @param int $ErrCode
|
* @param int $ErrCode
|
||||||
* @param string $devMessage
|
* @param string $devMessage
|
||||||
* @param string $publicMessage
|
* @param string $publicMessage
|
||||||
* @param string $code
|
* @param string $code
|
||||||
*/
|
*/
|
||||||
public function __construct(int $ErrCode = 500, string $devMessage = 'Erreur inconnue', string $publicMessage = 'Une erreur inconnue s\'est produite', string $code = '') {
|
public function __construct( int $ErrCode = 500, string $devMessage = 'Erreur inconnue', string $publicMessage = 'Une erreur inconnue s\'est produite', string $code = '' ) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
|
|
||||||
$tabCode = [
|
$tabCode = [
|
||||||
//Informational 1xx
|
//Informational 1xx
|
||||||
100 => ['label' => '100 Continue', 'msg' => '100 Continue'],
|
100 => [ 'label' => '100 Continue', 'msg' => '100 Continue' ],
|
||||||
101 => ['label' => '101 Switching Protocols', 'msg' => '101 Switching Protocols'],
|
101 => [ 'label' => '101 Switching Protocols', 'msg' => '101 Switching Protocols' ],
|
||||||
//Successful 2xx
|
//Successful 2xx
|
||||||
200 => ['label' => '200 OK', 'msg' => '200 OK'],
|
200 => [ 'label' => '200 OK', 'msg' => '200 OK' ],
|
||||||
201 => ['label' => '201 Created', 'msg' => '201 Created'],
|
201 => [ 'label' => '201 Created', 'msg' => '201 Created' ],
|
||||||
202 => ['label' => '202 Accepted', 'msg' => '202 Accepted'],
|
202 => [ 'label' => '202 Accepted', 'msg' => '202 Accepted' ],
|
||||||
203 => ['label' => '203 Non-Authoritative Information', 'msg' => '203 Non-Authoritative Information'],
|
203 => [ 'label' => '203 Non-Authoritative Information', 'msg' => '203 Non-Authoritative Information' ],
|
||||||
204 => ['label' => '204 No Content', 'msg' => '204 No Content'],
|
204 => [ 'label' => '204 No Content', 'msg' => '204 No Content' ],
|
||||||
205 => ['label' => '205 Reset Content', 'msg' => '205 Reset Content'],
|
205 => [ 'label' => '205 Reset Content', 'msg' => '205 Reset Content' ],
|
||||||
206 => ['label' => '206 Partial Content', 'msg' => '206 Partial Content'],
|
206 => [ 'label' => '206 Partial Content', 'msg' => '206 Partial Content' ],
|
||||||
226 => ['label' => '226 IM Used', 'msg' => '226 IM Used'],
|
226 => [ 'label' => '226 IM Used', 'msg' => '226 IM Used' ],
|
||||||
//Redirection 3xx
|
//Redirection 3xx
|
||||||
300 => ['label' => '300 Multiple Choices', 'msg' => '300 Multiple Choices'],
|
300 => [ 'label' => '300 Multiple Choices', 'msg' => '300 Multiple Choices' ],
|
||||||
301 => ['label' => '301 Moved Permanently', 'msg' => '301 Moved Permanently'],
|
301 => [ 'label' => '301 Moved Permanently', 'msg' => '301 Moved Permanently' ],
|
||||||
302 => ['label' => '302 Found', 'msg' => '302 Found'],
|
302 => [ 'label' => '302 Found', 'msg' => '302 Found' ],
|
||||||
303 => ['label' => '303 See Other', 'msg' => '303 See Other'],
|
303 => [ 'label' => '303 See Other', 'msg' => '303 See Other' ],
|
||||||
304 => ['label' => '304 Not Modified', 'msg' => '304 Not Modified'],
|
304 => [ 'label' => '304 Not Modified', 'msg' => '304 Not Modified' ],
|
||||||
305 => ['label' => '305 Use Proxy', 'msg' => '305 Use Proxy'],
|
305 => [ 'label' => '305 Use Proxy', 'msg' => '305 Use Proxy' ],
|
||||||
306 => ['label' => '306 (Unused)', 'msg' => '306 (Unused)'],
|
306 => [ 'label' => '306 (Unused)', 'msg' => '306 (Unused)' ],
|
||||||
307 => ['label' => '307 Temporary Redirect', 'msg' => '307 Temporary Redirect'],
|
307 => [ 'label' => '307 Temporary Redirect', 'msg' => '307 Temporary Redirect' ],
|
||||||
//Client Error 4xx
|
//Client Error 4xx
|
||||||
400 => ['label' => '400 Bad Request', 'msg' => '400 Bad Request'],
|
400 => [ 'label' => '400 Bad Request', 'msg' => '400 Bad Request' ],
|
||||||
401 => ['label' => '401 Unauthorized', 'msg' => 'Vous n\'êtes pas autorisé à accéder à cette page'],
|
401 => [ 'label' => '401 Unauthorized', 'msg' => 'Vous n\'êtes pas autorisé à accéder à cette page' ],
|
||||||
402 => ['label' => '402 Payment Required', 'msg' => '402 Payment Required'],
|
402 => [ 'label' => '402 Payment Required', 'msg' => '402 Payment Required' ],
|
||||||
403 => ['label' => '403 Forbidden', 'msg' => '403 Forbidden'],
|
403 => [ 'label' => '403 Forbidden', 'msg' => '403 Forbidden' ],
|
||||||
404 => ['label' => '404 Not Found', 'msg' => 'Page non trouvée'],
|
404 => [ 'label' => '404 Not Found', 'msg' => 'Page non trouvée' ],
|
||||||
405 => ['label' => '405 Method Not Allowed', 'msg' => '405 Method Not Allowed'],
|
405 => [ 'label' => '405 Method Not Allowed', 'msg' => '405 Method Not Allowed' ],
|
||||||
406 => ['label' => '406 Not Acceptable', 'msg' => '406 Not Acceptable'],
|
406 => [ 'label' => '406 Not Acceptable', 'msg' => '406 Not Acceptable' ],
|
||||||
407 => ['label' => '407 Proxy Authentication Required', 'msg' => '407 Proxy Authentication Required'],
|
407 => [ 'label' => '407 Proxy Authentication Required', 'msg' => '407 Proxy Authentication Required' ],
|
||||||
408 => ['label' => '408 Request Timeout', 'msg' => '408 Request Timeout'],
|
408 => [ 'label' => '408 Request Timeout', 'msg' => '408 Request Timeout' ],
|
||||||
409 => ['label' => '409 Conflict', 'msg' => '409 Conflict'],
|
409 => [ 'label' => '409 Conflict', 'msg' => '409 Conflict' ],
|
||||||
410 => ['label' => '410 Gone', 'msg' => '410 Gone'],
|
410 => [ 'label' => '410 Gone', 'msg' => '410 Gone' ],
|
||||||
411 => ['label' => '411 Length Required', 'msg' => '411 Length Required'],
|
411 => [ 'label' => '411 Length Required', 'msg' => '411 Length Required' ],
|
||||||
412 => ['label' => '412 Precondition Failed', 'msg' => '412 Precondition Failed'],
|
412 => [ 'label' => '412 Precondition Failed', 'msg' => '412 Precondition Failed' ],
|
||||||
413 => ['label' => '413 Request Entity Too Large', 'msg' => '413 Request Entity Too Large'],
|
413 => [ 'label' => '413 Request Entity Too Large', 'msg' => '413 Request Entity Too Large' ],
|
||||||
414 => ['label' => '414 Request-URI Too Long', 'msg' => '414 Request-URI Too Long'],
|
414 => [ 'label' => '414 Request-URI Too Long', 'msg' => '414 Request-URI Too Long' ],
|
||||||
415 => ['label' => '415 Unsupported Media Type', 'msg' => '415 Unsupported Media Type'],
|
415 => [ 'label' => '415 Unsupported Media Type', 'msg' => '415 Unsupported Media Type' ],
|
||||||
416 => ['label' => '416 Requested Range Not Satisfiable', 'msg' => '416 Requested Range Not Satisfiable'],
|
416 => [ 'label' => '416 Requested Range Not Satisfiable', 'msg' => '416 Requested Range Not Satisfiable' ],
|
||||||
417 => ['label' => '417 Expectation Failed', 'msg' => '417 Expectation Failed'],
|
417 => [ 'label' => '417 Expectation Failed', 'msg' => '417 Expectation Failed' ],
|
||||||
418 => ['label' => '418 I\'m a teapot', 'msg' => '418 I\'m a teapot'],
|
418 => [ 'label' => '418 I\'m a teapot', 'msg' => '418 I\'m a teapot' ],
|
||||||
422 => ['label' => '422 Unprocessable Entity', 'msg' => '422 Unprocessable Entity'],
|
422 => [ 'label' => '422 Unprocessable Entity', 'msg' => '422 Unprocessable Entity' ],
|
||||||
423 => ['label' => '423 Locked', 'msg' => '423 Locked'],
|
423 => [ 'label' => '423 Locked', 'msg' => '423 Locked' ],
|
||||||
426 => ['label' => '426 Upgrade Required', 'msg' => '426 Upgrade Required'],
|
426 => [ 'label' => '426 Upgrade Required', 'msg' => '426 Upgrade Required' ],
|
||||||
428 => ['label' => '428 Precondition Required', 'msg' => '428 Precondition Required'],
|
428 => [ 'label' => '428 Precondition Required', 'msg' => '428 Precondition Required' ],
|
||||||
429 => ['label' => '429 Too Many Requests', 'msg' => '429 Too Many Requests'],
|
429 => [ 'label' => '429 Too Many Requests', 'msg' => '429 Too Many Requests' ],
|
||||||
431 => ['label' => '431 Request Header Fields Too Large', 'msg' => '431 Request Header Fields Too Large'],
|
431 => [ 'label' => '431 Request Header Fields Too Large', 'msg' => '431 Request Header Fields Too Large' ],
|
||||||
//Server Error 5xx
|
//Server Error 5xx
|
||||||
500 => ['label' => '500 Internal Server Error', 'msg' => 'Une erreur est survenue'],
|
500 => [ 'label' => '500 Internal Server Error', 'msg' => 'Une erreur est survenue' ],
|
||||||
501 => ['label' => '501 Not Implemented', 'msg' => '501 Not Implemented'],
|
501 => [ 'label' => '501 Not Implemented', 'msg' => '501 Not Implemented' ],
|
||||||
502 => ['label' => '502 Bad Gateway', 'msg' => '502 Bad Gateway'],
|
502 => [ 'label' => '502 Bad Gateway', 'msg' => '502 Bad Gateway' ],
|
||||||
503 => ['label' => '503 Service Unavailable', 'msg' => '503 Service Unavailable'],
|
503 => [ 'label' => '503 Service Unavailable', 'msg' => '503 Service Unavailable' ],
|
||||||
504 => ['label' => '504 Gateway Timeout', 'msg' => '504 Gateway Timeout'],
|
504 => [ 'label' => '504 Gateway Timeout', 'msg' => '504 Gateway Timeout' ],
|
||||||
505 => ['label' => '505 HTTP Version Not Supported', 'msg' => '505 HTTP Version Not Supported'],
|
505 => [ 'label' => '505 HTTP Version Not Supported', 'msg' => '505 HTTP Version Not Supported' ],
|
||||||
506 => ['label' => '506 Variant Also Negotiates', 'msg' => '506 Variant Also Negotiates'],
|
506 => [ 'label' => '506 Variant Also Negotiates', 'msg' => '506 Variant Also Negotiates' ],
|
||||||
510 => ['label' => '510 Not Extended', 'msg' => '510 Not Extended'],
|
510 => [ 'label' => '510 Not Extended', 'msg' => '510 Not Extended' ],
|
||||||
511 => ['label' => '511 Network Authentication Required', 'msg' => '511 Network Authentication Required']
|
511 => [ 'label' => '511 Network Authentication Required', 'msg' => '511 Network Authentication Required' ]
|
||||||
];
|
];
|
||||||
|
|
||||||
header('Content-Type: application/json');
|
header( 'Content-Type: application/json' );
|
||||||
header($_SERVER['SERVER_PROTOCOL'].' '.$tabCode[$ErrCode]['label']);
|
header( $_SERVER['SERVER_PROTOCOL'] . ' ' . $tabCode[ $ErrCode ]['label'] );
|
||||||
echo json_encode(['status' => 'echec', 'msg' => $publicMessage, 'devMsg' => $devMessage, 'code' => $code], JSON_PRETTY_PRINT);
|
echo json_encode( [
|
||||||
|
'status' => 'echec',
|
||||||
|
'msg' => $publicMessage,
|
||||||
|
'devMsg' => $devMessage,
|
||||||
|
'code' => $code
|
||||||
|
], JSON_PRETTY_PRINT );
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -7,124 +7,125 @@ use base\Config;
|
|||||||
class APIRouter {
|
class APIRouter {
|
||||||
|
|
||||||
//Les méthodes HTTP gérée par l'API
|
//Les méthodes HTTP gérée par l'API
|
||||||
const HTTP_METHODS = ['GET', 'POST', 'DELETE', 'PUT'];
|
const HTTP_METHODS = [ 'GET', 'POST', 'DELETE', 'PUT' ];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* APIRouter constructor.
|
* APIRouter constructor.
|
||||||
|
*
|
||||||
* @param string $file
|
* @param string $file
|
||||||
* @param string $action
|
* @param string $action
|
||||||
*/
|
*/
|
||||||
public function __construct(string $file, string $action) {
|
public function __construct( string $file, string $action ) {
|
||||||
|
|
||||||
//On vérifie que les paramètres ne sont pas vides
|
//On vérifie que les paramètres ne sont pas vides
|
||||||
if (empty($file) || empty($action)) {
|
if ( empty( $file ) || empty( $action ) ) {
|
||||||
new APIError();
|
new APIError();
|
||||||
}
|
}
|
||||||
|
|
||||||
//On vérifie que la classe appelée existe
|
//On vérifie que la classe appelée existe
|
||||||
$fileName = 'API' . ucfirst($file);
|
$fileName = 'API' . ucfirst( $file );
|
||||||
if (!file_exists('src/API/' . $fileName . '.php')) {
|
if ( ! file_exists( 'src/API/' . $fileName . '.php' ) ) {
|
||||||
new APIError(404);
|
new APIError( 404 );
|
||||||
}
|
}
|
||||||
|
|
||||||
//On instancie la classe.
|
//On instancie la classe.
|
||||||
$class = '\\' . Config::NAMESPACE . '\\API\\' . $fileName;
|
$class = '\\' . Config::NAMESPACE . '\\API\\' . $fileName;
|
||||||
$class = new $class($action);
|
$class = new $class( $action );
|
||||||
|
|
||||||
//On vérifie que l'action demandé est déclarée
|
//On vérifie que l'action demandé est déclarée
|
||||||
if (!array_key_exists($action, $class->getDeclaredFunctions())) {
|
if ( ! array_key_exists( $action, $class->getDeclaredFunctions() ) ) {
|
||||||
new APIError(404);
|
new APIError( 404 );
|
||||||
}
|
}
|
||||||
|
|
||||||
//On reconstruit le nom de la fonction
|
//On reconstruit le nom de la fonction
|
||||||
$array = explode('-', $action);
|
$array = explode( '-', $action );
|
||||||
foreach ($array as $key => $value) {
|
foreach ( $array as $key => $value ) {
|
||||||
if ($key == 0) {
|
if ( $key == 0 ) {
|
||||||
$array[$key] = $value;
|
$array[ $key ] = $value;
|
||||||
} else {
|
} else {
|
||||||
$array[$key] = ucfirst($value);
|
$array[ $key ] = ucfirst( $value );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$function = implode('', $array); //le nom de la fonction
|
$function = implode( '', $array ); //le nom de la fonction
|
||||||
|
|
||||||
//On vérifie que la fonction existe dans la classe
|
//On vérifie que la fonction existe dans la classe
|
||||||
if (!method_exists($class, $function)) {
|
if ( ! method_exists( $class, $function ) ) {
|
||||||
new APIError(500, 'La fonction ' . $function . ' n\'existe pas dans la classe ' . get_class($class));
|
new APIError( 500, 'La fonction ' . $function . ' n\'existe pas dans la classe ' . get_class( $class ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
//On vérifie que la méthode d'envoie est référencée
|
//On vérifie que la méthode d'envoie est référencée
|
||||||
$method = $class->getDeclaredFunctions()[$action]['method'];
|
$method = $class->getDeclaredFunctions()[ $action ]['method'];
|
||||||
if (!in_array($method, self::HTTP_METHODS)) {
|
if ( ! in_array( $method, self::HTTP_METHODS ) ) {
|
||||||
new APIError(500, 'méthode http inconnue');
|
new APIError( 500, 'méthode http inconnue' );
|
||||||
}
|
}
|
||||||
|
|
||||||
//On vérifie que la méthode requise et la mathode obtenue sont les même
|
//On vérifie que la méthode requise et la mathode obtenue sont les même
|
||||||
if ($method != $_SERVER['REQUEST_METHOD']) {
|
if ( $method != $_SERVER['REQUEST_METHOD'] ) {
|
||||||
new APIError(400, 'La méthode HTTP ne correspond pas à la méthode prévue');
|
new APIError( 400, 'La méthode HTTP ne correspond pas à la méthode prévue' );
|
||||||
}
|
}
|
||||||
|
|
||||||
//On met les paramètres dans le tableau $data
|
//On met les paramètres dans le tableau $data
|
||||||
$params = $class->getDeclaredFunctions()[$action]['params'];
|
$params = $class->getDeclaredFunctions()[ $action ]['params'];
|
||||||
$data = [];
|
$data = [];
|
||||||
if (!empty($params)) {
|
if ( ! empty( $params ) ) {
|
||||||
if ($method == 'DELETE' || $method == 'PUT') {
|
if ( $method == 'DELETE' || $method == 'PUT' ) {
|
||||||
parse_str(file_get_contents('php://input'), $data);
|
parse_str( file_get_contents( 'php://input' ), $data );
|
||||||
} else if($method == 'POST') {
|
} else if ( $method == 'POST' ) {
|
||||||
$data = $_POST;
|
$data = $_POST;
|
||||||
} else if ($method == 'GET') {
|
} else if ( $method == 'GET' ) {
|
||||||
$data = $_GET;
|
$data = $_GET;
|
||||||
}
|
}
|
||||||
|
|
||||||
//On boucle sur les paramètres de la doc de la fonction
|
//On boucle sur les paramètres de la doc de la fonction
|
||||||
foreach ($params as $p => $options){
|
foreach ( $params as $p => $options ) {
|
||||||
if(!isset($options['required'])){
|
if ( ! isset( $options['required'] ) ) {
|
||||||
$options['required'] = false;
|
$options['required'] = false;
|
||||||
}
|
}
|
||||||
//Si le paramètre est obligatoire et qu'il est vide ou non fourni on lève une erreur 400 BAD REQUEST
|
//Si le paramètre est obligatoire et qu'il est vide ou non fourni on lève une erreur 400 BAD REQUEST
|
||||||
if ($options['required'] && (!array_key_exists($p, $data) || (empty($data[$p]) && $data[$p] != '0'))) {
|
if ( $options['required'] && ( ! array_key_exists( $p, $data ) || ( empty( $data[ $p ] ) && $data[ $p ] != '0' ) ) ) {
|
||||||
$devMsg = 'Paramètre ' . $p . ' manquant';
|
$devMsg = 'Paramètre ' . $p . ' manquant';
|
||||||
if (isset($options['devMsg'])) {
|
if ( isset( $options['devMsg'] ) ) {
|
||||||
$devMsg = $options['devMsg'];
|
$devMsg = $options['devMsg'];
|
||||||
}
|
}
|
||||||
$publicMsg = 'Des paramètres obligatoires ne sont pas envoyés ou sont vides';
|
$publicMsg = 'Des paramètres obligatoires ne sont pas envoyés ou sont vides';
|
||||||
if (isset($options['publicMsg'])) {
|
if ( isset( $options['publicMsg'] ) ) {
|
||||||
$publicMsg = $options['publicMsg'];
|
$publicMsg = $options['publicMsg'];
|
||||||
}
|
}
|
||||||
$code = '';
|
$code = '';
|
||||||
if (isset($options['code'])) {
|
if ( isset( $options['code'] ) ) {
|
||||||
$code = $options['code'];
|
$code = $options['code'];
|
||||||
}
|
}
|
||||||
new APIError(400, $devMsg, $publicMsg, $code);
|
new APIError( 400, $devMsg, $publicMsg, $code );
|
||||||
}
|
}
|
||||||
|
|
||||||
//On vérifie que le type donné correspond au typage requis
|
//On vérifie que le type donné correspond au typage requis
|
||||||
if (isset($options['type'])) {
|
if ( isset( $options['type'] ) ) {
|
||||||
if ($options['type'] == 'int') {
|
if ( $options['type'] == 'int' ) {
|
||||||
if (ctype_digit($data[$p])) {
|
if ( ctype_digit( $data[ $p ] ) ) {
|
||||||
$data[$p] = (int) $data[$p];
|
$data[ $p ] = (int) $data[ $p ];
|
||||||
} else {
|
} else {
|
||||||
new APIError(400, 'Le type donné ne correspond pas au type demandé pour le paramètre '.$p.' : string donné, '.$options['type'].' requis');
|
new APIError( 400, 'Le type donné ne correspond pas au type demandé pour le paramètre ' . $p . ' : string donné, ' . $options['type'] . ' requis' );
|
||||||
}
|
}
|
||||||
} else if ($options['type'] == 'bool') {
|
} else if ( $options['type'] == 'bool' ) {
|
||||||
if ($data[$p] == 'true' || $data[$p] == '1') {
|
if ( $data[ $p ] == 'true' || $data[ $p ] == '1' ) {
|
||||||
$data[$p] = true;
|
$data[ $p ] = true;
|
||||||
} else if ($data[$p] == 'false' || $data[$p] == '0') {
|
} else if ( $data[ $p ] == 'false' || $data[ $p ] == '0' ) {
|
||||||
$data[$p] = false;
|
$data[ $p ] = false;
|
||||||
} else {
|
} else {
|
||||||
new APIError(400, 'Le type donné ne correspond pas au type demandé pour le paramètre '.$p.' : string donné, '.$options['type'].' requis');
|
new APIError( 400, 'Le type donné ne correspond pas au type demandé pour le paramètre ' . $p . ' : string donné, ' . $options['type'] . ' requis' );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//Si un paramètre non obligatoire n'est pas donné par l'utilisateur on lui donne la valeur par défaut d'une chaine vide
|
//Si un paramètre non obligatoire n'est pas donné par l'utilisateur on lui donne la valeur par défaut d'une chaine vide
|
||||||
if (!array_key_exists($p, $data)) {
|
if ( ! array_key_exists( $p, $data ) ) {
|
||||||
$data[$p] = '';
|
$data[ $p ] = '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//On appelle la fonction correspondante pour le traitement
|
//On appelle la fonction correspondante pour le traitement
|
||||||
$class->$function($data);
|
$class->$function( $data );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8,15 +8,17 @@ class Autoloader {
|
|||||||
* Enregistre notre autoloader
|
* Enregistre notre autoloader
|
||||||
*/
|
*/
|
||||||
static function register() {
|
static function register() {
|
||||||
spl_autoload_register(array(__CLASS__, 'autoload'));
|
spl_autoload_register( array( __CLASS__, 'autoload' ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Inclue le fichier correspondant à notre classe
|
* Inclue le fichier correspondant à notre classe
|
||||||
|
*
|
||||||
* @param $class string Le nom de la classe à charger
|
* @param $class string Le nom de la classe à charger
|
||||||
*/
|
*/
|
||||||
static function autoload($class) {
|
static function autoload( $class ) {
|
||||||
if (preg_match('#^' . Config::NAMESPACE . '\\\(.+)$#', $class, $matches))
|
if ( preg_match( '#^' . Config::NAMESPACE . '\\\(.+)$#', $class, $matches ) ) {
|
||||||
require 'src/' . str_replace('\\', '/', $matches[1]) . '.php';
|
require 'src/' . str_replace( '\\', '/', $matches[1] ) . '.php';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -9,30 +9,30 @@ class Controller {
|
|||||||
private $data;
|
private $data;
|
||||||
|
|
||||||
public function __construct() {
|
public function __construct() {
|
||||||
$this->data=[];
|
$this->data = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function view() {
|
protected function view() {
|
||||||
ob_start();
|
ob_start();
|
||||||
extract($this->data);
|
extract( $this->data );
|
||||||
require 'src/View/' . str_replace('\\', '/', preg_replace('#^' . Config::NAMESPACE . '\\\Controller\\\#', '', get_class($this))) . '.php';
|
require 'src/View/' . str_replace( '\\', '/', preg_replace( '#^' . Config::NAMESPACE . '\\\Controller\\\#', '', get_class( $this ) ) ) . '.php';
|
||||||
ob_end_flush();
|
ob_end_flush();
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function addData($data) {
|
protected function addData( $data ) {
|
||||||
$this->data += $data;
|
$this->data += $data;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function returnJson($data) {
|
protected function returnJson( $data ) {
|
||||||
header('Content-Type: application/json');
|
header( 'Content-Type: application/json' );
|
||||||
echo json_encode($data);
|
echo json_encode( $data );
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function throwError($msg, $code = '') {
|
protected function throwError( $msg, $code = '' ) {
|
||||||
header('Content-Type: application/json');
|
header( 'Content-Type: application/json' );
|
||||||
echo json_encode(['status' => 'echec', 'msg' => $msg, 'code' => $code], JSON_PRETTY_PRINT);
|
echo json_encode( [ 'status' => 'echec', 'msg' => $msg, 'code' => $code ], JSON_PRETTY_PRINT );
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -11,29 +11,29 @@ class ControllerSite {
|
|||||||
private $footer;
|
private $footer;
|
||||||
|
|
||||||
public function __construct() {
|
public function __construct() {
|
||||||
$this->data=[];
|
$this->data = [];
|
||||||
$this->head=[];
|
$this->head = [];
|
||||||
$this->footer=[];
|
$this->footer = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected function view($header = true, $footer = true) {
|
protected function view( $header = true, $footer = true ) {
|
||||||
ob_start();
|
ob_start();
|
||||||
extract($this->data);
|
extract( $this->data );
|
||||||
|
|
||||||
if (empty($this->head['title'])) {
|
if ( empty( $this->head['title'] ) ) {
|
||||||
$this->head['title'] = Config::TITLE_HEADER;
|
$this->head['title'] = Config::TITLE_HEADER;
|
||||||
}
|
}
|
||||||
if (empty($this->head['description'])) {
|
if ( empty( $this->head['description'] ) ) {
|
||||||
$this->head['description'] = Config::DESCRIPTION_HEADER;
|
$this->head['description'] = Config::DESCRIPTION_HEADER;
|
||||||
}
|
}
|
||||||
if ($header) {
|
if ( $header ) {
|
||||||
require 'src/View/Site/tpl/head.php';
|
require 'src/View/Site/tpl/head.php';
|
||||||
}
|
}
|
||||||
|
|
||||||
require 'src/View/'.str_replace('\\', '/', preg_replace('#^' . Config::NAMESPACE . '\\\Controller\\\#', '', get_class($this))) . '.php';
|
require 'src/View/' . str_replace( '\\', '/', preg_replace( '#^' . Config::NAMESPACE . '\\\Controller\\\#', '', get_class( $this ) ) ) . '.php';
|
||||||
|
|
||||||
if ($footer) {
|
if ( $footer ) {
|
||||||
require 'src/View/Site/tpl/footer.php';
|
require 'src/View/Site/tpl/footer.php';
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -41,30 +41,30 @@ class ControllerSite {
|
|||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function addHead($head) {
|
protected function addHead( $head ) {
|
||||||
$this->head += $head;
|
$this->head += $head;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function addData($data) {
|
protected function addData( $data ) {
|
||||||
$this->data += $data;
|
$this->data += $data;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function addFooter($footer) {
|
protected function addFooter( $footer ) {
|
||||||
$this->footer += $footer;
|
$this->footer += $footer;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $data
|
* @param $data
|
||||||
*/
|
*/
|
||||||
protected function returnJson($data) {
|
protected function returnJson( $data ) {
|
||||||
header('Content-Type: application/json');
|
header( 'Content-Type: application/json' );
|
||||||
echo json_encode($data);
|
echo json_encode( $data );
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function throwError($msg, $code = '') {
|
protected function throwError( $msg, $code = '' ) {
|
||||||
header('Content-Type: application/json');
|
header( 'Content-Type: application/json' );
|
||||||
echo json_encode(['status' => 'echec', 'msg' => $msg, 'code' => $code], JSON_PRETTY_PRINT);
|
echo json_encode( [ 'status' => 'echec', 'msg' => $msg, 'code' => $code ], JSON_PRETTY_PRINT );
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,91 +6,92 @@ class Error extends Controller {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Error constructor.
|
* Error constructor.
|
||||||
|
*
|
||||||
* @param int $ErrCode
|
* @param int $ErrCode
|
||||||
* @param string $message
|
* @param string $message
|
||||||
*/
|
*/
|
||||||
public function __construct($ErrCode = 500, $message = '') {
|
public function __construct( $ErrCode = 500, $message = '' ) {
|
||||||
|
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
|
|
||||||
$tabCode = [
|
$tabCode = [
|
||||||
//Informational 1xx
|
//Informational 1xx
|
||||||
100 => ['label' => '100 Continue', 'msg' => '100 Continue'],
|
100 => [ 'label' => '100 Continue', 'msg' => '100 Continue' ],
|
||||||
101 => ['label' => '101 Switching Protocols', 'msg' => '101 Switching Protocols'],
|
101 => [ 'label' => '101 Switching Protocols', 'msg' => '101 Switching Protocols' ],
|
||||||
//Successful 2xx
|
//Successful 2xx
|
||||||
200 => ['label' => '200 OK', 'msg' => '200 OK'],
|
200 => [ 'label' => '200 OK', 'msg' => '200 OK' ],
|
||||||
201 => ['label' => '201 Created', 'msg' => '201 Created'],
|
201 => [ 'label' => '201 Created', 'msg' => '201 Created' ],
|
||||||
202 => ['label' => '202 Accepted', 'msg' => '202 Accepted'],
|
202 => [ 'label' => '202 Accepted', 'msg' => '202 Accepted' ],
|
||||||
203 => ['label' => '203 Non-Authoritative Information', 'msg' => '203 Non-Authoritative Information'],
|
203 => [ 'label' => '203 Non-Authoritative Information', 'msg' => '203 Non-Authoritative Information' ],
|
||||||
204 => ['label' => '204 No Content', 'msg' => '204 No Content'],
|
204 => [ 'label' => '204 No Content', 'msg' => '204 No Content' ],
|
||||||
205 => ['label' => '205 Reset Content', 'msg' => '205 Reset Content'],
|
205 => [ 'label' => '205 Reset Content', 'msg' => '205 Reset Content' ],
|
||||||
206 => ['label' => '206 Partial Content', 'msg' => '206 Partial Content'],
|
206 => [ 'label' => '206 Partial Content', 'msg' => '206 Partial Content' ],
|
||||||
226 => ['label' => '226 IM Used', 'msg' => '226 IM Used'],
|
226 => [ 'label' => '226 IM Used', 'msg' => '226 IM Used' ],
|
||||||
//Redirection 3xx
|
//Redirection 3xx
|
||||||
300 => ['label' => '300 Multiple Choices', 'msg' => '300 Multiple Choices'],
|
300 => [ 'label' => '300 Multiple Choices', 'msg' => '300 Multiple Choices' ],
|
||||||
301 => ['label' => '301 Moved Permanently', 'msg' => '301 Moved Permanently'],
|
301 => [ 'label' => '301 Moved Permanently', 'msg' => '301 Moved Permanently' ],
|
||||||
302 => ['label' => '302 Found', 'msg' => '302 Found'],
|
302 => [ 'label' => '302 Found', 'msg' => '302 Found' ],
|
||||||
303 => ['label' => '303 See Other', 'msg' => '303 See Other'],
|
303 => [ 'label' => '303 See Other', 'msg' => '303 See Other' ],
|
||||||
304 => ['label' => '304 Not Modified', 'msg' => '304 Not Modified'],
|
304 => [ 'label' => '304 Not Modified', 'msg' => '304 Not Modified' ],
|
||||||
305 => ['label' => '305 Use Proxy', 'msg' => '305 Use Proxy'],
|
305 => [ 'label' => '305 Use Proxy', 'msg' => '305 Use Proxy' ],
|
||||||
306 => ['label' => '306 (Unused)', 'msg' => '306 (Unused)'],
|
306 => [ 'label' => '306 (Unused)', 'msg' => '306 (Unused)' ],
|
||||||
307 => ['label' => '307 Temporary Redirect', 'msg' => '307 Temporary Redirect'],
|
307 => [ 'label' => '307 Temporary Redirect', 'msg' => '307 Temporary Redirect' ],
|
||||||
//Client Error 4xx
|
//Client Error 4xx
|
||||||
400 => ['label' => '400 Bad Request', 'msg' => '400 Bad Request'],
|
400 => [ 'label' => '400 Bad Request', 'msg' => '400 Bad Request' ],
|
||||||
401 => ['label' => '401 Unauthorized', 'msg' => 'Vous n\'êtes pas autorisé à accéder à cette page'],
|
401 => [ 'label' => '401 Unauthorized', 'msg' => 'Vous n\'êtes pas autorisé à accéder à cette page' ],
|
||||||
402 => ['label' => '402 Payment Required', 'msg' => '402 Payment Required'],
|
402 => [ 'label' => '402 Payment Required', 'msg' => '402 Payment Required' ],
|
||||||
403 => ['label' => '403 Forbidden', 'msg' => '403 Forbidden'],
|
403 => [ 'label' => '403 Forbidden', 'msg' => '403 Forbidden' ],
|
||||||
404 => ['label' => '404 Not Found', 'msg' => 'Page non trouvée'],
|
404 => [ 'label' => '404 Not Found', 'msg' => 'Page non trouvée' ],
|
||||||
405 => ['label' => '405 Method Not Allowed', 'msg' => '405 Method Not Allowed'],
|
405 => [ 'label' => '405 Method Not Allowed', 'msg' => '405 Method Not Allowed' ],
|
||||||
406 => ['label' => '406 Not Acceptable', 'msg' => '406 Not Acceptable'],
|
406 => [ 'label' => '406 Not Acceptable', 'msg' => '406 Not Acceptable' ],
|
||||||
407 => ['label' => '407 Proxy Authentication Required', 'msg' => '407 Proxy Authentication Required'],
|
407 => [ 'label' => '407 Proxy Authentication Required', 'msg' => '407 Proxy Authentication Required' ],
|
||||||
408 => ['label' => '408 Request Timeout', 'msg' => '408 Request Timeout'],
|
408 => [ 'label' => '408 Request Timeout', 'msg' => '408 Request Timeout' ],
|
||||||
409 => ['label' => '409 Conflict', 'msg' => '409 Conflict'],
|
409 => [ 'label' => '409 Conflict', 'msg' => '409 Conflict' ],
|
||||||
410 => ['label' => '410 Gone', 'msg' => '410 Gone'],
|
410 => [ 'label' => '410 Gone', 'msg' => '410 Gone' ],
|
||||||
411 => ['label' => '411 Length Required', 'msg' => '411 Length Required'],
|
411 => [ 'label' => '411 Length Required', 'msg' => '411 Length Required' ],
|
||||||
412 => ['label' => '412 Precondition Failed', 'msg' => '412 Precondition Failed'],
|
412 => [ 'label' => '412 Precondition Failed', 'msg' => '412 Precondition Failed' ],
|
||||||
413 => ['label' => '413 Request Entity Too Large', 'msg' => '413 Request Entity Too Large'],
|
413 => [ 'label' => '413 Request Entity Too Large', 'msg' => '413 Request Entity Too Large' ],
|
||||||
414 => ['label' => '414 Request-URI Too Long', 'msg' => '414 Request-URI Too Long'],
|
414 => [ 'label' => '414 Request-URI Too Long', 'msg' => '414 Request-URI Too Long' ],
|
||||||
415 => ['label' => '415 Unsupported Media Type', 'msg' => '415 Unsupported Media Type'],
|
415 => [ 'label' => '415 Unsupported Media Type', 'msg' => '415 Unsupported Media Type' ],
|
||||||
416 => ['label' => '416 Requested Range Not Satisfiable', 'msg' => '416 Requested Range Not Satisfiable'],
|
416 => [ 'label' => '416 Requested Range Not Satisfiable', 'msg' => '416 Requested Range Not Satisfiable' ],
|
||||||
417 => ['label' => '417 Expectation Failed', 'msg' => '417 Expectation Failed'],
|
417 => [ 'label' => '417 Expectation Failed', 'msg' => '417 Expectation Failed' ],
|
||||||
418 => ['label' => '418 I\'m a teapot', 'msg' => '418 I\'m a teapot'],
|
418 => [ 'label' => '418 I\'m a teapot', 'msg' => '418 I\'m a teapot' ],
|
||||||
422 => ['label' => '422 Unprocessable Entity', 'msg' => '422 Unprocessable Entity'],
|
422 => [ 'label' => '422 Unprocessable Entity', 'msg' => '422 Unprocessable Entity' ],
|
||||||
423 => ['label' => '423 Locked', 'msg' => '423 Locked'],
|
423 => [ 'label' => '423 Locked', 'msg' => '423 Locked' ],
|
||||||
426 => ['label' => '426 Upgrade Required', 'msg' => '426 Upgrade Required'],
|
426 => [ 'label' => '426 Upgrade Required', 'msg' => '426 Upgrade Required' ],
|
||||||
428 => ['label' => '428 Precondition Required', 'msg' => '428 Precondition Required'],
|
428 => [ 'label' => '428 Precondition Required', 'msg' => '428 Precondition Required' ],
|
||||||
429 => ['label' => '429 Too Many Requests', 'msg' => '429 Too Many Requests'],
|
429 => [ 'label' => '429 Too Many Requests', 'msg' => '429 Too Many Requests' ],
|
||||||
431 => ['label' => '431 Request Header Fields Too Large', 'msg' => '431 Request Header Fields Too Large'],
|
431 => [ 'label' => '431 Request Header Fields Too Large', 'msg' => '431 Request Header Fields Too Large' ],
|
||||||
//Server Error 5xx
|
//Server Error 5xx
|
||||||
500 => ['label' => '500 Internal Server Error', 'msg' => 'Une erreur est survenue'],
|
500 => [ 'label' => '500 Internal Server Error', 'msg' => 'Une erreur est survenue' ],
|
||||||
501 => ['label' => '501 Not Implemented', 'msg' => '501 Not Implemented'],
|
501 => [ 'label' => '501 Not Implemented', 'msg' => '501 Not Implemented' ],
|
||||||
502 => ['label' => '502 Bad Gateway', 'msg' => '502 Bad Gateway'],
|
502 => [ 'label' => '502 Bad Gateway', 'msg' => '502 Bad Gateway' ],
|
||||||
503 => ['label' => '503 Service Unavailable', 'msg' => '503 Service Unavailable'],
|
503 => [ 'label' => '503 Service Unavailable', 'msg' => '503 Service Unavailable' ],
|
||||||
504 => ['label' => '504 Gateway Timeout', 'msg' => '504 Gateway Timeout'],
|
504 => [ 'label' => '504 Gateway Timeout', 'msg' => '504 Gateway Timeout' ],
|
||||||
505 => ['label' => '505 HTTP Version Not Supported', 'msg' => '505 HTTP Version Not Supported'],
|
505 => [ 'label' => '505 HTTP Version Not Supported', 'msg' => '505 HTTP Version Not Supported' ],
|
||||||
506 => ['label' => '506 Variant Also Negotiates', 'msg' => '506 Variant Also Negotiates'],
|
506 => [ 'label' => '506 Variant Also Negotiates', 'msg' => '506 Variant Also Negotiates' ],
|
||||||
510 => ['label' => '510 Not Extended', 'msg' => '510 Not Extended'],
|
510 => [ 'label' => '510 Not Extended', 'msg' => '510 Not Extended' ],
|
||||||
511 => ['label' => '511 Network Authentication Required', 'msg' => '511 Network Authentication Required']
|
511 => [ 'label' => '511 Network Authentication Required', 'msg' => '511 Network Authentication Required' ]
|
||||||
];
|
];
|
||||||
|
|
||||||
if (isset($tabCode[$ErrCode])) {
|
if ( isset( $tabCode[ $ErrCode ] ) ) {
|
||||||
header($_SERVER['SERVER_PROTOCOL'] . ' ' . $tabCode[$ErrCode]['label']);
|
header( $_SERVER['SERVER_PROTOCOL'] . ' ' . $tabCode[ $ErrCode ]['label'] );
|
||||||
if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {
|
if ( isset( $_SERVER['HTTP_X_REQUESTED_WITH'] ) && strtolower( $_SERVER['HTTP_X_REQUESTED_WITH'] ) == 'xmlhttprequest' ) {
|
||||||
$this->throwError($tabCode[$ErrCode]['msg'], 'Erreur_' . $ErrCode);
|
$this->throwError( $tabCode[ $ErrCode ]['msg'], 'Erreur_' . $ErrCode );
|
||||||
}
|
}
|
||||||
$erreur = $tabCode[$ErrCode]['msg'];
|
$erreur = $tabCode[ $ErrCode ]['msg'];
|
||||||
$this->addData(['erreur' => $erreur]);
|
$this->addData( [ 'erreur' => $erreur ] );
|
||||||
} else {
|
} else {
|
||||||
header($_SERVER['SERVER_PROTOCOL'] . ' ' . $tabCode[500]['label']);
|
header( $_SERVER['SERVER_PROTOCOL'] . ' ' . $tabCode[500]['label'] );
|
||||||
if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {
|
if ( isset( $_SERVER['HTTP_X_REQUESTED_WITH'] ) && strtolower( $_SERVER['HTTP_X_REQUESTED_WITH'] ) == 'xmlhttprequest' ) {
|
||||||
$this->throwError($tabCode[500]['msg'], 'Erreur_500');
|
$this->throwError( $tabCode[500]['msg'], 'Erreur_500' );
|
||||||
}
|
}
|
||||||
$erreur = $tabCode[500]['msg'];
|
$erreur = $tabCode[500]['msg'];
|
||||||
$this->addData(['erreur' => $erreur]);
|
$this->addData( [ 'erreur' => $erreur ] );
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($message)) {
|
if ( ! empty( $message ) ) {
|
||||||
$this->addData(['message' => $message]);
|
$this->addData( [ 'message' => $message ] );
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->view();
|
$this->view();
|
||||||
|
@ -12,14 +12,14 @@ class Index extends ControllerSite {
|
|||||||
public function __construct() {
|
public function __construct() {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
|
|
||||||
$this->addHead([
|
$this->addHead( [
|
||||||
]);
|
] );
|
||||||
|
|
||||||
$this->addFooter([
|
$this->addFooter( [
|
||||||
|
|
||||||
]);
|
] );
|
||||||
|
|
||||||
$this->addData([]);
|
$this->addData( [] );
|
||||||
$this->view();
|
$this->view();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -8,97 +8,98 @@ class SiteError extends ControllerSite {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* SiteError constructor.
|
* SiteError constructor.
|
||||||
|
*
|
||||||
* @param int $ErrCode
|
* @param int $ErrCode
|
||||||
* @param string $message
|
* @param string $message
|
||||||
*/
|
*/
|
||||||
public function __construct($ErrCode = 500, $message = '') {
|
public function __construct( $ErrCode = 500, $message = '' ) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
|
|
||||||
$tabCode = [
|
$tabCode = [
|
||||||
//Informational 1xx
|
//Informational 1xx
|
||||||
100 => ['label' => '100 Continue', 'msg' => '100 Continue'],
|
100 => [ 'label' => '100 Continue', 'msg' => '100 Continue' ],
|
||||||
101 => ['label' => '101 Switching Protocols', 'msg' => '101 Switching Protocols'],
|
101 => [ 'label' => '101 Switching Protocols', 'msg' => '101 Switching Protocols' ],
|
||||||
//Successful 2xx
|
//Successful 2xx
|
||||||
200 => ['label' => '200 OK', 'msg' => '200 OK'],
|
200 => [ 'label' => '200 OK', 'msg' => '200 OK' ],
|
||||||
201 => ['label' => '201 Created', 'msg' => '201 Created'],
|
201 => [ 'label' => '201 Created', 'msg' => '201 Created' ],
|
||||||
202 => ['label' => '202 Accepted', 'msg' => '202 Accepted'],
|
202 => [ 'label' => '202 Accepted', 'msg' => '202 Accepted' ],
|
||||||
203 => ['label' => '203 Non-Authoritative Information', 'msg' => '203 Non-Authoritative Information'],
|
203 => [ 'label' => '203 Non-Authoritative Information', 'msg' => '203 Non-Authoritative Information' ],
|
||||||
204 => ['label' => '204 No Content', 'msg' => '204 No Content'],
|
204 => [ 'label' => '204 No Content', 'msg' => '204 No Content' ],
|
||||||
205 => ['label' => '205 Reset Content', 'msg' => '205 Reset Content'],
|
205 => [ 'label' => '205 Reset Content', 'msg' => '205 Reset Content' ],
|
||||||
206 => ['label' => '206 Partial Content', 'msg' => '206 Partial Content'],
|
206 => [ 'label' => '206 Partial Content', 'msg' => '206 Partial Content' ],
|
||||||
226 => ['label' => '226 IM Used', 'msg' => '226 IM Used'],
|
226 => [ 'label' => '226 IM Used', 'msg' => '226 IM Used' ],
|
||||||
//Redirection 3xx
|
//Redirection 3xx
|
||||||
300 => ['label' => '300 Multiple Choices', 'msg' => '300 Multiple Choices'],
|
300 => [ 'label' => '300 Multiple Choices', 'msg' => '300 Multiple Choices' ],
|
||||||
301 => ['label' => '301 Moved Permanently', 'msg' => '301 Moved Permanently'],
|
301 => [ 'label' => '301 Moved Permanently', 'msg' => '301 Moved Permanently' ],
|
||||||
302 => ['label' => '302 Found', 'msg' => '302 Found'],
|
302 => [ 'label' => '302 Found', 'msg' => '302 Found' ],
|
||||||
303 => ['label' => '303 See Other', 'msg' => '303 See Other'],
|
303 => [ 'label' => '303 See Other', 'msg' => '303 See Other' ],
|
||||||
304 => ['label' => '304 Not Modified', 'msg' => '304 Not Modified'],
|
304 => [ 'label' => '304 Not Modified', 'msg' => '304 Not Modified' ],
|
||||||
305 => ['label' => '305 Use Proxy', 'msg' => '305 Use Proxy'],
|
305 => [ 'label' => '305 Use Proxy', 'msg' => '305 Use Proxy' ],
|
||||||
306 => ['label' => '306 (Unused)', 'msg' => '306 (Unused)'],
|
306 => [ 'label' => '306 (Unused)', 'msg' => '306 (Unused)' ],
|
||||||
307 => ['label' => '307 Temporary Redirect', 'msg' => '307 Temporary Redirect'],
|
307 => [ 'label' => '307 Temporary Redirect', 'msg' => '307 Temporary Redirect' ],
|
||||||
//Client Error 4xx
|
//Client Error 4xx
|
||||||
400 => ['label' => '400 Bad Request', 'msg' => '400 Bad Request'],
|
400 => [ 'label' => '400 Bad Request', 'msg' => '400 Bad Request' ],
|
||||||
401 => ['label' => '401 Unauthorized', 'msg' => '401 Unauthorized'],
|
401 => [ 'label' => '401 Unauthorized', 'msg' => '401 Unauthorized' ],
|
||||||
402 => ['label' => '402 Payment Required', 'msg' => '402 Payment Required'],
|
402 => [ 'label' => '402 Payment Required', 'msg' => '402 Payment Required' ],
|
||||||
403 => ['label' => '403 Forbidden', 'msg' => '403 Forbidden'],
|
403 => [ 'label' => '403 Forbidden', 'msg' => '403 Forbidden' ],
|
||||||
404 => ['label' => '404 Not Found', 'msg' => 'Page non trouvée'],
|
404 => [ 'label' => '404 Not Found', 'msg' => 'Page non trouvée' ],
|
||||||
405 => ['label' => '405 Method Not Allowed', 'msg' => '405 Method Not Allowed'],
|
405 => [ 'label' => '405 Method Not Allowed', 'msg' => '405 Method Not Allowed' ],
|
||||||
406 => ['label' => '406 Not Acceptable', 'msg' => '406 Not Acceptable'],
|
406 => [ 'label' => '406 Not Acceptable', 'msg' => '406 Not Acceptable' ],
|
||||||
407 => ['label' => '407 Proxy Authentication Required', 'msg' => '407 Proxy Authentication Required'],
|
407 => [ 'label' => '407 Proxy Authentication Required', 'msg' => '407 Proxy Authentication Required' ],
|
||||||
408 => ['label' => '408 Request Timeout', 'msg' => '408 Request Timeout'],
|
408 => [ 'label' => '408 Request Timeout', 'msg' => '408 Request Timeout' ],
|
||||||
409 => ['label' => '409 Conflict', 'msg' => '409 Conflict'],
|
409 => [ 'label' => '409 Conflict', 'msg' => '409 Conflict' ],
|
||||||
410 => ['label' => '410 Gone', 'msg' => 'Cet artisan n\'est plus plus référencé sur Eldotravo'],
|
410 => [ 'label' => '410 Gone', 'msg' => 'Cet artisan n\'est plus plus référencé sur Eldotravo' ],
|
||||||
411 => ['label' => '411 Length Required', 'msg' => '411 Length Required'],
|
411 => [ 'label' => '411 Length Required', 'msg' => '411 Length Required' ],
|
||||||
412 => ['label' => '412 Precondition Failed', 'msg' => '412 Precondition Failed'],
|
412 => [ 'label' => '412 Precondition Failed', 'msg' => '412 Precondition Failed' ],
|
||||||
413 => ['label' => '413 Request Entity Too Large', 'msg' => '413 Request Entity Too Large'],
|
413 => [ 'label' => '413 Request Entity Too Large', 'msg' => '413 Request Entity Too Large' ],
|
||||||
414 => ['label' => '414 Request-URI Too Long', 'msg' => '414 Request-URI Too Long'],
|
414 => [ 'label' => '414 Request-URI Too Long', 'msg' => '414 Request-URI Too Long' ],
|
||||||
415 => ['label' => '415 Unsupported Media Type', 'msg' => '415 Unsupported Media Type'],
|
415 => [ 'label' => '415 Unsupported Media Type', 'msg' => '415 Unsupported Media Type' ],
|
||||||
416 => ['label' => '416 Requested Range Not Satisfiable', 'msg' => '416 Requested Range Not Satisfiable'],
|
416 => [ 'label' => '416 Requested Range Not Satisfiable', 'msg' => '416 Requested Range Not Satisfiable' ],
|
||||||
417 => ['label' => '417 Expectation Failed', 'msg' => '417 Expectation Failed'],
|
417 => [ 'label' => '417 Expectation Failed', 'msg' => '417 Expectation Failed' ],
|
||||||
418 => ['label' => '418 I\'m a teapot', 'msg' => '418 I\'m a teapot'],
|
418 => [ 'label' => '418 I\'m a teapot', 'msg' => '418 I\'m a teapot' ],
|
||||||
422 => ['label' => '422 Unprocessable Entity', 'msg' => '422 Unprocessable Entity'],
|
422 => [ 'label' => '422 Unprocessable Entity', 'msg' => '422 Unprocessable Entity' ],
|
||||||
423 => ['label' => '423 Locked', 'msg' => '423 Locked'],
|
423 => [ 'label' => '423 Locked', 'msg' => '423 Locked' ],
|
||||||
426 => ['label' => '426 Upgrade Required', 'msg' => '426 Upgrade Required'],
|
426 => [ 'label' => '426 Upgrade Required', 'msg' => '426 Upgrade Required' ],
|
||||||
428 => ['label' => '428 Precondition Required', 'msg' => '428 Precondition Required'],
|
428 => [ 'label' => '428 Precondition Required', 'msg' => '428 Precondition Required' ],
|
||||||
429 => ['label' => '429 Too Many Requests', 'msg' => '429 Too Many Requests'],
|
429 => [ 'label' => '429 Too Many Requests', 'msg' => '429 Too Many Requests' ],
|
||||||
431 => ['label' => '431 Request Header Fields Too Large', 'msg' => '431 Request Header Fields Too Large'],
|
431 => [ 'label' => '431 Request Header Fields Too Large', 'msg' => '431 Request Header Fields Too Large' ],
|
||||||
//Server Error 5xx
|
//Server Error 5xx
|
||||||
500 => ['label' => '500 Internal Server Error', 'msg' => 'Une erreur est survenue'],
|
500 => [ 'label' => '500 Internal Server Error', 'msg' => 'Une erreur est survenue' ],
|
||||||
501 => ['label' => '501 Not Implemented', 'msg' => '501 Not Implemented'],
|
501 => [ 'label' => '501 Not Implemented', 'msg' => '501 Not Implemented' ],
|
||||||
502 => ['label' => '502 Bad Gateway', 'msg' => '502 Bad Gateway'],
|
502 => [ 'label' => '502 Bad Gateway', 'msg' => '502 Bad Gateway' ],
|
||||||
503 => ['label' => '503 Service Unavailable', 'msg' => '503 Service Unavailable'],
|
503 => [ 'label' => '503 Service Unavailable', 'msg' => '503 Service Unavailable' ],
|
||||||
504 => ['label' => '504 Gateway Timeout', 'msg' => '504 Gateway Timeout'],
|
504 => [ 'label' => '504 Gateway Timeout', 'msg' => '504 Gateway Timeout' ],
|
||||||
505 => ['label' => '505 HTTP Version Not Supported', 'msg' => '505 HTTP Version Not Supported'],
|
505 => [ 'label' => '505 HTTP Version Not Supported', 'msg' => '505 HTTP Version Not Supported' ],
|
||||||
506 => ['label' => '506 Variant Also Negotiates', 'msg' => '506 Variant Also Negotiates'],
|
506 => [ 'label' => '506 Variant Also Negotiates', 'msg' => '506 Variant Also Negotiates' ],
|
||||||
510 => ['label' => '510 Not Extended', 'msg' => '510 Not Extended'],
|
510 => [ 'label' => '510 Not Extended', 'msg' => '510 Not Extended' ],
|
||||||
511 => ['label' => '511 Network Authentication Required', 'msg' => '511 Network Authentication Required']
|
511 => [ 'label' => '511 Network Authentication Required', 'msg' => '511 Network Authentication Required' ]
|
||||||
];
|
];
|
||||||
|
|
||||||
if (isset($tabCode[$ErrCode])) {
|
if ( isset( $tabCode[ $ErrCode ] ) ) {
|
||||||
header($_SERVER['SERVER_PROTOCOL'].' '.$tabCode[$ErrCode]['label']);
|
header( $_SERVER['SERVER_PROTOCOL'] . ' ' . $tabCode[ $ErrCode ]['label'] );
|
||||||
if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {
|
if ( isset( $_SERVER['HTTP_X_REQUESTED_WITH'] ) && strtolower( $_SERVER['HTTP_X_REQUESTED_WITH'] ) == 'xmlhttprequest' ) {
|
||||||
$this->throwError('Erreur '.$tabCode[$ErrCode]['label'], 'Erreur_'.$ErrCode);
|
$this->throwError( 'Erreur ' . $tabCode[ $ErrCode ]['label'], 'Erreur_' . $ErrCode );
|
||||||
}
|
}
|
||||||
$erreur = $tabCode[$ErrCode]['msg'];
|
$erreur = $tabCode[ $ErrCode ]['msg'];
|
||||||
$this->addData(['erreur' => $erreur]);
|
$this->addData( [ 'erreur' => $erreur ] );
|
||||||
} else {
|
} else {
|
||||||
header($_SERVER['SERVER_PROTOCOL'].' '.$tabCode[500]['label']);
|
header( $_SERVER['SERVER_PROTOCOL'] . ' ' . $tabCode[500]['label'] );
|
||||||
if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {
|
if ( isset( $_SERVER['HTTP_X_REQUESTED_WITH'] ) && strtolower( $_SERVER['HTTP_X_REQUESTED_WITH'] ) == 'xmlhttprequest' ) {
|
||||||
$this->throwError('Erreur '.$tabCode[500]['label'], 'Erreur_500');
|
$this->throwError( 'Erreur ' . $tabCode[500]['label'], 'Erreur_500' );
|
||||||
}
|
}
|
||||||
$erreur = $tabCode[500]['msg'];
|
$erreur = $tabCode[500]['msg'];
|
||||||
$this->addData(['erreur' => $erreur]);
|
$this->addData( [ 'erreur' => $erreur ] );
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($message)) {
|
if ( ! empty( $message ) ) {
|
||||||
$this->addData(['message' => $message]);
|
$this->addData( [ 'message' => $message ] );
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->addHead([
|
$this->addHead( [
|
||||||
'title' => 'Un erreur est survenue',
|
'title' => 'Un erreur est survenue',
|
||||||
'description' => 'Oops une erreur est survenue',
|
'description' => 'Oops une erreur est survenue',
|
||||||
'robotNoIndex' => true
|
'robotNoIndex' => true
|
||||||
]);
|
] );
|
||||||
|
|
||||||
$this->view();
|
$this->view();
|
||||||
}
|
}
|
||||||
|
@ -6,16 +6,17 @@ class SiteRouter {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* SiteRouter constructor.
|
* SiteRouter constructor.
|
||||||
|
*
|
||||||
* @param $pages
|
* @param $pages
|
||||||
*/
|
*/
|
||||||
public function __construct($pages) {
|
public function __construct( $pages ) {
|
||||||
|
|
||||||
set_error_handler('errorHandler');
|
set_error_handler( 'errorHandler' );
|
||||||
|
|
||||||
if ($pages[0] == '') {
|
if ( $pages[0] == '' ) {
|
||||||
new Index();
|
new Index();
|
||||||
} else {
|
} else {
|
||||||
new SiteError(404);
|
new SiteError( 404 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -21,11 +21,10 @@ class BDD {
|
|||||||
PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC
|
PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC
|
||||||
];
|
];
|
||||||
|
|
||||||
self::$bdd = new PDO('mysql:host=' . self::SQL_SERVER . ';dbname=' . self::SQL_DB.';charset=utf8',
|
self::$bdd = new PDO( 'mysql:host=' . self::SQL_SERVER . ';dbname=' . self::SQL_DB . ';charset=utf8',
|
||||||
self::SQL_LOGIN, self::SQL_PASSWORD, $pdo_options);
|
self::SQL_LOGIN, self::SQL_PASSWORD, $pdo_options );
|
||||||
}
|
} catch ( Exception $e ) {
|
||||||
catch (Exception $e) {
|
die( 'Erreur : ' . $e->getMessage() );
|
||||||
die('Erreur : ' . $e->getMessage());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
3084
src/Model/FPDF.php
3084
src/Model/FPDF.php
File diff suppressed because it is too large
Load Diff
@ -6,13 +6,6 @@ use PDO;
|
|||||||
|
|
||||||
class Logs {
|
class Logs {
|
||||||
|
|
||||||
public $id;
|
|
||||||
public $level;
|
|
||||||
public $message;
|
|
||||||
public $file;
|
|
||||||
public $line;
|
|
||||||
public $date;
|
|
||||||
|
|
||||||
const ERROR_LEVEL = [
|
const ERROR_LEVEL = [
|
||||||
1 => 'E_ERROR',
|
1 => 'E_ERROR',
|
||||||
2 => 'E_WARNING',
|
2 => 'E_WARNING',
|
||||||
@ -31,9 +24,16 @@ class Logs {
|
|||||||
16384 => 'E_USER_DEPRECATED',
|
16384 => 'E_USER_DEPRECATED',
|
||||||
32767 => 'E_ALL'
|
32767 => 'E_ALL'
|
||||||
];
|
];
|
||||||
|
public $id;
|
||||||
|
public $level;
|
||||||
|
public $message;
|
||||||
|
public $file;
|
||||||
|
public $line;
|
||||||
|
public $date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Logs constructor.
|
* Logs constructor.
|
||||||
|
*
|
||||||
* @param int|null $id
|
* @param int|null $id
|
||||||
* @param string|null $level
|
* @param string|null $level
|
||||||
* @param string|null $message
|
* @param string|null $message
|
||||||
@ -41,9 +41,8 @@ class Logs {
|
|||||||
* @param string|null $line
|
* @param string|null $line
|
||||||
* @param string|null $date
|
* @param string|null $date
|
||||||
*/
|
*/
|
||||||
public function __construct(int $id = null, string $level = null, string $message = null, string $file = null, string $line = null, string $date = null)
|
public function __construct( int $id = null, string $level = null, string $message = null, string $file = null, string $line = null, string $date = null ) {
|
||||||
{
|
if ( $id === null ) {
|
||||||
if ($id === NULL) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$this->id = $id;
|
$this->id = $id;
|
||||||
@ -55,32 +54,34 @@ class Logs {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static function insert($level, $message, $file, $line, $date) {
|
public static function insert( $level, $message, $file, $line, $date ) {
|
||||||
Model::insert(BDTables::LOGS, [
|
Model::insert( BDTables::LOGS, [
|
||||||
'level' => $level,
|
'level' => $level,
|
||||||
'message' => $message,
|
'message' => $message,
|
||||||
'file' => $file,
|
'file' => $file,
|
||||||
'line' => $line,
|
'line' => $line,
|
||||||
'date' => date("Y-m-d H:i:s", strtotime($date))
|
'date' => date( "Y-m-d H:i:s", strtotime( $date ) )
|
||||||
]);
|
] );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retourne un tableau des derniers logs (limite en param)
|
* Retourne un tableau des derniers logs (limite en param)
|
||||||
|
*
|
||||||
* @param int $limit
|
* @param int $limit
|
||||||
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public static function getLastLogs(int $limit){
|
public static function getLastLogs( int $limit ) {
|
||||||
$req = BDD::instance()->prepare('SELECT *
|
$req = BDD::instance()->prepare( 'SELECT *
|
||||||
FROM ' . BDTables::LOGS . '
|
FROM ' . BDTables::LOGS . '
|
||||||
ORDER BY date DESC
|
ORDER BY date DESC
|
||||||
LIMIT :limit');
|
LIMIT :limit' );
|
||||||
$req->bindValue('limit', $limit, PDO::PARAM_INT);
|
$req->bindValue( 'limit', $limit, PDO::PARAM_INT );
|
||||||
$req->execute();
|
$req->execute();
|
||||||
$return = [];
|
$return = [];
|
||||||
|
|
||||||
foreach ($req->fetchAll() as $l){
|
foreach ( $req->fetchAll() as $l ) {
|
||||||
$log = new Logs($l['id'], $l['level'], $l['message'], $l['file'], $l['line'], $l['date']);
|
$log = new Logs( $l['id'], $l['level'], $l['message'], $l['file'], $l['line'], $l['date'] );
|
||||||
$return[] = $log;
|
$return[] = $log;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -90,96 +91,84 @@ class Logs {
|
|||||||
/**
|
/**
|
||||||
* @return int
|
* @return int
|
||||||
*/
|
*/
|
||||||
public function getId()
|
public function getId() {
|
||||||
{
|
|
||||||
return $this->id;
|
return $this->id;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param int $id
|
* @param int $id
|
||||||
*/
|
*/
|
||||||
public function setId($id)
|
public function setId( $id ) {
|
||||||
{
|
|
||||||
$this->id = $id;
|
$this->id = $id;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getLevel()
|
public function getLevel() {
|
||||||
{
|
|
||||||
return $this->level;
|
return $this->level;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $level
|
* @param string $level
|
||||||
*/
|
*/
|
||||||
public function setLevel($level)
|
public function setLevel( $level ) {
|
||||||
{
|
|
||||||
$this->level = $level;
|
$this->level = $level;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getMessage()
|
public function getMessage() {
|
||||||
{
|
return htmlspecialchars( $this->message );
|
||||||
return htmlspecialchars($this->message);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $message
|
* @param string $message
|
||||||
*/
|
*/
|
||||||
public function setMessage($message)
|
public function setMessage( $message ) {
|
||||||
{
|
|
||||||
$this->message = $message;
|
$this->message = $message;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getFile()
|
public function getFile() {
|
||||||
{
|
return htmlspecialchars( $this->file );
|
||||||
return htmlspecialchars($this->file);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $file
|
* @param string $file
|
||||||
*/
|
*/
|
||||||
public function setFile($file)
|
public function setFile( $file ) {
|
||||||
{
|
|
||||||
$this->file = $file;
|
$this->file = $file;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getLine()
|
public function getLine() {
|
||||||
{
|
return htmlspecialchars( $this->line );
|
||||||
return htmlspecialchars($this->line);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $line
|
* @param string $line
|
||||||
*/
|
*/
|
||||||
public function setLine($line)
|
public function setLine( $line ) {
|
||||||
{
|
|
||||||
$this->line = $line;
|
$this->line = $line;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getDate()
|
public function getDate() {
|
||||||
{
|
|
||||||
return $this->date;
|
return $this->date;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $date
|
* @param string $date
|
||||||
*/
|
*/
|
||||||
public function setDate($date)
|
public function setDate( $date ) {
|
||||||
{
|
|
||||||
$this->date = $date;
|
$this->date = $date;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -187,9 +176,8 @@ class Logs {
|
|||||||
* Retourne le type d'erreur en string (label)
|
* Retourne le type d'erreur en string (label)
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getErrorLabel()
|
public function getErrorLabel() {
|
||||||
{
|
return htmlspecialchars( self::ERROR_LEVEL[ $this->level ] );
|
||||||
return htmlspecialchars(self::ERROR_LEVEL[$this->level]);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6,40 +6,44 @@ class Model {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Crée une reqette d'insertion en base àpartir du nom de la table et d'un tableau associatif et l'exécute
|
* Crée une reqette d'insertion en base àpartir du nom de la table et d'un tableau associatif et l'exécute
|
||||||
|
*
|
||||||
* @param string $tableName
|
* @param string $tableName
|
||||||
* @param array $data
|
* @param array $data
|
||||||
|
*
|
||||||
* @return int lastInsertId
|
* @return int lastInsertId
|
||||||
*/
|
*/
|
||||||
public static function insert(string $tableName, array $data){
|
public static function insert( string $tableName, array $data ) {
|
||||||
$req = BDD::instance()->prepare('INSERT INTO ' . $tableName . ' (' . implode(', ', array_keys($data)) . ')
|
$req = BDD::instance()->prepare( 'INSERT INTO ' . $tableName . ' (' . implode( ', ', array_keys( $data ) ) . ')
|
||||||
VALUES (' . ':' . implode(', :', array_keys($data)) . ')');
|
VALUES (' . ':' . implode( ', :', array_keys( $data ) ) . ')' );
|
||||||
$req->execute($data);
|
$req->execute( $data );
|
||||||
|
|
||||||
return BDD::lastInsertId();
|
return BDD::lastInsertId();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Met à jour les données d'une ligne d'un table données
|
* Met à jour les données d'une ligne d'un table données
|
||||||
|
*
|
||||||
* @param string $tableName
|
* @param string $tableName
|
||||||
* @param array $data
|
* @param array $data
|
||||||
* @param string $idColumn
|
* @param string $idColumn
|
||||||
* @param int $idValue
|
* @param int $idValue
|
||||||
*/
|
*/
|
||||||
public static function update(string $tableName, array $data, string $idColumn, int $idValue){
|
public static function update( string $tableName, array $data, string $idColumn, int $idValue ) {
|
||||||
$reqStr = 'UPDATE ' . $tableName . ' SET ';
|
$reqStr = 'UPDATE ' . $tableName . ' SET ';
|
||||||
$lastKey = endKey($data);
|
$lastKey = endKey( $data );
|
||||||
foreach ($data as $key => $value){
|
foreach ( $data as $key => $value ) {
|
||||||
$reqStr .= $key . ' = :' . $key;
|
$reqStr .= $key . ' = :' . $key;
|
||||||
if($key != $lastKey) {
|
if ( $key != $lastKey ) {
|
||||||
$reqStr .= ', ';
|
$reqStr .= ', ';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$reqStr .= ' WHERE ' . $idColumn . ' = :' . $idColumn;
|
$reqStr .= ' WHERE ' . $idColumn . ' = :' . $idColumn;
|
||||||
$data[$idColumn] = $idValue;
|
$data[ $idColumn ] = $idValue;
|
||||||
|
|
||||||
//echo $reqStr; exit();
|
//echo $reqStr; exit();
|
||||||
|
|
||||||
$req = BDD::instance()->prepare($reqStr);
|
$req = BDD::instance()->prepare( $reqStr );
|
||||||
$req->execute($data);
|
$req->execute( $data );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<div class="content">
|
<div class="content">
|
||||||
<div class="error-page-container">
|
<div class="error-page-container">
|
||||||
<div class="error-title"><?= $erreur ?></div>
|
<div class="error-title"><?= $erreur ?></div>
|
||||||
<div class="error-message">Que voulez-vous faire ?</div>
|
<div class="error-message">Que voulez-vous faire ?</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
|
<script src="/js/jquery-3.2.1.min.js"></script>
|
||||||
|
<script src="/js/javascript.js?v=<?= base\Config::SITE_JS_VERSION ?>"></script>
|
||||||
|
<link href="/css/style.css?v=<?= base\Config::SITE_CSS_VERSION ?>" rel="stylesheet">
|
||||||
|
|
||||||
<script src="/js/jquery-3.2.1.min.js"></script>
|
</body>
|
||||||
<script src="/js/javascript.js?v=<?= base\Config::SITE_JS_VERSION ?>"></script>
|
|
||||||
<link href="/css/style.css?v=<?= base\Config::SITE_CSS_VERSION ?>" rel="stylesheet">
|
|
||||||
|
|
||||||
</body>
|
|
||||||
</html>
|
</html>
|
||||||
|
@ -15,24 +15,25 @@
|
|||||||
<title><?= $this->head['title'] ?></title>
|
<title><?= $this->head['title'] ?></title>
|
||||||
<meta name="description" content="<?= $this->head['description'] ?>">
|
<meta name="description" content="<?= $this->head['description'] ?>">
|
||||||
|
|
||||||
<meta property="og:title" content="<?= $this->head['title'] ?>" />
|
<meta property="og:title" content="<?= $this->head['title'] ?>"/>
|
||||||
<meta property="og:description" content="<?= $this->head['description'] ?>" />
|
<meta property="og:description" content="<?= $this->head['description'] ?>"/>
|
||||||
<meta property="og:url" content="https://<?= $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'] ?>" />
|
<meta property="og:url" content="https://<?= $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'] ?>"/>
|
||||||
<meta property="og:image" content="https://<?= $_SERVER['SERVER_NAME'] . \base\Config::FAVICON_PATH ?>" />
|
<meta property="og:image" content="https://<?= $_SERVER['SERVER_NAME'] . \base\Config::FAVICON_PATH ?>"/>
|
||||||
<!-- <meta property="fb:app_id" content="1000452166691027" /> -->
|
<!-- <meta property="fb:app_id" content="1000452166691027" /> -->
|
||||||
|
|
||||||
<link href='https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700%7CRoboto+Condensed:400,700%7CMaterial+Icons' rel='stylesheet' type='text/css'>
|
<link href='https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700%7CRoboto+Condensed:400,700%7CMaterial+Icons'
|
||||||
|
rel='stylesheet' type='text/css'>
|
||||||
|
|
||||||
<link href="/css/theme.css?v=<?= base\Config::SITE_CSS_VERSION ?>" rel="stylesheet">
|
<link href="/css/theme.css?v=<?= base\Config::SITE_CSS_VERSION ?>" rel="stylesheet">
|
||||||
<link href="/css/select2.css" rel="stylesheet">
|
<link href="/css/select2.css" rel="stylesheet">
|
||||||
|
|
||||||
<link rel="image_src" href="<?php \base\Config::FAVICON_PATH ?>" />
|
<link rel="image_src" href="<?php \base\Config::FAVICON_PATH ?>"/>
|
||||||
<link rel="icon" type="image/png" href="<?php \base\Config::FAVICON_PATH ?>" />
|
<link rel="icon" type="image/png" href="<?php \base\Config::FAVICON_PATH ?>"/>
|
||||||
|
|
||||||
<meta name="theme-color" content="#ffffff">
|
<meta name="theme-color" content="#ffffff">
|
||||||
|
|
||||||
<?php if (isset($this->head['robotNoIndex']) && $this->head['robotNoIndex'] == true) { ?>
|
<?php if ( isset( $this->head['robotNoIndex'] ) && $this->head['robotNoIndex'] == true ) { ?>
|
||||||
<meta name="robots" content="noindex" />
|
<meta name="robots" content="noindex"/>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
|
@ -1,42 +1,44 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
include ('src/lib/mail/PHPMailerAutoload.php');
|
include( 'src/lib/mail/PHPMailerAutoload.php' );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Permet de remplacer les accents et les apostrophes dans l'url
|
* Permet de remplacer les accents et les apostrophes dans l'url
|
||||||
|
*
|
||||||
* @param string $str l'url à formater
|
* @param string $str l'url à formater
|
||||||
* @param string $encoding
|
* @param string $encoding
|
||||||
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function formatURL (string $str, $encoding = 'utf-8') {
|
function formatURL( string $str, $encoding = 'utf-8' ) {
|
||||||
|
|
||||||
$str = str_replace( "+", "_plus_", $str);
|
$str = str_replace( "+", "_plus_", $str );
|
||||||
$str = str_replace( "%", "_pourcent_", $str);
|
$str = str_replace( "%", "_pourcent_", $str );
|
||||||
$str = str_replace( "&", "_et_", $str);
|
$str = str_replace( "&", "_et_", $str );
|
||||||
|
|
||||||
//on remplace les apotrophes et espaces par des underscore
|
//on remplace les apotrophes et espaces par des underscore
|
||||||
$str = str_replace ( array("'", " ", ","), "_", $str );
|
$str = str_replace( array( "'", " ", "," ), "_", $str );
|
||||||
|
|
||||||
$str = str_replace( "__", "_", $str);
|
$str = str_replace( "__", "_", $str );
|
||||||
|
|
||||||
// transformer les caractères accentués en entités HTML
|
// transformer les caractères accentués en entités HTML
|
||||||
$str = htmlentities($str, ENT_NOQUOTES, $encoding);
|
$str = htmlentities( $str, ENT_NOQUOTES, $encoding );
|
||||||
// remplacer les entités HTML pour avoir juste le premier caractères non accentués
|
// remplacer les entités HTML pour avoir juste le premier caractères non accentués
|
||||||
// Exemple : "&ecute;" => "e", "&Ecute;" => "E", "Ã " => "a" ...
|
// Exemple : "&ecute;" => "e", "&Ecute;" => "E", "Ã " => "a" ...
|
||||||
$str = preg_replace('#&([A-za-z])(?:acute|grave|cedil|circ|orn|ring|slash|th|tilde|uml);#', '\1', $str);
|
$str = preg_replace( '#&([A-za-z])(?:acute|grave|cedil|circ|orn|ring|slash|th|tilde|uml);#', '\1', $str );
|
||||||
|
|
||||||
// Remplacer les ligatures tel que : Œ, Æ ...
|
// Remplacer les ligatures tel que : Œ, Æ ...
|
||||||
// Exemple "Å“" => "oe"
|
// Exemple "Å“" => "oe"
|
||||||
$str = preg_replace('#&([A-za-z]{2})(?:lig);#', '\1', $str);
|
$str = preg_replace( '#&([A-za-z]{2})(?:lig);#', '\1', $str );
|
||||||
// Supprimer tout le reste
|
// Supprimer tout le reste
|
||||||
//$str = preg_replace('#&[^;]+;#', '', $str);
|
//$str = preg_replace('#&[^;]+;#', '', $str);
|
||||||
$str = str_replace( array("#", "&", "[", "^", ";", "]"), '', $str);
|
$str = str_replace( array( "#", "&", "[", "^", ";", "]" ), '', $str );
|
||||||
|
|
||||||
//on passe tout en minuscule
|
//on passe tout en minuscule
|
||||||
$str = strtolower($str);
|
$str = strtolower( $str );
|
||||||
|
|
||||||
if (substr($str, -1) == '_'){
|
if ( substr( $str, - 1 ) == '_' ) {
|
||||||
$str = substr($str, 0, -1);
|
$str = substr( $str, 0, - 1 );
|
||||||
}
|
}
|
||||||
|
|
||||||
return $str;
|
return $str;
|
||||||
@ -44,87 +46,93 @@ function formatURL (string $str, $encoding = 'utf-8') {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* La fonction darkroom() renomme et redimensionne les photos envoyées lors de l'ajout d'un objet.
|
* La fonction darkroom() renomme et redimensionne les photos envoyées lors de l'ajout d'un objet.
|
||||||
|
*
|
||||||
* @param $img String Chemin absolu de l'image d'origine.
|
* @param $img String Chemin absolu de l'image d'origine.
|
||||||
* @param $to String Chemin absolu de l'image générée (.jpg).
|
* @param $to String Chemin absolu de l'image générée (.jpg).
|
||||||
* @param $width Int Largeur de l'image générée. Si 0, valeur calculée en fonction de $height.
|
* @param $width Int Largeur de l'image générée. Si 0, valeur calculée en fonction de $height.
|
||||||
* @param $height Int Hauteur de l'image génétée. Si 0, valeur calculée en fonction de $width.
|
* @param $height Int Hauteur de l'image génétée. Si 0, valeur calculée en fonction de $width.
|
||||||
* Si $height = 0 et $width = 0, dimensions conservées mais conversion en .jpg
|
* Si $height = 0 et $width = 0, dimensions conservées mais conversion en .jpg
|
||||||
|
*
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
function darkroom($img, $to, $width = 0, $height = 0, $quality = 100, $useGD = true) {
|
function darkroom( $img, $to, $width = 0, $height = 0, $quality = 100, $useGD = true ) {
|
||||||
|
|
||||||
$dimensions = getimagesize($img);
|
$dimensions = getimagesize( $img );
|
||||||
$ratio = $dimensions[0] / $dimensions[1];
|
$ratio = $dimensions[0] / $dimensions[1];
|
||||||
|
|
||||||
// Calcul des dimensions si 0 passé en paramètre
|
// Calcul des dimensions si 0 passé en paramètre
|
||||||
if ($width == 0 && $height == 0) {
|
if ( $width == 0 && $height == 0 ) {
|
||||||
$width = $dimensions[0];
|
$width = $dimensions[0];
|
||||||
$height = $dimensions[1];
|
$height = $dimensions[1];
|
||||||
} else if ($height == 0) {
|
} else if ( $height == 0 ) {
|
||||||
$height = round($width / $ratio);
|
$height = round( $width / $ratio );
|
||||||
} else if ($width == 0) {
|
} else if ( $width == 0 ) {
|
||||||
$width = round($height * $ratio);
|
$width = round( $height * $ratio );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($dimensions[0] > ($width / $height) * $dimensions[1]){
|
if ( $dimensions[0] > ( $width / $height ) * $dimensions[1] ) {
|
||||||
$dimY = $height;
|
$dimY = $height;
|
||||||
$dimX = round($height * $dimensions[0] / $dimensions[1]);
|
$dimX = round( $height * $dimensions[0] / $dimensions[1] );
|
||||||
}
|
}
|
||||||
if ($dimensions[0] < ($width / $height) * $dimensions[1]) {
|
if ( $dimensions[0] < ( $width / $height ) * $dimensions[1] ) {
|
||||||
$dimX = $width;
|
$dimX = $width;
|
||||||
$dimY = round($width * $dimensions[1] / $dimensions[0]);
|
$dimY = round( $width * $dimensions[1] / $dimensions[0] );
|
||||||
}
|
}
|
||||||
if ($dimensions[0] == ($width / $height) * $dimensions[1]) {
|
if ( $dimensions[0] == ( $width / $height ) * $dimensions[1] ) {
|
||||||
$dimX = $width;
|
$dimX = $width;
|
||||||
$dimY = $height;
|
$dimY = $height;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Création de l'image avec la librairie GD
|
// Création de l'image avec la librairie GD
|
||||||
if ($useGD) {
|
if ( $useGD ) {
|
||||||
$pattern = imagecreatetruecolor($width, $height);
|
$pattern = imagecreatetruecolor( $width, $height );
|
||||||
$type = mime_content_type($img);
|
$type = mime_content_type( $img );
|
||||||
switch (substr($type, 6)) {
|
switch ( substr( $type, 6 ) ) {
|
||||||
case 'jpeg':
|
case 'jpeg':
|
||||||
$image = imagecreatefromjpeg($img);
|
$image = imagecreatefromjpeg( $img );
|
||||||
break;
|
break;
|
||||||
case 'gif':
|
case 'gif':
|
||||||
$image = imagecreatefromgif($img);
|
$image = imagecreatefromgif( $img );
|
||||||
break;
|
break;
|
||||||
case 'png':
|
case 'png':
|
||||||
$image = imagecreatefrompng($img);
|
$image = imagecreatefrompng( $img );
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
imagecopyresampled($pattern, $image, 0, 0, 0, 0, $dimX, $dimY, $dimensions[0], $dimensions[1]);
|
imagecopyresampled( $pattern, $image, 0, 0, 0, 0, $dimX, $dimY, $dimensions[0], $dimensions[1] );
|
||||||
imagedestroy($image);
|
imagedestroy( $image );
|
||||||
imagejpeg($pattern, $to, $quality);
|
imagejpeg( $pattern, $to, $quality );
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Redéfini la gestion des erreurs
|
* Redéfini la gestion des erreurs
|
||||||
|
*
|
||||||
* @param $errno
|
* @param $errno
|
||||||
* @param $errstr
|
* @param $errstr
|
||||||
* @param $errfile
|
* @param $errfile
|
||||||
* @param $errline
|
* @param $errline
|
||||||
|
*
|
||||||
* @return bool|void
|
* @return bool|void
|
||||||
*/
|
*/
|
||||||
function errorHandler($errno, $errstr, $errfile, $errline) {
|
function errorHandler( $errno, $errstr, $errfile, $errline ) {
|
||||||
if (!(error_reporting() & $errno)) {
|
if ( ! ( error_reporting() & $errno ) ) {
|
||||||
// Ce code d'erreur n'est pas inclus dans error_reporting()
|
// Ce code d'erreur n'est pas inclus dans error_reporting()
|
||||||
return ;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Insertion des logs
|
// Insertion des logs
|
||||||
\base\Model\Logs::insert($errno, $errstr, $errfile, $errline, date('Y-m-d H:i:s'));
|
\base\Model\Logs::insert( $errno, $errstr, $errfile, $errline, date( 'Y-m-d H:i:s' ) );
|
||||||
|
|
||||||
ob_clean();
|
ob_clean();
|
||||||
new \base\Controller\Site\SiteError(500);
|
new \base\Controller\Site\SiteError( 500 );
|
||||||
|
|
||||||
/* Ne pas exécuter le gestionnaire interne de PHP */
|
/* Ne pas exécuter le gestionnaire interne de PHP */
|
||||||
return ;
|
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -139,75 +147,75 @@ function getBrowser() {
|
|||||||
$ub = "";
|
$ub = "";
|
||||||
|
|
||||||
//First get the platform?
|
//First get the platform?
|
||||||
if (preg_match('/android/i', $u_agent) || preg_match('/Android/i', $u_agent)) {
|
if ( preg_match( '/android/i', $u_agent ) || preg_match( '/Android/i', $u_agent ) ) {
|
||||||
$platform = 'android';
|
$platform = 'android';
|
||||||
} else if (preg_match('/linux/i', $u_agent)) {
|
} else if ( preg_match( '/linux/i', $u_agent ) ) {
|
||||||
$platform = 'linux';
|
$platform = 'linux';
|
||||||
} else if (preg_match('/macintosh|mac os x/i', $u_agent)) {
|
} else if ( preg_match( '/macintosh|mac os x/i', $u_agent ) ) {
|
||||||
$platform = 'mac';
|
$platform = 'mac';
|
||||||
} else if (preg_match('/windows|win32/i', $u_agent)) {
|
} else if ( preg_match( '/windows|win32/i', $u_agent ) ) {
|
||||||
$platform = 'windows';
|
$platform = 'windows';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strstr($u_agent, 'mobile') || strstr($u_agent, 'Mobile')){
|
if ( strstr( $u_agent, 'mobile' ) || strstr( $u_agent, 'Mobile' ) ) {
|
||||||
$platform .= ' mobile';
|
$platform .= ' mobile';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Next get the name of the useragent yes seperately and for good reason
|
// Next get the name of the useragent yes seperately and for good reason
|
||||||
if (preg_match('/MSIE/i', $u_agent) && !preg_match('/Opera/i', $u_agent)) {
|
if ( preg_match( '/MSIE/i', $u_agent ) && ! preg_match( '/Opera/i', $u_agent ) ) {
|
||||||
$bname = 'Internet Explorer';
|
$bname = 'Internet Explorer';
|
||||||
$ub = "MSIE";
|
$ub = "MSIE";
|
||||||
} else if (preg_match('/Edge/i', $u_agent)) {
|
} else if ( preg_match( '/Edge/i', $u_agent ) ) {
|
||||||
$bname = 'Microsoft Edge';
|
$bname = 'Microsoft Edge';
|
||||||
$ub = "Edge";
|
$ub = "Edge";
|
||||||
} else if (preg_match('/Trident/i', $u_agent)) {
|
} else if ( preg_match( '/Trident/i', $u_agent ) ) {
|
||||||
$bname = 'Internet Explorer';
|
$bname = 'Internet Explorer';
|
||||||
$ub = "rv";
|
$ub = "rv";
|
||||||
} else if (preg_match('/Firefox/i', $u_agent)) {
|
} else if ( preg_match( '/Firefox/i', $u_agent ) ) {
|
||||||
$bname = 'Mozilla Firefox';
|
$bname = 'Mozilla Firefox';
|
||||||
$ub = "Firefox";
|
$ub = "Firefox";
|
||||||
} else if (preg_match('/Chrome/i', $u_agent)) {
|
} else if ( preg_match( '/Chrome/i', $u_agent ) ) {
|
||||||
$bname = 'Google Chrome';
|
$bname = 'Google Chrome';
|
||||||
$ub = "Chrome";
|
$ub = "Chrome";
|
||||||
} else if (preg_match('/Safari/i', $u_agent)) {
|
} else if ( preg_match( '/Safari/i', $u_agent ) ) {
|
||||||
$bname = 'Apple Safari';
|
$bname = 'Apple Safari';
|
||||||
$ub = "Safari";
|
$ub = "Safari";
|
||||||
} else if (preg_match('/Opera/i', $u_agent)) {
|
} else if ( preg_match( '/Opera/i', $u_agent ) ) {
|
||||||
$bname = 'Opera';
|
$bname = 'Opera';
|
||||||
$ub = "Opera";
|
$ub = "Opera";
|
||||||
} else if (preg_match('/Netscape/i', $u_agent)) {
|
} else if ( preg_match( '/Netscape/i', $u_agent ) ) {
|
||||||
$bname = 'Netscape';
|
$bname = 'Netscape';
|
||||||
$ub = "Netscape";
|
$ub = "Netscape";
|
||||||
}
|
}
|
||||||
|
|
||||||
// finally get the correct version number
|
// finally get the correct version number
|
||||||
// Added "|:"
|
// Added "|:"
|
||||||
$known = array('Version', $ub, 'other');
|
$known = array( 'Version', $ub, 'other' );
|
||||||
$pattern = '#(?<browser>' . join('|', $known) . ')[/|: ]+(?<version>[0-9.|a-zA-Z.]*)#';
|
$pattern = '#(?<browser>' . join( '|', $known ) . ')[/|: ]+(?<version>[0-9.|a-zA-Z.]*)#';
|
||||||
if (!preg_match_all($pattern, $u_agent, $matches)) {
|
if ( ! preg_match_all( $pattern, $u_agent, $matches ) ) {
|
||||||
// we have no matching number just continue
|
// we have no matching number just continue
|
||||||
}
|
}
|
||||||
|
|
||||||
// see how many we have
|
// see how many we have
|
||||||
$i = count($matches['browser']);
|
$i = count( $matches['browser'] );
|
||||||
if ($i != 1) {
|
if ( $i != 1 ) {
|
||||||
//we will have two since we are not using 'other' argument yet
|
//we will have two since we are not using 'other' argument yet
|
||||||
//see if version is before or after the name
|
//see if version is before or after the name
|
||||||
if (strripos($u_agent,"Version") < strripos($u_agent,$ub)){
|
if ( strripos( $u_agent, "Version" ) < strripos( $u_agent, $ub ) ) {
|
||||||
$version= $matches['version'][0];
|
$version = $matches['version'][0];
|
||||||
} else {
|
} else {
|
||||||
$version= $matches['version'][1];
|
$version = $matches['version'][1];
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$version= $matches['version'][0];
|
$version = $matches['version'][0];
|
||||||
}
|
}
|
||||||
|
|
||||||
// check if we have a number
|
// check if we have a number
|
||||||
if ($version == null || $version == "") {
|
if ( $version == null || $version == "" ) {
|
||||||
$version = "?";
|
$version = "?";
|
||||||
}
|
}
|
||||||
|
|
||||||
return array (
|
return array(
|
||||||
'userAgent' => $u_agent,
|
'userAgent' => $u_agent,
|
||||||
'platform' => $platform,
|
'platform' => $platform,
|
||||||
'version' => $version,
|
'version' => $version,
|
||||||
@ -219,16 +227,18 @@ function getBrowser() {
|
|||||||
/**
|
/**
|
||||||
* @param $string
|
* @param $string
|
||||||
* @param $limit
|
* @param $limit
|
||||||
|
*
|
||||||
* @return int
|
* @return int
|
||||||
*/
|
*/
|
||||||
function getLimitWord($string, $limit) {
|
function getLimitWord( $string, $limit ) {
|
||||||
$i = $limit;
|
$i = $limit;
|
||||||
if (!isset($string) || empty($string)){
|
if ( ! isset( $string ) || empty( $string ) ) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
while ($i > 0 && $string[$i] != ' '){
|
while ( $i > 0 && $string[ $i ] != ' ' ) {
|
||||||
$i--;
|
$i --;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $i;
|
return $i;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -315,83 +325,89 @@ function email(array $destinataires, string $subject, string $body, string $aute
|
|||||||
* @param string $file
|
* @param string $file
|
||||||
* @param int $angle
|
* @param int $angle
|
||||||
* @param string $newName
|
* @param string $newName
|
||||||
|
*
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
function rotateImage(string $file, int $angle, string $newName) {
|
function rotateImage( string $file, int $angle, string $newName ) {
|
||||||
// Initialisation variable pou test futur
|
// Initialisation variable pou test futur
|
||||||
$image = null;
|
$image = null;
|
||||||
$type = mime_content_type($file);
|
$type = mime_content_type( $file );
|
||||||
// Création ressources en fonction de l'image
|
// Création ressources en fonction de l'image
|
||||||
switch (substr($type, 6)) {
|
switch ( substr( $type, 6 ) ) {
|
||||||
case 'jpeg':
|
case 'jpeg':
|
||||||
$image = imagecreatefromjpeg($file);
|
$image = imagecreatefromjpeg( $file );
|
||||||
break;
|
break;
|
||||||
case 'png':
|
case 'png':
|
||||||
$image = imagecreatefrompng($file);
|
$image = imagecreatefrompng( $file );
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
// Si format image non prit en charge
|
// Si format image non prit en charge
|
||||||
if ($image == null){
|
if ( $image == null ) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
// Rotation de l'image
|
// Rotation de l'image
|
||||||
$rotate = imagerotate($image, $angle, 0);
|
$rotate = imagerotate( $image, $angle, 0 );
|
||||||
// On recrée l'image au format de base
|
// On recrée l'image au format de base
|
||||||
switch (substr($type, 6)) {
|
switch ( substr( $type, 6 ) ) {
|
||||||
case 'jpeg':
|
case 'jpeg':
|
||||||
imagejpeg($rotate, $file);
|
imagejpeg( $rotate, $file );
|
||||||
break;
|
break;
|
||||||
case 'png':
|
case 'png':
|
||||||
imagepng($rotate, $file);
|
imagepng( $rotate, $file );
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
imagedestroy($image);
|
imagedestroy( $image );
|
||||||
imagedestroy($rotate);
|
imagedestroy( $rotate );
|
||||||
rename($file, $newName);
|
rename( $file, $newName );
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array $data
|
* @param array $data
|
||||||
|
*
|
||||||
* @return array
|
* @return array
|
||||||
* Clean toutes les strings dans array en récursif, et filtre pour n'avoir qu'un espaces entre chaque mot
|
* Clean toutes les strings dans array en récursif, et filtre pour n'avoir qu'un espaces entre chaque mot
|
||||||
*/
|
*/
|
||||||
function cleanArray(array $data) {
|
function cleanArray( array $data ) {
|
||||||
if (!empty($data)){
|
if ( ! empty( $data ) ) {
|
||||||
foreach ($data as $key => $donnée){
|
foreach ( $data as $key => $donnée ) {
|
||||||
switch (gettype($donnée)){
|
switch ( gettype( $donnée ) ) {
|
||||||
case 'string':
|
case 'string':
|
||||||
if (!empty($donnée)){
|
if ( ! empty( $donnée ) ) {
|
||||||
$new_string = '';
|
$new_string = '';
|
||||||
foreach (explode(' ', trim($donnée)) as $str){
|
foreach ( explode( ' ', trim( $donnée ) ) as $str ) {
|
||||||
if (!empty($str)){
|
if ( ! empty( $str ) ) {
|
||||||
if ($new_string != ''){
|
if ( $new_string != '' ) {
|
||||||
$new_string .= ' ';
|
$new_string .= ' ';
|
||||||
}
|
}
|
||||||
$new_string .= $str;
|
$new_string .= $str;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$data[$key] = $new_string;
|
$data[ $key ] = $new_string;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'array':
|
case 'array':
|
||||||
if (!empty($donnée)){
|
if ( ! empty( $donnée ) ) {
|
||||||
$data[$key] = cleanArray($donnée);
|
$data[ $key ] = cleanArray( $donnée );
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $data;
|
return $data;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $array
|
* @param $array
|
||||||
|
*
|
||||||
* @return mixed
|
* @return mixed
|
||||||
*/
|
*/
|
||||||
function endKey($array){
|
function endKey( $array ) {
|
||||||
end($array);
|
end( $array );
|
||||||
return key($array);
|
|
||||||
|
return key( $array );
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
@ -19,31 +19,31 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* PHPMailer SPL autoloader.
|
* PHPMailer SPL autoloader.
|
||||||
|
*
|
||||||
* @param string $classname The name of the class to load
|
* @param string $classname The name of the class to load
|
||||||
*/
|
*/
|
||||||
function PHPMailerAutoload($classname)
|
function PHPMailerAutoload( $classname ) {
|
||||||
{
|
|
||||||
//Can't use __DIR__ as it's only in PHP 5.3+
|
//Can't use __DIR__ as it's only in PHP 5.3+
|
||||||
$filename = dirname(__FILE__).DIRECTORY_SEPARATOR.'class.'.strtolower($classname).'.php';
|
$filename = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'class.' . strtolower( $classname ) . '.php';
|
||||||
if (is_readable($filename)) {
|
if ( is_readable( $filename ) ) {
|
||||||
require $filename;
|
require $filename;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (version_compare(PHP_VERSION, '5.1.2', '>=')) {
|
if ( version_compare( PHP_VERSION, '5.1.2', '>=' ) ) {
|
||||||
//SPL autoloading was introduced in PHP 5.1.2
|
//SPL autoloading was introduced in PHP 5.1.2
|
||||||
if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
|
if ( version_compare( PHP_VERSION, '5.3.0', '>=' ) ) {
|
||||||
spl_autoload_register('PHPMailerAutoload', true, true);
|
spl_autoload_register( 'PHPMailerAutoload', true, true );
|
||||||
} else {
|
} else {
|
||||||
spl_autoload_register('PHPMailerAutoload');
|
spl_autoload_register( 'PHPMailerAutoload' );
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
/**
|
/**
|
||||||
* Fall back to traditional autoload for old PHP versions
|
* Fall back to traditional autoload for old PHP versions
|
||||||
|
*
|
||||||
* @param string $classname The name of the class to load
|
* @param string $classname The name of the class to load
|
||||||
*/
|
*/
|
||||||
function __autoload($classname)
|
function __autoload( $classname ) {
|
||||||
{
|
PHPMailerAutoload( $classname );
|
||||||
PHPMailerAutoload($classname);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -4,7 +4,8 @@
|
|||||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||||
</head>
|
</head>
|
||||||
<body class="body" style="background-color: whitesmoke !important;padding: 40px 0;line-height: 22px;width: 100%;">
|
<body class="body" style="background-color: whitesmoke !important;padding: 40px 0;line-height: 22px;width: 100%;">
|
||||||
<div class="contain" style="background-color: white;font-family: Arial, Helvetica, sans-serif; font-size: 16px;margin: auto;padding: 20px;max-width: 500px;width: 90%">
|
<div class="contain"
|
||||||
|
style="background-color: white;font-family: Arial, Helvetica, sans-serif; font-size: 16px;margin: auto;padding: 20px;max-width: 500px;width: 90%">
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div style="margin:20px auto;max-width: 500px;text-align: center;width: 90%;">
|
<div style="margin:20px auto;max-width: 500px;text-align: center;width: 90%;">
|
||||||
|
Loading…
Reference in New Issue
Block a user