Changeset 26199 for extensions/instagram2piwigo/include/ws_functions.inc.php

Timestamp:

Dec 26, 2013, 12:48:21 PM (10 years ago)

Author:

mistic100

Message:

update for 2.6

File:

• extensions/instagram2piwigo/include/ws_functions.inc.php (modified) (7 diffs)

extensions/instagram2piwigo/include/ws_functions.inc.php

@@ -1 +1 @@
 <?php
-if (!defined('INSTAG_PATH')) die('Hacking attempt!');
+defined('INSTAG_PATH') or die('Hacking attempt!');
 
 function instagram_add_ws_method($arr)
@@ -14 +14 @@
       'fills' => array('default' =>null),
       ),
-    'Used by Instagram2Piwigo'
+    'Used by Instagram2Piwigo',
+    null,
+    array('hidden'=>true)
     );
 }
@@ -26 +28 @@
   
   global $conf;
-  $conf['Instagram2Piwigo'] = unserialize($conf['Instagram2Piwigo']);
   
-  if ( empty($conf['Instagram2Piwigo']['api_key']) or empty($conf['Instagram2Piwigo']['secret_key']) )
+  if (empty($conf['Instagram2Piwigo']['api_key']) or empty($conf['Instagram2Piwigo']['secret_key']))
   {
     return new PwgError(null, l10n('Please fill your API keys on the configuration tab'));
@@ -65 +66 @@
     'username' => $photo_f->getUser()->getFullName(true),
     'tags' => $photo_f->getTags()->toArray(),
+    'location' => $photo_f->getLocation(),
     );
   $photo = array_merge($param, $photo);
@@ -95 +97 @@
   
     $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_taken', $photo['fills']))  $updates['date_creation'] = $photo['date'];
-    if (in_array('fill_author', $photo['fills'])) $updates['author'] = $photo['username'];
+    if (in_array('fill_author', $photo['fills'])) $updates['author'] = pwg_db_real_escape_string($photo['username']);
+    if (in_array('fill_geotag', $photo['fills']) and !empty($photo['location']) )
+    {
+      $updates['latitude'] = pwg_db_real_escape_string($photo['location']->getLat());
+      $updates['longitude'] = pwg_db_real_escape_string($photo['location']->getLng());
+    }
     
     if (count($updates))
@@ -108 +115 @@
     }
     
-    if ( !empty($photo['tags']) and in_array('fill_tags', $photo['fills']) )
+    if (!empty($photo['tags']) and in_array('fill_tags', $photo['fills']))
     {
       $raw_tags = implode(',', $photo['tags']);
@@ -115 +122 @@
   }
   
-  return sprintf(l10n('Photo "%s" imported'), $photo['title']);
+  return l10n('Photo "%s" imported', $photo['title']);
 }
-
-?>