Skip to content

Commit

Permalink
Merge branch 'release/1.7.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ClassyBot
ClassyBot committed Mar 9, 2024
2 parents 32aeafa + 9c230c3 commit 9392519
Show file tree
Hide file tree
Showing 1,260 changed files with 94,019 additions and 264,327 deletions.
2 changes: 1 addition & 1 deletion index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
define( 'WP_USE_THEMES', true );

/** Loads the ClassicPress Environment and Template */
require __DIR__ . '/wp-blog-header.php';
require dirname( __FILE__ ) . '/wp-blog-header.php';
96 changes: 41 additions & 55 deletions readme.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,28 @@
<html>

<head>
<meta name="viewport" content="width=device-width">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="robots" content="noindex, nofollow">
<meta name="viewport" content="width=device-width" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>ClassicPress &#8250; ReadMe</title>
<link rel="stylesheet" href="wp-admin/css/install.css?ver=20190218">
<link rel="stylesheet" href="wp-admin/css/install.css?ver=20190218" type="text/css" />
</head>

<body>
<h1 id="logo">
<a href="https://www.classicpress.net/">ClassicPress ReadMe</a>
<a href="https://www.classicpress.net/">ClassicPress</a>
</h1>
<p style="text-align: center">The CMS for Creators.<br>Stable. Lightweight. Instantly Familiar.</p>

<h2 id="welcome">Welcome to ClassicPress!</h2>
<p>You&#8217;ve just become part of a growing community of people who value the firm foundation WordPress
<p>You&#8217;ve just become part of a growing community of people who value the firm foundation WordPress 4.9.x
provides for websites everywhere. <a href="https://www.classicpress.net/governance/">Guided by our
community</a>, we can leverage our collective expertise to maintain and develop the ClassicPress platform as
<em>the</em> content management system of choice for professionals, hobbyists, developers, sole-traders and
<em>all</em> website creators worldwide.
</p>
<em>all</em> website creators worldwide.</p>
<p>Our purpose is to provide a stable, secure, and instantly familiar content management system driven by the needs
of the community. We invite you to connect with us and <a href="#resources">add your voice to the
conversation.</a>.</p>
<p><a href="https://www.classicpress.net/newsletter">Subscribe to our newsletter</a>, <a href="https://fosstodon.org/@classicpress">Mastodon</a>, or <a href="https://twitter.com/getclassicpress">Twitter</a> to receive the latest
announcements, news, and other updates about ClassicPress.</p>
<p style="text-align: right">&#8212; The ClassicPress Directors</p>

<h2 id="installation">Installation</h2>
<p>For more information about installing ClassicPress, see our <a
Expand Down Expand Up @@ -61,7 +58,8 @@ <h2 id="installation">Installation</h2>
</ol>

<h2 id="updating">Updating</h2>
<h3>Automatic Updater</h3>
<h3>Using the Automatic Updater</h3>
<p>If you are updating from beta version <code>1.0.0-beta1</code> or higher, you can use the automatic updater:</p>
<ol>
<li>Open <span class="file"><a href="wp-admin/update-core.php">wp-admin/update-core.php</a></span> in your
browser and follow the instructions.</li>
Expand All @@ -73,15 +71,14 @@ <h3>Updating Manually</h3>
<p>For more information, see our <a
href="https://docs.classicpress.net/updating-classicpress/#updating-classicpress-manually">manual update
documentation</a>.</p>
<ol>
<ol start="0">
<li>Before doing anything, <strong>make sure you have a working backup of the entire site as well as the
database</strong>.</li>
<li>Download the latest release of ClassicPress from our <a
href="https://link.classicpress.net/releases/">releases page</a>.</li>
<li>On your <strong>local computer</strong>, unzip the ClassicPress release file into a directory.</li>
<li>On your <strong>local computer</strong>, remove the <code>wp-config-sample.php</code> file and the
<code>wp-content</code> directory.
</li>
<code>wp-content</code> directory.</li>
<li>Upload what's left over to your server, replacing the existing files (using either SSH or an application
that connects over SFTP or FTP).</li>
<li>Point the browser to <span class="file"><a href="wp-admin/upgrade.php">/wp-admin/upgrade.php</a></span> and
Expand All @@ -96,25 +93,23 @@ <h2 id="migrating-from-wordpress">Migrating from WordPress</h2>

