Changeset 24815

Timestamp:

Oct 9, 2013, 3:18:02 PM (11 years ago)

Author:

mistic100

Message:

fix bug with quotes, add batch manager prefilter

Location:

extensions/flickr2piwigo

Files:

• admin/config.php (modified) (1 diff)
• admin/import.php (modified) (2 diffs)
• include/ws_functions.inc.php (modified) (1 diff)
• main.inc.php (modified) (2 diffs)
• maintain.inc.php (modified) (1 diff)

extensions/flickr2piwigo/admin/config.php

@@ -10 +10 @@
   unset($_SESSION['phpFlickr_auth_token']);
   conf_update_param('flickr2piwigo', serialize($conf['flickr2piwigo']));
+  $page['infos'][] = l10n('Information data registered in database');
 }
 

extensions/flickr2piwigo/admin/import.php

@@ -171 +171 @@
     if ($duplicates>0)
     {
-      array_push($page['infos'], l10n_dec('One picture is not displayed because already existing in the database.', '%d pictures are not displayed because already existing in the database.', $duplicates));
+      $page['infos'][] = '<a href="admin.php?page=batch_manager&amp;prefilter=flickr">'
+          .l10n_dec('One picture is not displayed because already existing in the database.', '%d pictures are not displayed because already existing in the database.', $duplicates)
+        .'</a>';
     }
     
@@ -266 +268 @@
     if ($duplicates>0)
     {
-      array_push($page['infos'], l10n_dec('%d picture is not displayed because already existing in the database.', '%d pictures are not displayed because already existing in the database.', $duplicates));
+      $page['infos'][] = '<a href="admin.php?page=batch_manager&amp;prefilter=flickr">'
+          .l10n_dec('%d picture is not displayed because already existing in the database.', '%d pictures are not displayed because already existing in the database.', $duplicates)
+        .'</a>';
     }
     

extensions/flickr2piwigo/include/ws_functions.inc.php

@@ -108 +108 @@
   
     $updates = array();
-    if (in_array('fill_name', $photo['fills']))   $updates['name'] = $photo['title']; 
+    if (in_array('fill_name', $photo['fills']))   $updates['name'] = pwg_db_real_escape_string($photo['title']); 
     if (in_array('fill_posted', $photo['fills'])) $updates['date_available'] = date('Y-m-d H:i:s', $photo['dates']['posted']);
     if (in_array('fill_taken', $photo['fills']))  $updates['date_creation'] = $photo['dates']['taken'];
-    if (in_array('fill_author', $photo['fills'])) $updates['author'] = $photo['owner']['username'];
+    if (in_array('fill_author', $photo['fills'])) $updates['author'] = pwg_db_real_escape_string($photo['owner']['username']);
     
     if (count($updates))

extensions/flickr2piwigo/main.inc.php

@@ -21 +21 @@
 {
   add_event_handler('get_admin_plugin_menu_links', 'flickr_admin_menu');
+  add_event_handler('get_batch_manager_prefilters', 'flickr_add_batch_manager_prefilters');
+  add_event_handler('perform_batch_manager_prefilters', 'flickr_perform_batch_manager_prefilters', EVENT_HANDLER_PRIORITY_NEUTRAL, 2);
+  add_event_handler('loc_begin_admin_page', 'flickr_prefilter_from_url');
 
   function flickr_admin_menu($menu) 
@@ -30 +33 @@
     return $menu;
   }
+  
+  function flickr_add_batch_manager_prefilters($prefilters)
+  {
+    array_push($prefilters, array(
+      'ID' => 'flickr',
+      'NAME' => l10n('Imported from Flickr'),
+    ));
+    return $prefilters;
+  }
+
+  function flickr_perform_batch_manager_prefilters($filter_sets, $prefilter)
+  {
+    if ($prefilter == 'flickr')
+    {
+      $query = '
+  SELECT id
+    FROM '.IMAGES_TABLE.'
+    WHERE file LIKE "flickr-%"
+  ;';
+      $filter_sets[] = array_from_query($query, 'id');
+    }
+    
+    return $filter_sets;
+  }
+  
+  function flickr_prefilter_from_url()
+  {
+    global $page;
+    if ($page['page'] == 'batch_manager' && @$_GET['prefilter'] == 'flickr')
+    {
+      $_SESSION['bulk_manager_filter'] = array('prefilter' => 'flickr');
+      unset($_GET['prefilter']);
+    }
+  }
 }
 

extensions/flickr2piwigo/maintain.inc.php

@@ -39 +39 @@
   global $conf;
   
-  pwg_query('DELETE FROM `'. CONFIG_TABLE .'` WHERE param = "flickr2piwigo" LIMIT 1;');
+  pwg_query('DELETE FROM `'. CONFIG_TABLE .'` WHERE param = "flickr2piwigo";');
+  unset($conf['flickr2piwigo']);
   
   rrmdir(PHPWG_ROOT_PATH . $conf['data_location'] . 'flickr_cache/');