Changeset 15343 for extensions/AMetaData/amd_aip_install.class.inc.php

Timestamp:

May 27, 2012, 1:31:32 PM (12 years ago)

Author:

grum

Message:

feature:2637 - Compatibility with Piwigo 2.4

File:

• extensions/AMetaData/amd_aip_install.class.inc.php (modified) (7 diffs)

extensions/AMetaData/amd_aip_install.class.inc.php

@@ -41 +41 @@
     $this->tabsheet->add('install',
                           l10n('g003_install'),
-                          $this->getAdminLink()."&f_tabsheet=install");
+                          $this->getAdminLink()."-install");
   }
 
@@ -71 +71 @@
     $template->set_filename('plugin_admin_content', dirname($this->getFileLocation())."/admin/amd_admin.tpl");
 
-    $this->tabsheet->select($_REQUEST['f_tabsheet']);
+    $this->tabsheet->select($_GET['tab']);
     $this->tabsheet->assign();
     $selected_tab=$this->tabsheet->get_selected();
@@ -80 +80 @@
     $pluginInfo=array(
       'AMD_VERSION' => "<i>".$this->getPluginName()."</i> ".l10n('g003_version').AMD_VERSION,
-      'AMD_PAGE' => $_REQUEST['f_tabsheet'],
+      'AMD_PAGE' => $_GET['tab'],
       'PATH' => AMD_PATH
     );
@@ -97 +97 @@
   protected function checkRequest()
   {
-    $_REQUEST['f_tabsheet']='install';
+    $_GET['tab']='install';
 
     if(!isset($_REQUEST['ajaxfct'])) return(false);
@@ -336 +336 @@
      * select 25 pictures into the caddie
      */
-    $sql="SELECT ti.id, ti.path, ti.has_high
+    $sql="SELECT ti.id, ti.path
           FROM ".CADDIE_TABLE." tc
             LEFT JOIN ".IMAGES_TABLE." ti ON ti.id = tc.element_id
@@ -365 +365 @@
         $excludeList="";
       }
-      $sql="SELECT ti.id, ti.path, ti.has_high
+      $sql="SELECT ti.id, ti.path
             FROM ".IMAGES_TABLE." ti ".$excludeList."
             ORDER BY RAND() LIMIT ".(25-count($listToAnalyze[0])).";";
@@ -388 +388 @@
       foreach($listToAnalyze[0] as $val)
       {
-        if($val['has_high']==='true' and $this->config['amd_UseMetaFromHD']=='y')
-        {
-          $this->analyzeImageFile($path."/".dirname($val['path'])."/pwg_high/".basename($val['path']), $val['id']);
-        }
-        else
-        {
-          $this->analyzeImageFile($path."/".$val['path'], $val['id']);
-        }
+        $this->analyzeImageFile($path."/".$val['path'], $val['id']);
       }
       $this->makeStatsConsolidation();