From e95f836556e0a426cbc1162db2c517a4e72f685d Mon Sep 17 00:00:00 2001
From: lucha <lucha@paranoici.org>
Date: Wed, 19 Aug 2020 16:41:04 -0700
Subject: [PATCH] removed non-patches patches
---
...-fixed-css-to-handle-heigth-overflow.patch | 26 --
...he-server-definition-for-the-local-r.patch | 26 --
...o-the-policy-on-the-registration-pag.patch | 374 ------------------
3 files changed, 426 deletions(-)
delete mode 100644 patches/0148-fixed-css-to-handle-heigth-overflow.patch
delete mode 100644 patches/0162-Adding-port-to-the-server-definition-for-the-local-r.patch
delete mode 100644 patches/0171-added-the-link-to-the-policy-on-the-registration-pag.patch
diff --git a/patches/0148-fixed-css-to-handle-heigth-overflow.patch b/patches/0148-fixed-css-to-handle-heigth-overflow.patch
deleted file mode 100644
index dd7e8e61..00000000
--- a/patches/0148-fixed-css-to-handle-heigth-overflow.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b65b56d144ad321d3896cf5f3ad3bfe4cf2f2f57 Mon Sep 17 00:00:00 2001
-From: lucha <lucha@paranoici.org>
-Date: Thu, 4 Oct 2012 00:14:07 +0200
-Subject: [PATCH 148/229] fixed css to handle heigth overflow
-
----
- .../privacy-share-buttons/css/socialshareprivacy.css | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/wp-content/plugins/privacy-share-buttons/css/socialshareprivacy.css b/wp-content/plugins/privacy-share-buttons/css/socialshareprivacy.css
-index 25fb11b0..cd8f0a1d 100755
---- a/wp-content/plugins/privacy-share-buttons/css/socialshareprivacy.css
-+++ b/wp-content/plugins/privacy-share-buttons/css/socialshareprivacy.css
-@@ -1,6 +1,6 @@
--.social_share_privacy {width:100%;}
--.social_share_privacy_area ul {position:relative;}
--.social_share_privacy_area li {float:left; list-style-type:none !important; list-style:none !important;}
-+.social_share_privacy {width:100%; heigth: 25px;}
-+.social_share_privacy_area ul {position:relative; heigth: 25px; }
-+.social_share_privacy_area li {float:left; heigth: 25px; list-style-type:none !important; list-style:none !important;}
- .social_share_privacy_area li .dummy_btn {cursor:pointer;}
-
- /* Tooltips */
---
-2.17.1
-
diff --git a/patches/0162-Adding-port-to-the-server-definition-for-the-local-r.patch b/patches/0162-Adding-port-to-the-server-definition-for-the-local-r.patch
deleted file mode 100644
index 80779197..00000000
--- a/patches/0162-Adding-port-to-the-server-definition-for-the-local-r.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ea198f971a37086587ebda72db160c8e7d5d7d0a Mon Sep 17 00:00:00 2001
-From: Joe <joe@autistici.org>
-Date: Fri, 3 May 2013 21:16:57 +0200
-Subject: [PATCH 162/229] Adding port to the server definition for the local
- read-only global dataset
-
----
- r2db/db-backends.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/r2db/db-backends.php b/r2db/db-backends.php
-index 44180a2e..e99f2df1 100644
---- a/r2db/db-backends.php
-+++ b/r2db/db-backends.php
-@@ -57,7 +57,7 @@ function noblogs_load_global_dataset($master_file, $ip_file) {
- } else {
- $globaldb['read'] = 0;
- $wpdb->add_database($globaldb);
-- $globaldb['host'] = $ldata;
-+ $globaldb['host'] = $ldata . ":" . $mdata["port"];
- $globaldb['read'] = 1;
- $globaldb['write'] = 0;
- $wpdb->add_database($globaldb);
---
-2.17.1
-
diff --git a/patches/0171-added-the-link-to-the-policy-on-the-registration-pag.patch b/patches/0171-added-the-link-to-the-policy-on-the-registration-pag.patch
deleted file mode 100644
index 1c5c49ae..00000000
--- a/patches/0171-added-the-link-to-the-policy-on-the-registration-pag.patch
+++ /dev/null
@@ -1,374 +0,0 @@
-From 20d07b96800567c6c04abfcb0623208dca7fd8ea Mon Sep 17 00:00:00 2001
-From: lucha <lucha@paranoici.org>
-Date: Mon, 25 Nov 2013 18:44:43 +0000
-Subject: [PATCH 171/229] added the link to the policy on the registration page
-
----
- .../noblogs-home/registration/activate.php | 56 ++++
- .../noblogs-home/registration/register.php | 291 ++++++++++++++++++
- 2 files changed, 347 insertions(+)
- create mode 100644 wp-content/themes/noblogs-home/registration/activate.php
- create mode 100644 wp-content/themes/noblogs-home/registration/register.php
-
-diff --git a/wp-content/themes/noblogs-home/registration/activate.php b/wp-content/themes/noblogs-home/registration/activate.php
-new file mode 100644
-index 00000000..d2eddc4a
---- /dev/null
-+++ b/wp-content/themes/noblogs-home/registration/activate.php
-@@ -0,0 +1,56 @@
-+<?php get_header( 'buddypress' ); ?>
-+
-+ <div id="content">
-+ <div class="padder">
-+
-+ <?php do_action( 'bp_before_activation_page' ); ?>
-+
-+ <div class="page" id="activate-page">
-+
-+ <h3><?php if ( bp_account_was_activated() ) :
-+ _e( 'Account Activated', 'buddypress' );
-+ else :
-+ _e( 'Activate your Account', 'buddypress' );
-+ endif; ?></h3>
-+
-+ <?php do_action( 'template_notices' ); ?>
-+
-+ <?php do_action( 'bp_before_activate_content' ); ?>
-+
-+ <?php if ( bp_account_was_activated() ) : ?>
-+
-+ <?php if ( isset( $_GET['e'] ) ) : ?>
-+ <p><?php _e( 'Your account was activated successfully! Your account details have been sent to you in a separate email.', 'buddypress' ); ?></p>
-+ <?php else : ?>
-+ <p><?php printf( __( 'Your account was activated successfully! You can now <a href="%s">log in</a> with the username and password you provided when you signed up.', 'buddypress' ), wp_login_url( bp_get_root_domain() ) ); ?></p>
-+ <?php endif; ?>
-+
-+ <?php else : ?>
-+
-+ <p><?php _e( 'Please provide a valid activation key.', 'buddypress' ); ?></p>
-+
-+ <form action="" method="get" class="standard-form" id="activation-form">
-+
-+ <label for="key"><?php _e( 'Activation Key:', 'buddypress' ); ?></label>
-+ <input type="text" name="key" id="key" value="" />
-+
-+ <p class="submit">
-+ <input type="submit" name="submit" value="<?php _e( 'Activate', 'buddypress' ); ?>" />
-+ </p>
-+
-+ </form>
-+
-+ <?php endif; ?>
-+
-+ <?php do_action( 'bp_after_activate_content' ); ?>
-+
-+ </div><!-- .page -->
-+
-+ <?php do_action( 'bp_after_activation_page' ); ?>
-+
-+ </div><!-- .padder -->
-+ </div><!-- #content -->
-+
-+ <?php get_sidebar( 'buddypress' ); ?>
-+
-+<?php get_footer( 'buddypress' ); ?>
-diff --git a/wp-content/themes/noblogs-home/registration/register.php b/wp-content/themes/noblogs-home/registration/register.php
-new file mode 100644
-index 00000000..f463af08
---- /dev/null
-+++ b/wp-content/themes/noblogs-home/registration/register.php
-@@ -0,0 +1,291 @@
-+<?php get_header( 'buddypress' ); ?>
-+
-+ <div id="content">
-+ <div class="padder">
-+
-+ <?php do_action( 'bp_before_register_page' ); ?>
-+
-+ <div class="page" id="register-page">
-+
-+ <form action="" name="signup_form" id="signup_form" class="standard-form" method="post" enctype="multipart/form-data">
-+
-+ <?php if ( 'registration-disabled' == bp_get_current_signup_step() ) : ?>
-+ <?php do_action( 'template_notices' ); ?>
-+ <?php do_action( 'bp_before_registration_disabled' ); ?>
-+
-+ <p><?php _e( 'User registration is currently not allowed.', 'buddypress' ); ?></p>
-+
-+ <?php do_action( 'bp_after_registration_disabled' ); ?>
-+ <?php endif; // registration-disabled signup setp ?>
-+
-+ <?php if ( 'request-details' == bp_get_current_signup_step() ) : ?>
-+
-+ <h2><?php _e( 'Create an Account', 'buddypress' ); ?></h2>
-+
-+ <?php do_action( 'template_notices' ); ?>
-+
-+ <p><?php _e( 'Before registering, please read our <a href="https://noblogs.org/policy">policy</a>. You may also want to install our <a href="http://ca.autistici.org">CA</a>.', 'buddypress' ); ?></p>
-+
-+ <?php do_action( 'bp_before_account_details_fields' ); ?>
-+
-+ <div class="register-section" id="basic-details-section">
-+
-+ <?php /***** Basic Account Details ******/ ?>
-+
-+ <h4><?php _e( 'Account Details', 'buddypress' ); ?></h4>
-+
-+ <label for="signup_username"><?php _e( 'Username', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label>
-+ <?php do_action( 'bp_signup_username_errors' ); ?>
-+ <input type="text" name="signup_username" id="signup_username" value="<?php bp_signup_username_value(); ?>" />
-+
-+ <label for="signup_email"><?php _e( 'Email Address [<a href="#fn1">*</a>]', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label>
-+ <?php do_action( 'bp_signup_email_errors' ); ?>
-+ <input type="text" name="signup_email" id="signup_email" value="<?php bp_signup_email_value(); ?>" />
-+
-+ <label for="signup_password"><?php _e( 'Choose a Password', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label>
-+ <?php do_action( 'bp_signup_password_errors' ); ?>
-+ <input type="password" name="signup_password" id="signup_password" value="" />
-+
-+ <label for="signup_password_confirm"><?php _e( 'Confirm Password', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label>
-+ <?php do_action( 'bp_signup_password_confirm_errors' ); ?>
-+ <input type="password" name="signup_password_confirm" id="signup_password_confirm" value="" />
-+ </div><!-- #basic-details-section -->
-+
-+ <?php do_action( 'bp_after_account_details_fields' ); ?>
-+
-+ <?php /***** Extra Profile Details ******/ ?>
-+
-+ <?php if ( bp_is_active( 'xprofile' ) ) : ?>
-+
-+ <?php do_action( 'bp_before_signup_profile_fields' ); ?>
-+
-+ <div class="register-section" id="profile-details-section">
-+
-+ <h4><?php _e( 'Profile Details', 'buddypress' ); ?></h4>
-+
-+ <?php /* Use the profile field loop to render input fields for the 'base' profile field group */ ?>
-+ <?php if ( bp_is_active( 'xprofile' ) ) : if ( bp_has_profile( 'profile_group_id=1' ) ) : while ( bp_profile_groups() ) : bp_the_profile_group(); ?>
-+
-+ <?php while ( bp_profile_fields() ) : bp_the_profile_field(); ?>
-+
-+ <div class="editfield">
-+
-+ <?php if ( 'textbox' == bp_get_the_profile_field_type() ) : ?>
-+
-+ <label for="<?php bp_the_profile_field_input_name(); ?>"><?php bp_the_profile_field_name(); ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ); ?><?php endif; ?></label>
-+ <?php do_action( bp_get_the_profile_field_errors_action() ); ?>
-+ <input type="text" name="<?php bp_the_profile_field_input_name(); ?>" id="<?php bp_the_profile_field_input_name(); ?>" value="<?php bp_the_profile_field_edit_value(); ?>" />
-+
-+ <?php endif; ?>
-+
-+ <?php if ( 'textarea' == bp_get_the_profile_field_type() ) : ?>
-+
-+ <label for="<?php bp_the_profile_field_input_name(); ?>"><?php bp_the_profile_field_name(); ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ); ?><?php endif; ?></label>
-+ <?php do_action( bp_get_the_profile_field_errors_action() ); ?>
-+ <textarea rows="5" cols="40" name="<?php bp_the_profile_field_input_name(); ?>" id="<?php bp_the_profile_field_input_name(); ?>"><?php bp_the_profile_field_edit_value(); ?></textarea>
-+
-+ <?php endif; ?>
-+
-+ <?php if ( 'selectbox' == bp_get_the_profile_field_type() ) : ?>
-+
-+ <label for="<?php bp_the_profile_field_input_name(); ?>"><?php bp_the_profile_field_name(); ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ); ?><?php endif; ?></label>
-+ <?php do_action( bp_get_the_profile_field_errors_action() ); ?>
-+ <select name="<?php bp_the_profile_field_input_name(); ?>" id="<?php bp_the_profile_field_input_name(); ?>">
-+ <?php bp_the_profile_field_options(); ?>
-+ </select>
-+
-+ <?php endif; ?>
-+
-+ <?php if ( 'multiselectbox' == bp_get_the_profile_field_type() ) : ?>
-+
-+ <label for="<?php bp_the_profile_field_input_name(); ?>"><?php bp_the_profile_field_name(); ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ); ?><?php endif; ?></label>
-+ <?php do_action( bp_get_the_profile_field_errors_action() ); ?>
-+ <select name="<?php bp_the_profile_field_input_name(); ?>" id="<?php bp_the_profile_field_input_name(); ?>" multiple="multiple">
-+ <?php bp_the_profile_field_options(); ?>
-+ </select>
-+
-+ <?php endif; ?>
-+
-+ <?php if ( 'radio' == bp_get_the_profile_field_type() ) : ?>
-+
-+ <div class="radio">
-+ <span class="label"><?php bp_the_profile_field_name(); ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ); ?><?php endif; ?></span>
-+
-+ <?php do_action( bp_get_the_profile_field_errors_action() ); ?>
-+ <?php bp_the_profile_field_options(); ?>
-+
-+ <?php if ( !bp_get_the_profile_field_is_required() ) : ?>
-+ <a class="clear-value" href="javascript:clear( '<?php bp_the_profile_field_input_name(); ?>' );"><?php _e( 'Clear', 'buddypress' ); ?></a>
-+ <?php endif; ?>
-+ </div>
-+
-+ <?php endif; ?>
-+
-+ <?php if ( 'checkbox' == bp_get_the_profile_field_type() ) : ?>
-+
-+ <div class="checkbox">
-+ <span class="label"><?php bp_the_profile_field_name(); ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ); ?><?php endif; ?></span>
-+
-+ <?php do_action( bp_get_the_profile_field_errors_action() ); ?>
-+ <?php bp_the_profile_field_options(); ?>
-+ </div>
-+
-+ <?php endif; ?>
-+
-+ <?php if ( 'datebox' == bp_get_the_profile_field_type() ) : ?>
-+
-+ <div class="datebox">
-+ <label for="<?php bp_the_profile_field_input_name(); ?>_day"><?php bp_the_profile_field_name(); ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ); ?><?php endif; ?></label>
-+ <?php do_action( bp_get_the_profile_field_errors_action() ); ?>
-+
-+ <select name="<?php bp_the_profile_field_input_name(); ?>_day" id="<?php bp_the_profile_field_input_name(); ?>_day">
-+ <?php bp_the_profile_field_options( 'type=day' ); ?>
-+ </select>
-+
-+ <select name="<?php bp_the_profile_field_input_name(); ?>_month" id="<?php bp_the_profile_field_input_name(); ?>_month">
-+ <?php bp_the_profile_field_options( 'type=month' ); ?>
-+ </select>
-+
-+ <select name="<?php bp_the_profile_field_input_name(); ?>_year" id="<?php bp_the_profile_field_input_name(); ?>_year">
-+ <?php bp_the_profile_field_options( 'type=year' ); ?>
-+ </select>
-+ </div>
-+
-+ <?php endif; ?>
-+
-+ <?php do_action( 'bp_custom_profile_edit_fields_pre_visibility' ); ?>
-+
-+ <?php if ( bp_current_user_can( 'bp_xprofile_change_field_visibility' ) ) : ?>
-+ <p class="field-visibility-settings-toggle" id="field-visibility-settings-toggle-<?php bp_the_profile_field_id() ?>">
-+ <?php printf( __( 'This field can be seen by: <span class="current-visibility-level">%s</span>', 'buddypress' ), bp_get_the_profile_field_visibility_level_label() ) ?> <a href="#" class="visibility-toggle-link"><?php _ex( 'Change', 'Change profile field visibility level', 'buddypress' ); ?></a>
-+ </p>
-+
-+ <div class="field-visibility-settings" id="field-visibility-settings-<?php bp_the_profile_field_id() ?>">
-+ <fieldset>
-+ <legend><?php _e( 'Who can see this field?', 'buddypress' ) ?></legend>
-+
-+ <?php bp_profile_visibility_radio_buttons() ?>
-+
-+ </fieldset>
-+ <a class="field-visibility-settings-close" href="#"><?php _e( 'Close', 'buddypress' ) ?></a>
-+
-+ </div>
-+ <?php else : ?>
-+ <p class="field-visibility-settings-notoggle" id="field-visibility-settings-toggle-<?php bp_the_profile_field_id() ?>">
-+ <?php printf( __( 'This field can be seen by: <span class="current-visibility-level">%s</span>', 'buddypress' ), bp_get_the_profile_field_visibility_level_label() ) ?>
-+ </p>
-+ <?php endif ?>
-+
-+ <?php do_action( 'bp_custom_profile_edit_fields' ); ?>
-+
-+ <p class="description"><?php bp_the_profile_field_description(); ?></p>
-+
-+ </div>
-+
-+ <?php endwhile; ?>
-+
-+ <input type="hidden" name="signup_profile_field_ids" id="signup_profile_field_ids" value="<?php bp_the_profile_group_field_ids(); ?>" />
-+
-+ <?php endwhile; endif; endif; ?>
-+
-+ </div><!-- #profile-details-section -->
-+
-+ <?php do_action( 'bp_after_signup_profile_fields' ); ?>
-+
-+ <?php endif; ?>
-+
-+ <?php if ( bp_get_blog_signup_allowed() ) : ?>
-+
-+ <?php do_action( 'bp_before_blog_details_fields' ); ?>
-+
-+ <?php /***** Blog Creation Details ******/ ?>
-+
-+ <div class="register-section" id="blog-details-section">
-+
-+ <h4><?php _e( 'Blog Details', 'buddypress' ); ?></h4>
-+
-+ <p><input type="checkbox" name="signup_with_blog" id="signup_with_blog" value="1"<?php if ( (int) bp_get_signup_with_blog_value() ) : ?> checked="checked"<?php endif; ?> /> <?php _e( 'Yes, I\'d like to create a new site', 'buddypress' ); ?></p>
-+
-+ <div id="blog-details"<?php if ( (int) bp_get_signup_with_blog_value() ) : ?>class="show"<?php endif; ?>>
-+
-+ <label for="signup_blog_url"><?php _e( 'Blog URL', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label>
-+ <?php do_action( 'bp_signup_blog_url_errors' ); ?>
-+
-+ <?php if ( is_subdomain_install() ) : ?>
-+ http:// <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value(); ?>" /> .<?php bp_blogs_subdomain_base(); ?>
-+ <?php else : ?>
-+ <?php echo home_url( '/' ); ?> <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value(); ?>" />
-+ <?php endif; ?>
-+
-+ <label for="signup_blog_title"><?php _e( 'Site Title', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label>
-+ <?php do_action( 'bp_signup_blog_title_errors' ); ?>
-+ <input type="text" name="signup_blog_title" id="signup_blog_title" value="<?php bp_signup_blog_title_value(); ?>" />
-+
-+ <span class="label"><?php _e( 'I would like my site to appear in search engines, and in public listings around this network.', 'buddypress' ); ?>:</span>
-+ <?php do_action( 'bp_signup_blog_privacy_errors' ); ?>
-+
-+ <label><input type="radio" name="signup_blog_privacy" id="signup_blog_privacy_public" value="public"<?php if ( 'public' == bp_get_signup_blog_privacy_value() || !bp_get_signup_blog_privacy_value() ) : ?> checked="checked"<?php endif; ?> /> <?php _e( 'Yes', 'buddypress' ); ?></label>
-+ <label><input type="radio" name="signup_blog_privacy" id="signup_blog_privacy_private" value="private"<?php if ( 'private' == bp_get_signup_blog_privacy_value() ) : ?> checked="checked"<?php endif; ?> /> <?php _e( 'No', 'buddypress' ); ?></label>
-+
-+ </div>
-+
-+ </div><!-- #blog-details-section -->
-+
-+ <?php do_action( 'bp_after_blog_details_fields' ); ?>
-+
-+ <?php endif; ?>
-+
-+ <?php do_action( 'bp_before_registration_submit_buttons' ); ?>
-+
-+ <div class="submit">
-+ <input type="submit" name="signup_submit" id="signup_submit" value="<?php _e( 'Complete Sign Up', 'buddypress' ); ?>" />
-+ </div>
-+
-+ <?php do_action( 'bp_after_registration_submit_buttons' ); ?>
-+
-+ <?php wp_nonce_field( 'bp_new_signup' ); ?>
-+
-+ <?php endif; // request-details signup step ?>
-+
-+ <?php if ( 'completed-confirmation' == bp_get_current_signup_step() ) : ?>
-+
-+ <h2><?php _e( 'Check Your Email To Activate Your Account!', 'buddypress' ); ?></h2>
-+
-+ <?php do_action( 'template_notices' ); ?>
-+ <?php do_action( 'bp_before_registration_confirmed' ); ?>
-+
-+ <?php if ( bp_registration_needs_activation() ) : ?>
-+ <p><?php _e( 'You have successfully created your account! To begin using this site you will need to activate your account via the email we have just sent to your address.', 'buddypress' ); ?></p>
-+ <?php else : ?>
-+ <p><?php _e( 'You have successfully created your account! Please log in using the username and password you have just created.', 'buddypress' ); ?></p>
-+ <?php endif; ?>
-+
-+ <?php do_action( 'bp_after_registration_confirmed' ); ?>
-+
-+ <?php endif; // completed-confirmation signup step ?>
-+
-+ <?php do_action( 'bp_custom_signup_steps' ); ?>
-+
-+ </form>
-+
-+ </div>
-+ <p id="fn1"><?php _e('[*] read the policy!','buddypress'); ?> </p>
-+ <?php do_action( 'bp_after_register_page' ); ?>
-+
-+ </div><!-- .padder -->
-+ </div><!-- #content -->
-+
-+ <?php get_sidebar( 'buddypress' ); ?>
-+
-+ <script type="text/javascript">
-+ jQuery(document).ready( function() {
-+ if ( jQuery('div#blog-details').length && !jQuery('div#blog-details').hasClass('show') )
-+ jQuery('div#blog-details').toggle();
-+
-+ jQuery( 'input#signup_with_blog' ).click( function() {
-+ jQuery('div#blog-details').fadeOut().toggle();
-+ });
-+ });
-+ </script>
-+
-+<?php get_footer( 'buddypress' ); ?>
---
-2.17.1
-
--
GitLab