Menu
▾
▴
[phpwsbb-commits] phpwsbb/class Forum.php,1.33,1.34 Manager.php,1.58,1.59 Message.php,1.71,1.72 Thread.php,1.64,1.65
|
From: Shaun M. <sin...@us...> - 2004-10-26 05:11:17
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4805 Modified Files: Forum.php Manager.php Message.php Thread.php Log Message: Changes for updated templates, extra icons and some xhtml changes. Fixed 'Edit Anon user' Index: Thread.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** Thread.php 25 Oct 2004 17:35:22 -0000 1.64 --- Thread.php 26 Oct 2004 05:11:07 -0000 1.65 *************** *** 263,269 **** $tags['MESSAGE'] = $_SESSION['translate']->it('Message'); if($_SESSION['OBJ_user']->user_id) ! $tags['MYPROFILE'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=usersettings">' . $_SESSION['translate']->it('My Forum Settings') . '</a>'; ! return '<a name="bb-top"></a>' . PHPWS_Template::processTemplate($tags, 'phpwsbb', 'view_thread_top.tpl') . $content --- 263,269 ---- $tags['MESSAGE'] = $_SESSION['translate']->it('Message'); if($_SESSION['OBJ_user']->user_id) ! $tags['MYPROFILE'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=usersettings"><img src="./images/phpwsbb/mysettings.png" border="0" alt="' .$_SESSION['translate']->it('Settings') . '" title="' .$_SESSION['translate']->it('Settings') . '" /> ' . $_SESSION['translate']->it('Settings') . '</a>'; ! return '<a name="bb-top" /></a>' . PHPWS_Template::processTemplate($tags, 'phpwsbb', 'view_thread_top.tpl') . $content *************** *** 427,433 **** else { if ($this->_locked) ! $GLOBALS['CNT_phpwsbb']['content'] .= '<div class="errortext">' . $_SESSION['translate']->it('This topic is already locked.') . '</div><br />\n'; else ! $GLOBALS['CNT_phpwsbb']['content'] .= '<div class="errortext">' . $_SESSION['translate']->it('This topic is already unlocked.') . '</div><br />\n'; $_REQUEST['PHPWSBB_THREAD_OP'] = 'view'; --- 427,433 ---- else { if ($this->_locked) ! $GLOBALS['CNT_phpwsbb']['content'] .= '<div class="errortext">' . $_SESSION['translate']->it('This topic is already locked.') . '</div><br />'; else ! $GLOBALS['CNT_phpwsbb']['content'] .= '<div class="errortext">' . $_SESSION['translate']->it('This topic is already unlocked.') . '</div><br />'; $_REQUEST['PHPWSBB_THREAD_OP'] = 'view'; *************** *** 446,450 **** return; } else { ! $GLOBALS['CNT_phpwsbb']['content'] .= $_SESSION['translate']->it('The topic was successfully saved.') . '<br />\n'; $_REQUEST['PHPWSBB_THREAD_OP'] = 'view'; --- 446,450 ---- return; } else { ! $GLOBALS['CNT_phpwsbb']['content'] .= $_SESSION['translate']->it('The topic was successfully saved.') . '<br />'; $_REQUEST['PHPWSBB_THREAD_OP'] = 'view'; *************** *** 469,475 **** else { if ($this->_sticky) ! $GLOBALS['CNT_phpwsbb']['content'] .= '<div class="errortext">' . $_SESSION['translate']->it('This topic is already sticky.') . '</div><br />\n'; else ! $GLOBALS['CNT_phpwsbb']['content'] .= '<div class="errortext">' . $_SESSION['translate']->it('This topic is already not sticky.') . '</div><br />\n'; $_REQUEST['PHPWSBB_THREAD_OP'] = 'view'; --- 469,475 ---- else { if ($this->_sticky) ! $GLOBALS['CNT_phpwsbb']['content'] .= '<div class="errortext">' . $_SESSION['translate']->it('This topic is already sticky.') . '</div><br />'; else ! $GLOBALS['CNT_phpwsbb']['content'] .= '<div class="errortext">' . $_SESSION['translate']->it('This topic is already not sticky.') . '</div><br />'; $_REQUEST['PHPWSBB_THREAD_OP'] = 'view'; *************** *** 488,492 **** return; } else { ! $GLOBALS['CNT_phpwsbb']['content'] .= $_SESSION['translate']->it('The topic was successfully saved.') . '<br />\n'; $_REQUEST['PHPWSBB_THREAD_OP'] = 'view'; --- 488,492 ---- return; } else { ! $GLOBALS['CNT_phpwsbb']['content'] .= $_SESSION['translate']->it('The topic was successfully saved.') . '<br />'; $_REQUEST['PHPWSBB_THREAD_OP'] = 'view'; Index: Message.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Message.php,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** Message.php 25 Oct 2004 17:35:22 -0000 1.71 --- Message.php 26 Oct 2004 05:11:07 -0000 1.72 *************** *** 120,126 **** $tags = $_SESSION['PHPWSBB_Manager']->_load_user_settings($this->_owner_id); $tags['BG'] = $bg; ! $tags['QUOTE'] = '<img src="./images/phpwsbb/reply_message.png" border="0" alt="' . $_SESSION['translate']->it('Quote this message') . '" title="' . $_SESSION['translate']->it('Quote this message') . '" /> ' .PHPWS_Text::moduleLink($_SESSION['translate']->it('Quote'), 'phpwsbb', array('PHPWSBB_MAN_OP'=>'reply', 'PHPWS_MAN_ITEMS'=>$this->_tid, 'reply_to'=>$this->getId())); ! $tags['NAV'] = '<a href="#bb-top" class="nav">'.$_SESSION["translate"]->it('Back to top').'</a>'; $tags['ID'] = $this->getId(); $tags['OWNER'] = $this->getOwner(); --- 120,127 ---- $tags = $_SESSION['PHPWSBB_Manager']->_load_user_settings($this->_owner_id); $tags['BG'] = $bg; ! $tags['QUOTE'] = '<img src="./images/phpwsbb/quote_message.png" border="0" alt="' . $_SESSION['translate']->it('Quote this message') . '" title="' . $_SESSION['translate']->it('Quote this message') . '" /> ' .PHPWS_Text::moduleLink($_SESSION['translate']->it('Quote'), 'phpwsbb', array('PHPWSBB_MAN_OP'=>'reply', 'PHPWS_MAN_ITEMS'=>$this->_tid, 'reply_to'=>$this->getId())); ! $tags['NAV'] = '<a href="#bb-top"><img src="./images/phpwsbb/back_to_top.png" border="0" alt="' .$_SESSION["translate"]->it('Back to top') . '" title="' . $_SESSION['translate']->it('Back to top') . '" /> ' ! .$_SESSION["translate"]->it('Back to top').'</a>'; $tags['ID'] = $this->getId(); $tags['OWNER'] = $this->getOwner(); *************** *** 193,198 **** } ! if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_users')) ! $tags['EDIT_USER'] = ' <a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=usersettings&user=' . $this->_owner_id . '">' . $_SESSION['translate']->it('Edit [var1]', $this->getOwner()) . '</a>'; if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'ban') && $this->isModerator) { --- 194,199 ---- } ! if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_users') && ($this->getOwner())) ! $tags['EDIT_USER'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=usersettings&user=' . $this->_owner_id . '"><img src="./images/phpwsbb/mysettings.png" border="0" alt="' . $_SESSION['translate']->it('Edit [var1]', $this->getOwner()) . '" title="' . $_SESSION['translate']->it('Edit [var1]', $this->getOwner()) . '" /> ' . $_SESSION['translate']->it('Edit [var1]', $this->getOwner()) . '</a>'; if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'ban') && $this->isModerator) { Index: Forum.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Forum.php,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** Forum.php 25 Oct 2004 17:35:22 -0000 1.33 --- Forum.php 26 Oct 2004 05:11:07 -0000 1.34 *************** *** 173,177 **** $tags['DESCRIPTION']= $this->_description; if($_SESSION['OBJ_user']->user_id) ! $tags['MYPROFILE'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=usersettings">' . $_SESSION['translate']->it('My Forum Settings') . '</a>'; if(!empty($this->_moderators)) { if($tmp = $GLOBALS['core']->getCol('SELECT username FROM mod_users WHERE user_id IN ('.$this->_moderators.')', TRUE)) --- 173,177 ---- $tags['DESCRIPTION']= $this->_description; if($_SESSION['OBJ_user']->user_id) ! $tags['MYPROFILE'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=usersettings"><img src="./images/phpwsbb/mysettings.png" border="0" alt="' .$_SESSION['translate']->it('Settings') . '" title="' .$_SESSION['translate']->it('Settings') . '" /> ' . $_SESSION['translate']->it('Settings') . '</a>'; if(!empty($this->_moderators)) { if($tmp = $GLOBALS['core']->getCol('SELECT username FROM mod_users WHERE user_id IN ('.$this->_moderators.')', TRUE)) *************** *** 264,268 **** /* Moderator List */ // Display list of automatic moderators (those that can edit forums) ! $super_mods = $GLOBALS['core']->getCol('SELECT u.username FROM ' . $GLOBALS['core']->tbl_prefix . 'mod_users AS u LEFT JOIN ' . $GLOBALS['core']->tbl_prefix . 'mod_user_uservar AS v ON ( v.user_id = u.user_id) WHERE u.deity OR (u.admin_switch AND v.varName="MOD_phpwsbb" AND v.varValue LIKE "%edit_forums%") ORDER BY u.username ASC'); if($super_mods) { $tags['S_MODERATORS_LABEL'] = $_SESSION['translate']->it('These users have moderation capabilities even if they\'re not selected'); --- 264,268 ---- /* Moderator List */ // Display list of automatic moderators (those that can edit forums) ! $super_mods = $GLOBALS['core']->getCol('SELECT u.username FROM ' . $GLOBALS['core']->tbl_prefix . 'mod_users AS u LEFT JOIN ' . $GLOBALS['core']->tbl_prefix . 'mod_user_uservar AS v ON ( v.user_id = u.user_id) WHERE u.deity OR (u.admin_switch AND v.varName="MOD_phpwsbb" AND v.varValue LIKE "%edit_forums%") GROUP BY u.username ORDER BY u.username ASC'); if($super_mods) { $tags['S_MODERATORS_LABEL'] = $_SESSION['translate']->it('These users have moderation capabilities even if they\'re not selected'); *************** *** 353,357 **** $_SESSION['OBJ_fatcat']->saveSelect($this->getLabel(), 'index.php?module=phpwsbb&PHPWSBB_MAN_OP=viewforum&PHPWS_MAN_ITEMS=' . $this->getId(), $this->getId()); ! $GLOBALS['CNT_phpwsbb']['content'] .= $_SESSION['PHPWSBB_Manager']->_menu($this) . $_SESSION['translate']->it('Your forum was successfully saved.') . "<br />\n"; $GLOBALS['CNT_phpwsbb']['content'] .= '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=list">' . $_SESSION['translate']->it('Back to Forums') . '</a>'; --- 353,357 ---- $_SESSION['OBJ_fatcat']->saveSelect($this->getLabel(), 'index.php?module=phpwsbb&PHPWSBB_MAN_OP=viewforum&PHPWS_MAN_ITEMS=' . $this->getId(), $this->getId()); ! $GLOBALS['CNT_phpwsbb']['content'] .= $_SESSION['PHPWSBB_Manager']->_menu($this) . $_SESSION['translate']->it('Your forum was successfully saved.') . "<br />"; $GLOBALS['CNT_phpwsbb']['content'] .= '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=list">' . $_SESSION['translate']->it('Back to Forums') . '</a>'; Index: Manager.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** Manager.php 20 Oct 2004 01:40:16 -0000 1.58 --- Manager.php 26 Oct 2004 05:11:07 -0000 1.59 *************** *** 258,262 **** function _menu($forum = NULL, $thread = NULL) { $addForum = $_SESSION['translate']->it('Add Forum'); ! $settings = $_SESSION['translate']->it('Settings'); $forumAdmin = NULL; --- 258,262 ---- function _menu($forum = NULL, $thread = NULL) { $addForum = $_SESSION['translate']->it('Add Forum'); ! $settings = $_SESSION['translate']->it('Admin Settings'); $forumAdmin = NULL; *************** *** 309,313 **** /* "Edit Profile" button */ if($_SESSION['OBJ_user']->user_id) ! $GLOBALS['CNT_phpwsbb']['content'] .= '<div align="right">|<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=usersettings">' . $_SESSION['translate']->it('My Forum Settings') . '</a>|</div>'; $this->setClass('PHPWSBB_Forum'); --- 309,313 ---- /* "Edit Profile" button */ if($_SESSION['OBJ_user']->user_id) ! $GLOBALS['CNT_phpwsbb']['content'] .= '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=usersettings"><img src="./images/phpwsbb/mysettings.png" border="0" alt="' .$_SESSION['translate']->it('Settings') . '" title="' .$_SESSION['translate']->it('Settings') . '" /> ' . $_SESSION['translate']->it('Settings') . '</a>'; $this->setClass('PHPWSBB_Forum'); *************** *** 671,674 **** --- 671,675 ---- $tags = array(); $tags = $form->getTemplate(); + $tags['MONITORS_TITLE'] = $_SESSION['translate']->it('Monitors'); $tags['MONITORDEFAULT_TEXT'] = $_SESSION['translate']->it('Automatically monitor threads you post to?'); if(!$this->_allow_user_monitors) *************** *** 681,684 **** --- 682,686 ---- $tags['EXIT_LINK'] = PHPWS_Text::moduleLink($_SESSION['translate']->it('Back to Forums'), 'phpwsbb', $this->last_viewed); + $tags['PERSONAL_TITLE'] = $_SESSION['translate']->it('Personal Info'); if ($this->_use_signatures) { $tags['SIGNATURE_LABEL'] = $_SESSION['translate']->it('Your Signature'); *************** *** 688,692 **** if ($this->_use_avatars) { ! $tags['AVATAR_TITLE'] = $_SESSION['translate']->it('Avatar Control Panel'); if(!empty($user['avatar_file'])) { $tags['CURRENT_AVATAR_LABEL'] = $_SESSION['translate']->it('Current Avatar'); --- 690,694 ---- if ($this->_use_avatars) { ! $tags['AVATAR_TITLE'] = $_SESSION['translate']->it('Avatar Settings'); if(!empty($user['avatar_file'])) { $tags['CURRENT_AVATAR_LABEL'] = $_SESSION['translate']->it('Current Avatar'); *************** *** 710,716 **** if ($id==$_SESSION['OBJ_user']->user_id) ! $title = $_SESSION['translate']->it('phpwsBB User Settings'); else ! $title = $_SESSION['translate']->it('phpwsBB User Settings for "[var1]"', $user['username']); $content = $this->_menu() . PHPWS_Template::processTemplate($tags, 'phpwsbb', 'edit_user_settings.tpl'); --- 712,718 ---- if ($id==$_SESSION['OBJ_user']->user_id) ! $title = $_SESSION['translate']->it('User Settings'); else ! $title = $_SESSION['translate']->it('User Settings for "[var1]"', $user['username']); $content = $this->_menu() . PHPWS_Template::processTemplate($tags, 'phpwsbb', 'edit_user_settings.tpl'); *************** *** 766,770 **** if($GLOBALS['core']->sqlUpdate($data, 'mod_phpwsbb_user_info', 'user_id', $_POST['user'])) { $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 { --- 768,772 ---- if($GLOBALS['core']->sqlUpdate($data, 'mod_phpwsbb_user_info', 'user_id', $_POST['user'])) { $title = $_SESSION['translate']->it('Settings Saved'); ! $content = $this->_menu() . $_SESSION['translate']->it("Your settings have been successfully saved.") . "<br />"; $content .= PHPWS_Text::moduleLink($_SESSION['translate']->it('Back to Forums'), 'phpwsbb', $this->last_viewed); } else { *************** *** 874,877 **** --- 876,885 ---- $tags = array(); $tags = $form->getTemplate(); + $tags['STATUS_TITLE'] = $_SESSION['translate']->it('Status'); + $tags['ANON_TITLE'] = $_SESSION['translate']->it('Anonymous Users'); + $tags['MONITORS_TITLE'] = $_SESSION['translate']->it('Monitors'); + $tags['BLOCKS_TITLE'] = $_SESSION['translate']->it('Blocks'); + $tags['AVATARS_TITLE'] = $_SESSION['translate']->it('Avatar Settings'); + $tags['PERSONAL_TITLE'] = $_SESSION['translate']->it('Personal Info'); $tags['ANONPOSTS_TEXT'] = $_SESSION['translate']->it('Allow Anonymous Posts'); $tags['ANONVIEW_TEXT'] = $_SESSION['translate']->it('Allow Anonymous Viewing of Posts'); *************** *** 937,941 **** $tags['RANK_NEW_TITLE'] = $_SESSION['translate']->it('Add a new rank by entering its information here.'); ! $title = $_SESSION['translate']->it('phpwsBB Settings'); $content = $this->_menu() . PHPWS_Template::processTemplate($tags, 'phpwsbb', 'edit_settings.tpl'); --- 945,949 ---- $tags['RANK_NEW_TITLE'] = $_SESSION['translate']->it('Add a new rank by entering its information here.'); ! $title = $_SESSION['translate']->it('Admin Settings'); $content = $this->_menu() . PHPWS_Template::processTemplate($tags, 'phpwsbb', 'edit_settings.tpl'); *************** *** 1062,1066 **** if($GLOBALS['core']->sqlUpdate($data, 'mod_phpwsbb_settings')) { $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 { --- 1070,1074 ---- if($GLOBALS['core']->sqlUpdate($data, 'mod_phpwsbb_settings')) { $title = $_SESSION['translate']->it('Settings Saved'); ! $content = $this->_menu() . $_SESSION['translate']->it('Your settings have been successfully saved.') . "<br />"; $content .= PHPWS_Text::moduleLink($_SESSION['translate']->it('Back to Forums'), 'phpwsbb', $this->last_viewed); } else { |
