aboutsummaryrefslogtreecommitdiffstats
path: root/admin/site_reader_remote.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2007-03-09 16:28:49 +0000
committerplegall <plg@piwigo.org>2007-03-09 16:28:49 +0000
commitb0478ef330b8f729554aec55baa81d9e3d02a063 (patch)
tree2be4688f02ba35fe2297f2b7d7de03e8f9eaf5e2 /admin/site_reader_remote.php
parent81030a7ab40a481d6d8c93539162a4a035ea09d1 (diff)
New: #images.high_filesize was added so that we can sum the filesizes in the
filtered history. #images.high_filesize is filled during metadata synchronization. Bug fixed: in getAttribute XML function, when asking "filesize", it was returning high_filesize. The regex was too simple. git-svn-id: http://piwigo.org/svn/trunk@1883 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/site_reader_remote.php17
1 files changed, 11 insertions, 6 deletions
diff --git a/admin/site_reader_remote.php b/admin/site_reader_remote.php
index dd0038877..9ee7916e2 100644
--- a/admin/site_reader_remote.php
+++ b/admin/site_reader_remote.php
@@ -47,7 +47,7 @@ function RemoteSiteReader($url, $listing_url)
'tn_ext', 'representative_ext', 'has_high',
);
$this->metadata_attributes = array(
- 'filesize', 'width', 'height'
+ 'filesize', 'width', 'height', 'high_filesize'
);
if (!isset($listing_url))
@@ -88,11 +88,16 @@ function open()
return false;
}
- $this->metadata_attributes = array_merge(
- $this->metadata_attributes,
- explode(',', getAttribute($info_xml_element, 'metadata'))
- );
+ $additional_metadata = getAttribute($info_xml_element, 'metadata');
+ if ($additional_metadata != '')
+ {
+ $this->metadata_attributes = array_merge(
+ $this->metadata_attributes,
+ explode(',', $additional_metadata)
+ );
+ }
+
$this->build_structure($xml_content, '', 0);
return true;
@@ -179,7 +184,7 @@ function get_metadata_attributes()
}
// returns a hash of attributes (metadata+width,...) for file
-function get_element_metadata($file)
+function get_element_metadata($file, $has_high = false)
{
return $this->get_element_attributes(
$file,