Rev: 4681rev4681

17 files changed, 48 insertions, 30 deletions

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