bug #74

includes/general_stuff.php

@@ -75,10 +75,10 @@ google_color_border = "FFFFFF";
     </div>
     <div class="relatedLinks">
       <h3><?=_("My Account")?></h3>
-      <a href="https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=4"><?=_("Normal Login")?></a> 
-      <a href="https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=4&noauto=1"><?=_("Net Cafe Login")?></a> 
-      <a href="https://<?=$_SESSION['_config']['securehostname']?>/index.php?id=4"><?=_("Cert Login")?></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> 
+      <a href="https://<?=$_SESSION['_config']['securehostname']?>/index.php?id=4"><?=_("Certificate Login")?></a>
     </div>
     <div class="relatedLinks">
       <h3 onclick="explode('misc')"><?=_("Miscellaneous")?></h3>

scripts/warning.php

@@ -46,6 +46,7 @@
 					}
 				}
 			}
+			$row['daysleft'] = ceil($row['daysleft']);
 			$body = sprintf(_("Hi %s"), $row['fname']).",\n\n";
 			$body .= _("You are receieving this email as you are the listed contact for:")."\n\n";
 			$body .= $row['subject']."\n\n";
@@ -74,6 +75,7 @@ echo $row['fname']." ".$row['lname']." <".$row['email']."> (memid: ".$row['memid
 		$res = mysql_query($query);
 		while($row = mysql_fetch_assoc($res))
 		{
+			$row['daysleft'] = ceil($row['daysleft']);
 			$body = sprintf(_("Hi %s"), $row['fname']).",\n\n";
 			$body .= _("You are receieving this email as you are the listed contact for:")."\n\n";
 			$body .= $row['CN']."\n\n";