[Xoops-cvs2] xoops-current/html/modules/newbb viewtopic.php,1.9,1.10 viewforum.php,1.6,1.7 search.php,1.7,1.8 index.php,1.6,1.7

[<on...@us...>]

Update of /cvsroot/xoops/xoops-current/html/modules/newbb
In directory usw-pr-cvs1:/tmp/cvs-serv22061

Modified Files:
	viewtopic.php viewforum.php search.php index.php 
Log Message:
no message

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/newbb/viewtopic.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** viewtopic.php	1 Sep 2002 06:24:03 -0000	1.9
--- viewtopic.php	5 Sep 2002 11:11:45 -0000	1.10
***************
*** 248,252 ****
  	$postsArray = ForumPosts::getAllPosts($topic_id, "ASC", $total_posts, 0);
  	$xoopsTpl->assign('topic_viewmode', 'thread');
! 	$xoopsTpl->assign('xoops_contents_tpl', 'viewtopic_thread.html');
  
  	$newObjArr = array();
--- 248,252 ----
  	$postsArray = ForumPosts::getAllPosts($topic_id, "ASC", $total_posts, 0);
  	$xoopsTpl->assign('topic_viewmode', 'thread');
! 	$xoopsContentsTpl =  'viewtopic_thread.html';
  
  	$newObjArr = array();
***************
*** 293,297 ****
  	$viewmode = 'flat';
  	$xoopsTpl->assign('topic_viewmode', 'flat');
! 	$xoopsTpl->assign('xoops_contents_tpl', 'viewtopic_flat.html');
  	$xoopsTpl->assign('lang_top', _TOP);
  	// this is a temporary fix.. will remove this once all lang files have this define in global.php
--- 293,297 ----
  	$viewmode = 'flat';
  	$xoopsTpl->assign('topic_viewmode', 'flat');
! 	$xoopsContentsTpl = 'viewtopic_flat.html';
  	$xoopsTpl->assign('lang_top', _TOP);
  	// this is a temporary fix.. will remove this once all lang files have this define in global.php

Index: viewforum.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/newbb/viewforum.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** viewforum.php	24 Aug 2002 23:41:07 -0000	1.6
--- viewforum.php	5 Sep 2002 11:11:45 -0000	1.7
***************
*** 85,90 ****
  }
  
- 
- $xoopsTpl->assign("xoops_contents_tpl", 'viewforum.html');
  $xoopsTpl->assign("forum_id", $forum);
  if ( $can_post == 1 ) {
--- 85,88 ----
***************
*** 274,277 ****
--- 272,276 ----
  }
  $xoopsTpl->assign('forum_jumpbox', make_jumpbox($forum));
+ $xoopsContentsTpl = 'viewforum.html';
  include(XOOPS_ROOT_PATH."/footer.php");
  ?>

Index: search.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/newbb/search.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** search.php	28 Aug 2002 22:09:12 -0000	1.7
--- search.php	5 Sep 2002 11:11:45 -0000	1.8
***************
*** 57,61 ****
  	$select .= '</select>';
  	$xoopsTpl->assign("forum_selection_box", $select);
! 	$xoopsTpl->assign("xoops_contents_tpl", 'search.html');
  
  } else {
--- 57,61 ----
  	$select .= '</select>';
  	$xoopsTpl->assign("forum_selection_box", $select);
! 	$xoopsContentsTpl = 'search.html';
  
  } else {
***************
*** 146,150 ****
  			$xoopsTpl->append('results', array('forum_name' => $myts->makeTboxData4Show($row['forum_name']), 'forum_id' => $row['forum_id'], 'topic_id' => $row['topic_id'], 'topic_title' => $myts->makeTboxData4Show($row['topic_title']), 'user_id' => $row['uid'], 'user_name' => $myts->makeTboxData4Show($row['uname']), 'post_time' => formatTimestamp($row['post_time'], "m")));
  		}
! 		$xoopsTpl->assign("xoops_contents_tpl", 'searchresults.html');
  	}
  }
--- 146,150 ----
  			$xoopsTpl->append('results', array('forum_name' => $myts->makeTboxData4Show($row['forum_name']), 'forum_id' => $row['forum_id'], 'topic_id' => $row['topic_id'], 'topic_title' => $myts->makeTboxData4Show($row['topic_title']), 'user_id' => $row['uid'], 'user_name' => $myts->makeTboxData4Show($row['uname']), 'post_time' => formatTimestamp($row['post_time'], "m")));
  		}
! 		$xoopsContentsTpl = 'searchresults.html';
  	}
  }

Index: index.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/newbb/index.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** index.php	24 Aug 2002 23:41:08 -0000	1.6
--- index.php	5 Sep 2002 11:11:45 -0000	1.7
***************
*** 35,40 ****
  	include(XOOPS_ROOT_PATH."/header.php");
  }
- $xoopsTpl->assign("xoops_contents_tpl", 'forumindex.html');
- 
  $myts =& MyTextSanitizer::getInstance();
  
--- 35,38 ----
***************
*** 148,151 ****
  $xoopsTpl->assign("lang_search", _MD_SEARCH);
  $xoopsTpl->assign("lang_advsearch", _MD_ADVSEARCH);
! include_once(XOOPS_ROOT_PATH."/footer.php");
  ?>
--- 146,150 ----
  $xoopsTpl->assign("lang_search", _MD_SEARCH);
  $xoopsTpl->assign("lang_advsearch", _MD_ADVSEARCH);
! $xoopsContentsTpl = 'forumindex.html';
! include_once(XOOPS_ROOT_PATH.'/footer.php');
  ?>