Merge branch 'issue#127' into 'master'

Merge branch Issue#127 with master

See merge request !45

ui/nG6/pi6/class.tx_nG6_pi6.php

@@ -128,45 +128,38 @@ class tx_nG6_pi6 extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
                         //Warn if mail is sent to several manager
                         $email_warn="" ;
                         $purge_email_to="";
-                        $purge_user_id_to=Array();
                         
-                        if ( count( $users_emails['manager']) >= 1 ) {
                         if ( count( $users_emails['manager']) > 1 ) {
-                               	$email_warn="Be aware that this project is associated to several managers (all received this email), please send only one answer per purge alert number.\n";
+                        	$email_warn.="Be aware that every user associated with this project received this email, please send only one answer per purge alert number.\n";
                         }
-                            $users_emails_to = array_merge($users_emails['administrator'],$users_emails['manager'],$users_emails['member']);
-                            $purge_user_id_to = array_merge($users_id['administrator'],$users_id['manager'],$users_id['member']);
                         
-                        } elseif ( count($users_emails['manager']) == 0) {
-                        
-							if( count( $users_emails['member']) >= 1){
-								$users_emails_to = array_merge($users_emails['administrator'],$users_emails['member']);
-								$purge_user_id_to=array_merge($users_id['administrator'],$users_id['member']);
-							}else{
-								$users_emails_to = $users_emails['administrator'];
-								$purge_user_id_to=array_merge($users_id['administrator']);
+                        $purge_user_id_to = array();
+                        $users_emails_to = array();
+                        if(isset($users_emails['administrator'])){
+                        	$users_emails_to = array_merge($users_emails_to, $users_emails['administrator']);
+                        	$purge_user_id_to = array_merge($purge_user_id_to, $users_id['administrator']);
                         }
-                      	  
-								  $email_warn="As this project do not have managers, administrators and members recieved this alert.\n";
-								  $email_warn.=  " - Administrator(s): ".join(', ',$users_emails['administrator']). "\n";
-								  $email_warn.=  " - Members(s): ".join(', ',$users_emails['member']). "\n";                  
-
+                        if(isset($users_emails['manager'])){
+                        	$users_emails_to = array_merge($users_emails_to,$users_emails['manager']);
+                        	$purge_user_id_to = array_merge($purge_user_id_to, $users_id['manager']);
+                        }
+                        if(isset($users_emails['member'])){
+                        	$users_emails_to = array_merge($users_emails_to, $users_emails['member']);
+                        	$purge_user_id_to = array_merge($purge_user_id_to, $users_id['member']);
                         }
                         
-						//Remove the discarded emails and ids from the lists (emails and ids).
-						foreach ( $array_emails_to_discard as $key1 => $dis_mail ){
-							if (($key = array_search($dis_mail, $users_emails_to)) !== false) {
-								unset($users_emails_to[$key]);
+                        $purge_email_to = join(', ',$users_emails_to );
                         
-								foreach ( $p[$project_id]["users"] as  $key2 => $u ){
-									if($u["email"] == $dis_mail ){
-										unset($purge_user_id_to[$key2]);
+                        $email_warn.=  "Every user associated with this project received this alert.\n";
+                        if( isset($users_emails['administrator']) && count($users_emails['administrator']) > 0 ){
+							$email_warn.=  " - Administrator(s): ".join(', ',$users_emails['administrator']). "\n";
 						}
+						if( isset($users_emails['manager']) && count($users_emails['manager']) > 0 ){
+							$email_warn.=  " - Manager(s): ".join(', ',$users_emails['manager']). "\n";
 						}
-								
+						if( isset($users_emails['member']) && count($users_emails['member']) > 0 ){
+							$email_warn.=  " - Member(s): ".join(', ',$users_emails['member']). "\n";
                         }
-						}
-						$purge_email_to = join(', ',$users_emails_to );
                         
                         //Retrieve purgeable information for email
                         $run_info=Array();