Changeset 3134

Timestamp:

05/10/2011 07:27:35 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Fix topic and reply edit locking. Props christopher-jon.

Location:

branches/plugin/bbp-includes

Files:

• bbp-general-functions.php (modified) (1 diff)
• bbp-reply-template.php (modified) (1 diff)
• bbp-topic-template.php (modified) (1 diff)

branches/plugin/bbp-includes/bbp-general-functions.php

@@ -258 +258 @@
 
     return $data;
+}
+
+/**
+ * Check the date against the _bbp_edit_lock setting.
+ *
+ * @since bbPress (r3133)
+ *
+ * @param string $post_date_gmt
+ *
+ * @uses get_option() Get the edit lock time
+ * @uses current_time() Get the current time
+ * @uses strtotime() Convert strings to time
+ * @uses apply_filters() Allow output to be manipulated
+ *
+ * @return bool
+ */
+function bbp_past_edit_lock( $post_date_gmt ) {
+
+    // Assume editing is allowed
+    $retval = false;
+
+    // Bail if empty date
+    if ( ! empty( $post_date_gmt ) ) {
+
+        // Period of time
+        $lockable  = '+' . get_option( '_bbp_edit_lock', '5' ) . ' minutes';
+
+        // Now
+        $cur_time  = current_time( 'timestamp', true );
+
+        // Add lockable time to post time
+        $lock_time = strtotime( $lockable, strtotime( $post_date_gmt ) );
+
+        // Compare
+        if ( $cur_time >= $lock_time ) {
+            $retval = true;
+        }
+    }
+
+    return apply_filters( 'bbp_past_edit_lock', (bool) $retval, $cur_time, $lock_time, $post_date_gmt );
 }
 

branches/plugin/bbp-includes/bbp-reply-template.php

@@ -1331 +1331 @@
         $reply = bbp_get_reply( bbp_get_reply_id( (int) $id ) );
 
-        if ( empty( $reply ) || !current_user_can( 'edit_reply', $reply->ID ) )
-            return;
-
+        // Bypass check if user has caps
+        if ( !is_super_admin() || !current_user_can( 'edit_others_replies' ) ) {
+
+            // User cannot edit or it is past the lock time
+            if ( empty( $reply ) || !current_user_can( 'edit_reply', $reply->ID ) || bbp_past_edit_lock( $reply->post_date_gmt ) )
+                return;
+        }
+
+        // No uri to edit reply
         if ( !$uri = bbp_get_reply_edit_url( $id ) )
             return;

branches/plugin/bbp-includes/bbp-topic-template.php

@@ -1901 +1901 @@
         $topic = bbp_get_topic( bbp_get_topic_id( (int) $id ) );
 
-        if ( empty( $topic ) || !current_user_can( 'edit_topic', $topic->ID ) )
-            return;
-
+        // Bypass check if user has caps
+        if ( !is_super_admin() || !current_user_can( 'edit_others_topics' ) ) {
+
+            // User cannot edit or it is past the lock time
+            if ( empty( $topic ) || !current_user_can( 'edit_topic', $topic->ID ) || bbp_past_edit_lock( $topic->post_date_gmt ) )
+                return;
+        }
+
+        // No uri to edit topic
         if ( !$uri = bbp_get_topic_edit_url( $id ) )
             return;