Changeset 7519 for extensions/AMetaData/amd_ajax.php

Timestamp:

Oct 31, 2010, 7:08:03 PM (13 years ago)

Author:

grum

Message:

Exploit the JpegMetadata class previous evolution
feature:1975, feature:1976, feature:1978

File:

• extensions/AMetaData/amd_ajax.php (modified) (6 diffs)

extensions/AMetaData/amd_ajax.php

@@ -162 +162 @@
                ($_REQUEST['filterType']=="exif.maker.Pentax" and !in_array('maker', $this->config['amd_FillDataBaseExcludeFilters'])) or
                ($_REQUEST['filterType']=="xmp" and !in_array('xmp', $this->config['amd_FillDataBaseExcludeFilters'])) or
-               ($_REQUEST['filterType']=="iptc"  and !in_array('iptc', $this->config['amd_FillDataBaseExcludeFilters']))
+               ($_REQUEST['filterType']=="iptc"  and !in_array('iptc', $this->config['amd_FillDataBaseExcludeFilters'])) or
+               ($_REQUEST['filterType']=="com"  and !in_array('com', $this->config['amd_FillDataBaseExcludeFilters']))
                )) $_REQUEST['filterType']="";
 
@@ -659 +660 @@
      * @param String $orderType : order for the list (by tag 'tag' or by number of
      *                            pictures 'num')
-     * @param String $filterType : filter for the list ('exif', 'xmp', 'iptc' or '')
+     * @param String $filterType : filter for the list ('exif', 'xmp', 'iptc', 'com' or '')
      * @return String
      */
@@ -1533 +1534 @@
                    paut.tagId = 'xmp.digiKam:TagsList' OR
                    paut.tagId = 'xmp.lr:hierarchicalSubject' OR
-                   paut.tagId = 'iptc.Keywords');";
+                   paut.tagId = 'iptc.Keywords' OR
+                   paut.tagId = 'magic.Author.Keywords');";
       $result=pwg_query($sql);
       if($result)
@@ -1545 +1547 @@
              */
             $tmp=unserialize($row['value']);
+            if(!isset($tmp['values'])) $tmp=array('values'=>$tmp);
             foreach($tmp['values'] as $val)
             {
@@ -1636 +1639 @@
                    paut.tagId = 'xmp.digiKam:TagsList' OR
                    paut.tagId = 'xmp.lr:hierarchicalSubject' OR
-                   paut.tagId = 'iptc.Keywords');";
+                   paut.tagId = 'iptc.Keywords' OR
+                   paut.tagId = 'magic.Author.Keywords');";
       $result=pwg_query($sql);
       if($result)
@@ -1648 +1652 @@
              */
             $tmp=unserialize($row['value']);
+            if(!isset($tmp['values'])) $tmp=array('values'=>$tmp);
             foreach($tmp['values'] as $val)
             {
-              if($row['tagId']=='xmp.digiKam:TagsList')
+              if($row['tagId']=='xmp.digiKam:TagsList' or $row['tagId']=='xmp.lr:hierarchicalSubject')
               {
                 $list=explode($this->tagSeparators[$row['tagId']], $val);