aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mayor-orig/mayor-base/log/mayor-base.rev2
-rw-r--r--mayor-orig/mayor-base/www/include/backend/mysql/session/accountInfo.php6
-rw-r--r--mayor-orig/mayor-base/www/include/backend/mysql/session/base.php2
-rw-r--r--mayor-orig/mayor-base/www/include/backend/mysql/session/createAccount.php2
-rw-r--r--mayor-orig/mayor-base/www/include/backend/mysql/session/createGroup.php4
-rw-r--r--mayor-orig/mayor-base/www/include/backend/mysql/session/search/searchAccount.php8
-rw-r--r--mayor-orig/mayor-felveteli/log/mayor-felveteli.rev2
-rw-r--r--mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev2
-rw-r--r--mayor-orig/mayor-installer-orig/log/mayor-installer.rev2
-rw-r--r--mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev2
-rw-r--r--mayor-orig/mayor-jatek/log/mayor-jatek.rev2
-rw-r--r--mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev2
-rw-r--r--mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev2
-rw-r--r--mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev2
-rw-r--r--mayor-orig/mayor-naplo/log/mayor-naplo.rev2
-rw-r--r--mayor-orig/mayor-portal/log/mayor-portal.rev2
-rw-r--r--mayor-orig/mayor-wiki/log/mayor-wiki.rev2
-rw-r--r--mayor-orig/md5sum26
-rw-r--r--mayor-orig/rev.txt2
-rw-r--r--rev.txt2
20 files changed, 38 insertions, 38 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index b9dafcc3..a29b5fa9 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4713
+4715
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));
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index b9dafcc3..a29b5fa9 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4713
+4715
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index b9dafcc3..a29b5fa9 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4713
+4715
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index b9dafcc3..a29b5fa9 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4713
+4715
diff --git a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
index b9dafcc3..a29b5fa9 100644
--- a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
+++ b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
@@ -1 +1 @@
-4713
+4715
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index b9dafcc3..a29b5fa9 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4713
+4715
diff --git a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
index b9dafcc3..a29b5fa9 100644
--- a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
+++ b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
@@ -1 +1 @@
-4713
+4715
diff --git a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
index b9dafcc3..a29b5fa9 100644
--- a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
+++ b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
@@ -1 +1 @@
-4713
+4715
diff --git a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
index b9dafcc3..a29b5fa9 100644
--- a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
+++ b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
@@ -1 +1 @@
-4713
+4715
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index b9dafcc3..a29b5fa9 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4713
+4715
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index b9dafcc3..a29b5fa9 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4713
+4715
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index b9dafcc3..a29b5fa9 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4713
+4715
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 8cf1cb8b..0808638e 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4713
-ce702c78ab1e2f4cc031757497de783a mayor-fenntarto-rev4713.tgz
-f8f436cbfda29f04f4f9d6d45096ed2b mayor-installer-sulix-rev4713.tgz
-8c02ce059544cdea9de78844e2301ca7 mayor-wiki-rev4713.tgz
-2e8da272ceb62adcab9ebd892db87bc8 mayor-installer-rev4713.tgz
-50b92c062c3980ceb8703c75528124c9 mayor-portal-rev4713.tgz
-0dc99f57b5c2ce5850451ae6d8f9c6b1 mayor-felveteli-rev4713.tgz
-dbe1d335412f36acf16aae503180c154 mayor-jatek-rev4713.tgz
-4f165a284865baf556b6fc83a622da7a mayor-locales-jp_JP-rev4713.tgz
-42558feb4dd9bd06ff0cdaa37ee0c668 mayor-locales-de_DE-rev4713.tgz
-8ec41cb9c101c60dc9c8576d1ac1c931 mayor-locales-en_US-rev4713.tgz
-ff759af5c9d054cfb59fe5db3bc4a247 mayor-naplo-rev4713.tgz
-bfc0ee9cf71c3fc76b4bc409deb53063 mayor-base-rev4713.tgz
+Revision 4715
+43fdcbb79107f40fc3120c57db417c4b mayor-fenntarto-rev4715.tgz
+391093a3387a8ee3b79138fb010fbb7f mayor-installer-sulix-rev4715.tgz
+122579371c590ad98e90f3407594cfa2 mayor-wiki-rev4715.tgz
+1ff2a02bc1b4b9c2781f98cc59760880 mayor-installer-rev4715.tgz
+a01109b8c8ad5240a9bace962f8f8fc5 mayor-portal-rev4715.tgz
+914440be442874ecc05078524270d735 mayor-felveteli-rev4715.tgz
+fd7d743f8212b7327098231f4bed480e mayor-jatek-rev4715.tgz
+2fc85c4d675f2cc19007ad334c6e821b mayor-locales-jp_JP-rev4715.tgz
+9137d63cd72829caadc5e4a0904b45a9 mayor-locales-de_DE-rev4715.tgz
+505bba3d3f63b1eed0e95b04bff71ce1 mayor-locales-en_US-rev4715.tgz
+a094cc484b6c9c2fb391eef4794117fd mayor-naplo-rev4715.tgz
+65448272b6e696a2f7db451664345822 mayor-base-rev4715.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index b9dafcc3..a29b5fa9 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4713
+4715
diff --git a/rev.txt b/rev.txt
index b9dafcc3..a29b5fa9 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4713
+4715
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 04:54:53 +0000