Skip to content

Commit

Permalink
Start supporting the WordPress ruleset
Browse files Browse the repository at this point in the history
  • Loading branch information
@akirk
akirk committed Jun 18, 2024
1 parent e2a15cc commit e80abff
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 30 deletions.
10 changes: 3 additions & 7 deletions includes/class-admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ public function process_admin_settings() {
if ( isset( $_GET['_wp_http_referer'] ) ) {
wp_safe_redirect( wp_get_referer() );
} else {
wp_safe_redirect( add_query_arg( 'updated', '1', remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) );
wp_safe_redirect( add_query_arg( 'updated', '1', remove_query_arg( array( '_wp_http_referer', '_wpnonce' ) ) ) );
}
exit;
}
Expand Down Expand Up @@ -1062,11 +1062,9 @@ public function process_admin_edit_friend() {
$hide_from_friends_page[] = $friend->user_login;
update_user_option( get_current_user_id(), 'friends_hide_from_friends_page', $hide_from_friends_page );
}
} else {
if ( in_array( $friend->user_login, $hide_from_friends_page ) ) {
} elseif ( in_array( $friend->user_login, $hide_from_friends_page ) ) {
$hide_from_friends_page = array_values( array_diff( $hide_from_friends_page, array( $friend->user_login ) ) );
update_user_option( get_current_user_id(), 'friends_hide_from_friends_page', $hide_from_friends_page );
}
}
} else {
return;
Expand Down Expand Up @@ -1279,11 +1277,9 @@ public function process_admin_edit_friend_feeds() {
$hide_from_friends_page[] = $friend->user_login;
update_user_option( get_current_user_id(), 'friends_hide_from_friends_page', $hide_from_friends_page );
}
} else {
if ( in_array( $friend->user_login, $hide_from_friends_page ) ) {
} elseif ( in_array( $friend->user_login, $hide_from_friends_page ) ) {
$hide_from_friends_page = array_values( array_diff( $hide_from_friends_page, array( $friend->user_login ) ) );
update_user_option( get_current_user_id(), 'friends_hide_from_friends_page', $hide_from_friends_page );
}
}

