Merge branch 'master' of https://bitbucket.org/1ka/1ka
This commit is contained in:
commit
e2c9892d29
@ -9896,7 +9896,7 @@ class SurveyInvitationsNew {
|
|||||||
echo '<span class="bold">'.$lang['srv_email_setting_select_server'].'</span> ';
|
echo '<span class="bold">'.$lang['srv_email_setting_select_server'].'</span> ';
|
||||||
|
|
||||||
// AAI ima Arnesov smtp
|
// AAI ima Arnesov smtp
|
||||||
if(true || $aai_instalacija){
|
if($aai_instalacija){
|
||||||
echo '<label><input type="radio" name="SMTPMailMode" value="0" '.($MA->is1KA() ? 'checked ="checked" ' : '').' onclick="smtpAAIPopupShow();">';
|
echo '<label><input type="radio" name="SMTPMailMode" value="0" '.($MA->is1KA() ? 'checked ="checked" ' : '').' onclick="smtpAAIPopupShow();">';
|
||||||
echo $lang['srv_email_setting_adapter0_aai']. ' </label>';
|
echo $lang['srv_email_setting_adapter0_aai']. ' </label>';
|
||||||
}
|
}
|
||||||
|
@ -60,7 +60,7 @@ class SurveyTeamMeter{
|
|||||||
// DANSCINA
|
// DANSCINA
|
||||||
if(isset($_GET['lang_id']) && $_GET['lang_id'] == '29'){
|
if(isset($_GET['lang_id']) && $_GET['lang_id'] == '29'){
|
||||||
$this->execute_params['script_name'] = 'Evoli_quality_clime_dan.R';
|
$this->execute_params['script_name'] = 'Evoli_quality_clime_dan.R';
|
||||||
$this->execute_params['pdf_name'] = 'Quality-climate-dan';
|
$this->execute_params['pdf_name'] = 'Kvalitetsklima.pdf';
|
||||||
}
|
}
|
||||||
// SLOVENSCINA
|
// SLOVENSCINA
|
||||||
elseif(isset($_GET['lang_id']) && $_GET['lang_id'] == '1'){
|
elseif(isset($_GET['lang_id']) && $_GET['lang_id'] == '1'){
|
||||||
|
Loading…
x
Reference in New Issue
Block a user