Changeset 10122

Timestamp:

Apr 6, 2011, 9:24:30 PM (14 years ago)

Author:

mistic100

Message:

bug:2152 no special parameter for updated comment validation

Location:

trunk

Files:

• admin/configuration.php (modified) (1 diff)
• admin/themes/default/template/configuration.tpl (modified) (1 diff)
• include/functions_comment.inc.php (modified) (1 diff)
• include/picture_comment.inc.php (modified) (1 diff)
• install/config.sql (modified) (1 diff)
• install/db/99-database.php (added)
• language/en_UK/admin.lang.php (modified) (1 diff)
• language/fr_FR/admin.lang.php (modified) (1 diff)
• picture.php (modified) (1 diff)

trunk/admin/configuration.php

@@ -64 +64 @@
     'comments_forall',
     'comments_validation',
-    'comments_update_validation',
     'email_admin_on_comment',
     'email_admin_on_comment_validation',

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

@@ -142 +142 @@
         <span class="property">{'Validation'|@translate}</span>
         <input type="checkbox" name="comments_validation" {if ($comments.comments_validation)}checked="checked"{/if}>
-      </label>
-    </li>
-    
-    <li>
-      <label>
-        <span class="property">{'Update Validation'|@translate}</span>
-        <input type="checkbox" name="comments_update_validation" {if ($comments.comments_update_validation)}checked="checked"{/if}>
       </label>
     </li>

trunk/include/functions_comment.inc.php

@@ -266 +266 @@
     
     // 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

trunk/include/picture_comment.inc.php

@@ -39 +39 @@
 }
 
-if (!isset($comment_action))
-{
-  if ( $page['show_comments'] and isset( $_POST['content'] ) )
-  {
-    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');
-
-    $comment_action = insert_user_comment($comm, @$_POST['key'], $infos );
-
-    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);
-    }
-
-    $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'] and isset( $_POST['content'] ) )
+{
+  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');
+
+  $comment_action = insert_user_comment($comm, @$_POST['key'], $infos );
+
+  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);
+  }
+
+  $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');
 }
 

trunk/install/config.sql

@@ -4 +4 @@
 INSERT INTO piwigo_config (param,value,comment) VALUES ('log','true','keep an history of visits on your website');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('comments_validation','false','administrators validate users comments before becoming visible');
-INSERT INTO piwigo_config (param,value,comment) VALUES ('comments_update_validation','false','administrators validate users updated comments before becoming visible');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('comments_forall','false','even guest not registered can post comments');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('user_can_delete_comment','false','administrators can allow user delete their own comments');

trunk/language/en_UK/admin.lang.php

@@ -730 +730 @@
 $lang['Validate'] = "Validate";
 $lang['Validation'] = "Validation";
-$lang['Update Validation'] = "Validation when a comment is modified";
 $lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = "Versions of create_listing_file.php on the remote site and Piwigo must be the same";
 $lang['Version'] = "Version";

trunk/language/fr_FR/admin.lang.php

@@ -170 +170 @@
 $lang['Validate'] = "Valider";
 $lang['Validation'] = "Validation";
-$lang['Update Validation'] = "Validation quand un commentaire est modifié";
 $lang['Version'] = "Version";
 $lang['Virtual albums to move'] = 'Albums virtuels à déplacer';

trunk/picture.php

@@ -363 +363 @@
             );
             
+          unset($_POST['content']);
           break;
         }