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

[Xoops-cvs2] xoops-current/html/modules/xoopspoll/blocks xoopspoll.php,1.2,1.3

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

Update of /cvsroot/xoops/xoops-current/html/modules/xoopspoll/blocks
In directory usw-pr-cvs1:/tmp/cvs-serv27562

Modified Files:
	xoopspoll.php 
Log Message:
no message

Index: xoopspoll.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/xoopspoll/blocks/xoopspoll.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** xoopspoll.php	24 Sep 2002 18:46:36 -0000	1.2
--- xoopspoll.php	26 Sep 2002 02:31:31 -0000	1.3
***************
*** 1,13 ****
  <?php
  function b_xoopspoll_show() {
  	$block = array();
  	$block['title'] = _MB_POLLS_TITLE1;
! 	$polls = XoopsPoll::getAll(array("display=1"), true, "weight ASC, end_time DESC");
! 	$block['content'] = "";
! 	foreach ( $polls as $poll ) {
! 		$block['content'] .= "<p>";
! 		$renderer = new XoopsPollRenderer($poll);
  		$block['content'] .= $renderer->renderForm();
- 		$block['content'] .= "</p>";
  	}
          return $block;
--- 1,15 ----
  <?php
+ include_once(XOOPS_ROOT_PATH.'/modules/xoopspoll/class/xoopspoll.php');
+ include_once(XOOPS_ROOT_PATH.'/modules/xoopspoll/class/xoopspolloption.php');
+ include_once(XOOPS_ROOT_PATH.'/modules/xoopspoll/class/xoopspollrenderer.php');
  function b_xoopspoll_show() {
  	$block = array();
  	$block['title'] = _MB_POLLS_TITLE1;
! 	$polls =& XoopsPoll::getAll(array('display=1'), true, 'weight ASC, end_time DESC');
! 	$block['content'] = '';
! 	$count = count($polls);
! 	for ($i = 0; $i < $count; $i++) {
! 		$renderer = new XoopsPollRenderer($polls[$i]);
  		$block['content'] .= $renderer->renderForm();
  	}
          return $block;

[Xoops-cvs2] xoops-current/html/modules/mydownloads singlefile.php,1.1.1.1,1.2 viewcat.php,1.1.1.1,1.2

[<w4...@us...>]

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

Modified Files:
	singlefile.php viewcat.php 
Log Message:
no comment

Index: singlefile.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/mydownloads/singlefile.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** singlefile.php	15 Jul 2002 08:13:18 -0000	1.1.1.1
--- singlefile.php	26 Sep 2002 01:02:15 -0000	1.2
***************
*** 39,44 ****
  $result=$xoopsDB->query($q);
  list($lid, $cid, $title, $url, $homepage, $version, $size, $platform, $logourl, $status, $time, $hits, $rating, $votes, $comments, $description)=$xoopsDB->fetchRow($result);
! echo "<table width=\"100%\" cellspacing=\"0\" cellpadding=\"3\" border=\"0\"><tr><td align=\"center\">\n";
! echo "<table width=\"100%\" cellspacing=\"2\" cellpadding=\"2\" border=\"0\" bgcolor=\"cccccc\"><tr><td>\n";
  $pathstring = "<a href=index.php>"._MD_MAIN."</a>&nbsp;:&nbsp;";
  $nicepath = $mytree->getNicePathFromId($cid, "title", "viewcat.php?op=");
--- 39,44 ----
  $result=$xoopsDB->query($q);
  list($lid, $cid, $title, $url, $homepage, $version, $size, $platform, $logourl, $status, $time, $hits, $rating, $votes, $comments, $description)=$xoopsDB->fetchRow($result);
! echo "<table width='100%' cellspacing='0' cellpadding='3' border='0'><tr><td align='left'>\n";
! echo "<table width='100%' cellspacing='2' cellpadding='2' border='0' bgcolor='cccccc'><tr><td>\n";
  $pathstring = "<a href=index.php>"._MD_MAIN."</a>&nbsp;:&nbsp;";
  $nicepath = $mytree->getNicePathFromId($cid, "title", "viewcat.php?op=");
***************
*** 46,50 ****
  echo "<b>".$pathstring."</b>";
  echo "</td></tr></table><br>";
! echo "<table width=\"100%\" cellspacing=0 cellpadding=10 border=0>";
  
  $rating = number_format($rating, 2);
--- 46,50 ----
  echo "<b>".$pathstring."</b>";
  echo "</td></tr></table><br>";
! echo "<table width='100%' cellspacing=0 cellpadding=10 border=0>";
  
  $rating = number_format($rating, 2);
***************
*** 61,69 ****
  $description = $myts->makeTareaData4Show($description,0);
  include("include/dlformat.php");
!     		
  echo "</td></tr></table>\n";
  echo "</td></tr></table>\n";
  CloseTable();
!     	
  include("footer.php");
  
--- 61,69 ----
  $description = $myts->makeTareaData4Show($description,0);
  include("include/dlformat.php");
! 
  echo "</td></tr></table>\n";
  echo "</td></tr></table>\n";
  CloseTable();
! 
  include("footer.php");
  

Index: viewcat.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/mydownloads/viewcat.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** viewcat.php	15 Jul 2002 08:13:18 -0000	1.1.1.1
--- viewcat.php	26 Sep 2002 01:02:15 -0000	1.2
***************
*** 53,57 ****
  
  
! echo "<table width='100%' cellspacing='0' cellpadding='0' border='0'><tr><td align='center'>\n";
  echo "<table width='100%' cellspacing='1' cellpadding='2' border='0' class='bg3'><tr><td>\n";
  $pathstring = "<a href='index.php'>"._MD_MAIN."</a>&nbsp;:&nbsp;";
--- 53,57 ----
  
  
! echo "<table width='100%' cellspacing='0' cellpadding='0' border='0'><tr><td align='left'>\n";
  echo "<table width='100%' cellspacing='1' cellpadding='2' border='0' class='bg3'><tr><td>\n";
  $pathstring = "<a href='index.php'>"._MD_MAIN."</a>&nbsp;:&nbsp;";
***************
*** 67,74 ****
  	echo "</td></tr>";
  	echo "<tr><td align='left'><h4>"._MD_CATEGORIES."</h4></td></tr>\n";
! 	echo "<tr><td align='center'>";
  	$scount = 0;
          echo "<table width='90%'><tr>";
! 		
          foreach($arr as $ele){
  		$title = $myts->makeTboxData4Show($ele['title']);
--- 67,74 ----
  	echo "</td></tr>";
  	echo "<tr><td align='left'><h4>"._MD_CATEGORIES."</h4></td></tr>\n";
! 	echo "<tr><td align='left'>";
  	$scount = 0;
          echo "<table width='90%'><tr>";
! 
          foreach($arr as $ele){
  		$title = $myts->makeTboxData4Show($ele['title']);
***************
*** 86,94 ****
  $fullcountresult=$xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mydownloads_downloads")." WHERE cid=$cid AND status>0");
  list($numrows) = $xoopsDB->fetchRow($fullcountresult);
! 	
  if($numrows>0){
  	$q = "SELECT d.lid, d.title, d.url, d.homepage, d.version, d.size, d.platform, d.logourl, d.status, d.date, d.hits, d.rating, d.votes, d.comments, t.description FROM ".$xoopsDB->prefix("mydownloads_downloads")." d, ".$xoopsDB->prefix("mydownloads_text")." t WHERE cid=".$cid." AND d.status>0 AND d.lid=t.lid ORDER BY ".$orderby."";
  	$result = $xoopsDB->query($q,$show,$min);
!     
  	//if 2 or more items in result, show the sort menu
  	if($numrows>1){
--- 86,94 ----
  $fullcountresult=$xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mydownloads_downloads")." WHERE cid=$cid AND status>0");
  list($numrows) = $xoopsDB->fetchRow($fullcountresult);
! 
  if($numrows>0){
  	$q = "SELECT d.lid, d.title, d.url, d.homepage, d.version, d.size, d.platform, d.logourl, d.status, d.date, d.hits, d.rating, d.votes, d.comments, t.description FROM ".$xoopsDB->prefix("mydownloads_downloads")." d, ".$xoopsDB->prefix("mydownloads_text")." t WHERE cid=".$cid." AND d.status>0 AND d.lid=t.lid ORDER BY ".$orderby."";
  	$result = $xoopsDB->query($q,$show,$min);
! 
  	//if 2 or more items in result, show the sort menu
  	if($numrows>1){
***************
*** 151,156 ****
          	}
      	}
! 		
! }	
  echo "</td></tr></table>\n";
  CloseTable();
--- 151,156 ----
          	}
      	}
! 
! }
  echo "</td></tr></table>\n";
  CloseTable();

[Xoops-cvs2] xoops-current/html/modules/mylinks index.php,1.1.1.1,1.2 singlelink.php,1.1.1.1,1.2 viewcat.php,1.1.1.1,1.2

[<w4...@us...>]

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

Modified Files:
	index.php singlelink.php viewcat.php 
Log Message:
changed the center align to left align

Index: index.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/mylinks/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** index.php	15 Jul 2002 08:13:23 -0000	1.1.1.1
--- index.php	25 Sep 2002 23:39:41 -0000	1.2
***************
*** 41,46 ****
  OpenTable();
  mainheader();
! echo "<center>\n";
! echo "<table border=0 cellspacing=5 cellpadding=0 width=\"90%\"><tr>\n";
  $count = 0;
  while($myrow = $xoopsDB->fetchArray($result)) {
--- 41,46 ----
  OpenTable();
  mainheader();
! // echo "<center>\n";
! echo "<table border='0' cellspacing='5' cellpadding='0' width='90%'><tr>\n";
  $count = 0;
  while($myrow = $xoopsDB->fetchArray($result)) {
***************
*** 86,90 ****
  echo "<br><br>";
  printf(_MD_THEREARE,$numrows);
! echo "</center>";
  CloseTable();
  
--- 86,90 ----
  echo "<br><br>";
  printf(_MD_THEREARE,$numrows);
! //echo "</center>";
  CloseTable();
  
***************
*** 95,99 ****
  showNew();
  echo "</div>";
! CloseTable();	
  
  include(XOOPS_ROOT_PATH."/modules/mylinks/footer.php");
--- 95,99 ----
  showNew();
  echo "</div>";
! CloseTable();
  
  include(XOOPS_ROOT_PATH."/modules/mylinks/footer.php");

Index: singlelink.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/mylinks/singlelink.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** singlelink.php	15 Jul 2002 08:13:23 -0000	1.1.1.1
--- singlelink.php	25 Sep 2002 23:39:41 -0000	1.2
***************
*** 34,39 ****
  $result=$xoopsDB->query($q);
  list($lid, $cid, $ltitle, $url, $email, $logourl, $status, $time, $hits, $rating, $votes, $comments, $description)=$xoopsDB->fetchRow($result);
! echo "<table width=\"100%\" cellspacing=\"0\" cellpadding=\"3\" border=\"0\"><tr><td align=\"center\">\n";
! echo "<table width=\"100%\" cellspacing=\"2\" cellpadding=\"2\" border=\"0\" bgcolor=\"cccccc\"><tr><td>\n";
  $pathstring = "<a href=index.php>"._MD_MAIN."</a>&nbsp;:&nbsp;";
  $nicepath = $mytree->getNicePathFromId($cid, "title", "viewcat.php?op=");
--- 34,39 ----
  $result=$xoopsDB->query($q);
  list($lid, $cid, $ltitle, $url, $email, $logourl, $status, $time, $hits, $rating, $votes, $comments, $description)=$xoopsDB->fetchRow($result);
! echo "<table width='100%' cellspacing='0' cellpadding='3' border='0'><tr><td align='left'>\n";
! echo "<table width='100%' cellspacing='2' cellpadding='2' border='0' bgcolor='cccccc'><tr><td>\n";
  $pathstring = "<a href=index.php>"._MD_MAIN."</a>&nbsp;:&nbsp;";
  $nicepath = $mytree->getNicePathFromId($cid, "title", "viewcat.php?op=");
***************
*** 41,45 ****
  echo "<b>".$pathstring."</b>";
  echo "</td></tr></table><br>";
! echo "<table width=\"100%\" cellspacing=0 cellpadding=10 border=0>";
  $rating = number_format($rating, 2);
  $ltitle = $myts->makeTboxData4Show($ltitle);
--- 41,45 ----
  echo "<b>".$pathstring."</b>";
  echo "</td></tr></table><br>";
! echo "<table width='100%' cellspacing='0' cellpadding='10' border='0'>";
  $rating = number_format($rating, 2);
  $ltitle = $myts->makeTboxData4Show($ltitle);

Index: viewcat.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/mylinks/viewcat.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** viewcat.php	15 Jul 2002 08:13:24 -0000	1.1.1.1
--- viewcat.php	25 Sep 2002 23:39:41 -0000	1.2
***************
*** 52,56 ****
  }
  
! echo "<table width='100%' cellspacing='0' cellpadding='0' border='0'><tr><td align='center'>\n";
  echo "<table width='100%' cellspacing='1' cellpadding='2' border='0' class='bg3'><tr><td>\n";
  $pathstring = "<a href='index.php'>"._MD_MAIN."</a>&nbsp;:&nbsp;";
--- 52,56 ----
  }
  
! echo "<table width='100%' cellspacing='0' cellpadding='0' border='0'><tr><td align='left'>\n";
  echo "<table width='100%' cellspacing='1' cellpadding='2' border='0' class='bg3'><tr><td>\n";
  $pathstring = "<a href='index.php'>"._MD_MAIN."</a>&nbsp;:&nbsp;";
***************
*** 69,73 ****
  	$scount = 0;
          echo "<table width=\"90%\"><tr>";
! 		
          foreach($arr as $ele){
  		$title = $myts->makeTboxData4Show($ele['title']);
--- 69,73 ----
  	$scount = 0;
          echo "<table width=\"90%\"><tr>";
! 
          foreach($arr as $ele){
  		$title = $myts->makeTboxData4Show($ele['title']);
***************
*** 85,93 ****
  $fullcountresult=$xoopsDB->query("select count(*) from ".$xoopsDB->prefix("mylinks_links")." where cid=$cid and status>0");
  list($numrows) = $xoopsDB->fetchRow($fullcountresult);
! 	
  if($numrows>0){
  	$q = "select l.lid, l.title, l.url, l.email, l.logourl, l.status, l.date, l.hits, l.rating, l.votes, l.comments, t.description from ".$xoopsDB->prefix("mylinks_links")." l, ".$xoopsDB->prefix("mylinks_text")." t where cid=$cid and l.lid=t.lid and status>0 order by $orderby";
  	$result=$xoopsDB->query($q,$show,$min);
!     
  	//if 2 or more items in result, show the sort menu
  	if($numrows>1){
--- 85,93 ----
  $fullcountresult=$xoopsDB->query("select count(*) from ".$xoopsDB->prefix("mylinks_links")." where cid=$cid and status>0");
  list($numrows) = $xoopsDB->fetchRow($fullcountresult);
! 
  if($numrows>0){
  	$q = "select l.lid, l.title, l.url, l.email, l.logourl, l.status, l.date, l.hits, l.rating, l.votes, l.comments, t.description from ".$xoopsDB->prefix("mylinks_links")." l, ".$xoopsDB->prefix("mylinks_text")." t where cid=$cid and l.lid=t.lid and status>0 order by $orderby";
  	$result=$xoopsDB->query($q,$show,$min);
! 
  	//if 2 or more items in result, show the sort menu
  	if($numrows>1){
***************
*** 144,149 ****
          	}
      	}
! 		
! }	
  echo "</td></tr></table>\n";
  CloseTable();
--- 144,149 ----
          	}
      	}
! 
! }
  echo "</td></tr></table>\n";
  CloseTable();

[Xoops-cvs2] xoops-current/html userinfo.php,1.6,1.7

[<w4...@us...>]

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

Modified Files:
	userinfo.php 
Log Message:
align the user posts to the left

Index: userinfo.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/userinfo.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** userinfo.php	25 Sep 2002 13:07:51 -0000	1.6
--- userinfo.php	25 Sep 2002 22:30:29 -0000	1.7
***************
*** 142,146 ****
  
  CloseTable();
! echo "<br /><br /><div>";
  OpenTable();
  $mids =& XoopsModule::getHasSearchModulesList(false);
--- 142,146 ----
  
  CloseTable();
! echo "<br /><br /><p align='left'>";
  OpenTable();
  $mids =& XoopsModule::getHasSearchModulesList(false);
***************
*** 176,180 ****
  }
  CloseTable();
! echo "</div>";
  include("footer.php");
  ?>
--- 176,180 ----
  }
  CloseTable();
