diff options
| -rw-r--r-- | admin/configuration.php | 1 | ||||
| -rw-r--r-- | admin/themes/default/template/configuration.tpl | 7 | ||||
| -rw-r--r-- | include/functions_comment.inc.php | 2 | ||||
| -rw-r--r-- | include/picture_comment.inc.php | 79 | ||||
| -rw-r--r-- | install/config.sql | 1 | ||||
| -rw-r--r-- | install/db/99-database.php | 40 | ||||
| -rw-r--r-- | language/en_UK/admin.lang.php | 1 | ||||
| -rw-r--r-- | language/fr_FR/admin.lang.php | 1 | ||||
| -rw-r--r-- | picture.php | 1 |
9 files changed, 80 insertions, 53 deletions
diff --git a/admin/configuration.php b/admin/configuration.php index 2762fb62a..c84962e42 100644 --- a/admin/configuration.php +++ b/admin/configuration.php @@ -63,7 +63,6 @@ $history_checkboxes = array( $comments_checkboxes = array( 'comments_forall', 'comments_validation', - 'comments_update_validation', 'email_admin_on_comment', 'email_admin_on_comment_validation', 'user_can_delete_comment', diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl index a8c2a943f..e241f220f 100644 --- a/admin/themes/default/template/configuration.tpl +++ b/admin/themes/default/template/configuration.tpl @@ -143,13 +143,6 @@ <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> <li> <label> 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']) diff --git a/install/config.sql b/install/config.sql index 0741a3a72..dd8c94c67 100644 --- a/install/config.sql +++ b/install/config.sql @@ -3,7 +3,6 @@ INSERT INTO piwigo_config (param,value,comment) VALUES ('nb_comment_page','10','number of comments to display on each page'); 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'); INSERT INTO piwigo_config (param,value,comment) VALUES ('user_can_edit_comment','false','administrators can allow user edit their own comments'); diff --git a/install/db/99-database.php b/install/db/99-database.php new file mode 100644 index 000000000..b8014b060 --- /dev/null +++ b/install/db/99-database.php @@ -0,0 +1,40 @@ +<?php +// +-----------------------------------------------------------------------+ +// | Piwigo - a PHP based photo gallery | +// +-----------------------------------------------------------------------+ +// | Copyright(C) 2008-2011 Piwigo Team http://piwigo.org | +// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | +// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | +// +-----------------------------------------------------------------------+ +// | This program is free software; you can redistribute it and/or modify | +// | it under the terms of the GNU General Public License as published by | +// | the Free Software Foundation | +// | | +// | This program is distributed in the hope that it will be useful, but | +// | WITHOUT ANY WARRANTY; without even the implied warranty of | +// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | +// | General Public License for more details. | +// | | +// | You should have received a copy of the GNU General Public License | +// | along with this program; if not, write to the Free Software | +// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | +// | USA. | +// +-----------------------------------------------------------------------+ + +if (!defined('PHPWG_ROOT_PATH')) +{ + die('Hacking attempt!'); +} + +$upgrade_description = 'delete the config parameter comments_update_validation'; + +$query = 'DELETE FROM '.CONFIG_TABLE.' WHERE param = \'comments_update_validation\';'; + +pwg_query($query); + +echo +"\n" +. $upgrade_description +."\n" +; +?>
\ No newline at end of file diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index 3a4cc97bc..444c896f3 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -729,7 +729,6 @@ $lang['user_status_normal'] = "User"; $lang['user_status_webmaster'] = "Webmaster"; $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"; $lang['Virtual album added'] = "Virtual album added"; diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index e5d4840e0..e53cf21c9 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -169,7 +169,6 @@ $lang['User comments validation'] = "Validation des commentaires d'utilisateurs" $lang['Users'] = "Utilisateurs"; $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'; $lang['Virtual album name'] = 'Nom de l\'album virtuel'; diff --git a/picture.php b/picture.php index ba3e144df..d111d5301 100644 --- a/picture.php +++ b/picture.php @@ -362,6 +362,7 @@ UPDATE '.USER_CACHE_CATEGORIES_TABLE.' $infos ); + unset($_POST['content']); break; } else |