Changeset 1509 in ExiteCMS for branches/PLi-Fusion/forum/viewthread.php

Timestamp:

07/02/08 18:27:06 (4 years ago)

Author:

hverton

Message:

Merged trunk revisions 1408:1508 into the PLi-Fusion branch

File:

• branches/PLi-Fusion/forum/viewthread.php (modified) (10 diffs)

branches/PLi-Fusion/forum/viewthread.php

@@ -86 +86 @@
     "SELECT f.*, f2.forum_name AS forum_cat_name
     FROM ".$db_prefix."forums f
-    LEFT JOIN ".$db_prefix."forums f2 ON f.forum_cat=f2.forum_id
+    INNER JOIN ".$db_prefix."forums f2 ON f.forum_cat=f2.forum_id
     WHERE f.forum_id='".$forum_id."'"
 );
@@ -158 +158 @@
         }
         // check if this isn't a reload, back-post, or double submit
-        if (isset($_COOKIE['post_'.$random_id])) {
+        if (isset($_SESSION['posts'][$random_id])) {
             redirect("post.php?action=quickreply&forum_id=$forum_id&thread_id=$thread_id&post_id=0&errorcode=3");
         } else {
             if (!$flood) {
-                setcookie("post_".$random_id, "posted", time() + 60*60, "/", "", "0");
+                if (!isset($_SESSION['posts']) || !is_array($_SESSION['posts'])) $_SESSION['posts'] = array();
+                $_SESSION['posts'][$random_id] = time()+60*60*12;
                 $sig = ($userdata['user_sig'] ? '1' :'0');
                 $smileys = isset($_POST['disable_smileys']) ? "0" : "1";
@@ -199 +200 @@
             SELECT count(*) as unread, tr.thread_first_read, tr.thread_last_read
                 FROM ".$db_prefix."posts p
-                LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id
+                INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id
                 WHERE tr.user_id = '".$userdata['user_id']."' 
                     AND tr.thread_id = '".$thread_id."' 
@@ -212 +213 @@
             SELECT count(*) as unread, tr.thread_first_read, tr.thread_last_read
                 FROM ".$db_prefix."posts p
-                LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id
+                INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id
                 WHERE tr.user_id = '".$userdata['user_id']."'
                     AND p.post_author != '".$userdata['user_id']."'
@@ -261 +262 @@
     $result = dbquery(
         "SELECT p.*, u.*, u2.user_name AS edit_name, u2.user_status AS edit_status FROM ".$db_prefix."posts p
-        LEFT JOIN ".$db_prefix."users u ON p.post_author = u.user_id
+        INNER JOIN ".$db_prefix."users u ON p.post_author = u.user_id
         LEFT JOIN ".$db_prefix."users u2 ON p.post_edituser = u2.user_id AND post_edituser > '0'
         WHERE p.thread_id='$thread_id' ORDER BY post_sticky DESC, post_datestamp ASC LIMIT $rowstart,".$settings['numofthreads']
@@ -267 +268 @@
     $variables['posts'] = array();
     while ($data = dbarray($result)) {
+
+        // default, show no ranking information
+        $data['show_ranking'] = false;
 
         // check for a system-post (author = 0 ), use some of the webmasters details for this
@@ -278 +282 @@
             $data['user_sig'] = "";
             $data['user_status'] = "0";
+        } else {
+            // check if a ranking is defined for this poster
+            $result2 = dbquery("SELECT * FROM ".$db_prefix."forum_ranking WHERE rank_posts_from <= '".$data['user_posts']."' AND rank_posts_to >= '".$data['user_posts']."' ORDER BY rank_order");
+            while ($data2 = dbarray($result2)) {
+                // get the grouplist for this ranking
+                if (strpos($data2['rank_groups'], ",")) {
+                    $groups = explode(",", $data2['rank_groups']);
+                } else {
+                    if (empty($data2['rank_groups'])) {
+                        $groups = "";
+                    } else {
+                        $groups = array($data2['rank_groups']);
+                    }
+                }
+                if (is_array($groups)) {
+                    // check for group matching as well, assume a match will be found
+                    $ranking_match = true;
+                    foreach($groups as $group) {
+                        if ($data2['rank_groups_and']) {
+                            // all should match
+                            if (!checkusergroup($data['post_author'], $group)) {
+                                // bail out if a non-match has been found
+                                $ranking_match = false;
+                                break;
+                            }
+                        } else {
+                            // one match is sufficient
+                            if (checkusergroup($data['post_author'], $group)) {
+                                $ranking_match = true;
+                                break;
+                            }
+                        }
+                    }
+                } else {
+                    // no groups to test, must be a match on posts range
+                    $ranking_match = true;
+                }
+                // if we had a match, add the ranking information to the post data
+                if ($ranking_match) {
+                    $data['ranking'] = $data2;
+                    $data['show_ranking'] = true;
+                    break;
+                }
+            }
         }
 
@@ -301 +349 @@
         $last_post_datestamp = max($data['post_datestamp'], $data['post_edittime'], $last_post_datestamp);
 
-        // check what options to show for this post
-        $data['user_can_edit'] = iMEMBER && $data['post_author'] != 0 && (iMOD || iSUPERADMIN || (!$tdata['thread_locked'] && $userdata['user_id'] == $data['post_author']));
+        // check if the user can edit this post. Assume the user can't
+        $data['user_can_edit'] = false;
+        if (iMEMBER) {
+            // webmasters and forum moderators may always edit
+            if (iSUPERADMIN || iMOD) {
+                $data['user_can_edit'] = true;
+            } else {
+                // check if this is not a system post
+                if ($data['post_author'] != 0) {
+                    // check if the thread is not locked
+                    if (!$tdata['thread_locked']) {
+                        // check if this is the users own post
+                        if ($userdata['user_id'] == $data['post_author']) {
+                            // check if the edit time is not expired
+                            if ($settings['forum_edit_timeout'] == 0 || ($data['post_datestamp'] + $settings['forum_edit_timeout'] * 3600) > time()) {
+                                $data['user_can_edit'] = true;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // check if we can show the poster's IP address
         $data['show_ip'] = (iMOD || iSUPERADMIN && ($data['post_ip'] != "0.0.0.0" && file_exists(PATH_THEME."images/ip.gif")));
     
@@ -311 +381 @@
                 $data['cc_flag'] = GeoIP_Code2Flag($settings['country']);
             } else {
-                $data['cc_flag'] = GeoIP_IP2Flag($data['post_ip']);
+                $data['cc_flag'] = !empty($data['post_cc']) ? GeoIP_Code2Flag($data['post_cc']) : GeoIP_IP2Flag($data['post_ip']);
             }
         } else {
@@ -324 +394 @@
         // user & group memberships
         $data['group_names'] = array();
+        // if a ranking is present, and a rank title is defined, display that first
+        if (isset($data['ranking']) && !empty($data['ranking']['rank_title']) && !$data['ranking']['rank_tooltip']) {
+            $data['group_names'][] = array('type' => 'R', 'color' => $data['ranking']['rank_color'], 'name' => $data['ranking']['rank_title']);
+        }
+        // display the standard user level next
         $data['group_names'][] = array('type' => 'U', 'level' => $data['user_level'], 'name' => getuserlevel($data['user_level']));