diff options
| author | Michael Tänzer <neo@nhng.de> | 2013-02-27 01:17:34 +0100 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2013-02-27 01:17:34 +0100 |
| commit | a179527ab6174bf81346af5640cab11d9f245966 (patch) | |
| tree | f6e9b6d5e1498f28a43a1bc803e4b07885d832e8 /pages | |
| parent | be8f7fb541f322cb5350a61177ec6c2a3f4deb73 (diff) | |
| parent | 2519503420ca934e98c959d577e680e90e54b9e0 (diff) | |
| download | cacert-devel-a179527ab6174bf81346af5640cab11d9f245966.tar.gz cacert-devel-a179527ab6174bf81346af5640cab11d9f245966.tar.xz cacert-devel-a179527ab6174bf81346af5640cab11d9f245966.zip | |
Merge remote-tracking branch 'origin/bug-1082' into release
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/index/4.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pages/index/4.php b/pages/index/4.php index ffbfe26..9eb90af 100644 --- a/pages/index/4.php +++ b/pages/index/4.php @@ -29,7 +29,7 @@ <? } else { ?> <style> .box2 {width:100%;text-align:center;} -.box {background:#F5F7F7;border:2px solid #cccccc;margin:0px auto;height:250px;width:300px;padding:1em;} +.box {background:#F5F7F7;border:2px solid #cccccc;margin:0px auto;height:auto;width:300px;padding:1em;} .smalltext {font-size:10px;} label {width:100px;display:block;float:left;} text {width:166px;display:block;float:left;} @@ -45,15 +45,15 @@ h1 {font-size:1.9em;text-align:center;} <label for="email"><?=_("Email Address")?>:</label><input type='text' name="email" value="<?=sanitizeHTML(array_key_exists("email",$_REQUEST)?$_REQUEST['email']:"")?>" <? if(array_key_exists('notauto',$_REQUEST) && $_REQUEST['noauto'] == 1) echo " autocomplete='off'"; ?>/><br /> <label for="pword"><?=_("Pass Phrase")?>:</label><input type='password' name='pword' autocomplete="off"/><br /> <input type='submit' name="process" value="<?=_("Login")?>" /><br /><br /> -<a href='https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=4'><?=_("Password Login")?></a> - -<a href='https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=5'><?=_("Lost Password")?></a> - +<a href='https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=4'><?=_("Password Login")?></a> - +<a href='https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=5'><?=_("Lost Password")?></a> - <a href='https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=4&noauto=1'><?=_("Net Cafe Login")?></a><br /> <p class='smalltext'><?=sprintf(_("If you are having trouble with your username or password, please visit our %swiki page%s for more information"), "<a href='http://wiki.cacert.org/wiki/FAQ/LostPasswordOrAccount' target='_new'>", "</a>");?></p> <input type="hidden" name="oldid" value="<?=$id?>"> </form> </div> </div> -<? } +<? } if(array_key_exists("oldlocation",$_SESSION['_config']) && $_SESSION['_config']['oldlocation']!="") { echo "<br/><center>"._("If you want to use certificate login instead of username+password, please")." <a href='https://secure.cacert.org/".sanitizeHTML($_SESSION['_config']['oldlocation'])."'>"._("click here")."</a></center>"; |