';
+ echo '
';
+ if ($D['class']==6) {
+ echo '
';
+ }
+ echo '
'.$D['cim'].'';
+
+ echo '
';
echo '
';
echo $a;
if ($b!="") echo '
Tovább...';
@@ -29,9 +32,17 @@
echo $ADAT['hirek']['linkek'][$D['id']][$j]['szoveg'];
echo '';
}
+
+ if ($D['csoport']!='') {
+ $CSOPORT = explode(',',$D['csoport']);
+ echo '
';
+ for ($j=0; $j'.$CSOPORT[$j].'';
+ echo '
';
+ }
+
echo '
';
echo '
';
- }
+ }
}
}
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 cd1cafa9..b38ffa8f 100644
--- a/mayor-orig/www/skin/classic/module-session/html/accountInfo.phtml
+++ b/mayor-orig/www/skin/classic/module-session/html/accountInfo.phtml
@@ -26,7 +26,7 @@
}
function putEduroamForm($ADAT) {
-return false;
+// return false;
global $eduroamDOMAINS;
if (__TANAR===true) {
$eduroamAFFILIATION = 'faculty';
@@ -43,7 +43,7 @@ return false;
} else {
echo '
';
$ADAT['eduroamAdat']['eduroamUID'] = _USERACCOUNT;
- $ADAT['eduroamAdat']['eduroamPASSWORD'] = @exec('pwgen'); // --TODO
+ $ADAT['eduroamAdat']['eduroamPASSWORD'] = "********";
}
echo '
';
echo '';
@@ -309,4 +309,31 @@ return false;
}
+ function putAccountActivityForm($ADAT) {
+ formBegin();
+ echo '';
+ echo '';
+ formEnd();
+ }
+
?>
diff --git a/mayor-orig/www/skin/default/base/html/base.phtml b/mayor-orig/www/skin/default/base/html/base.phtml
index de3d6a55..7c226647 100644
--- a/mayor-orig/www/skin/default/base/html/base.phtml
+++ b/mayor-orig/www/skin/default/base/html/base.phtml
@@ -167,7 +167,6 @@ function includeJS($page,$sub,$f,$skin) {
}
}
}
-
}
// -------------------------------------------------------------------
@@ -335,7 +334,7 @@ l53 -52 55 54 55 55 42 -43 43 -42 -55 -55 -54 -55 54 -55 55 -55 -43 -42 -42
function _svgLoginout($SET=array('print'=>true, 'color'=>'#00c0ff')) {
return false;
- global $page;
+/* global $page;
if (//_POLICY=='public'
defined('_USERACCOUNT') && (!is_string(_USERACCOUNT) || _USERACCOUNT=='')) {
if($page=='auth') $_bg = 'rgb(247, 197, 14)';
@@ -348,7 +347,7 @@ l53 -52 55 54 55 55 42 -43 43 -42 -55 -55 -54 -55 54 -55 55 -55 -43 -42 -42
$img .= '';
}
if ($print===true) echo $img; else return $img;
-
+*/
}
function _svgDown($SET=array('print'=>true, 'color' => '#3496b9')) {
@@ -370,7 +369,6 @@ l53 -52 55 54 55 55 42 -43 43 -42 -55 -55 -54 -55 54 -55 55 -55 -43 -42 -42
if (is_array($AUTH['private']['allowOnly'])) $_class='class="restricted"'; else $_class = '';
echo '';
-
if ($loggedIn) {
if (defined('_MAYORAUTHRESULT') && defined('_AUTH_FAILURE') && intval(_MAYORAUTHRESULT)>=intval(_AUTH_FAILURE)) {
$_class=' failed';
@@ -405,7 +403,10 @@ l53 -52 55 54 55 55 42 -43 43 -42 -55 -55 -54 -55 54 -55 55 -55 -43 -42 -42
}
echo '
';
} else {
- echo '
';
+ if ($_SESSION['mayorapiauth']===true) {
+ echo '
';
+ }
+ echo '
';
}
echo '