Changeset 225

Timestamp:

08/14/2005 05:30:28 AM (18 years ago)

Author:

mdawaffe

Message:

Fork caps edit_topic into edit_topic and manage_topics. Same for posts. Fixe time_lock bug: Fixes #123.

Location:

trunk

Files:

• bb-admin/delete-post.php (modified) (1 diff)
• bb-admin/delete-topic.php (modified) (1 diff)
• bb-admin/sticky.php (modified) (1 diff)
• bb-admin/topic-move.php (modified) (1 diff)
• bb-admin/topic-toggle.php (modified) (1 diff)
• bb-includes/capabilities.php (modified) (5 diffs)
• bb-includes/template-functions.php (modified) (5 diffs)

trunk/bb-admin/delete-post.php

@@ -13 +13 @@
     die('There is a problem with that post, pardner.');
 
-if ( !current_user_can( 'edit_post', $post_id ) ) {
+if ( !current_user_can('manage_posts') ) {
     header('Location: ' . bb_get_option('uri') );
     exit();

trunk/bb-admin/delete-topic.php

@@ -13 +13 @@
     die('There is a problem with that topic, pardner.');
 
-if ( !current_user_can( 'edit_topic', $topic_id ) ) {
+if ( !current_user_can('manage_topics') ) {
     header('Location: ' . bb_get_option('uri') );
     exit();

trunk/bb-admin/sticky.php

@@ -8 +8 @@
     die('There is a problem with that topic, pardner.');
 
-if ( !current_user_can( 'edit_topic', $topic_id ) ) {
+if ( !current_user_can('manage_topic') ) {
     header('Location: ' . bb_get_option('uri') );
     exit();

trunk/bb-admin/topic-move.php

@@ -14 +14 @@
     die('Your topic or forum caused all manner of confusion');
 
-if ( !current_user_can( 'edit_topic', $topic_id ) ) {
+if ( !current_user_can('manage_topics') ) {
     header('Location: ' . bb_get_option('uri') );
     exit();

trunk/bb-admin/topic-toggle.php

@@ -8 +8 @@
     die('There is a problem with that topic, pardner.');
 
-if ( !current_user_can( 'edit_topic', $topic_id ) ) {
+if ( !current_user_can('manage_topics') ) {
     header('Location: ' . bb_get_option('uri') );
     exit();

trunk/bb-includes/capabilities.php

@@ -36 +36 @@
                         'browse_deleted' => true,   // Use 'deleted' View
                         'view_by_ip' => true,       // view-ip.php
+                        'manage_topics' => true,    // Delete/Close/Stick
                         'edit_others_tags' => true,
                         'edit_others_topics' => true,
+                        'manage_posts' => true,
                         'ignore_edit_lock' => true,
                         'edit_others_posts' => true,
@@ -59 +61 @@
                         'browse_deleted' => true,
                         'view_by_ip' => true,
+                        'manage_topics' => true,
                         'edit_others_tags' => true,
                         'edit_others_topics' => true,
+                        'manage_posts' => true,
                         'ignore_edit_lock' => true,
                         'edit_others_posts' => true,
@@ -79 +83 @@
                         'browse_deleted' => true,   //+
                         'view_by_ip' => true,       //+
+                        'manage_topics' => true,    //+
                         'edit_others_tags' => true, //+
                         'edit_others_topics' => true,   //+
+                        'manage_posts' => true,     //+
                         'ignore_edit_lock' => true, //+
                         'edit_others_posts' => true,    //+
@@ -270 +276 @@
     }
     
-    //has_cap(capability_or_role_name) or
-    //has_cap('edit_post', post_id)
     function has_cap($cap) {
         global $bb_roles;
@@ -308 +312 @@
         if ( !topic_is_open( $post->topic_id ) )
             $caps = array_merge($caps, map_meta_cap( 'edit_topic', $user_id, $post->topic_id ));
-        $post_time = strtotime($post->post_time);
+        $post_time = strtotime($post->post_time . '+0000');
         $curr_time = time();
                 if ( $curr_time - $post_time > bb_get_option( 'edit_lock' ) * 60 )

trunk/bb-includes/template-functions.php

@@ -423 +423 @@
 function topic_delete_link() {
     global $current_user, $topic;
-    if ( !current_user_can( 'edit_topic', $topic->topic_id ) )
+    if ( !current_user_can('manage_topics') )
         return;
 
@@ -434 +434 @@
 function topic_close_link() {
     global $current_user, $topic;
-    if ( !current_user_can( 'edit_topic', $topic->topic_id ) )
+    if ( !current_user_can('manage_topic') )
         return;
 
@@ -446 +446 @@
 function topic_sticky_link() {
     global $current_user, $topic;
-    if ( !current_user_can( 'edit_topic', $topic->topic_id ) )
+    if ( !current_user_can('manage_topic') )
         return;
 
@@ -468 +468 @@
 function topic_move_dropdown() {
     global $current_user, $forum_id, $topic;
-    if ( !current_user_can( 'edit_topic', $topic->topic_id ) )
+    if ( !current_user_can('manage_topic') )
         return;
     $forum_id = $topic->forum_id;
@@ -567 +567 @@
 function post_delete_link() {
     global $current_user, $post;
-    if ( !current_user_can( 'edit_post', $post->post_id ) )
+    if ( !current_user_can('manage_posts') )
         return;