From f75d0ba5d50ff9fe8e75f0310dc5e0486bf3520f Mon Sep 17 00:00:00 2001
From: Michael RICOIS <mricois@scores-decisions.com>
Date: Tue, 14 Feb 2012 11:15:59 +0000
Subject: [PATCH] Fichier des PDFs dans les commentaires

---
 application/controllers/FichierController.php |  25 ------------------
 library/Scores/RapportComment.php             |   6 ++---
 .../commentaires/161-Ccom stat proc coll.pdf  | Bin
 .../commentaires/165b-Ccom Sauvegarde.pdf     | Bin
 .../commentaires/167b-Ccom Redr Jud.pdf       | Bin
 .../commentaires/169-Ccom AncienRjLj.pdf      | Bin
 .../169-Liquidation Judiciaire.pdf            | Bin
 .../commentaires/169xb-Ccom rjljrecours.pdf   | Bin
 .../rouerelance}/docs/_notes/dwsync.xml       |   0
 .../docs/assurance-credit-cap.pdf             | Bin
 .../docs/ccsf-codefi-ciri-credit-impot.pdf    | Bin
 .../rouerelance}/docs/ccsf-codefi-ciri.pdf    | Bin
 .../commentaires/rouerelance}/docs/ccsf.pdf   | Bin
 .../rouerelance}/docs/chomage.pdf             | Bin
 .../docs/circulaire-23mars2009.pdf            | Bin
 .../docs/circulaire-27aout2009.pdf            | Bin
 .../rouerelance}/docs/codefi-ciri.pdf         | Bin
 .../rouerelance}/docs/factor-oseo.pdf         | Bin
 .../rouerelance}/docs/lease-back.pdf          | Bin
 .../rouerelance}/docs/loi-sauvegarde.pdf      | Bin
 .../rouerelance}/docs/mandat-ad-hoc.pdf       | Bin
 .../rouerelance}/docs/mediation-du-credit.pdf | Bin
 .../oseo-garantie-innovation-financement.pdf  | Bin
 .../rouerelance}/docs/oseo-innovation.pdf     | Bin
 .../rouerelance}/docs/oseo-soutien.pdf        | Bin
 .../rouerelance}/docs/plan-moratorie.pdf      | Bin
 .../docs/reduction-frais-generaux.pdf         | Bin
 .../rouerelance}/docs/relance.pdf             | Bin
 .../docs/renforcement-fonds-propres.pdf       | Bin
 .../rouerelance}/passeport-de-la-relance.htm  |  18 +++----------
 .../rouerelance}/roue-relance.swf             | Bin
 31 files changed, 6 insertions(+), 43 deletions(-)
 rename {cache => public}/commentaires/161-Ccom stat proc coll.pdf (100%)
 rename {cache => public}/commentaires/165b-Ccom Sauvegarde.pdf (100%)
 rename {cache => public}/commentaires/167b-Ccom Redr Jud.pdf (100%)
 rename {cache => public}/commentaires/169-Ccom AncienRjLj.pdf (100%)
 rename {cache => public}/commentaires/169-Liquidation Judiciaire.pdf (100%)
 rename {cache => public}/commentaires/169xb-Ccom rjljrecours.pdf (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/docs/_notes/dwsync.xml (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/docs/assurance-credit-cap.pdf (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/docs/ccsf-codefi-ciri-credit-impot.pdf (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/docs/ccsf-codefi-ciri.pdf (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/docs/ccsf.pdf (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/docs/chomage.pdf (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/docs/circulaire-23mars2009.pdf (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/docs/circulaire-27aout2009.pdf (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/docs/codefi-ciri.pdf (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/docs/factor-oseo.pdf (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/docs/lease-back.pdf (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/docs/loi-sauvegarde.pdf (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/docs/mandat-ad-hoc.pdf (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/docs/mediation-du-credit.pdf (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/docs/oseo-garantie-innovation-financement.pdf (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/docs/oseo-innovation.pdf (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/docs/oseo-soutien.pdf (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/docs/plan-moratorie.pdf (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/docs/reduction-frais-generaux.pdf (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/docs/relance.pdf (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/docs/renforcement-fonds-propres.pdf (100%)
 rename {cache/commentaires => public/commentaires/rouerelance}/passeport-de-la-relance.htm (78%)
 rename {cache/commentaires => public/commentaires/rouerelance}/roue-relance.swf (100%)

diff --git a/application/controllers/FichierController.php b/application/controllers/FichierController.php
index df1bc949a..c8ff024f1 100644
--- a/application/controllers/FichierController.php
+++ b/application/controllers/FichierController.php
@@ -284,29 +284,4 @@ class FichierController extends Zend_Controller_Action
 			echo "Impossible de charger le fichier.";
 		}
 	}
-	
-	/**
-	* Gestion des fichiers Actes et Bilans
-	*/
-	public function commentairesAction()
-	{
-		$directory = APPLICATION_PATH.'/../cache/commentaires';
-		$file = $this->getRequest()->getParam('fichier');
-		$output_file = $directory.'/'.$file;
-		if (file_exists($output_file) && filesize($output_file)>0) {
-			$content_type = 'application/pdf';
-			header('Content-type: '.$content_type.'');
-			header('Content-Length: '.filesize($output_file));
-			header('Content-MD5: '.base64_encode(md5_file($output_file)));
-			header('Content-Disposition: inline; filename="'.basename($output_file).'"');
-			header('Cache-Control: private, max-age=0, must-revalidate');
-			header('Pragma: public');
-			ini_set('zlib.output_compression','0');
-			echo file_get_contents($output_file);
-		} else {
-			echo "Erreur lors de l'affichage du fichier.";
-		}
-	}
-	
-	
 }
\ No newline at end of file
diff --git a/library/Scores/RapportComment.php b/library/Scores/RapportComment.php
index 1ad4cc2bc..8545e3a6f 100644
--- a/library/Scores/RapportComment.php
+++ b/library/Scores/RapportComment.php
@@ -214,8 +214,8 @@ class RapportComment
 	protected function lien($content)
 	{
 		$path = array(
-			'pdf' => '/fichier/commentaires',
-			'html' => '',
+			'pdf' => '/commentaires',
+			'html' => '/commentaires',
 		);
 		$pattern = "/<lien='(.*?).(pdf|html|htm)'>(.*?)<\/lien>/i";
 		preg_match($pattern, $content, $matches);
@@ -233,7 +233,7 @@ class RapportComment
 				case 'html':
 					$content = str_replace(
 						$matches[0],
-						"<a href='".$path['html'].$matches[1].".".
+						"<a href='".$path['html']."/".$matches[1].".".
 							$matches[2]."' target='_blank'>".
 							$matches[3]."</a>",
 						$content);
diff --git a/cache/commentaires/161-Ccom stat proc coll.pdf b/public/commentaires/161-Ccom stat proc coll.pdf
similarity index 100%
rename from cache/commentaires/161-Ccom stat proc coll.pdf
rename to public/commentaires/161-Ccom stat proc coll.pdf
diff --git a/cache/commentaires/165b-Ccom Sauvegarde.pdf b/public/commentaires/165b-Ccom Sauvegarde.pdf
similarity index 100%
rename from cache/commentaires/165b-Ccom Sauvegarde.pdf
rename to public/commentaires/165b-Ccom Sauvegarde.pdf
diff --git a/cache/commentaires/167b-Ccom Redr Jud.pdf b/public/commentaires/167b-Ccom Redr Jud.pdf
similarity index 100%
rename from cache/commentaires/167b-Ccom Redr Jud.pdf
rename to public/commentaires/167b-Ccom Redr Jud.pdf
diff --git a/cache/commentaires/169-Ccom AncienRjLj.pdf b/public/commentaires/169-Ccom AncienRjLj.pdf
similarity index 100%
rename from cache/commentaires/169-Ccom AncienRjLj.pdf
rename to public/commentaires/169-Ccom AncienRjLj.pdf
diff --git a/cache/commentaires/169-Liquidation Judiciaire.pdf b/public/commentaires/169-Liquidation Judiciaire.pdf
similarity index 100%
rename from cache/commentaires/169-Liquidation Judiciaire.pdf
rename to public/commentaires/169-Liquidation Judiciaire.pdf
diff --git a/cache/commentaires/169xb-Ccom rjljrecours.pdf b/public/commentaires/169xb-Ccom rjljrecours.pdf
similarity index 100%
rename from cache/commentaires/169xb-Ccom rjljrecours.pdf
rename to public/commentaires/169xb-Ccom rjljrecours.pdf
diff --git a/cache/commentaires/docs/_notes/dwsync.xml b/public/commentaires/rouerelance/docs/_notes/dwsync.xml
similarity index 100%
rename from cache/commentaires/docs/_notes/dwsync.xml
rename to public/commentaires/rouerelance/docs/_notes/dwsync.xml
diff --git a/cache/commentaires/docs/assurance-credit-cap.pdf b/public/commentaires/rouerelance/docs/assurance-credit-cap.pdf
similarity index 100%
rename from cache/commentaires/docs/assurance-credit-cap.pdf
rename to public/commentaires/rouerelance/docs/assurance-credit-cap.pdf
diff --git a/cache/commentaires/docs/ccsf-codefi-ciri-credit-impot.pdf b/public/commentaires/rouerelance/docs/ccsf-codefi-ciri-credit-impot.pdf
similarity index 100%
rename from cache/commentaires/docs/ccsf-codefi-ciri-credit-impot.pdf
rename to public/commentaires/rouerelance/docs/ccsf-codefi-ciri-credit-impot.pdf
diff --git a/cache/commentaires/docs/ccsf-codefi-ciri.pdf b/public/commentaires/rouerelance/docs/ccsf-codefi-ciri.pdf
similarity index 100%
rename from cache/commentaires/docs/ccsf-codefi-ciri.pdf
rename to public/commentaires/rouerelance/docs/ccsf-codefi-ciri.pdf
diff --git a/cache/commentaires/docs/ccsf.pdf b/public/commentaires/rouerelance/docs/ccsf.pdf
similarity index 100%
rename from cache/commentaires/docs/ccsf.pdf
rename to public/commentaires/rouerelance/docs/ccsf.pdf
diff --git a/cache/commentaires/docs/chomage.pdf b/public/commentaires/rouerelance/docs/chomage.pdf
similarity index 100%
rename from cache/commentaires/docs/chomage.pdf
rename to public/commentaires/rouerelance/docs/chomage.pdf
diff --git a/cache/commentaires/docs/circulaire-23mars2009.pdf b/public/commentaires/rouerelance/docs/circulaire-23mars2009.pdf
similarity index 100%
rename from cache/commentaires/docs/circulaire-23mars2009.pdf
rename to public/commentaires/rouerelance/docs/circulaire-23mars2009.pdf
diff --git a/cache/commentaires/docs/circulaire-27aout2009.pdf b/public/commentaires/rouerelance/docs/circulaire-27aout2009.pdf
similarity index 100%
rename from cache/commentaires/docs/circulaire-27aout2009.pdf
rename to public/commentaires/rouerelance/docs/circulaire-27aout2009.pdf
diff --git a/cache/commentaires/docs/codefi-ciri.pdf b/public/commentaires/rouerelance/docs/codefi-ciri.pdf
similarity index 100%
rename from cache/commentaires/docs/codefi-ciri.pdf
rename to public/commentaires/rouerelance/docs/codefi-ciri.pdf
diff --git a/cache/commentaires/docs/factor-oseo.pdf b/public/commentaires/rouerelance/docs/factor-oseo.pdf
similarity index 100%
rename from cache/commentaires/docs/factor-oseo.pdf
rename to public/commentaires/rouerelance/docs/factor-oseo.pdf
diff --git a/cache/commentaires/docs/lease-back.pdf b/public/commentaires/rouerelance/docs/lease-back.pdf
similarity index 100%
rename from cache/commentaires/docs/lease-back.pdf
rename to public/commentaires/rouerelance/docs/lease-back.pdf
diff --git a/cache/commentaires/docs/loi-sauvegarde.pdf b/public/commentaires/rouerelance/docs/loi-sauvegarde.pdf
similarity index 100%
rename from cache/commentaires/docs/loi-sauvegarde.pdf
rename to public/commentaires/rouerelance/docs/loi-sauvegarde.pdf
diff --git a/cache/commentaires/docs/mandat-ad-hoc.pdf b/public/commentaires/rouerelance/docs/mandat-ad-hoc.pdf
similarity index 100%
rename from cache/commentaires/docs/mandat-ad-hoc.pdf
rename to public/commentaires/rouerelance/docs/mandat-ad-hoc.pdf
diff --git a/cache/commentaires/docs/mediation-du-credit.pdf b/public/commentaires/rouerelance/docs/mediation-du-credit.pdf
similarity index 100%
rename from cache/commentaires/docs/mediation-du-credit.pdf
rename to public/commentaires/rouerelance/docs/mediation-du-credit.pdf
diff --git a/cache/commentaires/docs/oseo-garantie-innovation-financement.pdf b/public/commentaires/rouerelance/docs/oseo-garantie-innovation-financement.pdf
similarity index 100%
rename from cache/commentaires/docs/oseo-garantie-innovation-financement.pdf
rename to public/commentaires/rouerelance/docs/oseo-garantie-innovation-financement.pdf
diff --git a/cache/commentaires/docs/oseo-innovation.pdf b/public/commentaires/rouerelance/docs/oseo-innovation.pdf
similarity index 100%
rename from cache/commentaires/docs/oseo-innovation.pdf
rename to public/commentaires/rouerelance/docs/oseo-innovation.pdf
diff --git a/cache/commentaires/docs/oseo-soutien.pdf b/public/commentaires/rouerelance/docs/oseo-soutien.pdf
similarity index 100%
rename from cache/commentaires/docs/oseo-soutien.pdf
rename to public/commentaires/rouerelance/docs/oseo-soutien.pdf
diff --git a/cache/commentaires/docs/plan-moratorie.pdf b/public/commentaires/rouerelance/docs/plan-moratorie.pdf
similarity index 100%
rename from cache/commentaires/docs/plan-moratorie.pdf
rename to public/commentaires/rouerelance/docs/plan-moratorie.pdf
diff --git a/cache/commentaires/docs/reduction-frais-generaux.pdf b/public/commentaires/rouerelance/docs/reduction-frais-generaux.pdf
similarity index 100%
rename from cache/commentaires/docs/reduction-frais-generaux.pdf
rename to public/commentaires/rouerelance/docs/reduction-frais-generaux.pdf
diff --git a/cache/commentaires/docs/relance.pdf b/public/commentaires/rouerelance/docs/relance.pdf
similarity index 100%
rename from cache/commentaires/docs/relance.pdf
rename to public/commentaires/rouerelance/docs/relance.pdf
diff --git a/cache/commentaires/docs/renforcement-fonds-propres.pdf b/public/commentaires/rouerelance/docs/renforcement-fonds-propres.pdf
similarity index 100%
rename from cache/commentaires/docs/renforcement-fonds-propres.pdf
rename to public/commentaires/rouerelance/docs/renforcement-fonds-propres.pdf
diff --git a/cache/commentaires/passeport-de-la-relance.htm b/public/commentaires/rouerelance/passeport-de-la-relance.htm
similarity index 78%
rename from cache/commentaires/passeport-de-la-relance.htm
rename to public/commentaires/rouerelance/passeport-de-la-relance.htm
index a48db61ed..6ea12047b 100644
--- a/cache/commentaires/passeport-de-la-relance.htm
+++ b/public/commentaires/rouerelance/passeport-de-la-relance.htm
@@ -5,22 +5,10 @@
 <script language="javascript" type="text/javascript">AC_FL_RunContent = 0;</script>
 <script src="http://www.comptalia.tv/swf/AC_RunActiveContent.js" language="javascript" type="text/javascript"></script>
 
-<!-- GOOGLE ANALYTICS -->
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript" >
-var pageTracker = _gat._getTracker("UA-520632-1");
-pageTracker._initData();
-pageTracker._trackPageview();
-</script>
-<!-- GOOGLE ANALYTICS -->
-
 </head>
 <body bgcolor="#cccccc" topmargin="0">
-<!--URL utilisées dans l'animation-->
-<!--texte utilisé dans l'animation-->
+<!--URL utilis�es dans l'animation-->
+<!--texte utilis� dans l'animation-->
 <!--
 _root.nomLot
 Lancer la roue
@@ -32,7 +20,7 @@ Lancer la roue
 		<td>
 			<script language="javascript">
 	if (AC_FL_RunContent == 0) {
-		alert("Cette page nécessite le fichier AC_RunActiveContent.js.");
+		alert("Cette page nécessite le fichier AC_RunActiveContent.js.");
 	} else {
 		AC_FL_RunContent( 'codebase','http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0','name','roue-relance','width','780','height','800','align','middle','id','roue-relance','src','roue-relance','quality','high','bgcolor','#999999','allowscriptaccess','sameDomain','allowfullscreen','false','pluginspage','http://www.macromedia.com/go/getflashplayer','movie','roue-relance' ); //end AC code
 	}
diff --git a/cache/commentaires/roue-relance.swf b/public/commentaires/rouerelance/roue-relance.swf
similarity index 100%
rename from cache/commentaires/roue-relance.swf
rename to public/commentaires/rouerelance/roue-relance.swf