Revision 1528
Added by Dietmar almost 13 years ago
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 13 | 13 |
=========================== add small Features 2.8.2 ========================== |
| 14 | 14 |
|
| 15 | 15 |
----------------------------------- Fixes 2.8.2 -------------------------------- |
| 16 |
20 Nov-2011 Build 1527 Dietmar Woellbrink (Luisehahne) |
|
| 16 |
23 Nov-2011 Build 1528 Dietmar Woellbrink (Luisehahne) |
|
| 17 |
! rework login and show_menu in templates allcss and round |
|
| 18 |
22 Nov-2011 Build 1527 Dietmar Woellbrink (Luisehahne) |
|
| 17 | 19 |
# fix redirect login |
| 18 | 20 |
20 Nov-2011 Build 1526 Dietmar Woellbrink (Luisehahne) |
| 19 | 21 |
# typofix in BG and RU |
| branches/2.8.x/wb/admin/interface/version.php | ||
|---|---|---|
| 52 | 52 |
|
| 53 | 53 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
| 54 | 54 |
if(!defined('VERSION')) define('VERSION', '2.8.2');
|
| 55 |
if(!defined('REVISION')) define('REVISION', '1526');
|
|
| 55 |
if(!defined('REVISION')) define('REVISION', '1528');
|
|
| branches/2.8.x/wb/templates/allcss/index.php | ||
|---|---|---|
| 79 | 79 |
|
| 80 | 80 |
<!-- main navigation menu --> |
| 81 | 81 |
<div class="menu"> |
| 82 |
<?php show_menu(1, 0, -1, true, |
|
| 83 |
'<li><span [class]>[a][menu_title][/a]</span>', '</li>', |
|
| 84 |
'<ul>', '</ul>', 'class="menu_default"', 'class="menu_current"', 0 |
|
| 85 |
); |
|
| 86 |
?> |
|
| 87 |
|
|
| 88 |
<?php |
|
| 82 |
<?php show_menu2(SM2_ALLMENU, SM2_ROOT, SM2_ROOT+PAGE_LEVEL_LIMIT, SM2_ALL|SM2_NUMCLASS ); ?> |
|
| 83 |
<?php |
|
| 89 | 84 |
// CODE FOR WEBSITE BAKER FRONTEND LOGIN |
| 90 |
if (FRONTEND_LOGIN == 'enabled' && VISIBILITY != 'private' |
|
| 91 |
&& $wb->get_session('USER_ID') == '') { ?>
|
|
| 85 |
if (FRONTEND_LOGIN == 'enabled' && VISIBILITY != 'private' && $wb->get_session('USER_ID') == '') {
|
|
| 86 |
$redirect_url = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : WB_URL ); |
|
| 87 |
$redirect_url = (isset($thisApp->redirect_url) ? $thisApp->redirect_url : $redirect_url ); |
|
| 88 |
?> |
|
| 92 | 89 |
<!-- login form --> |
| 93 | 90 |
<br /> |
| 94 | 91 |
<form name="login" id="login" action="<?php echo LOGIN_URL; ?>" method="post"> |
| 92 |
<input type="hidden" name="redirect" value="<?php echo $redirect_url;?>" /></p> |
|
| 95 | 93 |
<fieldset> |
| 96 | 94 |
<legend><?php echo $TEXT['LOGIN']; ?></legend> |
| 97 | 95 |
<label for="username" accesskey="1"><?php echo $TEXT['USERNAME']; ?>:</label> |
| branches/2.8.x/wb/templates/round/index.php | ||
|---|---|---|
| 78 | 78 |
</tr> |
| 79 | 79 |
<tr> |
| 80 | 80 |
<td width="170"> |
| 81 |
<?php show_menu(); ?>
|
|
| 81 |
<?php show_menu2(SM2_ALLMENU,SM2_ROOT, SM2_ROOT+PAGE_LEVEL_LIMIT, SM2_ALL|SM2_NUMCLASS ); ?>
|
|
| 82 | 82 |
</td> |
| 83 | 83 |
</tr> |
| 84 | 84 |
<tr> |
| ... | ... | |
| 119 | 119 |
</form> |
| 120 | 120 |
<?php } ?> |
| 121 | 121 |
|
| 122 |
<?php |
|
| 123 |
if(FRONTEND_LOGIN AND !$wb->is_authenticated()) {
|
|
| 124 |
?> |
|
| 122 |
<?php |
|
| 123 |
if(FRONTEND_LOGIN AND !$wb->is_authenticated() AND VISIBILITY != 'private' ) {
|
|
| 124 |
$redirect_url = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : WB_URL ); |
|
| 125 |
$redirect_url = (isset($thisApp->redirect_url) ? $thisApp->redirect_url : $redirect_url ); |
|
| 126 |
?> |
|
| 125 | 127 |
<form name="login" action="<?php echo LOGIN_URL; ?>" method="post"> |
| 126 |
|
|
| 128 |
<input type="hidden" name="redirect" value="<?php echo $redirect_url;?>" /></p> |
|
| 127 | 129 |
<table cellpadding="0" cellspacing="0" border="0" width="150" align="center" style="margin-top: 10px;"> |
| 128 | 130 |
<tr> |
| 129 | 131 |
<td class="border"> |
Also available in: Unified diff
rework login and show_menu in templates allcss and round