<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[8354] sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins: WordCamp Global Login: Remove the unnecessary funnel through the main site.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/8354">8354</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/8354","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-02-27 14:06:22 +0000 (Wed, 27 Feb 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordCamp Global Login: Remove the unnecessary funnel through the main site.
The login funnel was added because, at the time, 4th-level domains didn't have SSL certificates. Now that they do, this is no longer needed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginswcorgloginmessagephp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/wcorg-login-message.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginswcorggloballoginphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/wcorg-global-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginswcorggloballoginphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/wcorg-global-login.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/wcorg-global-login.php 2019-02-27 01:13:53 UTC (rev 8353)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/wcorg-global-login.php 2019-02-27 14:06:22 UTC (rev 8354)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,82 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Plugin Name: WordCamp.org Global Login Endpoint
- * Plugin Description: Allows users to only log in on WordCamp.org, and not any of the other sites in the network.
- */
-
-class WordCamp_Global_Login_Endpoint_Plugin {
-
- function __construct() {
- add_action( 'login_form_login', array( $this, 'login_form_login' ) );
- add_action( 'login_url', array( $this, 'login_url' ), 99, 2 );
- add_filter( 'allowed_redirect_hosts', array( $this, 'allowed_redirect_hosts' ) );
- add_action( 'muplugins_loaded', array( $this, 'muplugins_loaded' ) );
- }
-
- /**
- * A subdomain install will set the default auth cookie path to /wp-admin but we're
- * running a semi-subdomain install because we have subdirectories too. Explicitly
- * define the admin cookie path, otherwise it will get set to /wp-admin from the
- * wordcamp.org login point.
- */
- public function muplugins_loaded() {
- define( 'ADMIN_COOKIE_PATH', '/' );
- }
-
- /**
- * Don't render the login form, unless the current host is wordcamp.org
- */
- function login_form_login() {
-
- $loggedout = !empty( $_REQUEST['loggedout'] ) ? $_REQUEST['loggedout'] : '';
-
- $current_network = get_current_site();
- $url = parse_url( admin_url() );
- if ( $url['host'] != $current_network->domain ) {
- $login_url = wp_login_url();
- if ( $loggedout )
- $login_url = add_query_arg( 'loggedout', $loggedout, $login_url );
-
- wp_safe_redirect( $login_url );
- die();
- }
- }
-
- /**
- * Filter the wp_login_url function to always return the wordcamp.org login url.
- */
- function login_url( $login_url, $redirect ) {
-
- $current_network = get_current_site();
- $url = parse_url( $login_url );
- if ( $url['host'] != $current_network->domain ) {
- $login_url = sprintf( 'https://%s/wp-login.php', $current_network->domain );
-
- if ( $redirect )
- $login_url = add_query_arg( 'redirect_to', urlencode( $redirect ), $login_url );
-
- $login_url = esc_url_raw( $login_url );
- }
-
- return $login_url;
- }
-
- /**
- * When redirecting with ?redirect_to= from wordcamp.org, allow the redirects to
- * be other sites in the network. See wp_safe_redirect().
- */
- function allowed_redirect_hosts( $hosts ) {
-
- $redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
- $url = parse_url( $redirect_to );
- $current_network = get_current_site();
- $pattern = '/\.'. str_replace( '.', '\.', $current_network->domain ) .'$/i';
-
- if ( !empty( $url['host'] ) && preg_match( $pattern, $url['host'] ) )
- $hosts[] = $url['host'];
-
- return $hosts;
- }
-}
-
-$GLOBALS['wordcamp_gle'] = new WordCamp_Global_Login_Endpoint_Plugin;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginswcorgloginmessagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/wcorg-login-message.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/wcorg-login-message.php 2019-02-27 01:13:53 UTC (rev 8353)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/wcorg-login-message.php 2019-02-27 14:06:22 UTC (rev 8354)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,27 +38,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Set the locale on the login screen
- *
- * Currently all logins are funneled through the main site, so they're all in English by default. That sucks for
- * international users, so this overrides the main site's locale and uses the one from the site that they're
- * logging into instead.
- *
- * @todo This can be removed after the subdirectory migration.
- *
- * @param string $locale
- * @return string
- */
-function wcorg_login_message_locale( $locale ) {
- if ( is_main_network() && false !== strpos( $_SERVER['SCRIPT_NAME'], '/wp-login.php' ) ) {
- $locale = wcorg_get_login_locale( $locale );
- }
-
- return $locale;
-}
-add_filter( 'locale', 'wcorg_login_message_locale' );
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Override the default login message.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * We share user tables with WordPress.org, so users need to know to use that account.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +48,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wcorg_login_message( $message, $redirect_to = false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $locale = wcorg_get_login_locale();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $locale = get_locale();
</ins><span class="cx" style="display: block; padding: 0 10px"> $registration_url = wcorg_get_wporg_forums_url( $locale, 'register' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $redirect_to && ! empty( $_REQUEST['redirect_to'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,31 +95,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'login_message', 'wcorg_login_message' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Get the locale used by the site that the user is logging in to.
- *
- * @todo After subdirectory migration, users will login at city.wordcamp.org/year/wp-login.php instead of being
- * redirected through the main site, so change this to pull from current site's locale instead of using redirect_to
- *
- * @return string
- */
-function wcorg_get_login_locale( $locale = 'en_US' ) {
- if ( ! empty( $_REQUEST['redirect_to'] ) ) {
- $url = parse_url( $_REQUEST['redirect_to'] );
-
- if ( isset( $url['host'] ) ) {
- $blog_details = get_blog_details( array( 'domain' => $url['host'] ), false );
-
- if ( $wplang = get_blog_option( $blog_details->blog_id, 'WPLANG' ) ) {
- $locale = $wplang;
- }
- }
- }
-
- return $locale;
-}
-
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Determine the correct WordPress.org forums URL for the given locale
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @todo Add more sites as they're created
</span></span></pre>
</div>
</div>
</body>
</html>