Commit 3cc437b8 authored by David Surville's avatar David Surville
Browse files

Traitement des cas où les filtres ne sont pas existants lors du renommage...

Traitement des cas où les filtres ne sont pas existants lors du renommage d'une adresse fonctionnelle
parent d8e2c8b9
Loading
Loading
Loading
Loading
+20 −8
Changes for src/UnicaenZimbra/Processus/BoiteGenerique.php: 20 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -154,12 +154,14 @@ class BoiteGenerique extends Processus
	$distribListService->addMembers($distribList, $mail);
	
	// Répertoires
	$folderService->rename($folderService->get($afName.' | Réception'), $afNewName.' | Réception');
        $folderService->rename($folderService->get($afName.' | Envoi'),	    $afNewName.' | Envoi');
	$inputFolder = $folderService->rename($folderService->get($afName.' | Réception'),  $afNewName.' | Réception');
        $sentFolder  = $folderService->rename($folderService->get($afName.' | Envoi'),	    $afNewName.' | Envoi');
	
	// Filtre entrant
	$filter = $filterService->getInput()[$afName.' | Réception'];
	$filter->setName($afNewName.' | Réception');
	$filter = new Filter;
//	$filter = $filterService->getInput()[$afName.' | Réception'];
	$filter->setName($afNewName.' | Réception')
	       ->setCondition($filter::CONDITION_ANYOF);
	$test1 = new FilterTestAddress();
        $test1->setHeader('to,cc')->setStringComparison('contains')->setPart('all')
	      ->setValue($newName);
@@ -168,6 +170,11 @@ class BoiteGenerique extends Processus
	      ->setValue($newName);
        $filter->setTests(array($test1, $test2));
	
	$action = new FilterActionFileInto;
        $action->setFolderPath( $afNewName.' | Réception' );
        $filter->addAction($action);
        $filter->addAction( new FilterActionKeep );
	
	$filterService->deleteInput($afName.' | Réception');
	$filterService->createInput($filter);
	
@@ -276,7 +283,7 @@ class BoiteGenerique extends Processus
        $filter->addTest($test);

        $action = new FilterActionFileInto;
        $action->setFolderPath( $afName.' | Envoi' );
        $action->setFolderPath( $sentFolder->absFolderPath );
        $filter->addAction($action);
        $filterService->createOutput($filter);
	
@@ -380,17 +387,22 @@ class BoiteGenerique extends Processus
        $identityService->setAccount($userAccount);
	
	// Répertoires
	$folderService->rename($folderService->get($afName.' | Réception'), $afNewName.' | Réception');
        $folderService->rename($folderService->get($afName.' | Envoi'),	    $afNewName.' | Envoi');
	$inputFolder = $folderService->rename($inputFolder = $folderService->get($afName.' | Réception'),   $afNewName.' | Réception');
        $sentFolder  = $folderService->rename($sentFolder  = $folderService->get($afName.' | Envoi'),	    $afNewName.' | Envoi');

	// Filtre sortant
	$filter = $filterService->getOutput()[$afName.' | Envoi'];
	$filter = new Filter;
//	$filter = $filterService->getOutput()[$afName.' | Envoi'];
	$filter->setName($afNewName.' | Envoi');
	$test = new FilterTestAddress();
	$test->setHeader('from')->setStringComparison('contains')->setPart('all')
	     ->setValue($newName);
        $filter->setTests(array($test));
	
	$action = new FilterActionFileInto;
        $action->setFolderPath( $afNewName.' | Envoi' );
        $filter->addAction($action);
	
	$filterService->deleteOutput($afName.' | Envoi');
	$filterService->createOutput($filter);