Changeset 1317 in ExiteCMS

Timestamp:

02/27/08 22:00:23 (4 years ago)

Author:

hverton

Message:

disable post flooding check for superadmins
tested thread_first_read functionality, made some adjustments

Location:

trunk

Files:

• forum/post.php (modified) (1 diff)
• forum/viewforum.php (modified) (1 diff)
• forum/viewthread.php (modified) (1 diff)
• themes/ExiteCMS/images/exitecms_bg.gif (modified) (previous)

trunk/forum/post.php

@@ -580 +580 @@
                         // insert a new post record
                         $flood = false;
-                        $result = dbquery("SELECT MAX(post_datestamp) AS last_post FROM ".$db_prefix."posts WHERE post_author='".$userdata['user_id']."'");
-                        if (!iSUPERADMIN && dbrows($result) > 0) {
-                            $data = dbarray($result);
-                            if ((time() - $data['last_post']) < $settings['flood_interval']) {
-                                $flood = true;
-                                $error = $locale['431'];
-                                $result = dbquery("INSERT INTO ".$db_prefix."flood_control (flood_ip, flood_timestamp) VALUES ('".USER_IP."', '".time()."')");
-                                if (dbcount("(flood_ip)", "flood_control", "flood_ip='".USER_IP."'") > 4) {
-                                    $result = dbquery("UPDATE ".$db_prefix."users SET user_status='1', user_ban_reason='".$locale['434']."' WHERE user_id='".$userdata['user_id']."'");
-                                    $error .= "<br />".$locale['432'];
-                                } else {
-                                    $error .= "<br />".sprintf($locale['433'], $settings['flood_interval']);
+                        if (!iSUPERADMIN) {
+                            // for non-webmasters, check for post flooding
+                            $result = dbquery("SELECT MAX(post_datestamp) AS last_post FROM ".$db_prefix."posts WHERE post_author='".$userdata['user_id']."'");
+                            if (dbrows($result) > 0) {
+                                $data = dbarray($result);
+                                if ((time() - $data['last_post']) < $settings['flood_interval']) {
+                                    $flood = true;
+                                    $error = $locale['431'];
+                                    $result = dbquery("INSERT INTO ".$db_prefix."flood_control (flood_ip, flood_timestamp) VALUES ('".USER_IP."', '".time()."')");
+                                    if (dbcount("(flood_ip)", "flood_control", "flood_ip='".USER_IP."'") > 4) {
+                                        $result = dbquery("UPDATE ".$db_prefix."users SET user_status='1', user_ban_reason='".$locale['434']."' WHERE user_id='".$userdata['user_id']."'");
+                                        $error .= "<br />".$locale['432'];
+                                    } else {
+                                        $error .= "<br />".sprintf($locale['433'], $settings['flood_interval']);
+                                    }
                                 }
                             }

trunk/forum/viewforum.php

@@ -94 +94 @@
                 AND tr.forum_id = '".$forum_id."'
                 AND (p.post_datestamp > ".$settings['unread_threshold']." OR p.post_edittime > ".$settings['unread_threshold'].")
-                AND (p.post_datestamp > tr.thread_last_read OR p.post_edittime > tr.thread_last_read)
+                AND ((p.post_datestamp > tr.thread_last_read OR p.post_edittime > tr.thread_last_read)
+                    OR (p.post_datestamp < tr.thread_first_read OR (p.post_edittime != 0 AND p.post_edittime < tr.thread_first_read)))
             GROUP BY p.thread_id
         ");

trunk/forum/viewthread.php

@@ -140 +140 @@
     $message = stripmessageinput(censorwords($_POST['message']));
     if ($message != "") {
-        $result = dbquery("SELECT MAX(post_datestamp) AS last_post FROM ".$db_prefix."posts WHERE post_author='".$userdata['user_id']."'");
-        if (!iSUPERADMIN || dbrows($result) > 0) {
-            $data = dbarray($result);
-            if ((time() - $data['last_post']) < $settings['flood_interval']) {
-                $flood = true;
-                $result = dbquery("INSERT INTO ".$db_prefix."flood_control (flood_ip, flood_timestamp) VALUES ('".USER_IP."', '".time()."')");
-                if (dbcount("(flood_ip)", "flood_control", "flood_ip='".USER_IP."'") > 4) {
-                    $result = dbquery("UPDATE ".$db_prefix."users SET user_status='1', user_ban_reason='".$locale['530']."' WHERE user_id='".$userdata['user_id']."'");
-                    redirect("post.php?action=quickreply&forum_id=$forum_id&thread_id=$thread_id&post_id=0&errorcode=2");
-                } else {
-                    redirect("post.php?action=quickreply&forum_id=$forum_id&thread_id=$thread_id&post_id=0&errorcode=1");
+        if (!iSUPERADMIN) {
+            // for non-webmasters, check for post flooding
+            $result = dbquery("SELECT MAX(post_datestamp) AS last_post FROM ".$db_prefix."posts WHERE post_author='".$userdata['user_id']."'");
+            if (dbrows($result) > 0) {
+                $data = dbarray($result);
+                if ((time() - $data['last_post']) < $settings['flood_interval']) {
+                    $flood = true;
+                    $result = dbquery("INSERT INTO ".$db_prefix."flood_control (flood_ip, flood_timestamp) VALUES ('".USER_IP."', '".time()."')");
+                    if (dbcount("(flood_ip)", "flood_control", "flood_ip='".USER_IP."'") > 4) {
+                        $result = dbquery("UPDATE ".$db_prefix."users SET user_status='1', user_ban_reason='".$locale['530']."' WHERE user_id='".$userdata['user_id']."'");
+                        redirect("post.php?action=quickreply&forum_id=$forum_id&thread_id=$thread_id&post_id=0&errorcode=2");
+                    } else {
+                        redirect("post.php?action=quickreply&forum_id=$forum_id&thread_id=$thread_id&post_id=0&errorcode=1");
+                    }
                 }
             }