Changeset 1058 for trunk/admin/site_update.php

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

File:

• trunk/admin/site_update.php (modified) (7 diffs, 1 prop)

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.= ' + ...';
 }