Changeset 29251 for extensions/Google2Piwigo

Timestamp:

Aug 23, 2014, 12:51:23 PM (10 years ago)

Author:

mistic100

Message:

update for 2.7

Location:

extensions/Google2Piwigo

Files:

• admin.php (modified) (1 diff)
• include/ws_functions.inc.php (modified) (3 diffs)
• main.inc.php (modified) (2 diffs)
• maintain.class.php (added)
• maintain.inc.php (deleted)

extensions/Google2Piwigo/admin.php

@@ -5 +5 @@
 
 load_language('plugin.lang', PICASA_WA_PATH);
+$conf['google2piwigo'] = safe_unserialize($conf['google2piwigo']);
 
 if (!file_exists(PICASA_WA_CACHE))

extensions/Google2Piwigo/include/ws_functions.inc.php

@@ -28 +28 @@
   }
   
-  global $conf, $pwg_loaded_plugins;
+  global $conf;
+  
+  $conf['google2piwigo'] = safe_unserialize($conf['google2piwigo']);
   
   include_once(PHPWG_ROOT_PATH . 'admin/include/functions.php');
@@ -130 +132 @@
   if (!empty($params['fills']))
   {
-    $params['fills'] = rtrim($params['fills'], ',');
-    $params['fills'] = explode(',', $params['fills']);
+    $fills = rtrim($params['fills'], ',');
+    $fills = explode(',', $fills);
+    $fills = array_flip($fills);
   
     $updates = array();
-    if (in_array('fill_name', $params['fills']))        $updates['name'] = pwg_db_real_escape_string($photo['title']); 
-    if (in_array('fill_date', $params['fills']))        $updates['date_creation'] = date('Y-m-d H:i:s', $photo['timestamp']);
-    if (in_array('fill_author', $params['fills']))      $updates['author'] = pwg_db_real_escape_string($photo['author']);
-    if (in_array('fill_description', $params['fills'])) $updates['comment'] = pwg_db_real_escape_string($photo['description']);
-    if (in_array('fill_geotag', $params['fills']) and !empty($photo['latlon']))
+    if (isset($fills['fill_name']))        $updates['name'] = pwg_db_real_escape_string($photo['title']); 
+    if (isset($fills['fill_date']))        $updates['date_creation'] = date('Y-m-d H:i:s', $photo['timestamp']);
+    if (isset($fills['fill_author']))      $updates['author'] = pwg_db_real_escape_string($photo['author']);
+    if (isset($fills['fill_description'])) $updates['comment'] = pwg_db_real_escape_string($photo['description']);
+    if (isset($fills['fill_geotag']) and !empty($photo['latlon']))
     {
       $latlon = explode(' ', $photo['latlon']);
@@ -157 +160 @@
     }
     
-    if (!empty($photo['tags']) and in_array('fill_tags', $params['fills']))
+    if (!empty($photo['tags']) and isset($fills['fill_tags']))
     {
       set_tags(get_tag_ids($photo['tags']), $photo['image_id']);

extensions/Google2Piwigo/main.inc.php

@@ -17 +17 @@
 define('PICASA_WA_ADMIN', get_root_url() . 'admin.php?page=plugin-' . PICASA_WA_ID);
 define('PICASA_WA_CACHE', PHPWG_ROOT_PATH . $conf['data_location'] . 'picasa_wa_cache/');
-define('PICASA_WA_VERSION',  'auto');
 
 
-include_once(PICASA_WA_PATH . 'include/ws_functions.inc.php');
+if (defined('IN_WS'))
+{
+  include_once(PICASA_WA_PATH . 'include/ws_functions.inc.php');
 
-
-add_event_handler('init', 'picasa_wa_init');
-add_event_handler('ws_add_methods', 'picasa_wa_add_ws_method');
+  add_event_handler('ws_add_methods', 'picasa_wa_add_ws_method');
+}
 
 if (defined('IN_ADMIN'))
@@ -66 +66 @@
   }
 }
-
-function picasa_wa_init()
-{
-  global $conf;
-  include_once(PICASA_WA_PATH . 'maintain.inc.php');
-  $maintain = new Google2Piwigo_maintain(PICASA_WA_ID);
-  $maintain->autoUpdate(PICASA_WA_VERSION, 'install');
-
-  $conf['google2piwigo'] = unserialize($conf['google2piwigo']);
-}