Merge branch 'master' of https://git.1ka.si:/git/1ka
This commit is contained in:
tejagerjovic
commit
65be1f4033
@ -6815,61 +6815,6 @@ class SurveyAdminSettings {
|
||||
|
||||
}
|
||||
|
||||
function testiranje_komentarji_links($comment_count){
|
||||
global $lang;
|
||||
global $site_url;
|
||||
global $site_path;
|
||||
global $admin_type;
|
||||
global $global_user_id;
|
||||
|
||||
|
||||
if($_GET['a'] == 'komentarji_anketa'){
|
||||
|
||||
// Gumb nazaj
|
||||
echo '<div class="switch_button '.($_GET['a'] == A_KOMENTARJI ? ' active' : '').'">';
|
||||
echo '<a href="index.php?anketa=' . $this->anketa . '&a='.A_KOMENTARJI.'" title="' . $lang['srv_testiranje_komentarji_title'] . '">' . $lang['srv_q_comments_back'] . '</a>';
|
||||
echo '</div>';
|
||||
|
||||
echo '<span class="bold"> (';
|
||||
if($comment_count['question']['unresolved'] > 0)
|
||||
echo '<span class="orange">';
|
||||
echo $comment_count['question']['unresolved'];
|
||||
if($comment_count['question']['unresolved'] > 0)
|
||||
echo '</span>';
|
||||
echo '/'.$comment_count['question']['all'];
|
||||
echo ')</span>';
|
||||
}
|
||||
else{
|
||||
|
||||
echo '<span id="comment_question_note">';
|
||||
|
||||
echo $lang['srv_komentarji_imate'].' ';
|
||||
if($comment_count['question']['unresolved'] > 0) echo '<span class="red">';
|
||||
echo $this->string_format((int)$comment_count['question']['unresolved'], 'srv_cnt_komentarji');
|
||||
if($comment_count['question']['unresolved'] > 0) echo '</span>';
|
||||
|
||||
echo ' '.$lang['srv_komentarji_odskupno'].' ';
|
||||
echo $this->string_format((int)$comment_count['question']['all'], 'srv_cnt_komentar_na_vprs');
|
||||
|
||||
echo '</span>';
|
||||
|
||||
|
||||
// Gumb splosni komentarji
|
||||
echo '<div class="switch_button '.($_GET['a'] == A_KOMENTARJI_ANKETA ? ' active' : '').'">';
|
||||
echo '<a href="index.php?anketa=' . $this->anketa . '&a='.A_KOMENTARJI_ANKETA.'" title="' . $lang['srv_testiranje_komentarji_anketa_title'] . '">' . $lang['srv_testiranje_komentarji_anketa_title'] . '</a>';
|
||||
echo '</div>';
|
||||
|
||||
echo '<span class="bold"> (';
|
||||
if($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved'] > 0)
|
||||
echo '<span class="orange">';
|
||||
echo ($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved']);
|
||||
if($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved'] > 0)
|
||||
echo '</span>';
|
||||
echo '/'.($comment_count['survey_resp']['all']+$comment_count['survey_admin']['all']);
|
||||
echo ')</span>';
|
||||
}
|
||||
}
|
||||
|
||||
function string_format($cnt,$lang_root) {
|
||||
global $lang;
|
||||
|
||||
@ -6956,6 +6901,7 @@ class SurveyAdminSettings {
|
||||
$survey_comment = SurveySetting::getInstance()->getSurveyMiscSetting('survey_comment');
|
||||
$survey_comment_resp = SurveySetting::getInstance()->getSurveyMiscSetting('survey_comment_resp');
|
||||
$comment_count = $this->testiranje_komentarji_count();
|
||||
$commentmarks_who = SurveySetting::getInstance()->getSurveyMiscSetting('commentmarks_who');
|
||||
|
||||
$rowa = SurveyInfo::getInstance()->getSurveyRow();
|
||||
|
||||
@ -6970,16 +6916,6 @@ class SurveyAdminSettings {
|
||||
echo $this->string_format((int)($comment_count['survey_resp']['all']+$comment_count['survey_admin']['all']), 'srv_cnt_komentarji_survey_od');
|
||||
echo '</div>';
|
||||
|
||||
|
||||
/* - ZAČASNO ZAKOMENTIRAN TOOLTIP (prekriva vsebino za redizajn) @TG
|
||||
echo ' <span class="tooltip clr spaceLeft">';
|
||||
echo ' ('.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.') ';
|
||||
echo '<span class="expanded-tooltip bottom light" style="left: -20px;">';
|
||||
echo '<b>' . $lang['srv_survey_testdata2'] . ':</b> '.$lang['srv_testdata_text'].'';
|
||||
echo '<p>'.$lang['srv_preview_testdata_longtext'].'</p>';
|
||||
echo '<span class="arrow"></span>';
|
||||
echo '</span>'; // expanded-tooltip bottom
|
||||
echo '</span>'; // tooltip */
|
||||
|
||||
echo '<div class="testni_vnos">';
|
||||
echo '<a href="'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'" target="_blank"><span class="faicon monitor link-right"></span> '.$lang['srv_survey_testdata'].'</a>';
|
||||
@ -6998,7 +6934,8 @@ class SurveyAdminSettings {
|
||||
echo '<label for="only_unresolved">'.$lang['srv_comments_unresolved'].'</label>';
|
||||
echo '</div>';
|
||||
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
echo $lang['move_show'].': <select id="only_unresolved" name="" onchange="window.location = \'index.php?anketa='.$this->anketa.'&a=komentarji_anketa&only_unresolved=\'+$(\'#only_unresolved\').val(); " >
|
||||
<option value="0"'.($_GET['only_unresolved']==0?' selected="selected"':'').'>'.$lang['all2'].'</option>
|
||||
<option value="1"'.($_GET['only_unresolved']==1?' selected="selected"':'').'>'.$lang['srv_comments_unresolved'].'</option>
|
||||
@ -7008,7 +6945,6 @@ class SurveyAdminSettings {
|
||||
<option value="5"'.($_GET['only_unresolved']==5?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option>
|
||||
</select>';
|
||||
}
|
||||
//echo ' '.Help::display('srv_comments_only_unresolved');
|
||||
|
||||
$only_unresolved = " ";
|
||||
switch($_GET['only_unresolved']){
|
||||
@ -7046,11 +6982,6 @@ class SurveyAdminSettings {
|
||||
while ($row = mysqli_fetch_array($sql)) {
|
||||
|
||||
if (($i != 0 && $sortpostorder==0) || ($i < $rows && $sortpostorder==1)) {
|
||||
/*if ($row['ocena'] == 0) echo '<span style="color:black">';
|
||||
elseif ($row['ocena'] == 1) echo '<span style="color:darkgreen">';
|
||||
elseif ($row['ocena'] == 2) echo '<span style="color:#999999">';
|
||||
elseif ($row['ocena'] == 3) echo '<span style="color:#999999">';
|
||||
else echo '<span>';*/
|
||||
|
||||
echo '<div class="comment_box">';
|
||||
|
||||
@ -7070,33 +7001,37 @@ class SurveyAdminSettings {
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '<div class="bottom_options">';
|
||||
if ($commentmarks == 1) {
|
||||
echo ' <select name="ocena'.$row['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: this.value, id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});">
|
||||
<option value="0"'.($row['ocena']==0?' selected="selected"':'').'>'.$lang['srv_undecided'].'</option>
|
||||
<option value="1"'.($row['ocena']==1?' selected="selected"':'').'>'.$lang['srv_todo'].'</option>
|
||||
<option value="2"'.($row['ocena']==2?' selected="selected"':'').'>'.$lang['srv_done'].'</option>
|
||||
<option value="3"'.($row['ocena']==3?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option>
|
||||
</select>';
|
||||
} else {
|
||||
/*// Checkbox za "Koncano"
|
||||
echo '<input type="checkbox" name="ocena_'.$row['id'].'" id="ocena_'.$row['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (this.checked?\'2\':\'0\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});" value="2" '.($row['ocena'] >= 2?' checked':'').' />';
|
||||
echo '<label for="ocena_'.$row['id'].'">'.$lang['srv_done'].'</label>'; */
|
||||
|
||||
if ($row['ocena']==0) {
|
||||
echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'2\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
|
||||
echo $lang['srv_comments_archive'].'</p>';
|
||||
}
|
||||
else {
|
||||
echo '<p class="archived_comment"><span class="faicon arhiv link-right"></span>'.$lang['srv_comments_archived'].'</p>';
|
||||
echo '<p class="unarchive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'0\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon inv_sent_0 empty link-right"></span>';
|
||||
echo $lang['srv_comments_unarchive'].'</p>';
|
||||
}
|
||||
}
|
||||
echo '</div>';
|
||||
if ($admin_type <= 1 || $rowa['insert_uid']==$global_user_id || $commentmarks_who==0) {
|
||||
|
||||
echo '<div class="bottom_options">';
|
||||
|
||||
if ($commentmarks == 1) {
|
||||
echo ' <select name="ocena'.$row['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: this.value, id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});">
|
||||
<option value="0"'.($row['ocena']==0?' selected="selected"':'').'>'.$lang['srv_undecided'].'</option>
|
||||
<option value="1"'.($row['ocena']==1?' selected="selected"':'').'>'.$lang['srv_todo'].'</option>
|
||||
<option value="2"'.($row['ocena']==2?' selected="selected"':'').'>'.$lang['srv_done'].'</option>
|
||||
<option value="3"'.($row['ocena']==3?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option>
|
||||
</select>';
|
||||
}
|
||||
else {
|
||||
|
||||
if ($row['ocena']==0) {
|
||||
echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'2\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
|
||||
echo $lang['srv_comments_archive'].'</p>';
|
||||
}
|
||||
else {
|
||||
echo '<p class="archived_comment"><span class="faicon arhiv link-right"></span>'.$lang['srv_comments_archived'].'</p>';
|
||||
echo '<p class="unarchive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'0\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon inv_sent_0 empty link-right"></span>';
|
||||
echo $lang['srv_comments_unarchive'].'</p>';
|
||||
}
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
@ -7139,12 +7074,6 @@ class SurveyAdminSettings {
|
||||
while ($row = mysqli_fetch_array($sql)) {
|
||||
|
||||
echo '<div class="comment_box">';
|
||||
|
||||
/*if ($row['ocena'] == 0) echo '<span style="color:black">';
|
||||
elseif ($row['ocena'] == 1) echo '<span style="color:darkgreen">';
|
||||
elseif ($row['ocena'] == 2) echo '<span style="color:#999999">';
|
||||
elseif ($row['ocena'] == 3) echo '<span style="color:#999999">';
|
||||
else echo '<span>';*/
|
||||
|
||||
$datetime = strtotime($row['comment_time']);
|
||||
$datetime = date("d.m.Y G:i", $datetime);
|
||||
@ -7174,30 +7103,33 @@ class SurveyAdminSettings {
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '<div class="bottom_options">';
|
||||
if ($commentmarks == 1) {
|
||||
echo ' <select name="ocena'.$row['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: this.value, id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});">
|
||||
<option value="0"'.($row['ocena']==0?' selected="selected"':'').'>'.$lang['srv_undecided'].'</option>
|
||||
<option value="1"'.($row['ocena']==1?' selected="selected"':'').'>'.$lang['srv_todo'].'</option>
|
||||
<option value="2"'.($row['ocena']==2?' selected="selected"':'').'>'.$lang['srv_done'].'</option>
|
||||
<option value="3"'.($row['ocena']==3?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option>
|
||||
</select>';
|
||||
} else {
|
||||
/*// Checkbox za "Koncano"
|
||||
echo '<input type="checkbox" name="ocena_'.$row['id'].'" id="ocena_'.$row['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: (this.checked?\'2\':\'0\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});" value="2" '.($row['ocena'] >= 2?' checked':'').' />';
|
||||
echo '<label for="ocena_'.$row['id'].'">'.$lang['srv_done'].'</label>'; */
|
||||
|
||||
if ($row['ocena']==0) {
|
||||
echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: (\'2\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
|
||||
echo $lang['srv_comments_archive'].'</p>';
|
||||
}
|
||||
else {
|
||||
echo '<p class="archived_comment"><span class="faicon arhiv link-right"></span>'.$lang['srv_comments_archived'].'</p>';
|
||||
echo '<p class="unarchive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: (\'0\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon inv_sent_0 empty link-right"></span>';
|
||||
echo $lang['srv_comments_unarchive'].'</p>';
|
||||
}
|
||||
}
|
||||
echo '</div>';
|
||||
if ($admin_type <= 1 || $rowa['insert_uid']==$global_user_id || $commentmarks_who==0) {
|
||||
|
||||
echo '<div class="bottom_options">';
|
||||
|
||||
if ($commentmarks == 1) {
|
||||
echo ' <select name="ocena'.$row['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: this.value, id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});">
|
||||
<option value="0"'.($row['ocena']==0?' selected="selected"':'').'>'.$lang['srv_undecided'].'</option>
|
||||
<option value="1"'.($row['ocena']==1?' selected="selected"':'').'>'.$lang['srv_todo'].'</option>
|
||||
<option value="2"'.($row['ocena']==2?' selected="selected"':'').'>'.$lang['srv_done'].'</option>
|
||||
<option value="3"'.($row['ocena']==3?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option>
|
||||
</select>';
|
||||
}
|
||||
else {
|
||||
|
||||
if ($row['ocena']==0) {
|
||||
echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: (\'2\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
|
||||
echo $lang['srv_comments_archive'].'</p>';
|
||||
}
|
||||
else {
|
||||
echo '<p class="archived_comment"><span class="faicon arhiv link-right"></span>'.$lang['srv_comments_archived'].'</p>';
|
||||
echo '<p class="unarchive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: (\'0\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon inv_sent_0 empty link-right"></span>';
|
||||
echo $lang['srv_comments_unarchive'].'</p>';
|
||||
}
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
|
||||
@ -7719,7 +7651,7 @@ class SurveyAdminSettings {
|
||||
$sql1 = sisplet_query("SELECT tip, thread, note FROM srv_spremenljivka WHERE id = '$spr_id'");
|
||||
$row1 = mysqli_fetch_array($sql1);
|
||||
|
||||
$orderby = $sortpostorder == 1 ? 'DESC' : 'ASC' ;
|
||||
$orderby = $sortpostorder == 1 ? 'DESC' : 'ASC';
|
||||
$tid = $row1['thread'];
|
||||
|
||||
$only_unresolved = " ";
|
||||
@ -7744,9 +7676,11 @@ class SurveyAdminSettings {
|
||||
|
||||
if ($admin_type <= $question_comment_viewadminonly) { // vidi vse komentarje
|
||||
$sqlt = sisplet_query("SELECT * FROM post WHERE vsebina NOT LIKE '%{$tema_vsebuje}%' AND tid='$tid' $only_unresolved ORDER BY time $orderby, id $orderby");
|
||||
} elseif ($question_comment_viewauthor==1) { // vidi samo svoje komentarje
|
||||
}
|
||||
elseif ($question_comment_viewauthor==1) { // vidi samo svoje komentarje
|
||||
$sqlt = sisplet_query("SELECT * FROM post WHERE vsebina NOT LIKE '%{$tema_vsebuje}%' AND tid='$tid' $only_unresolved AND uid='$global_user_id' ORDER BY time $orderby, id $orderby");
|
||||
} else { // ne vidi nobenih komentarjev
|
||||
}
|
||||
else { // ne vidi nobenih komentarjev
|
||||
$sqlt = sisplet_query("SELECT * FROM post WHERE 1=0");
|
||||
}
|
||||
|
||||
@ -7796,19 +7730,6 @@ class SurveyAdminSettings {
|
||||
|
||||
$i = 0;
|
||||
while ($rowt = mysqli_fetch_array($sqlt)) {
|
||||
/* if ($_GET['only_unresolved'] == 1) {
|
||||
if ($rowt['ocena'] == 0) echo '<span style="color:black">';
|
||||
elseif ($rowt['ocena'] == 1) echo '<span style="color:darkgreen">';
|
||||
elseif ($rowt['ocena'] == 2) echo '<span style="color:#999999">';
|
||||
elseif ($rowt['ocena'] == 3) echo '<span style="color:#999999">';
|
||||
else echo '<span>';
|
||||
} else {
|
||||
if ($rowt['ocena'] == 0) echo '<span style="color:#990000">';
|
||||
elseif ($rowt['ocena'] == 1) echo '<span style="color:darkgreen">';
|
||||
elseif ($rowt['ocena'] == 2) echo '<span style="color:black">';
|
||||
elseif ($rowt['ocena'] == 3) echo '<span style="color:black">';
|
||||
else echo '<span>';
|
||||
}*/
|
||||
|
||||
echo '<div class="comment_box">';
|
||||
|
||||
@ -7894,25 +7815,17 @@ class SurveyAdminSettings {
|
||||
if ($admin_type <= $question_resp_comment_viewadminonly) {
|
||||
|
||||
echo '<div class="comment_type">';
|
||||
|
||||
echo $lang['srv_repondent_comment'].':';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
if ($_GET['only_unresolved'] == 1) $only_unresolved = " AND d.text2 <= 1 "; else $only_unresolved = " ";
|
||||
|
||||
$sqlt = sisplet_query("SELECT * FROM srv_data_text".$this->db_table." WHERE spr_id='0' AND vre_id='$spr_id' $only_unresolved2 ORDER BY id ASC");
|
||||
$sqlt = sisplet_query("SELECT * FROM srv_data_text".$this->db_table." WHERE spr_id='0' AND vre_id='$spr_id' $only_unresolved2 ORDER BY id $orderby");
|
||||
if (!$sqlt) echo mysqli_error($GLOBALS['connect_db']);
|
||||
while ($rowt = mysqli_fetch_array($sqlt)) {
|
||||
|
||||
echo '<div class="comment_box">';
|
||||
|
||||
/*if ($rowt['text2'] == 0) echo '<span style="color:black">';
|
||||
elseif ($rowt['text2'] == 1) echo '<span style="color:darkgreen">';
|
||||
elseif ($rowt['text2'] == 2) echo '<span style="color:#999999">';
|
||||
elseif ($rowt['text2'] == 3) echo '<span style="color:#999999">';
|
||||
else echo '<span>'; */
|
||||
|
||||
// Ce smo slucajno pobrisali testne vnose, nimamo casa vnosa komentarja
|
||||
$sqlTime = sisplet_query("SELECT time_edit FROM srv_user WHERE id='".$rowt['usr_id']."'");
|
||||
if(mysqli_num_rows($sqlTime) > 0){
|
||||
@ -7958,7 +7871,9 @@ class SurveyAdminSettings {
|
||||
}
|
||||
|
||||
if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) {
|
||||
|
||||
echo '<div class="bottom_options">';
|
||||
|
||||
if ($commentmarks == 1) {
|
||||
echo ' <select name="ocena'.$rowt['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_comment\', text2: this.value, id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});">
|
||||
<option value="0"'.($rowt['text2']==0?' selected':'').'>'.$lang['srv_undecided'].'</option>
|
||||
@ -7983,14 +7898,14 @@ class SurveyAdminSettings {
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>'; #div.question_comment.resp
|
||||
|
||||
|
||||
echo '</div>'; #div.question_comment_holder
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -7,23 +7,27 @@
|
||||
|
||||
|
||||
// Nastavimo url api-ja
|
||||
//$api_url = 'http://localhost/admin/survey/api/api.php';
|
||||
$api_url = 'http://test.1ka.si/admin/survey/api/api.php';
|
||||
//$api_url = 'http://test.1ka.si/admin/survey/api/api.php';
|
||||
//$api_url = 'https://www.1ka.si/admin/survey/api/api.php';
|
||||
|
||||
// Nastavimo identifier in key userja
|
||||
$identifier = 'a1c3b90fdae3c45d';
|
||||
$private_key = 'e60032141a7aae518f9938636b963fc14d58d40025dc7b6b82f4e69b8a42599e';
|
||||
|
||||
$api_url = 'http://localhost/admin/survey/api/api.php';
|
||||
$identifier = '0d712128f7fe5707';
|
||||
$private_key = 'd0ea50f1deabe2d9d9082c4c2a25c7db3648cab59f7a19939c808f602bdbc1be';
|
||||
|
||||
|
||||
// Nastavimo parametre
|
||||
$ank_id = '8086';
|
||||
$action = 'getSurveyQuestions';
|
||||
//$ank_id = '8086';
|
||||
//$action = 'getSurveyQuestions';
|
||||
$action = 'createSurvey';
|
||||
|
||||
|
||||
// Izvedemo klic (GET ali POST)
|
||||
$result = executeGET();
|
||||
//$result = executePOST();
|
||||
//$result = executeGET();
|
||||
$result = executePOST();
|
||||
|
||||
|
||||
|
||||
@ -82,7 +86,7 @@ function executePOST(){
|
||||
|
||||
// GET params
|
||||
$params = 'action='.$action; // Funkcija, ki jo želimo izvesti
|
||||
$params .= '&ank_id='.$ank_id; // ostali parametri potrebni za klic funkcije (id ankete, vprašanja...)
|
||||
//$params .= '&ank_id='.$ank_id; // ostali parametri potrebni za klic funkcije (id ankete, vprašanja...)
|
||||
|
||||
// POST data
|
||||
$post_data = array(
|
||||
@ -99,6 +103,19 @@ function executePOST(){
|
||||
"param_string" => "rekid=5406729&dnid=10352449&brand=MORA&ser=Žiak Pavel Žiak - GOREMO (Víglaš)&serenota=Pavel Žiak - GOREMO&sercenter=SC Slovakia&drzava=Slovakia"
|
||||
);*/
|
||||
|
||||
$post_data = array(
|
||||
"naslov_vprasalnika" => "naslovovoovvo",
|
||||
"survey_type" => 0,
|
||||
"besedilo_vprasanja" => "text vprasasa",
|
||||
"vrsta_vprasanja" => 0,
|
||||
"other" => "Other:",
|
||||
"Odgovori" => array(
|
||||
"Text of option 1",
|
||||
"Text of option 2",
|
||||
"Text of option 3"
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
// Pripravimo podatke za hashiranje
|
||||
$request_method = 'POST';
|
||||
|
||||
@ -387,15 +387,13 @@ class SurveyStaticHtml
|
||||
echo '<div id="additional_navigation">';
|
||||
|
||||
// Komentarji na vprasanja
|
||||
echo '<span>';
|
||||
echo '<span '.($_GET['a'] == A_KOMENTARJI_ANKETA ? 'class="active"' : '').'>';
|
||||
|
||||
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_KOMENTARJI_ANKETA . '" title="' . $lang['srv_testiranje_komentarji_anketa_title'] . '">';
|
||||
echo '<span ' . ($_GET['a'] == A_KOMENTARJI_ANKETA ? 'class="active"' : '') . '>';
|
||||
echo $lang['srv_testiranje_komentarji_anketa_title'];
|
||||
echo '</span>';
|
||||
echo '</a>';
|
||||
|
||||
echo '<span class="bold" style="margin-right: 50px;"> (';
|
||||
echo '<span class="bold">(';
|
||||
if ($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved'] > 0)
|
||||
echo '<span class="orange">';
|
||||
echo($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved']);
|
||||
@ -408,15 +406,13 @@ class SurveyStaticHtml
|
||||
|
||||
|
||||
// Komentarji na anketo
|
||||
echo '<span>';
|
||||
echo '<span '.($_GET['a'] == A_KOMENTARJI ? ' class="active"' : '').'>';
|
||||
|
||||
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_KOMENTARJI . '" title="' . $lang['srv_testiranje_komentarji_title'] . '">';
|
||||
echo '<span ' . ($_GET['a'] == A_KOMENTARJI ? ' class="active"' : '') . '>';
|
||||
echo $lang['srv_testiranje_komentarji_title'];
|
||||
echo '</span>';
|
||||
echo '</a>';
|
||||
|
||||
echo '<span class="bold"> (';
|
||||
echo '<span class="bold">(';
|
||||
if ($comment_count['question']['unresolved'] > 0)
|
||||
echo '<span class="orange">';
|
||||
echo $comment_count['question']['unresolved'];
|
||||
|
||||
@ -136,13 +136,15 @@ class SurveyStatusProfiles
|
||||
if (($_podstran == A_COLLECT_DATA && $_GET['m'] == 'quick_edit') || $_POST['podstran'] == 'quick_edit') {
|
||||
$_podstran = 'vpogled';
|
||||
}
|
||||
|
||||
|
||||
self::$currentProfileId = SurveyUserSetting :: getInstance()->getSettings('default_status_profile_'.$_podstran);
|
||||
|
||||
if (!self::$currentProfileId) {
|
||||
|
||||
#self::$currentProfileId = 2;
|
||||
self::$currentProfileId = self::$survayDefaultUstrezni; # je lahko 2 ali 3
|
||||
}
|
||||
|
||||
# ustrezni je lahko samo če so kakšni ustrezni zapisi v bazi ob pogoju da pa neustrezni obstajajao
|
||||
if (self::$allValidCount == 0 && self::$allUserCount > 0) {
|
||||
if (self::$currentProfileId == 2 || self::$currentProfileId == 3 ) {
|
||||
@ -153,16 +155,22 @@ class SurveyStatusProfiles
|
||||
|
||||
# ce imamo nastavljen curent pid in profil z tem pid ne obstaja nastavomo na privzet profil
|
||||
if (self::$currentProfileId != 1) {
|
||||
|
||||
if (!isset(self::$profiles[self::$currentProfileId])) {
|
||||
self::$currentProfileId = 1;
|
||||
}
|
||||
}
|
||||
// Ce smo preklopili default ustrezni iz status 5,6 na 6 ali obratno
|
||||
elseif(self::$currentProfileId == 2 || self::$currentProfileId == 3){
|
||||
self::$currentProfileId = self::$survayDefaultUstrezni;
|
||||
}
|
||||
}
|
||||
|
||||
# ce ne obstajajo podatki za cpid damo error
|
||||
if (!isset(self::$profiles[self::$currentProfileId])) {
|
||||
die("Profile data is missing!");
|
||||
return false;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@ -1214,14 +1222,16 @@ class SurveyStatusProfiles
|
||||
}
|
||||
|
||||
static function changeOnlyValidRadio() {
|
||||
|
||||
if (isset($_POST['checked']) && (int)$_POST['checked'] > 0) {
|
||||
$dpid = (int)$_POST['checked'];
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
#$dpid = 2;
|
||||
$dpid = (int)self::$survayDefaultUstrezni;
|
||||
}
|
||||
|
||||
self::setDefaultProfileId($dpid);
|
||||
|
||||
}
|
||||
|
||||
/** preveri obstoj profila in vrne enak id če obstaja, če ne vrne id privzetega profila
|
||||
|
||||
@ -774,9 +774,9 @@ class SurveyInvitationsNew {
|
||||
echo '<div class="setting_line">';
|
||||
echo ' <label>'.$lang['srv_inv_recipient_list_delimiter'].'</label>';
|
||||
echo ' <input id="recipientsDelimiter1" type="radio" ' .(!isset ($_POST['recipientsDelimiter']) || $_POST['recipientsDelimiter']==","?'checked="checked"':'') .' value="," name="recipientsDelimiter"><label for="recipientsDelimiter1">' .$lang['srv_inv_recipient_delimiter_comma'] .' (,)</label>';
|
||||
echo ' <input id="recipientsDelimiter4" type="radio" ' .(isset ($_POST['recipientsDelimiter']) && $_POST['recipientsDelimiter']=="|~|"?'checked="checked"':'') .' value="|~|" name="recipientsDelimiter"><label for="recipientsDelimiter4">' .$lang['srv_inv_recipient_delimiter_1KA'] .' (|~|)</label>';
|
||||
echo ' <input id="recipientsDelimiter2" type="radio" ' .(isset ($_POST['recipientsDelimiter']) && $_POST['recipientsDelimiter']==";"?'checked="checked"':'') .' value=";" name="recipientsDelimiter"><label for="recipientsDelimiter2">' .$lang['srv_inv_recipient_delimiter_semicolon'] .' (;) </label>';
|
||||
echo ' <input id="recipientsDelimiter3" type="radio" ' .(isset ($_POST['recipientsDelimiter']) && $_POST['recipientsDelimiter']=="|"?'checked="checked"':'') .' value="|" name="recipientsDelimiter"><label for="recipientsDelimiter3">' .$lang['srv_inv_recipient_delimiter_pipe'] .' (|)</label>';
|
||||
echo ' <input id="recipientsDelimiter4" type="radio" ' .(isset ($_POST['recipientsDelimiter']) && $_POST['recipientsDelimiter']=="|~|"?'checked="checked"':'') .' value="|~|" name="recipientsDelimiter"><label for="recipientsDelimiter4">' .$lang['srv_inv_recipient_delimiter_1KA'] .' (|~|)</label>';
|
||||
echo '</div>';
|
||||
|
||||
// Vnosno polje
|
||||
@ -838,10 +838,10 @@ class SurveyInvitationsNew {
|
||||
|
||||
echo '<div class="setting_line">';
|
||||
echo ' <label>'.$lang['srv_inv_recipient_import_file_delimiter'].'</label>';
|
||||
echo ' <input type="radio" name="recipientsDelimiter" id="recipientsDelimiter1" value="," checked><label for="recipientsDelimiter1">'.$lang['srv_inv_recipient_delimiter_comma'].' (,)</label>';
|
||||
echo ' <input type="radio" name="recipientsDelimiter" id="recipientsDelimiter2" value=";"><label for="recipientsDelimiter2">'.$lang['srv_inv_recipient_delimiter_semicolon'].' (;)</label>';
|
||||
echo ' <input type="radio" name="recipientsDelimiter" id="recipientsDelimiter3" value="|"><label for="recipientsDelimiter3">'.$lang['srv_inv_recipient_delimiter_pipe'].' (|)</label>';
|
||||
echo ' <input type="radio" name="recipientsDelimiter" id="recipientsDelimiter4" value="|~|"><label for="recipientsDelimiter4">'.$lang['srv_inv_recipient_delimiter_1KA'].' (|~|)</label>';
|
||||
echo ' <input type="radio" name="recipientsDelimiter" id="recipientsDelimiter1_import" value="," '.(!isset ($_POST['recipientsDelimiter']) || $_POST['recipientsDelimiter']==","?'checked="checked"':'').'><label for="recipientsDelimiter1_import">'.$lang['srv_inv_recipient_delimiter_comma'].' (,)</label>';
|
||||
echo ' <input type="radio" name="recipientsDelimiter" id="recipientsDelimiter2_import" value=";" '.(!isset ($_POST['recipientsDelimiter']) && $_POST['recipientsDelimiter']==";"?'checked="checked"':'').'><label for="recipientsDelimiter2_import">'.$lang['srv_inv_recipient_delimiter_semicolon'].' (;)</label>';
|
||||
echo ' <input type="radio" name="recipientsDelimiter" id="recipientsDelimiter3_import" value="|" '.(!isset ($_POST['recipientsDelimiter']) && $_POST['recipientsDelimiter']=="|"?'checked="checked"':'').'><label for="recipientsDelimiter3_import">'.$lang['srv_inv_recipient_delimiter_pipe'].' (|)</label>';
|
||||
echo ' <input type="radio" name="recipientsDelimiter" id="recipientsDelimiter4_import" value="|~|" '.(!isset ($_POST['recipientsDelimiter']) && $_POST['recipientsDelimiter']=="|~|"?'checked="checked"':'').'><label for="recipientsDelimiter4_import">'.$lang['srv_inv_recipient_delimiter_1KA'].' (|~|)</label>';
|
||||
echo '</div>';
|
||||
|
||||
echo '</form>';
|
||||
@ -2231,117 +2231,143 @@ class SurveyInvitationsNew {
|
||||
|
||||
echo '<span>'.$lang['srv_invitation_message_choose'].':</span><br/>';
|
||||
|
||||
echo '<div id="invitation_messages" >';
|
||||
|
||||
echo '<div id="invitation_messages">';
|
||||
|
||||
echo '<ol>';
|
||||
foreach ($array_messages AS $_m => $message) {
|
||||
echo '<li mid="'.$message['id'].'" class="'
|
||||
.($message['id'] == $mid ? ' active' : '')
|
||||
.'" onclick="invChangeMessage(\''.$message['id'].'\')">';
|
||||
|
||||
echo '<li mid="'.$message['id'].'" class="'.($message['id'] == $mid ? ' active' : '').'" onclick="invChangeMessage(\''.$message['id'].'\')">';
|
||||
|
||||
echo $message['naslov'];
|
||||
|
||||
if($message['id'] == $mid){
|
||||
|
||||
echo '<div class="icons">';
|
||||
|
||||
if (count($array_messages) > 1)
|
||||
echo '<span class="faicon delete_circle" id="inv_del_msg_profile" onclick="invMessageDelete();" title="'.$lang['srv_inv_message_delete_profile'].'"></span>';
|
||||
|
||||
echo '<span class="faicon edit" id="inv_ren_msg_profile" onclick="invShowMessageRename();" title="'.$lang['srv_inv_message_rename_profile'].'"></span>';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
echo '</li>';
|
||||
}
|
||||
echo '</ol>';
|
||||
|
||||
echo '</div>'; #invitation_messages
|
||||
|
||||
if (count($array_messages) > 1) {
|
||||
echo '<span class="as_link" id="inv_del_msg_profile" onclick="invMessageDelete();" title="'.$lang['srv_inv_message_delete_profile'].'">'.$lang['srv_inv_message_delete_profile'].'</span><br/>';
|
||||
}
|
||||
echo '<span class="as_link" id="inv_ren_msg_profile" onclick="invShowMessageRename();" title="'.$lang['srv_inv_message_rename_profile'].'">'.$lang['srv_inv_message_rename_profile'].'</span>';
|
||||
{
|
||||
# polovimo podatke profila
|
||||
$sql_string = "SELECT sim.*, u.name, u.surname, e.name as ename, e.surname as esurname FROM srv_invitations_messages AS sim LEFT JOIN users AS u ON sim.uid = u.id LEFT JOIN users AS e ON sim.edit_uid = e.id WHERE sim.id = '".(int)$mid."'";
|
||||
$sql_query = sisplet_query($sql_string);
|
||||
$sql_row = mysqli_fetch_assoc($sql_query);
|
||||
|
||||
$avtor = array();
|
||||
$edit = array();
|
||||
if (trim($sql_row['name'])) {
|
||||
$avtor[] = trim ($sql_row['name']);
|
||||
}
|
||||
if (trim($sql_row['surname'])) {
|
||||
$avtor[] = trim ($sql_row['surname']);
|
||||
}
|
||||
# polovimo podatke profila
|
||||
$sql_string = "SELECT sim.*, u.name, u.surname, e.name as ename, e.surname as esurname FROM srv_invitations_messages AS sim LEFT JOIN users AS u ON sim.uid = u.id LEFT JOIN users AS e ON sim.edit_uid = e.id WHERE sim.id = '".(int)$mid."'";
|
||||
$sql_query = sisplet_query($sql_string);
|
||||
$sql_row = mysqli_fetch_assoc($sql_query);
|
||||
|
||||
if ( count($avtor) > 0 ) {
|
||||
echo '<div class="gray">'.$lang['srv_invitation_author'].' '.implode(' ',$avtor).'</div>';
|
||||
}
|
||||
if ( count($avtor) > 0 ) {
|
||||
echo '<div class="gray" title="'.date("d.m.Y H:i:s",strtotime($sql_row['insert_time'])).'">'.$lang['srv_invitation_author_day'].' '.date("d.m.Y",strtotime($sql_row['insert_time'])).'</div>';
|
||||
}
|
||||
if (trim($sql_row['ename'])) {
|
||||
$edit[] = trim ($sql_row['ename']);
|
||||
}
|
||||
if (trim($sql_row['esurname'])) {
|
||||
$edit[] = trim ($sql_row['esurname']);
|
||||
}
|
||||
$avtor = array();
|
||||
$edit = array();
|
||||
if (trim($sql_row['name'])) {
|
||||
$avtor[] = trim ($sql_row['name']);
|
||||
}
|
||||
if (trim($sql_row['surname'])) {
|
||||
$avtor[] = trim ($sql_row['surname']);
|
||||
}
|
||||
|
||||
|
||||
echo '<div class="info">';
|
||||
|
||||
if ( count($avtor) > 0 ) {
|
||||
echo '<div>'.$lang['srv_invitation_author'].' '.implode(' ',$avtor).'</div>';
|
||||
}
|
||||
if ( count($avtor) > 0 ) {
|
||||
echo '<div title="'.date("d.m.Y H:i:s",strtotime($sql_row['insert_time'])).'">'.$lang['srv_invitation_author_day'].' '.date("d.m.Y",strtotime($sql_row['insert_time'])).'</div>';
|
||||
}
|
||||
if (trim($sql_row['ename'])) {
|
||||
$edit[] = trim ($sql_row['ename']);
|
||||
}
|
||||
if (trim($sql_row['esurname'])) {
|
||||
$edit[] = trim ($sql_row['esurname']);
|
||||
}
|
||||
|
||||
if ( count($edit) > 0 && $edit != $avtor) {
|
||||
echo '<div>'.$lang['srv_invitation_changed'].' '.implode(' ',$edit).'</div>';
|
||||
}
|
||||
if ($sql_row['insert_time'] != $sql_row['edit_time']) {
|
||||
echo '<div title="'.date("d.m.Y H:i:s",strtotime($sql_row['edit_time'])).'">'.$lang['srv_invitation_changed_day'].' '.date("d.m.Y",strtotime($sql_row['insert_time'])).'</div>';
|
||||
}
|
||||
|
||||
echo '<div style="max-width:202px">'.$lang['srv_invitation_comment'].' '. trim ($sql_row['comment']).'</div>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
if ( count($edit) > 0 && $edit != $avtor) {
|
||||
echo '<div class="gray">'.$lang['srv_invitation_changed'].' '.implode(' ',$edit).'</div>';
|
||||
}
|
||||
if ($sql_row['insert_time'] != $sql_row['edit_time']) {
|
||||
echo '<div class="gray" title="'.date("d.m.Y H:i:s",strtotime($sql_row['edit_time'])).'">'.$lang['srv_invitation_changed_day'].' '.date("d.m.Y",strtotime($sql_row['insert_time'])).'</div>';
|
||||
}
|
||||
|
||||
echo '<div class="gray" style="max-width:202px">'.$lang['srv_invitation_comment'].' '. trim ($sql_row['comment']).'</div>';
|
||||
}
|
||||
|
||||
echo '</fieldset>'; #inv_messages_profiles_holder
|
||||
|
||||
|
||||
$MA = new MailAdapter($this->sid, $type='invitation');
|
||||
|
||||
# zlistamo seznam vseh sporočil
|
||||
# izpišemo primer besedila
|
||||
echo '<fieldset id="inv_msg_preview_hld" class="right_holder">';
|
||||
|
||||
echo '<span class="h2 spaceRight floatLeft">'.$lang['srv_inv_message_draft_content_heading'].'</span> '.Help::display('srv_inv_message_title_noEmail');
|
||||
echo '<legend>'.$lang['message'].' '.Help::display('srv_inv_message_title_noEmail').'</legend>';
|
||||
|
||||
//echo '<span class="spaceRight floatRight"><a href="'.$site_url . 'admin/survey/index.php?anketa='.$this->sid.'&a=invitations&m=inv_server&show_back=true">'.$lang['srv_inv_message_draft_settings'].'</a></span>';
|
||||
echo '<br class="clr"/>';
|
||||
echo '<div id="inv_error_note" class="displayNone"></div>';
|
||||
|
||||
|
||||
echo '<div id="inv_msg_preview">';
|
||||
echo '<table>';
|
||||
echo '<tr><th>'.$lang['srv_inv_message_draft_content_subject'].':</th>';
|
||||
echo '<td class="inv_bt">';
|
||||
echo '<input type="text" id="inv_message_subject" value="'.$preview_message['subject_text'].'" autocomplete="off">';
|
||||
echo '</td></tr>';
|
||||
echo '<tr><th>'.$lang['srv_inv_message_draft_content_body'].':</th>';
|
||||
echo '<td ><div class="msgBody">';
|
||||
echo '<textarea id="inv_message_body" name="inv_message_body" autocomplete="off">'.($preview_message['body_text']).'</textarea>';
|
||||
echo '</div>';
|
||||
?>
|
||||
<script type="text/javascript">
|
||||
create_inv_editor('inv_message_body', false);
|
||||
</script><?php
|
||||
echo '</td></tr>';
|
||||
|
||||
echo '<div class="setting_item">';
|
||||
echo ' <label>'.$lang['srv_inv_message_draft_content_subject'].':</label>';
|
||||
echo ' <input type="text" id="inv_message_subject" class="medium" value="'.$preview_message['subject_text'].'" autocomplete="off">';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '<div class="setting_item">';
|
||||
echo ' <label>'.$lang['srv_inv_message_draft_content_body'].':</label>';
|
||||
echo ' <textarea id="inv_message_body" name="inv_message_body" autocomplete="off">'.($preview_message['body_text']).'</textarea>';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
?>
|
||||
<script type="text/javascript"> create_inv_editor('inv_message_body', false); </script>
|
||||
<?php
|
||||
|
||||
$urls = $this->getUrlLists();
|
||||
if (count($urls) > 0) {
|
||||
echo '<tr><th>'.$lang['srv_inv_message_draft_url'].'</th>';
|
||||
echo '<td>';
|
||||
echo '<select id="inv_message_url">';
|
||||
|
||||
echo '<div class="setting_item">';
|
||||
|
||||
echo '<label>'.$lang['srv_inv_message_draft_url'].'</label>';
|
||||
|
||||
echo '<select id="inv_message_url" class="dropdown medium">';
|
||||
foreach ($urls AS $url) {
|
||||
$selected = '';
|
||||
$selected = '';
|
||||
if ($preview_message['url'] == '') {
|
||||
if ($preview_message['dc'] == true) {
|
||||
$selected = ' selected="selected"';
|
||||
if ($preview_message['dc'] == true) {
|
||||
$selected = ' selected="selected"';
|
||||
}
|
||||
} else if ($preview_message['url'] == $url['url']) {
|
||||
$selected = ' selected="selected"';
|
||||
$selected = ' selected="selected"';
|
||||
}
|
||||
echo '<option value="'.$url['url'].'"'.$selected.'>'.$url['name'].'</option>';
|
||||
}
|
||||
echo '</select>';
|
||||
echo '</td>';
|
||||
echo '</tr>';
|
||||
}
|
||||
echo '</table>';
|
||||
echo '</div>';
|
||||
|
||||
echo '<br class="clr"/>';
|
||||
|
||||
echo '<span class="buttonwrapper floatRight spaceRight" title="'.$lang['srv_invitation_forward'].'"><a class="ovalbutton" href="#" onclick="inv_message_save_forward_noEmail(\''.$mid.'\'); return false;"><span>'.$lang['srv_invitation_forward'].'</span></a></span>';
|
||||
echo '<span class="buttonwrapper floatRight spaceRight" title="'.$lang['srv_invitation_forward'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="if(inv_message_save_simple_noEmail(\''.$mid.'\')) { window.location.reload() }; return false;"><span>'.$lang['srv_inv_message_save'].'</span></a></span>';
|
||||
echo '<span class="buttonwrapper floatRight spaceRight" title="'.$lang['srv_invitation_message_saveNew'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="inv_message_save_advanced(\''.$mid.'\'); return false;"><span>'.$lang['srv_invitation_message_saveNew'].'</span></a></span>';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '<div class="button_holder below float-right">';
|
||||
echo ' <button class="white-black medium" title="'.$lang['srv_invitation_message_saveNew'].'" onclick="inv_message_save_advanced(\''.$mid.'\'); return false;">'.$lang['srv_invitation_message_saveNew'].'</button>';
|
||||
echo ' <button class="white-blue medium" title="'.$lang['srv_invitation_forward'].'" onclick="if(inv_message_save_simple_noEmail(\''.$mid.'\')) { window.location.reload() }; return false;">'.$lang['srv_inv_message_save'].'</button>';
|
||||
echo ' <button class="blue medium" title="'.$lang['srv_invitation_forward'].'" onclick="inv_message_save_forward_noEmail(\''.$mid.'\'); return false;">'.$lang['srv_invitation_forward'].'</button>';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '</fieldset>';
|
||||
}
|
||||
|
||||
@ -3480,8 +3506,6 @@ class SurveyInvitationsNew {
|
||||
|
||||
$lists['-1'] = $lang['srv_invitation_new_templist'];
|
||||
$lists['0'] = $lang['srv_invitation_new_templist_author'];
|
||||
|
||||
//echo '<div id="inv_send_note">Pošiljam . . . Prosimo počakajte.</div>';
|
||||
|
||||
|
||||
echo '<table id="tbl_recipients_send_list">';
|
||||
@ -3580,54 +3604,64 @@ class SurveyInvitationsNew {
|
||||
|
||||
// Način pošiljanja
|
||||
$noEmailingType = SurveySession::get('inv_noEmailing_type');
|
||||
echo '<span class="bold">';
|
||||
echo $lang['srv_inv_message_type_external'].': </span>';
|
||||
echo '<div class="setting_item ver">';
|
||||
echo ' <span class="semi-bold">'.$lang['srv_inv_message_type_external'].': ';
|
||||
if($noEmailingType == 1)
|
||||
echo $lang['srv_inv_message_noemailing_type2'];
|
||||
echo $lang['srv_inv_message_noemailing_type2'];
|
||||
elseif($noEmailingType == 2)
|
||||
echo $lang['srv_inv_message_noemailing_type3'];
|
||||
echo $lang['srv_inv_message_noemailing_type3'];
|
||||
else
|
||||
echo $lang['srv_inv_message_noemailing_type1'];
|
||||
echo '<br /><br />';
|
||||
echo $lang['srv_inv_message_noemailing_type1'];
|
||||
echo ' </span>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '<form id="frm_do_send" action="'.$site_url.'admin/survey/index.php?anketa='.$this->sid.'&a='.A_INVITATIONS.'&m=send_mail&noemailing=1" method="post">';
|
||||
|
||||
// Komentar pri posiljanju
|
||||
echo '<label>'.$lang['srv_inv_send_comment'].' '.Help::display('srv_inv_sending_comment').': ';
|
||||
echo '<input type="text" name="comment" id="msg_comment" value="'.$comment.'">';
|
||||
echo '</label>';
|
||||
// Komentar pri posiljanju
|
||||
echo '<div class="setting_item ver">';
|
||||
echo ' <label>'.$lang['srv_inv_send_comment'].' '.Help::display('srv_inv_sending_comment').':</label>';
|
||||
echo ' <input type="text" class="medium" name="comment" id="msg_comment" value="'.$comment.'">';
|
||||
echo '</div>';
|
||||
|
||||
// Pobrisi podvojene maile
|
||||
echo '<label><input type="checkbox" id="dont_send_duplicated" name="dont_send_duplicated" checked="checked">'.$lang['srv_inv_send_remove_duplicates'].'</label></span> '.Help::display('srv_inv_sending_double').'<br />';
|
||||
|
||||
// Gumb poslji
|
||||
echo '<br /><div id="inv_send_mail_btn"><span class="buttonwrapper floatLeft"><a href="#" onclick="$(\'#fade\').fadeTo(\'slow\', 1); $(\'#inv_send_note\').fadeTo(\'slow\',1); $(\'#frm_do_send\').submit();" class="ovalbutton ovalbutton_orange" ><span>'.$lang['srv_inv_nav_send_noEmailing'].'</span></a></span>';
|
||||
echo '<br class="clr"/><br /></div>';
|
||||
|
||||
echo '<div class="setting_item ver">';
|
||||
echo ' <input type="checkbox" id="dont_send_duplicated" name="dont_send_duplicated" checked="checked">';
|
||||
echo ' <label for="dont_send_duplicated">'.$lang['srv_inv_send_remove_duplicates'].' '.Help::display('srv_inv_sending_double').'</label>';
|
||||
echo '</div>';
|
||||
|
||||
// Gumb Poslji
|
||||
echo '<div id="inv_send_mail_btn" class="setting_item hor">';
|
||||
echo ' <button class="blue medium" style="width:auto;" onclick="$(\'#fade\').fadeTo(\'slow\', 1); $(\'#inv_send_note\').fadeTo(\'slow\',1); $(\'#frm_do_send\').submit();">'.$lang['srv_inv_nav_send_noEmailing'].'</button>';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// Seznam mailov na katere bomo poslali
|
||||
if ((int)$this->invitationAdvancedConditionId > 0)
|
||||
{
|
||||
#if (is_array($this->user_inv_ids) && count($this->user_inv_ids) > 0)
|
||||
{
|
||||
echo '<span class="floatLeft">';
|
||||
$scp = new SurveyCondition($this->sid);
|
||||
$note = $scp -> getConditionString($this->invitationAdvancedConditionId );
|
||||
echo $note;
|
||||
#$scp -> displayConditionNote($this->invitationAdvancedConditionId );
|
||||
echo '</span>';
|
||||
echo '<br/>';
|
||||
}
|
||||
if ((int)$this->invitationAdvancedConditionId > 0){
|
||||
|
||||
echo '<div class="setting_item ver">';
|
||||
|
||||
$scp = new SurveyCondition($this->sid);
|
||||
$note = $scp -> getConditionString($this->invitationAdvancedConditionId );
|
||||
echo $note;
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
# izpišemo seznam e-mailov in dodamo checkboxe
|
||||
echo '<div class="strong">'.$lang['srv_inv_potencial_respondents'].' <span id="inv_num_recipients">'.count($respondents).'</span></div>';
|
||||
echo '<div class="setting_item ver">';
|
||||
echo '<span>'.$lang['srv_inv_potencial_respondents'].' <span id="inv_num_recipients">'.count($respondents).'</span></span>';
|
||||
echo '</div>';
|
||||
|
||||
# izpišemo opozorilo kadar pošiljamo na več kakor 5000 naslovov
|
||||
$text = (Common::checkModule('gorenje')) ? $lang['srv_inv_potencial_respondents_limit_gorenje'] : $lang['srv_inv_potencial_respondents_limit'];
|
||||
echo '<div id="inv_send_mail_limit" class="red strong'.(count($respondents) > 4999?'':' hidden').'">'.$text.'</div>';
|
||||
$text = (Common::checkModule('gorenje')) ? $lang['srv_inv_potencial_respondents_limit_gorenje'] : $lang['srv_inv_potencial_respondents_limit'];
|
||||
echo '<div id="inv_send_mail_limit" class="setting_item ver red semi-bold '.(count($respondents) > 4999?'':' displayNone').'">';
|
||||
echo $text;
|
||||
echo '</div>';
|
||||
|
||||
echo '<input type="hidden" name="anketa" id="anketa" value="'.$this->sid.'">';
|
||||
|
||||
# da preprečimo večkratno pošiljanje
|
||||
session_start();
|
||||
list($short,$long) = $this->generateCode();
|
||||
@ -3650,9 +3684,8 @@ class SurveyInvitationsNew {
|
||||
$lists['-1'] = $lang['srv_invitation_new_templist'];
|
||||
$lists['0'] = $lang['srv_invitation_new_templist_author'];
|
||||
|
||||
echo '<div id="inv_send_note">Pošiljam . . . Prosimo počakajte.</div>';
|
||||
|
||||
echo '<br/><table id="tbl_recipients_send_list">';
|
||||
echo '<table id="tbl_recipients_send_list">';
|
||||
echo '<tr>';
|
||||
echo '<th class="tbl_icon"><input type="checkbox" checked="checked" onclick="invTogleSend(this);">'.'</th>';
|
||||
echo '<th title="'.$lang['srv_inv_recipients_email'].'">'.$lang['srv_inv_recipients_email'].'</th>';
|
||||
@ -3662,20 +3695,34 @@ class SurveyInvitationsNew {
|
||||
echo '</tr>';
|
||||
$cnt=1;
|
||||
foreach ($respondents as $pass => $respondent) {
|
||||
echo '<tr'.($cnt > $this->rec_send_page_limit ? ' class="displayNone"' : '').'>';
|
||||
echo '<td><input type="checkbox" name="rids[]" value="'.$respondent['id'].'" checked="checekd"></td>';
|
||||
echo '<td>'.$respondent['email'].'</td>';
|
||||
echo '<td>'.$respondent['firstname'].'</td>';
|
||||
echo '<td>'.$lang['srv_userstatus_'.$respondent['status']].' ('.$respondent['status'].')'.'</td>';
|
||||
if ($lists[$respondent['list_id']] != '') {
|
||||
echo '<td>'.$lists[$respondent['list_id']].'</td>';
|
||||
} else {
|
||||
echo '<td>'.$lang['srv_inv_send_who_table_list_deleted'].'</td>';
|
||||
|
||||
echo '<tr'.($cnt > $this->rec_send_page_limit ? ' class="displayNone"' : '').'>';
|
||||
|
||||
echo ' <td>';
|
||||
echo ' <input type="checkbox" name="rids[]" id="rids_'.$respondent['id'].'" value="'.$respondent['id'].'" checked="checekd">';
|
||||
echo ' <label for="rids_'.$respondent['id'].'"></label>';
|
||||
echo ' </td>';
|
||||
|
||||
echo ' <td>'.$respondent['email'].'</td>';
|
||||
|
||||
echo ' <td>'.$respondent['firstname'].'</td>';
|
||||
|
||||
echo ' <td>'.$lang['srv_userstatus_'.$respondent['status']].' ('.$respondent['status'].')'.'</td>';
|
||||
|
||||
if ($lists[$respondent['list_id']] != '') {
|
||||
echo ' <td>'.$lists[$respondent['list_id']].'</td>';
|
||||
}
|
||||
else {
|
||||
echo ' <td>'.$lang['srv_inv_send_who_table_list_deleted'].'</td>';
|
||||
}
|
||||
|
||||
echo '</tr>';
|
||||
|
||||
$cnt++;
|
||||
}
|
||||
|
||||
echo '</table>';
|
||||
|
||||
echo '</form>';
|
||||
}
|
||||
}
|
||||
@ -4740,19 +4787,16 @@ class SurveyInvitationsNew {
|
||||
|
||||
# če so napake jih prikažemo če ne obdelamo datoteko
|
||||
if (count($errors) > 0) {
|
||||
|
||||
echo '<br class="clr" />';
|
||||
|
||||
echo '<span class="inv_message_errors">'.$lang['srv_inv_recipiens_upload_error'].'</span>';
|
||||
|
||||
echo '<br class="clr" />';
|
||||
echo '<br class="clr" />';
|
||||
|
||||
echo '<span class="inv_error_note">';
|
||||
echo '<div id="inv_message_errors">';
|
||||
|
||||
echo '<span>'.$lang['srv_inv_recipiens_upload_error'].'</span>';
|
||||
|
||||
foreach($errors as $error) {
|
||||
echo '* '.$error.'<br />';
|
||||
echo '<span class="inv_error_note">* '.$error.'</span>';
|
||||
}
|
||||
echo '</span>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
$this->addRecipientsView($fields, $invalid_recipiens_array);
|
||||
}
|
||||
@ -9251,17 +9295,19 @@ class SurveyInvitationsNew {
|
||||
# če so napake jih prikažemo če ne obdelamo datoteko
|
||||
if (count($errors) > 0) {
|
||||
|
||||
echo '<br class="clr" />';
|
||||
echo '<span class="inv_message_errors">'.$lang['srv_inv_recipiens_upload_error'].'</span>';
|
||||
echo '<br class="clr" />';
|
||||
echo '<br class="clr" />';
|
||||
echo '<span class="inv_error_note">';
|
||||
echo '<div id="inv_message_errors">';
|
||||
|
||||
echo '<span>'.$lang['srv_inv_recipiens_upload_error'].'</span>';
|
||||
|
||||
foreach($errors as $error) {
|
||||
echo '* '.$error.'<br />';
|
||||
echo '<span class="inv_error_note">* '.$error.'</span>';
|
||||
}
|
||||
echo '</span>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
#$this->addRecipientsView($fields, $invalid_recipiens_array);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
|
||||
$fh = @fopen($file_tmp, "rb");
|
||||
if ($fh) {
|
||||
@ -10209,7 +10255,7 @@ class SurveyInvitationsNew {
|
||||
}
|
||||
else{
|
||||
echo ' <div class="setting_item">';
|
||||
echo ' <input type="radio" name="SMTPMailMode" id="SMTPMailMode_0" value="0" '.($MA->is1KA() ? 'checked ="checked" ' : '').' '.($enabled1ka ? '' : ' disabled="disabled"').' onclick="$(\'#send_mail_mode1, #send_mail_mode2\').hide();$(\'#send_mail_mode0\').show();">';
|
||||
echo ' <input type="radio" name="SMTPMailMode" id="SMTPMailMode_0" value="0" '.($MA->is1KA() ? 'checked ="checked" ' : '').' '.($enabled1ka ? '' : ' disabled="disabled"').' onclick="$(\'#send_mail_mode1, #send_mail_mode2\').addClass(\'displayNone\'); $(\'#send_mail_mode0\').removeClass(\'displayNone\');">';
|
||||
echo ' <label for="SMTPMailMode_0">'.$lang['srv_email_setting_adapter0'].'</label>';
|
||||
echo ' </div>';
|
||||
}
|
||||
@ -10217,14 +10263,14 @@ class SurveyInvitationsNew {
|
||||
// Google smtp je viden samo starim, kjer je ze vklopljen
|
||||
if($MA->isGoogle()){
|
||||
echo ' <div class="setting_item">';
|
||||
echo ' <input type="radio" name="SMTPMailMode" id="SMTPMailMode_1" value="1" '.($MA->isGoogle() ? 'checked ="checked" ' : '').' onclick="$(\'#send_mail_mode0, #send_mail_mode2\').hide(); $(\'#send_mail_mode1\').show();">';
|
||||
echo ' <input type="radio" name="SMTPMailMode" id="SMTPMailMode_1" value="1" '.($MA->isGoogle() ? 'checked ="checked" ' : '').' onclick="$(\'#send_mail_mode0, #send_mail_mode2\').addClass(\'displayNone\'); $(\'#send_mail_mode1\').removeClass(\'displayNone\');">';
|
||||
echo ' <label for="SMTPMailMode_1">'.$lang['srv_email_setting_adapter1'].'</label>';
|
||||
echo ' </div>';
|
||||
}
|
||||
|
||||
// Lastni smtp
|
||||
echo ' <div class="setting_item">';
|
||||
echo ' <input type="radio" name="SMTPMailMode" id="SMTPMailMode_2" value="2" '.($MA->isSMTP() ? 'checked ="checked" ' : '').' onclick="$(\'#send_mail_mode0, #send_mail_mode1\').hide(); $(\'#send_mail_mode2\').show();">';
|
||||
echo ' <input type="radio" name="SMTPMailMode" id="SMTPMailMode_2" value="2" '.($MA->isSMTP() ? 'checked ="checked" ' : '').' onclick="$(\'#send_mail_mode0, #send_mail_mode1\').addClass(\'displayNone\'); $(\'#send_mail_mode2\').removeClass(\'displayNone\');">';
|
||||
echo ' <label for="SMTPMailMode_2">'.$lang['srv_email_setting_adapter2'].' '.Help::display('srv_mail_mode').'</label>';
|
||||
echo ' </div>';
|
||||
|
||||
@ -10447,7 +10493,9 @@ class SurveyInvitationsNew {
|
||||
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '</div>';
|
||||
|
||||
echo '</form>';
|
||||
@ -10465,7 +10513,6 @@ class SurveyInvitationsNew {
|
||||
|
||||
|
||||
if ($_GET['s'] == '1') {
|
||||
echo '<div id="success_save" style="float:left; display:inline; margin: -2px 0 0 0;"></div>';
|
||||
echo '<script type="text/javascript">$(document).ready(function() {actionNotePopup(\'success_save\', \'success\');});</script>';
|
||||
}
|
||||
}
|
||||
|
||||
@ -117,7 +117,7 @@ class SurveyUnsubscribe {
|
||||
return array(substr($cookie,0,6), $cookie);
|
||||
}
|
||||
|
||||
function doUnsubscribe() {
|
||||
public function doUnsubscribe() {
|
||||
global $lang;
|
||||
|
||||
$anketa = self::$sid;
|
||||
|
||||
@ -1656,12 +1656,12 @@ function smtpAAIAccept(){
|
||||
function squaloSwitch(){
|
||||
|
||||
if($('#squalo_mode').prop('checked')){
|
||||
$('#send_mail_mode0, #send_mail_mode1, #send_mail_mode2, .mail_mode_switch, #send_mail_mode_test').hide();
|
||||
$('#send_mail_mode0, #send_mail_mode1, #send_mail_mode2, .mail_mode_switch, #send_mail_mode_test').addClass('displayNone');
|
||||
$('#success_save').hide();
|
||||
}
|
||||
else{
|
||||
$('.squalo_settings').hide();
|
||||
$('#send_mail_mode2, .mail_mode_switch, #send_mail_mode_test').show();
|
||||
$('.squalo_settings').addClass('displayNone');
|
||||
$('#send_mail_mode2, .mail_mode_switch, #send_mail_mode_test').removeClass('displayNone');
|
||||
$('#success_save').hide();
|
||||
}
|
||||
}
|
||||
|
||||
@ -29,9 +29,10 @@
|
||||
$anketa = $_GET['anketa'];
|
||||
if ((int)$anketa > 0) {
|
||||
$su = new SurveyUnsubscribe($anketa);
|
||||
$su::doUnsubscribe();
|
||||
$su->doUnsubscribe();
|
||||
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
echo $lang['user_bye_missing_id'];
|
||||
exit;
|
||||
}
|
||||
|
||||
@ -4982,7 +4982,7 @@ $lang = array (
|
||||
'srv_inv_recipiens_add_invalid_note' => "Preverite naslove in njihov položaj v spodnjem oknu!",
|
||||
'srv_inv_recipiens_add_invalid_note2' => "Enote z neveljavnim emailom ali geslom se ne dodajo v seznam",
|
||||
'srv_inv_recipiens_add_invalid_upload_note' => "Preverite naslove v datoteki!",
|
||||
'srv_inv_recipiens_upload_error' => "Uporabnikov ne morem dodati, prosim odpravite spodnje napake!",
|
||||
'srv_inv_recipiens_upload_error' => "Uporabnikov ni mogoče dodati, prosim odpravite spodnje napake!",
|
||||
'srv_inv_recipiens_upload_error_no_fields' => "Nobeno polje ni izbrano!",
|
||||
'srv_inv_recipiens_onlyThisSurvey' => "Samo ta anketa",
|
||||
'srv_inv_recipiens_from' => "Vnos prejemnikov",
|
||||
@ -5091,7 +5091,7 @@ $lang = array (
|
||||
'srv_inv_potencial_respondents' => "Sporočilo bo poslano na spodnje naslove:",
|
||||
'srv_inv_potencial_respondents_limit' => "Vabilo želite poslati več kot 5000 respondentom. Prosimo, če nas pred pošiljanjem o tem obvestite na <a href=\"mailto:info@1ka.si\">info@1ka.si</a>!",
|
||||
'srv_inv_btn_add_recipients_add' => "Dodaj",
|
||||
'srv_inv_recipiens_file_note_1' => "<span class=\"semi-bold\">Izberite datoteko z e-poštnimi naslovi prejemnikov. Vsak prejemnik mora biti v svoji vrstici.</span> Če uvažate tudi dodatna personalizacijska polja, jih ločite z vejicami. Polja v datoteki morajo biti v enakem vrstnem redu kot ste označili zgoraj. Podvojeni zapisi se ne bodo dodajali.",
|
||||
'srv_inv_recipiens_file_note_1' => "<span class=\"semi-bold\">Izberite datoteko z e-poštnimi naslovi prejemnikov. Vsak prejemnik mora biti v svoji vrstici.</span> Če uvažate tudi dodatna personalizacijska polja, jih ločite z vejicami. Polja v datoteki morajo biti v enakem vrstnem redu, kot ste označili zgoraj. Podvojeni zapisi se ne bodo dodajali.",
|
||||
'srv_inv_archive_heading' => "Arhivi pošiljanja",
|
||||
'srv_inv_archive_date_send' => "Datum pošiljanja",
|
||||
'srv_inv_archive_hour_send' => "Ura pošiljanja",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -41,6 +41,25 @@ body #main_holder #main .page_invitations{
|
||||
}
|
||||
}
|
||||
|
||||
// Zgornja vrstica z textom pri sms, posti
|
||||
#inv_messages_holder_noEmailing{
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
// Zgornja vrstica z napakami
|
||||
#inv_message_errors{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
margin-bottom: 16px;
|
||||
|
||||
span{
|
||||
padding-bottom: 8px;
|
||||
color: red;
|
||||
font-weight: 500;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Leva stran s profili
|
||||
@mixin inv_left_list(){
|
||||
|
||||
@ -147,6 +147,18 @@ div.page_komentarji_anketa {
|
||||
padding: 0;
|
||||
margin: 32px 0 0 0;
|
||||
|
||||
// V vprasanju tukaj odstranimo urejanje
|
||||
.spremenljivka_content{
|
||||
|
||||
.icons_holder{
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
.add-variable{
|
||||
display: none !important;
|
||||
}
|
||||
}
|
||||
|
||||
div.question_comment_holder {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
@ -326,14 +338,21 @@ div.page_komentarji_anketa {
|
||||
|
||||
|
||||
}
|
||||
|
||||
#topSettingsHolder.komentarji,
|
||||
#topSettingsHolder.komentarji_anketa {
|
||||
|
||||
#additional_navigation {
|
||||
a {
|
||||
span {
|
||||
padding: 2px 0px 2px 0;
|
||||
}
|
||||
}
|
||||
|
||||
span.bold {
|
||||
margin: 0 0 0 8px;
|
||||
font-size: 14px;
|
||||
|
||||
span{
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
font-size: 14px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user