Redesign - popravki napak - kopiranje iz knjiznice, popravki urejanja mobilnih tem, tabela uporabnikov

admin/survey/classes/class.Dostop.php

@@ -1548,15 +1548,20 @@ class Dostop {
 		}
 
 		// kopirano iz user_to_be v users
-		$result = sisplet_query("SELECT type, email, name, surname, pass, status, gdpr_agree, when_reg, came_from, lang FROM  WHERE id='" . $uid . "'");
+		$result = sisplet_query("SELECT type, email, name, surname, pass, status, gdpr_agree, when_reg, came_from, lang FROM users_to_be WHERE id='" . $uid . "'");
 
 		if (mysqli_num_rows($result) > 0) {
 			$r = mysqli_fetch_assoc($result);
 			$g = base64_encode((hash('SHA256', base64_decode($r['pass']) . $pass_salt)));
 
-			sisplet_query("INSERT INTO users (type, email, name, surname, pass, status, gdpr_agree, when_reg, came_from, lang, manuallyApproved) 
+			$sqlCopy = sisplet_query("INSERT INTO users (type, email, name, surname, pass, status, gdpr_agree, when_reg, came_from, lang, manuallyApproved) 
                       VALUES ('" . $r['type'] . "', '" . $r['email'] . "', '" . $r['name'] . "', '" . $r['surname'] . "', '" . $g . "','" . $r['status'] . "', '" . $r['gdpr_agree'] . "','" . $r['when_reg'] . "', '" . $r['came_from'] . "', '" . $r['lang'] . "',  'Y')");
-			sisplet_query("DELETE FROM users_to_be WHERE id='" . $uid . "' OR email='" . $r['email'] . "'");
+            if (!$sqlCopy) {
+				echo mysqli_error($GLOBALS['connect_db']);
+                return;
+			}
+            
+            sisplet_query("DELETE FROM users_to_be WHERE id='" . $uid . "' OR email='" . $r['email'] . "'");
            
 
             // Uporabniku posljemo email da je bil njegov racun aktiviran

admin/survey/classes/class.Library.php

@@ -778,16 +778,17 @@ class Library {
     	global $global_user_id;
     	global $lang;
     	global $site_url;
+
         $anketa = $_POST['anketa'];     // nasa anketa (jo povozimo)
         $ank_id = $_POST['ank_id'];     // anketa, ki jo uporabimo za predlogo
 
         $hierarhija = (empty($_POST['hierarhija']) ? false : true);
 
         if($hierarhija && $ank_id == 'privzeta'){
-
             $ank_id = AppSettings::getInstance()->getSetting('hierarhija-default_id');
         }
 
+
         if ($anketa > 0) {
 
 			// preberemo osnovne podatke obstojece ankete (naslov.....)
@@ -797,11 +798,11 @@ class Library {
 	        $sql2 = sisplet_query("SELECT naslov FROM srv_anketa WHERE id = '$ank_id'");
 	        $row2 = mysqli_fetch_array($sql2);
 
-             $sqls = sisplet_query("SELECT ank_id, uid FROM srv_dostop WHERE ank_id='$anketa'");
+            $sqls = sisplet_query("SELECT ank_id, uid FROM srv_dostop WHERE ank_id='$anketa'");
 
             $this->SurveyAdmin->anketa_delete($anketa);
-
+        } 
-        } else {
+        else {
 
             $sql = sisplet_query("SELECT naslov, dostop FROM srv_anketa WHERE id = '$ank_id'");
             $row = mysqli_fetch_array($sql);
@@ -812,14 +813,13 @@ class Library {
         $naslov = " naslov='".(isset($_POST['naslov']) ? $_POST['naslov'] : $row['naslov'])."',";
         $intro_opomba = " intro_opomba='".(addslashes($lang['srv_library_copy_of_note'].'<a href="'.$site_url.'admin/survey/index.php?anketa='.$ank_id.'">'.$row2['naslov'].'</a>'))."',";
 
-
-        //$new_id = $this->SurveyAdmin->anketa_copy($ank_id);
         $sas = new SurveyAdminSettings();
 		$new_id = $sas->anketa_copy($ank_id);
 
         // popravimo naslov, opombo, dostop, in novega avtorja
         sisplet_query("UPDATE srv_anketa SET $naslov $intro_opomba dostop='$row[dostop]', insert_uid='$global_user_id', edit_uid='$global_user_id' WHERE id='$new_id'");
-		// vsilimo refresh podatkov
+		
+        // vsilimo refresh podatkov
 		SurveyInfo :: getInstance()->resetSurveyData();
 
         // dostop uporabimo od stare ankete in ne od skopirane (trnutno ne kopira pravic od prej, če ustvarjamo novo anketo)
@@ -840,7 +840,8 @@ class Library {
             (new \Hierarhija\Hierarhija($new_id))->izrisisSistemskoVprsanjeVloga();
 
             echo $new_id;
-        }else{
+        }
+        else{
             echo 'index.php?anketa='.$new_id.'&a=branching';
         }
     }

admin/survey/script/js-lang.php

@@ -202,6 +202,8 @@ lang('srv_comment_comment');
 lang('edit1338');
 lang('for');
 lang('alternative_email_delete');
+lang('srv_anketa_deleted_restore_confirm');
+lang('srv_data_deleted_restore_confirm');
 
 
 //LOKACIJA

admin/survey/script/script.js

@@ -4359,30 +4359,20 @@ function changeDoCMSUserFilterCheckbox() {
 
 function anketa_restore(anketa) {
 
-	if ( confirm('?') ) {
+	if ( confirm(lang['srv_anketa_deleted_restore_confirm']) ) {
-
 		$.post('ajax.php?a=anketa_restore', {id: anketa}, function () {
-
 			window.location.href = 'index.php?anketa='+anketa;
-
 		})
-
 	}
-
 }
 
 function data_restore(anketa) {
 
-	if ( confirm('?') ) {
+	if ( confirm(lang['srv_data_deleted_restore_confirm']) ) {
-
 		$.post('ajax.php?a=data_restore', {id: anketa}, function () {
-
 			window.location.href = 'index.php?anketa='+anketa;
-
 		})
-
 	}
-
 }
 
 function deleteSurveyDataFile(note) {

lang/1.php

@@ -5929,10 +5929,12 @@ $lang = array (
 	"srv_anketa_deleted"						=>	'Izbrisane ankete',
 	"srv_anketa_deleted_note"					=>	'V spodnji tabeli je seznam vseh izbrisanih anket in možnost obnovitve teh anket.',
 	"srv_anketa_deleted_restore"				=>	'Obnovi anketo',
+	"srv_anketa_deleted_restore_confirm"		=>	'Ste prepričani, da želite obnoviti anketo?',
 	"srv_data_deleted"							=>	'Izbrisani podatki',
 	"srv_data_deleted_surveyname"				=>	'Ime ankete',
 	"srv_data_deleted_user"						=>	'E-mail uporabnika',
 	"srv_data_deleted_restore"					=>	'Obnovi podatke',
+	"srv_data_deleted_restore_confirm"          =>	'Ste prepričani, da želite obnoviti podatke?',
 	"srv_data_deleted_note"						=>	'V spodnji tabeli je seznam vseh anket, kjer so bili izbrisani podatki, in možnost obnovitve izbrisanih podatkov.',
 	"srv_restore"								=>	'Obnovi',
 	"srv_all_types"								=>	'Vsi tipi',

lang/2.php

@@ -5824,10 +5824,12 @@ $lang = array (
 	"srv_anketa_deleted"						=>	'Deleted surveys',
 	"srv_anketa_deleted_note"					=>	'The table below lists all deleted surveys and the possibility to restore them.',
 	"srv_anketa_deleted_restore"				=>	'Restore survey',
+    "srv_anketa_deleted_restore_confirm"		=>	'Are you sure you want to restore this survey?',
 	"srv_data_deleted"							=>	'Deleted data',
 	"srv_data_deleted_surveyname"				=>	'Survey name',
 	"srv_data_deleted_user"						=>	'User E-mail',
 	"srv_data_deleted_restore"					=>	'Restore data',
+    "srv_data_deleted_restore_confirm"          =>	'Are you sure you want to restore this data?',
 	"srv_data_deleted_note"						=>	'The table below lists all the surveys where data have been deleted and the possibility to restore deleted data.',
 	"srv_restore"								=>	'Restore',
 	"srv_all_types"								=>	'All types',

public/css/admin_new.css

@@ -30113,6 +30113,10 @@ button.buttons-columnVisibility.active {
   padding-top: 0 !important;
 }
 
+.select-info {
+  display: none;
+}
+
 table.usersTable {
   margin-left: 14px;
   margin-right: 14px;

resources/sass/admin_new/pages/users/users.scss

@@ -92,6 +92,10 @@ button.buttons-columnVisibility {
     padding-top: 0 !important;
 }
 
+.select-info{
+    display: none;
+}
+
 table.usersTable {
     margin-left: 14px;
     margin-right: 14px;