aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM.Gergo2021-02-20 03:21:57 +0100
committerM.Gergo2021-02-20 03:21:57 +0100
commit34ddfeaa047c1e92c3eaf013c4169ff7b25c4020 (patch)
treed74a08ef5867f90784a543cb5950b10f0eccc3f6
parent01cc685366173b7bccb0fdf037c9bbd948910faa (diff)
downloadmayor-34ddfeaa047c1e92c3eaf013c4169ff7b25c4020.tar.gz
mayor-34ddfeaa047c1e92c3eaf013c4169ff7b25c4020.zip
M2N: Zárás tartás lekérdezés jav.
-rw-r--r--egyéb/nextcloud/mayor-ldap.php4
-rw-r--r--egyéb/nextcloud/mayor-nextcloud.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/egyéb/nextcloud/mayor-ldap.php b/egyéb/nextcloud/mayor-ldap.php
index b811612e..96648202 100644
--- a/egyéb/nextcloud/mayor-ldap.php
+++ b/egyéb/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éb/nextcloud/mayor-nextcloud.php b/egyéb/nextcloud/mayor-nextcloud.php
index e95270b5..3dbf0323 100644
--- a/egyéb/nextcloud/mayor-nextcloud.php
+++ b/egyéb/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"; }