Changeset 16085 for extensions

Timestamp:

Jun 27, 2012, 11:03:10 AM (12 years ago)

Author:

mistic100

Message:

add curl download, and display error if no download method (curl or allow_url_fopen) available

Location:

extensions/flickr2piwigo

Files:

• admin/import.php (modified) (2 diffs)
• include/ws_functions.inc.php (modified) (2 diffs)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)

extensions/flickr2piwigo/admin/import.php

@@ -6 +6 @@
 {
   array_push($page['warnings'], l10n('Please fill your API keys on the configuration tab'));
+  $_GET['action'] = 'error';
+}
+else if ( !function_exists('curl_init') and !ini_get('allow_url_fopen') )
+{
+  array_push($page['errors'], l10n('No download method available'));
   $_GET['action'] = 'error';
 }
@@ -29 +34 @@
   }
 }
+
 
 if (!isset($_GET['action'])) $_GET['action'] = 'main';

extensions/flickr2piwigo/include/ws_functions.inc.php

@@ -55 +55 @@
   
   // copy file
-  $file = fopen($photo['url'], "rb");
-  $newf = fopen($photo['path'], "wb");
-  while (!feof($file))
+  if (download_remote_file($photo['url'], $photo['path']) == false)
   {
-    fwrite($newf, fread($file, 1024 * 8 ), 1024 * 8 );
+    return new PwgError(500, l10n('No download method available'));
   }
-  fclose($file);
-  fclose($newf);
   
   // category
@@ -131 +127 @@
 }
 
+function download_remote_file($src, $dest)
+{
+  if (function_exists('curl_init'))
+  {
+    $newf = fopen($dest, "wb");
+    $ch = curl_init();
+    
+    curl_setopt($ch, CURLOPT_URL, $src);
+    curl_setopt($ch, CURLOPT_HEADER, 0);
+    curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)');
+    curl_setopt($ch, CURLOPT_FILE, $newf);
+    
+    curl_exec($ch);
+    curl_close($ch);
+    fclose($newf);
+    
+    return true;
+  }
+  else if (ini_get('allow_url_fopen'))
+  {
+    $file = fopen($src, "rb");
+    $newf = fopen($dest, "wb");
+    
+    while (!feof($file))
+    {
+      fwrite($newf, fread($file, 1024 * 8 ), 1024 * 8 );
+    }
+    
+    fclose($file);
+    fclose($newf);
+    
+    return true;
+  }
+  
+  return false;
+}
+
+
 ?>

extensions/flickr2piwigo/language/en_UK/plugin.lang.php

@@ -28 +28 @@
 $lang['Begin transfert'] = 'Begin transfert';
 $lang['Open Flickr page in a new tab'] = 'Open Flickr page in a new tab';
+$lang['No download method available'] = 'No download method available';
 
 ?>

extensions/flickr2piwigo/language/fr_FR/plugin.lang.php

@@ -28 +28 @@
 $lang['Begin transfert'] = 'Commencer les transfert';
 $lang['Open Flickr page in a new tab'] = 'Ouvrir la page Flickr dans un nouvel onglet';
+$lang['No download method available'] = 'Aucune méthode de téléchargement n\'est disponible';
 
 ?>