From 847eb4a21606966ac5573c6ed6df878eff93841a Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Thu, 10 Sep 2020 13:20:03 +0200 Subject: Rev: 4680 --- mayor-orig/mayor-base/www/include/backend/ads/session/base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mayor-orig/mayor-base/www') 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; } -- cgit v1.2.3 From a5ac3d0ab4015ed2683706cd0677ce6ce159f0ed Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Wed, 21 Oct 2020 20:35:04 +0200 Subject: Rev: 4691 --- mayor-orig/mayor-base/log/mayor-base.rev | 2 +- mayor-orig/mayor-base/www/include/base/mysql.php | 4 +- mayor-orig/mayor-felveteli/log/mayor-felveteli.rev | 2 +- .../www/static/hu_HU/felveteli/felveteli.2020.html | 107 +++++++++++++++++++++ .../www/static/hu_HU/felveteli/felveteli.html | 105 +------------------- mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev | 2 +- .../mayor-installer-orig/log/mayor-installer.rev | 2 +- .../log/mayor-installer-sulix.rev | 2 +- mayor-orig/mayor-jatek/log/mayor-jatek.rev | 2 +- .../log/mayor-locales-de_DE.rev | 2 +- .../log/mayor-locales-en_US.rev | 2 +- .../log/mayor-locales-jp_JP.rev | 2 +- mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 +- mayor-orig/mayor-portal/log/mayor-portal.rev | 2 +- .../www/policy/private/portal/portal/portal.php | 1 + .../classic/module-portal/html/hirek/egyhir.phtml | 5 +- mayor-orig/mayor-wiki/log/mayor-wiki.rev | 2 +- mayor-orig/md5sum | 26 ++--- mayor-orig/rev.txt | 2 +- rev.txt | 2 +- 20 files changed, 144 insertions(+), 132 deletions(-) create mode 100644 mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.2020.html (limited to 'mayor-orig/mayor-base/www') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index 44f34c74..54f5b275 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4683 +4691 diff --git a/mayor-orig/mayor-base/www/include/base/mysql.php b/mayor-orig/mayor-base/www/include/base/mysql.php index 819fdcd0..e4322dc8 100644 --- a/mayor-orig/mayor-base/www/include/base/mysql.php +++ b/mayor-orig/mayor-base/www/include/base/mysql.php @@ -91,11 +91,11 @@ mysqli_set_charset($lr, "utf8"); mysqli_query($lr, "SET NAMES utf8"); mysqli_query($lr, "SET collation_connection='utf8_hungarian_ci'"); - mysqli_query($lr, "SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))"); + mysqli_query($lr, "SET SESSION sql_mode=(SELECT REPLACE(REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''),'NO_ZERO_DATE',''))"); } else { mysql_query("SET NAMES utf8", $lr); mysql_query("SET collation_connection='utf8_hungarian_ci'", $lr); - mysql_query("SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))", $lr); + mysql_query("SET SESSION sql_mode=(SELECT REPLACE(REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''),'NO_ZERO_DATE',''))", $lr); } } else { $_SESSION['alert'][] = "message:sql_select_db_failure:db_connect/${SET['fv']}:$modul:".$MYSQL_DATA[$modul]['db']; diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index 44f34c74..54f5b275 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4683 +4691 diff --git a/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.2020.html b/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.2020.html new file mode 100644 index 00000000..13dd5cfa --- /dev/null +++ b/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.2020.html @@ -0,0 +1,107 @@ +
+

Középiskolai felvételi

+

2020/2021-es tanév

+ +
+ + Felvételi Tájékoztató 2020/2021 [PDF] + +
+ +

Letölthető dokumentumok

+ + +

Fontos dátumok

+ +
+
2019. október 17.
+
+A felvételi tájékoztató megjelenése. +
+ +
2019. november 11. 18:00
+
Tájékoztató értekezletet a felvételi eljárás rendjéről, induló osztályokról
+ +
2019. november 11-15.
+
Iskola bemutatkozás és nyílt órák (előzetes jelentkezéssel!)
+ +
2019. december 6.
+
Jelentkezési határidő az egységes követelmények szerint tartott + a felvételi eljárást megelőző írásbeli felvételi vizsgára. +
+ +
2020. január 18. 1000
+
Írásbeli felvételi vizsgák az érintett 6 évfolyamos gimnáziumokban. (2x45 perc)
+ +
2020. január 18. 1000
+
Írásbeli felvételi a nyolcadik évfolyamok számára a felvételi eljárást + megelőző írásbeli vizsgát szervező középiskolákban. (2x45 perc)
+ +
2020. január 25. 8:00-16:00 6 4-5
+
A felvételi eljárást megelőző központi írásbeli dolgozatok megtekintése négyévfolyamos, hatévfolyamos és a nyelvi előkészítős képzésre jelentkezőknek
+ +
2020. február 19.
+
Tanulói Jelentkezési Lapok és Tanulói Adatlapok leadási határideje
+ +
2020. február 24. - 2020. március 13.
+
Szóbeli beszélgetések a kiírás szerint.
+ +
2020. március 16.
+
Ideiglenes felvételi jegyzék közzététele.
+ +
+ +

