Changeset 1307 in ExiteCMS

Timestamp:

02/27/08 09:57:44 (4 years ago)

Author:

root

Message:

removed the thread_page field from the threads_read table

Files:

• themes/PLi-Fusion/PLiTheme/php-files/themes/PLiTheme/theme.php (modified) (1 diff)
• themes/PLi-Fusion/PLiThemeCentered/php-files/themes/PLiThemeCentered/theme.php (modified) (1 diff)
• themes/PLi-Fusion/PLiXmas/php-files/themes/PLiXmas/theme.php (modified) (1 diff)
• themes/public/ExiteCMS_70/php-files/themes/ExiteCMS_70/theme.php (modified) (1 diff)
• trunk/forum/index.php (modified) (1 diff)
• trunk/forum/viewforum.php (modified) (3 diffs)
• trunk/forum/viewthread.php (modified) (4 diffs)
• trunk/modules/user_info_panel/user_info_panel.php (modified) (1 diff)
• trunk/profile.php (modified) (1 diff)
• trunk/themes/ExiteCMS/theme.php (modified) (1 diff)

themes/PLi-Fusion/PLiTheme/php-files/themes/PLiTheme/theme.php

@@ -82 +82 @@
 
 // unread forum post indicator
-if (iMEMBER) {
+if (iMEMBER && $settings['revision'] >= 1193) {
     $result = dbquery("SELECT count(*) as unread, sum(tr.thread_page) AS pages FROM ".$db_prefix."posts p LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id WHERE tr.user_id = '".$userdata['user_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)", false);
     $variables['new_posts'] = ($result ? mysql_result($result, 0) : 0);

themes/PLi-Fusion/PLiThemeCentered/php-files/themes/PLiThemeCentered/theme.php

@@ -82 +82 @@
 
 // unread forum post indicator
-if (iMEMBER) {
+if (iMEMBER && $settings['revision'] >= 1193) {
     $result = dbquery("SELECT count(*) as unread, sum(tr.thread_page) AS pages FROM ".$db_prefix."posts p LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id WHERE tr.user_id = '".$userdata['user_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)", false);
     $variables['new_posts'] = ($result ? mysql_result($result, 0) : 0);

themes/PLi-Fusion/PLiXmas/php-files/themes/PLiXmas/theme.php

@@ -82 +82 @@
 
 // unread forum post indicator
-if (iMEMBER) {
+if (iMEMBER && $settings['revision'] >= 1193) {
     $result = dbquery("SELECT count(*) as unread, sum(tr.thread_page) AS pages FROM ".$db_prefix."posts p LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id WHERE tr.user_id = '".$userdata['user_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)", false);
     $variables['new_posts'] = ($result ? mysql_result($result, 0) : 0);

themes/public/ExiteCMS_70/php-files/themes/ExiteCMS_70/theme.php

@@ -65 +65 @@
 
 // unread forum post indicator
-if (iMEMBER) {
+if (iMEMBER && $settings['revision'] >= 1193) {
     if ($userdata['user_posts_unread']) {
         // include the users own posts

trunk/forum/index.php

@@ -82 +82 @@
         if ($userdata['user_posts_unread']) {
             // include the users own posts
-            $result2 = dbquery("SELECT count(*) as unread, sum(tr.thread_page) AS pages FROM ".$db_prefix."posts p LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id WHERE tr.user_id = '".$userdata['user_id']."' AND tr.forum_id = '".$data['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)", false);
+            $result2 = dbquery("SELECT count(*) as unread FROM ".$db_prefix."posts p LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id WHERE tr.user_id = '".$userdata['user_id']."' AND tr.forum_id = '".$data['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)", false);
         } else {
             // filter the users own posts
-            $result2 = dbquery("SELECT count(*) as unread, sum(tr.thread_page) AS pages FROM ".$db_prefix."posts p LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id WHERE tr.user_id = '".$userdata['user_id']."' AND tr.forum_id = '".$data['forum_id']."' AND p.post_author != '".$userdata['user_id']."' AND p.post_edituser != '".$userdata['user_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)", false);
+            $result2 = dbquery("SELECT count(*) as unread FROM ".$db_prefix."posts p LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id WHERE tr.user_id = '".$userdata['user_id']."' AND tr.forum_id = '".$data['forum_id']."' AND p.post_author != '".$userdata['user_id']."' AND p.post_edituser != '".$userdata['user_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)", false);
         }
         $data['unread_posts'] = ($result2 ? mysql_result($result2, 0) : 0);

trunk/forum/viewforum.php

@@ -107 +107 @@
     if ($userdata['user_posts_unread']) {
         // include the users own posts
-        $result = dbquery("SELECT count(*) as unread, sum(tr.thread_page) AS pages FROM ".$db_prefix."posts p LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id WHERE tr.user_id = '".$userdata['user_id']."' 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)", false);
+        $result = dbquery("SELECT count(*) as unread FROM ".$db_prefix."posts p LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id WHERE tr.user_id = '".$userdata['user_id']."' 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)", false);
     } else {
         // filter the users own posts
-        $result = dbquery("SELECT count(*) as unread, sum(tr.thread_page) AS pages FROM ".$db_prefix."posts p LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id WHERE tr.user_id = '".$userdata['user_id']."' AND tr.forum_id = '".$forum_id."' AND p.post_author != '".$userdata['user_id']."' AND p.post_edituser != '".$userdata['user_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)", false);
+        $result = dbquery("SELECT count(*) as unread FROM ".$db_prefix."posts p LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id WHERE tr.user_id = '".$userdata['user_id']."' AND tr.forum_id = '".$forum_id."' AND p.post_author != '".$userdata['user_id']."' AND p.post_edituser != '".$userdata['user_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)", false);
     }
     $variables['unread_posts'] = ($result ? mysql_result($result, 0) : 0);
@@ -152 +152 @@
     if (isset($userdata['user_id']) && $variables['unread_posts']) {
         $result2 = dbquery("
-            SELECT count(*) as unread, sum(tr.thread_page) AS pages, MIN(p.post_id) as post_id
+            SELECT count(*) as unread, MIN(p.post_id) as post_id
                 FROM ".$db_prefix."posts p 
                 LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 
@@ -173 +173 @@
         $data['first_unread_post'] = 0;
     }
-    // number of pages of posts in this thread
-    $data['thread_pages'] = ceil($data['thread_replies'] / $settings['numofthreads']) + 1;
     // correct the number of replies
     $data['thread_replies'] = max(0, $data['thread_replies'] - 1);

trunk/forum/viewthread.php

@@ -194 +194 @@
         // include the users own posts
         $result = dbquery("
-            SELECT count(*) as unread, tr.thread_last_read, tr.thread_page
+            SELECT count(*) as unread, tr.thread_last_read
                 FROM ".$db_prefix."posts p
                 LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id
@@ -206 +206 @@
         // filter the users own posts
         $result = dbquery("
-            SELECT count(*) as unread, tr.thread_last_read, tr.thread_page
+            SELECT count(*) as unread, tr.thread_last_read
                 FROM ".$db_prefix."posts p
                 LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id
@@ -222 +222 @@
         $variables['unread_posts'] = $data['unread'];
         $thread_last_read = $data['thread_last_read'];
-        $thread_page = $data['thread_page'];
     } else {
         $variables['unread_posts'] = 0;
         $thread_last_read = time();
-        $thread_page = 0;
     }
 } else {
     $variables['unread_posts'] = 0;
     $thread_last_read = time();
-    $thread_page = 0;
 }
 
@@ -397 +394 @@
 // update the threads_read record for this user and thread when the last_post_datestamp is newer
 if (iMEMBER && $last_post_datestamp) {
-    $result = dbquery("UPDATE ".$db_prefix."threads_read SET thread_last_read = '".$last_post_datestamp."', thread_page = '".min($rowstart, $thread_page)."' WHERE user_id = '".$userdata['user_id']."' AND thread_id = '".$thread_id."' AND thread_last_read < '".$last_post_datestamp."'");
+    $result = dbquery("UPDATE ".$db_prefix."threads_read SET thread_last_read = '".$last_post_datestamp."' WHERE user_id = '".$userdata['user_id']."' AND thread_id = '".$thread_id."' AND thread_last_read < '".$last_post_datestamp."'");
 }
 

trunk/modules/user_info_panel/user_info_panel.php

@@ -34 +34 @@
     if ($userdata['user_posts_unread']) {
         // include the users own posts
-        $result = dbquery("SELECT count(*) as unread, sum(tr.thread_page) AS pages FROM ".$db_prefix."posts p LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id WHERE tr.user_id = '".$userdata['user_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)", false);
+        $result = dbquery("SELECT count(*) as unread FROM ".$db_prefix."posts p LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id WHERE tr.user_id = '".$userdata['user_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)", false);
     } else {
         // filter the users own posts
-        $result = dbquery("SELECT count(*) as unread, sum(tr.thread_page) AS pages FROM ".$db_prefix."posts p LEFT 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']."' AND p.post_edituser != '".$userdata['user_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)", false);
+        $result = dbquery("SELECT count(*) as unread FROM ".$db_prefix."posts p LEFT 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']."' AND p.post_edituser != '".$userdata['user_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)", false);
     }
     $variables['new_post_msg'] = ($result ? mysql_result($result, 0) : 0);

trunk/profile.php

@@ -92 +92 @@
     $data['user_posts'] = number_format($data['user_posts']);
     $data['show_viewposts_button'] = ($data['user_posts'] > 0 and file_exists(PATH_MODULES."forum_threads_list_panel/my_posts.php"));
-    $result = dbquery("SELECT count(*) as unread, sum(tr.thread_page) AS pages FROM ".$db_prefix."posts p LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id WHERE tr.user_id = '".$data['user_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)", false);
+    $result = dbquery("SELECT count(*) as unread FROM ".$db_prefix."posts p LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id WHERE tr.user_id = '".$data['user_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)", false);
     $data['unread_count'] = ($result ? mysql_result($result, 0) : 0);
     $data['user_email'] = str_replace("@","@",$data['user_email']);

trunk/themes/ExiteCMS/theme.php

@@ -68 +68 @@
     if ($userdata['user_posts_unread']) {
         // include the users own posts
-        $result = dbquery("SELECT count(*) as unread, sum(tr.thread_page) AS pages FROM ".$db_prefix."posts p LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id WHERE tr.user_id = '".$userdata['user_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)", false);
+        $result = dbquery("SELECT count(*) as unread FROM ".$db_prefix."posts p LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id WHERE tr.user_id = '".$userdata['user_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)", false);
     } else {
         // filter the users own posts
-        $result = dbquery("SELECT count(*) as unread, sum(tr.thread_page) AS pages FROM ".$db_prefix."posts p LEFT 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']."' AND p.post_edituser != '".$userdata['user_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)", false);
+        $result = dbquery("SELECT count(*) as unread FROM ".$db_prefix."posts p LEFT 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']."' AND p.post_edituser != '".$userdata['user_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)", false);
     }
     $variables['new_posts'] = ($result ? mysql_result($result, 0) : 0);