From 5b0949856ec0375ce5feb922c026fc10b59afd48 Mon Sep 17 00:00:00 2001
From: Alexandre Cases <alexandre.cases@etu.univ-tlse2.fr>
Date: Wed, 1 Jun 2016 12:34:00 +0200
Subject: [PATCH] Version: 2.4.2.1

---
 README-LABINVENT.md             |  5 +++--
 src/Template/Error/error400.ctp | 43 +++++++++++++++++++++++++++++++++++++++++++
 src/Template/Error/error500.ctp | 45 +++++++++++++++++++++++++++++++++++++++++++++
 src/Template/Layout/default.ctp |  2 +-
 4 files changed, 92 insertions(+), 3 deletions(-)

diff --git a/README-LABINVENT.md b/README-LABINVENT.md
index 3363c31..b31cf8b 100755
--- a/README-LABINVENT.md
+++ b/README-LABINVENT.md
@@ -51,11 +51,12 @@ Logiciel testé et validé sur les configurations suivantes :
 VERSION ACTUELLE
 
 Date: 01/06/2016
-Version: 2.4.2.0		
+Version: 2.4.2.1		
 
 Implémentation de la gestion des ACL, tests, bugfixes...
+Affichage erreur CakePHP en mode debug de l'application (app.php)
 
-Demande (terminée): https://projects.irap.omp.eu/issues/3689
+Demande (terminée): https://projects.irap.omp.eu/issues/3735
 
 Demande (en cours): https://projects.irap.omp.eu/issues/3526
 					https://projects.irap.omp.eu/issues/3605
diff --git a/src/Template/Error/error400.ctp b/src/Template/Error/error400.ctp
index 0a8bd85..98fe16b 100755
--- a/src/Template/Error/error400.ctp
+++ b/src/Template/Error/error400.ctp
@@ -1,5 +1,47 @@
 <?php 
 use App\Controller\AppController;
+use Cake\Core\Configure;
+use Cake\Error\Debugger;
+
+if(Configure::read('debug')) {
+	$this->layout = 'dev_error';
+	
+	$this->assign('title', $message);
+	$this->assign('templateName', 'error400.ctp');
+	
+	$this->start('file');
+	?>
+	<?php if (!empty($error->queryString)) : ?>
+	    <p class="notice">
+	        <strong>SQL Query: </strong>
+	        <?= h($error->queryString) ?>
+	    </p>
+	<?php endif; ?>
+	<?php if (!empty($error->params)) : ?>
+	        <strong>SQL Query Params: </strong>
+	        <?php Debugger::dump($error->params) ?>
+	<?php endif; ?>
+	<?= $this->element('auto_table_warning') ?>
+	<?php
+	    if (extension_loaded('xdebug')):
+	        xdebug_print_function_stack();
+	    endif;
+	
+	    $this->end();
+	?>
+	<h2><?= h($message) ?></h2>
+	<p class="error">
+	    <strong><?= __d('cake', 'Error') ?>: </strong>
+	    <?= sprintf(
+	        __d('cake', 'The requested address %s was not found on this server.'),
+	        "<strong>'{$url}'</strong>"
+	    ) ?>
+	</p>
+<?php 
+}
+else {
+	
+
 $this->layout = false;
 ?>
 
@@ -121,3 +163,4 @@ if(AppController::isLabinventDebugMode()) { ?>
 
 </body>
 </html>
+<?php } ?>
diff --git a/src/Template/Error/error500.ctp b/src/Template/Error/error500.ctp
index 0a8bd85..c976235 100755
--- a/src/Template/Error/error500.ctp
+++ b/src/Template/Error/error500.ctp
@@ -1,5 +1,49 @@
 <?php 
 use App\Controller\AppController;
+use Cake\Core\Configure;
+use Cake\Error\Debugger;
+
+if(Configure::read('debug')) {
+	$this->layout = 'dev_error';
+	
+	$this->assign('title', $message);
+	$this->assign('templateName', 'error500.ctp');
+	
+	$this->start('file');
+	?>
+	<?php if (!empty($error->queryString)) : ?>
+	    <p class="notice">
+	        <strong>SQL Query: </strong>
+	        <?= h($error->queryString) ?>
+	    </p>
+	<?php endif; ?>
+	<?php if (!empty($error->params)) : ?>
+	        <strong>SQL Query Params: </strong>
+	        <?php Debugger::dump($error->params) ?>
+	<?php endif; ?>
+	<?php if ($error instanceof Error) : ?>
+	        <strong>Error in: </strong>
+	        <?= sprintf('%s, line %s', str_replace(ROOT, 'ROOT', $error->getFile()), $error->getLine()) ?>
+	<?php endif; ?>
+	<?php
+	    echo $this->element('auto_table_warning');
+	
+	    if (extension_loaded('xdebug')):
+	        xdebug_print_function_stack();
+	    endif;
+	
+	    $this->end();
+	?>
+	<h2><?= __d('cake', 'An Internal Error Has Occurred') ?></h2>
+	<p class="error">
+	    <strong><?= __d('cake', 'Error') ?>: </strong>
+	    <?php error_log('test '.$error); ?>
+	    <?= h($message) ?>
+	</p>
+<?php 
+}
+else {
+	
 $this->layout = false;
 ?>
 
@@ -121,3 +165,4 @@ if(AppController::isLabinventDebugMode()) { ?>
 
 </body>
 </html>
+<?php } ?>
\ No newline at end of file
diff --git a/src/Template/Layout/default.ctp b/src/Template/Layout/default.ctp
index c1490f6..08f1de1 100755
--- a/src/Template/Layout/default.ctp
+++ b/src/Template/Layout/default.ctp
@@ -93,7 +93,7 @@ $cakeDescription = 'Labinvent 2.0';
 					</i></td>
 					<td id="version">
 						<!-- VERSION M.m.f.b (version (M)ajeure, version (m)ineure, numero de nouvelle (f)onctionnalite, numero de (b)ugfix) -->
-						<font color="black">VERSION 2.4.2.0 (01/06/2016)</font>
+						<font color="black">VERSION 2.4.2.1 (01/06/2016)</font>
 					</td>
 				</tr>
 			</table>
--
libgit2 0.21.2