[freeside-commits] branch master updated. 786daeef39e4009958f732744cacc0d24d16d021
Ivan
ivan at 420.am
Wed Apr 19 12:28:09 PDT 2017
The branch, master has been updated
via 786daeef39e4009958f732744cacc0d24d16d021 (commit)
from 5cfe4a2d5a299af5af44b249e12f114c9c886850 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 786daeef39e4009958f732744cacc0d24d16d021
Author: Ivan Kohler <ivan at freeside.biz>
Date: Wed Apr 19 12:28:08 2017 -0700
clean up example wordpress self-service, RT#75279
diff --git a/fs_selfservice/wordpress/example_login.php b/fs_selfservice/wordpress/example_login.php
index 1e3e6fe..1b19d46 100644
--- a/fs_selfservice/wordpress/example_login.php
+++ b/fs_selfservice/wordpress/example_login.php
@@ -22,7 +22,7 @@ if ( $error ) {
<FORM ACTION="process_login.php" METHOD=POST>
<INPUT TYPE="hidden" NAME="session" VALUE="login">
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=2 CELLPADDING=0>
+<TABLE>
<?php if ( $single_domain ) { ?>
@@ -64,7 +64,7 @@ if ( $error ) {
<FORM ACTION="process_login.php" METHOD=POST>
<INPUT TYPE="hidden" NAME="session" VALUE="login">
- <TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=2 CELLPADDING=0>
+ <TABLE>
<TR>
<TH ALIGN="right">Phone number </TH>
<TD>
diff --git a/fs_selfservice/wordpress/freeside_selfservice.php b/fs_selfservice/wordpress/freeside_selfservice.php
index f619e81..d26c56f 100644
--- a/fs_selfservice/wordpress/freeside_selfservice.php
+++ b/fs_selfservice/wordpress/freeside_selfservice.php
@@ -5,7 +5,7 @@ Plugin URI: http://freeside.biz/freeside
Description: Call the Freeside signup and self-service APIs from within Wordpress
Version: 0.20170417
Author: Freeside Internet Services, Inc.
-Author URI: https://freeside.biz/freeside/
+Author URI: http://freeside.biz/freeside/
License URI: https://www.gnu.org/licenses/gpl-3.0.html
Text Domain: freeside_selfserivce
Domain Path: /languages
@@ -46,9 +46,6 @@ function freeside_server_input() {
//TODO: remove freeside_server on uninstall
function freeside_init() {
- //error_log("FINALLY action run ". $FREESIDE_PROCESS_LOGIN);
-
- //error_log($GLOBALS['$FREESIDE_PROCESS_LOGIN']);
if ( ! $GLOBALS['FREESIDE_PROCESS_LOGIN'] ) {
return;
} else {
@@ -75,11 +72,12 @@ function freeside_init() {
$url .= $_SERVER['SERVER_NAME'];
$url .= $_SERVER['REQUEST_URI'];
- wp_redirect(dirname($url). '/example_login.php?username='. urlencode($_POST['freeside_username']).
- '&domain='. urlencode($_POST['freeside_domain']).
- '&email='. urlencode($_POST['freeside_email']).
- '&freeside_error='. urlencode($error)
- );
+ wp_redirect(dirname($url). '/example_login.php?'.
+ 'username='. urlencode($_POST['freeside_username']).
+ '&domain='. urlencode($_POST['freeside_domain']).
+ '&email='. urlencode($_POST['freeside_email']).
+ '&freeside_error='. urlencode($error)
+ );
exit;
}
@@ -90,10 +88,6 @@ function freeside_init() {
//error_log("[login] logged into freeside with session_id=$freeside_session_id, setting cookie");
-// now what? for now, always redirect to the main page (or the select a
-// customer diversion).
-// eventually, other options?
-
setcookie('freeside_session_id', $session_id);
$GLOBALS['FREESIDE_LOGIN_RESPONSE'] = $response;
@@ -125,7 +119,7 @@ class FreesideSelfService {
public function __call($name, $arguments) {
$URL = 'http://'. get_option('freeside_server'). ':8080';
- error_log("[FreesideSelfService] $name called, sending to ". $URL);
+ //error_log("[FreesideSelfService] $name called, sending to ". $URL);
$request = xmlrpc_encode_request("FS.ClientAPI_XMLRPC.$name", freeside_flatten($arguments[0]));
$context = stream_context_create( array( 'http' => array(
diff --git a/fs_selfservice/wordpress/process_login.php b/fs_selfservice/wordpress/process_login.php
index 2ddf27c..c1080ce 100644
--- a/fs_selfservice/wordpress/process_login.php
+++ b/fs_selfservice/wordpress/process_login.php
@@ -1,64 +1,17 @@
<?php
$GLOBALS['FREESIDE_PROCESS_LOGIN'] = true;
-//error_log($GLOBALS['$FREESIDE_PROCESS_LOGIN']);
require( dirname( __FILE__ ) . '/wp-blog-header.php' );
-//add_action('muplugins_loaded', 'freeside_process_login');
-//error_log("action added");
-
-function notfreeside_process_login() {
-error_log("FINALLY action run");
-
-$freeside = new FreesideSelfService();
-
-$response = $freeside->login( array(
- 'email' => strtolower($_POST['email']),
- 'username' => strtolower($_POST['username']),
- 'domain' => strtolower($_POST['domain']),
- 'password' => $_POST['password'],
-) );
-
-#error_log("[login] received response from freeside: $response");
-
-$error = $response['error'];
-
-if ( $error ) {
-
- wp_redirect('example_login.php?username='. urlencode($username).
- '&domain='. urlencode($domain).
- '&email='. urlencode($email).
- '&freeside_error='. urlencode($error)
- );
- exit;
-
-}
-
-// 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);
-
-}
-
$response = $GLOBALS['FREESIDE_LOGIN_RESPONSE'];
if ( $response['custnum'] || $response['svcnum'] ) {
- error_log('redirecting to example_selfservice.php');
wp_redirect("example_selfservice.php");
exit;
} elseif ( $response['customers'] ) {
- error_log('sending header');
get_header();
?>
-----------------------------------------------------------------------
Summary of changes:
fs_selfservice/wordpress/example_login.php | 4 +-
fs_selfservice/wordpress/freeside_selfservice.php | 22 ++++------
fs_selfservice/wordpress/process_login.php | 47 ---------------------
3 files changed, 10 insertions(+), 63 deletions(-)
More information about the freeside-commits
mailing list