Changeset 1145

Timestamp:

Apr 11, 2006, 5:55:51 AM (18 years ago)

Author:

rvelices

Message:

merge r1144 from branch-1_6 into trunk

Location:

trunk

Files:

• include/category_recent_cats.inc.php (modified) (5 diffs)
• include/category_subcats.inc.php (modified) (1 diff)
• index.php (modified) (1 diff)
• tools/create_listing_file.php (modified) (15 diffs)

trunk/include/category_recent_cats.inc.php

@@ -47 +47 @@
        , tn_ext
        , nb_images
+       , c.name AS cat_name
   FROM '.CATEGORIES_TABLE.' AS c
     INNER JOIN '.IMAGES_TABLE.' AS i ON i.id = c.representative_picture_id
@@ -68 +69 @@
       )
     );
-  
+
   // template thumbnail initialization
   if (mysql_num_rows($result) > 0)
   {
     $template->assign_block_vars('categories', array());
+  }
+
+  $comment = null;
+  if (isset($row['comment']))
+  {
+    $comment = strip_tags($row['comment'], '<a><br><p><b><i><small><strong>');
   }
 
@@ -85 +92 @@
         'ALT'   => $row['file'],
         'TITLE' => $lang['hint_category'],
-        
+
         'URL'  => make_index_url(
           array(
             'category' => $row['category_id'],
+            'cat_name' => $row['cat_name'],
             )
           ),
         'NAME' => get_cat_display_name_cache($row['uppercats'], null, false),
         'NB_IMAGES' => $row['nb_images'],
-        'DESCRIPTION' => @$row['comment'],
+        'DESCRIPTION' => $comment,
         )
       );
@@ -111 +119 @@
     $row_number = 0;
   }
-  
+
   $old_level_separator = $conf['level_separator'];
   $conf['level_separator'] = '<br />';
@@ -124 +132 @@
         'IMAGE_ALT'   => $row['file'],
         'IMAGE_TITLE' => $lang['hint_category'],
-        
+
         'U_IMG_LINK'  => make_index_url(
           array(
             'category' => $row['category_id'],
+            'cat_name' => $row['cat_name'],
             )
           ),

trunk/include/category_subcats.inc.php

@@ -95 +95 @@
   if (isset($row['comment']))
   {
-    $comment = strip_tags($row['comment']);
+    $comment = strip_tags($row['comment'], '<a><br><p><b><i><small><strong>');
   }
 

trunk/index.php

@@ -45 +45 @@
   session_unset();
   session_destroy();
-  setcookie(session_name(),'',0, ini_get('session.cookie_path') );
+  setcookie(session_name(),'',0,
+      ini_get('session.cookie_path'), ini_get('session.cookie_domain') );
   redirect( make_index_url() );
 }

trunk/tools/create_listing_file.php

@@ -83 +83 @@
 {
   $result = array();
-  
+
   // Read IPTC data
   $iptc = array();
-  
+
   $imginfo = array();
   getimagesize($filename, $imginfo);
-  
+
   if (isset($imginfo['APP13']))
   {
@@ -136 +136 @@
   // remove binary nulls
   $value = str_replace(chr(0x00), ' ', $value);
-  
+
   return htmlentities($value);
 }
@@ -146 +146 @@
   $map = $conf['use_iptc_mapping'];
   $datefields = array('date_creation', 'date_available');
-  
+
   $iptc = get_iptc_data($file, $map);
 
@@ -162 +162 @@
   if (isset($iptc['keywords']))
   {
-    // keywords separator is the comma, nothing else. Allowed characters in
-    // keywords : [A-Za-z0-9], "-" and "_". All other characters will be
-    // considered as separators
-    $iptc['keywords'] = preg_replace('/[^\w-]+/', ',', $iptc['keywords']);
+    // official keywords separator is the comma
+    $iptc['keywords'] = preg_replace('/[.;]/', ',', $iptc['keywords']);
     $iptc['keywords'] = preg_replace('/^,+|,+$/', '', $iptc['keywords']);
   }
@@ -243 +241 @@
 
   $prefix_length = strlen($conf['prefix_thumbnail']);
-  
+
   $thumbnails = array();
   if ($opendir = @opendir($dir.'/thumbnail'))
@@ -350 +348 @@
     $dirs.= "\n".$indent.'</dir'.$level.'>';
   }
-  return $dirs;   
+  return $dirs;
 }
 
@@ -370 +368 @@
 {
   global $conf, $page;
-  
+
   // fs means FileSystem : $fs_files contains files in the filesystem found
   // in $dir that can be managed by PhpWebGallery (see get_pwg_files
@@ -384 +382 @@
   $print_dir = preg_replace('/^\.\//', '', $dir);
   $print_dir = preg_replace('/\/*$/', '/', $print_dir);
-  
+
   foreach ($fs_files as $fs_file)
   {
@@ -391 +389 @@
     $element['path'] = $page['url'].$print_dir.$fs_file;
     $element['filesize'] = floor(filesize($dir.'/'.$fs_file) / 1024);
-    
+
     $file_wo_ext = get_filename_wo_extension($fs_file);
 
@@ -409 +407 @@
 
     // 2 cases : the element is a picture or not. Indeed, for a picture
-    // thumbnail is mandatory, high is optional and for non picture element, 
+    // thumbnail is mandatory, high is optional and for non picture element,
     // thumbnail and representative is optionnal
     if (in_array(get_extension($fs_file), $conf['picture_ext']))
@@ -421 +419 @@
           $element['height'] = $image_size[1];
         }
-        
+
         if ( in_array($fs_file, $fs_highs) )
         {
@@ -465 +463 @@
           }
         }
-        
+
         array_push($elements, $element);
       }
@@ -493 +491 @@
         }
       }
-      
+
       array_push($elements, $element);
     }
@@ -538 +536 @@
   {
     $start = get_moment();
-    
+
     $listing = '<informations';
     $listing.= ' generation_date="'.date('Y-m-d').'"';
     $listing.= ' phpwg_version="'.htmlentities($conf{'version'}).'"';
-    
+
     $attrs=array();
     if ($conf['use_iptc'])
@@ -553 +551 @@
     }
     $listing.= ' metadata="'.implode(',',array_unique($attrs)).'"';
-    
+
     $end = strrpos($_SERVER['PHP_SELF'], '/') + 1;
     $local_folder = substr($_SERVER['PHP_SELF'], 0, $end);
     $page['url'] = 'http://'.$_SERVER['HTTP_HOST'].$local_folder;
-    
+
     $listing.= ' url="'.$page['url'].'"';
     $listing.= '/>'."\n";
-    
+
     $listing.= get_dirs('.', '', 0);
-    
+
     if ($fp = @fopen("./listing.xml","w"))
     {