Changeset 29229 for trunk

Timestamp:

Aug 17, 2014, 10:01:10 PM (10 years ago)

Author:

flop25

Message:

feature:732
unlock sub-albums

Location:

trunk/admin

Files:

• cat_modify.php (modified) (1 diff)
• include/functions.php (modified) (2 diffs)
• themes/default/template/cat_modify.tpl (modified) (1 diff)

trunk/admin/cat_modify.php

@@ -137 +137 @@
   $cat_info = get_cat_info($_GET['cat_id']);
 
-  if ($cat_info['visible'] != get_boolean( $_POST['visible'] ) )
+  if ($_POST['visible']=='true_sub')
+  {
+    set_cat_visible(array($_GET['cat_id']), true, true);
+  }
+  elseif ($cat_info['visible'] != get_boolean( $_POST['visible'] ) )
   {
     set_cat_visible(array($_GET['cat_id']), $_POST['visible']);

trunk/admin/include/functions.php

@@ -645 +645 @@
  * @param int[] $categories
  * @param boolean|string $value
- */
-function set_cat_visible($categories, $value)
+ * @param boolean $unlock_child optional   default false
+ */
+function set_cat_visible($categories, $value, $unlock_child = false)
 {
   if ( ($value = filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE)) === null )
@@ -657 +658 @@
   if ($value)
   {
-    $uppercats = get_uppercat_ids($categories);
+    $cats = get_uppercat_ids($categories);
+    if ($unlock_child) {
+      $cats = array_merge($cats, get_subcat_ids($categories));
+    }
     $query = '
 UPDATE '.CATEGORIES_TABLE.'
   SET visible = \'true\'
-  WHERE id IN ('.implode(',', $uppercats).')';
+  WHERE id IN ('.implode(',', $cats).')';
     pwg_query($query);
   }

trunk/admin/themes/default/template/cat_modify.tpl

@@ -118 +118 @@
     <strong>{'Lock'|@translate}</strong>
     <br>
-                {html_radios name='visible' values=['true','false'] output=['No'|translate,'Yes'|translate] selected=$CAT_VISIBLE}
+                {html_radios name='visible' values=['true','true_sub','false'] output=['No'|translate,'No and unlock sub-albums'|translate,'Yes'|translate] selected=$CAT_VISIBLE}
   </p>