Bug 1762 fixed : Compleet RSS Feed returns notice

Remove mysql specific function
Merge from trunk

git-svn-id: http://piwigo.org/svn/branches/2.1@6663 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 9 insertions, 30 deletions

diff --git a/feed.php b/feed.php
index 642682353..b499c8296 100644
--- a/feed.php
+++ b/feed.php
@@ -36,11 +36,11 @@ include_once(PHPWG_ROOT_PATH.'include/functions_notification.inc.php');
  * @param string mysql datetime format
  * @return int timestamp
  */
-function mysqldt_to_ts($mysqldt)
+function datetime_to_ts($datetime)
 {
-  $date = explode_mysqldt($mysqldt);
-  return mktime($date['hour'], $date['minute'], $date['second'],
-                $date['month'], $date['day'], $date['year']);
+  $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']);
 }
 
 /**
@@ -136,7 +136,7 @@ if (!$image_only)
     $item->description.= '</ul>';
     $item->descriptionHtmlSyndicated = true;
 
-    $item->date = mysqldt_to_ts($dbnow);
+    $item->date = $dbnow;
     $item->author = $conf['rss_feed_author'];
     $item->guid= sprintf('%s', $dbnow);;
 
@@ -154,7 +154,7 @@ UPDATE '.USER_FEED_TABLE.'
 if ( !empty($feed_id) and empty($news) )
 {// 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 = '
 UPDATE '.USER_FEED_TABLE.'
@@ -188,7 +188,7 @@ foreach($dates as $date_detail)
 
   $item->descriptionHtmlSyndicated = true;
 
-  $item->date = mysqldt_to_ts($date);
+  $item->date = $date;
   $item->author = $conf['rss_feed_author'];
   $item->guid= sprintf('%s', 'pics-'.$date);;
 
diff --git a/include/functions_notification.inc.php b/include/functions_notification.inc.php
index eecdf1a5e..ebb713fb6 100644
--- a/include/functions_notification.inc.php
+++ b/include/functions_notification.inc.php
@@ -608,27 +608,6 @@ function get_html_description_recent_post_date($date_detail)
 }
 
 /**
- * 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
  */
@@ -637,10 +616,10 @@ function get_title_recent_post_date($date_detail)
   global $lang;
 
   $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;
 }