Merge branch 'master' of https://git.1ka.si/git/1ka

admin/survey/SurveyAdminAjax.php

@@ -6728,6 +6728,443 @@ class SurveyAdminAjax {
 
         echo '</div>';
 	}
+
+	function ajax_publish_popup_open() {
+		global $lang, $site_url;
+		$name = $_POST['name'];
+
+		echo '<div class="popup_close"><a href="#" onClick="popupClose(); return false;">✕</a></div>';
+
+		switch ($name) {
+			
+			case 'html':
+
+				$code = '<a href="'.SurveyInfo::getSurveyLink().'">'.$lang['srv_complete_survey'].'</a>';
+
+				echo '<h2><span class="fa-brands red html5">'.$lang['srv_anketa_href'].'</h2>';
+				
+				echo '<div class="popup_content publish">';
+				echo '<textarea onclick="this.select();" readonly>';
+				echo $code;
+				echo '</textarea>';
+
+				echo '</div>';
+				break;
+			
+			case 'htmlcount':
+
+				$code = '<a href="'.SurveyInfo::getSurveyLink().'">'.$lang['srv_complete_survey'].'</a><img src="'.$site_url.'main/survey/view_count.php?a='.$this->anketa.'" style="display:none"/>';
+
+				echo '<h2><span class="fa-brands red html5">'.$lang['srv_anketa_href_count'].'</h2>';
+				
+				echo '<div class="popup_content publish">';
+				echo '<textarea onclick="this.select();" readonly>';
+				echo $code;
+				echo '</textarea>';
+
+				echo '</div>';
+				break;
+
+			case 'iframejs':
+
+				$code = SurveyAdmin::getEmbed();
+
+				echo '<h2><span class="faicon fa-window-maximize"></span>'.$lang['srv_anketa_href_ijs'].'</h2>';
+				
+				echo '<div class="popup_content publish">';
+				echo '<textarea onclick="this.select();" readonly>';
+				echo $code;
+				echo '</textarea>';
+
+				echo '</div>';
+				break;
+			
+			case 'iframenojs':
+
+				$code = SurveyAdmin::getEmbed(false);
+
+				echo '<h2><span class="faicon fa-window-maximize empty"></span>'.$lang['srv_anketa_href_inojs'].'</h2>';
+				
+				echo '<div class="popup_content publish">';
+				echo '<textarea onclick="this.select();" readonly>';
+				echo $code;
+				echo '</textarea>';
+
+				echo '</div>';
+				break;
+
+			case 'settings': // še v delu 
+
+				echo '<h2><span class="faicon wheel_32 blue"></span>'.$lang['srv_publication_survey_settings'].'</h2>';
+				
+				echo '<div class="popup_content publish">';
+
+				//privzete nastavitve 
+				echo '<input type="hidden" value="' . $this->anketa . '" name="anketa" >';		
+				
+				$base_url = $site_url.'admin/survey/index.php?anketa='.$this->anketa;
+				# preberomo osnovne nastavitve 
+				$row = SurveyInfo::getInstance()->getSurveyRow();
+			
+				echo '<fieldset><legend>'.($row['active']==0 ? $lang['srv_default_setting_unactive'] : $lang['srv_default_setting']).'</legend>';
+					
+				// Ce imamo dostop do zavihka urejanje
+				if($d->checkDostopSub('edit')){
+					
+					# Trajanje
+					$starts = explode('-',$row['starts']);
+					$starts = $starts[2].'.'.$starts[1].'.'.$starts[0];
+					$expire = explode('-',$row['expire']);
+					$expire = $expire[2].'.'.$expire[1].'.'.$expire[0];
+					echo '<p>'.$lang['srv_starts'].':<a href="'.$base_url.'&a='.A_TRAJANJE.'&f=vabila_settings" title="'.$lang['srv_info_duration'].'"><span class="qs_data as_link">'.$starts.'</span></a></p>';
+					if ( $row['expire'] == PERMANENT_DATE ) {
+						#trajna
+						echo '<p>'.$lang['srv_trajna_anketa'].':<a href="'.$base_url.'&a='.A_TRAJANJE.'&f=vabila_settings" title="'.$lang['srv_trajna_anketa'].'"><span class="qs_data as_link">'.($row['expire'] == PERMANENT_DATE ? $lang['yes'] : $lang['no']).'</span></a></p>';
+					} else {
+						echo '<p>'.$lang['srv_expire'].':<a href="'.$base_url.'&a='.A_TRAJANJE.'&f=vabila_settings" title="'.$lang['srv_info_duration'].'"><span class="qs_data as_link">'.$expire.'</span></a></p>';
+					}
+						
+					// Skin ankete
+					if ($row['skin_profile'] == 0) {
+						$skin_name = $row['skin'];
+					} 
+					else {
+						$sqla = sisplet_query("SELECT name FROM srv_theme_profiles WHERE id = '".$row['skin_profile']."'");
+						$rowa = mysqli_fetch_array($sqla);
+						$skin_name = $rowa['name'];
+					}
+					//echo '<p>'.$lang['srv_themes'].':<a href="'.$base_url.'&a='.A_TEMA.'&f=vabila_settings" title="'.$lang['srv_themes'].'"><span class="qs_data as_link">'.$row['skin'].'</span></a></p>';
+					echo '<p>'.$lang['srv_themes'].':<a href="'.$base_url.'&a='.A_TEMA.'" title="'.$lang['srv_themes'].'"><span class="qs_data as_link">'.$skin_name.'</span></a></p>';						
+					
+					# Jezik
+					$lang_old = $lang;
+					$lang_admin = (int)$row['lang_admin'];
+					$lang_resp = (int)$row['lang_resp'];
+					$lang_array = array();
+					$lang_array[0] = $lang['srv_language_not_set'];
+					// Preberemo razpoložljive jezikovne datoteke
+					if ($dir = opendir('../../lang')) {
+						while (($file = readdir($dir)) !== false) {
+							if ($file != '.' AND $file != '..') {
+								if (is_numeric(substr($file, 0, strpos($file, '.')))) {
+									$i = substr($file, 0, strpos($file, '.'));
+									$file = '../../lang/'.$i.'.php';
+									if (file_exists($file)) {
+										include($file);
+										$lang_array[$i] = $lang['language'];
+									}
+								}
+							}
+						}
+					}
+					
+					$lang = $lang_old;
+					$resp_change_lang = SurveySetting::getInstance()->getSurveyMiscSetting('resp_change_lang');
+					//echo '<p>'.$lang['srv_language_admin_1'].':</p>';
+					echo '<p>'.$lang['srv_language_admin_0'].':<a href="'.$base_url.'&a='.A_JEZIK.'&f=vabila_settings" title="'.$lang['srv_language_admin_1'].'"><span class="qs_data as_link">'.$lang_array[$lang_admin].'</span></a> / <a href="'.$base_url.'&a='.A_JEZIK.'&f=vabila_settings" title="'.$lang['srv_language_respons_1'].'"><span class="qs_data as_link">'.$lang_array[$lang_resp].'</span></a></p>';
+
+					#obveščanje
+					
+					// jezikovni linki
+					$p = new Prevajanje($this->anketa);
+					$p->dostop();
+					$jeziki = $p->get_all_translation_langs();
+					if (count($jeziki) > 0) {
+						echo '<p>' . $lang['srv_trans_lang'] . ': ';
+						$i = 0;
+						foreach ($jeziki AS $key => $val) {
+							if ($i++ != 0) echo ', ';
+							echo '<a href="'.$link.'?anketa='.$this->anketa.'&a=prevajanje&lang_id='.$key.'" target="_blank">'.$val.'</a>';
+						}
+						echo '</p>';
+					}		
+					#piškotki
+					echo '<p>'.$lang['srv_cookie'].':<a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_cookie'].'"><span class="qs_data as_link">'.$lang['srv_cookie_'.$row['cookie']].'</span></a></p>';
+					echo '<p>'.$lang['srv_cookie_return'].':<a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_cookie_return'].'"><span class="qs_data as_link">'.($row['cookie_return'] == 0 ? $lang['srv_cookie_return_start'] : $lang['srv_cookie_return_middle']).'</span></a></p>';
+					
+					#more - več
+					echo '<div id="srv_objava_info_more1" class="as_link" onclick="$(\'#srv_objava_info_more, #srv_objava_info_more1, #srv_objava_info_more2\').toggle();">'.$lang['srv_more'].'</div>';
+					echo '<div id="srv_objava_info_more2" class="as_link displayNone" onclick="$(\'#srv_objava_info_more, #srv_objava_info_more1, #srv_objava_info_more2\').toggle();">'.$lang['srv_less'].'</div>';
+					echo '<div id="srv_objava_info_more" class="displayNone">';
+					
+					if ($row['cookie'] > -1) {
+						# če je piškotek dlje kot do konca nakete lahko izbere tudi druge možnosti
+						echo '<p>'.$lang['srv_return_finished'].':<a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_return_finished'].'"><span class="qs_data as_link">'.($row['return_finished'] == 1 ? $lang['srv_return_finished_yes'] : $lang['srv_return_finished_no']).'</span></a></p>';
+					} else {
+						# ker je piškotek samo do konca ankete se ne more vrnit ali urejat
+						echo '<p>'.$lang['srv_return_finished'].':<a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_return_finished'].'"><span class="qs_data as_link">'. $lang['srv_return_finished_no'] .'</span></a></p>';
+					}
+					
+					echo '<p>'.$lang['srv_multilang'].':<a href="'.$base_url.'&a='.A_PREVAJANJE.'&f=vabila_settings" title="'.$lang['srv_multilang'].'"><span class="qs_data as_link">'.($row['multilang'] == 1 ? $lang['yes'] : $lang['no'] ).'</span></a></p>';
+					
+					echo '<p>'.$lang['srv_user'].':<a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_user'].'"><span class="qs_data as_link">';
+					if ($row['user_from_cms'] == 1) {
+						echo $lang['srv_respondent'];
+					} elseif ($row['user_from_cms'] == 2) {
+						echo $lang['srv_vnasalec'];
+					} elseif ($row['user_from_cms'] == 0) {
+						echo $lang['no1'];
+					}
+					echo '</span></a></p>';
+					
+					echo '<p>'.$lang['srv_block_ip'].':<a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_block_ip'].'"><span class="qs_data as_link">';
+					if ($row['block_ip'] == 0) {
+						echo $lang['no1'];
+					} elseif ($row['block_ip'] == 10) {
+						echo '10 min';
+					} elseif ($row['block_ip'] == 20) {
+						echo '20 min';
+					} elseif ($row['block_ip'] == 60) {
+						echo '60 min';
+					} elseif ($row['block_ip'] == 720) {
+						echo '12 '.$lang['hour_hours2'];
+					} elseif ($row['block_ip'] == 1440) {
+						echo '24 '.$lang['hour_hours2'];
+					}
+					echo '</a>';
+					echo '</p>';
+					
+					
+					# user from cms	
+					if ($row['user_from_cms']>0) {
+						echo '<p>'.$lang['srv_user_cms_show'].':<a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_user_cms_show'].'"><span class="qs_data as_link">'.($lang['srv_user_cms_email']).'</span></a></p>';
+					} 
+					echo '<p>'.$lang['srv_vote_limit'].':<a href="'.$base_url.'&a='.A_TRAJANJE.'&f=vabila_settings" title="'.$lang['srv_vote_limit'].'"><span class="qs_data as_link">'.($row['vote_limit'] == 0 ? $lang['no'] : $lang['yes']).'</span></a></p>';
+					
+					echo '<p>'.$lang['srv_vote_count'].':<a href="'.$base_url.'&a='.A_TRAJANJE.'&f=vabila_settings" title="'.$lang['srv_vote_count'].'"><span class="qs_data as_link">'.($row['vote_limit'] == 0 ? '/' : $row['vote_count']).'</span></a></p>';
+					# Obveščanje
+					// preberemo nastavitve alertov
+					$sqlAlert = sisplet_query("SELECT * FROM srv_alert WHERE ank_id = '".$this->anketa."'");
+					if (mysqli_num_rows($sqlAlert) > 0) {
+						$rowAlert = mysqli_fetch_assoc($sqlAlert);
+					} else {
+						SurveyAlert::getInstance()->Init($anketa, $global_user_id);
+						$rowAlert = SurveyAlert::setDefaultAlertBeforeExpire();
+					}
+					
+					$alert_finish = array();
+					$alert_expire = array();
+					$alert_delete = array();
+					$alert_active = array();
+					if ($rowAlert['finish_respondent'] == 1) {
+						$alert_finish[] = $lang['srv_alert_respondent'];
+					}
+					if ($rowAlert['finish_respondent_cms'] == 1) {
+						$alert_finish[] = $lang['srv_alert_respondent_cms'];
+					}
+					if ($rowAlert['finish_author'] == 1) {
+						$alert_finish[] = $lang['srv_info_author'];
+					}
+					if ($rowAlert['finish_other'] == 1) {
+						$alert_finish[] = $lang['email_prejemniki'];
+					}
+					if ($rowAlert['expire_author'] == 1) {
+						$alert_expire[] = $lang['srv_info_author'];
+					}
+					if ($rowAlert['expire_other'] == 1) {
+						$alert_expire[] = $lang['email_prejemniki'];
+					}
+					if ($rowAlert['delete_author'] == 1) {
+						$alert_delete[] = $lang['srv_info_author'];
+					}
+					if ($rowAlert['delete_other'] == 1) {
+						$alert_delete[] = $lang['email_prejemniki'];
+					}
+					if ($rowAlert['active_author'] == 1) {
+						$alert_active[] = $lang['srv_info_author'];
+					}
+					if ($rowAlert['active_other'] == 1) {
+						$alert_active[] = $lang['email_prejemniki'];
+					}
+					echo '<p>'.$lang['srv_alert_completed_2'].':<a href="'.$base_url.'&a='.A_ALERT.'&f=vabila_settings" title="'.$lang['srv_alert_completed_2'].'"><span class="qs_data as_link">'.(count($alert_finish) ? implode(',',$alert_finish) : $lang['no']).'</span></a></p>';
+					echo '<p>'.$lang['srv_alert_expired_2'].':<a href="'.$base_url.'&a='.A_ALERT.'&f=vabila_settings" title="'.$lang['srv_alert_expired_2'].'"><span class="qs_data as_link">'.(count($alert_expire) ? implode(',',$alert_expire) : $lang['no']).'</span></a></p>';
+					echo '<p>'.$lang['srv_alert_active_2'].':<a href="'.$base_url.'&a='.A_ALERT.'&f=vabila_settings" title="'.$lang['srv_alert_active_2'].'"><span class="qs_data as_link">'.(count($alert_active) ? implode(',',$alert_active) : $lang['no']).'</span></a></p>';
+					echo '<p>'.$lang['srv_alert_delete_2'].':<a href="'.$base_url.'&a='.A_ALERT.'&f=vabila_settings" title="'.$lang['srv_alert_delete_2'].'"><span class="qs_data as_link">'.(count($alert_delete) ? implode(',',$alert_delete) : $lang['no']).'</span></a></p>';
+					
+					echo '<p>';
+					echo '<a href="index.php?anketa=' . $this->anketa . '&a='.A_SETTINGS . '&f=vabila_settings" title="' . $lang['srv_nastavitve_ankete'] . '">';
+					echo $lang['srv_nastavitve_ankete_all'].'</a>';
+					echo '</p>';
+					echo '</div>';
+				}
+				// Nimamo dostopa do zavihka urejanje - ni nobenih linkov
+				else{
+					# Trajanje
+					$starts = explode('-',$row['starts']);
+					$starts = $starts[2].'.'.$starts[1].'.'.$starts[0];
+					$expire = explode('-',$row['expire']);
+					$expire = $expire[2].'.'.$expire[1].'.'.$expire[0];
+					echo '<p>'.$lang['srv_starts'].': '.$starts.'</p>';
+					if ( $row['expire'] == PERMANENT_DATE ) {
+						#trajna
+						echo '<p>'.$lang['srv_trajna_anketa'].': '.($row['expire'] == PERMANENT_DATE ? $lang['yes'] : $lang['no']).'</p>';
+					} else {
+						echo '<p>'.$lang['srv_expire'].': '.$expire.'</p>';
+					}
+					
+					echo '<p>'.$lang['srv_themes'].': '.$row['skin'].'</p>';
+					
+					# Jezik
+					$lang_old = $lang;
+					$lang_admin = (int)$row['lang_admin'];
+					$lang_resp = (int)$row['lang_resp'];
+					$lang_array = array();
+					$lang_array[0] = $lang['srv_language_not_set'];
+					// Preberemo razpoložljive jezikovne datoteke
+					if ($dir = opendir('../../lang')) {
+						while (($file = readdir($dir)) !== false) {
+							if ($file != '.' AND $file != '..') {
+								if (is_numeric(substr($file, 0, strpos($file, '.')))) {
+									$i = substr($file, 0, strpos($file, '.'));
+									$file = '../../lang/'.$i.'.php';
+									if (file_exists($file)) {
+										include($file);
+										$lang_array[$i] = $lang['language'];
+									}
+								}
+							}
+						}
+					}
+					
+					$lang = $lang_old;
+					$resp_change_lang = SurveySetting::getInstance()->getSurveyMiscSetting('resp_change_lang');
+					echo '<p>'.$lang['srv_language_admin_0'].': '.$lang_array[$lang_admin].' / '.$lang_array[$lang_resp].'</p>';
+
+					#obveščanje
+					
+					// jezikovni linki
+					$p = new Prevajanje($this->anketa);
+					$jeziki = $p->get_all_translation_langs();
+					if (count($jeziki) > 0) {
+						echo '<p>' . $lang['srv_trans_lang'] . ': ';
+						$i = 0;
+						foreach ($jeziki AS $key => $val) {
+							if ($i++ != 0) echo ', ';
+							echo '<a href="'.$link.'?language='.$key.'&f=vabila_settings" target="_blank">'.$val.'</a>';
+						}
+						echo '</p>';
+					}		
+					#piškotki
+					echo '<p>'.$lang['srv_cookie'].': '.$lang['srv_cookie_'.$row['cookie']].'</p>';
+					echo '<p>'.$lang['srv_cookie_return'].': '.($row['cookie_return'] == 0 ? $lang['srv_cookie_return_start'] : $lang['srv_cookie_return_middle']).'</p>';
+					
+					#more - več
+					echo '<div id="srv_objava_info_more1" class="as_link" onclick="$(\'#srv_objava_info_more, #srv_objava_info_more1, #srv_objava_info_more2\').toggle();">'.$lang['srv_more'].'</div>';
+					echo '<div id="srv_objava_info_more2" class="as_link displayNone" onclick="$(\'#srv_objava_info_more, #srv_objava_info_more1, #srv_objava_info_more2\').toggle();">'.$lang['srv_less'].'</div>';
+					echo '<div id="srv_objava_info_more" class="displayNone">';
+					
+					if ($row['cookie'] > -1) {
+						# če je piškotek dlje kot do konca nakete lahko izbere tudi druge možnosti
+						echo '<p>'.$lang['srv_return_finished'].': '.($row['return_finished'] == 1 ? $lang['srv_return_finished_yes'] : $lang['srv_return_finished_no']).'</p>';
+					} else {
+						# ker je piškotek samo do konca ankete se ne more vrnit ali urejat
+						echo '<p>'.$lang['srv_return_finished'].': '. $lang['srv_return_finished_no'] .'</p>';
+					}
+					
+					echo '<p>'.$lang['srv_multilang'].': '.($row['multilang'] == 1 ? $lang['yes'] : $lang['no'] ).'</p>';
+					
+					echo '<p>'.$lang['srv_user'].': ';
+					if ($row['user_from_cms'] == 1) {
+						echo $lang['srv_respondent'];
+					} elseif ($row['user_from_cms'] == 2) {
+						echo $lang['srv_vnasalec'];
+					} elseif ($row['user_from_cms'] == 0) {
+						echo $lang['no1'];
+					}
+					echo '</p>';
+					
+					echo '<p>'.$lang['srv_block_ip'].': ';
+					if ($row['block_ip'] == 0) {
+						echo $lang['no1'];
+					} elseif ($row['block_ip'] == 10) {
+						echo '10 min';
+					} elseif ($row['block_ip'] == 20) {
+						echo '20 min';
+					} elseif ($row['block_ip'] == 60) {
+						echo '60 min';
+					} elseif ($row['block_ip'] == 720) {
+						echo '12 '.$lang['hour_hours2'];
+					} elseif ($row['block_ip'] == 1440) {
+						echo '24 '.$lang['hour_hours2'];
+					}
+					echo '</p>';
+					
+					
+					# user from cms	
+					if ($row['user_from_cms']>0) {
+						echo '<p>'.$lang['srv_user_cms_show'].': '.($lang['srv_user_cms_email']).'</p>';
+					} 
+					echo '<p>'.$lang['srv_vote_limit'].': '.($row['vote_limit'] == 0 ? $lang['no'] : $lang['yes']).'</p>';
+					
+					echo '<p>'.$lang['srv_vote_count'].': '.($row['vote_limit'] == 0 ? '/' : $row['vote_count']).'</p>';
+					# Obveščanje
+					// preberemo nastavitve alertov
+					$sqlAlert = sisplet_query("SELECT * FROM srv_alert WHERE ank_id = '".$this->anketa."'");
+					if (mysqli_num_rows($sqlAlert) > 0) {
+						$rowAlert = mysqli_fetch_assoc($sqlAlert);
+					} else {
+						SurveyAlert::getInstance()->Init($anketa, $global_user_id);
+						$rowAlert = SurveyAlert::setDefaultAlertBeforeExpire();
+					}
+					
+					$alert_finish = array();
+					$alert_expire = array();
+					$alert_delete = array();
+					$alert_active = array();
+					if ($rowAlert['finish_respondent'] == 1) {
+						$alert_finish[] = $lang['srv_alert_respondent'];
+					}
+					if ($rowAlert['finish_respondent_cms'] == 1) {
+						$alert_finish[] = $lang['srv_alert_respondent_cms'];
+					}
+					if ($rowAlert['finish_author'] == 1) {
+						$alert_finish[] = $lang['srv_info_author'];
+					}
+					if ($rowAlert['finish_other'] == 1) {
+						$alert_finish[] = $lang['email_prejemniki'];
+					}
+					if ($rowAlert['expire_author'] == 1) {
+						$alert_expire[] = $lang['srv_info_author'];
+					}
+					if ($rowAlert['expire_other'] == 1) {
+						$alert_expire[] = $lang['email_prejemniki'];
+					}
+					if ($rowAlert['delete_author'] == 1) {
+						$alert_delete[] = $lang['srv_info_author'];
+					}
+					if ($rowAlert['delete_other'] == 1) {
+						$alert_delete[] = $lang['email_prejemniki'];
+					}
+					if ($rowAlert['active_author'] == 1) {
+						$alert_active[] = $lang['srv_info_author'];
+					}
+					if ($rowAlert['active_other'] == 1) {
+						$alert_active[] = $lang['email_prejemniki'];
+					}
+					echo '<p>'.$lang['srv_alert_completed_2'].': '.(count($alert_finish) ? implode(',',$alert_finish) : $lang['no']).'</p>';
+					echo '<p>'.$lang['srv_alert_expired_2'].': '.(count($alert_expire) ? implode(',',$alert_expire) : $lang['no']).'</p>';
+					echo '<p>'.$lang['srv_alert_active_2'].': '.(count($alert_active) ? implode(',',$alert_active) : $lang['no']).'</p>';
+					echo '<p>'.$lang['srv_alert_delete_2'].': '.(count($alert_delete) ? implode(',',$alert_delete) : $lang['no']).'</p>';
+					
+					echo '</div>';
+				}
+				
+
+
+				echo '</div>';
+				break;
+		}
+
+        echo '<div class="button_holder">';
+		if ($name != 'settings') {
+			echo '<button class="medium white-blue" onclick="popupClose(); return false;">'.$lang['srv_zapri'].'</button>';				
+			echo '<button class="medium blue" onclick="CopyToClipboard(\'copy_link_v_delu_@TG\'); actionNotePopup(\'link_copied\', \'success\'); popupClose(); return false;">'.$lang['srv_diagnostika_testiranje_copy'].'</button>';
+		}
+		else {
+			echo '<button class="medium blue" onclick="popupClose(); return false;">'.$lang['srv_zapri'].'</button>';				
+		}
+		echo '</div>';
+	}
 }
 
 ?>

