diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
old mode 100644
new mode 100755
diff --git a/Main.svg b/Main.svg
deleted file mode 100644
index 00e9d72..0000000
--- a/Main.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/fluxRSS/.htaccess b/fluxRSS/.htaccess
new file mode 100755
index 0000000..7ded04e
--- /dev/null
+++ b/fluxRSS/.htaccess
@@ -0,0 +1,3 @@
+RewriteEngine on
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule . index.php [L]
\ No newline at end of file
diff --git a/fluxRSS/AltoRouter.php b/fluxRSS/AltoRouter.php
new file mode 100755
index 0000000..6c14b90
--- /dev/null
+++ b/fluxRSS/AltoRouter.php
@@ -0,0 +1,304 @@
+
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+namespace vendor;
+
+class AltoRouter
+{
+
+ /**
+ * @var array Array of all routes (incl. named routes).
+ */
+ protected $routes = [];
+
+ /**
+ * @var array Array of all named routes.
+ */
+ protected $namedRoutes = [];
+
+ /**
+ * @var string Can be used to ignore leading part of the Request URL (if main file lives in subdirectory of host)
+ */
+ protected $basePath = '';
+
+ /**
+ * @var array Array of default match types (regex helpers)
+ */
+ protected $matchTypes = [
+ 'i' => '[0-9]++',
+ 'a' => '[0-9A-Za-z]++',
+ 'h' => '[0-9A-Fa-f]++',
+ '*' => '.+?',
+ '**' => '.++',
+ '' => '[^/\.]++'
+ ];
+
+ /**
+ * Create router in one call from config.
+ *
+ * @param array $routes
+ * @param string $basePath
+ * @param array $matchTypes
+ * @throws Exception
+ */
+ public function __construct(array $routes = [], $basePath = '', array $matchTypes = [])
+ {
+ $this->addRoutes($routes);
+ $this->setBasePath($basePath);
+ $this->addMatchTypes($matchTypes);
+ }
+
+ /**
+ * Retrieves all routes.
+ * Useful if you want to process or display routes.
+ * @return array All routes.
+ */
+ public function getRoutes()
+ {
+ return $this->routes;
+ }
+
+ /**
+ * Add multiple routes at once from array in the following format:
+ *
+ * $routes = [
+ * [$method, $route, $target, $name]
+ * ];
+ *
+ * @param array $routes
+ * @return void
+ * @author Koen Punt
+ * @throws Exception
+ */
+ public function addRoutes($routes)
+ {
+ if (!is_array($routes) && !$routes instanceof Traversable) {
+ throw new RuntimeException('Routes should be an array or an instance of Traversable');
+ }
+ foreach ($routes as $route) {
+ call_user_func_array([$this, 'map'], $route);
+ }
+ }
+
+ /**
+ * Set the base path.
+ * Useful if you are running your application from a subdirectory.
+ * @param string $basePath
+ */
+ public function setBasePath($basePath)
+ {
+ $this->basePath = $basePath;
+ }
+
+ /**
+ * Add named match types. It uses array_merge so keys can be overwritten.
+ *
+ * @param array $matchTypes The key is the name and the value is the regex.
+ */
+ public function addMatchTypes(array $matchTypes)
+ {
+ $this->matchTypes = array_merge($this->matchTypes, $matchTypes);
+ }
+
+ /**
+ * Map a route to a target
+ *
+ * @param string $method One of 5 HTTP Methods, or a pipe-separated list of multiple HTTP Methods (GET|POST|PATCH|PUT|DELETE)
+ * @param string $route The route regex, custom regex must start with an @. You can use multiple pre-set regex filters, like [i:id]
+ * @param mixed $target The target where this route should point to. Can be anything.
+ * @param string $name Optional name of this route. Supply if you want to reverse route this url in your application.
+ * @throws Exception
+ */
+ public function map($method, $route, $target, $name = null)
+ {
+
+ $this->routes[] = [$method, $route, $target, $name];
+
+ if ($name) {
+ if (isset($this->namedRoutes[$name])) {
+ throw new RuntimeException("Can not redeclare route '{$name}'");
+ }
+ $this->namedRoutes[$name] = $route;
+ }
+
+ return;
+ }
+
+ /**
+ * Reversed routing
+ *
+ * Generate the URL for a named route. Replace regexes with supplied parameters
+ *
+ * @param string $routeName The name of the route.
+ * @param array @params Associative array of parameters to replace placeholders with.
+ * @return string The URL of the route with named parameters in place.
+ * @throws Exception
+ */
+ public function generate($routeName, array $params = [])
+ {
+
+ // Check if named route exists
+ if (!isset($this->namedRoutes[$routeName])) {
+ throw new RuntimeException("Route '{$routeName}' does not exist.");
+ }
+
+ // Replace named parameters
+ $route = $this->namedRoutes[$routeName];
+
+ // prepend base path to route url again
+ $url = $this->basePath . $route;
+
+ if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) {
+ foreach ($matches as $index => $match) {
+ list($block, $pre, $type, $param, $optional) = $match;
+
+ if ($pre) {
+ $block = substr($block, 1);
+ }
+
+ if (isset($params[$param])) {
+ // Part is found, replace for param value
+ $url = str_replace($block, $params[$param], $url);
+ } elseif ($optional && $index !== 0) {
+ // Only strip preceding slash if it's not at the base
+ $url = str_replace($pre . $block, '', $url);
+ } else {
+ // Strip match block
+ $url = str_replace($block, '', $url);
+ }
+ }
+ }
+
+ return $url;
+ }
+
+ /**
+ * Match a given Request Url against stored routes
+ * @param string $requestUrl
+ * @param string $requestMethod
+ * @return array|boolean Array with route information on success, false on failure (no match).
+ */
+ public function match($requestUrl = null, $requestMethod = null)
+ {
+
+ $params = [];
+
+ // set Request Url if it isn't passed as parameter
+ if ($requestUrl === null) {
+ $requestUrl = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/';
+ }
+
+ // strip base path from request url
+ $requestUrl = substr($requestUrl, strlen($this->basePath));
+
+ // Strip query string (?a=b) from Request Url
+ if (($strpos = strpos($requestUrl, '?')) !== false) {
+ $requestUrl = substr($requestUrl, 0, $strpos);
+ }
+
+ $lastRequestUrlChar = $requestUrl ? $requestUrl[strlen($requestUrl)-1] : '';
+
+ // set Request Method if it isn't passed as a parameter
+ if ($requestMethod === null) {
+ $requestMethod = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : 'GET';
+ }
+
+ foreach ($this->routes as $handler) {
+ list($methods, $route, $target, $name) = $handler;
+
+ $method_match = (stripos($methods, $requestMethod) !== false);
+
+ // Method did not match, continue to next route.
+ if (!$method_match) {
+ continue;
+ }
+
+ if ($route === '*') {
+ // * wildcard (matches all)
+ $match = true;
+ } elseif (isset($route[0]) && $route[0] === '@') {
+ // @ regex delimiter
+ $pattern = '`' . substr($route, 1) . '`u';
+ $match = preg_match($pattern, $requestUrl, $params) === 1;
+ } elseif (($position = strpos($route, '[')) === false) {
+ // No params in url, do string comparison
+ $match = strcmp($requestUrl, $route) === 0;
+ } else {
+ // Compare longest non-param string with url before moving on to regex
+ // Check if last character before param is a slash, because it could be optional if param is optional too (see https://github.com/dannyvankooten/AltoRouter/issues/241)
+ if (strncmp($requestUrl, $route, $position) !== 0 && ($lastRequestUrlChar === '/' || $route[$position-1] !== '/')) {
+ continue;
+ }
+
+ $regex = $this->compileRoute($route);
+ $match = preg_match($regex, $requestUrl, $params) === 1;
+ }
+
+ if ($match) {
+ if ($params) {
+ foreach ($params as $key => $value) {
+ if (is_numeric($key)) {
+ unset($params[$key]);
+ }
+ }
+ }
+
+ return [
+ 'target' => $target,
+ 'params' => $params,
+ 'name' => $name
+ ];
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Compile the regex for a given route (EXPENSIVE)
+ * @param $route
+ * @return string
+ */
+ protected function compileRoute($route)
+ {
+ if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) {
+ $matchTypes = $this->matchTypes;
+ foreach ($matches as $match) {
+ list($block, $pre, $type, $param, $optional) = $match;
+
+ if (isset($matchTypes[$type])) {
+ $type = $matchTypes[$type];
+ }
+ if ($pre === '.') {
+ $pre = '\.';
+ }
+
+ $optional = $optional !== '' ? '?' : null;
+
+ //Older versions of PCRE require the 'P' in (?P)
+ $pattern = '(?:'
+ . ($pre !== '' ? $pre : null)
+ . '('
+ . ($param !== '' ? "?P<$param>" : null)
+ . $type
+ . ')'
+ . $optional
+ . ')'
+ . $optional;
+
+ $route = str_replace($block, $pattern, $route);
+ }
+ }
+ return "`^$route$`u";
+ }
+}
diff --git a/fluxRSS/DAL/ArticleGateway.php b/fluxRSS/DAL/ArticleGateway.php
index 7818920..89e43ec 100755
--- a/fluxRSS/DAL/ArticleGateway.php
+++ b/fluxRSS/DAL/ArticleGateway.php
@@ -48,4 +48,13 @@ class ArticleGateway
throw new Exception("PDO error");
}
}
+
+ public function removeAllArticleForParser(){
+ try{
+ $query = 'DELETE FROM Article;';
+ $this->con->executeQuery($query);
+ }catch(\PDOException $p){
+ throw new Exception("Data is not delete.");
+ }
+ }
}
\ No newline at end of file
diff --git a/fluxRSS/cache/7d/7d23d818a9618a39f1bf95b3e694ad5c44a32007fb7602bc4dc5cebe7a55ad13.php b/fluxRSS/cache/7d/7d23d818a9618a39f1bf95b3e694ad5c44a32007fb7602bc4dc5cebe7a55ad13.php
index 7de6a2c..343538b 100755
--- a/fluxRSS/cache/7d/7d23d818a9618a39f1bf95b3e694ad5c44a32007fb7602bc4dc5cebe7a55ad13.php
+++ b/fluxRSS/cache/7d/7d23d818a9618a39f1bf95b3e694ad5c44a32007fb7602bc4dc5cebe7a55ad13.php
@@ -12,7 +12,11 @@ use Twig\Sandbox\SecurityNotAllowedFunctionError;
use Twig\Source;
use Twig\Template;
+<<<<<<< HEAD
/* connexion.html */
+=======
+/* Connection.html */
+>>>>>>> pre-master
class __TwigTemplate_2ce784f5b9085065b66af58be97997ff169e0f0d71d95a1d280acea4a24fd4e6 extends Template
{
private $source;
@@ -165,7 +169,11 @@ utilisation anormale de la vuephp
public function getTemplateName()
{
+<<<<<<< HEAD
return "connexion.html";
+=======
+ return "Connection.html";
+>>>>>>> pre-master
}
public function isTraitable()
@@ -180,6 +188,10 @@ utilisation anormale de la vuephp
public function getSourceContext()
{
+<<<<<<< HEAD
return new Source("", "connexion.html", "/Applications/MAMP/htdocs/phptwig/templates/connexion.html");
+=======
+ return new Source("", "Connection.html", "/Applications/MAMP/htdocs/phptwig/templates/Connection.html");
+>>>>>>> pre-master
}
}
diff --git a/fluxRSS/config/config.php b/fluxRSS/config/config.php
index a187ad0..be4f14e 100755
--- a/fluxRSS/config/config.php
+++ b/fluxRSS/config/config.php
@@ -12,3 +12,4 @@ $rep = __DIR__ . '/../';
$base = 'dbrorossetto';
$login = 'rorossetto';
$mdp = 'tpphp';
+$path = '~mapoint2/Tp/routeur/Srouteur';
diff --git a/fluxRSS/controleur/AdminControleur.php b/fluxRSS/controleur/AdminControleur.php
new file mode 100755
index 0000000..6d97769
--- /dev/null
+++ b/fluxRSS/controleur/AdminControleur.php
@@ -0,0 +1,8 @@
+setBasePath('~/mapoint2/Tp/routeur/Srouteur');
+ $router->map('GET', '/', 'UserControleur.php');
+ $router->map('GET|POST','/user/[a:action]?','UserControleur.php');
+ $router->map('GET|POST','/admin/[a:action]?','AdminControleur.php');
+
+ $match = $router->match();
+
+ if (!$match) {
+ $dVueEreur[] = "Page doesn't exist";
+ echo $twig->render('erreur.html', ['dVueEreur' => $dVueEreur]);
+ }
+ else {
+ $controller=$match['target'] ?? null;
+ $action=$match['params']['action'] ?? null;
+ try {
+ $controller = '\\controleur\\' . $controller;
+ $controller = new $controller;
+ if($controller == "\\controleur\\AdminControleur.php"){
+ if (!AdminModel::isAdmin()){
+ echo $twig->render('Connection.html');
+ }
+ }
+ if (is_callable(array($controller, $action))) {
+ call_user_func_array(array($controller, $action),
+ array($match['params']));
+ }
+ }
+ catch (Error $error){
+ $dVueEreur[] = "Controller doesn't exist";
+ echo $twig->render('erreur.html', ['dVueEreur' => $dVueEreur]);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/fluxRSS/controleur/Controleur.php b/fluxRSS/controleur/UserControleur.php
similarity index 96%
rename from fluxRSS/controleur/Controleur.php
rename to fluxRSS/controleur/UserControleur.php
index 0786850..72bd0cd 100755
--- a/fluxRSS/controleur/Controleur.php
+++ b/fluxRSS/controleur/UserControleur.php
@@ -5,7 +5,7 @@ use model\AdminModel;
use model\ArticleModel;
use model\Parser;
-class Controleur
+class UserControleur
{
public function __construct()
{
@@ -115,6 +115,6 @@ class Controleur
//'data' => $data,
];
- echo $twig->render('connexion.html', ['dVue' => $dVue, 'dVueEreur' => $dVueEreur]);
+ echo $twig->render('Connection.html', ['dVue' => $dVue, 'dVueEreur' => $dVueEreur]);
}
}//fin class
diff --git a/fluxRSS/dannyvankooten-AltoRouter-ac028a7/.github/workflows/php.yml b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/.github/workflows/php.yml
new file mode 100755
index 0000000..c428ab7
--- /dev/null
+++ b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/.github/workflows/php.yml
@@ -0,0 +1,39 @@
+name: PHP
+
+on: [ push, pull_request ]
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ php-versions: [ '7.3', '7.4', '8.0', '8.1' ]
+
+ steps:
+ - uses: actions/checkout@v2
+
+ - uses: shivammathur/setup-php@v2
+ with:
+ php-version: ${{ matrix.php-versions }}
+ tools: composer
+
+ - name: Validate composer.json and composer.lock
+ run: composer validate
+
+ - name: Get composer cache directory
+ id: composer-cache
+ run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+ - name: Cache dependencies
+ uses: actions/cache@v2
+ with:
+ path: ${{ steps.composer-cache.outputs.dir }}
+ key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+ restore-keys: ${{ runner.os }}-composer-
+
+ - name: Install dependencies
+ if: steps.composer-cache.outputs.cache-hit != 'true'
+ run: composer install --prefer-dist --no-progress
+
+ - name: Run test suite
+ run: composer run-script test
\ No newline at end of file
diff --git a/fluxRSS/dannyvankooten-AltoRouter-ac028a7/AltoRouter.php b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/AltoRouter.php
new file mode 100755
index 0000000..31aa338
--- /dev/null
+++ b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/AltoRouter.php
@@ -0,0 +1,302 @@
+
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+class AltoRouter
+{
+
+ /**
+ * @var array Array of all routes (incl. named routes).
+ */
+ protected $routes = [];
+
+ /**
+ * @var array Array of all named routes.
+ */
+ protected $namedRoutes = [];
+
+ /**
+ * @var string Can be used to ignore leading part of the Request URL (if main file lives in subdirectory of host)
+ */
+ protected $basePath = '';
+
+ /**
+ * @var array Array of default match types (regex helpers)
+ */
+ protected $matchTypes = [
+ 'i' => '[0-9]++',
+ 'a' => '[0-9A-Za-z]++',
+ 'h' => '[0-9A-Fa-f]++',
+ '*' => '.+?',
+ '**' => '.++',
+ '' => '[^/\.]++'
+ ];
+
+ /**
+ * Create router in one call from config.
+ *
+ * @param array $routes
+ * @param string $basePath
+ * @param array $matchTypes
+ * @throws Exception
+ */
+ public function __construct(array $routes = [], $basePath = '', array $matchTypes = [])
+ {
+ $this->addRoutes($routes);
+ $this->setBasePath($basePath);
+ $this->addMatchTypes($matchTypes);
+ }
+
+ /**
+ * Retrieves all routes.
+ * Useful if you want to process or display routes.
+ * @return array All routes.
+ */
+ public function getRoutes()
+ {
+ return $this->routes;
+ }
+
+ /**
+ * Add multiple routes at once from array in the following format:
+ *
+ * $routes = [
+ * [$method, $route, $target, $name]
+ * ];
+ *
+ * @param array $routes
+ * @return void
+ * @author Koen Punt
+ * @throws Exception
+ */
+ public function addRoutes($routes)
+ {
+ if (!is_array($routes) && !$routes instanceof Traversable) {
+ throw new RuntimeException('Routes should be an array or an instance of Traversable');
+ }
+ foreach ($routes as $route) {
+ call_user_func_array([$this, 'map'], $route);
+ }
+ }
+
+ /**
+ * Set the base path.
+ * Useful if you are running your application from a subdirectory.
+ * @param string $basePath
+ */
+ public function setBasePath($basePath)
+ {
+ $this->basePath = $basePath;
+ }
+
+ /**
+ * Add named match types. It uses array_merge so keys can be overwritten.
+ *
+ * @param array $matchTypes The key is the name and the value is the regex.
+ */
+ public function addMatchTypes(array $matchTypes)
+ {
+ $this->matchTypes = array_merge($this->matchTypes, $matchTypes);
+ }
+
+ /**
+ * Map a route to a target
+ *
+ * @param string $method One of 5 HTTP Methods, or a pipe-separated list of multiple HTTP Methods (GET|POST|PATCH|PUT|DELETE)
+ * @param string $route The route regex, custom regex must start with an @. You can use multiple pre-set regex filters, like [i:id]
+ * @param mixed $target The target where this route should point to. Can be anything.
+ * @param string $name Optional name of this route. Supply if you want to reverse route this url in your application.
+ * @throws Exception
+ */
+ public function map($method, $route, $target, $name = null)
+ {
+
+ $this->routes[] = [$method, $route, $target, $name];
+
+ if ($name) {
+ if (isset($this->namedRoutes[$name])) {
+ throw new RuntimeException("Can not redeclare route '{$name}'");
+ }
+ $this->namedRoutes[$name] = $route;
+ }
+
+ return;
+ }
+
+ /**
+ * Reversed routing
+ *
+ * Generate the URL for a named route. Replace regexes with supplied parameters
+ *
+ * @param string $routeName The name of the route.
+ * @param array @params Associative array of parameters to replace placeholders with.
+ * @return string The URL of the route with named parameters in place.
+ * @throws Exception
+ */
+ public function generate($routeName, array $params = [])
+ {
+
+ // Check if named route exists
+ if (!isset($this->namedRoutes[$routeName])) {
+ throw new RuntimeException("Route '{$routeName}' does not exist.");
+ }
+
+ // Replace named parameters
+ $route = $this->namedRoutes[$routeName];
+
+ // prepend base path to route url again
+ $url = $this->basePath . $route;
+
+ if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) {
+ foreach ($matches as $index => $match) {
+ list($block, $pre, $type, $param, $optional) = $match;
+
+ if ($pre) {
+ $block = substr($block, 1);
+ }
+
+ if (isset($params[$param])) {
+ // Part is found, replace for param value
+ $url = str_replace($block, $params[$param], $url);
+ } elseif ($optional && $index !== 0) {
+ // Only strip preceding slash if it's not at the base
+ $url = str_replace($pre . $block, '', $url);
+ } else {
+ // Strip match block
+ $url = str_replace($block, '', $url);
+ }
+ }
+ }
+
+ return $url;
+ }
+
+ /**
+ * Match a given Request Url against stored routes
+ * @param string $requestUrl
+ * @param string $requestMethod
+ * @return array|boolean Array with route information on success, false on failure (no match).
+ */
+ public function match($requestUrl = null, $requestMethod = null)
+ {
+
+ $params = [];
+
+ // set Request Url if it isn't passed as parameter
+ if ($requestUrl === null) {
+ $requestUrl = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/';
+ }
+
+ // strip base path from request url
+ $requestUrl = substr($requestUrl, strlen($this->basePath));
+
+ // Strip query string (?a=b) from Request Url
+ if (($strpos = strpos($requestUrl, '?')) !== false) {
+ $requestUrl = substr($requestUrl, 0, $strpos);
+ }
+
+ $lastRequestUrlChar = $requestUrl ? $requestUrl[strlen($requestUrl)-1] : '';
+
+ // set Request Method if it isn't passed as a parameter
+ if ($requestMethod === null) {
+ $requestMethod = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : 'GET';
+ }
+
+ foreach ($this->routes as $handler) {
+ list($methods, $route, $target, $name) = $handler;
+
+ $method_match = (stripos($methods, $requestMethod) !== false);
+
+ // Method did not match, continue to next route.
+ if (!$method_match) {
+ continue;
+ }
+
+ if ($route === '*') {
+ // * wildcard (matches all)
+ $match = true;
+ } elseif (isset($route[0]) && $route[0] === '@') {
+ // @ regex delimiter
+ $pattern = '`' . substr($route, 1) . '`u';
+ $match = preg_match($pattern, $requestUrl, $params) === 1;
+ } elseif (($position = strpos($route, '[')) === false) {
+ // No params in url, do string comparison
+ $match = strcmp($requestUrl, $route) === 0;
+ } else {
+ // Compare longest non-param string with url before moving on to regex
+ // Check if last character before param is a slash, because it could be optional if param is optional too (see https://github.com/dannyvankooten/AltoRouter/issues/241)
+ if (strncmp($requestUrl, $route, $position) !== 0 && ($lastRequestUrlChar === '/' || $route[$position-1] !== '/')) {
+ continue;
+ }
+
+ $regex = $this->compileRoute($route);
+ $match = preg_match($regex, $requestUrl, $params) === 1;
+ }
+
+ if ($match) {
+ if ($params) {
+ foreach ($params as $key => $value) {
+ if (is_numeric($key)) {
+ unset($params[$key]);
+ }
+ }
+ }
+
+ return [
+ 'target' => $target,
+ 'params' => $params,
+ 'name' => $name
+ ];
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Compile the regex for a given route (EXPENSIVE)
+ * @param $route
+ * @return string
+ */
+ protected function compileRoute($route)
+ {
+ if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) {
+ $matchTypes = $this->matchTypes;
+ foreach ($matches as $match) {
+ list($block, $pre, $type, $param, $optional) = $match;
+
+ if (isset($matchTypes[$type])) {
+ $type = $matchTypes[$type];
+ }
+ if ($pre === '.') {
+ $pre = '\.';
+ }
+
+ $optional = $optional !== '' ? '?' : null;
+
+ //Older versions of PCRE require the 'P' in (?P)
+ $pattern = '(?:'
+ . ($pre !== '' ? $pre : null)
+ . '('
+ . ($param !== '' ? "?P<$param>" : null)
+ . $type
+ . ')'
+ . $optional
+ . ')'
+ . $optional;
+
+ $route = str_replace($block, $pattern, $route);
+ }
+ }
+ return "`^$route$`u";
+ }
+}
diff --git a/fluxRSS/dannyvankooten-AltoRouter-ac028a7/LICENSE.md b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/LICENSE.md
new file mode 100755
index 0000000..a1130bb
--- /dev/null
+++ b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/LICENSE.md
@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2012 Danny van Kooten
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/fluxRSS/dannyvankooten-AltoRouter-ac028a7/README.md b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/README.md
new file mode 100755
index 0000000..7d6e1fe
--- /dev/null
+++ b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/README.md
@@ -0,0 +1,57 @@
+# AltoRouter  [](https://packagist.org/packages/altorouter/altorouter) [](https://packagist.org/packages/altorouter/altorouter)
+
+AltoRouter is a small but powerful routing class, heavily inspired by [klein.php](https://github.com/chriso/klein.php/).
+
+```php
+$router = new AltoRouter();
+
+// map homepage
+$router->map('GET', '/', function() {
+ require __DIR__ . '/views/home.php';
+});
+
+// dynamic named route
+$router->map('GET|POST', '/users/[i:id]/', function($id) {
+ $user = .....
+ require __DIR__ . '/views/user/details.php';
+}, 'user-details');
+
+// echo URL to user-details page for ID 5
+echo $router->generate('user-details', ['id' => 5]); // Output: "/users/5"
+```
+
+## Features
+
+* Can be used with all HTTP Methods
+* Dynamic routing with named route parameters
+* Reversed routing
+* Flexible regular expression routing (inspired by [Sinatra](http://www.sinatrarb.com/))
+* Custom regexes
+
+## Getting started
+
+You need PHP >= 5.6 to use AltoRouter, although we highly recommend you [use an officially supported PHP version](https://secure.php.net/supported-versions.php) that is not EOL.
+
+- [Install AltoRouter](http://altorouter.com/usage/install.html)
+- [Rewrite all requests to AltoRouter](http://altorouter.com/usage/rewrite-requests.html)
+- [Map your routes](http://altorouter.com/usage/mapping-routes.html)
+- [Match requests](http://altorouter.com/usage/matching-requests.html)
+- [Process the request your preferred way](http://altorouter.com/usage/processing-requests.html)
+
+## Contributors
+- [Danny van Kooten](https://github.com/dannyvankooten)
+- [Koen Punt](https://github.com/koenpunt)
+- [John Long](https://github.com/adduc)
+- [Niahoo Osef](https://github.com/niahoo)
+
+## License
+
+MIT License
+
+Copyright (c) 2012 Danny van Kooten
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/fluxRSS/dannyvankooten-AltoRouter-ac028a7/composer.json b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/composer.json
new file mode 100755
index 0000000..05bcb40
--- /dev/null
+++ b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/composer.json
@@ -0,0 +1,35 @@
+{
+ "name": "altorouter/altorouter",
+ "description": "A lightning fast router for PHP",
+ "keywords": ["router", "routing", "lightweight"],
+ "homepage": "https://github.com/dannyvankooten/AltoRouter",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "Danny van Kooten",
+ "email": "dannyvankooten@gmail.com",
+ "homepage": "http://dannyvankooten.com/"
+ },
+ {
+ "name": "Koen Punt",
+ "homepage": "https://github.com/koenpunt"
+ },
+ {
+ "name": "niahoo",
+ "homepage": "https://github.com/niahoo"
+ }
+ ],
+ "require": {
+ "php": ">=5.6.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "9.5.*",
+ "squizlabs/php_codesniffer": "3.6.2"
+ },
+ "autoload": {
+ "classmap": ["AltoRouter.php"]
+ },
+ "scripts": {
+ "test": "vendor/bin/phpunit"
+ }
+}
diff --git a/fluxRSS/dannyvankooten-AltoRouter-ac028a7/phpcs.xml b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/phpcs.xml
new file mode 100755
index 0000000..d59cccf
--- /dev/null
+++ b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/phpcs.xml
@@ -0,0 +1,10 @@
+
+
+ rules
+
+
+ tests
+ AltoRouter.php
+ examples/
+
+
diff --git a/fluxRSS/index.php b/fluxRSS/index.php
index fd16b5b..1eb4352 100755
--- a/fluxRSS/index.php
+++ b/fluxRSS/index.php
@@ -5,7 +5,7 @@ require_once __DIR__ . '/config/config.php';
require __DIR__ . '/vendor/autoload.php';
-use controleur\Controleur;
+use controleur\FrontControleur;
//twig
$loader = new \Twig\Loader\FilesystemLoader('templates');
@@ -13,6 +13,6 @@ $twig = new \Twig\Environment($loader, [
'cache' => false,
]);
-$cont = new Controleur();
+$cont = new FrontControleur();
diff --git a/fluxRSS/model/AdminModel.php b/fluxRSS/model/AdminModel.php
index 1767d1b..212677c 100755
--- a/fluxRSS/model/AdminModel.php
+++ b/fluxRSS/model/AdminModel.php
@@ -27,4 +27,9 @@ class AdminModel
}
return null;
}
+
+ public static function isAdmin(): bool
+ {
+ return $_SESSION['role'] == 'admin';
+ }
}
\ No newline at end of file
diff --git a/fluxRSS/model/Parser.php b/fluxRSS/model/Parser.php
index a965433..287e26d 100755
--- a/fluxRSS/model/Parser.php
+++ b/fluxRSS/model/Parser.php
@@ -3,6 +3,7 @@
namespace model;
use DAL\ArticleGateway;
+use DAL\Connection;
use DAL\FluxGateway;
use DOMDocument;
use Exception;
@@ -62,13 +63,25 @@ class Parser
/**
* @throws Exception
*/
- public function addAllArticles(){
- $allFlux = $this->fluxGateway->findAllFlux();
+ public function addAllArticles()
+ {
+ $this->articleGateway->removeAllArticleForParser();
+ $allFlux = $this->fluxGateway->findAllFlux();
+ var_dump($allFlux);
$allArticles = $this->parseAll($allFlux);
-
+ var_dump($allArticles);
foreach ($allArticles as $article) {
$this->articleGateway->addArticle($article);
}
+ return $allArticles;
}
-}
\ No newline at end of file
+
+}
+$gwArt = new ArticleGateway(new Connection('mysql:host=londres.uca.local;dbname=dbrorossetto', 'rorossetto', 'tpphp'));
+$gwFl = new FluxGateway(new Connection('mysql:host=londres.uca.local;dbname=dbrorossetto', 'rorossetto', 'tpphp'));
+$pars = new Parser( $gwFl,$gwArt);
+var_dump($pars->addAllArticles());
+
+
+
diff --git a/fluxRSS/templates/Connection.html b/fluxRSS/templates/Connection.html
new file mode 100755
index 0000000..4b74bdd
--- /dev/null
+++ b/fluxRSS/templates/Connection.html
@@ -0,0 +1,58 @@
+
+
+
+
+
+ Login
+
+
+
+
+ {% if dVue is defined %}
+ {% if dVueEreur is defined and dVueEreur|length >0 %}
+