Changeset 2193

Timestamp:

Jan 23, 2008, 10:10:13 PM (16 years ago)

Author:

vdigital

Message:

Bug with no ref (and maybe 663): Currently if the "Search in subcategories" checkbox was unselected, all existing categories and elements were duplicated.
Cause: Wrong comparison between fileserver directory list and already known files in tables.

Resolution: keeping only the selected directory from the file server directory list in such cases,
if that one is still allocated.

Location:

branches/branch-1_7

Files:

• admin/site_update.php (modified) (1 diff)
• template/yoga/admin/site_update.tpl (modified) (1 diff)

branches/branch-1_7/admin/site_update.php

@@ -241 +241 @@
   }
 
-  $inserts = array();
+  // If $_POST['subcats-included'] != 1 ("Search in subcategories" is unchecked)
+  // $db_fulldirs doesn't include any subdirectories and $fs_fulldirs does
+  // So $fs_fulldirs will be limited to the selected basedir 
+  // (if that one is in $fs_fulldirs)
+  if (!isset($_POST['subcats-included']) or $_POST['subcats-included'] != 1)
+  {
+    $fs_fulldirs = array_intersect($fs_fulldirs, array_keys($db_fulldirs));
+  }
+  // print_r( $fs_fulldirs ); echo "<br>";
+  // print_r( $db_fulldirs ); echo "<br>";
+  // print_r( array_diff($fs_fulldirs, array_keys($db_fulldirs)) ); echo "<br>";
+  // die('That\'s why dirs or files synchronizations were duplicating cats.');
+
+  $inserts = array();  
   // new categories are the directories not present yet in the database
   foreach (array_diff($fs_fulldirs, array_keys($db_fulldirs)) as $fulldir)

branches/branch-1_7/template/yoga/admin/site_update.tpl

@@ -98 +98 @@
 
     <li><label>
-    <img class="button" src="{themeconf:icon_dir}/check.png" alt="checked checkbox">
-    <input type="HIDDEN" name="subcats-included" value="1" {SUBCATS_INCLUDED_CHECKED} />
+    <input type="checkbox" name="subcats-included" value="1" {SUBCATS_INCLUDED_CHECKED} />
 {lang:search_subcats_included}</label>
- / (<strong>Warning</strong>: Locked control, contact our forum if needed).</li>
+    </li>
     </ul>
   </fieldset>