Preklop na Arnes smtp na AAI instalaciji
This commit is contained in:
pero1203
parent
81c157abe0
commit
763b8defd8
@ -461,6 +461,9 @@ class SurveyAdmin
|
||||
echo '<div id="vrednost_edit" class="divPopUp"></div>';
|
||||
|
||||
|
||||
// Generičen popup
|
||||
echo '<div id="popup_note" class="divPopUp"></div>';
|
||||
|
||||
// urejanje calculation-ov
|
||||
echo '<div id="calculation" class="divPopUp"></div>';
|
||||
|
||||
|
||||
@ -315,6 +315,8 @@ class SurveyInvitationsNew {
|
||||
$this->setNoEmailing();
|
||||
} else if ($action == 'set_noEmailing_type') {
|
||||
$this->setNoEmailingType();
|
||||
} else if ($action == 'showAAISmtpPopup') {
|
||||
$this->showAAISmtpPopup();
|
||||
} else {
|
||||
$sql = sisplet_query("SELECT EXISTS (SELECT 1 FROM srv_invitations_archive WHERE ank_id='".$this->sid."')");
|
||||
$row = mysqli_fetch_array($sql);
|
||||
@ -9864,10 +9866,12 @@ class SurveyInvitationsNew {
|
||||
function viewServerSettings(){
|
||||
global $lang;
|
||||
global $site_url;
|
||||
global $site_url;
|
||||
global $site_path;
|
||||
global $admin_type;
|
||||
global $global_user_id;
|
||||
global $mysql_database_name;
|
||||
global $aai_instalacija;
|
||||
|
||||
$row = SurveyInfo::getInstance()->getSurveyRow();
|
||||
|
||||
@ -9879,25 +9883,40 @@ class SurveyInvitationsNew {
|
||||
$MA = new MailAdapter($this->sid, $type='invitation');
|
||||
|
||||
// Dostop za posiljanje mailov preko 1ka serverja
|
||||
$enabled1ka = ( $MA->is1KA() || (($admin_type == 0) && ($mysql_database_name == 'www1kasi' || $mysql_database_name == 'test1kasi' || $mysql_database_name == 'real1kasi' || $mysql_database_name == '1kaarnessi')) ) ? true : false;
|
||||
$enabled1ka = $MA->is1KA() ? true : false;
|
||||
|
||||
// Admini na testu, www in virtualkah imajo 1ka smtp
|
||||
if(($admin_type == 0) && ($mysql_database_name == 'www1kasi' || $mysql_database_name == 'test1kasi' || $mysql_database_name == 'real1kasi'))
|
||||
$enabled1ka = true;
|
||||
|
||||
// Opozorilo, ce imamo vklopljena vabila, da gre za iste nastavitve
|
||||
echo '<p class="red bold">'.$lang['srv_email_server_settings_warning'].'</p>';
|
||||
|
||||
// Izbira SMTP streznika
|
||||
echo '<span class="bold">'.$lang['srv_email_setting_select_server'].'</span> ';
|
||||
|
||||
// AAI ima Arnesov smtp
|
||||
if($aai_instalacija){
|
||||
echo '<label><input type="radio" name="SMTPMailMode" value="0" '.($MA->is1KA() ? 'checked ="checked" ' : '').' onclick="smtpAAIPopupShow();">';
|
||||
echo $lang['srv_email_setting_adapter0_aai']. ' </label>';
|
||||
}
|
||||
else{
|
||||
echo '<label><input type="radio" name="SMTPMailMode" value="0" '.($MA->is1KA() ? 'checked ="checked" ' : '').' '.($enabled1ka ? '' : ' disabled="disabled"').' onclick="$(\'#send_mail_mode1, #send_mail_mode2\').hide();$(\'#send_mail_mode0\').show();">';
|
||||
echo $lang['srv_email_setting_adapter0']. ' </label>';
|
||||
}
|
||||
|
||||
// Google smtp je viden samo starim, kjer je ze vklopljen
|
||||
if($MA->isGoogle()){
|
||||
echo '<label><input type="radio" name="SMTPMailMode" value="1" '.($MA->isGoogle() ? 'checked ="checked" ' : '').' onclick="$(\'#send_mail_mode0, #send_mail_mode2\').hide(); $(\'#send_mail_mode1\').show();">';
|
||||
echo $lang['srv_email_setting_adapter1'].' </label>';
|
||||
}
|
||||
|
||||
// Lastni smtp
|
||||
echo '<label><input type="radio" name="SMTPMailMode" value="2" '.($MA->isSMTP() ? 'checked ="checked" ' : '').' onclick="$(\'#send_mail_mode0, #send_mail_mode1\').hide(); $(\'#send_mail_mode2\').show();">';
|
||||
echo $lang['srv_email_setting_adapter2'].' </label>';
|
||||
|
||||
echo Help :: display('srv_mail_mode');
|
||||
|
||||
|
||||
|
||||
#1KA
|
||||
$enkaSettings = $MA->get1KASettings($raziskave=true);
|
||||
echo '<div id="send_mail_mode0" '.(!$MA->is1KA() ? ' class="displayNone"' : '').'>';
|
||||
@ -10053,4 +10072,26 @@ class SurveyInvitationsNew {
|
||||
SurveySession::set('inv_noEmailing_type', (int)$_POST['value']);
|
||||
}
|
||||
}
|
||||
|
||||
// Prikazemo popup za vklop arnes smtp-ja na aai
|
||||
private function showAAISmtpPopup(){
|
||||
global $lang;
|
||||
|
||||
|
||||
echo '<div class="popup_close"><a href="#" onClick="quick_title_edit_cancel(); return false;">✕</a></div>';
|
||||
|
||||
echo '<h2>'.$lang['srv_email_setting_adapter0_aai_title'].'</h2>';
|
||||
|
||||
echo '<div class="popup_content">';
|
||||
echo $lang['srv_email_setting_adapter0_aai_popup'];
|
||||
echo '<br /><br />';
|
||||
echo '<input type="checkbox" id="aai_smtp_checkbox" name="aai_smtp_checkbox" class="pointer" onClick="smtpAAIAccept();">';
|
||||
echo ' <label for="aai_smtp_checkbox"><b>'.$lang['srv_email_setting_adapter0_aai_popup2'].'</b></label>';
|
||||
echo '</div>';
|
||||
|
||||
echo '<div class="buttons_holder">';
|
||||
echo '<span class="buttonwrapper floatRight spaceLeft" id="aai_smtp_button" style="display:none;" title="'.$lang['srv_save_profile_yes'].'"><a class="ovalbutton ovalbutton_orange" href="#" onClick="smtpAAISet(); return false;"><span>'.$lang['srv_save_profile_yes'].'</span></a></span>';
|
||||
echo '<span class="buttonwrapper floatRight" title="'.$lang['srv_cancel'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="smtpAAIPopupClose(); return false;"><span>'.$lang['srv_cancel'].'</span></a></span>';
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
@ -1709,3 +1709,39 @@ function noEmailingType(value){
|
||||
|
||||
$.post('ajax.php?t=invitations&a=set_noEmailing_type', {anketa:srv_meta_anketa_id, value:value});
|
||||
}
|
||||
|
||||
|
||||
// AAI - popup pri vklopu ARNES smtp streznika pri vabilih
|
||||
function smtpAAIPopupShow(){
|
||||
|
||||
$('#fade').fadeTo('slow', 1);
|
||||
$('#popup_note').html('').fadeIn('slow');
|
||||
$("#popup_note").load('ajax.php?t=invitations&a=showAAISmtpPopup', {anketa: srv_meta_anketa_id, noNavi:'true'});
|
||||
}
|
||||
function smtpAAIPopupClose(){
|
||||
|
||||
// Ni sprejel - vrnemo radio
|
||||
$('input[name=SMTPMailMode][value=2]').prop('checked', true);
|
||||
|
||||
$('#popup_note').fadeOut('slow').html('');
|
||||
$('#fade').fadeOut('slow');
|
||||
}
|
||||
function smtpAAISet(){
|
||||
|
||||
// Shranimo formo
|
||||
$("form[name='settingsanketa_"+srv_meta_anketa_id+"']").submit();
|
||||
|
||||
// Prikazemo nastavitve za Arnes smtp
|
||||
/*$('#send_mail_mode1, #send_mail_mode2').hide();
|
||||
$('#send_mail_mode0').show();
|
||||
|
||||
// Zapremo popup
|
||||
smtpAAIPopupClose();*/
|
||||
}
|
||||
function smtpAAIAccept(){
|
||||
|
||||
if($('#aai_smtp_checkbox').is(':checked'))
|
||||
$('#aai_smtp_button').show();
|
||||
else
|
||||
$('#aai_smtp_button').hide();
|
||||
}
|
||||
|
||||
@ -6398,6 +6398,10 @@ $lang = array (
|
||||
'srv_aapor' => 'AAPOR kalkulacije',
|
||||
'srv_languages_statistics' => 'Statistika jezikov',
|
||||
'srv_email_setting_adapter0' => '1KA privzeto',
|
||||
'srv_email_setting_adapter0_aai' => '1KA ARNES',
|
||||
'srv_email_setting_adapter0_aai_title' => 'Soglasje za uporabo Arnes SMTP',
|
||||
'srv_email_setting_adapter0_aai_popup' => 'V primeru uporabe 1KA sistema vabil in pošiljanja vabil iz elektronskega naslova 1ka@guest.arnes.si, prosimo, da upoštevate pogoje uporabe orodja 1KA glede pošiljanja email vabil in označite, ali se strinjate s spodnjo izjavo.',
|
||||
'srv_email_setting_adapter0_aai_popup2' => 'Izjavljam, da imam eksplicitno soglasje prejemnikov ali pravno podlago za pošiljanje e-mail vabil (podpora uporabnikom, zadovoljstvo zaposlenih ali študentov ipd.).',
|
||||
'srv_email_setting_adapter1' => 'Google',
|
||||
'srv_email_setting_adapter2' => 'Lasten strežnik',
|
||||
'srv_email_setting_adapter1_note' => 'Uporabniško geslo pridobite v nastavitvah zasebnosti v vašem Gmail računu pod<br />\'Prijava in varnost\' – \'Gesla za aplikacije\'. <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/posiljanje-emailov-preko-smtp-email-sistema-1ka-na-strezniku-uporabnika-oziroma?from1ka=1" target="_blank">Več >></a>',
|
||||
|
||||
@ -6281,6 +6281,10 @@ $lang = array (
|
||||
'srv_aapor' => 'AAPOR calculations',
|
||||
'srv_languages_statistics' => 'Languages statistics',
|
||||
'srv_email_setting_adapter0' => '1KA default',
|
||||
'srv_email_setting_adapter0_aai' => '1KA ARNES',
|
||||
'srv_email_setting_adapter0_aai_title' => 'Arnes SMTP agreement',
|
||||
'srv_email_setting_adapter0_aai_popup' => 'In case of using the 1KA email invitations and sending invitations from the e-mail address 1ka@guest.arnes.si, please follow the conditions of using the 1KA tool regarding sending email invitations and indicate whether you agree with the statement below.',
|
||||
'srv_email_setting_adapter0_aai_popup2' => 'I declare that I have the explicit consent of the recipients or the legal basis for sending e-mail invitations (customer support, employee or student satisfaction, etc.).',
|
||||
'srv_email_setting_adapter1' => 'Google - GMail',
|
||||
'srv_email_setting_adapter1_note' => 'Uporabniško geslo pridobite v nastavitvah zasebnosti v vašem Gmail računu pod<br />\'Prijava in varnost\' – \'Gesla za aplikacije\'. <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/posiljanje-emailov-preko-smtp-email-sistema-1ka-na-strezniku-uporabnika-oziroma?from1ka=1" target="_blank">Več >></a>',
|
||||
'srv_email_setting_adapter2' => 'Own SMTP settings',
|
||||
|
||||
@ -8271,6 +8271,16 @@ span.faicon.inv_unsubscribed_1::before {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
/* Generic popup */
|
||||
#popup_note {
|
||||
display: none;
|
||||
max-width: 600px !important;
|
||||
}
|
||||
#popup_note .popup_content {
|
||||
margin-bottom: 40px;
|
||||
line-height: 24px;
|
||||
}
|
||||
|
||||
#clipboard {
|
||||
position: fixed;
|
||||
top: 10px;
|
||||
@ -28165,21 +28175,6 @@ and open the template in the editor.
|
||||
#branching ul.first {
|
||||
margin: 0px 40px 40px -30px;
|
||||
}
|
||||
|
||||
/*#branching.branching_glasovanje {
|
||||
max-width: 810px;
|
||||
}
|
||||
|
||||
#toolbox_library {
|
||||
right: 30px;
|
||||
}
|
||||
|
||||
#quick_settings_holder {
|
||||
right: 30px;
|
||||
}
|
||||
#quick_settings_holder.glas_quick_settings {
|
||||
right: 30px;
|
||||
}*/
|
||||
}
|
||||
@media screen and (-webkit-min-device-pixel-ratio: 0) {
|
||||
.tabnavigation1 {
|
||||
@ -28195,56 +28190,6 @@ and open the template in the editor.
|
||||
left: 1162px;
|
||||
}
|
||||
}
|
||||
/*
|
||||
@media all and (min-width: 1500px) {
|
||||
#branching.branching_glasovanje {
|
||||
max-width: 800px;
|
||||
}
|
||||
#toolbox_library {
|
||||
right: 30px;
|
||||
}
|
||||
|
||||
#quick_settings_holder {
|
||||
right: 30px;
|
||||
}
|
||||
#quick_settings_holder.glas_quick_settings {
|
||||
right: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
@media all and (min-width: 1580px) {
|
||||
#toolbox_library {
|
||||
right: 30px;
|
||||
}
|
||||
|
||||
#quick_settings_holder {
|
||||
right: auto;
|
||||
left: 1180px;
|
||||
}
|
||||
#quick_settings_holder.glas_quick_settings {
|
||||
right: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
@media all and (min-width: 1618px) {
|
||||
#branching.branching_glasovanje {
|
||||
max-width: 815px;
|
||||
}
|
||||
|
||||
#toolbox_library {
|
||||
right: auto;
|
||||
left: 1180px;
|
||||
}
|
||||
|
||||
#quick_settings_holder {
|
||||
right: auto;
|
||||
left: 1182px;
|
||||
}
|
||||
#quick_settings_holder.glas_quick_settings {
|
||||
right: auto;
|
||||
left: 1182px;
|
||||
}
|
||||
}*/
|
||||
@media print {
|
||||
.no-print {
|
||||
display: none !important;
|
||||
|
||||
@ -194,6 +194,16 @@
|
||||
}
|
||||
}
|
||||
|
||||
/* Generic popup */
|
||||
#popup_note {
|
||||
display: none;
|
||||
max-width: 600px !important;
|
||||
|
||||
.popup_content{
|
||||
margin-bottom: 40px;
|
||||
line-height: 24px;
|
||||
}
|
||||
}
|
||||
|
||||
#clipboard {
|
||||
position: fixed;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user