Menu
▾
▴
[phpwsbb-commits] phpwsbb/class Forum.php,1.36,1.37 Manager.php,1.62,1.63 Message.php,1.77,1.78 Thread.php,1.72,1.73
|
From: Wendall C. <wen...@us...> - 2005-03-04 18:19:56
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32328/class Modified Files: Forum.php Manager.php Message.php Thread.php Log Message: image dimensions and version bump Index: Thread.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** Thread.php 1 Mar 2005 02:06:01 -0000 1.72 --- Thread.php 4 Mar 2005 18:19:43 -0000 1.73 *************** *** 174,178 **** $content = '<div class="errortext">' . $_SESSION['translate']->it('This topic has no messages.') . '</div>'; if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'delete_threads') && $this->isModerator) ! $content .= '<br /><a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=delete&PHPWS_MAN_ITEMS[]=' . $this->getId() . '">' . $_SESSION['translate']->it('Delete Topic') . '</a>'; return $content; } --- 174,178 ---- $content = '<div class="errortext">' . $_SESSION['translate']->it('This topic has no messages.') . '</div>'; if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'delete_threads') && $this->isModerator) ! $content .= '<br />' . $this->createLink($_SESSION['translate']->it('Delete Topic'), array('PHPWSBB_MAN_OP' => 'delete', 'PHPWS_MAN_ITEMS[]' => $this->getId())); return $content; } *************** *** 195,204 **** if (!$ro) { ! $tags['REPLY'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=reply&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/reply_message.png" border="0" alt="' . $_SESSION['translate']->it('Reply') . '" title="' . $_SESSION['translate']->it('Reply') . '" /> ' . $_SESSION['translate']->it('Reply') . '</a>'; if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'lock_threads') && $this->isModerator) { ! if ($this->_locked) ! $tags['LOCK'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=unlock&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/unlocked.png" border="0" alt="' . $_SESSION['translate']->it('Unlock Topic') . '" title="' . $_SESSION['translate']->it('Unlock Topic') . '" /> ' . $_SESSION['translate']->it('Unlock Topic') . '</a>'; ! else ! $tags['LOCK'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=lock&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/locked.png" border="0" alt="' . $_SESSION['translate']->it('Lock Topic') . '" title="' . $_SESSION['translate']->it('Lock Topic') . '" /> ' . $_SESSION['translate']->it('Lock Topic') . '</a>'; } --- 195,211 ---- 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) { ! $unlock = $_SESSION['translate']->it('Unlock Topic'); ! $tags['LOCK'] = $this->createLink($unlock, array('PHPWSBB_MAN_OP'=>'unlock', ! 'PHPWS_MAN_ITEMS[]'=>$this->getId()), 'unlocked.png', 16, 16); ! } else { ! $lock = $_SESSION['translate']->it('Lock Topic'); ! $tags['LOCK'] = $this->createLink($lock, array('PHPWSBB_MAN_OP'=>'lock', ! 'PHPWS_MAN_ITEMS[]'=>$this->getId()), 'locked.png', 16, 16); ! } } *************** *** 226,244 **** } ! if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'delete_threads') && $this->isModerator) ! $tags['DELETE'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=delete&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/delete.png" border="0" alt="' . $_SESSION['translate']->it('Delete Topic') . '" title="' . $_SESSION['translate']->it('Delete Topic') . '" /> ' . $_SESSION['translate']->it('Delete Topic') . '</a>'; if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_threads') && $this->isModerator) { ! if ($this->isHidden()) ! $tags['HIDE'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=showthread&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/hideshow.png" border="0" alt="' . $_SESSION['translate']->it('Show Topic') . '" title="' . $_SESSION['translate']->it('Show Topic') . '" /> ' . $_SESSION['translate']->it('Show Topic') . '</a>'; ! else ! $tags['HIDE'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=hidethread&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/hideshow.png" border="0" alt="' . $_SESSION['translate']->it('Hide Topic') . '" title="' . $_SESSION['translate']->it('Hide Topic') . '" /> ' . $_SESSION['translate']->it('Hide Topic') . '</a>'; } if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'sticky_threads') && $this->isModerator) { ! if ($this->_sticky) ! $tags['STICKY'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=unstick&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/sticky.png" border="0" alt="' . $_SESSION['translate']->it('Unstick Topic') . '" title="' . $_SESSION['translate']->it('Unstick Topic') . '" /> ' . $_SESSION['translate']->it('Unstick Topic') . '</a>'; ! else ! $tags['STICKY'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=stick&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/sticky.png" border="0" alt="' . $_SESSION['translate']->it('Stick Topic') . '" title="' . $_SESSION['translate']->it('Stick Topic') . '" /> ' . $_SESSION['translate']->it('Stick Topic') . '</a>'; } } --- 233,264 ---- } ! if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'delete_threads') && $this->isModerator) { ! $delete = $_SESSION['translate']->it('Delete Topic'); ! $tags['DELETE'] = $this->createLink($delete, array('PHPWSBB_MAN_OP'=>'delete', ! 'PHPWS_MAN_ITEMS[]'=>$this->getId()), 'delete.png', 16, 16); ! } if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_threads') && $this->isModerator) { ! if ($this->isHidden()) { ! $showthread = $_SESSION['translate']->it('Show Topic'); ! $tags['HIDE'] = $this->createLink($showthread, array('PHPWSBB_MAN_OP'=>'showthread', ! 'PHPWS_MAN_ITEMS[]'=>$this->getId()), 'hideshow.png', 16, 14); ! } else { ! $hidethread = $_SESSION['translate']->it('Hide Topic'); ! $tags['HIDE'] = $this->createLink($hidethread, array('PHPWSBB_MAN_OP'=>'hidethread', ! 'PHPWS_MAN_ITEMS[]'=>$this->getId()), 'hideshow.png', 16, 14); ! } } if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'sticky_threads') && $this->isModerator) { ! if ($this->_sticky) { ! $unstick = $_SESSION['translate']->it('Unstick Topic'); ! $tags['STICKY'] = $this->createLink($unstick, array('PHPWSBB_MAN_OP'=>'unstick', ! 'PHPWS_MAN_ITEMS[]'=>$this->getId()), 'sticky.png', 16, 16); ! } else { ! $stick = $_SESSION['translate']->it('Stick Topic'); ! $tags['STICKY'] = $this->createLink($stick, array('PHPWSBB_MAN_OP'=>'stick', ! 'PHPWS_MAN_ITEMS[]'=>$this->getId()), 'sticky.png', 16, 16); ! } } } *************** *** 246,253 **** if ($_SESSION['PHPWSBB_Manager']->_allow_user_monitors) { if (isset($_SESSION['OBJ_user']->username)) ! if ($this->monitored) ! $tags['MONITOR'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=unmonitor&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/unmonitor.png" border="0" alt="' . $_SESSION['translate']->it('Stop Monitor') . '" title="' . $_SESSION['translate']->it('Stop Monitor') . '" /> ' . $_SESSION['translate']->it('Stop Monitor') . '</a>'; ! else ! $tags['MONITOR'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=monitor&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/monitor.png" border="0" alt="' . $_SESSION['translate']->it('Monitor') . '" title="' . $_SESSION['translate']->it('Monitor') . '" /> ' . $_SESSION['translate']->it('Monitor') . '</a>'; } --- 266,278 ---- if ($_SESSION['PHPWSBB_Manager']->_allow_user_monitors) { if (isset($_SESSION['OBJ_user']->username)) ! if ($this->monitored) { ! $unmonitor = $_SESSION['translate']->it('Stop Monitor'); ! $tags['MONITOR'] = $this->createLink($unmonitor, array('PHPWSBB_MAN_OP'=>'unmonitor', ! 'PHPWS_MAN_ITEMS[]'=>$this->getId()), 'unmonitor.png', 16, 16); ! } else { ! $monitor = $_SESSION['translate']->it('Monitor'); ! $tags['MONITOR'] = $this->createLink($monitor, array('PHPWSBB_MAN_OP'=>'monitor', ! 'PHPWS_MAN_ITEMS[]'=>$this->getId()), 'monitor.png', 16, 16); ! } } *************** *** 263,268 **** $tags['AUTHOR'] = $_SESSION['translate']->it('Author'); $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>' --- 288,296 ---- $tags['AUTHOR'] = $_SESSION['translate']->it('Author'); $tags['MESSAGE'] = $_SESSION['translate']->it('Message'); ! if($_SESSION['OBJ_user']->user_id) { ! $mysettings = $_SESSION['translate']->it('Settings'); ! $tags['MYPROFILE'] = $this->createLink($mysettings, array('PHPWSBB_MAN_OP'=>'usersettings', ! 'PHPWS_MAN_ITEMS[]'=>$this->getId()), 'mysettings.png', 16, 16); ! } return '<a name="bb-top" /></a>' *************** *** 514,520 **** $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><a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS=' . $this->getId() . '">' . $_SESSION['translate']->it('Back to the topic.') . '</a> | '; ! $GLOBALS['CNT_phpwsbb']['content'] .= '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=viewforum&PHPWS_MAN_ITEMS[]=' . $this->_fid . '">' . $_SESSION['translate']->it('Back to the forum.') . '</a></p>'; ! } --- 542,549 ---- $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'] .= '<p>' . $this->createLink($_SESSION['translate']->it('Back to the forum.'), ! array('PHPWSBB_MAN_OP'=>'viewforum','PHPWS_MAN_ITEMS[]'=>$this->_fid)) . '</p>'; } *************** *** 536,541 **** $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'] .= '<br /><a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS=' . $this->getId() . '">' . $_SESSION['translate']->it('Back to the topic.') . '</a><br />'; ! $GLOBALS['CNT_phpwsbb']['content'] .= '<br /><a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=viewforum&PHPWS_MAN_ITEMS[]=' . $this->_fid . '">' . $_SESSION['translate']->it('Back to the forum.') . '</a><br />'; } }// END FUNC _unmonitor --- 565,572 ---- $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'] .= '<br />' . $this->createLink($_SESSION['translate']->it('Back to the topic.'), ! array('PHPWSBB_MAN_OP'=>'view','PHPWS_MAN_ITEMS[]'=>$this->getId())) . '<br />'; ! $GLOBALS['CNT_phpwsbb']['content'] .= '<br />' . $this->createLink($_SESSION['translate']->it('Back to the forum.'), ! array('PHPWSBB_MAN_OP'=>'viewforum','PHPWS_MAN_ITEMS[]'=>$this->_fid)) . '<br />'; } }// END FUNC _unmonitor *************** *** 653,656 **** --- 684,738 ---- return $ret; } + /** + * Quick link function for phpwsBB + * Based on PHPWS_Text:imageLink by Matthew McNaney <ma...@NO...> + * @param string title String to appear as the 'click on' word(s) or image alt + * @param array getVars Associative array of GET variable to append to the link + * @param string image Name of image file will automatically add path info + * @param string height Height of image, requires $image + * @param string width Width of image, requres $image + * @param string link Change default link + * @param string target Window target + * @param class Stylesheet style + * @return string + */ + function createLink($title, $getVars=NULL, $image=NULL, $height=NULL, $width=NULL, $link=NULL, $target=NULL, $class=NULL) { + if(!is_null($link)) + $link = '<a href="' . $link; + else + $link = '<a href="./index.php?module=phpwsbb'; + + if (is_array($getVars)){ + foreach ($getVars as $var_name=>$value){ + $link .= '&'; + $link .= $var_name . '=' . $value; + $i = 1; + } + } + + if ($target == 'blank' || $target === TRUE) + $linkTarget = ' target="_blank" '; + elseif ($target == 'index') + $linkTarget = ' target="index" '; + else + $linkTarget = NULL; + + $link .= '"'; + + if(isset($class)) + $link .= ' class="' . $class . '"'; + if (!is_null($image) && !is_null($width) && !is_null($height)) { + $image = './images/phpwsbb/' . $image; + $img = '<img src="' . $image . '" width="' . $width . '" height="' . + $height . '" border="0" alt="' . $title . '" title="' . $title . + '" /> ' . $title; + if($link !== '-1') + return $link . $linkTarget . '>' . $img . '</a>'; + else + return $img; + } else { + return $link . $linkTarget . '>' . $title . '</a>'; + } + }// END FUNC bbLink() }// END CLASS PHPWSBB_Thread Index: Message.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Message.php,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** Message.php 1 Mar 2005 02:08:04 -0000 1.77 --- Message.php 4 Mar 2005 18:19:42 -0000 1.78 *************** *** 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(); --- 120,125 ---- $tags = $_SESSION['PHPWSBB_Manager']->_load_user_settings($this->_owner_id); $tags['BG'] = $bg; ! $tags['QUOTE'] = PHPWSBB_Thread::createLink($_SESSION['translate']->it('Quote'), array('PHPWSBB_MAN_OP'=>'reply', 'PHPWS_MAN_ITEMS'=>$this->_tid, 'reply_to'=>$this->getId()), 'quote_message.png', 16, 16); ! $tags['NAV'] = PHPWSBB_Thread::createLink($_SESSION["translate"]->it('Back to top'),NULL,'back_to_top.png',16,16,'#bb-top'); $tags['ID'] = $this->getId(); $tags['OWNER'] = $this->getOwner(); *************** *** 135,139 **** $tags['BODY'] = PHPWS_Text::parseOutput($this->_body); $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>'; $poster = $this->getOwner(); --- 133,138 ---- $tags['BODY'] = PHPWS_Text::parseOutput($this->_body); $tags['TID'] = $this->_tid; ! $tags['REPORT'] = PHPWSBB_Thread::createLink($_SESSION['translate']->it('Report this post to administrator'), ! array('PHPWSBB_MAN_OP'=>'report','PHPWS_MAN_ITEMS[]'=>$this->getId()),'report.png',16,16); $poster = $this->getOwner(); *************** *** 146,150 **** $notesinfo = PHPWS_Boost::getVersionInfo('notes'); if (version_compare($notesinfo['version'], '1.6.0') >= 0) ! $tags['NOTE'] = '<a href="index.php?module=notes&NOTE_op=new_note&NOTE_toUser=' . $this->getOwner() . '"><img src="./images/phpwsbb/new_note.png" border="0" alt="' . $_SESSION['translate']->it('Send note to poster') . '" title="' . $_SESSION['translate']->it('Send note to poster') . '" /> ' . $_SESSION['translate']->it('Note to [var1]',$this->getOwner()) . '</a>'; } } --- 145,149 ---- $notesinfo = PHPWS_Boost::getVersionInfo('notes'); if (version_compare($notesinfo['version'], '1.6.0') >= 0) ! $tags['NOTE'] = '<a href="index.php?module=notes&NOTE_op=new_note&NOTE_toUser=' . $this->getOwner() . '"><img src="./images/phpwsbb/new_note.png" border="0" height="16" width="16" alt="' . $_SESSION['translate']->it('Send note to poster') . '" title="' . $_SESSION['translate']->it('Send note to poster') . '" /> ' . $_SESSION['translate']->it('Note to [var1]',$this->getOwner()) . '</a>'; } } *************** *** 171,189 **** if (($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_messages') && $this->isModerator) || ($this->getOwner() && ($_SESSION['OBJ_user']->username == $this->getOwner()))) ! $tags['EDIT'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=edit&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/edit.png" border="0" alt="' . $_SESSION['translate']->it('Edit') . '" title="' . $_SESSION['translate']->it('Edit') . '" /> ' . $_SESSION['translate']->it('Edit') . '</a>'; if (($_SESSION['OBJ_user']->allow_access('phpwsbb', 'delete_messages') && $this->isModerator) || ($this->getOwner() && ($_SESSION['OBJ_user']->username == $this->getOwner()))) ! $tags['DELETE'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=deletemessage&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/delete.png" border="0" alt="' . $_SESSION['translate']->it('Delete') . '" title="' . $_SESSION['translate']->it('Delete') . '" /> ' . $_SESSION['translate']->it('Delete') . '</a>'; if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_messages') && $this->isModerator) { if ($this->isHidden()) ! $tags['HIDE'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=showmessage&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/hideshow.png" border="0" alt="' . $_SESSION['translate']->it('Show Message') . '" title="' . $_SESSION['translate']->it("Show Message") . '" /> ' . $_SESSION['translate']->it('Show Message') . '</a>'; else ! $tags['HIDE'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=hidemessage&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/hideshow.png" border="0" alt="' . $_SESSION['translate']->it('Hide Message') . '" title="' . $_SESSION['translate']->it('Hide Message') . '" /> ' . $_SESSION['translate']->it('Hide Message') . '</a>'; } $thread = new PHPWSBB_Thread($this->_tid); if (($_SESSION['OBJ_user']->allow_access('phpwsbb', 'fork_messages') && $this->isModerator) && ($thread->_replies > 0)) ! $tags['FORK'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=fork&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/fork.png" border="0" alt="' . $_SESSION['translate']->it('Fork') . '" title="' . $_SESSION['translate']->it('Fork') . '" /> ' . $_SESSION['translate']->it('Fork') . '</a>'; if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'view_ips') && $this->isModerator) { --- 170,188 ---- if (($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_messages') && $this->isModerator) || ($this->getOwner() && ($_SESSION['OBJ_user']->username == $this->getOwner()))) ! $tags['EDIT'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=edit&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/edit.png" border="0" height="16" width="16" alt="' . $_SESSION['translate']->it('Edit') . '" title="' . $_SESSION['translate']->it('Edit') . '" /> ' . $_SESSION['translate']->it('Edit') . '</a>'; if (($_SESSION['OBJ_user']->allow_access('phpwsbb', 'delete_messages') && $this->isModerator) || ($this->getOwner() && ($_SESSION['OBJ_user']->username == $this->getOwner()))) ! $tags['DELETE'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=deletemessage&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/delete.png" border="0" height="16" width="16" alt="' . $_SESSION['translate']->it('Delete') . '" title="' . $_SESSION['translate']->it('Delete') . '" /> ' . $_SESSION['translate']->it('Delete') . '</a>'; if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_messages') && $this->isModerator) { if ($this->isHidden()) ! $tags['HIDE'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=showmessage&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/hideshow.png" border="0" height="16" width="16" alt="' . $_SESSION['translate']->it('Show Message') . '" title="' . $_SESSION['translate']->it("Show Message") . '" /> ' . $_SESSION['translate']->it('Show Message') . '</a>'; else ! $tags['HIDE'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=hidemessage&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/hideshow.png" border="0" height="16" width="16" alt="' . $_SESSION['translate']->it('Hide Message') . '" title="' . $_SESSION['translate']->it('Hide Message') . '" /> ' . $_SESSION['translate']->it('Hide Message') . '</a>'; } $thread = new PHPWSBB_Thread($this->_tid); if (($_SESSION['OBJ_user']->allow_access('phpwsbb', 'fork_messages') && $this->isModerator) && ($thread->_replies > 0)) ! $tags['FORK'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=fork&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/fork.png" border="0" height="16" width="16" alt="' . $_SESSION['translate']->it('Fork') . '" title="' . $_SESSION['translate']->it('Fork') . '" /> ' . $_SESSION['translate']->it('Fork') . '</a>'; if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'view_ips') && $this->isModerator) { *************** *** 193,197 **** 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) { --- 192,196 ---- 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" height="16" width="16" 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) { *************** *** 209,225 **** if ($ib) ! $tags['BAN_IP'] = ' <a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=unbanip&PHPWS_MAN_ITEMS[]=' . $this->getIp() . '"><img src="./images/phpwsbb/ok.png" border="0" alt="' . $_SESSION['translate']->it('Unban this IP') . '" title="' . $_SESSION['translate']->it('Unban this IP') . '" /> ' . $_SESSION['translate']->it('Unban this IP') . '</a>'; else ! $tags['BAN_IP'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=banip&PHPWS_MAN_ITEMS[]=' . $this->getIp() . '"><img src="./images/phpwsbb/ban.png" border="0" alt="' . $_SESSION['translate']->it('Ban this IP') . '" title="' . $_SESSION['translate']->it('Ban this IP') . '" /> ' . $_SESSION['translate']->it('Ban this IP') . '</a>'; if ($this->getOwner()) if ($ub) ! $tags['BAN_USERNAME'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=unbanusername&PHPWS_MAN_ITEMS[]=' . $this->getOwner() . '"><img src="./images/phpwsbb/ok.png" border="0" alt="' . $_SESSION['translate']->it('Unban this Poster') . '" title="' . $_SESSION['translate']->it('Unban this Poster') . '" /> ' . $_SESSION['translate']->it('Allow [var1] (Banned)', $this->getOwner()) . '</a>'; else ! $tags['BAN_USERNAME'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=banusername&PHPWS_MAN_ITEMS[]=' . $this->getOwner() . '"><img src="./images/phpwsbb/ban.png" border="0" alt="' . $_SESSION['translate']->it('Ban this Poster') . '" title="' . $_SESSION['translate']->it('Ban this Poster') . '" /> ' . $_SESSION['translate']->it('Ban [var1]', $this->getOwner()) . '</a>'; } else { ! $tags['BAN_IP'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=banip&PHPWS_MAN_ITEMS[]=' . $this->getIp() . '"><img src="./images/phpwsbb/ban.png" border="0" alt="' . $_SESSION['translate']->it('Ban this IP') . '" title="' . $_SESSION['translate']->it('Ban this IP') . '" /> ' . $_SESSION['translate']->it('Ban this IP') . '</a>'; if ($this->getOwner()) ! $tags['BAN_USERNAME'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=banusername&PHPWS_MAN_ITEMS[]=' . $this->getOwner() . '"><img src="./images/phpwsbb/ban.png" border="0" alt="' . $_SESSION['translate']->it('Ban this Poster') . '" title="' . $_SESSION['translate']->it('Ban this Poster') . '" /> ' . $_SESSION['translate']->it('Ban [var1]', $this->getOwner()) . '</a>'; } } --- 208,224 ---- if ($ib) ! $tags['BAN_IP'] = ' <a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=unbanip&PHPWS_MAN_ITEMS[]=' . $this->getIp() . '"><img src="./images/phpwsbb/ok.png" border="0" height="16" width="16" alt="' . $_SESSION['translate']->it('Unban this IP') . '" title="' . $_SESSION['translate']->it('Unban this IP') . '" /> ' . $_SESSION['translate']->it('Unban this IP') . '</a>'; else ! $tags['BAN_IP'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=banip&PHPWS_MAN_ITEMS[]=' . $this->getIp() . '"><img src="./images/phpwsbb/ban.png" border="0" height="16" width="16" alt="' . $_SESSION['translate']->it('Ban this IP') . '" title="' . $_SESSION['translate']->it('Ban this IP') . '" /> ' . $_SESSION['translate']->it('Ban this IP') . '</a>'; if ($this->getOwner()) if ($ub) ! $tags['BAN_USERNAME'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=unbanusername&PHPWS_MAN_ITEMS[]=' . $this->getOwner() . '"><img src="./images/phpwsbb/ok.png" border="0" height="16" width="16" alt="' . $_SESSION['translate']->it('Unban this Poster') . '" title="' . $_SESSION['translate']->it('Unban this Poster') . '" /> ' . $_SESSION['translate']->it('Allow [var1] (Banned)', $this->getOwner()) . '</a>'; else ! $tags['BAN_USERNAME'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=banusername&PHPWS_MAN_ITEMS[]=' . $this->getOwner() . '"><img src="./images/phpwsbb/ban.png" border="0" height="16" width="16" alt="' . $_SESSION['translate']->it('Ban this Poster') . '" title="' . $_SESSION['translate']->it('Ban this Poster') . '" /> ' . $_SESSION['translate']->it('Ban [var1]', $this->getOwner()) . '</a>'; } else { ! $tags['BAN_IP'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=banip&PHPWS_MAN_ITEMS[]=' . $this->getIp() . '"><img src="./images/phpwsbb/ban.png" border="0" height="16" width="16" alt="' . $_SESSION['translate']->it('Ban this IP') . '" title="' . $_SESSION['translate']->it('Ban this IP') . '" /> ' . $_SESSION['translate']->it('Ban this IP') . '</a>'; if ($this->getOwner()) ! $tags['BAN_USERNAME'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=banusername&PHPWS_MAN_ITEMS[]=' . $this->getOwner() . '"><img src="./images/phpwsbb/ban.png" border="0" height="16" width="16" alt="' . $_SESSION['translate']->it('Ban this Poster') . '" title="' . $_SESSION['translate']->it('Ban this Poster') . '" /> ' . $_SESSION['translate']->it('Ban [var1]', $this->getOwner()) . '</a>'; } } *************** *** 740,744 **** if ($prefix) { if ($this->isHidden()) ! $lab = '<img src="./images/phpwsbb/hideshow.png" border="0" alt="' . $_SESSION['translate']->it('Hidden') . '" title="' . $_SESSION['translate']->it('Hidden') . '" /> ' . $lab; } return $lab; --- 739,743 ---- if ($prefix) { if ($this->isHidden()) ! $lab = '<img src="./images/phpwsbb/hideshow.png" border="0" height="16" width="16" alt="' . $_SESSION['translate']->it('Hidden') . '" title="' . $_SESSION['translate']->it('Hidden') . '" /> ' . $lab; } return $lab; Index: Forum.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Forum.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** Forum.php 5 Jan 2005 00:45:33 -0000 1.36 --- Forum.php 4 Mar 2005 18:19:42 -0000 1.37 *************** *** 172,177 **** $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>'; if(!empty($this->_moderators)) { if($tmp = $GLOBALS['core']->getCol('SELECT username FROM mod_users WHERE user_id IN ('.$this->_moderators.')', TRUE)) --- 172,180 ---- $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); ! } if(!empty($this->_moderators)) { if($tmp = $GLOBALS['core']->getCol('SELECT username FROM mod_users WHERE user_id IN ('.$this->_moderators.')', TRUE)) *************** *** 183,199 **** if(!$ro) { ! $tags['NEW'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=new&fid=' . $this->getId() . '"><img src="./images/phpwsbb/new_message.png" border="0" alt="' . $_SESSION['translate']->it('New Topic') . '" title="' . $_SESSION['translate']->it('New Topic') . '" /> ' . $_SESSION['translate']->it('New Topic') . '</a>'; if($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_forums')) ! $tags['EDIT'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=editforum&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/edit.png" border="0" alt="' . $_SESSION['translate']->it('Edit Forum') . '" title="' . $_SESSION['translate']->it('Edit Forum') . '" /> ' . $_SESSION['translate']->it('Edit Forum') . '</a>'; if($_SESSION['OBJ_user']->allow_access('phpwsbb', 'delete_forums')) ! $tags['DELETE'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=deleteforum&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/delete.png" border="0" alt="' . $_SESSION['translate']->it('Delete Forum') . '" title="' . $_SESSION['translate']->it('Delete Forum') . '" /> ' . $_SESSION['translate']->it('Delete Forum') . '</a>'; if($_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_threads') && $this->isModerator) { ! if($this->isHidden()) ! $tags['HIDE'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=showforum&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/hideshow.png" border="0" alt="' . $_SESSION['translate']->it('Show Forum') . '" title="' . $_SESSION['translate']->it('Show Forum') . '" /> ' . $_SESSION['translate']->it('Show Forum') . '</a>'; ! else ! $tags['HIDE'] = '<a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=hideforum&PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/hideshow.png" border="0" alt="' . $_SESSION['translate']->it('Hide Forum') . '" title="' . $_SESSION['translate']->it('Hide Forum') . '" /> ' . $_SESSION['translate']->it('Hide Forum') . '</a>'; } } --- 186,212 ---- if(!$ro) { ! $tags['NEW'] = PHPWSBB_Thread::createLink($_SESSION['translate']->it('New Topic'), ! array('PHPWSBB_MAN_OP'=>'new','fid'=>$this->getId()),'new_message.png',16,16); if($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_forums')) ! $tags['EDIT'] = PHPWSBB_Thread::createLink($_SESSION['translate']->it('Edit Forum'), ! array('PHPWSBB_MAN_OP'=>'editforum','PHPWS_MAN_ITEMS[]'=>$this->getId()), ! 'edit.png', 16,16); if($_SESSION['OBJ_user']->allow_access('phpwsbb', 'delete_forums')) ! $tags['DELETE'] = PHPWSBB_Thread::createLink($_SESSION['translate']->it('Delete Forum'), ! array('PHPWSBB_MAN_OP'=>'deleteforum','PHPWS_MAN_ITEMS[]'=>$this->getId()), ! 'delete.png',16,16); if($_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_threads') && $this->isModerator) { ! if ($this->isHidden()) { ! $showforum = $_SESSION['translate']->it('Show Forum'); ! $tags['HIDE'] = PHPWSBB_Thread::createLink($showforum, array('PHPWSBB_MAN_OP'=>'showforum', ! 'PHPWS_MAN_ITEMS[]'=>$this->getId()), 'hideshow.png', 16, 16); ! } else { ! $hideforum = $_SESSION['translate']->it('Hide Forum'); ! $tags['HIDE'] = PHPWSBB_Thread::createLink($hideforum, array('PHPWSBB_MAN_OP'=>'hideforum', ! 'PHPWS_MAN_ITEMS[]'=>$this->getId()), 'hideshow.png', 16, 16); ! } } } Index: Manager.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** Manager.php 5 Jan 2005 15:50:32 -0000 1.62 --- Manager.php 4 Mar 2005 18:19:42 -0000 1.63 *************** *** 308,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'); --- 308,315 ---- /* "Edit Profile" 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); ! } $this->setClass('PHPWSBB_Forum'); |
