Changeset 7519 for extensions/AMetaData/amd_aip.class.inc.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_aip.class.inc.php (modified) (4 diffs)

extensions/AMetaData/amd_aip.class.inc.php

@@ -558 +558 @@
     $template->set_filename('sheet_page', dirname(__FILE__).'/admin/amd_metadata_database_status.tpl');
 
+    $warning2='';
+    $sql="SELECT tagId
+          FROM ".$this->tables['used_tags']."
+          WHERE newFromLastUpdate='y'";
+    $result=pwg_query($sql);
+    if($result)
+    {
+      $tmp=array();
+      $tagSchema='';
+      while($row=pwg_db_fetch_assoc($result))
+      {
+        if(preg_match('/^([a-z0-9]*)\..*/i', $row['tagId'], $tagSchema))
+        {
+          if(!in_array($tagSchema[1],$this->config['amd_FillDataBaseIgnoreSchemas'])) $tmp[]=$row['tagId'];
+        }
+      }
+      if(count($tmp)>0)
+      {
+        $ul='';
+        foreach($tmp as $val)
+        {
+          $ul.='<li>'.$val.'</li>';
+        }
+        if(count($tmp)>1)
+        {
+          $warning2=sprintf(GPCCore::BBtoHTML(l10n('g003_databaseWarning2_n')),$ul);
+        }
+        else
+        {
+          $warning2=sprintf(GPCCore::BBtoHTML(l10n('g003_databaseWarning2_1')),$ul);
+        }
+      }
+    }
+
+
     $datas=array(
       'urlRequest' => $this->getAdminLink('ajax'),
+      'warning2' => $warning2,
       'warning1' => GPCCore::BBtoHTML(l10n('g003_databaseWarning1')),
       'nfoMetadata' => Array(
@@ -566 +602 @@
           'magic' => 0,
           'xmp' => 0,
+          'com' => 0,
           'userDefined' => 0,
           'numOfPictures' => 0,
@@ -591 +628 @@
           FROM ".$this->tables['used_tags']."
           WHERE tagId LIKE 'xmp.%'
+          UNION
+          SELECT SUM(numOfImg), 'com'
+          FROM ".$this->tables['used_tags']."
+          WHERE tagId LIKE 'com.%'
           UNION
           SELECT SUM(numOfImg), 'userDefined'
@@ -619 +660 @@
              $row['type']=='magic' or
              $row['type']=='xmp' or
+             $row['type']=='com' or
              $row['type']=='userDefined') $datas['nfoMetadata']['nfoRows']+=$row['nb'];
         }