From: Shaun M. <sin...@us...> - 2006-03-01 14:50:22
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20118 Modified Files: Manager.php Log Message: Expand role of menu() function Add show_categories to switch on/off fatcat features Index: Manager.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** Manager.php 27 Feb 2006 18:50:37 -0000 1.70 --- Manager.php 1 Mar 2006 14:50:18 -0000 1.71 *************** *** 188,191 **** --- 188,199 ---- /** + * Show category features + * + * @var bit + * @access private + */ + var $_show_categories; + + /** * Stores the last page viewed for possible recall * *************** *** 272,275 **** --- 280,284 ---- $this->_use_views = $result[0]['use_views']; $this->_use_low_priority = $result[0]['use_low_priority']; + $this->_show_categories = $result[0]['show_categories']; // Default page $this->last_viewed = array('PHPWSBB_MAN_OP'=>'list'); *************** *** 283,303 **** function _menu($forum = NULL, $thread = NULL) { - $addForum = $_SESSION['translate']->it('Add Forum'); - $settings = $_SESSION['translate']->it('Admin Settings'); - $forumAdmin = NULL; - $tags = array(); - if($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_forums') || - $_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_settings')) { - $tags['FORUM_ADMIN'] = 1; - } - - if($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_forums')) - $tags['ADD_FORUM'] = '<a href="index.php?module=phpwsbb&PHPWSBB_MAN_OP=editforum">'.$addForum.'</a>'; if($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_settings')) ! $tags['SETTINGS'] = '<a href="index.php?module=phpwsbb&PHPWSBB_MAN_OP=getsettings">'.$settings.'</a>'; ! $tags['LIST'] = PHPWS_Text::moduleLink($_SESSION['translate']->it('Forums'), 'phpwsbb', array('PHPWSBB_MAN_OP'=>'list')); if (isset($forum)) --- 292,315 ---- function _menu($forum = NULL, $thread = NULL) { $tags = array(); if($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_settings')) ! $tags['SETTINGS'] = PHPWSBB_Thread::createLink($_SESSION['translate']->it('Admin'), array('PHPWSBB_MAN_OP'=>'getsettings'), 'gear.png', 16, 16); ! /* "Edit Profile" and "All New Posts" button */ ! if($_SESSION['OBJ_user']->user_id) { ! $mysettings = $_SESSION['translate']->it('Settings'); ! $tags['MYPROFILE'] = PHPWSBB_Thread::createLink($mysettings, array('PHPWSBB_MAN_OP'=>'usersettings'), '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); ! } ! ! /* "Categories" button */ ! if($_SESSION['OBJ_fatcat'] && $this->_show_categories) { ! $categories = $_SESSION['translate']->it('Categories'); ! $tags['CATEGORIES'] = PHPWSBB_Thread::createLink($categories, array('PHPWSBB_MAN_OP'=>'categories'), 'view_tree.png', 16, 16); ! } ! ! $tags['LIST'] = PHPWSBB_Thread::createLink($_SESSION['translate']->it('Forums'), array('PHPWSBB_MAN_OP'=>'list'), 'view_text.png', 16, 16); if (isset($forum)) *************** *** 338,356 **** $newforum = $_SESSION['translate']->it('New Forum'); $tags['NEW'] = PHPWSBB_Thread::createLink($newforum, array('PHPWSBB_MAN_OP'=>'editforum'), 'new_forum.png', 16, 16); ! } ! ! /* "Edit Profile" and "All New Posts" button */ ! if($_SESSION['OBJ_user']->user_id) { ! $mysettings = $_SESSION['translate']->it('Settings'); ! $tags['MYPROFILE'] = PHPWSBB_Thread::createLink($mysettings, array('PHPWSBB_MAN_OP'=>'usersettings'), '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); ! } ! ! /* "Categories" button */ ! if($_SESSION['OBJ_fatcat']) { ! $categories = $_SESSION['translate']->it('Categories'); ! $tags['CATEGORIES'] = PHPWSBB_Thread::createLink($categories, array('PHPWSBB_MAN_OP'=>'categories'), 'view_tree.png', 16, 16); ! } $this->setClass('PHPWSBB_Forum'); --- 350,354 ---- $newforum = $_SESSION['translate']->it('New Forum'); $tags['NEW'] = PHPWSBB_Thread::createLink($newforum, array('PHPWSBB_MAN_OP'=>'editforum'), 'new_forum.png', 16, 16); ! } else $tags = array(); $this->setClass('PHPWSBB_Forum'); *************** *** 967,970 **** --- 965,973 ---- $tabs++; + $form->add('SETTINGS_show_categories', 'checkbox'); + $form->setMatch('SETTINGS_show_categories', $this->_show_categories); + $form->setTab('SETTINGS_show_categories', $tabs); + $tabs++; + $form->add('SETTINGS_use_signatures', 'checkbox'); $form->setMatch('SETTINGS_use_signatures', $this->_use_signatures); *************** *** 985,988 **** --- 988,992 ---- $tags['MONITORS_TITLE'] = $_SESSION['translate']->it('Monitors'); $tags['BLOCKS_TITLE'] = $_SESSION['translate']->it('Blocks'); + $tags['CATEGORIES_TITLE'] = $_SESSION['translate']->it('Categories'); $tags['AVATARS_TITLE'] = $_SESSION['translate']->it('Avatar Settings'); $tags['PERSONAL_TITLE'] = $_SESSION['translate']->it('Personal Info'); *************** *** 1007,1010 **** --- 1011,1015 ---- $tags['LATESTTHREADSBLOCKTITLE_TEXT'] = $_SESSION['translate']->it('Latest Threads Block Title'); $tags['MAXLATESTTHREADS_TEXT'] = $_SESSION['translate']->it('Maximum Number of Threads to Show in Latest Threads Block'); + $tags['SHOW_CATEGORIES_TEXT'] = $_SESSION['translate']->it('Show Category related features'); $tags['USE_AVATARS_TEXT'] = $_SESSION['translate']->it('Allow user-selected Avatars to be displayed in messages'); $tags['USE_OFFSITE_AVATARS_TEXT'] = $_SESSION['translate']->it('Allow user-selected Avatar URLs to be displayed in messages'); *************** *** 1055,1059 **** $title = $_SESSION['translate']->it('Admin Settings'); ! $content = PHPWS_Template::processTemplate($tags, 'phpwsbb', 'edit_settings.tpl'); $GLOBALS['CNT_phpwsbb']['title'] = $title; --- 1060,1064 ---- $title = $_SESSION['translate']->it('Admin Settings'); ! $content = $this->_menu() . PHPWS_Template::processTemplate($tags, 'phpwsbb', 'edit_settings.tpl'); $GLOBALS['CNT_phpwsbb']['title'] = $title; *************** *** 1128,1131 **** --- 1133,1141 ---- $this->_use_signatures = 0; + if(isset($_REQUEST['SETTINGS_show_categories'])) + $this->_show_categories = 1; + else + $this->_show_categories = 0; + // If changes to the user ranks were posted, save them now. if(isset($_POST['PHPWSBB_RANK'])) { *************** *** 1188,1191 **** --- 1198,1202 ---- $data['use_offsite_avatars'] = $this->_use_offsite_avatars; $data['use_signatures'] = $this->_use_signatures; + $data['show_categories'] = $this->_show_categories; if($GLOBALS['core']->sqlUpdate($data, 'mod_phpwsbb_settings')) { |