Rev: 4535rev4535

10 files changed, 108 insertions, 11 deletions

diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/settings-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/settings-pre.php
new file mode 100644
index 00000000..8f637334
--- /dev/null
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/settings-pre.php
@@ -0,0 +1,16 @@
+<?php
+
+    if (_RIGHTS_OK !== true) die();
+
+    if (!__NAPLOADMIN && !__VEZETOSEG) {
+	$_SESSION['alert'][] = "page:insufficient_access";
+    } else {
+
+	if ($action=='set') {
+
+	}
+
+    }
+
+
+?>
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/settings.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/settings.php
new file mode 100644
index 00000000..b8ae846a
--- /dev/null
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/settings.php
@@ -0,0 +1,14 @@
+<?php
+
+    if (_RIGHTS_OK !== true) die();
+
+    global $ADAT;
+
+    if (is_array($ADAT)) {
+
+	putNaploSettings($ADAT);
+
+    }
+    
+
+?>
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php
index 460e4ec9..31511d7b 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php
@@ -40,9 +40,11 @@ if ( $skin == 'ajax'
             	$oraId = $oraIds[$i];
 		$_ki = readVariable($_POST['K_'.$oraId], 'id', '');
 		$_leiras = readVariable($_POST['L_'.$oraId],'string', '');
+		$_cimkeId = intval(readVariable($_POST['C_'.$oraId],'string', ''));
 		$_csoportAdat = readVariable($_POST['M_'.$oraId], 'string', '');
-		if (isset($_POST['L_'.$oraId]))
-            		$_JSON['result'] = $_JSON['result'] && updateHaladasiNaploOra($oraId, $_leiras, $_csoportAdat, $_ki, $lr);
+		if (isset($_POST['L_'.$oraId])) {
+            	    $_JSON['result'] = $_JSON['result'] && updateHaladasiNaploOra($oraId, $_leiras, $_cimkeId, $_csoportAdat, $_ki, $lr);
+		}
 	    }
         }
 	// ez DUPlikátum, a nem ajaxnál is ezt tesszük ám!
@@ -189,11 +191,12 @@ if ( $skin == 'ajax'
 		    //EXPERIMENTAL: $_modTs = readVariable($_POST['T_'.$oraId], 'datetime', '');
 		    $_ki = readVariable($_POST['K_'.$oraId], 'numeric', '');
 		    $_leiras = readVariable($_POST['L_'.$oraId],'string', ''); //htmlspecialchars($_POST['L_'.$oraId])
+		    $_cimkeId = intval(readVariable($_POST['C_'.$oraId],'string', '')); 
 		    $_csoportAdat = readVariable($_POST['M_'.$oraId], 'string', ''); //numeric:numeric ???
 		    // paraméterek: $oraId, $leiras, $csoportAdat = 'csoportId:tankorId', $ki = '', $olr = '')
 		    if (isset($_POST['L_'.$oraId])) // a biztonság kedvéért ellenőrizzük
-            		updateHaladasiNaploOra($oraId, $_leiras, $_csoportAdat, $_ki, $lr);
-            	    //EXPERIMENTAL: updateHaladasiNaploOra($oraId, $_leiras, $_csoportAdat, $_ki, $_modTs, $lr);
+            		updateHaladasiNaploOra($oraId, $_leiras, $_cimkeId, $_csoportAdat, $_ki, $lr);
+            	    //EXPERIMENTAL: updateHaladasiNaploOra($oraId, $_leiras, $_cimke, $_csoportAdat, $_ki, $_modTs, $lr);
 		}
             }
 	    $UJORA = readVariable($_POST['UJORA'],'string');
