Changeset 1622

Timestamp:

12/22/2006 11:15:11 AM (2 years ago)

Author:

jeena

Message:

added hooks for comments

Location:

trunk

Files:

• admin/comments.php (modified) (1 diff)
• log.php (modified) (7 diffs)
• scripts/comments.php (modified) (1 diff)
• scripts/general.func.php (modified) (1 diff)
• scripts/jlogPlugins.class.php (modified) (1 diff)

trunk/admin/comments.php

@@ -101 +101 @@
                 email                   = '".$data['email']."', 
                 homepage                = '".$data['homepage']."', 
-                content             = '".$data['content']."', 
-                mail_by_comment = '".$data['mail_by_comment']."' 
+                content                 = '".$data['content']."', 
+                mail_by_comment         = '".$data['mail_by_comment']."' 
             WHERE id = '".$data['id']."' LIMIT 1;"; 
      

trunk/log.php

@@ -64 +64 @@
 
  $com_form = strip($_POST);
+ if(!isset($com_form['type'])) $com_form['type'] = "";
  $error = com_check_errors($com_form);
 
@@ -110 +111 @@
 
    ### Plugin Hook
-   $com_form = $plugins->callHook('newComment', $com_form);
+   $com_form = $plugins->callHook('newComment', $com_form, $blogentry);
 
    $com = escape_for_mysql($com_form);
@@ -124 +125 @@
                         reference,
                         mail_by_comment,
-                        date
+                        date,
+                                                                                                type
                   )
            VALUES (
@@ -135 +137 @@
             '".$blogentry['id']."',
             '".$com['mail_by_comment']."',
-            NOW()
+            NOW(),
+                                                '".$com['type']."'
            )"; 
 
@@ -170 +173 @@
      else {
 
-      if(JLOG_INFO_BY_COMMENT === true) {
+             $mail['topic'] = $l['admin']['comments_mailsubject']." - ".$blogentry['topic'];
        $mail['headers'] = "From: ";
        if(!empty($com_form['name'])) $mail['headers'] .= str_replace(array("\n", "\r"), "", $com_form['name']);
@@ -176 +179 @@
        if(!empty($com_form['email'])) $mail['headers'] .= " <".str_replace(array("\n", "\r"), "", $com_form['email']).">";
        $mail['headers'] .= "\r\nX-Mailer: PHP/".phpversion();
-
 
        $mail['text'] = $l['admin']['comments_mail_txt']." »".$blogentry['topic']."«\n- -\n";
@@ -187 +189 @@
        $mail['text'] .= "\n\n".$l['admin']['kill_c_email']."\n".JLOG_PATH."/admin/comments.php?action=trash&id=".$cid;
 
-       @mail(JLOG_EMAIL, $l['admin']['comments_mailsubject']." - ".$blogentry['topic'], $mail['text'], $mail['headers']);
+                   ### Plugin Hook
+                   $mail = $plugins->callHook('adminMail', $mail, $blogentry);
+                         
+       if(empty($mail['nomail']) and JLOG_INFO_BY_COMMENT) @mail(JLOG_EMAIL, $mail['topic'], $mail['text'], $mail['headers']);
       }
 
+                        $mail['topic'] = $l['comments_mailsubject']." - ".$blogentry['topic'];
       $mail['headers'] = "From: ".JLOG_WEBSITE." <".JLOG_EMAIL.">\r\n"
                         ."X-Mailer: PHP/".phpversion();
 
-      $mail['text'] = $l['comments_mail_txt']." »".$blogentry['topic']."«\n- -\n";
-      if(!empty($com_form['name'])) $mail['text'] .= $com_form['name'];
-      else $mail['text'] .= $l['comments_anonym'];
-      if(!empty($com_form['city'])) $mail['text'] .= " ".$l['comments_from']." ".$com_form['city'];
-      $mail['text'] .= " ".$l['comments_posted']." ".$date.":\n\n";
-      $mail['text'] .= html_entity_decode(strip_tags($bbcomments->parse($com_form['content'])));
-      $mail['text'] .= "\n\n".str_replace ( '&amp;', '&', blog($blogentry['date'], $blogentry['url']))."#c".$cid."";
-      $mail['text'] .= "\n-- \n".$l['comments_stop_receiving']."\n";
-      $mail['text'] .= JLOG_PATH."/stop.php?id=".$blogentry['id']."&email=";
+      $mail['all_text'] = $l['comments_mail_txt']." »".$blogentry['topic']."«\n- -\n";
+      if(!empty($com_form['name'])) $mail['all_text'] .= $com_form['name'];
+      else $mail['all_text'] .= $l['comments_anonym'];
+      if(!empty($com_form['city'])) $mail['all_text'] .= " ".$l['comments_from']." ".$com_form['city'];
+      $mail['all_text'] .= " ".$l['comments_posted']." ".$date.":\n\n";
+      $mail['all_text'] .= html_entity_decode(strip_tags($bbcomments->parse($com_form['content'])));
+      $mail['all_text'] .= "\n\n".str_replace ( '&amp;', '&', blog($blogentry['date'], $blogentry['url']))."#c".$cid."";
+      $mail['all_text'] .= "\n-- \n".$l['comments_stop_receiving']."\n";
+      $mail['all_text'] .= JLOG_PATH."/stop.php?id=".$blogentry['id']."&email=";
 
       while ($data = $comment_mail->fetch()) {
-       if($data['email'] != $com['email']) {
-           @mail($data['email'], $l['comments_mailsubject']." - ".$blogentry['topic'], $mail['text'].$data['email'], $mail['headers']);
-       }
-      }
-     }
-    $c['form_content'] .= "<p id='entryform'>".$l['comments_thx']."</p>".com_javascript_variables();
-   }
+       if($data['email'] != $com_form['email']) {
+
+                                 $mail['mail_to'] = $data['email'];
+                                         $mail['text'] = $mail['all_text'].$data['email'];
+                                 
+                                         ### Plugin Hook
+                                 $mail = $plugins->callHook('commentorMail', $mail, $blogentry);
+
+           if(empty($mail['nomail'])) @mail($mail['mail_to'], $mail['topic'], $mail['text'], $mail['headers']);
+                                }
+        }
+         }
+   $c['form_content'] .= "<p id='entryform'>".$l['comments_thx']."</p>".com_javascript_variables();
   }
  }

trunk/scripts/comments.php

@@ -129 +129 @@
 
    ### Plugin Hook
-   $comment = $plugins->callHook('showComment', $comment, $data, $nr);
+         $comment = $plugins->callHook('showComment', $comment, $data, $nr);
 
  return $comment;

trunk/scripts/general.func.php

@@ -207 +207 @@
          $com = array();
          while($c = $comments->fetch()) $com[$c['reference']] = $c['count'];
+                                 
+                                 ### Plugin Hook
+                                 global $plugins;
+                           $com = $plugins->callHook('countComments', $com);
+                        
          return $com;
 }

trunk/scripts/jlogPlugins.class.php

@@ -22 +22 @@
     function hook_permalink       ($t) { return $t; } // string permalink + string date + string url + string section
     function hook_xmlrpcPermalink ($t) { return $t; } // string url
+                function hook_countComments   ($t) { return $t; } // array with id and count
+                function hook_adminMail       ($t) { return $t; } // array with mail + array blogentry
+                function hook_commentorMail   ($t) { return $t; } // array with mail + array blogentry
 
-  /* Parameters functions */
-/*
-    function saveConfigData($name, $t) {
-    echo  get_class($this);
-        return false;
-    }
-
-    function loadConfigData($name, $t) {
-        return false;
-    }
-*/
 }