[php-blog-cvs] serendipity/include functions_entries.inc.php,1.12,1.13 plugin_internal.inc.php,1.11,1.12

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4345/include

Modified Files:
	functions_entries.inc.php plugin_internal.inc.php 
Log Message:
added config option to NOT hide entries in the future. Some newssites may even have a use for this. :)



Index: plugin_internal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/plugin_internal.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- plugin_internal.inc.php	29 Nov 2004 09:55:11 -0000	1.11
+++ plugin_internal.inc.php	29 Nov 2004 10:39:33 -0000	1.12
@@ -144,7 +144,7 @@
                               FROM {$serendipity['dbPrefix']}entries e
                              WHERE e.timestamp >= " . serendipity_serverOffsetHour($ts, true) . "
                                AND e.timestamp <= " . serendipity_serverOffsetHour($endts, true) . "
-                               AND e.timestamp <= $now
+                               " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND e.timestamp <= $now " : '') . "
                                AND e.isdraft = 'false'";
         }
 

Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- functions_entries.inc.php	29 Nov 2004 09:55:11 -0000	1.12
+++ functions_entries.inc.php	29 Nov 2004 10:39:26 -0000	1.13
@@ -175,7 +175,7 @@
         }
     }
 
-    if (!isset($serendipity['GET']['adminModule'])) {
+    if (!isset($serendipity['GET']['adminModule']) && !serendipity_db_bool($serendipity['showFutureEntries'])) {
         if (!empty($cond['and'])) {
             $cond['and'] .= " AND e.timestamp <= '" . serendipity_serverOffsetHour(time(), true) . "'";
         } else {
@@ -296,7 +296,7 @@
     $cond['and'] = " "; // intentional dummy string to attach dummy AND parts to the WHERE clauses
 
     if ($fetchDrafts == 'false') {
-        $cond['and'] = " AND e.isdraft = 'false' AND e.timestamp <= " . serendipity_serverOffsetHour(time(), true);
+        $cond['and'] = " AND e.isdraft = 'false' " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND e.timestamp <= " . serendipity_serverOffsetHour(time(), true) : '');
     }
 
     if (isset($serendipity['GET']['adminModule']) && $serendipity['GET']['adminModule'] == 'entries' && $serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF) {
@@ -419,7 +419,7 @@
     }
 
     $cond = array();
-    $cond['and'] = " AND isdraft = 'false' AND timestamp <= " . serendipity_serverOffsetHour(time(), true);
+    $cond['and'] = " AND isdraft = 'false' " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND timestamp <= " . serendipity_serverOffsetHour(time(), true) : '');
     serendipity_plugin_api::hook_event('frontend_fetchentries', $cond);
     $querystring = "SELECT $distinct
                             e.id,
@@ -1561,7 +1561,7 @@
                                                        WHERE isdraft = 'false'
                                                            AND timestamp >= $s
                                                            AND timestamp <= $e
-                                                           AND timestamp <= " . serendipity_serverOffsetHour(time(), true));
+                                                           " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND timestamp <= " . serendipity_serverOffsetHour(time(), true) : ''));
             $entry_count = $entries[0][0];
 
             /* A silly hack to get the maximum amount of entries per month */