Changeset 17476 for extensions/flickr2piwigo/admin

Timestamp:

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

Author:

mistic100

Message:

some code corrections

Location:

extensions/flickr2piwigo/admin

Files:

• import.php (modified) (7 diffs)
• template/import.list_all.tpl (modified) (2 diffs)
• template/import.list_photos.tpl (modified) (1 diff)
• template/style.css (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;
+}