Changeset 1058 for trunk/admin

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/admin

Files:

• cat_modify.php (modified) (4 diffs)
• remote_site.php (deleted)
• site_manager.php (modified) (7 diffs, 1 prop)
• site_reader_local.php (modified) (4 diffs, 1 prop)
• site_reader_remote.php (modified) (8 diffs, 1 prop)
• site_update.php (modified) (7 diffs, 1 prop)
• update.php (deleted)

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