Update

QuentG · Feb 15, 2019 · 0470798 · 0470798
1 parent d98f684
commit 0470798
Show file tree

Hide file tree

Showing 35 changed files with 18 additions and 3 deletions.
diff --git a/README.md b/README.md
diff --git a/composer.json b/composer.json
diff --git a/composer.lock b/composer.lock
diff --git a/controllers/internals/.tokeep b/controllers/internals/.tokeep
diff --git a/controllers/internals/Api.php b/controllers/internals/Api.php
diff --git a/controllers/internals/Httpstatus.php b/controllers/internals/Httpstatus.php
diff --git a/controllers/publics/Api.php b/controllers/publics/Api.php
@@ -137,8 +137,7 @@ public function status (int $id)
             $time = $this->internal_api->getHistory($id);
 
             if($status['id'] == $id)
-            {
-
+            {           
                 return $this->controller_api->json(array(
                     'id' => $id,
                     'url' => $status['url_site'],

diff --git a/controllers/publics/Httpstatus.php b/controllers/publics/Httpstatus.php
diff --git a/descartes/env.php b/descartes/env.php
@@ -2,7 +2,7 @@
     /*
      * Define Descartes env
      */
-    $http_dir_path = '/Httpstatus'; //Path we need to put after servername in url to access app
+    $http_dir_path = '/httpstatus'; //Path we need to put after servername in url to access app
     $http_protocol = (isset($_SERVER['HTTPS']) ? 'https' : 'http') . '://';
     $http_server_name = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'localhost';
     $http_server_port = isset($_SERVER['SERVER_PORT']) ? ($_SERVER['SERVER_PORT'] == 80) ? '' : $_SERVER['SERVER_PORT'] : '';

diff --git a/descartes/exceptions/DescartesException404.php b/descartes/exceptions/DescartesException404.php
diff --git a/descartes/exceptions/DescartesExceptionConsoleInvocationError.php b/descartes/exceptions/DescartesExceptionConsoleInvocationError.php
diff --git a/descartes/exceptions/DescartesExceptionRouterInvocationError.php b/descartes/exceptions/DescartesExceptionRouterInvocationError.php
diff --git a/descartes/exceptions/DescartesExceptionRouterUrlGenerationError.php b/descartes/exceptions/DescartesExceptionRouterUrlGenerationError.php
diff --git a/descartes/exceptions/DescartesExceptionTemplateNotReadable.php b/descartes/exceptions/DescartesExceptionTemplateNotReadable.php
diff --git a/descartes/load-environment.php b/descartes/load-environment.php
diff --git a/env.dev.php b/env.dev.php
@@ -0,0 +1,12 @@
+<?php
+	/*
+		Ce fichier défini les constantes modifiables et les options
+	*/
+
+	//On défini l'environment
+    $env = [
+        'DATABASE_HOST' => 'localhost',
+        'DATABASE_NAME' => 'consejo_gans',
+        'DATABASE_USER' => 'root',
+        'DATABASE_PASSWORD' => 'bernardbernard',
+    ];
diff --git a/models/.tokeep b/models/.tokeep
diff --git a/models/Api.php b/models/Api.php
diff --git a/models/Httpstatus.php b/models/Httpstatus.php
diff --git a/names.txt b/names.txt
diff --git a/routes.php b/routes.php
diff --git a/static/css/style.css b/static/css/style.css
diff --git a/static/img/login/icon-password.png b/static/img/login/icon-password.png
diff --git a/static/img/login/icon-user.png b/static/img/login/icon-user.png
diff --git a/supervisor.conf b/supervisor.conf
@@ -0,0 +1,4 @@
+[program:check_status]
+command=php /var/www/html/httpstatus/console.php controllers/internals/Httpstatus checkStatus
+autostart=true
+autorestart=true
diff --git a/templates/httpstatus/admin/add.php b/templates/httpstatus/admin/add.php
diff --git a/templates/httpstatus/admin/admin.php b/templates/httpstatus/admin/admin.php
diff --git a/templates/httpstatus/admin/edit.php b/templates/httpstatus/admin/edit.php
diff --git a/templates/httpstatus/home.php b/templates/httpstatus/home.php
diff --git a/templates/httpstatus/login.php b/templates/httpstatus/login.php
diff --git a/templates/httpstatus/show.php b/templates/httpstatus/show.php
diff --git a/templates/incs/header.php b/templates/incs/header.php
diff --git a/templates/incs/header_admin.php b/templates/incs/header_admin.php
diff --git a/tests/controllers/internals/.keep b/tests/controllers/internals/.keep
diff --git a/tests/controllers/publics/.keep b/tests/controllers/publics/.keep