bug:2152 no special parameter for updated comment validation

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

2 files changed, 39 insertions, 42 deletions

diff --git a/include/functions_comment.inc.php b/include/functions_comment.inc.php
index 71aef652d..932491520 100644
--- a/include/functions_comment.inc.php
+++ b/include/functions_comment.inc.php
@@ -265,7 +265,7 @@ function update_user_comment($comment, $post_key)
     }
     
     // should the updated comment must be validated
-    if (!$conf['comments_update_validation'] or is_admin())
+    if (!$conf['comments_validation'] or is_admin())
     {
       $comment_action='validate'; //one of validate, moderate, reject
     }
diff --git a/include/picture_comment.inc.php b/include/picture_comment.inc.php
index 80f33a27e..e40a11f09 100644
--- a/include/picture_comment.inc.php
+++ b/include/picture_comment.inc.php
@@ -38,55 +38,52 @@ foreach ($related_categories as $category)
   }
 }
 
-if (!isset($comment_action))
+if ( $page['show_comments'] and isset( $_POST['content'] ) )
 {
-  if ( $page['show_comments'] and isset( $_POST['content'] ) )
+  if ( is_a_guest() and !$conf['comments_forall'] )
   {
-    if ( is_a_guest() and !$conf['comments_forall'] )
-    {
-      die ('Session expired');
-    }
-
-    $comm = array(
-      'author' => trim( @$_POST['author'] ),
-      'content' => trim( $_POST['content'] ),
-      'image_id' => $page['image_id'],
-     );
-
-    include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
+    die ('Session expired');
+  }
 
-    $comment_action = insert_user_comment($comm, @$_POST['key'], $infos );
+  $comm = array(
+    'author' => trim( @$_POST['author'] ),
+    'content' => trim( $_POST['content'] ),
+    'image_id' => $page['image_id'],
+   );
 
-    switch ($comment_action)
-    {
-      case 'moderate':
-        array_push( $infos, l10n('An administrator must authorize your comment before it is visible.') );
-      case 'validate':
-        array_push( $infos, l10n('Your comment has been registered'));
-        break;
-      case 'reject':
-        set_status_header(403);
-        array_push($infos, l10n('Your comment has NOT been registered because it did not pass the validation rules') );
-        break;
-      default:
-        trigger_error('Invalid comment action '.$comment_action, E_USER_WARNING);
-    }
+  include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
 
-    $template->assign(
-        ($comment_action=='reject') ? 'errors' : 'infos',
-        $infos
-      );
+  $comment_action = insert_user_comment($comm, @$_POST['key'], $infos );
 
-    // allow plugins to notify what's going on
-    trigger_action( 'user_comment_insertion',
-        array_merge($comm, array('action'=>$comment_action) )
-      );
-  }
-  elseif ( isset($_POST['content']) )
+  switch ($comment_action)
   {
-    set_status_header(403);
-    die('ugly spammer');
+    case 'moderate':
+      array_push( $infos, l10n('An administrator must authorize your comment before it is visible.') );
+    case 'validate':
+      array_push( $infos, l10n('Your comment has been registered'));
+      break;
+    case 'reject':
+      set_status_header(403);
+      array_push($infos, l10n('Your comment has NOT been registered because it did not pass the validation rules') );
+      break;
+    default:
+      trigger_error('Invalid comment action '.$comment_action, E_USER_WARNING);
   }
+
+  $template->assign(
+      ($comment_action=='reject') ? 'errors' : 'infos',
+      $infos
+    );
+
+  // allow plugins to notify what's going on
+  trigger_action( 'user_comment_insertion',
+      array_merge($comm, array('action'=>$comment_action) )
+    );
+}
+elseif ( isset($_POST['content']) )
+{
+  set_status_header(403);
+  die('ugly spammer');
 }
 
 if ($page['show_comments'])