Changeset 11325 for extensions/reply_to/reply_to.inc.php

Timestamp:

Jun 11, 2011, 11:06:33 PM (13 years ago)

Author:

mistic100

Message:

correct regex, parse on notification email and admin page

File:

• extensions/reply_to/reply_to.inc.php (modified) (9 diffs)

extensions/reply_to/reply_to.inc.php

@@ -27 +27 @@
   {
     add_event_handler('render_comment_content', 'replyto_parse_picture', 60);
+    add_event_handler('user_comment_insertion', 'replyto_parse_picture_mail');
     if ( !is_a_guest() OR $conf['comments_forall'] )
     {
@@ -40 +41 @@
   {
     add_event_handler('render_comment_content', 'replyto_parse_album', 60);
+    add_event_handler('user_comment_insertion', 'replyto_parse_album_mail');
     if ( !is_a_guest() OR $conf['comments_forall'] )
     {
@@ -80 +82 @@
 {if not isset($comment.IN_EDIT)}
 <div class="actions" style="float:right;">
-  <a title="{\'reply to this comment\'|@translate}" class="replyTo" onclick="replyto(\'{$comment.ID}\', \'{$comment.AUTHOR}\');">&nbsp;</a>
+  <a href="#commentform" title="{\'reply to this comment\'|@translate}" class="replyTo" onclick="replyto(\'{$comment.ID}\', \'{$comment.AUTHOR}\');">&nbsp;</a>
 </div>
 {/if}'
@@ -91 +93 @@
 .$search[2];
 
+  $search[3] = '<legend>{\'Add a comment\'|@translate}</legend>';
+  $replace[3] = $search[3].'
+<a name="commentform"></a>';
+
   return str_replace($search, $replace, $content);
 }
@@ -100 +106 @@
 function replyto_parse_picture($comment)
 {
-  if (preg_match('#\[reply=([1-9]+)\](.*)\[/reply\]#si', $comment, $matches))
+  if (preg_match('#\[reply=([0-9]+)\]([^\[\]]*)\[/reply\]#i', $comment, $matches))
   {
     // picture informations
@@ -141 +147 @@
       ));                 
       
-      $search = "#\[reply=([1-9]+)\](.*)\[/reply\]#si";
-      $replace = '@ <a href="'.$image['url'].'#comment-$1">$2</a> :';
+      $search = "#\[reply=([0-9]+)\]([^\[\]]*)\[/reply\]#i";
+      $replace = '@ <a href="'.get_absolute_root_url().$image['url'].'#comment-$1">$2</a> :';
     }
     else
     {
-      $search = "#\[reply=([1-9]+)\](.*)\[/reply\]#si";
+      $search = "#\[reply=([0-9]+)\]([^\[\]]*)\[/reply\]#i";
       $replace = '';
     }
@@ -160 +166 @@
 function replyto_parse_album($comment)
 {
-  if (preg_match('#\[reply=([1-9]+)\](.*)\[/reply\]#si', $comment, $matches))
+  if (preg_match('#\[reply=([0-9]+)\]([^\[\]]*)\[/reply\]#i', $comment, $matches))
   {  
     // check if the comment is really an album comment 
     // (both comments_on_albums script and default comments script are executed... 
     //  with the same 'render_comment_content' event)
+    ## THIS CAN INDUCE ERRORS, MUST FIND A BETTER WAY
     $query = '
 SELECT id
@@ -199 +206 @@
       ));                 
     
-      $search = "#\[reply=([1-9]+)\](.*)\[/reply\]#si";
-      $replace = '@ <a href="'.$category['url'].'#comment-$1">$2</a> :';
+      $search = "#\[reply=([0-9]+)\]([^\[\]]*)\[/reply\]#i";
+      $replace = '@ <a href="'.get_absolute_root_url().$category['url'].'#comment-$1">$2</a> :';
     }
     else
     {
-      $search = "#\[reply=([1-9]+)\](.*)\[/reply\]#si";
+      $search = "#\[reply=([0-9]+)\]([^\[\]]*)\[/reply\]#i";
       $replace = '';
     }
@@ -216 +223 @@
 }
 
+/**
+ * Replace BBcode tag by a link in notification mails
+ */
+function replyto_parse_picture_mail($comment)
+{
+  $comment['content'] = replyto_parse_picture($comment['content']);
+  var_dump($comment);
+  return $comment;
+}
+
+function replyto_parse_album_mail($comment)
+{
+  $comment['content'] = replyto_parse_album($comment['content']);
+  return $comment;
+}
+
 ?>