From efd1f615ec07dae79b54ea7216c385901220bd5a Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Mon, 25 Jan 2021 09:03:17 +0100
Subject: [PATCH] Omejitev dodeljenih uporabnikov za managerje je zaenkrat
 onemogocena.

---
 admin/survey/SurveyAdminSettings.php  |  6 ++--
 admin/survey/classes/class.Dostop.php | 51 ++++++++++++++-------------
 composer.lock                         | 10 +++---
 3 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 79256b7dd..d401a2ed4 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -8250,8 +8250,8 @@ class SurveyAdminSettings {
         if( !($admin_type == 1 || $admin_type == 0) )
             return '';
 
-        // Na virtualkah imajo managerji omejitev st. dodeljenih uporabnikov
-        if(/*$virtual_domain && */$admin_type == 1){
+        // Na virtualkah imajo managerji omejitev st. dodeljenih uporabnikov - ZAENKRAT JE TO ONEMOGOCENO, KASNEJE SE LAHKO OMEJI NA PAKET
+        if(false && $virtual_domain && $admin_type == 1){
 
             // Limit st. dodeljenih uporabnikov
             $managed_accounts_limit = 5;
@@ -8286,6 +8286,7 @@ class SurveyAdminSettings {
 
         echo '<div id="dodajanje">';
 
+        // Dodajanje novih uporabnikov - ustvari racun, doda uporabnika pod pregled in mu poslje mail
         echo '<form class="manager_add_user" name="manager_add_user" action="ajax.php?t=dostop&a=manager_add_user" method="post">';
         echo '<h3><b>'.$lang['srv_users_add_assigned_title'].'</b></h3>';
         echo '<p><label for="email">'.$lang['email'].':</label><input type="email" id="email" name="email"> '.(empty($_GET['add']) && $_GET['error']=='email'?'<span class="red">'.$lang['srv_added_false'].'</span>':'').'</p>';
@@ -8294,7 +8295,6 @@ class SurveyAdminSettings {
         echo '<p><label for="password">'.$lang['password'].':</label><input type="password" id="password" name="password"> '.(empty($_GET['add']) && $_GET['error']=='pass'?'<span class="red">'.$lang['pass_doesnt_match'].'</span>':'').'</p>';
         echo '<p><label for="password2">'.$lang['again'].':</label><input type="password" id="password2" name="password2"></p>';
         
-        //echo '<p><button type="submit">'.$lang['add'].'</button></p>';
         echo '<p><div class="buttonwrapper floatLeft">';
         echo '  <a class="ovalbutton ovalbutton_orange" href="#" onclick="document.manager_add_user.submit();">'.$lang['create_add'].'</a>';
         echo '</div></p>';
diff --git a/admin/survey/classes/class.Dostop.php b/admin/survey/classes/class.Dostop.php
index 3257fa26d..52d315c28 100644
--- a/admin/survey/classes/class.Dostop.php
+++ b/admin/survey/classes/class.Dostop.php
@@ -988,36 +988,37 @@ class Dostop {
 
 	    if($admin_type == 0){
 
-          $sqls = sisplet_query("SELECT id, name, surname, email FROM users WHERE id NOT IN (SELECT user FROM srv_dostop_manage WHERE manager='".$global_user_id."') AND  email NOT LIKE ('D3LMD-%') AND email NOT LIKE ('UNSU8MD-%') AND email LIKE '%".$_GET['term']."%' ORDER BY email", "obj");
+            $sqls = sisplet_query("SELECT id, name, surname, email FROM users WHERE id NOT IN (SELECT user FROM srv_dostop_manage WHERE manager='".$global_user_id."') AND  email NOT LIKE ('D3LMD-%') AND email NOT LIKE ('UNSU8MD-%') AND email LIKE '%".$_GET['term']."%' ORDER BY email", "obj");
 
-          if(!empty($sqls->email)){
-              $json['results'][] = [
-                  'id' => $sqls->id,
-                  'text' => $sqls->email.' - '.$sqls->name.' '.$sqls->surname
-              ];
-          }else{
-              foreach ($sqls as $user) {
-                  $json['results'][] = [
-                      'id' => $user->id,
-                      'text' => $user->email.' - '.$user->name.' '.$user->surname
-                  ];
-              }
-          }
+            if(!empty($sqls->email)){
+                $json['results'][] = [
+                    'id' => $sqls->id,
+                    'text' => $sqls->email.' - '.$sqls->name.' '.$sqls->surname
+                ];
+            }
+            else{
+                foreach ($sqls as $user) {
+                    $json['results'][] = [
+                        'id' => $user->id,
+                        'text' => $user->email.' - '.$user->name.' '.$user->surname
+                    ];
+                }
+            }
 
-          echo json_encode($json);
-
-       }elseif ($admin_type == 1){
+            echo json_encode($json);
+        }
+        elseif ($admin_type == 1){
 	        $email = trim($_POST['uemail']);
             $user = sisplet_query("SELECT id, name, surname, email FROM users WHERE id NOT IN (SELECT user FROM srv_dostop_manage WHERE manager='".$global_user_id."') AND  email NOT LIKE ('D3LMD-%') AND email NOT LIKE ('UNSU8MD-%') AND email='".$email."'");
 
-              if(mysqli_num_rows($user) > 0) {
-                  echo 'success';
-              }else{
-                  echo 'error';
-              }
-
-      }
-  }
+            if(mysqli_num_rows($user) > 0) {
+                echo 'success';
+            }
+            else{
+                echo 'error';
+            }
+        }
+    }
 
 	// Če je administrator
 
diff --git a/composer.lock b/composer.lock
index 616ab6352..16c582c8b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1912,16 +1912,16 @@
     "packages-dev": [
         {
             "name": "filp/whoops",
-            "version": "2.9.1",
+            "version": "2.9.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "307fb34a5ab697461ec4c9db865b20ff2fd40771"
+                "reference": "df7933820090489623ce0be5e85c7e693638e536"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/307fb34a5ab697461ec4c9db865b20ff2fd40771",
-                "reference": "307fb34a5ab697461ec4c9db865b20ff2fd40771",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/df7933820090489623ce0be5e85c7e693638e536",
+                "reference": "df7933820090489623ce0be5e85c7e693638e536",
                 "shasum": ""
             },
             "require": {
@@ -1969,7 +1969,7 @@
                 "throwable",
                 "whoops"
             ],
-            "time": "2020-11-01 12:00:00"
+            "time": "2021-01-24 12:00:00"
         },
         {
             "name": "kint-php/kint",