Changeset 17314 for extensions/pbase2piwigo/admin/import.php

Timestamp:

Aug 2, 2012, 6:38:10 PM (12 years ago)

Author:

mistic100

Message:

• many small improvements
• protect "generic" functions
• complete localization

File:

• extensions/pbase2piwigo/admin/import.php (modified) (4 diffs)

extensions/pbase2piwigo/admin/import.php

@@ -50 +50 @@
   case 'config':
   {
+    if (isset($_SESSION['pbase_empty_error']))
+    {
+      array_push($page['errors'], l10n('Import queue is empty'));
+      unset($_SESSION['pbase_empty_error']);
+    }
+    
+    // counters
+    $nb_categories = $nb_pictures = 0;
+    count_pictures_cats($tree, '/root', $nb_pictures, $nb_categories, true);
+    
+    // get piwigo categories
+    $query = '
+SELECT id, name, uppercats, global_rank
+  FROM '.CATEGORIES_TABLE.'
+;';
+    display_select_cat_wrapper($query, array(), 'associate_options');
+    display_select_cat_wrapper($query, array(), 'category_parent_options');
+    
     $template->assign(array(
+      'nb_categories' => $nb_categories-1, // don't count root
+      'nb_pictures' => $nb_pictures,
       'F_ACTION' => PBASE_ADMIN.'-import&action=init_import',
       'RESET_LINK' => PBASE_ADMIN.'-import&action=reset_tree',
@@ -61 +81 @@
   {
     $categories = $_POST['categories'];
+    $nb_categories = $nb_pictures = 0;
     
-    // remove duplicate categories (in case of recursive mode)
     if (isset($_POST['recursive']))
     {
+      // we don't add "root", only it's children
+      if (@$categories[0] == '/root')
+      {
+        $temp = &get_current_cat($tree, '/root');
+        $categories = array_merge($categories, array_values(array_unique_deep($temp['categories'], 'path')));
+        $categories = array_unique($categories);
+        unset($categories[0]);
+      }
+      
+      // remove duplicate categories (in case of recursive mode)
       foreach ($categories as &$path)
       {
@@ -77 +107 @@
     // count pictures and cats
     $temp_cats = $categories;
-    $nb_categories = $nb_pictures = 0;
     foreach ($temp_cats as $path)
     {
       count_pictures_cats($tree, $path, $nb_pictures, $nb_categories, isset($_POST['recursive']));
+    }
+    
+    if ($nb_pictures == 0)
+    {
+      $_SESSION['pbase_empty_error'] = true;
+      redirect(PBASE_ADMIN.'-import');
     }
     
@@ -87 +122 @@
       'nb_categories' => $nb_categories,
       'categories' => $categories,
+      'PARENT_CATEGORY' => $_POST['parent_category'],
       'RECURSIVE' => boolean_to_string(isset($_POST['recursive'])),
       'FILLS' => implode(',', @$_POST['fills']),