mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-29 12:49:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug 1762 fixed : Compleet RSS Feed returns notice

Browse source 
Remove mysql specific function

git-svn-id: http://piwigo.org/svn/trunk@6662 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou 2010-07-05 20:46:55 +00:00
parent c1414297fb
commit 531ee35375
2 changed files with 9 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

14
feed.php
View file

@ -36,11 +36,11 @@ include_once(PHPWG_ROOT_PATH.'include/functions_notification.inc.php');
* @param string mysql datetime format * @param string mysql datetime format
* @return int timestamp * @return int timestamp
*/ */
function mysqldt_to_ts($mysqldt) function datetime_to_ts($datetime)
{ {
$date = explode_mysqldt($mysqldt); $date = strptime($datetime, '%Y-%m-%d %H:%M:%S');
return mktime($date['hour'], $date['minute'], $date['second'], return mktime($date['tm_hour'], $date['tm_min'], $date['tm_sec'],
$date['month'], $date['day'], $date['year']); $date['tm_mon'], $date['tm_mday'], 1900+$date['tm_year']);
} }
/** /**
@ -136,7 +136,7 @@ if (!$image_only)
$item->description.= '</ul>'; $item->description.= '</ul>';
$item->descriptionHtmlSyndicated = true; $item->descriptionHtmlSyndicated = true;
$item->date = mysqldt_to_ts($dbnow); $item->date = $dbnow;
$item->author = $conf['rss_feed_author']; $item->author = $conf['rss_feed_author'];
$item->guid= sprintf('%s', $dbnow);; $item->guid= sprintf('%s', $dbnow);;
@ -154,7 +154,7 @@ UPDATE '.USER_FEED_TABLE.'
if ( !empty($feed_id) and empty($news) ) if ( !empty($feed_id) and empty($news) )
{// update the last check from time to time to avoid deletion by maintenance tasks {// update the last check from time to time to avoid deletion by maintenance tasks
if ( !isset($feed_row['last_check']) 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 = ' $query = '
UPDATE '.USER_FEED_TABLE.' UPDATE '.USER_FEED_TABLE.'
@ -188,7 +188,7 @@ foreach($dates as $date_detail)
$item->descriptionHtmlSyndicated = true; $item->descriptionHtmlSyndicated = true;
$item->date = mysqldt_to_ts($date); $item->date = $date;
$item->author = $conf['rss_feed_author']; $item->author = $conf['rss_feed_author'];
$item->guid= sprintf('%s', 'pics-'.$date);; $item->guid= sprintf('%s', 'pics-'.$date);;

25
include/functions_notification.inc.php
View file

@ -607,27 +607,6 @@ function get_html_description_recent_post_date($date_detail)
return $description; return $description;
} }
/**
* 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 * returns title about recently published elements grouped by post date
* @param $date_detail: selected date computed by get_recent_post_dates function * @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; global $lang;
$date = $date_detail['date_available']; $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 = 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; return $title;
} }