diff --git a/.gitignore b/.gitignore index 237b694..2ff17a6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ app/config/config.yml *.yml~ .settings .project +.vscode +.history \ No newline at end of file diff --git a/web/index.php b/web/index.php index 85d5e91..4af5e5a 100644 --- a/web/index.php +++ b/web/index.php @@ -13,6 +13,12 @@ str_replace('/index.php', '', $_SERVER['SCRIPT_NAME']) ); +// PHP built-in webserver configuration, see https://silex.symfony.com/doc/2.0/web_servers.html +$filename = __DIR__.preg_replace('#(\?.*)$#', '', $_SERVER['REQUEST_URI']); +if (php_sapi_name() === 'cli-server' && is_file($filename)) { + return false; +} + $app = new Silex\Application(); $app['template_url'] = BASE_URL; diff --git a/web/js/angular/controllers.js b/web/js/angular/controllers.js index 2d6b046..387f951 100644 --- a/web/js/angular/controllers.js +++ b/web/js/angular/controllers.js @@ -62,6 +62,7 @@ controllers.controller('LogFileController', ['$scope', '$http', '$routeParams', $http.get('api/logs/'+client+'/'+log, { params: $scope.$parent.filter }) .then(function successCallback(response) { $scope.$parent.currentLog = response.data; + $scope.busy = false; $scope.$parent.busySearch = false; $scope.scrollTop(); initTooltips();