Changeset 1058

Timestamp:

Feb 28, 2006, 2:13:16 AM (18 years ago)

Author:

rvelices

Message:

remake of Remote sites and synchronize: final integration and old code cleanup

fix: xml getAttribute always decodes html entities and added encodeAttribute
function

Location:

trunk

Files:

• admin.php (modified) (3 diffs)
• admin/cat_modify.php (modified) (4 diffs)
• admin/remote_site.php (deleted)
• admin/site_manager.php (modified) (7 diffs, 1 prop)
• admin/site_reader_local.php (modified) (4 diffs, 1 prop)
• admin/site_reader_remote.php (modified) (8 diffs, 1 prop)
• admin/site_update.php (modified) (7 diffs, 1 prop)
• admin/update.php (deleted)
• category.php (modified) (2 diffs)
• include/functions_xml.inc.php (modified) (1 diff)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (5 diffs)
• language/fr_FR.iso-8859-1/admin.lang.php (modified) (4 diffs)
• template/yoga/admin.tpl (modified) (1 diff)
• template/yoga/admin/remote_site.tpl (deleted)
• template/yoga/admin/site_manager.tpl (modified) (3 diffs, 1 prop)
• template/yoga/admin/site_update.tpl (modified) (1 diff, 1 prop)
• template/yoga/admin/update.tpl (deleted)
• upload.php (modified) (3 diffs)

trunk/admin.php

@@ -3 +3 @@
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
@@ -82 +82 @@
     'U_CAT_STATUS'=> $opt_link.'status',
     'U_CAT_OPTIONS'=> $link_start.'cat_options',
-    'U_CAT_UPDATE'=> $link_start.'update',
+    'U_CAT_UPDATE'=> $link_start.'site_update&site=1',
     'U_WAITING'=> $link_start.'waiting',
     'U_COMMENTS'=> $link_start.'comments',
@@ -106 +106 @@
     );
 }
-  
+
 //------------------------------------------------------------- content display
 $page['errors'] = array();

trunk/admin/cat_modify.php

@@ -3 +3 @@
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
@@ -259 +259 @@
                                        '',
                                        get_complete_dir($category['id']))));
-  $template->assign_block_vars('upload' ,array());
 }
 else
@@ -301 +300 @@
 }
 
-if (is_numeric($category['site_id']) and $category['site_id'] != 1)
+$category['cat_dir'] = get_complete_dir($_GET['cat_id']);
+if (is_numeric($category['site_id']) and url_is_remote($category['cat_dir']) )
 {
   $query = '
@@ -312 +312 @@
 }
 
+if (!$category['is_virtual'] and !url_is_remote($category['cat_dir']) )
+{
+  $template->assign_block_vars('upload' ,array());
+}
+
 //----------------------------------------------------------- sending html code
 $template->assign_var_from_handle('ADMIN_CONTENT', 'categories');

trunk/admin/site_manager.php

@@ -64 +64 @@
   else
   {
-    array_push($page['errors'], l10n('remote_site_file_not_found'));
+    array_push($page['errors'], l10n('site_err_remote_file_not_found'));
   }
 }
@@ -100 +100 @@
   {
     array_push($page['errors'],
-      l10n('remote_site_already_exists').' ['.$url.']');
+      l10n('site_already_exists').' ['.$url.']');
   }
   if (count($page['errors']) == 0)
@@ -115 +115 @@
         {
           array_push($page['errors'],
-                     l10n('remote_site_error').' : '.$first_line);
+                     l10n('site_err').' : '.$first_line);
         }
       }
       else
       {
-        array_push($page['errors'], l10n('remote_site_file_not_found') );
+        array_push($page['errors'], l10n('site_err_remote_file_not_found') );
       }
     }
@@ -143 +143 @@
     pwg_query($query);
     array_push($page['infos'],
-               $url.' '.l10n('remote_site_created'));
+               $url.' '.l10n('site_created'));
   }
 }
@@ -189 +189 @@
       delete_site($page['site']);
       array_push($page['infos'],
-                 $galleries_url.' '.l10n('remote_site_deleted'));
+                 $galleries_url.' '.l10n('site_deleted'));
       break;
     }
