Changeset 17476

Timestamp:

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

Author:

mistic100

Message:

some code corrections

Location:

extensions/flickr2piwigo

Files:

• admin/import.php (modified) (7 diffs)
• admin/template/import.list_all.tpl (modified) (2 diffs)
• admin/template/import.list_photos.tpl (modified) (1 diff)
• admin/template/style.css (modified) (1 diff)
• include/functions.inc.php (modified) (3 diffs)
• include/ws_functions.inc.php (modified) (5 diffs)
• language/en_UK/description.txt (modified) (1 diff)
• language/en_UK/plugin.lang.php (modified) (2 diffs)
• language/fr_FR/description.txt (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (2 diffs)
• main.inc.php (modified) (1 diff)
• maintain.inc.php (modified) (1 diff)

extensions/flickr2piwigo/admin/import.php

@@ -3 +3 @@
 
 set_time_limit(600);
+
+include_once(PICASA_WA_PATH . 'include/functions.inc.php');
 
 // check API parameters and connect to flickr
@@ -10 +12 @@
   $_GET['action'] = 'error';
 }
-else if ( !function_exists('curl_init') and !ini_get('allow_url_fopen') )
+else if ( !test_remote_download() )
 {
   array_push($page['errors'], l10n('No download method available'));
@@ -154 +156 @@
 ;';
     $existing_photos = simple_hash_from_query($query, 'id', 'file');
-    $existing_photos = array_map(create_function('$p', '$p=preg_replace("#^'.$flickr_prefix.'([0-9]+)\.([a-z]{3,4})$#i", "$1", $p); return $p;'), $existing_photos);
+    $existing_photos = array_map(create_function('$p', 'return preg_replace("#^'.$flickr_prefix.'([0-9]+)\.([a-z]{3,4})$#i", "$1", $p);'), $existing_photos);
     
     // remove existing photos
@@ -199 +201 @@
   FROM '.CATEGORIES_TABLE.'
 ;';
-    display_select_cat_wrapper($query, array(), 'associate_options');
     display_select_cat_wrapper($query, array(), 'category_parent_options');
     
@@ -223 +224 @@
     
     $all_photos = array();
-    foreach ($all_albums as &$album)
+    foreach ($all_albums as $album)
     {
       $album_photos = $flickr->photosets_getPhotos($album['id'], NULL, NULL, 500, NULL, 'photos');
       $album_photos = $album_photos['photoset']['photo'];
       
-      foreach ($album_photos as &$photo)
+      foreach ($album_photos as $photo)
       {
         $all_photos[ $photo['id'] ][] = $album['title'];
       }
-      unset($photo);
-    }
-    unset($album);
+    }
     
     // get existing photos
@@ -243 +242 @@
 ;';
     $existing_photos = simple_hash_from_query($query, 'id', 'file');
-    $existing_photos = array_map(create_function('$p', '$p=preg_replace("#^'.$flickr_prefix.'([0-9]+)\.([a-z]{3,4})$#i", "$1", $p); return $p;'), $existing_photos);
+    $existing_photos = array_map(create_function('$p', 'return preg_replace("#^'.$flickr_prefix.'([0-9]+)\.([a-z]{3,4})$#i", "$1", $p);'), $existing_photos);
     
     // remove existing photos
@@ -281 +280 @@
   FROM '.CATEGORIES_TABLE.'
 ;';
-    display_select_cat_wrapper($query, array(), 'associate_options', true);
     display_select_cat_wrapper($query, array(), 'category_parent_options');
     break;

extensions/flickr2piwigo/admin/template/import.list_all.tpl

@@ -57 +57 @@
     $("#loader_import").fadeIn();
     
