From f8e8bdf05bee2444f003bc5dbb001343e1459e73 Mon Sep 17 00:00:00 2001
From: patdenice <patdenice@piwigo.org>
Date: Mon, 1 Oct 2007 15:56:42 +0000
Subject: [PATCH] 0000749: Add an option to add new elements to caddie when
 synchronize database. Add a redirection on index.php after "add to caddie
 action" (like on picture.php)

git-svn-id: http://piwigo.org/svn/trunk@2114 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/site_update.php                     | 16 ++++++++++++++++
 index.php                                 |  2 +-
 language/en_UK.iso-8859-1/common.lang.php |  1 +
 language/fr_FR.iso-8859-1/admin.lang.php  |  1 +
 template/yoga/admin/site_update.tpl       |  1 +
 5 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/admin/site_update.php b/admin/site_update.php
index f19b10d1e..a8dc0f5b4 100644
--- a/admin/site_update.php
+++ b/admin/site_update.php
@@ -485,6 +485,8 @@ SELECT IF(MAX(id)+1 IS NULL, 1, MAX(id)+1) AS next_element_id
             'info' => l10n('update_research_added')
             )
           );
+
+        $caddiables[] = $insert['id'];
       }
       else
       {
@@ -530,6 +532,8 @@ SELECT IF(MAX(id)+1 IS NULL, 1, MAX(id)+1) AS next_element_id
           'info' => l10n('update_research_added')
           )
         );
+
+      $caddiables[] = $insert['id'];
     }
   }
 
@@ -550,6 +554,12 @@ SELECT IF(MAX(id)+1 IS NULL, 1, MAX(id)+1) AS next_element_id
         array_keys($insert_links[0]),
         $insert_links
         );
+
+      // add new elements to caddie
+      if (isset($_POST['add_to_caddie']) and $_POST['add_to_caddie'] == 1)
+      {
+        fill_caddie($caddiables);
+      }
     }
     $counts['new_elements'] = count($inserts);
   }
@@ -957,6 +967,12 @@ if (!isset($_POST['submit']) or (isset($simulate) and $simulate))
         array('DISPLAY_INFO_CHECKED'=>'checked="checked"'));
     }
 
+    if (isset($_POST['add_to_caddie']) and $_POST['add_to_caddie'] == 1)
+    {
+      $template->assign_vars(
+        array('ADD_TO_CADDIE_CHECKED'=>'checked="checked"'));
+    }
+
     if (isset($_POST['subcats-included']) and $_POST['subcats-included'] == 1)
     {
       $template->assign_vars(
diff --git a/index.php b/index.php
index f3edd49de..52dd517b0 100644
--- a/index.php
+++ b/index.php
@@ -86,7 +86,7 @@ else
 if (isset($_GET['caddie']))
 {
   fill_caddie($page['items']);
-  // redirect();
+  redirect(duplicate_index_url());
 }
 
 //----------------------------------------------------- template initialization
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index 9b5c315e8..ed5ada707 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -634,6 +634,7 @@ $lang['Waiting page: %s'] = 'Waiting page: %s';
 $lang['Picture uploaded by %s'] = 'Picture uploaded by %s';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
 $lang['guest_must_be_guest'] = 'Bad status for user "guest", using default status. Please notify the webmaster.';
+$lang['add new elements to caddie'] = 'add new elements to caddie';
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
 $lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster and special user cannot use this method';
 ?>
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index c5ec14690..8c0042d3d 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -636,6 +636,7 @@ $lang['c13y_webmaster_non_existent'] = 'L\'utilisateur "webmestre" principal n\'
 $lang['c13y_bad_webmaster_status'] = 'Le statut de l\'utilisateur "webmestre" principal est incorrect';
 $lang['c13y_user_created'] = 'Utilisateur "%s" créé avec comme mot de passe "%s"';
 $lang['c13y_user_status_updated'] = 'Statut de l\'utilisateur "%s" mis à jour';
+$lang['add new elements to caddie'] = 'ajouter les nouveaux éléments au panier';
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
 $lang['no_display_thumbnail'] = 'Pas d\'affichage';
 $lang['display_thumbnail_classic'] = 'Affichage classique';
diff --git a/template/yoga/admin/site_update.tpl b/template/yoga/admin/site_update.tpl
index 31152ef35..471f98e4e 100644
--- a/template/yoga/admin/site_update.tpl
+++ b/template/yoga/admin/site_update.tpl
@@ -67,6 +67,7 @@
       <li><label><input type="radio" name="sync" value="dirs" {SYNC_DIRS_CHECKED} /> {lang:update_sync_dirs}</label></li>
       <li><label><input type="radio" name="sync" value="files" {SYNC_ALL_CHECKED} /> {lang:update_sync_all}</label></li>
       <li><label><input type="checkbox" name="display_info" value="1" {DISPLAY_INFO_CHECKED} /> {lang:update_display_info}</label></li>
+      <li><label><input type="checkbox" name="add_to_caddie" value="1" {ADD_TO_CADDIE_CHECKED} /> {lang:add new elements to caddie}</label></li>
     </ul>
   </fieldset>