diff --git a/admin/survey/classes/class.SurveyInvitationsNew.php b/admin/survey/classes/class.SurveyInvitationsNew.php index fc425a41e..2abe389e7 100644 --- a/admin/survey/classes/class.SurveyInvitationsNew.php +++ b/admin/survey/classes/class.SurveyInvitationsNew.php @@ -4401,21 +4401,21 @@ class SurveyInvitationsNew { echo $msg; - /*echo '
'; - echo $lang['srv_invitation_note11'].''.$lang['srv_invitation_note11_link'].'';*/ - echo '
'; echo '
'.$lang['srv_inv_nav_email_status'].'
'; } function uploadRecipients() { - global $lang; + global $lang; + $errors = array(); $allowedExtensions = array("txt","csv","dat"); - $_fields = trim($_POST['fields']); + + $_fields = trim($_POST['fields']); if ($_fields != null && $_fields != '') { $fields = explode(',',$_fields); - } else { + } + else { $fields = array(); } @@ -4451,17 +4451,22 @@ class SurveyInvitationsNew { # če so napake jih prikažemo če ne obdelamo datoteko if (count($errors) > 0) { + echo '
'; + + echo ''.$lang['srv_inv_recipiens_upload_error'].''; + echo '
'; - echo ''.$lang['srv_inv_recipiens_upload_error'].''; - echo '
'; - echo '
'; + echo '
'; + echo ''; - foreach($errors as $error) { + foreach($errors as $error) { echo '* '.$error.'
'; } - echo '
'; + echo ''; + $this->addRecipientsView($fields, $invalid_recipiens_array); - } else { + } + else { $fh = @fopen($file_tmp, "rb"); if ($fh) { @@ -4473,10 +4478,13 @@ class SurveyInvitationsNew { // Vejica NI kul, ker se uporablja pri nazivih in v custom poljih Za interni delimiter naj bo recimo " | "... $recipients_list = str_replace ($_POST['recipientsDelimiter'], "|~|", $recipients_list); - #dodamo polja - $result = $this->addMassRecipients($recipients_list, $fields); + // Dodamo polja + $result = $this->addMassRecipients($recipients_list, $fields); + + // Shranimo v seznam + $pid = $this->saveAppendRecipientList($pid=0, $fields, $recipients_list, $profileName='', $profileComment=''); - # prikažemo napake + // Prikažemo napake $invalid_recipiens_array = $this->displayRecipentsErrors($result); $this->addRecipientsView($fields, $invalid_recipiens_array);