From f1a62c55df647daa22a83e283317afe7e59ab3b1 Mon Sep 17 00:00:00 2001
From: Emmanuel ROY
Date: Fri, 18 Dec 2020 18:55:35 +0100
Subject: [PATCH] Update por le dev
---
application/class/Dumper.php | 11 +-
application/class/Logger.php | 7 +-
...fine-constantes.php => app-constantes.php} | 3 +
application/config/app-parameters.php | 11 +
application/config/bdd-parameters.php | 14 +
.../cas-authentification-config-example.php | 102 +
application/config/files/routing.yml | 10 +-
...ybrid-authentification-config-example.php} | 8 +-
application/include/actions/DefaultAction.php | 9 +-
.../include/actions/MenudocsAction.php | 35 -
application/include/conduits/DocConduit.php | 41 -
application/include/conduits/FooConduit.php | 3 +-
application/include/conduits/IndexConduit.php | 14 +
.../controlleurs/AccueilHttpReponse.php | 45 -
.../include/controlleurs/ErrorHttpReponse.php | 27 -
application/include/controlleurs/admin.php | 1 +
.../include/controlleurs/authentificate.php | 57 -
.../include/controlleurs/authentification.php | 11 -
application/include/controlleurs/beers.php | 7 -
application/include/controlleurs/compte.php | 22 -
application/include/controlleurs/error.php | 1 +
.../controlleurs/{accueil.php => index.php} | 4 +-
application/include/controlleurs/logout.php | 34 -
application/include/modeles/admin.model | 6 +
.../include/modeles/authentificate.model | 4 -
.../include/modeles/authentification.model | 4 -
application/include/modeles/beers.model | 5 -
application/include/modeles/cgu.model | 1 +
application/include/modeles/compte.model | 4 -
application/include/modeles/error.model | 1 +
.../modeles/{accueil.model => index.model} | 3 +-
application/include/modeles/logout.model | 4 -
application/include/modeles/policy.model | 1 +
.../include/vues/layout/body.blade.php | 160 +-
.../include/vues/system/system.blade.php | 10 +
...thentificate.blade.php => admin.blade.php} | 8 +-
.../vues/view/authentification.blade.php | 27 -
.../include/vues/view/compte.blade.php | 31 -
application/include/vues/view/docs.blade.php | 19 -
application/include/vues/view/error.blade.php | 89 +-
application/include/vues/view/foo.blade.php | 16 -
.../{accueil.blade.php => index.blade.php} | 3 +-
application/include/vues/view/index.html.twig | 1 +
.../include/vues/view/menu-docs.blade.php | 8 -
application/traitements/ajax-example.php | 20 +-
.../traitements/traitement-example.php | 18 +-
composer.json | 34 +-
console/bin.php | 4 +-
console/command/Cache.php | 13 +-
console/command/Module.php | 158 +-
console/command/Page.php | 27 +-
console/command/Symfony.php | 10 +-
console/skel/module.php | 4 +-
console/skel/module_symfony.php | 4 +-
console/skel/page.model | 1 +
console/skel/page.php | 2 +-
console/skel/phplist/config.skel.php | 2 +-
.../src/Controller/AdminController.php | 1 +
.../src/Controller/DefaultController.php | 5 +-
.../src/Controller/ErrorController.php | 5 +-
.../Events/OnAuthenticationFailureEvent.php | 21 +-
.../Events/OnAuthenticationSuccessEvent.php | 18 +-
.../src/Security/AccessDeniedHandler.php | 5 +-
.../symfony-app/src/Security/AuthUser.php | 14 +-
.../src/Security/AuthUserProvider.php | 16 +-
.../src/Security/SessionAuthenticator.php | 30 +-
.../DependencyInjection/Configuration.php | 37 +-
.../SessionAuthExtension.php | 19 +-
.../Events/CheckCredentialsEvent.php | 20 +-
.../Events/OnAuthenticationFailureEvent.php | 21 +-
.../Events/OnAuthenticationSuccessEvent.php | 18 +-
.../Security/Abstracts/AuthAbstract.php | 5 +-
.../Security/Abstracts/AuthFinal.php | 13 +-
.../Security/Abstracts/GetterAbstract.php | 24 +-
.../Security/AuthenticatorFactory.php | 8 +-
.../AuthBundle/Security/CasAuthenticator.php | 41 +-
.../Security/DefaultAuthentication.php | 24 +-
.../Security/Getters/CasAttributes.php | 49 +-
.../Security/Getters/RsaAttributes.php | 51 +-
.../Security/Getters/SessionAttributes.php | 49 +-
.../Interfaces/AttributesInterface.php | 337 +-
.../Security/Interfaces/AuthInterface.php | 62 +-
.../AuthBundle/Security/RsaAuthenticator.php | 40 +-
.../Security/SessionAuthenticator.php | 21 +-
.../AuthBundle/Security/User/AuthUser.php | 33 +-
.../Security/User/AuthUserProvider.php | 22 +-
.../src/Session/AuthBundle/Utils/Config.php | 14 +-
console/skel/symfony-app/src/Utils/Config.php | 17 +-
.../templates/default/error.html.twig | 0
.../templates/default/index.html.twig | 0
.../templates/default/page.html.twig | 0
.../templates/default/unauthorized.html.twig | 0
.../Adapter/FilesystemTagAwareAdapter.php | 6 +-
console/skel/symfony/cache/LockRegistry.php | 7 +-
.../skel/symfony/cache/Simple/ArrayCache.php | 4 +-
.../symfony/cache/Traits/MemcachedTrait.php | 4 +-
.../skel/symfony/cache/Traits/RedisTrait.php | 8 +-
.../config/Definition/Builder/ExprBuilder.php | 52 +-
.../symfony/config/Definition/EnumNode.php | 3 +-
console/skel/symfony/config/FileLocator.php | 3 +-
.../symfony/config/Loader/LoaderInterface.php | 4 +-
.../symfony/config/Resource/GlobResource.php | 4 +-
.../Definition/Builder/ExprBuilderTest.php | 8 +-
.../Dumper/XmlReferenceDumperTest.php | 5 +-
.../Tests/Definition/NormalizationTest.php | 12 +-
.../config/Tests/Loader/FileLoaderTest.php | 4 +-
.../Tests/Loader/LoaderResolverTest.php | 3 +-
.../Resource/ClassExistenceResourceTest.php | 4 +-
console/skel/symfony/config/Util/XmlUtils.php | 3 +-
.../Tests/ExpressionLanguageTest.php | 8 +-
.../expression-language/Tests/ParserTest.php | 15 +-
.../skel/symfony/filesystem/Filesystem.php | 3 +-
.../Finder/Adapter/AbstractFindAdapter.php | 14 +-
.../Component/Finder/Shell/Command.php | 4 +-
.../Component/Finder/Tests/FinderTest.php | 16 +-
.../Iterator/CustomFilterIteratorTest.php | 8 +-
.../FilecontentFilterIteratorTest.php | 12 +-
.../Tests/Iterator/FilterIteratorTest.php | 5 +-
.../Tests/Iterator/IteratorTestCase.php | 16 +-
.../Tests/Iterator/MockFileListIterator.php | 4 +-
.../Finder/Tests/Iterator/MockSplFileInfo.php | 2 +
.../Tests/Iterator/SortableIteratorTest.php | 10 +-
.../symfony/http-foundation/File/File.php | 4 +-
.../http-foundation/File/UploadedFile.php | 4 +-
.../symfony/http-foundation/JsonResponse.php | 4 +-
.../http-foundation/RedirectResponse.php | 3 +-
.../Tests/File/MimeType/MimeTypeTest.php | 2 +-
.../http-foundation/Tests/RequestTest.php | 10 +-
.../Session/Flash/AutoExpireFlashBagTest.php | 18 +-
.../Tests/Session/Flash/FlashBagTest.php | 18 +-
.../Tests/StreamedResponseTest.php | 45 +-
.../skel/symfony/polyfill-ctype/bootstrap.php | 55 +-
.../symfony/polyfill-mbstring/bootstrap.php | 191 +-
.../skel/symfony/polyfill-php54/bootstrap.php | 15 +-
.../skel/symfony/polyfill-php55/bootstrap.php | 20 +-
console/skel/symfony/polyfill-php70/Php70.php | 4 +-
.../skel/symfony/polyfill-php70/bootstrap.php | 15 +-
console/skel/symfony/routing/Router.php | 6 +-
.../Tests/Fixtures/CustomXmlFileLoader.php | 4 +-
.../Tests/Fixtures/dumper/url_matcher1.php | 79 +-
.../Tests/Fixtures/dumper/url_matcher2.php | 83 +-
.../Tests/Fixtures/dumper/url_matcher3.php | 3 +-
.../Tests/Fixtures/dumper/url_matcher4.php | 1 -
.../Tests/Fixtures/dumper/url_matcher5.php | 12 +-
.../Tests/Fixtures/dumper/url_matcher6.php | 32 +-
.../Tests/Fixtures/dumper/url_matcher7.php | 32 +-
.../Tests/Generator/UrlGeneratorTest.php | 103 +-
.../Tests/Loader/ClosureLoaderTest.php | 3 +-
.../Tests/Loader/PhpFileLoaderTest.php | 20 +-
.../routing/Tests/RouteCollectionTest.php | 41 +-
.../skel/symfony/routing/Tests/RouteTest.php | 4 +-
.../Test/ServiceLocatorTest.php | 36 +-
.../skel/symfony/yaml/Command/LintCommand.php | 3 +-
console/skel/symfony/yaml/Dumper.php | 3 +-
data/docs/00.configuration.md | 12 +
data/docs/02.controleur_base.md | 15 +-
.../css/bootstrap-grid.css | 4997 +++++++
.../css/bootstrap-grid.css.map | 1 +
.../css/bootstrap-grid.min.css | 7 +
.../css/bootstrap-grid.min.css.map | 1 +
.../css/bootstrap-grid.rtl.css | 4996 +++++++
.../css/bootstrap-grid.rtl.css.map | 1 +
.../css/bootstrap-grid.rtl.min.css | 7 +
.../css/bootstrap-grid.rtl.min.css.map | 1 +
.../css/bootstrap-reboot.css | 429 +
.../css/bootstrap-reboot.css.map | 1 +
.../css/bootstrap-reboot.min.css | 8 +
.../css/bootstrap-reboot.min.css.map | 1 +
.../css/bootstrap-reboot.rtl.css | 426 +
.../css/bootstrap-reboot.rtl.css.map | 1 +
.../css/bootstrap-reboot.rtl.min.css | 8 +
.../css/bootstrap-reboot.rtl.min.css.map | 1 +
.../css/bootstrap-utilities.css | 4617 +++++++
.../css/bootstrap-utilities.css.map | 1 +
.../css/bootstrap-utilities.min.css | 7 +
.../css/bootstrap-utilities.min.css.map | 1 +
.../css/bootstrap-utilities.rtl.css | 4608 +++++++
.../css/bootstrap-utilities.rtl.css.map | 1 +
.../css/bootstrap-utilities.rtl.min.css | 7 +
.../css/bootstrap-utilities.rtl.min.css.map | 1 +
.../css/bootstrap.css | 10717 ++++++++++++++++
.../css/bootstrap.css.map | 1 +
.../css/bootstrap.min.css | 7 +
.../css/bootstrap.min.css.map | 1 +
.../css/bootstrap.rtl.css | 10693 +++++++++++++++
.../css/bootstrap.rtl.css.map | 1 +
.../css/bootstrap.rtl.min.css | 7 +
.../css/bootstrap.rtl.min.css.map | 1 +
.../js/bootstrap.bundle.js | 6701 ++++++++++
.../js/bootstrap.bundle.js.map | 1 +
.../js/bootstrap.bundle.min.js | 7 +
.../js/bootstrap.bundle.min.js.map | 1 +
.../js/bootstrap.esm.js | 4961 +++++++
.../js/bootstrap.esm.js.map | 1 +
.../js/bootstrap.esm.min.js | 7 +
.../js/bootstrap.esm.min.js.map | 1 +
.../js/bootstrap.js | 5008 ++++++++
.../js/bootstrap.js.map | 1 +
.../js/bootstrap.min.js | 7 +
.../js/bootstrap.min.js.map | 1 +
public/assets/css/custom.css | 42 +-
public/index.php | 6 +-
public/phpinfo.php | 2 +-
tests/Test.php | 36 +-
tests/fichiertest.class.php | 19 +-
205 files changed, 60117 insertions(+), 1612 deletions(-)
rename application/config/{define-constantes.php => app-constantes.php} (93%)
create mode 100644 application/config/app-parameters.php
create mode 100644 application/config/bdd-parameters.php
create mode 100644 application/config/cas-authentification-config-example.php
rename application/config/{authentification-config-example.php => hybrid-authentification-config-example.php} (85%)
delete mode 100644 application/include/actions/MenudocsAction.php
delete mode 100644 application/include/conduits/DocConduit.php
create mode 100644 application/include/conduits/IndexConduit.php
delete mode 100644 application/include/controlleurs/AccueilHttpReponse.php
delete mode 100644 application/include/controlleurs/ErrorHttpReponse.php
create mode 100644 application/include/controlleurs/admin.php
delete mode 100644 application/include/controlleurs/authentificate.php
delete mode 100644 application/include/controlleurs/authentification.php
delete mode 100644 application/include/controlleurs/beers.php
delete mode 100644 application/include/controlleurs/compte.php
rename application/include/controlleurs/{accueil.php => index.php} (63%)
delete mode 100644 application/include/controlleurs/logout.php
create mode 100644 application/include/modeles/admin.model
delete mode 100644 application/include/modeles/authentificate.model
delete mode 100644 application/include/modeles/authentification.model
delete mode 100644 application/include/modeles/beers.model
delete mode 100644 application/include/modeles/compte.model
rename application/include/modeles/{accueil.model => index.model} (76%)
delete mode 100644 application/include/modeles/logout.model
rename application/include/vues/view/{authentificate.blade.php => admin.blade.php} (61%)
delete mode 100644 application/include/vues/view/authentification.blade.php
delete mode 100644 application/include/vues/view/compte.blade.php
delete mode 100644 application/include/vues/view/docs.blade.php
delete mode 100644 application/include/vues/view/foo.blade.php
rename application/include/vues/view/{accueil.blade.php => index.blade.php} (88%)
create mode 100644 application/include/vues/view/index.html.twig
delete mode 100644 application/include/vues/view/menu-docs.blade.php
mode change 100755 => 100644 console/skel/symfony-app/templates/default/error.html.twig
mode change 100755 => 100644 console/skel/symfony-app/templates/default/index.html.twig
mode change 100755 => 100644 console/skel/symfony-app/templates/default/page.html.twig
mode change 100755 => 100644 console/skel/symfony-app/templates/default/unauthorized.html.twig
create mode 100644 data/docs/00.configuration.md
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-grid.css
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-grid.css.map
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-grid.min.css
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-grid.min.css.map
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-grid.rtl.css
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-grid.rtl.css.map
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-grid.rtl.min.css
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-grid.rtl.min.css.map
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-reboot.css
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-reboot.css.map
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-reboot.min.css
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-reboot.min.css.map
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-reboot.rtl.css
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-reboot.rtl.css.map
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-reboot.rtl.min.css
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-reboot.rtl.min.css.map
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-utilities.css
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-utilities.css.map
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-utilities.min.css
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-utilities.min.css.map
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-utilities.rtl.css
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-utilities.rtl.css.map
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-utilities.rtl.min.css
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap-utilities.rtl.min.css.map
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap.css
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap.css.map
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap.min.css
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap.min.css.map
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap.rtl.css
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap.rtl.css.map
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap.rtl.min.css
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/css/bootstrap.rtl.min.css.map
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/js/bootstrap.bundle.js
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/js/bootstrap.bundle.js.map
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/js/bootstrap.bundle.min.js
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/js/bootstrap.bundle.min.js.map
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/js/bootstrap.esm.js
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/js/bootstrap.esm.js.map
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/js/bootstrap.esm.min.js
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/js/bootstrap.esm.min.js.map
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/js/bootstrap.js
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/js/bootstrap.js.map
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/js/bootstrap.min.js
create mode 100644 public/assets/bootstrap-5.0.0-beta1-dist/js/bootstrap.min.js.map
diff --git a/application/class/Dumper.php b/application/class/Dumper.php
index 87dcfd0..e31c80d 100644
--- a/application/class/Dumper.php
+++ b/application/class/Dumper.php
@@ -2,10 +2,10 @@
namespace MVC\Classe;
-
-class Dumper{
-
- public static function dump($var){
+class Dumper
+{
+ public static function dump($var)
+ {
echo "";
if (is_bool($var)) {
echo ($var) ? "true" : "false";
@@ -21,7 +21,6 @@ class Dumper{
*/
public static function setPHPvalues()
{
-
ini_set('display_errors', 1);
ini_set('display_startup_errors', 1);
ini_set('memory_limit', -1);
@@ -32,4 +31,4 @@ class Dumper{
return;
}
-}
\ No newline at end of file
+}
diff --git a/application/class/Logger.php b/application/class/Logger.php
index aa05216..81a1365 100644
--- a/application/class/Logger.php
+++ b/application/class/Logger.php
@@ -3,13 +3,11 @@
namespace MVC\Classe;
-
use Symfony\Component\Validator\Constraints\Date;
class Logger
{
-
- static function addLog($type = 'default', $what = "")
+ public static function addLog($type = 'default', $what = "")
{
$file = LOG_PATH . DIRECTORY_SEPARATOR . 'app.' . $type . '.log';
$browser = new Browser();
@@ -41,5 +39,4 @@ class Logger
return;
}
-
-}
\ No newline at end of file
+}
diff --git a/application/config/define-constantes.php b/application/config/app-constantes.php
similarity index 93%
rename from application/config/define-constantes.php
rename to application/config/app-constantes.php
index e02e5a5..8e30fe6 100644
--- a/application/config/define-constantes.php
+++ b/application/config/app-constantes.php
@@ -15,8 +15,11 @@ define("PUBLIC_PATH", dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR
define("CONSOLE_PATH", dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . "console");
define("DATA_PATH", dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . "data");
+<<<<<<< HEAD:application/config/define-constantes.php
// De base laisser vide,
// sauf si l'application est hebergé sur de multiples sous-repertoire en ajoutant le slash_final
// par exemple : "my-app/"
// ou : "my-app/dev/
define("BASE_SERVER_DIRECTORY", "");
+=======
+>>>>>>> master-dev:application/config/app-constantes.php
diff --git a/application/config/app-parameters.php b/application/config/app-parameters.php
new file mode 100644
index 0000000..7768f4e
--- /dev/null
+++ b/application/config/app-parameters.php
@@ -0,0 +1,11 @@
+
+ * @author Adam Franco
+ * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License 2.0
+ * @link https://wiki.jasig.org/display/CASC/phpCAS
+ */
+
+$phpcas_path = '../../source/';
+
+///////////////////////////////////////
+// Basic Config of the phpCAS client //
+///////////////////////////////////////
+
+// Full Hostname of your CAS Server
+$cas_host = 'cas.domain.fr';
+// Context of the CAS Server
+$cas_context = 'cas';
+// Port of your CAS server. Normally for a https server it's 443
+$cas_port = 443;
+// Path to the ca chain that issued the cas server certificate
+$cas_server_ca_cert_path = '';
+
+//////////////////////////////////////////
+// Advanced Config for special purposes //
+//////////////////////////////////////////
+/*
+// The "real" hosts of clustered cas server that send SAML logout messages
+// Assumes the cas server is load balanced across multiple hosts
+$cas_real_hosts = array('cas-real-1.example.com', 'cas-real-2.example.com');
+
+// Client config for cookie hardening
+$client_domain = '127.0.0.1';
+$client_path = 'phpcas';
+$client_secure = true;
+$client_httpOnly = true;
+$client_lifetime = 0;
+
+// Database config for PGT Storage
+$db = 'pgsql:host=localhost;dbname=phpcas';
+//$db = 'mysql:host=localhost;dbname=phpcas';
+$db_user = 'phpcasuser';
+$db_password = 'mysupersecretpass';
+$db_table = 'phpcastabel';
+$driver_options = '';
+
+///////////////////////////////////////////
+// End Configuration -- Don't edit below //
+///////////////////////////////////////////
+
+// Generating the URLS for the local cas example services for proxy testing
+if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+ $curbase = 'https://' . $_SERVER['SERVER_NAME'];
+} else {
+ $curbase = 'http://' . $_SERVER['SERVER_NAME'];
+}
+if ($_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) {
+ $curbase .= ':' . $_SERVER['SERVER_PORT'];
+}
+
+$curdir = dirname($_SERVER['REQUEST_URI']) . "/";
+
+// CAS client nodes for rebroadcasting pgtIou/pgtId and logoutRequest
+$rebroadcast_node_1 = 'http://cas-client-1.example.com';
+$rebroadcast_node_2 = 'http://cas-client-2.example.com';
+
+// access to a single service
+$serviceUrl = $curbase . $curdir . 'example_service.php';
+// access to a second service
+$serviceUrl2 = $curbase . $curdir . 'example_service_that_proxies.php';
+
+$pgtBase = preg_quote(preg_replace('/^http:/', 'https:', $curbase . $curdir), '/');
+$pgtUrlRegexp = '/^' . $pgtBase . '.*$/';
+
+$cas_url = 'https://' . $cas_host;
+if ($cas_port != '443') {
+ $cas_url = $cas_url . ':' . $cas_port;
+}
+$cas_url = $cas_url . $cas_context;
+
+// Set the session-name to be unique to the current script so that the client script
+// doesn't share its session with a proxied script.
+// This is just useful when running the example code, but not normally.
+session_name(
+ 'session_for-'
+ . preg_replace('/[^a-z0-9-]/i', '_', basename($_SERVER['SCRIPT_NAME']))
+);
+// Set an UTF-8 encoding header for internation characters (User attributes)
+header('Content-Type: text/html; charset=utf-8');
+?>
+*/
diff --git a/application/config/files/routing.yml b/application/config/files/routing.yml
index 8cd0fc0..c54412d 100644
--- a/application/config/files/routing.yml
+++ b/application/config/files/routing.yml
@@ -1,6 +1,6 @@
home_route:
path: /
- defaults: { controller: 'FooController::indexAction' }
+ defaults: { controller: '' }
foo_route:
path: /foo
@@ -11,11 +11,3 @@ foo_placeholder_route:
defaults: { controller: 'FooConduit::load' }
requirements:
id: '[0-9]+'
-
-docs_route:
- path: /docs
- defaults: { controller: 'DocConduit::index' }
-
-docs_name_route:
- path: /docs/file/{name}
- defaults: { controller: 'DocConduit::readfile' }
\ No newline at end of file
diff --git a/application/config/authentification-config-example.php b/application/config/hybrid-authentification-config-example.php
similarity index 85%
rename from application/config/authentification-config-example.php
rename to application/config/hybrid-authentification-config-example.php
index d42f7bd..f37f99b 100644
--- a/application/config/authentification-config-example.php
+++ b/application/config/hybrid-authentification-config-example.php
@@ -14,22 +14,22 @@ $config = [
'providers' => [
'GitHub' => [
'enabled' => true,
- 'keys' => ['id' => '4cc55bcafbf8ea77ae14', 'secret' => 'e0b7c5091d7af4f4e5ced843f2e8ce1f38f02578'],
+ 'keys' => ['id' => '4cc55bcafbf8ea77ae14', 'secret' => ''],
],
'Google' => [
'enabled' => true,
- 'keys' => ['id' => '686670374445-mhktaj9gp08p6oiu8e1aue3ckua6e3s3.apps.googleusercontent.com', 'secret' => '4yOeNxYuYE4H8DFhVzQlOb_U'],
+ 'keys' => ['id' => '686670374445-mhktaj9gp08p6oiu8e1aue3ckua6e3s3.apps.googleusercontent.com', 'secret' => ''],
],
'Facebook' => [
'enabled' => true,
- 'keys' => ['id' => '432266300978748', 'secret' => '43815184db62771fce19b64cdd80110a'],
+ 'keys' => ['id' => '432266300978748', 'secret' => ''],
],
'Twitter' => [
'enabled' => true,
- 'keys' => ['key' => 'gnsmsVW0EkdpSVeqwCOG7V1H5', 'secret' => 'cdv71bFMUV4OBpkjFIwPNOlbRBQhrAaWBTmLF8aPzZBeMf3PyQ'],
+ 'keys' => ['key' => 'gnsmsVW0EkdpSVeqwCOG7V1H5', 'secret' => ''],
]
],
//optional : set debug mode
diff --git a/application/include/actions/DefaultAction.php b/application/include/actions/DefaultAction.php
index 1b8a237..c7447d8 100644
--- a/application/include/actions/DefaultAction.php
+++ b/application/include/actions/DefaultAction.php
@@ -55,14 +55,13 @@ class DefaultAction extends Action
public function makeHttp11($data)
{
-
$data = array('myval' => 25);
//Dumper::dump($data);
- \MVC\Classe\Logger::addLog('action','http11 make request');
+ \MVC\Classe\Logger::addLog('action', 'http11 make request');
$request = new HttpMethodRequete();
- $request->setUrl(Url::absolute_link_rewrite(false,'accueil',['var10'=>'val10']))->get($data);
- $request->setUrl(Url::absolute_link_rewrite(false,'accueil',['var10'=>'val10']))->post($data);
+ $request->setUrl(Url::absolute_link_rewrite(false, 'accueil', ['var10'=>'val10']))->get($data);
+ $request->setUrl(Url::absolute_link_rewrite(false, 'accueil', ['var10'=>'val10']))->post($data);
$request->setUrl(Url::absolute_link_rewrite(false, 'accueil', ['var10' => 'val10']))->put($data);
- $request->setUrl(Url::absolute_link_rewrite(false,'accueil',['var10'=>'val10']))->delete($data);
+ $request->setUrl(Url::absolute_link_rewrite(false, 'accueil', ['var10'=>'val10']))->delete($data);
}
}
diff --git a/application/include/actions/MenudocsAction.php b/application/include/actions/MenudocsAction.php
deleted file mode 100644
index 82549c0..0000000
--- a/application/include/actions/MenudocsAction.php
+++ /dev/null
@@ -1,35 +0,0 @@
-render('menu-docs', array('files'=>$files));
- }
-
-}
diff --git a/application/include/conduits/DocConduit.php b/application/include/conduits/DocConduit.php
deleted file mode 100644
index de361b0..0000000
--- a/application/include/conduits/DocConduit.php
+++ /dev/null
@@ -1,41 +0,0 @@
-render('docs', array('page_title' => 'Foo', 'description' => 'DocConduit','files' => $files));
- }
- // Route('/docs/file/{name}')
- public function readfile(){
-
- $markdown = file_get_contents(DATA_PATH.'/docs/'.$this->name);
-
- $my_html = MarkdownExtra::defaultTransform($markdown);
-
- return $this->render('docs', array('page_title' => 'Foo', 'description' => 'DocConduit','data' => $my_html));
-
- }
-}
\ No newline at end of file
diff --git a/application/include/conduits/FooConduit.php b/application/include/conduits/FooConduit.php
index 5d76449..dcefa6b 100644
--- a/application/include/conduits/FooConduit.php
+++ b/application/include/conduits/FooConduit.php
@@ -17,6 +17,5 @@ class FooConduit extends Conduit
{
echo "load of foo";
return $this->render('foo', array('page_title' => 'Foo', 'description' => 'FooConduit', 'id' => $this->id));
-
}
-}
\ No newline at end of file
+}
diff --git a/application/include/conduits/IndexConduit.php b/application/include/conduits/IndexConduit.php
new file mode 100644
index 0000000..2dbe1e5
--- /dev/null
+++ b/application/include/conduits/IndexConduit.php
@@ -0,0 +1,14 @@
+render('index', array("templating_a"=>'blade',"templating_b"=>'twig',"templating_c"=>'edge'));
+ }
+}
diff --git a/application/include/controlleurs/AccueilHttpReponse.php b/application/include/controlleurs/AccueilHttpReponse.php
deleted file mode 100644
index c239bb9..0000000
--- a/application/include/controlleurs/AccueilHttpReponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-params);
- Dumper::dump($this->data);
- $text = ob_get_clean();
- Logger::addLog('http11.put', '____Hello Put____' . PHP_EOL . $text);
- }
- public function delete()
- {
- ob_start();
- Dumper::dump($this->params);
- Dumper::dump($this->data);
- $text = ob_get_clean();
- Logger::addLog('http11.delete', '____Hello Delete:____' . PHP_EOL . $text);
-
- }
-
- public function get()
- {
- ob_start();
- Dumper::dump($this->params);
- Dumper::dump($this->data);
- $text = ob_get_clean();
- Logger::addLog('http11.get', '____Hello GET____' . PHP_EOL . $text);
- }
-
- public function post()
- {
- ob_start();
- Dumper::dump($this->params);
- Dumper::dump($this->data);
- $text = ob_get_clean();
- Logger::addLog('http11.post', '____Hello POST____' . PHP_EOL . $text);
- }
-}
\ No newline at end of file
diff --git a/application/include/controlleurs/ErrorHttpReponse.php b/application/include/controlleurs/ErrorHttpReponse.php
deleted file mode 100644
index 09a411e..0000000
--- a/application/include/controlleurs/ErrorHttpReponse.php
+++ /dev/null
@@ -1,27 +0,0 @@
-getProviders())) {
- // Store the provider for the callback event
- $storage->set('provider', $url_params['provider']);
- \MVC\Classe\Session::setStorage($storage);
- \MVC\Classe\Session::setUserProfile(array());
- } else {
- $error = $url_params['provider'];
- }
- }
-
- //
- // Event 2: User clicked LOGOUT link
- //
- if (isset($url_params['logout'])) {
- if (in_array($url_params['logout'], $hybridauth->getProviders())) {
- // Disconnect the adapter
- $adapter = $hybridauth->getAdapter($url_params['logout']);
- $adapter->disconnect();
- } else {
- $error = $url_params['logout'];
- }
- }
-
- //
- // Event 3: Provider returns via CALLBACK
- //
- if ($url_params['provider'] = $storage->get('provider')) {
-
- \MVC\Classe\Session::setHybridAuth($hybridauth);
- $hybridauth->authenticate($url_params['provider']);
-
-
- }
-
-} catch (Exception $e) {
- error_log($e->getMessage());
- echo $e->getMessage();
-}
diff --git a/application/include/controlleurs/authentification.php b/application/include/controlleurs/authentification.php
deleted file mode 100644
index 5c2b45b..0000000
--- a/application/include/controlleurs/authentification.php
+++ /dev/null
@@ -1,11 +0,0 @@
-getConnectedAdapters();
-
-$templateData['hybridauth'] = $hybridauth;
-$templateData['adapters'] = $adapters;
\ No newline at end of file
diff --git a/application/include/controlleurs/beers.php b/application/include/controlleurs/beers.php
deleted file mode 100644
index c01f667..0000000
--- a/application/include/controlleurs/beers.php
+++ /dev/null
@@ -1,7 +0,0 @@
-'blade',"templating_b"=>'twig',"templating_c"=>'edge');
-Logger::addLog('ok', 'Hello world');
\ No newline at end of file
diff --git a/application/include/controlleurs/compte.php b/application/include/controlleurs/compte.php
deleted file mode 100644
index eeffb53..0000000
--- a/application/include/controlleurs/compte.php
+++ /dev/null
@@ -1,22 +0,0 @@
-authenticate(\MVC\Classe\Session::getStorage()->get('provider'));
-$adapters = $hybridauth->getConnectedAdapters();
-foreach ($adapters as $adapter){
- $userProfile[] = $adapter->getUserProfile();
- \MVC\Classe\Session::setId($adapter->getUserProfile()->identifier);
- \MVC\Classe\Session::setUserName($adapter->getUserProfile()->displayName);
-}
-\MVC\Classe\Session::setUserProfile($userProfile);
-
-//Dumper::dump($_SESSION);
-
-$templateData['adapters'] = $adapters;
\ No newline at end of file
diff --git a/application/include/controlleurs/error.php b/application/include/controlleurs/error.php
index e69de29..b3d9bbc 100644
--- a/application/include/controlleurs/error.php
+++ b/application/include/controlleurs/error.php
@@ -0,0 +1 @@
+'blade',"templating_b"=>'twig',"templating_c"=>'edge');
-Logger::addLog('ok', 'Hello world');
\ No newline at end of file
+Logger::addLog('ok', 'Hello world');
diff --git a/application/include/controlleurs/logout.php b/application/include/controlleurs/logout.php
deleted file mode 100644
index 70f45b2..0000000
--- a/application/include/controlleurs/logout.php
+++ /dev/null
@@ -1,34 +0,0 @@
-getProviders())) {
- // Disconnect the adapter
- $adapter = $hybridauth->getAdapter($url_params['logout']);
- $adapter->disconnect();
- \MVC\Classe\Session::destroy();
- header("location: ".MVC\Classe\Url::link_rewrite(false,'accueil'));
- } else {
- $error = $url_params['logout'];
- }
- }
-
-
-} catch (Exception $e) {
- error_log($e->getMessage());
- echo $e->getMessage();
-}
diff --git a/application/include/modeles/admin.model b/application/include/modeles/admin.model
new file mode 100644
index 0000000..7eb9635
--- /dev/null
+++ b/application/include/modeles/admin.model
@@ -0,0 +1,6 @@
+name : admin
+page_title : Administration de l'application
+description : Administration de l'application
+engine : blade
+params : params
+
diff --git a/application/include/modeles/authentificate.model b/application/include/modeles/authentificate.model
deleted file mode 100644
index 7cd2d33..0000000
--- a/application/include/modeles/authentificate.model
+++ /dev/null
@@ -1,4 +0,0 @@
-name : authentificate
-page_title: Hybrid Authentification de l'application
-description : La page d'authentification
-params : params
diff --git a/application/include/modeles/authentification.model b/application/include/modeles/authentification.model
deleted file mode 100644
index 716809e..0000000
--- a/application/include/modeles/authentification.model
+++ /dev/null
@@ -1,4 +0,0 @@
-name : authentification
-page_title: Hybrid Authentification de l'application
-description : La page d'authentification
-params : params
diff --git a/application/include/modeles/beers.model b/application/include/modeles/beers.model
deleted file mode 100644
index e4f701c..0000000
--- a/application/include/modeles/beers.model
+++ /dev/null
@@ -1,5 +0,0 @@
-name : beers
-page_title : module_title
-description : module_description
-params : module_params
-
diff --git a/application/include/modeles/cgu.model b/application/include/modeles/cgu.model
index 963bb61..d828d46 100644
--- a/application/include/modeles/cgu.model
+++ b/application/include/modeles/cgu.model
@@ -1,4 +1,5 @@
name : cgu
page_title: Conditions Générale d'Utilisation de l'application
description : abracadabla
+engine : blade
params : params
diff --git a/application/include/modeles/compte.model b/application/include/modeles/compte.model
deleted file mode 100644
index 419a991..0000000
--- a/application/include/modeles/compte.model
+++ /dev/null
@@ -1,4 +0,0 @@
-name : compte
-page_title: Compte(s) utilisateurs de l'application
-description : La page d'accès privé
-params : params
diff --git a/application/include/modeles/error.model b/application/include/modeles/error.model
index 3e452af..bc2dccc 100644
--- a/application/include/modeles/error.model
+++ b/application/include/modeles/error.model
@@ -1,4 +1,5 @@
name : error
page_title: Erreurs de l'application
description : abracadabla
+engine : blade
params : params
diff --git a/application/include/modeles/accueil.model b/application/include/modeles/index.model
similarity index 76%
rename from application/include/modeles/accueil.model
rename to application/include/modeles/index.model
index be4ce17..d685945 100644
--- a/application/include/modeles/accueil.model
+++ b/application/include/modeles/index.model
@@ -1,5 +1,6 @@
-name : accueil
+name : index
page_title : Accueil de l'application
description : zatou stra bracadabla
+engine : blade
params : params
diff --git a/application/include/modeles/logout.model b/application/include/modeles/logout.model
deleted file mode 100644
index e9167c7..0000000
--- a/application/include/modeles/logout.model
+++ /dev/null
@@ -1,4 +0,0 @@
-name : logout
-page_title: Hybrid Authentification de l'application
-description : La page d'authentification
-params : params
diff --git a/application/include/modeles/policy.model b/application/include/modeles/policy.model
index 68b54a9..77af2b9 100644
--- a/application/include/modeles/policy.model
+++ b/application/include/modeles/policy.model
@@ -1,4 +1,5 @@
name : policy
page_title: Politique de Confidentialité de l'application
description : abracadabla
+engine : blade
params : params
diff --git a/application/include/vues/layout/body.blade.php b/application/include/vues/layout/body.blade.php
index 791f23c..8f95d97 100644
--- a/application/include/vues/layout/body.blade.php
+++ b/application/include/vues/layout/body.blade.php
@@ -7,32 +7,10 @@
@@ -43,40 +21,12 @@
-
-
-
-
-
-
@@ -87,30 +37,8 @@
@@ -123,7 +51,7 @@
- @yield('content')
+ @yield('content')
@@ -134,68 +62,18 @@
-
-
-
-
-
-
+
+
+
+
-
-
-
-
© 2020 SAND Framework - Responsive FrameWork Template.
- All Rights Reserved.
Info[ARTS]Media
+
+
+
© 2020-2021 Built with SAND Framework - Responsive FrameWork Template.
+
@@ -203,4 +81,4 @@
-@endsection
\ No newline at end of file
+@endsection
diff --git a/application/include/vues/system/system.blade.php b/application/include/vues/system/system.blade.php
index dafc74c..72c18aa 100644
--- a/application/include/vues/system/system.blade.php
+++ b/application/include/vues/system/system.blade.php
@@ -9,9 +9,14 @@
@section('top-css')
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> master-dev
@show
@@ -24,11 +29,16 @@
@yield('body')
@section('bottom-javascript')
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> master-dev
@show
+@extends('body')
-
- ERROR
-
-
diff --git a/application/include/vues/view/authentificate.blade.php b/application/include/vues/view/admin.blade.php
similarity index 61%
rename from application/include/vues/view/authentificate.blade.php
rename to application/include/vues/view/admin.blade.php
index 285e2d2..6513e8a 100644
--- a/application/include/vues/view/authentificate.blade.php
+++ b/application/include/vues/view/admin.blade.php
@@ -1,14 +1,12 @@
@extends('body')
@section('sidebar')
-
+ @parent
@endsection
@section('content')
-
-@endsection
-
-@section('top-javascript')
+
This is appended to the master sidebar.
-@endsection
-
-@section('top-javascript')
-@endsection
-
diff --git a/application/include/vues/view/compte.blade.php b/application/include/vues/view/compte.blade.php
deleted file mode 100644
index 3b423f0..0000000
--- a/application/include/vues/view/compte.blade.php
+++ /dev/null
@@ -1,31 +0,0 @@
-@extends('body')
-
-@section('sidebar')
- @parent
-
-
This is appended to the master sidebar.
- @endif
-
-
-@endsection
-
diff --git a/application/include/vues/view/docs.blade.php b/application/include/vues/view/docs.blade.php
deleted file mode 100644
index 200ff26..0000000
--- a/application/include/vues/view/docs.blade.php
+++ /dev/null
@@ -1,19 +0,0 @@
-@extends('body')
-
-@section('sidebar')
- @parent
-@endsection
-
-@section('content')
- @if (isset($files))
-
-