replacement of short_period and long_period by recent_period

git-svn-id: http://piwigo.org/svn/trunk@452 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
z0rglub
2004-07-09 21:00:00 +00:00
parent 2cf37f308e
commit f007a28bf6
12 changed files with 41 additions and 86 deletions
+2 -2
View File
@@ -38,7 +38,7 @@ $query = '
SELECT id AS category_id
FROM '.CATEGORIES_TABLE.'
WHERE date_last > SUBDATE(CURRENT_DATE
,INTERVAL '.$user['short_period'].' DAY)';
,INTERVAL '.$user['recent_period'].' DAY)';
if ( $user['forbidden_categories'] != '' )
{
$query.= '
@@ -70,7 +70,7 @@ SELECT id,file,tn_ext,storage_category_id
FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE.'
WHERE category_id = '.$row['category_id'].'
AND date_available > SUBDATE(CURRENT_DATE
,INTERVAL '.$user['short_period'].' DAY)
,INTERVAL '.$user['recent_period'].' DAY)
AND id = image_id
ORDER BY RAND()
LIMIT 0,1
+1 -2
View File
@@ -84,8 +84,7 @@ function register_user( $login, $password, $password_conf,
// 1. retrieving default values, the ones of the user "guest"
$infos = array( 'nb_image_line', 'nb_line_page', 'language',
'maxwidth', 'maxheight', 'expand', 'show_nb_comments',
'short_period', 'long_period', 'template',
'forbidden_categories' );
'recent_period', 'template', 'forbidden_categories' );
$query = 'SELECT ';
for ( $i = 0; $i < sizeof( $infos ); $i++ )
{
+3 -11
View File
@@ -36,19 +36,11 @@ function get_icon( $date )
$day_in_seconds = 24*60*60;
$output = '';
$title = $lang['recent_image'].'&nbsp;';
if ( $diff < $user['long_period'] * $day_in_seconds )
if ( $diff < $user['recent_period'] * $day_in_seconds )
{
$icon_url = './template/'.$user['template'].'/theme/';
if ( $diff < $user['short_period'] * $day_in_seconds )
{
$icon_url.= 'new_short.gif';
$title .= $user['short_period'];
}
else
{
$icon_url.= 'new_long.gif';
$title .= $user['long_period'];
}
$icon_url.= 'recent.gif';
$title .= $user['recent_period'];
$title .= '&nbsp;'.$lang['days'];
$size = getimagesize( $icon_url );
$output = '<img title="'.$title.'" src="'.$icon_url.'" style="border:0;';
+2 -2
View File
@@ -32,8 +32,8 @@
// status --> $user['status']
$infos = array( 'id', 'username', 'mail_address', 'nb_image_line',
'nb_line_page', 'status', 'language', 'maxwidth',
'maxheight', 'expand', 'show_nb_comments', 'short_period',
'long_period', 'template', 'forbidden_categories' );
'maxheight', 'expand', 'show_nb_comments', 'recent_period',
'template', 'forbidden_categories' );
$query_user = 'SELECT '.implode( ',', $infos );
$query_user.= ' FROM '.USERS_TABLE;