@@ -197 +197 @@
 $template->assign_vars( array(
   'F_ACTION' => PHPWG_ROOT_PATH.'admin.php'
-                .get_query_string_diff( array('action','site') ) 
+                .get_query_string_diff( array('action','site') )
   ) );
-  
+
 // +-----------------------------------------------------------------------+
 // |                           remote sites list                           |
@@ -227 +227 @@
   $update_url.= '?page=site_update';
   $update_url.= '&site='.$row['id'];
-
   $template->assign_block_vars(
     'sites.site',
     array(
       'NAME' => $row['galleries_url'],
-      'TYPE' => l10n( $is_remote ? 'Remote' : 'Local' ),
+      'TYPE' => l10n( $is_remote ? 'site_remote' : 'site_local' ),
       'CATEGORIES' => $row['nb_categories'],
       'IMAGES' => isset($row['nb_images']) ? $row['nb_images'] : 0,
-      'U_UPDATE' => $update_url
+      'U_SYNCHRONIZE' => $update_url
      )
    );
-
    if ($is_remote)
    {

trunk/admin/site_reader_local.php

@@ -47 +47 @@
   if (!is_dir($this->site_url))
   {
-    array_push($errors, array('path' => $this->site_url, 'type' => 'PWG-ERROR-NODIR'));
+    array_push($errors, array('path' => $this->site_url, 'type' => 'PWG-ERROR-NO-FS'));
     return false;
   }
@@ -61 +61 @@
 
 /**
- * Returns an array with all file system files according to $conf['file_ext'] 
+ * Returns an array with all file system files according to $conf['file_ext']
  * and $conf['picture_ext']
  * @param string $path recurse in this directory
@@ -131 +131 @@
 }
 
-// returns the name of the attributes that are supported for 
+// returns the name of the attributes that are supported for
 // update/synchronization according to configuration
 function get_update_attributes()
 {
   global $conf;
-  $update_fields = array( 'has_high', 'representative_ext', 
+  $update_fields = array( 'has_high', 'representative_ext',
       'filesize', 'width', 'height' );
   if ($conf['use_exif'])
@@ -166 +166 @@
     return null;
   }
-  
+
   $data = array();
-  
+
   $filename = basename($file);
   $data['has_high'] = $this->get_has_high( dirname($file), $filename );
-  $data['representative_ext'] = $this->get_representative_ext( dirname($file), 
+  $data['representative_ext'] = $this->get_representative_ext( dirname($file),
                                         get_filename_wo_extension($filename) );
-  
+
   $data['filesize'] = floor(filesize($file)/1024);
   if ($image_size = @getimagesize($file))

trunk/admin/site_reader_remote.php

@@ -72 +72 @@
   else
   {
-    array_push($errors, array('path' => $listing_file, 'type' => 'PWG-ERROR-NO-FS'));
+    array_push($errors, array('path' => $listing_file, 'type' => 'PWG-ERROR-NOLISTING'));
     return false;
   }
@@ -95 +95 @@
 
 /**
- * Returns a hash with all elements (images and files) inside the full $path 
+ * Returns a hash with all elements (images and files) inside the full $path
  * according to listing.xml
  * @param string $path recurse in this directory only
@@ -110 +110 @@
       foreach ( $files as $file)
       {
-        $data = $this->get_element_attributes($file, 
+        $data = $this->get_element_attributes($file,
                                               $this->insert_attributes);
         $elements[$file] = $data;
@@ -120 +120 @@
 }
 
-// returns the name of the attributes that are supported for 
+// returns the name of the attributes that are supported for
 // update/synchronization according to listing.xml
 function get_update_attributes()
@@ -130 +130 @@
 function get_element_update_attributes($file)
 {
-    return $this->get_element_attributes($file, 
+    return $this->get_element_attributes($file,
                                          $this->update_attributes);
 }
@@ -138 +138 @@
  * Returns a hash of image/file attributes
  * @param string $file fully qualified file name
- * @param array $attributes specifies which attributes to retrieve 
+ * @param array $attributes specifies which attributes to retrieve
  *  returned
 */
@@ -144 +144 @@
 {
   $xml_element = $this->site_files[$file];
-  if ( ! isset($xml_element) ) 
+  if ( ! isset($xml_element) )
   {
     return null;
@@ -153 +153 @@
     if (getAttribute($xml_element, $att) != '')
     {
-      $val = html_entity_decode( getAttribute($xml_element, $att) );
+      $val = getAttribute($xml_element, $att);
       $data[$att] = addslashes($val);
     }

trunk/admin/site_update.php

@@ -51 +51 @@
 
 $error_labels = array(
-  'PWG-UPDATE-1' => array( l10n('update_wrong_dirname_short'), 
+  'PWG-UPDATE-1' => array( l10n('update_wrong_dirname_short'),
                            l10n('update_wrong_dirname_info') ),
   'PWG-UPDATE-2' => array( l10n('update_missing_tn_short'),
-                           l10n('update_missing_tn_info') 
+                           l10n('update_missing_tn_info')
                            . implode(',', $conf['picture_ext']) ),
-  'PWG-ERROR-NO-FS' => array( l10n('Does not exist'), 
+  'PWG-ERROR-NO-FS' => array( l10n('update_missing_file_or_dir'),
                              l10n('update_missing_file_or_dir_info')),
-  'PWG-ERROR-VERSION' => array( l10n('Invalid PhpWebGalley version'), 
-                             l10n('update_pwg_version_differs_info')),
-  'PWG-ERROR-NOLISTING' => array( l10n('remote_site_listing_not_found'), 
-                             l10n('remote_site_listing_not_found_info'))
+  'PWG-ERROR-VERSION' => array( l10n('update_err_pwg_version_differs'),
+                             l10n('update_err_pwg_version_differs_info')),
+  'PWG-ERROR-NOLISTING' => array( l10n('update_err_remote_listing_not_found'),
+                             l10n('update_err_remote_listing_not_found_info'))
                       );
 $errors = array();
@@ -409 +409 @@
         $insert{'date_available'} = CURRENT_DATE;
         $insert{'tn_ext'} = $fs[$path]['tn_ext'];
-        $insert{'has_high'} = $fs[$path]['has_high'];
+        if ( isset($fs[$path]['has_high']) )
+        {
+          $insert{'has_high'} = $fs[$path]['has_high'];
+        }
+        else
+        {
+          $insert{'has_high'} = null;
+        }
         $insert{'path'} = $path;
 
@@ -431 +438 @@
       $insert{'date_available'} = CURRENT_DATE;
       $insert{'has_high'} = $fs[$path]['has_high'];
+      if ( isset($fs[$path]['has_high']) )
+      {
+        $insert{'has_high'} = $fs[$path]['has_high'];
+      }
+      else
+      {
+        $insert{'has_high'} = null;
+      }
       $insert{'path'} = $path;
 
@@ -525 +540 @@
       foreach ($fields['update'] as $field)
       {
-        $data[$field] = getAttribute($row['infos'], $field);
+        $data[$field] = addslashes( getAttribute($row['infos'], $field) );
       }
 
@@ -582 +597 @@
 // |                          synchronize metadata                         |
 // +-----------------------------------------------------------------------+
-if (isset($_POST['submit']) and preg_match('/^metadata/', $_POST['sync']) 
+if (isset($_POST['submit']) and preg_match('/^metadata/', $_POST['sync'])
          and !$general_failure)
 {
@@ -643 +658 @@
     mass_updates(IMAGES_TABLE, $fields, $datas);
   }
-  
+
   echo '<!-- metadata update : ';
   echo get_elapsed_time($start, get_moment());
@@ -672 +687 @@
 if ($site_is_remote and !isset($_POST['submit']) )
 {
-  $used_metadata.= ' + ' . l10n('Aditionnal remote attributes');
+  $used_metadata.= ' + ...';
 }
 

trunk/category.php

@@ -3 +3 @@
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
@@ -436 +436 @@
   // upload a picture in the category
   if (is_numeric($page['cat'])
-      and $page['cat_site_id'] == 1
+//      and $page['cat_site_id'] == 1
       and $page['cat_dir'] != ''
       and $page['cat_uploadable'])

trunk/include/functions_xml.inc.php

@@ -54 +54 @@
 //  echo htmlentities($element).'<br /><br />';
   $regex = '/^<\w+[^>]*'.$attribute.'\s*=\s*"('.VAL_REG.')"/i';
-  if ( preg_match( $regex, $element, $out ) ) return $out[1];
+  if ( preg_match( $regex, $element, $out ) ) 
+  {
+    return html_entity_decode($out[1], ENT_QUOTES);
+  }
   else return '';
+}
+
+// The function encode Attribute returns the xml attribute $attribute="$value" 
+function encodeAttribute( $attribute, $value )
+{
+  return $attribute.'="'.htmlspecialchars($value, ENT_QUOTES).'" ';
 }
         

trunk/language/en_UK.iso-8859-1/admin.lang.php

@@ -136 +136 @@
 $lang['Select at least one picture'] = 'Select at least one picture';
 $lang['Select at least one user'] = 'Select at least one user';
+$lang['Site manager'] = 'Site manager';
 $lang['Show info'] = 'Show info';
 $lang['Show number of comments'] = 'Show number of comments';
@@ -192 +193 @@
 $lang['dissociate from category'] = 'dissociate from category';
 $lang['dissociate from group'] = 'dissociate from group';
-$lang['down'] = 'Move down';
 $lang['edit category permissions'] = 'edit category permissions';
 $lang['edit'] = 'Edit';
@@ -245 +245 @@
 $lang['registration_date'] = 'registration date';
 $lang['remote_site'] = 'Remote site';
-$lang['remote_site_already_exists'] = 'This site already exists';
 $lang['remote_site_clean'] = 'clean';
 $lang['remote_site_clean_hint'] = 'remove remote listing.xml file';
-$lang['remote_site_create'] = 'Create a new site : (give its URL to create_listing_file.php)';
-$lang['remote_site_created'] = 'created';
-$lang['remote_site_delete'] = 'delete';
-$lang['remote_site_delete_hint'] = 'delete this site and all its attached elements';
-$lang['remote_site_deleted'] = 'deleted';
-$lang['remote_site_error'] = 'an error happened';
-$lang['remote_site_file_not_found'] = 'file create_listing_file.php on remote site was not found';
 $lang['remote_site_generate'] = 'generate listing';
 $lang['remote_site_generate_hint'] = 'generate file listing.xml on remote site';
-$lang['remote_site_listing_not_found'] = 'listing.xml file was not found';
 $lang['remote_site_local_found'] = 'A local listing.xml file has been found for ';
-$lang['remote_site_local_new'] = '(new site)';
 $lang['remote_site_local_update'] = 'read local listing.xml and update';
-$lang['remote_site_removed'] = 'was removed on remote site';
-$lang['remote_site_removed_title'] = 'Removed elements';
+$lang['remote_site_test'] = 'test';
+$lang['remote_site_test_hint'] = 'test this remote site';
 $lang['remote_site_uncorrect_url'] = 'Remote site url must start by http or https and must only contain characters among "/", "a-zA-Z0-9", "-" or "_"';
-$lang['remote_site_update'] = 'update';
-$lang['remote_site_update_hint'] = 'read remote listing.xml and updates database';
-$lang['remote_sites'] = 'Remote sites';
 $lang['remove keyword'] = 'remove keyword';
 $lang['selection'] = 'selection';
 $lang['set to'] = 'set to';
 $lang['singly represented'] = 'singly represented';
+$lang['site_already_exists'] = 'This site already exists';
+$lang['site_create'] = 'Create a new site : (give its URL to create_listing_file.php)';
+$lang['site_created'] = 'created';
+$lang['site_delete'] = 'delete';
+$lang['site_delete_hint'] = 'delete this site and all its attached elements';
+$lang['site_deleted'] = 'deleted';
+$lang['site_err'] = 'an error happened';
+$lang['site_err_remote_file_not_found'] = 'file create_listing_file.php on remote site was not found';
+$lang['site_local'] = 'Local';
+$lang['site_remote'] = 'Remote';
+$lang['site_synchronize'] = 'synchronize';
+$lang['site_synchronize_hint'] = 'update the database from files';
 $lang['stats_addr'] = 'IP Address';
 $lang['stats_category'] = 'Category';
@@ -337 +336 @@
 $lang['update_default_title'] = 'Choose an option';
 $lang['update_display_info'] = 'display maximum informations (added categories and elements, deleted categories and elements)';
-$lang['update_elements_metadata_sync'] = 'elements informations synchronized with files metadata';
+$lang['update_missing_file_or_dir'] = 'File/directory read error';
+$lang['update_missing_file_or_dir_info'] = 'The file or directory cannot be accessed (either it does not exist or the access is denied)';
+$lang['update_err_pwg_version_differs'] = 'PhpWebGallery version differs on the remote site';
+$lang['update_err_pwg_version_differs_info'] = 'Version of create_listing_file.php on the remote site and PhpWebGallery must be the same';
+$lang['update_err_remote_listing_not_found'] = 'listing.xml file was not found';
+$lang['update_err_remote_listing_not_found_info'] = 'listing.xml file was not found on the remote site. This file is generated by choosing the "generate listing" command in the Site manager';
 $lang['update_error_list_title'] = 'Error list';
 $lang['update_errors_caption'] = 'Errors caption';
@@ -345 +349 @@
 $lang['update_nb_del_categories'] = 'categories deleted in the database';
 $lang['update_nb_del_elements'] = 'elements deleted in the database';
+$lang['update_nb_elements_metadata_available'] = 'images candidates for metadata synchronization';
+$lang['update_nb_elements_metadata_sync'] = 'elements informations synchronized with files metadata';
 $lang['update_nb_errors'] = 'errors during synchronization';
 $lang['update_nb_new_categories'] = 'categories added in the database';

trunk/language/fr_FR.iso-8859-1/admin.lang.php

@@ -136 +136 @@
 $lang['Select at least one picture'] = 'Sélectionner au moins une image';
 $lang['Select at least one user'] = 'Séléctionner au moins un utilisateur';
+$lang['Site manager'] = 'Gestionnaire des sites';
 $lang['Show info'] = 'Montrer les informations';
 $lang['Show number of comments'] = 'Montrer le nombre de commentaires';
@@ -244 +245 @@
 $lang['registration_date'] = 'date d\'enregistrement';
 $lang['remote_site'] = 'Site distant';
-$lang['remote_site_already_exists'] = 'Ce site existe déjà';
 $lang['remote_site_clean'] = 'nettoyer';
 $lang['remote_site_clean_hint'] = 'supprimer le fichier listing.xml distant';
-$lang['remote_site_create'] = 'Créer un nouveau site distant : (donner son URL vers create_listing_file.php)';
-$lang['remote_site_created'] = 'créé';
-$lang['remote_site_delete'] = 'supprimer';
-$lang['remote_site_delete_hint'] = 'supprimer ce site distant et toutes les informations associées';
-$lang['remote_site_deleted'] = 'supprimé';
-$lang['remote_site_error'] = 'une erreur est survenue';
-$lang['remote_site_file_not_found'] = 'le fichier create_listing_file.php est introuvable sur le site distant';
 $lang['remote_site_generate'] = 'générer le listing';
 $lang['remote_site_generate_hint'] = 'générer le fichier listing.xml sur le site distant';
-$lang['remote_site_listing_not_found'] = 'le fichier listing.xml est introuvable';
 $lang['remote_site_local_found'] = 'Un fichier listing.xml local a été trouvé pour ';
-$lang['remote_site_local_new'] = '(nouveau site)';
 $lang['remote_site_local_update'] = 'lire le listing.xml local et mettre à jour';
-$lang['remote_site_removed'] = 'a été supprimé du site distant';
-$lang['remote_site_removed_title'] = 'Éléments supprimés';
+$lang['remote_site_test'] = 'tester';
+$lang['remote_site_test_hint'] = 'tester ce site distant';
 $lang['remote_site_uncorrect_url'] = 'L\'URL d\'un site distant doit commencer par "http" ou "https" et ne doit contenir des caractères que parmi "/", "a-zA-Z0-9", "-" ou "_"';
-$lang['remote_site_update'] = 'synchronisation';
-$lang['remote_site_update_hint'] = 'lit le fichier listing.xml distant et met à jour la base de données';
-$lang['remote_sites'] = 'Sites distants';
 $lang['remove keyword'] = 'supprimer mot-clef';
 $lang['selection'] = 'sélection';
 $lang['set to'] = 'changer en';
 $lang['singly represented'] = 'représentant fixe';
+$lang['site_already_exists'] = 'Ce site existe déjà';
+$lang['site_create'] = 'Créer un nouveau site distant : (donner son URL vers create_listing_file.php)';
+$lang['site_created'] = 'créé';
+$lang['site_delete'] = 'supprimer';
+$lang['site_delete_hint'] = 'supprimer ce site et toutes les informations associées';
+$lang['site_deleted'] = 'supprimé';
+$lang['site_err'] = 'une erreur est survenue';
+$lang['site_err_remote_file_not_found'] = 'le fichier create_listing_file.php est introuvable sur le site distant';
+$lang['site_local'] = 'Local';
+$lang['site_remote'] = 'Distant';
+$lang['site_synchronize'] = 'synchroniser';
+$lang['site_synchronize_hint'] = 'met à jour la base de données à partir des fichiers';
 $lang['stats_addr'] = 'Adresse IP';
 $lang['stats_category'] = 'Catégorie';
@@ -336 +336 @@
 $lang['update_default_title'] = 'Choisir une option';
 $lang['update_display_info'] = 'afficher un maximum d\'informations (catégories ajoutées, éléments ajoutés, catégories et éléments supprimés)';
-$lang['update_elements_metadata_sync'] = 'informations des images synchronisées avec les méta-données';
+$lang['update_missing_file_or_dir'] = 'Erreur d\'ouverture fichier/répertoire';
+$lang['update_missing_file_or_dir_info'] = 'Le fichier ou répertoire ne peut pas être accede (soit il n\'existe pas, soit l\'accés est refusé)';
+$lang['update_err_pwg_version_differs'] = 'La version PhpWebGallery sur le site distant est differente';
+$lang['update_err_pwg_version_differs_info'] = 'La version de create_listing_file.php sur le site distant et PhpWebGallery doit être la même';
+$lang['update_err_remote_listing_not_found'] = 'le fichier listing.xml est introuvable';
+$lang['update_err_remote_listing_not_found_info'] = 'le fichier listing.xml est introuvable sur le site distant. Ce fichier est generé en choisissant la commande "générer le listing" dans le gestionnaire de sites';
 $lang['update_error_list_title'] = 'Liste des erreurs';
 $lang['update_errors_caption'] = 'Légende des erreurs';
@@ -344 +349 @@
 $lang['update_nb_del_categories'] = 'catégories supprimées de la base de données';
 $lang['update_nb_del_elements'] = 'éléments supprimés de la base de données';
+$lang['update_nb_elements_metadata_available'] = 'images candidates à la synchronisation avec les méta-données';
+$lang['update_nb_elements_metadata_sync'] = 'informations des images synchronisées avec les méta-données';
 $lang['update_nb_errors'] = 'erreurs survenues durant la synchronisation';
 $lang['update_nb_new_categories'] = 'catégories ajoutées dans la base de données';

trunk/template/yoga/admin.tpl

@@ -16 +16 @@
         <li><a href="{U_FAQ}">{lang:instructions}</a></li>
         <li><a href="{U_SITE_MANAGER}">{lang:Site manager}</a></li>
-        <li><a href="{U_SITES}">{lang:remote_sites}</a></li>
         <li><a href="{U_HISTORY}">{lang:history}</a></li>
         <li><a href="{U_CAT_UPDATE}">{lang:update}</a></li>

trunk/template/yoga/admin/site_manager.tpl

@@ -4 +4 @@
     <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
   </ul>
-  <h2>{lang:remote_sites}</h2>
+  <h2>{lang:Site manager}</h2>
 </div>
 
@@ -23 +23 @@
     <a href="{sites.site.NAME}" target="_blank">{sites.site.NAME}</a><br>({sites.site.TYPE}, {sites.site.CATEGORIES} {lang:categories}, {sites.site.IMAGES} {lang:picture}s)
   </td><td>  
-    [<a href="{sites.site.U_UPDATE}" title="{lang:update this site}">{lang:remote_site_update}</a>]
+    [<a href="{sites.site.U_SYNCHRONIZE}" title="{lang:site_synchronize_hint}">{lang:site_synchronize}</a>]
     <!-- BEGIN delete -->
       [<a href="{sites.site.delete.U_DELETE}" onclick="return confirm('{lang:Are you sure?}');" 
-                title="{lang:remote_site_delete_hint}">{lang:remote_site_delete}</a>]
+                title="{lang:site_delete_hint}">{lang:site_delete}</a>]
     <!-- END delete -->
     <!-- BEGIN remote -->
       <br>
-      [<a href="{sites.site.remote.U_TEST}" title="{lang:@@}">{lang:Test}</a>]
+      [<a href="{sites.site.remote.U_TEST}" title="{lang:remote_site_test_hint}">{lang:remote_site_test}</a>]
       [<a href="{sites.site.remote.U_GENERATE}" title="{lang:remote_site_generate_hint}">{lang:remote_site_generate}</a>]
       [<a href="{sites.site.remote.U_CLEAN}" title="{lang:remote_site_clean_hint}">{lang:remote_site_clean}</a>]
@@ -41 +41 @@
 <form action="{F_ACTION}" method="post">
   <p>
-    <label for="galleries_url" >{lang:remote_site_create}</label> 
+    <label for="galleries_url" >{lang:site_create}</label> 
     <input type="text" name="galleries_url" id="galleries_url" />
   </p>

trunk/template/yoga/admin/site_update.tpl

@@ -22 +22 @@
 <h3>{L_RESULT_METADATA}</h3>
 <ul>
-  <li>{metadata_result.NB_ELEMENTS_DONE} {lang:update_elements_metadata_sync}</li>
-  <li>{metadata_result.NB_ELEMENTS_CANDIDATES} {lang:elements available for synchronization}</li>
+  <li>{metadata_result.NB_ELEMENTS_DONE} {lang:update_nb_elements_metadata_sync}</li>
+  <li>{metadata_result.NB_ELEMENTS_CANDIDATES} {lang:update_nb_elements_metadata_available}</li>
   <li>{lang:update_used_metadata} : {METADATA_LIST}</li>
 </ul>

trunk/upload.php

@@ -3 +3 @@
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
@@ -126 +126 @@
   $page['cat_name']       = $result['name'];
   $page['cat_uploadable'] = $result['uploadable'];
-  if ($page['cat_site_id'] != 1 or !$page['cat_uploadable'])
+  if ( url_is_remote($page['cat_dir']) or !$page['cat_uploadable'])
   {
     echo '<div style="text-align:center;">'.$lang['upload_forbidden'].'<br />';
@@ -183 +183 @@
   //        date_creation="2004-08-14" name="" />
   $xml_infos = '<infos';
-  $xml_infos.= ' author="'.htmlspecialchars($_POST['author'],ENT_QUOTES).'"';
-  $xml_infos.= ' comment="'.htmlspecialchars($_POST['comment'],ENT_QUOTES).'"';
-  $xml_infos.= ' date_creation="'.$date_creation.'"';
-  $xml_infos.= ' name="'.htmlspecialchars( $_POST['name'], ENT_QUOTES).'"';
+  $xml_infos.= encodeAttribute('author', $_POST['author']);
+  $xml_infos.= encodeAttribute('comment', $_POST['comment']);
+  $xml_infos.= encodeAttribute('date_creation', $date_creation);
+  $xml_infos.= encodeAttribute('name', $_POST['name']);
   $xml_infos.= ' />';