[phpwsbb-commits] phpwsbb/class Message.php,1.62,1.63 Thread.php,1.55,1.56

[Eloi G. <ada...@us...>]

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

Modified Files:
	Message.php Thread.php 
Log Message:
Cleaned up some string fragments

Index: Thread.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** Thread.php	13 Sep 2004 21:41:55 -0000	1.55
--- Thread.php	14 Sep 2004 04:13:46 -0000	1.56
***************
*** 325,329 ****
                  $admin_email = $user_contact;
              }
!             $from = '"' . $_SESSION['translate']->it('Bulletin Board Admin') . '" <${admin_email}>';
              $subject = $_SESSION['translate']->it('Reply to "[var1]"', $this->getLabel());
              $message = $_SESSION['PHPWSBB_Manager']->_email_text;
--- 325,329 ----
                  $admin_email = $user_contact;
              }
!             $from = '"' . $_SESSION['translate']->it('Bulletin Board Admin') . '" <'.$admin_email.'>';
              $subject = $_SESSION['translate']->it('Reply to "[var1]"', $this->getLabel());
              $message = $_SESSION['PHPWSBB_Manager']->_email_text;

Index: Message.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Message.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** Message.php	13 Sep 2004 21:41:55 -0000	1.62
--- Message.php	14 Sep 2004 04:13:46 -0000	1.63
***************
*** 454,458 ****
                  }
  
!                 $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;
--- 454,458 ----
                  }
  
!                 $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;
***************
*** 591,595 ****
                  $admin_email = $user_contact;
              }
!             $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);
--- 591,595 ----
                  $admin_email = $user_contact;
              }
!             $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);