Changeset 18995

Timestamp:

Nov 11, 2012, 4:01:09 PM (11 years ago)

Author:

mistic100

Message:

feature:2786 Allow to edit website url in user comments + improve "user experience" on comment edition

Location:

trunk

Files:

• comments.php (modified) (1 diff)
• include/functions_comment.inc.php (modified) (3 diffs)
• language/en_UK/common.lang.php (modified) (2 diffs)
• language/fr_FR/common.lang.php (modified) (1 diff)
• picture.php (modified) (3 diffs)
• themes/default/template/comment_list.tpl (modified) (4 diffs)

trunk/comments.php

@@ -234 +234 @@
       {
         check_pwg_token();
-        update_user_comment(
+        $comment_action = update_user_comment(
           array(
             'comment_id' => $_GET['edit'],
             'image_id' => $_POST['image_id'],
-            'content' => $_POST['content']
+            'content' => $_POST['content'],
+            'website_url' => @$_POST['website_url'],
             ),
           $_POST['key']
           );
-
-        $perform_redirect = true;
+        
+        switch ($comment_action)
+        {
+          case 'moderate':
+            $_SESSION['page_infos'][] = l10n('An administrator must authorize your comment before it is visible.');
+          case 'validate':
+            $_SESSION['page_infos'][] = l10n('Your comment has been registered');
+            $perform_redirect = true;
+            break;
+          case 'reject':
+            $_SESSION['page_errors'][] = 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);
+        }
       }
-      else
-      {
-        $edit_comment = $_GET['edit'];
-      }
+      
+      $edit_comment = $_GET['edit'];
     }
 

trunk/include/functions_comment.inc.php

@@ -310 +310 @@
 function update_user_comment($comment, $post_key)
 {
-  global $conf;
+  global $conf, $page;
 
   $comment_action = 'validate';
@@ -336 +336 @@
                   );
 
+  // website
+  if (!empty($comment['website_url']))
+  {
+    if (!preg_match('/^https?/i', $comment['website_url']))
+    {
+      $comment['website_url'] = 'http://'.$comment['website_url'];
+    }
+    if (!url_check_format($comment['website_url']))
+    {
+      array_push($page['errors'], l10n('Your website URL is invalid'));
+      $comment_action='reject';
+    }
+  }
+
   if ( $comment_action!='reject' )
   {
@@ -348 +362 @@
 UPDATE '.COMMENTS_TABLE.'
   SET content = \''.$comment['content'].'\',
+      website_url = '.(!empty($comment['website_url']) ? '\''.$comment['website_url'].'\'' : 'NULL').',
       validated = \''.($comment_action=='validate' ? 'true':'false').'\',
       validation_date = '.($comment_action=='validate' ? 'NOW()':'NULL').'

trunk/language/en_UK/common.lang.php

@@ -393 +393 @@
 $lang['Visits, high → low'] = 'Visits, high → low';
 $lang['Visits, low → high'] = 'Visits, low → high';
+$lang['Website'] = 'Website';
 $lang['Webmaster'] = "Webmaster";
 $lang['Week %d'] = "Week %d";
@@ -410 +411 @@
 $lang['Your password has been reset'] = 'Your password has been reset';
 $lang['Your username has been successfully changed to : %s'] = 'Your username has been successfully changed to : %s';
+$lang['Your website URL is invalid'] = 'Your website URL is invalid';
 $lang['mandatory'] = 'mandatory';
 ?>

trunk/language/fr_FR/common.lang.php

@@ -411 +411 @@
 $lang['Email address is mandatory'] = 'Adresse email obligatoire';
 $lang['mandatory'] = 'obligatoire';
+$lang['Website'] = 'Site web';
+$lang['Your website URL is invalid'] = 'L\'adresse de votre site web est invalide';
 ?>

trunk/picture.php

@@ -350 +350 @@
               'comment_id' => $_GET['comment_to_edit'],
               'image_id' => $page['image_id'],
-              'content' => $_POST['content']
+              'content' => $_POST['content'],
+              'website_url' => @$_POST['website_url'],
               ),
             $_POST['key']
@@ -366 +367 @@
             case 'reject':
               $_SESSION['page_errors'][] = l10n('Your comment has NOT been registered because it did not pass the validation rules');
-              $perform_redirect = true;
               break;
             default:
@@ -378 +378 @@
           unset($_POST['content']);
         }
-        else
-        {
-          $edit_comment = $_GET['comment_to_edit'];
-        }
+        
+        $edit_comment = $_GET['comment_to_edit'];
       }
       break;

trunk/themes/default/template/comment_list.tpl

@@ -6 +6 @@
 
 .content .commentElement .description{ldelim}
-        height: {$comment_derivative_params->max_height()+5}px
+        min-height: {$comment_derivative_params->max_height()+5}px
 }
 {/html_style}{/strip}
@@ -29 +29 @@
         </div>
         {/if}
-        <div class="description"{if isset($comment.IN_EDIT)} style="height:200px"{/if}>
+        <div class="description">
                 {if isset($comment.U_DELETE) or isset($comment.U_VALIDATE) or isset($comment.U_EDIT)}
                 <div class="actions" style="float:right;font-size:90%">
@@ -40 +40 @@
                         <a href="{$comment.U_CANCEL}">
                                 {'Cancel'|@translate}
-                        </a>{if isset($comment.U_VALIDATE) or isset($comment.U_EDIT)} | {/if}
+                        </a>{if isset($comment.U_VALIDATE)} | {/if}
                 {/if}
                 {if isset($comment.U_EDIT) and !isset($comment.IN_EDIT)}
@@ -61 +61 @@
                 <a name="edit_comment"></a>
                 <form method="post" action="{$comment.U_EDIT}" id="editComment">
-                        <p><label>{'Edit a comment'|@translate} :</label></p>
+                        <p><label for="contenteditid">{'Edit a comment'|@translate} :</label></p>
                         <p><textarea name="content" id="contenteditid" rows="5" cols="80">{$comment.CONTENT|@escape}</textarea></p>
+                        <p><label for="website_url">{'Website'|@translate} :</label></p>
+                        <p><input type="text" name="website_url" id="website_url" value="{$comment.WEBSITE_URL}" size="40"></p>
                         <p><input type="hidden" name="key" value="{$comment.KEY}">
                                 <input type="hidden" name="pwg_token" value="{$comment.PWG_TOKEN}">