Menu
▾
▴
phpwsbb-commits — phpwsBB CVS Commits Notifications
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
(48) |
Apr
(45) |
May
(11) |
Jun
(7) |
Jul
|
Aug
(11) |
Sep
(75) |
Oct
(38) |
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(17) |
Feb
|
Mar
(22) |
Apr
|
May
(1) |
Jun
|
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
(5) |
Feb
(29) |
Mar
(22) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Shaun M. <sin...@us...> - 2007-01-09 12:11:27
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31388 Modified Files: Manager.php Log Message: Put ReportMessage under anon on/off switch to stop spammers sending admins mail Index: Manager.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** Manager.php 3 Jan 2007 19:37:38 -0000 1.75 --- Manager.php 9 Jan 2007 12:11:22 -0000 1.76 *************** *** 605,608 **** --- 605,613 ---- function _reportMessage() { + if(!$this->_allow_anon_posts && !$_SESSION['OBJ_user']->username) { + $_SESSION['OBJ_user']->jumpURL = './index.php?module=phpwsbb&PHPWSBB_MAN_OP=report&PHPWS_MAN_ITEMS[]=' . $_REQUEST['PHPWS_MAN_ITEMS'][0]; + $_SESSION['OBJ_user']->error[] = $_SESSION['translate']->it('You must log-in to report a post to the administrator.'); + $_SESSION['OBJ_user']->routeLogin(); + } $this->message = new PHPWSBB_Message($_REQUEST['PHPWS_MAN_ITEMS'][0]); $_REQUEST['PHPWSBB_MESSAGE_OP'] = 'report'; |
|
From: Shaun M. <sin...@us...> - 2007-01-03 19:37:44
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7809 Modified Files: Manager.php Log Message: Thread analysis menu added Index: Manager.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** Manager.php 16 Apr 2006 22:28:33 -0000 1.74 --- Manager.php 3 Jan 2007 19:37:38 -0000 1.75 *************** *** 403,406 **** --- 403,467 ---- }// END FUNC _listNewThreads + // List threads started by a particular user + function _listUserThreads($user = NULL) { + if(!$_SESSION['OBJ_user']->username) { + $_SESSION['OBJ_user']->jumpURL = './index.php?module=phpwsbb&PHPWSBB_MAN_OP=userthreads'; + $_SESSION['OBJ_user']->error[] = $_SESSION['translate']->it('The "User Threads" feature is only available to registered users of this site. You must log-in to view this page.'); + $_SESSION['OBJ_user']->routeLogin(); + exit(); + } + + if (!$user) $user = $_SESSION['OBJ_user']->username; + $this->setClass('PHPWSBB_Thread'); + $this->setTable('mod_phpwsbb_threads'); + $this->setOrder('sticky DESC, lastpost DESC'); + if(!$_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_threads')) + $this->setSort('owner = "'.$user.'" AND hidden=0'); + else + $this->setSort('owner = "'.$user.'"'); + + return PHPWS_Text::profanityFilter($this->getList('threads', NULL, FALSE)); + }// END FUNC _listUserThreads + + // List threads with zero replies + function _listZero() { + if(!$_SESSION['OBJ_user']->username) { + $_SESSION['OBJ_user']->jumpURL = './index.php?module=phpwsbb&PHPWSBB_MAN_OP=userthreads'; + $_SESSION['OBJ_user']->error[] = $_SESSION['translate']->it('The "No replies" feature is only available to registered users of this site. You must log-in to view this page.'); + $_SESSION['OBJ_user']->routeLogin(); + exit(); + } + + $this->setClass('PHPWSBB_Thread'); + $this->setTable('mod_phpwsbb_threads'); + $this->setOrder('sticky DESC, lastpost DESC'); + if(!$_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_threads')) + $this->setSort('replies=0 AND hidden=0'); + else + $this->setSort('replies=0'); + + return PHPWS_Text::profanityFilter($this->getList('threads', NULL, FALSE)); + }// END FUNC _listZero + + // List Locked threads + function _listLocked() { + if(!$_SESSION['OBJ_user']->username) { + $_SESSION['OBJ_user']->jumpURL = './index.php?module=phpwsbb&PHPWSBB_MAN_OP=userthreads'; + $_SESSION['OBJ_user']->error[] = $_SESSION['translate']->it('The "Locked Threads" feature is only available to registered users of this site. You must log-in to view this page.'); + $_SESSION['OBJ_user']->routeLogin(); + exit(); + } + + $this->setClass('PHPWSBB_Thread'); + $this->setTable('mod_phpwsbb_threads'); + $this->setOrder('sticky DESC, lastpost DESC'); + if(!$_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_threads')) + $this->setSort('locked=1 AND hidden=0'); + else + $this->setSort('locked=1'); + + return PHPWS_Text::profanityFilter($this->getList('threads', NULL, FALSE)); + }// END FUNC _listLocked + // Displays a submenu for viewing new posts since last visit, today, this week... function _newMenu() { *************** *** 416,419 **** --- 477,493 ---- }// END FUNC _newMenu + // Displays a submenu for viewing thread analysis... + function _analMenu() { + $tags = array(); + + $tags['LABEL'] = $_SESSION['translate']->it('Thread Analysis') . ':'; + $tags['LOCKED'] = PHPWSBB_Thread::createLink($_SESSION['translate']->it('Locked Threads'), array('PHPWSBB_MAN_OP'=>'lockedthreads'), 'locked.png', 16, 16); + $tags['ZERO'] = PHPWSBB_Thread::createLink($_SESSION['translate']->it('Empty Threads'), array('PHPWSBB_MAN_OP'=>'zerothreads'), 'no_new_messages.png', 16, 16); + $tags['USER'] = PHPWSBB_Thread::createLink($_SESSION['translate']->it('My Threads'), array('PHPWSBB_MAN_OP'=>'userthreads','user'=>$_SESSION['OBJ_user']->username), 'new_messages.png', 16, 16); + + return implode($tags, " "); + + }// END FUNC _analMenu + function _categories() { if(!$this->_allow_anon_view && !$_SESSION['OBJ_user']->username) { *************** *** 1463,1466 **** --- 1537,1546 ---- break; + case 'analysis': + PHPWS_Layout::addPageTitle($_SESSION['translate']->it('Thread Analysis')); + $GLOBALS['CNT_phpwsbb']['title'] = $_SESSION['translate']->it('Thread Analysis'); + $GLOBALS['CNT_phpwsbb']['content'] = $this->_menu() . $this->_analmenu(); + break; + case 'recalc_users': $this->_recalc_users(); *************** *** 1489,1492 **** --- 1569,1593 ---- PHPWS_Layout::addPageTitle($_SESSION['translate']->it('This Week\'s Posts')); break; + + case 'userthreads': + if (isset($_REQUEST['user'])) { + $GLOBALS['CNT_phpwsbb']['title'] = $_SESSION['translate']->it('Threads started by [var1]', $_REQUEST['user']); + $GLOBALS['CNT_phpwsbb']['content'] = $this->_menu() . $this->_analMenu() . $this->_listUserThreads($_REQUEST['user']); + } else { + $GLOBALS['CNT_phpwsbb']['title'] = $_SESSION['translate']->it('My Threads'); + $GLOBALS['CNT_phpwsbb']['content'] = $this->_menu() . $this->_analMenu() . $this->_listUserThreads(); + } + break; + + case 'zerothreads': + $GLOBALS['CNT_phpwsbb']['title'] = $_SESSION['translate']->it('Threads with no replies'); + $GLOBALS['CNT_phpwsbb']['content'] = $this->_menu() . $this->_analMenu() . $this->_listZero(); + break; + + case 'lockedthreads': + $GLOBALS['CNT_phpwsbb']['title'] = $_SESSION['translate']->it('Locked Threads'); + $GLOBALS['CNT_phpwsbb']['content'] = $this->_menu() . $this->_analMenu() . $this->_listLocked(); + break; + } |
|
From: Shaun M. <sin...@us...> - 2006-08-13 23:48:49
|
Update of /cvsroot/phpwsbb/phpwsbb/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27130 Modified Files: ChangeLog Log Message: Halt the install if the image directory is not writable. Index: ChangeLog =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/docs/ChangeLog,v retrieving revision 1.132 retrieving revision 1.133 diff -C2 -d -r1.132 -r1.133 *** ChangeLog 27 Feb 2006 01:17:27 -0000 1.132 --- ChangeLog 13 Aug 2006 23:48:47 -0000 1.133 *************** *** 17,20 **** --- 17,21 ---- * Category View * Private Forums (restrict viewing to a group) + * Halt install if images directory not writeable *phpwsbb-1.0.3 (23 Mar 2005) |
|
From: Shaun M. <sin...@us...> - 2006-08-13 23:46:43
|
Update of /cvsroot/phpwsbb/phpwsbb/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26414 Modified Files: install.php Log Message: Halt the install if the image directory is not writable. Index: install.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/boost/install.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** install.php 4 Mar 2005 18:19:41 -0000 1.24 --- install.php 13 Aug 2006 23:46:40 -0000 1.25 *************** *** 38,41 **** --- 38,52 ---- } + /* Create image directory */ + $phpwsbb_sourcedir = $GLOBALS['core']->source_dir . 'mod/phpwsbb/img/'; + $phpwsbb_imagedir = $GLOBALS['core']->home_dir . 'images/phpwsbb/'; + if(PHPWS_File::recursiveFileCopy($phpwsbb_sourcedir, $phpwsbb_imagedir)) { + $content .= 'phpwsBB image directory ' . $phpwsbb_imagedir . ' successfully created!<br />'; + } else { + $content .= 'phpwsBB could not create the image directory: ' . $phpwsbb_imagedir . '<br />You will have to do this manually!. Please also make sure it\'s writable before trying again.<br />'; + $content .= 'phpwsBB has not been installed.<br />'; + return; + } + if($status = $GLOBALS['core']->sqlImport(PHPWS_SOURCE_DIR . 'mod/phpwsbb/boost/install.sql', TRUE)) { *************** *** 48,58 **** } - /* Create image directory */ - $phpwsbb_sourcedir = $GLOBALS['core']->source_dir . 'mod/phpwsbb/img/'; - $phpwsbb_imagedir = $GLOBALS['core']->home_dir . 'images/phpwsbb/'; - if(PHPWS_File::recursiveFileCopy($phpwsbb_sourcedir, $phpwsbb_imagedir)) - $content .= 'phpwsBB image directory ' . $phpwsbb_imagedir . ' successfully created!<br />'; - else - $content .= 'phpwsBB could not create the image directory: ' . $phpwsbb_imagedir . '<br />You will have to do this manually!<br />'; - ?> \ No newline at end of file --- 59,61 ---- |
|
From: Shaun M. <sin...@us...> - 2006-04-16 22:28:37
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2675 Modified Files: Manager.php Log Message: View new posts since today, this week Index: Manager.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** Manager.php 6 Mar 2006 00:57:57 -0000 1.73 --- Manager.php 16 Apr 2006 22:28:33 -0000 1.74 *************** *** 403,406 **** --- 403,418 ---- }// END FUNC _listNewThreads + // Displays a submenu for viewing new posts since last visit, today, this week... + function _newMenu() { + $tags = array(); + + $tags['LABEL'] = $_SESSION['translate']->it('New Posts') . ':'; + $tags['LASTVISIT'] = PHPWSBB_Thread::createLink($_SESSION['translate']->it('Since Last Visit'), array('PHPWSBB_MAN_OP'=>'getnew'), 'lastvisit.png', 16, 16); + $tags['TODAY'] = PHPWSBB_Thread::createLink($_SESSION['translate']->it('Today'), array('PHPWSBB_MAN_OP'=>'today'), 'today.png', 16, 16); + $tags['WEEK'] = PHPWSBB_Thread::createLink($_SESSION['translate']->it('This Week'), array('PHPWSBB_MAN_OP'=>'week'), '7days.png', 16, 16); + + return implode($tags, " "); + + }// END FUNC _newMenu function _categories() { *************** *** 1460,1466 **** $since = time(); $GLOBALS['CNT_phpwsbb']['title'] = $_SESSION['translate']->it('New Posts Since My Last Visit on [var1]', date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, $since)); ! $GLOBALS['CNT_phpwsbb']['content'] = $this->_menu() . $this->_listNewThreads($since); PHPWS_Layout::addPageTitle($_SESSION['translate']->it('New Posts')); break; } --- 1472,1492 ---- $since = time(); $GLOBALS['CNT_phpwsbb']['title'] = $_SESSION['translate']->it('New Posts Since My Last Visit on [var1]', date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, $since)); ! $GLOBALS['CNT_phpwsbb']['content'] = $this->_menu() . $this->_newMenu() . $this->_listNewThreads($since); PHPWS_Layout::addPageTitle($_SESSION['translate']->it('New Posts')); break; + + case 'today': + $since = strtotime("00:00 today"); + $GLOBALS['CNT_phpwsbb']['title'] = $_SESSION['translate']->it('Today\'s Posts'); + $GLOBALS['CNT_phpwsbb']['content'] = $this->_menu() . $this->_newMenu() . $this->_listNewThreads($since); + PHPWS_Layout::addPageTitle($_SESSION['translate']->it('Today\'s Posts')); + break; + + case 'week': + $since = strtotime("last monday"); + $GLOBALS['CNT_phpwsbb']['title'] = $_SESSION['translate']->it('This Week\'s Posts'); + $GLOBALS['CNT_phpwsbb']['content'] = $this->_menu() . $this->_newMenu() . $this->_listNewThreads($since); + PHPWS_Layout::addPageTitle($_SESSION['translate']->it('This Week\'s Posts')); + break; } |
|
From: Shaun M. <sin...@us...> - 2006-04-16 22:23:22
|
Update of /cvsroot/phpwsbb/phpwsbb/img In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31413 Added Files: 7days.png lastvisit.png month.png today.png Log Message: Extra Icons for date related views --- NEW FILE: 7days.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: lastvisit.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: month.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: today.png --- (This appears to be a binary file; contents omitted.) |
|
From: Eloi G. <ada...@us...> - 2006-03-11 03:27:41
|
Update of /cvsroot/phpwsbb/phpwsbb/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21337/inc Modified Files: runtime.php Log Message: Added title tag to "Latest Posts" block links to show the full titles Index: runtime.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/inc/runtime.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** runtime.php 24 Feb 2006 06:45:57 -0000 1.8 --- runtime.php 11 Mar 2006 03:27:36 -0000 1.9 *************** *** 74,82 **** $block .= '<ul>'; foreach($result as $row) { ! if(strlen($row['label']) > 15) ! $lbl = substr(PHPWS_Text::parseOutput($row['label']),0,15) . ' ...'; ! else ! $lbl = PHPWS_Text::parseOutput($row['label']); ! $block .= '<li>' . PHPWS_Text::moduleLink($lbl, 'phpwsbb', array('PHPWSBB_MAN_OP'=>'view', 'PHPWS_MAN_ITEMS'=>$row['id'])) . '</li>'; $c++; } --- 74,85 ---- $block .= '<ul>'; foreach($result as $row) { ! if(strlen($row['label']) > 15) { ! $title = PHPWS_Text::parseOutput($row['label']); ! $lbl = substr($title,0,15) . ' ...'; ! } ! else { ! $title = $lbl = PHPWS_Text::parseOutput($row['label']); ! } ! $block .= '<li>' . PHPWS_Text::moduleLink($lbl, 'phpwsbb', array('PHPWSBB_MAN_OP'=>'view', 'PHPWS_MAN_ITEMS'=>$row['id']), NULL, '" title="'.$title) . '</li>'; $c++; } |
|
From: Shaun M. <sin...@us...> - 2006-03-06 01:02:42
|
Update of /cvsroot/phpwsbb/phpwsbb/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8551 Modified Files: edit.tpl editforum.tpl Log Message: Adding labels Index: editforum.tpl =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/templates/editforum.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** editforum.tpl 4 Feb 2006 01:51:29 -0000 1.7 --- editforum.tpl 6 Mar 2006 01:02:38 -0000 1.8 *************** *** 1,4 **** --- 1,5 ---- {BACK} {START_FORM} + <br /> <!-- BEGIN LABEL --> *************** *** 27,40 **** --- 28,47 ---- <!-- BEGIN CATEGORIES --> + <label> {CATEGORIES_TEXT}: {CATEGORIES} + </label> <br /> <br /> <!-- END CATEGORIES --> + <label> {S_MODERATORS_LABEL}: {S_MODERATORS} + </label> <br /> <br /> + <label> {MODERATORS_LABEL}<br /> {MODERATORS} + </label> <br /> <br /> Index: edit.tpl =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/templates/edit.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** edit.tpl 1 Mar 2006 14:35:16 -0000 1.3 --- edit.tpl 6 Mar 2006 01:02:38 -0000 1.4 *************** *** 1,28 **** {BACK} {START_FORM} <!-- BEGIN PREVIEW --> ! <br />{PREVIEW_TEXT}: <div style="border:1px solid; padding:4px">{PREVIEW}</div><br /> <!-- END PREVIEW --> <!-- BEGIN GUESTNAME --> ! {GUESTNAME_TEXT}:<br /> ! {MESSAGE_GUESTNAME}<br /><br /> <!-- END GUESTNAME --> <!-- BEGIN GUESTEMAIL --> ! {GUESTEMAIL_TEXT}:<br /> ! {MESSAGE_GUESTEMAIL}<br /><br /> <!-- END GUESTEMAIL --> <!-- BEGIN LABEL --> ! {LABEL_TEXT}:<br /> ! {MESSAGE_LABEL}<br /><br /> <!-- END LABEL --> <!-- BEGIN BODY --> ! {BODY_TEXT}:<br /> ! {MESSAGE_BODY}<br /><br /> <!-- END BODY --> --- 1,30 ---- {BACK} {START_FORM} + <br /> <!-- BEGIN PREVIEW --> ! <label>{PREVIEW_TEXT}: <div style="border:1px solid; padding:4px">{PREVIEW}</div><br /> + </label> <!-- END PREVIEW --> <!-- BEGIN GUESTNAME --> ! <label>{GUESTNAME_TEXT}:<br /> ! {MESSAGE_GUESTNAME}</label><br /><br /> <!-- END GUESTNAME --> <!-- BEGIN GUESTEMAIL --> ! <label>{GUESTEMAIL_TEXT}:<br /> ! {MESSAGE_GUESTEMAIL}</label><br /><br /> <!-- END GUESTEMAIL --> <!-- BEGIN LABEL --> ! <label>{LABEL_TEXT}:<br /> ! {MESSAGE_LABEL}</label><br /><br /> <!-- END LABEL --> <!-- BEGIN BODY --> ! <label>{BODY_TEXT}:<br /> ! {MESSAGE_BODY}</label><br /><br /> <!-- END BODY --> |
|
From: Shaun M. <sin...@us...> - 2006-03-06 01:00:35
|
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; |
|
From: Shaun M. <sin...@us...> - 2006-03-06 00:59:40
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6969 Modified Files: Forum.php Log Message: Add page titles Index: Forum.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Forum.php,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** Forum.php 1 Mar 2006 18:13:07 -0000 1.45 --- Forum.php 6 Mar 2006 00:59:37 -0000 1.46 *************** *** 486,489 **** --- 486,490 ---- $content = $_SESSION['PHPWSBB_Manager']->_menu($this); $content .= $this->_view(); + PHPWS_Layout::addPageTitle($this->getLabel(0)); break; |
|
From: Shaun M. <sin...@us...> - 2006-03-06 00:58:02
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6131 Modified Files: Manager.php Log Message: Add page titles Shorten 'View New Posts' to 'New Posts' Index: Manager.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** Manager.php 1 Mar 2006 20:47:43 -0000 1.72 --- Manager.php 6 Mar 2006 00:57:57 -0000 1.73 *************** *** 301,305 **** $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); } --- 301,305 ---- $mysettings = $_SESSION['translate']->it('Settings'); $tags['MYPROFILE'] = PHPWSBB_Thread::createLink($mysettings, array('PHPWSBB_MAN_OP'=>'usersettings'), 'mysettings.png', 16, 16); ! $newposts = $_SESSION['translate']->it('New Posts'); $tags['NEW_POSTS'] = PHPWSBB_Thread::createLink($newposts, array('PHPWSBB_MAN_OP'=>'getnew'), 'new_messages.png', 16, 16); } *************** *** 345,348 **** --- 345,350 ---- $GLOBALS['CNT_phpwsbb']['content'] .= $this->_menu(); + + PHPWS_Layout::addPageTitle($_SESSION['translate']->it('Bulletin Board Forums')); /* "New forum" button */ *************** *** 385,389 **** if(!$_SESSION['OBJ_user']->username) { $_SESSION['OBJ_user']->jumpURL = './index.php?module=phpwsbb&PHPWSBB_MAN_OP=getnew'; ! $_SESSION['OBJ_user']->error[] = $_SESSION['translate']->it('The "View New Posts" feature is only available to registered users of this site. You must log-in to view this page.'); $_SESSION['OBJ_user']->routeLogin(); exit(); --- 387,391 ---- if(!$_SESSION['OBJ_user']->username) { $_SESSION['OBJ_user']->jumpURL = './index.php?module=phpwsbb&PHPWSBB_MAN_OP=getnew'; ! $_SESSION['OBJ_user']->error[] = $_SESSION['translate']->it('The "New Posts" feature is only available to registered users of this site. You must log-in to view this page.'); $_SESSION['OBJ_user']->routeLogin(); exit(); *************** *** 1366,1369 **** --- 1368,1372 ---- case 'usersettings': + PHPWS_Layout::addPageTitle($_SESSION['translate']->it('Bulletin Board Settings')); if (isset($_REQUEST['user'])) $this->_getUserSettings((int)$_REQUEST['user']); *************** *** 1444,1447 **** --- 1447,1451 ---- case 'categories': + PHPWS_Layout::addPageTitle($_SESSION['translate']->it('Bulletin Board Categories')); $this->_categories(); break; *************** *** 1457,1460 **** --- 1461,1465 ---- $GLOBALS['CNT_phpwsbb']['title'] = $_SESSION['translate']->it('New Posts Since My Last Visit on [var1]', date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, $since)); $GLOBALS['CNT_phpwsbb']['content'] = $this->_menu() . $this->_listNewThreads($since); + PHPWS_Layout::addPageTitle($_SESSION['translate']->it('New Posts')); break; } |
|
From: Shaun M. <sin...@us...> - 2006-03-01 20:47:48
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6878 Modified Files: Manager.php Log Message: Security fix - Protect post counts from being reset by the general public Index: Manager.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** Manager.php 1 Mar 2006 14:50:18 -0000 1.71 --- Manager.php 1 Mar 2006 20:47:43 -0000 1.72 *************** *** 1269,1272 **** --- 1269,1287 ---- + function _recalc_users() { + if(!$_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_forums')) { + $message = $_SESSION['translate']->it('Access to update user posts counts was denied due to lack of proper permissions.'); + $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Manager::_recalc_users()', $message, 'exit', 1); + $error->message(); + return FALSE; + } else { + /* Resets all post count to 0 so they'll be recalculated on user_load */ + $GLOBALS['core']->query('UPDATE mod_phpwsbb_user_info SET posts=0', true); + $GLOBALS['CNT_phpwsbb']['title'] = $_SESSION['translate']->it('Bulletin Board Forums'); + $GLOBALS['CNT_phpwsbb']['content'] = $_SESSION['translate']->it('All user post counts have been reset.'); + } + }// END FUNC recalc_users + + function action() { if(PHPWS_Message::isMessage($this->notice)) { *************** *** 1433,1447 **** case 'recalc_users': ! /* Resets all post count to 0 so they'll be recalculated on user_load */ ! $GLOBALS['core']->query('UPDATE mod_phpwsbb_user_info SET posts=0', true); ! $GLOBALS['CNT_phpwsbb']['title'] = $_SESSION['translate']->it('Bulletin Board Forums'); ! $GLOBALS['CNT_phpwsbb']['content'] = $_SESSION['translate']->it('All user post counts have been reset.'); break; case 'getnew': ! if (!$since = $GLOBALS['core']->getOne('SELECT last_on FROM mod_phpwsbb_user_info WHERE user_id = '.$_SESSION['OBJ_user']->user_id, 1)) ! $since = time(); ! $GLOBALS['CNT_phpwsbb']['title'] = $_SESSION['translate']->it('New Posts Since My Last Visit on [var1]', date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, $since)); ! $GLOBALS['CNT_phpwsbb']['content'] = $this->_menu() . $this->_listNewThreads($since); break; } --- 1448,1460 ---- case 'recalc_users': ! $this->_recalc_users(); ! $this->_list(); break; case 'getnew': ! if (!$since = $GLOBALS['core']->getOne('SELECT last_on FROM mod_phpwsbb_user_info WHERE user_id = '.$_SESSION['OBJ_user']->user_id, 1)) ! $since = time(); ! $GLOBALS['CNT_phpwsbb']['title'] = $_SESSION['translate']->it('New Posts Since My Last Visit on [var1]', date(PHPWS_DATE_FORMAT . ' ' . PHPWS_TIME_FORMAT, $since)); ! $GLOBALS['CNT_phpwsbb']['content'] = $this->_menu() . $this->_listNewThreads($since); break; } *************** *** 1548,1550 **** } ! ?> \ No newline at end of file --- 1561,1563 ---- } ! ?> |
|
From: Shaun M. <sin...@us...> - 2006-03-01 18:18:33
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28337 Modified Files: Thread.php Log Message: RFE # [ 1044661 ] Posting to a locked thread Removing Popbox Titles on boxes with messages eg. monitor/unmonitor Index: Thread.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** Thread.php 1 Mar 2006 14:45:16 -0000 1.84 --- Thread.php 1 Mar 2006 18:18:28 -0000 1.85 *************** *** 219,225 **** if (!$ro) { ! $reply = $_SESSION['translate']->it('Reply'); ! $tags['REPLY'] = $this->createLink($reply, array('PHPWSBB_MAN_OP'=>'reply', ! 'PHPWS_MAN_ITEMS[]'=>$this->getId()), 'reply_message.png', 16, 16); if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'lock_threads') && $this->isModerator) { if ($this->_locked) { --- 219,227 ---- if (!$ro) { ! if (!$this->_locked || $_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_messages') || $this->isModerator) { ! $reply = $_SESSION['translate']->it('Reply'); ! $tags['REPLY'] = $this->createLink($reply, array('PHPWSBB_MAN_OP'=>'reply', ! 'PHPWS_MAN_ITEMS[]'=>$this->getId()), 'reply_message.png', 16, 16); ! } if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'lock_threads') && $this->isModerator) { if ($this->_locked) { *************** *** 467,472 **** } else { - $title = $_SESSION['translate']->it('Delete Topic Confirmation'); - $form = new EZform('PHPWSBB_Thread_delete'); $form->add('module', 'hidden', 'phpwsbb'); --- 469,472 ---- *************** *** 480,485 **** $tags['MESSAGE'] = $_SESSION['translate']->it('Are you sure you want to delete this topic?'); ! $content = PHPWS_Template::processTemplate($tags, 'phpwsbb', 'delete.tpl'); ! $_SESSION['OBJ_layout']->popbox($title, $content, NULL, 'CNT_phpwsbb'); } --- 480,485 ---- $tags['MESSAGE'] = $_SESSION['translate']->it('Are you sure you want to delete this topic?'); ! $GLOBALS['CNT_phpwsbb']['title'] = $_SESSION['translate']->it('Delete Topic Confirmation'); ! $GLOBALS['CNT_phpwsbb']['content'] = PHPWS_Template::processTemplate($tags, 'phpwsbb', 'delete.tpl'); } *************** *** 586,590 **** if ($_SESSION['PHPWSBB_Manager']->_allow_user_monitors) { if (empty($_SESSION['OBJ_user']->user_id)) { ! $GLOBALS['CNT_phpwsbb']['content'] .= '<div class="errortext">' . $_SESSION['translate']->it('You must be a registered user and logged in to monitor topics.') . '</div>'; } else { $data = array(); --- 586,590 ---- if ($_SESSION['PHPWSBB_Manager']->_allow_user_monitors) { if (empty($_SESSION['OBJ_user']->user_id)) { ! $content = '<div class="errortext">' . $_SESSION['translate']->it('You must be a registered user and logged in to monitor topics.') . '</div>'; } else { $data = array(); *************** *** 592,608 **** $data['user_id'] = $_SESSION['OBJ_user']->user_id; if ($GLOBALS['core']->sqlInsert($data, 'mod_phpwsbb_monitors', TRUE, FALSE, FALSE, FALSE)) { ! $GLOBALS['CNT_phpwsbb']['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 { ! $GLOBALS['CNT_phpwsbb']['content'] .= '<div class="errortext">' . $_SESSION['translate']->it('There was a problem adding the monitor entry. Please try again or contact the system administrator.') . '</div>'; } ! $GLOBALS['CNT_phpwsbb']['content'] .= '<p>' . $this->createLink($_SESSION['translate']->it('Back to the topic.'), array('PHPWSBB_MAN_OP'=>'view','PHPWS_MAN_ITEMS[]'=>$this->getId())) . ' | '; ! $GLOBALS['CNT_phpwsbb']['content'] .= $this->createLink($_SESSION['translate']->it('Back to the forum.'), array('PHPWSBB_MAN_OP'=>'viewforum','PHPWS_MAN_ITEMS[]'=>$this->_fid)) . '</p>'; } ! ! //$_REQUEST['PHPWSBB_THREAD_OP'] = 'view'; ! //$this->action(); } }// END FUNC _monitor --- 592,606 ---- $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 { ! $content = '<div class="errortext">' . $_SESSION['translate']->it('There was a problem adding the monitor entry. Please try again or contact the system administrator.') . '</div>'; } ! $content .= '<p>' . $this->createLink($_SESSION['translate']->it('Back to the topic.'), array('PHPWSBB_MAN_OP'=>'view','PHPWS_MAN_ITEMS[]'=>$this->getId())) . ' | '; ! $content .= $this->createLink($_SESSION['translate']->it('Back to the forum.'), array('PHPWSBB_MAN_OP'=>'viewforum','PHPWS_MAN_ITEMS[]'=>$this->_fid)) . '</p>'; } ! return $content; } }// END FUNC _monitor *************** *** 615,627 **** $data['user_id'] = $_SESSION['OBJ_user']->user_id; if ($GLOBALS['core']->sqlDelete('mod_phpwsbb_monitors', $data)) { ! $GLOBALS['CNT_phpwsbb']['content'] .= $_SESSION['translate']->it('Monitor successfully removed.'); $this->monitored = FALSE; } else { ! $GLOBALS['CNT_phpwsbb']['content'] .= '<div class="errortext">' . $_SESSION['translate']->it('There was a problem removing the monitor entry. Please try again or contact the system administrator.') . '</div>'; } ! $GLOBALS['CNT_phpwsbb']['content'] .= '<p>' . $this->createLink($_SESSION['translate']->it('Back to the topic.'), ! array('PHPWSBB_MAN_OP'=>'view','PHPWS_MAN_ITEMS[]'=>$this->getId())) . ' | '; ! $GLOBALS['CNT_phpwsbb']['content'] .= $this->createLink($_SESSION['translate']->it('Back to the forum.'), ! array('PHPWSBB_MAN_OP'=>'viewforum','PHPWS_MAN_ITEMS[]'=>$this->_fid)) . '</p>'; } }// END FUNC _unmonitor --- 613,626 ---- $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 { ! $content = '<div class="errortext">' . $_SESSION['translate']->it('There was a problem removing the monitor entry. Please try again or contact the system administrator.') . '</div>'; } ! $content .= '<p>' . $this->createLink($_SESSION['translate']->it('Back to the topic.'), ! array('PHPWSBB_MAN_OP'=>'view','PHPWS_MAN_ITEMS[]'=>$this->getId())) . ' | '; ! $content .= $this->createLink($_SESSION['translate']->it('Back to the forum.'), ! array('PHPWSBB_MAN_OP'=>'viewforum','PHPWS_MAN_ITEMS[]'=>$this->_fid)) . '</p>'; ! return $content; } }// END FUNC _unmonitor *************** *** 632,636 **** $this->_fid = $_REQUEST['Thread_fid']; if ($oldfid == $this->_fid) ! return $_SESSION['translate']->it('You tried to move it to current forum.'); $this->commit(); --- 631,635 ---- $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(); *************** *** 676,684 **** case 'monitor': ! $this->_monitor(); break; case 'unmonitor': ! $this->_unmonitor(); break; --- 675,687 ---- case 'monitor': ! $title = $_SESSION['translate']->it('Monitor'); ! $content = $_SESSION['PHPWSBB_Manager']->_menu(NULL, $this); ! $content .= $this->_monitor(); break; case 'unmonitor': ! $title = $_SESSION['translate']->it('Monitor'); ! $content = $_SESSION['PHPWSBB_Manager']->_menu(NULL, $this); ! $content .= $this->_unmonitor(); break; |
|
From: Shaun M. <sin...@us...> - 2006-03-01 18:14:56
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24318 Modified Files: Message.php Log Message: RFE # [ 1044661 ] Posting to a locked thread Index: Message.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Message.php,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** Message.php 1 Mar 2006 14:48:33 -0000 1.88 --- Message.php 1 Mar 2006 18:14:52 -0000 1.89 *************** *** 263,267 **** // Need to see if thread is locked $thread = new PHPWSBB_Thread($this->_tid); ! if ($thread->_locked) { $message = '<div class="errortext">' . $_SESSION['translate']->it('This thread has been locked.') . '</div>'; $GLOBALS['CNT_phpwsbb']['content'] .= $message; --- 263,267 ---- // Need to see if thread is locked $thread = new PHPWSBB_Thread($this->_tid); ! if ($thread->_locked && !$_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_messages') && !$this->isModerator) { $message = '<div class="errortext">' . $_SESSION['translate']->it('This thread has been locked.') . '</div>'; $GLOBALS['CNT_phpwsbb']['content'] .= $message; |
|
From: Shaun M. <sin...@us...> - 2006-03-01 18:13:12
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22072 Modified Files: Forum.php Log Message: Removing popbox Index: Forum.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Forum.php,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** Forum.php 1 Mar 2006 14:52:10 -0000 1.44 --- Forum.php 1 Mar 2006 18:13:07 -0000 1.45 *************** *** 395,401 **** $_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>'; ! } --- 395,401 ---- $_SESSION['OBJ_fatcat']->saveSelect($this->getLabel(), 'index.php?module=phpwsbb&PHPWSBB_MAN_OP=viewforum&PHPWS_MAN_ITEMS=' . $this->getId(), $this->getId()); ! $content = '<p>' . $_SESSION['translate']->it('Your forum was successfully saved.') . '</p>'; ! $content .= '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=list">' . $_SESSION['translate']->it('Back to Forums') . '</a>'; ! return $content; } *************** *** 462,467 **** } else { - $title = $_SESSION['translate']->it('Delete Forum Confirmation'); - $form = new EZform('PHPWSBB_Forum_delete'); $form->add('module', 'hidden', 'phpwsbb'); --- 462,465 ---- *************** *** 475,480 **** $tags['MESSAGE'] = $_SESSION['translate']->it('Are you sure you want to delete this forum and all its threads and messages?'); ! $content = PHPWS_Template::processTemplate($tags, 'phpwsbb', 'delete.tpl'); ! $_SESSION['OBJ_layout']->popbox($title, $content, NULL, 'CNT_phpwsbb'); } --- 473,478 ---- $tags['MESSAGE'] = $_SESSION['translate']->it('Are you sure you want to delete this forum and all its threads and messages?'); ! $GLOBALS['CNT_phpwsbb']['title'] = $_SESSION['translate']->it('Delete Forum Confirmation'); ! $GLOBALS['CNT_phpwsbb']['content'] = PHPWS_Template::processTemplate($tags, 'phpwsbb', 'delete.tpl'); } *************** *** 501,505 **** case 'save': ! $this->_save(); break; --- 499,505 ---- case 'save': ! $title = $_SESSION['translate']->it('Saving Forum'); ! $content = $_SESSION['PHPWSBB_Manager']->_menu($this); ! $content .= $this->_save(); break; |
|
From: Shaun M. <sin...@us...> - 2006-03-01 14:53:24
|
Update of /cvsroot/phpwsbb/phpwsbb/img In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21951 Added Files: gear.png view_text.png Log Message: New images for menu functions --- NEW FILE: view_text.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: gear.png --- (This appears to be a binary file; contents omitted.) |
|
From: Shaun M. <sin...@us...> - 2006-03-01 14:52:24
|
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)) |
|
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')) { |
|
From: Shaun M. <sin...@us...> - 2006-03-01 14:48:38
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19089 Modified Files: Message.php Log Message: Use PREVIEW tag in message editing Index: Message.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Message.php,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** Message.php 27 Feb 2006 01:08:07 -0000 1.87 --- Message.php 1 Mar 2006 14:48:33 -0000 1.88 *************** *** 350,353 **** --- 350,359 ---- $tags = $form->getTemplate(); + if(isset($_REQUEST['Message_preview'])) { + unset($_REQUEST['Message_preview']); + $tags['PREVIEW_TEXT'] = $_SESSION['translate']->it('Preview'); + $tags['PREVIEW'] = $this->_preview(); + } + if (empty($_SESSION['OBJ_user']->user_id)) { $tags['GUESTNAME_TEXT'] = $_SESSION['translate']->it('Guest Name'); *************** *** 372,375 **** --- 378,390 ---- /** + * Preview the message whilst editing. + */ + function _preview() { + $content = PHPWS_Text::parseOutput(trim($_REQUEST['Message_body'])); + return $content; + }// END FUNC _preview + + + /** * Reads variables off $_REQUEST array, saves to database, * creating new message and thread when necessary. *************** *** 401,406 **** if (isset($_REQUEST['Message_preview'])) { - $message = PHPWS_Text::parseOutput($_REQUEST['Message_body']); - $_SESSION['PHPWSBB_Manager']->notice = new PHPWS_Message($message, 'CNT_phpwsbb'); $_REQUEST['PHPWSBB_MESSAGE_OP'] = 'edit'; $this->action(); --- 416,419 ---- |
|
From: Shaun M. <sin...@us...> - 2006-03-01 14:45:25
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17223 Modified Files: Thread.php Log Message: Removed local 'new posts' tag. Added title on 'Moved post message' Index: Thread.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** Thread.php 25 Feb 2006 21:29:40 -0000 1.83 --- Thread.php 1 Mar 2006 14:45:16 -0000 1.84 *************** *** 322,327 **** $tags['MYPROFILE'] = $this->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'] = $this->createLink($newposts, array('PHPWSBB_MAN_OP'=>'getnew'), 'new_messages.png', 16, 16); } --- 322,325 ---- *************** *** 686,689 **** --- 684,688 ---- case 'move': + $title = $_SESSION['translate']->it('Topic Moved'); $content = $_SESSION['PHPWSBB_Manager']->_menu(NULL, $this) . $this->_move(); break; |
|
From: Shaun M. <sin...@us...> - 2006-03-01 14:43:22
|
Update of /cvsroot/phpwsbb/phpwsbb/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16011 Modified Files: install.sql update.php Log Message: Added settings for categories on/off Index: install.sql =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/boost/install.sql,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** install.sql 23 Feb 2006 06:16:36 -0000 1.24 --- install.sql 1 Mar 2006 14:43:16 -0000 1.25 *************** *** 100,106 **** use_signatures smallint NOT NULL default '1', use_views smallint NOT NULL default '0', ! use_low_priority smallint NOT NULL default '0' ); ! INSERT INTO mod_phpwsbb_settings VALUES (1, 1, NULL, 'The thread [name] has been updated. Go to [url] to view it.', 0, 1, 1, 'Forums', 1, 'Latest Forum Posts', 5, 0, 1, 0, 90, 90, 6, 1, 0, 0); CREATE TABLE mod_phpwsbb_user_ranks ( --- 100,107 ---- use_signatures smallint NOT NULL default '1', use_views smallint NOT NULL default '0', ! use_low_priority smallint NOT NULL default '0', ! show_categories smallint NOT NULL default '1' ); ! INSERT INTO mod_phpwsbb_settings VALUES (1, 1, NULL, 'The thread [name] has been updated. Go to [url] to view it.', 0, 1, 1, 'Forums', 1, 'Latest Forum Posts', 5, 0, 1, 0, 90, 90, 6, 1, 0, 0, 1); CREATE TABLE mod_phpwsbb_user_ranks ( Index: update.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/boost/update.php,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** update.php 23 Feb 2006 06:16:36 -0000 1.51 --- update.php 1 Mar 2006 14:43:16 -0000 1.52 *************** *** 355,358 **** --- 355,363 ---- $content .= '<div class="errortext">There was a problem creating the "View new posts" settings in the User Settings table.</div>'; + if ($status = $GLOBALS['core']->query('ALTER TABLE mod_phpwsbb_settings ADD show_categories smallint NOT NULL default "1"', TRUE)) + $content .= '* Added Settings for category related features.<br />'; + else + $content .= '<div class="errortext">There was a problem creating the category settings in the settings table.</div>'; + $content .= '* Copying images to /images/phpwsbb/<br />'; /* Copy new image files */ |
|
From: Shaun M. <sin...@us...> - 2006-03-01 14:42:25
|
Update of /cvsroot/phpwsbb/phpwsbb/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15502 Modified Files: menu.tpl Log Message: Expanded role for menu.tpl to include global functions like new posts, settings and categories Index: menu.tpl =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/templates/menu.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** menu.tpl 4 Feb 2006 01:37:57 -0000 1.5 --- menu.tpl 1 Mar 2006 14:42:20 -0000 1.6 *************** *** 1,20 **** - <!-- BEGIN FORUM_ADMIN --> <div style="text-align:right; border-bottom: 1px solid; margin-bottom:1em"> <!-- BEGIN SETTINGS --> ! {SETTINGS} <!-- END SETTINGS --> </div> - <!-- END FORUM_ADMIN --> - <!-- BEGIN LIST --> - {LIST} - <!-- END LIST --> <!-- BEGIN FORUM --> ! :: {FORUM} <!-- END FORUM --> <!-- BEGIN THREAD --> :: {THREAD} <!-- END THREAD --> ! <br /> ! {PHPWSBB_MESSAGE} ! <br /> --- 1,28 ---- <div style="text-align:right; border-bottom: 1px solid; margin-bottom:1em"> + <!-- BEGIN LIST --> + {LIST} + <!-- END LIST --> + <!-- BEGIN CATEGORIES --> + {CATEGORIES} + <!-- END CATEGORIES --> + <!-- BEGIN NEW_POSTS --> + {NEW_POSTS} + <!-- END NEW_POSTS --> + <!-- BEGIN MYPROFILE --> + {MYPROFILE} + <!-- BEGIN MYPROFILE --> <!-- BEGIN SETTINGS --> ! {SETTINGS} <!-- END SETTINGS --> </div> <!-- BEGIN FORUM --> ! {FORUM} <!-- END FORUM --> <!-- BEGIN THREAD --> :: {THREAD} <!-- END THREAD --> ! ! <!-- BEGIN PHPWSBB_MESSAGE --> ! <p>{PHPWSBB_MESSAGE}</p> ! <!-- END PHPWSBB_MESSAGE --> \ No newline at end of file |
|
From: Shaun M. <sin...@us...> - 2006-03-01 14:40:31
|
Update of /cvsroot/phpwsbb/phpwsbb/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14426 Modified Files: view_forum_top.tpl view_thread_top.tpl Log Message: Removed settings and new posts Index: view_forum_top.tpl =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/templates/view_forum_top.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** view_forum_top.tpl 23 Feb 2006 06:16:37 -0000 1.5 --- view_forum_top.tpl 1 Mar 2006 14:40:25 -0000 1.6 *************** *** 1,9 **** <!-- BEGIN DESCRIPTION --> ! {DESCRIPTION}<br /><br /> <!-- END DESCRIPTION --> <!-- BEGIN CATEGORY --> ! {CATEGORY_TEXT}: {CATEGORY}<br /> <!-- END CATEGORY --> - <!-- BEGIN ACTIONS --> <!-- BEGIN NEW --> {NEW} --- 1,8 ---- <!-- BEGIN DESCRIPTION --> ! <p>{DESCRIPTION}</p> <!-- END DESCRIPTION --> <!-- BEGIN CATEGORY --> ! <p>{CATEGORY_TEXT}: {CATEGORY}</p> <!-- END CATEGORY --> <!-- BEGIN NEW --> {NEW} *************** *** 18,26 **** {HIDE} <!-- END HIDE --> - <!-- BEGIN PROFILE --> - {MYPROFILE} - <!-- END PROFILE --> - <!-- BEGIN NEWSTUFF --> - {NEW_POSTS} - <!-- END NEWSTUFF --> <!-- END ACTIONS --> \ No newline at end of file --- 17,19 ---- Index: view_thread_top.tpl =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/templates/view_thread_top.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** view_thread_top.tpl 23 Feb 2006 06:16:37 -0000 1.6 --- view_thread_top.tpl 1 Mar 2006 14:40:25 -0000 1.7 *************** *** 1,2 **** --- 1,6 ---- + <!-- BEGIN THREAD_MOVE --> + {START_FORM}{THREAD_FID} {THREAD_MOVE}{END_FORM} + <!-- END THREAD_MOVE --> + <!-- BEGIN ACTIONS --> <!-- BEGIN REPLY --> *************** *** 18,31 **** {STICKY} <!-- END STICKY --> - <!-- BEGIN PROFILE --> - {MYPROFILE} - <!-- END PROFILE --> - <!-- BEGIN NEWSTUFF --> - {NEW_POSTS} - <!-- END NEWSTUFF --> <!-- END ACTIONS --> ! <!-- BEGIN THREAD_MOVE --> ! {START_FORM}{THREAD_MOVE} {THREAD_FID}{END_FORM} ! <!-- END THREAD_MOVE --> <table border="0" width="100%" cellspacing="1" cellpadding="4"> <tr class="bg_medium"> --- 22,27 ---- {STICKY} <!-- END STICKY --> <!-- END ACTIONS --> ! <table border="0" width="100%" cellspacing="1" cellpadding="4"> <tr class="bg_medium"> |
|
From: Shaun M. <sin...@us...> - 2006-03-01 14:38:55
|
Update of /cvsroot/phpwsbb/phpwsbb/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13350 Modified Files: view_thread_bottom.tpl Log Message: Removed settings and thread move Index: view_thread_bottom.tpl =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/templates/view_thread_bottom.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** view_thread_bottom.tpl 26 Oct 2004 05:14:08 -0000 1.3 --- view_thread_bottom.tpl 1 Mar 2006 14:38:52 -0000 1.4 *************** *** 19,27 **** {STICKY} <!-- END STICKY --> ! <!-- BEGIN PROFILE --> ! {MYPROFILE} ! <!-- END PROFILE --> ! <!-- END ACTIONS --> ! <!-- BEGIN THREAD_MOVE --> ! {START_FORM}{THREAD_MOVE} {THREAD_FID}{END_FORM} ! <!-- END THREAD_MOVE --> --- 19,21 ---- {STICKY} <!-- END STICKY --> ! <!-- END ACTIONS --> \ No newline at end of file |
|
From: Shaun M. <sin...@us...> - 2006-03-01 14:38:08
|
Update of /cvsroot/phpwsbb/phpwsbb/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12798 Modified Files: view_forum_bottom.tpl Log Message: Removed settings Index: view_forum_bottom.tpl =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/templates/view_forum_bottom.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** view_forum_bottom.tpl 26 Oct 2004 05:14:08 -0000 1.5 --- view_forum_bottom.tpl 1 Mar 2006 14:38:02 -0000 1.6 *************** *** 12,18 **** {HIDE} <!-- END HIDE --> - <!-- BEGIN PROFILE --> - {MYPROFILE} - <!-- END PROFILE --> <!-- END ACTIONS --> --- 12,15 ---- |
