diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index 3835a53a2..09d6c5ac9 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -3541,14 +3541,17 @@ class SurveyAdmin
     private function displaySeznamAnket(){
         global $lang, $site_url, $global_user_id, $admin_type, $site_domain;
 
+
         # naložimo razred z seznamom anket
-        $SL = new SurveyList();
+        $SL = ($has_folders = SurveyList::hasFolders()) ? new SurveyListFolders() : new SurveyList();
+
+
         $SLCount = $SL->countSurveys();
         $SLCountPhone = $SL->countPhoneSurveys();
 
 
         // VSEBINA POSAMEZNEGA TABA PRI MOJIH ANKETAH 
-        echo '<div id="moje_ankete_edit" class="page_'.$_GET['a'].' subpage_'.$_GET['t'].' '.(isset($_GET['b']) ? 'subpage_b_'.$_GET['b'] : '').' '.($SLCount == 0 ? 'page_ustvari_anketo' : '').' '.($SLCount > 0 && $SL->hasFolders() ? 'moje_ankete_folders' : '').' '.$this->layout_width.' '.$this->layout_menu.'">';
+        echo '<div id="moje_ankete_edit" class="page_'.$_GET['a'].' subpage_'.$_GET['t'].' '.(isset($_GET['b']) ? 'subpage_b_'.$_GET['b'] : '').' '.($SLCount == 0 ? 'page_ustvari_anketo' : '').' '.($SLCount > 0 && $has_folders ? 'moje_ankete_folders' : '').' '.$this->layout_width.' '.$this->layout_menu.'">';
 
         // izpis pregledovanja
         if ((!isset($_GET['a']) && !isset($_GET['anketa'])) || ($_GET['a'] == 'pregledovanje')) { 
diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index 50a3cf07d..d89a2816a 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -4087,13 +4087,17 @@ class SurveyAdminAjax {
 			// shranimo nastavitve
 			UserSetting::getInstance()->saveUserSetting();
 			
-			$SL = new SurveyList();
+            $SL = (SurveyList::hasFolders()) ? new SurveyListFolders() : new SurveyList();
+
 			$SL->getSurveys();
 		}
 		elseif ($_GET['a'] == 'surveyListFilter') {
-			// setiramo nastavitve v UserSetting
-			$SL = new SurveyList();
-			$SL -> setFilter();
+			
+            // setiramo nastavitve v UserSetting
+			$SL = (SurveyList::hasFolders()) ? new SurveyListFolders() : new SurveyList();
+
+			$SL->setFilter();
+
 			$SL->getSurveys();
 		}
 		elseif ($_GET['a'] == 'default_surveyListSettings') {
@@ -4120,8 +4124,10 @@ class SurveyAdminAjax {
 			if ($_POST['sortby'] != "" )
 				UserSetting::getInstance()->setUserSetting('survey_list_order_by', $_POST['sortby']. ",".$_POST['sorttype']);
 
-			$SL = new SurveyList();
+            $SL = (SurveyList::hasFolders()) ? new SurveyListFolders() : new SurveyList();
+
 			$SL->saveCssSettings($_POST['data']);
+
 			$SL->getSurveys();
 		}
 		elseif ($_GET['a'] == 'surveyList_goTo') {
@@ -4130,7 +4136,7 @@ class SurveyAdminAjax {
 				UserSetting::getInstance()->setUserSetting('survey_list_order_by', $_POST['sortby']. ",".$_POST['sorttype']);
 			UserSetting::getInstance()->saveUserSetting();
 			
-			$SL = new SurveyList();
+			$SL = (SurveyList::hasFolders()) ? new SurveyListFolders() : new SurveyList();
 			$SL->getSurveys();
 			
 		}
@@ -4141,37 +4147,37 @@ class SurveyAdminAjax {
 			UserSetting::getInstance()->setUserSetting('survey_list_folders', $val);
 			UserSetting::getInstance()->saveUserSetting();
 			
-			$SL = new SurveyList();
+			$SL = (SurveyList::hasFolders()) ? new SurveyListFolders() : new SurveyList();
 			$SL->getSurveys();
 			
 		}
 		elseif ($_GET['a'] == 'surveyList_user') {
 
-			$SL = new SurveyList();
+			$SL = (SurveyList::hasFolders()) ? new SurveyListFolders() : new SurveyList();
+
 			$SL -> setUserId();
 			$SL->getSurveys();
-			
 		}
 		elseif ($_GET['a'] == 'surveyList_language') {
 
-			$SL = new SurveyList();
+			$SL = (SurveyList::hasFolders()) ? new SurveyListFolders() : new SurveyList();
+            
 			$SL -> setUserLanguage();
 			$SL->getSurveys();
-			
         }
         elseif ($_GET['a'] == 'surveyList_gdpr') {
 
-			$SL = new SurveyList();
+			$SL = (SurveyList::hasFolders()) ? new SurveyListFolders() : new SurveyList();
+
 			$SL -> setUserGDPR();
 			$SL->getSurveys();
-			
 		}
 		elseif ($_GET['a'] == 'surveyList_library') {
 
-			$SL = new SurveyList();
+			$SL = (SurveyList::hasFolders()) ? new SurveyListFolders() : new SurveyList();
+
 			$SL -> setUserLibrary();
 			$SL->getSurveys();
-			
 		}
 		elseif ($_GET['a'] == 'survey_chaneg_type') {
 			global $site_url;
diff --git a/admin/survey/ajax.php b/admin/survey/ajax.php
index a181afd8d..f0ad1cd3a 100644
--- a/admin/survey/ajax.php
+++ b/admin/survey/ajax.php
@@ -510,7 +510,7 @@ elseif ($_GET['t'] == 'surveyList') {
 } 
 elseif ($_GET['t'] == 'surveyListFolders') {
 	$SL = new SurveyListFolders();
-	$SL->Ajax();    
+	$SL->ajax();    
 } 
 elseif ($_GET['t'] == 'library') {
     $l = new Library();
diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php
index 3d06bafde..ba025639f 100644
--- a/admin/survey/classes/class.SurveyList.php
+++ b/admin/survey/classes/class.SurveyList.php
@@ -21,55 +21,55 @@ if(session_id() == '') {session_start();}
 
 class SurveyList {
 	
-	private $surveys_ids = array();					# array z id-ji anket
-	private $settingsArray = array();				# array z nastavitvami
+	protected $surveys_ids = array();					# array z id-ji anket
+	protected $settingsArray = array();				# array z nastavitvami
 
-	private $parentFolder;							# osnovni direktorij
-	private $currentFolder;							# trenutni direktorij
-	private $folders = array();						# array z direktoriji
+	protected $parentFolder;							# osnovni direktorij
+	protected $currentFolder;							# trenutni direktorij
+	protected $folders = array();						# array z direktoriji
 	
-	private $user_id = null;						# ali filtriramo po userju
-	private $g_uid = null;							# globalna nastavitev user_id
-	private $g_adminType = null;					# globalna nastavitev adminType
+	protected $user_id = null;						# ali filtriramo po userju
+	protected $g_uid = null;							# globalna nastavitev user_id
+	protected $g_adminType = null;					# globalna nastavitev adminType
 	
 	
-	private $onlyPhone = false;						# Ali prikazujemo samo telefonske ankete
+	protected $onlyPhone = false;						# Ali prikazujemo samo telefonske ankete
 	
-    private $lang_id = 0;							# nastavitev languageType
+    protected $lang_id = 0;							# nastavitev languageType
     
-	private $gdpr = 0;							    # nastavitev gdpr filter za ankete
+	protected $gdpr = 0;							    # nastavitev gdpr filter za ankete
 
-	private $dostopCondition = null;				# shranimo omejitve dostopa (glede na tip uporabnika in uporabniški uid)
-	private $folderCondition = null;				# shranimo omejevanja folderjev
+	protected $dostopCondition = null;				# shranimo omejitve dostopa (glede na tip uporabnika in uporabniški uid)
+	protected $folderCondition = null;				# shranimo omejevanja folderjev
 	
-	private $libraryCondition = null;				# shranimo novo omejevanje folderjev (moja knjiznica)
-	private $currentLibrary;						# trenutni direktorij moje knjiznice
+	protected $libraryCondition = null;				# shranimo novo omejevanje folderjev (moja knjiznica)
+	protected $currentLibrary;						# trenutni direktorij moje knjiznice
 	
-	private $filter = null;							# filter za ime ankete
+	protected $filter = null;							# filter za ime ankete
 	
-	private $show_folders = 0;						# ali prikazujemo mape ali ne (default zaenkrat da)
+	protected $show_folders = 0;						# ali prikazujemo mape ali ne (default zaenkrat da)
 	
 	
-	private $isSearch = 0;							# ali izvajamo search po anektah
-	private $searchString = '';						# geslo po katerem iscemo po anketah
-	private $searchStringProcessed = array();			# geslo po katerem iscemo po anketah, obdelano (skrajsano da isce tudi po drugih sklanjatvah)
-	private $searchSettings = array();				# nastavitve searcha
+	protected $isSearch = 0;							# ali izvajamo search po anektah
+	protected $searchString = '';						# geslo po katerem iscemo po anketah
+	protected $searchStringProcessed = array();			# geslo po katerem iscemo po anketah, obdelano (skrajsano da isce tudi po drugih sklanjatvah)
+	protected $searchSettings = array();				# nastavitve searcha
 	
 	
 	# privzete nastavitve
-	private $pageno = 1;							# na kateri strani navigacije smo 
-	private $max_pages = 1;							# koliko strani imamo
-	private $sortby = SRV_LIST_ORDER_BY;			# id polja po katerem sortiramo
-	private $sorttype = SRV_LIST_ORDER_TYPE;		# tip sortiranja 1= deac, 0 = asc
-	private $rec_per_page = SRV_LIST_REC_PER_PAGE;	# število zapisov na stran
-	private $orderByText = false;					# ali sortiramo po tekstovnem polju (takrat uporabimo upper)
+	protected $pageno = 1;							# na kateri strani navigacije smo 
+	protected $max_pages = 1;							# koliko strani imamo
+	protected $sortby = SRV_LIST_ORDER_BY;			# id polja po katerem sortiramo
+	protected $sorttype = SRV_LIST_ORDER_TYPE;		# tip sortiranja 1= deac, 0 = asc
+	protected $rec_per_page = SRV_LIST_REC_PER_PAGE;	# število zapisov na stran
+	protected $orderByText = false;					# ali sortiramo po tekstovnem polju (takrat uporabimo upper)
 	
 	# privzete možnosti
-	private $sort_types_options = array(1=>'DESC',2=>'ASC'); 	# možni načini sortiranja
-	private $appropriateStatus = '5,6';							# statusi ki veljajo kot ustrezni
+	protected $sort_types_options = array(1=>'DESC',2=>'ASC'); 	# možni načini sortiranja
+	protected $appropriateStatus = '5,6';							# statusi ki veljajo kot ustrezni
 	
 	# možni načini sortiranja
-	private $order_by_options = array(
+	protected $order_by_options = array(
 		1=>'naslov', 	
 		2=>'active',
 		3=>'lib_glb',
@@ -95,7 +95,7 @@ class SurveyList {
 	);
 										
 	# polja za prikaz									
-	private $dataFields = array(
+	protected $dataFields = array(
 		1=>array('id'=>1,'visible'=>1,'order_by'=>'naslov','header_field'=>'sl_naslov','alsoResize'=>'.sl_naslov','minWidth'=>100,'data_field'=>'naslov','data_type'=>'naslov', 'data_css'=>'sl_naslov_padding', 'order_text'=>true),
 		2=>array('id'=>2,'visible'=>1,'order_by'=>'active','header_field'=>'sl_active','lang_label'=>'sl_active_1','alsoResize'=>'.sl_active','minWidth'=>20,'maxWidth'=>30,'data_field'=>'active','data_type'=>'active','data_css'=>'anl_ac'),
 		3=>array('id'=>3,'visible'=>0,'order_by'=>'lib_glb','header_field'=>'sl_lib_glb','lang_label'=>'sl_lib_glb_1','alsoResize'=>'.sl_lib_glb','minWidth'=>20,'maxWidth'=>30,'data_field'=>'lib_glb','data_type'=>'lib_glb','data_css'=>'anl_ac'),
@@ -229,9 +229,18 @@ class SurveyList {
 	
 	
     // Vrnemo, ce imamo vklopljene folderje ali ne
-    public function hasFolders(){
+    public static function hasFolders(){
+        global $global_user_id;
 
-        if($this->show_folders == '1')
+        $show_folders = 0;
+
+        $userAccess = UserAccess::getInstance($global_user_id);
+        $detect = New Mobile_Detect();
+
+        if($userAccess->checkUserAccess('my_survey_folders') && !$detect->isMobile() && !$detect->isTablet())
+		    $show_folders = UserSetting::getInstance()->getUserSetting('survey_list_folders');
+
+        if($show_folders == '1')
             return true;
         else
             return false;
@@ -889,16 +898,6 @@ class SurveyList {
 		global $global_user_id;
 		global $lang;
 				
-
-        // Prikaz novih folderjev - V DELU
-        /*if($this->show_folders == 1){
-            
-            $surveyFolders = new SurveyListFolders();
-            $surveyFolders->display();
-
-            return;
-        }*/
-
         
 		// Gumba za ustvarjanje ankete - nekatere niso prikazane pri searchu
 		if($this->isSearch != 1){
@@ -1506,7 +1505,7 @@ class SurveyList {
 	}
 	
 	// Prikazemo gumb za sortiranje seznama anket
-	private function displaySortButton(){
+	protected function displaySortButton(){
 		global $lang, $site_url;
 		
 		echo $lang['orderby'];
@@ -1539,7 +1538,7 @@ class SurveyList {
 	}
 	
 	// Prikazemo gumb za filtriranje seznama anket
-	private function displayFilterButton(){
+	protected function displayFilterButton(){
 		global $lang, $site_url, $admin_languages;
 		
 		echo '<div id="filterButton" '.(($this->user_id || $this->lang_id != 0 || $this->gdpr != 0) ? 'class="active"' : '').'>';
@@ -1593,7 +1592,7 @@ class SurveyList {
 	}
 	
 	// Prikazemo preklop med navadnim pogledom in pogledom s folderji
-	private function displayFolderSwitch(){			
+	protected function displayFolderSwitch(){			
         global $lang, $global_user_id;
         
         // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
@@ -1628,7 +1627,7 @@ class SurveyList {
 	}
 	
 	// Prikazemo nastavitve za napredno iskanje ce iscemo po anketah
-	private function displaySearchSettings(){
+	protected function displaySearchSettings(){
 		global $lang;
 		global $site_url;
 
@@ -2092,7 +2091,7 @@ class SurveyList {
 		return $result;
 	}
 	
-	private function createOrderUrlNew($id=null, $txt) {
+	protected function createOrderUrlNew($id=null, $txt) {
 		global $site_url;
 		
 		if (!isset($id) || $id == null || $id == "") { 
@@ -2441,7 +2440,7 @@ class SurveyList {
 	}
 	
 	/** vrne sql string za omejevanje dostopa uporabniku */
-	function getLanguageLimit()	{
+	protected function getLanguageLimit()	{
         global $global_admin_type;
         
 		if ((int)$this->lang_id > 0) {
@@ -2450,7 +2449,7 @@ class SurveyList {
 	}
 	
 	/** vrne sql string za omejevanje dostopa uporabniku */
-	function getDostopAnketa()	{
+	protected function getDostopAnketa()	{
 		global $global_admin_type;
 		global $global_user_id;
 		
@@ -2503,7 +2502,7 @@ class SurveyList {
 	}
 	
 	/** vrne order string za SQL s katerim sortiramo */
-	private function getOrderString() {
+	protected function getOrderString() {
 		
 		if (!isset($this->sortby) || (int)$this->sortby == 0) {
 			$this->sortby = SRV_LIST_ORDER_BY;
@@ -2536,13 +2535,13 @@ class SurveyList {
 	}
 	
 	/** vrne Limit string za SQL s katerim prika?emo posamezno stran */
-	private function getLimitString() {
+	protected function getLimitString() {
 		$result = " LIMIT " . ($this->pageno * $this->rec_per_page - $this->rec_per_page) . ", " . $this->rec_per_page;
 		return $result;
 	}
 	
 	// vrne sql string za search po anketah glede na nastavitve searcha
-	private function getSearchString(){
+	protected function getSearchString(){
 
 		$search_text = mysqli_real_escape_string($GLOBALS['connect_db'], $this->searchString);
         $search_text = stripslashes(stripslashes($search_text));
@@ -2641,7 +2640,7 @@ class SurveyList {
 	}
 	
 	// Dobimo vse parametri searcha
-	private function getSearchParams(){
+	protected function getSearchParams(){
 		global $site_url;
 
 		$params = '';
diff --git a/admin/survey/classes/class.SurveyListFolders.php b/admin/survey/classes/class.SurveyListFolders.php
index b20547be3..fd9412b2b 100644
--- a/admin/survey/classes/class.SurveyListFolders.php
+++ b/admin/survey/classes/class.SurveyListFolders.php
@@ -5,34 +5,34 @@
  */
 
 
-class SurveyListFolders {
+class SurveyListFolders extends SurveyList{
 
-
-    private $current_folder = 0;            // Trenutni odprt folder
-    private $pageno = 1;                    // Trenutna stran (paginacija)
-
-											
-	public function __construct() {
-		global $admin_type, $global_user_id, $site_path;
-
-
-	}
+    
+    private $current_folder = array();
 			
 
 	// Prikazemo pogled s folderji
-	public function display() {
+	public function getSurveys() {
 		global $global_user_id;
 		global $lang;			
 
+
+        // Nastavimo trenutni folder na root
+        $this->current_folder = array(
+            'id'        => 0,
+            'naslov'    => $lang['srv_mySurvey_all_surveys']
+        );
+
+
         echo '<div class="survey_list_folders">';
 
         // Levi meni s folderji
-        echo '  <div class="left_content">';
+        echo '  <div id="left_content" class="left_content">';
         $this->displayLeftContent();
         echo '  </div>';
         
         // Desna vsebina
-        echo '  <div class="right_content">';
+        echo '  <div id="right_content" class="right_content">';
         $this->displayRightContent();
         echo '  </div>';
 
@@ -95,12 +95,12 @@ class SurveyListFolders {
 
             // Nastavimo, ce je to trenutno odprt folder
             if($row['active'] == '1')
-                $this->current_folder = $row['id'];            
+                $this->current_folder = $row;            
         }
 
 
         // Izrisemo folder box
-        echo '<div id="folder_item_'.$folder_id.'" class="folder_item">';
+        echo '<div id="folder_item_'.$folder_id.'" class="folder_item" onClick="mysurvey_folder_activate(\''.$folder_id.'\');">';
         
         echo '<span class="faicon arrow"></span>';
         echo '<span class="faicon folder"></span>';
@@ -124,20 +124,42 @@ class SurveyListFolders {
     private function displayRightContent(){
         
         // Naslov trenutnega folderja
-        echo '      <div class="folder_title">';
+        echo '<div class="folder_title">';
         $this->displayFolderTitle();
-        echo '      </div>';
+        echo '</div>';
 
-        // Vrstica z gumbi, filtri
-        echo '      <div class="second_line">';
-        $this->displayButtonsRow();
-        echo '      </div>';
+
+        // Vrstica z gumbi, filtri - niso prikazane pri searchu
+        echo '<div class="second_line">';
+
+		if($this->isSearch != 1){	
+            $this->displayButtonsRow();
+		}
+        else{
+            // Okno z nastavitvami searcha
+            echo '<div id="searchSettings">';
+            $this->displaySearchSettings();
+            echo '</div>';
+        }
+        
+        echo '</div>';
+        
         
 		// Izris seznama anket      
         echo '<div class="div_sl_new folders">';
-        $this->displaySurveyTable();
+        $this->displayNewSurveyList();
         echo '</div>';
 
+        // Paginacija - se na dnu - ni prikazana pri searchu
+        if($this->isSearch != 1){
+            echo '<div class="pagination_bottom_holder">';
+            echo '  <div class="pagination bottom">';
+            $this->displayPagiantion();
+            echo '  </div>';
+            echo '</div>';
+        }
+
+
         // Footer
         echo '<footer id="srv_footer" class="folders_footer">';
         $this->displayFooter();
@@ -147,248 +169,153 @@ class SurveyListFolders {
     // Naslov folderja na vrhu
     private function displayFolderTitle(){
 
+        echo '<span class="faicon folder"></span>';
+        echo $this->current_folder['naslov'];
     }
 
     // Izpisemo vrstico z gombi na vrhu (ustvari novo anketo, filtri...)
     private function displayButtonsRow(){
         
-        // Gumb za ustvarjanje ankete	        
+        // Gumb za ustvarjanje ankete	    
+        echo '<div class="create_buttons">';
         $this->new_anketa_div();
+        echo '</div>';
 
 
         // Filtri na desni
-        echo '  <div class="filters">';
+        echo '<div class="filters">';
+
+        // Preklop na pogled s folderji (samo ce imamo nov vmesnik)
+        //echo '<div id="folderSwitch">';
+        $this->displayFolderSwitch();
+        //echo '</div>';
 
         // Okno za search po mojeih anketah
         echo '  <div id="searchMySurveys">';
         $this->displaySearch();	
         echo '  </div>';
         
-        // Preklop na pogled s folderji (samo ce imamo nov vmesnik)
-        //echo '<div id="folderSwitch">';
-        $this->displayFolderSwitch();
-        //echo '</div>';
-
+        /*
         // Gumb za filtriranje
         //echo '<div id="filterButton">';
         $this->displayFilterButton();
         //echo '</div>';
     
         // Gumb za sortiranje
-        echo '      <div id="sortButton">';
+        echo '  <div id="sortButton">';
         $this->displaySortButton();
-        echo '      </div>';
-
         echo '  </div>';
+        */
+
+        echo '</div>';
     }
 
-    // Kreacija nove ankete
-    private function new_anketa_div(){
+    // Izpisemo footer
+    private function displayFooter(){
         global $lang;
-        global $admin_type;
-        global $site_url;
+        global $site_frontend;
+        global $mysql_database_name;
 
-        echo '<a href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo" title="'.$lang['srv_create_survey'].'">';
-        echo '  <button class="large blue button_create">';
-        echo $lang['srv_create_survey'];
-        echo '  </button>';
-        echo '</a>';
 
-        // uporabniki z vklopljeno moznostjo imajo tudi hitro ustvarjanje ankete (brez vnosa imena in izbire skina)
-        $oneclickCreateMySurveys = UserSetting::getInstance()->getUserSetting('oneclickCreateMySurveys');
-        if ($oneclickCreateMySurveys == 1) {
-            echo '<div class="button_quick_create">';
-            echo '  <a href="#" onclick="newAnketaBlank();" title="'.$lang['one_click_create'].'">';
-            echo '      <span class="faicon add"></span><span>'.$lang['one_click_create'].'</span>';
-            echo '  </a>';
+        // Leva stran footerja
+        echo '<div class="footer_left">';
+        
+        // Custom footer
+        if(AppSettings::getInstance()->getSetting('app_settings-footer_custom') !== false){
+            echo '<div class="footer_line">';
+            echo AppSettings::getInstance()->getSetting('app_settings-footer_text');
             echo '</div>';
         }
-    }
-
-    // Prikazemo preklop med navadnim pogledom in pogledom s folderji
-	private function displayFolderSwitch(){			
-        global $lang, $global_user_id;
-        
-        // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
-        $userAccess = UserAccess::getInstance($global_user_id);
-        
-        // Ce ni na voljo
-        if(!$userAccess->checkUserAccess('my_survey_folders')){
-            echo '<div title="'.$lang['srv_mySurvey_show_folders_desc'].'" id="folderSwitch" class="user_access_locked" onClick="popupUserAccess(\'my_survey_folders\');">';
-            echo $lang['srv_mySurvey_show_folders'];
-		    echo '</div>';
-        }
+        // Default footer
         else{
-            echo '<div title="'.$lang['srv_mySurvey_show_folders_desc'].'" id="folderSwitch" onClick="switchFolder(\''.$this->show_folders.'\');">';
-            echo '  <span>'.$lang['srv_mySurvey_show_folders'].'</span>';
 
-            // Stikalo za folderje
-            if($this->show_folders == 1)
-                echo '  <div class="switch_folders on"></div>';
-            else
-                echo '  <div class="switch_folders off"></div>';
+            // First left line - links
+            echo '<div class="footer_line">';
 
-		    echo '</div>';
-        }	
-	}
-
-    // Prikazemo gumb za sortiranje seznama anket
-	private function displaySortButton(){
-		global $lang, $site_url;
-		
-		echo $lang['orderby'];
-				
-		echo '<div id="sortSettings">';
-		
-		echo '<ul>';
-		
-		if($this->sorttype == 2){
-			$sort = 1;
-			$img_src = 'sort_ascending';
-		} 
-		else{
-			$sort = 2;
-			$img_src = 'sort_descending';
-		}
-		
-		echo '<li '.($this->sortby == 1 ? ' class="active"' : '').'><a href="#" onClick="surveyList_goTo(\'1\',\''.($this->sortby != 1 ? '1' : $sort).'\')">'.$lang['sort_by_title'].' <span class="faicon '.($this->sortby != 1 ? 'sort_unsorted' : $img_src).'"></span></a></li>';
-		echo '<li '.($this->sortby == 6 ? ' class="active"' : '').'><a href="#" onClick="surveyList_goTo(\'6\',\''.($this->sortby != 6 ? '1' : $sort).'\')">'.$lang['sort_by_qcount'].' <span class="faicon '.($this->sortby != 6 ? 'sort_unsorted' : $img_src).'"></span></a></li>';
-		echo '<li '.($this->sortby == 5 ? ' class="active"' : '').'><a href="#" onClick="surveyList_goTo(\'5\',\''.($this->sortby != 5 ? '1' : $sort).'\')">'.$lang['sort_by_answercount'].' <span class="faicon '.($this->sortby != 5 ? 'sort_unsorted' : $img_src).'"></span></a></li>';
-		echo '<li '.($this->sortby == 16 ? ' class="active"' : '').'><a href="#" onClick="surveyList_goTo(\'16\',\''.($this->sortby != 16 ? '1' : $sort).'\')">'.$lang['sort_by_insert'].' <span class="faicon '.($this->sortby != 16 ? 'sort_unsorted' : $img_src).'"></span></a></li>';
-		echo '<li '.($this->sortby == 14 ? ' class="active"' : '').'><a href="#" onClick="surveyList_goTo(\'14\',\''.($this->sortby != 14 ? '1' : $sort).'\')">'.$lang['sort_by_edit'].' <span class="faicon '.($this->sortby != 14 ? 'sort_unsorted' : $img_src).'"></span></a></li>';
-		echo '<li '.($this->sortby == 18 ? ' class="active"' : '').'><a href="#" onClick="surveyList_goTo(\'18\',\''.($this->sortby != 18 ? '1' : $sort).'\')">Status <span class="faicon '.($this->sortby != 18 ? 'sort_unsorted' : $img_src).'"></span></a></li>';
-		echo '<li '.($this->sortby == 7 ? ' class="active"' : '').'><a href="#" onClick="surveyList_goTo(\'7\',\''.($this->sortby != 7 ? '1' : $sort).'\')"><li '.($this->sortby == 7 ? ' class="active"' : '').'>'.$lang['sort_by_author'].' <span class="faicon '.($this->sortby != 7 ? 'sort_unsorted' : $img_src).'"></span></a></li>';
-		echo '<li '.($this->sortby == 11 ? ' class="active"' : '').' style="border:0;"><a href="#" onClick="surveyList_goTo(\'11\',\''.($this->sortby != 11 ? '1' : $sort).'\')">'.$lang['sort_by_editor'].' <span class="faicon '.($this->sortby != 11 ? 'sort_unsorted' : $img_src).'"></span></a></li>';
-		
-		echo '</ul>';
-		
-		echo '</div>';
-	}
-	
-	// Prikazemo gumb za filtriranje seznama anket
-	private function displayFilterButton(){
-		global $lang, $site_url, $admin_languages;
-		
-		echo '<div id="filterButton" '.(($this->user_id || $this->lang_id != 0 || $this->gdpr != 0) ? 'class="active"' : '').'>';
-		
-		echo $lang['srv_analiza_filter'];
-		
-		echo '<div id="filterSettings">';		
-		echo '<ul>';
-               
-		# filter po uporabniku
-		echo '<li>';
-		
-		echo '<span class="filter_title">'.$lang['srv_list_author'].'</span>';
-		
-		// Ce preklapljamo v searchu moramo refreshati celo stran (druga js funkcija)
-		$reload = ($this->isSearch == 1) ? '_reload' : '';
-		
-		echo '<span class="filter_line"><input type="radio" name="filter_mySurveys" id="filter_mySurveys_0" value="0" '.(!$this->user_id ? 'checked="checked"' : '').' onclick="surveyList_user'.$reload.'(\'clr\',\'0\');"> <label for="filter_mySurveys_0">'.$lang['srv_list_all_surveys'].'</label></span>';
-		echo '<span class="filter_line"><input type="radio" name="filter_mySurveys" id="filter_mySurveys_1" value="1" '.($this->user_id ? 'checked="checked"' : '').' onclick="surveyList_user'.$reload.'(\'uid\',\''.$this->g_uid.'\');"> <label for="filter_mySurveys_1">'.$lang['srv_list_my_surveys'].'</label></span>';
-				
-		echo '</li>';
-        
-        
-		# filter po jeziku
-		echo '<li>';	
-		
-		echo '<span class="filter_title">'.$lang['srv_sl_set_language'].'</span>';
-		
-		echo '<span class="filter_line"><input type="radio" name="filter_language" id="filter_language_0" value="0" '.((int)$this->lang_id == 0 ? 'checked="checked"' : '').' onclick="surveyList_language'.$reload.'(\'0\');"> <label for="filter_language_0">'.$lang['srv_sl_set_language_all'].'</label></span>';
-		echo '<span class="filter_line"><input type="radio" name="filter_language" id="filter_language_1" value="1" '.((int)$this->lang_id == 1 ? 'checked="checked"' : '').' onclick="surveyList_language'.$reload.'(\'1\');"> <label for="filter_language_1">'.$admin_languages['1'].'</label></span>';
-		echo '<span class="filter_line"><input type="radio" name="filter_language" id="filter_language_2" value="2" '.((int)$this->lang_id == 2 ? 'checked="checked"' : '').' onclick="surveyList_language'.$reload.'(\'2\');"> <label for="filter_language_2">'.$admin_languages['2'].'</label></span>';
-		
-        echo '</li>';	
+            echo $lang['srv_footer_links'];
+            
+            if(isAAI())
+                echo '<span class="footer_item"><a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/pogosta-vprasanja-o-arnes-aai-prijavi-uporabi-orodja-1ka" target="_blank">'.$lang['aa4'].'</a></span>';
+            
+            echo '</div>';
 
 
-        # filter po GDPR anketah
-		echo '<li>';	
-		
-		echo '<span class="filter_title">'.$lang['srv_gdpr'].'</span>';
-		
-		echo '<span class="filter_line"><input type="radio" name="filter_gdpr" id="filter_gdpr_0" value="0" '.((int)$this->gdpr == 0 ? 'checked="checked"' : '').' onclick="surveyList_gdpr'.$reload.'(\'0\');"> <label for="filter_gdpr_0">'.$lang['srv_list_all_surveys'].'</label></span>';
-		echo '<span class="filter_line"><input type="radio" name="filter_gdpr" id="filter_gdpr_1" value="1" '.((int)$this->gdpr == 1 ? 'checked="checked"' : '').' onclick="surveyList_gdpr'.$reload.'(\'1\');"> <label for="filter_gdpr_1">'.$lang['srv_list_gdpr_gdpr'].'</label></span>';
-		
-        echo '</li>';	
-        
-		
-		echo '</ul>';			
-		echo '</div>';
-		
-		echo '</div>';
-	}
+            // Second left line - version...
+            echo '<div class="footer_line">';
 
-    // Prikazemo search okno za iskanje po anketah
-	public function displaySearch(){
-		global $lang;
-		global $site_url;
-		
-		echo '<form method="GET" id="1kasmysurvey" action="'.$site_url.'admin/survey/index.php">';      
-	    
-        echo '<input id="searchMySurvey" type="text" value="" placeholder="'.$lang['s_search_mySurvey'].'" name="search" />';
-		
-		echo '	<button class="medium white-black" onclick="$(\'#1kasmysurvey\').submit(); return false;">';
-		echo $lang['s_search2'];
-		echo '	</button>';
-          		
-		echo '</form>';
-	}
+            // Verzijo izpišemo samo za admine
+            if ($admin_type == 0) {   
+                
+                // Verzija 1ka
+                $sqlVersion = sisplet_query("SELECT value FROM misc WHERE what='version'", "obj");
+                if (!empty($sqlVersion)) {
+                    echo '<span class="footer_item">'.$lang['srv_footer_1ka_version'].': ' . $sqlVersion->value . '</span>';
+                }
 
-    // Izpisemo tabelo z anketami v folderju
-    private function displaySurveyTable(){
-        
-        // Loop po vseh folderjih prvega nivoja - samo na prvi strani
-        if($this->pageno == 1){
-
-            // Plus za dodajanje folderja
-            echo '<div class="folder_add_first"><a href="#" title="'.$lang['srv_mySurvey_create_folder'].'" onClick="create_folder(\''.$folder['id'].'\'); return false;">';
-            echo '  <span class="faicon add"></span><span>'.$lang['srv_mySurvey_create_folder'].'</span>';
-            echo '</a></div>';
-        
-            $sql = sisplet_query("SELECT * FROM srv_mysurvey_folder WHERE usr_id='$global_user_id' AND parent='0' ORDER BY naslov ASC");
-            if(mysqli_num_rows($sql) > 0) {
-                while($row = mysqli_fetch_array($sql)){
-                    echo '<div id="folder_holder_'.$row['id'].'" class="folder_holder level1">';
-                    $this->displayNewFolder($row);
-                    echo '</div>';
+                // Verzija Drupal
+                if ($site_frontend == 'drupal') {
+                    $sqlDrupal = sisplet_query("SELECT value FROM misc WHERE what='drupal version'", "obj");
+                    if (!empty($sqlDrupal)) {
+                        echo '<span class="footer_item">Drupal: ' . $sqlDrupal->value . '</span>';
+                    }
                 }
             }
+        
+            echo '<span class="footer_item">Copyright (©) 2002-'.date('Y').' '.$lang['srv_footer_copyright'].'</span>';
+
+            echo '</div>';
         }
-        
-        // Na koncu se izpisemo ankete ki niso v nobenem folderju
-        $row = array('id'=>0, 'naslov'=>$lang['srv_mySurvey_unallocated']);
-        echo '<div id="folder_holder_0" class="folder_holder level1">';
-        $this->displayNewFolder($row);
+
         echo '</div>';
+
+
+        // Desna stran footerja - report a bug
+        echo '<div id="reportabug" class="footer_right">';
         
-        echo '<script type="text/javascript">surveyList_folder_init();</script>';
+        // www.1ka.si ima se link na go instrukcije
+        if($mysql_database_name == 'real1kasi' || $mysql_database_name == 'test1kasi' || $mysql_database_name == 'test21kasi'){
 
-        // Klik izven "Vec" - zapremo okno
-        echo '<script>
-            $(document).mouseup(function(e){
-                var container = $(".survey_other_box, .dots");
-            
-                if (!container.is(e.target) && container.has(e.target).length === 0){
-                    $(".survey_other_box").addClass("displayNone");
-                }
-            });
-        </script>';
+            echo '<a href="#" onClick="consultingPopupOpen();"><span class="faicon external_link"></span> '.$lang['srv_svetovanje'].'</a>';
+            echo '<br>';
+        }
 
+        // Posebej report buga za gorenje
+        if (Common::checkModule('gorenje')){
+            echo '<a href="https://helpdesk.gorenje.com/SubmitSR.jsp" target="_blank"><span class="faicon inline_comment"></span> '.$lang['srv_footer_reportabug'].'</a>';
+        }
+        else{
+            // Slovenski jezik
+            if ($lang['id'] == 1){
+                echo '<a href="https://www.1ka.si/a/72864?Q1=292032" target="_blank"><span class="faicon inline_comment"></span> '.$lang['srv_footer_reportabug'].'</a>';
 
+                // Zacasen gumb na desni
+                echo '<a href="https://www.1ka.si/a/72864?Q1=292032" target="_blank"><div class="right_help_button">'.$lang['srv_footer_reportabug2'].'</div></a>';
+            }
+            // Angleski jezik
+            else{
+                echo '<a href="https://www.1ka.si/a/72864?Q1=292032&language=2" target="_blank"><span class="faicon inline_comment"></span> '.$lang['srv_footer_reportabug'].'</a>';
 
+                // Zacasen gumb na desni
+                echo '<a href="https://www.1ka.si/a/72864?Q1=292032&language=2" target="_blank"><div class="right_help_button">'.$lang['srv_footer_reportabug2'].'</div></a>';
+            }
+        }
 
-        global $lang;
+        echo '</div>';
+    }
+
+    // Izposemo tabelo z anketami
+    public function displayNewSurveyList($folder=0) {
+		global $lang;
 		global $site_url;
 		global $global_user_id;
 				
-    
-        $ankete = $this->getSurveysAsListNew($this->current_folder);
+        
+        $ankete = $this->getSurveysAsListNew($folder);
                     
         echo '<input type="hidden" id="sortby" value="'.(isset($_POST['sortby']) ? $_POST['sortby'] : null).'">';
         echo '<input type="hidden" id="sorttype" value="'.(isset($_POST['sorttype']) ? $_POST['sorttype'] : null).'">';
         
-        if ($count = count($this->surveys_list)) {
+        if ($count = count($ankete)) {
         
             // Naslov za search
             if($this->isSearch == 1){
@@ -450,10 +377,10 @@ class SurveyListFolders {
         
         
             // VRSTICE Z ANKETAMI
-            foreach ($this->surveys_list as $anketa) {
+            foreach ( $ankete as $anketa ) {
                 
                 echo '<tr id="anketa_list_'.$anketa['id'].'" class="anketa_list '.($this->show_folders == 1 ? ' mySurvey_draggable' : '').'" anketa_id="'.$anketa['id'].'">';
-                              
+            
 
                 // Naslov
                 echo '<td class="col1">';
@@ -671,494 +598,13 @@ class SurveyListFolders {
             // Naslov za prazen search
             if($this->isSearch == 1)
                 echo '<span class="search_title">'.$lang['s_search_mySurvey_nothing'].'.</span>';
-        }
-    
-    }
-
-    // Izpisemo footer
-    private function displayFooter(){
-        global $lang;
-        global $site_frontend;
-        global $mysql_database_name;
-
-
-        // Leva stran footerja
-        echo '<div class="footer_left">';
-        
-        // Custom footer
-        if(AppSettings::getInstance()->getSetting('app_settings-footer_custom') !== false){
-            echo '<div class="footer_line">';
-            echo AppSettings::getInstance()->getSetting('app_settings-footer_text');
-            echo '</div>';
-        }
-        // Default footer
-        else{
-
-            // First left line - links
-            echo '<div class="footer_line">';
-
-            echo $lang['srv_footer_links'];
-            
-            if(isAAI())
-                echo '<span class="footer_item"><a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/pogosta-vprasanja-o-arnes-aai-prijavi-uporabi-orodja-1ka" target="_blank">'.$lang['aa4'].'</a></span>';
-            
-            echo '</div>';
-
-
-            // Second left line - version...
-            echo '<div class="footer_line">';
-
-            // Verzijo izpišemo samo za admine
-            if ($admin_type == 0) {   
-                
-                // Verzija 1ka
-                $sqlVersion = sisplet_query("SELECT value FROM misc WHERE what='version'", "obj");
-                if (!empty($sqlVersion)) {
-                    echo '<span class="footer_item">'.$lang['srv_footer_1ka_version'].': ' . $sqlVersion->value . '</span>';
-                }
-
-                // Verzija Drupal
-                if ($site_frontend == 'drupal') {
-                    $sqlDrupal = sisplet_query("SELECT value FROM misc WHERE what='drupal version'", "obj");
-                    if (!empty($sqlDrupal)) {
-                        echo '<span class="footer_item">Drupal: ' . $sqlDrupal->value . '</span>';
-                    }
-                }
-            }
-        
-            echo '<span class="footer_item">Copyright (©) 2002-'.date('Y').' '.$lang['srv_footer_copyright'].'</span>';
-
-            echo '</div>';
-        }
-
-        echo '</div>';
-
-
-        // Desna stran footerja - report a bug
-        echo '<div id="reportabug" class="footer_right">';
-        
-        // www.1ka.si ima se link na go instrukcije
-        if($mysql_database_name == 'real1kasi' || $mysql_database_name == 'test1kasi' || $mysql_database_name == 'test21kasi'){
-
-            echo '<a href="#" onClick="consultingPopupOpen();"><span class="faicon external_link"></span> '.$lang['srv_svetovanje'].'</a>';
-            echo '<br>';
-        }
-
-        // Posebej report buga za gorenje
-        if (Common::checkModule('gorenje')){
-            echo '<a href="https://helpdesk.gorenje.com/SubmitSR.jsp" target="_blank"><span class="faicon inline_comment"></span> '.$lang['srv_footer_reportabug'].'</a>';
-        }
-        else{
-            // Slovenski jezik
-            if ($lang['id'] == 1){
-                echo '<a href="https://www.1ka.si/a/72864?Q1=292032" target="_blank"><span class="faicon inline_comment"></span> '.$lang['srv_footer_reportabug'].'</a>';
-
-                // Zacasen gumb na desni
-                echo '<a href="https://www.1ka.si/a/72864?Q1=292032" target="_blank"><div class="right_help_button">'.$lang['srv_footer_reportabug2'].'</div></a>';
-            }
-            // Angleski jezik
-            else{
-                echo '<a href="https://www.1ka.si/a/72864?Q1=292032&language=2" target="_blank"><span class="faicon inline_comment"></span> '.$lang['srv_footer_reportabug'].'</a>';
-
-                // Zacasen gumb na desni
-                echo '<a href="https://www.1ka.si/a/72864?Q1=292032&language=2" target="_blank"><div class="right_help_button">'.$lang['srv_footer_reportabug2'].'</div></a>';
-            }
-        }
-
-        echo '</div>';
-    }
-
-		
-
-
-
-
-
-	function displayNewFolder($folder){
-		global $lang;
-		global $global_user_id;
-		global $admin_type;
-		
-		// Izris nerazvrscenih anket
-		if($folder['id'] == 0){				
-			echo '<div class="folder_title open droppable" id="folder_0" folder_id="0">';
-			
-			echo '<span class="faicon folder_arrow_icon" onClick="toggle_folder(\''.$folder['id'].'\'); return false;"></span>';
-				
-			echo ' <span>'.$folder['naslov'].'</span>';
-
-            // Dodaten div za klik za razpiranje
-            echo '<div class="folder_clickable" onClick="toggle_folder(\''.$folder['id'].'\'); return false;"></div>';
-			
-			// Ikona za dodajanje folderja
-			echo '</div>';
-			
-			
-			echo '<div id="folder_content_0" class="folder_content">';
-			$this->displayNewSurveyList($folder=0);
-			echo '</div>';
-		}
-		else{
-			echo '<div class="folder_title '.($folder['open'] == 1 ? 'open' : 'closed').' mySurvey_draggable droppable" id="folder_'.$folder['id'].'" folder_id="'.$folder['id'].'">';
-			
-            // Puscica za odpiranje/zapiranje
-			echo '<span class="faicon folder_arrow_icon" onClick="toggle_folder(\''.$folder['id'].'\'); return false;"></span>';
-			
-            // Ikona mape
-			echo '<span class="faicon folder_icon"></span>';
-
-			// Naslov folderja
-            echo '<div id="folder_title_text_'.$folder['id'].'" class="folder_title_text" onClick="edit_title_folder(\''.$folder['id'].'\'); return false;">'.$folder['naslov'].'</div>';
-			
-
-            echo '<div class="map_holder_control">';
-			
-            // Ikona za dodajanje folderja
-			echo '<a href="#" title="'.$lang['srv_mySurvey_create_subfolder'].'" onClick="create_folder(\''.$folder['id'].'\'); return false;"><span class="faicon add"></span></a>';
-			
-			// Ikona za brisanje folderja
-			echo '<a href="#" title="'.$lang['srv_mySurvey_delete_folder'].'" onClick="delete_folder(\''.$folder['id'].'\'); return false;"><span class="faicon remove"></span></a>';
-			
-			// Ikona za kopiranje folderja - samo admini
-			if($admin_type == 0)
-				echo '<a href="#" title="'.$lang['srv_mySurvey_copy_folder'].'" onClick="copy_folder(\''.$folder['id'].'\'); return false;"><span class="faicon copy"></span></a>';
-			
-			echo '</div>';
-
-
-            // Dodaten div za klik za razpiranje
-            echo '<div class="folder_clickable" onClick="toggle_folder(\''.$folder['id'].'\'); return false;"></div>';
-
-
-			echo '</div>';
-			
-			
-			echo '<div id="folder_content_'.$folder['id'].'" class="folder_content '.($folder['open'] == 1 ? '' : ' closed').' '.($folder['parent'] != 0 ? ' subfolder' : '').'">';
-		
-			$this->displayNewSurveyList($folder['id']);
-			
-			// Izpisemo se vse folderje znotraj trenutnega folderja
-			$sql = sisplet_query("SELECT * FROM srv_mysurvey_folder WHERE usr_id='$global_user_id' AND parent='".$folder['id']."' ORDER BY id DESC");
-			if(mysqli_num_rows($sql) > 0) {								
-				while($row = mysqli_fetch_array($sql)){
-					echo '<div id="folder_holder_'.$row['id'].'" class="folder_holder">';
-					$this->displayNewFolder($row);
-					echo '</div>';
-				}
-			}	
-			
-			echo '</div>';
-		}
+        }			
 	}
-	
-			
-	/** Prikažemo navigacijo po straneh rezultatov
-	 * 
-	 */
-	function displayPagiantion() {
-		global $site_url, $lang;
-		
-		//$this->max_pages = 100;
-		
-		# ali sploh izrisujemo paginacijo
-		if ($this->max_pages > 1) {
-
-			if ($this->onlyPhone == false) {
-				$baseUrl = $site_url."admin/survey/index.php?pageno=";
-			} else {
-				$baseUrl = $site_url."admin/survey/index.php?a=phoneSurveys&pageno=";
-			}
-
-			# povezava na prejšnjo stran
-			$prev_page = $this->pageno - 1;
-			if($prev_page >= 1) { 
-	  			echo '<a href="'.$baseUrl.$prev_page.'"><div class="arrow left"><span class="faicon pagination_left"></span></div></a>';
-			} 
-            else {
-				# brez href povezave 
-	  			echo '<div class="arrow left disabledPage"><span class="faicon pagination_left"></span></div>'; 
-			}	
-			
-			# povezave  za vmesne strani
-			$middle = $this->max_pages / 2;
-			$skipped  = false;
-			for($a = 1; $a <= $this->max_pages; $a++) {
-				if ($this->max_pages < ((SRV_LIST_GROUP_PAGINATE+1) * 2) || $a <= SRV_LIST_GROUP_PAGINATE || $a > ($this->max_pages-SRV_LIST_GROUP_PAGINATE) 
-					|| ( abs($a-$this->pageno) < SRV_LIST_GROUP_PAGINATE))  {
-					if ($skipped == true) {
-
-						echo '<div class="spacePage">.&nbsp;.&nbsp;.</div>';
-
-						$skipped  = false;
-					}
-
-					if($a == $this->pageno) {
-		   				# brez href povezave
-		      			echo '<div class="page_number currentPage">'.$a.'</div>'; 
-			 		} 
-                    else {
-		  				echo '<a href="'.$baseUrl.$a.'"><div class="page_number">'.$a.'</div></a>';
-		     		}
-				} 
-                else {
-					$skipped = true;
-				}
-			} 
-
-			# povezava na naslednjo stran
-			$next_page = $this->pageno + 1;
-			if($next_page <= $this->max_pages) {
-				echo '<a href="'.$baseUrl.$next_page.'"><div class="arrow right"><span class="faicon pagination_right"></span></div></a>';			
-			} 
-            else {
-				# brez href povezave
-				echo '<div class="arrow right disabledPage"><span class="faicon pagination_right"></span></div>'; 
-			}
- 
-		}
-	}
-	
-	
-	
-	
-	
-	private function displaySettingsUrl() {
-		global $lang;
-				
-		echo '<span class="sl_setting_link"><a href="#" onclick="show_surveyListSettings(); return false;"> '.$lang['settings'].'</a></span>';
-		
-		echo '<div id="survey_ListQickInfo" class="displayNone"></div>';
-	}
-	
-	// Prikazemo nastavitve za napredno iskanje ce iscemo po anketah
-	private function displaySearchSettings(){
-		global $lang;
-		global $site_url;
-
-        // NAPREDNE NASTAVITVE ISKANJA
-        $show_advanced_search = false;
-        if($this->searchSettings['sstatus'] != '0' 
-            || $this->searchSettings['sidatefrom'] != '' 
-            || $this->searchSettings['sidateto'] != '' 
-            || $this->searchSettings['sedatefrom'] != '' 
-            || $this->searchSettings['sedateto'] != ''){
-
-            $show_advanced_search = true;
-        }
-
-        echo '<form method="GET" id="1kasf2" action="'.$site_url.'admin/survey/index.php">';
 
 
-        // Zgornja vrstica z geslom in gumbom za iskanje
-        echo '<div class="search_settings_top">';
 
-        // Posebej imamo skrito polje s parametri da jih ohranimo pri ajax klicih
-		echo '<input type="hidden" id="searchParams" name="searchParams" value="'.$this->getSearchParams().'" />';	
-
-		// Iskano geslo
-		echo '<div class="search_text">';
-        echo '	<input type="text" name="search" id="searchMySurveyText" value="'.htmlentities($this->searchString).'" placeholder="'.$lang['s_search'].'" />';
-		echo '</div>';
-		
-		// Iskanje po naslovu ali avtorju ali besedilu
-		echo '<div class="search_type">';
-		echo '	<select name="stype" id="stype">';
-		echo '	    <option value="0" '.($this->searchSettings['stype'] == '0' ? ' selected="selected"' : '').'>'.$lang['s_title'].'</option>';
-		echo '	    <option value="1" '.($this->searchSettings['stype'] == '1' ? ' selected="selected"' : '').'>'.$lang['s_author'].'</option>';
-		echo '	    <option value="2" '.($this->searchSettings['stype'] == '2' ? ' selected="selected"' : '').'>'.$lang['s_text'].'</option>';
-		echo '  </select>';
-		echo '</div>';
-        
-        // Gumb isci
-		echo '<div class="search_button">';
-		echo '	<a href="#" onclick="$(\'#1kasf2\').submit(); return false;"><button class="medium blue">'.$lang['s_search'].'</button></a>';
-		echo '</div>';
-
-		echo '</div>';
-		
-		
-        // Gumba za napredne nastavitve
-        echo '<div class="search_settings_advanced_buttons">';		
-		
-		echo '  <button type="button" id="advanced_settings_button" class="white-black small '.($show_advanced_search ? 'active': '').'" onClick="showAdvancedSearch(); return false;">';
-        echo '      <span class="faicon search"></span>'.$lang['s_advanced'];
-        echo '  </button>';
-        
-        // Gumb nazaj na moje ankete
-        echo '  <a href="'.$site_url.'admin/survey/index.php?a=pregledovanje"><button type="button" class="white-black small">';
-        echo '      <span class="faicon clipboard_notes"></span>'.$lang['s_search_mySurvey_back'];
-        echo '  </button></a>';
-
-        echo '</div>';
-
-		
-        // Okno z naprednimi nastavitvami
-		echo '<div id="advancedSearch" class="search_settings_advanced" '.($show_advanced_search ? '' : ' style="display:none;"').'>';		
-		
-		// Status ankete (aktivna, neaktivna, zakljucena)
-		echo '<div class="setting_holder">';
-		echo '	<span class="setting_title">'.$lang['s_activity'].': </span>';
-		echo '  <div class="setting_line"><input type="radio" name="sstatus" id="sstatus_0" value="0" '.($this->searchSettings['sstatus'] == '0' ? ' checked="checked"' : '').'><label for="sstatus_0">'.$lang['s_all_surveys'].'</label></div>';
-		echo '	<div class="setting_line"><input type="radio" name="sstatus" id="sstatus_1" value="1" '.($this->searchSettings['sstatus'] == '1' ? ' checked="checked"' : '').'><label for="sstatus_1">'.$lang['s_active_surveys'].'</label></div>';
-		echo '	<div class="setting_line"><input type="radio" name="sstatus" id="sstatus_2" value="2" '.($this->searchSettings['sstatus'] == '2' ? ' checked="checked"' : '').'><label for="sstatus_2">'.$lang['s_nonactive_surveys'].'</label></div>';
-		echo '</div>';
-		
-		// Datum ustvarjanja ankete
-		echo '<div class="setting_holder">';
-        echo '	<span class="setting_title">'.$lang['s_itime'].': </span>';
-		echo '	<div class="setting_line"><span>'.$lang['srv_activate_duration_manual_from'].' <input type="text" id="sidatefrom" name="sidatefrom" value="'.$this->searchSettings['sidatefrom'].'" autocomplete="off" size="12" /></span></div>';
-		echo '	<div class="setting_line"><span>'.$lang['srv_activate_duration_manual_to'].' <input type="text" id="sidateto" name="sidateto" value="'.$this->searchSettings['sidateto'].'" autocomplete="off" size="12" /></span></div>';
-		echo '</div>';
-		
-		// Datum zadnjega urejanja ankete
-		echo '<div class="setting_holder">';
-        echo '	<span class="setting_title">'.$lang['s_etime'].': </span>';
-		echo '	<div class="setting_line"><span>'.$lang['srv_activate_duration_manual_from'].' <input type="text" id="sedatefrom" name="sedatefrom" value="'.$this->searchSettings['sedatefrom'].'" autocomplete="off" size="12" /></span></div>';
-		echo '	<div class="setting_line"><span>'.$lang['srv_activate_duration_manual_to'].' <input type="text" id="sedateto" name="sedateto" value="'.$this->searchSettings['sedateto'].'" autocomplete="off" size="12" /></span></div>';
-		echo '</div>';
-
-        // Metaadmin lahko dodatno omeji search po avtorju
-		if(Dostop::isMetaAdmin()){
-			echo '<div class="setting_holder">';
-            echo '	<span class="setting_title">'.$lang['s_search_metaadmin'].': </span>';
-			echo '	<div class="setting_line"><input type="text" name="onlyAuthor" id="onlyAuthor" value="'.htmlentities($this->searchSettings['onlyAuthor']).'" placeholder="'.$lang['s_search'].'"></div>';
-			echo '</div>';
-		}
-
-        echo '</div>';
-		
-				
-		// JS za koledar
-		echo '<script type="text/javascript">
-				var srv_site_url = \''.$site_url.'\';
-				$(document).ready(function () {
-					$("#sidatefrom, #sidateto, #sedatefrom, #sedateto").datepicker({
-						showOtherMonths: true,
-						selectOtherMonths: true,
-						changeMonth: true,
-						changeYear: true,
-						dateFormat: "dd.mm.yy",
-						showAnim: "slideDown",
-						showOn: "both",
-						buttonText: ""
-					});
-				});
-			</script>';		
-            
-        echo '<input style="display: none;" value="Išči" type="submit">';
-
-        echo '</form>';
-	}
-	
-	
-	
-	/** polovimo nastavitve prikaza za posameznega uporabnika
-	 * 
-	 */
-	private function getSettings($display_default = false) {
-		
-		$defaultOrder = $this->dataFields;
-		$resultArray = array();
-		$izBaze = false;
-
-		if ($this->g_uid > 0) {
-			$saved_surveyList_string = UserSetting::getInstance()->getUserSetting('survey_list_order');
-			$saved_surveyList_visible_string = UserSetting::getInstance()->getUserSetting('survey_list_visible');
-			$saved_surveyList_visible = array_unique(explode(",",$saved_surveyList_visible_string));
-			if (isset($saved_surveyList_string) && $saved_surveyList_string != "" && !$display_default ) {
-				$saved_surveyList_order = array_unique(explode(",",$saved_surveyList_string));
-				$izBaze = true;
-				// uporabimo shranjene nastavitve
-				foreach ( $saved_surveyList_order as $order) {
-						if (in_array($order,$saved_surveyList_visible))
-       					{
-	       					$defaultOrder[$order]['visible'] = 1; 
-       					} else {
-       						$defaultOrder[$order]['visible'] = 0;
-       					}
-       					if (isset($defaultOrder[$order]['order_by']) && isset($defaultOrder[$order]))
-       					{
-			       			$resultArray[$defaultOrder[$order]['order_by']] = $defaultOrder[$order];
-			       			if (isset($defaultOrder[$order]))
-			       			{
-			       				unset($defaultOrder[$order]);
-			       			}
-       					}
-				}
-			} 
-		}
-
-		// za vse ostalo uporabimo privzete nastavitve
-		foreach ( $defaultOrder as $order) 
-		{
-			if ($izBaze) 
-			{
-				$order['visible'] = 0; // ponastavimo vidnost ?e imamo iz baze
-			}
-			if (isset($order['order_by']))
-			{
-				$resultArray[$order['order_by']] = $order;
-			}
-		}
-		return $resultArray;
-	}
-	
-	private function getSurveysAsList() {
-
-		$result = array();
-
-		// ce imas hkrati dostop do ankete (srv_dostop) in preko managerskega dostopa (srv_dostop_manage) se brez DISTINCT podvajajo ankete
-		$stringSurveyList = "SELECT DISTINCT sa.id, sa.folder, '1' as del, sa.naslov, sa.active, sa.edit_time, ";
-		$stringSurveyList .= ( $this->settingsArray['lib_glb']['visible'] == 1 ) ? 'sal.lib_glb AS lib_glb, ' :'';
-		$stringSurveyList .= ( $this->settingsArray['lib_usr']['visible'] == 1 ) ? 'sal.lib_usr AS lib_usr, ' : '';
-		$stringSurveyList .= ( $this->settingsArray['e_name']['visible'] == 1 ||  $this->settingsArray['e_surname']['visible'] == 1 || $this->settingsArray['e_email']['visible'] == 1 )
-									? "sa.edit_uid, sal.e_name AS e_name, sal.e_surname AS e_surname, sal.e_email AS e_email, " : '';
-		$stringSurveyList .= ( $this->settingsArray['i_name']['visible'] == 1 ||  $this->settingsArray['i_surname']['visible'] == 1 || $this->settingsArray['i_email']['visible'] == 1 )
-									? "sa.insert_uid, sal.i_name AS i_name, sal.i_surname AS i_surname, sal.i_email AS i_email, " : '';
-		$stringSurveyList .= ( $this->settingsArray['edit_time']['visible'] == 1 ) ? "date_format(edit_time, '%d.%m.%y %k:%i') AS e_time, " : '';
-		$stringSurveyList .= ( $this->settingsArray['insert_time']['visible'] == 1 ) ? "date_format(insert_time, '%d.%m.%y %k:%i') AS i_time, " : '';
-		$stringSurveyList .= ( $this->settingsArray['vnos_time_first']['visible'] == 1 || $this->settingsArray['vnos_time_last']['visible'] == 1) 
-								? "date_format(sal.a_first, '%d.%m.%y %k:%i') AS v_time_first, date_format(sal.a_last, '%d.%m.%y %k:%i') AS v_time_last, " : '';
-
-		$stringSurveyList .= "sal.answers as answers, "; // vedno prestejemo odgovore
-		$stringSurveyList .= ( $this->settingsArray['variables']['visible'] == 1 ) ? "sal.variables as variables, " : '';
-		$stringSurveyList .= ( $this->settingsArray['trajanjeod']['visible'] == 1 ) ? "date_format(sa.starts, '%d.%m.%y') as trajanjeod, " : '';
-		$stringSurveyList .= ( $this->settingsArray['trajanjedo']['visible'] == 1 ) ? "date_format(sa.expire, '%d.%m.%y') as trajanjedo, " : '';
-		$stringSurveyList .= ( $this->settingsArray['approp']['visible'] == 1 ) ? "approp, " : '';
-		$stringSurveyList .= "sd.canEdit, sa.survey_type "; // tega pustim tukaj, da ni problemov z vejico
-		
-		$stringSurveyList .= "FROM srv_anketa sa ";
-		$stringSurveyList .= "LEFT OUTER JOIN srv_survey_list AS sal ON sal.id = sa.id " ;
-		
-		# kdo lahko ureja anketo (briše)
-		// tega substringy se ne da dodatno razbit z prepareSubquery, ker selectamo 2 elementa...
-		$stringSurveyList .= "LEFT OUTER JOIN (SELECT 1 AS canEdit, ank_id FROM srv_dostop WHERE FIND_IN_SET('edit', dostop ) ='1' AND aktiven = '1' AND uid = '$this->g_uid' OR uid IN (".SurveyCopy::prepareSubquery(sisplet_query("SELECT user FROM srv_dostop_manage WHERE manager = '".$this->g_uid."'")).")) AS sd ON sd.ank_id = sa.id " ;
-		#$stringSurveyList .= "LEFT OUTER JOIN (SELECT ank_id, FIND_IN_SET('edit', dostop ) AS canEdit FROM srv_dostop WHERE aktiven = '1' AND uid = '$this->g_uid') AS sd ON sd.ank_id = sa.id " ;
-
-		$stringSurveyList .= "WHERE sa.backup='0' AND sa.id>0 AND active >= '0' AND invisible = '0' ";
-		//$stringSurveyList .= $this->getFolderCondition();
-		
-		$stringSurveyList .= $this->getLanguageLimit();
-		$stringSurveyList .= $this->getDostopAnketa();
-		$stringSurveyList .= $this->getOrderString();
-		$stringSurveyList .= $this->getLimitString();
-		
-		$sqlSurveyList = sisplet_query($stringSurveyList);
-		if (!$sqlSurveyList) {
-			print_r("ERROR in query:");
-			print_r($stringSurveyList);
-			echo mysqli_error($GLOBALS['connect_db']);
-		}
-		$ids = array();
-		while ($rowSurveyList = mysqli_fetch_assoc($sqlSurveyList)) {
-			$result[] = $rowSurveyList;
-			
-		}
-		return $result;
-	}
-	
-	// Dobimo seznam anket za nov prikaz (starega se naceloma ne uporablja vec)
-	private function getSurveysAsListNew($folder=0) {
+    // Dobimo seznam anket za nov prikaz (starega se naceloma ne uporablja vec)
+	private function getSurveysAsListNew() {
 
 		$result = array();
 
@@ -1179,9 +625,7 @@ class SurveyListFolders {
 		$stringSurveyList .= "approp, ";
 		$stringSurveyList .= "sd.canEdit, sa.survey_type "; // tega pustim tukaj, da ni problemov z vejico
 
-		if($folder > 0)	
-            $stringSurveyList .= ", sf.folder as mysurvey_folder ";
-            		
+        
 		// Ce searchamo po besedah dodamo se uvod, zakljucek, naslove vprasanj in vrednosti vprasanj
 		if($this->isSearch == 1 && $this->searchSettings['stype'] == '2'){
 			$stringSurveyList .= ", sa.introduction AS introduction, sa.conclusion AS conclusion ";
@@ -1191,7 +635,7 @@ class SurveyListFolders {
 			$stringSurveyList .= ", sv.id AS sv_id, sv.naslov AS sv_naslov, sv.spr_id AS sv_spr_id ";
 		}
         
-        
+    
 		$stringSurveyList .= "FROM srv_anketa sa ";
 		$stringSurveyList .= "LEFT OUTER JOIN srv_survey_list AS sal ON sal.id = sa.id " ;
 		$stringSurveyList .= "LEFT OUTER JOIN srv_library_anketa AS sla ON sla.ank_id = sa.id " ;
@@ -1199,9 +643,9 @@ class SurveyListFolders {
 		# kdo lahko ureja anketo (briše)
 		// tega substringy se ne da dodatno razbit z prepareSubquery, ker selectamo 2 elementa...
 		$stringSurveyList .= "LEFT OUTER JOIN (SELECT 1 AS canEdit, ank_id FROM srv_dostop WHERE FIND_IN_SET('edit', dostop ) ='1' AND aktiven = '1' AND uid = '$this->g_uid' OR uid IN (".SurveyCopy::prepareSubquery(sisplet_query("SELECT user FROM srv_dostop_manage WHERE manager = '".$this->g_uid."'")).")) AS sd ON sd.ank_id = sa.id " ;
-		#$stringSurveyList .= "LEFT OUTER JOIN (SELECT ank_id, FIND_IN_SET('edit', dostop ) AS canEdit FROM srv_dostop WHERE aktiven = '1' AND uid = '$this->g_uid') AS sd ON sd.ank_id = sa.id " ;
 
-		if($folder > 0)
+
+		if($this->current_folder['id'] > 0)
 			$stringSurveyList .= "LEFT OUTER JOIN srv_mysurvey_anketa AS sf ON sf.ank_id = sa.id ";
 
 		// Ce iscemo po kljucnih besedah moramo dodat se tabele srv_grupa, srv_spremenljivka in srv_vrednost
@@ -1216,23 +660,22 @@ class SurveyListFolders {
 			$stringSurveyList .= "LEFT OUTER JOIN srv_nice_links AS nl ON sa.id = nl.ank_id ";
 		}
 		
+
 		$stringSurveyList .= "WHERE sa.backup='0' AND sa.id>0 AND active >= '0' AND invisible = '0' ";
 		
-		//$stringSurveyList .= $this->getFolderCondition();
-		//$stringSurveyList .= $this->getLibraryCondition();	// Tega ni vec ker imamo nove folderje v mojih anketah
-		if($folder > 0)
-			$stringSurveyList .= "AND sf.usr_id='$this->g_uid' AND sf.folder='$folder' ";
-		elseif($folder == 0)
+		if($this->current_folder['id'] > 0)
+			$stringSurveyList .= "AND sf.usr_id='$this->g_uid' AND sf.folder='".$this->current_folder['id']."' ";
+		elseif($this->current_folder['id'] == 0)
 			$stringSurveyList .= "AND NOT EXISTS (SELECT * FROM srv_mysurvey_anketa sma WHERE sma.ank_id=sa.id AND sma.usr_id='$this->g_uid') ";
     
-
+            
         // GDPR filter
         if($this->gdpr == 1)
             $stringSurveyList .= "AND EXISTS (SELECT * FROM srv_gdpr_anketa sgdpr WHERE sgdpr.ank_id=sa.id) ";
 		elseif($this->gdpr == 2)
 			$stringSurveyList .= "AND NOT EXISTS (SELECT * FROM srv_gdpr_anketa sgdpr WHERE sgdpr.ank_id=sa.id) ";
 
-
+            
 		// Ce izvajamo search po anketah
 		if($this->isSearch == 1){
 			// Filter glede na search
@@ -1266,7 +709,7 @@ class SurveyListFolders {
 			// Limit anket
 			$stringSurveyList .= $this->getLimitString();	
 		}
-		
+
 		
 		$sqlSurveyList = sisplet_query($stringSurveyList);
 		if (!$sqlSurveyList) {
@@ -1281,796 +724,84 @@ class SurveyListFolders {
 
 		return $result;
 	}
+
+
 	
-	
-	// Enostaven seznam anket za mobilno aplikacijo
-	public function getSurveysSimple($ank_id = 0, $limit = '', $mobile_created = -1, $include_folders=false) {
+	/** Funkcija ki kiče podfunkcije za ajax del 
+     * 
+	 * 
+	 */ 
+	public function ajax() {
+        global $global_user_id;
+        global $lang;
 
-		$result = array();
 
-		// ce imas hkrati dostop do ankete (srv_dostop) in preko managerskega dostopa (srv_dostop_manage) se brez DISTINCT podvajajo ankete
-		$stringSurveyList = "SELECT DISTINCT sa.id, sa.folder, '1' as del, sa.naslov, sa.active, sa.mobile_created, sa.block_ip, ";
-		//$stringSurveyList .= 'sal.lib_glb AS lib_glb, ';
-		//$stringSurveyList .= 'sal.lib_usr AS lib_usr, ';
-		$stringSurveyList .= "sa.edit_uid, sal.e_name AS e_name, sal.e_surname AS e_surname, sal.e_email AS e_email, ";
-		$stringSurveyList .= "sa.insert_uid, sal.i_name AS i_name, sal.i_surname AS i_surname, sal.i_email AS i_email, ";
-		$stringSurveyList .= "date_format(edit_time, '%d.%m.%y %k:%i') AS e_time, ";
-		$stringSurveyList .= "date_format(insert_time, '%d.%m.%y %k:%i') AS i_time, ";
-		$stringSurveyList .= "date_format(sal.a_first, '%d.%m.%y %k:%i') AS v_time_first, date_format(sal.a_last, '%d.%m.%y %k:%i') AS v_time_last, ";
+        // Aktiviramo folder in prikazemo ankete v tem folderju
+		if($_GET['a'] == 'mysurvey_folder_activate'){
 
-		$stringSurveyList .= "sal.answers as answers, "; // vedno prestejemo odgovore
-                $stringSurveyList .= "sal.approp as approp, "; // vedno prestejemo odgovore
-		$stringSurveyList .= "sal.variables as variables, ";
-		$stringSurveyList .= "date_format(sa.starts, '%d.%m.%y') as trajanjeod, ";
-		$stringSurveyList .= "date_format(sa.expire, '%d.%m.%y') as trajanjedo, ";
-		$stringSurveyList .= "sa.survey_type "; // tega pustim tukaj, da ni problemov z vejico
-		
-		$stringSurveyList .= "FROM srv_anketa sa ";
-		$stringSurveyList .= "LEFT OUTER JOIN srv_survey_list AS sal ON sal.id = sa.id " ;
-		$stringSurveyList .= "LEFT OUTER JOIN srv_library_anketa AS sla ON sla.ank_id = sa.id " ;
-		
-		# kdo lahko ureja anketo (briše)
-		// tega substringy se ne da dodatno razbit z prepareSubquery, ker selectamo 2 elementa...
-		$stringSurveyList .= "LEFT OUTER JOIN (SELECT 1 AS canEdit, ank_id FROM srv_dostop WHERE FIND_IN_SET('edit', dostop ) ='1' AND aktiven = '1' AND uid = '$this->g_uid' OR uid IN (".SurveyCopy::prepareSubquery(sisplet_query("SELECT user FROM srv_dostop_manage WHERE manager = '".$this->g_uid."'")).")) AS sd ON sd.ank_id = sa.id " ;
-		
-		$stringSurveyList .= "WHERE sa.backup='0' AND sa.id>0 AND active >= '0' AND invisible = '0' ";
-                
-                if($mobile_created == 1)
-                    $stringSurveyList .= "AND sa.mobile_created='".$mobile_created."' ";
-		
-                if(!$include_folders)
-                    $stringSurveyList .= "AND NOT EXISTS (SELECT * FROM srv_mysurvey_anketa sma WHERE sma.ank_id=sa.id AND sma.usr_id='$this->g_uid') ";
-		
-		// Ce imamo podan ank_id vrnemo samo za 1 anketo
-		if($ank_id > 0)
-			$stringSurveyList .= "AND sa.id='".$_GET['ank_id']."' ";
-		
-		//$stringSurveyList .= $this->getLanguageLimit();
-		$stringSurveyList .= $this->getDostopAnketa();
-		//$stringSurveyList .= $this->getOrderString();
-		//$stringSurveyList .= $this->getLimitString();
-		
-		//$stringSurveyList .= 'ORDER BY upper(naslov) ASC';
-                
-                //zacasno zaradi aplikacije
-                if($mobile_created == 1)
-                    $stringSurveyList .= "ORDER BY edit_time DESC";
-                else
-                    $stringSurveyList .= 'ORDER BY sal.a_last DESC';
-                
-                //@Uros dodal, da vrne samo doloceno stevilo zadnjih anktivnih anket, ce je nastavljeno
-                if($limit != '' && $limit != 0)
-                    $stringSurveyList .= ' limit '.$limit;
-		
-		$sqlSurveyList = sisplet_query($stringSurveyList);
-		while ($rowSurveyList = mysqli_fetch_assoc($sqlSurveyList)) {
-			
-			// Pretvorimo vse v utf - drugace vcasih ne dela json_encode
-			foreach($rowSurveyList as $key => $val){
-				//$rowSurveyList[$key] = utf8_encode($val);
-				$rowSurveyList[$key] = mb_convert_encoding($val, 'HTML-ENTITIES', "UTF-8");
+			$folder_id = isset($_POST['folder_id']) ? $_POST['folder_id'] : '0';
+
+
+            // Nastavimo vse folderje na neaktivne
+            $sql = sisplet_query("UPDATE srv_mysurvey_folder SET active='0' WHERE usr_id='".$global_user_id."'");
+            
+            // Nastavimo izbran folder na aktivnega
+            if($folder_id > '0')
+                $sql = sisplet_query("UPDATE srv_mysurvey_folder SET active='1' WHERE usr_id='".$global_user_id."' AND id='".$folder_id."'");
+
+
+            // Nastavimo current folder
+            if($folder_id == '0'){
+                $this->current_folder = array(
+                    'id'        => 0,
+                    'naslov'    => $lang['srv_mySurvey_all_surveys']
+                );
+            }
+            else{
+                // Dobimo podatke folderja
+                $sql = sisplet_query("SELECT f.*, COUNT(a.ank_id) AS survey_count
+                                        FROM srv_mysurvey_folder f
+                                            LEFT JOIN srv_mysurvey_anketa a
+                                            ON f.id=a.folder
+                                        WHERE id='".$folder_id."'
+                                        GROUP BY 1
+                                    ");
+                if (!$sql)
+                    echo mysqli_error($GLOBALS['connect_db']);
+
+                $row = mysqli_fetch_array($sql);
+
+                $this->current_folder = $row;
             }
 
-			$result[] = $rowSurveyList;	
-		}	
-		return $result;
-	}
-	
-	private function createOrderUrl($id=null, $txt) {
 
-		if (!isset($id) || $id == null || $id == "") { 
-			$id=1;
+            // Na novo prikazemo desno stran
+            $this->displayRightContent();
 		}
-			
-		if ($this->sortby != $id ) {
-			$img_src = 'sort_unsorted';
-			$result='<div onClick="surveyList_goTo(\''.$id.'\',\'1\')">'.$txt.'</div>';
-		} else {
 
-			if ($this->sorttype == 2) {
-				$img_src = 'sort_ascending';
-				$result='<div onClick="surveyList_goTo(\''.$id.'\',\'1\')" class="red">'.$txt.'<span class="faicon '.$img_src.'" title=""></span></div>';
-			} else {
-				$img_src = 'sort_descending';
-				
-				$result='<div onClick="surveyList_goTo(\''.$id.'\',\'2\')" class="red">'.$txt.'<span class="faicon '.$img_src.'" title=""></span></div>';
-			}
-		}
-	
-		return $result;
-	}
-	
-	private function createOrderUrlNew($id=null, $txt) {
-		global $site_url;
-		
-		if (!isset($id) || $id == null || $id == "") { 
-			$id=1;
-		}
-			
-		if ($this->sortby != $id ) {
-			$result='<div onClick="surveyList_goTo(\''.$id.'\',\'1\')">'.$txt.'</div>';
-		} 
-        else {
 
-			if ($this->sorttype == 2) {
-				$result='<div class="active" onClick="surveyList_goTo(\''.$id.'\',\'1\')">'.$txt.'<span class="active faicon after sort_up_arrow icon-orange"/></div>';
-			} 
-            else {
-				$result='<div class="active" onClick="surveyList_goTo(\''.$id.'\',\'2\')">'.$txt.'<span class="active faicon after sort_down_arrow icon-orange"/></div>';
-			}
-		}
-	
-		return $result;
-	}
-	
-	private function echoText($text, $type = 'text', $id = null,$options=array()) {
-		global $lang;
-		global $site_url;
 
-		if ( $type == 'text') {
-			$result = ( isset($text) && $text != null && $text != "") ? $text : "&nbsp;";
-		} elseif ($type == 'naslov') {
-			$result = '<strong><a href="'.$site_url.'admin/survey/index.php?anketa='.$id.'&a='.A_REDIRECTLINK.'" title="'.$text.'">'.$text.'</a></strong>';
-		} elseif ($type == 'active') {
- 	    	$result = '<a href="/" onclick="anketa_active(\''.$id.'\',\''.(int)$text.'\',\'true\'); return false;">' .
-             		  '<span class="faicon '.((int)$text==1?'star_on':'star_off').'" alt="'.(int)$text.'" title="'.((int)$text==1?$lang['srv_anketa_active']:$lang['srv_anketa_noactive']).'"> </span>'.
-             		  '</a>';
-		} elseif ($type == 'delete') {
-			if ((int)$options['anketa_canEdit'] > 0) {
- 	    	$result = '<a href="/" onclick="anketa_delete_list(\''.$id.'\', \''.$lang['srv_anketadeleteconfirm'].'\'); return false;">' .
-             		  '<span class="faicon delete_circle icon-orange_link" title="'.$lang['srv_anketa_delete'].'"></span>'.
-             		  '</a>';
-			} else {
-				$result=' ';
-			}
-		} elseif ($type == 'lib_glb') {
-			if ($this->g_adminType == 0) {
-				// samo admin lahko dodaja in odstranjuje v sistemsko knjiznico			
-				$result = '<a href="/" onclick="surveyList_knjiznica(\''.$id.'\'); return false;">'.
-                 	  '<span class="sprites library_admin_'.((int)$text==1?'on':'off').'" title="'.((int)$text==1?$lang['srv_ank_lib_off']:$lang['srv_ank_lib_on']).'"></span>'.
-                 	  '</a>';
-			} else {
-				$result = '<a href="/" onclick="surveyList_knjiznica_noaccess(\''.$lang['srv_list_library_no_access'].'\'); return false;">'.
-                 	  '<span class="sprites library_admin_'.((int)$text==1?'on':'off').'" title="'.((int)$text==1?$lang['srv_ank_lib_off']:$lang['srv_ank_lib_on']).'"></span>'.
-                 	  '</a>';
-			}
-		} elseif ($type == 'lib_usr') {
-	        $result = '<a href="/" onclick="surveyList_myknjiznica(\''.$id.'\'); return false;">'.
-	             	  '<span class="sprites '.((int)$text==1?'library_on':'library_off').'" title="'.((int)$text==1?$lang['srv_ank_mylib_off']:$lang['srv_ank_mylib_on']).'"></span>'.
-	             	  '</a>';
-		} elseif ($type == 'survey_type') {
-			if ($text == '3') {
-				$text = '2';
-			} 
-			
-	        $result = $lang['srv_vrsta_survey_type_'.$text];
-		
-		} elseif ($type == 'euid' || $type == 'iuid') {
-			$text = iconv("iso-8859-2", "utf-8",$text);
-			if ($options['anketa_is_copy']) {
-	        	$result = $lang['srv_survey_is_copy'];
-			} else {
-				$result = ( isset($text) && $text != null && $text != "") 
-					? '<span class="as_link"'.($type == 'euid' ? ' onclick="surveyList_user(\'e\',this);" euid="'.$options['anketa_e_uid'].'"': ' onclick="surveyList_user(\'i\',this);"  iuid="'.$options['anketa_i_uid'].'"').'>'.$text.'</span>' : 
-					"&nbsp;";
 
-					// echoText($text, 'text', $id, $options );
-			}
-		} else {
+		/*switch ($_GET['a']) {
 
-			$this->echoText($text, 'text', $id, $options );
-		}
-	
-		echo (isset($result) && $result != "" && $result != null) ? $result : "&nbsp;";
-	}
-	
-	/**
-	 * polovimo shranjene ?irine za polja
-	 */
-	private function getCssSetings() {
-		global $global_user_id;
-		$result_old_data = array();
-		if ($this->g_uid > 0) {
-			// najprej iz nastavitev preberemo obstoje?e shranjene ?irine 			
-			$saved_old_data_string = UserSetting::getInstance()->getUserSetting('survey_list_widths'); 
-			
-			if (isset($saved_old_data_string) && $saved_old_data_string != null && $saved_old_data_string != "" ) {
-				$old_data = array_unique(explode(";",$saved_old_data_string));				
-				foreach ( $old_data as $tmp_old_data ) {
-					$_tmp_old_data = array_unique(explode(",",$tmp_old_data));
-					$result_old_data[$_tmp_old_data[0]] = $_tmp_old_data[1]; 
-				}
-			}
-		}
-		return $result_old_data;
+			case 'survey_dropped':
+			case 'folder_dropped':
+			case 'folder_create':
+			case 'folder_delete':
+			case 'folder_toggle':
+			case 'folder_rename':
+			case 'folder_copy':
+				$this->updateMySurveyFolders();
+				break;
+			default:
+				print_r($_POST);
+				print_r($_GET);
+			break;
+		}*/
 	}
 
-	/** Izrišemo div z nastavitvami
-	 * 
-	 * Enter description here ...
-	 * @param unknown_type $display_default
-	 */
-	public function displaySettings($display_default = false) {
-		global $site_url, $lang;
-
-		# izpisemo dive
-		$settingsArray = $this->getSettings();
-		echo '<div id="survey_list_inner">';
-			echo '<input type="hidden" id="sortby" value="'.$_POST['sortby'].'">';
-			echo '<input type="hidden" id="sorttype" value="'.$_POST['sorttype'].'">';
-		$grupaName = "";
-		$zastopaneGrupe = array();
-
-		echo '<div class="floatLeft" style="width:auto !important"><ul id="sortable" style="width:auto !important;">';
-		foreach ( $settingsArray as $opcija ) {
-			// preverimo ali je nova grupa
-			if ((!isset($opcija['header_grupa']) && $grupaName != "") || // nismo več v grupi stara še obstaja  
-				( isset($opcija['header_grupa']) && $grupaName != "" && $opcija['header_grupa'] != $grupaName)) { // smo v grupi ampak ime ni enako prejšnjemu
-				echo '</ul>';
-				echo '</div>';
-				echo '<div class="clr"></div>';
-				echo '</li>';
-				$grupaName = "";		
-			}
-			// preverimo ali naredimo novo grupo (Vnesel / urejal) 
-			if (isset($opcija['header_grupa']) && $grupaName == "") { // smo v grupi polj pod in imamo podpolja: ime priimek, email, datum
-				// imamo začtek grupe 
-				echo '<li class="sortable_group">';
-				echo '<div style="width:20px; float:left;">';
-				echo '<img class="parent movable" src="'.$site_url.'admin/survey/icons/icons/move_updown.png" alt="move" vartical-align="middle" />';
-				echo '</div>';
-				echo '<div id="group_holder" style="float:left;">';
-				echo '<ul id="sortableGroup" name="'.$opcija['header_grupa'].'">';
-				$grupaName = $opcija['header_grupa'];
-				$zastopaneGrupe[] = $opcija['header_grupa'];
-			}
-			if (!isset($opcija['header_grupa'])) {
-				echo '<li id="'.$opcija['id'].'" class="sortable_noGroup"><span class="">';
-				echo '<img class="parent movable" src="'.$site_url.'admin/survey/icons/icons/move_updown.png" alt="move" vartical-align="middle" />';
-				// ?e je viden ali ?e je id = 1 (ime ankete) potem dodamo checkbox (imena ankete ne moremo izklju?it)
-				echo '<input name="sl_fields" id="sl_fields_'.$opcija['id'].'" value="'.$opcija['id'].'" type="checkbox" '.($opcija['visible'] == 1 || $opcija['id'] == 1 ? 'checked="checked"':'').' '.($opcija['id'] == 1 ? 'disabled="disabled"':'').'>';
-				echo $lang['srv_h_'.$opcija['header_field']];
-				echo '</span>';
-				echo '</li>';
-			} else {
-				echo '<li id="'.$opcija['id'].'" class="sortable_noGroup"><span class="">';
-				echo '<img class="sub_child movable" src="'.$site_url.'admin/survey/icons/icons/move_updown.png" alt="move" vartical-align="middle" />';
-				// ?e je viden ali ?e je id = 1 (ime ankete) potem dodamo checkbox (imena ankete ne moremo izklju?it)
-				echo '<input name="sl_fields" id="sl_fields_'.$opcija['id'].'" value="'.$opcija['id'].'" type="checkbox" '.($opcija['visible'] == 1 || $opcija['id'] == 1 ? 'checked="checked"':'').' '.($opcija['id'] == 1 ? 'disabled="disabled"':'').'>';
-				echo $lang['srv_'.$opcija['header_grupa']]. " - ";
-				echo $lang['srv_h_'.$opcija['header_field']];
-				echo '</span>';
-				echo '</li>';		
-			}
-		}
-		// na koncu ?e preverimo ali imamo kon?ano grupo ?ene nardimo zaključna diva
-		if ($grupaName != "") {
-			echo '</ul>';
-			echo '</div>';
-			echo '<div class="clr"></div>';
-			
-			echo '</li>';
-			$grupaName = "";		
-		}
-
-		echo '</ul></div>';
-		
-		echo '<div class="floatRight sl_div_error_holder" style="margin-right:10px; width:420px;">';
-		echo '<div id="div_error" class="red sl_div_error"><img src="icons/icons/error.png" alt="" vartical-align="middle" />'.$lang['srv_sl_error_msg'].'</div>';
-		echo '<div style="margin-top:20px;">'.$lang['srv_sl_setting_show'].'<input id="rows_per_page" value="'.$this->rec_per_page.'" type="text" />'.$lang['srv_sl_setting_records'];
-		echo '</div>';
-		echo '<div style="margin-top:20px;">';
-		echo '  <div class="floatLeft spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="default_surveyListSettings(); return false;"><span><img src="'.$site_url.'admin/survey/icons/icons/page_white_gear.png" alt="" vartical-align="middle" />'.$lang['srv_default'].'</span></a></div></div>';
-		echo '  <div class="floatLeft spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="cancle_surveyListSettings(); return false;"><span><img src="'.$site_url.'admin/survey/icons/icons/cog_back.png" alt="" vartical-align="middle" />'.$lang['srv_cancel'].'</span></a></div></div>';
-		echo '  <div class="floatLeft spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="save_surveyListSettings(); return false;"><span><img src="'.$site_url.'admin/survey/icons/icons/cog_save.png" alt="" vartical-align="middle" />'.$lang['save'].'</span></a></div></div>';
-		echo '<div class="clr"></div>';
-		echo '</div>';
-		echo '</div>';
-		
-		echo '<div class="clr"></div>';
-		echo '</div>';
-		echo	'<script type="text/javascript">';
-		// echo '$(function() {';
-		echo '$(document).ready(function() {';
-	 	echo '$("#sortable").sortable({ axis: "y", handle: "img.parent"}).stop();';
-		// echo '$("#sortable").disableSelection();';
-			foreach ( $zastopaneGrupe as $grupa ) {
-    			echo '$("[name='.$grupa.']").sortable({ axis: "y", handle: "img.sub_child", zIndex: 5  }).stop();';
-    		}
-			// $("#sortableGroup").sortable();
-			// $("#sortableGroup").disableSelection();
-
-		echo '})';
-        echo '</script>';
-	}
-	
-	public function displayListQickInfo() {
-		# prikažemo hitri povzetek anket uporabnika
-		
-		# preštejemo zadnje ankete v 12 urah
-		$ank1hour = "SELECT id FROM srv_anketa sa WHERE sa.backup='0' AND sa.id > 0 AND sa.active >= 0 AND invisible = '0' AND (sa.insert_time > (DATE_SUB(CURDATE(), INTERVAL 1 HOUR)) || sa.edit_time > (DATE_SUB(CURDATE(), INTERVAL 1 HOUR)) ) ".$this->getDostopAnketa();
-		$ank12hour = "SELECT id FROM srv_anketa sa WHERE sa.backup='0' AND sa.id > 0 AND sa.active >= 0 AND invisible = '0' AND (sa.insert_time > (DATE_SUB(CURDATE(), INTERVAL 12 HOUR)) || sa.edit_time > (DATE_SUB(CURDATE(), INTERVAL 12 HOUR)) ) ".$this->getDostopAnketa();
-		$ank24hour = "SELECT id FROM srv_anketa sa WHERE sa.backup='0' AND sa.id > 0 AND sa.active >= 0 AND invisible = '0' AND (sa.insert_time > (DATE_SUB(CURDATE(), INTERVAL 24 HOUR)) || sa.edit_time > (DATE_SUB(CURDATE(), INTERVAL 23 HOUR)) ) ".$this->getDostopAnketa();
-	
-		$qry1hour = sisplet_query($ank1hour);
-		$qry12hour = sisplet_query($ank12hour);
-		$qry24hour = sisplet_query($ank24hour);
-		
-		$cnt1hour = mysqli_num_rows($qry1hour);
-		$cnt12hour = mysqli_num_rows($qry12hour);
-		$cnt24hour = mysqli_num_rows($qry24hour);
-		
-
-	}
-	
-	
-	// Vrne stevilo vseh anket
-	public function countSurveys() {
-		return count($this->surveys_ids);
-	}
-	
-	// Vrne stevilo vseh anket v rootu (ce imamo folderje)
-	public function countRootSurveys() {
-		global $global_user_id;
-		
-		// Poiscemo vse ankete v custom folderjih
-		$sql = sisplet_query("SELECT ank_id FROM srv_mysurvey_anketa WHERE usr_id='$global_user_id'");
-		
-		// Vrnemo razliko v stevilu anket (odstejemo ankete v custom folderjih)
-		$survey_count = count($this->surveys_ids);
-		if(mysqli_num_rows($sql) > 0)
-			$survey_count -= mysqli_num_rows($sql);
-		
-		return $survey_count;
-	}
-
-	/** Anketam ki so potekle popravimo aktivnost
-	 * 
-	 */
-	public function checkSurveyExpire() {
-                //v primeru maza moramo sporociti vsem aplikacijam deaktivacijo ankete
-                if(Common::checkModule('maza')){
-                    $maza = new MAZA();
-                    $maza -> maza_check_expired_surveys();
-                }
-                
-		# Anketam ki so potekle popravimo aktivnost
-		sisplet_query("UPDATE srv_anketa SET active = '0' WHERE active = '1' AND expire < CURDATE()");
-		// vsilimo refresh podatkov
-		SurveyInfo :: getInstance()->resetSurveyData();
-	}
-	
-	/** GETERS && SETTERS **/
-	/* GETERS */
-	private function getParentFolder()	{ return $this->parentFolder; }
-	private function getCurrentFolder()	{ return $this->currentFolder; }
-	public function getDef_Rows_per_page() { return SRV_LIST_REC_PER_PAGE; }
-	
-	/** vrne sql pogoj za folderje na podlagi trenutnega folderja */
-	private function getFolderCondition () {
-		if ($this->folderCondition == null) {
-			$resultString = " AND 0";
-			#$this->folders = array();
-			$folderArray = $this->getFolderTreeAsArray($this->getCurrentFolder());
-			if ( count( $folderArray ) > 0) {
-				$prefix="";
-				$resultString = " AND sa.folder IN (";
-				foreach ($folderArray as $fid => $fname) {
-		       		$resultString .= $prefix.$fid;
-		       		$prefix=",";
-				}
-				$resultString .=") ";
-			}
-			$this->folderCondition = $resultString;
-		}
-		return $this->folderCondition;
-	}
-	
-	/** vrne array z folderjem in subfolderji (če je SRV_LIST_GET_SUB_FOLDERS = true) */ 
-	function getFolderTreeAsArray($parent) {
-		# če ni dodan parent ga dodamo
-		if (!isset($this->folders[$parent])) {
-			$parentSql = sisplet_query('SELECT id, naslov FROM srv_folder WHERE id="'.$parent.'";');
-			if (mysqli_num_rows($parentSql)>0) {
-				$rowParent = mysqli_fetch_assoc($parentSql);
-				$this->folders[$rowParent['id']] = $rowParent['naslov'];
-			}
-		}
-	   	if (SRV_LIST_GET_SUB_FOLDERS || $parent == 0) {
-			$result = sisplet_query('SELECT id, naslov FROM srv_folder WHERE parent="'.$parent.'";');
-			while ($row = mysqli_fetch_array($result)) {
-		   		$this->folders[$row['id']] = $row['naslov'];
-		   		$this->getFolderTreeAsArray($row['id']);
-			}
-	   	}
-		return $this->folders;
-	} 
-	
-	/** vrne sql pogoj za ankete v moji knjiznici na podlagi trenutnega folderja */
-	private function getLibraryCondition () {
-
-		if ($this->currentLibrary == null) {
-			$resultString = '';
-		}
-		else{
-			$children = array();
-			$children = $this->getLibraryChildren($this->currentLibrary, $children);
-
-			$childrenString = '';
-			if(!empty($children))
-				$childrenString = ','.implode(',', $children);
-
-			//$resultString = " AND sla.ank_id=sa.id AND sla.folder='".$this->currentLibrary."'";
-			$resultString = " AND sla.ank_id=sa.id AND sla.folder IN (".$this->currentLibrary . $childrenString.")";
-		}
-		
-		$this->libraryCondition = $resultString;
-		
-		return $this->libraryCondition;
-	}
-	
-	private function getLibraryChildren($folder_id, $children){
-		
-		// Pridobimo vse childe
-		$sql = sisplet_query("SELECT id, parent FROM srv_library_folder WHERE parent='".$folder_id."'");
-		
-		// Izstopni pogoj
-		if(mysqli_num_rows($sql) == 0)
-			return ($children);
-			
-		while($row = mysqli_fetch_array($sql)){
-			$children[] = $row['id'];
-			$children2 = $this->getLibraryChildren($row['id'], $children);
-			
-			$children = array_merge($children, $children2);
-		}
-		
-		return array_unique($children);
-	}
-	
-	/** vrne sql string za omejevanje dostopa uporabniku */
-	function getLanguageLimit()	{
-        global $global_admin_type;
-        
-		if ((int)$this->lang_id > 0) {
-			return " AND lang_admin ='".(int)$this->lang_id."'";
-		}
-	}
-	
-	/** vrne sql string za omejevanje dostopa uporabniku */
-	function getDostopAnketa()	{
-		global $global_admin_type;
-		global $global_user_id;
-		
-		if ($this->dostopCondition == null) {
-			// posebej za managerje, ki vidijo ankete svojih uporabnikov
-			$manage = '';
-			
-			#generalni dostop glede na tip uporabnikov -->  $admin_type <= $row['dostop']
-			# posebej dostop za vsazga userja posebej  -->  sisplet_query("SELECT * FROM srv_dostop WHERE ank_id = '$anketa' AND uid='$uid'") -> if (mysqli_num_rows($sql) > 0)
-			if ($this->user_id == null) {
-				if ($this->g_adminType == 1 || $this->g_adminType == 0) 
-					$manage = " OR uid IN (".SurveyCopy::prepareSubquery(sisplet_query("SELECT user FROM srv_dostop_manage WHERE manager = '".$this->g_uid."' ")).") ";
-				
-				$this->dostopCondition = (SRV_LIST_CHECK_DOSTOP ?  " AND (sa.id IN (".SurveyCopy::prepareSubquery(sisplet_query("SELECT ank_id FROM srv_dostop WHERE uid='".$this->g_uid."' $manage"))."))" : "");
-			} 
-			else {
-				if ($this->g_adminType == 1 || $this->g_adminType == 0) 
-					$manage = " OR uid IN (".SurveyCopy::prepareSubquery(sisplet_query("SELECT user FROM srv_dostop_manage WHERE manager = '".$this->g_uid."'")).") ";
-
-				$this->dostopCondition = (SRV_LIST_CHECK_DOSTOP ?  " AND (insert_uid = '".$this->user_id."') AND (sa.id IN (".SurveyCopy::prepareSubquery(sisplet_query("SELECT ank_id FROM srv_dostop WHERE uid='".$this->g_uid."' $manage"))."))" : "");
-			}
-			
-			# če ni admin odstranimo ankete kjer je uporabnik označen samo kot anketar
-			if ( true /*$this->g_adminType != '0'*/ ) { 
-				$this->dostopCondition .= " AND sa.id".($this->onlyPhone == false ? " NOT":"")." IN"
-				." (SELECT ank_id FROM srv_dostop AS sd WHERE sd.aktiven = '1' AND sd.uid = '$this->g_uid' AND FIND_IN_SET('phone',sd.dostop )>0 AND FIND_IN_SET('edit',sd.dostop ) = 0) ";
-			} 
-			else {
-			}
-		}
-		
-
-		// meta admin vidi kao spet vse
-		if ( Dostop::isMetaAdmin() ) {
-			
-			if ($this->user_id == null) {
-				$this->dostopCondition = (SRV_LIST_CHECK_DOSTOP ?  " AND (sa.dostop >= '".$this->g_adminType."' OR sa.id IN (".SurveyCopy::prepareSubquery(sisplet_query("SELECT ank_id FROM srv_dostop WHERE uid='".$this->g_uid."' $manage"))."))" : "");
-			} 
-			// filtriranje
-			else {  
-				$manage = " OR uid IN (".SurveyCopy::prepareSubquery(sisplet_query("SELECT user FROM srv_dostop_manage WHERE manager = '".$this->g_uid."'")).") ";
-				$this->dostopCondition = (SRV_LIST_CHECK_DOSTOP ?  " AND (insert_uid = '".$this->user_id."') AND (sa.id IN (".SurveyCopy::prepareSubquery(sisplet_query("SELECT ank_id FROM srv_dostop WHERE uid='".$this->g_uid."' $manage"))."))" : "");
-			}
-
-			// Včasih se za meta admina nekaj porusi in ne prikaze nobene ankete...
-			//$this->dostopCondition = '';
-		}
-		
-		return $this->dostopCondition;
-	}
-	
-	/** vrne order string za SQL s katerim sortiramo */
-	private function getOrderString() {
-		
-		if (!isset($this->sortby) || (int)$this->sortby == 0) {
-			$this->sortby = SRV_LIST_ORDER_BY;
-		}
-		
-		if (isset($this->order_by_options[$this->sortby])) {
-			$order_by = $this->order_by_options[$this->sortby];
-		} else {
-			$order_by = $this->order_by_options[SRV_LIST_ORDER_BY];
-		}
-		
-		// UPPER damo, ker drugace sortira najprej vlke crke potem pa male
-		if($this->sortby == 1 || $this->sortby == 7 || $this->sortby == 11){
-			// Zamenjamo nacin sortiranja pri besedilu (drugace zacnemo od zadaj)
-			$sorttype = ($this->sorttype == 1) ? 2 : 1;
-			$result = " ORDER BY upper(" . $order_by . ") " . $this->sort_types_options[$sorttype];
-		}
-		// Dodamo opcije sortiranja pri statusu (18), ker ni dovolj sortiranje po "expired"
-		elseif($this->sortby == 18){
-			$sorttypeReverse = ($this->sorttype == 1) ? 2 : 1;
-			$result = " ORDER BY 
-						sa.active ".$this->sort_types_options[$this->sorttype].",
-						(SELECT IF(COUNT(sac.sid) > 0, 1, 0) FROM srv_activity sac WHERE sac.sid=sa.id) ".$this->sort_types_options[$this->sorttype].",
-						".$order_by." ".$this->sort_types_options[$sorttypeReverse];
-		}
-		else
-			$result = " ORDER BY " . $order_by . " ".$this->sort_types_options[$this->sorttype];
-
-		return $result;
-	}
-	
-	/** vrne Limit string za SQL s katerim prika?emo posamezno stran */
-	private function getLimitString() {
-		$result = " LIMIT " . ($this->pageno * $this->rec_per_page - $this->rec_per_page) . ", " . $this->rec_per_page;
-		return $result;
-	}
-	
-	// vrne sql string za search po anketah glede na nastavitve searcha
-	private function getSearchString(){
-
-		$search_text = mysqli_real_escape_string($GLOBALS['connect_db'], $this->searchString);
-        $search_text = stripslashes(stripslashes($search_text));
-        
-        // Vse gre v lowerstring
-        $search_text = strtolower($search_text);
-		
-		// Ce gre za string v narekovajih
-		if($search_text[0] == '"' && $search_text[strlen($search_text) - 1] == '"'){
-			$search_text = trim($search_text, '"');
-			$this->searchStringProcessed[] = $search_text;
-			$search_text = '%'.$search_text.'%';	
-		}
-		else{
-			// Sklanjamo po search besedi - ce gre za search po naslovu ali kljucnih besedah
-			if ($this->searchSettings['stype'] == '0' || $this->searchSettings['stype'] == '2') {        
-                
-                // odstrani vse zvezdice in pluse in skrajsaj besede za dva znaka, dodaj *.
-		        $search_text = explode (" ", $search_text);
-		        
-				for ($a=0; $a<sizeof($search_text); $a++) {
-		            if (strlen ($search_text[$a]) > 5) 
-						$search_text[$a] = substr ($search_text[$a], 0, -2);
-		            elseif (strlen ($search_text[$a]) > 2) 
-						$search_text[$a] = substr ($search_text[$a], 0, -1);
-		            else 
-						$search_text[$a] = $search_text[$a];
-					
-					$this->searchStringProcessed[$a] = $search_text[$a];
-					$search_text[$a] = '%'.$search_text[$a].'%';
-		        }
-		        
-				$search_text = implode(" ", $search_text);		
-		    }
-			else{
-				$this->searchStringProcessed[] = $search_text;
-				$search_text = '%'.$search_text.'%';
-			}
-		}
-		
-		// Search po avtorju
-		if($this->searchSettings['stype'] == '1'){ 
-            $result = " AND (i_name LIKE '".$search_text."' OR i_surname LIKE '".$search_text."' OR i_email LIKE '".$search_text."')";
-        }
-		// Search po kljucnih besedah znotraj vprasanj (naslovi vprasanj in vrednosti)
-		elseif($this->searchSettings['stype'] == '2'){
-			$result = " AND (LOWER(introduction) LIKE LOWER('".$search_text."')
-								OR LOWER(conclusion) LIKE LOWER('".$search_text."') 
-								OR LOWER(ss.naslov) LIKE LOWER('".$search_text."') 
-                                OR LOWER(sv.naslov) LIKE LOWER('".$search_text."'))";
-        }
-		// Search po naslovu
-		else{
-            $result = " AND (LOWER(sa.naslov) LIKE LOWER('".$search_text."') OR LOWER(sa.akronim) LIKE LOWER('".$search_text."') OR LOWER(nl.link) LIKE LOWER('".$search_text."'))";
-        }
-		
-		// Search po statusu (aktivne, neaktivne)
-		if($this->searchSettings['sstatus'] == '1')
-			$result .= " AND active > '0'";
-		if($this->searchSettings['sstatus'] == '2')
-			$result .= " AND active = '0'";
-		
-		// Search po datumu ustvarjanja (od)
-		if($this->searchSettings['sidatefrom'] != ''){			
-			$date = date('Y-m-d H:i:s', strtotime($this->searchSettings['sidatefrom']));
-			$result .= " AND insert_time >= '".$date."'";
-		}
-		// Search po datumu ustvarjanja (do)
-		if($this->searchSettings['sidateto'] != ''){
-			$date = date('Y-m-d H:i:s', strtotime($this->searchSettings['sidateto']));
-			$result .= " AND insert_time <= '".$date."'";
-		}
-		
-		// Search po datumu zadnjega urejanja (od)
-		if($this->searchSettings['sedatefrom'] != ''){
-			$date = date('Y-m-d H:i:s', strtotime($this->searchSettings['sedatefrom']));
-			$result .= " AND edit_time >= '".$date."'";
-		}
-		// Search po datumu zadnjega urejanja (do)
-		if($this->searchSettings['sedateto'] != ''){
-			$date = date('Y-m-d H:i:s', strtotime($this->searchSettings['sedateto']));
-			$result .= " AND edit_time <= '".$date."'";
-		}
-		
-		// Dodaten search po avtorju samo za metaadmine
-		if($this->searchSettings['onlyAuthor'] != ''){
-			$onlyAuthorString = mysqli_real_escape_string($GLOBALS['connect_db'], $this->searchSettings['onlyAuthor']);
-			$onlyAuthorString = stripslashes(stripslashes($onlyAuthorString));
-
-			$result .= " AND (i_name LIKE '%".$onlyAuthorString."%' 
-							OR i_surname LIKE '%".$onlyAuthorString."%' 
-							OR i_email LIKE '%".$onlyAuthorString."%')";
-		}
-		
-		return $result;
-	}
-	
-	// Dobimo vse parametri searcha
-	private function getSearchParams(){
-		global $site_url;
-
-		$params = '';
-		
-		if($this->isSearch == 1){
-			$params .= 'search='.urlencode($this->searchString);
-			
-			if(!empty($this->searchSettings)){
-				foreach($this->searchSettings as $key => $val){
-					$params .= '&'.$key.'='.urlencode($val);
-				}
-			}
-		}
-		
-		return $params;
-	}
-	
-	
-	/**
-	 *  shranimo širine celic
-	 */
-	public function saveCssSettings($data) {
-		$new_data = array();
-		if (isset($data) && $data != null) {
-			$new_data = $this->getCssSetings();
-			// nato popravimo vrednost 	
-			$_tmp_new_data = array_unique(explode(",",$data));
-			$new_data[$_tmp_new_data[0]] = $_tmp_new_data[1];
-			// nato zdru?imo v primerno obliko in shranimo
-			$saveString = "";
-			$saveStringPrefix = "";
-			if (isset($new_data) && $new_data != null && count($new_data) > 0) {
-				foreach ( $new_data as $tmp_new_key => $tmp_new_data ) {
-					$saveString .= $saveStringPrefix.$tmp_new_key.",".$tmp_new_data;	
-					$saveStringPrefix = ";";
-				}
-			}	
-			UserSetting::getInstance()->setUserSetting('survey_list_widths', $saveString);
-		} else {
-			UserSetting::getInstance()->setUserSetting('survey_list_widths', "");
-		}
-		// shranimo
-		UserSetting::getInstance()->saveUserSetting('survey_list_widths', $saveString);
-	}
-	/* SETERS */
-	private function setParentFolder($parentFolder = 0)	{ $this->parentFolder = $parentFolder; }
-	private function setCurrentFolder($currentFolder = 0)	{ $this->currentFolder = $currentFolder; }
-	
-    private function UpdateSystemLibrary () {
-		global $lang, $site_url;
-		
-        $anketa = $_POST['anketa'];
-
-		echo '<a href="/" onclick="surveyList_knjiznica(\''.$anketa.'\'); return false;">';
-		
-		$sql = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='$anketa' AND uid='0'");
-        if (mysqli_num_rows($sql) == 0) {
-            $sql1 = sisplet_query("SELECT * FROM srv_library_folder WHERE uid='0' AND tip='1' AND parent='0' AND lang='$lang[id]'");
-            $row1 = mysqli_fetch_array($sql1);
-            sisplet_query("INSERT INTO srv_library_anketa (ank_id, uid, folder) VALUES ('$anketa', '0', '$row1[id]')");
-			echo '<span class="sprites library_admin_on" title="'.$lang['srv_ank_lib_on'].'"></span>';
-        } else {
-            sisplet_query("DELETE FROM srv_library_anketa WHERE ank_id='$anketa' AND uid='0'");
-			echo '<span class="sprites library_admin_off" title="'.$lang['srv_ank_lib_off'].'"></span>';
-        }
-		
-		echo '</a>';
-    }
-
-    private function UpdateUserLibrary () {
-        global $global_user_id, $site_url, $lang;
-		
-        $anketa = $_POST['anketa'];
-		
-		echo '<a href="/" onclick="surveyList_myknjiznica(\''.$anketa.'\'); return false;">';
-        
-		$sql = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='$anketa' AND uid='$global_user_id'");
-        if (mysqli_num_rows($sql) > 0) {
-            sisplet_query("DELETE FROM srv_library_anketa WHERE ank_id='$anketa' AND uid='$global_user_id'");
-            echo '<span class="sprites library_off" title="'.$lang['srv_ank_mylib_off'].'"></span>';
-        } else {
-            $sql1 = sisplet_query("SELECT * FROM srv_library_folder WHERE uid='$global_user_id' AND tip='1' AND parent='0'");
-            $row1 = mysqli_fetch_array($sql1);
-            sisplet_query("INSERT INTO srv_library_anketa (ank_id, uid, folder) VALUES ('$anketa', '$global_user_id', '$row1[id]')");
-            echo '<span class="sprites library_on" title="'.$lang['srv_ank_mylib_on'].'"></span>';
-        }
-		
-		echo '</a>';
-    }
-	
-	private function UpdateSystemLibraryNew () {
-		global $lang, $site_url;
-		
-        $anketa = $_POST['anketa'];
-
-        $sql = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='$anketa' AND uid='0'");
-
-        if (mysqli_num_rows($sql) == 0) {
-            $sql1 = sisplet_query("SELECT * FROM srv_library_folder WHERE uid='0' AND tip='1' AND parent='0' AND lang='$lang[id]'");
-            $row1 = mysqli_fetch_array($sql1);
-            
-            sisplet_query("INSERT INTO srv_library_anketa (ank_id, uid, folder) VALUES ('$anketa', '0', '$row1[id]')");
-			sisplet_query("UPDATE srv_survey_list SET lib_glb='1' WHERE id='$anketa'");
-        } 
-        else {
-            sisplet_query("DELETE FROM srv_library_anketa WHERE ank_id='$anketa' AND uid='0'");
-			sisplet_query("UPDATE srv_survey_list SET lib_glb='0' WHERE id='$anketa'");
-        }
-    }
-
-	private function UpdateUserLibraryNew () {
-        global $global_user_id, $site_url;
-		
-        $anketa = $_POST['anketa'];
-
-        $sql = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='$anketa' AND uid='$global_user_id'");
-
-        if (mysqli_num_rows($sql) > 0) {
-            sisplet_query("DELETE FROM srv_library_anketa WHERE ank_id='$anketa' AND uid='$global_user_id'");
-			sisplet_query("UPDATE srv_survey_list SET lib_usr='0' WHERE id='$anketa'");
-        } 
-        else {
-            $sql1 = sisplet_query("SELECT * FROM srv_library_folder WHERE uid='$global_user_id' AND tip='1' AND parent='0'");
-            $row1 = mysqli_fetch_array($sql1);
-
-            sisplet_query("INSERT INTO srv_library_anketa (ank_id, uid, folder) VALUES ('$anketa', '$global_user_id', '$row1[id]')");
-			sisplet_query("UPDATE srv_survey_list SET lib_usr='1' WHERE id='$anketa'");
-        }
-    }
-	
-	private function DisplayInfo () {
-        global $global_user_id, $site_url;
-		
-        $anketa = $_POST['anketa'];
-		SurveyInfo::getInstance()->SurveyInit($anketa);
-
-        SurveyInfo::DisplayInfoBox();
-    }
-    
-	// ajax, ki poskrbi za vse update glelde razvrscanja mojih anket v folderje
-	private function updateMySurveyFolders(){
+    // ajax, ki poskrbi za vse update glelde razvrscanja mojih anket v folderje
+	/*private function updateMySurveyFolders(){
 		global $global_user_id, $site_url, $lang;
 
 		// Prenesli smo anketo v drug folder
@@ -2199,223 +930,7 @@ class SurveyListFolders {
 		}
 		
 		return;
-	}
-	
-	
-	/** Funkcija ki kiče podfunkcije za ajax del 
-	 * 
-	 */ 
-	public function Ajax() {
-		switch ( $_GET['a'] ) {
-			case 'surveyList_knjiznica':
-				$this->UpdateSystemLibrary();
-				break;
-			case 'surveyList_myknjiznica':
-				$this->UpdateUserLibrary();
-				break;
-			case 'surveyList_myknjiznica_new':
-				$this->UpdateUserLibraryNew();
-				break;
-			case 'surveyList_knjiznica_new':
-				$this->UpdateSystemLibraryNew();
-				break;
-			case 'surveyList_display_info':
-				$this->DisplayInfo();
-				break;
-			case 'survey_dropped':
-			case 'folder_dropped':
-			case 'folder_create':
-			case 'folder_delete':
-			case 'folder_toggle':
-			case 'folder_rename':
-			case 'folder_copy':
-				$this->updateMySurveyFolders();
-				break;
-			case 'language_change':
-				$this->switch_language();
-				break;	
-			default:
-				print_r($_POST);
-				print_r($_GET);
-			break;
-		}
-	}
-	
-	
-	/** Osveži datoteko z dodatnimi podatki anket
-	 * za tiste ankete ki so bile spremenjene ali so imele kakšne vnose
-	 */
-	private function refreshData() {
-		
-		# polovimo vse obstoječe podatke v združeni datoteki
-		if (count($this->surveys_ids)>0 ) {
-			
-			// Metaadmin updata samo svoje ankete (drugace jih je prevec in lahko zasteka)
-			if(Dostop::isMetaAdmin()){
-								
-				# polovimo seznam metaadminovih anket
-				$meta_surveys_ids = array();
-				$dostopCondition = (SRV_LIST_CHECK_DOSTOP ?  " AND (insert_uid = '".$this->user_id."') AND (sa.id IN (".SurveyCopy::prepareSubquery(sisplet_query("SELECT ank_id FROM srv_dostop WHERE uid='".$this->g_uid."'"))."))" : "");
-				$stringSurveyList = "SELECT id, backup, active, folder, dostop FROM srv_anketa sa WHERE sa.backup='0' AND sa.id > 0 AND sa.active >= 0 AND sa.invisible = '0' ".$dostopCondition;
-				$sqlSurveyList = sisplet_query($stringSurveyList);
-				while (	$rowSurveyList = mysqli_fetch_assoc($sqlSurveyList)) {
-					$meta_surveys_ids[$rowSurveyList['id']] = $rowSurveyList['id'];
-				}
-				
-				$to_update = $meta_surveys_ids;
+	}*/
 
-                if(!empty($meta_surveys_ids)){
-
-                    # poiščemmo katere ankete so OK, in jih odstranimo iz seznama anket potrebnih za update
-                    $sqlSurveyList = sisplet_query("SELECT id 
-                                                        FROM srv_survey_list 
-                                                        WHERE id IN (".implode(',', $meta_surveys_ids).")
-                                                            AND updated = '0' AND last_updated IS NOT NULL
-                                                    ");
-                    while (	$rowSurveyList = mysqli_fetch_assoc($sqlSurveyList)) {
-                        if (isset($to_update[$rowSurveyList['id']])) {
-                            unset($to_update[$rowSurveyList['id']]);
-                        }
-                    }
-                }
-				
-			}
-			else{		
-				$to_update = $this->surveys_ids;
-				
-				# poiščemmo katere ankete so OK, in jih odstranimo iz seznama anket potrebnih za update
-				$sqlSurveyList = sisplet_query("SELECT id 
-                                                    FROM srv_survey_list 
-                                                    WHERE id IN (".implode(',', $this->surveys_ids).") 
-                                                        AND updated = '0' AND last_updated IS NOT NULL
-                                                ");
-				while (	$rowSurveyList = mysqli_fetch_assoc($sqlSurveyList)) {
-					if (isset($to_update[$rowSurveyList['id']])) {
-						unset($to_update[$rowSurveyList['id']]);
-					}
-				}
-			}
-				 
-			# če je treba kaj updejtat
-			if (count($to_update) > 0) {
-				$stringUpdateList = 
-				  " SELECT sa.id, "
-
-				. ' IF(ISNULL(sla1.lib_glb),0,sla1.lib_glb) AS lib_glb,'
-				. ' IF(ISNULL(sla2.lib_usr),0,sla2.lib_usr) AS lib_usr,' 
-				
-				. " us3.vnos_time_first AS v_time_first, us3.vnos_time_last AS v_time_last," 
-				. ' IF(ISNULL(us3.answers),0,us3.answers) as answers,' 
-				. ' IF(ISNULL(g.variables),0,g.variables) as variables,'
-				. ' IF(ISNULL(us5.approp),0,us5.approp) as approp'
-				
-				. ' FROM srv_anketa sa'
-				
-				. " LEFT OUTER JOIN ( SELECT ank_id, uid, COUNT(*) AS lib_glb FROM srv_library_anketa as sla WHERE sla.uid = '0' AND sla.ank_id IN (".implode(',', $to_update).") GROUP BY ank_id ) 
-						AS sla1 ON sla1.ank_id = sa.id" 
-				. " LEFT OUTER JOIN ( SELECT ank_id, uid, COUNT(*) AS lib_usr FROM srv_library_anketa as sla WHERE sla.uid = '".$this->g_uid."' AND sla.ank_id IN (".implode(',', $to_update).") GROUP BY ank_id ) 
-						AS sla2 ON sla2.ank_id = sa.id"
-				
-				. ' LEFT OUTER JOIN ( SELECT us3.ank_id, COUNT(us3.ank_id) as answers, MIN( us3.time_insert ) as vnos_time_first, MAX( us3.time_insert ) as vnos_time_last, preview FROM srv_user as us3 WHERE us3.ank_id IN ('.implode(',', $to_update).') AND us3.preview = \'0\' AND us3.deleted=\'0\' AND us3.testdata=\'0\' AND (us3.last_status=\'5\' OR us3.last_status=\'6\') AND us3.lurker=\'0\' GROUP BY us3.ank_id ) 
-						AS us3 ON us3.ank_id = sa.id'
-				
-				. ' LEFT OUTER JOIN ( SELECT g.ank_id, COUNT(s.gru_id) as variables FROM srv_grupa g, srv_spremenljivka s WHERE g.id = s.gru_id AND g.ank_id IN ('.implode(',', $to_update).') GROUP BY g.ank_id ) 
-						AS g ON g.ank_id = sa.id'
-
-				. ' LEFT OUTER JOIN ( SELECT us5.ank_id, COUNT(us5.ank_id) as approp, preview FROM srv_user as us5 WHERE last_status IN (' . $this->appropriateStatus . ') AND us5.ank_id IN ('.implode(',', $to_update).') AND us5.preview =\'0\' AND us5.deleted=\'0\' GROUP BY us5.ank_id ) 
-						AS us5 ON us5.ank_id = sa.id'
-				
-				. ' WHERE sa.id IN ('.implode(',', $to_update).')';
-				
-				$sqlUpdateList = sisplet_query($stringUpdateList);
-	 			if (!$sqlUpdateList) echo mysqli_error($GLOBALS['connect_db']);
-				
-	    		if (mysqli_num_rows($sqlUpdateList) > 0) {
-					
-					// Po novem zakesiramo podatke iz tabele "users" posebej (da ne zaklene zgornji query tabele za dalj casa)
-					$users = array();
-					$sqlUsers = sisplet_query("SELECT sa.id AS ank_id, sa.edit_uid, us1.name AS e_name, us1.surname AS e_surname, us1.email AS e_email,
-														sa.insert_uid, us2.name AS i_name, us2.surname AS i_surname, us2.email AS i_email
-												FROM srv_anketa sa
-												LEFT OUTER JOIN users AS us1 ON us1.id = sa.edit_uid
-												LEFT OUTER JOIN users AS us2 ON us2.id = sa.insert_uid
-												WHERE sa.id IN (".implode(',', $to_update).")");
-					while($rowUsers = mysqli_fetch_array($sqlUsers)){
-						$users[$rowUsers['ank_id']] = $rowUsers;
-					}
-					
-	    			$values = array();
-					while (	$row = mysqli_fetch_assoc($sqlUpdateList)) {
-						
-						$row['i_name'] = mysqli_real_escape_string($GLOBALS['connect_db'], $users[$row['id']]['i_name']);
-						$row['i_surname'] = mysqli_real_escape_string($GLOBALS['connect_db'], $users[$row['id']]['i_surname']);
-						$row['i_email'] = mysqli_real_escape_string($GLOBALS['connect_db'], $users[$row['id']]['i_email']);
-						$row['e_name'] = mysqli_real_escape_string($GLOBALS['connect_db'], $users[$row['id']]['e_name']);
-						$row['e_surname'] = mysqli_real_escape_string($GLOBALS['connect_db'], $users[$row['id']]['e_surname']);
-						$row['e_email'] = mysqli_real_escape_string($GLOBALS['connect_db'], $users[$row['id']]['e_email']);
-						 
-						$values[] = "('$row[id]','$row[lib_glb]','$row[lib_usr]','$row[answers]','$row[variables]','$row[approp]','$row[i_name]','$row[i_surname]','$row[i_email]','$row[e_name]','$row[e_surname]','$row[e_email]','$row[v_time_first]','$row[v_time_last]','0', NOW())";	
-					}
-					
-					$updateString = "INSERT INTO srv_survey_list (id, lib_glb, lib_usr, answers, variables, approp, i_name, i_surname, i_email, e_name, e_surname, e_email, a_first, a_last, updated, last_updated) "
-					 ." VALUES ".implode(',', $values)." ON DUPLICATE KEY UPDATE id=VALUES(id), lib_glb=VALUES(lib_glb), lib_usr=VALUES(lib_usr), answers=VALUES(answers), variables=VALUES(variables), approp=VALUES(approp), i_name=VALUES(i_name), i_surname=VALUES(i_surname), i_email=VALUES(i_email), e_name=VALUES(e_name), e_surname=VALUES(e_surname), e_email=VALUES(e_email), a_first=VALUES(a_first), a_last=VALUES(a_last), updated='0', last_updated=NOW()";
-					 
-					 sisplet_query($updateString);
-	
-	    		}
-	    		sisplet_query("COMMIT");
-			}
-		}
-
-		# polovimo nastavitve uporabnika
-		$this->settingsArray = $this->getSettings();
-		
-		
-		# koliko imamo strani
-		$this->max_pages = (int)$this->rec_per_page > 0 ? ceil($this->countSurveys() / $this->rec_per_page) : 1;
-		
-		# ce imamo direktorije, imamo manj strani zaradi anket v direktorijih
-		if($this->show_folders == 1 && $this->max_pages > 1){
-			$this->max_pages = ceil($this->countRootSurveys() / $this->rec_per_page);
-		}
-				
-		# katera je trenutna stran
-		if (isset($_GET['pageno']) && (int)$_GET['pageno'] > 0) {
-			# izbrana stran ne more biti večja, kot pa imamo vseh strani
-			$this->pageno = min((int)$_GET['pageno'], $this->max_pages );
-		}	
-	}
-	
-	function setFilter() {
-		if (isset($_POST['sl_filter']) && trim($_POST['sl_filter']) != "") {
-			$this->filter = trim($_POST['sl_filter']);
-		}
-	}
-	
-	public function countPhoneSurveys() {
-		# če ni admin odstranimo ankete kjer je uporabnik označen samo kot anketar
-		
-		$stringSurveyList = "SELECT count(*) FROM srv_anketa sa WHERE sa.backup='0' AND sa.id > 0 AND sa.active >= 0 AND sa.invisible = '0' "
-		.$this->getFolderCondition();
-		if ($this->g_adminType != '0') {
-			$stringSurveyList .= " AND sa.id IN (".SurveyCopy::prepareSubquery(sisplet_query("SELECT ank_id FROM srv_dostop AS sd WHERE sd.aktiven = '1' AND sd.uid = '$this->g_uid' AND FIND_IN_SET('phone',sd.dostop )>0 AND FIND_IN_SET('edit',sd.dostop ) = 0")).")";
-		} else {
-			$stringSurveyList .= " AND sa.id IN (".SurveyCopy::prepareSubquery(sisplet_query("SELECT ank_id FROM srv_dostop AS sd WHERE sd.aktiven = '1' AND FIND_IN_SET('phone',sd.dostop )>0 AND FIND_IN_SET('edit',sd.dostop ) = 0")).")";
-		}
-		
-		$sqlSurveyList = sisplet_query($stringSurveyList);
-		[$count] = mysqli_fetch_row($sqlSurveyList);
-		
-		return (int)$count;
-	}
-	
-	// Preklopimo jezik
-	private function switch_language(){
-		global $global_user_id;
-		
-		$lang = $_POST['lang'];
-		
-		sisplet_query("UPDATE users SET lang = '$lang' WHERE id = '$global_user_id'");	
-	}
 }
 ?>
\ No newline at end of file
diff --git a/admin/survey/script/surveyList.js b/admin/survey/script/surveyList.js
index 9a08c1aa0..f7b831581 100644
--- a/admin/survey/script/surveyList.js
+++ b/admin/survey/script/surveyList.js
@@ -1,3 +1,97 @@
+/** Izbrise anketo
+ * 
+ * @param anketa
+ * @param confirmtext
+ * @return
+ */
+ function anketa_delete_list (anketa, confirmtext) {
+	if (confirm(confirmtext)) {
+		$("#anketa_list_"+anketa).slideUp();
+        $.post('ajax.php?a=anketa_delete', {anketa: anketa, 'inList': 'true'}, function(response) {
+        	if (response == '0') {
+        		window.location = 'index.php';
+        	}
+        });
+	}
+}
+
+/** doda/odstrani anketo v sistemsko knjiznico in refresa ikono za knjiznico ankete
+ * 
+ */
+function surveyList_knjiznica (anketa) {
+	$("ul#surveyList").find("li#anketa_list_"+anketa).find(".sl_lib_glb").load('ajax.php?t=surveyList&a=surveyList_knjiznica', {anketa: anketa});
+}
+
+/** navadnega uporabnika obvesti da nima dostopa za dodajanje v sistemsko knjiznico
+ * 
+ */
+function surveyList_knjiznica_noaccess (msg) {
+	genericAlertPopup('alert_parameter_msg');
+}
+
+/** doda/odstrani anketo v uporabnisko knjiznico in refresa ikono za knjiznico ankete
+* 
+*/
+function surveyList_myknjiznica (anketa) {
+	$("ul#surveyList").find("li#anketa_list_"+anketa).find(".sl_lib_usr").load('ajax.php?t=surveyList&a=surveyList_myknjiznica', {anketa: anketa});
+    //$('#folders').load('ajax.php?t=folders&a=folders_myknjiznica', {anketa: anketa});
+}
+
+function surveyList_myknjiznica_new (anketa) {
+	$.post('ajax.php?t=surveyList&a=surveyList_myknjiznica_new', {anketa: anketa}, function() {
+		window.location.reload(true);
+	});
+}
+
+function surveyList_knjiznica_new (anketa) {
+	$.post('ajax.php?t=surveyList&a=surveyList_knjiznica_new', {anketa: anketa}, function() {
+		window.location.reload(true);
+	});
+}
+
+// Prikaz vec na tri pikice v tabeli anket
+function surveyList_show_more(ank_id){
+
+    if($('#survey_other_box_'+ank_id).hasClass('displayNone')){
+        $('.survey_other_box').addClass('displayNone');
+        $('#survey_other_box_'+ank_id).removeClass('displayNone');
+    }
+    else{
+        $('.survey_other_box').addClass('displayNone');
+    }
+    
+}
+
+
+
+/* MOJE ANKETE - pogled z mapami */
+
+// Preklopimo med prikazom folderjev in navadnim prikazom
+function switchFolder(show){
+	if(show == 1)
+		var show_folders = 0;
+	else
+		var show_folders = 1;
+
+	$('#survey_list').load('ajax.php?a=surveyList_folders', {show_folders:show_folders}, function(){
+        $('#moje_ankete_edit').toggleClass('moje_ankete_folders');
+    });
+}
+
+// Aktiviramo folder
+function mysurvey_folder_activate(folder_id){
+
+    $('#right_content').load('ajax.php?t=surveyListFolders&a=mysurvey_folder_activate', {folder_id: folder_id}, function(){
+
+        // Pobrisemo aktivni class aktivnega
+        $('.folder_item').removeClass('active');
+        
+        // Dodamo aktivni class novemu
+        $('#folder_item_'+folder_id).addClass('active');
+	});
+}
+
+
 // inicializiramo drag/drop anket in folderjev
 function surveyList_folder_init() {
 
@@ -109,77 +203,6 @@ function copy_folder(folder){
 }
 
 
-// Preklopimo med prikazom folderjev in navadnim prikazom
-function switchFolder(show){
-	if(show == 1)
-		var show_folders = 0;
-	else
-		var show_folders = 1;
-
-	$('#survey_list').load('ajax.php?a=surveyList_folders', {show_folders:show_folders});
-}
 
 
-/** Izbrise anketo
- * 
- * @param anketa
- * @param confirmtext
- * @return
- */
-function anketa_delete_list (anketa, confirmtext) {
-	if (confirm(confirmtext)) {
-		$("#anketa_list_"+anketa).slideUp();
-        $.post('ajax.php?a=anketa_delete', {anketa: anketa, 'inList': 'true'}, function(response) {
-        	if (response == '0') {
-        		window.location = 'index.php';
-        	}
-        });
-	}
-}
 
-
-/** doda/odstrani anketo v sistemsko knjiznico in refresa ikono za knjiznico ankete
- * 
- */
-function surveyList_knjiznica (anketa) {
-	$("ul#surveyList").find("li#anketa_list_"+anketa).find(".sl_lib_glb").load('ajax.php?t=surveyList&a=surveyList_knjiznica', {anketa: anketa});
-}
-/** navadnega uporabnika obvesti da nima dostopa za dodajanje v sistemsko knjiznico
- * 
- */
-function surveyList_knjiznica_noaccess (msg) {
-	genericAlertPopup('alert_parameter_msg');
-}
-
-/** doda/odstrani anketo v uporabnisko knjiznico in refresa ikono za knjiznico ankete
-* 
-*/
-function surveyList_myknjiznica (anketa) {
-	$("ul#surveyList").find("li#anketa_list_"+anketa).find(".sl_lib_usr").load('ajax.php?t=surveyList&a=surveyList_myknjiznica', {anketa: anketa});
-    //$('#folders').load('ajax.php?t=folders&a=folders_myknjiznica', {anketa: anketa});
-}
-
-function surveyList_myknjiznica_new (anketa) {
-	$.post('ajax.php?t=surveyList&a=surveyList_myknjiznica_new', {anketa: anketa}, function() {
-		window.location.reload(true);
-	});
-}
-function surveyList_knjiznica_new (anketa) {
-	$.post('ajax.php?t=surveyList&a=surveyList_knjiznica_new', {anketa: anketa}, function() {
-		window.location.reload(true);
-	});
-}
-
-
-// Prikaz vec na tri pikice v tabeli anket
-function surveyList_show_more(ank_id){
-
-    if($('#survey_other_box_'+ank_id).hasClass('displayNone')){
-        $('.survey_other_box').addClass('displayNone');
-        $('#survey_other_box_'+ank_id).removeClass('displayNone');
-    }
-    else{
-        $('.survey_other_box').addClass('displayNone');
-    }
-    
-}
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index fa9be2618..97c8880d4 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -10500,20 +10500,26 @@ span.cke_toolgroup .cke_button {
 /*
     Gumbi na vrhu pri mojih anketah
 */
-#survey_list .first_line {
+#survey_list .first_line,
+#survey_list .second_line {
   display: flex;
   justify-content: left;
   align-items: center;
   margin-bottom: 40px;
 }
-#survey_list .first_line .button_quick_create {
+#survey_list .first_line .button_quick_create,
+#survey_list .second_line .button_quick_create {
+  display: flex;
+  align-items: center;
   margin-left: 32px;
 }
-#survey_list .first_line .button_quick_create a {
+#survey_list .first_line .button_quick_create a,
+#survey_list .second_line .button_quick_create a {
   text-decoration: none;
   font-weight: 600;
 }
-#survey_list .first_line .button_quick_create .faicon {
+#survey_list .first_line .button_quick_create .faicon,
+#survey_list .second_line .button_quick_create .faicon {
   margin-right: 8px;
 }
 
@@ -11089,16 +11095,29 @@ body.eng #survey_list .filters #folderSwitch {
 .moje_ankete_folders #survey_list .survey_list_folders .right_content {
   width: auto;
   padding: 32px 16px;
-  /*.second_line{
-      display: flex;
-
-  }   */
 }
 .moje_ankete_folders #survey_list .survey_list_folders .right_content .folder_title {
   margin-bottom: 24px;
   font-weight: 600;
   font-size: 16px;
 }
+.moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line {
+  display: flex;
+}
+.moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line .create_buttons {
+  display: flex;
+}
+.moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line .filters {
+  width: auto;
+}
+.moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line .filters #searchMySurveys {
+  width: auto;
+  margin-left: 16px;
+}
+.moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line .filters #searchMySurveys #searchMySurvey,
+.moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line .filters #searchMySurveys button {
+  height: 40px;
+}
 
 #survey_list .div_sl_new.folders table#surveyList_new tr.sl_header_new td {
   background-color: #FFFFFF;
diff --git a/resources/sass/admin_new/pages/my_surveys/survey_list_folders.scss b/resources/sass/admin_new/pages/my_surveys/survey_list_folders.scss
index 20617a01d..a717491a2 100644
--- a/resources/sass/admin_new/pages/my_surveys/survey_list_folders.scss
+++ b/resources/sass/admin_new/pages/my_surveys/survey_list_folders.scss
@@ -45,6 +45,7 @@
             }
         }
 
+
         // Vsebina na desni
         .right_content{
             width: auto;
@@ -57,10 +58,27 @@
                 font-size: 16px;
             }
 
-            /*.second_line{
+            .second_line{
                 display: flex;
 
-            }   */         
+                .create_buttons{
+                    display: flex;
+                }
+
+                .filters{
+                    width: auto;
+
+                    #searchMySurveys{
+                        width: auto;
+                        margin-left: 16px;
+
+                        #searchMySurvey,
+                        button{
+                            height: 40px;
+                        }
+                    }
+                }
+            }       
         }
     }
 }
diff --git a/resources/sass/admin_new/pages/my_surveys/top_buttons.scss b/resources/sass/admin_new/pages/my_surveys/top_buttons.scss
index cc560762e..99901c61a 100644
--- a/resources/sass/admin_new/pages/my_surveys/top_buttons.scss
+++ b/resources/sass/admin_new/pages/my_surveys/top_buttons.scss
@@ -2,7 +2,8 @@
     Gumbi na vrhu pri mojih anketah
 */
 
-#survey_list .first_line{
+#survey_list .first_line,
+#survey_list .second_line{
 
     display: flex;
     justify-content: left;
@@ -15,6 +16,9 @@
     }
 
     .button_quick_create {
+        display: flex;
+        align-items: center;
+
         margin-left: 32px;
 
         a{