Changes for v2

phpMv · Apr 7, 2020 · 6214054 · 6214054
1 parent dd41de6
commit 6214054
Show file tree

Hide file tree

Showing 56 changed files with 380 additions and 684 deletions.
diff --git a/...WsController.php-df981244.annotations.php → ...WsController.php-26959e61.annotations.php b/...WsController.php-df981244.annotations.php → ...WsController.php-26959e61.annotations.php
diff --git a/...ations/Admin.php-61d40772.annotations.php → ...ations/Admin.php-45f03c7d.annotations.php b/...ations/Admin.php-61d40772.annotations.php → ...ations/Admin.php-45f03c7d.annotations.php
diff --git a/...seAnnotation.php-aecc5ace.annotations.php → ...seAnnotation.php-2701ed2d.annotations.php b/...seAnnotation.php-aecc5ace.annotations.php → ...seAnnotation.php-2701ed2d.annotations.php
diff --git a/app/cache/annotations/CacheTrait.php-898ad40f.annotations.php b/app/cache/annotations/CacheTrait.php-898ad40f.annotations.php
diff --git a/...s/CheckTrait.php-c3d5397e.annotations.php → ...s/CheckTrait.php-a8dd60ea.annotations.php b/...s/CheckTrait.php-c3d5397e.annotations.php → ...s/CheckTrait.php-a8dd60ea.annotations.php
diff --git a/...ComposerTrait.php-edb8f14.annotations.php → ...omposerTrait.php-9163f17c.annotations.php b/...ComposerTrait.php-edb8f14.annotations.php → ...omposerTrait.php-9163f17c.annotations.php
diff --git a/app/cache/annotations/ConfigTrait.php-6b8db0e9.annotations.php b/app/cache/annotations/ConfigTrait.php-6b8db0e9.annotations.php
diff --git a/...s/Controller.php-51df5599.annotations.php → ...s/Controller.php-861fa168.annotations.php b/...s/Controller.php-51df5599.annotations.php → ...s/Controller.php-861fa168.annotations.php
diff --git a/...ntrollerBase.php-ce0bc117.annotations.php → ...ntrollerBase.php-6eda1b42.annotations.php b/...ntrollerBase.php-ce0bc117.annotations.php → ...ntrollerBase.php-6eda1b42.annotations.php
diff --git a/app/cache/annotations/ControllerBase.php-b3f038a9.annotations.php b/app/cache/annotations/ControllerBase.php-b3f038a9.annotations.php
diff --git a/app/cache/annotations/ControllersTrait.php-ef8be1ce.annotations.php b/app/cache/annotations/ControllersTrait.php-ef8be1ce.annotations.php
diff --git a/app/cache/annotations/CreateControllersTrait.php-86f5cff4.annotations.php b/app/cache/annotations/CreateControllersTrait.php-86f5cff4.annotations.php
diff --git a/app/cache/annotations/DatabaseTrait.php-8f1f9205.annotations.php b/app/cache/annotations/DatabaseTrait.php-8f1f9205.annotations.php
diff --git a/app/cache/annotations/DefaultMaintenance.php-e8c8a72c.annotations.php b/app/cache/annotations/DefaultMaintenance.php-e8c8a72c.annotations.php
diff --git a/...etAnnotation.php-bf8ff479.annotations.php → ...etAnnotation.php-e77b5f85.annotations.php b/...etAnnotation.php-bf8ff479.annotations.php → ...etAnnotation.php-e77b5f85.annotations.php
diff --git a/app/cache/annotations/GitTrait.php-8a664551.annotations.php b/app/cache/annotations/GitTrait.php-8a664551.annotations.php
diff --git a/...exController.php-d6cc5600.annotations.php → ...exController.php-cd6d22a1.annotations.php b/...exController.php-d6cc5600.annotations.php → ...exController.php-cd6d22a1.annotations.php
@@ -6,6 +6,7 @@
   'Display' => 'Ubiquity\\core\\postinstall\\Display',
   'Logger' => 'Ubiquity\\log\\Logger',
   'ThemesManager' => 'Ubiquity\\themes\\ThemesManager',
