Changeset 18927 for extensions/Comments_on_Albums/include/functions_comment.inc.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/functions_comment.inc.php (modified) (4 diffs)

extensions/Comments_on_Albums/include/functions_comment.inc.php

@@ -39 +39 @@
     if ( empty($comm['author']) )
     {
+      if ($conf['comments_author_mandatory'])
+      {
+        array_push($infos, l10n('Username is mandatory') );
+        $comment_action='reject';
+      }
       $comm['author'] = 'guest';
     }
@@ -75 +80 @@
   }
   
+  // website
+  if (!empty($comm['website_url']))
+  {
+    if (!preg_match('/^https?/i', $comm['website_url']))
+    {
+      $comm['website_url'] = 'http://'.$comm['website_url'];
+    }
+    if (!url_check_format($comm['website_url']))
+    {
+      array_push($infos, l10n('Your website URL is invalid'));
+      $comment_action='reject';
+    }
+  }
+  
+  // email
+  if (empty($comm['email']))
+  {
+    if (!empty($user['email']))
+    {
+      $comm['email'] = $user['email'];
+    }
+    else if ($conf['comments_email_mandatory'])
+    {
+      array_push($infos, l10n('Email address is missing. Please specify an email address.') );
+      $comment_action='reject';
+    }
+  }
+  else if (!email_check_format($comm['email']))
+  {
+    array_push($infos, l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)'));
+    $comment_action='reject';
+  }
+  
   // anonymous id = ip address
   $ip_components = explode('.', $comm['ip']);
@@ -116 +154 @@
     $query = '
 INSERT INTO '.COA_TABLE.'
-  (author, author_id, content, date, validated, validation_date, category_id)
+  (author, author_id, anonymous_id, content, date, validated, validation_date, category_id, website_url, email)
   VALUES (
     \''.$comm['author'].'\',
     '.$comm['author_id'].',
+    \''.$comm['anonymous_id'].'\',
     \''.$comm['content'].'\',
     NOW(),
     \''.($comment_action=='validate' ? 'true':'false').'\',
     '.($comment_action=='validate' ? 'NOW()':'NULL').',
-    '.$comm['category_id'].'
+    '.$comm['category_id'].',
+    '.(!empty($comm['website_url']) ? '\''.$comm['website_url'].'\'' : 'NULL').',
+    '.(!empty($comm['email']) ? '\''.$comm['email'].'\'' : 'NULL').'
   )
 ';
@@ -142 +183 @@
       (
         get_l10n_args('Author: %s', stripslashes($comm['author']) ),
+        get_l10n_args('Email: %s', stripslashes($comm['email']) ),
         get_l10n_args('Comment: %s', stripslashes($comm['content']) ),
         get_l10n_args('', ''),