diff options
Diffstat (limited to 'mayor-orig/www/policy/private/session')
6 files changed, 30 insertions, 3 deletions
diff --git a/mayor-orig/www/policy/private/session/accountInfo-pre.php b/mayor-orig/www/policy/private/session/accountInfo-pre.php index 226ecd26..9b54adf5 100644 --- a/mayor-orig/www/policy/private/session/accountInfo-pre.php +++ b/mayor-orig/www/policy/private/session/accountInfo-pre.php @@ -34,21 +34,40 @@ changeAccountInfo($userAccount, $toPolicy); + } elseif ($action=='tokenLogout') { + + revokeTokens(); + } elseif ($action=='userSettingsModify') { $changeSkinTo = readVariable($_POST['changeSkinTo'],'enum',null,$SKINSSHOW); setUserSettings($userAccount, $toPolicy, array('skin'=>$changeSkinTo)); } elseif ($action=='generateEduroamId') { - + $eduroamDOMAIN = readVariable($_POST['eduroamDOMAIN'],'enum',null,$eduroamDOMAINS); + $eduroamPASSWORD = @exec('pwgen'); + if (__TANAR===true) { + $eduroamAFFILIATION = 'faculty'; + } elseif (__DIAK===true) { + $eduroamAFFILIATION = 'student'; + } else { + $eduroamAFFILIATION = 'staff'; + } + createEduroamSettings(array('userAccount'=>$userAccount,'policy'=> $toPolicy, + 'eduroamUID' => $userAccount, + 'eduroamDOMAIN'=>$eduroamDOMAIN, + 'eduroamAFFILIATION'=>$eduroamAFFILIATION, + 'eduroamPASSWORD'=>$eduroamPASSWORD)); } elseif ($action=='modoifyEduroamId') { - + } $userInfo = getUserInfo($userAccount, $toPolicy); // keretrendszer attribútumai $accountInfo = getAccountInfo($userAccount, $toPolicy); // backend attribútumai $ADAT = getUserSettings($userAccount, $toPolicy); + $ADAT['activity'] = getMyActivity(); + 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 e072907b..66642ef3 100644 --- a/mayor-orig/www/policy/private/session/accountInfo.php +++ b/mayor-orig/www/policy/private/session/accountInfo.php @@ -12,6 +12,8 @@ putEduroamForm($ADAT); + putAccountActivityForm($ADAT); + putAccountInfoForm($userInfo, $accountInfo, $backendAttrDef, $toPolicy); ?> diff --git a/mayor-orig/www/policy/private/session/eduroam-pre.php b/mayor-orig/www/policy/private/session/eduroam-pre.php new file mode 100644 index 00000000..40a406cd --- /dev/null +++ b/mayor-orig/www/policy/private/session/eduroam-pre.php @@ -0,0 +1,5 @@ +<?php + + getEduroamAdat(); + +?>
\ No newline at end of file diff --git a/mayor-orig/www/policy/private/session/eduroam.php b/mayor-orig/www/policy/private/session/eduroam.php new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/mayor-orig/www/policy/private/session/eduroam.php diff --git a/mayor-orig/www/policy/private/session/search/searchAccount-pre.php b/mayor-orig/www/policy/private/session/search/searchAccount-pre.php index 2108f631..1ef93e95 100644 --- a/mayor-orig/www/policy/private/session/search/searchAccount-pre.php +++ b/mayor-orig/www/policy/private/session/search/searchAccount-pre.php @@ -25,4 +25,5 @@ echo $action; } + ?> diff --git a/mayor-orig/www/policy/private/session/search/searchAccount.php b/mayor-orig/www/policy/private/session/search/searchAccount.php index 8cfe1d75..727706ee 100644 --- a/mayor-orig/www/policy/private/session/search/searchAccount.php +++ b/mayor-orig/www/policy/private/session/search/searchAccount.php @@ -5,7 +5,7 @@ if (_RIGHTS_OK !== true) die(); - global $attr, $pattern, $searchResult, $searchAttrList, $toPolicy; + global $attr, $pattern, $searchResult, $searchAttrList, $toPolicy, $ADAT; putSearchAccountForm($attr, $pattern, $searchAttrList, $toPolicy); |