! echo "</p>";
  include("footer.php");
  ?>

[Xoops-cvs2] xoops-current/html/modules/xoopspoll/class xoopspollrenderer.php,1.6,1.7

[<w4...@us...>]

Update of /cvsroot/xoops/xoops-current/html/modules/xoopspoll/class
In directory usw-pr-cvs1:/tmp/cvs-serv2354/html/modules/xoopspoll/class

Modified Files:
	xoopspollrenderer.php 
Log Message:
no comment

Index: xoopspollrenderer.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/xoopspoll/class/xoopspollrenderer.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** xoopspollrenderer.php	21 Sep 2002 04:29:49 -0000	1.6
--- xoopspollrenderer.php	25 Sep 2002 20:41:47 -0000	1.7
***************
*** 38,42 ****
  	function renderForm(){
  		$content = "<form action='".XOOPS_URL."/modules/xoopspoll/index.php' method='post'>";
! 		$content .= "<table border='0' cellpadding='0' cellspacing='0' valign='top' width='100%'><tr><td class='bg2'>\n";
  		$content .= "<table width='100%' border='0' cellpadding='4' cellspacing='1'>\n";
  		$content .= "<tr class='bg3'><td align='center' colspan='2'><input type='hidden' name='poll_id' value='".$this->poll->getVar("poll_id")."' />\n";
--- 38,42 ----
  	function renderForm(){
  		$content = "<form action='".XOOPS_URL."/modules/xoopspoll/index.php' method='post'>";
! 		$content .= "<table border='0' cellpadding='0' cellspacing='0' width='100%'><tr><td class='bg2'>\n";
  		$content .= "<table width='100%' border='0' cellpadding='4' cellspacing='1'>\n";
  		$content .= "<tr class='bg3'><td align='center' colspan='2'><input type='hidden' name='poll_id' value='".$this->poll->getVar("poll_id")."' />\n";

[Xoops-cvs2] xoops-current/html/class xoopsmodule.php,1.5,1.6

[<w4...@us...>]

Update of /cvsroot/xoops/xoops-current/html/class
In directory usw-pr-cvs1:/tmp/cvs-serv2354/html/class

Modified Files:
	xoopsmodule.php 
Log Message:
no comment

Index: xoopsmodule.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopsmodule.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** xoopsmodule.php	24 Sep 2002 18:28:33 -0000	1.5
--- xoopsmodule.php	25 Sep 2002 20:41:47 -0000	1.6
***************
*** 38,42 ****
  	var $errors = array();
  	var $adminmenu = array();
! 	
  	// these table cannot be installed nor uninstalled
  	// this is a very dirty workaround...may need to find a better method
--- 38,42 ----
  	var $errors = array();
  	var $adminmenu = array();
! 
  	// these table cannot be installed nor uninstalled
  	// this is a very dirty workaround...may need to find a better method
***************
*** 172,176 ****
  						// [4] contains unprefixed table name
  						$prefixed_query = $this->db->prefixQuery($piece);
! 						// check if the table name is reserved 
  						if ( !$prefixed_query ) {
  							array_push($this->errors,"$piece is not a valid SQL!");
--- 172,176 ----
  						// [4] contains unprefixed table name
  						$prefixed_query = $this->db->prefixQuery($piece);
! 						// check if the table name is reserved
  						if ( !$prefixed_query ) {
  							array_push($this->errors,"$piece is not a valid SQL!");
***************
*** 178,182 ****
  							break;
  						}
! 						// check if the table name is reserved 
  						if ( !in_array($prefixed_query[4], $this->reservedTables) ) {
  							// not reserved, so try to create one
--- 178,182 ----
  							break;
  						}
! 						// check if the table name is reserved
  						if ( !in_array($prefixed_query[4], $this->reservedTables) ) {
  							// not reserved, so try to create one
***************
*** 219,223 ****
  				$this->modinfo['hasSearch'] = 0;
  			}
! 			if ( !isset($this->weight) || !is_numeric($this->weight) ) {	
  				$this->weight = 1;
  			}
--- 219,223 ----
  				$this->modinfo['hasSearch'] = 0;
  			}
! 			if ( !isset($this->weight) || !is_numeric($this->weight) ) {
  				$this->weight = 1;
  			}
***************
*** 685,689 ****
  			$xoopsTpl->setTemplateDir(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme']);
  			for ($i = 0; $i < $count; $i++) {
! 				$xoopsTpl->clear_cache('file:'.XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks/'.$block_arr[$i]->getVar('btemplate'), 'block'.$block_arr[$i]->getVar('bid'))
  			}
  		}
--- 685,689 ----
  			$xoopsTpl->setTemplateDir(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme']);
  			for ($i = 0; $i < $count; $i++) {
! 				$xoopsTpl->clear_cache('file:'.XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks/'.$block_arr[$i]->getVar('btemplate'), 'block'.$block_arr[$i]->getVar('bid'));
  			}
  		}

[Xoops-cvs2] xoops-current/html/class module.textsanitizer.php,1.8,1.9

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

Update of /cvsroot/xoops/xoops-current/html/class
In directory usw-pr-cvs1:/tmp/cvs-serv25462

Modified Files:
	module.textsanitizer.php 
Log Message:
no message

Index: module.textsanitizer.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/module.textsanitizer.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** module.textsanitizer.php	12 Aug 2002 20:11:24 -0000	1.8
--- module.textsanitizer.php	25 Sep 2002 18:50:06 -0000	1.9
***************
*** 29,35 ****
  	var $smileys = array();
  
- 	// allow images to be displayed?
- 	var $allowImage = false;
- 
  	/*
  	* Constructor of this class
--- 29,32 ----
***************
*** 48,55 ****
  	}
  
- 	function setAllowImage($value=true){
- 		$this->allowImage = $value;
- 	}
- 
      	function smiley($message) {
  		$db =& Database::getInstance();
--- 45,48 ----
***************
*** 155,165 ****
  		$patterns[] = "/\[img align=(['\"]?)(left|right)\\1]([^\"\(\)\?\&']*)\[\/img\]/sU";
  		$patterns[] = "/\[img]([^\"\(\)\?\&']*)\[\/img\]/sU";
! 		if ( $this->allowImage != true ) {
! 			$replacements[] = '<a href="\\3" target="_blank">\\3</a>';
! 			$replacements[] = '<a href="\\1" target="_blank">\\1</a>';
! 		} else {
  			$replacements[] = '<img src="\\3" align="\\2" alt="" />';
  			$replacements[] = '<img src="\\1" alt="" />';
! 		}
  		$text = preg_replace($patterns, $replacements, $text);
  		$text = str_replace('[quote]', _QUOTEC.'<div class="xoopsQuote"><blockquote>', $text);
--- 148,158 ----
  		$patterns[] = "/\[img align=(['\"]?)(left|right)\\1]([^\"\(\)\?\&']*)\[\/img\]/sU";
  		$patterns[] = "/\[img]([^\"\(\)\?\&']*)\[\/img\]/sU";
! 		//if ( $this->allowImage != true ) {
! 		//	$replacements[] = '<a href="\\3" target="_blank">\\3</a>';
! 		//	$replacements[] = '<a href="\\1" target="_blank">\\1</a>';
! 		//} else {
  			$replacements[] = '<img src="\\3" align="\\2" alt="" />';
  			$replacements[] = '<img src="\\1" alt="" />';
! 		//}
  		$text = preg_replace($patterns, $replacements, $text);
  		$text = str_replace('[quote]', _QUOTEC.'<div class="xoopsQuote"><blockquote>', $text);

[Xoops-cvs2] xoops-current/html/modules/system/admin/preferences preferences.php,1.9,1.10 main.php,1.5,1.6

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

Update of /cvsroot/xoops/xoops-current/html/modules/system/admin/preferences
In directory usw-pr-cvs1:/tmp/cvs-serv22719

Modified Files:
	preferences.php main.php 
Log Message:
no message

Index: preferences.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/preferences/preferences.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** preferences.php	23 Sep 2002 21:13:29 -0000	1.9
--- preferences.php	25 Sep 2002 18:46:38 -0000	1.10
***************
*** 33,37 ****
  		//$allowsig_radio = new XoopsFormRadioYN(_MD_AM_ALLOWSIG, "allow_sig", $xoopsConfig['allow_sig'], _MD_AM_YES,_MD_AM_NO);
  		$allowhtml_radio = new XoopsFormRadioYN(_MD_AM_ALLOWHTML, "allow_html", $xoopsConfig['allow_html'], _MD_AM_YES,_MD_AM_NO);
! 		$allowimage_radio = new XoopsFormRadioYN(_MD_AM_ALLOWIMAGE, "allow_image", $xoopsConfig['allow_image'], _MD_AM_YES,_MD_AM_NO);
  		$newuser_radio = new XoopsFormRadioYN("", "new_user_notify", $xoopsConfig['new_user_notify'], _MD_AM_YES,_MD_AM_NO);
  		$newuser_group_select = new XoopsFormSelectGroup(_MD_AM_NOTIFYTO, "new_user_notify_group", false, $xoopsConfig['new_user_notify_group'], 1, false);
--- 33,37 ----
  		//$allowsig_radio = new XoopsFormRadioYN(_MD_AM_ALLOWSIG, "allow_sig", $xoopsConfig['allow_sig'], _MD_AM_YES,_MD_AM_NO);
  		$allowhtml_radio = new XoopsFormRadioYN(_MD_AM_ALLOWHTML, "allow_html", $xoopsConfig['allow_html'], _MD_AM_YES,_MD_AM_NO);
! 		//$allowimage_radio = new XoopsFormRadioYN(_MD_AM_ALLOWIMAGE, "allow_image", $xoopsConfig['allow_image'], _MD_AM_YES,_MD_AM_NO);
  		$newuser_radio = new XoopsFormRadioYN("", "new_user_notify", $xoopsConfig['new_user_notify'], _MD_AM_YES,_MD_AM_NO);
  		$newuser_group_select = new XoopsFormSelectGroup(_MD_AM_NOTIFYTO, "new_user_notify_group", false, $xoopsConfig['new_user_notify_group'], 1, false);
***************
*** 101,105 ****
  		//$form->addElement($allowsig_radio);
  		$form->addElement($allowhtml_radio);
! 		$form->addElement($allowimage_radio);
  		$form->addElement($newuser_tray);
  		$form->addElement($actv_tray);
--- 101,105 ----
  		//$form->addElement($allowsig_radio);
  		$form->addElement($allowhtml_radio);
! 		//$form->addElement($allowimage_radio);
  		$form->addElement($newuser_tray);
  		$form->addElement($actv_tray);
***************
*** 126,130 ****
  	}
  
! 	function save_pref($sitename, $slogan, $adminmail, $language, $startpage, $server_TZ, $default_TZ, $default_theme, $old_theme, $anonymous, $minpass, $anonpost, $new_user_notify, $new_user_notify_group, $activation_type, $activation_group, $self_delete, $display_loading_img, $gzip_compression, $uname_test_level, $usercookie, $sessioncookie, $old_sessioncookie, $sessionexpire, $banners, $tags, $my_ip, $com_mode, $com_order, $allow_html, $allow_image, $debug_mode, $avatar_allow_upload, $avatar_width, $avatar_height, $avatar_maxsize){
  		global $xoopsConfig, $HTTP_COOKIE_VARS;
  		if (!xoopsfwrite()) {
--- 126,130 ----
  	}
  
! 	function save_pref($sitename, $slogan, $adminmail, $language, $startpage, $server_TZ, $default_TZ, $default_theme, $old_theme, $anonymous, $minpass, $anonpost, $new_user_notify, $new_user_notify_group, $activation_type, $activation_group, $self_delete, $display_loading_img, $gzip_compression, $uname_test_level, $usercookie, $sessioncookie, $old_sessioncookie, $sessionexpire, $banners, $tags, $my_ip, $com_mode, $com_order, $allow_html, $debug_mode, $avatar_allow_upload, $avatar_width, $avatar_height, $avatar_maxsize){
  		global $xoopsConfig, $HTTP_COOKIE_VARS;
  		if (!xoopsfwrite()) {
***************
*** 195,201 ****
  // "._MD_AM_ALLOWHTML." (1="._MD_AM_YES." 0="._MD_AM_NO.")
  \$xoopsConfig['allow_html'] = ".intval($allow_html).";
- 
- // "._MD_AM_ALLOWIMAGE." (1="._MD_AM_YES." 0="._MD_AM_NO.")
- \$xoopsConfig['allow_image'] = ".intval($allow_image).";
  
  // "._MD_AM_ACTVTYPE." (0="._MD_AM_AUTOACTV." 1="._MD_AM_USERACTV." 2="._MD_AM_ADMINACTV.")
--- 195,198 ----

Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/preferences/main.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** main.php	20 Sep 2002 16:33:58 -0000	1.5
--- main.php	25 Sep 2002 18:46:39 -0000	1.6
***************
*** 27,31 ****
  				}
  			}
! 			save_pref($sitename, $slogan, $adminmail, $language, $startpage, $server_TZ, $default_TZ, $default_theme, $old_theme, $anonymous, $minpass, $anonpost, $new_user_notify, $new_user_notify_group, $activation_type, $activation_group, $self_delete, $display_loading_img, $gzip_compression, $uname_test_level, $usercookie, $sessioncookie, $old_sessioncookie, $sessionexpire, $banners, $tags, $my_ip, $com_mode, $com_order, $allow_html, $allow_image, $debug_mode, $avatar_allow_upload, $avatar_width, $avatar_height, $avatar_maxsize);
  			break;
  		case "default":
--- 27,31 ----
  				}
  			}
! 			save_pref($sitename, $slogan, $adminmail, $language, $startpage, $server_TZ, $default_TZ, $default_theme, $old_theme, $anonymous, $minpass, $anonpost, $new_user_notify, $new_user_notify_group, $activation_type, $activation_group, $self_delete, $display_loading_img, $gzip_compression, $uname_test_level, $usercookie, $sessioncookie, $old_sessioncookie, $sessionexpire, $banners, $tags, $my_ip, $com_mode, $com_order, $allow_html, $debug_mode, $avatar_allow_upload, $avatar_width, $avatar_height, $avatar_maxsize);
  			break;
  		case "default":

[Xoops-cvs2] xoops-current/html userinfo.php,1.5,1.6 register.php,1.6,1.7 misc.php,1.2,1.3 lostpass.php,1.1.1.1,1.2 index.php,1.1.1.1,1.2 edituser.php,1.7,1.8

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

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

Modified Files:
	userinfo.php register.php misc.php lostpass.php index.php 
	edituser.php 
Log Message:
no message

Index: userinfo.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/userinfo.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** userinfo.php	5 Aug 2002 03:07:31 -0000	1.5
--- userinfo.php	25 Sep 2002 13:07:51 -0000	1.6
***************
*** 124,128 ****
  	echo "</td></tr></table></td></tr></table></td>";
  	echo "<td width='50%'><table border='0' cellpadding='0' cellspacing='0' align='center' valign='top' width='80%'><tr><td class='bg2'><table border='0' cellpadding='4' cellspacing='1' width='100%'><tr valign='top' class='bg1'><td colspan='2' align='center'><b>"._US_STATISTICS."</b></td></tr><tr valign='top' class='bg3'><td><b>"._US_MEMBERSINCE.":</b></td><td align='center'>".formatTimestamp($thisUser->getVar("user_regdate"),"s")."</td></tr>\n";
! 	$userrank = $thisUser->rank();
  	echo "<tr valign='top' class='bg1'><td><b>"._US_RANK.":</b></td><td align='center'>";
  	if ( $userrank['image'] ) {
--- 124,128 ----
  	echo "</td></tr></table></td></tr></table></td>";
  	echo "<td width='50%'><table border='0' cellpadding='0' cellspacing='0' align='center' valign='top' width='80%'><tr><td class='bg2'><table border='0' cellpadding='4' cellspacing='1' width='100%'><tr valign='top' class='bg1'><td colspan='2' align='center'><b>"._US_STATISTICS."</b></td></tr><tr valign='top' class='bg3'><td><b>"._US_MEMBERSINCE.":</b></td><td align='center'>".formatTimestamp($thisUser->getVar("user_regdate"),"s")."</td></tr>\n";
! 	$userrank =& $thisUser->rank();
  	echo "<tr valign='top' class='bg1'><td><b>"._US_RANK.":</b></td><td align='center'>";
  	if ( $userrank['image'] ) {
***************
*** 148,152 ****
  	$module = new XoopsModule($mid);
  	$results = array();
! 	$results = $module->search("", "", 5, 0, $thisUser->getVar("uid"));
  
  	if ( !is_array($results) || !($count = count($results)) ) {
--- 148,152 ----
  	$module = new XoopsModule($mid);
  	$results = array();
! 	$results =& $module->search("", "", 5, 0, $thisUser->getVar("uid"));
  
  	if ( !is_array($results) || !($count = count($results)) ) {

Index: register.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/register.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** register.php	20 Sep 2002 16:06:29 -0000	1.6
--- register.php	25 Sep 2002 13:07:51 -0000	1.7
***************
*** 25,29 ****
  
  function userCheck($uname, $email, $pass, $vpass) {
! 	global $xoopsConfig, $xoopsDB;
  	include(XOOPS_ROOT_PATH.'/modules/system/cache/badunames.php');
  	$myts =& MyTextSanitizer::getInstance();
--- 25,30 ----
  
  function userCheck($uname, $email, $pass, $vpass) {
! 	global $xoopsConfig;
! 	$xoopsDB =& Database::getInstance();
  	include(XOOPS_ROOT_PATH.'/modules/system/cache/badunames.php');
  	$myts =& MyTextSanitizer::getInstance();
***************
*** 96,108 ****
  }
  switch ( $op ) {
- 	default:
- 	case 'register':
- 		include('header.php');
- 		OpenTable();
- 		include('include/registerform.php');
- 		$reg_form->display();
- 		CloseTable();
- 		include('footer.php');
- 		break;
  	case 'newuser':
  		$myts =& MyTextSanitizer::getInstance();
--- 97,100 ----
***************
*** 247,250 ****
--- 239,251 ----
  			$reg_form->display();
  		}
+ 		include('footer.php');
+ 		break;
+ 	case 'register':
+ 	default:
+ 		include('header.php');
+ 		OpenTable();
+ 		include('include/registerform.php');
+ 		$reg_form->display();
+ 		CloseTable();
  		include('footer.php');
  		break;

Index: misc.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/misc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** misc.php	15 Jul 2002 16:55:58 -0000	1.2
--- misc.php	25 Sep 2002 13:07:51 -0000	1.3
***************
*** 19,22 ****
--- 19,26 ----
  // ------------------------------------------------------------------------- //
  include("mainfile.php");
+ $action = isset($HTTP_GET_VARS['action']) ? trim($HTTP_GET_VARS['action']) : '';
+ $action = isset($HTTP_POST_VARS['action']) ? trim($HTTP_POST_VARS['action']) : $action;
+ $type = isset($HTTP_GET_VARS['type']) ? trim($HTTP_GET_VARS['type']) : '';
+ $type = isset($HTTP_POST_VARS['type']) ? trim($HTTP_POST_VARS['type']) : $type;
  
  if ( $action == "showpopups" ) {
***************
*** 83,93 ****
  			<?php
  			include_once(XOOPS_ROOT_PATH."/class/xoopslists.php");
! 			if ( !isset($subdir) ) {
! 				$subdir = "";
! 			}
! 			$lists = new XoopsLists;
! 			$avatarslist = $lists->getAvatarsList($subdir);
  			$cntavs = 0;
! 			$counter = isset($start) ? intval($start) : 0;
      			foreach ( $avatarslist as $avatar ) { 
  				echo "<td><img src='images/avatar/".$avatar."' alt='".$avatar."' style='padding: 10px;vertical-align:top;'  /><br /><input name='myimage' type='button' value='"._SELECT."' onclick='myimage_onclick(".$counter.")' /></td>\n";
--- 87,94 ----
  			<?php
  			include_once(XOOPS_ROOT_PATH."/class/xoopslists.php");
! 			$subdir = isset($HTTP_GET_VARS['subdir']) ? trim($HTTP_GET_VARS['subdir']) : '';
! 			$avatarslist = XoopsLists::getAvatarsList($subdir);
  			$cntavs = 0;
! 			$counter = isset($HTTP_GET_VARS['start']) ? intval($HTTP_GET_VARS['start']) : 0;
      			foreach ( $avatarslist as $avatar ) { 
  				echo "<td><img src='images/avatar/".$avatar."' alt='".$avatar."' style='padding: 10px;vertical-align:top;'  /><br /><input name='myimage' type='button' value='"._SELECT."' onclick='myimage_onclick(".$counter.")' /></td>\n";
***************
*** 102,106 ****
  	        	break;
          	case "friend":
! 			if ( !isset($op) || $op == "sendform" ) {
  				if ( $xoopsUser ) {
  					$yname = $xoopsUser->getVar("uname");
--- 103,107 ----
  	        	break;
          	case "friend":
! 			if ( !isset($HTTP_POST_VARS['op']) || $HTTP_POST_VARS['op'] == "sendform" ) {
  				if ( $xoopsUser ) {
  					$yname = $xoopsUser->getVar("uname");
***************
*** 130,134 ****
  				$closebutton = 0;
      				echo "</td></tr></table></td></tr></table>\n";
! 			} elseif ( $op == "sendsite" ) {
  				if ( $xoopsUser ) {
  					$ymail = $xoopsUser->getVar("email");
--- 131,135 ----
  				$closebutton = 0;
      				echo "</td></tr></table></td></tr></table>\n";
! 			} elseif ($HTTP_POST_VARS['op'] == "sendsite") {
  				if ( $xoopsUser ) {
  					$ymail = $xoopsUser->getVar("email");
***************
*** 136,144 ****
  					break;
  				}
! 				if ( !isset($yname) || $yname == "" || !isset($fname) || $fname == ""  || !$fmail ) {
  				    redirect_header(XOOPS_URL."/misc.php?action=showpopups&amp;type=friend&amp;op=sendform",2,_NEEDINFO);
  					exit();
  				}
! 				if ( !checkEmail($fmail) ) {
  					$errormessage = _INVALIDEMAIL1."<br />"._INVALIDEMAIL2."";
  					redirect_header(XOOPS_URL."/misc.php?action=showpopups&amp;type=friend&amp;op=sendform",2,$errormessage);
--- 137,148 ----
  					break;
  				}
! 				if ( !isset($HTTP_POST_VARS['yname']) || trim($HTTP_POST_VARS['yname']) == "" || !isset($HTTP_POST_VARS['fname']) || trim($HTTP_POST_VARS['fname']) == ""  || !isset($HTTP_POST_VARS['fmail']) || trim($HTTP_POST_VARS['fmail']) == '' ) {
  				    redirect_header(XOOPS_URL."/misc.php?action=showpopups&amp;type=friend&amp;op=sendform",2,_NEEDINFO);
  					exit();
  				}
! 				$yname = trim($HTTP_POST_VARS['yname'];
! 				$fname = trim($HTTP_POST_VARS['fname'];
! 				$fmail = trim($HTTP_POST_VARS['fmail'];
! 				if (!checkEmail($fmail)) {
  					$errormessage = _INVALIDEMAIL1."<br />"._INVALIDEMAIL2."";
  					redirect_header(XOOPS_URL."/misc.php?action=showpopups&amp;type=friend&amp;op=sendform",2,$errormessage);

Index: lostpass.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/lostpass.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** lostpass.php	15 Jul 2002 08:13:06 -0000	1.1.1.1
--- lostpass.php	25 Sep 2002 13:07:51 -0000	1.2
***************
*** 21,25 ****
  $xoopsOption['pagetype'] = "user";
  include("mainfile.php");
! if ( !isset($email) || $email == "" ) {
  	redirect_header("user.php",2,_US_SORRYNOTFOUND);
  	exit();
--- 21,27 ----
  $xoopsOption['pagetype'] = "user";
  include("mainfile.php");
! $email = isset($HTTP_GET_VARS['email']) ? trim($HTTP_GET_VARS['email']) : '';
! $email = isset($HTTP_POST_VARS['email']) ? trim($HTTP_POST_VARS['email']) : $email;
! if ($email == '') {
  	redirect_header("user.php",2,_US_SORRYNOTFOUND);
  	exit();
***************
*** 33,38 ****
  	exit();
  } else {
  	$areyou = substr($getuser[0]->getVar("pass"), 0, 5);
! 	if ( isset($code) && $areyou == $code ) {
  		$newpass=makepass();
  		$xoopsMailer =& getMailer();
--- 35,41 ----
  	exit();
  } else {
+ 	$code = isset($HTTP_GET_VARS['code']) ? trim($HTTP_GET_VARS['code']) : '';
  	$areyou = substr($getuser[0]->getVar("pass"), 0, 5);
! 	if ($code != '' && $areyou == $code) {
  		$newpass=makepass();
  		$xoopsMailer =& getMailer();
***************
*** 42,46 ****
  		$xoopsMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
  		$xoopsMailer->assign("SITEURL", XOOPS_URL."/");
! 		$xoopsMailer->assign("IP", $REMOTE_ADDR);
  		$xoopsMailer->assign("NEWPWD", $newpass);
  		$xoopsMailer->setToUsers($getuser[0]);
--- 45,49 ----
  		$xoopsMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
  		$xoopsMailer->assign("SITEURL", XOOPS_URL."/");
! 		$xoopsMailer->assign("IP", $HTTP_SERVER_VARS['REMOTE_ADDR']);
  		$xoopsMailer->assign("NEWPWD", $newpass);
  		$xoopsMailer->setToUsers($getuser[0]);
***************
*** 54,58 ****
  	// Next step: add the new password to the database
  		$cryptpass = md5($newpass);
! 		$query="UPDATE ".$xoopsDB->prefix("users")." SET pass='$cryptpass' WHERE uid=".$getuser[0]->getVar("uid")."";
  		if ( !$xoopsDB->queryF($query) ) {
  			include("header.php");
--- 57,61 ----
  	// Next step: add the new password to the database
  		$cryptpass = md5($newpass);
! 		$query="UPDATE ".$xoopsDB->prefix("users")." SET pass='".md5($newpass)."' WHERE uid=".$getuser[0]->getVar('uid');
  		if ( !$xoopsDB->queryF($query) ) {
  			include("header.php");
***************
*** 71,75 ****
  		$xoopsMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
  		$xoopsMailer->assign("SITEURL", XOOPS_URL."/");
! 		$xoopsMailer->assign("IP", $REMOTE_ADDR);
  		$xoopsMailer->assign("NEWPWD_LINK", XOOPS_URL."/lostpass.php?email=".$email."&code=".$areyou);
  		$xoopsMailer->setToUsers($getuser[0]);
--- 74,78 ----
  		$xoopsMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
  		$xoopsMailer->assign("SITEURL", XOOPS_URL."/");
! 		$xoopsMailer->assign("IP", $HTTP_SERVER_VARS['REMOTE_ADDR']);
  		$xoopsMailer->assign("NEWPWD_LINK", XOOPS_URL."/lostpass.php?email=".$email."&code=".$areyou);
  		$xoopsMailer->setToUsers($getuser[0]);

Index: index.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** index.php	15 Jul 2002 08:13:06 -0000	1.1.1.1
--- index.php	25 Sep 2002 13:07:51 -0000	1.2
***************
*** 32,36 ****
  //check if start page is defined
  if ( isset($xoopsConfig['startpage']) && $xoopsConfig['startpage'] != "" && $xoopsConfig['startpage'] != "--" ) {
! 	header("Location: modules/".$xoopsConfig['startpage']."/");
  	exit();
  } else {
--- 32,36 ----
  //check if start page is defined
  if ( isset($xoopsConfig['startpage']) && $xoopsConfig['startpage'] != "" && $xoopsConfig['startpage'] != "--" ) {
! 	header('Location: '.XOOPS_URL.'/modules/'.$xoopsConfig['startpage'].'/');
  	exit();
  } else {

Index: edituser.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/edituser.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** edituser.php	20 Sep 2002 08:32:56 -0000	1.7
--- edituser.php	25 Sep 2002 13:07:51 -0000	1.8
***************
*** 34,39 ****
  
  // if GET/POST is set, change $op
! if ( isset($HTTP_POST_VARS['op']) ) {
! 	$op =  $HTTP_POST_VARS['op'];
  } elseif ( isset($HTTP_GET_VARS['op']) ) {
  	$op =  $HTTP_GET_VARS['op'];
--- 34,40 ----
  
  // if GET/POST is set, change $op
! if ( isset($HTTP_POST_VARS) ) {
! 	foreach ($HTTP_POST_VARS as $k => $v) {
! 		${$k} =  $v;
  } elseif ( isset($HTTP_GET_VARS['op']) ) {
  	$op =  $HTTP_GET_VARS['op'];
***************
*** 163,167 ****
  	}
  	$email = $myts->oopsStripSlashesGPC(trim($email));
! 	if ( (!$email) || ($email=="") || (!checkEmail($email)) ) {
  		include("header.php");
  		echo "<div>"._US_INVALIDMAIL."</div><br />";
--- 164,168 ----
  	}
  	$email = $myts->oopsStripSlashesGPC(trim($email));
! 	if (!isset($email) || $email == '' || !checkEmail($email)) {
  		include("header.php");
  		echo "<div>"._US_INVALIDMAIL."</div><br />";
***************
*** 260,264 ****
  	// xoops_upload_file is the default name in XOOPS
  	$field = $GLOBALS['xoops_upload_file'][0];
- 	//echo "<h1>".$GLOBALS['uploadFileName'][0]."<br />".$HTTP_POST_FILES[$field]['tmp_name']."<br />".$xoopsConfig['avatar_allow_upload']."</h1>";
  	if ( $HTTP_POST_FILES[$field]['tmp_name'] != "none" && ($xoopsConfig['avatar_allow_upload'] == 1) ) {
  		if ( $oldavatar = avatarExists($xoopsUser->getVar("uid")) ) {
--- 261,264 ----

[Xoops-cvs2] xoops-current/html/modules/system/admin/mailusers mailform.php,1.4,1.5

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

Update of /cvsroot/xoops/xoops-current/html/modules/system/admin/mailusers
In directory usw-pr-cvs1:/tmp/cvs-serv2695

Modified Files:
	mailform.php 
Log Message:
no message

Index: mailform.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/mailusers/mailform.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mailform.php	20 Sep 2002 14:13:08 -0000	1.4
--- mailform.php	25 Sep 2002 10:33:50 -0000	1.5
***************
*** 10,13 ****
--- 10,14 ----
  		$form->addElement($uid_hidden);
  		$display_names .= "<a href='".XOOPS_URL."/userinfo.php?uid=".$HTTP_POST_VARS['memberslist_id'][$i]."' target='_blank'>".$HTTP_POST_VARS['memberslist_uname'][$HTTP_POST_VARS['memberslist_id'][$i]]."</a>, ";
+ 		unset($uid_hidden);
  	}
  	$users_label = new XoopsFormLabel(_AM_SENDTOUSERS2, substr($display_names, 0, -2));

[Xoops-cvs2] xoops-current/html/modules/xoopspoll/cache pollsblock.inc.php,1.1.1.1,NONE index.html,1.2,NONE

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

Update of /cvsroot/xoops/xoops-current/html/modules/xoopspoll/cache
In directory usw-pr-cvs1:/tmp/cvs-serv27811

Removed Files:
	pollsblock.inc.php index.html 
Log Message:
no message

--- pollsblock.inc.php DELETED ---

--- index.html DELETED ---

[Xoops-cvs2] xoops-current/html/modules/xoopspoll pollresults.php,1.2,1.3

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

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

Modified Files:
	pollresults.php 
Log Message:
no message

Index: pollresults.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/xoopspoll/pollresults.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pollresults.php	10 Sep 2002 02:13:33 -0000	1.2
--- pollresults.php	24 Sep 2002 19:15:52 -0000	1.3
***************
*** 66,70 ****
  	echo "<br />";
  }
- 
  $orderby = ($order == 1) ? "date DESC" : "date ASC";
  if ( $mode == "flat" ) {
--- 66,69 ----

[Xoops-cvs2] xoops-current/html/modules/xoopspoll/blocks xoopspoll.php,1.1.1.1,1.2

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

Update of /cvsroot/xoops/xoops-current/html/modules/xoopspoll/blocks
In directory usw-pr-cvs1:/tmp/cvs-serv13160

Modified Files:
	xoopspoll.php 
Log Message:
no message

Index: xoopspoll.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/xoopspoll/blocks/xoopspoll.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** xoopspoll.php	15 Jul 2002 08:14:02 -0000	1.1.1.1
--- xoopspoll.php	24 Sep 2002 18:46:36 -0000	1.2
***************
*** 3,10 ****
  	$block = array();
  	$block['title'] = _MB_POLLS_TITLE1;
! 	ob_start();
! 	include(XOOPS_ROOT_PATH."/modules/xoopspoll/cache/pollsblock.inc.php");
! 	$block['content'] = ob_get_contents();
! 	ob_end_clean();
          return $block;
  }
--- 3,14 ----
  	$block = array();
  	$block['title'] = _MB_POLLS_TITLE1;
! 	$polls = XoopsPoll::getAll(array("display=1"), true, "weight ASC, end_time DESC");
! 	$block['content'] = "";
! 	foreach ( $polls as $poll ) {
! 		$block['content'] .= "<p>";
! 		$renderer = new XoopsPollRenderer($poll);
! 		$block['content'] .= $renderer->renderForm();
! 		$block['content'] .= "</p>";
! 	}
          return $block;
  }

[Xoops-cvs2] xoops-current/html/modules/xoopspoll/admin index.php,1.3,1.4

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

Update of /cvsroot/xoops/xoops-current/html/modules/xoopspoll/admin
In directory usw-pr-cvs1:/tmp/cvs-serv7429

Modified Files:
	index.php 
Log Message:
no message

Index: index.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/xoopspoll/admin/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** index.php	10 Sep 2002 00:45:38 -0000	1.3
--- index.php	24 Sep 2002 18:31:48 -0000	1.4
***************
*** 146,150 ****
  			$i++;
  		}
! 		poll_update_cache();
  	} else {
  		echo $poll->getErrors();
--- 146,150 ----
  			$i++;
  		}
! 		$xoopsModule->clearBlockCache();
  	} else {
  		echo $poll->getErrors();
***************
*** 256,260 ****
  	}
  	$poll->updateCount();
! 	poll_update_cache();
  	redirect_header("index.php",1,_AM_DBUPDATED);
  	exit();
--- 256,260 ----
  	}
  	$poll->updateCount();
! 	$xoopsModule->clearBlockCache();
  	redirect_header("index.php",1,_AM_DBUPDATED);
  	exit();
***************
*** 311,315 ****
  		$i++;
  	}
! 	poll_update_cache();
  	redirect_header("index.php",1,_AM_DBUPDATED);
  	exit();
--- 311,315 ----
  		$i++;
  	}
! 	$xoopsModule->clearBlockCache();
  	redirect_header("index.php",1,_AM_DBUPDATED);
  	exit();
***************
*** 336,340 ****
  		XoopsPollOption::deleteByPollId($poll->getVar("poll_id"));
  		XoopsPollLog::deleteByPollId($poll->getVar("poll_id"));
! 		poll_update_cache();
  		// delete comments for this poll
  		$com = new XoopsComments($xoopsDB->prefix("xoopspollcomments"));
--- 336,340 ----
  		XoopsPollOption::deleteByPollId($poll->getVar("poll_id"));
  		XoopsPollLog::deleteByPollId($poll->getVar("poll_id"));
! 		$xoopsModule->clearBlockCache();
  		// delete comments for this poll
  		$com = new XoopsComments($xoopsDB->prefix("xoopspollcomments"));
***************
*** 397,401 ****
  	}
  	$poll->updateCount();
! 	poll_update_cache();
  	redirect_header("index.php",1,_AM_DBUPDATED);
  	exit();
--- 397,401 ----
  	}
  	$poll->updateCount();
! 	$xoopsModule->clearBlockCache();
  	redirect_header("index.php",1,_AM_DBUPDATED);
  	exit();
***************
*** 423,457 ****
  		}
  	}
! 	poll_update_cache();
  	redirect_header("index.php",1,_AM_DBUPDATED);
  	exit();
- }
- 
- function poll_update_cache(){
- 	$filename = XOOPS_ROOT_PATH."/modules/xoopspoll/cache/pollsblock.inc.php";
- 	if ( !is_writable($filename) ) {
- 		// attempt to chmod 666
- 		if ( !chmod($filename, 0666) ) {
- 			xoops_cp_header();
- 			printf(_MUSTWABLE, "<b>".$filename."</b>");
- 			xoops_cp_footer();
- 			exit();
- 		}
- 	}
- 	$polls =& XoopsPoll::getAll(array("display=1"), true, "weight ASC, end_time DESC");
- 	$contents = "";
- 	foreach ( $polls as $poll ) {
- 		$renderer = new XoopsPollRenderer($poll);
- 		$contents .= $renderer->renderForm();
- 		}
- 	if (!xoopsfwrite()) {
- 		return;
- 	}
- 
- 	$file = fopen($filename, "w");
- 	if ( fwrite($file, $contents) == -1) {
- 		return;
- 	}
- 	fclose($file);
  }
  ?>
--- 423,429 ----
  		}
  	}
! 	$xoopsModule->clearBlockCache();
  	redirect_header("index.php",1,_AM_DBUPDATED);
  	exit();
  }
  ?>

[Xoops-cvs2] xoops-current/html/class xoopsmodule.php,1.4,1.5

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

Update of /cvsroot/xoops/xoops-current/html/class
In directory usw-pr-cvs1:/tmp/cvs-serv5985

Modified Files:
	xoopsmodule.php 
Log Message:
no message

Index: xoopsmodule.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopsmodule.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** xoopsmodule.php	22 Sep 2002 06:02:04 -0000	1.4
--- xoopsmodule.php	24 Sep 2002 18:28:33 -0000	1.5
***************
*** 674,682 ****
  	}
  
! 	function useSmarty(){
! 		if ( !isset($this->modinfo['use_smarty']) || $this->modinfo['use_smarty'] == 0 ) {
! 			return false;
  		}
- 		return true;
  	}
  
--- 674,691 ----
  	}
  
! 	function clearBlockCache(){
! 		global $xoopsConfig;
! 		$block_arr = XoopsBlock::getByModule($this->mid);
! 		$count = count($block_arr);
! 		if ($count > 0) {
! 			$xoopsTpl = new XoopsTpl();
! 			$xoopsTpl->setCaching(2);
! 			$xoopsTpl->setCacheDir(XOOPS_ROOT_PATH.'/cache');
! 			$xoopsTpl->setCompileDir(XOOPS_ROOT_PATH.'/templates_c');
! 			$xoopsTpl->setTemplateDir(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme']);
! 			for ($i = 0; $i < $count; $i++) {
! 				$xoopsTpl->clear_cache('file:'.XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks/'.$block_arr[$i]->getVar('btemplate'), 'block'.$block_arr[$i]->getVar('bid'))
! 			}
  		}
  	}
  

[Xoops-cvs2] xoops-current/html/modules/system/admin/blocksadmin blocksadmin.php,1.5,1.6

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

Update of /cvsroot/xoops/xoops-current/html/modules/system/admin/blocksadmin
In directory usw-pr-cvs1:/tmp/cvs-serv12357

Modified Files:
	blocksadmin.php 
Log Message:
no message

Index: blocksadmin.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/blocksadmin/blocksadmin.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** blocksadmin.php	23 Sep 2002 21:13:13 -0000	1.5
--- blocksadmin.php	24 Sep 2002 17:42:35 -0000	1.6
***************
*** 395,399 ****
  			$xoopsTpl->setCompileDir(XOOPS_ROOT_PATH.'/templates_c');
  			$xoopsTpl->setTemplateDir(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme']);
! 			if (!$xoopsTpl->clear_cache('file:'.XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks/'.$btemplate, $bid)) {
  				//echo 'false';
  			}
--- 395,399 ----
  			$xoopsTpl->setCompileDir(XOOPS_ROOT_PATH.'/templates_c');
  			$xoopsTpl->setTemplateDir(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme']);
! 			if (!$xoopsTpl->clear_cache('file:'.XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks/'.$btemplate, 'block'.$bid)) {
  				//echo 'false';
  			}

[Xoops-cvs2] xoops-current/html header.php,1.13,1.14

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

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

Modified Files:
	header.php 
Log Message:
no message

Index: header.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/header.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** header.php	23 Sep 2002 21:13:44 -0000	1.13
--- header.php	24 Sep 2002 17:41:25 -0000	1.14
***************
*** 123,127 ****
  			$btemplate = ($btemplate == '') ? 'block1.html' : $btemplate;
  			$bcachetime = intval($arr[$i]->getVar('bcachetime'));
! 			if (!$xoopsTpl->is_cached('file:'.XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks/'.$btemplate, $arr[$i]->getVar('bid'))) {
  				$xoopsLogger->addBlock($arr[$i]->getVar('name'));
  				$block =& $arr[$i]->buildBlock();
--- 123,127 ----
  			$btemplate = ($btemplate == '') ? 'block1.html' : $btemplate;
  			$bcachetime = intval($arr[$i]->getVar('bcachetime'));
! 			if (!$xoopsTpl->is_cached('file:'.XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks/'.$btemplate, 'block'.$arr[$i]->getVar('bid'))) {
  				$xoopsLogger->addBlock($arr[$i]->getVar('name'));
  				$block =& $arr[$i]->buildBlock();

[Xoops-cvs2] xoops-current/html/images join.gif,NONE,1.1

[<w4...@us...>]

Update of /cvsroot/xoops/xoops-current/html/images
In directory usw-pr-cvs1:/tmp/cvs-serv15185/html/images

Added Files:
	join.gif 
Log Message:
no comment

--- NEW FILE: join.gif ---
(This appears to be a binary file; contents omitted.)

[Xoops-cvs2] xoops-current/html header.php,1.12,1.13 footer.php,1.9,1.10

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

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

Modified Files:
	header.php footer.php 
Log Message:
no message

Index: header.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/header.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** header.php	21 Sep 2002 17:08:38 -0000	1.12
--- header.php	23 Sep 2002 21:13:44 -0000	1.13
***************
*** 31,34 ****
--- 31,35 ----
  	if (!file_exists(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/layout.html')) {
  		// the old way..
+ 		$xoopsOption['theme_use_smarty'] = 0;
  		xoops_header(false);
  		include(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/theme.php');
***************
*** 37,45 ****
  		// exit if this page uses smarty
  		if (!empty($xoopsOption['use_smarty'])) {
! 			echo "This page requires Smarty enabled theme";
! 			include('footer.php');
! 			exit();
  		}
  	} else {
  		// include Smarty template engine and initialize it
  		require_once(XOOPS_ROOT_PATH.'/class/xoopstpl.php');
--- 38,54 ----
  		// exit if this page uses smarty
  		if (!empty($xoopsOption['use_smarty'])) {
! 			// include Smarty template engine and initialize it
! 			require_once(XOOPS_ROOT_PATH.'/class/xoopstpl.php');
! 			$xoopsTpl = new XoopsTpl();
! 			$xoopsTpl->setCaching(2);
! 			if ($xoopsConfig['debug_mode'] == 1) {
! 				$xoopsTpl->setDebugging(true);
! 			}
! 			$xoopsTpl->setCacheDir(XOOPS_ROOT_PATH.'/cache');
! 			$xoopsTpl->setCompileDir(XOOPS_ROOT_PATH.'/templates_c');
! 			$xoopsTpl->setTemplateDir(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme']);
  		}
  	} else {
+ 		$xoopsOption['theme_use_smarty'] = 1;
  		// include Smarty template engine and initialize it
  		require_once(XOOPS_ROOT_PATH.'/class/xoopstpl.php');

Index: footer.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/footer.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** footer.php	19 Sep 2002 16:58:46 -0000	1.9
--- footer.php	23 Sep 2002 21:13:44 -0000	1.10
***************
*** 3,8 ****
  	define("XOOPS_FOOTER_INCLUDED",1);
  	$footer = "<br />Powered by XOOPS &copy; 2002 <a href='http://www.xoops.org/' target='_blank'>The XOOPS Project</a>";
! 	if ( !isset($xoopsTpl) ) {
  		// the old way
  		if ( !isset($xoopsOption['show_rblock']) ) {
  			$xoopsOption['show_rblock'] = 0;
--- 3,31 ----
  	define("XOOPS_FOOTER_INCLUDED",1);
  	$footer = "<br />Powered by XOOPS &copy; 2002 <a href='http://www.xoops.org/' target='_blank'>The XOOPS Project</a>";
! 	if ($xoopsConfig['debug_mode'] == 1) {
! 		$xoopsLogger =& XoopsLogger::getInstance();
! 		$xoopsLogger->stopTime();
! 		$footer .= $xoopsLogger->dumpAll();
! 	}
! 	if ($xoopsOption['theme_use_smarty'] == 0) {
  		// the old way
+ 		if (!empty($xoopsOption['use_smarty'])) {
+ 			if (isset($xoopsContentsTpl) &&  $xoopsContentsTpl != '') {
+ 				// check if the current page is a module page
+ 				if ( isset($xoopsModule) && get_class($xoopsModule) == 'xoopsmodule' ) {
+ 					// set module specific template directory
+ 					if ( !is_dir(XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/templates/'.$xoopsConfig['default_theme'].'/') ) {
+ 						$xoopsTpl->assign('xoops_contents_tpldir', XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/templates/xoops');
+ 						$xoopsContentsTpl = 'file:'.XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/templates/xoops/'.$xoopsContentsTpl;
+ 					} else {
+ 						$xoopsTpl->assign('xoops_contents_tpldir', XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/templates/'.$xoopsConfig['default_theme']);
+ 						$xoopsContentsTpl = 'file:'.XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/templates/'.$xoopsConfig['default_theme'].'/'.$xoopsContentsTpl;
+ 					}
+ 				}
+ 				$cache = !empty($xoopsContentsTplCache) ? intval($xoopsContentsTplCache) : 0;
+ 				$xoopsTpl->cache_lifetime = $cache;
+ 				$xoopsTpl->display($xoopsContentsTpl);
+ 			}
+ 		}
  		if ( !isset($xoopsOption['show_rblock']) ) {
  			$xoopsOption['show_rblock'] = 0;
***************
*** 32,40 ****
  				$xoopsTpl->assign('xoops_contents', $xoopsTpl->fetch($xoopsContentsTpl));
  			}
- 		}
- 		if ($xoopsConfig['debug_mode']) {
- 			$xoopsLogger =& XoopsLogger::getInstance();
- 			$xoopsLogger->stopTime();
- 			$footer .= $xoopsLogger->dumpAll();
  		}
  		$xoopsTpl->assign('xoops_footer', $footer);
--- 55,58 ----

[Xoops-cvs2] xoops-current/html/modules/system/admin/preferences preferences.php,1.8,1.9

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

Update of /cvsroot/xoops/xoops-current/html/modules/system/admin/preferences
In directory usw-pr-cvs1:/tmp/cvs-serv7251

Modified Files:
	preferences.php 
Log Message:
no message

Index: preferences.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/preferences/preferences.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** preferences.php	21 Sep 2002 06:26:35 -0000	1.8
--- preferences.php	23 Sep 2002 21:13:29 -0000	1.9
***************
*** 275,284 ****
  			// we may want to move this to somewhere else...
  			if ( $default_theme != $old_theme ) {
! 				// include Smarty template engine and initialize it
! 				require_once(SMARTY_DIR."Smarty.class.php");
! 				$xoopsTpl = new Smarty();
! 				$xoopsTpl->compile_dir = XOOPS_ROOT_PATH."/templates_c";
  				// clear all compiled files
  				$xoopsTpl->clear_compiled_tpl();
  			}
  		}
--- 275,287 ----
  			// we may want to move this to somewhere else...
  			if ( $default_theme != $old_theme ) {
! 				require_once(XOOPS_ROOT_PATH.'/class/xoopstpl.php');
! 				$xoopsTpl = new XoopsTpl();
! 				$xoopsTpl->setCompileDir(XOOPS_ROOT_PATH.'/templates_c');
  				// clear all compiled files
  				$xoopsTpl->clear_compiled_tpl();
+ 				if (is_dir(XOOPS_ROOT_PATH.'/cache')) {
+ 					$xoopsTpl->setCacheDir(XOOPS_ROOT_PATH.'/cache');
+ 					$xoopsTpl->clear_all_cache();
+ 				}
  			}
  		}

[Xoops-cvs2] xoops-current/html/modules/system/admin/blocksadmin blocksadmin.php,1.4,1.5

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

Update of /cvsroot/xoops/xoops-current/html/modules/system/admin/blocksadmin
In directory usw-pr-cvs1:/tmp/cvs-serv7150

Modified Files:
	blocksadmin.php 
Log Message:
no message

Index: blocksadmin.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/blocksadmin/blocksadmin.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** blocksadmin.php	20 Sep 2002 16:21:07 -0000	1.4
--- blocksadmin.php	23 Sep 2002 21:13:13 -0000	1.5
***************
*** 100,109 ****
  			$block_templates =& XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks');
  		}
! 		echo '<tr valign="top"><td class="bg3"><b>'._AM_BTEMPLATE.'</b></td><td class="bg1"><select name="btemplate">';
  		foreach ($block_templates as $key => $value) {
  			echo '<option value="'.$key.'">'.$value.'</option>';
  		}
  		echo '</select></td></tr>';
! 		echo '<tr valign="top"><td class="bg3"><b>'._AM_ADVANCED.'</b></td><td class="bg1">'._AM_BCACHETIME.' <input type="text" name="bcachetime" size="10" maxlength="10" value="0" />';
  		//echo '<br />'._AM_BALIAS.' <input type="text" name="balias" size="50" maxlength="50" value="" />';
  		echo '</td></tr>';
--- 100,109 ----
  			$block_templates =& XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks');
  		}
! 		echo '<tr align="left" valign="top"><td class="bg3"><b>'._AM_BTEMPLATE.'</b></td><td class="bg1"><select name="btemplate">';
  		foreach ($block_templates as $key => $value) {
  			echo '<option value="'.$key.'">'.$value.'</option>';
  		}
  		echo '</select></td></tr>';
! 		echo '<tr align="left" valign="top"><td class="bg3"><b>'._AM_ADVANCED.'</b></td><td class="bg1">'._AM_BCACHETIME.' <input type="text" name="bcachetime" size="10" maxlength="10" value="0" />';
  		//echo '<br />'._AM_BALIAS.' <input type="text" name="balias" size="50" maxlength="50" value="" />';
  		echo '</td></tr>';
***************
*** 250,254 ****
  		if ( $myblock->getVar('visible') == 1 ) echo " selected='selected'";
  		echo '>'._AM_YES.'</option></select></td></tr>';
! 		echo '<tr><td class="bg3" valign="top"><b>'._AM_VISIBLEIN.'</b></td><td class="bg1"><select size="5" name="bmodule[]" multiple="multiple">';
  		$db =& Database::getInstance();
  		$sql = 'SELECT module_id FROM '.$db->prefix('block_module_link').' WHERE block_id='.intval($bid);
--- 250,254 ----
  		if ( $myblock->getVar('visible') == 1 ) echo " selected='selected'";
  		echo '>'._AM_YES.'</option></select></td></tr>';
! 		echo '<tr align="left" valign="top"><td class="bg3" valign="top"><b>'._AM_VISIBLEIN.'</b></td><td class="bg1"><select size="5" name="bmodule[]" multiple="multiple">';
  		$db =& Database::getInstance();
  		$sql = 'SELECT module_id FROM '.$db->prefix('block_module_link').' WHERE block_id='.intval($bid);
***************
*** 316,320 ****
  			$block_templates =& XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks/');
  		}
! 		echo '<tr valign="top"><td class="bg3"><b>'._AM_BTEMPLATE.'</b></td><td class="bg1"><select name="btemplate">';
  		foreach ($block_templates as $key => $value) {
  			echo '<option value="'.$key.'"';
--- 316,320 ----
  			$block_templates =& XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks/');
  		}
! 		echo '<tr align="left" valign="top"><td class="bg3"><b>'._AM_BTEMPLATE.'</b></td><td class="bg1"><select name="btemplate">';
  		foreach ($block_templates as $key => $value) {
  			echo '<option value="'.$key.'"';
***************
*** 331,335 ****
  			echo "</td></tr>";
  		}
! 		echo '<tr valign="top"><td class="bg3"><b>'._AM_ADVANCED.'</b></td><td class="bg1">'._AM_BCACHETIME.' <input type="text" name="bcachetime" size="10" maxlength="10" value="'.$myblock->getVar('bcachetime').'" />';
  		//echo '<br />'._AM_BALIAS.' <input type="text" name="balias" size="50" maxlength="50" value="'.$myblock->getVar('balias', 'E').'" />';
  		echo '</td></tr>';
--- 331,335 ----
  			echo "</td></tr>";
  		}
! 		echo '<tr align="left" valign="top"><td class="bg3"><b>'._AM_ADVANCED.'</b></td><td class="bg1">'._AM_BCACHETIME.' <input type="text" name="bcachetime" size="10" maxlength="10" value="'.$myblock->getVar('bcachetime').'" />';
  		//echo '<br />'._AM_BALIAS.' <input type="text" name="balias" size="50" maxlength="50" value="'.$myblock->getVar('balias', 'E').'" />';
  		echo '</td></tr>';
***************
*** 396,400 ****
  			$xoopsTpl->setTemplateDir(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme']);
  			if (!$xoopsTpl->clear_cache('file:'.XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks/'.$btemplate, $bid)) {
! 				echo 'false';
  			}
  		}
--- 396,400 ----
  			$xoopsTpl->setTemplateDir(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme']);
  			if (!$xoopsTpl->clear_cache('file:'.XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks/'.$btemplate, $bid)) {
! 				//echo 'false';
  			}
  		}

[Xoops-cvs2] xoops-current/html/modules/headlines/blocks headlines.php,1.1.1.1,1.2

[<w4...@us...>]

Update of /cvsroot/xoops/xoops-current/html/modules/headlines/blocks
In directory usw-pr-cvs1:/tmp/cvs-serv16398/html/modules/headlines/blocks

Modified Files:
	headlines.php 
Log Message:
removed the <p></p> for have the xhtml standard

Index: headlines.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/headlines/blocks/headlines.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** headlines.php	15 Jul 2002 08:13:17 -0000	1.1.1.1
--- headlines.php	22 Sep 2002 10:37:43 -0000	1.2
***************
*** 31,35 ****
  	while (list($hid, $sitename, $url, $headlinesurl, $status) = $xoopsDB->fetchRow($result)) {
  		$cache_file = "newsheadline-$hid.cache";
! 		$block['content'] .= "<p>";
  		// fsockopen was ok the last time, so do it again
  		if ( $status == 2 ) {
--- 31,35 ----
  	while (list($hid, $sitename, $url, $headlinesurl, $status) = $xoopsDB->fetchRow($result)) {
  		$cache_file = "newsheadline-$hid.cache";
! 		$block['content'] .= "";
  		// fsockopen was ok the last time, so do it again
  		if ( $status == 2 ) {
***************
*** 45,49 ****
  			$block['content'] .= $synd->getHtml(true);
  		}
! 		$block['content'] .= "</p>";
  		// set status to 2(ok) for headlines that passed fsockopen or used cache
  		$xoopsDB->queryF("UPDATE ".$xoopsDB->prefix("headlines")." SET status=2 WHERE hid=$hid");
--- 45,49 ----
  			$block['content'] .= $synd->getHtml(true);
  		}
! 		$block['content'] .= "";
  		// set status to 2(ok) for headlines that passed fsockopen or used cache
  		$xoopsDB->queryF("UPDATE ".$xoopsDB->prefix("headlines")." SET status=2 WHERE hid=$hid");

[Xoops-cvs2] xoops-current/html/themes/phpkaox layout.html,1.5,1.6

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

Update of /cvsroot/xoops/xoops-current/html/themes/phpkaox
In directory usw-pr-cvs1:/tmp/cvs-serv32104

Modified Files:
	layout.html 
Log Message:
no message

Index: layout.html
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/themes/phpkaox/layout.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** layout.html	21 Sep 2002 22:44:15 -0000	1.5
--- layout.html	22 Sep 2002 06:46:45 -0000	1.6
***************
*** 45,54 ****
            {if $xoops_showcblock == 1}
  
!             <table width="100%" id="xoopsCBlock">
  
              <!-- Start center-center blocks loop -->
              {foreach item=block from=$xoops_ccblocks}
!               <tr id="xoopsCCBlock">
!                 <td width='100%' valign='top' colspan='2'>
                    {$block}
                  </td>
--- 45,54 ----
            {if $xoops_showcblock == 1}
  
!             <table width="100%">
  
              <!-- Start center-center blocks loop -->
              {foreach item=block from=$xoops_ccblocks}
!               <tr>
!                 <td width="100%" valign="top" colspan="2">
                    {$block}
                  </td>

[Xoops-cvs2] xoops-current/html/modules/system/admin/modulesadmin modulesadmin.php,1.7,1.8

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

Update of /cvsroot/xoops/xoops-current/html/modules/system/admin/modulesadmin
In directory usw-pr-cvs1:/tmp/cvs-serv27748

Modified Files:
	modulesadmin.php 
Log Message:
no message

Index: modulesadmin.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/modulesadmin/modulesadmin.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** modulesadmin.php	22 Sep 2002 06:08:38 -0000	1.7
--- modulesadmin.php	22 Sep 2002 06:14:35 -0000	1.8
***************
*** 129,133 ****
  		}
  	}
! 	return "<p>".sprintf(_MD_AM_FAILINS, "<b>".$mymodule->name()."</b>")."&nbsp;"._MD_AM_ERRORSC."<br /> - ".sprintf(_MD_AM_ALEXISTS, $module)."</p>";
  }
  
--- 129,133 ----
  		}
  	}
! 	return "<p>".sprintf(_MD_AM_FAILINS, "<b>".$module."</b>")."&nbsp;"._MD_AM_ERRORSC."<br /> - ".sprintf(_MD_AM_ALEXISTS, $module)."</p>";
  }
  
***************
*** 348,352 ****
  				$moveLayers[$tree[$cnt][4]] .= "setleft('" . $layer_label[$cnt] . "'," . $abscissa[$tree[$cnt][0]] . ");\n";
  			}
! 			if (!isset()) {
  				$moveLayers[$tree[$cnt][4]] = "settop('" . $layer_label[$cnt] . "'," . $ordinata[$tree[$cnt][0]] . ");\n";
  			} else {
--- 348,352 ----
  				$moveLayers[$tree[$cnt][4]] .= "setleft('" . $layer_label[$cnt] . "'," . $abscissa[$tree[$cnt][0]] . ");\n";
  			}
! 			if (!isset($moveLayers[$tree[$cnt][4]])) {
  				$moveLayers[$tree[$cnt][4]] = "settop('" . $layer_label[$cnt] . "'," . $ordinata[$tree[$cnt][0]] . ");\n";
  			} else {
***************
*** 356,360 ****
  
  			// the new layer is accounted for in the shutdown() function
! 			$shutdown[$tree[$cnt][4]] .= "popUp('" . $layer_label[$cnt] . "',false);\n";
  		}
  		if ($tree[$cnt+1][0]>$tree[$cnt][0] && $cnt<$tmpcount) {
--- 356,364 ----
  
  			// the new layer is accounted for in the shutdown() function
! 			if (!isset($shutdown[$tree[$cnt][4]])) {
! 				$shutdown[$tree[$cnt][4]] = "popUp('" . $layer_label[$cnt] . "',false);\n";
! 			} else {
! 				$shutdown[$tree[$cnt][4]] .= "popUp('" . $layer_label[$cnt] . "',false);\n";
! 			}
  		}
  		if ($tree[$cnt+1][0]>$tree[$cnt][0] && $cnt<$tmpcount) {
***************
*** 402,406 ****
  			}
  			if (!isset($firstleveltable[$tree[$cnt][4]])) {
! 				$firstleveltable[$tree[$cnt][4]] .= "<a href='" . $currentlink . "'" . $onmouseover . "'" . $currenttarget . ">" . $tree[$cnt][5] . "</a>" . $currentarrow . "<br />\n";
  			} else {
  				$firstleveltable[$tree[$cnt][4]] .= "<a href='" . $currentlink . "'" . $onmouseover . "'" . $currenttarget . ">" . $tree[$cnt][5] . "</a>" . $currentarrow . "<br />\n";
--- 406,410 ----
  			}
  			if (!isset($firstleveltable[$tree[$cnt][4]])) {
! 				$firstleveltable[$tree[$cnt][4]] = "<a href='" . $currentlink . "'" . $onmouseover . "'" . $currenttarget . ">" . $tree[$cnt][5] . "</a>" . $currentarrow . "<br />\n";
  			} else {
  				$firstleveltable[$tree[$cnt][4]] .= "<a href='" . $currentlink . "'" . $onmouseover . "'" . $currenttarget . ">" . $tree[$cnt][5] . "</a>" . $currentarrow . "<br />\n";

[Xoops-cvs2] xoops-current/html/modules/system/admin/modulesadmin modulesadmin.php,1.6,1.7

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

Update of /cvsroot/xoops/xoops-current/html/modules/system/admin/modulesadmin
In directory usw-pr-cvs1:/tmp/cvs-serv26964

Modified Files:
	modulesadmin.php 
Log Message:
no message

Index: modulesadmin.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/modulesadmin/modulesadmin.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** modulesadmin.php	20 Sep 2002 16:31:59 -0000	1.6
--- modulesadmin.php	22 Sep 2002 06:08:38 -0000	1.7
***************
*** 286,290 ****
  			$tree[$cnt][0] = 1;
  			$tree[$cnt][5] = "<img src='\".XOOPS_URL.\"/modules/".$mod->dirname()."/".$mod->image()."' />";
! 			$tree[$cnt][1] .= $mod->name();
  			$tree[$cnt][2] = "\".XOOPS_URL.\"/modules/".$mod->dirname()."/".$mod->adminindex();
  			$tree[$cnt][3] = "";
--- 286,290 ----
  			$tree[$cnt][0] = 1;
  			$tree[$cnt][5] = "<img src='\".XOOPS_URL.\"/modules/".$mod->dirname()."/".$mod->image()."' />";
! 			$tree[$cnt][1] = $mod->name();
  			$tree[$cnt][2] = "\".XOOPS_URL.\"/modules/".$mod->dirname()."/".$mod->adminindex();
  			$tree[$cnt][3] = "";
***************
*** 343,348 ****
  
  			// geometrical parameters are assigned to the new layer, related to the above mentioned children
! 			$moveLayers[$tree[$cnt][4]] .= "setleft('" . $layer_label[$cnt] . "'," . $abscissa[$tree[$cnt][0]] . ");\n";
! 			$moveLayers[$tree[$cnt][4]] .= "settop('" . $layer_label[$cnt] . "'," . $ordinata[$tree[$cnt][0]] . ");\n";
  			//$moveLayers[$tree[$cnt][4]] .= "setwidth('" . $layer_label[$cnt] . "'," . $abscissa_step . ");\n";
  
--- 343,356 ----
  
  			// geometrical parameters are assigned to the new layer, related to the above mentioned children
! 			if (!isset($moveLayers[$tree[$cnt][4]])) {
! 				$moveLayers[$tree[$cnt][4]] = "setleft('" . $layer_label[$cnt] . "'," . $abscissa[$tree[$cnt][0]] . ");\n";
! 			} else {
! 				$moveLayers[$tree[$cnt][4]] .= "setleft('" . $layer_label[$cnt] . "'," . $abscissa[$tree[$cnt][0]] . ");\n";
! 			}
! 			if (!isset()) {
! 				$moveLayers[$tree[$cnt][4]] = "settop('" . $layer_label[$cnt] . "'," . $ordinata[$tree[$cnt][0]] . ");\n";
! 			} else {
! 				$moveLayers[$tree[$cnt][4]] .= "settop('" . $layer_label[$cnt] . "'," . $ordinata[$tree[$cnt][0]] . ");\n";
! 			}
  			//$moveLayers[$tree[$cnt][4]] .= "setwidth('" . $layer_label[$cnt] . "'," . $abscissa_step . ");\n";
  
***************
*** 393,397 ****
  				$onmouseover = " onMouseover='shutdown();";
  			}
! 			$firstleveltable[$tree[$cnt][4]] .= "<a href='" . $currentlink . "'" . $onmouseover . "'" . $currenttarget . ">" . $tree[$cnt][5] . "</a>" . $currentarrow . "<br />\n";
  		}
  	}	// end of the "for" cycle scanning all nodes
--- 401,409 ----
  				$onmouseover = " onMouseover='shutdown();";
  			}
! 			if (!isset($firstleveltable[$tree[$cnt][4]])) {
! 				$firstleveltable[$tree[$cnt][4]] .= "<a href='" . $currentlink . "'" . $onmouseover . "'" . $currenttarget . ">" . $tree[$cnt][5] . "</a>" . $currentarrow . "<br />\n";
! 			} else {
! 				$firstleveltable[$tree[$cnt][4]] .= "<a href='" . $currentlink . "'" . $onmouseover . "'" . $currenttarget . ">" . $tree[$cnt][5] . "</a>" . $currentarrow . "<br />\n";
! 			}
  		}
  	}	// end of the "for" cycle scanning all nodes