[phpwsbb-commits] phpwsbb/class Message.php,1.83,1.84 Thread.php,1.78,1.79

[Shaun M. <sin...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5025

Modified Files:
	Message.php Thread.php 
Log Message:
Reverting out BUG  #1209372 - Missed a few &s


Index: Thread.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** Thread.php	20 Jul 2005 17:30:27 -0000	1.78
--- Thread.php	28 Jul 2005 19:09:51 -0000	1.79
***************
*** 376,380 ****
              $message = str_replace('[name]', '"' . strip_tags($this->getLabel()) . '"', $message);
              // Got rid of the brackets so that the link isn't broken in email messages
!             $message = str_replace('[url]', 'http://' . PHPWS_HOME_HTTP . 'index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS=' . $this->getId(), $message);
      
              foreach ($emails as $email) {
--- 376,380 ----
              $message = str_replace('[name]', '"' . strip_tags($this->getLabel()) . '"', $message);
              // Got rid of the brackets so that the link isn't broken in email messages
!             $message = str_replace('[url]', 'http://' . PHPWS_HOME_HTTP . 'index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS=' . $this->getId(), $message);
      
              foreach ($emails as $email) {

Index: Message.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Message.php,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** Message.php	20 Jul 2005 17:30:26 -0000	1.83
--- Message.php	28 Jul 2005 19:09:50 -0000	1.84
***************
*** 480,484 ****
                  $message = str_replace('[name]', '"' . $this->getLabel() . '"', $message);
                  // Got rid of the brackets so that the link isn't broken in email messages
!                 $message = str_replace('[url]', 'http://' . PHPWS_HOME_HTTP . 'index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS=' . $thread->getId(), $message);
          
                  $mail_object =& Mail::factory('mail');
--- 480,484 ----
                  $message = str_replace('[name]', '"' . $this->getLabel() . '"', $message);
                  // Got rid of the brackets so that the link isn't broken in email messages
!                 $message = str_replace('[url]', 'http://' . PHPWS_HOME_HTTP . 'index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS=' . $thread->getId(), $message);
          
                  $mail_object =& Mail::factory('mail');
***************
*** 622,627 ****
              $from = '"' . $_SESSION['translate']->it('Bulletin Board Admin') . '" <'.$admin_email.'>';
              $subject = $_SESSION['translate']->it('Reported BB Post: "[var1]"', $this->getLabel());
!             $message = str_replace('[url]', 'http://' . PHPWS_HOME_HTTP . 'index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=view&amp;PHPWS_MAN_ITEMS=' . $this->getId(), $message);
!             $message = $_SESSION['translate']->it('A bulletin board user reported a bulletin board post for review.  Please visit [var1] to view the post and take action.','http://' . PHPWS_HOME_HTTP . 'index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=view&amp;PHPWS_MAN_ITEMS[]=' . $this->_tid . '#' . $_REQUEST['Message_id']);
              $message .= "\n\nReason:\n\n" . $_REQUEST['Message_reason'];
              $message .= "\n\nOriginal Message:\n\n";
--- 622,627 ----
              $from = '"' . $_SESSION['translate']->it('Bulletin Board Admin') . '" <'.$admin_email.'>';
              $subject = $_SESSION['translate']->it('Reported BB Post: "[var1]"', $this->getLabel());
!             $message = str_replace('[url]', 'http://' . PHPWS_HOME_HTTP . 'index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS=' . $this->getId(), $message);
!             $message = $_SESSION['translate']->it('A bulletin board user reported a bulletin board post for review.  Please visit [var1] to view the post and take action.','http://' . PHPWS_HOME_HTTP . 'index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS[]=' . $this->_tid . '#' . $_REQUEST['Message_id']);
              $message .= "\n\nReason:\n\n" . $_REQUEST['Message_reason'];
              $message .= "\n\nOriginal Message:\n\n";