Changeset 26180 for extensions/flickr2piwigo/include

Timestamp:

Dec 24, 2013, 6:23:13 PM (10 years ago)

Author:

mistic100

Message:

update for piwigo 2.6

Location:

extensions/flickr2piwigo/include

Files:

• functions.inc.php (modified) (7 diffs)
• ws_functions.inc.php (modified) (11 diffs)

extensions/flickr2piwigo/include/functions.inc.php

@@ -1 +1 @@
 <?php
-if (!defined('FLICKR_PATH')) die('Hacking attempt!');
+defined('FLICKR_PATH') or die('Hacking attempt!');
 
 /**
@@ -30 +30 @@
       return false;
     }
-    
+
     $return = ($dest === true) ? true : false;
-    
+
     /* curl */
     if (function_exists('curl_init'))
@@ -41 +41 @@
       }
       $ch = curl_init();
-      
+
       curl_setopt($ch, CURLOPT_URL, $src);
       curl_setopt($ch, CURLOPT_HEADER, false);
@@ -65 +65 @@
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
       }
-      
+
       $out = curl_exec($ch);
       curl_close($ch);
-      
+
       if ($out === false)
       {
@@ -90 +90 @@
         return false;
       }
-      
+
       $opts = array(
         'http' => array(
@@ -100 +100 @@
 
       $context = stream_context_create($opts);
-      
+
       if (($file = file_get_contents($src, false, $context)) === false)
       {
         return 'file_error';
       }
-      
+
       if (!$return)
       {
@@ -116 +116 @@
       }
     }
-    
+
     return false;
   }
 }
-
-?>

extensions/flickr2piwigo/include/ws_functions.inc.php

@@ -1 +1 @@
 <?php
-if (!defined('FLICKR_PATH')) die('Hacking attempt!');
+defined('FLICKR_PATH') or die('Hacking attempt!');
 
 function flickr_add_ws_method($arr)
 {
   $service = &$arr[0];
-  
+
   $service->addMethod(
     'pwg.images.addFlickr',
@@ -14 +14 @@
       'fills' => array('default' =>null),
       ),
-    'Used by Flickr2Piwigo'
+    'Used by Flickr2Piwigo',
+    null,
+    array('hidden'=>true)
     );
 }
@@ -24 +26 @@
     return new PwgError(403, 'Forbidden');
   }
-  
+
   global $conf;
-  $conf['flickr2piwigo'] = unserialize($conf['flickr2piwigo']);
-  
-  if ( empty($conf['flickr2piwigo']['api_key']) or empty($conf['flickr2piwigo']['secret_key']) )
+
+  if (empty($conf['flickr2piwigo']['api_key']) or empty($conf['flickr2piwigo']['secret_key']))
   {
     return new PwgError(null, l10n('Please fill your API keys on the configuration tab'));
   }
-  
+
   include_once(PHPWG_ROOT_PATH . 'admin/include/functions.php');
   include_once(PHPWG_ROOT_PATH . 'admin/include/functions_upload.inc.php');
   include_once(FLICKR_PATH . 'include/functions.inc.php');
-  
+
   if (test_remote_download() === false)
   {
     return new PwgError(null, l10n('No download method available'));
   }
-  
+
   // init flickr API
   include_once(FLICKR_PATH . 'include/phpFlickr/phpFlickr.php');
   $flickr = new phpFlickr($conf['flickr2piwigo']['api_key'], $conf['flickr2piwigo']['secret_key']);
   $flickr->enableCache('fs', FLICKR_FS_CACHE);
-  
+
   // user
   $u = $flickr->test_login();
-  if ( $u === false or empty($_SESSION['phpFlickr_auth_token']) )
+  if ($u === false or empty($_SESSION['phpFlickr_auth_token']))
   {
     return new PwgError(403, l10n('API not authenticated'));
   }
-  
+
   // photos infos
   $photo_f = $flickr->photos_getInfo($photo['id']);
@@ -59 +60 @@
   $photo['url'] = $flickr->get_biggest_size($photo['id'], 'original');
   $photo['path'] = FLICKR_FS_CACHE . 'flickr-'.$u['username'].'-'.$photo['id'].'.'.get_extension($photo['url']);
-  
+
   // copy file
   if (download_remote_file($photo['url'], $photo['path']) == false)
@@ -65 +66 @@
     return new PwgError(null, l10n('Can\'t download file'));
   }
-  
+
   // category
   if (!preg_match('#^[0-9]+$#', $photo['category']))
   {
     $categories_names = explode(',', $photo['category']);
-    
+
     $photo['category'] = array();
     foreach ($categories_names as $category_name)
@@ -79 +80 @@
 ;';
       $result = pwg_query($query);
-      
+
       if (pwg_db_num_rows($result))
       {
         list($cat_id) = pwg_db_fetch_row($result);
-        array_push($photo['category'], $cat_id);
+        $photo['category'][] = $cat_id;
       }
       else
       {
-        
+
         $cat = create_virtual_category($category_name);
-        array_push($photo['category'], $cat['id']);
+        $photo['category'][] = $cat['id'];
       }
     }
@@ -97 +98 @@
     $photo['category'] = array($photo['category']);
   }
-  
+
   // add photo
   $photo['image_id'] = add_uploaded_file($photo['path'], basename($photo['path']), $photo['category']);
-  
+
   // do some updates
   if (!empty($photo['fills']))
@@ -106 +107 @@
     $photo['fills'] = rtrim($photo['fills'], ',');
     $photo['fills'] = explode(',', $photo['fills']);
-  
+
     $updates = array();
-    if (in_array('fill_name', $photo['fills']))   $updates['name'] = pwg_db_real_escape_string($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'];
@@ -115 +116 @@
     if (in_array('fill_geotag', $photo['fills']) and !empty($photo['location']) )
     {
-      $updates['lat'] = pwg_db_real_escape_string($photo['location']['latitude']);
-      $updates['lon'] = pwg_db_real_escape_string($photo['location']['longitude']);
+      $updates['latitude'] = pwg_db_real_escape_string($photo['location']['latitude']);
+      $updates['longitude'] = pwg_db_real_escape_string($photo['location']['longitude']);
     }
-    
+
     if (count($updates))
     {
@@ -127 +128 @@
         );
     }
-    
-    if ( !empty($photo['tags']['tag']) and in_array('fill_tags', $photo['fills']) )
+
+    if (!empty($photo['tags']['tag']) and in_array('fill_tags', $photo['fills']))
     {
       $raw_tags = array_map(create_function('$t', 'return $t["_content"];'), $photo['tags']['tag']);
@@ -135 +136 @@
     }
   }
-  
-  return sprintf(l10n('Photo "%s" imported'), $photo['title']);
+
+  return l10n('Photo "%s" imported', $photo['title']);
 }
-
-?>