Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9100] XoopsModules/newbb/branches/alfred/newbb
|
From: <dh...@us...> - 2012-03-06 16:44:04
|
Revision: 9100
http://xoops.svn.sourceforge.net/xoops/?rev=9100&view=rev
Author: dhcst
Date: 2012-03-06 16:43:51 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
fix templates and many errors
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/action.topic.php
XoopsModules/newbb/branches/alfred/newbb/class/category.php
XoopsModules/newbb/branches/alfred/newbb/class/digest.php
XoopsModules/newbb/branches/alfred/newbb/class/forum.php
XoopsModules/newbb/branches/alfred/newbb/class/moderate.php
XoopsModules/newbb/branches/alfred/newbb/class/online.php
XoopsModules/newbb/branches/alfred/newbb/class/post.php
XoopsModules/newbb/branches/alfred/newbb/class/rate.php
XoopsModules/newbb/branches/alfred/newbb/class/readforum.php
XoopsModules/newbb/branches/alfred/newbb/class/readtopic.php
XoopsModules/newbb/branches/alfred/newbb/class/report.php
XoopsModules/newbb/branches/alfred/newbb/class/topic.php
XoopsModules/newbb/branches/alfred/newbb/class/topic.renderer.php
XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
XoopsModules/newbb/branches/alfred/newbb/header.php
XoopsModules/newbb/branches/alfred/newbb/include/functions.welcome.inc.php
XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php
XoopsModules/newbb/branches/alfred/newbb/post.php
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewpost.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html
XoopsModules/newbb/branches/alfred/newbb/viewforum.php
XoopsModules/newbb/branches/alfred/newbb/viewpost.php
XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
Modified: XoopsModules/newbb/branches/alfred/newbb/action.topic.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/action.topic.php 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/action.topic.php 2012-03-06 16:43:51 UTC (rev 9100)
@@ -106,8 +106,6 @@
foreach (array_keys($forums_obj) as $id) {
$forum_handler->synchronization($forums_obj[$id]);
}
- $stats_handler = xoops_getmodulehandler('stats', 'newbb');
- $stats_handler->reset();
unset($topics_obj, $forums_obj);
break;
case "move":
@@ -119,7 +117,7 @@
$post_handler->updateAll("forum_id", intval($_POST["newforum"]), $criteria, true);
$topic_handler->updateAll("forum_id", intval($_POST["newforum"]), $criteria, true);
$forum_handler->synchronization($_POST["newforum"]);
- $forum_handler->synchronization($forum_id);
+ $forum_handler->synchronization($forum_id);
} else {
include XOOPS_ROOT_PATH."/header.php";
$category_handler =& xoops_getmodulehandler('category', 'newbb');
@@ -165,6 +163,8 @@
}
break;
}
+$stats_handler = xoops_getmodulehandler('stats', 'newbb');
+$stats_handler->reset();
if (empty($forum_id)) {
redirect_header("list.topic.php", 2, _MD_DBUPDATED);
} else {
Modified: XoopsModules/newbb/branches/alfred/newbb/class/category.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/category.php 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/class/category.php 2012-03-06 16:43:51 UTC (rev 9100)
@@ -23,7 +23,7 @@
function __construct()
{
- //$this->XoopsObject();
+ $this->XoopsObject();
$this->initVar('cat_id', XOBJ_DTYPE_INT);
$this->initVar('cat_title', XOBJ_DTYPE_TXTBOX);
$this->initVar('cat_image', XOBJ_DTYPE_SOURCE, "blank.gif");
@@ -118,6 +118,11 @@
$perm_handler =& xoops_getmodulehandler('permission', 'newbb');
return $perm_handler->setCategoryPermission($category->getVar("cat_id"));
}
+
+ function synchronization($object = null)
+ {
+ return true;
+ }
}
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/class/digest.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/digest.php 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/class/digest.php 2012-03-06 16:43:51 UTC (rev 9100)
@@ -26,7 +26,7 @@
function __construct()
{
- //$this->XoopsObject();
+ $this->XoopsObject();
$this->initVar('digest_id', XOBJ_DTYPE_INT);
$this->initVar('digest_time', XOBJ_DTYPE_INT);
$this->initVar('digest_content', XOBJ_DTYPE_TXTAREA);
Modified: XoopsModules/newbb/branches/alfred/newbb/class/forum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-03-06 16:43:51 UTC (rev 9100)
@@ -626,8 +626,8 @@
}
if (!$object->getVar("forum_id")) return false;
+ $sql = "SELECT MAX(post_id) AS last_post, COUNT(*) AS total FROM " . $this->db->prefix("bb_posts") . " AS p LEFT JOIN " . $this->db->prefix("bb_topics") . " AS t ON p.topic_id=t.topic_id WHERE p.approved=1 AND t.approved=1 AND p.forum_id = ".$object->getVar("forum_id");
- $sql = "SELECT MAX(post_id) AS last_post, COUNT(*) AS total FROM " . $this->db->prefix("bb_posts") . " AS p LEFT JOIN " . $this->db->prefix("bb_topics") . " AS t ON p.topic_id=t.topic_id WHERE p.approved=1 AND t.approved=1 AND p.forum_id = ".$object->getVar("forum_id");
if ( $result = $this->db->query($sql)) {
$last_post = 0;
$posts = 0;
@@ -651,7 +651,7 @@
}
}
}
-
+ $object->setDirty();
return $this->insert($object, true);
}
Modified: XoopsModules/newbb/branches/alfred/newbb/class/moderate.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/moderate.php 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/class/moderate.php 2012-03-06 16:43:51 UTC (rev 9100)
@@ -26,11 +26,13 @@
* @copyright copyright (c) 2005 XOOPS.org
*/
-class Moderate extends ArtObject {
-
+//class Moderate extends ArtObject {
+class Moderate extends XoopsObject
+{
function Moderate()
{
- $this->ArtObject("bb_moderates");
+ //$this->ArtObject("bb_moderates");
+ $this->XoopsObject();
$this->initVar('mod_id', XOBJ_DTYPE_INT);
$this->initVar('mod_start', XOBJ_DTYPE_INT);
$this->initVar('mod_end', XOBJ_DTYPE_INT);
@@ -41,11 +43,18 @@
}
}
-class NewbbModerateHandler extends ArtObjectHandler
+//class NewbbModerateHandler extends ArtObjectHandler
+class NewbbModerateHandler extends XoopsPersistableObjectHandler
{
- function NewbbModerateHandler(&$db) {
- $this->ArtObjectHandler($db, 'bb_moderates', 'Moderate', 'mod_id', 'uid');
+ function __construct(&$db)
+ {
+ parent::__construct($db, 'bb_moderates', 'Moderate', 'mod_id', 'uid');
}
+
+ function NewbbModerateHandler(&$db)
+ {
+ $this->__construct($db);
+ }
/**
* Clear garbage
Modified: XoopsModules/newbb/branches/alfred/newbb/class/online.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/online.php 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/class/online.php 2012-03-06 16:43:51 UTC (rev 9100)
@@ -51,9 +51,9 @@
mt_srand((double)microtime() * 1000000);
// set gc probabillity to 10% for now..
- //if (mt_rand(1, 100) < 75) {
+ if (mt_rand(1, 100) < 75) {
$this->gc(300);
- //}
+ }
if (is_object($xoopsUser)) {
$uid = $xoopsUser->getVar('uid');
$uname = $xoopsUser->getVar('uname');
Modified: XoopsModules/newbb/branches/alfred/newbb/class/post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-03-06 16:43:51 UTC (rev 9100)
@@ -37,11 +37,13 @@
newbb_load_object();
class Post extends ArtObject {
+//class Post extends XoopsObject {
var $attachment_array = array();
function Post()
{
$this->ArtObject("bb_posts");
+ //$this->XoopsObject();
$this->initVar('post_id', XOBJ_DTYPE_INT);
$this->initVar('topic_id', XOBJ_DTYPE_INT, 0, true);
$this->initVar('forum_id', XOBJ_DTYPE_INT, 0, true);
@@ -558,11 +560,19 @@
}
class NewbbPostHandler extends ArtObjectHandler
+//class NewbbPostHandler extends XoopsPersistableObjectHandler
{
- function NewbbPostHandler(&$db) {
- $this->ArtObjectHandler($db, 'bb_posts', 'Post', 'post_id', 'subject');
+ function __construct(&$db)
+ {
+ parent::__construct($db, 'bb_posts', 'Post', 'post_id', 'subject');
}
+ function NewbbPostHandler(&$db)
+ {
+ $this->__construct($db);
+ }
+
+
function &get($id)
{
$id = intval($id);
@@ -700,6 +710,7 @@
$topic_obj->setVar("topic_time", $post->getVar("post_time"));
$topic_obj->setVar("poster_name", $post->getVar("poster_name"), true);
$topic_obj->setVar("approved", $post->getVar("approved"), true);
+
if (!$topic_id = $topic_handler->insert($topic_obj, $force)) {
$post->deleteAttachment();
$post->setErrors("insert topic error");
@@ -742,6 +753,7 @@
if ($post->getVar("approved") != $topic_obj->getVar("approved")) {
$topic_obj->setVar("approved", $post->getVar("approved"));
}
+ $topic_obj->setDirty();
if (!$result = $topic_handler->insert($topic_obj, $force)) {
$post->setErrors("update topic error");
//xoops_error($topic_obj->getErrors());
@@ -936,6 +948,12 @@
}
return $ret;
}
+
+ function synchronization()
+ {
+ //$this->cleanOrphan();
+ return true;
+ }
/**
* clean orphan items from database
Modified: XoopsModules/newbb/branches/alfred/newbb/class/rate.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/rate.php 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/class/rate.php 2012-03-06 16:43:51 UTC (rev 9100)
@@ -55,6 +55,11 @@
$this->ArtObjectHandler($db, 'bb_votedata', 'Nrate', 'ratingid');
}
+ function synchronization()
+ {
+ return;
+ }
+
/**
* clean orphan items from database
*
Modified: XoopsModules/newbb/branches/alfred/newbb/class/readforum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/readforum.php 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/class/readforum.php 2012-03-06 16:43:51 UTC (rev 9100)
@@ -110,5 +110,10 @@
return true;
}
+
+ function synchronization()
+ {
+ return;
+ }
}
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/class/readtopic.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/readtopic.php 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/class/readtopic.php 2012-03-06 16:43:51 UTC (rev 9100)
@@ -159,5 +159,10 @@
}
return true;
}
+
+ function synchronization()
+ {
+ return;
+ }
}
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/class/report.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/report.php 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/class/report.php 2012-03-06 16:43:51 UTC (rev 9100)
@@ -91,6 +91,11 @@
}
return $ret;
}
+
+ function synchronization()
+ {
+ return;
+ }
/**
* clean orphan items from database
Modified: XoopsModules/newbb/branches/alfred/newbb/class/topic.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/topic.php 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/class/topic.php 2012-03-06 16:43:51 UTC (rev 9100)
@@ -418,7 +418,7 @@
return $this->deleteAll($crit_expire, true/*, true*/);
}
- function synchronization(&$object/*, $force = true*/)
+ function synchronization($object = NULL, $force = true)
{
if (!is_object($object)) {
$object =& $this->get(intval($object));
Modified: XoopsModules/newbb/branches/alfred/newbb/class/topic.renderer.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/topic.renderer.php 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/class/topic.renderer.php 2012-03-06 16:43:51 UTC (rev 9100)
@@ -485,6 +485,7 @@
}
require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
$nav = new XoopsPageNav($count_topic, $this->config['topics_per_page'], @$this->vars["start"], "start", implode("&", $args));
+ if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) $nav->url = XOOPS_URL . $nav->url;
if ($this->config['pagenav_display'] == 'select')
$navi = $nav->renderSelect();
elseif ($this->config['pagenav_display'] == 'bild')
Modified: XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-03-06 16:43:51 UTC (rev 9100)
@@ -1,9 +1,13 @@
newBB
Changelog 4.3
-02/12/2012
+03/06/2012
===========================================
1 Fix Cache Config for SEO
2 Fix Typos in templates
+ 3 Fix Nav for SEO
+ 4 Fix PDF for SEO
+ 5 Fix Error Topic Number in Blocks
+ 6 Fix Stats move or delete Topics
newBB
Changelog 4.2
Modified: XoopsModules/newbb/branches/alfred/newbb/header.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/header.php 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/header.php 2012-03-06 16:43:51 UTC (rev 9100)
@@ -17,8 +17,8 @@
if(((strpos(getenv('REQUEST_URI'), '.html') === false) && !empty($xoopsModuleConfig['do_rewrite']) && (!isset($_POST) || count($_POST) <= 0)))
{
- if ( strpos(getenv("REQUEST_URI"),"/modules/newbb/index.php?mark_read") === false && in_array(basename(getenv('SCRIPT_NAME')),$toseo_url) && (trim(getenv("REQUEST_URI")) != '') && trim(getenv("REQUEST_URI")) != "/".REAL_MODULE_NAME."/") {
- $s = XOOPS_URL . getenv("REQUEST_URI");
+ if ( strpos(getenv("REQUEST_URI"),"/modules/newbb/index.php?mark_read") === false && in_array(basename(getenv('SCRIPT_NAME')),$toseo_url) && (trim(getenv("REQUEST_URI")) != '') && strpos(getenv("REQUEST_URI") , "/".REAL_MODULE_NAME."/") === false ) {
+ $s = "http://" . getenv('HTTP_HOST') . getenv("REQUEST_URI");
$newurl = seo_urls('<a href="'.$s.'"></a>');
$newurl = str_replace('<a href="','',$newurl);
$newurl = str_replace('"></a>','',$newurl);
Modified: XoopsModules/newbb/branches/alfred/newbb/include/functions.welcome.inc.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/functions.welcome.inc.php 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/include/functions.welcome.inc.php 2012-03-06 16:43:51 UTC (rev 9100)
@@ -94,7 +94,7 @@
$message = sprintf(_MD_WELCOME_MESSAGE, $xoopsUser->getVar('uname'))."\n\n";
$message .= _PROFILE.": <a href='".XOOPS_URL . "/userinfo.php?uid=" . $xoopsUser->getVar('uid')."'><strong>".$xoopsUser->getVar('uname')."</strong></a> ";
- $message .= " | <a href='".XOOPS_URL . "/pmlite.php?send2=1&to_userid=" . $xoopsUser->getVar('uid')."'>"._MD_PM."</a>\n";
+ //$message .= " | <a href='".XOOPS_URL . "/pmlite.php?send2=1&to_userid=" . $xoopsUser->getVar('uid')."'>"._MD_PM."</a>\n";
foreach ($categories as $category) {
if (isset($category["fields"])) {
$message .= "\n\n".$category["cat_title"].":\n\n";
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-03-06 16:43:51 UTC (rev 9100)
@@ -439,7 +439,7 @@
%s
was deleted by me
-As justification, I would like to let you know following:
+As justification, I am taking the following information on:
%s
@@ -450,7 +450,7 @@
%s
%s");
define("_MD_FORUMHOME","Board index");
-define("_MD_NEWBB_SEEWAITREPORT","There were <font color=\"red\"> <b>%s </b> Contributions reported </font>");
+define("_MD_NEWBB_SEEWAITREPORT","There were <font color=\"red\"> <b>%s</b> Contributions reported </font>");
define('NEWBB_PDF_SUBJECT','Title: ');
define('NEWBB_PDF_TOPIC','Post: ');
define('NEWBB_PDF_AUTHOR','Author: ');
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-03-06 16:43:51 UTC (rev 9100)
@@ -62,6 +62,8 @@
define("_MI_IMAGELIB_DESC", "Select which Image library to use for creating Thumbnails. Leave AUTO for automatic choice.");
define("_MI_MAX_IMG_WIDTH", "Maximum Image Width");
define("_MI_MAX_IMG_WIDTH_DESC", "Sets the maximum allowed <strong>Width</strong> size of an uploaded image otherwise thumbnail will be used. <br >Input 0 if you do not want to create thumbnails.");
+define("_MI_MAX_IMG_HEIGHT","Maximum height of an image");
+define("_MI_MAX_IMG_HEIGHT_DESC", "Sets the maximum allowed height of an uploaded image.");
define("_MI_MAX_IMAGE_WIDTH", "Maximum Image Width for creating thumbnail");
define("_MI_MAX_IMAGE_WIDTH_DESC", "Sets the maximum width of an uploaded image to create thumbnail. <br >Image with width larger than the value will not use thumbnail.");
define("_MI_MAX_IMAGE_HEIGHT", "Maximum Image Height for creating thumbnail");
@@ -254,7 +256,4 @@
define("_MI_ADVERTISING_DESC","shows a commercial break after the 2nd Thread");
define("_MI_USERATTACH_ENABLE","Display attachments only for registered users");
define("_MI_USERATTACH_DESC","shows attachments in the forum only after logging in.");
-
-define("_MI_MAX_IMG_HEIGHT","Maximum height of an image");
-define("_MI_MAX_IMG_HEIGHT_DESC", "Sets the maximum allowed height of an uploaded image.");
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/post.php 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/post.php 2012-03-06 16:43:51 UTC (rev 9100)
@@ -65,6 +65,7 @@
$error_message = array();
if ( !empty($_POST['contents_submit']) ) {
+
$token_valid = false;
$token_valid = $GLOBALS['xoopsSecurity']->check();
@@ -141,7 +142,7 @@
&& ( $isadmin || ( $post_obj->checkTimelimit('edit_timelimit') && $post_obj->checkIdentity() ))
) {}
else {
- redirect_header("viewtopic.php?forum={$forum_id}&topic_id={$topic_id}&post_id={$post_id}&order={$order}&viewmode={$viewmode}", 2, _MD_NORIGHTTOEDIT);
+ redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum={$forum_id}&topic_id={$topic_id}&post_id={$post_id}&order={$order}&viewmode={$viewmode}", 2, _MD_NORIGHTTOEDIT);
exit();
}
@@ -153,13 +154,13 @@
if ($topic_id) {
$topic_status = $topic_obj->getVar('topic_status');
if (!$topic_handler->getPermission($forum_obj, $topic_status, 'reply')) {
- redirect_header("viewtopic.php?forum={$forum_id}&topic_id={$topic_id}&post_id={$post_id}&order={$order}&viewmode={$viewmode}", 2, _MD_NORIGHTTOREPLY);
+ redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum={$forum_id}&topic_id={$topic_id}&post_id={$post_id}&order={$order}&viewmode={$viewmode}", 2, _MD_NORIGHTTOREPLY);
exit();
}
} else {
$topic_status = 0;
if (!$topic_handler->getPermission($forum_obj, $topic_status, 'post')) {
- redirect_header("viewtopic.php?forum={$forum_id}", 2, _MD_NORIGHTTOPOST);
+ redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum={$forum_id}", 2, _MD_NORIGHTTOPOST);
exit();
}
}
@@ -268,6 +269,7 @@
}
$postid = $post_handler->insert($post_obj);
+
if ( !$postid ) {
include_once XOOPS_ROOT_PATH . '/header.php';
xoops_error($post_obj->getErrors());
@@ -275,7 +277,6 @@
exit();
}
newbb_setsession("LP", time()); // Recording last post time
-
$topic_obj =& $topic_handler->get( $post_obj->getVar("topic_id") );
$uid = (is_object($xoopsUser)) ? $xoopsUser->getVar('uid') : 0;
if ( newbb_isAdmin($forum_obj)
@@ -374,15 +375,15 @@
);
}
- $redirect = "viewtopic.php?post_id=" . $postid ;
+ $redirect = XOOPS_URL."/modules/newbb/viewtopic.php?post_id=" . $postid ;
$message = _MD_THANKSSUBMIT . "<br />" . $error_upload;
} else {
- $redirect = "viewforum.php?forum=" . $post_obj->getVar('forum_id');
+ $redirect = XOOPS_URL."/modules/newbb/viewforum.php?forum=" . $post_obj->getVar('forum_id');
$message = _MD_THANKSSUBMIT . "<br />" . _MD_WAITFORAPPROVAL . "<br />" . $error_upload;
}
if ( $op == "add" ) {
- redirect_header("polls.php?op=add&forum=" . $post_obj->getVar('forum_id') . "&topic_id=" . $post_obj->getVar('topic_id'), 1, _MD_ADDPOLL);
+ redirect_header(XOOPS_URL."/modules/newbb/polls.php?op=add&forum=" . $post_obj->getVar('forum_id') . "&topic_id=" . $post_obj->getVar('topic_id'), 1, _MD_ADDPOLL);
exit();
} else {
redirect_header($redirect, 2, $message);
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-03-06 16:43:51 UTC (rev 9100)
@@ -1,185 +1,166 @@
-<fieldset>
- <div class="forum_header">
- <div class="forum_title" style="float:left;">
- <h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php"><{$index_title}></a></h2>
- <hr align="left" width="50%" size="1"/>
- <{$index_desc}>
- </div>
+<div class="forum_header">
+ <div class="forum_title" style="float:left;">
+ <h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php"><{$index_title}></a></h2>
+ <hr align="left" width="50%" size="1" />
+ <{$index_desc}>
</div>
- <div style="clear:both;"></div>
- <{if $viewer_level gt 1}>
- <br/>
-
- <div class="forum_stats">
- <div class="forum_stats_left">
- <{$smarty.const._MD_TOPIC}>:
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=active#admin" target="_self" title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a>
- |
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=pending#admin" target="_self" title="<{$smarty.const._MD_TYPE_PENDING}>"><{if
- $wait_new_topic}>(<font color="red"><b><{$wait_new_topic}></b></font>)
- <{/if}><{$smarty.const._MD_TYPE_PENDING}></a> |
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=deleted#admin" target="_self" title="<{$smarty.const._MD_TYPE_DELETED}>"><{if
- $delete_topic}>(<font color="red"><b><{$delete_topic}></b></font>)
- <{/if}><{$smarty.const._MD_TYPE_DELETED}></a><br/>
- <{$smarty.const._MD_POST2}>:
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=active#admin" target="_self" title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a>
- |
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=pending#admin" target="_self" title="<{$smarty.const._MD_TYPE_PENDING}>"><{if
- $wait_new_post}>(<font color="red"><b><{$wait_new_post}></b></font>)
- <{/if}><{$smarty.const._MD_TYPE_PENDING}></a> |
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=deleted#admin" target="_self" title="<{$smarty.const._MD_TYPE_DELETED}>"><{if
- $delete_post}>(<font color="red"><b><{$delete_post}></b></font>)
- <{/if}><{$smarty.const._MD_TYPE_DELETED}></a>
+</div>
+<div style="clear:both;"></div>
+<{if $viewer_level gt 1}>
+ <br />
+ <div class="forum_stats">
+ <div class="forum_stats_left">
+ <{$smarty.const._MD_TOPIC}>:
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=active#admin" target="_self" title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a> |
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=pending#admin" target="_self" title="<{$smarty.const._MD_TYPE_PENDING}>"><{if $wait_new_topic}>(<font color="red"><b><{$wait_new_topic}></b></font>) <{/if}><{$smarty.const._MD_TYPE_PENDING}></a> |
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=deleted#admin" target="_self" title="<{$smarty.const._MD_TYPE_DELETED}>"><{if $delete_topic}>(<font color="red"><b><{$delete_topic}></b></font>) <{/if}><{$smarty.const._MD_TYPE_DELETED}></a><br />
+ <{$smarty.const._MD_POST2}>:
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=active#admin" target="_self" title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a> |
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=pending#admin" target="_self" title="<{$smarty.const._MD_TYPE_PENDING}>"><{if $wait_new_post}>(<font color="red"><b><{$wait_new_post}></b></font>) <{/if}><{$smarty.const._MD_TYPE_PENDING}></a> |
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=deleted#admin" target="_self" title="<{$smarty.const._MD_TYPE_DELETED}>"><{if $delete_post}>(<font color="red"><b><{$delete_post}></b></font>) <{/if}><{$smarty.const._MD_TYPE_DELETED}></a>
</div>
<div class="forum_stats_right">
- <{if $report_post}><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/admin_report.php"><{$report_post}></a><{/if}>
- <br/><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/moderate.php" target="_self" title="<{$smarty.const._MD_TYPE_SUSPEND}>"><{$smarty.const._MD_TYPE_SUSPEND}></a>
- |
+ <{if $report_post}><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/admin_report.php"><{$report_post}></a><{/if}>
+ <br /><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/moderate.php" target="_self" title="<{$smarty.const._MD_TYPE_SUSPEND}>"><{$smarty.const._MD_TYPE_SUSPEND}></a> |
<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/index.php" target="_self" title="<{$smarty.const._MD_ADMINCP}>"><{$smarty.const._MD_ADMINCP}></a>
- </div>
- <div style="clear:both;"></div>
- </div>
- <{/if}>
-</fieldset>
-<br style="clear: both;"/>
-<fieldset>
- <div class="dropdown">
- <{includeq file="db:newbb_index_menu.html"}>
- </div>
-</fieldset>
-<br style="clear: both;"/>
-<fieldset>
-<br/>
+ </div>
+ <div style="clear:both;"></div>
+ </div>
+<{/if}>
+<br style="clear: both;" />
+<div class="dropdown">
+ <{includeq file="db:newbb_index_menu.html"}>
+</div>
+<br style="clear: both;" />
+<br />
<!-- start forum categories -->
-<div class="index_category">
-<!-- start forum categories -->
-<{foreachq item=category from=$categories}>
-<table class="index_category" cellspacing="0" width="100%">
- <tr class="head">
- <td width="3%" valign="middle" align="center">
- <img onclick="ToggleBlockCategory('<{$category.cat_element_id}>', this, '<{$category_icon.expand}>', '<{$category_icon.collapse}>')" src="<{$category.cat_icon_display}>" alt=""/>
- </td>
- <{if $category.cat_image}>
- <td width="8%"><img src="<{$category.cat_image}>" alt="<{$category.cat_title}>"/></td>
- <{/if}>
- <td align="left">
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?cat=<{$category.cat_id}>"><{$category.cat_title}></a>
- <{if $category.cat_description}><p class="desc"><{$category.cat_description}></p><{/if}>
- </td>
- <{if $category.cat_sponsor}>
- <td width="15%" nowrap="nowrap" align="right">
- <p class="desc">
- <a href="<{$category.cat_sponsor.link}>" title="<{$category.cat_sponsor.title}>" target="_blank"><{$category.cat_sponsor.title}></a>
- </p>
- </td>
- <{/if}>
- </tr>
-</table>
+<div class="index_category">
+ <!-- start forum categories -->
+ <{foreachq item=category from=$categories}>
+ <table class="index_category" cellspacing="0" width="100%">
+ <tr class="head">
+ <td width="3%" valign="middle" align="center">
+ <img onclick="ToggleBlockCategory('<{$category.cat_element_id}>', this, '<{$category_icon.expand}>', '<{$category_icon.collapse}>')" src="<{$category.cat_icon_display}>" alt="" />
+ </td>
+ <{if $category.cat_image}>
+ <td width="8%"><img src="<{$category.cat_image}>" alt="<{$category.cat_title}>" /></td>
+ <{/if}>
+ <td align="left">
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?cat=<{$category.cat_id}>"><{$category.cat_title}></a>
+ <{if $category.cat_description}><p class="desc"><{$category.cat_description}></p><{/if}>
+ </td>
+ <{if $category.cat_sponsor}>
+ <td width="15%" nowrap="nowrap" align="right">
+ <p class="desc"><a href="<{$category.cat_sponsor.link}>" title="<{$category.cat_sponsor.title}>" target="_blank"><{$category.cat_sponsor.title}></a></p>
+ </td>
+ <{/if}>
+ </tr>
+ </table>
-<div id="<{$category.cat_element_id}>" style="display: <{$category.cat_display}>">
-<table border="0" cellspacing="2" cellpadding="0" width="100%">
-<{if $category.forums}>
-<tr class="head" align="center">
- <td width="5%"> </td>
- <{if $subforum_display == "expand"}>
- <td colspan="2" width="37%" nowrap="nowrap" align="left"><{$smarty.const._MD_FORUM}></td>
- <{else}>
- <td width="37%" nowrap="nowrap" align="left"><{$smarty.const._MD_FORUM}></td>
- <{/if}>
- <td width="9%" nowrap="nowrap"><{$smarty.const._MD_TOPICS}></td>
- <td width="9%" nowrap="nowrap"><{$smarty.const._MD_POSTS}></td>
- <td width="40%" nowrap="nowrap"><{$smarty.const._MD_LASTPOST}></td>
-</tr>
-<{/if}>
+ <div id="<{$category.cat_element_id}>" style="display: <{$category.cat_display}>">
+ <table border="0" cellspacing="2" cellpadding="0" width="100%">
+ <{if $category.forums}>
+ <tr class="head" align="center">
+ <td width="5%"> </td>
+ <{if $subforum_display == "expand"}>
+ <td colspan="2" width="37%" nowrap="nowrap" align="left"><{$smarty.const._MD_FORUM}></td>
+ <{else}>
+ <td width="37%" nowrap="nowrap" align="left"><{$smarty.const._MD_FORUM}></td>
+ <{/if}>
+ <td width="9%" nowrap="nowrap"><{$smarty.const._MD_TOPICS}></td>
+ <td width="9%" nowrap="nowrap"><{$smarty.const._MD_POSTS}></td>
+ <td width="40%" nowrap="nowrap"><{$smarty.const._MD_LASTPOST}></td>
+ </tr>
+ <{/if}>
-<!-- start forums -->
+ <!-- start forums -->
-<{if $subforum_display == "expand"}>
-<{foreachq item=forum from=$category.forums}>
-<tr>
- <td width="5%" class="even" align="center" valign="middle"><{$forum.forum_folder}></td>
- <td colspan="2" class="odd">
- <div id="index_forum">
+ <{if $subforum_display == "expand"}>
+ <{foreachq item=forum from=$category.forums}>
+ <tr>
+ <td width="5%" class="even" align="center" valign="middle"><{$forum.forum_folder}></td>
+ <td colspan="2" class="odd">
+ <div id="index_forum">
<span class="item"><a href="<{$forum.topic_link}>"><{$forum.forum_name}></a>
<{if $rss_enable}>
(<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?f=<{$forum.forum_id}>" target="_blank" title="RSS feed">RSS</a>)
<{/if}>
- <br/><{$forum.forum_desc}>
+ <br /><{$forum.forum_desc}>
</span>
- <{if $forum.forum_moderators}>
+ <{if $forum.forum_moderators}>
<span class="extra">
<{$smarty.const._MD_MODERATOR}>: <{$forum.forum_moderators}>
</span>
- <{/if}>
- </div>
- </td>
- <td class="even" align="center" valign="middle">
- <{if $stats[$forum.forum_id].topic.day}><strong><{$stats[$forum.forum_id].topic.day}></strong>/<{/if}>
- <{$forum.forum_topics}>
- </td>
- <td class="odd" align="center" valign="middle">
- <{if $stats[$forum.forum_id].post.day}><strong><{$stats[$forum.forum_id].post.day}></strong>/<{/if}>
- <{$forum.forum_posts}>
- </td>
- <td class="even" align="right" valign="middle">
- <{if $forum.forum_lastpost_subject}>
- <{$forum.forum_lastpost_time}> <{$smarty.const._MD_BY}> <{$forum.forum_lastpost_user}><br/>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$forum.forum_lastpost_id}>">
- <{$forum.forum_lastpost_subject}> <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/<{$forum.forum_lastpost_icon}>" alt="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" title="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>"/>
- </a>
- <{else}>
- <{$smarty.const._AM_NEWBB_NOTOPIC}>
- <{/if}>
- </td>
-</tr>
+ <{/if}>
+ </div>
+ </td>
+ <td class="even" align="center" valign="middle">
+ <{if $stats[$forum.forum_id].topic.day}><strong><{$stats[$forum.forum_id].topic.day}></strong>/<{/if}>
+ <{$forum.forum_topics}>
+ </td>
+ <td class="odd" align="center" valign="middle">
+ <{if $stats[$forum.forum_id].post.day}><strong><{$stats[$forum.forum_id].post.day}></strong>/<{/if}>
+ <{$forum.forum_posts}>
+ </td>
+ <td class="even" align="right" valign="middle">
+ <{if $forum.forum_lastpost_subject}>
+ <{$forum.forum_lastpost_time}> <{$smarty.const._MD_BY}> <{$forum.forum_lastpost_user}><br />
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$forum.forum_lastpost_id}>">
+ <{$forum.forum_lastpost_subject}> <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/<{$forum.forum_lastpost_icon}>" alt="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" title="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" />
+ </a>
+ <{else}>
+ <{$smarty.const._AM_NEWBB_NOTOPIC}>
+ <{/if}>
+ </td>
+ </tr>
<{if $forum.subforum}>
-<tr class="head">
- <td width="5%"> </td>
- <td width="5%" align="center"><{$img_subforum}> </td>
- <td width="32%" align="center"><{$smarty.const._MD_SUBFORUMS}> </td>
- <td width="9%" nowrap="nowrap"> </td>
- <td width="9%" nowrap="nowrap"> </td>
- <td width="40%" nowrap="nowrap"> </td>
-</tr>
+ <tr class="head" >
+ <td width="5%"> </td>
+ <td width="5%" align="center"><{$img_subforum}> </td>
+ <td width="32%" align="center"><{$smarty.const._MD_SUBFORUMS}> </td>
+ <td width="9%" nowrap="nowrap"> </td>
+ <td width="9%" nowrap="nowrap"> </td>
+ <td width="40%" nowrap="nowrap"> </td>
+ </tr>
<{foreachq item=subforum from=$forum.subforum}>
-<tr>
- <td class="odd" width="5%"> </td>
- <td class="even" align="center" valign="middle" width="5%"><{$subforum.forum_folder}></td>
- <td width="32%" class="odd">
- <div id="index_forum">
+ <tr>
+ <td class="odd" width="5%"> </td>
+ <td class="even" align="center" valign="middle" width="5%"><{$subforum.forum_folder}></td>
+ <td width="32%" class="odd">
+ <div id="index_forum">
<span class="item"><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$subforum.forum_id}>"><strong><{$subforum.forum_name}></strong></a>
<{if $rss_enable}>
(<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?f=<{$subforum.forum_id}>" target="_blank" title="RSS feed">RSS</a>)
<{/if}>
- <br/><{$subforum.forum_desc}>
+ <br /><{$subforum.forum_desc}>
</span>
- <{if $subforum.forum_moderators}>
+ <{if $subforum.forum_moderators}>
<span class="extra">
<{$smarty.const._MD_MODERATOR}>: <{$subforum.forum_moderators}>
</span>
- <{/if}>
+ <{/if}>
</div>
- </td>
- <td class="even" width="9%" align="center" valign="middle">
- <{if $stats[$subforum.forum_id].topic.day}><strong><{$stats[$subforum.forum_id].topic.day}></strong>/<{/if}>
- <{$subforum.forum_topics}>
- </td>
- <td class="odd" width="9%" align="center" valign="middle">
- <{if $stats[$subforum.forum_id].post.day}><strong><{$stats[$subforum.forum_id].post.day}></strong>/<{/if}>
- <{$subforum.forum_posts}>
- </td>
- <td class="even" width="40%" align="right" valign="middle">
- <{if $subforum.forum_lastpost_subject}>
- <{$subforum.forum_lastpost_time}> <{$smarty.const._MD_BY}> <{$subforum.forum_lastpost_user}><br/>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$subforum.forum_lastpost_id}>">
- <{$subforum.forum_lastpost_subject}> <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/<{$forum.forum_lastpost_icon}>" alt="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" title="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>"/>
- </a>
- <{else}>
- <{$smarty.const._AM_NEWBB_NOTOPIC}>
- <{/if}>
- </td>
-</tr>
+ </td>
+ <td class="even" width="9%" align="center" valign="middle">
+ <{if $stats[$subforum.forum_id].topic.day}><strong><{$stats[$subforum.forum_id].topic.day}></strong>/<{/if}>
+ <{$subforum.forum_topics}>
+ </td>
+ <td class="odd" width="9%" align="center" valign="middle">
+ <{if $stats[$subforum.forum_id].post.day}><strong><{$stats[$subforum.forum_id].post.day}></strong>/<{/if}>
+ <{$subforum.forum_posts}>
+ </td>
+ <td class="even" width="40%" align="right" valign="middle">
+ <{if $subforum.forum_lastpost_subject}>
+ <{$subforum.forum_lastpost_time}> <{$smarty.const._MD_BY}> <{$subforum.forum_lastpost_user}><br />
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$subforum.forum_lastpost_id}>">
+ <{$subforum.forum_lastpost_subject}> <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/<{$forum.forum_lastpost_icon}>" alt="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" title="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" />
+ </a>
+ <{else}>
+ <{$smarty.const._AM_NEWBB_NOTOPIC}>
+ <{/if}>
+ </td>
+ </tr>
<{/foreach}>
<{/if}>
<{/foreach}>
@@ -187,181 +168,170 @@
<{elseif $subforum_display == "collapse"}>
<{foreachq item=forum from=$category.forums}>
-<tr>
- <{if $forum.subforum}>
- <td class="even" rowspan="2" align="center" valign="middle"><{$forum.forum_folder}></td>
- <{else}>
- <td class="even" align="center" valign="middle"><{$forum.forum_folder}></td>
- <{/if}>
- <td class="odd">
- <div id="index_forum">
+ <tr>
+ <{if $forum.subforum}>
+ <td class="even" rowspan="2" align="center" valign="middle"><{$forum.forum_folder}></td>
+ <{else}>
+ <td class="even" align="center" valign="middle"><{$forum.forum_folder}></td>
+ <{/if}>
+ <td class="odd">
+ <div id="index_forum">
<span class="item"><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum.forum_id}>"><{$forum.forum_name}></a>
<{if $rss_enable}>
(<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?f=<{$forum.forum_id}>" target="_blank" title="RSS feed">RSS</a>)
<{/if}>
- <br/><{$forum.forum_desc}>
+ <br /><{$forum.forum_desc}>
</span>
- <{if $forum.forum_moderators}>
+ <{if $forum.forum_moderators}>
<span class="extra">
<{$smarty.const._MD_MODERATOR}>: <{$forum.forum_moderators}>
</span>
- <{/if}>
+ <{/if}>
</div>
- </td>
- <td class="even" align="center" valign="middle">
- <{if $stats[$forum.forum_id].topic.day}><strong><{$stats[$forum.forum_id].topic.day}></strong>/<{/if}>
- <{$forum.forum_topics}>
- </td>
- <td class="odd" align="center" valign="middle">
- <{if $stats[$forum.forum_id].post.day}><strong><{$stats[$forum.forum_id].post.day}></strong>/<{/if}>
- <{$forum.forum_posts}>
- </td>
- <td class="even" align="right" valign="middle">
- <{if $forum.forum_lastpost_subject}>
- <{$forum.forum_lastpost_time}> <{$smarty.const._MD_BY}> <{$forum.forum_lastpost_user}><br/>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$forum.forum_lastpost_id}>">
- <{$forum.forum_lastpost_subject}> <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/<{$forum.forum_lastpost_icon}>" alt="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" title="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>"/>
- </a>
- <{else}>
- <{$smarty.const._AM_NEWBB_NOTOPIC}>
- <{/if}>
- </td>
-</tr>
+ </td>
+ <td class="even" align="center" valign="middle">
+ <{if $stats[$forum.forum_id].topic.day}><strong><{$stats[$forum.forum_id].topic.day}></strong>/<{/if}>
+ <{$forum.forum_topics}>
+ </td>
+ <td class="odd" align="center" valign="middle">
+ <{if $stats[$forum.forum_id].post.day}><strong><{$stats[$forum.forum_id].post.day}></strong>/<{/if}>
+ <{$forum.forum_posts}>
+ </td>
+ <td class="even" align="right" valign="middle">
+ <{if $forum.forum_lastpost_subject}>
+ <{$forum.forum_lastpost_time}> <{$smarty.const._MD_BY}> <{$forum.forum_lastpost_user}><br />
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$forum.forum_lastpost_id}>">
+ <{$forum.forum_lastpost_subject}> <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/<{$forum.forum_lastpost_icon}>" alt="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" title="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" />
+ </a>
+ <{else}>
+ <{$smarty.const._AM_NEWBB_NOTOPIC}>
+ <{/if}>
+ </td>
+ </tr>
-<{if $forum.subforum}>
-<tr>
- <td class="odd" colspan="4" align="left"><{$smarty.const._MD_SUBFORUMS}> <{$img_subforum}>
- <{foreachq item=subforum from=$forum.subforum}>
- [<a href="viewforum.php?forum=<{$subforum.forum_id}>"><{$subforum.forum_name}></a>]
- <{/foreach}>
- </td>
-</tr>
-<{/if}>
+ <{if $forum.subforum}>
+ <tr>
+ <td class="odd" colspan="4" align="left"><{$smarty.const._MD_SUBFORUMS}> <{$img_subforum}>
+ <{foreachq item=subforum from=$forum.subforum}>
+ [<a href="viewforum.php?forum=<{$subforum.forum_id}>"><{$subforum.forum_name}></a>]
+ <{/foreach}>
+ </td>
+ </tr>
+ <{/if}>
<{/foreach}>
<{else}>
<{foreachq item=forum from=$category.forums}>
-<tr>
- <td class="even" align="center" valign="middle"><{$forum.forum_folder}></td>
- <td class="odd">
- <div id="index_forum">
+ <tr>
+ <td class="even" align="center" valign="middle"><{$forum.forum_folder}></td>
+ <td class="odd">
+ <div id="index_forum">
<span class="item"><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum.forum_id}>"><{$forum.forum_name}></a>
<{if $rss_enable}>
(<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?f=<{$forum.forum_id}>" target="_blank" title="RSS feed">RSS</a>)
<{/if}>
- <br/><{$forum.forum_desc}>
+ <br /><{$forum.forum_desc}>
</span>
- <{if $forum.forum_moderators}>
+ <{if $forum.forum_moderators}>
<span class="extra">
<{$smarty.const._MD_MODERATOR}>: <{$forum.forum_moderators}>
</span>
- <{/if}>
+ <{/if}>
</div>
- </td>
- <td class="even" align="center" valign="middle">
- <{if $stats[$forum.forum_id].topic.day}><strong><{$stats[$forum.forum_id].topic.day}></strong>/<{/if}>
- <{$forum.forum_topics}>
- </td>
- <td class="odd" align="center" valign="middle">
- <{if $stats[$forum.forum_id].post.day}><strong><{$stats[$forum.forum_id].post.day}></strong>/<{/if}>
- <{$forum.forum_posts}>
- </td>
- <td class="even" align="right" valign="middle">
- <{if $forum.forum_lastpost_subject}>
- <{$forum.forum_lastpost_time}> <{$smarty.const._MD_BY}> <{$forum.forum_lastpost_user}><br/>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$forum.forum_lastpost_id}>">
- <{$forum.forum_lastpost_subject}> <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/<{$forum.forum_lastpost_icon}>" alt="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" title="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>"/>
- </a>
- <{else}>
- <{$smarty.const._AM_NEWBB_NOTOPIC}>
- <{/if}>
- </td>
-</tr>
+ </td>
+ <td class="even" align="center" valign="middle">
+ <{if $stats[$forum.forum_id].topic.day}><strong><{$stats[$forum.forum_id].topic.day}></strong>/<{/if}>
+ <{$forum.forum_topics}>
+ </td>
+ <td class="odd" align="center" valign="middle">
+ <{if $stats[$forum.forum_id].post.day}><strong><{$stats[$forum.forum_id].post.day}></strong>/<{/if}>
+ <{$forum.forum_posts}>
+ </td>
+ <td class="even" align="right" valign="middle">
+ <{if $forum.forum_lastpost_subject}>
+ <{$forum.forum_lastpost_time}> <{$smarty.const._MD_BY}> <{$forum.forum_lastpost_user}><br />
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$forum.forum_lastpost_id}>">
+ <{$forum.forum_lastpost_subject}> <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/<{$forum.forum_lastpost_icon}>" alt="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" title="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" />
+ </a>
+ <{else}>
+ <{$smarty.const._AM_NEWBB_NOTOPIC}>
+ <{/if}>
+ </td>
+ </tr>
<{/foreach}>
<{/if}>
-<!-- end forums -->
+ <!-- end forums -->
</table>
-<br/>
+<br />
</div>
<{/foreach}>
<!-- end forum categories -->
-</fieldset>
-<fieldset>
- <div>
- <div style="float: left; text-align: left;">
- <{$img_forum_new}> = <{$smarty.const._MD_NEWPOSTS}><br/>
- <{$img_forum}> = <{$smarty.const._MD_NONEWPOSTS}><br/>
- </div>
- <div style="float: right; text-align: right;">
- <form action="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php" method="post" name="search" id="search">
- <input name="term" id="term" type="text" size="20"/>
- <input type="hidden" name="forum" id="forum" value="all"/>
- <input type="hidden" name="sortby" id="sortby" value="p.post_time desc"/>
- <input type="hidden" name="searchin" id="searchin" value="both"/>
- <input type="submit" name="submit" id="submit" value="<{$smarty.const._MD_SEARCH}>"/>
- <br/>
- [ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php"><{$smarty.const._MD_ADVSEARCH}></a> ]
- </form>
- <{if $rss_button}>
- <br/>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?c=<{$viewcat}>" target="_blank" title="RSS FEED">
- <{$rss_button}>
- </a>
- <br/><font size="0.7em;">NewBB Version <{$version/100}></font>
- <br/>
- <{/if}>
- </div>
- </div>
-</fieldset>
-<br style="clear: both;"/>
-<{if $currenttime}>
-<fieldset>
- <div>
- <div class="even" style="padding: 5px; line-height: 150%;">
- <span style="padding: 2px;"><{$online.statistik}></span>
- <strong><{$smarty.const._MD_NEWBB_STATS}></strong>
- </div>
- <div class="forum_stats odd" style="padding: 5px; line-height: 150%;">
- <!-- <div class="odd" style="padding: 5px; line-height: 150%;"> //-->
- <div class="forum_stats_left odd">
- <{$currenttime}><br/>
- <{$smarty.const._MD_TOTALTOPICSC}>
- <strong><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php" title="<{$smarty.const._MD_ALL}>"><{$stats[0].topic.total}></a></strong>
- |
- <{$smarty.const._MD_TOTALPOSTSC}><strong><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php" title="<{$smarty.const._MD_ALLPOSTS}>"><{$stats[0].post.total}></a></strong>
- <{if $stats[0].digest.total}>
- |
- <{$smarty.const._MD_TOTALDIGESTSC}><strong><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=digest" title="<{$smarty.const._MD_TOTALDIGESTSC}>"><{$stats[0].digest.total}></a></strong>
- <{/if}>
- <{if $userstats}>
- <br/><br/>
- <{$userstats.lastvisit}><br/><{$userstats.lastpost}>
- <{/if}>
- </div>
- <div class="forum_stats_right odd">
- <!-- <div style="align :right; float: right; width: 48%">//-->
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=new" title="<{$smarty.const._MD_VIEW_NEWPOSTS}>"><{$smarty.const._MD_VIEW_NEWPOSTS}></a><br/>
- <{$smarty.const._MD_TODAYTOPICSC}><strong><{$stats[0].topic.day|default:0}></strong>
- | <{$smarty.const._MD_TODAYPOSTSC}><strong><{$stats[0].post.day|default:0}></strong>
- <{if $userstats}>
- <br/><br/>
- <{$userstats.topics}> | <{$userstats.posts}><{if $userstats.digests}><br/><{$userstats.digests}><{/if}>
- <{/if}>
- </div>
- </div>
- </div>
-</fieldset>
+<div>
+ <div style="float: left; text-align: left;">
+ <{$img_forum_new}> = <{$smarty.const._MD_NEWPOSTS}><br />
+ <{$img_forum}> = <{$smarty.const._MD_NONEWPOSTS}><br />
+ </div>
+ <div style="float: right; text-align: right;">
+ <form action="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php" method="post" name="search" id="search">
+ <input name="term" id="term" type="text" size="20" />
+ <input type="hidden" name="forum" id="forum" value="all" />
+ <input type="hidden" name="sortby" id="sortby" value="p.post_time desc" />
+ <input type="hidden" name="searchin" id="searchin" value="both" />
+ <input type="submit" name="submit" id="submit" value="<{$smarty.const._MD_SEARCH}>" />
+ <br />
+ [ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php"><{$smarty.const._MD_ADVSEARCH}></a> ]
+ </form>
+ <{if $rss_button}>
+ <br />
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?c=<{$viewcat}>" target="_blank" title="RSS FEED">
+ <{$rss_button}>
+ </a>
+ <br /><font size="0.7em;"><a href="http://www.simple-xoops.de">NewBB Version <{$version/100}></a></font>
+ <br />
+ <{/if}>
+ </div>
+</div>
+<br style="clear: both;" />
+<{if $currenttime}>
+ <div>
+ <div class="even" style="padding: 5px; line-height: 150%;">
+ <span style="padding: 2px;"><{$online.statistik}></span>
+ <strong><{$smarty.const._MD_NEWBB_STATS}></strong>
+ </div>
+ <div class="forum_stats odd" style="padding: 5px; line-height: 150%;">
+ <!-- <div class="odd" style="padding: 5px; line-height: 150%;"> //-->
+ <div class="forum_stats_left odd">
+ <{$currenttime}><br />
+ <{$smarty.const._MD_TOTALTOPICSC}>
+ <strong><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php" title="<{$smarty.const._MD_ALL}>"><{$stats[0].topic.total}></a></strong>
+ | <{$smarty.const._MD_TOTALPOSTSC}><strong><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php" title="<{$smarty.const._MD_ALLPOSTS}>"><{$stats[0].post.total}></a></strong>
+ <{if $stats[0].digest.total}>
+ | <{$smarty.const._MD_TOTALDIGESTSC}><strong><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=digest" title="<{$smarty.const._MD_TOTALDIGESTSC}>"><{$stats[0].digest.total}></a></strong>
+ <{/if}>
+ <{if $userstats}>
+ <br /><br />
+ <{$userstats.lastvisit}><br /><{$userstats.lastpost}>
+ <{/if}>
+ </div>
+ <div class="forum_stats_right odd">
+ <!-- <div style="align :right; float: right; width: 48%">//-->
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=new" title="<{$smarty.const._MD_VIEW_NEWPOSTS}>"><{$smarty.const._MD_VIEW_NEWPOSTS}></a><br />
+ <{$smarty.const._MD_TODAYTOPICSC}><strong><{$stats[0].topic.day|default:0}></strong>
+ | <{$smarty.const._MD_TODAYPOSTSC}><strong><{$stats[0].post.day|default:0}></strong>
+ <{if $userstats}>
+ <br /><br />
+ <{$userstats.topics}> | <{$userstats.posts}><{if $userstats.digests}><br /><{$userstats.digests}><{/if}>
+ <{/if}>
+ </div>
+ </div>
+ </div>
<{/if}>
<br style="clear:both;"/>
-<{if $online}>
-<fieldset>
- <{includeq file="db:newbb_online.html"}>
-</fieldset>
+<{if $online}>
+ <{includeq file="db:newbb_online.html"}>
<{/if}>
-<fieldset>
- <{includeq file='db:newbb_notification_select.html'}>
-</fieldset>
+<{includeq file='db:newbb_notification_select.html'}>
<!-- end module contents -->
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html 2012-03-06 16:43:51 UTC (rev 9100)
@@ -129,7 +129,7 @@
<{else}>
<{foreachq item=btn from=$topic_post.thread_buttons}> <a href="<{$btn.link}>&post_id=<{$topic_post.post_id}>" title="<{$btn.name}>"> <{$btn.image}></a> <{/foreach}>
<{/if}>
- <a href="#threadtop" title="<{$smarty.const._MD_TOP}>"> <{$up}></a>
+ <a href="#threadtop" title="<{$smarty.const._MD_TOP}>"> <{$p_up}></a>
</td>
</tr>
</table>
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html 2012-03-06 16:43:51 UTC (rev 9100)
@@ -1,4 +1,3 @@
-<fieldset>
<div class="forum_header">
<div class="forum_title">
<h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php"><{$forum_index_title}></a></h2>
@@ -237,5 +236,5 @@
<{includeq file="db:newbb_online.html"}>
<{/if}>
<{includeq file='db:newbb_notification_select.html'}>
-</fieldset>
+
<!-- end module contents -->
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewpost.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewpost.html 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewpost.html 2012-03-06 16:43:51 UTC (rev 9100)
@@ -1,4 +1,3 @@
-<fieldset>
<div class="forum_header">
<div class="forum_title">
<h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php"><{$lang_forum_index}></a></h2>
@@ -137,5 +136,5 @@
<br />
<{includeq file="db:newbb_online.html"}>
<{/if}>
-</fieldset>
+
<!-- end module contents -->
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html 2012-03-06 16:43:51 UTC (rev 9100)
@@ -1,4 +1,3 @@
-<fieldset>
<div class="forum_header">
<div class="forum_title">
<h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php"><{$lang_forum_index}></a></h2>
@@ -242,7 +241,7 @@
<br />
<{includeq file='db:newbb_notification_select.html'}>
-</fieldset>
+
<script type="text/javascript">
<!--
xoopsGetElementById('aktuell').scrollIntoView(true);
Modified: XoopsModules/newbb/branches/alfred/newbb/viewforum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-03-06 16:43:51 UTC (rev 9100)
@@ -255,7 +255,6 @@
}
$xoopsTpl->assign('forum_topicstatus', $current_status);
-
$all_topics = $forum_handler->getTopicCount($forum_obj, $startdate, $status);
if ( $all_topics > $xoopsModuleConfig['topics_per_page']) {
include XOOPS_ROOT_PATH.'/class/pagenav.php';
@@ -264,7 +263,7 @@
$page_query_nav = implode("&", array_values($query_nav));
unset($query_nav);
$nav = new XoopsPageNav($all_topics, $xoopsModuleConfig['topics_per_page'], $start, "start", $page_query_nav);
-
+ if (!empty($xoopsModuleConfig['do_rewrite'])) $nav->url = XOOPS_URL.$nav->url;
if ($xoopsModuleConfig['pagenav_display'] == 'select')
$navi = $nav->renderSelect();
elseif ($xoopsModuleConfig['pagenav_display'] == 'bild')
Modified: XoopsModules/newbb/branches/alfred/newbb/viewpost.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewpost.php 2012-03-05 21:45:51 UTC (rev 9099)
+++ XoopsModules/newbb/branches/alfred/newbb/viewpost.php 2012-03-06 16:43:51 UTC (rev 9100)
@@ -333,6 +333,7 @@
if ( $postCount > $post_perpage ) {
include XOOPS_ROOT_PATH.'/class/pagenav.php';
$nav = new XoopsPageNav($postCount, $post_perpage, $start, "start", 'forum='.$forum_id.'&viewmode='.$viewmode.'&status='.$status.'&uid='.$uid.'&order='.$order."&mode=".$mode);
+ if (!empty($xoopsModuleConfig['do_rewrite'])) $nav->url = XOOPS_URL . $nav->url;
if ($xoopsModuleConfig['pagenav_display'] == 'select')
$navi = $nav->renderSelect();
elseif ($xoopsModuleConfig['pagenav_display'] == 'bild')
Modified: XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
===========================================...
[truncated message content] |
