X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=ng_selfservice%2Fprocess_login.php;h=22e2c7169c10ce0f25ac22ea4c7782fc9d0250ef;hp=d2d01550d355341394e5fed42a10da29c2f874c0;hb=f4ad9107585d16317bb15bf3223fe8b8eeeeb82c;hpb=2f7688b1b21d92b406d60d09cdd8edcd7a99e842

diff --git a/ng_selfservice/process_login.php b/ng_selfservice/process_login.php
index d2d01550d..22e2c7169 100644
--- a/ng_selfservice/process_login.php
+++ b/ng_selfservice/process_login.php
@@ -3,7 +3,15 @@
 require('freeside.class.php');
 $freeside = new FreesideSelfService();
 
+$ip = $_SERVER['REMOTE_ADDR'];
+
+if ($_POST['domain'] == "ip_mac") {
+  $mac_addr = $freeside->get_mac_address( array('ip' => $ip, ) );
+  $_POST['username'] = $mac_addr['mac_address'];
+}
+
 $response = $freeside->login( array( 
+  'email'    => strtolower($_POST['email']),
   'username' => strtolower($_POST['username']),
   'domain'   => strtolower($_POST['domain']),
   'password' => $_POST['password'],
@@ -15,9 +23,10 @@ $error = $response['error'];
 
 if ( $error ) {
 
-  header('Location:index.php?username='. urlencode($username).
-                            '&domain='.   urlencode($domain).
-                            '&error='.    urlencode($error)
+  header('Location:index.php?username='. urlencode($_POST['username']).
+                           '&domain='.   urlencode($_POST['domain']).
+                           '&email='.    urlencode($_POST['email']).
+                           '&error='.    urlencode($error)
         );
   die();
 
@@ -34,7 +43,7 @@ error_log("[login] logged into freeside with session_id=$session_id, setting coo
 
 setcookie('session_id', $session_id);
 
-header("Location:main.php")
+header("Location:main.php");
 #die();
 
-?>
+?>
\ No newline at end of file