Commit 7dfbdfa5 authored by Romain Therville's avatar Romain Therville 🐭
Browse files

Merge branch 'issue#127' into 'master'

Merge branch Issue#127 with master

See merge request !45
parents 126a821e c1b80fa2
...@@ -121,53 +121,46 @@ class tx_nG6_pi6 extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin { ...@@ -121,53 +121,46 @@ class tx_nG6_pi6 extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
$users_id[$u["right_level_label"]]=Array(); $users_id[$u["right_level_label"]]=Array();
$users_emails[$u["right_level_label"]]=Array(); $users_emails[$u["right_level_label"]]=Array();
} }
$users_id[$u["right_level_label"]][] = $u["user_id"]; $users_id[$u["right_level_label"]][] = $u["user_id"];
$users_emails[$u["right_level_label"]][] = $u["email"]; $users_emails[$u["right_level_label"]][] = $u["email"];
} }
//Warn if mail is sent to several manager //Warn if mail is sent to several manager
$email_warn="" ; $email_warn="" ;
$purge_email_to=""; $purge_email_to="";
$purge_user_id_to=Array();
if ( count( $users_emails['manager']) >= 1 ) { if ( count( $users_emails['manager']) > 1 ) {
if ( count( $users_emails['manager']) > 1 ) { $email_warn.="Be aware that every user associated with this project received this email, please send only one answer per purge alert number.\n";
$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"; }
}
$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){ $purge_user_id_to = array();
$users_emails_to = array_merge($users_emails['administrator'],$users_emails['member']); $users_emails_to = array();
$purge_user_id_to=array_merge($users_id['administrator'],$users_id['member']); if(isset($users_emails['administrator'])){
}else{ $users_emails_to = array_merge($users_emails_to, $users_emails['administrator']);
$users_emails_to = $users_emails['administrator']; $purge_user_id_to = array_merge($purge_user_id_to, $users_id['administrator']);
$purge_user_id_to=array_merge($users_id['administrator']); }
} if(isset($users_emails['manager'])){
$users_emails_to = array_merge($users_emails_to,$users_emails['manager']);
$email_warn="As this project do not have managers, administrators and members recieved this alert.\n"; $purge_user_id_to = array_merge($purge_user_id_to, $users_id['manager']);
$email_warn.= " - Administrator(s): ".join(', ',$users_emails['administrator']). "\n"; }
$email_warn.= " - Members(s): ".join(', ',$users_emails['member']). "\n"; 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']);
}
$purge_email_to = join(', ',$users_emails_to );
$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 ){
//Remove the discarded emails and ids from the lists (emails and ids). $email_warn.= " - Manager(s): ".join(', ',$users_emails['manager']). "\n";
foreach ( $array_emails_to_discard as $key1 => $dis_mail ){
if (($key = array_search($dis_mail, $users_emails_to)) !== false) {
unset($users_emails_to[$key]);
foreach ( $p[$project_id]["users"] as $key2 => $u ){
if($u["email"] == $dis_mail ){
unset($purge_user_id_to[$key2]);
}
}
}
} }
$purge_email_to = join(', ',$users_emails_to ); if( isset($users_emails['member']) && count($users_emails['member']) > 0 ){
$email_warn.= " - Member(s): ".join(', ',$users_emails['member']). "\n";
}
//Retrieve purgeable information for email //Retrieve purgeable information for email
$run_info=Array(); $run_info=Array();
$analyses_info=Array(); $analyses_info=Array();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment