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-naplo/log/mayor-naplo.rev         |  2 +-
 .../policy/private/naplo/intezmeny/osztaly-pre.php |  2 +-
 .../module-naplo/html/intezmeny/osztaly.phtml      | 22 ++++++++++++++++++++--
 3 files changed, 22 insertions(+), 4 deletions(-)

(limited to 'mayor-orig/mayor-naplo')

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>';
-- 
cgit v1.2.3