From b22ecae7aaa96df5f0e70a5bea87ee42feaf7d30 Mon Sep 17 00:00:00 2001 From: Christopher Burger Date: Tue, 2 Oct 2018 12:48:24 -0400 Subject: Revert "RT# 39340 - removed min_selfservice dir and merged into ng_selfservice" This reverts commit 77baa7974ade41e55d85de22e7d7a54273dd442f. --- ng_selfservice/elements/header.php | 18 ------- ng_selfservice/index.php | 8 +-- ng_selfservice/ip_login.php | 105 ------------------------------------- ng_selfservice/no_access.php | 34 ------------ ng_selfservice/process_login.php | 15 ++---- 5 files changed, 6 insertions(+), 174 deletions(-) delete mode 100644 ng_selfservice/ip_login.php delete mode 100644 ng_selfservice/no_access.php (limited to 'ng_selfservice') diff --git a/ng_selfservice/elements/header.php b/ng_selfservice/elements/header.php index 3ef5c6e12..633996515 100644 --- a/ng_selfservice/elements/header.php +++ b/ng_selfservice/elements/header.php @@ -1,21 +1,3 @@ -check_access( array( - 'session_id' => $_COOKIE['session_id'], - 'page' => $page, -) ); - -if ($access['error']) { - header('Location:no_access.php?error='. urlencode($access['error'])); - die(); -} - -?> - diff --git a/ng_selfservice/index.php b/ng_selfservice/index.php index 06e8fc13b..62b6562c8 100644 --- a/ng_selfservice/index.php +++ b/ng_selfservice/index.php @@ -3,7 +3,7 @@ require('freeside.class.php'); $freeside = new FreesideSelfService(); -$login_info = $freeside->login_info( array('session_id' => $_COOKIE['session_id'],)); +$login_info = $freeside->login_info(); extract($login_info); @@ -60,7 +60,7 @@ if ( $error ) { OR

- +
@@ -85,10 +85,6 @@ if ( $error ) { - - diff --git a/ng_selfservice/ip_login.php b/ng_selfservice/ip_login.php deleted file mode 100644 index 153065767..000000000 --- a/ng_selfservice/ip_login.php +++ /dev/null @@ -1,105 +0,0 @@ -get_mac_address( array('ip' => $ip, ) ); - -$response = $freeside->login( array( - 'username' => $mac['mac_address'], - 'domain' => 'ip_mac', -) ); - -$error = $response['error']; - -if ( $error ) { - - $title ='Login'; include('elements/header.php'); - include('elements/error.php'); - echo "Sorry "+$error; - - // header('Location:index.php?username='. urlencode($mac). - // '&domain='. urlencode($domain). - // '&email='. urlencode($email). - // '&error='. urlencode($error) - // ); - -} -else { -// sucessful login - -$session_id = $response['session_id']; - -error_log("[login] logged into freeside with session_id=$session_id, setting cookie"); - -// now what? for now, always redirect to the main page (or the select a -// customer diversion). -// eventually, other options? - -setcookie('session_id', $session_id); - -if ( $response['custnum'] || $response['svcnum'] ) { - - header("Location:main.php"); - die(); - //1; - -} elseif ( $response['customers'] ) { - //var_dump($response['customers']); -?> - - - - - - - -
- - - - - - - - - - -
Customer - -
-
- - - - - - diff --git a/ng_selfservice/no_access.php b/ng_selfservice/no_access.php deleted file mode 100644 index b13cca93c..000000000 --- a/ng_selfservice/no_access.php +++ /dev/null @@ -1,34 +0,0 @@ - - - - - Access Denied - - - - - - - Access Denied -

- -customer_info_short( array( - 'session_id' => $_COOKIE['session_id'], -) ); - -if ( isset($customer_info['error']) && $customer_info['error'] ) { - $error = $customer_info['error']; - header('Location:index.php?error='. urlencode($error)); - die(); -} - -extract($customer_info); - -?> - -

Sorry you do not have access to the page you are trying to reach.

- - - \ No newline at end of file diff --git a/ng_selfservice/process_login.php b/ng_selfservice/process_login.php index d98281a1a..15b000b14 100644 --- a/ng_selfservice/process_login.php +++ b/ng_selfservice/process_login.php @@ -3,13 +3,6 @@ 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']), @@ -23,9 +16,9 @@ $error = $response['error']; if ( $error ) { - header('Location:index.php?username='. urlencode($_POST['username']). - '&domain='. urlencode($_POST['domain']). - '&email='. urlencode($_POST['email']). + header('Location:index.php?username='. urlencode($username). + '&domain='. urlencode($domain). + '&email='. urlencode($email). '&error='. urlencode($error) ); die(); @@ -50,7 +43,7 @@ if ( $response['custnum'] || $response['svcnum'] ) { die(); } elseif ( $response['customers'] ) { - //var_dump($response['customers']); +var_dump($response['customers']); ?> -- cgit v1.2.1