From fb152bd023d0b73c199468a8fc9f430b91d58086 Mon Sep 17 00:00:00 2001
From: Nikola Petrov <nikola@petrovv.com>
Date: Fri, 11 Sep 2026 10:34:44 +0200
Subject: [PATCH] small changes

---
 php/auto/connection.php |  3 ++-
 php/user/ldapLogin.php  | 35 +++++++++++------------------------
 php/user/logout.php     |  3 ++-
 3 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/php/auto/connection.php b/php/auto/connection.php
index 028e7b5..7102c1e 100644
--- a/php/auto/connection.php
+++ b/php/auto/connection.php
@@ -11,7 +11,8 @@ try {
   $conn->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
   $conn->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
 } catch(PDOException $e) {
-  echo "Connection failed: " . $e->getMessage();
+  echo json_encode(["error" => "error.connect.faild"]);
+  exit;
 }
 
 
diff --git a/php/user/ldapLogin.php b/php/user/ldapLogin.php
index d89b235..b97abaa 100644
--- a/php/user/ldapLogin.php
+++ b/php/user/ldapLogin.php
@@ -12,7 +12,7 @@ $nimrodLDAP = new Connection([
 ]);
 
 if (!isset($_POST['uporabnik']) || !isset($_POST['geslo'])) {
-  echo json_encode(["napaka" => "manjkajo podatki"]);
+  echo json_encode(["error" => "error.user.login.missing"]);
   exit;
 }
 
@@ -22,17 +22,22 @@ $geslo = $_POST['geslo'];
 try {
   $nimrodLDAP->connect();
 } catch (Exception $e) {
-  echo 'napaka pri povezavi na LDap';
-  echo $e;
+  echo json_encode(["error" => "error.user.login.connect"]);
   exit;
 }
 
 $LUser = $nimrodLDAP->query()->findBy('samaccountname', $username);
 if (empty($LUser)) {
-  echo json_encode(["napaka" => "uporabnik ni najden"]);
+  echo json_encode(["error" => "error.user.login.notFound"]);
   exit;
 }
 
+$emailUserja = $LUser['userprincipalname'][0]; 
+$user = $LUser['distinguishedname'][0];
+if (!$nimrodLDAP->auth()->attempt($user, $geslo, $stayAuthenticated = true)) {
+  echo json_encode(["error" => "error.user.login.wrongPassword"]);
+  exit;
+}
 
 $vGrupah = $LUser['memberof'];
 $dGrupe = [ 
@@ -44,14 +49,7 @@ $razlikaGrup = array_intersect(
   array_map('strtolower', $dGrupe)
 );
 if (count($razlikaGrup) <= 0) {
-  echo json_encode(["napaka" => "nimaš pravic skupinskih"]);
-  exit;
-}
-
-$emailUserja = $LUser['userprincipalname'][0]; 
-$user = $LUser['distinguishedname'][0];
-if (!$nimrodLDAP->auth()->attempt($user, $geslo, $stayAuthenticated = true)) {
-  echo json_encode(["napaka" => "napacno geslo"]);
+  echo json_encode(["error" => "error.user.login.groupRight"]);
   exit;
 }
 
@@ -78,15 +76,4 @@ if ($obstojeciUporabnik) {
 $_SESSION['displayname'] = $uporabnik;
 $_SESSION['email'] = $email;
 
-echo json_encode(["res" => "uspesno"]);
-
-
-
-
-
-
-
-
-
-
-
+echo json_encode(["res" => "res.user.login.true"]);
diff --git a/php/user/logout.php b/php/user/logout.php
index fe85113..d6ab385 100644
--- a/php/user/logout.php
+++ b/php/user/logout.php
@@ -1,2 +1,3 @@
 <?php
-session_destroy();
\ No newline at end of file
+session_destroy();
+echo json_encode(["res" => "res.user.loginout.true"]);
\ No newline at end of file