admin pages: merge Categories/comments page into Configuration/comments page

(they are related and we reduce the # of links in the menu)

git-svn-id: http://piwigo.org/svn/trunk@1865 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 39 insertions, 41 deletions

diff --git a/admin/cat_options.php b/admin/cat_options.php
index 8aaf4ad14..305c764c1 100644
--- a/admin/cat_options.php
+++ b/admin/cat_options.php
@@ -60,16 +60,6 @@ UPDATE '.CATEGORIES_TABLE.'
       pwg_query($query);
       break;
     }
-    case 'comments' :
-    {
-      $query = '
-UPDATE '.CATEGORIES_TABLE.'
-  SET commentable = \'false\'
-  WHERE id IN ('.implode(',', $_POST['cat_true']).')
-;';
-      pwg_query($query);
-      break;
-    }
     case 'visible' :
     {
       set_cat_visible($_POST['cat_true'], 'false');
@@ -108,16 +98,6 @@ UPDATE '.CATEGORIES_TABLE.'
       pwg_query($query);
       break;
     }
-    case 'comments' :
-    {
-      $query = '
-UPDATE '.CATEGORIES_TABLE.'
-  SET commentable = \'true\'
-  WHERE id IN ('.implode(',', $_POST['cat_false']).')
-;';
-      pwg_query($query);
-      break;
-    }
     case 'visible' :
     {
       set_cat_visible($_POST['cat_false'], 'true');
@@ -205,27 +185,6 @@ SELECT id,name,uppercats,global_rank
       );
     break;
   }
-  case 'comments' :
-  {
-    $query_true = '
-SELECT id,name,uppercats,global_rank
-  FROM '.CATEGORIES_TABLE.'
-  WHERE commentable = \'true\'
-;';
-    $query_false = '
-SELECT id,name,uppercats,global_rank
-  FROM '.CATEGORIES_TABLE.'
-  WHERE commentable = \'false\'
-;';
-    $template->assign_vars(
-      array(
-        'L_SECTION' => $lang['cat_comments_title'],
-        'L_CAT_OPTIONS_TRUE' => $lang['authorized'],
-        'L_CAT_OPTIONS_FALSE' => $lang['forbidden'],
-        )
-      );
-    break;
-  }
   case 'visible' :
   {
     $query_true = '
diff --git a/admin/configuration.php b/admin/configuration.php
index 12235cce6..c45fddc85 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -158,6 +158,32 @@ UPDATE '.CONFIG_TABLE.'
   load_conf_from_db();
 }
 
+if ( $page['section']=='comments' and !is_adviser() )
+{
+  if (isset($_POST['falsify'])
+      and isset($_POST['cat_true'])
+      and count($_POST['cat_true']) > 0)
+  {
+      $query = '
+UPDATE '.CATEGORIES_TABLE.'
+  SET commentable = \'false\'
+  WHERE id IN ('.implode(',', $_POST['cat_true']).')
+;';
+      pwg_query($query);
+  }
+  if (isset($_POST['trueify'])
+         and isset($_POST['cat_false'])
+         and count($_POST['cat_false']) > 0)
+  {
+      $query = '
+UPDATE '.CATEGORIES_TABLE.'
+  SET commentable = \'true\'
+  WHERE id IN ('.implode(',', $_POST['cat_false']).')
+;';
+      pwg_query($query);
+  }
+}
+
 //----------------------------------------------------- template initialization
 $template->set_filenames( array('config'=>'admin/configuration.tpl') );
 
@@ -226,6 +252,19 @@ switch ($page['section'])
             )
         );
     }
+    
+    $query_true = '
+SELECT id,name,uppercats,global_rank
+  FROM '.CATEGORIES_TABLE.'
+  WHERE commentable = \'true\'
+;';
+    $query_false = '
+SELECT id,name,uppercats,global_rank
+  FROM '.CATEGORIES_TABLE.'
+  WHERE commentable = \'false\'
+;';
+    display_select_cat_wrapper($query_true,array(),'comments.category_option_true');
+    display_select_cat_wrapper($query_false,array(),'comments.category_option_false');
     break;
   }
   case 'default' :