Changeset 42343 for trunk/src/wp-admin/includes/comment.php

Timestamp:

11/30/2017 11:09:33 PM (8 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

• trunk/src/wp-admin/includes/comment.php (modified) (8 diffs)

trunk/src/wp-admin/includes/comment.php

@@ -33 +33 @@
     }
 
-    return $wpdb->get_var( $wpdb->prepare("SELECT comment_post_ID FROM $wpdb->comments
+    return $wpdb->get_var(
+        $wpdb->prepare(
+            "SELECT comment_post_ID FROM $wpdb->comments
             WHERE comment_author = %s AND $date_field = %s",
             stripslashes( $comment_author ),
             stripslashes( $comment_date )
-    ) );
+        )
+    );
 }
 
@@ -46 +49 @@
  */
 function edit_comment() {
-    if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) )
-        wp_die ( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
-
-    if ( isset( $_POST['newcomment_author'] ) )
+    if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) ) {
+        wp_die( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
+    }
+
+    if ( isset( $_POST['newcomment_author'] ) ) {
         $_POST['comment_author'] = $_POST['newcomment_author'];
-    if ( isset( $_POST['newcomment_author_email'] ) )
+    }
+    if ( isset( $_POST['newcomment_author_email'] ) ) {
         $_POST['comment_author_email'] = $_POST['newcomment_author_email'];
-    if ( isset( $_POST['newcomment_author_url'] ) )
+    }
+    if ( isset( $_POST['newcomment_author_url'] ) ) {
         $_POST['comment_author_url'] = $_POST['newcomment_author_url'];
-    if ( isset( $_POST['comment_status'] ) )
+    }
+    if ( isset( $_POST['comment_status'] ) ) {
         $_POST['comment_approved'] = $_POST['comment_status'];
-    if ( isset( $_POST['content'] ) )
+    }
+    if ( isset( $_POST['content'] ) ) {
         $_POST['comment_content'] = $_POST['content'];
-    if ( isset( $_POST['comment_ID'] ) )
+    }
+    if ( isset( $_POST['comment_ID'] ) ) {
         $_POST['comment_ID'] = (int) $_POST['comment_ID'];
-
-    foreach ( array ('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
-        if ( !empty( $_POST['hidden_' . $timeunit] ) && $_POST['hidden_' . $timeunit] != $_POST[$timeunit] ) {
+    }
+
+    foreach ( array( 'aa', 'mm', 'jj', 'hh', 'mn' ) as $timeunit ) {
+        if ( ! empty( $_POST[ 'hidden_' . $timeunit ] ) && $_POST[ 'hidden_' . $timeunit ] != $_POST[ $timeunit ] ) {
             $_POST['edit_date'] = '1';
             break;
@@ -69 +79 @@
     }
 
-    if ( !empty ( $_POST['edit_date'] ) ) {
-        $aa = $_POST['aa'];
-        $mm = $_POST['mm'];
-        $jj = $_POST['jj'];
-        $hh = $_POST['hh'];
-        $mn = $_POST['mn'];
-        $ss = $_POST['ss'];
-        $jj = ($jj > 31 ) ? 31 : $jj;
-        $hh = ($hh > 23 ) ? $hh -24 : $hh;
-        $mn = ($mn > 59 ) ? $mn -60 : $mn;
-        $ss = ($ss > 59 ) ? $ss -60 : $ss;
+    if ( ! empty( $_POST['edit_date'] ) ) {
+        $aa                    = $_POST['aa'];
+        $mm                    = $_POST['mm'];
+        $jj                    = $_POST['jj'];
+        $hh                    = $_POST['hh'];
+        $mn                    = $_POST['mn'];
+        $ss                    = $_POST['ss'];
+        $jj                    = ( $jj > 31 ) ? 31 : $jj;
+        $hh                    = ( $hh > 23 ) ? $hh - 24 : $hh;
+        $mn                    = ( $mn > 59 ) ? $mn - 60 : $mn;
+        $ss                    = ( $ss > 59 ) ? $ss - 60 : $ss;
         $_POST['comment_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
     }
@@ -95 +105 @@
  */
 function get_comment_to_edit( $id ) {
-    if ( !$comment = get_comment($id) )
+    if ( ! $comment = get_comment( $id ) ) {
         return false;
-
-    $comment->comment_ID = (int) $comment->comment_ID;
+    }
+
+    $comment->comment_ID      = (int) $comment->comment_ID;
     $comment->comment_post_ID = (int) $comment->comment_post_ID;
 
@@ -111 +122 @@
     $comment->comment_content = apply_filters( 'comment_edit_pre', $comment->comment_content );
 
-    $comment->comment_author = format_to_edit( $comment->comment_author );
+    $comment->comment_author       = format_to_edit( $comment->comment_author );
     $comment->comment_author_email = format_to_edit( $comment->comment_author_email );
-    $comment->comment_author_url = format_to_edit( $comment->comment_author_url );
-    $comment->comment_author_url = esc_url($comment->comment_author_url);
+    $comment->comment_author_url   = format_to_edit( $comment->comment_author_url );
+    $comment->comment_author_url   = esc_url( $comment->comment_author_url );
 
     return $comment;
@@ -133 +144 @@
 
     $single = false;
-    if ( !is_array($post_id) ) {
+    if ( ! is_array( $post_id ) ) {
         $post_id_array = (array) $post_id;
-        $single = true;
+        $single        = true;
     } else {
         $post_id_array = $post_id;
     }
-    $post_id_array = array_map('intval', $post_id_array);
-    $post_id_in = "'" . implode("', '", $post_id_array) . "'";
+    $post_id_array = array_map( 'intval', $post_id_array );
+    $post_id_in    = "'" . implode( "', '", $post_id_array ) . "'";
 
     $pending = $wpdb->get_results( "SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' GROUP BY comment_post_ID", ARRAY_A );
 
     if ( $single ) {
-        if ( empty($pending) )
+        if ( empty( $pending ) ) {
             return 0;
-        else
-            return absint($pending[0]['num_comments']);
+        } else {
+            return absint( $pending[0]['num_comments'] );
+        }
     }
 
@@ -154 +166 @@
 
     // Default to zero pending for all posts in request
-    foreach ( $post_id_array as $id )
-        $pending_keyed[$id] = 0;
-
-    if ( !empty($pending) )
-        foreach ( $pending as $pend )
-            $pending_keyed[$pend['comment_post_ID']] = absint($pend['num_comments']);
+    foreach ( $post_id_array as $id ) {
+        $pending_keyed[ $id ] = 0;
+    }
+
+    if ( ! empty( $pending ) ) {
+        foreach ( $pending as $pend ) {
+            $pending_keyed[ $pend['comment_post_ID'] ] = absint( $pend['num_comments'] );
+        }
+    }
 
     return $pending_keyed;
@@ -181 +196 @@
  */
 function enqueue_comment_hotkeys_js() {
-    if ( 'true' == get_user_option( 'comment_shortcuts' ) )
+    if ( 'true' == get_user_option( 'comment_shortcuts' ) ) {
         wp_enqueue_script( 'jquery-table-hotkeys' );
+    }
 }