Kiemelt adatok

+ +
+
Az iskola rövid neve és címe:
+
Városmajori Gimnázium
+ 1122. Budapest, Városmajor u. 71.
+ Tel: 214-1554; Fax: 214-1479
+ Telephely kódja: 001
+
+
A gimnázium központi azonosító kódja:
+
035242
+ + +
A 2019/2020-es tanévben indítandó tanulócsoportok azonosító számai:
+
+ + + + + + + + + + + + +
Az osztály jelemegnevezésekódja
7. Aáltalános egyedi tantervű osztály (angol)0710
7. Báltalános egyedi tantervű osztály (német)0720
9. Cének-zene speciális tantervű csoport (angol)0930
9. Cmagyar egyedi tantervű csoport (angol)0934
9. Dmatematika tehetséggondozó csoport (angol)0940
9. Dfizika egyedi tantervű csoport (angol)0942
9/Ny. Eáltalános tantervű (nyelvi előkészítős, 1+4 évfolyamos) csoport (német)0850
9/Ny. Eáltalános tantervű (nyelvi előkészítős, 1+4 évfolyamos) csoport (spanyol)0855
+
+ +
+ +
diff --git a/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.html b/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.html index 13dd5cfa..d8acbde8 100644 --- a/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.html +++ b/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.html @@ -1,107 +1,10 @@

Középiskolai felvételi

-

2020/2021-es tanév

+

2021/2022-es tanév

- - Felvételi Tájékoztató 2020/2021 [PDF] + + Felvételi Tájékoztató 2021/2022 [PDF]
- -

Letölthető dokumentumok

- - -

Fontos dátumok

- -
-
2019. október 17.
-
-A felvételi tájékoztató megjelenése. -
- -
2019. november 11. 18:00
-
Tájékoztató értekezletet a felvételi eljárás rendjéről, induló osztályokról
- -
2019. november 11-15.
-
Iskola bemutatkozás és nyílt órák (előzetes jelentkezéssel!)
- -
2019. december 6.
-
Jelentkezési határidő az egységes követelmények szerint tartott - a felvételi eljárást megelőző írásbeli felvételi vizsgára. -
- -
2020. január 18. 1000
-
Írásbeli felvételi vizsgák az érintett 6 évfolyamos gimnáziumokban. (2x45 perc)
- -
2020. január 18. 1000
-
Írásbeli felvételi a nyolcadik évfolyamok számára a felvételi eljárást - megelőző írásbeli vizsgát szervező középiskolákban. (2x45 perc)
- -
2020. január 25. 8:00-16:00 6 4-5
-
A felvételi eljárást megelőző központi írásbeli dolgozatok megtekintése négyévfolyamos, hatévfolyamos és a nyelvi előkészítős képzésre jelentkezőknek
- -
2020. február 19.
-
Tanulói Jelentkezési Lapok és Tanulói Adatlapok leadási határideje
- -
2020. február 24. - 2020. március 13.
-
Szóbeli beszélgetések a kiírás szerint.
- -
2020. március 16.
-
Ideiglenes felvételi jegyzék közzététele.
- -
- -

Kiemelt adatok

