Changeset 1654 in ExiteCMS

Timestamp:

08/19/08 11:02:58 (3 years ago)

Author:

hverton

Message:

added a new forum setting to limit forum message visibility for guests to a set number of days. Older threads will not be accessable. This may encourage visitors to become a member

Location:

trunk

Files:

• administration/settings_forum.php (modified) (1 diff)
• administration/tools/language_pack_English.php (modified) (2 diffs)
• administration/tools/language_pack_Nederlands.php (modified) (2 diffs)
• administration/upgrade/rev01650.php (added)
• files/locales/en.main.global.php (modified) (1 diff)
• forum/viewforum.php (modified) (2 diffs)
• forum/viewposts.php (modified) (2 diffs)
• forum/viewthread.php (modified) (3 diffs)
• includes/templates/admin.settings_forum.tpl (modified) (2 diffs)
• includes/templates/forum.index.tpl (modified) (1 diff)
• includes/templates/forum.viewforum.tpl (modified) (1 diff)

trunk/administration/settings_forum.php

@@ -39 +39 @@
     $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".(isNum($_POST['unread_threshold']) ? $_POST['unread_threshold'] : "0")."' WHERE cfg_name = 'unread_threshold'");
     $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".(isNum($_POST['forum_edit_timeout']) ? $_POST['forum_edit_timeout'] : "0")."' WHERE cfg_name = 'forum_edit_timeout'");
+    $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".(isNum($_POST['forum_guest_limit']) ? $_POST['forum_guest_limit'] : "0")."' WHERE cfg_name = 'forum_guest_limit'");
 }
 

trunk/administration/tools/language_pack_English.php

@@ -1040 +1040 @@
         $localestrings['541'] = ", then ";
         $localestrings['542'] = ", with OpenID";
+        $localestrings['543'] = "Limit forum posts for guests to:";
+        $localestrings['544'] = "No Limit";
         $localestrings['550'] = "Security";
         $localestrings['551'] = "Enable registration system?";
@@ -2313 +2315 @@
         $localestrings['460'] = "Sticky Thread.";
         $localestrings['461'] = "You are not authorised to view this Forum.";
+        $localestrings['462'] = "For guest users, only the active threads of the last %s are visible. Please consider becoming a member";
         $localestrings['500'] = "View Thread";
         $localestrings['501'] = "Author";

trunk/administration/tools/language_pack_Nederlands.php

@@ -1040 +1040 @@
         $localestrings['541'] = ", daarna ";
         $localestrings['542'] = ", met OpenID";
+        $localestrings['543'] = "Forumberichten voor gasten limiteren tot:";
+        $localestrings['544'] = "Geen limiet";
         $localestrings['550'] = "Beveiliging";
         $localestrings['551'] = "Activeer registratie systeem?";
@@ -2313 +2315 @@
         $localestrings['460'] = "Belangrijke topic.";
         $localestrings['461'] = "U bent niet geauthoriseerd om dit forum te bekijken.";
+        $localestrings['462'] = "Voor gasten zijn alleen de topics van de laatste %s zichtbaar. Wordt lid om alles te kunnen zien";
         $localestrings['500'] = "Bekijk topic";
         $localestrings['501'] = "Auteur";

trunk/files/locales/en.main.global.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.global
-// generated on : Sun Aug 17 2008, 18:14:24 CEST
+// generated on : Mon Aug 18 2008, 22:18:00 CEST
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

trunk/forum/viewforum.php

@@ -146 +146 @@
 $variables['rowstart'] = $rowstart;
 
