Changeset 17476 for extensions/flickr2piwigo/include/ws_functions.inc.php

Timestamp:

Aug 8, 2012, 1:55:06 PM (12 years ago)

Author:

mistic100

Message:

some code corrections

File:

• extensions/flickr2piwigo/include/ws_functions.inc.php (modified) (5 diffs)

extensions/flickr2piwigo/include/ws_functions.inc.php

@@ -10 +10 @@
     'ws_images_addFlickr',
     array(
-      'category' => array('default' => null),   
-      'id' => array('default' => null),
+      'id' => array(),
+      'category' => array(),
       'fills' => array('default' =>null),
       ),
-    'Used by Flickr2Piwigo, fills € (fill_name,fill_posted,fill_taken,fill_author,fill_tags)'
+    'Used by Flickr2Piwigo'
     );
 }
@@ -30 +30 @@
   if ( empty($conf['flickr2piwigo']['api_key']) or empty($conf['flickr2piwigo']['secret_key']) )
   {
-    return new PwgError(500, l10n('Please fill your API keys on the configuration tab'));
+    return new PwgError(null, l10n('Please fill your API keys on the configuration tab'));
   }
   
@@ -36 +36 @@
   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
@@ -58 +63 @@
   if (download_remote_file($photo['url'], $photo['path']) == false)
   {
-    return new PwgError(500, l10n('No download method available'));
+    return new PwgError(null, l10n('Can\'t download file'));
   }
   
@@ -125 +130 @@
   }
   
-  return sprintf(l10n('%s imported'), $photo['title']);
+  return sprintf(l10n('Photo "%s" imported'), $photo['title']);
 }