Changeset 1280 in ExiteCMS

Timestamp:

02/14/08 15:02:48 (4 years ago)

Author:

hverton

Message:

added user option to show/hide the users own posts from the unread posts count

Location:

trunk

Files:

• administration/tools/language_pack_English.php (modified) (1 diff)
• administration/upgrade/rev01280.php (added)
• edit_profile.php (modified) (2 diffs)
• forum/index.php (modified) (1 diff)
• forum/viewforum.php (modified) (2 diffs)
• forum/viewthread.php (modified) (1 diff)
• includes/templates/main.edit_profile.tpl (modified) (1 diff)
• modules/user_info_panel/user_info_panel.php (modified) (1 diff)
• themes/ExiteCMS/theme.php (modified) (1 diff)

trunk/administration/tools/language_pack_English.php

@@ -3077 +3077 @@
         $localestrings['u033'] = "Open";
         $localestrings['u034'] = "Closed";
-        $localestrings['u035'] = "";
+        $localestrings['u035'] = "Show your own posts as unread";
         $localestrings['u036'] = "";
         $localestrings['u037'] = "Html";

trunk/edit_profile.php

@@ -144 +144 @@
     $user_newsletters = isNum($_POST['user_newsletters']) ? $_POST['user_newsletters'] : "1";
     $user_forum_fullscreen = isNum($_POST['user_forum_fullscreen']) ? $_POST['user_forum_fullscreen'] : "0";
+    $user_posts_unread = isNum($_POST['user_posts_unread']) ? $_POST['user_posts_unread'] : "0";
     $user_theme = stripinput($_POST['user_theme']);
     $user_offset = isset($_POST['user_offset']) ? $_POST['user_offset'] : "+0";
@@ -185 +186 @@
         }
         if ($user_newpassword != "") { $newpass = " user_password=md5(md5('$user_newpassword')), "; } else { $newpass = " "; }
-        $result = dbquery("UPDATE ".$db_prefix."users SET user_name='$username', user_fullname='$user_fullname', ".$newpass."user_email='".$_POST['user_email']."', user_bad_email = '0', user_hide_email='$user_hide_email', user_location='$user_location', user_birthdate='$user_birthdate', user_aim='$user_aim', user_icq='$user_icq', user_msn='$user_msn', user_yahoo='$user_yahoo', user_web='$user_web', user_forum_fullscreen='$user_forum_fullscreen', user_newsletters='$user_newsletters', user_theme='$user_theme', user_offset='$user_offset', ".$set_avatar."user_sig='$user_sig', user_locale='".$_POST['user_locale']."' WHERE user_id='".$this_userdata['user_id']."'");
+        $result = dbquery("UPDATE ".$db_prefix."users SET user_name='$username', user_fullname='$user_fullname', ".$newpass."user_email='".$_POST['user_email']."', user_bad_email = '0', user_hide_email='$user_hide_email', user_location='$user_location', user_birthdate='$user_birthdate', user_aim='$user_aim', user_icq='$user_icq', user_msn='$user_msn', user_yahoo='$user_yahoo', user_web='$user_web', user_forum_fullscreen='$user_forum_fullscreen', user_posts_unread='$user_forum_posts_unread', user_newsletters='$user_newsletters', user_theme='$user_theme', user_offset='$user_offset', ".$set_avatar."user_sig='$user_sig', user_locale='".$_POST['user_locale']."' WHERE user_id='".$this_userdata['user_id']."'");
         if ($user_theme != $userdata['user_theme']) redirect(FUSION_SELF."?status=1");
         $result = dbquery("SELECT * FROM ".$db_prefix."users WHERE user_id='".$this_userdata['user_id']."'");

trunk/forum/index.php

@@ -80 +80 @@
     // get the unread posts count for this forum
     if (iMEMBER) {
-        $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);
+        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);
+        } 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);
+        }
         $data['unread_posts'] = ($result2 ? mysql_result($result2, 0) : 0);
     } else {

trunk/forum/viewforum.php

@@ -66 +66 @@
 }
 
-// get the number of unread posts in this forum
-$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);
-$variables['unread_posts'] = ($result ? mysql_result($result, 0) : 0);
-
 // if a forum rules custompage is given, check if it exists
 $variables['rulespage_defined'] = false;
@@ -107 +103 @@
 }
 
-// check for unread posts in this forum
+// get the number of unread posts in this forum
 if (iMEMBER) {
-    $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);
-    $data['unread_count'] = ($result ? mysql_result($result, 0) : 0);
+    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);
+    } 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);
+    }
+    $variables['unread_posts'] = ($result ? mysql_result($result, 0) : 0);
 } else {
-    $data['unread_count'] = 0;
+    $variables['unread_posts'] = 0;
 }
 

trunk/forum/viewthread.php

@@ -191 +191 @@
 // number of unread posts in this thread
 if (iMEMBER) {
-    $result = dbquery("
-        SELECT count(*) as unread, tr.thread_last_read, tr.thread_page
-            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.thread_id = '".$thread_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)
-            GROUP BY tr.thread_id
-        ");
+    if ($userdata['user_posts_unread']) {
+        // include the users own posts
+        $result = dbquery("
+            SELECT count(*) as unread, tr.thread_last_read, tr.thread_page
+                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.thread_id = '".$thread_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)
+                GROUP BY tr.thread_id
+            ");
+    } else {
+        // filter the users own posts
+        $result = dbquery("
+            SELECT count(*) as unread, tr.thread_last_read, tr.thread_page
+                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 tr.thread_id = '".$thread_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)
+                GROUP BY tr.thread_id
+            ");
+    }
     if (dbrows($result)) {
         $data = dbarray($result);

trunk/includes/templates/main.edit_profile.tpl

@@ -102 +102 @@
                 <input type='radio' name='user_forum_fullscreen' value='1' {if $this_userdata.user_forum_fullscreen == "1"}checked="checked"{/if} />{$locale.u007}
                 <input type='radio' name='user_forum_fullscreen' value='0' {if $this_userdata.user_forum_fullscreen == "0"}checked="checked"{/if} />{$locale.u008}
+            </td>
+        </tr>
+        <tr>
+            <td class='tbl'>
+                {$locale.u035}
+            </td>
+            <td class='tbl'>
+                <input type='radio' name='user_posts_unread' value='1' {if $this_userdata.user_posts_unread == "1"}checked="checked"{/if} />{$locale.u007}
+                <input type='radio' name='user_posts_unread' value='0' {if $this_userdata.user_posts_unread == "0"}checked="checked"{/if} />{$locale.u008}
             </td>
         </tr>

trunk/modules/user_info_panel/user_info_panel.php

@@ -32 +32 @@
     }
     $variables['new_pm_msg'] = dbcount("(pmindex_id)", "pm_index", "pmindex_user_id ='".$userdata['user_id']."' AND pmindex_to_id='".$userdata['user_id']."' AND pmindex_read_datestamp = '0'");
-    $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);
+    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);
+    } 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);
+    }
     $variables['new_post_msg'] = ($result ? mysql_result($result, 0) : 0);
     // check if the forum_threads_list_panel module is installed

trunk/themes/ExiteCMS/theme.php

@@ -66 +66 @@
 // unread forum post indicator
 if (iMEMBER) {
-    $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);
+    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);
+    } 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);
+    }
     $variables['new_posts'] = ($result ? mysql_result($result, 0) : 0);
 } else {