Changeset 1059 for trunk/picture.php

Timestamp:

Feb 28, 2006, 5:28:06 AM (18 years ago)

Author:

rvelices

Message:

calendar improvements: week on weekly list starts on Monday,
ability to show grayed months/weeks/days (without any picture in it),
added icons for created/posted fields
language uniformization

calendar fixes: correct number of pictures in calendar view,
code simplification (I hope so)

File:

• trunk/picture.php (modified) (28 diffs)

trunk/picture.php

@@ -174 +174 @@
           array_push( $already_there, $row['element_id'] );
         }
-        
+
         if ( count($already_there)>0 )
         {
@@ -184 +184 @@
           pwg_query($query);
         }
-        
+
         $query = '
 UPDATE '. RATE_TABLE . '
@@ -192 +192 @@
         pwg_query($query);
 
-        setcookie('pwg_anonymous_rater', $anonymous_id, 
+        setcookie('pwg_anonymous_rater', $anonymous_id,
                    strtotime('+10 years'), cookie_path() );
       }
@@ -198 +198 @@
     else
     {
-      setcookie('pwg_anonymous_rater', $anonymous_id, 
+      setcookie('pwg_anonymous_rater', $anonymous_id,
                  strtotime('+10 years'), cookie_path() );
     }
@@ -293 +293 @@
     $i = 'current';
   }
-  
+
   foreach (array_keys($row) as $key)
   {
@@ -307 +307 @@
     $picture[$i]['is_picture'] = true;
   }
-  
+
   $cat_directory = dirname($row['path']);
   $file_wo_ext = get_filename_wo_extension($row['file']);
@@ -347 +347 @@
 
   $picture[$i]['thumbnail'] = get_thumbnail_src($row['path'], @$row['tn_ext']);
-  
+
   if ( !empty( $row['name'] ) )
   {
@@ -377 +377 @@
 if ($url_up_start>0)
 {
-  $url_up .= '&start='.$url_up_start; 
+  $url_up .= '&start='.$url_up_start;
 }
 
@@ -408 +408 @@
   $query.= ';';
   $result = pwg_query( $query );
-  
+
   if ( $_GET['add_fav'] == 1 )
   {
@@ -461 +461 @@
     }
   }
-  
+
   if ( $register_comment )
   {
@@ -480 +480 @@
       $data{'image_id'} = $_GET['image_id'];
       $data{'content'} = htmlspecialchars( $_POST['content'], ENT_QUOTES);
-      
+
       if (!$conf['comments_validation'] or $user['status'] == 'admin')
       {
@@ -490 +490 @@
         $data{'validated'} = 'false';
       }
-      
+
       include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
       $fields = array('author', 'date', 'image_id', 'content', 'validated',
                       'validation_date');
       mass_inserts(COMMENTS_TABLE, $fields, array($data));
-      
+
       // information message
       $message = $lang['comment_added'];
 
       if (!$conf['comments_validation'] or $user['status'] == 'admin')
-      
+
       if ( $conf['comments_validation'] and $user['status'] != 'admin' )
       {
@@ -541 +541 @@
 
 $title_img = $picture['current']['name'];
-if ( isset( $page['cat'] ) ) 
-{
-  if (is_numeric( $page['cat'] )) 
+if ( isset( $page['cat'] ) )
+{
+  if (is_numeric( $page['cat'] ))
   {
     $title_img = replace_space(get_cat_display_name($page['cat_name']));
@@ -648 +648 @@
   'L_UP_HINT' => $lang['home_hint'],
   'L_UP_ALT' => $lang['home'],
-  
+
   'U_HOME' => (PHPWG_ROOT_PATH.'category.php'),
   'U_UP' => $url_up,
@@ -687 +687 @@
 }
 // button to set the current picture as representative
-if ('admin' == $user['status'] and 
+if ('admin' == $user['status'] and
     isset($page['cat']) and is_numeric($page['cat']))
 {
@@ -741 +741 @@
     $url.= get_query_string_diff(array('add_fav'));
     $url.= '&add_fav=0';
-    
+
     $template->assign_block_vars(
       'favorite',
@@ -805 +805 @@
 // date of availability
 $val = format_date($picture['current']['date_available'], 'mysql_datetime');
-$infos['INFO_AVAILABILITY_DATE'] = '<a href="'.
+$infos['INFO_POSTED_DATE'] = '<a href="'.
    PHPWG_ROOT_PATH.'category.php?calendar=posted-c-'.
    substr($picture['current']['date_available'],0,10).'">'.$val.'</a>';
@@ -894 +894 @@
       die('Exif extension not available, admin should disable exif display');
     }
-    
+
     if ($exif = @read_exif_data($picture['current']['src']))
     {
@@ -913 +913 @@
               $key = $lang['exif_field_'.$field];
             }
-            
+
             $template->assign_block_vars(
               'metadata.line',
@@ -933 +933 @@
               $key = $lang['exif_field_'.$tokens[1]];
             }
-            
+
             $template->assign_block_vars(
               'metadata.line',
@@ -958 +958 @@
         );
     }
-    
+
     foreach ($iptc as $field => $value)
     {
@@ -966 +966 @@
         $key = $lang[$field];
       }
-      
+
       $template->assign_block_vars(
         'metadata.line',
@@ -981 +981 @@
 {
   if ( !is_numeric( $_GET['slideshow'] ) ) $_GET['slideshow'] = $conf['slideshow_period'];
-  
+
   $template->assign_block_vars('stop_slideshow', array(
   'U_SLIDESHOW'=>$picture['current']['url']
@@ -1020 +1020 @@
       WHERE element_id = '.$_GET['image_id'] . '
       AND user_id = '.$user['id'] ;
-  
+
       if ($user['is_the_guest'])
       {
@@ -1031 +1031 @@
         $query .= ' AND anonymous_id = \''.$anonymous_id . '\'';
       }
-      
+
       $result = pwg_query($query);
       if (mysql_num_rows($result) > 0)
@@ -1045 +1045 @@
       }
     }
-    else  
+    else
     {
       $sentence = $lang['never_rated'].'. '.$lang['Rate'];
@@ -1111 +1111 @@
   $query.= ';';
   $row = mysql_fetch_array( pwg_query( $query ) );
-  
+
   // navigation bar creation
   $url = PHPWG_ROOT_PATH.'picture.php';
@@ -1162 +1162 @@
     }
   }
-  
+
   if (!$user['is_the_guest']
       or ($user['is_the_guest'] and $conf['comments_forall']))