[phpwsbb-commits] phpwsbb/class Forum.php,1.43,1.44

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

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

Modified Files:
	Forum.php 
Log Message:
Remove some local menu functions to menu()
Use show_categories to switch on/off fatcat features


Index: Forum.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Forum.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** Forum.php	25 Feb 2006 21:29:39 -0000	1.43
--- Forum.php	1 Mar 2006 14:52:10 -0000	1.44
***************
*** 170,174 ****
  
          $tags = array();
!         if($_SESSION['OBJ_fatcat']) {
              $cat = $_SESSION['OBJ_fatcat']->fatcatLinks($this->getId());
              if(isset($cat) && !empty($cat)) {
--- 170,174 ----
  
          $tags = array();
!         if($_SESSION['OBJ_fatcat'] && $_SESSION['PHPWSBB_Manager']->_show_categories) {
              $cat = $_SESSION['OBJ_fatcat']->fatcatLinks($this->getId());
              if(isset($cat) && !empty($cat)) {
***************
*** 191,201 ****
          $tags['THREADS']    = $this->_threads;
          $tags['DESCRIPTION']= PHPWS_Text::parseOutput($this->_description);
!         if($_SESSION['OBJ_user']->user_id) {
!             $mysettings = $_SESSION['translate']->it('Settings');
!             $tags['MYPROFILE'] = PHPWSBB_Thread::createLink($mysettings, array('PHPWSBB_MAN_OP'=>'usersettings',
!               'PHPWS_MAN_ITEMS[]'=>$this->getId()), 'mysettings.png', 16, 16);
!             $newposts = $_SESSION['translate']->it('View New Posts');
!             $tags['NEW_POSTS'] = PHPWSBB_Thread::createLink($newposts, array('PHPWSBB_MAN_OP'=>'getnew'), 'new_messages.png', 16, 16);
!         }
          if(!empty($this->_moderators)) {
              if($tmp = $GLOBALS['core']->getCol('SELECT username FROM mod_users WHERE user_id IN ('.$this->_moderators.')', TRUE))
--- 191,195 ----
          $tags['THREADS']    = $this->_threads;
          $tags['DESCRIPTION']= PHPWS_Text::parseOutput($this->_description);
! 
          if(!empty($this->_moderators)) {
              if($tmp = $GLOBALS['core']->getCol('SELECT username FROM mod_users WHERE user_id IN ('.$this->_moderators.')', TRUE))