Changeset 1046 for trunk

Timestamp:

Feb 17, 2006, 3:41:57 AM (18 years ago)

Author:

rvelices

Message:

fix: remote site decodes html entities from xml and addslashes

fix: picture displays "image rank/total" images even for non numeric categories

fix: category comment not transformed with nl2br if allow_html_descriptions and
comment already looks like html

Location:

trunk

Files:

• admin/site_reader_remote.php (modified) (1 diff)
• include/functions_category.inc.php (modified) (1 diff)
• picture.php (modified) (2 diffs)
• tools/create_listing_file.php (modified) (2 diffs)

trunk/admin/site_reader_remote.php

@@ -153 +153 @@
     if (getAttribute($xml_element, $att) != '')
     {
-      $data[$att] = getAttribute($xml_element, $att);
+      $val = html_entity_decode( getAttribute($xml_element, $att) );
+      $data[$att] = addslashes($val);
     }
   }

trunk/include/functions_category.inc.php

@@ -161 +161 @@
     }
   }
-  $cat['comment'] = nl2br($cat['comment']);
+  global $conf;
+  if ( !( $conf['allow_html_descriptions'] and
+          preg_match('/<(div|br|img).*>/i', $cat['comment']) ) )
+  {
+    $cat['comment'] = nl2br($cat['comment']);
+  }
 
   $names = array();

trunk/picture.php

@@ -530 +530 @@
 
 $title_img = $picture['current']['name'];
-$title_nb = '';
 if (is_numeric( $page['cat'] )) 
 {
   $title_img = replace_space(get_cat_display_name($page['cat_name']));
-  $n = $page['current_rank'] + 1;
-  $title_nb = $n.'/'.$page['cat_nb_images'];
 }
 else if ( $page['cat'] == 'search' )
@@ -541 +538 @@
   $title_img = replace_search( $title_img, $_GET['search'] );
 }
+$title_nb = ($page['current_rank'] + 1).'/'.$page['cat_nb_images'];
 
 // calculation of width and height

trunk/tools/create_listing_file.php

@@ -461 +461 @@
             foreach (array_keys($iptc) as $key)
             {
-              $element[$key] = addslashes($iptc[$key]);
+              $element[$key] = $iptc[$key];
             }
           }
@@ -541 +541 @@
     $listing = '<informations';
     $listing.= ' generation_date="'.date('Y-m-d').'"';
-    $listing.= ' phpwg_version="'.$conf{'version'}.'"';
+    $listing.= ' phpwg_version="'.htmlentities($conf{'version'}).'"';
     
     $attrs=array();