diff options
Diffstat (limited to 'mayor-orig/www/policy/private')
4 files changed, 26 insertions, 20 deletions
diff --git a/mayor-orig/www/policy/private/naplo/haladasi/helyettesites-pre.php b/mayor-orig/www/policy/private/naplo/haladasi/helyettesites-pre.php index 5f7d600c..89686a13 100644 --- a/mayor-orig/www/policy/private/naplo/haladasi/helyettesites-pre.php +++ b/mayor-orig/www/policy/private/naplo/haladasi/helyettesites-pre.php @@ -4,8 +4,9 @@ */ if (_RIGHTS_OK !== true) die(); - if (!__NAPLOADMIN and !__VEZETOSEG) { - $_SESSION['alert'][] = 'message:insufficient_access'; + + if (!(__NAPLOADMIN===true || __VEZETOSEG===true || (MAYOR_SOCIAL===true && __TANAR===true))) { + $_SESSION['alert'][] = 'page:insufficient_access'; } else { require_once('include/modules/naplo/share/tanar.php'); @@ -45,14 +46,6 @@ if ($action == 'hianyzoModositas') { - /* Régi megoldás - $hianyzok = $_POST['hianyzok']; - if (!is_array($hianyzok)) $hianyzok = array(); - $voltHianyzok = getHianyzok($dt); - - $ujHianyzok = array_diff($hianyzok, $voltHianyzok); - $toroltHianyzok = array_diff($voltHianyzok, $hianyzok); - */ $ujHianyzok = readVariable($_POST['addHianyzo'], 'numeric unsigned'); $toroltHianyzok = readVariable($_POST['delHianyzo'], 'numeric unsigned'); @@ -168,7 +161,12 @@ $HELYETTESITES['tanarTerheles'] = getOraTerhelesStatByTanarId(array('dt'=>$dt)); } db_close($lr); - } + + + + + + // toolBar if (__NAPLOADMIN) { @@ -180,7 +178,7 @@ 'igDt' => getTanitasiNap(array('direction'=>'elore', 'napszam'=>10, 'fromDt'=>'curdate()')), 'napTipusok' => array('tanítási nap', 'speciális tanítási nap') ); - } elseif (__VEZETOSEG) { + } elseif (__VEZETOSEG || MAYOR_SOCIAL===true) { $TOOL['datumSelect'] = array( 'tipus' => 'cella', 'post' => array('tanarId', 'diakId', 'osztalyId', 'tankorId'), 'paramName' => 'dt', 'hanyNaponta' => 1, @@ -191,4 +189,7 @@ } getToolParameters(); + } + + ?> diff --git a/mayor-orig/www/policy/private/naplo/orarend/orarend-pre.php b/mayor-orig/www/policy/private/naplo/orarend/orarend-pre.php index 5b00491c..f570cc8f 100644 --- a/mayor-orig/www/policy/private/naplo/orarend/orarend-pre.php +++ b/mayor-orig/www/policy/private/naplo/orarend/orarend-pre.php @@ -63,7 +63,6 @@ foreach ($ADAT['telephelyek'] as $tAdat) $telephelyIds[] = $tAdat['telephelyId']; $telephelyId = readVariable($_POST['telephelyId'], 'id', (count($ADAT['telephelyek'])>1?null:1), $telephelyIds); /* A telephelyet ki tudnánk találni a lekérdezett órák termeiből is... */ - $tolDt = readVariable($_POST['tolDt'], 'date', getTanitasihetHetfo(array('napszam'=>0))); $dt = readVariable($_POST['dt'], 'date'); // mutatni @@ -85,7 +84,6 @@ // A következő nap előtti hétfő $tolDt = date('Y-m-d', strtotime('last Monday', strtotime('+1 days', time()))); - /* if (strtotime($tolDt) > strtotime($_TANEV['zarasDt'])) $_tolDt = $_TANEV['zarasDt']; elseif (strtotime($tolDt) < strtotime($_TANEV['kezdesDt'])) $_tolDt = $_TANEV['kezdesDt']; @@ -99,13 +97,12 @@ // SOCIAL SOCIAL SOCIAL SOCIAL SOCIAL SOCIAL SOCIAL SOCIAL SOCIAL SOCIAL SOCIAL SOCIAL SOCIAL SOCIAL SOCIAL SOCIAL if (MAYOR_SOCIAL === true && $action== 'orarendiOraTeremModosit') { - $_MODIFY; if(is_array($_POST)) { $TMP_TERMEK = getTermek(array('result' => 'assoc')); $TMP_TEREMIDS = array_keys($TMP_TERMEK); foreach($_POST as $_pk => $_pv) { if (($_pv>0 || $_pv=="teremTorol") && substr($_pk,0,3) == 'OOM') { - list($placeholder, $M['het'], $M['nap'], $M['ora'], $M['tanarId'],$M['tolDt']) = explode('+',$_pk); + list($placeholder, $M['het'], $M['nap'], $M['ora'], $M['tanarId'],$M['dt']) = explode('+',$_pk); if ($_pv=='teremTorol') $_pv=0; // hackit $M['teremId'] = readVariable($_pv,'id',0,$TMP_TEREMIDS); $M['tanev'] = __TANEV; @@ -260,7 +257,8 @@ } } - // $ADAT['dt'] = $tolDt; // BUG - ez vajon miért volt??? + // $ADAT['dt'] = $tolDt; // BUG - ez vajon miért volt??? - Mert a MSE (Social Edition), ben használtuk. Hibásan. Áttérés tolDt - re + $ADAT['tolDt'] = $tolDt; $ADAT['tanarId'] = $tanarId; $ADAT['osztalyId'] = $osztalyId; $ADAT['diakId'] = $diakId; @@ -271,7 +269,7 @@ //===================================== $TOOL['datumSelect'] = array( - 'tipus'=>'cella', 'post'=>array('tanarId','osztalyId','tankorId','mkId','diakId','telephelyId'), + 'tipus'=>'cella', 'post'=>array('tanarId','osztalyId','tankorId','mkId','diakId','telephelyId','teremId'), 'paramName' => 'tolDt', 'hanyNaponta' => 7, 'override'=>true, // használathoz még át kell írni pár függvényt!!! // 'tolDt' => date('Y-m-d', strtotime('Monday', strtotime($_TANEV['kezdesDt']))), diff --git a/mayor-orig/www/policy/private/session/accountInfo-pre.php b/mayor-orig/www/policy/private/session/accountInfo-pre.php index 7bf243cc..226ecd26 100644 --- a/mayor-orig/www/policy/private/session/accountInfo-pre.php +++ b/mayor-orig/www/policy/private/session/accountInfo-pre.php @@ -39,13 +39,18 @@ $changeSkinTo = readVariable($_POST['changeSkinTo'],'enum',null,$SKINSSHOW); setUserSettings($userAccount, $toPolicy, array('skin'=>$changeSkinTo)); - } + } elseif ($action=='generateEduroamId') { + } elseif ($action=='modoifyEduroamId') { + } $userInfo = getUserInfo($userAccount, $toPolicy); // keretrendszer attribútumai $accountInfo = getAccountInfo($userAccount, $toPolicy); // backend attribútumai $ADAT = getUserSettings($userAccount, $toPolicy); - + if ($toPolicy=='private' && _POLICY ==='private') { + $ADAT['eduroamAdat'] = getEduroamSettings($userAccount, $toPolicy); + // dump($ADAT); + } ?> diff --git a/mayor-orig/www/policy/private/session/accountInfo.php b/mayor-orig/www/policy/private/session/accountInfo.php index 7c4a3e0a..e072907b 100644 --- a/mayor-orig/www/policy/private/session/accountInfo.php +++ b/mayor-orig/www/policy/private/session/accountInfo.php @@ -10,6 +10,8 @@ putUserSettingsForm($ADAT); + putEduroamForm($ADAT); + putAccountInfoForm($userInfo, $accountInfo, $backendAttrDef, $toPolicy); ?> |