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