Skip to content

Fixing Broken auth when using UBP_SITEURL #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ryanwooten6 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixing Broken auth when using UBP_SITEURL #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions class-404-template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class UBP_404_Template {
var $remote_path;
var $local_path;
var $response;
var $url_parts;

function __construct() {
// Only run for whitelisted paths
Expand Down Expand Up @@ -119,18 +120,20 @@ public function get_siteurl() {
// Strip schema, slashes, and whitespace
$url = str_replace( array( 'http://', 'https://' ), '', UBP_LIVE_DOMAIN );
$url = 'http://' . $url;
$this->url_parts = parse_url($url);

}else if ( defined( 'UBP_SITEURL' ) && false !== UBP_SITEURL ) {

$url = parse_url( UBP_SITEURL );
$url = 'http://' . $url['host'] . @$url['path'];
$this->url_parts = parse_url( UBP_SITEURL );
$url = 'http://' . $this->url_parts['host'] . @$this->url_parts['path'];

}else if ( !is_multisite() ) {
// Nothing set... Get original siteurl from database

remove_filter( 'option_siteurl', '_config_wp_siteurl' );
$url = get_option( 'siteurl' );
add_filter( 'option_siteurl', '_config_wp_siteurl' );
$this->url_parts = parse_url($url);

}

Expand All @@ -149,8 +152,13 @@ public function get_domain() {

public function get_auth() {
if ( !isset( $this->auth ) ) {
$user = parse_url( $this->get_siteurl(), PHP_URL_USER );
$pass = parse_url( $this->get_siteurl(), PHP_URL_PASS );
if(!isset($this->url_parts)){
$user = parse_url( $this->get_siteurl(), PHP_URL_USER );
$pass = parse_url( $this->get_siteurl(), PHP_URL_PASS );
}else{
$user = $this->url_parts['user'];
$pass = $this->url_parts['pass'];
}

if ( $user && $pass )
$this->auth = $user . ':' . $pass . '@';
Expand Down Expand Up @@ -195,4 +203,4 @@ public function get_remote_path() {
return $this->remote_path;
}

}
}