Changeset 28844 for extensions/instagram2piwigo/main.inc.php

Timestamp:

Jun 29, 2014, 4:23:36 PM (10 years ago)

Author:

mistic100

Message:

use new maintain class

File:

• extensions/instagram2piwigo/main.inc.php (modified) (2 diffs)

extensions/instagram2piwigo/main.inc.php

@@ -17 +17 @@
 define('INSTAG_ADMIN',    get_root_url() . 'admin.php?page=plugin-' . INSTAG_ID);
 define('INSTAG_FS_CACHE', $conf['data_location'].'instagram_cache/');
-define('INSTAG_VERSION',  'auto');
-
 
 include_once(INSTAG_PATH . 'include/ws_functions.inc.php');
 
 
-add_event_handler('init', 'instagram_init');
+$conf['Instagram2Piwigo'] = safe_unserialize($conf['Instagram2Piwigo']);
+
+
 add_event_handler('ws_add_methods', 'instagram_add_ws_method');
 
@@ -32 +32 @@
   add_event_handler('get_batch_manager_prefilters', 'instagram_add_batch_manager_prefilters');
   add_event_handler('perform_batch_manager_prefilters', 'instagram_perform_batch_manager_prefilters', EVENT_HANDLER_PRIORITY_NEUTRAL, 2);
-
-  function instagram_admin_menu($menu) 
-  {
-    $menu[] = array(
-      'NAME' => 'Instagram2Piwigo',
-      'URL' => INSTAG_ADMIN,
-      );
-    return $menu;
-  }
-  
-  function instagram_add_batch_manager_prefilters($prefilters)
-  {
-    $prefilters[] = array(
-      'ID' => 'instagram',
-      'NAME' => l10n('Imported from Instagram'),
-      );
-    return $prefilters;
-  }
-
-  function instagram_perform_batch_manager_prefilters($filter_sets, $prefilter)
-  {
-    if ($prefilter == 'instagram')
-    {
-      $query = '
-  SELECT id
-    FROM '.IMAGES_TABLE.'
-    WHERE file LIKE "instagram-%"
-  ;';
-      $filter_sets[] = array_from_query($query, 'id');
-    }
-    
-    return $filter_sets;
-  }
 }
 
 
-function instagram_init()
+function instagram_admin_menu($menu) 
 {
-  global $conf;
+  $menu[] = array(
+    'NAME' => 'Instagram2Piwigo',
+    'URL' => INSTAG_ADMIN,
+    );
+  return $menu;
+}
 
-  include_once(INSTAG_PATH . 'maintain.inc.php');
-  $maintain = new instagram2piwigo_maintain(INSTAG_ID);
-  $maintain->autoUpdate(INSTAG_VERSION, 'install');
+function instagram_add_batch_manager_prefilters($prefilters)
+{
+  $prefilters[] = array(
+    'ID' => 'instagram',
+    'NAME' => l10n('Imported from Instagram'),
+    );
+  return $prefilters;
+}
 
-  $conf['Instagram2Piwigo'] = unserialize($conf['Instagram2Piwigo']);
+function instagram_perform_batch_manager_prefilters($filter_sets, $prefilter)
+{
+  if ($prefilter == 'instagram')
+  {
+    $query = '
+SELECT id
+  FROM '.IMAGES_TABLE.'
+  WHERE file LIKE "instagram-%"
+;';
+    $filter_sets[] = array_from_query($query, 'id');
+  }
+  
+  return $filter_sets;
 }