From fab41ebdf0e61b3872e7ccbfbd9265a5744e052c Mon Sep 17 00:00:00 2001
From: Michael RICOIS <mricois@scores-decisions.com>
Date: Wed, 9 May 2012 21:34:16 +0000
Subject: [PATCH] Correction pour aficher les erreurs

---
 application/controllers/EnvoiController.php | 56 ++++++++++-----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/application/controllers/EnvoiController.php b/application/controllers/EnvoiController.php
index b3f3f546..c3399b40 100644
--- a/application/controllers/EnvoiController.php
+++ b/application/controllers/EnvoiController.php
@@ -1,5 +1,5 @@
 <?php
-class EnvoiController extends Zend_Controller_Action 
+class EnvoiController extends Zend_Controller_Action
 {
 
 	public function init()
@@ -7,12 +7,12 @@ class EnvoiController extends Zend_Controller_Action
 		$this->view->headScript()->appendFile('/scripts/enrichissement.js', 'text/javascript');
 		$this->view->headLink()->appendStylesheet('/styles/enrichissement.css');
 	}
-	
+
 	/**
 	 * Enter description here ...
 	 */
 	public function indexAction(){}
-	
+
 	public function fileformAction()
 	{
 		$this->view->headScript()->appendFile('/scripts/jquery.form.js', 'text/javascript');
@@ -35,37 +35,37 @@ class EnvoiController extends Zend_Controller_Action
 			->where("actif = 'Oui'");
 		$clients = $sqlmetier->fetchAll($sql, null, Zend_Db::FETCH_OBJ);
 
-		$this->view->assign('clients', $clients);		
+		$this->view->assign('clients', $clients);
 	}
-	
+
 	public function fileuploadAction()
 	{
 		$this->_helper->layout()->disableLayout();
 		$this->_helper->viewRenderer->setNoRender(true);
-		
+
 		$request = $this->getRequest();
-		
+
 		$name = $request->getParam('ref', '');
 		$idClient = $request->getParam('client');
 		if (empty($name)) {
-			echo "Référence non définie.";			
-		} 
-		else 
+			echo "Référence non définie.";
+		}
+		else
 		{
-			$config = new Zend_Config_Ini(APPLICATION_PATH . '/configs/configuration.ini', 'path');	
+			$config = new Zend_Config_Ini(APPLICATION_PATH . '/configs/configuration.ini', 'path');
 			$path = realpath($config->data).'/validation';
 			if(!file_exists($path)) mkdir($path);
-			
+
 			if ( isset($_FILES) && count($_FILES)==1 ){
 				$n = $_FILES['fichier']['name'];
 				$s = $_FILES['fichier']['size'];
 				$tmp_name = $_FILES['fichier']['tmp_name'];
-			
+
 				$extValide = array('csv');
 				$extension = strrchr($n,'.');
 				$extension = substr($extension,1);
 				//Vérifier l'extension du fichier
-				if(!in_array($extension, $extValide)){				
+				if(!in_array($extension, $extValide)){
 					echo "Extension de fichier incorrect !";
 				} elseif (move_uploaded_file($tmp_name, $path.'/'.$idClient.'-'.$name.'.'.$extension)){
 					echo "Fichier envoyé, <a href=\"".
@@ -81,7 +81,7 @@ class EnvoiController extends Zend_Controller_Action
 			}
 		}
 	}
-	
+
 	/**
 	 * Etat de progression de l'upload du fichier
 	 */
@@ -89,8 +89,8 @@ class EnvoiController extends Zend_Controller_Action
 	{
 		$this->_helper->layout()->disableLayout();
 		$this->_helper->viewRenderer->setNoRender(true);
-		
-		$request = $this->getRequest();		
+
+		$request = $this->getRequest();
 		$key = $request->getParam('key', '');
 		if (!empty($key)) {
 			//$rep sera égal à false si la clef n'existe pas dans le cache apc
@@ -98,35 +98,35 @@ class EnvoiController extends Zend_Controller_Action
 			echo json_encode($rep);
 		}
 	}
-	
+
 	public function checkfileAction()
 	{
 		$request = $this->getRequest();
 		$file = $request->getParam('file');
-		
+
 		$config = new Zend_Config_Ini(APPLICATION_PATH . '/configs/configuration.ini', 'path');
-		
-		$pathIn = $config->data.'/validation';		
+
+		$pathIn = $config->data.'/validation';
 		$pathOut = $config->data.'/clients';
 		if(!file_exists($pathOut)) mkdir($pathOut);
-		
+
 		//Vérifier le format du fichier
 		require_once 'Scores/Enrichissement.php';
 		$data = new Enrichissement();
-	
+
 		$result = $data->checkFileEntete($pathIn.'/'.$file);
-		if ($result===FALSE) 
+		if ($result===FALSE)
 		{
 			$this->view->assign('errors',array("Impossible de lire le fichier !"));
 			//Supprimer le fichier
 			unlink($pathIn.'/'.$file);
-		} 
+		}
 		elseif (is_array($result))
 		{
-			$this->view->assign('errors',$error);	
+			$this->view->assign('errors',$result);
 			//Supprimer le fichier
 			unlink($pathIn.'/'.$file);
-		} 
+		}
 		elseif (is_int($result))
 		{
 			//Enregistrer dans la bdd
@@ -146,5 +146,5 @@ class EnvoiController extends Zend_Controller_Action
 			$this->view->assign('nb', $result);
 		}
 	}
-	
+
 }
\ No newline at end of file