<h2 id="requirements">System Requirements</h2>
<ul>
<li><a href="https://secure.php.net/">PHP</a> version <strong>7.4</strong> or greater.</li>
<li><a href="https://www.mysql.com/">MySQL</a> version <strong>5.7</strong> or greater, or MariaDB version
<strong>10.4</strong>
or greater.</li>
<li><a href="https://httpd.apache.org/">Apache</a>, <a href="https://nginx.org/en/">Nginx</a>, <a
href="https://www.litespeedtech.com/">LiteSpeed</a> or another web server that supports PHP and
MySQL/MariaDB.</li>
<li><a href="https://secure.php.net/">PHP</a> version <strong>5.6</strong> or higher.</li>
<li><a href="https://www.mysql.com/">MySQL</a> version <strong>5.0</strong> or higher.</li>
<li><a href="https://httpd.apache.org/">Apache</a> version <strong>2.4</strong> server or higher.</li>
</ul>

<h3>Recommended Setup</h3>
<h3>Recommendations</h3>
<ul>
<li><a href="https://secure.php.net/">PHP</a> version <strong>8.0</strong> or greater.</li>
<li><a href="https://www.mysql.com/">MySQL</a> version <strong>5.7</strong> or greater, or <a
href="https://mariadb.org/">MariaDB</a> version <strong>10.4</strong> or greater.</li>
<li><a href="https://httpd.apache.org/">Apache</a> with <code>mod_rewrite</code> module, <a
href="https://nginx.org/en/">Nginx</a>, or <a href="https://www.litespeedtech.com/">LiteSpeed</a>
server.</li>
<li>An SSL certificate to support HTTPS (free from <a href="https://letsencrypt.org/">Let&#8217;s Encrypt</a>).
<li><a href="https://secure.php.net/" target="_blank" rel="noopener">PHP</a> version <strong>8.0</strong>
</li>
<li><a href="https://www.mysql.com/" target="_blank" rel="noopener">MySQL</a> version <strong>5.7</strong> or
higher or <a href="https://mariadb.org/" target="_blank" rel="noopener">MariaDB</a> version
<strong>10.3</strong> or higher.</li>
<li><a href="https://httpd.apache.org/" target="_blank" rel="noopener">Apache</a> <strong>2.4</strong>
with&nbsp;mod_rewrite module, <a href="https://nginx.org/en/" target="_blank" rel="noopener">Nginx</a>, or
<a href="https://www.litespeedtech.com/" target="_blank" rel="noopener">LiteSpeed</a> server.</li>
<li>An SSL certificate to support HTTPS (free from <a href="https://letsencrypt.org/" target="_blank"
rel="noopener">Let’s Encrypt</a>).</li>
</ul>

<h2 id="resources">Online Resources</h2>
Expand All @@ -133,47 +128,38 @@ <h2 id="resources">Online Resources</h2>
<dt><a href="https://forums.classicpress.net/c/support">ClassicPress Support Forums</a></dt>
<dd>The support forums are a great way to get help from other ClassicPress users. Many community members and
ClassicPress leaders are active here.</dd>
<dt><a href="https://www.classicpress.net/join-zulip/">ClassicPress Zulip Chat</a></dt>
<dt><a href="https://www.classicpress.net/join-slack/">ClassicPress Slack</a></dt>
<dd>There is an active online chat channel that is used for discussion among people who use ClassicPress and
plan its further development.</dd>
<dt><a href="https://github.com/ClassicPress/ClassicPress/issues/new/choose">ClassicPress Feature Requests</a>
</dt>
<dd>Do you have an idea to make ClassicPress better? Consider sharing your idea on GitHub for the core team and
the community to share feedback and, possibly, implement the feature.</dd>
<dt><a href="https://github.com/ClassicPress/ClassicPress/issues/new/choose">ClassicPress Feature Requests</a></dt>
<dd>Do you have an idea to make ClassicPress better? Consider sharing your idea on GitHub for the core team and the community to share feedback and, possibly, implement the feature.</dd>
<dt><a href="https://www.classicpress.net/governance/">ClassicPress Governance</a></dt>
<dd>Last but not least, read about the ClassicPress governance structure to understand how we do things and how
you can help. ClassicPress is a community-driven and funded fork of WordPress that enables all stakeholders
to
you can help. ClassicPress is a community-driven and funded fork of WordPress that enables all stakeholders to
shape the direction that the project takes. This page aims to explain how we handle this process to ensure
that power doesn't become centralised and that every voice can be heard.</dd>
</dl>

<h2 id="share">Help Promote ClassicPress</h2>
<h2 id="share">Share the Love</h2>
<p>ClassicPress has no multi-million dollar marketing campaign or celebrity sponsors, but we do have something even
better: you and the rest of our community. If you enjoy ClassicPress, please consider:</p>
<ul>
<li>Participating in our <a href="https://forums.classicpress.net/">forums</a>.</li>
<li>Telling a friend about ClassicPress or sharing it on social media.</li>
<li>Setting up a ClassicPress website for someone less knowledgeable than yourself.</li>
<li>Writing a blog post about why you chose to use ClassicPress for your website.</li>
<li>Writing to WordPress plugin and theme developers to ask them to support ClassicPress.</li>
<li>Participating in our <a href="https://forums.classicpress.net/">forums</a></li>
<li>Telling a friend about ClassicPress</li>
<li>Setting up a ClassicPress website for someone less knowledgeable than yourself</li>
<li>Sharing your favorite article about us with your social media followers</li>
<li>Writing a technical publication or other news organization to tell them about ClassicPress</li>
</ul>
<h2 id="fund">Community Funding</h2>
<p>ClassicPress is a community-driven and funded free, open-source project managed by 501(c)3 non-profit
ClassicPress Initiative.</p>
<p>You contributions help ClassicPress pay infrastructure and administrative costs. There are several ways you can
financially support ClassicPress:</p>
<h2 id="fund">Community Funded</h2>
<p>ClassicPress is a community-driven and funded free open source project. You contributions help ClassicPress pay infrastructure and administrative costs. There are several ways you can financially support ClassicPress:</p>
<ul>
<li><a href="https://opencollective.com/classicpress">Making a donation</a> to help us run the project
(donations in the US are tax-deductible).</li>
<li><a href="https://www.classicpress.net/sponsors/">Become a sponsor</a> to promote your business to
ClassicPress community.</li>
<li>Visit <a href="https://link.classicpress.net/merchandise/">ClassicPress brand store</a> to buy
ClassicPress-branded merchandise to show your support.</li>
<li><a href="https://opencollective.com/classicpress" title="Donate to ClassicPress">Making a donation</a> to help us run the project (donations in the US are tax-deductible).</li>
<li>If you have a business, <a href="https://www.classicpress.net/sponsors/">become a sponsor</a> to promote your brand to ClassicPress community. Sponsorships start at $250.</li>
<li>Support ClassicPress on GitHub by <a href="https://github.com/sponsors/ClassicPress">becoming a sponsor.</a></li>
<li>Visit <a href="https://www.cafepress.com/classicpress">ClassicPress Swag store</a> and buy ClassicPress-branded merchandise to show your support.</li>
</ul>
<h2 id="credits">Credits</h2>
<p>ClassicPress v2.0 is a hard fork of the <a href="https://wordpress.org/download/releases/">WordPress 6.2
branch</a>.
<p>ClassicPress is a hard fork of the <a href="https://wordpress.org/download/releases/">WordPress 4.9 branch</a>.
WordPress itself is a fork of b2/caf&#233;log from Michel Valdrighi.</p>

<h2 id="license">License</h2>
Expand Down
78 changes: 37 additions & 41 deletions wp-activate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
define( 'WP_INSTALLING', true );

/** Sets up the ClassicPress Environment. */
require __DIR__ . '/wp-load.php';
require dirname( __FILE__ ) . '/wp-load.php';

require __DIR__ . '/wp-blog-header.php';
require dirname( __FILE__ ) . '/wp-blog-header.php';

if ( ! is_multisite() ) {
wp_redirect( wp_registration_url() );
Expand All @@ -37,7 +37,7 @@
if ( $key ) {
$redirect_url = remove_query_arg( 'key' );

if ( remove_query_arg( false ) !== $redirect_url ) {
if ( $redirect_url !== remove_query_arg( false ) ) {
setcookie( $activate_cookie, $key, 0, $activate_path, COOKIE_DOMAIN, is_ssl(), true );
wp_safe_redirect( $redirect_url );
exit;
Expand All @@ -46,13 +46,13 @@
}
}

if ( null === $result && isset( $_COOKIE[ $activate_cookie ] ) ) {
if ( $result === null && isset( $_COOKIE[ $activate_cookie ] ) ) {
$key = $_COOKIE[ $activate_cookie ];
$result = wpmu_activate_signup( $key );
setcookie( $activate_cookie, ' ', time() - YEAR_IN_SECONDS, $activate_path, COOKIE_DOMAIN, is_ssl(), true );
}

if ( null === $result || ( is_wp_error( $result ) && 'invalid_key' === $result->get_error_code() ) ) {
if ( $result === null || ( is_wp_error( $result ) && 'invalid_key' === $result->get_error_code() ) ) {
status_header( 404 );
} elseif ( is_wp_error( $result ) ) {
$error_code = $result->get_error_code();
Expand All @@ -68,13 +68,13 @@
$wp_object_cache->cache_enabled = false;
}

// Fix for page title.
// Fix for page title
$wp_query->is_404 = false;

/**
* Fires before the Site Activation page is loaded.
*
* @since 3.0.0
* @since WP-3.0.0
*/
do_action( 'activate_header' );

Expand All @@ -83,15 +83,15 @@
*
* Fires on {@see 'wp_head'}.
*
* @since MU (3.0.0)
* @since WP-MU (3.0.0)
*/
function do_activate_header() {
/**
* Fires before the Site Activation page is loaded.
*
* Fires on the {@see 'wp_head'} action.
*
* @since 3.0.0
* @since WP-3.0.0
*/
do_action( 'activate_wp_head' );
}
Expand All @@ -100,41 +100,37 @@ function do_activate_header() {
/**
* Loads styles specific to this page.
*
* @since MU (3.0.0)
* @since WP-MU (3.0.0)
*/
function wpmu_activate_stylesheet() {
?>
<style>
.wp-activate-container { width: 90%; margin: 0 auto; }
.wp-activate-container form { margin-top: 2em; }
#submit, #key { width: 100%; font-size: 24px; box-sizing: border-box; }
#language { margin-top: 0.5em; }
.wp-activate-container .error { background: #f66; color: #333; }
span.h3 { padding: 0 8px; font-size: 1.3em; font-weight: 600; }
<style type="text/css">
form { margin-top: 2em; }
#submit, #key { width: 90%; font-size: 24px; }
#language { margin-top: .5em; }
.error { background: #f66; }
span.h3 { padding: 0 8px; font-size: 1.3em; font-weight: bold; }
</style>
<?php
}
add_action( 'wp_head', 'wpmu_activate_stylesheet' );
add_action( 'wp_head', 'wp_strict_cross_origin_referrer' );
add_filter( 'wp_robots', 'wp_robots_sensitive_page' );
add_action( 'wp_head', 'wp_sensitive_page_meta' );

get_header( 'wp-activate' );

$blog_details = get_blog_details();
?>

<div id="signup-content" class="widecolumn">
<div class="wp-activate-container">
<?php if ( ! $key ) { ?>

<h2><?php _e( 'Activation Key Required' ); ?></h2>
<form name="activateform" id="activateform" method="post" action="<?php echo network_site_url( $blog_details->path . 'wp-activate.php' ); ?>">
<form name="activateform" id="activateform" method="post" action="<?php echo network_site_url( 'wp-activate.php' ); ?>">
<p>
<label for="key"><?php _e( 'Activation Key:' ); ?></label>
<br><input type="text" name="key" id="key" value="" size="50" autofocus>
<br /><input type="text" name="key" id="key" value="" size="50" />
</p>
<p class="submit">
<input id="submit" type="submit" name="Submit" class="submit" value="<?php esc_attr_e( 'Activate' ); ?>">
<input id="submit" type="submit" name="Submit" class="submit" value="<?php esc_attr_e( 'Activate' ); ?>" />
</p>
</form>

Expand All @@ -146,27 +142,27 @@ function wpmu_activate_stylesheet() {
<h2><?php _e( 'Your account is now active!' ); ?></h2>
<?php
echo '<p class="lead-in">';
if ( '' === $signup->domain . $signup->path ) {
if ( $signup->domain . $signup->path == '' ) {
printf(
/* translators: 1: Login URL, 2: Username, 3: User email address, 4: Lost password URL. */
/* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */
__( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
network_site_url( $blog_details->path . 'wp-login.php', 'login' ),
network_site_url( 'wp-login.php', 'login' ),
$signup->user_login,
$signup->user_email,
wp_lostpassword_url()
);
} else {
printf(
/* translators: 1: Site URL, 2: Username, 3: User email address, 4: Lost password URL. */
/* translators: 1: site URL, 2: username, 3: user email, 4: lost password URL */
__( 'Your site at %1$s is active. You may now log in to your site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
sprintf( '<a href="http://%1$s%2$s">%1$s%2$s</a>', $signup->domain, $blog_details->path ),
sprintf( '<a href="http://%1$s">%1$s</a>', $signup->domain ),
$signup->user_login,
$signup->user_email,
wp_lostpassword_url()
);
}
echo '</p>';
} elseif ( null === $result || is_wp_error( $result ) ) {
} elseif ( $result === null || is_wp_error( $result ) ) {
?>
<h2><?php _e( 'An error occurred during the activation' ); ?></h2>
<?php if ( is_wp_error( $result ) ) : ?>
Expand All @@ -180,39 +176,39 @@ function wpmu_activate_stylesheet() {
<h2><?php _e( 'Your account is now active!' ); ?></h2>

<div id="signup-welcome">
<p><span class="h3"><?php _e( 'Username:' ); ?></span> <?php echo $user->user_login; ?></p>
<p><span class="h3"><?php _e( 'Password:' ); ?></span> <?php echo $result['password']; ?></p>
<p><span class="h3"><?php _e( 'Username:' ); ?></span> <?php echo $user->user_login; ?></p>
<p><span class="h3"><?php _e( 'Password:' ); ?></span> <?php echo $result['password']; ?></p>
</div>

<?php
if ( $url && network_home_url( '', 'http' ) !== $url ) :
if ( $url && $url != network_home_url( '', 'http' ) ) :
switch_to_blog( (int) $result['blog_id'] );
$login_url = wp_login_url();
restore_current_blog();
?>
<p class="view">
<?php
/* translators: 1: Site URL, 2: Login URL. */
/* translators: 1: site URL, 2: login URL */
printf( __( 'Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>' ), $url, esc_url( $login_url ) );
?>
</p>
<?php else : ?>
<p class="view">
<?php
printf(
/* translators: 1: Login URL, 2: Network home URL. */
__( 'Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ),
network_site_url( $blog_details->path . 'wp-login.php', 'login' ),
network_home_url( $blog_details->path )
);
/* translators: 1: login URL, 2: network home URL */
printf( __( 'Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url( 'wp-login.php', 'login' ), network_home_url() );
?>
</p>
<?php
endif;
endif;
}
}
?>
</div>
</div>
<script type="text/javascript">
var key_input = document.getElementById('key');
key_input && key_input.focus();
</script>
<?php
get_footer( 'wp-activate' );
Loading

0 comments on commit 9392519

Please sign in to comment.