if ( $friend->set_retention_number_enabled( isset( $_POST['friends_enable_retention_number'] ) && $_POST['friends_enable_retention_number'] ) ) {
Expand Down
2 changes: 1 addition & 1 deletion integrations/class-enable-mastodon-apps.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/**
* Class Enable_Mastodon_Apps
*
* This class is used to enable Mastodon Apps to work with ActivityPub
* This class is used to enable Mastodon Apps to work with Friends.
*
* @see https://github.com/akirk/enable-mastodon-apps
*/
Expand Down
1 change: 1 addition & 0 deletions phpcs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<config name="text_domain" value="friends" />

<rule ref="WordPress"/>
<rule ref="WordPress-Core">
<exclude name="Generic.Formatting.MultipleStatementAlignment.NotSameWarning" />
<exclude name="WordPress.PHP.StrictInArray.MissingTrueStrict" />
Expand Down
19 changes: 10 additions & 9 deletions templates/admin/edit-feeds.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
*/

$active_feeds = $args['friend']->get_active_feeds();
$feeds = $args['friend']->get_feeds();
$_feeds = $args['friend']->get_feeds();


$has_last_log = false;
?><form method="post">
Expand All @@ -22,7 +23,7 @@
<?php endif; ?>
<ul class="feeds <?php echo empty( $active_feeds ) ? ' hidden' : ''; ?>">
<?php
foreach ( $feeds as $term_id => $feed ) :
foreach ( $_feeds as $term_id => $feed ) :
if ( $feed->get_last_log() ) {
$has_last_log = true;
$last_log = $feed->get_last_log();
Expand Down Expand Up @@ -66,15 +67,15 @@
</option>
<?php endif; ?>
</select>
<a href="<?php echo esc_url( wp_nonce_url( add_query_arg( '_wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), self_admin_url( 'admin.php?page=add-friend&parser=' . urlencode( $feed->get_parser() ) . '&feed=' . urlencode( $term_id ) . '&preview=' . urlencode( $feed->get_url() ) ) ), 'preview-feed' ) ); ?>" class="preview-parser" target="_blank" rel="noopener noreferrer"><?php esc_attr_e( 'Preview', 'friends' ); ?></a>
<a href="<?php echo esc_url( wp_nonce_url( add_query_arg( '_wp_http_referer', remove_query_arg( '_wp_http_referer' ), self_admin_url( 'admin.php?page=add-friend&parser=' . esc_url( $feed->get_parser() ) . '&feed=' . esc_url( $term_id ) . '&preview=' . esc_url( $feed->get_url() ) ) ), 'preview-feed' ) ); ?>" class="preview-parser" target="_blank" rel="noopener noreferrer"><?php esc_attr_e( 'Preview', 'friends' ); ?></a>
</td>
</tr>
<tr>
<th><?php /* phpcs:ignore WordPress.WP.I18n.MissingArgDomain */ esc_html_e( 'Post Format' ); ?></th>
<td>
<select name="feeds[<?php echo esc_attr( $term_id ); ?>][post-format]" aria-label="<?php /* phpcs:ignore WordPress.WP.I18n.MissingArgDomain */ esc_attr_e( 'Post Format' ); ?>">
<?php foreach ( $args['post_formats'] as $format => $title ) : ?>
<option value="<?php echo esc_attr( $format ); ?>"<?php selected( $format, $feed->get_post_format() ); ?>><?php echo esc_html( $title ); ?></option>
<?php foreach ( $args['post_formats'] as $format => $_title ) : ?>
<option value="<?php echo esc_attr( $format ); ?>"<?php selected( $format, $feed->get_post_format() ); ?>><?php echo esc_html( $_title ); ?></option>
<?php endforeach; ?>
</select>
</td>
Expand Down Expand Up @@ -123,15 +124,15 @@
<option value="<?php echo esc_attr( $slug ); ?>"><?php echo esc_html( wp_strip_all_tags( $parser_name ) ); ?></option>
<?php endforeach; ?>
</select>
<a href="<?php echo esc_url( wp_nonce_url( add_query_arg( '_wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), self_admin_url( 'admin.php?page=add-friend&parser=&preview=' ) ), 'preview-feed' ) ); ?>" class="preview-parser" target="_blank" rel="noopener noreferrer"><?php esc_attr_e( 'Preview', 'friends' ); ?></a>
<a href="<?php echo esc_url( wp_nonce_url( add_query_arg( '_wp_http_referer', remove_query_arg( '_wp_http_referer' ), self_admin_url( 'admin.php?page=add-friend&parser=&preview=' ) ), 'preview-feed' ) ); ?>" class="preview-parser" target="_blank" rel="noopener noreferrer"><?php esc_attr_e( 'Preview', 'friends' ); ?></a>
</td>
</tr>
<tr>
<th><?php /* phpcs:ignore WordPress.WP.I18n.MissingArgDomain */ esc_html_e( 'Post Format' ); ?></th>
<td>
<select name="feeds[new][post-format]" aria-label="<?php /* phpcs:ignore WordPress.WP.I18n.MissingArgDomain */ esc_attr_e( 'Post Format' ); ?>">
<?php foreach ( $args['post_formats'] as $format => $title ) : ?>
<option value="<?php echo esc_attr( $format ); ?>"><?php echo esc_html( $title ); ?></option>
<?php foreach ( $args['post_formats'] as $format => $_title ) : ?>
<option value="<?php echo esc_attr( $format ); ?>"><?php echo esc_html( $_title ); ?></option>
<?php endforeach; ?>
</select>
</td>
Expand All @@ -146,7 +147,7 @@
</li>
</ul>

<?php if ( count( $active_feeds ) !== count( $feeds ) ) : ?>
<?php if ( count( $active_feeds ) !== count( $_feeds ) ) : ?>
<a href="" class="show-inactive-feeds"><?php esc_html_e( 'Show inactive feeds', 'friends' ); ?></a> |
<?php endif; ?>
<?php if ( $has_last_log ) : ?>
Expand Down
18 changes: 9 additions & 9 deletions templates/admin/preview-rules.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
/**
* Render a preview row.
*
* @param \WP_Post $post The post.
* @param \WP_Post $_post The post.
* @param array $args The arguments.
*/
function preview_row( $post, $args ) {
$modified_post = $args['feed']->apply_feed_rules( $post, null, $args['friend'] );
function preview_row( $_post, $args ) {
$modified_post = $args['feed']->apply_feed_rules( $_post, null, $args['friend'] );
?>
<tr>

<td class="title column-title column-primary" data-colname="<?php /* phpcs:ignore WordPress.WP.I18n.MissingArgDomain */ esc_attr_e( 'Title' ); ?>"><a href="<?php the_permalink( $modified_post ? $modified_post : $post ); ?>" rel="noopener noreferrer"><?php echo esc_html( $modified_post ? $modified_post->post_title : $post->post_title ); ?></a></td>
<td class="author column-author" data-colname="<?php /* phpcs:ignore WordPress.WP.I18n.MissingArgDomain */ esc_attr_e( 'Author' ); ?>"><?php echo esc_html( get_post_meta( $post->ID, 'author', true ) ); ?></td>
<td class="date column-date" data-colname="<?php /* phpcs:ignore WordPress.WP.I18n.MissingArgDomain */ esc_attr_e( 'Date' ); ?>"><?php echo esc_html( date_i18n( __( 'F j, Y g:i a' ), strtotime( $post->post_date ) ) ); ?></td>
<td class="title column-title column-primary" data-colname="<?php /* phpcs:ignore WordPress.WP.I18n.MissingArgDomain */ esc_attr_e( 'Title' ); ?>"><a href="<?php the_permalink( $modified_post ? $modified_post : $_post ); ?>" rel="noopener noreferrer"><?php echo esc_html( $modified_post ? $modified_post->post_title : $_post->post_title ); ?></a></td>
<td class="author column-author" data-colname="<?php /* phpcs:ignore WordPress.WP.I18n.MissingArgDomain */ esc_attr_e( 'Author' ); ?>"><?php echo esc_html( get_post_meta( $_post->ID, 'author', true ) ); ?></td>
<td class="date column-date" data-colname="<?php /* phpcs:ignore WordPress.WP.I18n.MissingArgDomain */ esc_attr_e( 'Date' ); ?>"><?php echo esc_html( date_i18n( __( 'F j, Y g:i a' ), strtotime( $_post->post_date ) ) ); ?></td>
<td class="action column-action" data-colname="<?php esc_attr_e( 'Action', 'friends' ); ?>">
<?php
if ( ! $modified_post || $modified_post->_feed_rule_delete ) {
Expand All @@ -37,7 +37,7 @@ function preview_row( $post, $args ) {
?>
</td>
<td class="view column-view" data-colname="<?php /* phpcs:ignore WordPress.WP.I18n.MissingArgDomain */ esc_attr_e( 'View' ); ?>">
<a href="<?php echo esc_url( $args['friend']->get_local_friends_page_url( $post->ID ) ); ?>?show-hidden"><?php esc_html_e( 'View post', 'friends' ); ?></a>
<a href="<?php echo esc_url( $args['friend']->get_local_friends_page_url( $_post->ID ) ); ?>?show-hidden"><?php esc_html_e( 'View post', 'friends' ); ?></a>
<?php
}
?>
Expand Down Expand Up @@ -87,8 +87,8 @@ function preview_row( $post, $args ) {
<th class="column-view"><?php esc_html_e( 'Friends Page', 'friends' ); ?></th>
</tr>
<?php
foreach ( $args['friend_posts']->get_posts() as $post ) {
preview_row( $post, $args );
foreach ( $args['friend_posts']->get_posts() as $_post ) {
preview_row( $_post, $args );
}
?>
</tbody>
Expand Down
8 changes: 4 additions & 4 deletions templates/admin/settings-header.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@
<nav class="friends-tabs-wrapper hide-if-no-js" aria-label="<?php /* phpcs:ignore WordPress.WP.I18n.MissingArgDomain */ esc_html_e( 'Secondary menu' ); ?>">
<?php

foreach ( $args['menu'] as $label => $page ) {
if ( ! $page ) {
foreach ( $args['menu'] as $label => $_page ) {
if ( ! $_page ) {
?>
<span class="friends-tab">
<?php echo esc_html( $label ); ?>
</span>
<?php
continue;
}
$url = admin_url( 'admin.php?page=' . $page );
if ( $page === $args['active'] ) {
$url = admin_url( 'admin.php?page=' . $_page );
if ( $_page === $args['active'] ) {
?>
<span class="friends-tab active" aria-current="true">
<?php echo esc_html( $label ); ?>
Expand Down

0 comments on commit e80abff

Please sign in to comment.