From 05cd10ac470512a35ac392856baabe8b0619add5 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Sun, 6 Sep 2020 12:06:53 +0200
Subject: Rev: 4678

---
 .../mayor-naplo/www/skin/classic/module-naplo/html/base.phtml     | 8 +++-----
 .../www/skin/classic/module-naplo/html/export/kretaOrarend.phtml  | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'mayor-orig/mayor-naplo/www/skin/classic')

diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/base.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/base.phtml
index cd9ec7cc..0c5f7937 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/base.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/base.phtml
@@ -3,7 +3,6 @@
     if (_RIGHTS_OK !== true) die();
 
     require_once('include/share/date/names.php');
-
     if (_RUNLEVEL!=='cron') putEszkozSor();
 
     function putUjIntezmeny() {
@@ -61,10 +60,11 @@
 	    if ($showHelp) echo '<span id="toolBarHelpButton" class="onClickHideShow">?</span>';
 	echo '</td>'."\n";
 	reset($TOOL); 
-	foreach ( $TOOL as $tool => $params ) {
 
+	foreach ( $TOOL as $tool => $params ) {
 //	    if ( function_exists( $func = "put$tool" ) && $params['tipus']=='cella') {
 	    if ( isset($params['tipus']) && $params['tipus']=='cella') {
+
 		if (isset($params['title'])) $title = '__'.$params['title'];
 		else $title = '__'.nagybetus($tool).'TITLE';
 
@@ -274,9 +274,8 @@
     }
 
     function putForrasSelect() {
-
 	global $TOOL;
-	putToolFormStart('forrasSelect');
+	putToolFormStart('forrasSelect','forras');
 	    echo '<select name="'.$TOOL['forrasSelect']['paramName'].'" class="onChangeSubmit">';
 		echo '<option value=""> - </option>'."\n";
 		$SEL = array($TOOL['forrasSelect']['paramValue'] => ' selected="selected" ');
@@ -285,7 +284,6 @@
 		}
 	    echo '</select>';
 	putToolFormStop();
-
     }
 
     function putIntezmenySelect() {
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/export/kretaOrarend.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/export/kretaOrarend.phtml
index 7ffeccad..c1d40d25 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/export/kretaOrarend.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/export/kretaOrarend.phtml
@@ -4,6 +4,7 @@
 
         formBegin(array('action'=>href('index.php?page=naplo&sub=export&f=kretaOrarend'), 'class'=>"export"));
         echo '<input type="hidden" name="action" value="kretaOrarendExport" />'."\n";
+	echo '<input type="hidden" name="dt" value="'.$ADAT['dt'].'" />'."\n";
 
         echo '<fieldset><legend>Kréta - Órarend export</legend>'."\n";
         echo '<table>'."\n";
-- 
cgit v1.2.3


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(-)

(limited to 'mayor-orig/mayor-naplo/www/skin/classic')

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<count($oidxp); $i++) {
+	$_oid = $oidxp[$i];
+        $ADAT['oidCheck'][$_oid] = getDiakokByPattern($_oid);
+    }
+
+} elseif ($action == 'osztalyAdatModositas' && __NAPLOADMIN) {
 
 	$leiras = readVariable($_POST['leiras'], 'string');
 	$ofoTanarId = readVariable($_POST['ofoTanarId'], 'id');
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly.php
index 20ca97a5..a1c51b8c 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly.php
@@ -12,7 +12,8 @@
 
 	// Osztályhoz rendelés
 	if (isset($ADAT['osztalyId']) && ($ADAT['osztalyAdat']["kezdoTanev"]<=$ADAT['tanev'] && $ADAT['osztalyAdat']["vegzoTanev"]>=$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 '<input type="hidden" name="action" value="oidEllenor" />';
+	echo '<input type="hidden" name="osztalyId" value="'.$ADAT['osztalyId'].'" />';
+	echo '<input type="hidden" name="osztalyId" value="'.$ADAT['osztalyId'].'" />';
+
+	echo '<h1>'._OIDELLENOR.'</h1>';
+	
+	var_dump($ADAT['oidCheck']);
+
+	echo '<textarea name="oidtxt" rows="10">';
+	    echo $ADAT['oidtxt'];
+	echo '</textarea>';
+
+	echo '<br/><input type="submit" value="'._OK.'" />';
+
+	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


From dc2b3d12c866d02833def3704cbb0725e04ca7a1 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Thu, 10 Sep 2020 13:45:03 +0200
Subject: Rev: 4681

---
 mayor-orig/mayor-base/log/mayor-base.rev           |  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 |  2 +-
 .../module-naplo/html/intezmeny/osztaly.phtml      | 22 ++++++++++++++++--
 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 +-
 17 files changed, 48 insertions(+), 30 deletions(-)

(limited to 'mayor-orig/mayor-naplo/www/skin/classic')

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index e9f0a693..ee67738f 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4680
+4681
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index e9f0a693..ee67738f 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4680
+4681
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index e9f0a693..ee67738f 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4680
+4681
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index e9f0a693..ee67738f 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4680
+4681
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 e9f0a693..ee67738f 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 @@
-4680
+4681
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index e9f0a693..ee67738f 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4680
+4681
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 e9f0a693..ee67738f 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 @@
-4680
+4681
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 e9f0a693..ee67738f 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 @@
-4680
+4681
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 e9f0a693..ee67738f 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 @@
-4680
+4681
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index e9f0a693..ee67738f 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4680
+4681
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 62d0f384..0acd5f0f 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
@@ -125,7 +125,7 @@ if ($action == 'oidEllenor' && __NAPLOADMIN===true) {
     $oidxp = explode("\n",str_replace(' ',"\n",str_replace('\r','\n',$_POST['oidtxt'])));
     $ADAT['oidtxt'] = $_re;
     for($i=0; $i<count($oidxp); $i++) {
-	$_oid = $oidxp[$i];
+	$_oid = trim($oidxp[$i]);
         $ADAT['oidCheck'][$_oid] = getDiakokByPattern($_oid);
     }
 
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 44af95fb..01a9b0d8 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
@@ -432,8 +432,26 @@ function putOidEllenor($ADAT) {
 
 	echo '<h1>'._OIDELLENOR.'</h1>';
 	
-	var_dump($ADAT['oidCheck']);
-
+	if (is_array($ADAT['oidCheck'])) {
+	    echo '<table>';
+	    foreach($ADAT['oidCheck'] as $oId=>$DA) {
+	      for ($i=0; $i<count($DA); $i++) {
+		$D = $DA[$i];
+		echo '<tr>';
+		echo '<td>'.$oId.'</td>';
+		echo '<td class="diakAdat diakNev" data-diakid="'.$D['diakId'].'">'.$D['diakId'].'</td>';
+		echo '<td class="diakAdat diakNev" data-diakid="'.$D['diakId'].'">'.$D['diakNev'].'</td>';
+		echo '<td>'.$D['oId'].'</td>';
+		echo '<td>';
+		    if ($ADAT['osztalyAdat']['osztalyJel']!=$D['osztalyJel']) {echo '!!!!!!!';}
+		    //echo '72455076207';
+		    echo $D['osztalyJel'];
+		echo '</td>';
+		echo '</tr>';
+	      }
+	    }
+	    echo '</table>';
+	}
 	echo '<textarea name="oidtxt" rows="10">';
 	    echo $ADAT['oidtxt'];
 	echo '</textarea>';
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index e9f0a693..ee67738f 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4680
+4681
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index e9f0a693..ee67738f 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4680
+4681
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index a4b66494..7c9ee0ee 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-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
+Revision 4681
+15c2a2e023f8d05716b1baed93973bdc  mayor-fenntarto-rev4681.tgz
+46aa3cf4b5efa5ee0ca4cf78d8cc1eaf  mayor-installer-sulix-rev4681.tgz
+a014e0b2366869b03f60954498f55e63  mayor-wiki-rev4681.tgz
+754361c37b37ae4cc9cf9e6f8d647c7d  mayor-installer-rev4681.tgz
+4d879e5cf7746acd5f12d84bee8717a8  mayor-portal-rev4681.tgz
+393e2c0e36081ba94e8b547b6ed03a7c  mayor-felveteli-rev4681.tgz
+8b4e6e23d43ffba1a2e351200a03fd47  mayor-jatek-rev4681.tgz
+b42789275534e1b605ce8611fef58534  mayor-locales-jp_JP-rev4681.tgz
+af3e34234540ba2adddd58bb844e8baa  mayor-locales-de_DE-rev4681.tgz
+77483820d31eab179c30146544683ccf  mayor-locales-en_US-rev4681.tgz
+76f0f3df73e4fc536bd2075e5ecfb5d7  mayor-naplo-rev4681.tgz
+456ef5dcce3b8420acceff4170d38ff7  mayor-base-rev4681.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index e9f0a693..ee67738f 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4680
+4681
diff --git a/rev.txt b/rev.txt
index e9f0a693..ee67738f 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4680
+4681
-- 
cgit v1.2.3


From 5d168373f8d3de040dd0f696f2f783958b1304de Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Thu, 19 Nov 2020 14:20:03 +0100
Subject: Rev: 4710

---
 mayor-orig/mayor-base/log/mayor-base.rev           |  2 +-
 mayor-orig/mayor-felveteli/log/mayor-felveteli.rev |  2 +-
 .../www/static/hu_HU/felveteli/felveteli.html      |  6 ++---
 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 +-
 .../include/modules/naplo/share/oraModifier.php    |  5 +++--
 .../www/include/modules/naplo/share/tanar.php      |  6 +++--
 .../policy/private/naplo/intezmeny/valtas-pre.php  |  2 ++
 .../module-naplo/html/intezmeny/valtas.phtml       | 15 ++++++++++++-
 mayor-orig/mayor-portal/log/mayor-portal.rev       |  2 +-
 .../www/include/modules/portal/hirek/egyhir.php    |  3 +++
 .../www/include/modules/portal/share/hirek.php     |  4 +++-
 .../policy/private/portal/portal/portal-pre.php    |  8 ++++++-
 .../www/policy/public/portal/portal/portal-pre.php |  9 +++++++-
 .../www/skin/classic/module-portal/css/portal.css  |  9 +++++++-
 .../classic/module-portal/html/hirek/egyhir.phtml  |  2 +-
 .../module-portal/html/hirek/hirekAdmin.phtml      |  2 +-
 .../classic/module-portal/html/share/hirek.phtml   | 18 ++++++++++++++-
 .../module-portal/javascript/portal.jquery.min.js  |  9 ++++++++
 mayor-orig/mayor-wiki/log/mayor-wiki.rev           |  2 +-
 mayor-orig/md5sum                                  | 26 +++++++++++-----------
 mayor-orig/rev.txt                                 |  2 +-
 rev.txt                                            |  2 +-
 29 files changed, 110 insertions(+), 42 deletions(-)

(limited to 'mayor-orig/mayor-naplo/www/skin/classic')

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index 9bce5583..de4ba040 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4695
+4710
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 9bce5583..de4ba040 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4695
+4710
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 d8acbde8..4d68ac34 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
@@ -3,8 +3,8 @@
 <h2>2021/2022-es tanév</h2>
 
 <div style="margin-top: 6px; text-align:center;">
-  <a style="font-weight: bold; font-size: 16px; color: #837389;" href="/vmg/felveteli/FT2021.pdf">
-    Felvételi Tájékoztató 2021/2022 [PDF]
+  <a style="font-weight: bold; font-size: 16px; color: #837389;" href="/vmg/felveteli/FT2021b.pdf" title="Fissítve: 2020. november 9.">
+    Felvételi Tájékoztató 2021/2022 (.pdf)
   </a>
 </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index 9bce5583..de4ba040 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4695
+4710
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 9bce5583..de4ba040 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4695
+4710
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 9bce5583..de4ba040 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 @@
-4695
+4710
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index 9bce5583..de4ba040 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4695
+4710
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 9bce5583..de4ba040 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 @@
-4695
+4710
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 9bce5583..de4ba040 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 @@
-4695
+4710
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 9bce5583..de4ba040 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 @@
-4695
+4710
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 9bce5583..de4ba040 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4695
+4710
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php
index 625b6b13..031ad51e 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php
@@ -36,8 +36,9 @@
 	return ($_TANEV['szemeszter'][1]['statusz'] == 'aktív') // Csak aktív szemeszterbe írhatunk
                 && (
                     ((__VEZETOSEG || __NAPLOADMIN) && $Feladat && $haladasiOraAdat['eredet']=='órarend')
-                    || $time <= time()
-                )       // A jövőbeli órák nem írhatók be, kivéve, ha az előírt tanári feladat (pl versenyfelügyelet)!
+                    || $time <= time()  // A jövőbeli órák nem írhatók be, kivéve, ha az előírt tanári feladat (pl versenyfelügyelet)!
+		    || $time >= time()   // Pandemic Release
+                )       
                 && (
                     // Az admin bármikor módosíthat - de csak vezetői utasításra teszi!
                     __NAPLOADMIN
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 5e23e4ec..0a931863 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
@@ -66,9 +66,11 @@
 	} elseif ($SET['mkId'] == '') {
 	    if (count($where) > 0) $W = 'WHERE ' . implode(' AND ',$where);
 	    $q = "SELECT tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev, statusz,
-		    hetiKotelezoOraszam,hetiLekotottMinOraszam,hetiLekotottMaxOraszam,hetiKotottMaxOraszam,hetiMunkaora
+		    hetiKotelezoOraszam,hetiLekotottMinOraszam,hetiLekotottMaxOraszam,hetiKotottMaxOraszam,hetiMunkaora 
 			$extraAttrs
-		FROM ".__INTEZMENYDBNEV.".tanar $W ORDER BY CONCAT_WS(' ', ViseltCsaladiNev, viseltUtoNev)";
+		FROM ".__INTEZMENYDBNEV.".tanar 
+--		LEFT JOIN ".__INTEZMENYDBNEV.".tanarKepesites USING (tanarId) LEFT JOIN ".__INTEZMENYDBNEV.".kepesitesTargy USING (kepesitesId)
+		$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,
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/valtas-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/valtas-pre.php
index 8c0d870c..fb04a3ca 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/valtas-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/valtas-pre.php
@@ -5,6 +5,7 @@
     require_once('include/modules/naplo/share/intezmenyek.php');
     require_once('include/modules/naplo/share/szemeszter.php');
     require_once('include/modules/naplo/share/tanar.php');
+    require_once('include/modules/naplo/share/targy.php');
     require_once('include/modules/naplo/share/osztaly.php');
     require_once('include/modules/naplo/share/munkakozosseg.php');
 
@@ -40,6 +41,7 @@
 	}
     }
     $ADAT['tanarok'] = getTanarok(array('extraAttrs'=>'titulus,statusz,besorolas','telephelyId'=>__TELEPHELYID));
+    $ADAT['targyak'] = getTargyak(array('arraymap'=>array('targyId')));
     $lr = db_connect('naplo_intezmeny');
     for($i=0; $i<count($ADAT['tanarok']); $i++) {
 	$_tanarId = $ADAT['tanarok'][$i]['tanarId'];
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml
index 756ec408..6811b588 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml
@@ -13,7 +13,7 @@ function putTanarLista($ADAT) {
 	    if ($T['titulus']!='') echo '<div class="titulus">'.$T['titulus'].'</div>';
 	    if ($T['statusz']=='külső óraadó') echo '<div class="titulus">'.$T['statusz'].'</div>';
 	    if ($T['besorolas']=='Gyakornok') echo '<div class="titulus">'.kisbetus($T['besorolas']).'</div>';
-//	    if ($T['besorolas']=='Mesterpedagógus') echo '<div class="titulus">'.kisbetus($T['besorolas']).'</div>';
+	    if ($T['besorolas']=='Mesterpedagógus') echo '<div class="titulus">'.kisbetus($T['besorolas']).'</div>';
 
 	    $osztalyai = ($ADAT['tanarOsztaly'][$T['tanarId']]);
 	    for ($j=0; $j<count($osztalyai); $j++) {
@@ -28,6 +28,19 @@ function putTanarLista($ADAT) {
 		    echo $munkakozossegei[$j]['munkakozossegNev']. ' munkaközösség-vezető';
 		echo '</div>';
 	    }
+
+/*
+	    $targyai = explode(',',$T['kepesitesTargyIdk']);
+	    if (count($targyai)>0) {
+		echo '<div class="" style="color:#aaa; font-size:smaller">';
+		for ($j=0; $j<count($targyai); $j++) {
+		    $_targyId = $targyai[$j];
+		    echo ' '.$ADAT['targyak'][$_targyId][0]['targyNev'].' ';
+		}
+		echo '</div>';
+	    }
+*/
+
 	echo '</td>';
 	if (($i+1) % 3 == 0 && $i!=count($ADAT['tanarok'])-1) echo '</tr><tr>';
     }
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 9bce5583..de4ba040 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4695
+4710
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 1c5c8bc9..652c18ae 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
@@ -41,6 +41,9 @@
 	    }
 	} else $q = '';
 	if ($q!='') $r = db_query($q,array('modul'=>'portal','result'=>'insert','values'=>$v));
+	$q = "DELETE FROM `hirKategoria` WHERE hirId=%u";
+	$v = array($hirId);
+	db_query($q,array('modul'=>'portal','result'=>'delete','values'=>$v));
 	if (is_array($DATA['kategoriaId'])) {
 	    for ($i=0; $i<count($DATA['kategoriaId']); $i++) {
 		$q = "INSERT IGNORE INTO `hirKategoria` (hirId,kategoriaId) VALUES (%u,%u)";
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 0de316b6..7b59782a 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
@@ -13,7 +13,7 @@
 	return $r;
     }
 
-    function getHirek($SET = array('all'=>true,'tolDt'=>'', 'igDt'=>'', 'id' => '', 'flag'=>array(), 'class'=>array(), 'cid'=>array(), 'limit'=>'', 'lang'=>'hu_HU') ) {
+    function getHirek($SET = array('all'=>true,'tolDt'=>'', 'igDt'=>'', 'id' => '', 'flag'=>array(), 'class'=>array(), 'cid'=>array(), 'limit'=>'', 'lang'=>'hu_HU', 'kategoria'=>array()) ) {
 
 	$tolDt = $SET['tolDt']; $igDt = $SET['igDt'];
 	if ($tolDt!='') $W[] = "kdt<='$tolDt'";
@@ -21,6 +21,8 @@
 	if (count($SET['flag'])>0) $W[] = "flag IN (".implode(',',$SET['flag']).")";
 	if (count($SET['class'])>0) $W[] = "class IN (".implode(',',$SET['class']).")";
 	if (count($SET['cid'])>0) $W[] = "cid IN (".implode(',',$SET['cid']).")";
+	if (is_array($SET['kategoria']) && count($SET['kategoria'])>0 && !is_null($SET['kategoria'][0])) 
+	    $W[] = "kategoriaId IN (".implode(',',$SET['kategoria']).")";
 	if ($SET['lang']!='')  $W[] = "lang='".$SET['lang']."'";
 
 	if ($SET['limit']!='') $L = ' LIMIT '.$SET['limit'];
diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal-pre.php b/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal-pre.php
index dc4e79d5..d8026e35 100644
--- a/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal-pre.php
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal-pre.php
@@ -5,7 +5,13 @@
     require_once('include/modules/portal/share/kerdoiv.php');
     require_once('include/modules/session/groupInfo.php');
 
-    $ADAT['hirek'] = getHirek(array('cid'=>array(0),'tolDt'=>date('Y-m-d H:i:s'), 'igDt'=>date('Y-m-d H:i:s'),'flag'=>array(1),'class'=>array(1,6),'csoport'=>$AUTH['my']['categories']));
+    $ADAT['kategoriak'] = getKategoriak();
+    for ($i=0; $i<count($ADAT['kategoriak']); $i++) {
+        $RESTRICTKATEGORIA[] = intval($ADAT['kategoriak'][$i]['id']);
+    }
+    $kategoriaId = readVariable($_GET['kategoriaId'],'id',null,$RESTRICTKATEGORIA);
+    $ADAT['kategoriaId'] = $kategoriaId;
+    $ADAT['hirek'] = getHirek(array('kategoria'=>array($kategoriaId),'cid'=>array(0),'tolDt'=>date('Y-m-d H:i:s'), 'igDt'=>date('Y-m-d H:i:s'),'flag'=>array(1),'class'=>array(1,6),'csoport'=>$AUTH['my']['categories']));
     $ADAT['kerdoiv'] = getKerdoiv(_POLICY);
 
     $ev=date('Y');$honap=date('m');$nap=date('d');
diff --git a/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal-pre.php b/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal-pre.php
index d02f5484..44906949 100644
--- a/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal-pre.php
+++ b/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal-pre.php
@@ -14,7 +14,14 @@
 //    $ADAT['nevnap']['ma'] = getNevnap(date('m'),date('d'));
 //    $ADAT['nevnap']['holnap'] = getNevnap(date('m'),date('d')+1);
 
-    $FILTER=array('tolDt'=>date('Y-m-d H:i:s'), 'igDt'=>date('Y-m-d H:i:s'),'flag'=>array(1),'class'=>array(1));
+    $ADAT['kategoriak'] = getKategoriak();
+    for ($i=0; $i<count($ADAT['kategoriak']); $i++) {
+        $RESTRICTKATEGORIA[] = intval($ADAT['kategoriak'][$i]['id']);
+    }
+    $kategoriaId = readVariable($_GET['kategoriaId'],'id',null,$RESTRICTKATEGORIA);
+    $ADAT['kategoriaId'] = $kategoriaId;
+
+    $FILTER=array('tolDt'=>date('Y-m-d H:i:s'), 'igDt'=>date('Y-m-d H:i:s'),'flag'=>array(1),'class'=>array(1),'kategoria'=>array($kategoriaId));
     if (defined('__PORTAL_RESTRICT_CID')) 
 	$FILTER['cid'] = explode(',',__PORTAL_RESTRICT_CID);
 
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 5152e545..9ea85cbc 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
@@ -68,6 +68,13 @@
 
     div.egyHir span.tag { background-color: #bbb; padding: 0px 4px; margin: 0px 2px; border-radius:2px; color:white;}
 
+    div.egyHirmeta a { color: #aaa; border-bottom: dotted 1px #bbb}
+    div.egyHirmeta a:hover { color: #444; border-bottom: solid 1px #bbb}
+
+    h2.hirKategoriaSelected { text-align: center; padding-left:22px; padding-right:22px; color: #7d96a0 ; text-decoration: underline solid #eee; font-weight:100; letter-spacing:2px; font-size: 24px; font-variant:small-caps}
+    h2.hirKategoriaSelected a  { display:none; color: #d64161; padding-left: 6px; font-size:14px;}
+    h2.hirKategoriaSelected:hover { padding-right:0px;}
+    h2.hirKategoriaSelected:hover a { display: inline-block;}
 
 div.egyHir:after {
   clear: both;
@@ -87,7 +94,7 @@ hr {display: none;}
     table.portalMain div.dobozTart a { color: black }
 
     
-    div.static h1 { margin: 20px;}
+    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) {
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 f24068ca..e3a31005 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
@@ -57,7 +57,7 @@
 			}
 			echo '</select>';
 		    }
-		    _putKategoriak($ADAT,$HIR['cid']);
+		    // _putKategoriak($ADAT,$HIR['cid']);
 
 	    	echo '</td>';
 		echo '<td style="line-height:2em; max-width: 300px">';
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 1f55154a..a995e638 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
@@ -40,7 +40,7 @@
 	$FLAGS = array(0=>'nem látszik', 1=>'látszik', 2=>2, 3=>3);
 	$now = time();
 	echo '<table class="hAdmin hideShowContainer" align="center" cellspacing="1">';
-	echo '<tr><td colspan="7"><button type="button" class="onClickHideShow">Mindent mutass!</button></td></tr>'."\n";
+	echo '<tr><th colspan="7"><button type="button" class="onClickHideShow"> + Mindent mutass! + </button></th></tr>'."\n";
 	for ($i=0; $i<count($ADAT['szovegek']); $i++) {
 	    $D = $ADAT['szovegek'][$i];
 	    if ($D['class']==0) $_class='class="unk"'; else 
diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/hirek.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/hirek.phtml
index 37812ac0..5a1c26b5 100644
--- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/hirek.phtml
+++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/hirek.phtml
@@ -9,6 +9,16 @@
 	    }
 
 	} else {
+
+	  $KATEGORIAID2LEIRAS = (reindex($ADAT['kategoriak'],array('id')));
+
+	  if ($ADAT['kategoriaId']>0 && $KATEGORIAID2LEIRAS[$ADAT['kategoriaId']][0]['leiras']!='') {
+		echo '<h2 class="hirKategoriaSelected">';
+		    echo ucfirst($KATEGORIAID2LEIRAS[$ADAT['kategoriaId']][0]['leiras']);
+		    echo '<a href="'.href('index.php?page=portal&f=portal&sub=portal').'" class="icon-remove-sign"></a>';
+		echo '</h2>';
+	  }
+
 	  for ($i=0; $i<count($ADAT['hirek']['szovegek']); $i++) {
 
 	    $D = $ADAT['hirek']['szovegek'][$i];
@@ -34,7 +44,13 @@
 			for ($j=0; $j<count($CSOPORT); $j++) echo '<span class="tag">'.$CSOPORT[$j].'</span>';
 			//echo '</span>';
 		    }
-
+		    if ($D['hirkategoriak']!='') {
+			$D['kategoriaIdk'] = explode(',',$D['hirkategoriak']);
+			for ($j=0; $j<count($D['kategoriaIdk']); $j++ ) {
+			    echo ' · ';
+			    echo '<a href="'.href('index.php?page=portal&sub=portal&f=portal&kategoriaId='.$D['kategoriaIdk'][$j]).'" class="hirkategoriaLeiras">'.$KATEGORIAID2LEIRAS[$D['kategoriaIdk'][$j]][0]['leiras'].'</a>';
+			}
+		    }
 		echo '</div>';
 	    }
 	    echo '<div class="hir">';
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 41d70923..55364674 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
@@ -23,6 +23,15 @@ $(function() {
 	});
     });
 
+	$('#kategoriaSelectorContainer').html('');
+       $('span.kategoriaSelector.selected').each(function() {
+       $('<input />', { 
+           type: 'hidden', 
+           name: 'kategoriaId[]', 
+           value: $(this).data('kategoriaid')
+       }).appendTo($('#kategoriaSelectorContainer')); 
+	});
+
 
 /*
    myForm.on('submit', function(e) {
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index 9bce5583..de4ba040 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4695
+4710
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 39f0774c..c59d4b06 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-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
+Revision 4710
+cb8cda74ec914985cfc33eeb1c0f600b  mayor-fenntarto-rev4710.tgz
+fce4128a082128b51ccd3c1f7da49d16  mayor-installer-sulix-rev4710.tgz
+57cf545c827177cc44b1b976799235e0  mayor-wiki-rev4710.tgz
+6093ef06efd2db548e5e6478e277df76  mayor-installer-rev4710.tgz
+6020d68cd542a943247ae84e62f82271  mayor-portal-rev4710.tgz
+bfeaeacfbb2e08af566791a15d22e94f  mayor-felveteli-rev4710.tgz
+92806a3648b8ae4d97cf4931539bc2ac  mayor-jatek-rev4710.tgz
+77ecb781efc6202022fbc0c88c339944  mayor-locales-jp_JP-rev4710.tgz
+52e12bcaca7f74a4be364bc52babfd3c  mayor-locales-de_DE-rev4710.tgz
+91ef318a14aed435ef505255cefde6d0  mayor-locales-en_US-rev4710.tgz
+b54133612c87fd2c3de6094485296e19  mayor-naplo-rev4710.tgz
+1386d084c17d51d0fd101f37c37b02bd  mayor-base-rev4710.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index 9bce5583..de4ba040 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4695
+4710
diff --git a/rev.txt b/rev.txt
index 9bce5583..de4ba040 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4695
+4710
-- 
cgit v1.2.3


From eba77eabc9b033ef3b904eec7737bc997db37596 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Wed, 25 Nov 2020 13:30:04 +0100
Subject: Rev: 4712

---
 mayor-orig/mayor-base/log/mayor-base.rev           |  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 +-
 .../private/naplo/haladasi/hazifeladat-pre.php     |  3 ++-
 .../policy/private/naplo/tools/getOraAdat-pre.php  |  4 +++-
 .../www/skin/classic/module-naplo/css/naplo.css    |  7 ++++++
 .../module-naplo/html/haladasi/hazifeladat.phtml   |  6 ++++-
 .../install/mayor-portal/mysql/mayor-portal.sql    |  2 +-
 mayor-orig/mayor-portal/log/mayor-portal.rev       |  2 +-
 .../update/rev004710-1-mayor_portal.sql            | 12 ++++++++++
 mayor-orig/mayor-wiki/log/mayor-wiki.rev           |  2 +-
 mayor-orig/md5sum                                  | 26 +++++++++++-----------
 mayor-orig/rev.txt                                 |  2 +-
 rev.txt                                            |  2 +-
 21 files changed, 57 insertions(+), 31 deletions(-)
 create mode 100644 mayor-orig/mayor-portal/update/rev004710-1-mayor_portal.sql

(limited to 'mayor-orig/mayor-naplo/www/skin/classic')

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index de4ba040..acbf96c3 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4710
+4712
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index de4ba040..acbf96c3 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4710
+4712
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index de4ba040..acbf96c3 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4710
+4712
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index de4ba040..acbf96c3 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4710
+4712
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 de4ba040..acbf96c3 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 @@
-4710
+4712
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index de4ba040..acbf96c3 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4710
+4712
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 de4ba040..acbf96c3 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 @@
-4710
+4712
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 de4ba040..acbf96c3 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 @@
-4710
+4712
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 de4ba040..acbf96c3 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 @@
-4710
+4712
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index de4ba040..acbf96c3 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4710
+4712
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php
index 86ca57a0..a973e454 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php
@@ -80,7 +80,8 @@
 	}
 	if ($oraId>0 && $ADAT['oraAdat']['oraBeirhato']===true ) {
 	    $leiras = readVariable($_POST['oraLeiras'],'string');
-	    updateHaladasiNaploOra($oraId, $leiras);
+	    $cimkeId = readVariable($_POST['cimkeId'],'string');
+	    updateHaladasiNaploOra($oraId, $leiras, $cimkeId);
 	}
     } elseif (__TANAR===true && $action=='lattam') {
 	$lr = db_connect('naplo');
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php
index 064bc796..308e7b4f 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php
@@ -25,7 +25,8 @@
 	$dolgozatBeirhato = $oraBeirhato;
 	if ($oraBeirhato===true && $action=='oraBeiras') {
 	    $leiras = readVariable($_POST['leiras'], 'string');
-	    updateHaladasiNaploOra($oraId,$leiras);
+	    $cimkeId = readVariable($_POST['cimkeId'], 'id');
+	    updateHaladasiNaploOra($oraId,$leiras,$cimkeId);
 	}
 	$_JSON['oraAdat'] = $ORAADAT = getOraAdatById($oraId);
 	if ($ORAADAT['hazifeladatId']>0) {
@@ -56,6 +57,7 @@
 	        <input class="mayorToken" type="hidden" name="mayorToken" value="'.$_SESSION['mayorToken'].'" />
 	        <input type="hidden" name="action" value="oraBeiras" />
 	        <input type="hidden" name="oraId" value="'.$oraId.'" />
+	        <input type="hidden" name="cimkeId" value="'.$_JSON['oraAdat']['cimkeId'].'" />
 	        <textarea name="leiras" style="margin-top:8px; width:99%; height:100px;">'. supertext($_JSON['oraAdat']['leiras']).'</textarea>';
 	    $oraForm .= '<button type="button" class="setOraAdat mentes" value="mentés" data-oraid="'.$oraId.'"><span class="icon-ok"></span> MENTÉS </button>';
 	    $oraForm .= '</form>';
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css
index f12a5b14..c88905c2 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css
@@ -251,6 +251,13 @@
     div.arckepContainer.szulo span {background-color: #40e0d0; }
     div.arckepContainer.diak span {background-color: #6495ed; }
 
+    span.cimke { margin:0px 1px; border-radius: 2px; font-size:xx-small; color:white; padding: 0px 2px 0px 2px;  background-color:#ddd; }
+    span.cimke_0 { background-color: #4caf50; }
+    span.cimke_1 { background-color: red; }
+    span.cimke_2 { background-color: orange; }
+    span.cimke_3 { background-color: #3f51b5; }
+    span.cimke_4 { background-color: #673ab7; }
+
 @media (max-width: 764px) {
 
     #toolBarTitle {display:;}
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
index 419fbc49..dd9c3687 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
@@ -8,8 +8,11 @@
 	    echo ($ADAT['oraAdat']['dt']).' ('.$ADAT['oraAdat']['dt'].'), '.$ADAT['oraAdat']['ora'].'. '._ORA;
 	    echo '</span>';
 	    echo ' – <span class="tankorNev tankorAdat" data-tankorid="'.$ADAT['oraAdat']['tankorId'].'">'.$ADAT['oraAdat']['tankorNev'].'</span>';
+	    if ($ADAT['oraAdat']['cimkeLeiras']!='') {
+		echo ' – '.'<span class="cimke cimke_'.(intval($ADAT['oraAdat']['cimkeId'])%5).'">'.$ADAT['oraAdat']['cimkeLeiras'].'</span>';
+	    }
 	    echo ' – <span class="tanarNev" data-tanarid="'.$ADAT['oraAdat']['ki'].'">'.$ADAT['oraAdat']['kiCn'].'</span>';
-	    // echo '<p>'.$ADAT['oraAdat']['leiras'].'</p>';
+
 
 	echo '</fieldset>'."\n";
 
@@ -124,6 +127,7 @@ echo '<style type="text/css">
 	    if ($skin != 'ajax') formBegin(array('class'=>'hazifeladat'));
 	    echo '<input type="hidden" name="action" value="hazifeladatBeiras"/>';
 	    echo '<input type="hidden" name="oraId" value="'.$ADAT['oraAdat']['oraId'].'"/>';
+	    echo '<input type="hidden" name="cimkeId" value="'.$ADAT['oraAdat']['cimkeId'].'"/>';
 	    echo '<input type="hidden" name="hazifeladatId" value="'.$ADAT['hazifeladatId'].'"/>';
 
 	    echo '<fieldset class="adatok"><legend>'.ucfirst(_TANANYAG).'</legend>'."\n";
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 61655882..f53e34a7 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
@@ -41,7 +41,7 @@ CREATE TABLE `hirek` (
   `lang` varchar(5) default 'hu_HU',
   `cim` text,
   `txt` text,
-  `owner` varchar(10) default NULL,
+  `owner` varchar(255) default NULL,
   `flag` tinyint(3) unsigned NOT NULL default '0',
   `cid` tinyint(3) unsigned NOT NULL default '0',
   `pic` varchar(20) default NULL,
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index de4ba040..acbf96c3 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4710
+4712
diff --git a/mayor-orig/mayor-portal/update/rev004710-1-mayor_portal.sql b/mayor-orig/mayor-portal/update/rev004710-1-mayor_portal.sql
new file mode 100644
index 00000000..5ac98672
--- /dev/null
+++ b/mayor-orig/mayor-portal/update/rev004710-1-mayor_portal.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_4710 $$
+
+CREATE PROCEDURE upgrade_database_4710()
+BEGIN
+SET NAMES utf8 COLLATE utf8_hungarian_ci;
+
+ALTER TABLE `hirek` MODIFY `owner` varchar(255) DEFAULT NULL;
+
+END $$
+DELIMITER ;
+CALL upgrade_database_4710();
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index de4ba040..acbf96c3 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4710
+4712
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index c59d4b06..a2be5a7a 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4710
-cb8cda74ec914985cfc33eeb1c0f600b  mayor-fenntarto-rev4710.tgz
-fce4128a082128b51ccd3c1f7da49d16  mayor-installer-sulix-rev4710.tgz
-57cf545c827177cc44b1b976799235e0  mayor-wiki-rev4710.tgz
-6093ef06efd2db548e5e6478e277df76  mayor-installer-rev4710.tgz
-6020d68cd542a943247ae84e62f82271  mayor-portal-rev4710.tgz
-bfeaeacfbb2e08af566791a15d22e94f  mayor-felveteli-rev4710.tgz
-92806a3648b8ae4d97cf4931539bc2ac  mayor-jatek-rev4710.tgz
-77ecb781efc6202022fbc0c88c339944  mayor-locales-jp_JP-rev4710.tgz
-52e12bcaca7f74a4be364bc52babfd3c  mayor-locales-de_DE-rev4710.tgz
-91ef318a14aed435ef505255cefde6d0  mayor-locales-en_US-rev4710.tgz
-b54133612c87fd2c3de6094485296e19  mayor-naplo-rev4710.tgz
-1386d084c17d51d0fd101f37c37b02bd  mayor-base-rev4710.tgz
+Revision 4712
+58c3a908ac6c47b264d9c97c050bd3bd  mayor-fenntarto-rev4712.tgz
+8e8360e59413398833af2d1c25cdb99a  mayor-installer-sulix-rev4712.tgz
+20e4bddd751039d937afa56d99959869  mayor-wiki-rev4712.tgz
+dde325efee1db53bb4c4388b4002df58  mayor-installer-rev4712.tgz
+4d7b12a7fcf3229c757c008104021fd2  mayor-portal-rev4712.tgz
+08123717b7ceed610968b0b6cc78cded  mayor-felveteli-rev4712.tgz
+2efc50b93cd5b9a849fd063a6a8b4523  mayor-jatek-rev4712.tgz
+637d3e4edffc6840a831e41d84443b92  mayor-locales-jp_JP-rev4712.tgz
+37e9bc8b52a7d83176bd660611d466ad  mayor-locales-de_DE-rev4712.tgz
+a3b30626e585c285ca6635169219b2ec  mayor-locales-en_US-rev4712.tgz
+38c4be37ac4d964ecc81deadb74c6553  mayor-naplo-rev4712.tgz
+0cb609ef44637d0ed42f3f22afb29e08  mayor-base-rev4712.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index de4ba040..acbf96c3 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4710
+4712
diff --git a/rev.txt b/rev.txt
index de4ba040..acbf96c3 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4710
+4712
-- 
cgit v1.2.3


From 5da1f06dce90826029f42c5e214f1e66f8dae0da Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Thu, 26 Nov 2020 16:25:04 +0100
Subject: Rev: 4713

---
 mayor-orig/mayor-base/log/mayor-base.rev           |  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 +-
 .../module-naplo/html/haladasi/hazifeladat.phtml   |  3 ++-
 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 +-
 16 files changed, 29 insertions(+), 28 deletions(-)

(limited to 'mayor-orig/mayor-naplo/www/skin/classic')

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index acbf96c3..b9dafcc3 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4712
+4713
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index acbf96c3..b9dafcc3 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4712
+4713
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index acbf96c3..b9dafcc3 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4712
+4713
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index acbf96c3..b9dafcc3 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4712
+4713
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 acbf96c3..b9dafcc3 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 @@
-4712
+4713
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index acbf96c3..b9dafcc3 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4712
+4713
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 acbf96c3..b9dafcc3 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 @@
-4712
+4713
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 acbf96c3..b9dafcc3 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 @@
-4712
+4713
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 acbf96c3..b9dafcc3 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 @@
-4712
+4713
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index acbf96c3..b9dafcc3 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4712
+4713
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
index dd9c3687..00077ba0 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
@@ -131,7 +131,8 @@ echo '<style type="text/css">
 	    echo '<input type="hidden" name="hazifeladatId" value="'.$ADAT['hazifeladatId'].'"/>';
 
 	    echo '<fieldset class="adatok"><legend>'.ucfirst(_TANANYAG).'</legend>'."\n";
-		if ($ADAT['oraAdat']['oraId']>0 && strtotime(date('Y-m-d'))>=strtotime($ADAT['oraAdat']['dt']) && $ADAT['oraAdat']['oraBeirhato']===true) {
+//		if ($ADAT['oraAdat']['oraId']>0 && strtotime(date('Y-m-d'))>=strtotime($ADAT['oraAdat']['dt']) && $ADAT['oraAdat']['oraBeirhato']===true) {
+		if ($ADAT['oraAdat']['oraId']>0 && $ADAT['oraAdat']['oraBeirhato']===true ) {
 		    echo '<input type="text" name="oraLeiras" value="'.$ADAT['oraAdat']['leiras'].'" style="width:70%">';
 		    echo '<input type="submit">';
 		} else {
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index acbf96c3..b9dafcc3 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4712
+4713
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index acbf96c3..b9dafcc3 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4712
+4713
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index a2be5a7a..8cf1cb8b 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4712
-58c3a908ac6c47b264d9c97c050bd3bd  mayor-fenntarto-rev4712.tgz
-8e8360e59413398833af2d1c25cdb99a  mayor-installer-sulix-rev4712.tgz
-20e4bddd751039d937afa56d99959869  mayor-wiki-rev4712.tgz
-dde325efee1db53bb4c4388b4002df58  mayor-installer-rev4712.tgz
-4d7b12a7fcf3229c757c008104021fd2  mayor-portal-rev4712.tgz
-08123717b7ceed610968b0b6cc78cded  mayor-felveteli-rev4712.tgz
-2efc50b93cd5b9a849fd063a6a8b4523  mayor-jatek-rev4712.tgz
-637d3e4edffc6840a831e41d84443b92  mayor-locales-jp_JP-rev4712.tgz
-37e9bc8b52a7d83176bd660611d466ad  mayor-locales-de_DE-rev4712.tgz
-a3b30626e585c285ca6635169219b2ec  mayor-locales-en_US-rev4712.tgz
-38c4be37ac4d964ecc81deadb74c6553  mayor-naplo-rev4712.tgz
-0cb609ef44637d0ed42f3f22afb29e08  mayor-base-rev4712.tgz
+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
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index acbf96c3..b9dafcc3 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4712
+4713
diff --git a/rev.txt b/rev.txt
index acbf96c3..b9dafcc3 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4712
+4713
-- 
cgit v1.2.3