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/log/mayor-base.rev | 2 +- .../www/include/backend/ads/session/base.php | 2 +- 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 +- .../policy/private/naplo/intezmeny/osztaly-pre.php | 15 ++++++++++++- .../www/policy/private/naplo/intezmeny/osztaly.php | 5 ++++- .../module-naplo/html/intezmeny/osztaly.phtml | 21 +++++++++++++++++ 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 +- 19 files changed, 67 insertions(+), 30 deletions(-) diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index 3c4089ce..e9f0a693 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4678 +4680 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-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index 3c4089ce..e9f0a693 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4678 +4680 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index 3c4089ce..e9f0a693 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4678 +4680 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index 3c4089ce..e9f0a693 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4678 +4680 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 3c4089ce..e9f0a693 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 @@ -4678 +4680 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index 3c4089ce..e9f0a693 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4678 +4680 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 3c4089ce..e9f0a693 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 @@ -4678 +4680 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 3c4089ce..e9f0a693 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 @@ -4678 +4680 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 3c4089ce..e9f0a693 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 @@ -4678 +4680 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 3c4089ce..e9f0a693 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4678 +4680 diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly-pre.php index 9222a0c8..62d0f384 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly-pre.php @@ -19,6 +19,7 @@ require_once('include/modules/naplo/share/tankorDiakModifier.php'); require_once('include/modules/naplo/share/hianyzasModifier.php'); require_once('include/modules/naplo/share/jegyModifier.php'); require_once('include/modules/naplo/share/jegy.php'); +require_once('include/modules/naplo/share/kereso.php'); require_once('include/share/net/upload.php'); define('FILE_UPLOAD_DIR',_DOWNLOADDIR.'/private/naplo/upload/'); @@ -116,7 +117,19 @@ if (isset($osztalyId)) { $ADAT['diakok'] = getDiakok(array('tanev' => $tanev)); } -if ($action == 'osztalyAdatModositas' && __NAPLOADMIN) { + +if ($action == 'oidEllenor' && __NAPLOADMIN===true) { + + // --TODO + $_re = str_replace(' ',"\n",str_replace('\r','\n',$_POST['oidtxt'])); + $oidxp = explode("\n",str_replace(' ',"\n",str_replace('\r','\n',$_POST['oidtxt']))); + $ADAT['oidtxt'] = $_re; + for($i=0; $i=$ADAT['tanev'])) { - + + putOsztalyAdatokForm($ADAT); if ($ADAT['osztalyJellegek'][ $ADAT['osztalyAdat']['osztalyJellegId'] ]['kovOsztalyJellegId'] != 0) { // NyEK évfolyam @@ -24,6 +25,8 @@ } putUjTagForm($ADAT); + if (__NAPLOADMIN ===true) putOidEllenor($ADAT); + if (__NAPLOADMIN) { if ($fileName == '') { putFileSelectForm('naplo_intezmeny:diak',array('osztalyId','tanev')); diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/osztaly.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/osztaly.phtml index b476482c..44af95fb 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/osztaly.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/osztaly.phtml @@ -423,5 +423,26 @@ function putOsztalyJellegek($ADAT,$osztalyJellegId) { } +function putOidEllenor($ADAT) { + + formBegin(array('class'=>'osztalyForm')); + echo ''; + echo ''; + echo ''; + + echo '

'._OIDELLENOR.'

'; + + var_dump($ADAT['oidCheck']); + + echo ''; + + echo '
'; + + formEnd(); + +} + ?> \ No newline at end of file diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index 3c4089ce..e9f0a693 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4678 +4680 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index 3c4089ce..e9f0a693 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4678 +4680 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index ceb87b49..a4b66494 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4678 -ae37f4627dc0b9d59b8f7d02f6a36567 mayor-fenntarto-rev4678.tgz -8701623ef3593718cdc4e916cb9beb45 mayor-installer-sulix-rev4678.tgz -67af2c56005638e1e987413d22429ac0 mayor-wiki-rev4678.tgz -2d9568b5e406bb195ad41b8a17616445 mayor-installer-rev4678.tgz -9cbef6c69c497940efaf9b32a7c9d542 mayor-portal-rev4678.tgz -b7e19d4216b5bab9f6e3d39f88b96eb4 mayor-felveteli-rev4678.tgz -2aece1e47be886e15341154afc3ef82f mayor-jatek-rev4678.tgz -0a1e9519b2c195ad2cfd53698e1edd83 mayor-locales-jp_JP-rev4678.tgz -17b9730d7e0766198c0f0d536fda000d mayor-locales-de_DE-rev4678.tgz -0a6684550a20f620b6e590feed384d68 mayor-locales-en_US-rev4678.tgz -417c3c4ec00fe453667175ed3b0dd435 mayor-naplo-rev4678.tgz -8f7e80787a56704f86db4101ad727229 mayor-base-rev4678.tgz +Revision 4680 +2adbe6892159370933630427685df89c mayor-fenntarto-rev4680.tgz +d12171381221c6da70355cac5edd40db mayor-installer-sulix-rev4680.tgz +a927f2c159b6967bbe164d62093eb29d mayor-wiki-rev4680.tgz +573f950dc80937ac4ef84925395124bc mayor-installer-rev4680.tgz +d8331f6f3fab928c0b63fd81f6d96c80 mayor-portal-rev4680.tgz +1922b6d82fd3442a2302f236db7762d2 mayor-felveteli-rev4680.tgz +eaf37db5261e944960739a8189c683d4 mayor-jatek-rev4680.tgz +75a0246fda3ebfcf818f2d37b2ee252c mayor-locales-jp_JP-rev4680.tgz +a2c562ba77ded498a38be164592d1cf9 mayor-locales-de_DE-rev4680.tgz +eb8c5997b1bf68d17e70684ed41ad2d0 mayor-locales-en_US-rev4680.tgz +4cd73545ae83ce4a2ec4ead62d793813 mayor-naplo-rev4680.tgz +4e0e32b4ec5359c77b50748e5a805de6 mayor-base-rev4680.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index 3c4089ce..e9f0a693 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4678 +4680 diff --git a/rev.txt b/rev.txt index 3c4089ce..e9f0a693 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4678 +4680 -- cgit v1.2.3