From 34ddfeaa047c1e92c3eaf013c4169ff7b25c4020 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Sat, 20 Feb 2021 03:21:57 +0100
Subject: M2N: Zárás tartás lekérdezés jav.

---
 "egy\303\251b/nextcloud/mayor-ldap.php"      | 4 ++--
 "egy\303\251b/nextcloud/mayor-nextcloud.php" | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git "a/egy\303\251b/nextcloud/mayor-ldap.php" "b/egy\303\251b/nextcloud/mayor-ldap.php"
index b811612e..96648202 100644
--- "a/egy\303\251b/nextcloud/mayor-ldap.php"
+++ "b/egy\303\251b/nextcloud/mayor-ldap.php"
@@ -794,8 +794,8 @@ ldap_set_option($ld, LDAP_OPT_PROTOCOL_VERSION, 3);
 ldap_set_option($ld, LDAP_OPT_REFERRALS, 0);
 
 
-
-$basedn = "DC=ad,DC=bmrg,DC=lan";
+ 
+$basedn = "DC=ad,DC=bmrg,DC=lan"; 
 ldap_set_option($ld, LDAP_OPT_MATCHED_DN, $basedn);
 
 
diff --git "a/egy\303\251b/nextcloud/mayor-nextcloud.php" "b/egy\303\251b/nextcloud/mayor-nextcloud.php"
index e95270b5..3dbf0323 100644
--- "a/egy\303\251b/nextcloud/mayor-nextcloud.php"
+++ "b/egy\303\251b/nextcloud/mayor-nextcloud.php"
@@ -646,7 +646,7 @@ if (function_exists('mysqli_connect') and version_compare(phpversion(), '7.0', '
             $ret = mysqli_fetch_array($r, MYSQLI_ASSOC); 
             mysqli_free_result($r);
         } else {
-            echo "\nMAY ->\t ******** Mayor_napló (tankör)lekérdezési hiba. (adatbázis) ********\n";
+            echo "\nMAY ->\t ******** Mayor_napló (szemeszter)lekérdezési hiba. (adatbázis) ********\n";
         }
         if ($log['verbose'] > 10 ){ print_r($ret); }
         return $ret;
@@ -712,7 +712,7 @@ if (function_exists('mysqli_connect') and version_compare(phpversion(), '7.0', '
                     WHERE accounts.studyId = tanar.oId AND statusz != 'jogviszonya lezárva' AND tanar.beDt <= CURRENT_DATE() AND (CURRENT_DATE() <= tanar.kiDt OR tanar.kiDt IS NULL) 
                     AND tanar.tanarId = tankorTanar.tanarId AND tankorTanar.beDt <= CURRENT_DATE() AND (CURRENT_DATE() <= tankorTanar.kiDt OR tankorTanar.kiDt = '".$m2n['zaras_tartas']."' ) 
                     AND tankorTanar.tankorId = tankorSzemeszter.tankorId 
-                    AND tankorSzemeszter.tanev = '".$ev['tanev']."' AND szemeszter = '".$ev['szemeszter']."'
+                    AND tankorSzemeszter.tanev = '".$ev['tanev']."' AND tankorSzemeszter.szemeszter = '".$ev['szemeszter']."'
                     ORDER BY userAccount ;
             ";
             if ($log['verbose'] > 5 ){ echo "MAY ->\t".$q."\n"; }  
-- 
cgit v1.2.3