Merge branch 'master' of https://github.com/BrunoSpy/epeires2

Author: BrunoSpy

module/Administration/view/administration/home/index.phtml

@@ -7,12 +7,26 @@ $commit = shell_exec("git log -n 1 --pretty=format:'%s (%ci)' --abbrev-commit");
 
 $tag = shell_exec("git describe --exact-match --tags");
 
+$hostname = getenv('COMPUTERNAME') ? getenv('COMPUTERNAME') : shell_exec('uname -n');
+
 $hasTag = ! (substr($tag, 0, strlen("fatal")) === "fatal" || substr($tag, 0, strlen("warning")) === "warning" || empty($tag));
 ?>
 <div class="container-fluid">
 	<div class="row">
 		<div class="col-sm-12">
 			<p></p>
+    		<div class="panel panel-default">
+    			<div class="panel-heading">
+    				<h3 class="panel-title">Serveur</h3>
+    			</div>
+    
+    			<div class="panel-body">
+    				<p>
+    					Nom d'hôte : <em><?php echo $hostname; ?></em>
+    				</p>
+    			</div>
+    		</div>
+    
     		<div class="panel panel-default">
     			<div class="panel-heading">
     				<h3 class="panel-title">Version</h3>

module/Application/src/Application/Repository/EventRepository.php

@@ -84,6 +84,7 @@ public function getEvents($userauth, $day = null, $lastmodified = null, $orderby
             $qb->andWhere($qb->expr()
                 ->orX($qb->expr()
                     ->neq('c.timelineconfirmed', true), $qb->expr()
+                    ->neq('e.scheduled', true), $qb->expr()
                     ->andX($qb->expr()
                         ->eq('c.timelineconfirmed', true), $qb->expr()
                         ->in('e.status', array(2,3,4)), $qb->expr()

module/Core/src/Core/View/Helper/UserMenu.php

@@ -62,7 +62,7 @@ public function __invoke($color)
             if ($router->match($request) && $router->match($request)->getMatchedRouteName() == 'administration') {
                 $html .= "<li><a href=\"" . $urlHelper('application') . "\">Interface OPE</a></li>";
             } else {
-                if ($this->auth->isGranted('admin.centre') || $this->auth->isGranted('admin.users') || $this->auth->isGranted('admin.categories') || $this->auth->isGranted('admin.models') || $this->auth->isGranted('admin.radio')) {
+                if ($this->auth->isGranted('admin.access') || $this->auth->isGranted('admin.centre') || $this->auth->isGranted('admin.users') || $this->auth->isGranted('admin.categories') || $this->auth->isGranted('admin.models') || $this->auth->isGranted('admin.radio')) {
                     $html .= "<li><a href=\"" . $urlHelper('administration', array(
                         'controller' => 'home',
                         'action' => 'index'