[php-blog-cvs] serendipity/include functions_entries.inc.php,1.17,1.18 plugin_internal.inc.php,1.13,1.14

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

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

Modified Files:
	functions_entries.inc.php plugin_internal.inc.php 
Log Message:
fix server time zone offset things, thanks to Kaustubh for reporting!
We actually store the server time in the entries, so we don't need to add offsets when fetching them later from the DB for all those 'future Entries' checks.



Index: plugin_internal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/plugin_internal.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- plugin_internal.inc.php	2 Dec 2004 10:54:56 -0000	1.13
+++ plugin_internal.inc.php	3 Dec 2004 12:02:27 -0000	1.14
@@ -131,7 +131,7 @@
                                        {$serendipity['dbPrefix']}entrycat ec
                                  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  <= " . time() : '') . "
                                    AND e.isdraft     = 'false'
                                    AND e.id          = ec.entryid
                                    AND c.categoryid  = ec.categoryid
@@ -144,7 +144,7 @@
                               FROM {$serendipity['dbPrefix']}entries e
                              WHERE e.timestamp >= " . serendipity_serverOffsetHour($ts, true) . "
                                AND e.timestamp <= " . serendipity_serverOffsetHour($endts, true) . "
-                               " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND e.timestamp <= $now " : '') . "
+                               " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND e.timestamp <= " . time() : '') . "
                                AND e.isdraft = 'false'";
         }
 

Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- functions_entries.inc.php	1 Dec 2004 11:00:55 -0000	1.17
+++ functions_entries.inc.php	3 Dec 2004 12:02:25 -0000	1.18
@@ -177,9 +177,9 @@
 
     if (!isset($serendipity['GET']['adminModule']) && !serendipity_db_bool($serendipity['showFutureEntries'])) {
         if (!empty($cond['and'])) {
-            $cond['and'] .= " AND e.timestamp <= '" . serendipity_serverOffsetHour(time(), true) . "'";
+            $cond['and'] .= " AND e.timestamp <= '" . time() . "'";
         } else {
-            $cond['and'] = "WHERE e.timestamp <= '" . serendipity_serverOffsetHour(time(), true) . "'";
+            $cond['and'] = "WHERE e.timestamp <= '" . time() . "'";
         }
     }
 
@@ -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' " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND e.timestamp <= " . serendipity_serverOffsetHour(time(), true) : '');
+        $cond['and'] = " AND e.isdraft = 'false' " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND e.timestamp <= " . time() : '');
     }
 
     if (isset($serendipity['GET']['adminModule']) && $serendipity['GET']['adminModule'] == 'entries' && $serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF) {
@@ -418,7 +418,7 @@
     }
 
     $cond = array();
-    $cond['and'] = " AND isdraft = 'false' " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND timestamp <= " . serendipity_serverOffsetHour(time(), true) : '');
+    $cond['and'] = " AND isdraft = 'false' " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND timestamp <= " . time() : '');
     serendipity_plugin_api::hook_event('frontend_fetchentries', $cond);
     $querystring = "SELECT $distinct
                             e.id,
@@ -1144,7 +1144,7 @@
         $hidden .= '        <input type="hidden" name="' . $key . '" value="' . $value . '" />' . $n;
     }
     $hidden .= '        <input type="hidden" id="entryid" name="serendipity[id]" value="' . (isset($entry['id']) ? $entry['id'] : '') . '" />' . $n;
-    $hidden .= '        <input type="hidden" name="serendipity[timestamp]" value="' . (isset($entry['timestamp']) ? serendipity_serverOffsetHour($entry['timestamp']) : '') . '" />' . $n;
+    $hidden .= '        <input type="hidden" name="serendipity[timestamp]" value="' . (isset($entry['timestamp']) ? serendipity_serverOffsetHour($entry['timestamp']) : serendipity_serverOffsetHour(time())) . '" />' . $n;
     $hidden .= '        <input type="hidden" name="serendipity[preview]" value="false" />';
     $hidden .= '        <input type="hidden" name="serendipity[quicksave]" value="false" />';
 
@@ -1559,7 +1559,7 @@
                                                        WHERE isdraft = 'false'
                                                            AND timestamp >= $s
                                                            AND timestamp <= $e
-                                                           " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND timestamp <= " . serendipity_serverOffsetHour(time(), true) : ''));
+                                                           " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND timestamp <= " . time() : ''));
             $entry_count = $entries[0][0];
 
             /* A silly hack to get the maximum amount of entries per month */