aboutsummaryrefslogtreecommitdiffstats
path: root/mayor-orig
diff options
context:
space:
mode:
authorM.Gergo2022-07-27 19:30:06 +0200
committerM.Gergo2022-07-27 19:30:06 +0200
commit9acd050ff186f06079b0bdb396d2f17bbbdc5336 (patch)
treefbbd61eb2c7512b74a34ff49d183f58b730354f9 /mayor-orig
parenta1743374b1a3f12a1d713cd40191bdb853c5e690 (diff)
downloadmayor-9acd050ff186f06079b0bdb396d2f17bbbdc5336.tar.gz
mayor-9acd050ff186f06079b0bdb396d2f17bbbdc5336.zip
Rev: 4850
Diffstat (limited to 'mayor-orig')
-rw-r--r--mayor-orig/mayor-base/log/mayor-base.rev2
-rw-r--r--mayor-orig/mayor-base/www/lang/hu_HU/base/base.php2
-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-naplo/www/include/modules/naplo/share/osztaly.php6
-rw-r--r--mayor-orig/mayor-naplo/www/include/modules/naplo/share/tanar.php16
-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
17 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 be364c8b..4d4433e4 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4847
+4850
diff --git a/mayor-orig/mayor-base/www/lang/hu_HU/base/base.php b/mayor-orig/mayor-base/www/lang/hu_HU/base/base.php
index 06d99596..846faac3 100644
--- a/mayor-orig/mayor-base/www/lang/hu_HU/base/base.php
+++ b/mayor-orig/mayor-base/www/lang/hu_HU/base/base.php
@@ -8,7 +8,7 @@
*/
define('_MAIN_TITLE','MaYoR');
-define('_MAIN_FOOTER','<a href="https://www.mayor.hu/">MaYoR</a> - 2002-2021 &copy; <a href="LICENSE.txt">GPL</a>');
+define('_MAIN_FOOTER','<a href="https://www.mayor.hu/">MaYoR</a> - 2002-2022 &copy; <a href="LICENSE.txt">GPL</a>');
define('_TANAR','tanár');
define('_DIAK','diák');
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index be364c8b..4d4433e4 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4847
+4850
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index be364c8b..4d4433e4 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4847
+4850
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index be364c8b..4d4433e4 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4847
+4850
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 be364c8b..4d4433e4 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 @@
-4847
+4850
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index be364c8b..4d4433e4 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4847
+4850
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 be364c8b..4d4433e4 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 @@
-4847
+4850
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 be364c8b..4d4433e4 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 @@
-4847
+4850
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 be364c8b..4d4433e4 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 @@
-4847
+4850
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index be364c8b..4d4433e4 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4847
+4850
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/osztaly.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/osztaly.php
index 86301c28..5a2f70c3 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/osztaly.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/osztaly.php
@@ -525,7 +525,7 @@ function getOsztalyfonok($osztalyId, $tanev=__TANEV, $olr = null) {
initTolIgDt($tanev, $kDt, $zDt);
$q = "SELECT osztalyTanar.tanarId,
- TRIM(CONCAT(viseltNevElotag,' ',viseltCsaladiNev,' ',viseltUtonev)) As tanarNev, osztalyTanar.beDt, osztalyTanar.kiDt
+ TRIM(CONCAT(IFNULL(viseltNevElotag,''),' ',viseltCsaladiNev,' ',viseltUtonev)) As tanarNev, osztalyTanar.beDt, osztalyTanar.kiDt
FROM osztalyTanar LEFT JOIN tanar USING (tanarId)
WHERE osztalyId = %u
AND osztalyTanar.beDt <= '%s'
@@ -544,7 +544,7 @@ function getOsztalyfonokok($osztalyId, $tanev = null, $olr = null) {
if (is_null($tanev)) {
$q = "SELECT osztalyTanar.tanarId AS tanarId,
- TRIM(CONCAT(viseltNevElotag,' ',viseltCsaladiNev,' ',viseltUtonev)) AS tanarNev,
+ TRIM(CONCAT(IFNULL(viseltNevElotag,''),' ',viseltCsaladiNev,' ',viseltUtonev)) AS tanarNev,
osztalyTanar.beDt AS beDt,
osztalyTanar.kiDt AS kiDt
FROM osztalyTanar LEFT JOIN tanar USING (tanarId)
@@ -561,7 +561,7 @@ function getOsztalyfonokok($osztalyId, $tanev = null, $olr = null) {
$kDt = $tanevAdat['kezdesDt']; $zDt = $tanevAdat['zarasDt'];
$q = "SELECT osztalyTanar.tanarId AS tanarId,
- TRIM(CONCAT(viseltNevElotag,' ',viseltCsaladiNev,' ',viseltUtonev)) AS tanarNev,
+ TRIM(CONCAT(IFNULL(viseltNevElotag,''),' ',viseltCsaladiNev,' ',viseltUtonev)) AS tanarNev,
osztalyTanar.beDt AS beDt,
osztalyTanar.kiDt AS kiDt
FROM osztalyTanar LEFT JOIN tanar USING (tanarId)
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/tanar.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/tanar.php
index 77b47fb8..fbf22510 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/tanar.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/tanar.php
@@ -50,12 +50,12 @@
if ($SET['targyId'] != '') {
if (count($where) > 0) $W = 'AND ' . implode(' AND ',$where);
- $q1 = "SELECT tanar.tanarId AS tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev, statusz,
+ $q1 = "SELECT tanar.tanarId AS tanarId, TRIM(CONCAT_WS(' ',IFNULL(viseltNevElotag,''), ViseltCsaladiNev, viseltUtoNev)) AS tanarNev, statusz,
hetiKotelezoOraszam,hetiLekotottMinOraszam,hetiLekotottMaxOraszam,hetiKotottMaxOraszam,hetiMunkaora
$extraAttrs
FROM ".__INTEZMENYDBNEV.".targy LEFT JOIN ".__INTEZMENYDBNEV.".mkTanar USING (mkId) LEFT JOIN ".__INTEZMENYDBNEV.".tanar USING (tanarId)
WHERE targyId=%u AND tanarId IS NOT NULL ".$W;
- $q2 = "SELECT tanar.tanarId AS tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev, statusz,
+ $q2 = "SELECT tanar.tanarId AS tanarId, TRIM(CONCAT_WS(' ',IFNULL(viseltNevElotag,''), ViseltCsaladiNev, viseltUtoNev)) AS tanarNev, statusz,
hetiKotelezoOraszam,hetiLekotottMinOraszam,hetiLekotottMaxOraszam,hetiKotottMaxOraszam,hetiMunkaora
$extraAttrs
FROM ".__INTEZMENYDBNEV.".kepesitesTargy LEFT JOIN ".__INTEZMENYDBNEV.".tanarKepesites USING (kepesitesId) LEFT JOIN ".__INTEZMENYDBNEV.".tanar USING (tanarId)
@@ -65,7 +65,7 @@
$q = "(".$q1.") UNION DISTINCT (".$q2.") ORDER BY tanarNev,tanarId";
} elseif ($SET['mkId'] == '') {
if (count($where) > 0) $W = 'WHERE ' . implode(' AND ',$where);
- $q = "SELECT tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev, statusz,
+ $q = "SELECT tanarId, TRIM(CONCAT_WS(' ',IFNULL(viseltNevElotag,''), ViseltCsaladiNev, viseltUtoNev)) AS tanarNev, statusz,
hetiKotelezoOraszam,hetiLekotottMinOraszam,hetiLekotottMaxOraszam,hetiKotottMaxOraszam,hetiMunkaora
$extraAttrs
FROM ".__INTEZMENYDBNEV.".tanar
@@ -73,7 +73,7 @@
$W ORDER BY CONCAT_WS(' ', ViseltCsaladiNev, viseltUtoNev)";
} else {
if (count($where) > 0) $W = 'AND ' . implode(' AND ',$where);
- $q = "SELECT tanar.tanarId AS tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev, statusz,
+ $q = "SELECT tanar.tanarId AS tanarId, TRIM(CONCAT_WS(' ',IFNULL(viseltNevElotag,''), ViseltCsaladiNev, viseltUtoNev)) AS tanarNev, statusz,
hetiKotelezoOraszam,hetiLekotottMinOraszam,hetiLekotottMaxOraszam,hetiKotottMaxOraszam,hetiMunkaora
$extraAttrs
FROM ".__INTEZMENYDBNEV.".tanar LEFT JOIN ".__INTEZMENYDBNEV.".mkTanar USING (tanarId)
@@ -86,7 +86,7 @@
function getTanarNevById($tanarId, $olr = null) {
- $q = "SELECT TRIM(CONCAT_WS(' ', viseltNevElotag, viseltCsaladiNev, viseltUtonev)) AS tanarNev
+ $q = "SELECT TRIM(CONCAT_WS(' ', IFNULL(viseltNevElotag,''), viseltCsaladiNev, viseltUtonev)) AS tanarNev
FROM ".__INTEZMENYDBNEV.".tanar WHERE tanarId=%u";
return db_query($q, array('fv' => 'getTanarNevById', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => array($tanarId)), $olr);
@@ -99,7 +99,7 @@
function getSzabadTanarok($dt, $ora, $olr = '') {
- $q = "SELECT tanar.tanarId AS tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev
+ $q = "SELECT tanar.tanarId AS tanarId, TRIM(CONCAT_WS(' ',IFNULL(viseltNevElotag,''), ViseltCsaladiNev, viseltUtoNev)) AS tanarNev
FROM ".__INTEZMENYDBNEV.".tanar LEFT JOIN ora ON tanarId=ki AND dt='%1\$s' and ora=%2\$u
WHERE ki IS NULL AND beDt<='%1\$s' and (kiDt IS NULL OR kiDt>='%1\$s')
ORDER BY CONCAT_WS(' ', ViseltCsaladiNev, viseltUtoNev)";
@@ -109,7 +109,7 @@
function getFoglaltTanarok($dt, $ora, $olr = '') {
- $q = "SELECT DISTINCT tanar.tanarId AS tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev
+ $q = "SELECT DISTINCT tanar.tanarId AS tanarId, TRIM(CONCAT_WS(' ',IFNULL(viseltNevElotag,''), ViseltCsaladiNev, viseltUtoNev)) AS tanarNev
FROM ".__INTEZMENYDBNEV.".tanar LEFT JOIN ora ON tanarId=ki AND dt='%1\$s' and ora=%2\$u
WHERE ki IS NOT NULL AND beDt<='%1\$s' and (kiDt IS NULL OR kiDt>='%1\$s')
ORDER BY CONCAT_WS(' ', ViseltCsaladiNev, viseltUtoNev)";
@@ -120,7 +120,7 @@
function getTanarAdatById($tanarIds, $olr = '') {
if (!is_array($tanarIds)) $tanarIds = array($tanarIds);
- $q = "SELECT *,TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev FROM ".__INTEZMENYDBNEV.".tanar WHERE tanarId IN (".implode(',', array_fill(0, count($tanarIds), '%u')).")";
+ $q = "SELECT *,TRIM(CONCAT_WS(' ',IFNULL(viseltNevElotag,''), ViseltCsaladiNev, viseltUtoNev)) AS tanarNev FROM ".__INTEZMENYDBNEV.".tanar WHERE tanarId IN (".implode(',', array_fill(0, count($tanarIds), '%u')).")";
$R = db_query($q, array('fv' => 'getTanarAdatById', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $tanarIds), $olr);
// for ($i=0; $i<count($R); $i++) {
// $q2 = "SELECT osztalyId
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index be364c8b..4d4433e4 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4847
+4850
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index be364c8b..4d4433e4 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4847
+4850
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 9f5708fc..9fd6a50a 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4847
-377e1327ce20979fae687cfe17cd126e mayor-fenntarto-rev4847.tgz
-9458fcb16472259b1da5de6b38db47ae mayor-installer-sulix-rev4847.tgz
-4146f121bb2919c3bf2e416b057be006 mayor-wiki-rev4847.tgz
-df483ac0477160ed805d1bc7f18d990a mayor-installer-rev4847.tgz
-f709a12bd6d436e4a32e3ca8efc82908 mayor-portal-rev4847.tgz
-c864b940a5f735ca923f8f65204d2d55 mayor-felveteli-rev4847.tgz
-cee9c454ded5be54b40e4f9ce7b2bc23 mayor-jatek-rev4847.tgz
-7260af553b61c205519c6f04e915ebe9 mayor-locales-jp_JP-rev4847.tgz
-ebaeada187a94c6b0e25efa7e39029f2 mayor-locales-de_DE-rev4847.tgz
-bc350a28b260d94979a8f39a961d25c4 mayor-locales-en_US-rev4847.tgz
-e3fe7b90b90eefe566e7b2f707eeced0 mayor-naplo-rev4847.tgz
-6941c0644de48652f0158253d4e98213 mayor-base-rev4847.tgz
+Revision 4850
+c5c11163d857bacc1aed0597749d5d67 mayor-fenntarto-rev4850.tgz
+819febe17618628c86161539d278f0a6 mayor-installer-sulix-rev4850.tgz
+8cba42881f8f02088509762badd345b9 mayor-wiki-rev4850.tgz
+c14ce883ea83bb303b7f35309a38ade4 mayor-installer-rev4850.tgz
+88fc58d350d77fb62d71d2dfa0d5de0f mayor-portal-rev4850.tgz
+dc08b7b3d85c50975b7699a042aae004 mayor-felveteli-rev4850.tgz
+8ba1d43aab0b3349a2729b861296799d mayor-jatek-rev4850.tgz
+0b051066f283428b58a146bfaa2dcace mayor-locales-jp_JP-rev4850.tgz
+80639f8f72df657fb82a0c234cd70fee mayor-locales-de_DE-rev4850.tgz
+83c7208fe97d0e0d10d597cd3ff76263 mayor-locales-en_US-rev4850.tgz
+a96f3e1c5a60cac728def72d7902e546 mayor-naplo-rev4850.tgz
+05cd217ed08ee3301b4d9a3e9378b267 mayor-base-rev4850.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index be364c8b..4d4433e4 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4847
+4850
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 10:17:57 +0000