From 0470798eb64fda985fd98408ee61fa906cb43c34 Mon Sep 17 00:00:00 2001 From: quentin Date: Fri, 15 Feb 2019 17:00:11 +0100 Subject: [PATCH] Update --- README.md | 0 composer.json | 0 composer.lock | 0 controllers/internals/.tokeep | 0 controllers/internals/Api.php | 0 controllers/internals/Httpstatus.php | 0 controllers/publics/Api.php | 3 +-- controllers/publics/Httpstatus.php | 0 descartes/env.php | 2 +- descartes/exceptions/DescartesException404.php | 0 .../DescartesExceptionConsoleInvocationError.php | 0 .../DescartesExceptionRouterInvocationError.php | 0 .../DescartesExceptionRouterUrlGenerationError.php | 0 .../DescartesExceptionTemplateNotReadable.php | 0 descartes/load-environment.php | 0 env.dev.php | 12 ++++++++++++ models/.tokeep | 0 models/Api.php | 0 models/Httpstatus.php | 0 names.txt | 0 routes.php | 0 static/css/style.css | 0 static/img/login/icon-password.png | Bin static/img/login/icon-user.png | Bin supervisor.conf | 4 ++++ templates/httpstatus/admin/add.php | 0 templates/httpstatus/admin/admin.php | 0 templates/httpstatus/admin/edit.php | 0 templates/httpstatus/home.php | 0 templates/httpstatus/login.php | 0 templates/httpstatus/show.php | 0 templates/incs/header.php | 0 templates/incs/header_admin.php | 0 tests/controllers/internals/.keep | 0 tests/controllers/publics/.keep | 0 35 files changed, 18 insertions(+), 3 deletions(-) mode change 100644 => 100755 README.md mode change 100644 => 100755 composer.json mode change 100644 => 100755 composer.lock mode change 100644 => 100755 controllers/internals/.tokeep mode change 100644 => 100755 controllers/internals/Api.php mode change 100644 => 100755 controllers/internals/Httpstatus.php mode change 100644 => 100755 controllers/publics/Api.php mode change 100644 => 100755 controllers/publics/Httpstatus.php mode change 100644 => 100755 descartes/exceptions/DescartesException404.php mode change 100644 => 100755 descartes/exceptions/DescartesExceptionConsoleInvocationError.php mode change 100644 => 100755 descartes/exceptions/DescartesExceptionRouterInvocationError.php mode change 100644 => 100755 descartes/exceptions/DescartesExceptionRouterUrlGenerationError.php mode change 100644 => 100755 descartes/exceptions/DescartesExceptionTemplateNotReadable.php mode change 100644 => 100755 descartes/load-environment.php create mode 100755 env.dev.php mode change 100644 => 100755 models/.tokeep mode change 100644 => 100755 models/Api.php mode change 100644 => 100755 models/Httpstatus.php mode change 100644 => 100755 names.txt mode change 100644 => 100755 routes.php mode change 100644 => 100755 static/css/style.css mode change 100644 => 100755 static/img/login/icon-password.png mode change 100644 => 100755 static/img/login/icon-user.png create mode 100755 supervisor.conf mode change 100644 => 100755 templates/httpstatus/admin/add.php mode change 100644 => 100755 templates/httpstatus/admin/admin.php mode change 100644 => 100755 templates/httpstatus/admin/edit.php mode change 100644 => 100755 templates/httpstatus/home.php mode change 100644 => 100755 templates/httpstatus/login.php mode change 100644 => 100755 templates/httpstatus/show.php mode change 100644 => 100755 templates/incs/header.php mode change 100644 => 100755 templates/incs/header_admin.php mode change 100644 => 100755 tests/controllers/internals/.keep mode change 100644 => 100755 tests/controllers/publics/.keep diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/composer.json b/composer.json old mode 100644 new mode 100755 diff --git a/composer.lock b/composer.lock old mode 100644 new mode 100755 diff --git a/controllers/internals/.tokeep b/controllers/internals/.tokeep old mode 100644 new mode 100755 diff --git a/controllers/internals/Api.php b/controllers/internals/Api.php old mode 100644 new mode 100755 diff --git a/controllers/internals/Httpstatus.php b/controllers/internals/Httpstatus.php old mode 100644 new mode 100755 diff --git a/controllers/publics/Api.php b/controllers/publics/Api.php old mode 100644 new mode 100755 index a1c7f39..f6bc58b --- 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 old mode 100644 new mode 100755 diff --git a/descartes/env.php b/descartes/env.php index 3a22b20..3f93462 100755 --- 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 old mode 100644 new mode 100755 diff --git a/descartes/exceptions/DescartesExceptionConsoleInvocationError.php b/descartes/exceptions/DescartesExceptionConsoleInvocationError.php old mode 100644 new mode 100755 diff --git a/descartes/exceptions/DescartesExceptionRouterInvocationError.php b/descartes/exceptions/DescartesExceptionRouterInvocationError.php old mode 100644 new mode 100755 diff --git a/descartes/exceptions/DescartesExceptionRouterUrlGenerationError.php b/descartes/exceptions/DescartesExceptionRouterUrlGenerationError.php old mode 100644 new mode 100755 diff --git a/descartes/exceptions/DescartesExceptionTemplateNotReadable.php b/descartes/exceptions/DescartesExceptionTemplateNotReadable.php old mode 100644 new mode 100755 diff --git a/descartes/load-environment.php b/descartes/load-environment.php old mode 100644 new mode 100755 diff --git a/env.dev.php b/env.dev.php new file mode 100755 index 0000000..f467a51 --- /dev/null +++ b/env.dev.php @@ -0,0 +1,12 @@ + 'localhost', + 'DATABASE_NAME' => 'consejo_gans', + 'DATABASE_USER' => 'root', + 'DATABASE_PASSWORD' => 'bernardbernard', + ]; diff --git a/models/.tokeep b/models/.tokeep old mode 100644 new mode 100755 diff --git a/models/Api.php b/models/Api.php old mode 100644 new mode 100755 diff --git a/models/Httpstatus.php b/models/Httpstatus.php old mode 100644 new mode 100755 diff --git a/names.txt b/names.txt old mode 100644 new mode 100755 diff --git a/routes.php b/routes.php old mode 100644 new mode 100755 diff --git a/static/css/style.css b/static/css/style.css old mode 100644 new mode 100755 diff --git a/static/img/login/icon-password.png b/static/img/login/icon-password.png old mode 100644 new mode 100755 diff --git a/static/img/login/icon-user.png b/static/img/login/icon-user.png old mode 100644 new mode 100755 diff --git a/supervisor.conf b/supervisor.conf new file mode 100755 index 0000000..6d2ef5d --- /dev/null +++ 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 old mode 100644 new mode 100755 diff --git a/templates/httpstatus/admin/admin.php b/templates/httpstatus/admin/admin.php old mode 100644 new mode 100755 diff --git a/templates/httpstatus/admin/edit.php b/templates/httpstatus/admin/edit.php old mode 100644 new mode 100755 diff --git a/templates/httpstatus/home.php b/templates/httpstatus/home.php old mode 100644 new mode 100755 diff --git a/templates/httpstatus/login.php b/templates/httpstatus/login.php old mode 100644 new mode 100755 diff --git a/templates/httpstatus/show.php b/templates/httpstatus/show.php old mode 100644 new mode 100755 diff --git a/templates/incs/header.php b/templates/incs/header.php old mode 100644 new mode 100755 diff --git a/templates/incs/header_admin.php b/templates/incs/header_admin.php old mode 100644 new mode 100755 diff --git a/tests/controllers/internals/.keep b/tests/controllers/internals/.keep old mode 100644 new mode 100755 diff --git a/tests/controllers/publics/.keep b/tests/controllers/publics/.keep old mode 100644 new mode 100755