Az eredeti forráskódok frissítve a http://mayor.hu -ról

6 files changed, 12 insertions, 12 deletions

diff --git a/mayor-orig/mayor-base/www/include/backend/ads/session/base.php b/mayor-orig/mayor-base/www/include/backend/ads/session/base.php
index 3a727c3b..edb47858 100644
--- a/mayor-orig/mayor-base/www/include/backend/ads/session/base.php
+++ b/mayor-orig/mayor-base/www/include/backend/ads/session/base.php
@@ -138,7 +138,7 @@
 
 	$userDn = ADSuserAccountToDn($userAccount, $toPolicy);
 	if (in_array($group, $AUTH[$toPolicy]['categories'])) {
-	    if (strpos($userDn, ',ou='.ekezettelen($group).',') !== false) return true;
+	    if (strpos(kisbetus($userDn), ',ou='.ekezettelen($group).',') !== false) return true;
 # Ha nincs megfelelő ou-ban, akkor nézzük a csoport tagságot - így berakható időszakosan akárki pl a titkárság kategóriába...
 #	    else return false;
 	}
diff --git a/mayor-orig/mayor-base/www/include/backend/mysql/session/accountInfo.php b/mayor-orig/mayor-base/www/include/backend/mysql/session/accountInfo.php
index 113e380b..5643f0af 100644
--- a/mayor-orig/mayor-base/www/include/backend/mysql/session/accountInfo.php
+++ b/mayor-orig/mayor-base/www/include/backend/mysql/session/accountInfo.php
@@ -140,7 +140,7 @@
 	    $_THESE = '*';
 	    $v = array();
 	}
-	$q = "SELECT $_THESE FROM groups WHERE groupCn='%s' AND policy='%s'";
+	$q = "SELECT $_THESE FROM `groups` WHERE groupCn='%s' AND policy='%s'";
 
 	array_push($v, $groupCn, $toPolicy);
 	$A = db_query($q, array('fv' => 'mysqlGetGroupInfo', 'modul' => $modul, 'result' => 'record', 'values' => $v), $lr);
@@ -185,7 +185,7 @@
 	$lr = db_connect($modul, array('fv' => 'mysqlChangeGroupInfo'));
         if (!$lr) return false;
 
-	$q = "SELECT gid FROM groups WHERE groupCn='%s' AND policy='%s'";
+	$q = "SELECT gid FROM `groups` WHERE groupCn='%s' AND policy='%s'";
 	$v = array($groupCn, $toPolicy);
 	$gid = db_query($q, array('fv' => 'mysqlChangeGroupInfo', 'modul' => $modul, 'result' => 'value', 'values' => $v), $lr);
 	if ($gid === false) { db_close($lr); return false; }
@@ -241,7 +241,7 @@
 			    $v = array($attr);
 			}
                     }
-		    $q = "UPDATE groups SET $W WHERE groupCn='%s' AND policy='%s'";
+		    $q = "UPDATE `groups` SET $W WHERE groupCn='%s' AND policy='%s'";
 		    array_push($v, $groupCn, $toPolicy);
 		    db_query($q, array('fv' => 'mysqlChangeGroupInfo', 'modul' => $modul, 'values' => $v), $lr);
         	}
diff --git a/mayor-orig/mayor-base/www/include/backend/mysql/session/base.php b/mayor-orig/mayor-base/www/include/backend/mysql/session/base.php
index 35272ff8..2964957b 100644
--- a/mayor-orig/mayor-base/www/include/backend/mysql/session/base.php
+++ b/mayor-orig/mayor-base/www/include/backend/mysql/session/base.php
@@ -32,7 +32,7 @@
 	}
 
 	// Az gid lekérdezése
