![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: db12c84)
raw | patch | inline | side by side (parent: db12c84)
| author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Thu, 25 Feb 2010 17:29:15 +0000 (17:29 +0000) | ||
| committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Thu, 25 Feb 2010 17:29:15 +0000 (17:29 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15727 594d385d-05f5-0310-b6e9-bd551577e9d8
| gosa-core/html/logout.php | patch | blob | history | |
| gosa-core/ihtml/themes/modern/framework.tpl | patch | blob | history |
index a29726d59babb7ad83e91a7c6978333066f6f633..f4c2c3d4d62e250687e4f8c57d4f1c47246a5e45 100644 (file)
}
/* If GET request is posted, the logout was forced by pressing the link */
-if (isset($_GET['request'])){
+if (isset($_POST['forcedlogout'])){
/* destroy old session */
session::destroy ();
diff --git a/gosa-core/ihtml/themes/modern/framework.tpl b/gosa-core/ihtml/themes/modern/framework.tpl
index 1672d0f6bfe8022b40f7137561e7eaf9829ea2f1..d811b164a358f7279989f5fbd76a6f612a6cfeab 100644 (file)
-<!-- Headline -->
-<body>
-{$php_errors}
-<form action='main.php{$plug}' name='mainform' method='post' enctype='multipart/form-data'>
+ <!-- Headline -->
+ <body>
+ {$php_errors}
-<!-- Title bar including logout button -->
-<div class='title-bar'>
- <ul>
- <li><img src='themes/modern/images/logo.png'></li>
- <li class='right table-wrapper'><div class='logout-label'><input type='submit' name='log-out' id='log-out' title='Log out' value=''></ div></li>
- <li class='right table-wrapper'><div class='logged-in-label'>You're logged in as <span class='logged-in-user'>{$username}</span></ div></li>
- </ul>
-</div>
-<!-- {$go_home} -->
+ <!-- Title bar including logout button -->
+ <div class='title-bar'>
+ <ul>
+ <li><img src='themes/modern/images/logo.png'></li>
+ <li class='right table-wrapper'>
+ <div class='logout-label'>
+ <form action='logout.php' name='logoutframe' method='post' enctype='multipart/form-data'>
+ <input type='submit' name='log-out' id='log-out' title='Log out' value=''>
+ <input type='hidden' name='forcedlogout' value='1'>
+ <input type="hidden" name="php_c_check" value="1">
+ </form>
+ </div>
+ </li>
+ <li class='right table-wrapper'>
+ <div class='logged-in-label'>You're logged in as <span class='logged-in-user'>{$username}</span>
+ </div>
+ </li>
+ </ul>
+ </div>
+ <!-- {$go_home} -->
-{$menu}
+ <form action='main.php{$plug}' name='mainform' method='post' enctype='multipart/form-data'>
+ {$menu}
-{$msg_dialogs}
+ {$msg_dialogs}
-<!-- Plugin area -->
-<div class='plugin-area'>
- <div class='plugin-path'>
- <ul class='path-navigation'>
- <li class='left right-border'><div class='nav-home'></div></li>
- <li class='left'>Welcome to GOsa</li>
- <li class='right left-border'>Help</li>
- <li class='right left-border'>Change password</li>
- <li class='right left-border'>My account</li>
- </ul>
- </div
- {$contents}
-</div>
+ <!-- Plugin area -->
+ <div class='plugin-area'>
+ <div class='plugin-path'>
+ <ul class='path-navigation'>
+ <li class='left right-border'><div class='nav-home'></div></li>
+ <li class='left'>Welcome to GOsa</li>
+ <li class='right left-border'>Help</li>
+ <li class='right left-border'>Change password</li>
+ <li class='right left-border'>My account</li>
+ </ul>
+ </div
+ {$contents}
+ </div>
- {if $channel != ""}
- <input type="hidden" name="_channel_" value="{$channel}">
- {/if}
-</table>{$errors}{$focus}<input type="hidden" name="php_c_check" value="1"></form></body></html>
+ {if $channel != ""}
+ <input type="hidden" name="_channel_" value="{$channel}">
+ {/if}
+ {$errors}
+ {$focus}
+ <input type="hidden" name="php_c_check" value="1">
+ </form>
+ </body>
+</html>