2 files changed, 77 insertions, 6 deletions

diff --git a/mayor-orig/www/skin/classic/module-session/css/accountInfo.css b/mayor-orig/www/skin/classic/module-session/css/accountInfo.css
index 9259e788..92b23fec 100644
--- a/mayor-orig/www/skin/classic/module-session/css/accountInfo.css
+++ b/mayor-orig/www/skin/classic/module-session/css/accountInfo.css
@@ -6,17 +6,21 @@
     }
 
     table.personalSettings thead th {
-	background-color: rgb(60,20,100);
+	background-color: cornflowerblue;
 	padding: 5px 40px 5px 40px;
     }
-
+    table.personalSettings.asAdamin thead th {
+	background-color: cornflowerblue;
+    }
     table.personalSettings thead th.policy {
 	background-color: rgb(225,125,25);
     }
 
     table.personalSettings tfoot th {
-	background-color: rgb(60,20,100);
+	background-color: cornflowerblue;
+	height:30px;
     }
+    table.personalSettings.asAdmin tfoot th { background-color: #f60; }
 
     table.personalSettings tbody td {
 	background-color: rgb(200,200,210);
@@ -98,3 +102,11 @@
     div.wall h2 { font-size:smaller; margin:0px; padding:0px; text-align: right;}
     div.wall img { border: none; top:5px; right:5px; float:right; }
     
+
+    table.attr { min-width: 320px; width: 100%; }
+    table.attr tr th { min-width: 100px; text-align:left; font-weight:normal; height:2em; padding:4px 8px; }
+    table.attr tr td { background-color: white; color: black; text-align: left; min-width: 150px; }
+
+
+    div.unknownAttr { background-color: orange; text-align: center; }
+
diff --git a/mayor-orig/www/skin/classic/module-session/html/accountInfo.phtml b/mayor-orig/www/skin/classic/module-session/html/accountInfo.phtml
index 35c992f0..cd1cafa9 100644
--- a/mayor-orig/www/skin/classic/module-session/html/accountInfo.phtml
+++ b/mayor-orig/www/skin/classic/module-session/html/accountInfo.phtml
@@ -25,6 +25,63 @@
 	formEnd();
     }
 
+    function putEduroamForm($ADAT) {
+return false;
+	global $eduroamDOMAINS;
+	if (__TANAR===true) {
+	    $eduroamAFFILIATION = 'faculty';
+	} elseif (__DIAK===true) {
+	    $eduroamAFFILIATION = 'student';
+	} else {
+	    $eduroamAFFILIATION = 'staff';
+	}
+	// info https://wiki.niif.hu/SulinetMassImport
+
+	formBegin();
+	if ($ADAT['eduroamAdat']['userAccount']!='') {
+	    echo '<input type="hidden" name="action" value="modifyEduroamId" />';
+	} else {
+	    echo '<input type="hidden" name="action" value="generateEduroamId" />';
+	    $ADAT['eduroamAdat']['eduroamUID'] = _USERACCOUNT;
+	    $ADAT['eduroamAdat']['eduroamPASSWORD'] =  @exec('pwgen'); // --TODO
+	}
+	echo '<table align="center" class="personalSettings">';
+	    echo '<thead>';
+		echo '<tr><th colspan="2">Eduroam</th></tr>';	
+	    echo '</thead>';
+
+    	    echo '<tr>';
+	    echo '<th>Eduroam felhasználói név:</th>';
+	    echo '<td>'.($ADAT['eduroamAdat']['eduroamUID']).'@';
+		if ($ADAT['eduroamDOMAIN']!='') {
+		    echo $ADAT['eduroamDOMAIN'];
+		} else {
+		    echo '<select name="eduroamDOMAIN">';
+		    for ($i=0; $i<count($eduroamDOMAINS); $i++) {
+			$_domain = $eduroamDOMAINS[$i];
+			echo '<option value="'.$_domain.'">'.$_domain.'</option>';
+		    }
+		    echo '</select>';
+		}
+	    echo '</td>';
+	    echo '</tr>';
+
+	    echo '<tr>';
+	    echo '<th>Eduroam jelszó:</th>';
+	    echo '<td>'.($ADAT['eduroamAdat']['eduroamPASSWORD']).'</td>';
+	    echo '</tr>';
+
+	    echo '<tr>';
+	    echo '<th>Eduroam viszony:</th>';
+	    echo '<td>'.($eduroamAFFILIATION).'</td>';
+	    echo '</tr>';
+
+    	    echo '<tr><th colspan="2"><input type="submit" value="'._OK.'" /></th></tr>';
+	echo '</table>';	
+	formEnd();
+
+    }
+
     function putAttr($name, $values, $anAttrDef, $toPolicy = _POLICY) {
 
 	global $AUTH;
@@ -35,7 +92,8 @@
         elseif ($anAttrDef['type'] == 'radio') putRadioAttr($name, $values, $anAttrDef);
         elseif ($anAttrDef['type'] == 'timestamp') putTimestampAttr($name, $values, $anAttrDef);
         elseif ($anAttrDef['type'] == 'image') putImageAttr($name, $userAccount, $anAttrDef);
-        else echo 'Ismeretlen atribútum típus: '.$name.' ('.$anAttrDef[$name]['type'].')';
+        elseif ($anAttrDef['type'] != '') echo '<div class="unknownAttr">ismeretlen attribútum típus: '.$name.' ('.($anAttrDef[$name]['type']).')</div>';
+        else echo '<div class="unknownAttr">'.$name.': nem elérhető</div>';
 
     }
 
@@ -55,7 +113,6 @@
         echo '</tr>';
 
         echo '</table>'."\n";
-
     }
 
     function putIntAttr($name, $values, $anAttrDef) {
@@ -191,7 +248,9 @@
         echo '<input type="hidden" name="action" value="changeSettings" />';
         echo '<input type="hidden" name="toPolicy" value="'.$toPolicy.'" />';
         echo '<input type="hidden" name="userAccount" value="'.$userInfo['userAccount'][0].'" />';
-        echo '<table class="personalSettings" align="center" cellspacing="1">';
+
+	if (_ACCESS_AS === _ADMIN_ACCESS) $_class = "asAdmin";
+        echo '<table class="personalSettings '.$_class.'" align="center" cellspacing="1">';
         echo '<thead>';
 	if ($toPolicy != _POLICY) echo '<tr><th class="policy">'.$toPolicy.'</th></tr>'."\n";
         echo '<tr><th>'.$userInfo['userCn'][0].'</th></tr>';