[phpwsbb-commits] phpwsbb/class Manager.php,1.44,1.45

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

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

Modified Files:
	Manager.php 
Log Message:
Changed "last_viewed" variable to an array to better work with the modulelink function

Index: Manager.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** Manager.php	15 Sep 2004 18:52:58 -0000	1.44
--- Manager.php	15 Sep 2004 20:24:42 -0000	1.45
***************
*** 187,191 ****
      * Stores the last page viewed for possible recall
      *
!     * @var      string
      * @access   public
      */
--- 187,191 ----
      * Stores the last page viewed for possible recall
      *
!     * @var      array
      * @access   public
      */
***************
*** 253,256 ****
--- 253,258 ----
          // Load user ranking system 
          $this->_load_user_ranks();
+         // Default page
+         $this->last_viewed = array('PHPWSBB_MAN_OP'=>'list');
      }// END FUNC PHPWSBB_Manager
  
***************
*** 347,352 ****
          }
  
!         if(isset($_REQUEST['PHPWS_MAN_ITEMS'][0]))
              $this->forum = new PHPWSBB_Forum($_REQUEST['PHPWS_MAN_ITEMS'][0]);
  
          $_REQUEST['PHPWSBB_FORUM_OP'] = 'view';
--- 349,357 ----
          }
  
!         if(isset($_REQUEST['PHPWS_MAN_ITEMS'][0])) {
              $this->forum = new PHPWSBB_Forum($_REQUEST['PHPWS_MAN_ITEMS'][0]);
+             // Save this URL in case the page needs to be restored
+             $this->last_viewed = array('PHPWSBB_MAN_OP'=>'viewforum', 'PHPWS_MAN_ITEMS'=>$_REQUEST['PHPWS_MAN_ITEMS'][0]);
+         }
  
          $_REQUEST['PHPWSBB_FORUM_OP'] = 'view';
***************
*** 671,675 ****
          $tags['REMOVEALLMONITORS_HELP'] = CLS_help::show_link('phpwsbb', 'remove_all_monitors');
  
!         $tags['EXIT_LINK'] = '<a href="'.$this->last_viewed.'">'.$_SESSION['translate']->it('Back to Forum').'</a>';
          $tags['SIGNATURE_LABEL'] = $_SESSION['translate']->it('Your Signature');
          $tags['SIGNATURE_HELP'] = $_SESSION['translate']->it('This is a block of text that is automatically added to posts you make. There is a 255 character limit');
--- 676,680 ----
          $tags['REMOVEALLMONITORS_HELP'] = CLS_help::show_link('phpwsbb', 'remove_all_monitors');
  
!         $tags['EXIT_LINK'] = PHPWS_Text::moduleLink($_SESSION['translate']->it('Back to Forums'), 'phpwsbb', $this->last_viewed);
          $tags['SIGNATURE_LABEL'] = $_SESSION['translate']->it('Your Signature');
          $tags['SIGNATURE_HELP'] = $_SESSION['translate']->it('This is a block of text that is automatically added to posts you make. There is a 255 character limit');
***************
*** 758,762 ****
              $title = $_SESSION['translate']->it('Settings Saved');
              $content = $this->_menu() . $_SESSION['translate']->it("Your settings have been successfully saved.");
!             $content .= '  <a href="'.$this->last_viewed.'">' . $_SESSION['translate']->it('Back to Forums') . '</a>';
          } else {
              $title = $_SESSION['translate']->it('Error Saving Settings');
--- 763,767 ----
              $title = $_SESSION['translate']->it('Settings Saved');
              $content = $this->_menu() . $_SESSION['translate']->it("Your settings have been successfully saved.");
!             $content .= PHPWS_Text::moduleLink($_SESSION['translate']->it('Back to Forums'), 'phpwsbb', $this->last_viewed);
          } else {
              $title = $_SESSION['translate']->it('Error Saving Settings');
***************
*** 1051,1055 ****
              $title = $_SESSION['translate']->it('Settings Saved');
              $content = $this->_menu() . $_SESSION['translate']->it('Your settings have been successfully saved.');
!             $content .= PHPWS_Text::moduleLink($_SESSION['translate']->it('Back to Forums'), 'phpwsbb', array('PHPWSBB_MAN_OP'=>'list'));
          } else {
              $title = $_SESSION['translate']->it('Error Saving Settings');
--- 1056,1060 ----
              $title = $_SESSION['translate']->it('Settings Saved');
              $content = $this->_menu() . $_SESSION['translate']->it('Your settings have been successfully saved.');
!             $content .= PHPWS_Text::moduleLink($_SESSION['translate']->it('Back to Forums'), 'phpwsbb', $this->last_viewed);
          } else {
              $title = $_SESSION['translate']->it('Error Saving Settings');
***************
*** 1132,1137 ****
              case 'viewforum':
                  $this->_viewForum();
-                 // Save this URL in case the page needs to be restored
-                 $this->last_viewed = PHPWS_WizardBag::whereami(TRUE);;
                  break;
  
--- 1137,1140 ----
***************
*** 1270,1274 ****
              case 'view':  // already handled in [/core/Manager.php]->manageraction() 
                  /* Save this URL in case the page needs to be restored */
!                 $this->last_viewed = PHPWS_WizardBag::whereami(TRUE);
                  break;
  
--- 1273,1277 ----
              case 'view':  // already handled in [/core/Manager.php]->manageraction() 
                  /* Save this URL in case the page needs to be restored */
!                 $this->last_viewed = array('PHPWSBB_MAN_OP'=>'view', 'PHPWS_MAN_ITEMS'=>$_REQUEST['PHPWS_MAN_ITEMS'][0]);
                  break;