[phpwsbb-commits] phpwsbb/class Thread.php,1.85,1.86

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

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

Modified Files:
	Thread.php 
Log Message:
Tidying error message display


Index: Thread.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** Thread.php	1 Mar 2006 18:18:28 -0000	1.85
--- Thread.php	6 Mar 2006 01:00:28 -0000	1.86
***************
*** 592,596 ****
                  $data['user_id'] = $_SESSION['OBJ_user']->user_id;
                  if ($GLOBALS['core']->sqlInsert($data, 'mod_phpwsbb_monitors', TRUE, FALSE, FALSE, FALSE)) {
!                     $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 {
--- 592,596 ----
                  $data['user_id'] = $_SESSION['OBJ_user']->user_id;
                  if ($GLOBALS['core']->sqlInsert($data, 'mod_phpwsbb_monitors', TRUE, FALSE, FALSE, FALSE)) {
!                     $content = '<p>' . $_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())) . '</p>';
                      $this->monitored = TRUE;
                  } else {
***************
*** 613,617 ****
              $data['user_id'] = $_SESSION['OBJ_user']->user_id;
              if ($GLOBALS['core']->sqlDelete('mod_phpwsbb_monitors', $data)) {
!                 $content = $_SESSION['translate']->it('Monitor successfully removed.');
                  $this->monitored = FALSE;
              } else {
--- 613,617 ----
              $data['user_id'] = $_SESSION['OBJ_user']->user_id;
              if ($GLOBALS['core']->sqlDelete('mod_phpwsbb_monitors', $data)) {
!                 $content = '<p>' . $_SESSION['translate']->it('Monitor successfully removed.') . '</p>';
                  $this->monitored = FALSE;
              } else {
***************
*** 630,635 ****
          $oldfid = $this->_fid;
          $this->_fid = $_REQUEST['Thread_fid'];
!         if ($oldfid == $this->_fid)
!             return '<div class="errortext">' . $_SESSION['translate']->it('You tried to move it to current forum.') . '</div>';
          $this->commit();
  
--- 630,640 ----
          $oldfid = $this->_fid;
          $this->_fid = $_REQUEST['Thread_fid'];
!         if ($oldfid == $this->_fid) {
!             $GLOBALS['CNT_phpwsbb']['content'] = '<div class="errortext">' . $_SESSION['translate']->it('You tried to move it to current forum.') . '</div>';
!             $_REQUEST['PHPWSBB_THREAD_OP'] = 'view';
!             $this->action();
!             return;
!         }
!             //return '<div class="errortext">' . $_SESSION['translate']->it('You tried to move it to current forum.') . '</div>';
          $this->commit();
  
***************
*** 641,645 ****
          $this->forumlabel = $forum->getLabel();
  
!         return $_SESSION['translate']->it('Topic moved to [var1].', $this->getForumLabel(TRUE));
      }// END FUNC _move
  
--- 646,654 ----
          $this->forumlabel = $forum->getLabel();
  
!         $GLOBALS['CNT_phpwsbb']['content'] = $_SESSION['translate']->it('Topic moved to [var1].', $this->getForumLabel(TRUE));
!         $_REQUEST['PHPWSBB_THREAD_OP'] = 'view';
!         $this->action();
! 
!         //return '<p>' . $_SESSION['translate']->it('Topic moved to [var1].', $this->getForumLabel(TRUE)) . '</p>';
      }// END FUNC _move
  
***************
*** 652,655 ****
--- 661,665 ----
                  $content = $_SESSION['PHPWSBB_Manager']->_menu(NULL, $this);
                  $content .= $this->_view();
+                 PHPWS_Layout::addPageTitle($this->getLabel(0));
                  break;
  
***************
*** 687,692 ****
  
              case 'move':
!                 $title = $_SESSION['translate']->it('Topic Moved');
!                 $content = $_SESSION['PHPWSBB_Manager']->_menu(NULL, $this) . $this->_move();
                  break;
  
--- 697,703 ----
  
              case 'move':
!                 //$title = $_SESSION['translate']->it('Topic Moved');
!                 //$content = $_SESSION['PHPWSBB_Manager']->_menu(NULL, $this) . 
!                 $this->_move();
                  break;