Changeset 16071 for extensions/flickr2piwigo/admin/import.php

Timestamp:

Jun 27, 2012, 1:53:21 AM (12 years ago)

Author:

mistic100

Message:

code cleanup, don't ask username anymore (prohibit importing photos from another account)

File:

• extensions/flickr2piwigo/admin/import.php (modified) (16 diffs)

extensions/flickr2piwigo/admin/import.php

@@ -3 +3 @@
 
 // check API parameters and connect to flickr
-if (empty($conf['flickr2piwigo']['api_key']) or empty($conf['flickr2piwigo']['secret_key']) or empty($conf['flickr2piwigo']['username']))
+if ( empty($conf['flickr2piwigo']['api_key']) or empty($conf['flickr2piwigo']['secret_key']) )
 {
   array_push($page['warnings'], l10n('Please fill your API keys on the configuration tab'));
@@ -16 +16 @@
   
   // must authenticate
-  if (empty($_SESSION['phpFlickr_auth_token']) and @$_GET['action']!='login')
+  $u = $flickr->test_login();
+  if ( ($u === false or empty($_SESSION['phpFlickr_auth_token'])) and @$_GET['action']!='login' )
   {
     $_GET['action'] = 'init_login';
   }
-  else
-  {
-    // get user id
-    $u = $flickr->people_findByUsername($conf['flickr2piwigo']['username']);
-    if ($u === false)
-    {
-      array_push($page['errors'], l10n('Unknown username, please verify your configuration'));
-      $_GET['action'] = 'error';
-    }
-  }
-  
   
   // generate token after authentication
@@ -48 +38 @@
   case 'init_login':
   {
-    $template->assign('flickr_login', FLICKR_ADMIN.'-import&action=login');
+    $template->assign('flickr_login', FLICKR_ADMIN . '-import&action=login');
     break;
   }
@@ -63 +53 @@
   {
     $_SESSION['page_infos'][] = l10n('Successfully logued to you Flickr account');
-    redirect(FLICKR_ADMIN.'-import');
+    redirect(FLICKR_ADMIN . '-import');
     break;
   }
@@ -72 +62 @@
     unset($_SESSION['phpFlickr_auth_token']);
     $_SESSION['page_infos'][] = l10n('Logued out');
-    redirect(FLICKR_ADMIN.'-import');
+    redirect(FLICKR_ADMIN . '-import');
     break;
   }
@@ -81 +71 @@
     $u = $flickr->people_getInfo($u['id']);
     $template->assign(array(
-      'username' => $conf['flickr2piwigo']['username'],
-      'profile_url' => $u['photosurl'],
-      'logout_url' => FLICKR_ADMIN.'-import&action=logout',
-      'list_albums_url' => FLICKR_ADMIN.'-import&action=list_albums',
-      'import_all_url' => FLICKR_ADMIN.'-import&action=list_all',
+      'username' => $u['username'],
+      'profile_url' => $u['profileurl'],
+      'logout_url' => FLICKR_ADMIN . '-import&action=logout',
+      'list_albums_url' => FLICKR_ADMIN . '-import&action=list_albums',
+      'import_all_url' => FLICKR_ADMIN . '-import&action=list_all',
       ));
     break;
@@ -100 +90 @@
     foreach ($albums as &$album)
     {
-      //$album['U_IMPORT_ALL'] = FLICKR_ADMIN.'-import&action=import_album&album='.$album['id'];
-      $album['U_LIST'] = FLICKR_ADMIN.'-import&action=list_photos&album='.$album['id'];
+      $album['U_LIST'] = FLICKR_ADMIN . '-import&action=list_photos&album='.$album['id'];
     }
     unset($album);
@@ -114 +103 @@
         'description' => null,
         'photos' => $wo_albums['photos']['total'],
-        //'U_IMPORT_ALL' => FLICKR_ADMIN.'-import&action=import_album&album='.$album['id'],
-        'U_LIST' => FLICKR_ADMIN.'-import&action=list_photos&album=not_in_set',
+        'U_LIST' => FLICKR_ADMIN . '-import&action=list_photos&album=not_in_set',
         ));
     }
