Changeset 15852 for tags

Timestamp:

01/08/12 19:26:50 (5 months ago)

Author:

Alexander Trofimov

Message:

Ticket #2717

File:

• tags/7.0/modules/boonex/forum/classes/Forum.php (modified) (8 diffs)

tags/7.0/modules/boonex/forum/classes/Forum.php

@@ -346 +346 @@
         if (!$allow_edit && $r['user'] == $this->_getLoginUserName())
         {
-            if ($this->_checkUserPerm ($r['user'], 'own', 'edit', $forum_id) && !$this->_isEditTimeout($r['post_id']))
+            if ($this->_checkUserPerm ($r['user'], 'own', 'edit', $forum_id) && !$this->_isEditTimeout($r['post_id']) && !$t['topic_locked'])
                 $allow_edit = 1;
         }           
@@ -352 +352 @@
         if (!$allow_del && $r['user'] == $this->_getLoginUserName())
         {
-            if ($this->_checkUserPerm ($r['user'], 'own', 'del', $forum_id) && !$this->_isEditTimeout($r['post_id']))
+            if ($this->_checkUserPerm ($r['user'], 'own', 'del', $forum_id) && !$this->_isEditTimeout($r['post_id']) && !$t['topic_locked'])
                 $allow_del = 1;
         }           
@@ -493 +493 @@
             if (!$allow_edit && $r['user'] == $u)
             {
-                if ($this->_checkUserPerm ($r['user'], 'own', 'edit', $forum_id) && !$this->_isEditTimeout($r['post_id']))
+                if ($this->_checkUserPerm ($r['user'], 'own', 'edit', $forum_id) && !$this->_isEditTimeout($r['post_id']) && !$t['topic_locked'])
                     $allow_edit = 1;
             }           
@@ -499 +499 @@
             if (!$allow_del && $r['user'] == $u)
             {
-                if ($this->_checkUserPerm ($r['user'], 'own', 'del', $forum_id) && !$this->_isEditTimeout($r['post_id']))
+                if ($this->_checkUserPerm ($r['user'], 'own', 'del', $forum_id) && !$this->_isEditTimeout($r['post_id']) && !$t['topic_locked'])
                     $allow_del = 1;
             }           
@@ -1176 +1176 @@
                 $when = $this->fdb->getPostWhen ((int)$post_id);
                 $timeout = $GLOBALS['gConf']['edit_timeout'] - (time() - $when);                    
-                $access = $timeout > 10 ? 'allow' : 'deny';
+                $access = $timeout > 10 && !$t['topic_locked'] ? 'allow' : 'deny';
             }
         }
@@ -1219 +1219 @@
             $no_access = false;
         if ($no_access && $user == $this->_getLoginUserName())
-            if ($this->_checkUserPerm ('', 'own', 'edit', $t['forum_id']) && !$this->_isEditTimeout((int)$post_id)) 
+            if ($this->_checkUserPerm ('', 'own', 'edit', $t['forum_id']) && !$this->_isEditTimeout((int)$post_id) && !$t['topic_locked']) 
                 $no_access = false;
         
@@ -1272 +1272 @@
 
         $f = $this->fdb->getForumByPostId ($post_id);
+        $aTopic = $this->fdb->getTopic ($topic_id);
 
         if ($this->_checkUserPerm ('', $f['forum_type'], 'del', $f['forum_id'])) 
             $no_access = false;
         if ($no_access && ($user = $this->fdb->getPostUser((int)$post_id)) == $this->_getLoginUserName())
-            if ($this->_checkUserPerm ('', 'own', 'del', $f['forum_id']) && !$this->_isEditTimeout((int)$post_id)) 
+            if ($this->_checkUserPerm ('', 'own', 'del', $f['forum_id']) && !$this->_isEditTimeout((int)$post_id) && !$aTopic['topic_locked'])
                 $no_access = false;
 
@@ -1295 +1296 @@
 
         $this->fdb->deletePost ($post_id);
-
-        $aTopic = $this->fdb->getTopic ($topic_id);
+        
         $exists = $aTopic ? 1 : 0;