- -
-
Az iskola rövid neve és címe:
-
Városmajori Gimnázium
- 1122. Budapest, Városmajor u. 71.
- Tel: 214-1554; Fax: 214-1479
- Telephely kódja: 001
-
-
A gimnázium központi azonosító kódja:
-
035242
- - -
A 2019/2020-es tanévben indítandó tanulócsoportok azonosító számai:
-
- - - - - - - - - - - - -
Az osztály jelemegnevezésekódja
7. Aáltalános egyedi tantervű osztály (angol)0710
7. Báltalános egyedi tantervű osztály (német)0720
9. Cének-zene speciális tantervű csoport (angol)0930
9. Cmagyar egyedi tantervű csoport (angol)0934
9. Dmatematika tehetséggondozó csoport (angol)0940
9. Dfizika egyedi tantervű csoport (angol)0942
9/Ny. Eáltalános tantervű (nyelvi előkészítős, 1+4 évfolyamos) csoport (német)0850
9/Ny. Eáltalános tantervű (nyelvi előkészítős, 1+4 évfolyamos) csoport (spanyol)0855
-
- -
- -
+ \ No newline at end of file diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index 44f34c74..54f5b275 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4683 +4691 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index 44f34c74..54f5b275 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4683 +4691 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 44f34c74..54f5b275 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 @@ -4683 +4691 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index 44f34c74..54f5b275 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4683 +4691 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 44f34c74..54f5b275 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 @@ -4683 +4691 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 44f34c74..54f5b275 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 @@ -4683 +4691 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 44f34c74..54f5b275 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 @@ -4683 +4691 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 44f34c74..54f5b275 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4683 +4691 diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index 44f34c74..54f5b275 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4683 +4691 diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal.php b/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal.php index 1640b057..6e9d1cc3 100644 --- a/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal.php +++ b/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal.php @@ -3,6 +3,7 @@ global $skin; /* $skinnek lennie kell */ + if (defined('_POLICY') && defined('__PORTAL_CODE') && file_exists('policy/'._POLICY.'/portal/portal/portal_'.__PORTAL_CODE.'.'.$skin.'.php') ) { require('policy/'._POLICY.'/portal/portal/portal_'.__PORTAL_CODE.'.'.$skin.'.php'); } elseif (file_exists('policy/'._POLICY.'/portal/portal/portal_'.demo.'.'.$skin.'.php')) { diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml index afebf8bc..b8e0f7ee 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml @@ -27,7 +27,7 @@ formBegin(); if (__HIREKADMIN===true) { - echo ''; + echo ''; echo ''; echo ''; @@ -139,7 +139,8 @@ echo ''; diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index 44f34c74..54f5b275 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4683 +4691 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index b0ed190b..052b0a58 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4683 -5ab848461fcb7c8f0e675e0ba565dfb6 mayor-fenntarto-rev4683.tgz -acab3f4d1dc57153e4737352e0b2513e mayor-installer-sulix-rev4683.tgz -67c861aee289395a3cb38590d67ce66a mayor-wiki-rev4683.tgz -6f0f8a265ca71ed5eedd44b33856b3b0 mayor-installer-rev4683.tgz -f1d56379fd6d7ac8086be051d95e4da5 mayor-portal-rev4683.tgz -e37c44fb0101398b91fe7c3371399672 mayor-felveteli-rev4683.tgz -0eff173e22c1dbdb55b53f65eecbaf94 mayor-jatek-rev4683.tgz -b2c987867d7f4b0c5e2cb6727ec3c9b7 mayor-locales-jp_JP-rev4683.tgz -11dd8efcac7603550dd6db72476e2a26 mayor-locales-de_DE-rev4683.tgz -180cebdc87e92c057e8870d8f3b77b91 mayor-locales-en_US-rev4683.tgz -1d142f81e335acfe4a50fe626a6c864a mayor-naplo-rev4683.tgz -7a2430870a191b80dc09cba2322b4b0d mayor-base-rev4683.tgz +Revision 4691 +71107f2d0381381d16916e473db42dba mayor-fenntarto-rev4691.tgz +a80ee713915cb729bf44f9c831f3e74a mayor-installer-sulix-rev4691.tgz +a0777d620e206b07b6e3565864a58fec mayor-wiki-rev4691.tgz +a58f5bd16055fc5f168b39a70052de05 mayor-installer-rev4691.tgz +512a43eb1223ecec3b81ea1eda4c16f6 mayor-portal-rev4691.tgz +21a67636b6d1d0c2ca040d1210901aaf mayor-felveteli-rev4691.tgz +1d2ff3b0f71141f6e3c916c749eab426 mayor-jatek-rev4691.tgz +f5490a7abb4629401ac267ec0e23a9ac mayor-locales-jp_JP-rev4691.tgz +d9d56f15c55aaca9e5e6447455e8b593 mayor-locales-de_DE-rev4691.tgz +b03f1fa2e742a0d3245a1c1b719dbd6f mayor-locales-en_US-rev4691.tgz +5b7345dd3db4f2aa184d4440beb7bd5e mayor-naplo-rev4691.tgz +6b1cef87715c325d36a3d24e66378cbf mayor-base-rev4691.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index 44f34c74..54f5b275 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4683 +4691 diff --git a/rev.txt b/rev.txt index 44f34c74..54f5b275 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4683 +4691 -- cgit v1.2.3 From c279e479aa9c943fd0fc2b396638a5208c78cfb9 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Wed, 28 Oct 2020 11:35:04 +0100 Subject: Rev: 4695 --- mayor-orig/mayor-base/log/mayor-base.rev | 2 +- .../mayor-base/www/skin/classic/base/css/base.css | 3 +- .../www/skin/default/base/html/base.phtml | 5 +- mayor-orig/mayor-felveteli/log/mayor-felveteli.rev | 2 +- .../include/menu/public/hu_HU/module-felveteli.php | 4 ++ mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev | 2 +- .../mayor-installer-orig/log/mayor-installer.rev | 2 +- .../log/mayor-installer-sulix.rev | 2 +- mayor-orig/mayor-jatek/log/mayor-jatek.rev | 2 +- .../log/mayor-locales-de_DE.rev | 2 +- .../log/mayor-locales-en_US.rev | 2 +- .../log/mayor-locales-jp_JP.rev | 2 +- mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 +- .../install/mayor-portal/mysql/mayor-portal.sql | 18 ++++-- mayor-orig/mayor-portal/log/mayor-portal.rev | 2 +- .../update/rev004693-1-mayor_portal.sql | 32 +++++++++++ .../www/include/modules/portal/hirek/egyhir.php | 9 ++- .../www/include/modules/portal/share/hirek.php | 2 +- .../www/policy/private/portal/hirek/egyhir-pre.php | 1 + .../policy/private/portal/hirek/hirekAdmin-pre.php | 35 +++++++++++- .../www/policy/private/portal/hirek/hirekAdmin.php | 6 +- .../classic/module-portal/css/hirek/egyhir.css | 34 +++++++++-- .../classic/module-portal/css/hirek/hirekAdmin.css | 15 ++++- .../www/skin/classic/module-portal/css/portal.css | 6 +- .../classic/module-portal/html/hirek/egyhir.phtml | 35 ++++++++---- .../module-portal/html/hirek/hirekAdmin.phtml | 66 +++++++++++++++++----- .../classic/module-portal/html/share/doboz.phtml | 3 +- .../module-portal/javascript/portal.jquery.min.js | 29 ++++++++++ mayor-orig/mayor-wiki/log/mayor-wiki.rev | 2 +- mayor-orig/md5sum | 26 ++++----- mayor-orig/rev.txt | 2 +- rev.txt | 2 +- 32 files changed, 282 insertions(+), 75 deletions(-) create mode 100644 mayor-orig/mayor-portal/update/rev004693-1-mayor_portal.sql (limited to 'mayor-orig/mayor-base/www') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index 54f5b275..9bce5583 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4691 +4695 diff --git a/mayor-orig/mayor-base/www/skin/classic/base/css/base.css b/mayor-orig/mayor-base/www/skin/classic/base/css/base.css index 54b53fb8..4ee80f46 100644 --- a/mayor-orig/mayor-base/www/skin/classic/base/css/base.css +++ b/mayor-orig/mayor-base/www/skin/classic/base/css/base.css @@ -102,7 +102,8 @@ padding-left: 140px; } - #nav li { position: relative; } + #nav li { position: relative; } + #nav li:first { white-space: nowrap; } #nav > li { float: left; z-index: 20; text-align: center; padding: 0; /* background-color: #3fa79c; */ background-color: #3496B9; diff --git a/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml b/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml index 19dfa38e..78a5dea8 100644 --- a/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml +++ b/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml @@ -137,7 +137,8 @@ function includeJS($page,$sub,$f,$skin) { echo ''."\n"; } } - if (__RICH_TEXT_EDITOR===true && $f == 'egyhir') { +/* + if (__RICH_TEXT_EDITOR===true && $f == 'egyhir') { // disabled // Koschtit Image Gallery if ($page == 'portal') { //require_once('skin/classic/share/javascript/koschtit/ki_include.php'); @@ -147,7 +148,7 @@ function includeJS($page,$sub,$f,$skin) { '; } - +*/ // if (file_exists(($_f="skin/$skin/base/javascript/jstorage.min.js")) ) { // echo ''."\n"; // } diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index 54f5b275..9bce5583 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4691 +4695 diff --git a/mayor-orig/mayor-felveteli/www/include/menu/public/hu_HU/module-felveteli.php b/mayor-orig/mayor-felveteli/www/include/menu/public/hu_HU/module-felveteli.php index 4fa2aa1d..953cc817 100644 --- a/mayor-orig/mayor-felveteli/www/include/menu/public/hu_HU/module-felveteli.php +++ b/mayor-orig/mayor-felveteli/www/include/menu/public/hu_HU/module-felveteli.php @@ -1,5 +1,7 @@ 'Felvételi (általános iskola)', 'url' => 'index.php?page=felveteli&sub=kos') @@ -45,4 +47,6 @@ array('txt' => '6.', 'url' => 'index.php?page=felveteli&sub=tajekoztato/20082009&f=6'), ); */ + +} ?> diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index 54f5b275..9bce5583 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4691 +4695 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index 54f5b275..9bce5583 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4691 +4695 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 54f5b275..9bce5583 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 @@ -4691 +4695 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index 54f5b275..9bce5583 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4691 +4695 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 54f5b275..9bce5583 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 @@ -4691 +4695 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 54f5b275..9bce5583 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 @@ -4691 +4695 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 54f5b275..9bce5583 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 @@ -4691 +4695 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 54f5b275..9bce5583 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4691 +4695 diff --git a/mayor-orig/mayor-portal/install/mayor-portal/mysql/mayor-portal.sql b/mayor-orig/mayor-portal/install/mayor-portal/mysql/mayor-portal.sql index 842760b7..61655882 100644 --- a/mayor-orig/mayor-portal/install/mayor-portal/mysql/mayor-portal.sql +++ b/mayor-orig/mayor-portal/install/mayor-portal/mysql/mayor-portal.sql @@ -61,13 +61,23 @@ SET character_set_client = @saved_cs_client; DROP TABLE IF EXISTS `kategoriak`; CREATE TABLE `kategoriak` ( - `id` mediumint(8) unsigned NOT NULL default '0', - `leiras` varchar(70) NOT NULL default '', + `id` mediumint(8) unsigned NOT NULL DEFAULT '0', + `leiras` varchar(70) NOT NULL DEFAULT '', `precode` text, - `postcode` text + `postcode` text, + UNIQUE KEY `id` (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 PACK_KEYS=1; - +DROP TABLE IF EXISTS `hirKategoria`; +CREATE TABLE `hirKategoria` ( + `hirId` int(10) unsigned NOT NULL, + `kategoriaId` mediumint(8) unsigned NOT NULL, + PRIMARY KEY (`hirId`,`kategoriaId`), + KEY `hirKategoria_FKIndex1` (`hirId`), + KEY `hirKategoria_FKIndex2` (`kategoriaId`), + CONSTRAINT `hirKategoria_ibfk_1` FOREIGN KEY (`hirId`) REFERENCES `hirek` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `hirKategoria_ibfk_2` FOREIGN KEY (`kategoriaId`) REFERENCES `kategoriak` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci; -- -- Table structure for table `linkek` -- diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index 54f5b275..9bce5583 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4691 +4695 diff --git a/mayor-orig/mayor-portal/update/rev004693-1-mayor_portal.sql b/mayor-orig/mayor-portal/update/rev004693-1-mayor_portal.sql new file mode 100644 index 00000000..5b36028d --- /dev/null +++ b/mayor-orig/mayor-portal/update/rev004693-1-mayor_portal.sql @@ -0,0 +1,32 @@ +DELIMITER $$ +DROP PROCEDURE IF EXISTS upgrade_database_4693 $$ + +CREATE PROCEDURE upgrade_database_4693() +BEGIN +SET NAMES utf8 COLLATE utf8_hungarian_ci; + +IF NOT EXISTS (SELECT * FROM information_schema.STATISTICS WHERE TABLE_SCHEMA=DATABASE() and TABLE_NAME='kategoriak' AND COLUMN_NAME='id') THEN + ALTER TABLE `kategoriak` ADD UNIQUE INDEX (id); +END IF; + +ALTER TABLE `hirek` ENGINE = InnoDB; +ALTER TABLE `kategoriak` ENGINE = InnoDB; + +IF NOT EXISTS (SELECT * FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() and TABLE_NAME='hirKategoria') THEN +CREATE TABLE `hirKategoria` ( + `hirId` int(10) unsigned NOT NULL, + `kategoriaId` mediumint(8) unsigned NOT NULL, + PRIMARY KEY (`hirId`,`kategoriaId`), + KEY `hirKategoria_FKIndex1` (`hirId`), + KEY `hirKategoria_FKIndex2` (`kategoriaId`), + CONSTRAINT `hirKategoria_ibfk_1` FOREIGN KEY (`hirId`) REFERENCES `hirek` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `hirKategoria_ibfk_2` FOREIGN KEY (`kategoriaId`) REFERENCES `kategoriak` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci ; +END IF; + +-- hirek.cid --> hirKategoria kapcsolo +INSERT IGNORE INTO hirKategoria SELECT hirek.id as hirId,hirek.cid AS kategoriaId from hirek where hirek.cid!=0; + +END $$ +DELIMITER ; +CALL upgrade_database_4693(); diff --git a/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php b/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php index c93a81bd..1c5c8bc9 100644 --- a/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php +++ b/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php @@ -13,7 +13,7 @@ $flag = intval($DATA['flag']); $class = intval($DATA['class']); $lang = (in_array($DATA['lang'],$LANGUAGES)) ? $DATA['lang'] : _DEFAULT_LANG; - if ($DATA['cid']>0) $cid = $DATA['cid']; + if ($DATA['cid']>0) $cid = $DATA['cid']; // -- TODO!!!! $csoport = $DATA['csoport']; if ($hirId!='' && __HIREKADMIN == false ) { $q = "SELECT owner FROM hirek WHERE owner='%s'"; @@ -41,6 +41,13 @@ } } else $q = ''; if ($q!='') $r = db_query($q,array('modul'=>'portal','result'=>'insert','values'=>$v)); + if (is_array($DATA['kategoriaId'])) { + for ($i=0; $i'portal','result'=>'insert','values'=>$v)); + } + } return $r; } diff --git a/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php b/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php index d7db431e..0de316b6 100644 --- a/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php +++ b/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php @@ -42,7 +42,7 @@ } else $WHERE = ''; if ($SET['all']===true) $WHERE = ''; - $q = "SELECT * FROM hirek $WHERE ORDER BY kdt DESC,vdt DESC".$L; + $q = "SELECT hirek.*, hirek.id AS hirId, GROUP_CONCAT(kategoriaId) AS hirkategoriak FROM hirek LEFT JOIN hirKategoria ON (hirek.id=hirId) $WHERE GROUP BY hirek.id ORDER BY kdt DESC,vdt DESC".$L; $HIREK['szovegek'] = db_query($q, array('modul'=>'portal','result'=>'indexed')); return $HIREK; } diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php index 0d5cbf71..ef18e58c 100644 --- a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php +++ b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php @@ -26,6 +26,7 @@ if (_RIGHTS_OK !== true) die(); $DATA['flag']= readVariable($_POST['flag'],'numeric',null); $DATA['class']= readVariable($_POST['class'],'numeric',null); $DATA['cid']= readVariable($_POST['cid'],'numeric',null); + $DATA['kategoriaId']= readVariable($_POST['kategoriaId'],'id',null); $DATA['lang'] = readVariable($_POST['lang'],'strictstring',$LANGUAGES); $DATA['owner'] = _USERACCOUNT; if (is_array($_POST['csoport'])) { diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin-pre.php b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin-pre.php index 630c9cbd..1e51b811 100644 --- a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin-pre.php +++ b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin-pre.php @@ -6,6 +6,39 @@ } require_once('include/modules/portal/share/hirek.php'); - $HIREK = getHirek(array('all'=>true)); // minden nyelvű hír + if ($action=='kategoriaSzerkeszt') { + $_id = readVariable($_POST['id'],'id'); + if (is_numeric($_id)) { + $_leiras = readVariable($_POST['leiras'],'string'); + $_precode = readVariable($_POST['precode'],'html'); + $_postcode = readVariable($_POST['postcode'],'html'); + $q = "INSERT INTO kategoriak (id,leiras,precode,postcode) VALUES (%u,'%s','%s','%s')"; + $v = array($_id,$_leiras,$_precode,$_postcode); + db_query($q,array('modul'=>'portal','values'=>$v)); + } + $KATEGORIAIDK = readVariable($_POST['kategoriaId'],'id'); + for ($i=0; $i'portal','values'=>$v)); + } + $KATEGORIAIDK = readVariable($_POST['kategoriaTorlendo'],'id'); + for ($i=0; $i'portal','values'=>$v)); + } + } + + + $ADAT = getHirek(array('all'=>true)); // minden nyelvű hír + $ADAT['kategoriak'] = getKategoriak(); + $ADAT['kategoriaId2txt'] = reindex($ADAT['kategoriak'],array('id')); +dump($ADAT['kategoriaId2txt']); ?> diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin.php b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin.php index 2474b23e..909018dc 100644 --- a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin.php +++ b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin.php @@ -1,5 +1,7 @@ diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/egyhir.css b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/egyhir.css index 8be4a7c3..1ea5cb6d 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/egyhir.css +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/egyhir.css @@ -3,40 +3,62 @@ div.egyhir { margin-left: 50px; + margin-right:50px; } div.egyhir form { font-weight: bold; + margin-bottom: 40px; + border-bottom: solid 1px #eee; } div.egyhir label { - + padding-right: 1em; } div.egyhir input { - background-color: white; +/* background-color: white; border: solid 1px #667766; - } +*/ } div.egyhir textarea { width: 80%; height: 300px; +/* border: solid 1px #667766; background-color: white; +*/ } table.egyhirdetail { background-color: #eeeeee; - border-bottom: solid 2px #667766; } table.egyhirdetail td { border: solid 1px #667766; + line-height: 2em; + padding: 0.4em; } table.egyhirdetail th { - background-color: #667766; + background-color: cornflowerblue; color: white; height:30px; - border-bottom: solid 2px #001100; } .mceEditor iframe { border: blue 1px solid; } + + #pic, #cim { line-height: 1.4em; margin-bottom:1em;} + +span.kategoriaSelector { border-radius: 4px; padding: 2px 4px; background-color: white; border: solid 1px black; font-weight:normal; +cursor: pointer; +-webkit-transition : 100ms ease-out; + -moz-transition : 100ms ease-out; + -o-transition : 100ms ease-out; + transition : 100ms ease-out; + } + +span.kategoriaSelector.selected { background-color: #d64161; color:white; } +span.kategoriaSelector.modified { background-color: #878f99; color:white; border-color:white; } +span.kategoriaSelector.selected.modified { background-color: #6b5b95; color:white; border-color: black;} +span.kategoriaSelector:hover { border: solid 1px #6b5b95; background-color: #ff7b25; color:white; } +span.kategoriaSelector.selected:hover { background-color: #878f99; color:white; } + diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/hirekAdmin.css b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/hirekAdmin.css index 9e05068d..347cd17f 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/hirekAdmin.css +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/hirekAdmin.css @@ -10,15 +10,24 @@ table.hAdmin { background-color: #445560; - + width:90%; } table.hAdmin tr td { - background-color: #eeeeee; + background-color: #eee; + padding: 2px 4px; + line-height: 1.6em; + } + table.hAdmin tr:hover td { + outline: solid 1px #d64161; + background-color: #fff; } + table.hAdmin tr td.latszik { + background-color: #d64161; color:white; + } table.hAdmin tr.unk td { - background-color: #993456; + background-color: #feb236; } table.hAdmin tr.old td { background-color: #999999; diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css index cc128d4f..5152e545 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css @@ -86,8 +86,10 @@ hr {display: none;} table.portalMain div.dobozTart a { color: black } - - + + div.static h1 { margin: 20px;} + div.static p { margin-left: 26px; margin-right:26px; margin-bottom: 1.2rem; font-size: 14px; line-height:1.6em;} + @media (max-width: 850px) { .bal, .jobb { display: none; diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml index b8e0f7ee..f24068ca 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml @@ -30,7 +30,10 @@ echo ''; echo '
'._BEALLITASOK.'
'; - echo ''; + echo ''; echo ''; - echo ''; echo ''; @@ -67,7 +83,6 @@ $_CHK = ($FLAGS[$i]==$HIR['flag']) ? ' checked="checked" ':''; echo ''; echo ''; @@ -124,8 +139,8 @@ echo "\n".''."\n"; echo '
'; - echo _KEP; - echo '
'; + echo _KEP.': '; + echo '
'; echo ''; echo ''; echo ''; diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml index 6dc5900d..1f55154a 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml @@ -1,27 +1,55 @@ '; + + for ($i=0; $i'; + echo ''; +// echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + } -/* - hideShowContainer - onClickHideShow - openable -*/ + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo '
'._BEALLITASOK.'
'; + echo _BEALLITASOK; + if ($HIR['owner']!='') echo ' ('.$HIR['owner'].')'; + echo '
'; echo _TOLDT.':
'; @@ -40,21 +43,34 @@ echo '		'; reset($LANGUAGES); - echo ''; + for($i=0; $i'; $_CHK = ($LANGUAGES[$i]==$HIR['lang']) ? ' selected="selected" ':''; echo ''; + } + echo ''; } - echo ''; - _putKategoriak($ADAT,$HIR['cid']); echo ''; - echo $HIR['owner']; + echo ''; + // ujfajta kategoria kezelés + $SELECTED_HIRKATEGORIAK = explode(',',$HIR['hirkategoriak']); + for ($i=0; $i'.$_D['leiras'].' '; + } + echo ''; + // ------------------------- echo '
'; + echo ''; + echo $D['id']; + echo ''.$D['leiras'].''.$D['precode'].''.$D['postcode'].'
'; + echo ''; + echo ''; + echo '
'; + formEnd(); + } + function putHirek($ADAT) { $CLASS = array(1=>'külső hír',2=>'kis hír',6=>'csak belső',0=>'ISMERETLEN'); $FLAGS = array(0=>'nem látszik', 1=>'látszik', 2=>2, 3=>3); $now = time(); - echo ''; - echo ''."\n"; - for ($i=0; $i'; + echo ''."\n"; + for ($i=0; $i'; - echo ''; + // echo ''; echo ''; echo ''; + echo ''; + echo ''; echo "\n\n"; diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/doboz.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/doboz.phtml index 7c903e27..8c8ded7b 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/doboz.phtml +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/doboz.phtml @@ -22,8 +22,9 @@ $bgcolor = ($SET['background-color']=='') ? '#eeeeee' : $SET['background-color'] ; $width = ($SET['width']=='') ? '100%':$SET['width']; if ($SET['header-link']!='') $cime = ''.$cime.''; + if (isset($SET['header-css']) && $SET['header-css']!='') $_style = $SET['header-css']; echo '
'; - echo '
'.$cime.'
'; + echo '
'.$cime.'
'; echo '
'.$bele.'
'; echo '
'; diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js b/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js index 0969c5c7..41d70923 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js @@ -10,4 +10,33 @@ $(function() { } }); + $('span.kategoriaSelector').click(function() { + $(this).toggleClass('selected'); + $(this).toggleClass('modified'); + $('#kategoriaSelectorContainer').html(''); + $('span.kategoriaSelector.selected').each(function() { + $('', { + type: 'hidden', + name: 'kategoriaId[]', + value: $(this).data('kategoriaid') + }).appendTo($('#kategoriaSelectorContainer')); + }); + }); + + +/* + myForm.on('submit', function(e) { + //e.preventDefault(); + $('span.kategoriaSelector.selected').each(function() { + $('', { + type: 'text', + name: 'kategoriaId[]', + value: $(this).data('kategoriaid') + }).appendTo(myForm); // append each input to the form + }); + + //myForm.submit(); // submit the form + }); +*/ + }); diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index 54f5b275..9bce5583 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4691 +4695 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index 052b0a58..39f0774c 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4691 -71107f2d0381381d16916e473db42dba mayor-fenntarto-rev4691.tgz -a80ee713915cb729bf44f9c831f3e74a mayor-installer-sulix-rev4691.tgz -a0777d620e206b07b6e3565864a58fec mayor-wiki-rev4691.tgz -a58f5bd16055fc5f168b39a70052de05 mayor-installer-rev4691.tgz -512a43eb1223ecec3b81ea1eda4c16f6 mayor-portal-rev4691.tgz -21a67636b6d1d0c2ca040d1210901aaf mayor-felveteli-rev4691.tgz -1d2ff3b0f71141f6e3c916c749eab426 mayor-jatek-rev4691.tgz -f5490a7abb4629401ac267ec0e23a9ac mayor-locales-jp_JP-rev4691.tgz -d9d56f15c55aaca9e5e6447455e8b593 mayor-locales-de_DE-rev4691.tgz -b03f1fa2e742a0d3245a1c1b719dbd6f mayor-locales-en_US-rev4691.tgz -5b7345dd3db4f2aa184d4440beb7bd5e mayor-naplo-rev4691.tgz -6b1cef87715c325d36a3d24e66378cbf mayor-base-rev4691.tgz +Revision 4695 +8006f6a2333f838cf1c3a4c464aed480 mayor-fenntarto-rev4695.tgz +0413e87eaa2472d46297b1b1e67964c9 mayor-installer-sulix-rev4695.tgz +7b1958ba242c788088f8e0fa8b19ac06 mayor-wiki-rev4695.tgz +ce7a02daded0bc1a5b9379455fe7d497 mayor-installer-rev4695.tgz +31a165054c79b9638a9d31cdaedb2f28 mayor-portal-rev4695.tgz +d4f27043abc3a93c21d8939bd1ecb2e5 mayor-felveteli-rev4695.tgz +93cab4f2a25ecae24063f2a189884046 mayor-jatek-rev4695.tgz +2d3becd23208144f80333ee7855359d3 mayor-locales-jp_JP-rev4695.tgz +9bd9f2a196265369cf9edc46c17adf51 mayor-locales-de_DE-rev4695.tgz +620f79072f95112bc578085c4bb0829b mayor-locales-en_US-rev4695.tgz +c869569cb053d07c3b3fc97f47c7a86e mayor-naplo-rev4695.tgz +79f3aac8fcfb484b28f30467c7056505 mayor-base-rev4695.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index 54f5b275..9bce5583 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4691 +4695 diff --git a/rev.txt b/rev.txt index 54f5b275..9bce5583 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4691 +4695 -- cgit v1.2.3 From 6096375432ff70c57cb832cd4fcbb031eeaa3765 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Wed, 6 Jan 2021 18:25:04 +0100 Subject: Rev: 4715 --- mayor-orig/mayor-base/log/mayor-base.rev | 2 +- .../include/backend/mysql/session/accountInfo.php | 6 ++--- .../www/include/backend/mysql/session/base.php | 2 +- .../backend/mysql/session/createAccount.php | 2 +- .../include/backend/mysql/session/createGroup.php | 4 ++-- .../backend/mysql/session/search/searchAccount.php | 8 +++---- mayor-orig/mayor-felveteli/log/mayor-felveteli.rev | 2 +- mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev | 2 +- .../mayor-installer-orig/log/mayor-installer.rev | 2 +- .../log/mayor-installer-sulix.rev | 2 +- mayor-orig/mayor-jatek/log/mayor-jatek.rev | 2 +- .../log/mayor-locales-de_DE.rev | 2 +- .../log/mayor-locales-en_US.rev | 2 +- .../log/mayor-locales-jp_JP.rev | 2 +- mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 +- mayor-orig/mayor-portal/log/mayor-portal.rev | 2 +- mayor-orig/mayor-wiki/log/mayor-wiki.rev | 2 +- mayor-orig/md5sum | 26 +++++++++++----------- mayor-orig/rev.txt | 2 +- rev.txt | 2 +- 20 files changed, 38 insertions(+), 38 deletions(-) (limited to 'mayor-orig/mayor-base/www') 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 -- cgit v1.2.3
'; - echo $D['lang']; - echo ''; + // echo $D['lang']; + // echo ''; echo ''; @@ -36,10 +64,20 @@ echo ' '.$D['csoport']; echo ''; - echo $D['owner']; + if ($D['hirkategoriak']!='') { + $_K = explode(',',$D['hirkategoriak']); + for($j=0; $j'; echo ''; + echo $D['owner']; + echo ''; echo $D['kdt']; + echo ''; echo $D['vdt']; echo '