Menu
▾
▴
xoops-svn
|
From: <dh...@us...> - 2012-02-08 17:27:58
|
Revision: 8909
http://xoops.svn.sourceforge.net/xoops/?rev=8909&view=rev
Author: dhcst
Date: 2012-02-08 17:27:44 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
update to newBB 4.2
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_header.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php
XoopsModules/newbb/branches/alfred/newbb/admin/index.php
XoopsModules/newbb/branches/alfred/newbb/class/forum.php
XoopsModules/newbb/branches/alfred/newbb/class/permission.forum.php
XoopsModules/newbb/branches/alfred/newbb/class/permission.php
XoopsModules/newbb/branches/alfred/newbb/class/post.php
XoopsModules/newbb/branches/alfred/newbb/class/topic.renderer.php
XoopsModules/newbb/branches/alfred/newbb/class/user.php
XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
XoopsModules/newbb/branches/alfred/newbb/header.php
XoopsModules/newbb/branches/alfred/newbb/include/functions.forum.php
XoopsModules/newbb/branches/alfred/newbb/include/functions.image.php
XoopsModules/newbb/branches/alfred/newbb/include/images.php
XoopsModules/newbb/branches/alfred/newbb/include/plugin.php
XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
XoopsModules/newbb/branches/alfred/newbb/language/english/blocks.php
XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php
XoopsModules/newbb/branches/alfred/newbb/language/german/admin.php
XoopsModules/newbb/branches/alfred/newbb/language/german/blocks.php
XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
XoopsModules/newbb/branches/alfred/newbb/language/german/modinfo.php
XoopsModules/newbb/branches/alfred/newbb/post.php
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_edit_post.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_online.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_poll_view.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_search.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewall.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/templates/style.css
XoopsModules/newbb/branches/alfred/newbb/topicmanager.php
XoopsModules/newbb/branches/alfred/newbb/viewforum.php
XoopsModules/newbb/branches/alfred/newbb/viewpost.php
XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
XoopsModules/newbb/branches/alfred/newbb/votepolls.php
XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
Added Paths:
-----------
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/buzz.png
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/delicious.png
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/digg.png
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/facebook.png
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/friendfeed.png
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/linkedin.png
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/reddit.png
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/stumbleupon.png
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/technorati.png
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/twitter.png
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/wong.png
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_notification_select.html
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -212,6 +212,7 @@
echo "</fieldset>";
break;
}
+mod_clearFile("","xoops_newbb");
echo "</fieldset>";
xoops_cp_footer();
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -117,7 +117,7 @@
$forum_handler->delete($forum_obj);
- mod_clearCacheFile("forum", "xoops_newbb");
+ //mod_clearCacheFile("forum", "newbb");
$forum_handler->synchronization($forum_dest);
unset($forum_dest);
mod_clearCacheFile("forum", "xoops_newbb");
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_header.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_header.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_header.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -35,7 +35,8 @@
include_once XOOPS_ROOT_PATH."/Frameworks/art/functions.php";
include_once XOOPS_ROOT_PATH."/Frameworks/art/functions.admin.php";
-xoops_loadLanguage('main');
+xoops_loadLanguage('main','newbb');
+xoops_loadLanguage('modinfo','newbb');
$newXoopsModuleGui = false;
if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -336,6 +336,7 @@
break;
}
+mod_clearCacheFile("","xoops_newbb");
echo "</fieldset></fieldset>";
xoops_cp_footer();
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/index.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -356,9 +356,9 @@
$moderate_handler->clearGarbage();
}
- mod_clearFile("","xoops_newbb");
}
mod_clearFile("","xoops_newbb");
+ mod_clearFile("","newbb");
echo "</fieldset>";
xoops_cp_footer();
break;
Modified: XoopsModules/newbb/branches/alfred/newbb/class/forum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -43,7 +43,7 @@
$this->initVar('cat_id', XOBJ_DTYPE_INT);
$this->initVar('parent_forum', XOBJ_DTYPE_INT);
$this->initVar('hot_threshold', XOBJ_DTYPE_INT, 20);
- $this->initVar('attach_maxkb', XOBJ_DTYPE_INT, 100);
+ $this->initVar('attach_maxkb', XOBJ_DTYPE_INT, 500);
$this->initVar('attach_ext', XOBJ_DTYPE_SOURCE, "zip|jpg|gif|png");
$this->initVar('forum_order', XOBJ_DTYPE_INT, 99);
$this->initVar("dohtml", XOBJ_DTYPE_INT, 1);
Modified: XoopsModules/newbb/branches/alfred/newbb/class/permission.forum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/permission.forum.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/class/permission.forum.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -191,13 +191,13 @@
function getTemplate()
{
- $perms = mod_loadFile("perm_template", "newbb");
+ $perms = mod_loadFile("perm_template", "xoops_newbb");
return $perms;
}
function setTemplate($perms)
{
- return mod_createFile($perms, "perm_template", "newbb");
+ return mod_createFile($perms, "perm_template", "xoops_newbb");
}
}
Modified: XoopsModules/newbb/branches/alfred/newbb/class/permission.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/permission.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/class/permission.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -192,7 +192,8 @@
function &loadPermData($perm_name = "forum_access")
{
load_functions("cache");
- if (!$perms = mod_loadCacheFile("permission_{$perm_name}", "xoops_newbb")) {
+ if (!$perms = mod_loadCacheFile("permission_{$perm_name}", "newbb")) {
+
$perms = $this->createPermData($perm_name);
}
@@ -212,8 +213,8 @@
}
}
if ($this->_checkRight($perm, $itemid, $groupid, $mid)) return true;
- //load_functions("cache");
- //mod_clearCacheFile("permission", "xoops_newbb");
+ load_functions("cache");
+ mod_clearCacheFile("permission", "xoops_newbb");
$this->addRight($perm, $itemid, $groupid, $mid);
return true;
}
Modified: XoopsModules/newbb/branches/alfred/newbb/class/post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -177,10 +177,13 @@
$isDisplayed = true;
} else {
global $xoopsUser;
- if (($xoopsUser && $xoopsUser->uid() > 0 && $xoopsUser->isactive()) || empty($xoopsModuleConfig['show_only_user_attach']))
- $post_attachment .= '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar("dirname", "n") . '/dl_attachment.php?attachid=' . $key . '&post_id=' . $this->getVar('post_id') . '"> <img src="' . $icon_filetype . '" alt="' . $filetype . '" /> ' . $att['name_display'] . '</a> ' . _MD_FILESIZE . ': '. $file_size . '; '._MD_HITS.': ' . $att['num_download'];
- else
- $post_attachment .= _MD_NEWBB_SEENOTGUEST;
+ if (empty($xoopsModuleConfig['show_userattach'])) {
+ $post_attachment .= '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar("dirname", "n") . '/dl_attachment.php?attachid=' . $key . '&post_id=' . $this->getVar('post_id') . '"> <img src="' . $icon_filetype . '" alt="' . $filetype . '" /> ' . $att['name_display'] . '</a> ' . _MD_FILESIZE . ': '. $file_size . '; '._MD_HITS.': ' . $att['num_download'];
+ } elseif (($xoopsUser && $xoopsUser->uid() > 0 && $xoopsUser->isactive()) ) {
+ $post_attachment .= '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar("dirname", "n") . '/dl_attachment.php?attachid=' . $key . '&post_id=' . $this->getVar('post_id') . '"> <img src="' . $icon_filetype . '" alt="' . $filetype . '" /> ' . $att['name_display'] . '</a> ' . _MD_FILESIZE . ': '. $file_size . '; '._MD_HITS.': ' . $att['num_download'];
+ } else {
+ $post_attachment .= _MD_NEWBB_SEENOTGUEST;
+ }
}
$post_attachment .= '<br />';
}
@@ -468,7 +471,7 @@
if (file_exists(XOOPS_ROOT_PATH."/Frameworks/tcpdf/tcpdf.php")) {
$thread_action['pdf']['image'] = newbb_displayImage('pdf', _MD_PDF);
- $thread_action['pdf']['link'] = "makepdf.php?type=post&pageid=0";
+ $thread_action['pdf']['link'] = XOOPS_URL."/modules/newbb/makepdf.php?type=post&pageid=0";
$thread_action['pdf']['name'] = _MD_PDF;
$thread_action['pdf']['target'] = '_blank';
}
@@ -477,6 +480,62 @@
$thread_action['print']['link'] = "print.php?form=2&forum=". $forum_id."&topic_id=" . $topic_id;
$thread_action['print']['name'] = _MD_PRINT;
$thread_action['print']['target'] = '_blank';
+
+ if ( $xoopsModuleConfig['show_sociallinks']) {
+
+ $full_title = $this->getVar('subject');
+ $clean_title =preg_replace('/[^A-Za-z0-9-]+/', '+', $this->getVar('subject'));
+ $full_link = XOOPS_URL."/modules/newbb/viewtopic.php?post_id=".$post_id;
+
+ $thread_action['social_twitter']['image'] = newbb_displayImage('twitter', _MD_SHARE_TWITTER);
+ $thread_action['social_twitter']['link'] = "http://twitter.com/share?text=".$clean_title."&url=".$full_link;
+ $thread_action['social_twitter']['name'] = _MD_SHARE_TWITTER;
+ $thread_action['social_twitter']['target'] = '_blank';
+
+ $thread_action['social_facebook']['image'] = newbb_displayImage('facebook', _MD_SHARE_FACEBOOK);
+ $thread_action['social_facebook']['link'] = "http://www.facebook.com/sharer.php?u=".$full_link;
+ $thread_action['social_facebook']['name'] = _MD_SHARE_FACEBOOK;
+ $thread_action['social_facebook']['target'] = '_blank';
+
+ $thread_action['social_buzz']['image'] = newbb_displayImage('buzz', _MD_SHARE_BUZZ);
+ $thread_action['social_buzz']['link'] = "http://www.google.com/buzz/post?url=".$full_link;
+ $thread_action['social_buzz']['name'] = _MD_SHARE_BUZZ;
+ $thread_action['social_buzz']['target'] = '_blank';
+
+ $thread_action['social_linkedin']['image'] = newbb_displayImage('linkedin', _MD_SHARE_LINKEDIN);
+ $thread_action['social_linkedin']['link'] = "http://www.linkedin.com/shareArticle?mini=true&title=".$full_title."&url=".$full_link;
+ $thread_action['social_linkedin']['name'] = _MD_SHARE_LINKEDIN;
+ $thread_action['social_linkedin']['target'] = '_blank';
+
+ $thread_action['social_delicious']['image'] = newbb_displayImage('delicious', _MD_SHARE_DELICIOUS);
+ $thread_action['social_delicious']['link'] = "http://del.icio.us/post?title=".$full_title."&url=".$full_link;
+ $thread_action['social_delicious']['name'] = _MD_SHARE_DELICIOUS;
+ $thread_action['social_delicious']['target'] = '_blank';
+
+ $thread_action['social_digg']['image'] = newbb_displayImage('digg', _MD_SHARE_DIGG);
+ $thread_action['social_digg']['link'] = "http://digg.com/submit?phase=2&title=".$full_title."&url=".$full_link;
+ $thread_action['social_digg']['name'] = _MD_SHARE_DIGG;
+ $thread_action['social_digg']['target'] = '_blank';
+
+ $thread_action['social_reddit']['image'] = newbb_displayImage('reddit', _MD_SHARE_REDDIT);
+ $thread_action['social_reddit']['link'] = "http://reddit.com/submit?title=".$full_title."&url=".$full_link;
+ $thread_action['social_reddit']['name'] = _MD_SHARE_REDDIT;
+ $thread_action['social_reddit']['target'] = '_blank';
+
+ $thread_action['social_wong']['image'] = newbb_displayImage('wong', _MD_SHARE_MRWONG);
+ $thread_action['social_wong']['link'] = "http://www.mister-wong.de/index.php?action=addurl&bm_url=".$full_link;
+ $thread_action['social_wong']['name'] = _MD_SHARE_WONG;
+ $thread_action['social_wong']['target'] = '_blank';
+
+ /*
+ $thread_action['social_technorati']['image'] = newbb_displayImage('technorati', _MD_SHARE_REDDIT);
+ $thread_action['social_technorati']['link'] = "http://technorati.com/faves/?add=".$full_link;
+ $thread_action['social_technorati']['name'] = _MD_SHARE_REDDIT;
+ $thread_action['social_technorati']['target'] = '_blank';
+ */
+
+ }
+
$post = array(
'post_id' => $post_id,
'post_parent_id' => $this->getVar('pid'),
Modified: XoopsModules/newbb/branches/alfred/newbb/class/topic.renderer.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/topic.renderer.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/class/topic.renderer.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -485,7 +485,13 @@
}
require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
$nav = new XoopsPageNav($count_topic, $this->config['topics_per_page'], @$this->vars["start"], "start", implode("&", $args));
- $xoopsTpl->assign('pagenav', $nav->renderNav(4));
+ if ($this->config['pagenav_display'] == 'select')
+ $navi = $nav->renderSelect();
+ elseif ($this->config['pagenav_display'] == 'bild')
+ $navi = $nav->renderImageNav(4);
+ else
+ $navi = $nav->renderNav(4);
+ $xoopsTpl->assign('pagenav', $navi);
} else {
$xoopsTpl->assign('pagenav', '');
}
@@ -568,7 +574,7 @@
' WHERE '.implode(" AND ", $wheres).
' AND '.@implode(" AND ", @$this->query["where"]).
' ORDER BY '.implode(", ", $this->query["sort"]);
-
+
if (!$result = $this->handler->db->query($sql, $this->config['topics_per_page'], @$this->vars["start"])) {
if (is_object($xoopsTpl)) {
$xoopsTpl->assign_by_ref("topics", $ret);
Modified: XoopsModules/newbb/branches/alfred/newbb/class/user.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/user.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/class/user.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -124,6 +124,7 @@
global $xoopsModuleConfig, $forumUrl;
$level = newbb_calculateLevel($this->user->getVar("posts"), $this->user->getVar("user_regdate"));
+ $info='';
if ($xoopsModuleConfig['user_level'] == 2) {
static $rpg_images;
if (!isset($rpg_images)) {
@@ -133,7 +134,7 @@
$rpg_images[$img] = XOOPS_URL . '/' . $rpg_path . '/'.$img.'.gif';
}
}
- $table = "<table class='userlevel'><tr><td class='end'><img src='" . $rpg_images['img_left'] . "' alt='' /></td><td class='center' background='" . $rpg_images['img_backing'] . "'><img src='%s' width='%d' alt='' /></td><td><img src='" . $rpg_images['img_right'] . "' alt='' /></td></tr></table>";
+ $table = "<table class='userlevel'><tr><td class='end'><img src='" . $rpg_images['img_left'] . "' alt='' /></td><td class='center' background='" . $rpg_images['img_backing'] . "'><img src='%s' width='%d' alt='' align='left' /></td><td><img src='" . $rpg_images['img_right'] . "' alt='' /></td></tr></table>";
$info = _MD_LEVEL . " " . $level['level'] . "<br />" . _MD_HP . " " . $level['hp'] . " / " . $level['hp_max'] . "<br />".
sprintf($table, $rpg_images["orange"], $level['hp_width']);
Modified: XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-02-08 17:27:44 UTC (rev 8909)
@@ -1,3 +1,17 @@
+newBB
+Changelog 4.2
+02/08/2012
+===========================================
+ 1 Fix Smilies are not displayed
+ 2 Fix View Avatars
+ 3 Fix Page Numbers views
+ 4 Fix Error in Cache
+ 5 New Userinfos on/off
+ 6 New Advertising in Threads
+ 7 New Visible Attachments for Guests on/of
+ 8 New Display page numbers adjusted
+
+
CBB
Changelog 4.1
11/26/2011
Modified: XoopsModules/newbb/branches/alfred/newbb/header.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/header.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/header.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -13,15 +13,14 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
if (!empty($xoopsModuleConfig['do_rewrite'])) include_once "seo_url.php";
/* for seo */
-$noseo_url = array("newtopic.php","list.topic.php","viewpost.php","reply.php","report.php","search.php","edit.php","moderate.php","polls.php","delete.php","index.php","makepdf.php");
-
-if(((strpos(getenv('REQUEST_URI'), '.html') === false) && !empty($xoopsModuleConfig['do_rewrite']) && (!isset($_POST) || count($_POST) <=0)))
+$toseo_url = array("index.php","viewforum.php","viewtopic.php","rss.php","print.php","makepdf.php");
+if(((strpos(getenv('REQUEST_URI'), '.html') === false) && !empty($xoopsModuleConfig['do_rewrite']) && (!isset($_POST) || count($_POST) <= 0)))
{
- if ( !in_array(basename(getenv('SCRIPT_NAME')),$noseo_url) && (trim(getenv("REQUEST_URI")) != '') && trim(getenv("REQUEST_URI")) != "/".REAL_MODULE_NAME."/") {
+ if ( 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");
$newurl = seo_urls('<a href="'.$s.'"></a>');
$newurl = str_replace('<a href="','',$newurl);
- $newurl = str_replace('"></a>','',$newurl);
+ $newurl = str_replace('"></a>','',$newurl);
if (!headers_sent()) {
header("HTTP/1.1 301 Moved Permanently");
header("Location: $newurl");
@@ -29,6 +28,7 @@
}
}
}
+
include_once XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/include/vars.php";
mod_loadFunctions("user", "newbb");
Modified: XoopsModules/newbb/branches/alfred/newbb/include/functions.forum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/functions.forum.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/include/functions.forum.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -59,7 +59,7 @@
function newbb_make_jumpbox($forum_id = 0)
{
- $box = '<form name="forum_jumpbox" method="get" action="viewforum.php" onsubmit="javascript: if (document.forum_jumpbox.forum.value < 1) {return false;}">';
+ $box = '<form name="forum_jumpbox" method="get" action="'.XOOPS_URL.'/modules/newbb/viewforum.php" onsubmit="javascript: if (document.forum_jumpbox.forum.value < 1) {return false;}">';
$box .= '<select class="select" name="forum" onchange="javascript: if (this.options[this.selectedIndex].value >0 ) { document.forms.forum_jumpbox.submit();}">';
$box .='<option value=0>-- '._MD_SELFORUM.' --</option>';
$box .= newbb_forumSelectBox($forum_id);
Modified: XoopsModules/newbb/branches/alfred/newbb/include/functions.image.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/functions.image.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/include/functions.image.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -48,7 +48,7 @@
$imginfo = @getimagesize($image);
$img_info = ( count($imginfo)>0 ) ? $imginfo[0]."X".$imginfo[1].' px':"";
-
+/*
if ($xoopsModuleConfig['max_img_width'] > 0) {
if (
( $xoopsModuleConfig['max_image_width'] > 0 && $imginfo[0]> $xoopsModuleConfig['max_image_width'] )
@@ -70,7 +70,25 @@
newbb_createThumbnail($source, $xoopsModuleConfig['max_img_width']);
}
}
+*/
+ if ( $xoopsModuleConfig['max_image_width'] > 0 && $xoopsModuleConfig['max_image_height'] > 0 ) {
+ if ( $imginfo[0] > $xoopsModuleConfig['max_image_width'] || $imginfo[1] > $xoopsModuleConfig['max_image_height']) {
+ if (!file_exists($thumb_path.'/'.$source) && $imginfo[0]>$xoopsModuleConfig['max_img_width']) {
+ newbb_createThumbnail($source, $xoopsModuleConfig['max_image_width']);
+ }
+ }
+ if ($imginfo[0] > $xoopsModuleConfig['max_image_width']) {
+ $pseudo_width = $xoopsModuleConfig['max_image_width'];
+ $pseudo_height = $xoopsModuleConfig['max_image_width']*($imginfo[1]/$imginfo[0]);
+ $pseudo_size = "width='".$pseudo_width."px' height='".$pseudo_height."px'";
+ }
+ if ($xoopsModuleConfig['max_image_height']> 0 && $pseudo_height > $xoopsModuleConfig['max_image_height']) {
+ $pseudo_height = $xoopsModuleConfig['max_image_height'];
+ $pseudo_width = $xoopsModuleConfig['max_image_height'] * ($imginfo[0]/$imginfo[1]);
+ $pseudo_size = "width='".$pseudo_width."px' height='".$pseudo_height."px'";
+ }
+ }
if (file_exists($thumb)) {
$attachmentImage = '<a href="'.$image_url.'" title="'.$source.' '.$img_info.'" target="newbb_image">';
Modified: XoopsModules/newbb/branches/alfred/newbb/include/images.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/images.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/include/images.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -69,6 +69,18 @@
$forumImage['printer'] =
$forumImage['new_forum'] =
+$forumImage['facebook'] =
+$forumImage['twitter'] =
+$forumImage['linkedin'] =
+$forumImage['buzz'] =
+$forumImage['stumbleupon'] =
+$forumImage['friendfeed'] =
+$forumImage['digg'] =
+$forumImage['reddit'] =
+$forumImage['delicious'] =
+$forumImage['technorati'] =
+$forumImage['wong'] =
+
"icon";
for($i = 1; $i <= 5; $i++ ) {
Modified: XoopsModules/newbb/branches/alfred/newbb/include/plugin.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/plugin.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/include/plugin.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -76,10 +76,6 @@
//1 => _MD_MENU_CLICK, // for "click to expand"
//2 => _MD_MENU_HOVER // for "mouse hover to expand"
);
-
-
-// Post view mode
-$customConfig["show_only_user_attach"] = 1;
return $customConfig;
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -1,5 +1,9 @@
<?php
// $Id: admin.php,v 1.3 2005/10/19 17:20:33 phppp Exp $
+
+if(defined('NEWBB_ADMIN_DEFINED')) return;
+else define('NEWBB_ADMIN_DEFINED',true);
+
//%%%%%% File Name index.php %%%%%
define("_AM_NEWBB_FORUMCONF", "Forum Configuration");
define("_AM_NEWBB_ADDAFORUM", "Add a Forum");
@@ -30,13 +34,10 @@
define("_AM_NEWBB_POSTNOTAPPROVED", "Post has NOT been approved");
define("_AM_NEWBB_POSTSAVED", "Post has been saved");
define("_AM_NEWBB_POSTNOTSAVED", "Post has NOT been saved");
-
define("_AM_NEWBB_TOPICAPPROVED", "Topic has been approved");
define("_AM_NEWBB_TOPICNOTAPPROVED", "Topic has been NOT approved");
define("_AM_NEWBB_TOPICID", "Topic ID");
define("_AM_NEWBB_ORPHAN_TOPICS_FOR_AUTH", "Unapproved topics authorization");
-
-
define('_AM_NEWBB_DEL_ONE','Delete only this message');
define('_AM_NEWBB_POSTSDELETED','Selected post deleted.');
define('_AM_NEWBB_NOAPPROVEPOST','There are presently no posts waiting approval.');
@@ -45,7 +46,6 @@
define('_AM_NEWBB_MESSAGEC','Message:');
define('_AM_NEWBB_CANCELPOST','Cancel Post');
define('_AM_NEWBB_GOTOMOD','Go to module');
-
define('_AM_NEWBB_PREFERENCES','Module preferences');
define('_AM_NEWBB_POLLMODULE','Xoops Poll Module');
define('_AM_NEWBB_POLL_OK','Ready for use');
@@ -63,14 +63,12 @@
define('_AM_NEWBB_REPORT','Reported posts');
define('_AM_NEWBB_REPORT_PENDING','Pending report');
define('_AM_NEWBB_REPORT_PROCESSED','processed report');
-
define('_AM_NEWBB_CREATETHEDIR','Create it');
define('_AM_NEWBB_SETMPERM','Set the permission');
define('_AM_NEWBB_DIRCREATED','The directory has been created');
define('_AM_NEWBB_DIRNOTCREATED','The directory can not be created');
define('_AM_NEWBB_PERMSET','The permission has been set');
define('_AM_NEWBB_PERMNOTSET','The permission can not be set');
-
define('_AM_NEWBB_DIGEST','Digest notification');
define('_AM_NEWBB_DIGEST_PAST','<font color="red">Should be sent out %d minutes ago</font>');
define('_AM_NEWBB_DIGEST_NEXT','Need to send out in %d minutes');
@@ -95,7 +93,7 @@
define("_AM_NEWBB_ALLOWPOLLS", "Allow Polls:");
define("_AM_NEWBB_ATTACHMENT_SIZE" ,"Max Size in kb`s:");
define("_AM_NEWBB_ALLOWED_EXTENSIONS", "Allowed Extensions:<span style='font-size: xx-small; font-weight: normal; display: block;'>'*' indicates no limititations.<br /> Extensions delimited by '|'</span>");
-//define("_AM_NEWBB_ALLOW_ATTACHMENTS", "Allow Attachments:");
+define("_AM_NEWBB_ALLOW_ATTACHMENTS", "Allow Attachments:");
define("_AM_NEWBB_ALLOWHTML", "Allow HTML:");
define("_AM_NEWBB_YES", "Yes");
define("_AM_NEWBB_NO", "No");
@@ -110,7 +108,6 @@
define("_AM_NEWBB_MODERATOR_ADD", "Add moderators");
// admin_cat_manager.php
-
define("_AM_NEWBB_SETCATEGORYORDER", "Set Category Position:");
define("_AM_NEWBB_ACTIVE", "Active");
define("_AM_NEWBB_INACTIVE", "Inactive");
@@ -123,8 +120,6 @@
define("_AM_NEWBB_DELCAT", "Delete Category");
define("_AM_NEWBB_WAYSYWTDTTAL", "Note: This will NOT remove the forums under the category, you must do that via the Edit Forum section.<br /><br />WARNING: Are you sure you want to delete this Category?");
-
-
//%%%%%% File Name admin_forums.php %%%%%
define("_AM_NEWBB_FORUMNAME", "Forum Name:");
define("_AM_NEWBB_FORUMDESCRIPTION", "Forum Description:");
@@ -180,9 +175,7 @@
define("_AM_NEWBB_CAN_TYPE", "Can use topic type");
define("_AM_NEWBB_CAN_HTML", "Can use HTML syntax");
define("_AM_NEWBB_CAN_SIGNATURE", "Can use signature");
-
define("_AM_NEWBB_ACTION", "Action");
-
define("_AM_NEWBB_PERM_TEMPLATE", "Set default permission template");
define("_AM_NEWBB_PERM_TEMPLATE_DESC", "Edit the following permission template so that it can be applied to a forum or a couple of forums");
define("_AM_NEWBB_PERM_FORUMS", "Select forums");
@@ -194,7 +187,6 @@
define("_AM_NEWBB_PERM_SETBYGROUP", "Set permissions directly by group");
// admin_forum_prune.php
-
define ("_AM_NEWBB_PRUNE_RESULTS_TITLE", "Prune Results");
define ("_AM_NEWBB_PRUNE_RESULTS_TOPICS", "Pruned Topics");
define ("_AM_NEWBB_PRUNE_RESULTS_POSTS", "Pruned Posts");
@@ -202,7 +194,6 @@
define ("_AM_NEWBB_PRUNE_STORE", "Store posts in this forum instead of deleting them");
define ("_AM_NEWBB_PRUNE_ARCHIVE", "Make a copy of posts into Archive");
define ("_AM_NEWBB_PRUNE_FORUMSELERROR", "You forgot to select forum(s) to prune");
-
define ("_AM_NEWBB_PRUNE_DAYS", "Remove topics without replies in:");
define ("_AM_NEWBB_PRUNE_FORUMS", "Forums to be pruned");
define ("_AM_NEWBB_PRUNE_STICKY", "Keep Sticky topics");
@@ -288,7 +279,6 @@
define("_AM_NEWBB_TYPE_EDITFORUM_DESC", "The data have not been saved yet. You must submit to save them.");
define("_AM_NEWBB_TYPE_ORDER_DESC", "To activate a type for a forum, a value greater than 0 is required for 'type_order'; In other words, a type will be inactive for a forum if 'type_order' is set to 0.");
-
// admin_synchronization.php
define("_AM_NEWBB_SYNC_TYPE_FORUM", "Forum Data");
define("_AM_NEWBB_SYNC_TYPE_TOPIC", "Topic Data");
@@ -296,9 +286,9 @@
define("_AM_NEWBB_SYNC_TYPE_USER", "User Data");
define("_AM_NEWBB_SYNC_TYPE_STATS", "Stats Info");
define("_AM_NEWBB_SYNC_TYPE_MISC", "MISC");
-
define("_AM_NEWBB_SYNC_ITEMS", "Items for each loop: ");
-
+define("_AM_NEWBB_ALLOW_SUBJECT_PREFIX", "Thread prefixes allow?");
+define("_AM_NEWBB_ALLOW_SUBJECT_PREFIX_DESC", "This allows for prefixes that are added to the topic name.");
define("_AM_NEWBB_GROUPMOD_TITLE","add moderators per group");
define("_AM_NEWBB_GROUPMOD_TITLEDESC","Allows you to enter, users of certain groups as moderators");
define("_AM_NEWBB_GROUPMOD_ALLFORUMS","all forums");
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/blocks.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/blocks.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/blocks.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -1,8 +1,8 @@
<?php
// $Id: blocks.php,v 1.3 2005/10/19 17:20:33 phppp Exp $
// Blocks
-if (defined('_MB_NEWBB_DEFINED')) return;
-else define('_MB_NEWBB_DEFINED',true);
+if(defined('NEWBB_BLOCKS_DEFINED')) return;
+else define('NEWBB_BLOCKS_DEFINED',true);
define("_MB_NEWBB_FORUM","Forum");
define("_MB_NEWBB_TOPIC","Topic");
@@ -18,7 +18,6 @@
define("_MB_NEWBB_FORUMLIST","Allowed forum list: ");
define("_MB_NEWBB_ALLTOPICS","Topics");
define("_MB_NEWBB_ALLPOSTS","Posts");
-
define("_MB_NEWBB_CRITERIA","Display criteria");
define("_MB_NEWBB_CRITERIA_TOPIC","Topics");
define("_MB_NEWBB_CRITERIA_POST","Posts");
@@ -33,11 +32,9 @@
define("_MB_NEWBB_CRITERIA_STICKYS","Most sticky topics");
define("_MB_NEWBB_TIME","Time period");
define("_MB_NEWBB_TIME_DESC","Positive for days and negative for hours");
-
define("_MB_NEWBB_TITLE","Title");
define("_MB_NEWBB_AUTHOR","Author");
define("_MB_NEWBB_COUNT","Count");
define("_MB_NEWBB_INDEXNAV","Display Navigator");
-
define("_MB_NEWBB_TITLE_LENGTH","Title/Post length");
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -1,11 +1,10 @@
<?php
-// $Id: main.php,v 1.3 2005/10/19 17:20:33 phppp Exp $
-if (defined('MAIN_DEFINED')) return;
+// $Id: main.php 17 2007-11-18 14:22:36Z LupusC $
+if(defined('MAIN_DEFINED')) return;
define('MAIN_DEFINED',true);
define('_MD_ERROR','Error');
define('_MD_SELFORUM','Select a Forum');
-
define('_MD_THIS_FILE_WAS_ATTACHED_TO_THIS_POST','Attached file:');
define('_MD_ALLOWED_EXTENSIONS','Allowed extensions');
define('_MD_MAX_FILESIZE','Maxium file size');
@@ -23,7 +22,6 @@
define('_MD_ALL_TOPIC_MARKED','All topics marked');
define('_MD_BOARD_DISCLAIMER','Board Disclaimer');
-
//index.php
define('_MD_ADMINCP','Admin CP');
define('_MD_FORUM','Forum');
@@ -45,7 +43,6 @@
define('_MD_USER_LASTVISIT', 'Your last visit: %s');
define('_MD_USER_LASTPOST', 'Your last post: %s');
define('_MD_USER_NOLASTPOST', 'You have not posted yet');
-
define('_MD_USER_TOPICS', 'Your Topics: ');
define('_MD_USER_POSTS', 'Posts: ');
define('_MD_USER_DIGESTS', 'Digests: ');
@@ -58,7 +55,6 @@
define('_MD_SUBFORUMS','Subforums');
define('_MD_MAINFORUMOPT', 'Main Options');
define("_MD_PENDING_POSTS_FOR_AUTH", "Posts pending approval:");
-
define('_MD_TODAYTOPICSC','Today Topics: ');
define('_MD_TODAYPOSTSC','Today Posts: ');
define('_MD_TOTALDIGESTSC','Total Digests: ');
@@ -66,8 +62,7 @@
//page_header.php
define('_MD_MODERATEDBY','Moderated by');
define('_MD_SEARCH','Search');
-//define('_MD_SEARCHRESULTS','Search Results');
-define('_MD_FORUMINDEX','%s Forum Index');
+define('_MD_FORUMINDEX','Forum Index');
define('_MD_POSTNEW','New Topic');
define('_MD_REGTOPOST','Register To Post');
@@ -137,13 +132,11 @@
define("_MD_CANNOT_UPLOAD", "You <strong>cannot</strong> upload.<br />");
define("_MD_CAN_SIGNATURE", "You <strong>can</strong> use signature.<br />");
define("_MD_CANNOT_SIGNATURE", "You <strong>cannot</strong> use signature.<br />");
-
define("_MD_IMTOPICS", "Important Topics");
define("_MD_NOTIMTOPICS", "Forum Topics");
define('_MD_FORUMOPTION', 'Forum options');
define('_MD_VAUP','View all unreplied posts');
define('_MD_VANP','View all new posts');
-
define('_MD_UNREPLIED','unreplied topics');
define('_MD_UNREAD','unread topics');
define('_MD_ALL','all topics');
@@ -213,22 +206,14 @@
define('_MD_EXCEEDTHREADVIEW','Post count exceeds the threshold for thread mode<br />Changing to flat mode');
//forumform.inc
-
define('_MD_QUOTE','Quote');
define('_MD_VIEW_REQUIRE','View requirements');
define('_MD_REQUIRE_KARMA','Karma');
define('_MD_REQUIRE_REPLY','Reply');
define('_MD_REQUIRE_NULL','No requirement');
-
define("_MD_SELECT_FORMTYPE", "Select your desired form type");
-
define("_MD_FORM_COMPACT", "Compact");
define("_MD_FORM_DHTML", "DHTML");
-define("_MD_FORM_SPAW", "Spaw Editor");
-define("_MD_FORM_HTMLAREA", "HTMLArea");
-define("_MD_FORM_FCK", "FCK Editor");
-define("_MD_FORM_KOIVI", "Koivi Editor");
-define("_MD_FORM_TINYMCE", "TinyMCE Editor");
// ERROR messages
define('_MD_ERRORFORUM','ERROR: Forum not selected!');
@@ -250,7 +235,6 @@
define('_MD_TIMEISUP','Your have reach the timelimit for editing your post.');
define('_MD_TIMEISUPDEL','Your have reach the timelimit for deleting your post.');
-
//reply.php
define('_MD_ON','on'); //Posted on
define('_MD_USERWROTE','%s wrote:'); // %s is username
@@ -260,7 +244,6 @@
define('_MD_EDITNOTALLOWED','You\'re not allowed to edit this post!');
define('_MD_EDITEDBY','Edited by');
define('_MD_ANONNOTALLOWED','Anonymous users are not allowed to post.<br />Please register.');
-
define('_MD_THANKSSUBMIT','Thanks for your submission!');
define('_MD_REPLYPOSTED','A reply to your topic has been posted.');
define('_MD_HELLO','Hello %s,');
@@ -282,7 +265,6 @@
define('_MD_DOSMILEY','Enable Smiley');
define('_MD_DOXCODE','Enable Xoops Code');
define('_MD_DOBR','Enable line break (Suggest to turn off if HTML enabled)');
-
define('_MD_DOHTML','Enable html tags');
define('_MD_NEWPOSTNOTIFY', 'Notify me of new posts in this thread');
define('_MD_ATTACHSIG','Attach Signature');
@@ -302,7 +284,6 @@
define('_MD_RETURNFORUMINDEX','Return to the forum index');
define('_MD_ERROR_BACK','Error - Please go back and try again.');
define('_MD_GOTONEWFORUM','View the updated topic');
-
define('_MD_TOPICDELETE','The topic has been deleted.');
define('_MD_TOPICMERGE','The topic has been merged.');
define('_MD_TOPICMOVE','The topic has been moved.');
@@ -312,8 +293,6 @@
define('_MD_TOPICUNSTICKY','The topic has been unStickyed.');
define('_MD_TOPICDIGEST','The topic has been Digested.');
define('_MD_TOPICUNDIGEST','The topic has been unDigested.');
-
-
define('_MD_DELETE','Delete');
define('_MD_MOVE','Move');
define('_MD_MERGE','Merge');
@@ -323,8 +302,6 @@
define('_MD_UNSTICKY','unSticky');
define('_MD_DIGEST','Digest');
define('_MD_UNDIGEST','unDigest');
-
-
define('_MD_DESC_DELETE','Once you press the delete button at the bottom of this form the topic you have selected, and all its related posts, will be <strong>permanently</strong> removed.');
define('_MD_DESC_MOVE','Once you press the move button at the bottom of this form the topic you have selected, and its related posts, will be moved to the forum you have selected.');
define('_MD_DESC_MERGE','Once you press the merge button at the bottom of this form the topic you have selected, and its related posts, will be merged to the topic you have selected.<br /><strong>The destination topic ID must be smaller than current one</strong>.');
@@ -334,7 +311,6 @@
define('_MD_DESC_UNSTICKY','Once you press the unSticky button at the bottom of this form the topic you have selected will be unStickyed. You may Sticky it again at a later time if you like.');
define('_MD_DESC_DIGEST','Once you press the Digest button at the bottom of this form the topic you have selected will be Digested. You may unDigest it again at a later time if you like.');
define('_MD_DESC_UNDIGEST','Once you press the unDigest button at the bottom of this form the topic you have selected will be unDigested. You may Digest it again at a later time if you like.');
-
define('_MD_MERGETOPICTO','Merge Topic To:');
define('_MD_MOVETOPICTO','Move Topic To:');
define('_MD_NOFORUMINDB','No Forums in DB');
@@ -342,14 +318,10 @@
// delete.php
define('_MD_DELNOTALLOWED','Sorry, but you\'re not allowed to delete this post.');
define('_MD_AREUSUREDEL','Are you sure you want to delete this post and all its child posts?');
-
define('_MD_POSTSDELETED','Selected post and all its child posts deleted.');
-
-
define('_MD_POSTDELETED','Selected post deleted.');
define('_MD_POSTFIRSTWITHREPLYNODELETED','The start posting can not be deleted if there are already answers<br />do this, delete the whole topic.');
-
// definitions moved from global.
define('_MD_THREAD','Thread');
define('_MD_FROM','From');
@@ -358,7 +330,6 @@
define('_MD_OFFLINE','Offline');
define('_MD_FLAT', 'Flat');
-
// online.php
define('_MD_USERS_ONLINE', 'Users Online:');
define('_MD_ANONYMOUS_USERS', 'Anonymous Users');
@@ -366,21 +337,17 @@
define('_MD_BROWSING_FORUM','Users browsing forum');
define('_MD_TOTAL_ONLINE','Total %d Users Online.');
define('_MD_ADMINISTRATOR','Administrator');
-
define('_MD_NO_SUCH_FILE','File not exist!');
//define('_MD_ERROR_UPATEATTACHMENT','Error occur when updating attachment');
// ratethread.php
define("_MD_CANTVOTEOWN", "You cannot vote on the topic you submitted.<br />All votes are logged and reviewed.");
define("_MD_VOTEONCE", "Please do not vote for the same topic more than once.");
-
-
define("_MD_VOTEAPPRE", "Your vote is appreciated.");
define("_MD_THANKYOU", "Thank you for taking the time to vote here at %s"); // %s is your site name
define("_MD_VOTES", "Votes");
define("_MD_NOVOTERATE", "You did not rate this Topic");
-
// polls.php
define("_MD_POLL_DBUPDATED", "Database Updated Successfully!");
define("_MD_POLL_POLLCONF", "Polls Configuration");
@@ -406,7 +373,6 @@
define("_MD_POLL_RESTART", "Restart this poll");
define("_MD_POLL_ADDMORE", "Add more options");
define("_MD_POLL_RUSUREDEL", "Are you sure you want to delete this poll and all its comments?");
-
define("_MD_POLL_RESTARTPOLL", "Restart poll");
define("_MD_POLL_RESET", "Reset all logs for this poll?");
define("_MD_POLL_ADDPOLL", "Add Poll");
@@ -414,10 +380,8 @@
//report.php
define("_MD_REPORTED", "Thank you for reporting this post/thread! A moderator will look into your report shortly.");
-
define("_MD_REPORT_ERROR", "Error occured while sending the report.");
define("_MD_REPORT_TEXT", "Report message:");
-
define("_MD_PDF", "Create PDF from Post");
define("_MD_PDF_PAGE", "Page %s");
@@ -432,7 +396,6 @@
define("_MD_MENU_SELECT", "Selection");
define("_MD_MENU_HOVER", "Hover");
define("_MD_MENU_CLICK", "Click");
-
define("_MD_WELCOME_SUBJECT", "%s has joined the forum");
define("_MD_WELCOME_MESSAGE", "Hi, %s has joined you. Let's start ...");
define("_MD_VIEWNEWPOSTS", "View new posts");
@@ -441,21 +404,17 @@
define("_MD_NAME", "Name");
define("_MD_PASSWORD", "Password");
define("_MD_LOGIN", "Login");
-
define("_MD_APPROVE", "Approve");
define("_MD_RESTORE", "Restore");
define("_MD_SPLIT_ONE", "Split");
define("_MD_SPLIT_TREE", "Split all children");
define("_MD_SPLIT_ALL", "Split all");
-
define("_MD_TYPE_ADMIN", "Admin mode");
define("_MD_TYPE_VIEW", "View mode");
define("_MD_TYPE_PENDING", "Pending");
define("_MD_TYPE_DELETED", "Deleted");
define("_MD_TYPE_SUSPEND", "Suspension");
-
define("_MD_DBUPDATED", "Database Updated Successfully!");
-
define("_MD_SUSPEND_SUBJECT", "User %s is suspended for %d days");
define("_MD_SUSPEND_TEXT", "User %s is suspended for %d days due to:<br />[quote]%s[/quote]<br /><br />The suspension is valid till %s");
define("_MD_SUSPEND_UID", "User ID");
@@ -469,7 +428,6 @@
define("_MD_SUSPEND_MANAGEMENT", "Moderation management");
define("_MD_SUSPEND_NOACCESS", "Your ID or IP has been suspended");
define("_MD_NEWBB_TYPE", "Topic type");
-
define("_MD_NEWBB_SEENOTGUEST","<font color=\"red\"><b>Link only for registered users</b></font>");
define("_MD_NEWBB_REPORTSUBJECT","A contribution has been reported");
define("_MD_NEWBB_GOTOLASTPOST","Go to last post");
@@ -501,6 +459,21 @@
define('_NW_PAGE','Site: ');
define('_AM_NEWBB_NOTOPIC','No Posts');
define('_MD_NORSS_DATA','No data to display');
-
define('_MD_NEWBB_STATS','Statistics');
+define("_MD_POSTTIME","posted on");
+
+// 4.2
+define("_MD_ADVERTISING_BLOCK","<br />Hier könnte auch Ihre Werbung stehen!<br />Kontaktieren Sie uns dazu und wir unterbreiten Ihnen ein Angebot.");
+define("_MD_ADVERTISING_USER","Werbung");
+define('_MD_SHARE_FACEBOOK', "Facebook");
+define('_MD_SHARE_TWITTER', "Twitter");
+define('_MD_SHARE_BUZZ', "Google Buzz");
+define('_MD_SHARE_LINKEDIN', "Linkedin");
+define('_MD_SHARE_STUMBLEUPON', "Stumbleupon");
+define('_MD_SHARE_FRIENDFEED', "FriendFeed");
+define('_MD_SHARE_REDDIT', "Reddit");
+define('_MD_SHARE_DELICIOUS', "Del.icio.us");
+define('_MD_SHARE_DIGG', "Digg");
+define('_MD_SHARE_TECHNORATI', "Technorati");
+define('_MD_SHARE_MRWONG', "Mr. Wong");
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-02-08 13:37:46 UTC (rev 8908)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-02-08 17:27:44 UTC (rev 8909)
@@ -1,7 +1,10 @@
<?php
-// $Id: modinfo.php,v 1.3 2005/10/19 17:20:33 phppp Exp $
+// $Id: modinfo.php,v 2.3 2012/02/08 16:20:00 dhcst Exp $
// Thanks Tom (http://www.wf-projects.com), for correcting the Engligh language package
+if (defined('NEWBB_MODINFO_DEFINED')) return;
+define('NEWBB_MODINO_DEFINED',true);
+
// Module Info
// The name of this module
@@ -18,7 +21,6 @@
define("_MI_NEWBB_BLOCK_TAG_CLOUD", "Tag Cloud");
define("_MI_NEWBB_BLOCK_TAG_TOP", "Top Tags");
-
// Names of admin menu items
define("_MI_NEWBB_ADMENU_INDEX", "Index");
define("_MI_NEWBB_ADMENU_CATEGORY", "Categories");
@@ -33,68 +35,56 @@
define("_MI_NEWBB_ADMENU_VOTE", "Votes");
define("_MI_NEWBB_ADMENU_TYPE", "Topic types");
define("_MI_NEWBB_ADMENU_ABOUT", "About");
+
//config options
define("_MI_DO_DEBUG", "Debug Mode");
define("_MI_DO_DEBUG_DESC", "Display error message");
define("_MI_DO_REWRITE","SEO-URL enabled");
define("_MI_DO_REWRITE_DESC","rewrites the URL, you need mod_rewrite and a. htaccess see readme.htaccess");
-
define("_MI_IMG_SET", "Image Set");
define("_MI_IMG_SET_DESC", "Select the Image Set to use");
define("_MI_THEMESET", "Theme set");
define("_MI_THEMESET_DESC", "Module-wide, select '"._NONE."' will use site-wide theme");
define("_MI_DIR_ATTACHMENT", "Attachments physical path.");
define("_MI_DIR_ATTACHMENT_DESC", "Physical path only needs to be set from your xoops root and not before, for example you may have attachments uploaded to www.yoururl.com/uploads/newbb the path entered would then be '/uploads/newbb' never include a trailing slash '/' the thumbnails path becomes '/uploads/newbb/thumbs'");
-
define("_MI_PATH_MAGICK", "Path for ImageMagick");
define("_MI_PATH_MAGICK_DESC", "Usually it is '/usr/bin/X11'. Leave it BLANK if you do not have ImageMagicK installed or for autodetecting.");
-
define("_MI_SUBFORUM_DISPLAY", "Display Mode of subforums on index page");
-
define("_MI_SUBFORUM_DISPLAY_DESC", "");
define("_MI_SUBFORUM_EXPAND", "Expand");
define("_MI_SUBFORUM_COLLAPSE", "Collpase");
define("_MI_SUBFORUM_HIDDEN", "Hidden");
-
define("_MI_POST_EXCERPT", "Post excerpt on forum page");
define("_MI_POST_EXCERPT_DESC", "Length of post excerpt by mouse over. 0 for no excerpt.");
-
define("_MI_PATH_NETPBM", "Path for Netpbm");
define("_MI_PATH_NETPBM_DESC", "Usually it is '/usr/bin'. Leave it BLANK if you do not have Netpbm installed or for autodetecting.");
-
define("_MI_IMAGELIB", "Select the Image library to use");
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_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_WIDTH","Maximum width of an image for the generation of a thumbnail");
+define("_MI_MAX_IMAGE_WIDTH_DESC", "Sets the maximum width of an uploaded image, from which a thumbnail is generated.");
define("_MI_MAX_IMAGE_HEIGHT", "Maximum Image Height for creating thumbnail");
define("_MI_MAX_IMAGE_HEIGHT_DESC", "Sets the maximum height of an uploaded image to create thumbnail. <br >Image with height larger than the value will not use thumbnail.");
-
define("_MI_SHOW_DIS", "Show Disclaimer On");
define("_MI_DISCLAIMER", "Disclaimer");
define("_MI_DISCLAIMER_DESC", "Enter your Disclaimer that will be shown for the above selected option.");
define("_MI_DISCLAIMER_TEXT", "The forum contains a lot of posts with a lot of usefull information. <br /><br />In order to keep the number of double-posts to a minimum, we would like to ask you to use the forum search before posting your questions here.");
define("_MI_NONE", "None");
-
define("_MI_POST", "Post");
define("_MI_REPLY", "Reply");
define("_MI_OP_BOTH", "Both");
define("_MI_WOL_ENABLE", "Enable Who's Online");
define("_MI_WOL_ENABLE_DESC", "Enable Who's Online Block shown below the Index page and the Forum pages");
-
define("_MI_NULL", "disable");
define("_MI_TEXT", "text");
define("_MI_GRAPHIC", "graphic");
define("_MI_USERLEVEL", "HP/MP/EXP Level Mode");
define("_MI_USERLEVEL_DESC", "<strong>HP</strong> is determined by your average posts per day.<br /><strong>MP</strong> is determined by your join date related to your post count.<br /><strong>EXP</strong> goes up each time you post, and when you get to 100%, you gain a level and the EXP drops to 0 again.");
-
define("_MI_RSS_ENABLE", "Enable RSS Feed");
define("_MI_RSS_ENABLE_DESC", "Enable RSS Feed, edit options below for maximum Items and Description length");
-
define("_MI_RSS_MAX_ITEMS", "RSS Max. Items");
define("_MI_RSS_MAX_DESCRIPTION", "RSS Max. Description Length");
define("_MI_RSS_UTF8", "RSS Encoding with UTF-8");
@@ -105,26 +95,19 @@
define("_MI_MEDIA_ENABLE_DESC", "Display attached Images directly in the post.");
define("_MI_USERBAR_ENABLE", "Enable Userbar");
define("_MI_USERBAR_ENABLE_DESC", "Display the expand Userbar: Profile, PM, ICQ, MSN, etc...");
-
define("_MI_GROUPBAR_ENABLE", "Enable Group bar");
define("_MI_GROUPBAR_ENABLE_DESC", "Display the Groups of the User in the Post info field.");
define("_MI_RATING_ENABLE", "Enable Rating Function");
define("_MI_RATING_ENABLE_DESC", "Allow Topic Rating");
-
define("_MI_VIEWMODE", "View Mode of the Threads");
define("_MI_VIEWMODE_DESC", "To override the General Settings of viewmode within threads, set to NONE in order to switch feature off");
-
define("_MI_COMPACT", "Compact");
-
define("_MI_MENUMODE", "Default Menu Mode");
define("_MI_MENUMODE_DESC", "'SELECT' - select options, 'HOVER' - may slow down IE, 'CLICK' - requires JAVASCRIPT");
-
define("_MI_REPORTMOD_ENABLE", "Report a Post");
define("_MI_REPORTMOD_ENABLE_DESC", "User can report posts to Moderator(s), for any reason, which enables Moderator(s) to take action");
-
define("_MI_SHOW_JUMPBOX", "Show Jumpbox");
define("_MI_JUMPBOXDESC", "If Enabled, a drop-down menu will allow users to jump to another forum from a forum or topic");
-
define("_MI_SHOW_PERMISSIONTABLE", "Show Permission Table");
define("_MI_SHOW_PERMISSIONTABLE_DESC", "Setting YES will display user's right");
define("_MI_EMAIL_DIGEST", "Email post digest");
@@ -132,89 +115,61 @@
define("_MI_NEWBB_EMAIL_NONE", "No email");
define("_MI_NEWBB_EMAIL_DAILY", "Daily");
define("_MI_NEWBB_EMAIL_WEEKLY", "Weekly");
-
define("_MI_SHOW_IP", "Show user IP");
define("_MI_SHOW_IP_DESC", "Setting YES will show users IP to moderators");
-
define("_MI_ENABLE_KARMA", "Enable karma requirement");
define("_MI_ENABLE_KARMA_DESC", "This allows user to set a karma requirement for other users reading his/her post");
-
define("_MI_KARMA_OPTIONS", "Karma options for post");
define("_MI_KARMA_OPTIONS_DESC", "Use ',' as delimer for multi-options.");
define("_MI_SINCE_OPTIONS", "'Since' options for 'viewform' and 'search'");
define("_MI_SINCE_OPTIONS_DESC", "Positive value for days and negative value for hours. Use ',' as delimer for multi-options.");
define("_MI_SINCE_DEFAULT", "'Since' default value");
define("_MI_SINCE_DEFAULT_DESC", "Default value if not specified by users. 0 - from beginning");
-
define("_MI_MODERATOR_HTML", "Allow HTML tags for moderators");
define("_MI_MODERATOR_HTML_DESC", "This option allows only moderators to use HTML in post subject");
define("_MI_USER_ANONYMOUS", "Allow registered users to post anonymously");
define("_MI_USER_ANONYMOUS_DESC", "This allows a logged in user to post anonymously");
-
define("_MI_ANONYMOUS_PRE", "Prefix for anonymous user");
define("_MI_ANONYMOUS_PRE_DESC", "This will add a prefix to the anonymous username whilst posting");
-
define("_MI_REQUIRE_REPLY", "Allow requiring reply to read a post");
define("_MI_REQUIRE_REPLY_DESC", "This feature forces readers to reply to the original posters post before being able to read the original");
-
define("_MI_EDIT_TIMELIMIT", "Time limit for edit a post");
define("_MI_EDIT_TIMELIMIT_DESC", "Set a Time limit for user editing their own post. In minutes, 0 for no limit");
-
define("_MI_DELETE_TIMELIMIT", "Time limit for deleting a Post");
define("_MI_DELETE_TIMELIMIT_DESC", "Set a Time limit for user deleting thier own post. In minutes, 0 for no limit");
-
define("_MI_POST_TIMELIMIT", "Time limit for consecutively posting");
define("_MI_POST_TIMELIMIT_DESC", "Set a Time limit for consecutively posting. In seconds, 0 for no limit");
-
define("_MI_RECORDEDIT_TIMELIMIT", "Timelimit for recording edit info");
define("_MI_RECORDEDIT_TIMELIMIT_DESC", "Set a Timelimit for waiving recording edit info. In minutes, 0 for no limit");
-
define("_MI_SHOW_REALNAME", "Show Realname");
define("_MI_SHOW_REALNAME_DESC", "Replace username with user's real name.");
-
define("_MI_CACHE_ENABLE", "Enable Cache");
define("_MI_CACHE_ENABLE_DESC", "Store some intermediate results in session to save queries");
define("_MI_QUICKREPLY_ENABLE", "Enable Quick reply");
define("_MI_QUICKREPLY_ENABLE_DESC", "This will enable the Quick reply form");
-
define("_MI_POSTSPERPAGE", "Posts per Page");
define("_MI_POSTSPERPAGE_DESC", "The maximum number of posts that will be displayed per page");
-
define("_MI_POSTSFORTHREAD", "Maximum posts for thread view mode");
define("_MI_POSTSFORTHREAD_DESC", "Flat mode will be used if post count exceeds the number");
-
define("_MI_TOPICSPERPAGE", "Topics per Page");
define("_MI_TOPICSPERPAGE_DESC", "The maximum number of topics that will be displayed per page");
-
define("_MI_IMG_TYPE", "Image Type");
define("_MI_IMG_TYPE_DESC", "Select the image type of buttons in the forum.<br />- png: for high speed server<br />- gif: for normal speed<br />- auto: gif for IE and png for other browsers");
-
define("_MI_PNGFORIE_ENABLE", "Enable PNG hack");
define("_MI_PNGFORIE_ENABLE_DESC", "The hack to allow PNG transparency attribute with IE");
-
define("_MI_FORM_OPTIONS", "Form Options");
define("_MI_FORM_OPTIONS_DESC", "Form options that users can choose when posting/editing/replying.");
-
define("_MI_FORM_COMPACT", "Compact");
define("_MI_FORM_DHTML", "DHTML");
-define("_MI_FORM_SPAW", "Spaw Editor");
-define("_MI_FORM_HTMLAREA", "HtmlArea Editor");
-define("_MI_FORM_FCK", "FCK Editor");
-define("_MI_FORM_KOIVI", "Koivi Editor");
-define("_MI_FORM_TINYMCE", "TinyMCE Editor");
-
define("_MI_MAGICK", "ImageMagick");
define("_MI_NETPBM", "Netpbm");
define("_MI_GD1", "GD1 Library");
define("_MI_GD2", "GD2 Library");
define("_MI_AUTO", "AUTO");
-
define("_MI_WELCOMEFORUM", "Forum for welcoming new user");
define("_MI_WELCOMEFORUM_DESC", "A profile post will be published when a user visits Forum module for the first time");
-
define("_MI_PERMCHECK_ONDISPLAY", "Check permission");
define("_MI_PERMCHECK_ONDISPLAY_DESC", "Check permission for edit on display page");
-
define("_MI_USERMODERATE", "Enable user moderation");
define("_MI_USERMODERATE_DESC", "");
@@ -223,43 +178,34 @@
define ('_MI_NEWBB_THREAD_NOTIFY', 'Thread');
define ('_MI_NEWBB_THREAD_NOTIFYDSC', 'Notification options that apply to the current thread.');
-
define ('_MI_NEWBB_FORUM_NOTIFY', 'Forum');
define ('_MI_NEWBB_FORUM_NOTIFYDSC', 'Notification options that apply to the current forum.');
-
define ('_MI_NEWBB_GLOBAL_NOTIFY', 'Global');
define ('_MI_NEWBB_GLOBAL_NOTIFYDSC', 'Global forum notification options.');
-
define ('_MI_NEWBB_THREAD_NEWPOST_NOTIFY', 'New Post');
define ('_MI_NEWBB_THREAD_NEWPOST_NOTIFYCAP', 'Notify me of new posts in the current thread.');
define ('_MI_NEWBB_THREAD_NEWPOST_NOTIFYDSC', 'Receive notification when a new message is posted in the current thread.');
define ('_MI_NEWBB_THREAD_NEWPOST_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : New post in thread');
-
define ('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFY', 'New Thread');
define ('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFYCAP', 'Notify me of new topics in the current forum.');
define ('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFYDSC', 'Receive notification when a new thread is started in the current forum.');
define ('_MI_NEWBB_FORUM_NEWTHREAD_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : New thread in forum');
-
define ('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFY', 'New Forum');
define ('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYCAP', 'Notify me when a new forum is created.');
define ('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYDSC', 'Receive notification when a new forum is created.');
define ('_MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : New forum');
-
define ('_MI_NEWBB_GLOBAL_NEWPOST_NOTIFY', 'New Post');
define ('_MI_NEWBB_GLOBAL_NEWPOST_NOTIFYCAP', 'Notify me of any new posts.');
define ('_MI_NEWBB_GLOBAL_NEWPOST_NOTIFYDSC', 'Receive notification when any new message is posted.');
define ('_MI_NEWBB_GLOBAL_NEWPOST_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : New post');
-
define ('_MI_NEWBB_FORUM_NEWPOST_NOTIFY', 'New Post');
define ('_MI_NEWBB_FORUM_NEWPOST_NOTIFYCAP', 'Notify me of any new posts in the current forum.');
define ('_MI_NEWBB_FORUM_NEWPOST_NOTIFYDSC', 'Receive notification when any new message is posted in the current forum.');
define ('_MI_NEWBB_FORUM_NEWPOST_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : New post in forum');
-
define ('_MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFY', 'New Post (Full Text)');
define ('_MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYCAP', 'Notify me of any new posts (include full text in message).');
define ('_MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYDSC', 'Receive full text notification when any new message is posted.');
define ('_MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} auto-notify : New post (full text)');
-
define ('_MI_NEWBB_GLOBAL_DIGEST_NOTIFY', 'Digest');
define ('_MI_NEWBB_GLOBAL_DIGEST_NOTIFYCAP', 'Notify me of post digest.');
define ('_MI_NEWBB_GLOBAL_DIGEST_NOTIFYDSC', 'Receive digest notification.');
@@ -275,25 +221,39 @@
Welcome to ".(htmlspecialchars($GLOBALS["xoopsConfig"]['sitename'], ENT_QUOTES))." forum.
Feel free to register and login to start your topics.
- If you have any question concerning NewBB usage, plz visit your local support site or [url=http://www.simple-xoops.de/forum/]CBB Module Site[/url].
+ If you have any question concerning NewBB usage, plz visit your local support site or [url=http://www.simple-xoops.de/forum/]NewBB Module...
[truncated message content] |
|
From: <dh...@us...> - 2012-02-08 21:06:33
|
Revision: 8916
http://xoops.svn.sourceforge.net/xoops/?rev=8916&view=rev
Author: dhcst
Date: 2012-02-08 21:06:23 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
Fix for Xoops 2.5.5
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php
XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php
XoopsModules/newbb/branches/alfred/newbb/admin/index.php
XoopsModules/newbb/branches/alfred/newbb/class/permission.forum.php
XoopsModules/newbb/branches/alfred/newbb/class/permission.php
XoopsModules/newbb/branches/alfred/newbb/class/post.php
XoopsModules/newbb/branches/alfred/newbb/header.php
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -136,7 +136,7 @@
break;
case "save":
-
+ mod_clearCacheFile("permission_category","newbb");
if ($cat_id) {
$category_obj =& $category_handler->get($cat_id);
$message = _AM_NEWBB_CATEGORYUPDATED;
@@ -157,7 +157,7 @@
}
if ($cat_id = $category_obj->getVar("cat_id") && $cat_isNew) {
$category_handler->applyPermissionTemplate($category_obj);
- }
+ }
redirect_header("admin_cat_manager.php", 2, $message);
exit();
@@ -212,7 +212,7 @@
echo "</fieldset>";
break;
}
-mod_clearFile("","xoops_newbb");
+mod_clearCacheFile("permission_category","newbb");
echo "</fieldset>";
xoops_cp_footer();
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_forum_manager.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -66,7 +66,7 @@
$forum_handler->updateAll("cat_id", $cid, new Criteria("forum_id", "(".implode(", ", $forums).")", "IN") );
}
- mod_clearCacheFile("forum", "xoops_newbb");
+ mod_clearCacheFile("forum", "newbb");
redirect_header('./admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_FORUM_MOVED);
} else {
redirect_header('./admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_ERR_FORUM_MOVED);
@@ -120,7 +120,7 @@
//mod_clearCacheFile("forum", "newbb");
$forum_handler->synchronization($forum_dest);
unset($forum_dest);
- mod_clearCacheFile("forum", "xoops_newbb");
+ mod_clearCacheFile("forum", "newbb");
redirect_header('./admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_FORUM_MERGED);
} else {
@@ -172,7 +172,7 @@
$forum_obj->setVar('cat_id', $_POST['cat_id']);
if ($forum_handler->insert($forum_obj)) {
- mod_clearCacheFile("forum", "xoops_newbb");
+ mod_clearCacheFile("forum", "newbb");
if (!empty($_POST["perm_template"])) {
$groupperm_handler = xoops_getmodulehandler('permission', $xoopsModule->getVar("dirname"));
$perm_template = $groupperm_handler->getTemplate();
@@ -217,7 +217,7 @@
} else {
$forum_obj =& $forum_handler->get($_POST['forum']);
$forum_handler->delete($forum_obj);
- mod_clearCacheFile("forum", "xoops_newbb");
+ mod_clearCacheFile("forum", "newbb");
redirect_header("admin_forum_manager.php?op=manage", 1, _AM_NEWBB_FORUMREMOVED);
exit();
}
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -208,12 +208,12 @@
case "template_save":
$res = $newbbperm_handler->setTemplate($_POST['perms'], $groupid = 0);
- if ($res) {
+ if ($res) {
redirect_header("admin_permissions.php?action=template", 2, _AM_NEWBB_PERM_TEMPLATE_CREATED);
} else {
redirect_header("admin_permissions.php?action=template", 2, _AM_NEWBB_PERM_TEMPLATE_ERROR);
}
- break;
+ exit();
case "apply":
$perm_template = $newbbperm_handler->getTemplate();
@@ -336,7 +336,7 @@
break;
}
-mod_clearCacheFile("","xoops_newbb");
+mod_clearCacheFile("forum","newbb");
echo "</fieldset></fieldset>";
xoops_cp_footer();
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/index.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -356,9 +356,7 @@
$moderate_handler->clearGarbage();
}
- }
- mod_clearFile("","xoops_newbb");
- mod_clearFile("","newbb");
+ }
echo "</fieldset>";
xoops_cp_footer();
break;
Modified: XoopsModules/newbb/branches/alfred/newbb/class/permission.forum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/permission.forum.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/class/permission.forum.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -191,13 +191,13 @@
function getTemplate()
{
- $perms = mod_loadFile("perm_template", "xoops_newbb");
+ $perms = mod_loadFile("perm_template", "newbb");
return $perms;
}
function setTemplate($perms)
{
- return mod_createFile($perms, "perm_template", "xoops_newbb");
+ return mod_createFile($perms, "perm_template", "newbb");
}
}
Modified: XoopsModules/newbb/branches/alfred/newbb/class/permission.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/permission.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/class/permission.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -60,21 +60,21 @@
function deleteByForum($forum_id)
{
- mod_clearCacheFile("permission_forum", "xoops_newbb");
+ mod_clearCacheFile("permission_forum", "newbb");
$handler =& $this->_loadHandler("forum");
return $handler->deleteByForum($forum_id);
}
function deleteByCategory($cat_id)
{
- mod_clearCacheFile("permission_category", "xoops_newbb");
+ mod_clearCacheFile("permission_category", "newbb");
$handler =& $this->_loadHandler("category");
return $handler->deleteByCategory($cat_id);
}
function setCategoryPermission($category, $groups = array())
{
- mod_clearCacheFile("permission_category", "xoops_newbb");
+ mod_clearCacheFile("permission_category", "newbb");
$handler =& $this->_loadHandler("category");
return $handler->setCategoryPermission($category, $groups);
}
@@ -214,7 +214,7 @@
}
if ($this->_checkRight($perm, $itemid, $groupid, $mid)) return true;
load_functions("cache");
- mod_clearCacheFile("permission", "xoops_newbb");
+ mod_clearCacheFile("permission", "newbb");
$this->addRight($perm, $itemid, $groupid, $mid);
return true;
}
@@ -254,7 +254,7 @@
function deleteRight($perm, $itemid, $groupid, $mid = null)
{
- mod_clearCacheFile("permission", "xoops_newbb");
+ mod_clearCacheFile("permission", "newbb");
if (empty($mid)) {
if (is_object($GLOBALS["xoopsModule"]) && $GLOBALS["xoopsModule"]->getVar("dirname") == "newbb") {
$mid = $GLOBALS["xoopsModule"]->getVar("mid");
@@ -285,7 +285,7 @@
function applyTemplate($forum, $mid = 0)
{
- mod_clearCacheFile("permission_forum", "xoops_newbb");
+ mod_clearCacheFile("permission_forum", "newbb");
$handler = $this->_loadHandler("forum");
return $handler->applyTemplate($forum, $mid);
}
Modified: XoopsModules/newbb/branches/alfred/newbb/class/post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -477,7 +477,7 @@
}
$thread_action['print']['image'] = newbb_displayImage('printer', _MD_PRINT);
- $thread_action['print']['link'] = "print.php?form=2&forum=". $forum_id."&topic_id=" . $topic_id;
+ $thread_action['print']['link'] = XOOPS_URL."/modules/newbb/print.php?form=2&forum=". $forum_id."&topic_id=" . $topic_id;
$thread_action['print']['name'] = _MD_PRINT;
$thread_action['print']['target'] = '_blank';
Modified: XoopsModules/newbb/branches/alfred/newbb/header.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/header.php 2012-02-08 20:13:16 UTC (rev 8915)
+++ XoopsModules/newbb/branches/alfred/newbb/header.php 2012-02-08 21:06:23 UTC (rev 8916)
@@ -13,7 +13,7 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
if (!empty($xoopsModuleConfig['do_rewrite'])) include_once "seo_url.php";
/* for seo */
-$toseo_url = array("index.php","viewforum.php","viewtopic.php","rss.php","print.php","makepdf.php");
+$toseo_url = array("index.php","viewforum.php","viewtopic.php","rss.php");
if(((strpos(getenv('REQUEST_URI'), '.html') === false) && !empty($xoopsModuleConfig['do_rewrite']) && (!isset($_POST) || count($_POST) <= 0)))
{
if ( in_array(basename(getenv('SCRIPT_NAME')),$toseo_url) && (trim(getenv("REQUEST_URI")) != '') && trim(getenv("REQUEST_URI")) != "/".REAL_MODULE_NAME."/") {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-02-10 15:22:36
|
Revision: 8927
http://xoops.svn.sourceforge.net/xoops/?rev=8927&view=rev
Author: dhcst
Date: 2012-02-10 15:22:29 +0000 (Fri, 10 Feb 2012)
Log Message:
-----------
fixed typo
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php
XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php
XoopsModules/newbb/branches/alfred/newbb/language/german/modinfo.php
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php 2012-02-09 20:43:00 UTC (rev 8926)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_cat_manager.php 2012-02-10 15:22:29 UTC (rev 8927)
@@ -71,7 +71,7 @@
$category_obj->setVar('cat_image', '');
$category_obj->setVar('cat_description', '');
$category_obj->setVar('cat_order', 0);
- $category_obj->setVar('cat_url', 'http://www.myxoops.org myXOOPS Support');
+ $category_obj->setVar('cat_url', 'http://www.simple-xoops.de newBB Support');
}
$sform->addElement(new XoopsFormText(_AM_NEWBB_SETCATEGORYORDER, 'cat_order', 5, 10, $category_obj->getVar('cat_order')), false);
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-02-09 20:43:00 UTC (rev 8926)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-02-10 15:22:29 UTC (rev 8927)
@@ -62,7 +62,7 @@
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_IMAGE_WIDTH", "Maximum Image Width for thumbnail generation");
+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");
define("_MI_MAX_IMAGE_HEIGHT_DESC", "Sets the maximum height of an uploaded image to create thumbnail. <br >Image with height larger than the value will not use thumbnail.");
Modified: XoopsModules/newbb/branches/alfred/newbb/language/german/modinfo.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/german/modinfo.php 2012-02-09 20:43:00 UTC (rev 8926)
+++ XoopsModules/newbb/branches/alfred/newbb/language/german/modinfo.php 2012-02-10 15:22:29 UTC (rev 8927)
@@ -225,7 +225,7 @@
Für Fragen hinsichtlich des NewBB steht die lokale Supportseite oder
- die [url=http://www.simple-xoops.de/]NewBB Modul Seite[/url] zur Verfügung.
+ die [url=http://www.simple-xoops.de/]NewBB Modul Support-Seite[/url] zur Verfügung.
");
define("_MI_NEWBB_ADMENU_GROUPMOD", "Gruppen Moderation");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-02-19 09:09:31
|
Revision: 9019
http://xoops.svn.sourceforge.net/xoops/?rev=9019&view=rev
Author: beckmi
Date: 2012-02-19 09:09:24 +0000 (Sun, 19 Feb 2012)
Log Message:
-----------
Fixing "collapse" typo
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/include/js/newbb_toggle.js
XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php
XoopsModules/newbb/branches/alfred/newbb/language/italian/modinfo.php
Modified: XoopsModules/newbb/branches/alfred/newbb/include/js/newbb_toggle.js
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/js/newbb_toggle.js 2012-02-19 08:10:30 UTC (rev 9018)
+++ XoopsModules/newbb/branches/alfred/newbb/include/js/newbb_toggle.js 2012-02-19 09:09:24 UTC (rev 9019)
@@ -62,14 +62,14 @@
}
}
-function ToggleBlockCategory(block, icon, src_expand, src_collpase)
+function ToggleBlockCategory(block, icon, src_expand, src_collapse)
{
if (document.getElementById)
{
if (document.getElementById(block).style.display == 'block')
{
document.getElementById(block).style.display = 'none';
- icon.src = src_collpase;
+ icon.src = src_collapse;
SaveCollapsed(block, true);
}
else
@@ -84,7 +84,7 @@
if (document.all[block].style.display == 'block')
{
document.all[block].style.display = 'none';
- icon.src = src_collpase;
+ icon.src = src_collapse;
SaveCollapsed(block, true);
}
else
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-02-19 08:10:30 UTC (rev 9018)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-02-19 09:09:24 UTC (rev 9019)
@@ -52,7 +52,7 @@
define("_MI_SUBFORUM_DISPLAY", "Display Mode of subforums on index page");
define("_MI_SUBFORUM_DISPLAY_DESC", "");
define("_MI_SUBFORUM_EXPAND", "Expand");
-define("_MI_SUBFORUM_COLLAPSE", "Collpase");
+define("_MI_SUBFORUM_COLLAPSE", "Collapse");
define("_MI_SUBFORUM_HIDDEN", "Hidden");
define("_MI_POST_EXCERPT", "Post excerpt on forum page");
define("_MI_POST_EXCERPT_DESC", "Length of post excerpt by mouse over. 0 for no excerpt.");
Modified: XoopsModules/newbb/branches/alfred/newbb/language/italian/modinfo.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/italian/modinfo.php 2012-02-19 08:10:30 UTC (rev 9018)
+++ XoopsModules/newbb/branches/alfred/newbb/language/italian/modinfo.php 2012-02-19 09:09:24 UTC (rev 9019)
@@ -54,7 +54,7 @@
define("_MI_SUBFORUM_DISPLAY", "Modalità di visualizzazione dei subforum a pagina indice");
define("_MI_SUBFORUM_DISPLAY_DESC", "");
define("_MI_SUBFORUM_EXPAND", "Espansione");
-define("_MI_SUBFORUM_COLLAPSE", "Collpase");
+define("_MI_SUBFORUM_COLLAPSE", "Collapse");
define("_MI_SUBFORUM_HIDDEN", "nascosto");
define("_MI_POST_EXCERPT", "Estratto post su forum");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-02-19 10:22:42
|
Revision: 9021
http://xoops.svn.sourceforge.net/xoops/?rev=9021&view=rev
Author: dhcst
Date: 2012-02-19 10:22:33 +0000 (Sun, 19 Feb 2012)
Log Message:
-----------
fix many errors and typos
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php
XoopsModules/newbb/branches/alfred/newbb/admin/index.php
XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php
XoopsModules/newbb/branches/alfred/newbb/class/forum.php
XoopsModules/newbb/branches/alfred/newbb/class/post.php
XoopsModules/newbb/branches/alfred/newbb/class/user.php
XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
XoopsModules/newbb/branches/alfred/newbb/header.php
XoopsModules/newbb/branches/alfred/newbb/include/module.v400.php
XoopsModules/newbb/branches/alfred/newbb/seo_url.php
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html
XoopsModules/newbb/branches/alfred/newbb/viewforum.php
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php 2012-02-19 09:24:43 UTC (rev 9020)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/admin_permissions.php 2012-02-19 10:22:33 UTC (rev 9021)
@@ -337,6 +337,7 @@
break;
}
mod_clearCacheFile("forum","newbb");
+mod_clearCacheFile("permission","newbb");
echo "</fieldset></fieldset>";
xoops_cp_footer();
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/index.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-02-19 09:24:43 UTC (rev 9020)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-02-19 10:22:33 UTC (rev 9021)
@@ -356,10 +356,11 @@
$moderate_handler->clearGarbage();
}
- }
+ }
echo "</fieldset>";
xoops_cp_footer();
break;
}
-
+mod_clearCacheFile("config","newbb");
+mod_clearCacheFile("permission","newbb");
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php 2012-02-19 09:24:43 UTC (rev 9020)
+++ XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php 2012-02-19 10:22:33 UTC (rev 9021)
@@ -54,7 +54,7 @@
global $xoopsConfig;
global $access_forums;
global $xoopsLogger;
-
+
mod_loadFunctions("time", "newbb");
$myts =& MyTextSanitizer::getInstance();
@@ -322,7 +322,7 @@
}
$topic['topic_poster'] = $topic_poster;
$topic['topic_page_jump'] = $topic_page_jump;
- $seo_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?post_id='.$topic['id'].'">'.$topic['title'].'</a>';
+ $seo_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?topic_id='.$topic['id'].'">'.$topic['title'].'</a>';
$seo_forum_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
if (!empty($newbbConfig['do_rewrite'])) {
Modified: XoopsModules/newbb/branches/alfred/newbb/class/forum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-02-19 09:24:43 UTC (rev 9020)
+++ XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-02-19 10:22:33 UTC (rev 9021)
@@ -331,7 +331,7 @@
$append = true;
}
} else {
- $topic_page_jump .= '[<a href="viewtopic.php?topic_id=' . $myrow['topic_id'] . '&start=' . (($i - 1) * $xoopsModuleConfig['posts_per_page']) . '">' . $i . '</a>]';
+ $topic_page_jump .= '[<a href="' . XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $myrow['topic_id'] . '&start=' . (($i - 1) * $xoopsModuleConfig['posts_per_page']) . '">' . $i . '</a>]';
$topic_page_jump_icon = "<a href='" . XOOPS_URL . "/modules/newbb/viewtopic.php?post_id=" . $myrow['post_id'] . "&start=" . (($i - 1) * $xoopsModuleConfig['posts_per_page']) . "'>" . newbb_displayImage('lastposticon',_MD_NEWBB_GOTOLASTPOST) . "</a>";
}
}
@@ -404,7 +404,7 @@
'type_id' => $myrow['type_id'],
'type_text' => $topic_prefix,
'topic_title' => $topic_title,
- 'topic_link' => 'viewtopic.php?topic_id=' . $myrow['topic_id'],
+ 'topic_link' => XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $myrow['topic_id'],
'rating_img' => $rating_img,
'topic_page_jump' => $topic_page_jump,
'topic_page_jump_icon' => $topic_page_jump_icon,
Modified: XoopsModules/newbb/branches/alfred/newbb/class/post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-02-19 09:24:43 UTC (rev 9020)
+++ XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-02-19 10:22:33 UTC (rev 9021)
@@ -524,16 +524,9 @@
$thread_action['social_wong']['image'] = newbb_displayImage('wong', _MD_SHARE_MRWONG);
$thread_action['social_wong']['link'] = "http://www.mister-wong.de/index.php?action=addurl&bm_url=".$full_link;
- $thread_action['social_wong']['name'] = _MD_SHARE_WONG;
+ $thread_action['social_wong']['name'] = _MD_SHARE_MRWONG;
$thread_action['social_wong']['target'] = '_blank';
- /*
- $thread_action['social_technorati']['image'] = newbb_displayImage('technorati', _MD_SHARE_REDDIT);
- $thread_action['social_technorati']['link'] = "http://technorati.com/faves/?add=".$full_link;
- $thread_action['social_technorati']['name'] = _MD_SHARE_REDDIT;
- $thread_action['social_technorati']['target'] = '_blank';
- */
-
}
$post = array(
Modified: XoopsModules/newbb/branches/alfred/newbb/class/user.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/user.php 2012-02-19 09:24:43 UTC (rev 9020)
+++ XoopsModules/newbb/branches/alfred/newbb/class/user.php 2012-02-19 10:22:33 UTC (rev 9021)
@@ -283,7 +283,7 @@
$ranks[$myrow['rank_id']] = $myrow;
$ranks[$myrow['rank_id']]["rank_title"] = $myts->htmlspecialchars($ranks[$myrow['rank_id']]["rank_title"]);
if (!empty($ranks[$myrow['rank_id']]['rank_image'])) {
- $ranks[$myrow['rank_id']]['rank_image'] = "<img src='" . XOOPS_UPLOAD_URL . "/" . htmlspecialchars($ranks[$myrow['rank_id']]['rank_image'], ENT_QUOTES) . "' alt='' />";
+ $ranks[$myrow['rank_id']]['rank_image'] = "<img src='" . XOOPS_UPLOAD_URL . "/ranks/" . htmlspecialchars($ranks[$myrow['rank_id']]['rank_image'], ENT_QUOTES) . "' alt='' />";
}
}
Modified: XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-02-19 09:24:43 UTC (rev 9020)
+++ XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-02-19 10:22:33 UTC (rev 9021)
@@ -1,4 +1,11 @@
newBB
+Changelog 4.3
+02/12/2012
+===========================================
+ 1 Fix Cache Config for SEO
+ 2 Fix Typos in templates
+
+newBB
Changelog 4.2
02/08/2012
===========================================
Modified: XoopsModules/newbb/branches/alfred/newbb/header.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/header.php 2012-02-19 09:24:43 UTC (rev 9020)
+++ XoopsModules/newbb/branches/alfred/newbb/header.php 2012-02-19 10:22:33 UTC (rev 9021)
@@ -14,9 +14,10 @@
if (!empty($xoopsModuleConfig['do_rewrite'])) include_once "seo_url.php";
/* for seo */
$toseo_url = array("index.php","viewforum.php","viewtopic.php","rss.php");
+
if(((strpos(getenv('REQUEST_URI'), '.html') === false) && !empty($xoopsModuleConfig['do_rewrite']) && (!isset($_POST) || count($_POST) <= 0)))
{
- if ( in_array(basename(getenv('SCRIPT_NAME')),$toseo_url) && (trim(getenv("REQUEST_URI")) != '') && trim(getenv("REQUEST_URI")) != "/".REAL_MODULE_NAME."/") {
+ 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");
$newurl = seo_urls('<a href="'.$s.'"></a>');
$newurl = str_replace('<a href="','',$newurl);
@@ -25,7 +26,7 @@
header("HTTP/1.1 301 Moved Permanently");
header("Location: $newurl");
exit();
- }
+ }
}
}
Modified: XoopsModules/newbb/branches/alfred/newbb/include/module.v400.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/module.v400.php 2012-02-19 09:24:43 UTC (rev 9020)
+++ XoopsModules/newbb/branches/alfred/newbb/include/module.v400.php 2012-02-19 10:22:33 UTC (rev 9021)
@@ -105,7 +105,7 @@
WHERE a.type_id = b.type_id AND a.type_id >0;
")
) {
- xoops_error($GLOBALS['xoopsDB']->error());
+ //xoops_error($GLOBALS['xoopsDB']->error());
$GLOBALS['xoopsDB']->queryF("DROP TABLE ".$GLOBALS['xoopsDB']->prefix("bb_type_tmp"));
$GLOBALS['xoopsDB']->queryF("DROP TABLE ".$GLOBALS['xoopsDB']->prefix("bb_type_forum_tmp"));
return true;
Modified: XoopsModules/newbb/branches/alfred/newbb/seo_url.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/seo_url.php 2012-02-19 09:24:43 UTC (rev 9020)
+++ XoopsModules/newbb/branches/alfred/newbb/seo_url.php 2012-02-19 10:22:33 UTC (rev 9021)
@@ -1,20 +1,15 @@
<?php
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-define('REAL_MODULE_NAME', 'forum');
-define('SEO_MODULE_NAME', 'forum');
+define('REAL_MODULE_NAME', 'modules/newbb');
ob_start('seo_urls');
function seo_urls($s)
{
$XPS_URL = str_replace('/','\/', quotemeta(XOOPS_URL) );
-
- if (strpos(getenv('REQUEST_URI'), '/modules/newbb/') === false)
- $module_name = str_replace('/','\/', quotemeta(REAL_MODULE_NAME));
- else
- $module_name = "modules\/newbb";
-
+ $module_name = str_replace('/','\/', quotemeta(REAL_MODULE_NAME));
+
$search = array(
// Search URLs of modules' directry.
@@ -27,13 +22,13 @@
'/<(a|meta)([^>]*)(href|url)=([\'\"]{0,1})'.$XPS_URL.'\/'.$module_name.'\/(newtopic.php)([^>\'\"]*)([\'\"]{1})([^>]*)>/i',
'/<(a|meta)([^>]*)(href|url)=([\'\"]{0,1})'.$XPS_URL.'\/'.$module_name.'\/(.*)([^>\'\"]*)([\'\"]{1})([^>]*)>/i'
);
-
-
+
$s = preg_replace_callback($search, 'replace_links', $s);
return $s;
}
+
function replace_links($matches)
{
switch ($matches[5]) {
@@ -179,7 +174,7 @@
$req_string = '';
}
//$ret = '<'.$matches[1].$matches[2].$matches[3].'='.$matches[4].XOOPS_URL.'/modules/'.SEO_MODULE_NAME.'/'.$add_to_url.$req_string.$matches[7].$matches[8].'>';
- $ret = '<'.$matches[1].$matches[2].$matches[3].'='.$matches[4].XOOPS_URL.'/'.SEO_MODULE_NAME.'/'.$add_to_url.$req_string.$matches[7].$matches[8].'>';
+ $ret = '<'.$matches[1].$matches[2].$matches[3].'='.$matches[4].XOOPS_URL.'/'.REAL_MODULE_NAME.'/'.$add_to_url.$req_string.$matches[7].$matches[8].'>';
return $ret;
}
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-02-19 09:24:43 UTC (rev 9020)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-02-19 10:22:33 UTC (rev 9021)
@@ -86,7 +86,7 @@
<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="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum.forum_id}>"><{$forum.forum_name}></a>
+ <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}>
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html 2012-02-19 09:24:43 UTC (rev 9020)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html 2012-02-19 10:22:33 UTC (rev 9021)
@@ -135,7 +135,7 @@
<{/if}>
</td>
<td width="4%" align="center"><{$topic.topic_icon}></td>
- <td> <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$topic.topic_link}>" title="<{$topic.topic_excerpt}>">
+ <td> <a href="<{$topic.topic_link}>" title="<{$topic.topic_excerpt}>">
<{$topic.topic_title}></a><{$topic.attachment}> <{$topic.topic_page_jump}>
</td>
<td align="center" valign="middle"><{$topic.topic_poster}></td>
Modified: XoopsModules/newbb/branches/alfred/newbb/viewforum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-02-19 09:24:43 UTC (rev 9020)
+++ XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-02-19 10:22:33 UTC (rev 9021)
@@ -161,13 +161,13 @@
unset($query_sort["sort"], $query_sort["order"]);
$page_query_sort = implode("&", array_values($query_sort));
unset($query_sort);
-$xoopsTpl->assign('h_topic_link', "viewforum.php?{$page_query_sort}&sort=t.topic_title&order=". (($sort == "t.topic_title" && $order == "DESC") ? "ASC" : "DESC"));
-$xoopsTpl->assign('h_reply_link', "viewforum.php?{$page_query_sort}&sort=t.topic_replies&order=". (($sort == "t.topic_replies" && $order == "DESC") ? "ASC" : "DESC"));
-$xoopsTpl->assign('h_poster_link', "viewforum.php?{$page_query_sort}&sort=u.uname&order=". (($sort == "u.uname" && $order == "DESC") ? "ASC" : "DESC"));
-$xoopsTpl->assign('h_views_link', "viewforum.php?{$page_query_sort}&sort=t.topic_views&order=". (($sort == "t.topic_views" && $order == "DESC") ? "ASC" : "DESC"));
-$xoopsTpl->assign('h_rating_link', "viewforum.php?{$page_query_sort}&sort=t.topic_ratings&order=". (($sort == "t.topic_ratings" && $order == "DESC") ? "ASC" : "DESC"));
-$xoopsTpl->assign('h_date_link', "viewforum.php?{$page_query_sort}&sort=p.post_time&order=". (($sort == "p.post_time" && $order == "DESC") ? "ASC" : "DESC"));
-$xoopsTpl->assign('h_publish_link', "viewforum.php?{$page_query_sort}&sort=t.topic_time&order=". (($sort == "t.topic_time" && $order == "DESC") ? "ASC" : "DESC"));
+$xoopsTpl->assign('h_topic_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&sort=t.topic_title&order=". (($sort == "t.topic_title" && $order == "DESC") ? "ASC" : "DESC"));
+$xoopsTpl->assign('h_reply_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&sort=t.topic_replies&order=". (($sort == "t.topic_replies" && $order == "DESC") ? "ASC" : "DESC"));
+$xoopsTpl->assign('h_poster_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&sort=u.uname&order=". (($sort == "u.uname" && $order == "DESC") ? "ASC" : "DESC"));
+$xoopsTpl->assign('h_views_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&sort=t.topic_views&order=". (($sort == "t.topic_views" && $order == "DESC") ? "ASC" : "DESC"));
+$xoopsTpl->assign('h_rating_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&sort=t.topic_ratings&order=". (($sort == "t.topic_ratings" && $order == "DESC") ? "ASC" : "DESC"));
+$xoopsTpl->assign('h_date_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&sort=p.post_time&order=". (($sort == "p.post_time" && $order == "DESC") ? "ASC" : "DESC"));
+$xoopsTpl->assign('h_publish_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&sort=t.topic_time&order=". (($sort == "t.topic_time" && $order == "DESC") ? "ASC" : "DESC"));
$xoopsTpl->assign('forum_since', $since); // For $since in search.php
@@ -195,13 +195,13 @@
$xoopsTpl->assign('img_digest', newbb_displayImage('topic_digest',_MD_TOPICDIGEST));
$xoopsTpl->assign('img_poll', newbb_displayImage('poll',_MD_TOPICHASPOLL));
-$mark_read_link = "viewforum.php?mark=1&{$page_query}";
-$mark_unread_link = "viewforum.php?mark=2&{$page_query}";
+$mark_read_link = XOOPS_URL."/modules/newbb/viewforum.php?mark=1&{$page_query}";
+$mark_unread_link = XOOPS_URL."/modules/newbb/viewforum.php?mark=2&{$page_query}";
$xoopsTpl->assign('mark_read', $mark_read_link);
$xoopsTpl->assign('mark_unread', $mark_unread_link);
-$xoopsTpl->assign('post_link', "viewpost.php?forum=".$forum_id);
-$xoopsTpl->assign('newpost_link', "viewpost.php?status=new&forum=".$forum_id);
+$xoopsTpl->assign('post_link', XOOPS_URL."/modules/newbb/viewpost.php?forum=".$forum_id);
+$xoopsTpl->assign('newpost_link', XOOPS_URL."/modules/newbb/viewpost.php?status=new&forum=".$forum_id);
$query_type = $query_array;
unset($query_type["type"]);
@@ -212,7 +212,7 @@
if ($types = $type_handler->getByForum($forum_id)) {
$type_options[] = array("title" => _ALL, "link" => "viewforum.php?{$page_query_type}");
foreach ($types as $key => $item) {
- $type_options[] = array("title" => $item["type_name"], "link" => "viewforum.php?{$page_query_type}&type={$key}");
+ $type_options[] = array("title" => $item["type_name"], "link" => XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_type}&type={$key}");
}
}
if ($type >0) {
@@ -225,11 +225,11 @@
unset($query_status["status"]);
$page_query_status = implode("&", array_values($query_status));
unset($query_status);
-$xoopsTpl->assign('newpost_link', "viewpost.php?status=new&forum=".$forum_obj->getVar('forum_id'));
-$xoopsTpl->assign('all_link', "viewforum.php?{$page_query_status}");
-$xoopsTpl->assign('digest_link', "viewforum.php?{$page_query_status}&status=digest");
-$xoopsTpl->assign('unreplied_link', "viewforum.php?{$page_query_status}&status=unreplied");
-$xoopsTpl->assign('unread_link', "viewforum.php?{$page_query_status}&status=unread");
+$xoopsTpl->assign('newpost_link', XOOPS_URL."/modules/newbb/viewpost.php?status=new&forum=".$forum_obj->getVar('forum_id'));
+$xoopsTpl->assign('all_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_status}");
+$xoopsTpl->assign('digest_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_status}&status=digest");
+$xoopsTpl->assign('unreplied_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_status}&status=unreplied");
+$xoopsTpl->assign('unread_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_status}&status=unread");
switch($status) {
case 'digest':
$current_status = _MD_DIGEST;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-02-19 11:38:17
|
Revision: 9023
http://xoops.svn.sourceforge.net/xoops/?rev=9023&view=rev
Author: dhcst
Date: 2012-02-19 11:38:10 +0000 (Sun, 19 Feb 2012)
Log Message:
-----------
fixed the link is not yet..
Modified Paths:
--------------
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/include/functions.recon.php
Modified: XoopsModules/newbb/branches/alfred/newbb/class/category.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/category.php 2012-02-19 10:40:52 UTC (rev 9022)
+++ XoopsModules/newbb/branches/alfred/newbb/class/category.php 2012-02-19 11:38:10 UTC (rev 9023)
@@ -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");
Modified: XoopsModules/newbb/branches/alfred/newbb/class/digest.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/digest.php 2012-02-19 10:40:52 UTC (rev 9022)
+++ XoopsModules/newbb/branches/alfred/newbb/class/digest.php 2012-02-19 11:38:10 UTC (rev 9023)
@@ -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-02-19 10:40:52 UTC (rev 9022)
+++ XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-02-19 11:38:10 UTC (rev 9023)
@@ -32,7 +32,7 @@
function __construct()
{
- $this->XoopsObject();
+ //$this->XoopsObject();
$this->initVar('forum_id', XOBJ_DTYPE_INT);
$this->initVar('forum_name', XOBJ_DTYPE_TXTBOX);
$this->initVar('forum_desc', XOBJ_DTYPE_TXTBOX);
Modified: XoopsModules/newbb/branches/alfred/newbb/include/functions.recon.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/functions.recon.php 2012-02-19 10:40:52 UTC (rev 9022)
+++ XoopsModules/newbb/branches/alfred/newbb/include/functions.recon.php 2012-02-19 11:38:10 UTC (rev 9023)
@@ -39,7 +39,7 @@
}
foreach ($clean as $item) {
$handler = xoops_getmodulehandler($item, "newbb");
- $handler->cleanOrphan($handler->table,$handler->keyName,'');
+ $handler->synchronization();
unset($handler);
}
$newbbConfig = newbb_load_config();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-02-19 12:26:47
|
Revision: 9025
http://xoops.svn.sourceforge.net/xoops/?rev=9025&view=rev
Author: dhcst
Date: 2012-02-19 12:26:40 +0000 (Sun, 19 Feb 2012)
Log Message:
-----------
fix pfad for seo
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/class/forum.php
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_menu.html
XoopsModules/newbb/branches/alfred/newbb/topicmanager.php
Modified: XoopsModules/newbb/branches/alfred/newbb/class/forum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-02-19 12:12:07 UTC (rev 9024)
+++ XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-02-19 12:26:40 UTC (rev 9025)
@@ -32,7 +32,7 @@
function __construct()
{
- //$this->XoopsObject();
+ $this->XoopsObject();
$this->initVar('forum_id', XOBJ_DTYPE_INT);
$this->initVar('forum_name', XOBJ_DTYPE_TXTBOX);
$this->initVar('forum_desc', XOBJ_DTYPE_TXTBOX);
@@ -78,7 +78,7 @@
}
- function insert(&$forum)
+ function insert($forum)
{
if (!parent::insert($forum, true)) {
return false;
@@ -613,19 +613,20 @@
*/
function synchronization($object = null)
{
- if (empty($object)) {
+ if (empty($object)) {
$forums = $this->getIds();
foreach ($forums as $id) {
$this->synchronization($id);
}
return true;
}
-
+
if (!is_object($object)) {
$object =& $this->get(intval($object));
}
+
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");
if ( $result = $this->db->query($sql)) {
$last_post = 0;
@@ -641,7 +642,7 @@
$object->setVar("forum_posts", $posts);
}
}
-
+
$sql = "SELECT COUNT(*) AS total FROM " . $this->db->prefix("bb_topics") . " WHERE approved=1 AND forum_id = " . $object->getVar("forum_id");
if ( $result = $this->db->query($sql) ) {
if ( $row = $this->db->fetchArray($result) ) {
@@ -649,9 +650,7 @@
$object->setVar("forum_topics", $row['total']);
}
}
- }
-
-
+ }
return $this->insert($object, true);
}
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_menu.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_menu.html 2012-02-19 12:12:07 UTC (rev 9024)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_menu.html 2012-02-19 12:26:40 UTC (rev 9025)
@@ -3,15 +3,15 @@
class="menu" onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}"
>
<option value=""><{$smarty.const._MD_FORUMOPTION}></option>
- <option value="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$mark_read}>"><{$smarty.const._MD_MARK_ALL_TOPICS}> <{$smarty.const._MD_MARK_READ}></option>
- <option value="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$mark_unread}>"><{$smarty.const._MD_MARK_ALL_TOPICS}> <{$smarty.const._MD_MARK_UNREAD}></option>
+ <option value="<{$mark_read}>"><{$smarty.const._MD_MARK_ALL_TOPICS}> <{$smarty.const._MD_MARK_READ}></option>
+ <option value="<{$mark_unread}>"><{$smarty.const._MD_MARK_ALL_TOPICS}> <{$smarty.const._MD_MARK_UNREAD}></option>
<option value="">--------</option>
- <option value="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$post_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_ALLPOSTS}></option>
- <option value="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$newpost_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_NEWPOSTS}></option>
- <option value="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$all_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_ALL}></option>
- <option value="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$digest_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_DIGEST}></option>
- <option value="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$unreplied_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_UNREPLIED}></option>
- <option value="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$unread_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_UNREAD}></option>
+ <option value="<{$post_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_ALLPOSTS}></option>
+ <option value="<{$newpost_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_NEWPOSTS}></option>
+ <option value="<{$all_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_ALL}></option>
+ <option value="<{$digest_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_DIGEST}></option>
+ <option value="<{$unreplied_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_UNREPLIED}></option>
+ <option value="<{$unread_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_UNREAD}></option>
</select>
<{if $type_options}>
Modified: XoopsModules/newbb/branches/alfred/newbb/topicmanager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/topicmanager.php 2012-02-19 12:12:07 UTC (rev 9024)
+++ XoopsModules/newbb/branches/alfred/newbb/topicmanager.php 2012-02-19 12:26:40 UTC (rev 9025)
@@ -193,8 +193,7 @@
if ( !$r = $xoopsDB->query($sql) ) {
return false;
}
- $forum_handler->synchronization($newforum);
- $forum_handler->synchronization($forum);
+ $forum_handler->synchronization();
echo $action[$mode]['msg']."<p><a href='viewtopic.php?topic_id=$topic_id&forum=$newforum'>"._MD_GOTONEWFORUM."</a></p><p><a href='".XOOPS_URL."/modules/newbb/index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
} else {
redirect_header("javascript:history.go(-1)",2,_MD_ERRORFORUM);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-02-19 12:59:18
|
Revision: 9026
http://xoops.svn.sourceforge.net/xoops/?rev=9026&view=rev
Author: dhcst
Date: 2012-02-19 12:59:12 +0000 (Sun, 19 Feb 2012)
Log Message:
-----------
fix move/merge topics
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/class/forum.php
XoopsModules/newbb/branches/alfred/newbb/topicmanager.php
Modified: XoopsModules/newbb/branches/alfred/newbb/class/forum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-02-19 12:26:40 UTC (rev 9025)
+++ XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-02-19 12:59:12 UTC (rev 9026)
@@ -651,7 +651,7 @@
}
}
}
-
+
return $this->insert($object, true);
}
Modified: XoopsModules/newbb/branches/alfred/newbb/topicmanager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/topicmanager.php 2012-02-19 12:26:40 UTC (rev 9025)
+++ XoopsModules/newbb/branches/alfred/newbb/topicmanager.php 2012-02-19 12:59:12 UTC (rev 9026)
@@ -52,6 +52,12 @@
$topic_handler =& xoops_getmodulehandler('topic', 'newbb');
$forum_handler =& xoops_getmodulehandler('forum', 'newbb');
+if ( !$forum ) {
+ $topic_obj =& $topic_handler->get($topic_id);
+ $forum = $topic_obj->getVar("forum_id");
+ unset($topic_obj);
+}
+
if ($xoopsModuleConfig['wol_enabled']) {
$online_handler =& xoops_getmodulehandler('online', 'newbb');
$online_handler->init($forum);
@@ -89,7 +95,7 @@
//sync($topic_id, "topic");
//xoops_notification_deletebyitem ($xoopsModule->getVar('mid'), 'thread', $topic_id);
}
- echo $action[$mode]['msg']."<p><a href='viewforum.php?forum=$forum'>"._MD_RETURNTOTHEFORUM."</a></p><p><a href='index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
+ echo $action[$mode]['msg']."<p><a href='".XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum'>"._MD_RETURNTOTHEFORUM."</a></p><p><a href='index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
} elseif ('restore' == $mode) {
//$topic_handler =& xoops_getmodulehandler('topic', 'newbb');
$forums = array();
@@ -183,7 +189,7 @@
} elseif ('move' == $mode) {
if ($newforum > 0) {
$topic_id = $topic_id[0];
- $topic_obj =& $topic_handler->get($topic_id);
+ $topic_obj = $topic_handler->get($topic_id);
$topic_obj->loadFilters("update");
$topic_obj->setVar("forum_id", $newforum, true);
$topic_handler->insert($topic_obj, true);
@@ -193,7 +199,9 @@
if ( !$r = $xoopsDB->query($sql) ) {
return false;
}
- $forum_handler->synchronization();
+ $forum_handler->synchronization($forum);
+ $forum_handler->synchronization($newforum);
+
echo $action[$mode]['msg']."<p><a href='viewtopic.php?topic_id=$topic_id&forum=$newforum'>"._MD_GOTONEWFORUM."</a></p><p><a href='".XOOPS_URL."/modules/newbb/index.php'>"._MD_RETURNFORUMINDEX."</a></p>";
} else {
redirect_header("javascript:history.go(-1)",2,_MD_ERRORFORUM);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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] |
|
From: <be...@us...> - 2012-03-06 17:06:46
|
Revision: 9101
http://xoops.svn.sourceforge.net/xoops/?rev=9101&view=rev
Author: beckmi
Date: 2012-03-06 17:06:36 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
fixing hard-coded language string "User Information"
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
XoopsModules/newbb/branches/alfred/newbb/language/italian/main.php
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-03-06 16:43:51 UTC (rev 9100)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-03-06 17:06:36 UTC (rev 9101)
@@ -476,4 +476,4 @@
define('_MD_SHARE_DIGG', "Digg");
define('_MD_SHARE_TECHNORATI', "Technorati");
define('_MD_SHARE_MRWONG', "Mr. Wong");
-?>
\ No newline at end of file
+define('_MD_USERINFO', "User Information");
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-03-06 16:43:51 UTC (rev 9100)
+++ XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-03-06 17:06:36 UTC (rev 9101)
@@ -481,4 +481,4 @@
define('_MD_SHARE_DIGG', "Digg");
define('_MD_SHARE_TECHNORATI', "Technorati");
define('_MD_SHARE_MRWONG', "Mr. Wong");
-?>
\ No newline at end of file
+define('_MD_USERINFO', "Benutzerinformationen");
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/language/italian/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/italian/main.php 2012-03-06 16:43:51 UTC (rev 9100)
+++ XoopsModules/newbb/branches/alfred/newbb/language/italian/main.php 2012-03-06 17:06:36 UTC (rev 9101)
@@ -522,10 +522,5 @@
define("_MD_SHARE_DELICIOUS", "Del.icio.us");
define("_MD_SHARE_DIGG", "Digg");
define("_MD_SHARE_TECHNORATI", "Technorati");
-
-?><?php
-
-// Translation done by XTransam & admin (in...@tx...)
-// XTransam 1.2 is written by Chronolabs Co-op & The XOOPS Project - File Dumped on 2011-11-18 14:39
-
-?>
\ No newline at end of file
+define('_MD_SHARE_MRWONG', "Mr. Wong");
+define('_MD_USERINFO', "User Information");
\ 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-06 16:43:51 UTC (rev 9100)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html 2012-03-06 17:06:36 UTC (rev 9101)
@@ -27,7 +27,7 @@
<br />
<{if $infobox gt 0}>
<div>
- <img style="padding:2px;" onclick="ToggleBlockCategory('<{$topic_post.post_id}>', this, '<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/more.png', '<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/more.png')" src="<{$icon_path}>/more.png" alt="Benutzerinformationen" title="Benutzerinformationen" />
+ <img style="padding:2px;" onclick="ToggleBlockCategory('<{$topic_post.post_id}>', this, '<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/more.png', '<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/more.png')" src="<{$icon_path}>/more.png" alt="<{$smarty.const._MD_USERINFO}>" title="<{$smarty.const._MD_USERINFO}>" />
</div>
<div id="<{$topic_post.post_id}>"
<{if $infobox == 1}>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-03-08 15:11:58
|
Revision: 9116
http://xoops.svn.sourceforge.net/xoops/?rev=9116&view=rev
Author: dhcst
Date: 2012-03-08 15:11:47 +0000 (Thu, 08 Mar 2012)
Log Message:
-----------
fix templates and typo for icons
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/class/forum.php
XoopsModules/newbb/branches/alfred/newbb/header.php
XoopsModules/newbb/branches/alfred/newbb/seo_url.php
XoopsModules/newbb/branches/alfred/newbb/templates/style.css
Modified: XoopsModules/newbb/branches/alfred/newbb/class/forum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-03-08 09:38:30 UTC (rev 9115)
+++ XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-03-08 15:11:47 UTC (rev 9116)
@@ -803,11 +803,11 @@
}
$_forum_data['forum_lastpost_subject'] = $subject;
}
- if ($icon = $post['icon']) {
- $_forum_data['forum_lastpost_icon'] = $icon;
- } else {
+ //if ($icon = $post['icon']) {
+ // $_forum_data['forum_lastpost_icon'] = $icon;
+ //} else {
$_forum_data['forum_lastpost_icon'] = 'lastposticon.png';
- }
+ //}
endif;
Modified: XoopsModules/newbb/branches/alfred/newbb/header.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/header.php 2012-03-08 09:38:30 UTC (rev 9115)
+++ XoopsModules/newbb/branches/alfred/newbb/header.php 2012-03-08 15:11:47 UTC (rev 9116)
@@ -15,14 +15,32 @@
/* for seo */
$toseo_url = array("index.php","viewforum.php","viewtopic.php","rss.php");
-if(((strpos(getenv('REQUEST_URI'), '.html') === false) && !empty($xoopsModuleConfig['do_rewrite']) && (!isset($_POST) || count($_POST) <= 0)))
+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")) != '') && 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);
- if (!headers_sent()) {
+ $redir = false;
+ if ( strpos(getenv("REQUEST_URI"),"/".SEO_MODULE_NAME."/index.php?mark_read") === true || strpos(getenv("REQUEST_URI"),"/".REAL_MODULE_NAME."/index.php?mark_read") === true) {
+ // Mark Forums
+ } else {
+ if ( in_array(basename(getenv('SCRIPT_NAME')),$toseo_url) ) {
+ //rewrite only for files
+
+ if ( trim(getenv("SCRIPT_NAME")) != '' ) {
+ if ( strpos(getenv("REQUEST_URI") , "/".REAL_MODULE_NAME."/") === false ) {
+ $redir = true;
+ }
+ }
+ }
+ }
+
+ if ($redir) {
+ $s = "http://" . getenv('HTTP_HOST') . getenv("REQUEST_URI");
+ $s = str_replace("/".preg_quote(SEO_MODULE_NAME)."/","/".preg_quote(REAL_MODULE_NAME)."/",$s);
+
+ $newurl = seo_urls('<a href="'.preg_quote($s).'"></a>');
+ $newurl = str_replace('<a href="','',preg_quote($newurl));
+ $newurl = str_replace('"></a>','',preg_quote($newurl));
+
+ if ( !headers_sent() ) {
header("HTTP/1.1 301 Moved Permanently");
header("Location: $newurl");
exit();
Modified: XoopsModules/newbb/branches/alfred/newbb/seo_url.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/seo_url.php 2012-03-08 09:38:30 UTC (rev 9115)
+++ XoopsModules/newbb/branches/alfred/newbb/seo_url.php 2012-03-08 15:11:47 UTC (rev 9116)
@@ -1,7 +1,8 @@
<?php
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-define('REAL_MODULE_NAME', 'modules/newbb');
+define('REAL_MODULE_NAME', 'modules/newbb'); //this is for normal Module
+define('SEO_MODULE_NAME', 'modules/newbb'); //this is for rewrite-Hack
ob_start('seo_urls');
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/style.css
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/style.css 2012-03-08 09:38:30 UTC (rev 9115)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/style.css 2012-03-08 15:11:47 UTC (rev 9116)
@@ -30,13 +30,13 @@
.forum_stats_left {
float: left;
text-align: left;
- width:49%;
+ width:45%;
}
.forum_stats_right {
float: right;
text-align: right;
- width:49%;
+ width:45%;
}
.forum_body {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-03-10 20:42:31
|
Revision: 9118
http://xoops.svn.sourceforge.net/xoops/?rev=9118&view=rev
Author: dhcst
Date: 2012-03-10 20:42:23 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
fix templates and many errors
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/action.post.php
XoopsModules/newbb/branches/alfred/newbb/action.topic.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/delete.php
XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
XoopsModules/newbb/branches/alfred/newbb/header.php
XoopsModules/newbb/branches/alfred/newbb/include/form.post.php
XoopsModules/newbb/branches/alfred/newbb/include/functions.image.php
XoopsModules/newbb/branches/alfred/newbb/include/search.inc.php
XoopsModules/newbb/branches/alfred/newbb/include/sitemap.plugin.php
XoopsModules/newbb/branches/alfred/newbb/index.php
XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
XoopsModules/newbb/branches/alfred/newbb/newtopic.php
XoopsModules/newbb/branches/alfred/newbb/post.php
XoopsModules/newbb/branches/alfred/newbb/seo_url.php
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_notification_select.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_viewforum_menu.html
XoopsModules/newbb/branches/alfred/newbb/viewforum.php
XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
Modified: XoopsModules/newbb/branches/alfred/newbb/action.post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/action.post.php 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/action.post.php 2012-03-10 20:42:23 UTC (rev 9118)
@@ -201,11 +201,11 @@
break;
}
if (!empty($topic_id)) {
- redirect_header("viewtopic.php?topic_id=$topic_id", 2, _MD_DBUPDATED);
+ redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id", 2, _MD_DBUPDATED);
} elseif (!empty($forum_id)) {
- redirect_header("viewforum.php?forum=$forum_id", 2, _MD_DBUPDATED);
+ redirect_header(XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum_id", 2, _MD_DBUPDATED);
} else {
- redirect_header("viewpost.php?uid=$uid", 2, _MD_DBUPDATED);
+ redirect_header(XOOPS_URL."/modules/newbb/viewpost.php?uid=$uid", 2, _MD_DBUPDATED);
}
include XOOPS_ROOT_PATH.'/footer.php';
Modified: XoopsModules/newbb/branches/alfred/newbb/action.topic.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/action.topic.php 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/action.topic.php 2012-03-10 20:42:23 UTC (rev 9118)
@@ -166,9 +166,9 @@
$stats_handler = xoops_getmodulehandler('stats', 'newbb');
$stats_handler->reset();
if (empty($forum_id)) {
- redirect_header("list.topic.php", 2, _MD_DBUPDATED);
+ redirect_header(XOOPS_URL."/modules/newbb/list.topic.php", 2, _MD_DBUPDATED);
} else {
- redirect_header("viewforum.php?forum=$forum_id", 2, _MD_DBUPDATED);
+ redirect_header(XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum_id", 2, _MD_DBUPDATED);
}
include XOOPS_ROOT_PATH.'/footer.php';
Modified: XoopsModules/newbb/branches/alfred/newbb/class/forum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-03-10 20:42:23 UTC (rev 9118)
@@ -803,11 +803,7 @@
}
$_forum_data['forum_lastpost_subject'] = $subject;
}
- //if ($icon = $post['icon']) {
- // $_forum_data['forum_lastpost_icon'] = $icon;
- //} else {
- $_forum_data['forum_lastpost_icon'] = 'lastposticon.png';
- //}
+ $_forum_data['forum_lastpost_icon'] = 'lastposticon.png';
endif;
Modified: XoopsModules/newbb/branches/alfred/newbb/class/moderate.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/moderate.php 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/class/moderate.php 2012-03-10 20:42:23 UTC (rev 9118)
@@ -14,9 +14,6 @@
exit();
}
-defined("NEWBB_FUNCTIONS_INI") || include XOOPS_ROOT_PATH.'/modules/newbb/include/functions.ini.php';
-newbb_load_object();
-
/**
* A handler for User moderation management
*
@@ -31,8 +28,7 @@
{
function Moderate()
{
- //$this->ArtObject("bb_moderates");
- $this->XoopsObject();
+ $this->XoopsObject();
$this->initVar('mod_id', XOBJ_DTYPE_INT);
$this->initVar('mod_start', XOBJ_DTYPE_INT);
$this->initVar('mod_end', XOBJ_DTYPE_INT);
Modified: XoopsModules/newbb/branches/alfred/newbb/class/online.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/online.php 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/class/online.php 2012-03-10 20:42:23 UTC (rev 9118)
@@ -51,8 +51,8 @@
mt_srand((double)microtime() * 1000000);
// set gc probabillity to 10% for now..
- if (mt_rand(1, 100) < 75) {
- $this->gc(300);
+ if (mt_rand(1, 100) < 60) {
+ $this->gc(150);
}
if (is_object($xoopsUser)) {
$uid = $xoopsUser->getVar('uid');
Modified: XoopsModules/newbb/branches/alfred/newbb/delete.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/delete.php 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/delete.php 2012-03-10 20:42:23 UTC (rev 9118)
@@ -33,7 +33,8 @@
}
$topic_id = $topic->getVar('topic_id');
if ( !$topic_id ) {
- $redirect = empty($forum)?"index.php":'viewforum.php?forum='.$forum;
+ $redirect = empty($forum) ? "index.php":'viewforum.php?forum='.$forum;
+ $redirect = XOOPS_URL."/modules/newbb/".$redirect;
redirect_header($redirect, 2, _MD_ERRORTOPIC);
exit();
}
@@ -53,12 +54,12 @@
if ( $topic_handler->getPermission($topic->getVar("forum_id"), $topic_status, 'delete')
&& ( $isadmin || $post_obj->checkIdentity() )) {}
else {
- redirect_header("viewtopic.php?topic_id=$topic_id&order=$order&viewmode=$viewmode&pid=$pid&forum=$forum", 2, _MD_DELNOTALLOWED);
+ redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&order=$order&viewmode=$viewmode&pid=$pid&forum=$forum", 2, _MD_DELNOTALLOWED);
exit();
}
if (!$isadmin && !$post_obj->checkTimelimit('delete_timelimit')) {
- redirect_header("viewtopic.php?forum=$forum&topic_id=$topic_id&post_id=$post_id&order=$order&viewmode=$viewmode&pid=$pid",2,_MD_TIMEISUPDEL);
+ redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id&post_id=$post_id&order=$order&viewmode=$viewmode&pid=$pid",2,_MD_TIMEISUPDEL);
exit();
}
@@ -72,7 +73,7 @@
if ($post_obj->isTopic() && $topic->getVar("topic_replies")==0) $isDeleteOne=false;
if ($isDeleteOne && $post_obj->isTopic() && $topic->getVar("topic_replies")>0) {
//$post_handler->emptyTopic($post_obj);
- redirect_header("viewtopic.php?topic_id=$topic_id&order=$order&viewmode=$viewmode&pid=$pid&forum=$forum", 2, _MD_POSTFIRSTWITHREPLYNODELETED);
+ redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&order=$order&viewmode=$viewmode&pid=$pid&forum=$forum", 2, _MD_POSTFIRSTWITHREPLYNODELETED);
exit();
} else {
if (!empty($_POST['post_text']))
@@ -109,9 +110,9 @@
$post_obj->loadFilters("delete");
if ( $isDeleteOne ) {
- redirect_header("viewtopic.php?topic_id=$topic_id&order=$order&viewmode=$viewmode&pid=$pid&forum=$forum", 2, _MD_POSTDELETED);
+ redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&order=$order&viewmode=$viewmode&pid=$pid&forum=$forum", 2, _MD_POSTDELETED);
} else {
- redirect_header("viewforum.php?forum=$forum", 2, _MD_POSTSDELETED);
+ redirect_header(XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum", 2, _MD_POSTSDELETED);
}
exit();
@@ -119,7 +120,7 @@
include XOOPS_ROOT_PATH."/header.php";
//xoops_confirm(array('post_id' => $post_id, 'viewmode' => $viewmode, 'order' => $order, 'forum' => $forum, 'topic_id' => $topic_id, 'ok' => 1), 'delete.php', _MD_DEL_ONE);
echo '<div class="confirmMsg">' . _MD_DEL_ONE . '<br />
- <form method="post" action="delete.php">';
+ <form method="post" action="'.XOOPS_URL.'/modules/newbb/delete.php">';
echo _MD_DELEDEDMSG . '<br />';
echo '<textarea name="post_text" cols="50" rows="5"></textarea><br />';
echo '<input type="hidden" name="post_id" value="' . htmlspecialchars($post_id) . '" />';
Modified: XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-03-10 20:42:23 UTC (rev 9118)
@@ -1,6 +1,6 @@
newBB
Changelog 4.3
-03/06/2012
+03/10/2012
===========================================
1 Fix Cache Config for SEO
2 Fix Typos in templates
@@ -8,6 +8,8 @@
4 Fix PDF for SEO
5 Fix Error Topic Number in Blocks
6 Fix Stats move or delete Topics
+ 7 Fix many typos in templates
+ 8 New cache for Seo
newBB
Changelog 4.2
Modified: XoopsModules/newbb/branches/alfred/newbb/header.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/header.php 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/header.php 2012-03-10 20:42:23 UTC (rev 9118)
@@ -18,15 +18,17 @@
if(((strpos(getenv('REQUEST_URI'), '.html') === false) && !empty($xoopsModuleConfig['do_rewrite']) && (!isset($_POST) || count($_POST) <= 0)))
{
$redir = false;
- if ( strpos(getenv("REQUEST_URI"),"/".SEO_MODULE_NAME."/index.php?mark_read") === true || strpos(getenv("REQUEST_URI"),"/".REAL_MODULE_NAME."/index.php?mark_read") === true) {
+ if ( strpos(getenv("REQUEST_URI"),"mark_read=") === true || strpos(getenv("REQUEST_URI"),"mark=") === true) {
// Mark Forums
} else {
if ( in_array(basename(getenv('SCRIPT_NAME')),$toseo_url) ) {
//rewrite only for files
if ( trim(getenv("SCRIPT_NAME")) != '' ) {
- if ( strpos(getenv("REQUEST_URI") , "/".REAL_MODULE_NAME."/") === false ) {
+ if ( strpos(getenv("REQUEST_URI") , "/".SEO_MODULE_NAME."/") === false ) {
$redir = true;
+ } else if ( getenv("QUERY_STRING") ) {
+ $redir = true;
}
}
}
@@ -34,12 +36,11 @@
if ($redir) {
$s = "http://" . getenv('HTTP_HOST') . getenv("REQUEST_URI");
- $s = str_replace("/".preg_quote(SEO_MODULE_NAME)."/","/".preg_quote(REAL_MODULE_NAME)."/",$s);
+ $s = str_replace("/".REAL_MODULE_NAME."/","/".SEO_MODULE_NAME."/",$s);
+ $newurl = seo_urls('<a href="'.$s.'"></a>');
+ $newurl = str_replace('<a href="','',$newurl);
+ $newurl = str_replace('"></a>','',$newurl);
- $newurl = seo_urls('<a href="'.preg_quote($s).'"></a>');
- $newurl = str_replace('<a href="','',preg_quote($newurl));
- $newurl = str_replace('"></a>','',preg_quote($newurl));
-
if ( !headers_sent() ) {
header("HTTP/1.1 301 Moved Permanently");
header("Location: $newurl");
Modified: XoopsModules/newbb/branches/alfred/newbb/include/form.post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/form.post.php 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/include/form.post.php 2012-03-10 20:42:23 UTC (rev 9118)
@@ -63,9 +63,9 @@
if (empty($post_parent_obj)) {
$post_parent_obj =& $post_handler->get($pid);
}
- $form_title = _MD_REPLY . ": <a href=\"viewtopic.php?topic_id={$topic_id}&post_id={$pid}\" rel=\"external\">" . $post_parent_obj->getVar("subject") . "</a>";
+ $form_title = _MD_REPLY . ": <a href=\"".XOOPS_URL."/modules/newbb/viewtopic.php?topic_id={$topic_id}&post_id={$pid}\" rel=\"external\">" . $post_parent_obj->getVar("subject") . "</a>";
} else {
- $form_title = _EDIT . ": <a href=\"viewtopic.php?post_id={$post_id}\" rel=\"external\">" . $post_obj->getVar("subject") . "</a>";
+ $form_title = _EDIT . ": <a href=\"".XOOPS_URL."/modules/newbb/viewtopic.php?post_id={$post_id}\" rel=\"external\">" . $post_obj->getVar("subject") . "</a>";
$editby = true;
}
$xoopsTpl->assign("form_title", $form_title);
@@ -98,7 +98,7 @@
//$filname = XOOPS_URL.$_SERVER['REQUEST_URI'];
-$forum_form = new XoopsThemeForm(htmlspecialchars(@$form_title), 'form_post', 'post.php', 'post', true);
+$forum_form = new XoopsThemeForm(htmlspecialchars(@$form_title), 'form_post', XOOPS_URL.'/modules/newbb/post.php', 'post', true);
$forum_form->setExtra('enctype="multipart/form-data"');
if ($editby)
{
@@ -320,9 +320,9 @@
$cancel_button = new XoopsFormButton('', 'cancel', _CANCEL, 'button');
if ( !empty($topic_id) ) {
- $extra = "viewtopic.php?topic_id=" . intval($topic_id);
+ $extra = XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=" . intval($topic_id);
} else {
- $extra = "viewforum.php?forum=" . $forum_obj->getVar('forum_id');
+ $extra = XOOPS_URL."/modules/newbb/viewforum.php?forum=" . $forum_obj->getVar('forum_id');
}
$cancel_button->setExtra("onclick='location=\"" . $extra . "\"'");
$cancel_button->setExtra("tabindex='6'");
Modified: XoopsModules/newbb/branches/alfred/newbb/include/functions.image.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/functions.image.php 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/include/functions.image.php 2012-03-10 20:42:23 UTC (rev 9118)
@@ -78,12 +78,12 @@
newbb_createThumbnail($source, $xoopsModuleConfig['max_image_width']);
}
}
- if ($imginfo[0] > $xoopsModuleConfig['max_image_width']) {
+ if ($imginfo[0] > $xoopsModuleConfig['max_image_width'] || $imginfo[1] > $xoopsModuleConfig['max_image_height']) {
$pseudo_width = $xoopsModuleConfig['max_image_width'];
$pseudo_height = $xoopsModuleConfig['max_image_width']*($imginfo[1]/$imginfo[0]);
$pseudo_size = "width='".$pseudo_width."px' height='".$pseudo_height."px'";
}
- if ($xoopsModuleConfig['max_image_height']> 0 && $pseudo_height > $xoopsModuleConfig['max_image_height']) {
+ if ($xoopsModuleConfig['max_image_height'] > 0 && $pseudo_height > $xoopsModuleConfig['max_image_height']) {
$pseudo_height = $xoopsModuleConfig['max_image_height'];
$pseudo_width = $xoopsModuleConfig['max_image_height'] * ($imginfo[0]/$imginfo[1]);
$pseudo_size = "width='".$pseudo_width."px' height='".$pseudo_height."px'";
Modified: XoopsModules/newbb/branches/alfred/newbb/include/search.inc.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/search.inc.php 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/include/search.inc.php 2012-03-10 20:42:23 UTC (rev 9118)
@@ -114,12 +114,12 @@
$users = array();
$i = 0;
while($myrow = $xoopsDB->fetchArray($result)) {
- $ret[$i]['link'] = "viewtopic.php?topic_id=".$myrow['topic_id']."&forum=".$myrow['forum_id']."&post_id=".$myrow['post_id']."#forumpost".$myrow['post_id'];
+ $ret[$i]['link'] = XOOPS_URL . "/modules/newbb/viewtopic.php?post_id=".$myrow['post_id'];
$ret[$i]['title'] = $myrow['subject'];
$ret[$i]['time'] = $myrow['post_time'];
$ret[$i]['uid'] = $myrow['uid'];
$ret[$i]['forum_name'] = $myts->htmlSpecialChars($myrow['forum_name']);
- $ret[$i]['forum_link'] = "viewforum.php?forum=".$myrow['forum_id'];
+ $ret[$i]['forum_link'] = XOOPS_URL . "/modules/newbb/viewforum.php?forum=".$myrow['forum_id'];
$users[$myrow['uid']] = 1;
$ret[$i]['poster_name'] = $myrow['poster_name'];
$i++;
Modified: XoopsModules/newbb/branches/alfred/newbb/include/sitemap.plugin.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/sitemap.plugin.php 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/include/sitemap.plugin.php 2012-03-10 20:42:23 UTC (rev 9118)
@@ -67,7 +67,7 @@
$i = $cat_id;
$sitemap['parent'][$i]['id'] = $cat_id;
$sitemap['parent'][$i]['title'] = $category["cat_title"];
- $sitemap['parent'][$i]['url'] = "index.php?cat=".$cat_id;
+ $sitemap['parent'][$i]['url'] = XOOPS_URL."/modules/newbb/index.php?cat=".$cat_id;
}
foreach ( $forums as $id => $forum ) {
$cid = $forum['cid'];
Modified: XoopsModules/newbb/branches/alfred/newbb/index.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/index.php 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/index.php 2012-03-10 20:42:23 UTC (rev 9118)
@@ -184,9 +184,11 @@
'forums' => $forums
);
}
+
unset($categories, $forums_array, $forumsByCat);
$xoopsTpl->assign_by_ref("category_icon", $category_icon);
$xoopsTpl->assign_by_ref("categories", $category_array);
+$xoopsTpl->assign("notifyicon", $category_icon);
$xoopsTpl->assign(array(
"index_title" => sprintf(_MD_WELCOME, htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES)),
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-03-10 20:42:23 UTC (rev 9118)
@@ -43,9 +43,9 @@
define('_MD_USER_LASTVISIT', 'Your last visit: %s');
define('_MD_USER_LASTPOST', 'Your last post: %s');
define('_MD_USER_NOLASTPOST', 'You have not posted yet');
-define('_MD_USER_TOPICS', 'Your Topics: ');
-define('_MD_USER_POSTS', 'Posts: ');
-define('_MD_USER_DIGESTS', 'Digests: ');
+define('_MD_USER_TOPICS', 'Your Topics: %s');
+define('_MD_USER_POSTS', 'Posts: %s');
+define('_MD_USER_DIGESTS', 'Digests: %s');
define('_MD_VIEW_NEWPOSTS', 'View New Posts');
define('_MD_ADVSEARCH','Advanced Search');
define('_MD_POSTEDON','Posted on: ');
@@ -476,4 +476,4 @@
define('_MD_SHARE_DIGG', "Digg");
define('_MD_SHARE_TECHNORATI', "Technorati");
define('_MD_SHARE_MRWONG', "Mr. Wong");
-define('_MD_USERINFO', "User Information");
\ No newline at end of file
+?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-03-10 20:42:23 UTC (rev 9118)
@@ -481,4 +481,4 @@
define('_MD_SHARE_DIGG', "Digg");
define('_MD_SHARE_TECHNORATI', "Technorati");
define('_MD_SHARE_MRWONG', "Mr. Wong");
-define('_MD_USERINFO', "Benutzerinformationen");
\ No newline at end of file
+?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/newtopic.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/newtopic.php 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/newtopic.php 2012-03-10 20:42:23 UTC (rev 9118)
@@ -38,7 +38,7 @@
}
$page_query = htmlspecialchars(implode("&", array_values($query_array)));
unset($query_array);
- redirect_header("viewforum.php?{$page_query}", 2, _MD_NORIGHTTOPOST);
+ redirect_header(XOOPS_URL."/modules/newbb/viewforum.php?{$page_query}", 2, _MD_NORIGHTTOPOST);
exit();
}
Modified: XoopsModules/newbb/branches/alfred/newbb/post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/post.php 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/post.php 2012-03-10 20:42:23 UTC (rev 9118)
@@ -291,7 +291,7 @@
$topic_obj->setVar("topic_tags", @$_POST["topic_tags"]);
}
$topic_handler->insert($topic_obj);
-
+
// Set read mark
if (!empty($isnew)) {
require_once XOOPS_ROOT_PATH . "/modules/newbb/include/functions.read.php";
@@ -382,6 +382,7 @@
$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(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();
Modified: XoopsModules/newbb/branches/alfred/newbb/seo_url.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/seo_url.php 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/seo_url.php 2012-03-10 20:42:23 UTC (rev 9118)
@@ -1,15 +1,15 @@
<?php
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-define('REAL_MODULE_NAME', 'modules/newbb'); //this is for normal Module
-define('SEO_MODULE_NAME', 'modules/newbb'); //this is for rewrite-Hack
+define('REAL_MODULE_NAME', 'modules/newbb'); //this is the Real Module directory
+define('SEO_MODULE_NAME' , 'modules/newbb'); //this is SEO Name for rewrite Hack
ob_start('seo_urls');
function seo_urls($s)
{
$XPS_URL = str_replace('/','\/', quotemeta(XOOPS_URL) );
- $module_name = str_replace('/','\/', quotemeta(REAL_MODULE_NAME));
+ $module_name = str_replace('/','\/', quotemeta(SEO_MODULE_NAME));
$search = array(
@@ -169,62 +169,75 @@
default:
$req_string = $matches[6];
$add_to_url = $matches[5];
+ //if ($add_to_url == '') $add_to_url ='index.php';
break;
}
if ($req_string == '?') {
$req_string = '';
}
- //$ret = '<'.$matches[1].$matches[2].$matches[3].'='.$matches[4].XOOPS_URL.'/modules/'.SEO_MODULE_NAME.'/'.$add_to_url.$req_string.$matches[7].$matches[8].'>';
- $ret = '<'.$matches[1].$matches[2].$matches[3].'='.$matches[4].XOOPS_URL.'/'.REAL_MODULE_NAME.'/'.$add_to_url.$req_string.$matches[7].$matches[8].'>';
+ $ret = '<'.$matches[1].$matches[2].$matches[3].'='.$matches[4].XOOPS_URL.'/'.SEO_MODULE_NAME.'/'.$add_to_url.$req_string.$matches[7].$matches[8].'>';
+ //$ret = '<'.$matches[1].$matches[2].$matches[3].'='.$matches[4].XOOPS_URL.'/'.REAL_MODULE_NAME.'/'.$add_to_url.$req_string.$matches[7].$matches[8].'>';
return $ret;
}
function forum_seo_cat($_cat_id)
{
- //$db =& Database::getInstance();
- $db = $GLOBALS['xoopsDB'];
- $query = "SELECT cat_title FROM ".
- $db->prefix('bb_categories').
- " WHERE cat_id = ".$_cat_id;
- $result = $db->query($query);
- $res = $db->fetchArray($result);
- $ret = forum_seo_title($res['cat_title']);
+ xoops_load('XoopsCache');
+ $key = "newbb_seo_cat";
+ $ret = false;
+ if ( $ret = XoopsCache::read($key) ) {
+ $ret = @$ret[$_cat_id];
+ if ($ret) return $ret;
+ }
+ $query = "SELECT cat_id, cat_title FROM ". $GLOBALS['xoopsDB']->prefix('bb_categories');
+ $result = $GLOBALS['xoopsDB']->query($query);
+ $_ret = array();
+ while ( $res = $GLOBALS['xoopsDB']->fetchArray($result) ) {
+ $_ret[$res['cat_id']] = forum_seo_title($res['cat_title']);
+ }
+ XoopsCache::write($key, $_ret);
+ $ret = XoopsCache::read($key);
+ $ret = $ret[$_cat_id];
return $ret;
}
function forum_seo_forum($_cat_id)
{
- //$db =& Database::getInstance();
- $db = $GLOBALS['xoopsDB'];
- $query = "SELECT forum_name FROM ".
- $db->prefix('bb_forums') .
- " WHERE forum_id = ".$_cat_id;
- $result = $db->query($query);
- $res = $db->fetchArray($result);
- $ret = forum_seo_title($res['forum_name']);
+ xoops_load('XoopsCache');
+ $key = "newbb_seo_forum";
+ $ret = false;
+ if ( $ret = XoopsCache::read($key) ) {
+ $ret = @$ret[$_cat_id];
+ if ($ret) return $ret;
+ }
+ $query = "SELECT forum_id, forum_name FROM " . $GLOBALS['xoopsDB']->prefix('bb_forums') ;
+ $result = $GLOBALS['xoopsDB']->query($query);
+ $_ret = array();
+ while ( $res = $GLOBALS['xoopsDB']->fetchArray($result) ) {
+ $_ret[$res['forum_id']] = forum_seo_title($res['forum_name']);
+ }
+ XoopsCache::write($key, $_ret);
+ $ret = XoopsCache::read($key);
+ $ret = $ret[$_cat_id];
return $ret;
}
function forum_seo_topic($_cat_id)
{
- //$db =& Database::getInstance();
- $db = $GLOBALS['xoopsDB'];
$query = "SELECT topic_title FROM ".
- $db->prefix('bb_topics') .
+ $GLOBALS['xoopsDB']->prefix('bb_topics') .
" WHERE topic_id = ".$_cat_id;
- $result = $db->query($query);
- $res = $db->fetchArray($result);
+ $result = $GLOBALS['xoopsDB']->query($query);
+ $res = $GLOBALS['xoopsDB']->fetchArray($result);
$ret = forum_seo_title($res['topic_title']);
return $ret;
}
function forum_seo_post($_cat_id)
{
- //$db =& Database::getInstance();
- $db = $GLOBALS['xoopsDB'];
$query = "SELECT subject FROM ".
- $db->prefix('bb_posts') .
+ $GLOBALS['xoopsDB']->prefix('bb_posts') .
" WHERE post_id = ".$_cat_id;
- $result = $db->query($query);
- $res = $db->fetchArray($result);
+ $result = $GLOBALS['xoopsDB']->query($query);
+ $res = $GLOBALS['xoopsDB']->fetchArray($result);
$ret = forum_seo_title($res['subject']);
return $ret;
}
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-03-10 20:42:23 UTC (rev 9118)
@@ -6,6 +6,7 @@
</div>
</div>
<div style="clear:both;"></div>
+<{$subforum_display}>
<{if $viewer_level gt 1}>
<br />
<div class="forum_stats">
@@ -33,6 +34,7 @@
</div>
<br style="clear: both;" />
<br />
+
<!-- start forum categories -->
<div class="index_category">
<!-- start forum categories -->
@@ -74,14 +76,13 @@
<{/if}>
<!-- 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">
- <span class="item"><a href="<{$forum.topic_link}>"><{$forum.forum_name}></a>
+ <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}>
@@ -114,185 +115,184 @@
</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>
-<{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">
- <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}>
- </span>
- <{if $subforum.forum_moderators}>
- <span class="extra">
- <{$smarty.const._MD_MODERATOR}>: <{$subforum.forum_moderators}>
- </span>
- <{/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>
-<{/foreach}>
-<{/if}>
-<{/foreach}>
+ <{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>
+ <{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">
+ <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}>
+ </span>
+ <{if $subforum.forum_moderators}>
+ <span class="extra">
+ <{$smarty.const._MD_MODERATOR}>: <{$subforum.forum_moderators}>
+ </span>
+ <{/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/<{$subforum.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}>
-<{elseif $subforum_display == "collapse"}>
+ <{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">
- <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}>
- </span>
- <{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>
+ <{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">
+ <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}>
+ </span>
+ <{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 $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}>
+ <{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="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$subforum.forum_id}>"><{$subforum.forum_name}></a>]
+ <{/foreach}>
+ </td>
+ </tr>
+ <{/if}>
+ <{/foreach}>
-<{else}>
+ <{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">
- <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}>
- </span>
- <{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>
-<{/foreach}>
+ <{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">
+ <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}>
+ </span>
+ <{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>
+ <{/foreach}>
-<{/if}>
- <!-- end forums -->
-</table>
-<br />
-</div>
-<{/foreach}>
-<!-- end forum categories -->
-<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}>" />
+ <{/if}>
+ <!-- end forums -->
+ </table>
<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>
+ <{/foreach}>
+ <!-- end forum categories -->
+<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>
<br style="clear: both;" />
<{if $currenttime}>
<div>
@@ -301,7 +301,6 @@
<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}>
@@ -316,7 +315,6 @@
<{/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>
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_notification_select.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_notification_select.html 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_notification_select.html 2012-03-10 20:42:23 UTC (rev 9118)
@@ -3,8 +3,10 @@
<h4 class="txtcenter"><{$lang_activenotifications}></h4>
<input type="hidden" name="not_redirect" value="<{$xoops_url}><{$xoops_notification.redirect_script}>" />
<input type="hidden" name="XOOPS_TOKEN_REQUEST" value="<{php}>echo $GLOBALS['xoopsSecurity']->createToken();<{/php}>" />
- <table class="outer">
- <tr><th colspan="3"><{$lang_notificationoptions}></th></tr>
+ <table class="outer">
+ <tr>
+ <th colspan="3"><{$lang_notificationoptions}></th>
+ </tr>
<tr>
<td class="head"><{$lang_category}></td>
<td class="head"><input name="allbox" id="allbox" onclick="xoopsCheckAll('notification_select','allbox');" type="checkbox" value="<{$lang_checkall}>" /></td>
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html 2012-03-10 20:42:23 UTC (rev 9118)
@@ -14,125 +14,123 @@
</div>
</th>
</tr>
- <tr>
- <{if $topic_post.poster.uid gt -1}>
- <td width="20%" class="odd" rowspan="2" valign="top">
- <{if $topic_post.poster.uid != 0}>
- <div class="comUserRankText"><{$topic_post.poster.rank.title}><br /><{$topic_post.poster.rank.image}></div>
- <{if $topic_post.poster.avatar != "blank.gif"}>
- <br /><img class="comUserImg" src="<{$xoops_upload_url}>/<{$topic_post.poster.avatar}>" alt="" />
+ <tr>
+ <{if $topic_post.poster.uid gt -1}>
+ <td width="20%" class="odd" rowspan="2" valign="top">
+ <{if $topic_post.poster.uid != 0}>
+ <div class="comUserRankText"><{$topic_post.poster.rank.title}><br /><{$topic_post.poster.rank.image}></div>
+ <{if $topic_post.poster.avatar != "blank.gif"}>
+ <br /><img class="comUserImg" src="<{$xoops_upload_url}>/<{$topic_post.poster.avatar}>" alt="" />
+ <{else}>
+ <br /><img class="comUserImg" src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/anonym.png" alt="" />
+ <{/if}>
+ <br />
+ <{if $infobox gt 0}>
+ <div>
+ <img style="padding:2px;" onclick="ToggleBlockCategory('<{$topic_post.post_id}>', this, '<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/more.png', '<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/more.png')" src="<{$icon_path}>/more.png" alt="Benutzerinformationen" title="Benutzerinformationen" />
+ </div>
+ <div id="<{$topic_post.post_id}>"
+ <{if $infobox == 1}> style="display: none;"
+ <{else}> style="display:block;"
+ <{/if}>
+ >
+ <div class="comUserStat"><span class="comUserStatCaption"><{$smarty.const._MD_JOINED}>:</span><br /><{$topic_post.poster.regdate}></div>
+ <{if $topic_post.poster.from}>
+ <div class="comUserStat"><span class="comUserStatCaption"><{$smarty.const._MD_FROM}></span> <{$topic_post.poster.from}></div>
+ <{/if}>
+ <{if $topic_post.poster.groups}>
+ <div class="comUserStat"> <span class="comUserStatCaption"><{$smarty.const._MD_GROUP}></span>
+ <{foreachq item=group from=$topic_post.poster.groups}> <br /><{$group}><{/foreach}>
+ </div>
+ <{/if}>
+ <div class="comUserStat">
+ <span class="comUserStatCaption"><{$smarty.const._MD_POSTS}>:</span>
+ <{if $topic_post.poster.posts gt 0}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?uid=<{$topic_post.poster.uid}>" title="<{$smarty.const._ALL}>" target="_self"><{$topic_post.poster.posts}></a>
+ <{else}>
+ 0
+ <{/if}>
+ <{if $topic_post.poster.digests gt 0}>
+ | <span class="comUserStatCaption"><{$smarty.const._MD_DIGESTS}>:</span> <{$topic_post.poster.digests}>
+ <{/if}>
+ </div>
+ <{if $topic_post.poster.level}>
+ <div class="comUserStat" align="left"><{$topic_post.poster.level}></div>
+ <{/if}>
+ <{if $topic_post.poster.status}>
+ <div class="comUserStatus"><{$topic_post.poster.status}></div>
+ <{/if}>
+ </div>
+ <{/if}>
+ <{else}>
+ <div class="comUserRankText"><{$anonymous_prefix}><{$topic_post.poster.name}></div>
+ <{/if}>
+ </td>
+
+ <td colspan="2" class="even">
<{else}>
- <br /><img class="comUserImg" src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/anonym.png" alt="" />
+ <td colspan="3" class="even">
<{/if}>
- <br />
- <{if $infobox gt 0}>
- <div>
- <img style="padding:2px;" onclick="ToggleBlockCategory('<{$topic_post.post_id}>', this, '<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/more.png', '<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/more.png')" src="<{$icon_path}>/more.png" alt="<{$smarty.const._MD_USERINFO}>" title="<{$smarty.const._MD_USERINFO}>" />
- </div>
- <div id="<{$topic_post.post_id}>"
- <{if $infobox == 1}>
- style="display: none;"
- <{else}>
- style="display:block;"
- <{/if}>
- >
- <div class="comUserStat"><span class="comUserStatCaption"><{$smarty.const._MD_JOINED}>:</span><br /><{$topic_post.poster.regdate}></div>
- <{if $topic_post.poster.from}>
- <div class="comUserStat"><span class="comUserStatCaption"><{$smarty.const._MD_FROM}></span> <{$topic_post.poster.from}></div>
- <{/if}>
- <{if $topic_post.poster.groups}>
- <div class="comUserStat"> <span class="comUserStatCaption"><{$smarty.const._MD_GROUP}></span>
- <{foreachq item=group from=$topic_post.poster.groups}> <br /><{$group}><{/foreach}>
- </div>
- <{/if}>
- <div class="comUserStat">
- <span class="comUserStatCaption"><{$smarty.const._MD_POSTS}>:</span>
- <{if $topic_post.poster.posts gt 0}>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?uid=<{$topic_post.poster.uid}>" title="<{$smarty.const._ALL}>" target="_self"><{$topic_post.poster.posts}></a>
- <{else}>
- 0
- <{/if}>
- <{if $topic_post.poster.digests gt 0}>
- | <span class="comUserStatCaption"><{$smarty.const._MD_DIGESTS}>:</span> <{$topic_post.poster.digests}>
- <{/if}>
+ <div class="comText"><{$topic_post.post_text}></div>
+ <{if $topic_post.post_attachment}>
+ <div class="comText"><{$topic_post.post_attachment}></div>
+ <{/if}>
+ <div class="clear"></div>
+ <br />
+ <div style="float: right; padding: 5px; margin-top: 10px;">
+ <{if $topic_post.poster_ip}>
+ IP: <a href="http://www.whois.sc/<{$topic_post.poster_ip}>" target="_blank"><{$topic_post.poster_ip}></a> |
+ <{/if}>
+ <{if $topic_post.poster.uid gt 0}>
+ <{$smarty.const._MD_POSTEDON}><{$topic_post.post_date}></div>
+ <{/if}>
+ <{if $topic_post.post_edit}>
+ <div class="clear"></div>
+ <br />
+ <div style="float: right; padding: 5px; margin-top: 10px; border:1px solid #000;">
+ <small><{$topic_post.post_edit}></small>
</div>
- <{if $topic_post.poster.level}>
- <div class="comUserStat" align="left"><{$topic_post.poster.level}></div>
- <{/if}>
- <{if $topic_post.poster.status}>
- <div class="comUserStatus"><{$topic_post.poster.status}></div>
- <{/if}>
+ <{/if}>
+ </td>
+ </tr>
+
+ <tr>
+ <{if $topic_post.poster.uid gt -1}>
+ <td colspan="2" class="odd" valign="bottom">
+ <{else}>
+ <td colspan="3" class="odd" valign="bottom">
+ <{/if}>
+ <{if $topic_post.post_signature}>
+ <div class="signature">
+ ____________________<br />
+ <{$topic_post.post_signature}>
</div>
<{/if}>
- <{else}>
- <div class="comUserRankText"><{$anonymous_prefix}><{$topic_post.poster.name}></div>
- <{/if}>
- </td>
+ </td>
+ </tr>
- <td colspan="2" class="even">
- <{else}>
- <td colspan="3" class="even">
- <{/if}>
- <div class="comText"><{$topic_post.post_text}></div>
- <{if $topic_post.post_attachment}>
- <div class="comText"><{$topic_post.post_attachment}></div>
- <{/if}>
- <div class="clear"></div>
- <br />
- <div style="float: right; padding: 5px; margin-top: 10px;">
- <{if $topic_post.poster_ip}>
- IP: <a href="http://www.whois.sc/<{$topic_post.poster_ip}>" target="_blank"><{$topic_post.poster_ip}></a> |
- <{/if}>
- <{if $topic_post.poster.uid gt 0}>
- <{$smarty.const._MD_POSTEDON}><{$topic_post.post_date}></div>
- <{/if}>
- <{if $topic_post.post_edit}>
- <div class="clear"></div>
- <br />
- <div style="float: right; padding: 5px; margin-top: 10px; border:1px solid #000;">
- <small><{$topic_post.post_edit}></small>
- </div>
- <{/if}>
- </td>
- </tr>
-
- <tr>
- <{if $topic_post.poster.uid gt -1}>
- <td colspan="2" class="odd" valign="bottom">
- <{else}>
- <td colspan="3" class="odd" valign="bottom">
- <{/if}>
- <{if $topic_post.post_signature}>
- <div class="signature">
- _________________<br />
- <{$topic_post.post_signature}>
- </div>
- <{/if}>
- </td>
- </tr>
-
- <tr>
- <td colspan="3" class="foot">
- <table style="border: 0; padding: 0; margin: 0">
- <tr>
- <td style="text-align:left;">
- <{foreachq item=btn from=$topic_post.thread_action}>
- <a href="<{$btn.link}>&post_id=<{$topic_post.post_id}>" title="<{$btn.name}>" <{if $btn.target}>target="<{$btn.target}>"<{/if}>> <{$btn.image}></a>
- <{/foreach}>
- </td>
- <td style="text-align: right;">
- <{if $mode gt 1}>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/action.post.php?post_id=<{$topic_post.post_id}>&op=split&mode=1" target="_self" title="<{$smarty.const._MD_SPLIT_ONE}>"><{$smarty.const._MD_SPLIT_ONE}></a> |
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/action.post.php?post_id=<{$topic_post.post_id}>&op=split&mode=2" target="_self" title="<{$smarty.const._MD_SPLIT_TREE}>"><{$smarty.const._MD_SPLIT_TREE}></a> |
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/action.post.php?post_id=<{$topic_post.post_id}>&op=split&mode=3" target="_self" title="<{$smarty.const._MD_SPLIT_ALL}>"><{$smarty.const._MD_SPLIT_ALL}></a> |
- <input type="checkbox" name="post_id[]" id="post_id[<{$topic_post.post_id}>]" value="<{$topic_post.post_id}>" />
- <{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}>"> <{$p_up}></a>
- </td>
- </tr>
- </table>
- </td>
- </tr>
+ <tr>
+ <td colspan="3" class="foot">
+ <table style="border: 0; padding: 0; margin: 0">
+ <tr>
+ <td style="text-align:left;">
+ <{foreachq item=btn from=$topic_post.thread_action}>
+ <a href="<{$btn.link}>&post_id=<{$topic_post.post_id}>" title="<{$btn.name}>" <{if $btn.target}>target="<{$btn.target}>"<{/if}>> <{$btn.image}></a>
+ <{/foreach}>
+ </td>
+ <td style="text-align: right;">
+ <{if $mode gt 1}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/action.post.php?post_id=<{$topic_post.post_id}>&op=split&mode=1" target="_self" title="<{$smarty.const._MD_SPLIT_ONE}>"><{$smarty.const._MD_SPLIT_ONE}></a> |
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/action.post.php?post_id=<{$topic_post.post_id}>&op=split&mode=2" target="_self" title="<{$smarty.const._MD_SPLIT_TREE}>"><{$smarty.const._MD_SPLIT_TREE}></a> |
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/action.post.php?post_id=<{$topic_post.post_id}>&op=split&mode=3" target="_self" title="<{$smarty.const._MD_SPLIT_ALL}>"><{$smarty.const._MD_SPLIT_ALL}></a> |
+ <input type="checkbox" name="post_id[]" id="post_id[<{$topic_post.post_id}>]" value="<{$topic_post.post_id}>" />
+ <{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}>"> <{$p_up}></a>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
</table>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html 2012-03-10 15:07:40 UTC (rev 9117)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html 2012-03-10 20:42:23 UTC (rev 9118)
@@ -29,13 +29,13 @@
<{/if}>
<{if $mode gt 1}>
-<form name="form_topics_admin" action="<{$xoops_url}>/modules/<{$xoops_dirname}>/action.topic.php" method="POST" onsubmit="javascript: if(window.document.form_topics_admin.op.value < 1){return false;}">
+ <form name="form_topics_admin" action="<{$xoops_url}>/modules/<{$xoops_dirname}>/action.topic.php" method="POST" onsubmit="javascript: if(window.document.form_topics_admin.op.value < 1){return false;}">
<{/if}>
<{if $viewer_level gt 1}>
-<div class="left" style="padding: 5px;" id="admin">
- <{$forum_addpoll}> <{$forum_post_or_register}>
-</div>
+ <div class="left" style="padding: 5px;" id="admin">
+ <{$forum_addpoll}> <{$forum_post_or_register}>
+ </div>
<div class="right" style="padding: 5px;">
<{if $mode gt 1}>
<{$smarty.const._ALL}>: <input type="checkbox" name="topic_check1" id="topic_check1" value="1" onclick="xoopsCheckAll('form_topics_admin', 'topic_check1');" />
@@ -62,42 +62,42 @@
<{/if}>
</div>
<{else}>
-<div class="right" style="padding: 5px;">
- <{$forum_addpoll}> <{$forum_post_or_register}>
-</div>
+ <div class="right" style="padding: 5px;">
+ <{$forum_addpoll}> <{$forum_post_or_register}>
+ </div>
<{/if}>
<div class="clear"></div>
<br />
<div>
-<div class="dropdown">
- <{includeq file="db:newbb_viewforum_menu.html"}>
+ <div class="dropdown">
+ <{includeq file="db:newbb_viewforum_menu.html"}>
+ </div>
+ <div style="padding: 5px;float: right; text-align:right;">
+ <{$forum_pagenav}>
+ </div>
</div>
-<div style="padding: 5px;float: right; text-align:right;">
-<{$forum_pagenav}>
-</div>
-</div>
<div class="clear"></div>
<br />
<table class="outer" cellpadding="6" cellspacing="1" border="0" width="100%" align="center">
<tr class="head" align="left">
- <td width="5%" colspan="2">
- <{if $mode gt 1}>
- <{$smarty.const._ALL}>: <input type="checkbox" name="topic_check" id="topic_check" value="1" onclick="xoopsCheckAll('form_topics_admin', 'topic_check');" />
- <{else}>
-
- <{/if}>
- </td>
- <td> <strong><a href="<{$h_topic_link}>"...
[truncated message content] |
|
From: <be...@us...> - 2012-04-16 19:12:06
|
Revision: 9356
http://xoops.svn.sourceforge.net/xoops/?rev=9356&view=rev
Author: beckmi
Date: 2012-04-16 19:11:55 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
Updating to tag 109 from Alfred
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php
XoopsModules/newbb/branches/alfred/newbb/class/user.php
XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
XoopsModules/newbb/branches/alfred/newbb/header.php
XoopsModules/newbb/branches/alfred/newbb/include/form.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/xoops_version.php
Modified: XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php 2012-04-16 13:58:15 UTC (rev 9355)
+++ XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php 2012-04-16 19:11:55 UTC (rev 9356)
@@ -95,7 +95,7 @@
if (!empty($newbbConfig['do_rewrite'])) {
include_once XOOPS_ROOT_PATH."/modules/newbb/seo_url.php";
} else {
- if (!defined('REAL_MODULE_NAME')) define('REAL_MODULE_NAME', 'modules/newbb');
+ if (!defined('SEO_MODULE_NAME')) define('SEO_MODULE_NAME', 'modules/newbb');
}
$query = 'SELECT'.
@@ -166,8 +166,8 @@
}
$topic['topic_poster'] = $topic_poster;
$topic['topic_page_jump'] = $topic_page_jump;
- $seo_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>';
- $seo_forum_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
+ $seo_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>';
+ $seo_forum_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
if (!empty($newbbConfig['do_rewrite'])) {
$topic['seo_url'] = seo_urls($seo_url);
$topic['seo_forum_url'] = seo_urls($seo_forum_url);
@@ -179,11 +179,11 @@
$block['topics'][] = $topic;
unset($topic);
}
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
$block['seo_top_allforums'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/list.topic.php">'._MB_NEWBB_ALLTOPICS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/list.topic.php">'._MB_NEWBB_ALLTOPICS.'</a>';
$block['seo_top_alltopics'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
$block['seo_top_allposts'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
$block['indexNav'] = intval($options[4]);
@@ -243,7 +243,7 @@
if (!empty($newbbConfig['do_rewrite'])) {
include_once XOOPS_ROOT_PATH."/modules/newbb/seo_url.php";
} else {
- if (!defined('REAL_MODULE_NAME')) define('REAL_MODULE_NAME', 'modules/newbb');
+ if (!defined('SEO_MODULE_NAME')) define('SEO_MODULE_NAME', 'modules/newbb');
}
if (!isset($access_forums)) {
@@ -322,8 +322,8 @@
}
$topic['topic_poster'] = $topic_poster;
$topic['topic_page_jump'] = $topic_page_jump;
- $seo_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?topic_id='.$topic['id'].'">'.$topic['title'].'</a>';
- $seo_forum_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
+ $seo_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?topic_id='.$topic['id'].'">'.$topic['title'].'</a>';
+ $seo_forum_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
if (!empty($newbbConfig['do_rewrite'])) {
$topic['seo_url'] = seo_urls($seo_url);
@@ -336,9 +336,9 @@
$block['topics'][] = $topic;
unset($topic);
}
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
$block['seo_top_allforums'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
$block['seo_top_allposts'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
$block['indexNav'] = intval($options[4]);
@@ -394,7 +394,7 @@
if (!empty($newbbConfig['do_rewrite'])) {
include_once XOOPS_ROOT_PATH."/modules/newbb/seo_url.php";
} else {
- if (!defined('REAL_MODULE_NAME')) define('REAL_MODULE_NAME', 'modules/newbb');
+ if (!defined('SEO_MODULE_NAME')) define('SEO_MODULE_NAME', 'modules/newbb');
}
if (!empty($options[6])) {
@@ -475,8 +475,8 @@
$topic['post_text'] = $post_text;
}
- $seo_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>';
- $seo_forum_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
+ $seo_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>';
+ $seo_forum_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
if (!empty($newbbConfig['do_rewrite'])) {
$topic['seo_url'] = seo_urls($seo_url);
@@ -490,9 +490,9 @@
$block['topics'][] = $topic;
unset($topic);
}
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
$block['seo_top_allforums'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
$block['seo_top_allposts'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
$block['indexNav'] = intval($options[4]);
Modified: XoopsModules/newbb/branches/alfred/newbb/class/user.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/user.php 2012-04-16 13:58:15 UTC (rev 9355)
+++ XoopsModules/newbb/branches/alfred/newbb/class/user.php 2012-04-16 19:11:55 UTC (rev 9356)
@@ -77,7 +77,7 @@
return $level;
}
-class User {
+class newbbUser {
var $user = null;
function User()
@@ -213,7 +213,7 @@
if (class_exists("User_language")) {
$handler = new User_language();
} else {
- $handler = new User();
+ $handler = new newbbUser();
}
foreach (array_keys($this->users) as $uid) {
$this->userlist[$uid] = $handler->getInfo($this->users[$uid]);
Modified: XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-04-16 13:58:15 UTC (rev 9355)
+++ XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-04-16 19:11:55 UTC (rev 9356)
@@ -1,6 +1,6 @@
newBB
Changelog 4.3
-03/10/2012
+03/17/2012
===========================================
1 Fix Cache Config for SEO
2 Fix Typos in templates
@@ -9,7 +9,12 @@
5 Fix Error Topic Number in Blocks
6 Fix Stats move or delete Topics
7 Fix many typos in templates
- 8 New cache for Seo
+ 8 Fix error in declaration User
+ 9 Fix Links in templates
+10 Fix and add languages
+11 New cache for Seo
+12 New Social-Links in Threads
+13 New advertising for topics
newBB
Changelog 4.2
Modified: XoopsModules/newbb/branches/alfred/newbb/header.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/header.php 2012-04-16 13:58:15 UTC (rev 9355)
+++ XoopsModules/newbb/branches/alfred/newbb/header.php 2012-04-16 19:11:55 UTC (rev 9356)
@@ -18,7 +18,7 @@
if(((strpos(getenv('REQUEST_URI'), '.html') === false) && !empty($xoopsModuleConfig['do_rewrite']) && (!isset($_POST) || count($_POST) <= 0)))
{
$redir = false;
- if ( strpos(getenv("REQUEST_URI"),"mark_read=") === true || strpos(getenv("REQUEST_URI"),"mark=") === true) {
+ if ( strpos(getenv("REQUEST_URI"),"index.php?mark_read=") == true || strpos(getenv("REQUEST_URI"),"mark=") == true) {
// Mark Forums
} else {
if ( in_array(basename(getenv('SCRIPT_NAME')),$toseo_url) ) {
@@ -34,13 +34,12 @@
}
}
- if ($redir) {
+ if ($redir == true) {
$s = "http://" . getenv('HTTP_HOST') . getenv("REQUEST_URI");
$s = str_replace("/".REAL_MODULE_NAME."/","/".SEO_MODULE_NAME."/",$s);
$newurl = seo_urls('<a href="'.$s.'"></a>');
$newurl = str_replace('<a href="','',$newurl);
- $newurl = str_replace('"></a>','',$newurl);
-
+ $newurl = str_replace('"></a>','',$newurl);
if ( !headers_sent() ) {
header("HTTP/1.1 301 Moved Permanently");
header("Location: $newurl");
Modified: XoopsModules/newbb/branches/alfred/newbb/include/form.post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/form.post.php 2012-04-16 13:58:15 UTC (rev 9355)
+++ XoopsModules/newbb/branches/alfred/newbb/include/form.post.php 2012-04-16 19:11:55 UTC (rev 9356)
@@ -117,11 +117,12 @@
$type_handler =& xoops_getmodulehandler('type', 'newbb');
$types = $type_handler->getByForum($forum_obj->getVar("forum_id"));
if (!empty($types)) {
- $type_element = new XoopsFormRadio(_MD_NEWBB_TYPE, 'type_id', $type_id);
+ $type_element = new XoopsFormSelect(_MD_NEWBB_TYPE, 'type_id', $type_id);
+ //$type_element = new XoopsFormRadio(_MD_NEWBB_TYPE, 'type_id', $type_id);
$type_element->addOption(0, _NONE);
foreach ($types as $key => $type) {
- $value = empty($type["type_color"]) ? $type["type_name"] : "<em style=\"font-style: normal; color: " . $type["type_color"] . ";\">" . $type["type_name"] . "</em>";
- $type_element->addOption($key, $value);
+ //$value = empty($type["type_color"]) ? $type["type_name"] : "<em style=\"font-style: normal; color: " . $type["type_color"] . ";\">" . $type["type_name"] . "</em>";
+ $type_element->addOption($key, $type["type_name"]);
}
$forum_form->addElement($type_element);
} else {
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-04-16 13:58:15 UTC (rev 9355)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-04-16 19:11:55 UTC (rev 9356)
@@ -6,7 +6,7 @@
</div>
</div>
<div style="clear:both;"></div>
-<{$subforum_display}>
+
<{if $viewer_level gt 1}>
<br />
<div class="forum_stats">
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html 2012-04-16 13:58:15 UTC (rev 9355)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html 2012-04-16 19:11:55 UTC (rev 9356)
@@ -20,7 +20,7 @@
<{if $topic_post.poster.uid != 0}>
<div class="comUserRankText"><{$topic_post.poster.rank.title}><br /><{$topic_post.poster.rank.image}></div>
<{if $topic_post.poster.avatar != "blank.gif"}>
- <br /><img class="comUserImg" src="<{$xoops_upload_url}>/<{$topic_post.poster.avatar}>" alt="" />
+ <br /><img class="comUserImg" src="<{$xoops_upload_url}>/avatars/<{$topic_post.poster.avatar}>" alt="" />
<{else}>
<br /><img class="comUserImg" src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/anonym.png" alt="" />
<{/if}>
Modified: XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/xoops_version.php 2012-04-16 13:58:15 UTC (rev 9355)
+++ XoopsModules/newbb/branches/alfred/newbb/xoops_version.php 2012-04-16 19:11:55 UTC (rev 9356)
@@ -27,10 +27,10 @@
$modversion['status_version'] = "4.2";
//about
-$modversion['release_date'] = '2012/03/10';
+$modversion['release_date'] = '2012/03/17';
$modversion["module_website_url"] = "http://www.simple-xoops.de/";
$modversion["module_website_name"] = "SIMPLE-XOOPS";
-$modversion["module_status"] = "BETA 1";
+$modversion["module_status"] = "BETA 2";
$modversion['min_php'] = "5.2";
$modversion['min_xoops'] = "2.5";
$modversion['min_admin'] = "1.1";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-05-30 08:57:34
|
Revision: 9601
http://xoops.svn.sourceforge.net/xoops/?rev=9601&view=rev
Author: beckmi
Date: 2012-05-30 08:57:28 +0000 (Wed, 30 May 2012)
Log Message:
-----------
fixing bugs, replacing Buzz with Gooogle Plus
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/admin/index.php
XoopsModules/newbb/branches/alfred/newbb/class/post.php
XoopsModules/newbb/branches/alfred/newbb/class/user.php
XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
XoopsModules/newbb/branches/alfred/newbb/include/images.php
XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
XoopsModules/newbb/branches/alfred/newbb/language/italian/main.php
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
Added Paths:
-----------
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/googleplus.png
Removed Paths:
-------------
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/buzz.png
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/index.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-05-30 08:57:28 UTC (rev 9601)
@@ -39,7 +39,7 @@
{
if (empty($path)) return false;
if (@is_writable($path)) {
- $path_status = _AM_NEWBB_AVAILABLE;
+ $path_status = '';// directory available;
} elseif (!@is_dir($path)) {
$path_status = _AM_NEWBB_NOTAVAILABLE." <a href=index.php?op=createdir&path=$path>"._AM_NEWBB_CREATETHEDIR.'</a>';
} else {
@@ -168,25 +168,21 @@
$indexAdmin->addInfoBox(_AM_NEWBB_REPORT) ;
$indexAdmin->addInfoBoxLine(_AM_NEWBB_REPORT, "<infolabel>" ._AM_NEWBB_REPORT_PENDING.': %s' . "</infolabel>" , $report_handler->getCount(new Criteria("report_result", 0)), 'Green') ;
$indexAdmin->addInfoBoxLine(_AM_NEWBB_REPORT, "<infolabel>" ._AM_NEWBB_REPORT_PROCESSED.': %s' . "</infolabel>" , $report_handler->getCount(new Criteria("report_result", 1)), 'Green') ;
-/*
- $temp1 = "<div style='padding: 8px;'>" . _AM_NEWBB_ATTACHPATH . ": ";
- $path_status1 = newbb_admin_getPathStatus($attach_path);
-
- $temp2 = "<br />" . _AM_NEWBB_THUMBPATH . ": ";
- $path_status2 = newbb_admin_getPathStatus($thumb_path);
-
- $indexAdmin->addConfigBoxLine($attach_path . ' (' . $path_status1 . ')', '');
- $indexAdmin->addConfigBoxLine($thumb_path . ' (' . $path_status2 . ')', '');
-*/
- foreach (array_keys( $folder) as $i) {
- $indexAdmin->addConfigBoxLine($folder[$i], 'folder');
- $indexAdmin->addConfigBoxLine(array($folder[$i], '755'), 'chmod');
- }
- echo $indexAdmin->addNavigation('index.php');
- echo $indexAdmin->renderIndex();
-
- } else {
+
+ foreach (array_keys($folder) as $i) {
+ if (!(newbb_admin_getPathStatus($folder[$i])) == '') {
+ $indexAdmin->addConfigBoxLine($folder[$i] . ' ' . newbb_admin_getPathStatus($folder[$i]), 'folder');
+ } else {
+ $indexAdmin->addConfigBoxLine($folder[$i], 'folder');
+ }
+ $indexAdmin->addConfigBoxLine(array($folder[$i], '755'), 'chmod');
+ }
+
+ echo $indexAdmin->addNavigation('index.php');
+ echo $indexAdmin->renderIndex();
+
+ } else {
// loadModuleAdminMenu(0, _MI_NEWBB_ADMENU_INDEX);
Modified: XoopsModules/newbb/branches/alfred/newbb/class/post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-05-30 08:57:28 UTC (rev 9601)
@@ -499,11 +499,11 @@
$thread_action['social_facebook']['name'] = _MD_SHARE_FACEBOOK;
$thread_action['social_facebook']['target'] = '_blank';
- $thread_action['social_buzz']['image'] = newbb_displayImage('buzz', _MD_SHARE_BUZZ);
- $thread_action['social_buzz']['link'] = "http://www.google.com/buzz/post?url=".$full_link;
- $thread_action['social_buzz']['name'] = _MD_SHARE_BUZZ;
- $thread_action['social_buzz']['target'] = '_blank';
-
+ $thread_action['social_gplus']['image'] = newbb_displayImage('googleplus', _MD_SHARE_GOOGLEPLUS);
+ $thread_action['social_gplus']['link'] = "https://plusone.google.com/_/+1/confirm?hl=en&url=".$full_link;
+ $thread_action['social_gplus']['name'] = _MD_SHARE_GOOGLEPLUS;
+ $thread_action['social_gplus']['target'] = '_blank';
+
$thread_action['social_linkedin']['image'] = newbb_displayImage('linkedin', _MD_SHARE_LINKEDIN);
$thread_action['social_linkedin']['link'] = "http://www.linkedin.com/shareArticle?mini=true&title=".$full_title."&url=".$full_link;
$thread_action['social_linkedin']['name'] = _MD_SHARE_LINKEDIN;
Modified: XoopsModules/newbb/branches/alfred/newbb/class/user.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/user.php 2012-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/class/user.php 2012-05-30 08:57:28 UTC (rev 9601)
@@ -77,10 +77,10 @@
return $level;
}
-class newbbUser {
+class User {
var $user = null;
-
- function User()
+
+ function user()
{
}
@@ -213,7 +213,7 @@
if (class_exists("User_language")) {
$handler = new User_language();
} else {
- $handler = new newbbUser();
+ $handler = new User();
}
foreach (array_keys($this->users) as $uid) {
$this->userlist[$uid] = $handler->getInfo($this->users[$uid]);
Modified: XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-05-30 08:57:28 UTC (rev 9601)
@@ -15,7 +15,11 @@
11 New cache for Seo
12 New Social-Links in Threads
13 New advertising for topics
+14 Fix Replaced Buzz with Google Plus (mamba)
+15 Fix Added "Create" links for missing directories (mamba)
+16 Fix Link to Blank.gif
+
newBB
Changelog 4.2
02/08/2012
Modified: XoopsModules/newbb/branches/alfred/newbb/include/images.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/images.php 2012-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/include/images.php 2012-05-30 08:57:28 UTC (rev 9601)
@@ -72,7 +72,7 @@
$forumImage['facebook'] =
$forumImage['twitter'] =
$forumImage['linkedin'] =
-$forumImage['buzz'] =
+$forumImage['googleplus'] =
$forumImage['stumbleupon'] =
$forumImage['friendfeed'] =
$forumImage['digg'] =
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-05-30 08:57:28 UTC (rev 9601)
@@ -53,7 +53,7 @@
define('_AM_NEWBB_GDLIB2','GD2 library:');
define('_AM_NEWBB_AUTODETECTED','Autodetected: ');
define('_AM_NEWBB_AVAILABLE','Available');
-define('_AM_NEWBB_NOTAVAILABLE','<font color="red">Not available</font>');
+define('_AM_NEWBB_NOTAVAILABLE','<font color="red">is not available. </font>');
define('_AM_NEWBB_NOTWRITABLE','<font color="red">Not writable</font>');
define('_AM_NEWBB_IMAGEMAGICK','ImageMagicK:');
define('_AM_NEWBB_IMAGEMAGICK_NOTSET','Not set');
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-05-30 08:57:28 UTC (rev 9601)
@@ -467,7 +467,7 @@
define("_MD_ADVERTISING_USER","Advertisement");
define('_MD_SHARE_FACEBOOK', "Facebook");
define('_MD_SHARE_TWITTER', "Twitter");
-define('_MD_SHARE_BUZZ', "Google Buzz");
+define('_MD_SHARE_GOOGLEPLUS', "Google Plus");
define('_MD_SHARE_LINKEDIN', "Linkedin");
define('_MD_SHARE_STUMBLEUPON', "Stumbleupon");
define('_MD_SHARE_FRIENDFEED', "FriendFeed");
Modified: XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-05-30 08:57:28 UTC (rev 9601)
@@ -472,7 +472,7 @@
define("_MD_ADVERTISING_USER","Werbung");
define('_MD_SHARE_FACEBOOK', "Facebook");
define('_MD_SHARE_TWITTER', "Twitter");
-define('_MD_SHARE_BUZZ', "Google Buzz");
+define('_MD_SHARE_GOOGLEPLUS', "Google Plus");
define('_MD_SHARE_LINKEDIN', "Linkedin");
define('_MD_SHARE_STUMBLEUPON', "Stumbleupon");
define('_MD_SHARE_FRIENDFEED', "FriendFeed");
Modified: XoopsModules/newbb/branches/alfred/newbb/language/italian/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/italian/main.php 2012-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/language/italian/main.php 2012-05-30 08:57:28 UTC (rev 9601)
@@ -514,7 +514,7 @@
//4.05 - social
define("_MD_SHARE_FACEBOOK", "Facebook");
define("_MD_SHARE_TWITTER", "Twitter");
-define("_MD_SHARE_BUZZ", "Google Buzz");
+define("_MD_SHARE_GOOGLEPLUS", "Google Plus");
define("_MD_SHARE_LINKEDIN", "LinkedIn");
define("_MD_SHARE_STUMBLEUPON", "Stumbleupon");
define("_MD_SHARE_FRIENDFEED", "FriendFeed");
Deleted: XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/buzz.png
===================================================================
(Binary files differ)
Added: XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/googleplus.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/googleplus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html 2012-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html 2012-05-30 08:57:28 UTC (rev 9601)
@@ -20,7 +20,7 @@
<{if $topic_post.poster.uid != 0}>
<div class="comUserRankText"><{$topic_post.poster.rank.title}><br /><{$topic_post.poster.rank.image}></div>
<{if $topic_post.poster.avatar != "blank.gif"}>
- <br /><img class="comUserImg" src="<{$xoops_upload_url}>/avatars/<{$topic_post.poster.avatar}>" alt="" />
+ <br /><img class="comUserImg" src="<{$xoops_upload_url}>/<{$topic_post.poster.avatar}>" alt="" />
<{else}>
<br /><img class="comUserImg" src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/anonym.png" alt="" />
<{/if}>
Modified: XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-05-29 12:27:50 UTC (rev 9600)
+++ XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-05-30 08:57:28 UTC (rev 9601)
@@ -44,7 +44,6 @@
}
$page_query = htmlspecialchars(implode("&", array_values($query_array)));
unset($query_array);
-
$topic_id = isset($_GET['topic_id']) ? intval($_GET['topic_id']) : 0;
$post_id = !empty($_GET['post_id']) ? intval($_GET['post_id']) : 0;
$forum_id = !empty($_GET['forum']) ? intval($_GET['forum']) : 0;
@@ -61,7 +60,6 @@
$order = ($xoopsConfig['com_order']==1) ? 'DESC' : 'ASC';
}
}
-
if ( !$topic_id && !$post_id ) {
$redirect = empty($forum_id) ? XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/index.php" : XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewforum.php?forum={$forum_id}";
redirect_header($redirect, 2, _MD_ERRORTOPIC);
@@ -115,7 +113,7 @@
$xoopsOption['template_main'] = 'newbb_viewtopic.html';
$postsArray = $topic_handler->getAllPosts($topic_obj, $order, $xoopsModuleConfig['posts_per_page'], $start, $post_id, $status);
-//Threadersteller zählt nicht
+//Threadersteller z\xE4hlt nicht
if (!$xoopsUser || ($xoopsUser->getVar('uid') != $topic_obj->getVar('topic_poster')) ) {
$topic_obj->incrementCounter();
}
@@ -199,14 +197,13 @@
$viewtopic_users = array();
if (count($userid_array) > 0) {
- require XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname", "n")."/class/user.php";
+ require XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname", "n")."/class/user.php";
$user_handler = new NewbbUserHandler($xoopsModuleConfig['groupbar_enabled'], $xoopsModuleConfig['wol_enabled']);
$user_handler->users = $users;
$user_handler->online = $online;
$viewtopic_users = $user_handler->getUsers();
}
unset($users);
-
if ($xoopsModuleConfig['allow_require_reply'] && $require_reply) {
if (!empty($xoopsModuleConfig['cache_enabled'])) {
$viewtopic_posters = newbb_getsession("t".$topic_id, true);
@@ -220,7 +217,6 @@
} else {
$viewtopic_posters =array();
}
-
if ($xoopsModuleConfig['advertising']) {
$i=0;
$rank = xoops_getrank();
@@ -294,7 +290,6 @@
unset($postsArray);
$xoopsTpl->assign('topic_print_link', "print.php?form=1&{$page_query}");
-
$admin_actions = array();
$ad_merge = "";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-06-15 21:21:52
|
Revision: 9650
http://xoops.svn.sourceforge.net/xoops/?rev=9650&view=rev
Author: dhcst
Date: 2012-06-15 21:21:45 +0000 (Fri, 15 Jun 2012)
Log Message:
-----------
Update
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/admin/index.php
XoopsModules/newbb/branches/alfred/newbb/class/post.php
XoopsModules/newbb/branches/alfred/newbb/class/user.php
XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
XoopsModules/newbb/branches/alfred/newbb/include/images.php
XoopsModules/newbb/branches/alfred/newbb/index.php
XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html
XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
Added Paths:
-----------
XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/buzz.png
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/index.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-06-15 21:21:45 UTC (rev 9650)
@@ -39,7 +39,7 @@
{
if (empty($path)) return false;
if (@is_writable($path)) {
- $path_status = '';// directory available;
+ $path_status = _AM_NEWBB_AVAILABLE;
} elseif (!@is_dir($path)) {
$path_status = _AM_NEWBB_NOTAVAILABLE." <a href=index.php?op=createdir&path=$path>"._AM_NEWBB_CREATETHEDIR.'</a>';
} else {
@@ -168,21 +168,25 @@
$indexAdmin->addInfoBox(_AM_NEWBB_REPORT) ;
$indexAdmin->addInfoBoxLine(_AM_NEWBB_REPORT, "<infolabel>" ._AM_NEWBB_REPORT_PENDING.': %s' . "</infolabel>" , $report_handler->getCount(new Criteria("report_result", 0)), 'Green') ;
$indexAdmin->addInfoBoxLine(_AM_NEWBB_REPORT, "<infolabel>" ._AM_NEWBB_REPORT_PROCESSED.': %s' . "</infolabel>" , $report_handler->getCount(new Criteria("report_result", 1)), 'Green') ;
+/*
+ $temp1 = "<div style='padding: 8px;'>" . _AM_NEWBB_ATTACHPATH . ": ";
+ $path_status1 = newbb_admin_getPathStatus($attach_path);
+
+ $temp2 = "<br />" . _AM_NEWBB_THUMBPATH . ": ";
+ $path_status2 = newbb_admin_getPathStatus($thumb_path);
+
+ $indexAdmin->addConfigBoxLine($attach_path . ' (' . $path_status1 . ')', '');
+ $indexAdmin->addConfigBoxLine($thumb_path . ' (' . $path_status2 . ')', '');
+*/
+ foreach (array_keys( $folder) as $i) {
+ $indexAdmin->addConfigBoxLine($folder[$i], 'folder');
+ $indexAdmin->addConfigBoxLine(array($folder[$i], '755'), 'chmod');
+ }
-
- foreach (array_keys($folder) as $i) {
- if (!(newbb_admin_getPathStatus($folder[$i])) == '') {
- $indexAdmin->addConfigBoxLine($folder[$i] . ' ' . newbb_admin_getPathStatus($folder[$i]), 'folder');
- } else {
- $indexAdmin->addConfigBoxLine($folder[$i], 'folder');
- }
- $indexAdmin->addConfigBoxLine(array($folder[$i], '755'), 'chmod');
- }
-
- echo $indexAdmin->addNavigation('index.php');
- echo $indexAdmin->renderIndex();
-
- } else {
+ echo $indexAdmin->addNavigation('index.php');
+ echo $indexAdmin->renderIndex();
+
+ } else {
// loadModuleAdminMenu(0, _MI_NEWBB_ADMENU_INDEX);
Modified: XoopsModules/newbb/branches/alfred/newbb/class/post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-06-15 21:21:45 UTC (rev 9650)
@@ -497,13 +497,8 @@
$thread_action['social_facebook']['image'] = newbb_displayImage('facebook', _MD_SHARE_FACEBOOK);
$thread_action['social_facebook']['link'] = "http://www.facebook.com/sharer.php?u=".$full_link;
$thread_action['social_facebook']['name'] = _MD_SHARE_FACEBOOK;
- $thread_action['social_facebook']['target'] = '_blank';
-
- $thread_action['social_gplus']['image'] = newbb_displayImage('googleplus', _MD_SHARE_GOOGLEPLUS);
- $thread_action['social_gplus']['link'] = "https://plusone.google.com/_/+1/confirm?hl=en&url=".$full_link;
- $thread_action['social_gplus']['name'] = _MD_SHARE_GOOGLEPLUS;
- $thread_action['social_gplus']['target'] = '_blank';
-
+ $thread_action['social_facebook']['target'] = '_blank';
+
$thread_action['social_linkedin']['image'] = newbb_displayImage('linkedin', _MD_SHARE_LINKEDIN);
$thread_action['social_linkedin']['link'] = "http://www.linkedin.com/shareArticle?mini=true&title=".$full_title."&url=".$full_link;
$thread_action['social_linkedin']['name'] = _MD_SHARE_LINKEDIN;
Modified: XoopsModules/newbb/branches/alfred/newbb/class/user.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/user.php 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/class/user.php 2012-06-15 21:21:45 UTC (rev 9650)
@@ -77,10 +77,10 @@
return $level;
}
-class User {
+class newbbUser {
var $user = null;
-
- function user()
+
+ function User()
{
}
@@ -213,7 +213,7 @@
if (class_exists("User_language")) {
$handler = new User_language();
} else {
- $handler = new User();
+ $handler = new newbbUser();
}
foreach (array_keys($this->users) as $uid) {
$this->userlist[$uid] = $handler->getInfo($this->users[$uid]);
@@ -283,7 +283,7 @@
$ranks[$myrow['rank_id']] = $myrow;
$ranks[$myrow['rank_id']]["rank_title"] = $myts->htmlspecialchars($ranks[$myrow['rank_id']]["rank_title"]);
if (!empty($ranks[$myrow['rank_id']]['rank_image'])) {
- $ranks[$myrow['rank_id']]['rank_image'] = "<img src='" . XOOPS_UPLOAD_URL . "/" . htmlspecialchars($ranks[$myrow['rank_id']]['rank_image'], ENT_QUOTES) . "' alt='' />";
+ $ranks[$myrow['rank_id']]['rank_image'] = "<img src='" . XOOPS_UPLOAD_URL . "/ranks/" . htmlspecialchars($ranks[$myrow['rank_id']]['rank_image'], ENT_QUOTES) . "' alt='' />";
}
}
Modified: XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-06-15 21:21:45 UTC (rev 9650)
@@ -15,11 +15,7 @@
11 New cache for Seo
12 New Social-Links in Threads
13 New advertising for topics
-14 Fix Replaced Buzz with Google Plus (mamba)
-15 Fix Added "Create" links for missing directories (mamba)
-16 Fix Link to Blank.gif
-
newBB
Changelog 4.2
02/08/2012
Modified: XoopsModules/newbb/branches/alfred/newbb/include/images.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/images.php 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/include/images.php 2012-06-15 21:21:45 UTC (rev 9650)
@@ -72,7 +72,7 @@
$forumImage['facebook'] =
$forumImage['twitter'] =
$forumImage['linkedin'] =
-$forumImage['googleplus'] =
+$forumImage['buzz'] =
$forumImage['stumbleupon'] =
$forumImage['friendfeed'] =
$forumImage['digg'] =
Modified: XoopsModules/newbb/branches/alfred/newbb/index.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/index.php 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/index.php 2012-06-15 21:21:45 UTC (rev 9650)
@@ -53,7 +53,7 @@
/* rss feed */
if (!empty($xoopsModuleConfig['rss_enable'])) {
$xoops_module_header .= '
- <link rel="alternate" type="application/rss+xml" title="'.$xoopsModule->getVar('name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/rss.php" />
+ <link rel="alternate" type="application/rss+xml" title="'.$xoopsModule->getVar('name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/rss.php" />
';
}
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-06-15 21:21:45 UTC (rev 9650)
@@ -53,7 +53,7 @@
define('_AM_NEWBB_GDLIB2','GD2 library:');
define('_AM_NEWBB_AUTODETECTED','Autodetected: ');
define('_AM_NEWBB_AVAILABLE','Available');
-define('_AM_NEWBB_NOTAVAILABLE','<font color="red">is not available. </font>');
+define('_AM_NEWBB_NOTAVAILABLE','<font color="red">Not available</font>');
define('_AM_NEWBB_NOTWRITABLE','<font color="red">Not writable</font>');
define('_AM_NEWBB_IMAGEMAGICK','ImageMagicK:');
define('_AM_NEWBB_IMAGEMAGICK_NOTSET','Not set');
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-06-15 21:21:45 UTC (rev 9650)
@@ -467,7 +467,7 @@
define("_MD_ADVERTISING_USER","Advertisement");
define('_MD_SHARE_FACEBOOK', "Facebook");
define('_MD_SHARE_TWITTER', "Twitter");
-define('_MD_SHARE_GOOGLEPLUS', "Google Plus");
+define('_MD_SHARE_BUZZ', "Google Buzz");
define('_MD_SHARE_LINKEDIN', "Linkedin");
define('_MD_SHARE_STUMBLEUPON', "Stumbleupon");
define('_MD_SHARE_FRIENDFEED', "FriendFeed");
Modified: XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-06-15 21:21:45 UTC (rev 9650)
@@ -472,7 +472,7 @@
define("_MD_ADVERTISING_USER","Werbung");
define('_MD_SHARE_FACEBOOK', "Facebook");
define('_MD_SHARE_TWITTER', "Twitter");
-define('_MD_SHARE_GOOGLEPLUS', "Google Plus");
+define('_MD_SHARE_BUZZ', "Google Buzz");
define('_MD_SHARE_LINKEDIN', "Linkedin");
define('_MD_SHARE_STUMBLEUPON', "Stumbleupon");
define('_MD_SHARE_FRIENDFEED', "FriendFeed");
Added: XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/buzz.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/newbb/branches/alfred/newbb/templates/images/icon/buzz.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-06-15 21:21:45 UTC (rev 9650)
@@ -27,8 +27,8 @@
</div>
<div style="clear:both;"></div>
</div>
+ <br style="clear: both;" />
<{/if}>
-<br style="clear: both;" />
<div class="dropdown">
<{includeq file="db:newbb_index_menu.html"}>
</div>
@@ -64,11 +64,11 @@
<{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}>
+ <{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>
@@ -269,11 +269,12 @@
</div>
<{/foreach}>
<!-- end forum categories -->
-<div>
+</div>
<div style="float: left; text-align: left;">
<{$img_forum_new}> = <{$smarty.const._MD_NEWPOSTS}><br />
<{$img_forum}> = <{$smarty.const._MD_NONEWPOSTS}><br />
</div>
+<br style="clear:both;"/>
<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" />
@@ -300,7 +301,8 @@
<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 style="clear:both;"></div>
+ <div class="forum_stats odd" style="padding: 3px; line-height: 150%;">
<div class="forum_stats_left odd">
<{$currenttime}><br />
<{$smarty.const._MD_TOTALTOPICSC}>
@@ -325,9 +327,9 @@
</div>
</div>
</div>
+ <br style="clear:both;"/>
<{/if}>
-<br style="clear:both;"/>
<{if $online}>
<{includeq file="db:newbb_online.html"}>
<{/if}>
Modified: XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-06-15 21:21:45 UTC (rev 9650)
@@ -44,6 +44,7 @@
}
$page_query = htmlspecialchars(implode("&", array_values($query_array)));
unset($query_array);
+
$topic_id = isset($_GET['topic_id']) ? intval($_GET['topic_id']) : 0;
$post_id = !empty($_GET['post_id']) ? intval($_GET['post_id']) : 0;
$forum_id = !empty($_GET['forum']) ? intval($_GET['forum']) : 0;
@@ -60,6 +61,7 @@
$order = ($xoopsConfig['com_order']==1) ? 'DESC' : 'ASC';
}
}
+
if ( !$topic_id && !$post_id ) {
$redirect = empty($forum_id) ? XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/index.php" : XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewforum.php?forum={$forum_id}";
redirect_header($redirect, 2, _MD_ERRORTOPIC);
@@ -113,7 +115,7 @@
$xoopsOption['template_main'] = 'newbb_viewtopic.html';
$postsArray = $topic_handler->getAllPosts($topic_obj, $order, $xoopsModuleConfig['posts_per_page'], $start, $post_id, $status);
-//Threadersteller z\xE4hlt nicht
+//Threadersteller zählt nicht
if (!$xoopsUser || ($xoopsUser->getVar('uid') != $topic_obj->getVar('topic_poster')) ) {
$topic_obj->incrementCounter();
}
@@ -197,13 +199,14 @@
$viewtopic_users = array();
if (count($userid_array) > 0) {
- require XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname", "n")."/class/user.php";
+ require XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname", "n")."/class/user.php";
$user_handler = new NewbbUserHandler($xoopsModuleConfig['groupbar_enabled'], $xoopsModuleConfig['wol_enabled']);
$user_handler->users = $users;
$user_handler->online = $online;
$viewtopic_users = $user_handler->getUsers();
}
unset($users);
+
if ($xoopsModuleConfig['allow_require_reply'] && $require_reply) {
if (!empty($xoopsModuleConfig['cache_enabled'])) {
$viewtopic_posters = newbb_getsession("t".$topic_id, true);
@@ -217,7 +220,8 @@
} else {
$viewtopic_posters =array();
}
-if ($xoopsModuleConfig['advertising']) {
+
+if ($xoopsModuleConfig['show_advertising']) {
$i=0;
$rank = xoops_getrank();
$image =
@@ -241,7 +245,7 @@
);
}
foreach ($postsArray as $eachpost) {
- if ($xoopsModuleConfig['advertising']) {
+ if ($xoopsModuleConfig['show_advertising']) {
if ($i == 2) $xoopsTpl->append('topic_posts', $post_werbung);
$i++;
}
@@ -290,6 +294,7 @@
unset($postsArray);
$xoopsTpl->assign('topic_print_link', "print.php?form=1&{$page_query}");
+
$admin_actions = array();
$ad_merge = "";
Modified: XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/xoops_version.php 2012-06-15 10:14:28 UTC (rev 9649)
+++ XoopsModules/newbb/branches/alfred/newbb/xoops_version.php 2012-06-15 21:21:45 UTC (rev 9650)
@@ -508,6 +508,7 @@
_MI_NEWBB_INFOBOX_SHOW => 2 )
);
+
$modversion['config'][] = array(
'name' => 'show_sociallinks',
'title' => '_MI_SHOW_SOCIALLINKS',
@@ -515,16 +516,15 @@
'formtype' => 'yesno',
'valuetype' => 'int',
'default' => 1);
-
+
$modversion['config'][] = array(
- 'name' => 'advertising',
+ 'name' => 'show_advertising',
'title' => '_MI_ADVERTISING',
'description' => '_MI_ADVERTISING_DESC',
'formtype' => 'yesno',
'valuetype' => 'int',
- 'default' => 0);
+ 'default' => 0);
-
$modversion['config'][] = array(
'name' => 'show_jump',
'title' => '_MI_SHOW_JUMPBOX',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-06-16 08:16:30
|
Revision: 9651
http://xoops.svn.sourceforge.net/xoops/?rev=9651&view=rev
Author: dhcst
Date: 2012-06-16 08:16:22 +0000 (Sat, 16 Jun 2012)
Log Message:
-----------
merge trunk from Mamba
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/admin/index.php
XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php
XoopsModules/newbb/branches/alfred/newbb/class/forum.php
XoopsModules/newbb/branches/alfred/newbb/class/post.php
XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
XoopsModules/newbb/branches/alfred/newbb/header.php
XoopsModules/newbb/branches/alfred/newbb/include/images.php
XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php
XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index_menu.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_menu.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html
XoopsModules/newbb/branches/alfred/newbb/viewforum.php
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/index.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -39,7 +39,7 @@
{
if (empty($path)) return false;
if (@is_writable($path)) {
- $path_status = _AM_NEWBB_AVAILABLE;
+ $path_status = "";
} elseif (!@is_dir($path)) {
$path_status = _AM_NEWBB_NOTAVAILABLE." <a href=index.php?op=createdir&path=$path>"._AM_NEWBB_CREATETHEDIR.'</a>';
} else {
@@ -168,20 +168,15 @@
$indexAdmin->addInfoBox(_AM_NEWBB_REPORT) ;
$indexAdmin->addInfoBoxLine(_AM_NEWBB_REPORT, "<infolabel>" ._AM_NEWBB_REPORT_PENDING.': %s' . "</infolabel>" , $report_handler->getCount(new Criteria("report_result", 0)), 'Green') ;
$indexAdmin->addInfoBoxLine(_AM_NEWBB_REPORT, "<infolabel>" ._AM_NEWBB_REPORT_PROCESSED.': %s' . "</infolabel>" , $report_handler->getCount(new Criteria("report_result", 1)), 'Green') ;
-/*
- $temp1 = "<div style='padding: 8px;'>" . _AM_NEWBB_ATTACHPATH . ": ";
- $path_status1 = newbb_admin_getPathStatus($attach_path);
-
- $temp2 = "<br />" . _AM_NEWBB_THUMBPATH . ": ";
- $path_status2 = newbb_admin_getPathStatus($thumb_path);
-
- $indexAdmin->addConfigBoxLine($attach_path . ' (' . $path_status1 . ')', '');
- $indexAdmin->addConfigBoxLine($thumb_path . ' (' . $path_status2 . ')', '');
-*/
- foreach (array_keys( $folder) as $i) {
- $indexAdmin->addConfigBoxLine($folder[$i], 'folder');
+
+ foreach (array_keys($folder) as $i) {
+ if (!(newbb_admin_getPathStatus($folder[$i])) == '') {
+ $indexAdmin->addConfigBoxLine($folder[$i] . ' ' . newbb_admin_getPathStatus($folder[$i]), 'folder');
+ } else {
+ $indexAdmin->addConfigBoxLine($folder[$i], 'folder');
+ }
$indexAdmin->addConfigBoxLine(array($folder[$i], '755'), 'chmod');
- }
+ }
echo $indexAdmin->addNavigation('index.php');
echo $indexAdmin->renderIndex();
Modified: XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -95,7 +95,7 @@
if (!empty($newbbConfig['do_rewrite'])) {
include_once XOOPS_ROOT_PATH."/modules/newbb/seo_url.php";
} else {
- if (!defined('SEO_MODULE_NAME')) define('SEO_MODULE_NAME', 'modules/newbb');
+ if (!defined('REAL_MODULE_NAME')) define('REAL_MODULE_NAME', 'modules/newbb');
}
$query = 'SELECT'.
@@ -166,8 +166,8 @@
}
$topic['topic_poster'] = $topic_poster;
$topic['topic_page_jump'] = $topic_page_jump;
- $seo_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>';
- $seo_forum_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
+ $seo_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>';
+ $seo_forum_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
if (!empty($newbbConfig['do_rewrite'])) {
$topic['seo_url'] = seo_urls($seo_url);
$topic['seo_forum_url'] = seo_urls($seo_forum_url);
@@ -179,11 +179,11 @@
$block['topics'][] = $topic;
unset($topic);
}
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
$block['seo_top_allforums'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/list.topic.php">'._MB_NEWBB_ALLTOPICS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/list.topic.php">'._MB_NEWBB_ALLTOPICS.'</a>';
$block['seo_top_alltopics'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
$block['seo_top_allposts'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
$block['indexNav'] = intval($options[4]);
@@ -243,7 +243,7 @@
if (!empty($newbbConfig['do_rewrite'])) {
include_once XOOPS_ROOT_PATH."/modules/newbb/seo_url.php";
} else {
- if (!defined('SEO_MODULE_NAME')) define('SEO_MODULE_NAME', 'modules/newbb');
+ if (!defined('REAL_MODULE_NAME')) define('REAL_MODULE_NAME', 'modules/newbb');
}
if (!isset($access_forums)) {
@@ -322,8 +322,8 @@
}
$topic['topic_poster'] = $topic_poster;
$topic['topic_page_jump'] = $topic_page_jump;
- $seo_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?topic_id='.$topic['id'].'">'.$topic['title'].'</a>';
- $seo_forum_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
+ $seo_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?topic_id='.$topic['id'].'">'.$topic['title'].'</a>';
+ $seo_forum_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
if (!empty($newbbConfig['do_rewrite'])) {
$topic['seo_url'] = seo_urls($seo_url);
@@ -336,9 +336,9 @@
$block['topics'][] = $topic;
unset($topic);
}
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
$block['seo_top_allforums'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
$block['seo_top_allposts'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
$block['indexNav'] = intval($options[4]);
@@ -394,7 +394,7 @@
if (!empty($newbbConfig['do_rewrite'])) {
include_once XOOPS_ROOT_PATH."/modules/newbb/seo_url.php";
} else {
- if (!defined('SEO_MODULE_NAME')) define('SEO_MODULE_NAME', 'modules/newbb');
+ if (!defined('REAL_MODULE_NAME')) define('REAL_MODULE_NAME', 'modules/newbb');
}
if (!empty($options[6])) {
@@ -475,8 +475,8 @@
$topic['post_text'] = $post_text;
}
- $seo_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>';
- $seo_forum_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
+ $seo_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>';
+ $seo_forum_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
if (!empty($newbbConfig['do_rewrite'])) {
$topic['seo_url'] = seo_urls($seo_url);
@@ -490,9 +490,9 @@
$block['topics'][] = $topic;
unset($topic);
}
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
$block['seo_top_allforums'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
$block['seo_top_allposts'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
$block['indexNav'] = intval($options[4]);
Modified: XoopsModules/newbb/branches/alfred/newbb/class/forum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -404,7 +404,8 @@
'type_id' => $myrow['type_id'],
'type_text' => $topic_prefix,
'topic_title' => $topic_title,
- 'topic_link' => XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $myrow['topic_id'],
+ //'topic_link' => XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $myrow['topic_id'],
+ 'topic_link' => 'viewtopic.php?topic_id=' . $myrow['topic_id'],
'rating_img' => $rating_img,
'topic_page_jump' => $topic_page_jump,
'topic_page_jump_icon' => $topic_page_jump_icon,
Modified: XoopsModules/newbb/branches/alfred/newbb/class/post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -497,7 +497,12 @@
$thread_action['social_facebook']['image'] = newbb_displayImage('facebook', _MD_SHARE_FACEBOOK);
$thread_action['social_facebook']['link'] = "http://www.facebook.com/sharer.php?u=".$full_link;
$thread_action['social_facebook']['name'] = _MD_SHARE_FACEBOOK;
- $thread_action['social_facebook']['target'] = '_blank';
+ $thread_action['social_facebook']['target'] = '_blank';
+
+ $thread_action['social_gplus']['image'] = newbb_displayImage('googleplus', _MD_SHARE_GOOGLEPLUS);
+ $thread_action['social_gplus']['link'] = "https://plusone.google.com/_/+1/confirm?hl=en&url=".$full_link;
+ $thread_action['social_gplus']['name'] = _MD_SHARE_GOOGLEPLUS;
+ $thread_action['social_gplus']['target'] = '_blank';
$thread_action['social_linkedin']['image'] = newbb_displayImage('linkedin', _MD_SHARE_LINKEDIN);
$thread_action['social_linkedin']['link'] = "http://www.linkedin.com/shareArticle?mini=true&title=".$full_title."&url=".$full_link;
Modified: XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-06-16 08:16:22 UTC (rev 9651)
@@ -1,6 +1,6 @@
newBB
Changelog 4.3
-03/17/2012
+06/16/2012
===========================================
1 Fix Cache Config for SEO
2 Fix Typos in templates
@@ -15,6 +15,9 @@
11 New cache for Seo
12 New Social-Links in Threads
13 New advertising for topics
+14 Fix Replaced Buzz with Google Plus (mamba)
+15 Fix Added "Create" links for missing directories (mamba)
+16 Fix Link to Blank.gif
newBB
Changelog 4.2
Modified: XoopsModules/newbb/branches/alfred/newbb/header.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/header.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/header.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -18,7 +18,7 @@
if(((strpos(getenv('REQUEST_URI'), '.html') === false) && !empty($xoopsModuleConfig['do_rewrite']) && (!isset($_POST) || count($_POST) <= 0)))
{
$redir = false;
- if ( strpos(getenv("REQUEST_URI"),"index.php?mark_read=") == true || strpos(getenv("REQUEST_URI"),"mark=") == true) {
+ if ( strpos(getenv("REQUEST_URI"),"mark_read=") == true || strpos(getenv("REQUEST_URI"),"mark=") == true) {
// Mark Forums
} else {
if ( in_array(basename(getenv('SCRIPT_NAME')),$toseo_url) ) {
Modified: XoopsModules/newbb/branches/alfred/newbb/include/images.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/images.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/include/images.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -72,7 +72,7 @@
$forumImage['facebook'] =
$forumImage['twitter'] =
$forumImage['linkedin'] =
-$forumImage['buzz'] =
+$forumImage['googleplus'] =
$forumImage['stumbleupon'] =
$forumImage['friendfeed'] =
$forumImage['digg'] =
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -53,7 +53,7 @@
define('_AM_NEWBB_GDLIB2','GD2 library:');
define('_AM_NEWBB_AUTODETECTED','Autodetected: ');
define('_AM_NEWBB_AVAILABLE','Available');
-define('_AM_NEWBB_NOTAVAILABLE','<font color="red">Not available</font>');
+define('_AM_NEWBB_NOTAVAILABLE','<font color="red">is not available. </font>');
define('_AM_NEWBB_NOTWRITABLE','<font color="red">Not writable</font>');
define('_AM_NEWBB_IMAGEMAGICK','ImageMagicK:');
define('_AM_NEWBB_IMAGEMAGICK_NOTSET','Not set');
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -467,7 +467,7 @@
define("_MD_ADVERTISING_USER","Advertisement");
define('_MD_SHARE_FACEBOOK', "Facebook");
define('_MD_SHARE_TWITTER', "Twitter");
-define('_MD_SHARE_BUZZ', "Google Buzz");
+define('_MD_SHARE_GOOGLEPLUS', "Google Plus");
define('_MD_SHARE_LINKEDIN', "Linkedin");
define('_MD_SHARE_STUMBLEUPON', "Stumbleupon");
define('_MD_SHARE_FRIENDFEED', "FriendFeed");
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -256,4 +256,7 @@
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/language/german/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -472,7 +472,7 @@
define("_MD_ADVERTISING_USER","Werbung");
define('_MD_SHARE_FACEBOOK', "Facebook");
define('_MD_SHARE_TWITTER', "Twitter");
-define('_MD_SHARE_BUZZ', "Google Buzz");
+define('_MD_SHARE_GOOGLEPLUS', "Google Plus");
define('_MD_SHARE_LINKEDIN', "Linkedin");
define('_MD_SHARE_STUMBLEUPON', "Stumbleupon");
define('_MD_SHARE_FRIENDFEED', "FriendFeed");
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-06-16 08:16:22 UTC (rev 9651)
@@ -26,9 +26,9 @@
<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>
- <br style="clear: both;" />
+ </div>
<{/if}>
+<br style="clear: both;" />
<div class="dropdown">
<{includeq file="db:newbb_index_menu.html"}>
</div>
@@ -301,8 +301,8 @@
<span style="padding: 2px;"><{$online.statistik}></span>
<strong><{$smarty.const._MD_NEWBB_STATS}></strong>
</div>
- <div style="clear:both;"></div>
- <div class="forum_stats odd" style="padding: 3px; line-height: 150%;">
+
+ <div class="forum_stats odd" style="padding: 5px; line-height: 150%;">
<div class="forum_stats_left odd">
<{$currenttime}><br />
<{$smarty.const._MD_TOTALTOPICSC}>
@@ -329,7 +329,7 @@
</div>
<br style="clear:both;"/>
<{/if}>
-
+<br style="clear: both;" />
<{if $online}>
<{includeq file="db:newbb_online.html"}>
<{/if}>
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index_menu.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index_menu.html 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index_menu.html 2012-06-16 08:16:22 UTC (rev 9651)
@@ -1,6 +1,5 @@
<select
name="mainoption" id="mainoption"
- class="menu"
onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.document.location=this.options[this.selectedIndex].value;}"
>
<option value=""><{$smarty.const._MD_MAINFORUMOPT}></option>
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html 2012-06-16 08:16:22 UTC (rev 9651)
@@ -63,7 +63,7 @@
</div>
<{else}>
<div class="right" style="padding: 5px;">
- <{$forum_addpoll}> <{$forum_post_or_register}>
+ <{$forum_post_or_register}>
</div>
<{/if}>
<div class="clear"></div>
@@ -134,7 +134,7 @@
<{/if}>
</td>
<td width="4%" align="center"><{$topic.topic_icon}></td>
- <td> <a href="<{$topic.topic_link}>" title="<{$topic.topic_excerpt}>">
+ <td> <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$topic.topic_link}>" title="<{$topic.topic_excerpt}>">
<{$topic.topic_title}></a><{$topic.attachment}> <{$topic.topic_page_jump}>
</td>
<td align="center" valign="middle"><{$topic.topic_poster}></td>
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_menu.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_menu.html 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_menu.html 2012-06-16 08:16:22 UTC (rev 9651)
@@ -1,6 +1,6 @@
<select
name="forumoption" id="forumoption"
- class="menu" onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}"
+ onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}"
>
<option value=""><{$smarty.const._MD_FORUMOPTION}></option>
<option value="<{$mark_read}>"><{$smarty.const._MD_MARK_ALL_TOPICS}> <{$smarty.const._MD_MARK_READ}></option>
@@ -17,7 +17,7 @@
<{if $type_options}>
<select
name="type" id="type"
- class="menu" onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}"
+ onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}"
>
<option value=""><{$smarty.const._MD_NEWBB_TYPE}></option>
<{foreachq item=opt from=$type_options}>
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html 2012-06-16 08:16:22 UTC (rev 9651)
@@ -100,7 +100,7 @@
<div>
<div class="dropdown">
- <select name="topicoption" id="topicoption" class="menu" onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.document.location=this.options[this.selectedIndex].value;}"
+ <select name="topicoption" id="topicoption" onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.document.location=this.options[this.selectedIndex].value;}"
>
<option value=""><{$smarty.const._MD_TOPICOPTION}></option>
<{if $viewer_level gt 1}>
@@ -120,7 +120,6 @@
<{if $rating_enable}>
<select
name="rate" id="rate"
- class="menu"
onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.document.location=this.options[this.selectedIndex].value;}"
>
<option value=""><{$smarty.const._MD_RATE}></option>
@@ -134,7 +133,7 @@
<select
name="viewmode" id="viewmode"
- class="menu" onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}"
+ onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}"
>
<option value=""><{$smarty.const._MD_VIEWMODE}></option>
<{foreachq item=act from=$viewmode_options}>
Modified: XoopsModules/newbb/branches/alfred/newbb/viewforum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -92,7 +92,7 @@
if ($forum_handler->getPermission($forum_obj, "post")) {
$xoopsTpl->assign('forum_post_or_register', "<a href=\"".XOOPS_URL."/modules/newbb/newtopic.php?forum={$forum_id}\">".newbb_displayImage('t_new', _MD_POSTNEW)."</a>");
- if ($forum_handler->getPermission($forum_obj, "addpoll")) {
+ if ($forum_handler->getPermission($forum_obj, "addpoll") && $pollmodules) {
$t_poll = newbb_displayImage('t_poll',_MD_ADDPOLL);
$xoopsTpl->assign('forum_addpoll', "<a href=\"".XOOPS_URL."/modules/newbb/newtopic.php?op=add&forum={$forum_id}\">{$t_poll}</a>");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-06-17 09:59:40
|
Revision: 9663
http://xoops.svn.sourceforge.net/xoops/?rev=9663&view=rev
Author: dhcst
Date: 2012-06-17 09:59:33 +0000 (Sun, 17 Jun 2012)
Log Message:
-----------
Update to RC1
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/admin/about.php
XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html
XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/about.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/about.php 2012-06-16 20:45:34 UTC (rev 9662)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/about.php 2012-06-17 09:59:33 UTC (rev 9663)
@@ -36,7 +36,7 @@
$module_info =& $module_handler->get($xoopsModule->getVar("mid"));
$aboutAdmin = new ModuleAdmin();
echo $aboutAdmin->addNavigation('about.php');
- echo $aboutAdmin->renderabout('PBQZ7D6LT6UBC', false);
+ echo $aboutAdmin->renderabout('PBQZ7D6LT6UBC', true);
} else {
$module_handler =& xoops_gethandler('module');
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-06-16 20:45:34 UTC (rev 9662)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-06-17 09:59:33 UTC (rev 9663)
@@ -62,7 +62,7 @@
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","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.");
@@ -257,6 +257,4 @@
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/templates/newbb_viewforum.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html 2012-06-16 20:45:34 UTC (rev 9662)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html 2012-06-17 09:59:33 UTC (rev 9663)
@@ -63,7 +63,7 @@
</div>
<{else}>
<div class="right" style="padding: 5px;">
- <{$forum_post_or_register}>
+ <{$forum_addpoll}> <{$forum_post_or_register}>
</div>
<{/if}>
<div class="clear"></div>
Modified: XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/xoops_version.php 2012-06-16 20:45:34 UTC (rev 9662)
+++ XoopsModules/newbb/branches/alfred/newbb/xoops_version.php 2012-06-17 09:59:33 UTC (rev 9663)
@@ -27,10 +27,10 @@
$modversion['status_version'] = "4.2";
//about
-$modversion['release_date'] = '2012/03/17';
+$modversion['release_date'] = '2012/06/17';
$modversion["module_website_url"] = "http://www.simple-xoops.de/";
$modversion["module_website_name"] = "SIMPLE-XOOPS";
-$modversion["module_status"] = "BETA 2";
+$modversion["module_status"] = "RC 1";
$modversion['min_php'] = "5.2";
$modversion['min_xoops'] = "2.5";
$modversion['min_admin'] = "1.1";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-06-18 07:52:50
|
Revision: 9668
http://xoops.svn.sourceforge.net/xoops/?rev=9668&view=rev
Author: dhcst
Date: 2012-06-18 07:52:39 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
Fix path for seo
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/class/topic.renderer.php
XoopsModules/newbb/branches/alfred/newbb/moderate.php
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/class/topic.renderer.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/topic.renderer.php 2012-06-17 21:34:05 UTC (rev 9667)
+++ XoopsModules/newbb/branches/alfred/newbb/class/topic.renderer.php 2012-06-18 07:52:39 UTC (rev 9668)
@@ -485,7 +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 (isset($xoopsModuleConfig['do_rewrite'])) $nav->url = formatURL($_SERVER['SERVER_NAME']) ." /" . $nav->url;
if ($this->config['pagenav_display'] == 'select')
$navi = $nav->renderSelect();
elseif ($this->config['pagenav_display'] == 'bild')
Modified: XoopsModules/newbb/branches/alfred/newbb/moderate.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/moderate.php 2012-06-17 21:34:05 UTC (rev 9667)
+++ XoopsModules/newbb/branches/alfred/newbb/moderate.php 2012-06-18 07:52:39 UTC (rev 9668)
@@ -205,6 +205,7 @@
if ( $moderate_count > $xoopsModuleConfig['topics_per_page']) {
include XOOPS_ROOT_PATH.'/class/pagenav.php';
$nav = new XoopsPageNav($all_topics, $xoopsModuleConfig['topics_per_page'], $start, "start", 'forum='.$forum_id.'&sort='.$sortname);
+ if (isset($xoopsModuleConfig['do_rewrite'])) $nav->url = formatURL($_SERVER['SERVER_NAME']) ." /" . $nav->url;
echo '<tr><td colspan="6">'.$nav->renderNav(4).'</td></tr>';
}
Modified: XoopsModules/newbb/branches/alfred/newbb/viewforum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-06-17 21:34:05 UTC (rev 9667)
+++ XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-06-18 07:52:39 UTC (rev 9668)
@@ -261,7 +261,8 @@
$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 (isset($xoopsModuleConfig['do_rewrite'])) $nav->url = formatURL($_SERVER['SERVER_NAME']) . $nav->url;
+ if (isset($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-06-17 21:34:05 UTC (rev 9667)
+++ XoopsModules/newbb/branches/alfred/newbb/viewpost.php 2012-06-18 07:52:39 UTC (rev 9668)
@@ -333,7 +333,8 @@
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 (isset($xoopsModuleConfig['do_rewrite'])) $nav->url = formatURL($_SERVER['SERVER_NAME']) . $nav->url;
+ //if (isset($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
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-06-17 21:34:05 UTC (rev 9667)
+++ XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-06-18 07:52:39 UTC (rev 9668)
@@ -255,7 +255,10 @@
if ( $total_posts > $xoopsModuleConfig['posts_per_page'] ) {
include XOOPS_ROOT_PATH.'/class/pagenav.php';
$nav = new XoopsPageNav($total_posts, $xoopsModuleConfig['posts_per_page'] , $start , "start", 'topic_id='.$topic_id.'&order='.$order.'&status='.$status."&mode=".$mode);
- if (!empty($xoopsModuleConfig['do_rewrite'])) $nav->url = XOOPS_URL . $nav->url;
+ if (!isset($xoopsModuleConfig['do_rewrite']))
+ $nav->url = formatURL($_SERVER['SERVER_NAME']) . $nav->url;
+ else
+ $nav->url = XOOPS_URL . $nav->url;
if ($xoopsModuleConfig['pagenav_display'] == 'select') {
$navi = $nav->renderSelect();
} elseif ($xoopsModuleConfig['pagenav_display'] == 'bild') {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-06-25 18:55:23
|
Revision: 9719
http://xoops.svn.sourceforge.net/xoops/?rev=9719&view=rev
Author: dhcst
Date: 2012-06-25 18:55:17 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
fix error in topicmanager
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
XoopsModules/newbb/branches/alfred/newbb/topicmanager.php
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-06-25 18:06:58 UTC (rev 9718)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-06-25 18:55:17 UTC (rev 9719)
@@ -7,7 +7,7 @@
//%%%%%% File Name index.php %%%%%
define("_AM_NEWBB_FORUMCONF", "Forum Configuration");
define("_AM_NEWBB_ADDAFORUM", "Add a Forum");
-define("_AM_NEWBB_SYNCFORUM", "Sync Forum");
+define("_AM_NEWBB_SYNCFORUM", "Sync forum");
define("_AM_NEWBB_REORDERFORUM", "Reorder");
define("_AM_NEWBB_FORUM_MANAGER", "Forums");
define("_AM_NEWBB_PRUNE_TITLE", "Prune");
@@ -35,12 +35,12 @@
define("_AM_NEWBB_POSTSAVED", "Post has been saved");
define("_AM_NEWBB_POSTNOTSAVED", "Post has NOT been saved");
define("_AM_NEWBB_TOPICAPPROVED", "Topic has been approved");
-define("_AM_NEWBB_TOPICNOTAPPROVED", "Topic has NOT been approved");
+define("_AM_NEWBB_TOPICNOTAPPROVED", "Topic has been NOT approved");
define("_AM_NEWBB_TOPICID", "Topic ID");
define("_AM_NEWBB_ORPHAN_TOPICS_FOR_AUTH", "Unapproved topics authorization");
-define('_AM_NEWBB_DEL_ONE','Delete only this post');
+define('_AM_NEWBB_DEL_ONE','Delete only this message');
define('_AM_NEWBB_POSTSDELETED','Selected post deleted.');
-define('_AM_NEWBB_NOAPPROVEPOST','There are presently no posts waiting for approval.');
+define('_AM_NEWBB_NOAPPROVEPOST','There are presently no posts waiting approval.');
define('_AM_NEWBB_SUBJECTC','Subject:');
define('_AM_NEWBB_MESSAGEICON','Message Icon:');
define('_AM_NEWBB_MESSAGEC','Message:');
@@ -57,12 +57,12 @@
define('_AM_NEWBB_NOTWRITABLE','<font color="red">Not writable</font>');
define('_AM_NEWBB_IMAGEMAGICK','ImageMagicK:');
define('_AM_NEWBB_IMAGEMAGICK_NOTSET','Not set');
-define('_AM_NEWBB_ATTACHPATH','Path for attachment storage');
+define('_AM_NEWBB_ATTACHPATH','Path for attachment storing');
define('_AM_NEWBB_THUMBPATH','Path for attached image thumbs');
//define('_AM_NEWBB_RSSPATH','Path for RSS feed');
define('_AM_NEWBB_REPORT','Reported posts');
define('_AM_NEWBB_REPORT_PENDING','Pending report');
-define('_AM_NEWBB_REPORT_PROCESSED','Processed report');
+define('_AM_NEWBB_REPORT_PROCESSED','processed report');
define('_AM_NEWBB_CREATETHEDIR','Create it');
define('_AM_NEWBB_SETMPERM','Set the permission');
define('_AM_NEWBB_DIRCREATED','The directory has been created');
@@ -91,7 +91,7 @@
define("_AM_NEWBB_EDITTHISFORUM", "Editing Forum:");
define("_AM_NEWBB_SET_FORUMORDER", "Set Forum Position:");
define("_AM_NEWBB_ALLOWPOLLS", "Allow Polls:");
-define("_AM_NEWBB_ATTACHMENT_SIZE" ,"Max Size in KB`s:");
+define("_AM_NEWBB_ATTACHMENT_SIZE" ,"Max Size in kb`s:");
define("_AM_NEWBB_ALLOWED_EXTENSIONS", "Allowed Extensions:<span style='font-size: xx-small; font-weight: normal; display: block;'>'*' indicates no limititations.<br /> Extensions delimited by '|'</span>");
define("_AM_NEWBB_ALLOW_ATTACHMENTS", "Allow Attachments:");
define("_AM_NEWBB_ALLOWHTML", "Allow HTML:");
@@ -156,8 +156,8 @@
define("_AM_NEWBB_REORDERID", "ID");
define("_AM_NEWBB_REORDERTITLE", "Title");
define("_AM_NEWBB_REORDERWEIGHT", "Position");
-define("_AM_NEWBB_SETFORUMORDER", "Set Forum Ordering");
-define("_AM_NEWBB_BOARDREORDER", "The Forum has been reordered to your specification");
+define("_AM_NEWBB_SETFORUMORDER", "Set Board Ordering");
+define("_AM_NEWBB_BOARDREORDER", "The Board has reordered to your specification");
// admin_permission.php
define("_AM_NEWBB_PERMISSIONS_TO_THIS_FORUM", "Topic permissions for this Forum");
@@ -192,7 +192,7 @@
define ("_AM_NEWBB_PRUNE_RESULTS_POSTS", "Pruned Posts");
define ("_AM_NEWBB_PRUNE_RESULTS_FORUMS", "Pruned Forums");
define ("_AM_NEWBB_PRUNE_STORE", "Store posts in this forum instead of deleting them");
-define ("_AM_NEWBB_PRUNE_ARCHIVE", "Save a copy of posts to Archive");
+define ("_AM_NEWBB_PRUNE_ARCHIVE", "Make a copy of posts into Archive");
define ("_AM_NEWBB_PRUNE_FORUMSELERROR", "You forgot to select forum(s) to prune");
define ("_AM_NEWBB_PRUNE_DAYS", "Remove topics without replies in:");
define ("_AM_NEWBB_PRUNE_FORUMS", "Forums to be pruned");
@@ -213,7 +213,7 @@
define ("_AM_NEWBB_PRUNE_2YEARS", "2 Years");
// About.php constants
-define('_AM_NEWBB_AUTHOR_INFO', "Author Information");
+define('_AM_NEWBB_AUTHOR_INFO', "Author Informations");
define('_AM_NEWBB_AUTHOR_NAME', "Author");
define('_AM_NEWBB_AUTHOR_WEBSITE', "Author's website");
define('_AM_NEWBB_AUTHOR_EMAIL', "Author's email");
@@ -236,7 +236,7 @@
define("_AM_NEWBB_PROCESSREPORT", "View new reports");
define("_AM_NEWBB_REPORTTITLE", "Report title");
define("_AM_NEWBB_REPORTEXTRA", "Extra");
-define("_AM_NEWBB_REPORTPOST", "Report post");
+define("_AM_NEWBB_REPORTPOST", "Reported post");
define("_AM_NEWBB_REPORTTEXT", "Report text");
define("_AM_NEWBB_REPORTMEMO", "Process memo");
@@ -252,18 +252,18 @@
define("_AM_NEWBB_VOTE_USER", "User");
define("_AM_NEWBB_VOTE_IP", "IP Address");
define("_AM_NEWBB_VOTE_USERAVG", "Average User Rating");
-define("_AM_NEWBB_VOTE_TOTALRATE", "Total Rating");
+define("_AM_NEWBB_VOTE_TOTALRATE", "Total Ratings");
define("_AM_NEWBB_VOTE_DATE", "Submitted");
define("_AM_NEWBB_VOTE_RATING", "Rating");
define("_AM_NEWBB_VOTE_NOREGVOTES", "No Registered User Votes");
define("_AM_NEWBB_VOTE_NOUNREGVOTES", "No Unregistered User Votes");
-define("_AM_NEWBB_VOTEDELETED", "Voting data deleted.");
+define("_AM_NEWBB_VOTEDELETED", "Vote data deleted.");
define("_AM_NEWBB_VOTE_ID", "ID");
define("_AM_NEWBB_VOTE_FILETITLE", "Thread Title");
define("_AM_NEWBB_VOTE_DISPLAYVOTES", "Voting Data Information");
define("_AM_NEWBB_VOTE_NOVOTES", "No User Votes to display");
define("_AM_NEWBB_VOTE_DELETE", "No User Votes to delete");
-define("_AM_NEWBB_VOTE_DELETEDSC", "<strong>Deletes</strong> the selected voting information from the database.");
+define("_AM_NEWBB_VOTE_DELETEDSC", "<strong>Deletes</strong> the chosen vote information from the database.");
// admin_type_manager.php
define("_AM_NEWBB_TYPE_ADD", "Add types");
@@ -276,7 +276,7 @@
define("_AM_NEWBB_TYPE_ORDER", "Order");
define("_AM_NEWBB_TYPE_LIST", "Type list");
define("_AM_NEWBB_TODEL_TYPE", "Are you sure to delete the types: [%s]?");
-define("_AM_NEWBB_TYPE_EDITFORUM_DESC", "The data have not been saved yet. You must submit to save it.");
+define("_AM_NEWBB_TYPE_EDITFORUM_DESC", "The data have not been saved yet. You must submit to save them.");
define("_AM_NEWBB_TYPE_ORDER_DESC", "To activate a type for a forum, a value greater than 0 is required for 'type_order'; In other words, a type will be inactive for a forum if 'type_order' is set to 0.");
// admin_synchronization.php
@@ -287,11 +287,11 @@
define("_AM_NEWBB_SYNC_TYPE_STATS", "Stats Info");
define("_AM_NEWBB_SYNC_TYPE_MISC", "MISC");
define("_AM_NEWBB_SYNC_ITEMS", "Items for each loop: ");
-define("_AM_NEWBB_ALLOW_SUBJECT_PREFIX", "Allow Thread prefixes?");
+define("_AM_NEWBB_ALLOW_SUBJECT_PREFIX", "Thread prefixes allow?");
define("_AM_NEWBB_ALLOW_SUBJECT_PREFIX_DESC", "This allows for prefixes that are added to the topic name.");
-define("_AM_NEWBB_GROUPMOD_TITLE","Add moderators per group");
+define("_AM_NEWBB_GROUPMOD_TITLE","add moderators per group");
define("_AM_NEWBB_GROUPMOD_TITLEDESC","Allows you to enter, users of certain groups as moderators");
-define("_AM_NEWBB_GROUPMOD_ALLFORUMS","All forums");
+define("_AM_NEWBB_GROUPMOD_ALLFORUMS","all forums");
define("_AM_NEWBB_GROUPMOD_ADDMOD","Moderators have been successfully registered.");
-define("_AM_NEWBB_GROUPMOD_ERRMOD","You have an Error!");
+define("_AM_NEWBB_GROUPMOD_ERRMOD","You have a Error!");
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/topicmanager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/topicmanager.php 2012-06-25 18:06:58 UTC (rev 9718)
+++ XoopsModules/newbb/branches/alfred/newbb/topicmanager.php 2012-06-25 18:55:17 UTC (rev 9719)
@@ -35,7 +35,7 @@
${$getint} = intval( @$_POST[$getint]);
}
foreach (array('topic_id') as $getint) {
- ${$getint} = @$_POST[$getint];
+ ${$getint} = intval(@$_POST[$getint]);
}
if (!is_array($topic_id)) $topic_id=array($topic_id);
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-06-29 11:22:47
|
Revision: 9737
http://xoops.svn.sourceforge.net/xoops/?rev=9737&view=rev
Author: dhcst
Date: 2012-06-29 11:22:41 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
fix topicmanager.php
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/topicmanager.php
XoopsModules/newbb/branches/alfred/newbb/viewforum.php
XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
Modified: XoopsModules/newbb/branches/alfred/newbb/topicmanager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/topicmanager.php 2012-06-29 10:48:16 UTC (rev 9736)
+++ XoopsModules/newbb/branches/alfred/newbb/topicmanager.php 2012-06-29 11:22:41 UTC (rev 9737)
@@ -53,7 +53,7 @@
$forum_handler =& xoops_getmodulehandler('forum', 'newbb');
if ( !$forum ) {
- $topic_obj =& $topic_handler->get($topic_id);
+ $topic_obj =& $topic_handler->get(intval($topic_id));
$forum = $topic_obj->getVar("forum_id");
unset($topic_obj);
}
@@ -63,7 +63,6 @@
$online_handler->init($forum);
}
-
$action_array = array('merge', 'delete','move','lock','unlock','sticky','unsticky','digest','undigest');
foreach ($action_array as $_action) {
$action[$_action] = array(
@@ -86,6 +85,7 @@
if ( isset($_POST['submit']) ) {
$mode = $_POST['mode'];
+
if ('delete' == $mode) {
foreach ($topic_id as $tid) {
$topic_obj =& $topic_handler->get($tid);
@@ -219,11 +219,16 @@
exit();
}
- $sql = sprintf("UPDATE %s SET ".$action[$mode]['sql']." WHERE topic_id = %u", $xoopsDB->prefix("bb_topics"), $topic_id);
- if ( !$r = $xoopsDB->query($sql) ) {
- redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id&order=$order&viewmode=$viewmode", 2, _MD_ERROR_BACK.'<br />sql:'.$sql);
- exit();
- }
+ if (!empty($action[$mode]['sql'])) {
+ $sql = sprintf("UPDATE %s SET ".$action[$mode]['sql']." WHERE topic_id = %u", $xoopsDB->prefix("bb_topics"), $topic_id);
+ if ( !$r = $xoopsDB->query($sql) ) {
+ redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id&order=$order&viewmode=$viewmode", 2, _MD_ERROR_BACK.'<br />sql:'.$sql);
+ exit();
+ }
+ } else {
+ redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id", 2, _MD_ERROR_BACK);
+ exit();
+ }
if ('digest' == $mode && $xoopsDB->getAffectedRows()) {
$topic_obj =& $topic_handler->get($topic_id);
$stats_handler =& xoops_getmodulehandler('stats', 'newbb');
Modified: XoopsModules/newbb/branches/alfred/newbb/viewforum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-06-29 10:48:16 UTC (rev 9736)
+++ XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-06-29 11:22:41 UTC (rev 9737)
@@ -261,7 +261,6 @@
$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 (isset($xoopsModuleConfig['do_rewrite'])) $nav->url = formatURL($_SERVER['SERVER_NAME']) . $nav->url;
if (isset($xoopsModuleConfig['do_rewrite'])) $nav->url = XOOPS_URL . $nav->url;
if ($xoopsModuleConfig['pagenav_display'] == 'select')
$navi = $nav->renderSelect();
Modified: XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/xoops_version.php 2012-06-29 10:48:16 UTC (rev 9736)
+++ XoopsModules/newbb/branches/alfred/newbb/xoops_version.php 2012-06-29 11:22:41 UTC (rev 9737)
@@ -27,7 +27,7 @@
$modversion['status_version'] = "4.2";
//about
-$modversion['release_date'] = '2012/06/17';
+$modversion['release_date'] = '2012/06/29';
$modversion["module_website_url"] = "http://www.simple-xoops.de/";
$modversion["module_website_name"] = "SIMPLE-XOOPS";
$modversion["module_status"] = "RC 1";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-07-02 08:32:46
|
Revision: 9773
http://xoops.svn.sourceforge.net/xoops/?rev=9773&view=rev
Author: dhcst
Date: 2012-07-02 08:32:37 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
fix select all topics in moderate
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html
XoopsModules/newbb/branches/alfred/newbb/topicmanager.php
XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html 2012-07-02 08:21:47 UTC (rev 9772)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html 2012-07-02 08:32:37 UTC (rev 9773)
@@ -1,4 +1,5 @@
<{if $post_id == $topic_post.post_id}><div id="aktuell"></div><{/if}>
+
<table class="outer" cellpadding="0" cellspacing="0" border="0" width="100%" align="center" style="border-bottom-width: 0px;">
<tr>
<th width="20%" align="left">
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html 2012-07-02 08:21:47 UTC (rev 9772)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html 2012-07-02 08:32:37 UTC (rev 9773)
@@ -65,7 +65,7 @@
<input type="hidden" name="topic_id" value="<{$topic_id}>" />
<input type="submit" name="submit" value="<{$smarty.const._SUBMIT}>" /> |
<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?topic_id=<{$topic_id}>" target="_self" title="<{$smarty.const._MD_TYPE_VIEW}>"><{$smarty.const._MD_TYPE_VIEW}></a>
- </form>
+
<{else}>
<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?topic_id=<{$topic_id}>&status=active#admin" target="_self" title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a> |
<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?topic_id=<{$topic_id}>&status=pending#admin" target="_self" title="<{$smarty.const._MD_TYPE_PENDING}>"><{$smarty.const._MD_TYPE_PENDING}></a> |
@@ -152,7 +152,7 @@
<div class="resultMsg"><{$smarty.const._MD_TOPICLOCK}></div>
<br />
<{/if}>
-
+<{if $post_id == 0}><div id="aktuell"></div><{/if}>
<{foreachq item=topic_post from=$topic_posts}>
<{includeq file="db:newbb_thread.html" topic_post=$topic_post mode=$mode}>
<br />
@@ -236,7 +236,6 @@
</div>
</div>
<div class="clear"></div>
-
<br />
<{includeq file='db:newbb_notification_select.html'}>
Modified: XoopsModules/newbb/branches/alfred/newbb/topicmanager.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/topicmanager.php 2012-07-02 08:21:47 UTC (rev 9772)
+++ XoopsModules/newbb/branches/alfred/newbb/topicmanager.php 2012-07-02 08:32:37 UTC (rev 9773)
@@ -32,7 +32,7 @@
if ( isset($_POST['submit']) ) {
foreach (array('forum', 'newforum', 'newtopic') as $getint) {
- ${$getint} = intval( @$_POST[$getint]);
+ ${$getint} = intval(@$_POST[$getint]);
}
foreach (array('topic_id') as $getint) {
${$getint} = intval(@$_POST[$getint]);
Modified: XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/xoops_version.php 2012-07-02 08:21:47 UTC (rev 9772)
+++ XoopsModules/newbb/branches/alfred/newbb/xoops_version.php 2012-07-02 08:32:37 UTC (rev 9773)
@@ -34,7 +34,7 @@
$modversion['min_php'] = "5.2";
$modversion['min_xoops'] = "2.5";
$modversion['min_admin'] = "1.1";
-$modversion['min_db'] = array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
+$modversion['min_db'] = array('mysql'=>'5.0', 'mysqli'=>'5.0');
$modversion['system_menu'] = 1;
$modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-07-03 09:04:19
|
Revision: 9783
http://xoops.svn.sourceforge.net/xoops/?rev=9783&view=rev
Author: dhcst
Date: 2012-07-03 09:04:09 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
fix permission in forum
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/delete.php
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html
XoopsModules/newbb/branches/alfred/newbb/viewforum.php
Modified: XoopsModules/newbb/branches/alfred/newbb/delete.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/delete.php 2012-07-03 08:45:49 UTC (rev 9782)
+++ XoopsModules/newbb/branches/alfred/newbb/delete.php 2012-07-03 09:04:09 UTC (rev 9783)
@@ -54,12 +54,12 @@
if ( $topic_handler->getPermission($topic->getVar("forum_id"), $topic_status, 'delete')
&& ( $isadmin || $post_obj->checkIdentity() )) {}
else {
- redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&order=$order&viewmode=$viewmode&pid=$pid&forum=$forum", 2, _MD_DELNOTALLOWED);
+ redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_DELNOTALLOWED);
exit();
}
if (!$isadmin && !$post_obj->checkTimelimit('delete_timelimit')) {
- redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id&post_id=$post_id&order=$order&viewmode=$viewmode&pid=$pid",2,_MD_TIMEISUPDEL);
+ redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id&post_id=$post_id&pid=$pid",2,_MD_TIMEISUPDEL);
exit();
}
@@ -73,7 +73,7 @@
if ($post_obj->isTopic() && $topic->getVar("topic_replies")==0) $isDeleteOne=false;
if ($isDeleteOne && $post_obj->isTopic() && $topic->getVar("topic_replies")>0) {
//$post_handler->emptyTopic($post_obj);
- redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&order=$order&viewmode=$viewmode&pid=$pid&forum=$forum", 2, _MD_POSTFIRSTWITHREPLYNODELETED);
+ redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_POSTFIRSTWITHREPLYNODELETED);
exit();
} else {
if (!empty($_POST['post_text']))
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html 2012-07-03 08:45:49 UTC (rev 9782)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html 2012-07-03 09:04:09 UTC (rev 9783)
@@ -1,5 +1,4 @@
<{if $post_id == $topic_post.post_id}><div id="aktuell"></div><{/if}>
-
<table class="outer" cellpadding="0" cellspacing="0" border="0" width="100%" align="center" style="border-bottom-width: 0px;">
<tr>
<th width="20%" align="left">
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html 2012-07-03 08:45:49 UTC (rev 9782)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html 2012-07-03 09:04:09 UTC (rev 9783)
@@ -60,7 +60,7 @@
<option value="approve"><{$smarty.const._MD_APPROVE}></option>
<{elseif $status eq "deleted"}>
<option value="restore"><{$smarty.const._MD_RESTORE}></option>
- <{/if}>
+ <{/if}>
</select>
<input type="hidden" name="topic_id" value="<{$topic_id}>" />
<input type="submit" name="submit" value="<{$smarty.const._SUBMIT}>" /> |
Modified: XoopsModules/newbb/branches/alfred/newbb/viewforum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-07-03 08:45:49 UTC (rev 9782)
+++ XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-07-03 09:04:09 UTC (rev 9783)
@@ -50,7 +50,7 @@
$forum_obj = $forum_handler->get($forum_id);
-if (!$forum_handler->getPermission($forum_obj)) {
+if (!$forum_handler->getPermission($forum_obj) || !$forum_handler->getPermission($forum_obj,'view')) {
redirect_header(XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/index.php", 2, _NOPERM);
exit();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-07-04 17:44:45
|
Revision: 9787
http://xoops.svn.sourceforge.net/xoops/?rev=9787&view=rev
Author: dhcst
Date: 2012-07-04 17:44:39 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
make edited Message optional
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/class/post.php
XoopsModules/newbb/branches/alfred/newbb/include/form.post.php
XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_notification_select.html
XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
Modified: XoopsModules/newbb/branches/alfred/newbb/class/post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-07-04 02:16:46 UTC (rev 9786)
+++ XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-07-04 17:44:39 UTC (rev 9787)
@@ -242,8 +242,9 @@
$edit_time = intval($postedit['edit_time']);
$edit_user = $myts->stripSlashesGPC($postedit['edit_user']);
$edit_msg = (!empty($postedit['edit_msg'])) ? $myts->stripSlashesGPC($postedit['edit_msg']) : '';
- $post_edit = _MD_EDITEDBY . " " . $edit_user . " " . _MD_ON . " " . formatTimestamp(intval($edit_time)) . "<br/>"._MD_EDITEDMSG . " " .$edit_msg."<br />";
- //$post_edit = _MD_EDITEDBY . " " . $edit_user . " " . _MD_ON . " " . formatTimestamp(intval($edit_time)) . "<br/>";
+ if ($edit_msg != "") {
+ $post_edit = _MD_EDITEDBY . " " . $edit_user . " " . _MD_ON . " " . formatTimestamp(intval($edit_time)) . "<br/>"._MD_EDITEDMSG . " " .$edit_msg."<br />";
+ }
}
}
return $post_edit;
Modified: XoopsModules/newbb/branches/alfred/newbb/include/form.post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/form.post.php 2012-07-04 02:16:46 UTC (rev 9786)
+++ XoopsModules/newbb/branches/alfred/newbb/include/form.post.php 2012-07-04 17:44:39 UTC (rev 9787)
@@ -100,9 +100,9 @@
$forum_form = new XoopsThemeForm(htmlspecialchars(@$form_title), 'form_post', XOOPS_URL.'/modules/newbb/post.php', 'post', true);
$forum_form->setExtra('enctype="multipart/form-data"');
-if ($editby)
-{
- $forum_form->addElement( new XoopsFormText(_MD_EDITEDMSG, 'editwhy', 60, 100, ''), true);
+
+if ($editby) {
+ $forum_form->addElement( new XoopsFormText(_MD_EDITEDMSG, 'editwhy', 60, 100, ''));
}
$uid = (is_object($xoopsUser)) ? $xoopsUser->getVar('uid') : 0;
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-07-04 02:16:46 UTC (rev 9786)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-07-04 17:44:39 UTC (rev 9787)
@@ -431,7 +431,7 @@
define("_MD_NEWBB_SEENOTGUEST","<font color=\"red\"><b>Link only for registered users</b></font>");
define("_MD_NEWBB_REPORTSUBJECT","A contribution has been reported");
define("_MD_NEWBB_GOTOLASTPOST","Go to last post");
-define("_MD_EDITEDMSG","Reason:");
+define("_MD_EDITEDMSG","Reason (optional):");
define("_MD_DELEDEDMSG","Reason for deleting<br /><small>(If a reason is provided, the user will receive a message)</small>:");
define("_MD_DELEDEDMSG_SUBJECT","Deletion of your article");
define("_MD_DELEDEDMSG_BODY","Hello %s,
Modified: XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-07-04 02:16:46 UTC (rev 9786)
+++ XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-07-04 17:44:39 UTC (rev 9787)
@@ -431,7 +431,7 @@
define("_MD_NEWBB_SEENOTGUEST","<font color=\"red\"><b>Link nur für registrierte User sichtbar</b></font>");
define("_MD_NEWBB_REPORTSUBJECT","Ein Beitrag wurde gemeldet");
define("_MD_NEWBB_GOTOLASTPOST","Gehe zum letzten Posting");
-define("_MD_EDITEDMSG","Grund:");
+define("_MD_EDITEDMSG","Grund (optional):");
define("_MD_DELEDEDMSG","Grund des Löschens<br /><small>(Wird ein Grund angegeben wird der User benachrichtigt)</small>:");
define("_MD_DELEDEDMSG_SUBJECT","Löschung deines Beitrages");
define("_MD_DELEDEDMSG_BODY","Hallo %s,
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_notification_select.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_notification_select.html 2012-07-04 02:16:46 UTC (rev 9786)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_notification_select.html 2012-07-04 17:44:39 UTC (rev 9787)
@@ -1,6 +1,6 @@
<{if $xoops_notification.show}>
<form name="notification_select" action="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$xoops_notification.target_page}>" method="post">
- <h4 class="txtcenter"><{$lang_activenotifications}></h4>
+ <h4 class="txtcenter"><{$lang_activenotifications}> </h4>
<input type="hidden" name="not_redirect" value="<{$xoops_url}><{$xoops_notification.redirect_script}>" />
<input type="hidden" name="XOOPS_TOKEN_REQUEST" value="<{php}>echo $GLOBALS['xoopsSecurity']->createToken();<{/php}>" />
<table class="outer">
Modified: XoopsModules/newbb/branches/alfred/newbb/xoops_version.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/xoops_version.php 2012-07-04 02:16:46 UTC (rev 9786)
+++ XoopsModules/newbb/branches/alfred/newbb/xoops_version.php 2012-07-04 17:44:39 UTC (rev 9787)
@@ -27,7 +27,7 @@
$modversion['status_version'] = "4.2";
//about
-$modversion['release_date'] = '2012/06/29';
+$modversion['release_date'] = '2012/07/04';
$modversion["module_website_url"] = "http://www.simple-xoops.de/";
$modversion["module_website_name"] = "SIMPLE-XOOPS";
$modversion["module_status"] = "RC 1";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-07-07 21:37:44
|
Revision: 9802
http://xoops.svn.sourceforge.net/xoops/?rev=9802&view=rev
Author: dhcst
Date: 2012-07-07 21:37:36 +0000 (Sat, 07 Jul 2012)
Log Message:
-----------
add fix from black_beard
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/class/forum.php
XoopsModules/newbb/branches/alfred/newbb/header.php
XoopsModules/newbb/branches/alfred/newbb/index.php
XoopsModules/newbb/branches/alfred/newbb/viewforum.php
XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
Modified: XoopsModules/newbb/branches/alfred/newbb/class/forum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-07-07 19:45:39 UTC (rev 9801)
+++ XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-07-07 21:37:36 UTC (rev 9802)
@@ -274,7 +274,7 @@
' FROM ' . $from .
' WHERE ' . $where .
' ORDER BY ' . $sortby;
-
+
if (!$result = $this->db->query($sql, $xoopsModuleConfig['topics_per_page'], $start)) {
redirect_header('index.php', 2, _MD_ERROROCCURED);
exit();
Modified: XoopsModules/newbb/branches/alfred/newbb/header.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/header.php 2012-07-07 19:45:39 UTC (rev 9801)
+++ XoopsModules/newbb/branches/alfred/newbb/header.php 2012-07-07 21:37:36 UTC (rev 9802)
@@ -6,44 +6,48 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang (phppp or D.J.) <ph...@us...>
* @since 4.00
- * @version $Id $
+ * @version $Id$
* @package module::newbb
*/
include_once '../../mainfile.php';
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-if (!empty($xoopsModuleConfig['do_rewrite'])) include_once "seo_url.php";
-/* for seo */
-$toseo_url = array("index.php","viewforum.php","viewtopic.php","rss.php");
+$xoopsLogger->startTime('newBB_Header');
-if(((strpos(getenv('REQUEST_URI'), '.html') === false) && !empty($xoopsModuleConfig['do_rewrite']) && (!isset($_POST) || count($_POST) <= 0)))
-{
- $redir = false;
- if ( strpos(getenv("REQUEST_URI"),"mark_read=") == true || strpos(getenv("REQUEST_URI"),"mark=") == true) {
- // Mark Forums
- } else {
- if ( in_array(basename(getenv('SCRIPT_NAME')),$toseo_url) ) {
- //rewrite only for files
+if (!empty($xoopsModuleConfig['do_rewrite'])) {
+ include_once "seo_url.php";
+ /* for seo */
+ $toseo_url = array("index.php","viewforum.php","viewtopic.php","rss.php");
- if ( trim(getenv("SCRIPT_NAME")) != '' ) {
- if ( strpos(getenv("REQUEST_URI") , "/".SEO_MODULE_NAME."/") === false ) {
- $redir = true;
- } else if ( getenv("QUERY_STRING") ) {
- $redir = true;
- }
- }
+ if(((strpos(getenv('REQUEST_URI'), '.html') === false) && !empty($xoopsModuleConfig['do_rewrite']) && (!isset($_POST) || count($_POST) <= 0)))
+ {
+ $redir = false;
+ if ( strpos(getenv("REQUEST_URI"),"mark_read=") == true || strpos(getenv("REQUEST_URI"),"mark=") == true) {
+ // Mark Forums
+ } else {
+ if ( in_array(basename(getenv('SCRIPT_NAME')),$toseo_url) ) {
+ //rewrite only for files
+
+ if ( trim(getenv("SCRIPT_NAME")) != '' ) {
+ if ( strpos(getenv("REQUEST_URI") , "/".SEO_MODULE_NAME."/") === false ) {
+ $redir = true;
+ } else if ( getenv("QUERY_STRING") ) {
+ $redir = true;
+ }
+ }
+ }
}
- }
- if ($redir == true) {
- $s = "http://" . getenv('HTTP_HOST') . getenv("REQUEST_URI");
- $s = str_replace("/".REAL_MODULE_NAME."/","/".SEO_MODULE_NAME."/",$s);
- $newurl = seo_urls('<a href="'.$s.'"></a>');
- $newurl = str_replace('<a href="','',$newurl);
- $newurl = str_replace('"></a>','',$newurl);
- if ( !headers_sent() ) {
- header("HTTP/1.1 301 Moved Permanently");
- header("Location: $newurl");
- exit();
+ if ($redir == true) {
+ $s = "http://" . getenv('HTTP_HOST') . getenv("REQUEST_URI");
+ $s = str_replace("/".REAL_MODULE_NAME."/","/".SEO_MODULE_NAME."/",$s);
+ $newurl = seo_urls('<a href="'.$s.'"></a>');
+ $newurl = str_replace('<a href="','',$newurl);
+ $newurl = str_replace('"></a>','',$newurl);
+ if ( !headers_sent() ) {
+ header("HTTP/1.1 301 Moved Permanently");
+ header("Location: $newurl");
+ exit();
+ }
}
}
}
@@ -97,15 +101,15 @@
}
$pollmodules = NULL;
-$module_handler = &xoops_gethandler('module');
+//$module_handler = &xoops_gethandler('module');
$xoopspoll = &$module_handler->getByDirname('xoopspoll');
-if (is_object($xoopspoll) && $xoopspoll->getVar('isactive'))
+if (is_object($xoopspoll) && $xoopspoll->getVar('isactive')) {
$pollmodules = 'xoopspoll';
-else
-{
+} else {
//Umfrage
$xoopspoll = &$module_handler->getByDirname('umfrage');
if (is_object($xoopspoll) && $xoopspoll->getVar('isactive'))
$pollmodules = 'umfrage';
}
+$xoopsLogger->stopTime('newBB_Header');
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/index.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/index.php 2012-07-07 19:45:39 UTC (rev 9801)
+++ XoopsModules/newbb/branches/alfred/newbb/index.php 2012-07-07 21:37:36 UTC (rev 9802)
@@ -24,7 +24,7 @@
}
mod_loadFunctions("read", "newbb");
newbb_setRead_forum($markvalue);
- $url = 'index.php';
+ $url = XOOPS_URL . '/modules/newbb/index.php';
redirect_header($url, 2, _MD_ALL_FORUM_MARKED.' '.$markresult);
}
@@ -66,7 +66,6 @@
$xoopsTpl->assign('xoops_pagetitle', $xoops_pagetitle);
$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
$xoopsTpl->assign('forum_index_title', $forum_index_title);
-
//if ($xoopsModuleConfig['wol_enabled']) {
if (!empty($xoopsModuleConfig['wol_enabled'])) {
$online_handler = xoops_getmodulehandler('online', 'newbb');
Modified: XoopsModules/newbb/branches/alfred/newbb/viewforum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-07-07 19:45:39 UTC (rev 9801)
+++ XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-07-07 21:37:36 UTC (rev 9802)
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang (phppp or D.J.) <ph...@us...>
* @since 4.00
- * @version $Id $
+ * @version $Id$
* @package module::newbb
*/
Modified: XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-07-07 19:45:39 UTC (rev 9801)
+++ XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-07-07 21:37:36 UTC (rev 9802)
@@ -28,11 +28,14 @@
// URL: http://xoopsforge.com, http://xoops.org.cn //
// Project: Article Project //
// ------------------------------------------------------------------------ //
-include_once dirname(__FILE__) . "/header.php";
+include_once "header.php";
+
mod_loadFunctions("read", "newbb");
mod_loadFunctions("render", "newbb");
// To enable image auto-resize by js
-// $xoops_module_header .= '<script src="'.XOOPS_URL.'/Frameworks/textsanitizer/xoops.js" type="text/javascript"></script>';
+if (empty($xoopsModuleConfig['do_rewrite'])) {
+ $xoops_module_header .= '<script src="'.XOOPS_URL.'/Frameworks/textsanitizer/xoops.js" type="text/javascript"></script>';
+}
/*
* Build the page query
@@ -107,8 +110,11 @@
exit();
}
-$karma_handler = xoops_getmodulehandler('karma', 'newbb');
-$user_karma = $karma_handler->getUserKarma();
+if (!empty($xoopsModuleConfig['enable_karma'])) {
+ $karma_handler = xoops_getmodulehandler('karma', 'newbb');
+ $user_karma = $karma_handler->getUserKarma();
+}
+
//$viewmode = "flat";
$total_posts = $topic_handler->getPostCount($topic_obj, $status);
@@ -125,11 +131,10 @@
$xoops_module_header .= '<link rel="alternate" type="application/rss+xml" title="'.$xoopsModule->getVar('name').'-'.$forum_obj->getVar('forum_name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/rss.php?f='.$forum_obj->getVar("forum_id").'" />';
}
-$xoopsOption['xoops_module_header']= $xoops_module_header;
+//$xoopsOption['xoops_module_header']= $xoops_module_header;
include XOOPS_ROOT_PATH."/header.php";
$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
-
if ($xoopsModuleConfig['wol_enabled']) {
$online_handler =& xoops_getmodulehandler('online', 'newbb');
$online_handler->init($forum_obj, $topic_obj);
@@ -196,7 +201,6 @@
$users = array();
}
-
$viewtopic_users = array();
if (count($userid_array) > 0) {
require XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname", "n")."/class/user.php";
@@ -272,7 +276,6 @@
$xoopsTpl->assign('forum_page_nav', '');
}
-
if (empty($post_id)) {
$first = array_keys ($postsArray);
$post_id = (!empty($first[0])) ? $first[0] : 0;
@@ -469,6 +472,7 @@
}
}
}
+
if ($topic_handler->getPermission($forum_obj, $topic_obj->getVar('topic_status'), "addpoll") && $pollmodul
) {
if (!$topic_obj->getVar('topic_haspoll')) {
@@ -660,6 +664,5 @@
if ($xoopsModuleConfig["do_tag"] && @include_once XOOPS_ROOT_PATH."/modules/tag/include/tagbar.php") {
$xoopsTpl->assign('tagbar', tagBar($topic_obj->getVar("topic_tags", "n")));
}
-
include XOOPS_ROOT_PATH.'/footer.php';
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2012-07-14 08:23:16
|
Revision: 9869
http://xoops.svn.sourceforge.net/xoops/?rev=9869&view=rev
Author: dhcst
Date: 2012-07-14 08:23:09 +0000 (Sat, 14 Jul 2012)
Log Message:
-----------
remove debugcode, fix hardcoded language
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/class/topic.php
XoopsModules/newbb/branches/alfred/newbb/header.php
XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
XoopsModules/newbb/branches/alfred/newbb/newtopic.php
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
Modified: XoopsModules/newbb/branches/alfred/newbb/class/topic.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/topic.php 2012-07-14 08:16:18 UTC (rev 9868)
+++ XoopsModules/newbb/branches/alfred/newbb/class/topic.php 2012-07-14 08:23:09 UTC (rev 9869)
@@ -377,14 +377,15 @@
global $xoopsUser, $xoopsModule;
static $_cachedTopicPerms;
mod_loadFunctions("user", "newbb");
- if (newbb_isAdmin($forum)) return 1;
+ if (newbb_isAdmin($forum)) return true;
$forum_id = is_object($forum) ? $forum->getVar('forum_id') : intval($forum);
if ( $forum_id < 1 ) return false;
if ($topic_locked && 'view' != $type) {
- $permission = 0;
+ $permission = false;
} else {
+
$perm_handler =& xoops_getmodulehandler('permission', 'newbb');
$permission = $perm_handler->getPermission("forum", $type, $forum_id);
}
Modified: XoopsModules/newbb/branches/alfred/newbb/header.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/header.php 2012-07-14 08:16:18 UTC (rev 9868)
+++ XoopsModules/newbb/branches/alfred/newbb/header.php 2012-07-14 08:23:09 UTC (rev 9869)
@@ -69,6 +69,7 @@
if ($key != $menumode) $menumode_other[] = array("title"=>$val, "link"=>$menu_url.$key);
}
+
$newbb_module_header = '';
$newbb_module_header .= '<link rel="alternate" type="application/rss+xml" title="'.$xoopsModule->getVar("name").'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', "n").'/rss.php" />';
if (!empty($xoopsModuleConfig['pngforie_enabled'])) {
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-07-14 08:16:18 UTC (rev 9868)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-07-14 08:23:09 UTC (rev 9869)
@@ -476,6 +476,8 @@
define('_MD_SHARE_DIGG', "Digg");
define('_MD_SHARE_TECHNORATI', "Technorati");
define('_MD_SHARE_MRWONG', "Mr. Wong");
+
//4.3
-
-define("_MD_GO", "Go");
\ No newline at end of file
+define("_MD_GO", "Go");
+define('_MD_NEWBB_SEEUSERDATA','User information');
+?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-07-14 08:16:18 UTC (rev 9868)
+++ XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-07-14 08:23:09 UTC (rev 9869)
@@ -481,4 +481,8 @@
define('_MD_SHARE_DIGG', "Digg");
define('_MD_SHARE_TECHNORATI', "Technorati");
define('_MD_SHARE_MRWONG', "Mr. Wong");
+
+// 4.3
+define("_MD_GO", "Los");
+define('_MD_NEWBB_SEEUSERDATA','Benutzerinformationen');
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/newtopic.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/newtopic.php 2012-07-14 08:16:18 UTC (rev 9868)
+++ XoopsModules/newbb/branches/alfred/newbb/newtopic.php 2012-07-14 08:23:09 UTC (rev 9869)
@@ -85,7 +85,6 @@
$attachsig = (is_object($xoopsUser) && $xoopsUser->getVar('attachsig')) ? 1 : 0;
$post_id = 0;
$topic_id = 0;
-
include 'include/form.post.php';
include XOOPS_ROOT_PATH.'/footer.php';
?>
\ 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-07-14 08:16:18 UTC (rev 9868)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html 2012-07-14 08:23:09 UTC (rev 9869)
@@ -27,7 +27,7 @@
<br />
<{if $infobox gt 0}>
<div>
- <img style="padding:2px;" onclick="ToggleBlockCategory('<{$topic_post.post_id}>', this, '<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/more.png', '<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/more.png')" src="<{$icon_path}>/more.png" alt="Benutzerinformationen" title="Benutzerinformationen" />
+ <img style="padding:2px;" onclick="ToggleBlockCategory('<{$topic_post.post_id}>', this, '<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/more.png', '<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/more.png')" src="<{$icon_path}>/more.png" alt="<{$smarty.const._MD_NEWBB_SEEUSERDATA}>" title="<{$smarty.const._MD_NEWBB_SEEUSERDATA}>" />
</div>
<div id="<{$topic_post.post_id}>"
<{if $infobox == 1}> style="display: none;"
Modified: XoopsModules/newbb/branches/alfred/newbb/viewtopic.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-07-14 08:16:18 UTC (rev 9868)
+++ XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-07-14 08:23:09 UTC (rev 9869)
@@ -29,17 +29,11 @@
// Project: Article Project //
// ------------------------------------------------------------------------ //
include_once "header.php";
-
+$xoopsLogger->startTime('newBB_viewtopic');
mod_loadFunctions("read", "newbb");
mod_loadFunctions("render", "newbb");
-// To enable image auto-resize by js
-if (empty($xoopsModuleConfig['do_rewrite'])) {
- $xoops_module_header .= '<script src="'.XOOPS_URL.'/Frameworks/textsanitizer/xoops.js" type="text/javascript"></script>';
-}
-/*
- * Build the page query
- */
+/*Build the page query*/
$query_vars = array("post_id", "topic_id", "status", "order", "start", "move", "mode");
$query_array = array();
foreach ($query_vars as $var) {
@@ -48,17 +42,18 @@
$page_query = htmlspecialchars(implode("&", array_values($query_array)));
unset($query_array);
-$topic_id = isset($_GET['topic_id']) ? intval($_GET['topic_id']) : 0;
-$post_id = !empty($_GET['post_id']) ? intval($_GET['post_id']) : 0;
-$forum_id = !empty($_GET['forum']) ? intval($_GET['forum']) : 0;
-$move = isset($_GET['move'])? strtolower($_GET['move']) : '';
-$start = !empty($_GET['start']) ? intval($_GET['start']) : 0;
-$status = (!empty($_GET['status']) && in_array($_GET['status'], array("active", "pending", "deleted"))) ? $_GET['status'] : "";
-$mode = !empty($_GET['mode']) ? intval($_GET['mode']) : (!empty($status) ? 2 : 0);
-$read = (!empty($_GET['read']) && in_array($_GET['read'], array("new"))) ? $_GET['read'] : "";
-$order = (!empty($_GET['order']) && in_array($_GET['order'], array("ASC","DESC"))) ? $_GET['order'] : "";
-if ($order=="") {
- if ($xoopsUser) {
+$forum_id = !empty($_GET['forum']) ? intval($_GET['forum']) : 0;
+$read = (!empty($_GET['read']) && in_array($_GET['read'], array("new"))) ? $_GET['read'] : "";
+$topic_id = isset($_GET['topic_id']) ? intval($_GET['topic_id']) : 0;
+$post_id = !empty($_GET['post_id']) ? intval($_GET['post_id']) : 0;
+$move = isset($_GET['move'])? strtolower($_GET['move']) : '';
+$start = !empty($_GET['start']) ? intval($_GET['start']) : 0;
+$status = (!empty($_GET['status']) && in_array($_GET['status'], array("active", "pending", "deleted"))) ? $_GET['status'] : "";
+$mode = !empty($_GET['mode']) ? intval($_GET['mode']) : (!empty($status) ? 2 : 0);
+$order = (!empty($_GET['order']) && in_array($_GET['order'], array("ASC","DESC"))) ? $_GET['order'] : "";
+
+if ($order == "") {
+ if (is_object($xoopsUser) && $xoopsUser->isActive() ) {
$order = ($xoopsUser->getVar('uorder')==1) ? 'DESC' : 'ASC';
} else {
$order = ($xoopsConfig['com_order']==1) ? 'DESC' : 'ASC';
@@ -69,6 +64,7 @@
$redirect = empty($forum_id) ? XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/index.php" : XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewforum.php?forum={$forum_id}";
redirect_header($redirect, 2, _MD_ERRORTOPIC);
}
+
$topic_handler = xoops_getmodulehandler('topic', 'newbb');
if ( !empty($post_id) ) {
$topic_obj = $topic_handler->getByPost($post_id);
@@ -77,8 +73,7 @@
$topic_obj = $topic_handler->getByMove($topic_id, ($move == "prev") ? -1 : 1, $forum_id);
$topic_id = $topic_obj->getVar("topic_id");
} else {
- $topic_obj = $topic_handler->get($topic_id);
-
+ $topic_obj = $topic_handler->get($topic_id);
}
if ( !is_object($topic_obj) || !$topic_id = $topic_obj->getVar('topic_id') ) {
@@ -118,7 +113,6 @@
//$viewmode = "flat";
$total_posts = $topic_handler->getPostCount($topic_obj, $status);
-$xoopsOption['template_main'] = 'newbb_viewtopic.html';
$postsArray = $topic_handler->getAllPosts($topic_obj, $order, $xoopsModuleConfig['posts_per_page'], $start, $post_id, $status);
//Threadersteller zählt nicht
@@ -131,7 +125,9 @@
$xoops_module_header .= '<link rel="alternate" type="application/rss+xml" title="'.$xoopsModule->getVar('name').'-'.$forum_obj->getVar('forum_name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/rss.php?f='.$forum_obj->getVar("forum_id").'" />';
}
-//$xoopsOption['xoops_module_header']= $xoops_module_header;
+
+$xoopsOption['template_main'] = 'newbb_viewtopic.html';
+$xoopsOption['xoops_module_header']= $xoops_module_header;
include XOOPS_ROOT_PATH."/header.php";
$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
@@ -226,9 +222,6 @@
}
if ($xoopsModuleConfig['show_advertising']) {
- $i=0;
- $rank = xoops_getrank();
- $image =
$post_werbung = array(
'post_id' => 0,
'post_parent_id' => 0,
@@ -244,10 +237,12 @@
'thread_action' => '',
'thread_buttons' => '',
'mod_buttons' => '',
- 'poster' => array('uid' => -1, 'link' => _MD_ADVERTISING_USER, 'avatar' => 'avatars/blank.gif', 'regdate' => 0, 'rank' => array('title' => $rank['title'])),
+ 'poster' => array('uid' => -1, 'link' => _MD_ADVERTISING_USER, 'avatar' => 'avatars/blank.gif', 'regdate' => 0, 'rank' => array('title' => '')),
'post_permalink' => ''
);
}
+
+$i = 0;
foreach ($postsArray as $eachpost) {
if ($xoopsModuleConfig['show_advertising']) {
if ($i == 2) $xoopsTpl->append('topic_posts', $post_werbung);
@@ -297,6 +292,7 @@
$xoTheme->addMeta('meta', 'keywords', $kwort);
$xoTheme->addMeta('meta', 'description', substr(strip_tags($postsArray[$post_id]->getVar('post_text')),0,100));
}
+
unset($postsArray);
$xoopsTpl->assign('topic_print_link', "print.php?form=1&{$page_query}");
@@ -538,6 +534,7 @@
mod_loadFunctions("forum", "newbb");
$xoopsTpl->assign('forum_jumpbox', newbb_make_jumpbox($forum_id));
}
+
$xoopsTpl->assign(array(
'lang_forum_index' => sprintf(_MD_FORUMINDEX, htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES)),
'lang_from' => _MD_FROM,
@@ -585,22 +582,9 @@
if ( !empty($xoopsModuleConfig['quickreply_enabled'])
&& $topic_handler->getPermission($forum_obj, $topic_obj->getVar('topic_status'), "reply")
) {
- require_once XOOPS_ROOT_PATH."/class/xoopsform/formelement.php";
- require_once XOOPS_ROOT_PATH."/class/xoopsform/formhidden.php";
- require_once XOOPS_ROOT_PATH."/class/xoopsform/formhiddentoken.php";
- require_once XOOPS_ROOT_PATH."/class/xoopsform/formbutton.php";
- require_once XOOPS_ROOT_PATH."/class/xoopsform/themeform.php";
- require_once XOOPS_ROOT_PATH."/class/xoopsform/formtextarea.php";
-
- $forum_form = new XoopsThemeForm(_MD_POSTREPLY, 'quick_reply', XOOPS_URL."/modules/".$xoopsModule->getVar("dirname", "n")."/post.php", 'post', true);
-
+ $forum_form = new XoopsThemeForm(_MD_POSTREPLY, 'quick_reply', XOOPS_URL."/modules/".$xoopsModule->getVar("dirname", "n")."/post.php", 'post', true);
if (!is_object($xoopsUser)) {
- require_once XOOPS_ROOT_PATH."/class/xoopsform/formpassword.php";
- require_once XOOPS_ROOT_PATH."/class/xoopsform/formcheckbox.php";
- require_once XOOPS_ROOT_PATH."/class/xoopsform/formtext.php";
- require_once XOOPS_ROOT_PATH."/class/xoopsform/formelementtray.php";
- require_once XOOPS_ROOT_PATH."/class/xoopsform/formcaptcha.php";
- $config_handler =& xoops_gethandler('config');
+ //$config_handler =& xoops_gethandler('config');
$user_tray = new XoopsFormElementTray(_MD_ACCOUNT);
$user_tray->addElement(new XoopsFormText(_MD_NAME, "uname", 26, 255));
$user_tray->addElement(new XoopsFormPassword(_MD_PASSWORD, "pass", 10, 32));
@@ -638,13 +622,6 @@
$forum_form->addElement(new XoopsFormHidden('order', $order));
$forum_form->addElement(new XoopsFormHidden('start', $start));
- // backward compatible
- if (!class_exists("XoopsSecurity")) {
- $post_valid = 1;
- $_SESSION['submit_token'] = $post_valid;
- $forum_form->addElement(new XoopsFormHidden('post_valid', $post_valid));
- }
-
$forum_form->addElement(new XoopsFormHidden('notify', -1));
$forum_form->addElement(new XoopsFormHidden('contents_submit', 1));
@@ -665,4 +642,5 @@
$xoopsTpl->assign('tagbar', tagBar($topic_obj->getVar("topic_tags", "n")));
}
include XOOPS_ROOT_PATH.'/footer.php';
+$xoopsLogger->stopTime('newBB_viewtopic');
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X