Changeset 27265 for extensions/flickr2piwigo

Timestamp:

Feb 8, 2014, 11:26:08 AM (10 years ago)

Author:

mistic100

Message:

fix bugs in "import all" and level sync

Location:

extensions/flickr2piwigo

Files:

• admin/import.php (modified) (1 diff)
• admin/template/import.list_all.tpl (modified) (1 diff)
• include/ws_functions.inc.php (modified) (2 diffs)

extensions/flickr2piwigo/admin/import.php

@@ -284 +284 @@
     $template->assign(array(
       'nb_elements' => count($all_photos),
-      'all_elements' => $all_photos,
+      'all_elements' => json_encode($all_photos),
       'F_ACTION' => FLICKR_ADMIN . '-import&action=import_set',
       ));

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

@@ -2 +2 @@
 (function($){
   /* global vars */
-  var all_elements = [{if !empty($all_elements)}{','|@implode:$all_elements}{/if}];
+  var all_elements = {$all_elements};
   var import_done = 0;
   var import_selected = {$nb_elements};

extensions/flickr2piwigo/include/ws_functions.inc.php

@@ -98 +98 @@
     $photo['category'] = array($photo['category']);
   }
-  
-  // level
-  $level = 0;
-  if (in_array('level', $photo['fills']) && !$photo['visibility']['ispublic'])
-  {
-    $level = 8;
-    if ($photo['visibility']['isfamily']) $level = 4;
-    if ($photo['visibility']['isfriend']) $level = 2;
-  }
 
   // add photo
-  $photo['image_id'] = add_uploaded_file($photo['path'], basename($photo['path']), $photo['category'], $level);
+  $photo['image_id'] = add_uploaded_file($photo['path'], basename($photo['path']), $photo['category']);
 
   // do some updates
@@ -127 +118 @@
       $updates['latitude'] = pwg_db_real_escape_string($photo['location']['latitude']);
       $updates['longitude'] = pwg_db_real_escape_string($photo['location']['longitude']);
+    }
+    if (in_array('level', $photo['fills']) && !$photo['visibility']['ispublic'])
+    {
+      $updates['level'] = 8;
+      if ($photo['visibility']['isfamily']) $updates['level'] = 4;
+      if ($photo['visibility']['isfriend']) $updates['level'] = 2;
     }