[phpwsbb-commits] phpwsbb/class Message.php,1.81,1.82 Thread.php,1.76,1.77

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

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

Modified Files:
	Message.php Thread.php 
Log Message:
BUG1209372 - Missed a few &s (rck000)
Also changed message reported to admin to make more sense


Index: Thread.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** Thread.php	22 Mar 2005 18:24:48 -0000	1.76
--- Thread.php	27 May 2005 00:13:45 -0000	1.77
***************
*** 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.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** Message.php	22 Mar 2005 18:24:46 -0000	1.81
--- Message.php	27 May 2005 00:13:41 -0000	1.82
***************
*** 473,477 ****
                  $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');
--- 473,477 ----
                  $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');
***************
*** 615,620 ****
              $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 post 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";
--- 615,620 ----
              $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";