@@ -129 +117 @@
   case 'list_photos':
   {
+    $self_url = FLICKR_ADMIN . '-import&action=list_photos&album='.$_GET['album'];
+    $flickr_prefix = 'flickr-'.$u['username'].'-';
+    $flickr_root_url = $flickr->urls_getUserPhotos($u['id']);
+    
+    // pagination
     if (isset($_GET['start']))   $page['start'] = intval($_GET['start']);
     else                         $page['start'] = 0;
@@ -134 +127 @@
     else                         $page['display'] = 20;
     
-    $self_url = FLICKR_ADMIN.'-import&action=list_photos&album='.$_GET['album'];
-    $flickr_prefix = 'flickr-'.$conf['flickr2piwigo']['username'].'-';
-    $flickr_root_url = $flickr->urls_getUserPhotos($u['id']);
+    // get photos
+    if ($_GET['album'] == 'not_in_set')
+    {
+      $all_photos = $flickr->photos_getNotInSet(NULL, NULL, NULL, NULL, 'photos', NULL, NULL, 500);
+      $all_photos = $all_photos['photos']['photo'];
+    }
+    else
+    {
+      $all_photos = $flickr->photosets_getPhotos($_GET['album'], NULL, NULL, 500, NULL, 'photos');
+      $all_photos = $all_photos['photoset']['photo'];
+    }
     
     // get existing photos
@@ -147 +148 @@
     $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);
     
-    // get photos
-    if ($_GET['album'] == 'not_in_set')
-    {
-      $all_photos = $flickr->photos_getNotInSet(NULL, NULL, NULL, NULL, 'photos', NULL, NULL, 500);
-      $all_photos = $all_photos['photos']['photo'];
-    }
-    else
-    {
-      $all_photos = $flickr->photosets_getPhotos($_GET['album'], NULL, NULL, 500, NULL, 'photos');
-      $all_photos = $all_photos['photoset']['photo'];
-    }
-    
-    // remove existing
+    // remove existing photos
     $duplicates = 0;
     foreach ($all_photos as $i => $photo)
@@ -169 +158 @@
       }
     }
+    
     if ($duplicates>0)
     {
@@ -214 +204 @@
     break;
   }
-    
+  
+  // list all photos of the user
   case 'list_all':
   {
-    $flickr_prefix = 'flickr-'.$conf['flickr2piwigo']['username'].'-';
+    $flickr_prefix = 'flickr-'.$u['username'].'-';
     
     // get all photos in all albums
@@ -246 +237 @@
     $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);
     
-    // remove duplicates
+    // remove existing photos
     $duplicates = 0;
     foreach ($all_photos as $id => &$photo)
@@ -264 +255 @@
     }
     unset($photo);
+    $all_photos = array_values($all_photos);
+    
     if ($duplicates>0)
     {
       array_push($page['infos'], l10n_dec('%d picture is not displayed because already existing in the database.', '%d pictures are not displayed because already existing in the database.', $duplicates));
     }
-    $all_photos = array_values($all_photos);
     
     $template->assign(array(
       'nb_elements' => count($all_photos),
       'all_elements' => json_encode($all_photos),
-      'F_ACTION' => FLICKR_ADMIN.'-import&action=import_set',
+      'F_ACTION' => FLICKR_ADMIN . '-import&action=import_set',
       ));
       
@@ -293 +285 @@
       $_SESSION['page_infos'][] = sprintf(l10n('%d pictures imported'), $_POST['done']);
     }
-    redirect(FLICKR_ADMIN.'-import');
+    redirect(FLICKR_ADMIN . '-import');
   }
 }
 
+
 $template->assign('ACTION', $_GET['action']);
 
-$template->set_filename('flickr2piwigo', dirname(__FILE__).'/template/import.tpl');
+$template->set_filename('flickr2piwigo', dirname(__FILE__) . '/template/import.tpl');
 
 ?>