+// is a thread time limit defined for guest users?
+$thread_limit = iMEMBER ? 0 : (time() - $settings['forum_guest_limit'] * 86400);
+
 // get the threads to fill this page
 $result = dbquery(
@@ -153 +156 @@
         LEFT JOIN ".$db_prefix."users tu1 ON t.thread_author = tu1.user_id
         LEFT JOIN ".$db_prefix."users tu2 ON t.thread_lastuser = tu2.user_id
-        WHERE t.forum_id = '".$forum_id."'
+        WHERE t.forum_id = '".$forum_id."'".($thread_limit==0?"":" AND t.thread_lastpost > ".$thread_limit)."
         GROUP BY thread_id
         ORDER BY thread_sticky DESC, thread_lastpost DESC

trunk/forum/viewposts.php

@@ -31 +31 @@
 if (!isset($forum_id) || !isNum($forum_id)) $forum_id = false;
 
+// is a thread time limit defined for guest users?
+$thread_limit = iMEMBER ? 0 : (time() - $settings['forum_guest_limit'] * 86400);
+
 // check if we have anything to display
 $result = dbquery(
     "SELECT tp.*, tf.* FROM ".$db_prefix."posts tp
+    INNER JOIN ".$db_prefix."threads th USING(thread_id)
     INNER JOIN ".$db_prefix."forums tf USING(forum_id)
-    WHERE ".groupaccess('forum_access').($forum_id ? " AND tp.forum_id = '$forum_id'" : "")
+    WHERE ".($thread_limit==0?"":" th.thread_lastpost > ".$thread_limit." AND ").groupaccess('forum_access').($forum_id ? " AND tp.forum_id = '$forum_id'" : "")
 );
+
 $rows = dbrows($result);
 $variables['rows'] = $rows;
@@ -46 +51 @@
 $result = dbquery(
     "SELECT tp.*, tf.* FROM ".$db_prefix."posts tp
+    INNER JOIN ".$db_prefix."threads th USING(thread_id)
     INNER JOIN ".$db_prefix."forums tf USING(forum_id)
-    WHERE ".groupaccess('forum_access').($forum_id ? " AND tp.forum_id = '$forum_id'" : "")."
+    WHERE ".($thread_limit==0?"":" th.thread_lastpost > ".$thread_limit." AND ").groupaccess('forum_access').($forum_id ? " AND tp.forum_id = '$forum_id'" : "")."
     ORDER BY post_datestamp DESC 
     LIMIT $rowstart,".ITEMS_PER_PAGE

trunk/forum/viewthread.php

@@ -118 +118 @@
 $variables['user_can_blacklist'] = checkrights("B");
 
+// check if there is a thread time limit defined for guests
+$thread_limit = iMEMBER ? 0 : (time() - $settings['forum_guest_limit'] * 86400);
+
 // get information about the current thread
 $result = dbquery(
     "SELECT * FROM ".$db_prefix."threads 
-    WHERE thread_id='".$thread_id."' AND forum_id='".$fdata['forum_id']."'"
+    WHERE thread_id='".$thread_id."' AND forum_id='".$fdata['forum_id']."'".($thread_limit==0?"":" AND thread_lastpost > ".$thread_limit)
 );
-// bail out if the requested forum does not exist
+// bail out if the requested thread does not exist
 if (!dbrows($result)) {
-    fallback("index.php");
-}
+    fallback("viewforum.php?forum_id=".$forum_id);
+}
+
 // store the thread information
 $tdata = dbarray($result);
@@ -342 +346 @@
         } else {
             // check if the post timestamp within the set unread threshold
-            if ($data['post_datestamp'] > $settings['unread_threshold'] || $data['post_editttime'] > $settings['unread_threshold']) {
+            if ($data['post_datestamp'] > $settings['unread_threshold'] || $data['post_edittime'] > $settings['unread_threshold']) {
                 // check if it is newer that the first and last marker in the threads_read record
                 if ($data['post_datestamp'] > $thread_last_read || $data['post_edittime'] > $thread_last_read || $data['post_datestamp'] < $thread_first_read || ($data['post_edittime'] != 0 && $data['post_edittime'] < $thread_first_read))  {
@@ -349 +353 @@
                     $data['unread'] = false;
                 }
+            } else {
+                $data['unread'] = false;
             }
         }

trunk/includes/templates/admin.settings_forum.tpl

@@ -82 +82 @@
                 <select name='unread_threshold' class='textbox'>
                 {section name=days start=0 loop=361 step=30}
-                <option value='{$smarty.section.days.index}' {if $smarty.section.days.index == $settings2.unread_threshold|default:0}selected='selected'{/if}>{if $smarty.section.days.index == 0}{$locale.714}{else}{$smarty.section.days.index} {$locale.518}{/if}</option>
+                <option value='{$smarty.section.days.index}' {if $smarty.section.days.index == $settings2.unread_threshold|default:0}selected='selected'{/if}>{if $smarty.section.days.index == 0}{$locale.544}{else}{$smarty.section.days.index} {$locale.518}{/if}</option>
                 {/section}
                 </select>
@@ -108 +108 @@
                 {section name=hours start=1 loop=25}
                 <option value='{$smarty.section.hours.index}' {if $settings2.forum_edit_timeout == $smarty.section.hours.index}selected='selected'{/if}>{$smarty.section.hours.index} {if $smarty.section.hours.index == 1}{$locale.535}{else}{$locale.536}{/if}</option>
+                {/section}
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <td width='60%' class='tbl'>
+                {$locale.543}
+            </td>
+            <td width='40%' class='tbl'>
+                <select name='forum_guest_limit' class='textbox'>
+                <option value='0' {if $settings2.forum_guest_limit}selected='selected'{/if}>{$locale.544}</option>
+                {section name=days start=1 loop=91}
+                <option value='{$smarty.section.days.index}' {if $settings2.forum_guest_limit == $smarty.section.days.index}selected='selected'{/if}>{$smarty.section.days.index} {if $smarty.section.days.index == 1}{$locale.527}{else}{$locale.518}{/if}</option>
                 {/section}
                 </select>

trunk/includes/templates/forum.index.tpl

@@ -48 +48 @@
                         </td>
                     </tr>
+                    {if !iMEMBER && $settings.forum_guest_limit}
+                        <tr>
+                            <td class='tbl2' align='center' colspan='6'>
+                                <span class='small' style='font-size:90%;font-weight:bold;'>{if $settings.forum_guest_limit == 1}{$locale.462|sprintf:$locale.074}{else}{assign var=days value=$settings.forum_guest_limit|cat:" "|cat:$locale.075}{$locale.462|sprintf:$days}{/if}</span>
+                            </td>
+                        </tr>
+                    {/if}
                     {/if}
                     <tr>

trunk/includes/templates/forum.viewforum.tpl

@@ -165 +165 @@
                 </tr>
             {/section}
+                {if !iMEMBER && $settings.forum_guest_limit}
+                <tr>
+                    <td class='tbl2' align='center' colspan='7'>
+                        <span class='small' style='font-size:90%;font-weight:bold;'>{if $settings.forum_guest_limit == 1}{$locale.462|sprintf:$locale.074}{else}{assign var=days value=$settings.forum_guest_limit|cat:" "|cat:$locale.075}{$locale.462|sprintf:$days}{/if}</span>
+                    </td>
+                </tr>
+                {/if}
             </table>
         </td>