Changeset 18927 for extensions/Comments_on_Albums/include/coa_albums.php

Timestamp:

Nov 4, 2012, 3:59:38 PM (11 years ago)

Author:

mistic100

Message:

update with Piwigo 2.5 features (website url, email, mandatory email and username)

File:

• extensions/Comments_on_Albums/include/coa_albums.php (modified) (7 diffs)

extensions/Comments_on_Albums/include/coa_albums.php

@@ -2 +2 @@
 /* Code adapted from include/picture_comment.inc.php and picture.php */
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+
+global $conf, $user;
 
 // +-----------------------------------------------------------------------+
@@ -122 +124 @@
     die('Session expired');
   }
-
+  
   $comm = array(
     'author' => trim( @$_POST['author'] ),
     'content' => trim( $_POST['content'] ),
+    'website_url' => trim( $_POST['website_url'] ),
+    'email' => trim( @$_POST['email'] ),
     'category_id' => $category['id'],
-  );
+   );
 
   include_once(COA_PATH.'include/functions_comment.inc.php'); // custom fonctions
   
-  $comment_action = insert_user_comment_albums($comm, @$_POST['key'], $page['infos']);
+  $comment_action = insert_user_comment_albums($comm, @$_POST['key'], $page['errors']);
 
   switch ($comment_action) 
@@ -231 +235 @@
     com.author,
     com.author_id,
-    '.$conf['user_fields']['username'].' AS username,
+    u.'.$conf['user_fields']['username'].' AS username,
+    u.'.$conf['user_fields']['email'].' AS user_email,
+    com.email,
     com.date,
+    com.website_url,
     com.category_id,
     com.content,
@@ -248 +255 @@
     while ($row = pwg_db_fetch_assoc($result)) 
     {
-      // author
-      if (!empty($row['author'])) 
-      {
-        $author = $row['author'];
-        if ($author == 'guest') 
-        {
-          $author = l10n('guest');
-        }
-      } 
-      else 
-      {
-        $author = stripslashes($row['username']);
+      if ($row['author'] == 'guest')
+      {
+        $row['author'] = l10n('guest');
+      }
+      
+      $email = null;
+      if (!empty($row['user_email']))
+      {
+        $email = $row['user_email'];
+      }
+      else if (!empty($row['email']))
+      {
+        $email = $row['email'];
       }
       
@@ -265 +273 @@
       $tpl_comment = array(
         'ID' => $row['id'],
-        'AUTHOR' => trigger_event('render_comment_author', $author),
+        'AUTHOR' => trigger_event('render_comment_author', $row['author']),
         'DATE' => format_date($row['date'], true),
+        'WEBSITE_URL' => $row['website_url'],
         'CONTENT' => trigger_event('render_comment_content', $row['content'], 'album'),
         );
@@ -300 +309 @@
         }
       }
-      if (is_admin() AND $row['validated'] != 'true') 
-      {
-        $tpl_comment['U_VALIDATE'] = add_url_params(
-          $url_self, 
-          array(
-            'action' => 'validate_comment',
-            'comment_to_validate' => $row['id'],
-            'pwg_token' => get_pwg_token(),
-            )
-          );
+      if (is_admin())
+      {
+        $tpl_comment['EMAIL'] = $email;
+        
+        if ($row['validated'] != 'true') 
+        {
+          $tpl_comment['U_VALIDATE'] = add_url_params(
+            $url_self, 
+            array(
+              'action' => 'validate_comment',
+              'comment_to_validate' => $row['id'],
+              'pwg_token' => get_pwg_token(),
+              )
+            );
+        }
       }
       
@@ -330 +344 @@
   {
     $key = get_ephemeral_key(3, $category['id']);
-    $content = null;
-    if ('reject'===@$comment_action) 
-    {
-      $content = htmlspecialchars(stripslashes($comm['content']));
-    }
+    
     $template->assign('comment_add', 
       array(
-        'F_ACTION' => $url_self,
-        'KEY' => $key,
-        'CONTENT' => $content,
-        'SHOW_AUTHOR' => !is_classic_user(),
+        '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']), 
         )
       );