Changeset 10984 for extensions/Comments_on_Albums/include/functions_comment.inc.php

Timestamp:

May 22, 2011, 12:34:18 PM (13 years ago)

Author:

mistic100

Message:

code cleanup

File:

• extensions/Comments_on_Albums/include/functions_comment.inc.php (modified) (5 diffs)

extensions/Comments_on_Albums/include/functions_comment.inc.php

@@ -4 +4 @@
 //returns string action to perform on a new comment: validate, moderate, reject
 if (!function_exists('user_comment_check')) {
-        function user_comment_check($action, $comment)
-        {
-          global $conf,$user;
-
-          if ($action=='reject')
-                return $action;
-
-          $my_action = $conf['comment_spam_reject'] ? 'reject':'moderate';
-
-          if ($action==$my_action)
-                return $action;
-
-          // we do here only BASIC spam check (plugins can do more)
-          if ( !is_a_guest() )
-                return $action;
-
-          $link_count = preg_match_all( '/https?:\/\//',
-                $comment['content'], $matches);
-
-          if ( strpos($comment['author'], 'http://')!==false )
-          {
-                $link_count++;
-          }
-
-          if ( $link_count>$conf['comment_spam_max_links'] )
-                return $my_action;
-
-          return $action;
-        }
+  function user_comment_check($action, $comment)
+  {
+    global $conf,$user;
+
+    if ($action=='reject')
+    return $action;
+
+    $my_action = $conf['comment_spam_reject'] ? 'reject':'moderate';
+
+    if ($action==$my_action)
+    return $action;
+
+    // we do here only BASIC spam check (plugins can do more)
+    if ( !is_a_guest() )
+    return $action;
+
+    $link_count = preg_match_all( '/https?:\/\//',
+    $comment['content'], $matches);
+
+    if ( strpos($comment['author'], 'http://')!==false )
+    {
+    $link_count++;
+    }
+
+    if ( $link_count>$conf['comment_spam_max_links'] )
+    return $my_action;
+
+    return $action;
+  }
 }
 
@@ -231 +231 @@
   $comment_action =
     trigger_event('user_comment_check',
-                  $comment_action,
-                  array_merge($comment,
-                              array('author' => $GLOBALS['user']['username'])
-                              )
-                  );
+      $comment_action,
+      array_merge($comment,
+            array('author' => $GLOBALS['user']['username'])
+            )
+      );
 
   if ( $comment_action!='reject' )
@@ -243 +243 @@
     {
       $user_where_clause = '   AND author_id = \''.
-        $GLOBALS['user']['id'].'\'';
+  $GLOBALS['user']['id'].'\'';
     }
     
@@ -293 +293 @@
     {
       email_admin('edit', array('author' => $GLOBALS['user']['username'],
-                                'content' => stripslashes($comment['content'])) );
+        'content' => stripslashes($comment['content'])) );
     }
   }
@@ -301 +301 @@
 
 if (!function_exists('email_admin')) {
-        function email_admin($action, $comment)
-        {
-          global $conf;
-
-          if (!in_array($action, array('edit', 'delete'))
-                  or (($action=='edit') and !$conf['email_admin_on_comment_edition'])
-                  or (($action=='delete') and !$conf['email_admin_on_comment_deletion']))
-          {
-                return;
-          }
-
-          include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
-
-          $keyargs_content = array();
-          $keyargs_content[] = get_l10n_args('Author: %s', $comment['author']);
-          if ($action=='delete')
-          {
-                $keyargs_content[] = get_l10n_args('This author removed the comment with id %d',
-                                                   $comment['comment_id']
-                                                   );
-          }
-          else
-          {
-                $keyargs_content[] = get_l10n_args('This author modified following comment:', '');
-                $keyargs_content[] = get_l10n_args('Comment: %s', $comment['content']);
-          }
-
-          pwg_mail_notification_admins(get_l10n_args('Comment by %s',
-                                                         $comment['author']),
-                                           $keyargs_content
-                                           );
-        }
+  function email_admin($action, $comment)
+  {
+    global $conf;
+
+    if (!in_array($action, array('edit', 'delete'))
+      or (($action=='edit') and !$conf['email_admin_on_comment_edition'])
+      or (($action=='delete') and !$conf['email_admin_on_comment_deletion']))
+    {
+    return;
+    }
+
+    include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
+
+    $keyargs_content = array();
+    $keyargs_content[] = get_l10n_args('Author: %s', $comment['author']);
+    if ($action=='delete')
+    {
+    $keyargs_content[] = get_l10n_args('This author removed the comment with id %d',
+               $comment['comment_id']
+               );
+    }
+    else
+    {
+    $keyargs_content[] = get_l10n_args('This author modified following comment:', '');
+    $keyargs_content[] = get_l10n_args('Comment: %s', $comment['content']);
+    }
+
+    pwg_mail_notification_admins(get_l10n_args('Comment by %s',
+               $comment['author']),
+             $keyargs_content
+             );
+  }
 }