Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[8909] XoopsModules/newbb/branches/alfred/newbb
|
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] |