+  'Router' => 'Ubiquity\\controllers\\Router',
 ),
   '#traitMethodOverrides' => array (
   'controllers\\IndexController' => 

diff --git a/...tJqueryTrait.php-e8f2adad.annotations.php → ...tJqueryTrait.php-11ff2188.annotations.php b/...tJqueryTrait.php-e8f2adad.annotations.php → ...tJqueryTrait.php-11ff2188.annotations.php
diff --git a/app/cache/annotations/LogsTrait.php-7ef939a8.annotations.php b/app/cache/annotations/LogsTrait.php-7ef939a8.annotations.php
diff --git a/.../MailerTrait.php-2aaf5b71.annotations.php → .../MailerTrait.php-dda60475.annotations.php b/.../MailerTrait.php-2aaf5b71.annotations.php → .../MailerTrait.php-dda60475.annotations.php
diff --git a/...inController.php-e26e072b.annotations.php → ...inController.php-42bfdd7e.annotations.php b/...inController.php-e26e072b.annotations.php → ...inController.php-42bfdd7e.annotations.php
@@ -5,6 +5,8 @@
   '#uses' => array (
   'URequest' => 'Ubiquity\\utils\\http\\URequest',
   'AbstractWsController' => 'ws\\controllers\\AbstractWsController',
+  'UCookie' => 'Ubiquity\\utils\\http\\UCookie',
+  'UString' => 'Ubiquity\\utils\\base\\UString',
 ),
   '#traitMethodOverrides' => array (
   'controllers\\MainController' => 
@@ -14,6 +16,9 @@
   'controllers\\MainController::index' => array(
     array('#name' => 'get', '#type' => 'Ubiquity\\annotations\\router\\GetAnnotation', "_default","name"=>"Home")
   ),
+  'controllers\\MainController::displayNews' => array(
+    array('#name' => 'get', '#type' => 'Ubiquity\\annotations\\router\\GetAnnotation', "news","name"=>"News")
+  ),
   'controllers\\MainController::contact' => array(
     array('#name' => 'get', '#type' => 'Ubiquity\\annotations\\router\\GetAnnotation', "contact","name"=>"Contact")
   ),
@@ -29,5 +34,11 @@
   'controllers\\MainController::sendMessage' => array(
     array('#name' => 'route', '#type' => 'Ubiquity\\annotations\\router\\RouteAnnotation', "sendMessage")
   ),
+  'controllers\\MainController::noMoreMessage' => array(
+    array('#name' => 'get', '#type' => 'Ubiquity\\annotations\\router\\GetAnnotation', "noMore/{title}","name"=>"noMore")
+  ),
+  'controllers\\MainController::acceptCookiesOrNot' => array(
+    array('#name' => 'get', '#type' => 'Ubiquity\\annotations\\router\\GetAnnotation', "cookies/{accept}/{redirect}")
+  ),
 );
 
diff --git a/app/cache/annotations/MaintenanceController.php-e64fcfc9.annotations.php b/app/cache/annotations/MaintenanceController.php-e64fcfc9.annotations.php
diff --git a/...tenanceTrait.php-74fa3fb0.annotations.php → ...tenanceTrait.php-4638ca71.annotations.php b/...tenanceTrait.php-74fa3fb0.annotations.php → ...tenanceTrait.php-4638ca71.annotations.php
diff --git a/app/cache/annotations/MessagesTrait.php-dceb8b15.annotations.php b/app/cache/annotations/MessagesTrait.php-dceb8b15.annotations.php
diff --git a/...sConfigTrait.php-fb2bdbe4.annotations.php → ...sConfigTrait.php-177aeb37.annotations.php b/...sConfigTrait.php-fb2bdbe4.annotations.php → ...sConfigTrait.php-177aeb37.annotations.php
diff --git a/.../ModelsTrait.php-6773d014.annotations.php → .../ModelsTrait.php-907a8f10.annotations.php b/.../ModelsTrait.php-6773d014.annotations.php → .../ModelsTrait.php-907a8f10.annotations.php
diff --git a/app/cache/annotations/ParamAnnotation.php-1730d8dc.annotations.php b/app/cache/annotations/ParamAnnotation.php-1730d8dc.annotations.php
diff --git a/app/cache/annotations/PostAnnotation.php-164e42f0.annotations.php b/app/cache/annotations/PostAnnotation.php-164e42f0.annotations.php
diff --git a/...tyAnnotation.php-fce341bb.annotations.php → ...tyAnnotation.php-a417ea47.annotations.php b/...tyAnnotation.php-fce341bb.annotations.php → ...tyAnnotation.php-a417ea47.annotations.php