-    if ($("input[name='album_mode']").val() == 'identical') {
+    if ($("input[name='album_mode']:checked").val() == 'identical') {
       var album = 0;
     } else {
@@ -115 +115 @@
     <p id="albumSelectWrapper" style="display:none;">
       <select style="width:400px" name="associate" id="albumSelect" size="1">
-        {html_options options=$associate_options}
+        {html_options options=$category_parent_options}
       </select>
       {'... or '|@translate}<a href="#" class="addAlbumOpen" title="{'create a new album'|@translate}">{'create a new album'|@translate}</a>

extensions/flickr2piwigo/admin/template/import.list_photos.tpl

@@ -405 +405 @@
       <label for="albumSelect"><b>{'Album'|@translate}:</b></label>
       <select style="width:400px" name="associate" id="albumSelect" size="1">
-        {html_options options=$associate_options}
+        {html_options options=$category_parent_options}
       </select>
       {'... or '|@translate}<a href="#" class="addAlbumOpen" title="{'create a new album'|@translate}">{'create a new album'|@translate}</a>

extensions/flickr2piwigo/admin/template/style.css

@@ -6 +6 @@
   margin-top:20px;
 }
+UL.thumbnails span.wrap2 {
+  height: 128px;
+  width: 128px;
+}

extensions/flickr2piwigo/include/functions.inc.php

@@ -1 +1 @@
 <?php
 if (!defined('FLICKR_PATH')) die('Hacking attempt!');
+
+/**
+ * test if a download method is available
+ * @return: bool
+ */
+if (!function_exists('test_remote_download'))
+{
+  function test_remote_download()
+  {
+    return function_exists('curl_init') || ini_get('allow_url_fopen');
+  }
+}
 
 /**
@@ -31 +43 @@
       
       curl_setopt($ch, CURLOPT_URL, $src);
-      curl_setopt($ch, CURLOPT_HEADER, 0);
+      curl_setopt($ch, CURLOPT_HEADER, false);
       curl_setopt($ch, CURLOPT_HTTPHEADER, array("Accept-language: en"));
       curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)');
       curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
       curl_setopt($ch, CURLOPT_MAXREDIRS, 1);
+      curl_setopt($ch, CURLOPT_TIMEOUT, 30);
       if (strpos($src, 'https://') !== false)
       {
@@ -50 +63 @@
       }
       
-      if (($out = curl_exec($ch)) === false)
+      $out = curl_exec($ch);
+      curl_close($ch);
+      
+      if ($out === false)
       {
         return 'file_error';
       }
-      
-      curl_close($ch);
-      
-      if (!$return)
+      else if (!$return)
       {
         fclose($newf);

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']);
 }
 

extensions/flickr2piwigo/language/en_UK/description.txt

@@ -1 @@
-Extension for importing pictures from your Flickr account
+Import pictures from your Flickr account

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

@@ -9 +9 @@
 $lang['Import'] = 'Import';
 $lang['API not authenticated'] = 'API not authenticated';
-$lang['%s imported'] = '%s imported';
+$lang['Photo "%s" imported'] = 'Photo "%s" imported';
 $lang['Flickr logins'] = 'Flickr logins';
 $lang['API key'] = 'API key';
@@ -29 +29 @@
 $lang['No download method available'] = 'No download method available';
 $lang['Logued as'] = 'Logued as';
+$lang['Logued out'] = 'Logued out';
 $lang['%d elements ready for importation'] = '%d elements ready for importation';
 

extensions/flickr2piwigo/language/fr_FR/description.txt

@@ -1 @@
-Extension permettant d'importer des photos depuis votre compte Flickr.
+Importez des photos depuis votre compte Flickr.

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

@@ -9 +9 @@
 $lang['Import'] = 'Importation';
 $lang['API not authenticated'] = 'API non authentifiée';
-$lang['%s imported'] = '%s importé';
+$lang['Photo "%s" imported'] = 'Photo "%s" importée';
 $lang['Flickr logins'] = 'Identifiants Flickr';
 $lang['API key'] = 'Clé API';
@@ -29 +29 @@
 $lang['No download method available'] = 'Aucune méthode de téléchargement n\'est disponible';
 $lang['Logued as'] = 'Indentifié en tant que';
+$lang['Logued out'] = 'Déconnecté';
 $lang['%d elements ready for importation'] = '%d elements prêts à l\'importation';
 

extensions/flickr2piwigo/main.inc.php

@@ -3 +3 @@
 Plugin Name: Flickr2Piwigo
 Version: auto
-Description: Extension for importing pictures from your Flickr account
+Description: Import pictures from your Flickr account
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=612
 Author: Mistic

extensions/flickr2piwigo/maintain.inc.php

@@ -37 +37 @@
 function plugin_uninstall() 
 {
+  global $conf;
+  
   pwg_query('DELETE FROM `'. CONFIG_TABLE .'` WHERE param = "flickr2piwigo" LIMIT 1;');