[phpwsbb-commits] phpwsbb/class Message.php,1.79,1.80 Thread.php,1.73,1.74

[Wendall C. <wen...@us...>]

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

Modified Files:
	Message.php Thread.php 
Log Message:
added language filters on quote

Index: Thread.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** Thread.php	4 Mar 2005 18:19:43 -0000	1.73
--- Thread.php	21 Mar 2005 21:29:27 -0000	1.74
***************
*** 537,541 ****
                  $data['user_id'] = $_SESSION['OBJ_user']->user_id;
                  if ($GLOBALS['core']->sqlInsert($data, 'mod_phpwsbb_monitors', TRUE, FALSE, FALSE, FALSE)) {
!                     $GLOBALS['CNT_phpwsbb']['content'] .= $_SESSION['translate']->it('You are now monitoring the topic "[var1]" and will be emailed when there is a new reply.', $this->getLabel());
                      $this->monitored = TRUE;
                  } else {
--- 537,541 ----
                  $data['user_id'] = $_SESSION['OBJ_user']->user_id;
                  if ($GLOBALS['core']->sqlInsert($data, 'mod_phpwsbb_monitors', TRUE, FALSE, FALSE, FALSE)) {
!                     $GLOBALS['CNT_phpwsbb']['content'] .= $_SESSION['translate']->it('You are now monitoring the topic "[var1]" and will be emailed when there is a new reply.', PHPWS_Text::parseOutput($this->getLabel()));
                      $this->monitored = TRUE;
                  } else {

Index: Message.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Message.php,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** Message.php	21 Mar 2005 20:37:19 -0000	1.79
--- Message.php	21 Mar 2005 21:29:26 -0000	1.80
***************
*** 265,269 ****
                  if (is_null($this->getLabel())) {
                      $label = 'Re: ' . $thread->getLabel(FALSE);
!                     $this->setLabel($label);
                  }
              }
--- 265,269 ----
                  if (is_null($this->getLabel())) {
                      $label = 'Re: ' . $thread->getLabel(FALSE);
!                     $this->setLabel(PHPWS_Text::parseOutput($label));
                  }
              }
***************
*** 305,309 ****
              if (is_null($poster))   
                  $poster = $result['guestname'] . ' (' . $_SESSION['translate']->it('GUEST') . ')';
!             $this->_body = '[quote="'.$poster.'"]'.trim($result['body'])."\n[/quote]\n\n";
          }
          $form->add('Message_body', 'textarea', $this->_body);
--- 305,309 ----
              if (is_null($poster))   
                  $poster = $result['guestname'] . ' (' . $_SESSION['translate']->it('GUEST') . ')';
!             $this->_body = '[quote="'.$poster.'"]'.PHPWS_Text::parseOutput(trim($result['body']))."\n[/quote]\n\n";
          }
          $form->add('Message_body', 'textarea', $this->_body);
***************
*** 468,472 ****
  
                  $from = '"' . $_SESSION['translate']->it('Bulletin Board Admin') . '" <'.$admin_email.'>';
!                 $subject = $_SESSION['translate']->it('Bulletin Board Post: "[var1]"', $this->getLabel());
                  $message = $_SESSION['PHPWSBB_Manager']->_email_text;
                  // Replace [name] and [url] in $message
--- 468,472 ----
  
                  $from = '"' . $_SESSION['translate']->it('Bulletin Board Admin') . '" <'.$admin_email.'>';
!                 $subject = $_SESSION['translate']->it('Bulletin Board Post: "[var1]"', PHPWS_Text::parseOutput($this->getLabel()));
                  $message = $_SESSION['PHPWSBB_Manager']->_email_text;
                  // Replace [name] and [url] in $message