diff --git a/admin/survey/classes/class.Library.php b/admin/survey/classes/class.Library.php
index 17db1d373..d774cd63c 100644
--- a/admin/survey/classes/class.Library.php
+++ b/admin/survey/classes/class.Library.php
@@ -27,41 +27,45 @@ class Library {
         if (isset($surveySkin))
             $this->skin = $surveySkin;
 
-        //include_once('Branching.php');
-
         $this->SurveyAdmin = new SurveyAdmin(1, -1);
         $this->Branching = new Branching($this->SurveyAdmin->anketa);
 
-
         if (isset($_options['tab'])) {
 			$this->tab = $_options['tab'];
             if ($this->tab <= 1)
                 $this->tip = 0;
             else
                 $this->tip = 1;
-        } else if (isset($_POST['tab'])) {
+        } 
+        else if (isset($_POST['tab'])) {
             $this->tab = ($_POST['tab'] == 0 || $_POST['tab'] == 'undefined') ? 0 : $_POST['tab'];
             if ($this->tab <= 1)
                 $this->tip = 0;
             else
                 $this->tip = 1;
-        } else {
+        } 
+        else {
             $this->tab = 0;
             $this->tip = 0;
         }
+
         if (isset($_options['prva'])) {
         	$this->prva = $_options['prva'];
-        } else {
+        } 
+        else {
         	$this->prva = 0;
         }
+
         if (isset($_GET['tab'])) $this->tab = (int)$_GET['tab'];
 
         // nastavimo mode v odvisnosti od survey_type ( če nismo v anketi je -1)
         if (isset($this->SurveyAdmin->anketa) && $this->SurveyAdmin->anketa > 0) {
         	$_st = $this->SurveyAdmin->getSurvey_type($this->SurveyAdmin->anketa);
-			if ($_st > -1)
+			
+            if ($_st > -1)
 				$this->mode = $_st;
         }
+        
 		$this->repareTabs();
 		
 		// Preverimo ce gre za search po anketah
@@ -195,24 +199,28 @@ class Library {
 			echo '<input type="hidden" name="lib_tip" id="lib_tip" value="'.($this->tip == 0 || $this->tip== "" ? "0" : "$this->tip").'">';
 			echo '<input type="hidden" name="lib_prva" id="lib_prva" value="'.($this->prva == 0 || $this->prva== "" ? "0" : "$this->prva").'">';
 
-			//echo '<div class="folder_right_label red">'.$lang['srv_kopiranje'].'</div>';
-
 			echo '<ul title="'.($uid==0?$lang['srv_library_left']:$lang['srv_library_left_right']).'" style="padding-left:0;" class="'.($admin_type==0 || $uid == $global_user_id?'can_edit':'').'">'."\n";
         }
 
-
         $sql = sisplet_query("SELECT id, naslov FROM srv_library_folder WHERE uid='$uid' AND parent = '$parent' AND tip='$this->tip' $language ORDER BY naslov");
-        if (!$sql) echo mysqli_error($GLOBALS['connect_db']);
+        if (!$sql) 
+            echo mysqli_error($GLOBALS['connect_db']);
+
         if (mysqli_num_rows($sql) == 0 && $uid > 0 && $parent == 0) {
+            
             // za prvic ko pride user, da mu dodamo folder
             if ($this->tip == 0)
             	$naslov = $lang['srv_moja_vprasanja'];
             else
             	$naslov = $lang['srv_moje_ankete'];
+            
             sisplet_query("INSERT INTO srv_library_folder (uid, tip, naslov, parent, lang) VALUES ('$uid', '$this->tip', '$naslov', '0', '$lang[id]')");
+            
             $sql = sisplet_query("SELECT id, naslov FROM srv_library_folder WHERE uid='$uid' AND parent = '$parent' AND tip='$this->tip' ORDER BY naslov");
-            if (!$sql) echo mysqli_error($GLOBALS['connect_db']);
+            if (!$sql) 
+                echo mysqli_error($GLOBALS['connect_db']);
         }
+
         while ($row = mysqli_fetch_array($sql)) {
             if (strpos($cookie, '-'.$row['id'].'-')=== false && $parent!=0)
                 $hidden = true;
@@ -222,8 +230,6 @@ class Library {
 
             echo '  <li id="li'.$row['id'].'" eid="'.$row['id'].'" class="folder" name="folder">';
 
-            // ne preverjamo vec ce je folder prazen, ker so tisti queryiji zelo pocasni...
-            //if ($parent != 0 && !$empty)
             if ($parent != 0)
                 echo '  <a href="/" onclick="javascript:library_folders_plusminus(\''.$row['id'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" id="f_pm_'.$row['id'].'"><span class="faicon icon-blue '.($hidden?'plus':'minus').'"></span></a>';
             else
@@ -257,117 +263,118 @@ class Library {
 				if (mysqli_num_rows($sql1) > 0) {
 
 					while ($row1 = mysqli_fetch_array($sql1)) {
-							echo '<li class="anketa tip'.$this->tip.'">';
-							echo '        <div copy="'.$row1['id'].'" eid="'.$row1['id'].'" class="folder_container '.($this->tip==0?'new_spr':'').'" name="library">';
 
-							echo '          <div class="folder_right">';
+                        echo '<li class="anketa tip'.$this->tip.'">';
+                        echo '        <div copy="'.$row1['id'].'" eid="'.$row1['id'].'" class="folder_container '.($this->tip==0?'new_spr':'').'" name="library">';
 
-							if ($this->tip == 0) {
-								//echo '<a href="/" onclick="javascript:copy_spremenljivka(\''.$row1['id'].'\'); return false;"><img src="img_'.$this->skin.'/copy.png" title="'.$lang['srv_copy_spr'].'" /></a>';
-								if ($admin_type==0 or $uid==$global_user_id)
-									echo ' <a href="/" onclick="library_brisi_spremenljivko(\''.$row1['id'].'\', \''.$lang['srv_brisispremenljivkoconfirm'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;"><span class="faicon delete_circle icon-orange" title="'.$lang['srv_brisispremenljivko'].'"></span></a>';
-							}
-							else {
-								SurveyInfo::getInstance()->SurveyInit($row1['id']);
-								if ($this->prva == "1") {
-                                    
-                                    // Dodaj anketo v javno knjiznico
-                                    if ($admin_type == 0 && $this->tab == 3) {
+                        echo '          <div class="folder_right">';
 
-                                        $sqlPublic = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='".$row1['id']."' AND uid='0'");
-                                        if (!$sqlPublic) echo mysqli_error($GLOBALS['connect_db']);
+                        if ($this->tip == 0) {
+                            //echo '<a href="/" onclick="javascript:copy_spremenljivka(\''.$row1['id'].'\'); return false;"><img src="img_'.$this->skin.'/copy.png" title="'.$lang['srv_copy_spr'].'" /></a>';
+                            if ($admin_type==0 or $uid==$global_user_id)
+                                echo ' <a href="/" onclick="library_brisi_spremenljivko(\''.$row1['id'].'\', \''.$lang['srv_brisispremenljivkoconfirm'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;"><span class="faicon delete_circle icon-orange" title="'.$lang['srv_brisispremenljivko'].'"></span></a>';
+                        }
+                        else {
+                            SurveyInfo::getInstance()->SurveyInit($row1['id']);
 
-                                        // Anketa ze obstaja v javni knjiznici - jo pobrisemo
-                                        if (mysqli_num_rows($sqlPublic) > 0) {
-                                            echo '  <a href="/" onclick="surveyList_knjiznica_new(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_ank_lib_off'].'">';
-                                            echo '      <span class="sprites faicon remove icon-orange small"></span> '.$lang['srv_ank_lib_off'];
-                                            echo '  </a>';
-                                        }
-                                        // Anketo dodamo v javno knjiznico
-                                        else{
-                                            echo '  <a href="/" onclick="surveyList_knjiznica_new(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_ank_lib_on'].'">';
-                                            echo '      <span class="sprites faicon library"></span> '.$lang['srv_ank_lib_on'];
-                                            echo '  </a>';
-                                        }
+                            if ($this->prva == "1") {
+                                
+                                // Dodaj anketo v javno knjiznico
+                                if ($admin_type == 0 && $this->tab == 3) {
+
+                                    $sqlPublic = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='".$row1['id']."' AND uid='0'");
+                                    if (!$sqlPublic) echo mysqli_error($GLOBALS['connect_db']);
+
+                                    // Anketa ze obstaja v javni knjiznici - jo pobrisemo
+                                    if (mysqli_num_rows($sqlPublic) > 0) {
+                                        echo '  <a href="/" onclick="surveyList_knjiznica_new(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_ank_lib_off'].'">';
+                                        echo '      <span class="sprites faicon remove icon-orange small"></span> '.$lang['srv_ank_lib_off'];
+                                        echo '  </a>';
                                     }
-
-									// nova anketa kot template iz knjiznice
-									echo '<a href="/" onclick="anketa_copy(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_library_use_survey'].'"><span class="faicon copy"></span> '.$lang['srv_anketacopy'].'</a> ';
-									//echo '<a href="/" onclick="anketa_copy(\''.$row1['id'].'\', \''.$lang['srv_anketa_copy'].'\'); return false;"><img src="img_'.$this->skin.'/copy.png" title="'.$lang['srv_copy_srv'].'" /></a>';
-									echo '<a href="'.$site_url.'main/survey/'.(!SurveyInfo::getInstance()->checkSurveyModule('uporabnost') ? 'index' : 'uporabnost').'.php?anketa='.$row1['id'].'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> '.$lang['srv_poglejanketo2'].'</a> ';
-                                    
-                                    // brisi iz knjiznice
-									if ($admin_type == 0) {
-										echo ' <a href="index.php?anketa='.$row1['id'].'" title="'.$lang['srv_editirajanketo'].'"><span class="faicon edit"></span> '.$lang['edit3'].'</a>';
+                                    // Anketo dodamo v javno knjiznico
+                                    else{
+                                        echo '  <a href="/" onclick="surveyList_knjiznica_new(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_ank_lib_on'].'">';
+                                        echo '      <span class="sprites faicon library"></span> '.$lang['srv_ank_lib_on'];
+                                        echo '  </a>';
                                     }
-                                    
-									if ($admin_type==0 && $this->tab==2) {// sistemska
-										echo ' <a href="/" onclick="library_del_anketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_4'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" title="'.$lang['srv_ank_lib_off'].'"><span class="sprites faicon remove icon-orange small"></span> '.$lang['hour_remove'].'</a>';
-                                    }
-                                    
-									if($this->tab==3){// moja knjiznica
-										echo ' <a href="/" onclick="library_del_myanketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_3'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" title="'.$lang['srv_ank_mylib_off'].'"><span class="faicon remove icon-orange small"></span> '.$lang['hour_remove'].'</a>';
-									}
-								}
-								else {
-									echo '<a href="'.$site_url.'main/survey/'.(!SurveyInfo::getInstance()->checkSurveyModule('uporabnost') ? 'index' : 'uporabnost').'.php?anketa='.$row1['id'].'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span></a>';
-									// moznost da povozi anketo z anketo iz knjiznice
-									//TEGA NE DOVOLIMO KER NI OK DA SE KAR PREPISE OBSTOJECO ANKETO - anketo iz knjiznice se lahko po novem dodaja samo iz mojih anket oz. pri ustvarjanju
-									echo ' <a href="/" onclick="alert_copy_anketa(\''.$row1['id'].'\'); return false;"><span class="sprites copy_small" title="'.$lang['srv_copy_srv'].'"></span></a>';
-								}
-							}
-							echo '</div>';
+                                }
 
-							echo '          <div class="folder_left'.($this->tip==1?' indent"':'" onclick="library_spremenljivka_new(\''.$row1['id'].'\'); return false;"').'>';
-							if ($this->tip == 1 && $this->prva == "0") {
-								echo '<a href="/" onclick="javascript:library_anketa_plusminus(\''.$row1['id'].'\', this); return false;"><span class="faicon icon-blue plus" style="opacity: 0.3"></span></a> ';
-							} else {
-								if ($this->tip != 0)
-									echo '  <span class="sprites spacer12"></span>';
-							}
+                                // nova anketa kot template iz knjiznice
+                                echo '<a href="/" onclick="anketa_copy(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_library_use_survey'].'"><span class="faicon copy"></span> '.$lang['srv_anketacopy'].'</a> ';
+                                echo '<a href="'.$site_url.'main/survey/'.(!SurveyInfo::getInstance()->checkSurveyModule('uporabnost') ? 'index' : 'uporabnost').'.php?anketa='.$row1['id'].'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> '.$lang['srv_poglejanketo2'].'</a> ';
+                                
+                                // brisi iz knjiznice
+                                if ($admin_type == 0) {
+                                    echo ' <a href="index.php?anketa='.$row1['id'].'" title="'.$lang['srv_editirajanketo'].'"><span class="faicon edit"></span> '.$lang['edit3'].'</a>';
+                                }
+                                
+                                if ($admin_type==0 && $this->tab==2) {// sistemska
+                                    echo ' <a href="/" onclick="library_del_anketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_4'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" title="'.$lang['srv_ank_lib_off'].'"><span class="sprites faicon remove icon-orange small"></span> '.$lang['hour_remove'].'</a>';
+                                }
+                                
+                                if($this->tab==3){// moja knjiznica
+                                    echo ' <a href="/" onclick="library_del_myanketa(\''.$row1['id'].'\', \''.$lang['srv_anketadeletelibrary_3'].'\',\''.$this->tab.'\',\''.$this->prva.'\'); return false;" title="'.$lang['srv_ank_mylib_off'].'"><span class="faicon remove icon-orange small"></span> '.$lang['hour_remove'].'</a>';
+                                }
+                            }
+                            else {
+                                echo '<a href="'.$site_url.'main/survey/'.(!SurveyInfo::getInstance()->checkSurveyModule('uporabnost') ? 'index' : 'uporabnost').'.php?anketa='.$row1['id'].'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span></a>';
+                                // moznost da povozi anketo z anketo iz knjiznice
+                                //TEGA NE DOVOLIMO KER NI OK DA SE KAR PREPISE OBSTOJECO ANKETO - anketo iz knjiznice se lahko po novem dodaja samo iz mojih anket oz. pri ustvarjanju
+                                echo ' <a href="/" onclick="alert_copy_anketa(\''.$row1['id'].'\'); return false;"><span class="sprites copy_small" title="'.$lang['srv_copy_srv'].'"></span></a>';
+                            }
+                        }
+                        echo '</div>';
+
+                        echo '          <div class="folder_left'.($this->tip==1?' indent"':'" onclick="library_spremenljivka_new(\''.$row1['id'].'\'); return false;"').'>';
+                        if ($this->tip == 1 && $this->prva == "0") {
+                            echo '<a href="/" onclick="javascript:library_anketa_plusminus(\''.$row1['id'].'\', this); return false;"><span class="faicon icon-blue plus" style="opacity: 0.3"></span></a> ';
+                        } else {
+                            if ($this->tip != 0)
+                                echo '  <span class="sprites spacer12"></span>';
+                        }
 
 
-							if ($this->tip == 0) {
-								if ($row1['tip']==1 || $row1['tip']==2 || $row1['tip']==3 || $row1['tip']==21 || $row1['tip']==7)
-									$ikonca = 'osnovna_vprasanja';
-								elseif ($row1['tip']==6 || $row1['tip']==16 || $row1['tip']==19 || $row1['tip']==20)
-									$ikonca = 'table';
-								else
-									$ikonca = 'other_vprasanja';
-							} else {
-								$ikonca = 'anketa';
-							}
+                        if ($this->tip == 0) {
+                            if ($row1['tip']==1 || $row1['tip']==2 || $row1['tip']==3 || $row1['tip']==21 || $row1['tip']==7)
+                                $ikonca = 'osnovna_vprasanja';
+                            elseif ($row1['tip']==6 || $row1['tip']==16 || $row1['tip']==19 || $row1['tip']==20)
+                                $ikonca = 'table';
+                            else
+                                $ikonca = 'other_vprasanja';
+                        } else {
+                            $ikonca = 'anketa';
+                        }
 
-							echo '<span class="faicon '.$ikonca.' mapca icon-blue" style="display:inline-block"></span> ';
-							echo skrajsaj(strip_tags($row1['naslov']), 40).'</a>'."\n";
+                        echo '<span class="faicon '.$ikonca.' mapca icon-blue" style="display:inline-block"></span> ';
+                        echo skrajsaj(strip_tags($row1['naslov']), 40).'</a>'."\n";
 
-							echo '          </div>';
+                        echo '          </div>';
 
 
-							if ($this->prva == "0") {
+                        if ($this->prva == "0") {
 
-								echo '<div id="anketa_vprasanja_'.$row1['id'].'" class="anketa_vprasanja">';
-								if ($this->tip == 1) {
-									$sql2 = sisplet_query("SELECT s.id, s.naslov, s.tip FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='$row1[id]'");
-									while ($row2 = mysqli_fetch_array($sql2)) {
+                            echo '<div id="anketa_vprasanja_'.$row1['id'].'" class="anketa_vprasanja">';
+                            if ($this->tip == 1) {
+                                $sql2 = sisplet_query("SELECT s.id, s.naslov, s.tip FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='$row1[id]'");
+                                while ($row2 = mysqli_fetch_array($sql2)) {
 
-										if ($row2['tip']==1 || $row2['tip']==2 || $row2['tip']==3 || $row2['tip']==21 || $row2['tip']==7)
-											$ikonca = 'osnovna_vprasanja';
-										elseif ($row2['tip']==6 || $row2['tip']==16 || $row2['tip']==19 || $row2['tip']==20)
-											$ikonca = 'table';
-										else
-											$ikonca = 'other_vprasanja';
+                                    if ($row2['tip']==1 || $row2['tip']==2 || $row2['tip']==3 || $row2['tip']==21 || $row2['tip']==7)
+                                        $ikonca = 'osnovna_vprasanja';
+                                    elseif ($row2['tip']==6 || $row2['tip']==16 || $row2['tip']==19 || $row2['tip']==20)
+                                        $ikonca = 'table';
+                                    else
+                                        $ikonca = 'other_vprasanja';
 
-										echo '<span class="new_spr" copy="'.$row2['id'].'" onclick="library_spremenljivka_new(\''.$row2['id'].'\'); return false;"><span class="faicon '.$ikonca.' icon-blue" title="'.$lang['srv_copy_spr'].'" style="display:inline-block"></span>';
-										echo ' '.skrajsaj(strip_tags($row2['naslov']), 40).'</span>';
+                                    echo '<span class="new_spr" copy="'.$row2['id'].'" onclick="library_spremenljivka_new(\''.$row2['id'].'\'); return false;"><span class="faicon '.$ikonca.' icon-blue" title="'.$lang['srv_copy_spr'].'" style="display:inline-block"></span>';
+                                    echo ' '.skrajsaj(strip_tags($row2['naslov']), 40).'</span>';
 
-									}
-								}
-								echo '</div>';
+                                }
+                            }
 
-							}
+                            echo '</div>';
+                        }
 
-							echo '</div></li>';
+                        echo '</div></li>';
 					}
 
 				}
@@ -376,7 +383,6 @@ class Library {
             echo '    </ul>'."\n";
 
             echo '  </li>'."\n";
-
         }
 
         if ($parent == 0) {
@@ -910,7 +916,6 @@ class Library {
 
         sisplet_query("DELETE FROM srv_library_anketa WHERE ank_id='$anketa' AND uid='0'");
 
-        //$this->display();
         $this->display_folders();
     }
 
@@ -921,7 +926,6 @@ class Library {
 
         sisplet_query("DELETE FROM srv_library_anketa WHERE ank_id='$anketa' AND uid='$global_user_id'");
 
-        //$this->display();
         $this->display_folders();
     }