Changeset 6662

Timestamp:

Jul 5, 2010, 10:46:55 PM (14 years ago)

Author:

nikrou

Message:

Bug 1762 fixed : Compleet RSS Feed returns notice
Remove mysql specific function

Location:

trunk

Files:

• feed.php (modified) (4 diffs)
• include/functions_notification.inc.php (modified) (2 diffs)

trunk/feed.php

@@ -37 +37 @@
  * @return int timestamp
  */
-function mysqldt_to_ts($mysqldt)
-{
-  $date = explode_mysqldt($mysqldt);
-  return mktime($date['hour'], $date['minute'], $date['second'],
-                $date['month'], $date['day'], $date['year']);
+function datetime_to_ts($datetime)
+{
+  $date = strptime($datetime, '%Y-%m-%d %H:%M:%S');
+  return mktime($date['tm_hour'], $date['tm_min'], $date['tm_sec'],
+                $date['tm_mon'], $date['tm_mday'], 1900+$date['tm_year']);
 }
 
@@ -137 +137 @@
     $item->descriptionHtmlSyndicated = true;
 
-    $item->date = mysqldt_to_ts($dbnow);
+    $item->date = $dbnow;
     $item->author = $conf['rss_feed_author'];
     $item->guid= sprintf('%s', $dbnow);;
@@ -155 +155 @@
 {// update the last check from time to time to avoid deletion by maintenance tasks
   if ( !isset($feed_row['last_check'])
-    or time()-mysqldt_to_ts($feed_row['last_check']) > 30*24*3600 )
+    or time()-datetime_to_ts($feed_row['last_check']) > 30*24*3600 )
   {
     $query = '
@@ -189 +189 @@
   $item->descriptionHtmlSyndicated = true;
 
-  $item->date = mysqldt_to_ts($date);
+  $item->date = $date;
   $item->author = $conf['rss_feed_author'];
   $item->guid= sprintf('%s', 'pics-'.$date);;

trunk/include/functions_notification.inc.php

@@ -609 +609 @@
 
 /**
- * explodes a MySQL datetime format (2005-07-14 23:01:37) in fields "year",
- * "month", "day", "hour", "minute", "second".
- *
- * @param string mysql datetime format
- * @return array
- */
-function explode_mysqldt($mysqldt)
-{
-  $date = array();
-  list($date['year'],
-       $date['month'],
-       $date['day'],
-       $date['hour'],
-       $date['minute'],
-       $date['second'])
-    = preg_split('/[-: ]/', $mysqldt);
-
-  return $date;
-}
-
-/**
  * returns title about recently published elements grouped by post date
  * @param $date_detail: selected date computed by get_recent_post_dates function
@@ -638 +617 @@
 
   $date = $date_detail['date_available'];
-  $exploded_date = explode_mysqldt($date);
+  $exploded_date = strptime($date, '%Y-%m-%d %H:%M:%S');
 
   $title = l10n_dec('%d new image', '%d new images', $date_detail['nb_elements']);
-  $title .= ' ('.$lang['month'][(int)$exploded_date['month']].' '.$exploded_date['day'].')';
+  $title .= ' ('.$lang['month'][(int)$exploded_date['tm_mon']].' '.$exploded_date['tm_mday'].')';
 
   return $title;