Menu
▾
▴
[phpwsbb-commits] phpwsbb/class Forum.php,1.34,1.35 Manager.php,1.59,1.60 Message.php,1.73,1.74 Runtime.php,1.14,1.15 Thread.php,1.65,1.66
|
From: Wendall C. <wen...@us...> - 2005-01-04 19:08:29
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28320/class Modified Files: Forum.php Manager.php Message.php Runtime.php Thread.php Log Message: fixed bugs #1064611 and #1086227 Index: Thread.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** Thread.php 26 Oct 2004 05:11:07 -0000 1.65 --- Thread.php 4 Jan 2005 19:06:59 -0000 1.66 *************** *** 264,268 **** 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') --- 264,268 ---- 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') *************** *** 329,333 **** $user = $_SESSION['PHPWSBB_Manager']->_load_user_settings($_SESSION['OBJ_user']->user_id); ! if ($_SESSION['PHPWSBB_Manager']->_allow_user_monitors && $new && !$user['suspendmonitors']) { $sql = "SELECT email FROM " . $GLOBALS['core']->tbl_prefix . "mod_phpwsbb_monitors a," . $GLOBALS['core']->tbl_prefix . "mod_users b WHERE a.thread_id=" . $this->getId() . " AND b.user_id=a.user_id and a.user_id != '" . $_SESSION['OBJ_user']->user_id . "'"; $emails = $GLOBALS['core']->getCol($sql); --- 329,334 ---- $user = $_SESSION['PHPWSBB_Manager']->_load_user_settings($_SESSION['OBJ_user']->user_id); ! if (isset($user['suspendmonitors']) && $_SESSION['PHPWSBB_Manager']->_allow_user_monitors ! && $new && !$user['suspendmonitors']) { $sql = "SELECT email FROM " . $GLOBALS['core']->tbl_prefix . "mod_phpwsbb_monitors a," . $GLOBALS['core']->tbl_prefix . "mod_users b WHERE a.thread_id=" . $this->getId() . " AND b.user_id=a.user_id and a.user_id != '" . $_SESSION['OBJ_user']->user_id . "'"; $emails = $GLOBALS['core']->getCol($sql); *************** *** 354,358 **** } ! if (!$this->monitored && $user['monitordefault']) $this->_monitor(); } --- 355,359 ---- } ! if (isset($user['monitordefault']) && !$this->monitored && $user['monitordefault']) $this->_monitor(); } Index: Message.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Message.php,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** Message.php 27 Oct 2004 01:10:38 -0000 1.73 --- Message.php 4 Jan 2005 19:06:56 -0000 1.74 *************** *** 134,139 **** $this->_body = preg_replace(array('/\[quote="(.*)"\]/isU', '/\[quote(?!=".*").*\]/isU', '/\[\/quote\]/isU'), array('<fieldset>
<legend><b>\1</b></legend>
\2', '<fieldset>
', '</fieldset>
'), $this->_body); $tags['BODY'] = PHPWS_Text::parseOutput($this->_body); - $tags['GUESTNAME'] = PHPWS_Text::parseOutput($this->_guestname); - $tags['GUESTEMAIL'] = PHPWS_Text::parseOutput($this->_guestemail); $tags['TID'] = $this->_tid; $tags['REPORT'] = '<a href="index.php?module=phpwsbb&PHPWSBB_MAN_OP=report&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/report.png" border="0" alt="' . $_SESSION['translate']->it('Report this post to administrator') . '" title="' . $_SESSION['translate']->it('Report this post to administrator') . '" /> ' . $_SESSION['translate']->it('Report') . '</a>'; --- 134,137 ---- *************** *** 141,146 **** $poster = $this->getOwner(); if (is_null($poster)) { ! $poster = $this->_guestname . ' (' . $_SESSION['translate']->it('GUEST') . ')'; ! $posteremail = $this->_guestemail; } else { if ($_SESSION['OBJ_user']->username && $_SESSION['OBJ_user']->username!=$this->getOwner()) { --- 139,144 ---- $poster = $this->getOwner(); if (is_null($poster)) { ! $poster = PHPWS_Text::parseOutput($this->_guestname) . ' (' . $_SESSION['translate']->it('GUEST') . ')'; ! $posteremail = PHPWS_Text::parseOutput($this->_guestemail); } else { if ($_SESSION['OBJ_user']->username && $_SESSION['OBJ_user']->username!=$this->getOwner()) { *************** *** 313,316 **** --- 311,315 ---- $form->setRows('Message_body',10); $form->setCols('Message_body',70); + $form->setId('Message_body'); $form->setTab('Message_body', $tabs); $tabs++; Index: Manager.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** Manager.php 26 Oct 2004 05:11:07 -0000 1.59 --- Manager.php 4 Jan 2005 19:06:48 -0000 1.60 *************** *** 276,286 **** if (isset($forum)) ! $tags['FORUM'] = PHPWS_Text::moduleLink($forum->getLabel(), 'phpwsbb', array('PHPWSBB_MAN_OP'=>'viewforum', 'PHPWS_MAN_ITEMS'=>$forum->getId())); if (isset($thread)) { ! $tags['THREAD'] = PHPWS_Text::moduleLink($thread->getLabel(), 'phpwsbb', array('PHPWSBB_MAN_OP'=>'view', 'PHPWS_MAN_ITEMS'=>$thread->getId())); if(!isset($forum)) { $forum = new PHPWSBB_Forum($thread->_fid); ! $tags['FORUM'] = PHPWS_Text::moduleLink($forum->getLabel(), 'phpwsbb', array('PHPWSBB_MAN_OP'=>'viewforum', 'PHPWS_MAN_ITEMS'=>$forum->getId())); } } --- 276,286 ---- if (isset($forum)) ! $tags['FORUM'] = PHPWS_Text::moduleLink(PHPWS_Text::parseOutput($forum->getLabel()), 'phpwsbb', array('PHPWSBB_MAN_OP'=>'viewforum', 'PHPWS_MAN_ITEMS'=>$forum->getId())); if (isset($thread)) { ! $tags['THREAD'] = PHPWS_Text::moduleLink(PHPWS_Text::parseOutput($thread->getLabel()), 'phpwsbb', array('PHPWSBB_MAN_OP'=>'view', 'PHPWS_MAN_ITEMS'=>$thread->getId())); if(!isset($forum)) { $forum = new PHPWSBB_Forum($thread->_fid); ! $tags['FORUM'] = PHPWS_Text::moduleLink(PHPWS_Text::parseOutput($forum->getLabel()), 'phpwsbb', array('PHPWSBB_MAN_OP'=>'viewforum', 'PHPWS_MAN_ITEMS'=>$forum->getId())); } } *************** *** 317,321 **** $this->setSort('hidden=0'); ! $GLOBALS['CNT_phpwsbb']['content'] .= $this->getList('forums', NULL, FALSE); }// END FUNC _list --- 317,321 ---- $this->setSort('hidden=0'); ! $GLOBALS['CNT_phpwsbb']['content'] .= PHPWS_Text::profanityFilter($this->getList('forums', NULL, FALSE)); }// END FUNC _list *************** *** 336,340 **** $this->setSort('fid='.$fid); ! return $this->getList('threads', NULL, FALSE); }// END FUNC _listThreads --- 336,340 ---- $this->setSort('fid='.$fid); ! return PHPWS_Text::profanityFilter($this->getList('threads', NULL, FALSE)); }// END FUNC _listThreads Index: Forum.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Forum.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Forum.php 26 Oct 2004 05:11:07 -0000 1.34 --- Forum.php 4 Jan 2005 19:06:46 -0000 1.35 *************** *** 171,175 **** $tags['LABEL'] = PHPWS_Text::parseOutput($this->getLabel()); $tags['THREADS'] = $this->_threads; ! $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>'; --- 171,175 ---- $tags['LABEL'] = PHPWS_Text::parseOutput($this->getLabel()); $tags['THREADS'] = $this->_threads; ! $tags['DESCRIPTION']= PHPWS_Text::parseOutput($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>'; Index: Runtime.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Runtime.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Runtime.php 8 Oct 2004 13:03:17 -0000 1.14 --- Runtime.php 4 Jan 2005 19:06:59 -0000 1.15 *************** *** 31,35 **** /** ! * Displays block with today's games in it * * @author Don Seiler <do...@NO...> --- 31,35 ---- /** ! * Displays block with today's posts in it * * @author Don Seiler <do...@NO...> *************** *** 59,63 **** $forum = new PHPWSBB_Forum($row); //$block .= PHPWS_Text::moduleLink($forum->getLabel(), 'phpwsbb', array('PHPWSBB_MAN_OP'=>'viewforum', 'PHPWS_MAN_ITEMS'=>$forum->getId())).'<br />'; ! $block .= '<li>' . PHPWS_Text::moduleLink($forum->getLabel(), 'phpwsbb', array('PHPWSBB_MAN_OP'=>'viewforum', 'PHPWS_MAN_ITEMS'=>$forum->getId())) . '</li>'; } $block .= '</ul>'; --- 59,63 ---- $forum = new PHPWSBB_Forum($row); //$block .= PHPWS_Text::moduleLink($forum->getLabel(), 'phpwsbb', array('PHPWSBB_MAN_OP'=>'viewforum', 'PHPWS_MAN_ITEMS'=>$forum->getId())).'<br />'; ! $block .= '<li>' . PHPWS_Text::moduleLink(PHPWS_Text::parseOutput($forum->getLabel()), 'phpwsbb', array('PHPWSBB_MAN_OP'=>'viewforum', 'PHPWS_MAN_ITEMS'=>$forum->getId())) . '</li>'; } $block .= '</ul>'; *************** *** 101,107 **** $thread = new PHPWSBB_Forum($row); if(strlen($thread->getLabel()) > 15) ! $lbl = substr($thread->getLabel(),0,15) . ' ...'; else ! $lbl = $thread->getLabel(); $block .= '<li>' . PHPWS_Text::moduleLink($lbl, 'phpwsbb', array('PHPWSBB_MAN_OP'=>'view', 'PHPWS_MAN_ITEMS'=>$thread->getId())) . '</li>'; $c++; --- 101,107 ---- $thread = new PHPWSBB_Forum($row); if(strlen($thread->getLabel()) > 15) ! $lbl = substr(PHPWS_Text::parseOutput($thread->getLabel()),0,15) . ' ...'; else ! $lbl = PHPWS_Text::parseOutput($thread->getLabel()); $block .= '<li>' . PHPWS_Text::moduleLink($lbl, 'phpwsbb', array('PHPWSBB_MAN_OP'=>'view', 'PHPWS_MAN_ITEMS'=>$thread->getId())) . '</li>'; $c++; |
