X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ng_selfservice%2Findex.php;h=06e8fc13b44be5550e2974f3a34713c496201669;hb=f4ad9107585d16317bb15bf3223fe8b8eeeeb82c;hp=ec5468666881fd5c788bd349ea55ee476693b1c7;hpb=2f7688b1b21d92b406d60d09cdd8edcd7a99e842;p=freeside.git

diff --git a/ng_selfservice/index.php b/ng_selfservice/index.php
index ec5468666..06e8fc13b 100644
--- a/ng_selfservice/index.php
+++ b/ng_selfservice/index.php
@@ -3,13 +3,14 @@
 require('freeside.class.php');
 $freeside = new FreesideSelfService();
 
-$login_info = $freeside->login_info();
+$login_info = $freeside->login_info( array('session_id' => $_COOKIE['session_id'],));
 
 extract($login_info);
 
 $error = $_GET['error'];
 if ( $error ) {
   $username = $_GET['username'];
+  $email    = $_GET['email'];
   $domain   = $_GET['domain'];
 }
 
@@ -22,23 +23,23 @@ if ( $error ) {
 
 <TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=2 CELLPADDING=0>
 
-<TR>
-  <TH ALIGN="right">Username </TH>
-  <TD>
-    <INPUT TYPE="text" NAME="username" VALUE="<? echo htmlspecialchars($username); ?>"><? if ( $single_domain ) { echo '@'.$single_domain; } ?>
-  </TD>
-</TR>
-
 <? if ( $single_domain ) { ?>
 
+  <TR>
+    <TH ALIGN="right">Username </TH>
+    <TD>
+      <INPUT TYPE="text" NAME="username" VALUE="<? echo htmlspecialchars($username); ?>"><? if ( $single_domain ) { echo '@'.$single_domain; } ?>
+    </TD>
+  </TR>
+
   <INPUT TYPE="hidden" NAME="domain" VALUE="<? echo $single_domain ?>">
 
 <? } else { ?>
 
   <TR>
-    <TH ALIGN="right">Domain </TH>
+    <TH ALIGN="right">Email address </TH>
     <TD>
-      <INPUT TYPE="text" NAME="domain" VALUE="<? echo htmlspecialchars($domain); ?>">
+      <INPUT TYPE="text" NAME="email" VALUE="<? echo htmlspecialchars($email); ?>">
     </TD>
   </TR>
 
@@ -59,7 +60,7 @@ if ( $error ) {
 <? if ( $phone_login ) { ?>
 
   <B>OR</B><BR><BR>
-    
+
   <FORM ACTION="process_login.php" METHOD=POST>
   <INPUT TYPE="hidden" NAME="session" VALUE="login">
   <TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=2 CELLPADDING=0>
@@ -84,6 +85,10 @@ if ( $error ) {
 
 <? } ?>
 
+<!--
+<BR><BR><A HREF="ip_login.php">Login by IP (<? echo $_SERVER['REMOTE_ADDR']; ?>) to make a payment.</A>
+-->
+
 <? include('elements/footer.php'); ?>