-	$q = "SELECT gid FROM groups WHERE groupCn = '%s' AND policy = '%s'";
+	$q = "SELECT gid FROM `groups` WHERE groupCn = '%s' AND policy = '%s'";
 	$v = array($groupCn, $toPolicy);
 	$gid = db_query($q, array('fv' => 'mysqlMemberOf', 'modul' => $modul, 'result' => 'value', 'values' => $v), $lr);
 	if ($gid === false) {
diff --git a/mayor-orig/mayor-base/www/include/backend/mysql/session/createAccount.php b/mayor-orig/mayor-base/www/include/backend/mysql/session/createAccount.php
index 25ff9132..4f34aea6 100644
--- a/mayor-orig/mayor-base/www/include/backend/mysql/session/createAccount.php
+++ b/mayor-orig/mayor-base/www/include/backend/mysql/session/createAccount.php
@@ -79,7 +79,7 @@
 		$category = $SET['groups'][$i];
 		$groupCn = kisbetus(ekezettelen($category));
 		if ($category == '') continue;
-		$q = "SELECT gid FROM groups WHERE groupCn='%s'";
+		$q = "SELECT gid FROM `groups` WHERE groupCn='%s'";
 		$gid = db_query($q, array('fv' => 'mysqlCreateAccount', 'modul' => $modul, 'result' => 'value', 'values' => array($groupCn)), $lr);
 		if ($gid === false || is_null($gid)) { // --FIXME -- ez jó így BENCE radyx
 		    if ($SET['createGroup']) {
diff --git a/mayor-orig/mayor-base/www/include/backend/mysql/session/createGroup.php b/mayor-orig/mayor-base/www/include/backend/mysql/session/createGroup.php
index d1bc4f7b..495af44d 100644
--- a/mayor-orig/mayor-base/www/include/backend/mysql/session/createGroup.php
+++ b/mayor-orig/mayor-base/www/include/backend/mysql/session/createGroup.php
@@ -16,14 +16,14 @@
         if (!$lr) return false;
 
 	// cn ütközés ellenőrzése
-	$q = "SELECT COUNT(*) FROM groups WHERE policy='%s' AND groupCn='%s'";
+	$q = "SELECT COUNT(*) FROM `groups` WHERE policy='%s' AND groupCn='%s'";
 	$v = array($toPolicy, $groupCn);
 	$num = db_query($q, array('fv' => 'mysqlCreateGroup', 'modul' => $modul, 'result' => 'value', 'values' => $v), $lr);
 	if ($num === false) { db_close($lr); return false; }
 	if ($num > 0) { $_SESSION['alert'][] = 'message:multi_uid:'.$groupCn; db_close($lr); return false; }
 
 	// csoport felvétel
-	$q = "INSERT INTO groups (groupCn, groupDesc, policy) VALUES ('%s', '%s','%s')";
+	$q = "INSERT INTO `groups` (groupCn, groupDesc, policy) VALUES ('%s', '%s','%s')";
 	$v = array($groupCn, $groupDesc, $toPolicy);
 	$gid = db_query($q, array('fv' => 'mysqlCreateGroup', 'modul' => $modul, 'result' => 'insert', 'values' => $v), $lr);
 	if ($gid === false) { db_close($lr); return false; }
diff --git a/mayor-orig/mayor-base/www/include/backend/mysql/session/search/searchAccount.php b/mayor-orig/mayor-base/www/include/backend/mysql/session/search/searchAccount.php
index fa4584b0..ef249342 100644
--- a/mayor-orig/mayor-base/www/include/backend/mysql/session/search/searchAccount.php
+++ b/mayor-orig/mayor-base/www/include/backend/mysql/session/search/searchAccount.php
@@ -64,7 +64,7 @@
     	if (!$lr) return false;
 	// Keresés
 	if ($attr == 'member') {
-	    $q = "SELECT `".implode('`,`', array_fill(0, count($searchAttrs), '%s'))."` FROM groups LEFT JOIN members 
+	    $q = "SELECT `".implode('`,`', array_fill(0, count($searchAttrs), '%s'))."` FROM `groups` LEFT JOIN members 
 		ON members.gid=groups.gid
 		LEFT JOIN accounts USING (uid)
 		WHERE gid IN 
@@ -72,7 +72,7 @@
 		AND groups.policy='%s'";
 	    $v = array_merge($searchAttrs, array($pattern, $toPolicy, $toPolicy));
 	} else {
-	    $q = "SELECT DISTINCT `".implode('`,`', array_fill(0, count($searchAttrs), '%s'))."` FROM groups LEFT JOIN members 
+	    $q = "SELECT DISTINCT `".implode('`,`', array_fill(0, count($searchAttrs), '%s'))."` FROM `groups` LEFT JOIN members 
 		ON members.gid=groups.gid
 		LEFT JOIN accounts USING (uid)
 		WHERE `%s` LIKE '%%%s%%' AND groups.policy='%s'";
@@ -122,7 +122,7 @@
 
 	    $homeDirectory = $ret['homeDirectory']; // de nem használjuk semmire...
 	    // A user csoport törlése
-	    $q = "DELETE FROM groups WHERE gid=%u";
+	    $q = "DELETE FROM `groups` WHERE gid=%u";
 	    $v = array($ret['uid']);
 	    $r = db_query($q, array('fv' => 'mysqlDeleteAccount', 'modul' => $modul, 'values' => $v), $lr);
 	    if (!$r) { db_close($lr); return false; }
@@ -155,7 +155,7 @@
         }
 
         // csoport törlése
-	$q = "DELETE FROM groups WHERE policy='%s' AND groupCn='%s'";
+	$q = "DELETE FROM `groups` WHERE policy='%s' AND groupCn='%s'";
 	$v = array($toPolicy, $groupCn);
 	$r = db_query($q, array('fv' => 'mysqlDeleteGroup', 'modul' => "$toPolicy auth", 'values' => $v));