xoops-svn Mailing List for XOOPS Web Application System (Page 144)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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.





2012	Jan	Feb (214)	Mar (139)	Apr (198)	May (187)	Jun (151)	Jul (210)	Aug (169)	Sep (58)	Oct (53)	Nov (54)	Dec (301)
2013	Jan (348)	Feb (178)	Mar (219)	Apr (154)	May (117)	Jun (194)	Jul (61)	Aug (132)	Sep (121)	Oct (110)	Nov (11)	Dec (18)
2014	Jan (34)	Feb (50)	Mar (82)	Apr (98)	May (39)	Jun (111)	Jul (67)	Aug (36)	Sep (33)	Oct (26)	Nov (53)	Dec (44)
2015	Jan (29)	Feb (47)	Mar (25)	Apr (19)	May (23)	Jun (20)	Jul (49)	Aug (7)	Sep (10)	Oct (10)	Nov (4)	Dec (25)
2016	Jan (8)	Feb (7)	Mar (1)	Apr	May (3)	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov (7)	Dec (5)
2017	Jan (4)	Feb	Mar	Apr	May (15)	Jun	Jul (18)	Aug (24)	Sep	Oct (14)	Nov	Dec
2018	Jan	Feb (22)	Mar	Apr (11)	May (1)	Jun (17)	Jul (2)	Aug (2)	Sep	Oct (6)	Nov (5)	Dec
2019	Jan	Feb	Mar	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (2)
2025	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (2)	Sep	Oct	Nov	Dec

xoops-svn Mailing List for XOOPS Web Application System (Page 144)

The world's leading content management systems (CMS) written in PHP

xoops-svn — All SVN commits will be posted to this ML