Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10557] XoopsModules/newbb/branches/irmtfan/newbb
|
From: <ir...@us...> - 2012-12-26 13:26:23
|
Revision: 10557
http://sourceforge.net/p/xoops/svn/10557
Author: irmtfan
Date: 2012-12-26 13:26:21 +0000 (Wed, 26 Dec 2012)
Log Message:
-----------
bug fix: Warning: xoopsOption[template_main] should be defined before including header.php in file /footer.php line 59
Modified Paths:
--------------
XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
XoopsModules/newbb/branches/irmtfan/newbb/edit.php
XoopsModules/newbb/branches/irmtfan/newbb/footer.php
XoopsModules/newbb/branches/irmtfan/newbb/header.php
XoopsModules/newbb/branches/irmtfan/newbb/index.php
XoopsModules/newbb/branches/irmtfan/newbb/list.topic.php
XoopsModules/newbb/branches/irmtfan/newbb/newtopic.php
XoopsModules/newbb/branches/irmtfan/newbb/post.php
XoopsModules/newbb/branches/irmtfan/newbb/reply.php
XoopsModules/newbb/branches/irmtfan/newbb/search.php
XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php
XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php
XoopsModules/newbb/branches/irmtfan/newbb/viewpost.php
XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php
Modified: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-12-26 09:57:13 UTC (rev 10556)
+++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt 2012-12-26 13:26:21 UTC (rev 10557)
@@ -1,3 +1,12 @@
+date 2012-12-26
+===================================
+1- bug fix: Warning: xoopsOption[template_main] should be defined before including header.php in file /footer.php line 59
+in newbb/edit.php, newbb/header.php, newbb/index.php, newbb/list.topic.php, newbb/newtopic.php, newbb/post.php, newbb/reply.php,
+newbb/search.php, newbb/topicmanager.php, newbb/viewforum.php, newbb/viewpost.php, newbb/viewtopic.php
+
+2- improve: use addStylesheet instead of xoops_module_header to add toggle script because some themes are not standard
+in newbb/header.php, newbb/footer.php
+
date 2012-12-25
===================================
1- bug fix: when vote in polls it should save user ip to db
Modified: XoopsModules/newbb/branches/irmtfan/newbb/edit.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/edit.php 2012-12-26 09:57:13 UTC (rev 10556)
+++ XoopsModules/newbb/branches/irmtfan/newbb/edit.php 2012-12-26 13:26:21 UTC (rev 10557)
@@ -75,8 +75,8 @@
$xoopsOption['template_main'] = 'newbb_edit_post.html';
$xoopsConfig["module_cache"][$xoopsModule->getVar("mid")] = 0;
-// irmtfan remove and move to header.php
-//include XOOPS_ROOT_PATH.'/header.php';
+// irmtfan include header.php after defining $xoopsOption['template_main']
+include_once XOOPS_ROOT_PATH.'/header.php';
/*
$xoopsTpl->assign('lang_forum_index', sprintf(_MD_FORUMINDEX, htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES)));
Modified: XoopsModules/newbb/branches/irmtfan/newbb/footer.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/footer.php 2012-12-26 09:57:13 UTC (rev 10556)
+++ XoopsModules/newbb/branches/irmtfan/newbb/footer.php 2012-12-26 13:26:21 UTC (rev 10557)
@@ -40,4 +40,7 @@
$xoTheme->addScript($js_rel_path . '/' . $jsfile);
}
}
+// add toggle script
+$toggle_script="var toggle_cookie=\"" . $forumCookie["prefix"] . "G" . "\";";
+$xoTheme->addScript( null, array ('type' => 'text/javascript'), $toggle_script);
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/irmtfan/newbb/header.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/header.php 2012-12-26 09:57:13 UTC (rev 10556)
+++ XoopsModules/newbb/branches/irmtfan/newbb/header.php 2012-12-26 13:26:21 UTC (rev 10557)
@@ -12,9 +12,9 @@
include_once '../../mainfile.php';
defined('XOOPS_ROOT_PATH') or die('Restricted access');
$xoopsLogger->startTime('newBB_Header');
-// irmtfan assign newbb dirname then replace all. include xoops header.php
+// irmtfan assign newbb dirname then replace all. include xoops header.php (now commented and removed)
$dirname = $xoopsModule->getVar("dirname");
-include_once XOOPS_ROOT_PATH . "/header.php";
+//include_once XOOPS_ROOT_PATH . "/header.php";
if (!empty($xoopsModuleConfig['do_rewrite'])) {
include_once "seo_url.php";
@@ -71,11 +71,11 @@
foreach ($xoopsModuleConfig["valid_menumodes"] as $key => $val) {
if ($key != $menumode) $menumode_other[] = array("title"=>$val, "link"=>$menu_url.$key);
}
-// irmtfan new method for add js scripts
-global $xoopsTpl;
-$xoopsTpl->assign("xoops_module_header",'
- <script type="text/javascript">var toggle_cookie="'.$forumCookie['prefix'].'G'.'";</script>
- '. @$xoopsTpl->get_template_vars("xoops_module_header"));
+// irmtfan new method for add js scripts - commented and move to footer.php
+//global $xoopsTpl;
+//$xoopsTpl->assign("xoops_module_header",'
+ //<script type="text/javascript">var toggle_cookie="'.$forumCookie['prefix'].'G'.'";</script>
+ //'. @$xoopsTpl->get_template_vars("xoops_module_header"));
/* START irmtfan remove and move to newbb/footer.php */
/*
Modified: XoopsModules/newbb/branches/irmtfan/newbb/index.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/index.php 2012-12-26 09:57:13 UTC (rev 10556)
+++ XoopsModules/newbb/branches/irmtfan/newbb/index.php 2012-12-26 13:26:21 UTC (rev 10557)
@@ -50,6 +50,13 @@
exit();
}
+$xoopsOption['template_main'] = 'newbb_index.html';
+$xoopsOption['xoops_pagetitle'] = $xoops_pagetitle;
+// irmtfan remove and move to footer.php
+//$xoopsOption['xoops_module_header'] = $xoops_module_header;
+// irmtfan include header.php after defining $xoopsOption['template_main']
+include_once $GLOBALS['xoops']->path('header.php');
+mod_loadFunctions("render", "newbb");
/* rss feed */
// irmtfan new method
if (!empty($xoopsModuleConfig['rss_enable'])) {
@@ -57,14 +64,6 @@
<link rel="alternate" type="application/xml+rss" title="'.$xoopsModule->getVar('name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/rss.php" />
'. @$xoopsTpl->get_template_vars("xoops_module_header"));
}
-
-$xoopsOption['template_main'] = 'newbb_index.html';
-$xoopsOption['xoops_pagetitle'] = $xoops_pagetitle;
-// irmtfan remove and move to footer.php
-//$xoopsOption['xoops_module_header'] = $xoops_module_header;
-//include $GLOBALS['xoops']->path('header.php');
-mod_loadFunctions("render", "newbb");
-
$xoopsTpl->assign('xoops_pagetitle', $xoops_pagetitle);
// irmtfan remove and move to footer.php
//$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
Modified: XoopsModules/newbb/branches/irmtfan/newbb/list.topic.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/list.topic.php 2012-12-26 09:57:13 UTC (rev 10556)
+++ XoopsModules/newbb/branches/irmtfan/newbb/list.topic.php 2012-12-26 13:26:21 UTC (rev 10557)
@@ -11,16 +11,17 @@
*/
include_once dirname(__FILE__) . "/header.php";
+
+//$xoopsOption['xoops_module_header']= $xoops_module_header;
+$xoopsOption['template_main'] = 'newbb_viewall.html';
+// irmtfan include header.php after defining $xoopsOption['template_main']
+include_once XOOPS_ROOT_PATH."/header.php";
// irmtfan new method
if (!empty($xoopsModuleConfig['rss_enable'])) {
$xoopsTpl->assign("xoops_module_header",'
<link rel="alternate" type="application/xml+rss" title="'.$xoopsModule->getVar('name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/rss.php" />
'. @$xoopsTpl->get_template_vars("xoops_module_header"));
}
-//$xoopsOption['xoops_module_header']= $xoops_module_header;
-$xoopsOption['template_main'] = 'newbb_viewall.html';
-//include XOOPS_ROOT_PATH."/header.php";
-
//$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
mod_loadFunctions("time", "newbb");
Modified: XoopsModules/newbb/branches/irmtfan/newbb/newtopic.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/newtopic.php 2012-12-26 09:57:13 UTC (rev 10556)
+++ XoopsModules/newbb/branches/irmtfan/newbb/newtopic.php 2012-12-26 13:26:21 UTC (rev 10557)
@@ -52,7 +52,8 @@
$xoopsConfig["module_cache"][$xoopsModule->getVar("mid")] = 0; // Disable cache
// irmtfan remove and move to footer.php
//$xoopsOption['xoops_module_header']= $xoops_module_header;
-//include XOOPS_ROOT_PATH.'/header.php';
+// irmtfan include header.php after defining $xoopsOption['template_main']
+include_once XOOPS_ROOT_PATH.'/header.php';
//$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
/*
Modified: XoopsModules/newbb/branches/irmtfan/newbb/post.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/post.php 2012-12-26 09:57:13 UTC (rev 10556)
+++ XoopsModules/newbb/branches/irmtfan/newbb/post.php 2012-12-26 13:26:21 UTC (rev 10557)
@@ -414,7 +414,8 @@
$xoopsConfig["module_cache"][$xoopsModule->getVar("mid")] = 0;
// irmtfan remove and move to footer.php
//$xoopsOption['xoops_module_header']= $xoops_module_header;
-//include XOOPS_ROOT_PATH . "/header.php";
+// irmtfan include header.php after defining $xoopsOption['template_main']
+include_once XOOPS_ROOT_PATH . "/header.php";
//$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
if ( !empty($_POST['contents_upload']) ) {
Modified: XoopsModules/newbb/branches/irmtfan/newbb/reply.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/reply.php 2012-12-26 09:57:13 UTC (rev 10556)
+++ XoopsModules/newbb/branches/irmtfan/newbb/reply.php 2012-12-26 13:26:21 UTC (rev 10557)
@@ -88,7 +88,8 @@
$xoopsConfig["module_cache"][$xoopsModule->getVar("mid")] = 0;
// irmtfan remove and move to footer.php
//$xoopsOption['xoops_module_header']= $xoops_module_header;
-//include XOOPS_ROOT_PATH.'/header.php';
+// irmtfan include header.php after defining $xoopsOption['template_main']
+include_once XOOPS_ROOT_PATH.'/header.php';
//$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
/*
Modified: XoopsModules/newbb/branches/irmtfan/newbb/search.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/search.php 2012-12-26 09:57:13 UTC (rev 10556)
+++ XoopsModules/newbb/branches/irmtfan/newbb/search.php 2012-12-26 13:26:21 UTC (rev 10557)
@@ -39,8 +39,8 @@
$xoopsConfig['module_cache'][$xoopsModule->getVar('mid')] = 0;
$xoopsOption['template_main']= 'newbb_search.html';
-// irmtfan remove and move to header.php
-//include XOOPS_ROOT_PATH.'/header.php';
+// irmtfan include header.php after defining $xoopsOption['template_main']
+include_once XOOPS_ROOT_PATH.'/header.php';
mod_loadFunctions("render", "newbb");
mod_loadFunctions("forum", "newbb");
Modified: XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php 2012-12-26 09:57:13 UTC (rev 10556)
+++ XoopsModules/newbb/branches/irmtfan/newbb/topicmanager.php 2012-12-26 13:26:21 UTC (rev 10557)
@@ -89,8 +89,8 @@
// Disable cache
$xoopsConfig["module_cache"][$xoopsModule->getVar("mid")] = 0;
-// irmtfan remove here and move to header.php
-//include XOOPS_ROOT_PATH.'/header.php';
+// irmtfan include header.php after defining $xoopsOption['template_main']
+include_once XOOPS_ROOT_PATH.'/header.php';
if ( isset($_POST['submit']) ) {
$mode = $_POST['mode'];
Modified: XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php 2012-12-26 09:57:13 UTC (rev 10556)
+++ XoopsModules/newbb/branches/irmtfan/newbb/viewforum.php 2012-12-26 13:26:21 UTC (rev 10557)
@@ -63,21 +63,20 @@
$xoops_pagetitle = $forum_obj->getVar('forum_name') . " [" .$xoopsModule->getVar('name')."]";
+
+$xoopsOption['template_main'] = 'newbb_viewforum.html';
+$xoopsOption['xoops_pagetitle']= $xoops_pagetitle;
+// irmtfan remove and move to footer.php
+//$xoopsOption['xoops_module_header']= $xoops_module_header;
+// irmtfan include header.php after defining $xoopsOption['template_main']
+include_once XOOPS_ROOT_PATH."/header.php";
+mod_loadFunctions("render", "newbb");
// irmtfan new method
if (!empty($xoopsModuleConfig['rss_enable'])) {
$xoopsTpl->assign("xoops_module_header",'
<link rel="alternate" type="application/xml+rss" title="'.$xoopsModule->getVar('name').'-'.$forum_obj->getVar('forum_name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/rss.php?f='.$forum_id.'" />
'. @$xoopsTpl->get_template_vars("xoops_module_header"));
}
-
-$xoopsOption['template_main'] = 'newbb_viewforum.html';
-$xoopsOption['xoops_pagetitle']= $xoops_pagetitle;
-// irmtfan remove and move to footer.php
-//$xoopsOption['xoops_module_header']= $xoops_module_header;
-
-//include XOOPS_ROOT_PATH."/header.php";
-mod_loadFunctions("render", "newbb");
-
//$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
$xoopsTpl->assign("forum_id", $forum_id);
$xoopsTpl->assign('version', $xoopsModule->getVar("version"));
Modified: XoopsModules/newbb/branches/irmtfan/newbb/viewpost.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/viewpost.php 2012-12-26 09:57:13 UTC (rev 10556)
+++ XoopsModules/newbb/branches/irmtfan/newbb/viewpost.php 2012-12-26 13:26:21 UTC (rev 10557)
@@ -171,8 +171,8 @@
// irmtfan remove and move to footer.php
//$xoopsOption['xoops_module_header']= $xoops_module_header;
$xoopsOption['template_main'] = 'newbb_viewpost.html';
-
-//include XOOPS_ROOT_PATH."/header.php";
+// irmtfan include header.php after defining $xoopsOption['template_main']
+include_once XOOPS_ROOT_PATH."/header.php";
mod_loadFunctions("time", "newbb");
mod_loadFunctions("render", "newbb");
Modified: XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php 2012-12-26 09:57:13 UTC (rev 10556)
+++ XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php 2012-12-26 13:26:21 UTC (rev 10557)
@@ -141,6 +141,13 @@
$topic_obj->incrementCounter();
}
newbb_setRead("topic", $topic_id, $topic_obj->getVar("topic_last_post_id"));
+
+$xoopsOption['template_main'] = 'newbb_viewtopic.html';
+// irmtfan remove and move to footer.php
+//$xoopsOption['xoops_module_header']= $xoops_module_header;
+// irmtfan include header.php after defining $xoopsOption['template_main']
+include_once XOOPS_ROOT_PATH."/header.php";
+//$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
// irmtfan new method
if (!empty($xoopsModuleConfig['rss_enable'])) {
$xoopsTpl->assign("xoops_module_header",'
@@ -148,12 +155,6 @@
'. @$xoopsTpl->get_template_vars("xoops_module_header"));
}
-$xoopsOption['template_main'] = 'newbb_viewtopic.html';
-// irmtfan remove and move to footer.php
-//$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);
|
