Regression from trunk

This commit is contained in:
Michael RICOIS 2013-04-25 12:15:18 +00:00
parent 95ba6b7d80
commit e195cb959d
2 changed files with 2 additions and 2 deletions

View File

@ -102,7 +102,7 @@ class FichierController extends Zend_Controller_Action
'/greffes/bilans/'.$matches[1].'/'.substr($matches[2],0,4).'/';
}
//acte
else if (preg_match('/^acte-[0-9]{9}-(.*)-([0-9]{8})-/', $file, $matches)) {
else if (preg_match('/^acte-[0-9]{9}-(.*)-([0-9]{8})-.*-.*-.*-.*-.*-.*$/', $file, $matches)) {
$type = $matches[1];
$date = $matches[2];
$annee = substr($date,0,4);

View File

@ -726,7 +726,7 @@ class FinanceController extends Zend_Controller_Action
//Vérifier que l'extension du fichier est bien correcte
$extValide = array('pdf', 'tiff');
$extension = strrchr($n,'.');
$extension = substr($extension,1);
$extension = strtolower(substr($extension,1));
if ( in_array($extension, $extValide) ){
//Lecture dans la bdd des informations
$infos = $bilanSaisie->getInfosBilan($ref);