Changeset 18950 for trunk

Timestamp:

Nov 6, 2012, 9:46:56 PM (11 years ago)

Author:

rvelices

Message:

• fill add comment form fields only if the input comment has been rejected
• simplify templates

Location:

trunk

Files:

• include/picture_comment.inc.php (modified) (5 diffs)
• themes/default/template/index.tpl (modified) (2 diffs)
• themes/default/template/picture.tpl (modified) (1 diff)

trunk/include/picture_comment.inc.php

@@ -139 +139 @@
       'COMMENTS_ORDER_TITLE' => $comments_order == 'ASC' ? l10n('Show latest comments first') : l10n('Show oldest comments first'),
       ));
-        
+
     $query = '
 SELECT
@@ -168 +168 @@
         $row['author'] = l10n('guest');
       }
-      
+
       $email = null;
       if (!empty($row['user_email']))
@@ -174 +174 @@
         $email = $row['user_email'];
       }
-      else if (!empty($row['email']))
+      elseif (!empty($row['email']))
       {
         $email = $row['email'];
@@ -221 +221 @@
       {
         $tpl_comment['EMAIL'] = $email;
-        
+
         if ($row['validated'] != 'true')
         {
@@ -251 +251 @@
   {
     $key = get_ephemeral_key(3, $page['image_id']);
-    
-    $template->assign('comment_add',
-        array(
-          'F_ACTION' =>         $url_self,
-          'KEY' =>              $key,
-          'CONTENT' =>          stripslashes(@$_POST['content']),
-          'SHOW_AUTHOR' =>      !is_classic_user(),
-          'AUTHOR_MANDATORY' => $conf['comments_author_mandatory'],
-          'AUTHOR' =>           stripslashes(@$_POST['author']),
-          'WEBSITE_URL' =>      stripslashes(@$_POST['website_url']),
-          'SHOW_EMAIL' =>       !is_classic_user() or empty($user['email']),
-          'EMAIL_MANDATORY' =>  $conf['comments_email_mandatory'],
-          'EMAIL' =>            stripslashes(@$_POST['email']), 
-        ));
+
+    $tpl_var =  array(
+        'F_ACTION' =>         $url_self,
+        'KEY' =>              $key,
+        'CONTENT' =>          '',
+        'SHOW_AUTHOR' =>      !is_classic_user(),
+        'AUTHOR_MANDATORY' => $conf['comments_author_mandatory'],
+        'AUTHOR' =>           '',
+        'WEBSITE_URL' =>      '',
+        'SHOW_EMAIL' =>       !is_classic_user() or empty($user['email']),
+        'EMAIL_MANDATORY' =>  $conf['comments_email_mandatory'],
+        'EMAIL' =>            '',
+      );
+
+    if ('reject'==@$comment_action)
+    {
+      foreach( array('content', 'author', 'website_url', 'email') as $k)
+      {
+        $tpl_var[strtoupper($k)] = htmlspecialchars( stripslashes(@$_POST[$k]) );
+      }
+    }
+    $template->assign('comment_add', $tpl_var);
   }
 }

trunk/themes/default/template/index.tpl

@@ -168 +168 @@
 {if !empty($CATEGORIES)}{$CATEGORIES}{/if}
 {if !empty($cats_navbar)}
-  {assign var=navbar value=$cats_navbar}
-  {include file='navigation_bar.tpl'|@get_extent:'navbar'}
+        {include file='navigation_bar.tpl'|@get_extent:'navbar' navbar=$cats_navbar}
 {/if}
 
@@ -178 +177 @@
 {/if}
 {if !empty($thumb_navbar)}
-  {assign var=navbar value=$thumb_navbar}
-  {include file='navigation_bar.tpl'|@get_extent:'navbar'}
+        {include file='navigation_bar.tpl'|@get_extent:'navbar' navbar=$thumb_navbar}
 {/if}
 

trunk/themes/default/template/picture.tpl

@@ -3 +3 @@
 *}
 {if isset($MENUBAR)}{$MENUBAR}{/if}
-<div id="content" {if isset($MENUBAR)}class="contentWithMenu"{/if}>
+<div id="content"{if isset($MENUBAR)} class="contentWithMenu"{/if}>
 {if isset($errors) or not empty($infos)}
 {include file='infos_errors.tpl'}