admin/survey/SurveyAdminSettings.php

@@ -2449,7 +2449,7 @@ class SurveyAdminSettings {
 
 			echo '<div class="top_note_activate">';
 			
-			echo '<p class="bold">'.$lang['srv_anketa_noactive2'].'</p>';
+			echo '<p class="semi-bold">'.$lang['srv_anketa_noactive2'].'</p>';
 
             //Toggle kopiran iz headerja
 			if (SurveyInfo::getSurveyColumn('active') == 1) {
@@ -2501,8 +2501,7 @@ class SurveyAdminSettings {
 
             echo '</div>';
 
-
+			echo '<p class="top16">'.$lang['srv_publication_survey_noactive_note2'].'</p>';
-
 
 			echo '</div>';
 
@@ -2519,366 +2518,56 @@ class SurveyAdminSettings {
 		echo '<input type="text" onClick="this.select();" value="'.SurveyInfo::getSurveyLink().'" readonly/>';
 		echo '</div>';
 		echo '<button type="button" class="medium blue" onclick="CopyToClipboard(\''.SurveyInfo::getSurveyLink().'\'); actionNotePopup(\'link_copied\', \'success\');">'.$lang['srv_diagnostika_testiranje_copy'].'</button>';
+		
+		//Lep URL - dodajanje
+
+		// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
+        $userAccess = UserAccess::getInstance($global_user_id);
+        if(!$userAccess->checkUserAccess($what='nice_url')){
             echo '<button type="button" class="medium yellow">'.$lang['srv_nice_url_add'].'</button>';
+			echo '</div>'; // div.button_holder
+
+        }
+        else{
+            // Gumb za dodajanje lepega linka
+            echo '<button id="nice_url_button" type="button" class="medium white-black" onclick="toggleNiceURL(\'show\');">'.$lang['srv_nice_url_add'].'</button>';
+
+			echo '<div id="nice_url_holder" class="displayNone">';
+			echo $site_url;
+			echo '<input type="text" class="text large" name="nice_url" id="nice_url" value=""/>';
+			echo '<button type="button" class="medium blue" onclick="$.redirect(\'ajax.php?a=nice_url\', {anketa: '.$this->anketa.', nice_url: $(\'#nice_url\').val()}); return false;">'.$lang['add'].'</button>';
+			echo '<button type="button" class="medium white-blue" onclick="toggleNiceURL(\'hide\')">'.$lang['edit1338'].'</button>';
 			echo '</div>';
 
-		// Povezave za skupine in jezike
+			echo '</div>'; // div.button_holder
-		echo '<p class="bold">'.$lang['srv_publication_survey_grouplang'].'</p>';
 
+
+			if (isset($_GET['error'])) {
+
+				?><script type="text/javascript">
+					toggleNiceURL('show');
+				</script><?php
+
+				echo '<div id="nice_url_error">';
+                
+                // Prekratek lep url
+                if(strlen($_GET['error']) <= 2)
+                    echo '<p class="red"><span class="bold">'.$_GET['error'].'</span> '.$lang['srv_nice_url_short'].'</p>';
+                // Predolg lep url
+                elseif(strlen($_GET['error']) > 20)
+                    echo '<p class="red"><span class="bold">'.$_GET['error'].'</span> '.$lang['srv_nice_url_long'].'</p>';
+                // Ze obstaja
+                else
+                    echo '<p class="red"><span class="bold">'.$_GET['error'].'</span> '.$lang['srv_nice_url_taken'].'</p>';
+				
+				echo '</div>';
+			}
+
+        }
+
+		// Zlistamo nice URL, povezave za skupine in jezike
 		$this->niceUrlSettings();
 		
-		/* --- privzete nastavitve 
-		echo '<input type="hidden" value="' . $this->anketa . '" name="anketa" >';		
-		
-		$base_url = $site_url.'admin/survey/index.php?anketa='.$this->anketa;
-		# preberomo osnovne nastavitve 
-		$row = SurveyInfo::getInstance()->getSurveyRow();
-	
-		echo '<fieldset><legend>'.($row['active']==0 ? $lang['srv_default_setting_unactive'] : $lang['srv_default_setting']).'</legend>';
-			
-		// Ce imamo dostop do zavihka urejanje
-		if($d->checkDostopSub('edit')){
-			
-			# Trajanje
-			$starts = explode('-',$row['starts']);
-			$starts = $starts[2].'.'.$starts[1].'.'.$starts[0];
-			$expire = explode('-',$row['expire']);
-			$expire = $expire[2].'.'.$expire[1].'.'.$expire[0];
-			echo '<p>'.$lang['srv_starts'].':<a href="'.$base_url.'&a='.A_TRAJANJE.'&f=vabila_settings" title="'.$lang['srv_info_duration'].'"><span class="qs_data as_link">'.$starts.'</span></a></p>';
-			if ( $row['expire'] == PERMANENT_DATE ) {
-				#trajna
-				echo '<p>'.$lang['srv_trajna_anketa'].':<a href="'.$base_url.'&a='.A_TRAJANJE.'&f=vabila_settings" title="'.$lang['srv_trajna_anketa'].'"><span class="qs_data as_link">'.($row['expire'] == PERMANENT_DATE ? $lang['yes'] : $lang['no']).'</span></a></p>';
-			} else {
-				echo '<p>'.$lang['srv_expire'].':<a href="'.$base_url.'&a='.A_TRAJANJE.'&f=vabila_settings" title="'.$lang['srv_info_duration'].'"><span class="qs_data as_link">'.$expire.'</span></a></p>';
-			}
-				
-			// Skin ankete
-			if ($row['skin_profile'] == 0) {
-				$skin_name = $row['skin'];
-			} 
-			else {
-				$sqla = sisplet_query("SELECT name FROM srv_theme_profiles WHERE id = '".$row['skin_profile']."'");
-				$rowa = mysqli_fetch_array($sqla);
-				$skin_name = $rowa['name'];
-			}
-			//echo '<p>'.$lang['srv_themes'].':<a href="'.$base_url.'&a='.A_TEMA.'&f=vabila_settings" title="'.$lang['srv_themes'].'"><span class="qs_data as_link">'.$row['skin'].'</span></a></p>';
-			echo '<p>'.$lang['srv_themes'].':<a href="'.$base_url.'&a='.A_TEMA.'" title="'.$lang['srv_themes'].'"><span class="qs_data as_link">'.$skin_name.'</span></a></p>';						
-			
-			# Jezik
-			$lang_old = $lang;
-			$lang_admin = (int)$row['lang_admin'];
-			$lang_resp = (int)$row['lang_resp'];
-			$lang_array = array();
-			$lang_array[0] = $lang['srv_language_not_set'];
-			// Preberemo razpoložljive jezikovne datoteke
-			if ($dir = opendir('../../lang')) {
-				while (($file = readdir($dir)) !== false) {
-					if ($file != '.' AND $file != '..') {
-						if (is_numeric(substr($file, 0, strpos($file, '.')))) {
-							$i = substr($file, 0, strpos($file, '.'));
-							$file = '../../lang/'.$i.'.php';
-							if (file_exists($file)) {
-								include($file);
-								$lang_array[$i] = $lang['language'];
-							}
-						}
-					}
-				}
-			}
-			
-			$lang = $lang_old;
-			$resp_change_lang = SurveySetting::getInstance()->getSurveyMiscSetting('resp_change_lang');
-			//echo '<p>'.$lang['srv_language_admin_1'].':</p>';
-			echo '<p>'.$lang['srv_language_admin_0'].':<a href="'.$base_url.'&a='.A_JEZIK.'&f=vabila_settings" title="'.$lang['srv_language_admin_1'].'"><span class="qs_data as_link">'.$lang_array[$lang_admin].'</span></a> / <a href="'.$base_url.'&a='.A_JEZIK.'&f=vabila_settings" title="'.$lang['srv_language_respons_1'].'"><span class="qs_data as_link">'.$lang_array[$lang_resp].'</span></a></p>';
-
-			#obveščanje
-			
-			// jezikovni linki
-			$p = new Prevajanje($this->anketa);
-			$p->dostop();
-			$jeziki = $p->get_all_translation_langs();
-			if (count($jeziki) > 0) {
-				echo '<p>' . $lang['srv_trans_lang'] . ': ';
-				$i = 0;
-				foreach ($jeziki AS $key => $val) {
-					if ($i++ != 0) echo ', ';
-					echo '<a href="'.$link.'?anketa='.$this->anketa.'&a=prevajanje&lang_id='.$key.'" target="_blank">'.$val.'</a>';
-				}
-				echo '</p>';
-			}		
-			#piškotki
-			echo '<p>'.$lang['srv_cookie'].':<a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_cookie'].'"><span class="qs_data as_link">'.$lang['srv_cookie_'.$row['cookie']].'</span></a></p>';
-			echo '<p>'.$lang['srv_cookie_return'].':<a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_cookie_return'].'"><span class="qs_data as_link">'.($row['cookie_return'] == 0 ? $lang['srv_cookie_return_start'] : $lang['srv_cookie_return_middle']).'</span></a></p>';
-			
-			#more - več
-			echo '<div id="srv_objava_info_more1" class="as_link" onclick="$(\'#srv_objava_info_more, #srv_objava_info_more1, #srv_objava_info_more2\').toggle();">'.$lang['srv_more'].'</div>';
-			echo '<div id="srv_objava_info_more2" class="as_link displayNone" onclick="$(\'#srv_objava_info_more, #srv_objava_info_more1, #srv_objava_info_more2\').toggle();">'.$lang['srv_less'].'</div>';
-			echo '<div id="srv_objava_info_more" class="displayNone">';
-			
-			if ($row['cookie'] > -1) {
-				# če je piškotek dlje kot do konca nakete lahko izbere tudi druge možnosti
-				echo '<p>'.$lang['srv_return_finished'].':<a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_return_finished'].'"><span class="qs_data as_link">'.($row['return_finished'] == 1 ? $lang['srv_return_finished_yes'] : $lang['srv_return_finished_no']).'</span></a></p>';
-			} else {
-				# ker je piškotek samo do konca ankete se ne more vrnit ali urejat
-				echo '<p>'.$lang['srv_return_finished'].':<a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_return_finished'].'"><span class="qs_data as_link">'. $lang['srv_return_finished_no'] .'</span></a></p>';
-			}
-			
-			echo '<p>'.$lang['srv_multilang'].':<a href="'.$base_url.'&a='.A_PREVAJANJE.'&f=vabila_settings" title="'.$lang['srv_multilang'].'"><span class="qs_data as_link">'.($row['multilang'] == 1 ? $lang['yes'] : $lang['no'] ).'</span></a></p>';
-			
-			echo '<p>'.$lang['srv_user'].':<a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_user'].'"><span class="qs_data as_link">';
-			if ($row['user_from_cms'] == 1) {
-				echo $lang['srv_respondent'];
-			} elseif ($row['user_from_cms'] == 2) {
-				echo $lang['srv_vnasalec'];
-			} elseif ($row['user_from_cms'] == 0) {
-				echo $lang['no1'];
-			}
-			echo '</span></a></p>';
-			
-			echo '<p>'.$lang['srv_block_ip'].':<a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_block_ip'].'"><span class="qs_data as_link">';
-			if ($row['block_ip'] == 0) {
-				echo $lang['no1'];
-			} elseif ($row['block_ip'] == 10) {
-				echo '10 min';
-			} elseif ($row['block_ip'] == 20) {
-				echo '20 min';
-			} elseif ($row['block_ip'] == 60) {
-				echo '60 min';
-			} elseif ($row['block_ip'] == 720) {
-				echo '12 '.$lang['hour_hours2'];
-			} elseif ($row['block_ip'] == 1440) {
-				echo '24 '.$lang['hour_hours2'];
-			}
-			echo '</a>';
-			echo '</p>';
-			
-			
-			# user from cms	
-			if ($row['user_from_cms']>0) {
-				echo '<p>'.$lang['srv_user_cms_show'].':<a href="'.$base_url.'&a='.A_COOKIE.'&f=vabila_settings" title="'.$lang['srv_user_cms_show'].'"><span class="qs_data as_link">'.($lang['srv_user_cms_email']).'</span></a></p>';
-			} 
-			echo '<p>'.$lang['srv_vote_limit'].':<a href="'.$base_url.'&a='.A_TRAJANJE.'&f=vabila_settings" title="'.$lang['srv_vote_limit'].'"><span class="qs_data as_link">'.($row['vote_limit'] == 0 ? $lang['no'] : $lang['yes']).'</span></a></p>';
-			
-			echo '<p>'.$lang['srv_vote_count'].':<a href="'.$base_url.'&a='.A_TRAJANJE.'&f=vabila_settings" title="'.$lang['srv_vote_count'].'"><span class="qs_data as_link">'.($row['vote_limit'] == 0 ? '/' : $row['vote_count']).'</span></a></p>';
-			# Obveščanje
-			// preberemo nastavitve alertov
-			$sqlAlert = sisplet_query("SELECT * FROM srv_alert WHERE ank_id = '".$this->anketa."'");
-			if (mysqli_num_rows($sqlAlert) > 0) {
-				$rowAlert = mysqli_fetch_assoc($sqlAlert);
-			} else {
-				SurveyAlert::getInstance()->Init($anketa, $global_user_id);
-				$rowAlert = SurveyAlert::setDefaultAlertBeforeExpire();
-			}
-			
-			$alert_finish = array();
-			$alert_expire = array();
-			$alert_delete = array();
-			$alert_active = array();
-			if ($rowAlert['finish_respondent'] == 1) {
-				$alert_finish[] = $lang['srv_alert_respondent'];
-			}
-			if ($rowAlert['finish_respondent_cms'] == 1) {
-				$alert_finish[] = $lang['srv_alert_respondent_cms'];
-			}
-			if ($rowAlert['finish_author'] == 1) {
-				$alert_finish[] = $lang['srv_info_author'];
-			}
-			if ($rowAlert['finish_other'] == 1) {
-				$alert_finish[] = $lang['email_prejemniki'];
-			}
-			if ($rowAlert['expire_author'] == 1) {
-				$alert_expire[] = $lang['srv_info_author'];
-			}
-			if ($rowAlert['expire_other'] == 1) {
-				$alert_expire[] = $lang['email_prejemniki'];
-			}
-			if ($rowAlert['delete_author'] == 1) {
-				$alert_delete[] = $lang['srv_info_author'];
-			}
-			if ($rowAlert['delete_other'] == 1) {
-				$alert_delete[] = $lang['email_prejemniki'];
-			}
-			if ($rowAlert['active_author'] == 1) {
-				$alert_active[] = $lang['srv_info_author'];
-			}
-			if ($rowAlert['active_other'] == 1) {
-				$alert_active[] = $lang['email_prejemniki'];
-			}
-			echo '<p>'.$lang['srv_alert_completed_2'].':<a href="'.$base_url.'&a='.A_ALERT.'&f=vabila_settings" title="'.$lang['srv_alert_completed_2'].'"><span class="qs_data as_link">'.(count($alert_finish) ? implode(',',$alert_finish) : $lang['no']).'</span></a></p>';
-			echo '<p>'.$lang['srv_alert_expired_2'].':<a href="'.$base_url.'&a='.A_ALERT.'&f=vabila_settings" title="'.$lang['srv_alert_expired_2'].'"><span class="qs_data as_link">'.(count($alert_expire) ? implode(',',$alert_expire) : $lang['no']).'</span></a></p>';
-			echo '<p>'.$lang['srv_alert_active_2'].':<a href="'.$base_url.'&a='.A_ALERT.'&f=vabila_settings" title="'.$lang['srv_alert_active_2'].'"><span class="qs_data as_link">'.(count($alert_active) ? implode(',',$alert_active) : $lang['no']).'</span></a></p>';
-			echo '<p>'.$lang['srv_alert_delete_2'].':<a href="'.$base_url.'&a='.A_ALERT.'&f=vabila_settings" title="'.$lang['srv_alert_delete_2'].'"><span class="qs_data as_link">'.(count($alert_delete) ? implode(',',$alert_delete) : $lang['no']).'</span></a></p>';
-			
-			echo '<p>';
-			echo '<a href="index.php?anketa=' . $this->anketa . '&a='.A_SETTINGS . '&f=vabila_settings" title="' . $lang['srv_nastavitve_ankete'] . '">';
-			echo $lang['srv_nastavitve_ankete_all'].'</a>';
-			echo '</p>';
-			echo '</div>';
-		}
-		// Nimamo dostopa do zavihka urejanje - ni nobenih linkov
-		else{
-			# Trajanje
-			$starts = explode('-',$row['starts']);
-			$starts = $starts[2].'.'.$starts[1].'.'.$starts[0];
-			$expire = explode('-',$row['expire']);
-			$expire = $expire[2].'.'.$expire[1].'.'.$expire[0];
-			echo '<p>'.$lang['srv_starts'].': '.$starts.'</p>';
-			if ( $row['expire'] == PERMANENT_DATE ) {
-				#trajna
-				echo '<p>'.$lang['srv_trajna_anketa'].': '.($row['expire'] == PERMANENT_DATE ? $lang['yes'] : $lang['no']).'</p>';
-			} else {
-				echo '<p>'.$lang['srv_expire'].': '.$expire.'</p>';
-			}
-			
-			echo '<p>'.$lang['srv_themes'].': '.$row['skin'].'</p>';
-			
-			# Jezik
-			$lang_old = $lang;
-			$lang_admin = (int)$row['lang_admin'];
-			$lang_resp = (int)$row['lang_resp'];
-			$lang_array = array();
-			$lang_array[0] = $lang['srv_language_not_set'];
-			// Preberemo razpoložljive jezikovne datoteke
-			if ($dir = opendir('../../lang')) {
-				while (($file = readdir($dir)) !== false) {
-					if ($file != '.' AND $file != '..') {
-						if (is_numeric(substr($file, 0, strpos($file, '.')))) {
-							$i = substr($file, 0, strpos($file, '.'));
-							$file = '../../lang/'.$i.'.php';
-							if (file_exists($file)) {
-								include($file);
-								$lang_array[$i] = $lang['language'];
-							}
-						}
-					}
-				}
-			}
-			
-			$lang = $lang_old;
-			$resp_change_lang = SurveySetting::getInstance()->getSurveyMiscSetting('resp_change_lang');
-			echo '<p>'.$lang['srv_language_admin_0'].': '.$lang_array[$lang_admin].' / '.$lang_array[$lang_resp].'</p>';
-
-			#obveščanje
-			
-			// jezikovni linki
-			$p = new Prevajanje($this->anketa);
-			$jeziki = $p->get_all_translation_langs();
-			if (count($jeziki) > 0) {
-				echo '<p>' . $lang['srv_trans_lang'] . ': ';
-				$i = 0;
-				foreach ($jeziki AS $key => $val) {
-					if ($i++ != 0) echo ', ';
-					echo '<a href="'.$link.'?language='.$key.'&f=vabila_settings" target="_blank">'.$val.'</a>';
-				}
-				echo '</p>';
-			}		
-			#piškotki
-			echo '<p>'.$lang['srv_cookie'].': '.$lang['srv_cookie_'.$row['cookie']].'</p>';
-			echo '<p>'.$lang['srv_cookie_return'].': '.($row['cookie_return'] == 0 ? $lang['srv_cookie_return_start'] : $lang['srv_cookie_return_middle']).'</p>';
-			
-			#more - več
-			echo '<div id="srv_objava_info_more1" class="as_link" onclick="$(\'#srv_objava_info_more, #srv_objava_info_more1, #srv_objava_info_more2\').toggle();">'.$lang['srv_more'].'</div>';
-			echo '<div id="srv_objava_info_more2" class="as_link displayNone" onclick="$(\'#srv_objava_info_more, #srv_objava_info_more1, #srv_objava_info_more2\').toggle();">'.$lang['srv_less'].'</div>';
-			echo '<div id="srv_objava_info_more" class="displayNone">';
-			
-			if ($row['cookie'] > -1) {
-				# če je piškotek dlje kot do konca nakete lahko izbere tudi druge možnosti
-				echo '<p>'.$lang['srv_return_finished'].': '.($row['return_finished'] == 1 ? $lang['srv_return_finished_yes'] : $lang['srv_return_finished_no']).'</p>';
-			} else {
-				# ker je piškotek samo do konca ankete se ne more vrnit ali urejat
-				echo '<p>'.$lang['srv_return_finished'].': '. $lang['srv_return_finished_no'] .'</p>';
-			}
-			
-			echo '<p>'.$lang['srv_multilang'].': '.($row['multilang'] == 1 ? $lang['yes'] : $lang['no'] ).'</p>';
-			
-			echo '<p>'.$lang['srv_user'].': ';
-			if ($row['user_from_cms'] == 1) {
-				echo $lang['srv_respondent'];
-			} elseif ($row['user_from_cms'] == 2) {
-				echo $lang['srv_vnasalec'];
-			} elseif ($row['user_from_cms'] == 0) {
-				echo $lang['no1'];
-			}
-			echo '</p>';
-			
-			echo '<p>'.$lang['srv_block_ip'].': ';
-			if ($row['block_ip'] == 0) {
-				echo $lang['no1'];
-			} elseif ($row['block_ip'] == 10) {
-				echo '10 min';
-			} elseif ($row['block_ip'] == 20) {
-				echo '20 min';
-			} elseif ($row['block_ip'] == 60) {
-				echo '60 min';
-			} elseif ($row['block_ip'] == 720) {
-				echo '12 '.$lang['hour_hours2'];
-			} elseif ($row['block_ip'] == 1440) {
-				echo '24 '.$lang['hour_hours2'];
-			}
-			echo '</p>';
-			
-			
-			# user from cms	
-			if ($row['user_from_cms']>0) {
-				echo '<p>'.$lang['srv_user_cms_show'].': '.($lang['srv_user_cms_email']).'</p>';
-			} 
-			echo '<p>'.$lang['srv_vote_limit'].': '.($row['vote_limit'] == 0 ? $lang['no'] : $lang['yes']).'</p>';
-			
-			echo '<p>'.$lang['srv_vote_count'].': '.($row['vote_limit'] == 0 ? '/' : $row['vote_count']).'</p>';
-			# Obveščanje
-			// preberemo nastavitve alertov
-			$sqlAlert = sisplet_query("SELECT * FROM srv_alert WHERE ank_id = '".$this->anketa."'");
-			if (mysqli_num_rows($sqlAlert) > 0) {
-				$rowAlert = mysqli_fetch_assoc($sqlAlert);
-			} else {
-				SurveyAlert::getInstance()->Init($anketa, $global_user_id);
-				$rowAlert = SurveyAlert::setDefaultAlertBeforeExpire();
-			}
-			
-			$alert_finish = array();
-			$alert_expire = array();
-			$alert_delete = array();
-			$alert_active = array();
-			if ($rowAlert['finish_respondent'] == 1) {
-				$alert_finish[] = $lang['srv_alert_respondent'];
-			}
-			if ($rowAlert['finish_respondent_cms'] == 1) {
-				$alert_finish[] = $lang['srv_alert_respondent_cms'];
-			}
-			if ($rowAlert['finish_author'] == 1) {
-				$alert_finish[] = $lang['srv_info_author'];
-			}
-			if ($rowAlert['finish_other'] == 1) {
-				$alert_finish[] = $lang['email_prejemniki'];
-			}
-			if ($rowAlert['expire_author'] == 1) {
-				$alert_expire[] = $lang['srv_info_author'];
-			}
-			if ($rowAlert['expire_other'] == 1) {
-				$alert_expire[] = $lang['email_prejemniki'];
-			}
-			if ($rowAlert['delete_author'] == 1) {
-				$alert_delete[] = $lang['srv_info_author'];
-			}
-			if ($rowAlert['delete_other'] == 1) {
-				$alert_delete[] = $lang['email_prejemniki'];
-			}
-			if ($rowAlert['active_author'] == 1) {
-				$alert_active[] = $lang['srv_info_author'];
-			}
-			if ($rowAlert['active_other'] == 1) {
-				$alert_active[] = $lang['email_prejemniki'];
-			}
-			echo '<p>'.$lang['srv_alert_completed_2'].': '.(count($alert_finish) ? implode(',',$alert_finish) : $lang['no']).'</p>';
-			echo '<p>'.$lang['srv_alert_expired_2'].': '.(count($alert_expire) ? implode(',',$alert_expire) : $lang['no']).'</p>';
-			echo '<p>'.$lang['srv_alert_active_2'].': '.(count($alert_active) ? implode(',',$alert_active) : $lang['no']).'</p>';
-			echo '<p>'.$lang['srv_alert_delete_2'].': '.(count($alert_delete) ? implode(',',$alert_delete) : $lang['no']).'</p>';
-			
-			echo '</div>';
-		} --- privzete nastavitve */
-
-
-
 		// Več načinov deljenja ankete
 		echo '<div class="title"><div class="title_icon"><span class="faicon edit_square empty"></span></div><h2>'.$lang['srv_publication_survey_more'].'</h2></div>';
 
@@ -2894,18 +2583,18 @@ class SurveyAdminSettings {
 		echo '</div>';
 
 		//HTML koda
-		echo '<div class="more_block">';
+		echo '<div class="more_block" onclick="publishPopupOpen(\'html\');">';
 			echo '<div class="more_title">';
-			echo '<div class="more_title_icon"><span class="fa-brands faicon red html5"></span></div>';
+			echo '<div class="more_title_icon"><span class="fa-brands red html5"></span></div>';
 			echo $lang['srv_anketa_href'];
 			echo '</div>';
 			echo $lang['srv_anketa_href_text'];
 		echo '</div>';
 		
 		//HTML koda +  števec
-		echo '<div class="more_block">';
+		echo '<div class="more_block" onclick="publishPopupOpen(\'htmlcount\');">';
 			echo '<div class="more_title">';
-			echo '<div class="more_title_icon"><span class="faicon red html5"></span><span class="faicon stopwatch20"></span></div>';
+			echo '<div class="more_title_icon"><span class="fa-brands red html5"></span><span class="faicon fa-1"></span></div>';
 			echo $lang['srv_anketa_href_count'];
 			echo '</div>';
 			echo $lang['srv_anketa_href_count_text'];
@@ -2918,22 +2607,23 @@ class SurveyAdminSettings {
 			echo $lang['srv_anketa_href_friends'];
 			echo '</div>';
 			echo $lang['srv_anketa_href_friends_text'];
+			echo '<a href="https://www.addthis.com/bookmark.php?v=250" class="addthis_button_compact" addthis:url="SurveyInfo::getSurveyLink()" addthis:title="$row[\'akronim\']">friend share</a>';
 		echo '</div>';
 
 		// iFrame - js
-		echo '<div class="more_block">';
+		echo '<div class="more_block" onclick="publishPopupOpen(\'iframejs\');">';
 			echo '<div class="more_title">';
 			echo '<div class="more_title_icon"><span class="faicon fa-window-maximize"></span></div>';
-			echo $lang['srv_anketa_href_ijs'];
+			echo $lang['srv_anketa_href_ijs'].Help :: display('srv_embed_js');
 			echo '</div>';
 			echo $lang['srv_anketa_href_ijs_text'];
 		echo '</div>';
 		
 		// iFrame - brez js
-		echo '<div class="more_block">';
+		echo '<div class="more_block" onclick="publishPopupOpen(\'iframenojs\');">';
 			echo '<div class="more_title">';
 			echo '<div class="more_title_icon"><span class="faicon fa-window-maximize empty"></span></div>';
-			echo $lang['srv_anketa_href_inojs'];
+			echo $lang['srv_anketa_href_inojs'].Help :: display('srv_embed_fixed');
 			echo '</div>';
 			echo $lang['srv_anketa_href_inojs_text'];
 		echo '</div>';
@@ -2982,22 +2672,29 @@ class SurveyAdminSettings {
 			echo ' (<a href="#" id="popup-open" onclick="javascript:testiranje_preview_settings(); return false;">'.$lang['srv_testrianje_how'].'</a>)</p>';	
 			
 			echo '</div>';
-		}
+		}*/
+		echo '<div class="publish_url_holder">';
 		
 		//Zlistamo vse lepe url-je
+		$title = 0;
         $sqll = sisplet_query("SELECT id, link FROM srv_nice_links WHERE ank_id = '$this->anketa' ORDER BY id ASC");
         while ($rowl = mysqli_fetch_assoc($sqll)) {
+			if ($title == 0) {
+			echo '<p class="semi-bold survey_links">'.$lang['srv_publication_survey_niceurl'].'</p>';
+			$title = 1;
+			}
 
             $link_nice = $site_url . $rowl['link'];
 
-            echo '<br/><span style="margin-left:35px; margin-top:5px; display:inline-block;" ><b>';
+			echo '<div class="niceurl">';
-            echo '<a href="'.$link_nice.'" target="_blank">'.$link_nice.'</a>'.(count($lang_array) > 0 ? ' - '.$base_lang_resp : '').'</b></span>';
+			echo '<a href="'.$link_nice.'" target="_blank">'.$link_nice.'</a>'.(count($lang_array) > 0 ? '&nbsp- '.$base_lang_resp : '');
-
+			echo '<span class="faicon blue copy" onclick="CopyToClipboard(\''.$link_nice.'\'); actionNotePopup(\'link_copied\', \'success\'); return false;" title="'.$lang['srv_publication_survey_copylink'].'"></span>';
-        }*/
+			echo '<a href="ajax.php?a=nice_url_remove&anketa='.$this->anketa.'&nice_url='.$rowl['id'].'" title="'.$lang['srv_copy_remove'].'"><span class="faicon trash empty"></span></a>';
+			echo '</div>';
+        }
 		
+		echo '<p class="semi-bold survey_links">'.$lang['srv_publication_survey_grouplang'].'</p>';
 		// Navaden url
-		echo '<div class="publish_url_holder">';
-		
 		$row = SurveyInfo::getInstance()->getSurveyRow();
 
 		$p->include_lang($p->lang_resp);
@@ -3043,62 +2740,6 @@ class SurveyAdminSettings {
 				}
 			}
 		}
-		
-        /*/ Okno za dodajanje lepega url-ja
-        echo '<fieldset><legend>'.$lang['srv_nice_url'].'</legend>';
-        
-        // Zlistamo vse lepe url-je
-        $sqll = sisplet_query("SELECT id, link FROM srv_nice_links WHERE ank_id = '$this->anketa' ORDER BY id ASC");
-        while ($rowl = mysqli_fetch_assoc($sqll)) {
-
-            echo '<span style="margin-top: 10px; display:inline-block;">';
-            echo '<b><a href="'.$site_url.$rowl['link'].'" target="_blank">'.$site_url.$rowl['link'].'</a></b>';
-            
-            // Remove nice url
-            echo '<a href="ajax.php?a=nice_url_remove&anketa='.$this->anketa.'&nice_url='.$rowl['id'].'" title="'.$lang['srv_copy_remove'].'"><span class="faicon delete_circle icon-orange_link spaceLeft"></span></a>';
-
-            echo '<br />';
-        }
-
-        echo '<br />';
-
-        // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
-        $userAccess = UserAccess::getInstance($global_user_id);
-        if(!$userAccess->checkUserAccess($what='nice_url')){
-            $userAccess->displayNoAccess($what='nice_url');
-        }
-        else{
-            // Gumb za dodajanje lepega linka
-            //echo '<div class="" style="margin-top:5px;"><a href="#" onclick="$(\'#spn_nice_url\').toggle(); return false;">' . $lang['srv_nice_url'] . '</a>&nbsp;'.Help::display('srv_nice_url');
-            echo '<div class="buttonwrapper"><a class="ovalbutton floatLeft" title="' . $lang['srv_nice_url_add'] . '" href="#" onclick="$(\'#spn_nice_url\').fadeToggle(); return false;">' . $lang['srv_nice_url_add'] . '</a></div>&nbsp;'.Help::display('srv_nice_url');
-            
-
-            echo '<br /><span id="spn_nice_url" '.(isset($_GET['error']) ? '' : 'style="display:none;"').'><br /><br />';
-            
-            echo $site_url.' <input type="text" name="nice_url" id="nice_url" value="" /> <input type="submit" value="'.$lang['add'].'" onclick="$.redirect(\'ajax.php?a=nice_url\', {anketa: '.$this->anketa.', nice_url: $(\'#nice_url\').val()}); return false;" />';
-
-            echo '</span>';
-            echo '</div>';
-                
-            if (isset($_GET['error'])) {
-                
-                // Prekratek lep url
-                if(strlen($_GET['error']) <= 2)
-                    echo '<br /><br /><span class="red"><b>'.$_GET['error'].'</b> '.$lang['srv_nice_url_short'].'</span>';
-                // Predolg lep url
-                elseif(strlen($_GET['error']) > 20)
-                    echo '<br /><br /><span class="red"><b>'.$_GET['error'].'</b> '.$lang['srv_nice_url_long'].'</span>';
-                // Ze obstaja
-                else
-                    echo '<br /><br /><span class="red"><b>'.$_GET['error'].'</b> '.$lang['srv_nice_url_taken'].'</span>';
-            }
-
-            echo '</div>';
-        }
-
-        echo '<br /><br />';
-		
-		echo '</fieldset>';*/
 	}
 	
 	function anketa_vabila_url() {

admin/survey/classes/class.SurveyThemeEditor.php

@@ -69,7 +69,7 @@ class SurveyThemeEditor {
 		echo '<div id="picker"></div>';
 			
 		echo '<h3>'.$lang['srv_skinname'].'</h3>';
-		echo '<input type="text" class="text large" id="skin-name" name="skin-name" value="'.$rowa['name'].'" onblur="te_change_name(this);">';
+		echo '<input type="text" class="text medium" id="skin-name" name="skin-name" value="'.$rowa['name'].'" onblur="te_change_name(this);">';
 
 		// Mobilni skin nima logotipa
 		if($mobile != 1){
@@ -302,7 +302,7 @@ class SurveyThemeEditor {
 
 			echo '<div class="setting_box">';
 
-			echo '<p>'.$lang['srv_te_question_border'].'</p><select class="dropdown large" name="question_border'.$id.'" data-id="'.$id.'" data-type="'.$type.'" class="auto-save">';
+			echo $lang['srv_te_question_border'].'<select class="dropdown large" name="question_border'.$id.'" data-id="'.$id.'" data-type="'.$type.'" class="auto-save">';
 			echo '<option value="" '.(''==$row['value']?' selected':'').'>'.$lang['default'].'</option>';
 			echo '<option value="0" '.($row['value']=='0'?' selected':'').'>'.$lang['srv_te_question_border_0'].'</option>';
 			echo '<option value="1" '.($row['value']=='1'?' selected':'').'>'.$lang['srv_te_question_border_1'].'</option>';

admin/survey/script/script.js

@@ -5554,3 +5554,25 @@ function top_note_hide(id) {
 	$('#'+id).addClass('displayNone');
 
 }
+
+//Objava - pregled (gumbi)
+function publishPopupOpen(name){
+	
+    $('#fade').fadeTo('slow', 1);
+	$('#general_popup').html('').fadeIn('slow');
+	$("#general_popup").load('ajax.php?a=publish_popup_open', {anketa: srv_meta_anketa_id, name: name});
+}
+
+//Objava - prikaz dodajanje lepega linka
+
+function toggleNiceURL(type) {
+
+	if (type == 'show') {
+		$("#nice_url_button").addClass('displayNone');
+		$("#nice_url_holder").removeClass('displayNone');
+	}
+	else if (type == 'hide') {
+		$("#nice_url_button").removeClass('displayNone');
+		$("#nice_url_holder").addClass('displayNone');
+	}
+}

lang/1.php

@@ -4289,7 +4289,10 @@ $lang = array (
 	"srv_publication_survey_links"		=> "Delite povezavo do ankete",
 	"srv_publication_survey_links_note"		=> "Spodaj je povezava do vprašalnika, kjer se podatki normalno shranjujejo v bazo. To povezavo sporočite dejanskim respondentom, denimo z objavo na družbenih omrežjih, forumih, prek e-maila, ipd.",
 	"srv_publication_survey_noactive_note"	=> "Če želite zbirati realne podatke, je anketo treba aktivirati.",
+	"srv_publication_survey_noactive_note2"	=> "Z aktiviranjem potrjujete <a href=\"#\" onclick=\"publishPopupOpen('settings')\">privzete nastavitve</a>.",
+	"srv_publication_survey_settings"	=> "Privzete nastavitve ankete",
 	"srv_publication_survey_grouplang"	=> "Povezave za skupine in jezike",
+	"srv_publication_survey_niceurl"	=> "Lepe URL povezave",
 	"srv_publication_survey_more"		=> "Več načinov deljenja ankete",
 	"srv_publication_survey_copylink"	=> "Kopiraj povezavo",
 	"srv_publication_advanced_url"		=> "Napredne URL povezave",
@@ -6187,7 +6190,8 @@ $lang = array (
 	'srv_te_survey_h_text'						=>	'Naslov ankete',
 	'srv_te_outer_frame'						=>	'Zunanji okvir',
 	'srv_te_question_text'						=>	'Besedilo vprašanja',
-	'srv_te_question_border'					=>	'Vprašanja',
+	'srv_te_question'							=>	'Vprašanja',
+	'srv_te_question_border'					=>	'Obroba',
 	'srv_te_question_border_0'					=>	'Brez',
 	'srv_te_question_border_1'					=>	'Črta',
 	'srv_te_question_border_2'					=>	'Okvir',

lang/2.php

@@ -4265,7 +4265,10 @@ $lang = array (
 	"srv_publication_survey_warnings"	=> "Survey has errors, warnings, recommendationsor unresolved comments which you can review here: ",
 	"srv_publication_survey_noactive"	=> "Your survey has not been activated yet",
 	"srv_publication_survey_noactive_note"	=> "To collect real data, the survey must be activated.",
+	"srv_publication_survey_noactive_note2"	=> "By activating the survey, you confirm the <a href=\"#\" onclick=\"publishPopupOpen('settings')\">default settings</a>.",
+	"srv_publication_survey_settings"	=> "Default survey settings",
 	"srv_publication_survey_grouplang"	=> "Group and language links",
+	"srv_publication_survey_niceurl"	=> "Custom URLs",
 	"srv_publication_survey_copylink"	=> "Copy link",
 	"srv_publication_survey_more"		=> "More ways to share the survey",
 	"srv_publication_survey_links"		=> "Share survey link",
@@ -6105,7 +6108,8 @@ $lang = array (
 	'srv_te_custom_font_style_keywords_bold'	=>  'Bold',
 	'srv_te_custom_font_style_keywords_italic'	=> 	'Italic',
 	'srv_te_custom_font_style_keywords_underline'=> 'Underline',
-	'srv_te_question_border'					=>	'Questions',
+	'srv_te_question'							=>	'Questions',
+	'srv_te_question_border'					=>	'Border',
 	'srv_te_question_border_0'					=>	'None',
 	'srv_te_question_border_1'					=>	'Line',
 	'srv_te_question_border_2'					=>	'Frame',

resources/fonts/FontAwesome5/scss/solid.scss

@@ -16,8 +16,25 @@
   url('#{$fa-font-path}/fa-solid-900.svg#fontawesome') format('svg');
 }
 
+@font-face {
+  font-family: 'Font Awesome 5 Brands';
+  font-style: normal;
+  font-weight: 400;
+  src: url('#{$fa-font-path}/fa-brands-400.eot');
+  src: url('#{$fa-font-path}/fa-brands-400.eot?#iefix') format('embedded-opentype'),
+  url('#{$fa-font-path}/fa-brands-400.woff2') format('woff2'),
+  url('#{$fa-font-path}/fa-brands-400.woff') format('woff'),
+  url('#{$fa-font-path}/fa-brands-400.ttf') format('truetype'),
+  url('#{$fa-font-path}/fa-brands-400.svg#fontawesome') format('svg');
+}
+
 .fa,
 .fas {
   font-family: 'Font Awesome 5 Free';
   font-weight: 900;
 }
+
+.fa-brands {
+  font-family: 'Font Awesome 5 Brands';
+  font-weight: 400;
+}

resources/sass/admin_new/basic/icons/icons.scss

@@ -1,9 +1,27 @@
+//navadne ikone
 span.faicon,
 a.faicon{
     font-family: $fontawesome;
     color: inherit;
     display: inline-block;
     font-weight: $heavy;
+}
+
+//fa-brands ikone
+span.fa-brands,
+a.fa-brands{
+    font-family: 'Font Awesome 5 Brands';
+    color: inherit;
+    display: inline-block;
+    font-weight: 400;
+}
+
+
+//Styling
+span.faicon,
+a.faicon,
+span.fa-brands,
+a.fa-brands {
     
     &.empty {
         font-weight: $regular;
@@ -93,6 +111,8 @@ div.icon_holder {
     //Ikone desno ob elementih
     span.faicon,
     a.faicon,
+    span.fa-brands,
+    a.fa-brands,
     button.ui-datepicker-trigger{
         margin-left: 12px;
     }
@@ -100,7 +120,9 @@ div.icon_holder {
     //Samo ikone - več ikon skupaj
     &.multiple {
         span.faicon,
-        a.faicon{
+        a.faicon,
+        span.fa-brands,
+        a.fa-brands{
             margin-left: 0;
             margin-right: 16px;
             &:last-of-type {
@@ -110,7 +132,6 @@ div.icon_holder {
     }
 }
 
-
 @import "radio";
 @import "standard";
 @import "modules";

resources/sass/admin_new/basic/icons/standard.scss

@@ -691,7 +691,7 @@ span.faicon.link-chain::before{
 }
 
 //HTML5
-span.faicon.html5::before{
+span.fa-brands.html5::before{
         content: "\f13b";
 }
 
@@ -705,3 +705,7 @@ span.faicon.checkbox-empty::before{
     content: "\f0c8";
     font-weight: 400 !important;
 }
+
+span.faicon.fa-1::before{
+        content: "\31";
+}

resources/sass/admin_new/pages/my_surveys/objava.scss

@@ -163,6 +163,7 @@ div#vabila {
         
         button {
             margin: 0 32px 0 8px;
+            min-width: 114px;
         }
 
         div.input_box {
@@ -178,10 +179,39 @@ div#vabila {
                 width: 90%
             }
         }
+
+        //Nice URL
+        div#nice_url_holder {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+
+            input {
+                margin: 0 8px;
+                width: 200px;
+            }
+
+            button {
+                margin-right: 8px;
+            }
+        }
+    }
+
+    div#nice_url_error {
+        width: 100%;
+        text-align: right;
     }
 
     //Seznam linkov za skupine/jezike
-    div.grouplang {
+    p.survey_links {
+        margin-top: 16px;
+        &:first-of-type {
+            margin-top: 0;
+        }
+    }
+
+    div.grouplang,
+    div.niceurl {
         margin-top: 16px;
         display: flex;
         align-items: center;
@@ -245,7 +275,7 @@ div#vabila {
 
                     position: relative;
 
-                    span.stopwatch20 {
+                    span.fa-1 {
                         font-size: 8px;
                         position: absolute;
 
@@ -254,9 +284,28 @@ div#vabila {
                     }
                 }
 
+                a.help {
+                    color: inherit;
+                    text-decoration: none;
+                    margin-left: 5px;
+                }
+                
             }
 
         }
     }
 
 }
+
+// Več načinov deljenja - popup
+
+div.popup_content {
+    &.publish {
+        textarea {
+            width: 568px;
+            padding: 8px;
+            display: block;
+            overflow: auto;
+        }
+    }
+}

resources/sass/admin_new/pages/my_surveys/oblika_teme.scss

@@ -313,7 +313,9 @@ div#theme-edit-wrap{
             flex-direction: row;
             width: 80%;
 
-            gap: 32px 16px;
+            font-size: 14px !important;
+
+            gap: 32px;
 
             &.top16 {
                 margin-top: 16px;
@@ -365,6 +367,8 @@ div#theme-edit-wrap{
             position: fixed;
             left: 500px;
             z-index: 999;
+            border-radius: 2px;
+            box-shadow: 0px 0px 5px 0px $dark-gray;
         }
 
         div.button_holder {