Changeset 1667 for trunk

Timestamp:

05/07/10 05:59:40 (2 years ago)

Author:

nick_ramsay

Message:

[TRUNK] Hotaru 1.2 updates for improved caching.

Location:

trunk

Files:

• . (modified) (1 prop)
• content/plugins (modified) (1 prop)
• content/plugins/sb_base/libs/SbBaseFunctions.php (modified) (6 diffs)
• content/plugins/sb_base/readme.txt (modified) (1 diff)
• functions/funcs.times.php (modified) (1 diff)
• libs/Comment.php (modified) (1 diff)
• libs/Post.php (modified) (1 diff)

trunk/content/plugins/sb_base/libs/SbBaseFunctions.php

@@ -149 +149 @@
             $h->vars['filter']['post_archived = %s'] = 'N'; 
             $h->vars['filter']['post_status = %s'] = 'new'; 
-            $start = date('YmdHis', strtotime("now"));
+            $start = date('YmdHis', time_block());
             $end = date('YmdHis', strtotime($upcoming_duration)); // should be negative
             $h->vars['filter']['(post_date >= %s AND post_date <= %s)'] = array($end, $start); 
@@ -158 +158 @@
             // Filters page to "top" stories from the last 24 hours only
             $h->vars['filter']['post_status = %s'] = 'top'; 
-            $start = date('YmdHis', strtotime("now"));
+            $start = date('YmdHis', time_block());
             $end = date('YmdHis', strtotime("-1 day"));
             $h->vars['filter']['(post_date >= %s AND post_date <= %s)'] = array($end, $start); 
@@ -167 +167 @@
             // Filters page to "top" stories from the last 48 hours only
             $h->vars['filter']['post_status = %s'] = 'top'; 
-            $start = date('YmdHis', strtotime("now"));
+            $start = date('YmdHis', time_block());
             $end = date('YmdHis', strtotime("-2 days"));
             $h->vars['filter']['(post_date >= %s AND post_date <= %s)'] = array($end, $start); 
@@ -176 +176 @@
             // Filters page to "top" stories from the last 7 days only
             $h->vars['filter']['post_status = %s'] = 'top'; 
-            $start = date('YmdHis', strtotime("now"));
+            $start = date('YmdHis', time_block());
             $end = date('YmdHis', strtotime("-7 days"));
             $h->vars['filter']['(post_date >= %s AND post_date <= %s)'] = array($end, $start); 
@@ -185 +185 @@
             // Filters page to "top" stories from the last 30 days only
             $h->vars['filter']['post_status = %s'] = 'top'; 
-            $start = date('YmdHis', strtotime("now"));
+            $start = date('YmdHis', time_block());
             $end = date('YmdHis', strtotime("-30 days"));
             $h->vars['filter']['(post_date >= %s AND post_date <= %s)'] = array($end, $start); 
@@ -194 +194 @@
             // Filters page to "top" stories from the last 365 days only
             $h->vars['filter']['post_status = %s'] = 'top'; 
-            $start = date('YmdHis', strtotime("now"));
+            $start = date('YmdHis', time_block());
             $end = date('YmdHis', strtotime("-365 days"));
             $h->vars['filter']['(post_date >= %s AND post_date <= %s)'] = array($end, $start); 

trunk/content/plugins/sb_base/readme.txt

@@ -14 +14 @@
 Changelog
 ---------
+v.1.0 2010/05/07 - Nick - Fixes for better caching
 v.1.0 2010/04/14 - Nick - Changes to enable home page overriding
 v.0.9 2010/03/27 - Nick - 1 & 3 month options for post archiving, plus reorganization of post RSS methods

trunk/functions/funcs.times.php

@@ -149 +149 @@
         }
 }
+
+ /**
+ * Returns the next time block of the day, e.g. now: 1:25, so returns 2:00 (if block = 1 hour)
+ *
+ * @param int $block - time in HOURS
+ * @return int - time in SECONDS
+ */
+function time_block($block = 1)
+{
+        $block = ($block * 60) * 60; // change into seconds
+        $time_now = time();
+        $start_of_current_block = floor($time_now/$block);
+        $start_of_current_block *= $block;
+        
+        $start_of_next_block = $start_of_current_block + $block;
+        
+        return $start_of_next_block;
+}
 ?>

trunk/libs/Comment.php

@@ -536 +536 @@
         public function countDailyComments($h)
         {
-                $start = date('YmdHis', strtotime("now"));
+                $start = date('YmdHis', time_block());
                 $end = date('YmdHis', strtotime("-1 day"));
                 $sql = "SELECT COUNT(comment_id) FROM " . TABLE_COMMENTS . " WHERE comment_archived = %s AND comment_user_id = %d AND (comment_date >= %s AND comment_date <= %s)";

trunk/libs/Post.php

@@ -413 +413 @@
                 } 
                 
-                $start = date('YmdHis', strtotime("now"));
+                $start = date('YmdHis', time_block());
                 $end = date('YmdHis', strtotime($time_ago));
                 $sql = "SELECT COUNT(post_id) FROM " . TABLE_POSTS . " WHERE post_archived = %s AND post_author = %d AND post_type = %s AND (post_date >= %s AND post_date <= %s)";