@@ -215,7 +218,7 @@ if ( $skin == 'ajax'
 	    if (is_array($_POST)) foreach ($_POST as $_key => $_leiras) {
 		if (substr($_key,0,3) === 'LE_' && $_leiras!='' && is_numeric($UJORAIDK[$_dt][$_ora])) {
 		    list($_rest, $_dt,$_ora) = explode('_',$_key);
-		    updateHaladasiNaploOra($UJORAIDK[$_dt][$_ora],$_leiras,'',$tanarId,$lr);
+		    updateHaladasiNaploOra($UJORAIDK[$_dt][$_ora],$_leiras,0,'',$tanarId,$lr);
 		}
 	    }
 	    //***
@@ -371,6 +374,7 @@ if ( $skin == 'ajax'
 	
 	    $ADAT['szabadTermek'] = getSzabadTermekByDtInterval($tolDt,$igDt, null,'ora');
 	    $ADAT['tankorTipusok'] = getTankorTipusok();
+	    if (__ORACIMKE_ENABLED === true) $ADAT['cimkek'] = getCimkek();
     /* ------------------------------------------------- */
         // toolBar
 	$TOOL['datumSelect'] = array(
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/oraCimke-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/oraCimke-pre.php
new file mode 100644
index 00000000..dbca2542
--- /dev/null
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/oraCimke-pre.php
@@ -0,0 +1,43 @@
+<?php
+
+    if (_RIGHTS_OK !== true) die();
+
+    if (!__NAPLOADMIN) {
+        $_SESSION['alert'][] = 'page:insufficient_access';
+    } else {
+
+	require_once('include/modules/naplo/share/ora.php');
+
+	if ($action == 'oraCimkez') {
+
+	    $D['cimkeId'] = readVariable($_POST['oraCimkeId'], 'id');
+	    $D['cimkeLeiras'] = readVariable($_POST['oraCimkeLeiras'], 'string');
+
+	    for($i=0; $i<count($D['cimkeId']); $i++) {
+		if ($D['cimkeLeiras'][$i]=='') {
+    		    $q = "DELETE FROM cimke WHERE cimkeId = %u";
+		    $v = array($D['cimkeId'][$i]);
+		    db_query($q, array('fv'=>'oraCimke','modul'=>'naplo_intezmeny','values'=>$v));
+		}
+	    }
+	    for($i=0; $i<count($D['cimkeLeiras']); $i++) {
+		if ($D['cimkeId'][$i]>0) {
+		    if ($D['cimkeLeiras'][$i]!='') {
+    			$q = "UPDATE cimke SET cimkeLeiras = '%s' WHERE cimkeId = %u";
+			$v = array($D['cimkeLeiras'][$i],$D['cimkeId'][$i]);
+		    }
+		} elseif ($D['cimkeLeiras'][$i]!='') {
+		    $q = "INSERT INTO  cimke (cimkeLeiras) VALUES ('%s')";
+		    $v = array($D['cimkeLeiras'][$i]);
+		}
+		db_query($q, array('fv'=>'oraCimke','modul'=>'naplo_intezmeny','values'=>$v));
+	    }
+
+	    //teremAdatModositas($D,($action=='ujTerem'));
+	    //unset($ADAT['teremId']);
+	}
+
+	$ADAT['cimkek'] = getoracimkek();
+
+    }
+?>
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/oraCimke.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/oraCimke.php
new file mode 100644
index 00000000..b1732496
--- /dev/null
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/oraCimke.php
@@ -0,0 +1,8 @@
+<?php
+
+    if (_RIGHTS_OK !== true) die();
+
+    global $ADAT;
+
+    putOraCimkeLista($ADAT);
+?>
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 0bff88bf..5097037f 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
@@ -60,7 +60,7 @@ if (__NAPLOADMIN && isset($_POST['fileName']) && $_POST['fileName'] != '') {
 			$MEZO_LISTA = $_POST['MEZO_LISTA'];
 			$KULCS_MEZOK = $_POST['KULCS_MEZOK'];
 			updateOsztaly($osztalyId, $fileName, $MEZO_LISTA, $KULCS_MEZOK, $mezo_elvalaszto, readVariable($_POST['rovatfej'], 'bool'));
-
+			$ADAT['updatedFromFile']=true;
 		} // MEZO_LISTA tömb
 	} else {
 		$_SESSION['alert'][] = 'message:file_not_found:'.$fileName;
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 c4f0ca80..20ca97a5 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
@@ -4,6 +4,12 @@
 
     global $ADAT, $fileName, $ADATOK, $MEZO_LISTA, $attrList;
 
+    if ($ADAT['updatedFromFile']===true) {
+
+	echo "KÉSZ!";
+	
+    } else {
+
 	// Osztályhoz rendelés
 	if (isset($ADAT['osztalyId']) && ($ADAT['osztalyAdat']["kezdoTanev"]<=$ADAT['tanev'] && $ADAT['osztalyAdat']["vegzoTanev"]>=$ADAT['tanev'])) {
 		
@@ -34,7 +40,6 @@
 	} elseif (__NAPLOADMIN) {
 		putUjOsztalyForm($ADAT);
 	}
-
-
+    }
 
 ?>
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 99ece06d..8c0d870c 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
@@ -39,7 +39,7 @@
 	    }
 	}
     }
-    $ADAT['tanarok'] = getTanarok(array('extraAttrs'=>'titulus','telephelyId'=>__TELEPHELYID));
+    $ADAT['tanarok'] = getTanarok(array('extraAttrs'=>'titulus,statusz,besorolas','telephelyId'=>__TELEPHELYID));
     $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/policy/private/naplo/orarend/orarend-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php
index f570cc8f..a7022d00 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php
@@ -21,6 +21,7 @@
 	require_once('include/modules/naplo/share/jegyzet.php');
 	require_once('include/modules/naplo/share/hianyzas.php');
 
+
     // -- TESZT - savePageState()
     define('__PAGE_PRESET', false); // kísérlet vége. no
     $preSetLoad = readVariable($_POST['preSetLoad'],'bool',false);
@@ -264,8 +265,11 @@
 	$ADAT['diakId'] = $diakId;
 	$ADAT['tankorId'] = $tankorId;
 	$ADAT['teremId'] = $teremId;
-	if ($skin=='ajax' && $_REQUEST['httpResponse']=='json') $_JSON['orarend']=$ADAT;
-
+	if ($skin=='ajax' && $_REQUEST['httpResponse']=='json') {
+	    $_JSON['orarend']=$ADAT;
+	} else {
+	    $ADAT['orarendvane'] = orarendvane();
+	}
 //=====================================
 
         $TOOL['datumSelect'] = array(
@@ -309,4 +313,5 @@
 	if ($stateCounter>0) setcookie($page.'_'.$sub.'_'.$f, implode('+',$SAVESTATE), 0, '', '', TRUE, TRUE);
     }
 
+
 ?>
\ No newline at end of file
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend.php
index b0ed3b60..761156cd 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend.php
@@ -2,6 +2,8 @@
 
     global $ADAT;
 
+    if ($ADAT['orarendvane']==0)
+	putNincsOrarend();
     if (is_array($ADAT))
 	putOrarend($ADAT);