Changeset 13092 for trunk/src/bp-friends/bp-friends-notifications.php

Timestamp:

08/24/2021 04:16:17 AM (5 years ago)

Author:

espellcaste

Message:

Making PHPDoc Improvements to the BP Friends (component) files.

Also, adding several minor PHP changes.

See #8553

File:

• trunk/src/bp-friends/bp-friends-notifications.php (modified) (9 diffs)

trunk/src/bp-friends/bp-friends-notifications.php

@@ -44 +44 @@
                         } else {
                                 /* translators: %s: friend name */
-                                $text = sprintf( __( '%s accepted your friendship request', 'buddypress' ),  bp_core_get_user_displayname( $item_id ) );
+                                $text = sprintf( __( '%s accepted your friendship request', 'buddypress' ), bp_core_get_user_displayname( $item_id ) );
                                 $amount = 'single';
                         }
@@ -62 +62 @@
                         } else {
                                 /* translators: %s: friend name */
-                                $text = sprintf( __( 'You have a friendship request from %s', 'buddypress' ),  bp_core_get_user_displayname( $item_id ) );
+                                $text = sprintf( __( 'You have a friendship request from %s', 'buddypress' ), bp_core_get_user_displayname( $item_id ) );
                                 $amount = 'single';
                         }
@@ -70 +70 @@
 
         // Return either an HTML link or an array, depending on the requested format.
-        if ( 'string' == $format ) {
+        if ( 'string' === $format ) {
 
                 /**
@@ -177 +177 @@
  * @since 1.9.0
  *
- * @param int    $friendship_id Friendship ID (not used).
- * @param object $friendship    Friendship object.
+ * @param int                   $friendship_id Friendship ID (not used).
+ * @param BP_Friends_Friendship $friendship    The friendship object.
  */
 function bp_friends_mark_friendship_rejected_notifications_by_item_id( $friendship_id, $friendship ) {
@@ -216 +216 @@
  * @since 1.9.0
  *
- * @param int    $friendship_id Friendship ID (not used).
- * @param object $friendship    Friendship Object.
+ * @param int                   $friendship_id Friendship ID (not used).
+ * @param BP_Friends_Friendship $friendship    The friendship object.
  */
 function bp_friends_mark_friendship_withdrawn_notifications_by_item_id( $friendship_id, $friendship ) {
@@ -243 +243 @@
 function friends_screen_notification_settings() {
 
-        if ( !$send_requests = bp_get_user_meta( bp_displayed_user_id(), 'notification_friends_friendship_request', true ) )
-                $send_requests   = 'yes';
-
-        if ( !$accept_requests = bp_get_user_meta( bp_displayed_user_id(), 'notification_friends_friendship_accepted', true ) )
+        if ( ! $send_requests = bp_get_user_meta( bp_displayed_user_id(), 'notification_friends_friendship_request', true ) ) {
+                $send_requests = 'yes';
+        }
+
+        if ( ! $accept_requests = bp_get_user_meta( bp_displayed_user_id(), 'notification_friends_friendship_accepted', true ) )
                 $accept_requests = 'yes'; ?>
 
@@ -253 +254 @@
                         <tr>
                                 <th class="icon"></th>
-                                <th class="title"><?php _ex( 'Friends', 'Friend settings on notification settings page', 'buddypress' ) ?></th>
-                                <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
-                                <th class="no"><?php _e( 'No', 'buddypress' )?></th>
+                                <th class="title"><?php _ex( 'Friends', 'Friend settings on notification settings page', 'buddypress' ); ?></th>
+                                <th class="yes"><?php esc_html_e( 'Yes', 'buddypress' ); ?></th>
+                                <th class="no"><?php esc_html_e( 'No', 'buddypress' ); ?></th>
                         </tr>
                 </thead>
@@ -262 +263 @@
                         <tr id="friends-notification-settings-request">
                                 <td></td>
-                                <td><?php _ex( 'A member sends you a friendship request', 'Friend settings on notification settings page', 'buddypress' ) ?></td>
+                                <td><?php _ex( 'A member sends you a friendship request', 'Friend settings on notification settings page', 'buddypress' ); ?></td>
                                 <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_request]" id="notification-friends-friendship-request-yes" value="yes" <?php checked( $send_requests, 'yes', true ) ?>/><label for="notification-friends-friendship-request-yes" class="bp-screen-reader-text"><?php
                                         /* translators: accessibility text */
-                                        _e( 'Yes, send email', 'buddypress' );
+                                        esc_html_e( 'Yes, send email', 'buddypress' );
                                 ?></label></td>
                                 <td class="no"><input type="radio" name="notifications[notification_friends_friendship_request]" id="notification-friends-friendship-request-no" value="no" <?php checked( $send_requests, 'no', true ) ?>/><label for="notification-friends-friendship-request-no" class="bp-screen-reader-text"><?php
                                         /* translators: accessibility text */
-                                        _e( 'No, do not send email', 'buddypress' );
+                                        esc_html_e( 'No, do not send email', 'buddypress' );
                                 ?></label></td>
                         </tr>
@@ -277 +278 @@
                                 <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_accepted]" id="notification-friends-friendship-accepted-yes" value="yes" <?php checked( $accept_requests, 'yes', true ) ?>/><label for="notification-friends-friendship-accepted-yes" class="bp-screen-reader-text"><?php
                                         /* translators: accessibility text */
-                                        _e( 'Yes, send email', 'buddypress' );
+                                        esc_html_e( 'Yes, send email', 'buddypress' );
                                 ?></label></td>
                                 <td class="no"><input type="radio" name="notifications[notification_friends_friendship_accepted]" id="notification-friends-friendship-accepted-no" value="no" <?php checked( $accept_requests, 'no', true ) ?>/><label for="notification-friends-friendship-accepted-no" class="bp-screen-reader-text"><?php
                                         /* translators: accessibility text */
-                                        _e( 'No, do not send email', 'buddypress' );
+                                        esc_html_e( 'No, do not send email', 'buddypress' );
                                 ?></label></td>
                         </tr>