|
From: Benjamin C. <bc...@us...> - 2002-10-18 17:28:04
|
Update of /cvsroot/phpbt/phpbt/templates/default
In directory usw-pr-cvs1:/tmp/cvs-serv7853/templates/default
Modified Files:
wrap.html
Log Message:
Fixes bug #624840 - Can't login from newaccount.php
Index: wrap.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/wrap.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- wrap.html 13 Sep 2002 19:11:30 -0000 1.22
+++ wrap.html 18 Oct 2002 17:28:01 -0000 1.23
@@ -53,31 +53,32 @@
<tr>
<td bgcolor="#000000" height="1" colspan="2"><img src="images/spacer.gif" height="1" width="1"></td>
</tr>
+ {if $smarty.server.SCRIPT_NAME|basename neq 'newaccount.php'}
<tr>
<td colspan="2" height="20" class="bottomnav">
<form method="post" action="{$smarty.server.SCRIPT_NAME}{if $smarty.request.QUERY_STRING}?{$smarty.request.QUERY_STRING}{/if}">
-{if not $smarty.session.uid}
- {if EMAIL_IS_LOGIN}
- {assign var="loginlabel" value="Email"}
- {else}
- {assign var="loginlabel" value="Login"}
- {/if}
- {$loginerror}
- {$loginlabel}: <input type="text" name="username" class="bottomnavinput" value="{$smarty.cookies.phpbt_user}">
- Password: <input type="password" name="password" class="bottomnavinput">
- <input type="hidden" name="dologin" value="1">
- <input type="submit" value="Login" class="bottomnavinput">
- <input type="submit" name="sendpass" value="Email Password" class="bottomnavinput" title="Forgot your password? Have it sent to you">
- {if RECALL_LOGIN}
- <input type="checkbox" name="savecookie" value="1" {if !empty($smarty.cookies.phpbt_user)}checked{/if} class="bottomnavinput" title="Remember {$loginlabel} for next time"> Remember me
- {/if}
-{else}
- Bugs assigned to me: <a href="query.php?op=mybugs&assignedto=1&open=1" title="Open">{$owner_open}</a> / <a href="query.php?op=mybugs&assignedto=1&open=0" title="Closed">{$owner_closed}</a>
- | Bugs reported by me: <a href="query.php?op=mybugs&reportedby=1&open=1" title="Open">{$reporter_open}</a> / <a href="query.php?op=mybugs&reportedby=1&open=0" title="Closed">{$reporter_closed}</a>
- | <a href="user.php">Personal Page</a>
- | <a href="logout.php">Logout {$smarty.session.uname}</a>
-{/if}
+ {if not $smarty.session.uid}
+ {if EMAIL_IS_LOGIN}
+ {assign var="loginlabel" value="Email"}
+ {else}
+ {assign var="loginlabel" value="Login"}
+ {/if}{$smarty.server.SCRIPT_NAME}
+ {$loginerror}
+ {$loginlabel}: <input type="text" name="username" class="bottomnavinput" value="{$smarty.cookies.phpbt_user}">
+ Password: <input type="password" name="password" class="bottomnavinput">
+ <input type="hidden" name="dologin" value="1">
+ <input type="submit" value="Login" class="bottomnavinput">
+ <input type="submit" name="sendpass" value="Email Password" class="bottomnavinput" title="Forgot your password? Have it sent to you">
+ {if RECALL_LOGIN}
+ <input type="checkbox" name="savecookie" value="1" {if !empty($smarty.cookies.phpbt_user)}checked{/if} class="bottomnavinput" title="Remember {$loginlabel} for next time"> Remember me
+ {/if}
+ {else}
+ Bugs assigned to me: <a href="query.php?op=mybugs&assignedto=1&open=1" title="Open">{$owner_open}</a> / <a href="query.php?op=mybugs&assignedto=1&open=0" title="Closed">{$owner_closed}</a>
+ | Bugs reported by me: <a href="query.php?op=mybugs&reportedby=1&open=1" title="Open">{$reporter_open}</a> / <a href="query.php?op=mybugs&reportedby=1&open=0" title="Closed">{$reporter_closed}</a>
+ | <a href="user.php">Personal Page</a>
+ | <a href="logout.php">Logout {$smarty.session.uname}</a>
+ {/if}
</form>
</td>
@@ -85,6 +86,7 @@
<tr>
<td bgcolor="#000000" height="1" colspan="2"><img src="images/spacer.gif" height="1" width="1"></td>
</tr>
+ {/if}
<tr>
<td bgcolor="#ffffff" height="20" colspan="2"><img src="images/spacer.gif" height="1" width="1"></td>
</tr>
|