Rev: 4825

5 files changed, 28 insertions, 5 deletions

diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/debug-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/debug-pre.php
index 1eed8cb9..d6862ba9 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/debug-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/debug-pre.php
@@ -17,6 +17,8 @@ if (__NAPLOADMIN!==true) {
     ini_set('xdebug.var_display_max_children', '4096');
     ini_set('xdebug.var_display_max_data', '4096');
 
+    $ADAT['debug_result']['post_max_size'] = ini_get('post_max_size');
+
     $ADAT['debug_result']['config']['backend'] = $config['backend'];
     $ADAT['debug_result']['config']['MYSQLI_ENABLED'] = MYSQLI_ENABLED;
     $ADAT['debug_result']['config']['__PORTAL_CODE'] = __PORTAL_CODE;
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/dokumentum/dokumentum-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/dokumentum/dokumentum-pre.php
index c41e820c..3ff6eab7 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/dokumentum/dokumentum-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/dokumentum/dokumentum-pre.php
@@ -30,9 +30,17 @@
 		'dokumentumPolicy' => $_policy
 	    )
 	);
-    } elseif ($action=='delDokumentum') {
+    } elseif ($action=='delModDokumentum') {
 	$_ids = readVariable($_POST['dokumentumId'],'id');
-	delDokumentum($_ids);
+	for($i=0; $i<count($_ids); $i++) {
+	    $DATA = array(
+		'dokumentumId' => ($_ids[$i]),
+		'dokumentumSorrend' => readVariable($_POST['sorrend_'.$_ids[$i]],'id',1)
+	    );
+	    updateDokumentum($DATA);
+	}
+	$_delids = readVariable($_POST['delDokumentumId'],'id');
+	delDokumentum($_delids);
     }
     }
     $ADAT = getDokumentumok();
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/dokumentum/dokumentum.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/dokumentum/dokumentum.php
index 04259088..89919bc1 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/dokumentum/dokumentum.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/dokumentum/dokumentum.php
@@ -7,7 +7,6 @@ global $ADAT,$ADATASSOC;
 
 if (__NAPLOADMIN===true) {
 
-
     putDokumentumLista($ADATASSOC);
     putDokumentumListaAdmin($ADAT, true);
     putDokumentumAdmin($ADAT);
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/szulinap-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/szulinap-pre.php
index 25332988..8fecbb97 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/szulinap-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/szulinap-pre.php
@@ -5,6 +5,7 @@
 //    if ($skin=='ajax') {
 
 	require_once('include/modules/naplo/share/diak.php');
+	require_once('include/modules/naplo/share/tanar.php');
 	require_once('include/modules/naplo/share/osztaly.php');
 
 	$ADAT['ma'] = getDiakBySzulDt(date('Y-m-d'));
@@ -18,11 +19,13 @@
 	    $_md = date('m-d',strtotime('+'.$i.' day',strtotime($dt)));
 	    $ADAT['heti'][$i]['dt']= date('Y-m-d',strtotime('+'.$i.' day',strtotime($dt)));
 	    $ADAT['heti'][$i]['diakok'] = getDiakBySzulDt($_md);
+	    $ADAT['heti'][$i]['tanarok'] = getTanarBySzulDt($_md);
 	}
 	$ADAT['osztaly'] = getOsztalyok(__TANEV,array('result'=>'assoc'));
-
 //    }
 
+    dump($ADAT['heti']);
+
 
     if ($skin!='ajax') {
     global $_TANEV;
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/szulinap.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/szulinap.php
index deca5915..c8172121 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/szulinap.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/szulinap.php
@@ -47,6 +47,16 @@
 	    }
 	    echo '</li>';
 	}
+
+	for ($i=0; $i<count($ADAT['heti'][$n]['tanarok']); $i++) {
+	    $_D = $ADAT['heti'][$n]['tanarok'][$i];
+	    $_tanarId= $_D['tanarId'];
+	    if (is_array($_D)) {
+		echo '<li class="tanarAdat tanarNev" data-tanarid="'.$_tanarId.'">';
+		echo $_D['tanarNev'].' (tanár)';
+		echo '</li>';
+	    }
+	}
 	echo '</ul>';
 
     }
@@ -59,10 +69,11 @@
 
     if ($szulinapos) echo _HAPPYBIRTHDAY;
 
+    if ($skin=='ajax') {
     echo '<a href="'.href('index.php?page=naplo&f=szulinap').'" class="btn_szulinap">';
 	echo '<button><span class="icon-th-list" style="font-size:8px; color:#888"></span> Születésnaposok</button>';
     echo '</a>';
-
+    }
     if ($skin!='ajax') echo '</div>';
 
 /*