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

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

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

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

Modified Files:
	xoopspollrenderer.php 
Log Message:
no message

Index: xoopspollrenderer.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/xoopspoll/class/xoopspollrenderer.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xoopspollrenderer.php	4 Aug 2002 19:36:12 -0000	1.3
--- xoopspollrenderer.php	10 Sep 2002 02:16:21 -0000	1.4
***************
*** 76,80 ****
  				$percent = 0;
  			}
! 			echo "<tr class='bg1'><td width='30%'>".$option->getVar("option_text")."</td><td width='70%'>";
  			if ( $percent > 0 ) {
  				$width = intval($percent)*2;
--- 76,80 ----
  				$percent = 0;
  			}
! 			echo "<tr class='bg1'><td width='30%' align='left'>".$option->getVar("option_text")."</td><td width='70%' align='left'>";
  			if ( $percent > 0 ) {
  				$width = intval($percent)*2;

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

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

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

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.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** pollresults.php	15 Jul 2002 08:14:01 -0000	1.1.1.1
--- pollresults.php	10 Sep 2002 02:13:33 -0000	1.2
***************
*** 59,67 ****
  $parentid = $pollcomment->getVar("pid");
  if ( empty($parentid) ){
! 	OpenTable();
      	$poll = new XoopsPoll($item_id);
  	$renderer = new XoopsPollRenderer($poll);
  	$renderer->renderResults();
!     	CloseTable();
  	echo "<br />";
  }
--- 59,67 ----
  $parentid = $pollcomment->getVar("pid");
  if ( empty($parentid) ){
! 	//OpenTable();
      	$poll = new XoopsPoll($item_id);
  	$renderer = new XoopsPollRenderer($poll);
  	$renderer->renderResults();
!     	//CloseTable();
  	echo "<br />";
  }

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

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

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

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

Index: index.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/xoopspoll/admin/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.php	4 Aug 2002 19:35:48 -0000	1.2
--- index.php	10 Sep 2002 00:45:38 -0000	1.3
***************
*** 442,454 ****
  	$contents = "";
  	foreach ( $polls as $poll ) {
- 		$contents .= "<p>";
  		$renderer = new XoopsPollRenderer($poll);
  		$contents .= $renderer->renderForm();
! 		$contents .= "</p>";
! 	}
  	if (!xoopsfwrite()) {
  		return;
  	}
! 	
  	$file = fopen($filename, "w");
  	if ( fwrite($file, $contents) == -1) {
--- 442,452 ----
  	$contents = "";
  	foreach ( $polls as $poll ) {
  		$renderer = new XoopsPollRenderer($poll);
  		$contents .= $renderer->renderForm();
! 		}
  	if (!xoopsfwrite()) {
  		return;
  	}
! 
  	$file = fopen($filename, "w");
  	if ( fwrite($file, $contents) == -1) {

[Xoops-cvs2] xoops-current/html/modules/newbb/blocks newbb_new.php,1.3,1.4

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

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

Modified Files:
	newbb_new.php 
Log Message:
line 37 removed valign='top'  for have xhtml standard

Index: newbb_new.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/newbb/blocks/newbb_new.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** newbb_new.php	23 Aug 2002 06:31:51 -0000	1.3
--- newbb_new.php	9 Sep 2002 21:15:01 -0000	1.4
***************
*** 35,39 ****
  	}
      	if ($xoopsDB->getRowsNum($result) > 0) {
! 		$block['content'] = "<table border='0' cellpadding='0' cellspacing='0' valign='top' width='100%' class='bg2'><tr><td>\n";
  		$block['content'] .= "<table width='100%' border='0' cellpadding='4' cellspacing='1'>\n";
  		$block['content'] .= "<tr class='bg3'>";
--- 35,39 ----
  	}
      	if ($xoopsDB->getRowsNum($result) > 0) {
! 		$block['content'] = "<table border='0' cellpadding='0' cellspacing='0' width='100%' class='bg2'><tr><td>\n";
  		$block['content'] .= "<table width='100%' border='0' cellpadding='4' cellspacing='1'>\n";
  		$block['content'] .= "<tr class='bg3'>";

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

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

Update of /cvsroot/xoops/xoops-current/html/modules/whosonline/language/spanish
In directory usw-pr-cvs1:/tmp/cvs-serv32608/html/modules/whosonline/language/spanish

Modified Files:
	blocks.php 
Log Message:
no comments

Index: blocks.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/whosonline/language/spanish/blocks.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** blocks.php	15 Jul 2002 08:14:01 -0000	1.1.1.1
--- blocks.php	7 Sep 2002 21:38:03 -0000	1.2
***************
*** 1,8 ****
! <?php // Xoops Spanish Support (www.xoops.sytes.net) 
  // Blocks
  define("_MB_WHOSONLINE_TITLE1","Quién está en linea?");
  
! //first %s represents the number of guests, the second represents members. The order cannot be changed! 
! define("_MB_WHOSONLINE_THERE","Hay actualmente, %s invitado(s) y %s miembro(s) que estan en linea.");
  
  // %s represents user name
--- 1,8 ----
! <?php // Xoops Spanish Support (www.xoops.sytes.net)
  // Blocks
  define("_MB_WHOSONLINE_TITLE1","Quién está en linea?");
  
! //first %s represents the number of guests, the second represents members. The order cannot be changed!
! define("_MB_WHOSONLINE_THERE","<img border='0' src='/images/pointer.gif' alt='invitados' /> %s invitado(s) <br /><img border='0' src='/images/pointer.gif' alt='invitados' /> %s miembro(s)");
  
  // %s represents user name
***************
*** 10,14 ****
  
  define("_MB_WHOSONLINE_MORE","más...");
! define("_MB_WHOSONLINE_URAU","<img border='0' src='/images\info2.gif' alt='Usuario Anónimo'> <br>Usted es un Usuario Anónimo.");
  define("_MB_WHOSONLINE_RNOW","Regístrese Ahora!");
  define("_MB_WHOSONLINE_CURU","Usuarios en linea Registrados:");
--- 10,14 ----
  
  define("_MB_WHOSONLINE_MORE","más...");
! define("_MB_WHOSONLINE_URAU","<img border='0' src='/images/info.gif' alt='Usuario Anónimo' /> <br />Usted es un Usuario Anónimo.");
  define("_MB_WHOSONLINE_RNOW","Regístrese Ahora!");
  define("_MB_WHOSONLINE_CURU","Usuarios en linea Registrados:");
***************
*** 25,28 ****
  define("_MB_WHOSONLINE_DAYS2","dias");
  define("_MB_WHOSONLINE_MEMS","miembros");
! define("_MB_WHOSONLINE_SLAST","Mostrar ultimas visitas");
  ?>
--- 25,28 ----
  define("_MB_WHOSONLINE_DAYS2","dias");
  define("_MB_WHOSONLINE_MEMS","miembros");
! define("_MB_WHOSONLINE_SLAST","Mostrar últimas visitas");
  ?>

[Xoops-cvs2] xoops-current/html/class xoopslists.php,1.2,1.3

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

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

Modified Files:
	xoopslists.php 
Log Message:
no message

Index: xoopslists.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopslists.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** xoopslists.php	4 Aug 2002 19:39:26 -0000	1.2
--- xoopslists.php	6 Sep 2002 03:35:44 -0000	1.3
***************
*** 33,39 ****
  		 */
  		function &getThemesList() {
! 			$themes_list = array();
! 			$themes_list =& XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH."/themes/");
! 			return $themes_list;
  		}
  
--- 33,37 ----
  		 */
  		function &getThemesList() {
! 			return XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH."/themes/");
  		}
  
***************
*** 46,50 ****
  			$handle=@opendir($dirname);
  			while ( ($file = readdir($handle)) ) {
! 				if ( !ereg("^[.]{1,2}$",$file) ) {
  					if ( is_dir($dirname.$file) ) {
  						$dirlist[$file]=$file;
--- 44,48 ----
  			$handle=@opendir($dirname);
  			while ( ($file = readdir($handle)) ) {
! 				if ( !preg_match("/^[.]{1,2}$/",$file) ) {
  					if ( is_dir($dirname.$file) ) {
  						$dirlist[$file]=$file;
***************
*** 66,70 ****
  			$handle=@opendir($dirname);
  			while ( ($file = readdir($handle)) ) {
! 				if ( !ereg("^[.]{1,2}$",$file) && ereg(".gif|.jpg|.png",$file) ) {
  					$file = $prefix.$file;
  					$filelist[$file]=$file;
--- 64,68 ----
  			$handle=@opendir($dirname);
  			while ( ($file = readdir($handle)) ) {
! 				if ( !preg_match("/^[.]{1,2}$/",$file) && preg_match("/[.gif|.jpg|.png]$/i",$file) ) {
  					$file = $prefix.$file;
  					$filelist[$file]=$file;

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

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

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

Modified Files:
	header.php 
Log Message:
no message

Index: header.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/header.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** header.php	5 Sep 2002 11:10:36 -0000	1.4
--- header.php	6 Sep 2002 03:20:02 -0000	1.5
***************
*** 80,92 ****
  		}
  		if ( $xoopsUser ) {
! 			$arr = $xoopsblock->getAllBlocksByGroup($xoopsUser->groups(), true, $side, XOOPS_BLOCK_VISIBLE);
  		} else {
! 			$arr = $xoopsblock->getAllBlocksByGroup(XoopsGroup::getByType("Anonymous"), true, $side, XOOPS_BLOCK_VISIBLE);
  		}
! 		foreach ( $arr as $myblock ) {
! 			$block = array();
! 			$block = $myblock->buildBlock();
  			if ( $block ) {
! 				if ( XOOPS_SIDEBLOCK_LEFT == $myblock->getVar('side') ) {
  					$xoopsTpl->append('xoops_lblocks', array('title' => $block['title'], 'content' => $block['content']));
  				} else {
--- 80,92 ----
  		}
  		if ( $xoopsUser ) {
! 			$arr =& $xoopsblock->getAllBlocksByGroup($xoopsUser->groups(), true, $side, XOOPS_BLOCK_VISIBLE);
  		} else {
! 			$arr =& $xoopsblock->getAllBlocksByGroup(XoopsGroup::getByType("Anonymous"), true, $side, XOOPS_BLOCK_VISIBLE);
  		}
! 		$block_count = count($arr);
! 		for ($i = 0; $i < $block_count; $i++) {
! 			$block =& $arr[$i]->buildBlock();
  			if ( $block ) {
! 				if ( XOOPS_SIDEBLOCK_LEFT == $arr[$i]->getVar('side') ) {
  					$xoopsTpl->append('xoops_lblocks', array('title' => $block['title'], 'content' => $block['content']));
  				} else {
***************
*** 94,98 ****
  				}
  			}
- 			unset($myblock);
  			unset($block);
  		}
--- 94,97 ----

[Xoops-cvs2] xoops-current/html/include functions.php,1.11,1.12

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

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

Modified Files:
	functions.php 
Log Message:
no message

Index: functions.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/include/functions.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** functions.php	3 Sep 2002 06:45:39 -0000	1.11
--- functions.php	6 Sep 2002 02:36:50 -0000	1.12
***************
*** 418,422 ****
  		global $xoopsUser;
  		$xoopsblock = new XoopsBlock();
- 		$arr = array();
  		if ( $side == "left" ) {
  			$side = XOOPS_SIDEBLOCK_LEFT;
--- 418,421 ----
***************
*** 427,438 ****
  		}
  		if ( $xoopsUser ) {
! 			$arr = $xoopsblock->getAllBlocksByGroup($xoopsUser->groups(), true, $side, XOOPS_BLOCK_VISIBLE);
  		} else {
! 			$arr = $xoopsblock->getAllBlocksByGroup(XoopsGroup::getByType("Anonymous"), true, $side, XOOPS_BLOCK_VISIBLE);
  		}
! 		foreach ( $arr as $myblock ) {
  			$block = array();
! 			$block = $myblock->buildBlock();
! 			if($block){
  				if ( $side == XOOPS_SIDEBLOCK_LEFT ) {
                          		themesidebox($block['title'],$block['content']);
--- 426,438 ----
  		}
  		if ( $xoopsUser ) {
! 			$arr =& $xoopsblock->getAllBlocksByGroup($xoopsUser->groups(), true, $side, XOOPS_BLOCK_VISIBLE);
  		} else {
! 			$arr =& $xoopsblock->getAllBlocksByGroup(XoopsGroup::getByType("Anonymous"), true, $side, XOOPS_BLOCK_VISIBLE);
  		}
! 		$block_count = count($arr);
! 		for ($i = 0; $i < $block_count; $i++) {
  			$block = array();
! 			$block =& $arr[$i]->buildBlock();
! 			if ($block) {
  				if ( $side == XOOPS_SIDEBLOCK_LEFT ) {
                          		themesidebox($block['title'],$block['content']);
***************
*** 443,447 ****
  				}
  			}
- 			unset($myblock);
  			unset($block);
  		}
--- 443,446 ----
***************
*** 457,470 ****
  		$arr = array();
  		if ( $xoopsUser ) {
! 			$arr = $xoopsblock->getAllBlocksByGroup($xoopsUser->groups(), true, XOOPS_CENTERBLOCK_ALL, XOOPS_BLOCK_VISIBLE);
  		} else {
! 			$arr = $xoopsblock->getAllBlocksByGroup(XoopsGroup::getByType("Anonymous"), true, XOOPS_CENTERBLOCK_ALL, XOOPS_BLOCK_VISIBLE);
  		}
! 		if ( count($arr) > 0 ){
! 			foreach ( $arr as $myblock ) {
! 				$block = array();
! 				$block = $myblock->buildBlock();
  				if ( $block ) {
! 					if ( XOOPS_CENTERBLOCK_CENTER == $myblock->getVar("side") ) {
  						if ( $block['title'] != "" ) {
  							$cc_block .= "<tr valign='top'><td colspan='2'><b>".$block['title']."</b><br />".$block['content']."<br /><br /></td></tr>\n";
--- 456,469 ----
  		$arr = array();
  		if ( $xoopsUser ) {
! 			$arr =& $xoopsblock->getAllBlocksByGroup($xoopsUser->groups(), true, XOOPS_CENTERBLOCK_ALL, XOOPS_BLOCK_VISIBLE);
  		} else {
! 			$arr =& $xoopsblock->getAllBlocksByGroup(XoopsGroup::getByType("Anonymous"), true, XOOPS_CENTERBLOCK_ALL, XOOPS_BLOCK_VISIBLE);
  		}
! 		$block_count = count($arr);
! 		if ($block_count > 0) {
! 			for ($i = 0; $i < $block_count; $i++) {
! 				$block =& $arr[$i]->buildBlock();
  				if ( $block ) {
! 					if ( XOOPS_CENTERBLOCK_CENTER == $arr[$i]->getVar("side") ) {
  						if ( $block['title'] != "" ) {
  							$cc_block .= "<tr valign='top'><td colspan='2'><b>".$block['title']."</b><br />".$block['content']."<br /><br /></td></tr>\n";
***************
*** 472,476 ****
  							$cc_block .= "<tr><td colspan='2'>".$block['content']."<br /><br /></td></tr>\n";
  						}
! 					} elseif ( XOOPS_CENTERBLOCK_LEFT == $myblock->getVar("side") ) {
  						if ( $block['title'] != "" ) {
  							$cl_block .= "<p><b>".$block['title']."</b><br />".$block['content']."</p>\n";
--- 471,475 ----
  							$cc_block .= "<tr><td colspan='2'>".$block['content']."<br /><br /></td></tr>\n";
  						}
! 					} elseif ( XOOPS_CENTERBLOCK_LEFT == $arr[$i]->getVar("side") ) {
  						if ( $block['title'] != "" ) {
  							$cl_block .= "<p><b>".$block['title']."</b><br />".$block['content']."</p>\n";
***************
*** 486,490 ****
  					}
  				}
- 				unset($myblock);
  				unset($block);
  			}
--- 485,488 ----

[Xoops-cvs2] xoops-current/html/class xoopsblock.php,1.3,1.4

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

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

Modified Files:
	xoopsblock.php 
Log Message:
no message

Index: xoopsblock.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopsblock.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xoopsblock.php	8 Aug 2002 17:50:09 -0000	1.3
--- xoopsblock.php	6 Sep 2002 02:28:42 -0000	1.4
***************
*** 181,188 ****
  				// align content if there is additional content
  				// in db
! 				$block['content'] = $this->buildContent($this->getVar("position"),$block['content'],$this->getContent("S",$this->getVar("c_type")));
  				// replace title if there is additional title
  				// in db
! 				$block['title'] = $this->buildTitle($block['title'], $this->getVar("title"));
  			} else {
  				return false;
--- 181,188 ----
  				// align content if there is additional content
  				// in db
! 				$block['content'] =& $this->buildContent($this->getVar("position"),$block['content'],$this->getContent("S",$this->getVar("c_type")));
  				// replace title if there is additional title
  				// in db
! 				$block['title'] =& $this->buildTitle($block['title'], $this->getVar("title"));
  			} else {
  				return false;
***************
*** 204,208 ****
  	* after the original content
  	*/
! 	function buildContent($position,$content="",$contentdb="") {
  		if ( $position == 0 ) {
  			$ret = $contentdb.$content;
--- 204,208 ----
  	* after the original content
  	*/
! 	function &buildContent($position,$content="",$contentdb="") {
  		if ( $position == 0 ) {
  			$ret = $contentdb.$content;
***************
*** 213,217 ****
  	}
  
! 	function buildTitle($originaltitle, $newtitle="") {
  		if ($newtitle != "") {
  			$ret = $newtitle;
--- 213,217 ----
  	}
  
! 	function &buildTitle($originaltitle, $newtitle="") {
  		if ($newtitle != "") {
  			$ret = $newtitle;

[Xoops-cvs2] xoops-current/html/language/spanish/mail_template adminactivate.tpl,NONE,1.1

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

Update of /cvsroot/xoops/xoops-current/html/language/spanish/mail_template
In directory usw-pr-cvs1:/tmp/cvs-serv32386/html/language/spanish/mail_template

Added Files:
	adminactivate.tpl 
Log Message:
no comment

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

[Xoops-cvs2] xoops-current/html/modules/system/language/spanish/admin preferences.php,1.2,1.3

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

Update of /cvsroot/xoops/xoops-current/html/modules/system/language/spanish/admin
In directory usw-pr-cvs1:/tmp/cvs-serv30849/html/modules/system/language/spanish/admin

Modified Files:
	preferences.php 
Log Message:
no comments

Index: preferences.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/language/spanish/admin/preferences.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** preferences.php	10 Aug 2002 02:07:10 -0000	1.2
--- preferences.php	6 Sep 2002 00:35:49 -0000	1.3
***************
*** 60,62 ****
  define("_MD_AM_ALLOWIMAGE","Permitir a los usuarios mostrar archivos de imagenes en los envíos?");
  
! ?>
--- 60,67 ----
  define("_MD_AM_ALLOWIMAGE","Permitir a los usuarios mostrar archivos de imagenes en los envíos?");
  
! define("_MD_AM_USERACTV","Requiere activación por usuario (recomendada)");
! define("_MD_AM_AUTOACTV","Activar automaticamente");
! define("_MD_AM_ADMINACTV","Activación por Administradores");
! define("_MD_AM_ACTVTYPE","Seleccione el tipo de activación para los users nuevos que se registran");
! define("_MD_AM_ACTVGROUP","Enviar mail de activación de cuenta a (valido solamente cuando 'Activación por Administradores' es seleccionado):");
! ?>
\ No newline at end of file

[Xoops-cvs2] xoops-current/html/language/spanish user.php,1.3,1.4

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

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

Modified Files:
	user.php 
Log Message:
no comments

Index: user.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/language/spanish/user.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** user.php	9 Aug 2002 09:36:01 -0000	1.3
--- user.php	6 Sep 2002 00:35:48 -0000	1.4
***************
*** 53,57 ****
  define("_US_REGISTERNG","No p[uedo registrar Nuevo Usuario.");
  define("_US_WELCOME","Bienvenido a %s!");
! define('_US_MAILOK',"Permitir a los administradores y moderadores enviarle emails de notificación?");
  
  
--- 53,57 ----
  define("_US_REGISTERNG","No p[uedo registrar Nuevo Usuario.");
  define("_US_WELCOME","Bienvenido a %s!");
! define('_US_MAILOK',"Permitir a los administradores y moderadores enviarle emails con noticias?");
  
  
***************
*** 63,66 ****
--- 63,68 ----
  define("_US_YOURREGISTERED","Usted está ahora Registrado. Recibirá su contraseña en la cuenta de email que facilitó.");
  define("_US_YOURREGMAILNG","Usted está ahora Registrado. estamos imposibilitados de enviar el mail de activacion a su cuenta de email por un problema interno de nuestro server. lamentamos el inconveniente, por favor contacte al administrador por mail.");
+ define('_US_YOURREGISTERED2','Usted está ahora registrado. Por favor aguarde a que su cuenta sea activada por los administradores.');
+ 
  
  // %s is your site name

[Xoops-cvs2] xoops-current/html/language/english/mail_template adminactivate.tpl,NONE,1.1

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

Update of /cvsroot/xoops/xoops-current/html/language/english/mail_template
In directory usw-pr-cvs1:/tmp/cvs-serv22336

Added Files:
	adminactivate.tpl 
Log Message:
no message

--- NEW FILE: adminactivate.tpl ---
Hello {X_UNAME},

A new user {USERNAME} ({USEREMAIL}) has just registered an account at {SITENAME}.
Clicking on the link below will activate the account of this user:

{USERACTLINK}

-----------
{SITENAME} ({SITEURL}) 
webmaster
{ADMINMAIL}

[Xoops-cvs2] xoops-current/html/language/english user.php,1.2,1.3

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

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

Modified Files:
	user.php 
Log Message:
no message

Index: user.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/language/english/user.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** user.php	8 Aug 2002 16:03:08 -0000	1.2
--- user.php	5 Sep 2002 11:12:18 -0000	1.3
***************
*** 53,57 ****
  define("_US_REGISTERNG","Could not register new user.");
  define("_US_WELCOME","Welcome to %s!");
! define('_US_MAILOK',"Allow site administrators and moderators to send you email notices?");
  
  
--- 53,57 ----
  define("_US_REGISTERNG","Could not register new user.");
  define("_US_WELCOME","Welcome to %s!");
! define('_US_MAILOK',"Allow site administrators and moderators to send email notices?");
  
  
***************
*** 61,64 ****
--- 61,65 ----
  define("_US_YOURREGISTERED","You are now registered. Email containing an user activation key has been sent to the email account you provided. Please follow the instruction on the mail to activate your acount. ");
  define("_US_YOURREGMAILNG","You are now registered. However, we were unable to send the activation mail to your email account due to an internal error occurred on our server. We are sorry for the inconvenience, but please contact the webmaster by mail.");
+ define('_US_YOURREGISTERED2','You are now registered. Please wait for your account to be activated by the administrators.');
  
  // %s is your site name

[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');
  ?>

[Xoops-cvs2] xoops-current/html/modules/system/language/english/admin preferences.php,1.2,1.3

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

Update of /cvsroot/xoops/xoops-current/html/modules/system/language/english/admin
In directory usw-pr-cvs1:/tmp/cvs-serv21916

Modified Files:
	preferences.php 
Log Message:
no message

Index: preferences.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/language/english/admin/preferences.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** preferences.php	10 Aug 2002 00:19:49 -0000	1.2
--- preferences.php	5 Sep 2002 11:11:11 -0000	1.3
***************
*** 59,61 ****
--- 59,67 ----
  define("_MD_AM_ALLOWTHEME","Allow users to select theme?");
  define("_MD_AM_ALLOWIMAGE","Allow users to display image files in posts?");
+ 
+ define("_MD_AM_USERACTV","Requires activation by user (recommended)");
+ define("_MD_AM_AUTOACTV","Activate automatically");
+ define("_MD_AM_ADMINACTV","Activation by administrators");
+ define("_MD_AM_ACTVTYPE","Select activation type of newly registered users");
+ define("_MD_AM_ACTVGROUP","Send account activation mail to (valid only when 'Activation by administrators' is selected):");
  ?>

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

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

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

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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** preferences.php	23 Aug 2002 04:18:03 -0000	1.4
--- preferences.php	5 Sep 2002 11:10:57 -0000	1.5
***************
*** 38,44 ****
  		$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);
! 		$newuser_tray = new XoopsFormElementTray(_MD_AM_NEWUNOTIFY, "<br />");
  		$newuser_tray->addElement($newuser_radio);
  		$newuser_tray->addElement($newuser_group_select);
  		$sdelete_radio = new XoopsFormRadioYN(_MD_AM_SELFDELETE, "self_delete", $xoopsConfig['self_delete'], _MD_AM_YES,_MD_AM_NO);
  		$loading_radio = new XoopsFormRadioYN(_MD_AM_LOADINGIMG, "display_loading_img", $xoopsConfig['display_loading_img'], _MD_AM_YES,_MD_AM_NO);
--- 38,52 ----
  		$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);
! 		$newuser_tray = new XoopsFormElementTray(_MD_AM_NEWUNOTIFY, '<br />');
  		$newuser_tray->addElement($newuser_radio);
  		$newuser_tray->addElement($newuser_group_select);
+ 
+ 		$actv_select = new XoopsFormSelect('', 'activation_type', $xoopsConfig['activation_type']);
+ 		$actv_select->addOptionArray(array(0 => _MD_AM_USERACTV, 1 => _MD_AM_AUTOACTV, 2 => _MD_AM_ADMINACTV));
+ 		$actv_group_select = new XoopsFormSelectGroup(_MD_AM_ACTVGROUP.'<br />', 'activation_group', false, $xoopsConfig['activation_group'], 1, false);
+ 		$actv_tray = new XoopsFormElementTray(_MD_AM_ACTVTYPE, '<br /><br />');
+ 		$actv_tray->addElement($actv_select);
+ 		$actv_tray->addElement($actv_group_select);
+ 
  		$sdelete_radio = new XoopsFormRadioYN(_MD_AM_SELFDELETE, "self_delete", $xoopsConfig['self_delete'], _MD_AM_YES,_MD_AM_NO);
  		$loading_radio = new XoopsFormRadioYN(_MD_AM_LOADINGIMG, "display_loading_img", $xoopsConfig['display_loading_img'], _MD_AM_YES,_MD_AM_NO);
***************
*** 97,100 ****
--- 105,109 ----
  		$form->addElement($allowimage_radio);
  		$form->addElement($newuser_tray);
+ 		$form->addElement($actv_tray);
  		$form->addElement($sdelete_radio);
  		$form->addElement($loading_radio);
***************
*** 121,125 ****
  	}
  
! 	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, $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()) {
--- 130,134 ----
  	}
  
! 	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()) {
***************
*** 193,196 ****
--- 202,210 ----
  // "._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.")
+ \$xoopsConfig['activation_type'] = ".intval($activation_type).";
+ // "._MD_AM_ACTVGROUP."
+ \$xoopsConfig['activation_group'] = ".intval($activation_group).";
  
  // "._MD_AM_NEWUNOTIFY." (1="._MD_AM_YES." 0="._MD_AM_NO.")

Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/preferences/main.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** main.php	23 Aug 2002 04:18:04 -0000	1.3
--- main.php	5 Sep 2002 11:10:57 -0000	1.4
***************
*** 29,33 ****
  				}
  			}
! 			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, $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":
--- 29,33 ----
  				}
  			}
! 			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":

[Xoops-cvs2] xoops-current/html register.php,1.3,1.4 header.php,1.3,1.4 footer.php,1.4,1.5

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

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

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

Index: register.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/register.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** register.php	8 Aug 2002 16:02:13 -0000	1.3
--- register.php	5 Sep 2002 11:10:36 -0000	1.4
***************
*** 145,149 ****
  		break;
  	case "finish":
- 		$myts =& MyTextSanitizer::getInstance();
  		include("header.php");
  		$uname = trim($uname);
--- 145,148 ----
***************
*** 167,171 ****
  			}
  			$newuser->setVar("user_avatar",$user_avatar);
! 			$newuser->setVar("actkey",substr(md5(makepass()), 0, 8));
  			$newuser->setVar("pass", md5($pass));
  			$newuser->setVar("timezone_offset", $timezone_offset);
--- 166,171 ----
  			}
  			$newuser->setVar("user_avatar",$user_avatar);
! 			$actkey = substr(md5(makepass()), 0, 8);
! 			$newuser->setVar("actkey",$actkey);
  			$newuser->setVar("pass", md5($pass));
  			$newuser->setVar("timezone_offset", $timezone_offset);
***************
*** 174,201 ****
  			$newuser->setVar("umode",$xoopsConfig['com_mode']);
  			$newuser->setVar("user_mailok",$user_mailok);
  			$newid = $newuser->store();
  			if ( !$newid ) {
  				echo _US_REGISTERNG;
! 				include("footer.php");
  				exit();
  			}
! 			$xoopsMailer =& getMailer();
! 			$xoopsMailer->useMail();
! 			$xoopsMailer->setTemplate("register.tpl");
! 			$xoopsMailer->assign("SITENAME", $xoopsConfig['sitename']);
! 			$xoopsMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
! 			$xoopsMailer->assign("SITEURL", XOOPS_URL."/");
! 			$xoopsMailer->setToUsers(new XoopsUser($newid));
! 			$xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
! 			$xoopsMailer->setFromName($xoopsConfig['sitename']);
! 			$xoopsMailer->setSubject(sprintf(_US_USERKEYFOR,$uname));
! 			OpenTable();
! 			if ( !$xoopsMailer->send() ) {
! 				echo _US_YOURREGMAILNG;
! 			} else {
! 				echo _US_YOURREGISTERED;
  			}
! 			CloseTable();
! 			if ( $xoopsConfig['new_user_notify'] == 1 && !empty($xoopsConfig['new_user_notify_group']) ) {
  				$xoopsMailer =& getMailer();
  				$xoopsMailer->useMail();
--- 174,234 ----
  			$newuser->setVar("umode",$xoopsConfig['com_mode']);
  			$newuser->setVar("user_mailok",$user_mailok);
+ 			if ($xoopsConfig['activation_type'] == 1) {
+ 				$newuser->setVar('level', 1);
+ 			}
  			$newid = $newuser->store();
  			if ( !$newid ) {
  				echo _US_REGISTERNG;
! 				include('footer.php');
  				exit();
  			}
! 			if ($xoopsConfig['activation_type'] == 1) {
! 				redirect_header("user.php", 4, _US_ACTLOGIN);
! 				exit();
  			}
! 			if ($xoopsConfig['activation_type'] == 0) {
! 				$myts =& MyTextSanitizer::getInstance();
! 				$xoopsMailer =& getMailer();
! 				$xoopsMailer->useMail();
! 				$xoopsMailer->setTemplate("register.tpl");
! 				$xoopsMailer->assign("SITENAME", $xoopsConfig['sitename']);
! 				$xoopsMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
! 				$xoopsMailer->assign("SITEURL", XOOPS_URL."/");
! 				$xoopsMailer->setToUsers(new XoopsUser($newid));
! 				$xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
! 				$xoopsMailer->setFromName($xoopsConfig['sitename']);
! 				$xoopsMailer->setSubject(sprintf(_US_USERKEYFOR,$myts->oopsStripSlashesGPC($uname)));
! 				OpenTable();
! 				if ( !$xoopsMailer->send() ) {
! 					echo _US_YOURREGMAILNG;
! 				} else {
! 					echo _US_YOURREGISTERED;
! 				}
! 				CloseTable();
! 			} elseif ($xoopsConfig['activation_type'] == 2) {
! 				$myts =& MyTextSanitizer::getInstance();
! 				$xoopsMailer =& getMailer();
! 				$xoopsMailer->useMail();
! 				$xoopsMailer->setTemplate('adminactivate.tpl');
! 				$xoopsMailer->assign('USERNAME', $myts->oopsStripSlashesGPC($uname));
! 				$xoopsMailer->assign('USEREMAIL', $myts->oopsStripSlashesGPC($email));
! 				$xoopsMailer->assign('USERACTLINK', XOOPS_URL.'/user.php?op=actv&id='.$newid.'&actkey='.$actkey);
! 				$xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
! 				$xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
! 				$xoopsMailer->assign('SITEURL', XOOPS_URL."/");
! 				$xoopsMailer->setToGroups(new XoopsGroup($xoopsConfig['activation_group']));
! 				$xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
! 				$xoopsMailer->setFromName($xoopsConfig['sitename']);
! 				$xoopsMailer->setSubject(sprintf(_US_USERKEYFOR,$myts->oopsStripSlashesGPC($uname)));
! 				OpenTable();
! 				if ( !$xoopsMailer->send() ) {
! 					echo _US_YOURREGMAILNG;
! 				} else {
! 					echo _US_YOURREGISTERED2;
! 				}
! 				CloseTable();
! 			}
! 			if ($xoopsConfig['new_user_notify'] == 1 && !empty($xoopsConfig['new_user_notify_group'])) {
! 				$myts =& MyTextSanitizer::getInstance();
  				$xoopsMailer =& getMailer();
  				$xoopsMailer->useMail();
***************
*** 204,210 ****
  				$xoopsMailer->setFromName($xoopsConfig['sitename']);
  				$xoopsMailer->setSubject(sprintf(_US_NEWUSERREGAT,$xoopsConfig['sitename']));
! 				$xoopsMailer->setBody(sprintf(_US_HASJUSTREG,$uname));
  				$xoopsMailer->send();
  			}
  		} else {
  			echo "<span style='color:#ff0000; font-weight:bold;'>$stop</span>";
--- 237,244 ----
  				$xoopsMailer->setFromName($xoopsConfig['sitename']);
  				$xoopsMailer->setSubject(sprintf(_US_NEWUSERREGAT,$xoopsConfig['sitename']));
! 				$xoopsMailer->setBody(sprintf(_US_HASJUSTREG,$myts->oopsStripSlashesGPC($uname)));
  				$xoopsMailer->send();
  			}
+ 			
  		} else {
  			echo "<span style='color:#ff0000; font-weight:bold;'>$stop</span>";

Index: header.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/header.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** header.php	24 Aug 2002 23:31:41 -0000	1.3
--- header.php	5 Sep 2002 11:10:36 -0000	1.4
***************
*** 45,49 ****
--- 45,51 ----
  		require_once(SMARTY_DIR."Smarty.class.php");
  		$xoopsTpl = new Smarty();
+ 		//$xoopsTpl->caching = 2;
  		//$xoopsTpl->debugging = true;
+ 		//$xoopsTpl->cache_dir = XOOPS_ROOT_PATH.'/cache';
  		$xoopsTpl->compile_dir = XOOPS_ROOT_PATH.'/templates_c';
  		$xoopsTpl->template_dir = XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'];
***************
*** 97,138 ****
  		// set some header variables
  		$xoopsTpl->assign('xoops_charset', _CHARSET);
- 		$myts =& MyTextSanitizer::getInstance();
  		$xoopsTpl->assign('xoops_version', XOOPS_VERSION);
! 		// check if the current page is a module page
! 		if ( isset($xoopsModule) && get_class($xoopsModule) == 'xoopsmodule' ) {
! 			// set page title
! 			$xoopsTpl->assign('xoops_pagetitle', $myts->oopsHtmlSpecialChars($xoopsModule->name()));
! 			if ( empty($xoopsOption['use_smarty']) ) {
! 				// this module page doesn't use Smarty, so assign empty value for content template
! 				$xoopsTpl->assign('xoops_contents_tpl', '');
! 				// new themes using Smarty does not have old functions that are required in old modules, so include them now
! 				include(XOOPS_ROOT_PATH.'/include/old_theme_functions.php');
! 				// need this also
! 				$xoopsTheme['thename'] = $xoopsConfig['default_theme'];
! 				ob_start();
! 			} else {
! 				// this module page uses smarty template
! 				// 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');
! 				} else {
! 					$xoopsTpl->assign('xoops_contents_tpldir', XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/templates/'.$xoopsConfig['default_theme']);
! 				}
! 			}
! 		} else {
! 			// current page is not a module page
! 			$xoopsTpl->assign('xoops_contents_tpldir', XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/');
! 			// set page title
! 			$xoopsTpl->assign('xoops_pagetitle', $xoopsConfig['sitename']);
! 			// Does the page use smarty templates?
! 			if ( empty($xoopsOption['use_smarty']) ) {
! 				// no, so so assign empty value for content template
! 				$xoopsTpl->assign('xoops_contents_tpl', '');
! 				// new themes using Smarty does not have old functions that are required in old modules, so include them now
! 				include(XOOPS_ROOT_PATH.'/include/old_theme_functions.php');
! 				// need this also
! 				$xoopsTheme['thename'] = $xoopsConfig['default_theme'];
! 				ob_start();
! 			}
  		}
  	}
--- 99,109 ----
  		// set some header variables
  		$xoopsTpl->assign('xoops_charset', _CHARSET);
  		$xoopsTpl->assign('xoops_version', XOOPS_VERSION);
! 		if ( empty($xoopsOption['use_smarty']) ) {
! 			// new themes using Smarty does not have old functions that are required in old modules, so include them now
! 			include(XOOPS_ROOT_PATH.'/include/old_theme_functions.php');
! 			// need this also
! 			$xoopsTheme['thename'] = $xoopsConfig['default_theme'];
! 			ob_start();
  		}
  	}

Index: footer.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/footer.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** footer.php	3 Sep 2002 06:46:19 -0000	1.4
--- footer.php	5 Sep 2002 11:10:36 -0000	1.5
***************
*** 18,26 ****
  			$contents = ob_get_contents();
  			ob_end_clean();
! 			$xoopsTpl->assign("xoops_contents", $contents);
  		}
! 		$xoopsTpl->assign("xoops_footer", $footer);
  		header ('Content-Type:text/html; charset='._CHARSET);
! 		$xoopsTpl->display("layout.html");
  	}
  }
--- 18,47 ----
  			$contents = ob_get_contents();
  			ob_end_clean();
! 			$xoopsTpl->assign('xoops_contents', $contents);
! 		} else {
! 			if (isset($xoopsContentsTpl) &&  $xoopsContentsTpl != '') {
! 				// check if the current page is a module page
! 				if ( isset($xoopsModule) && get_class($xoopsModule) == 'xoopsmodule' ) {
! 					// set page title
! 					$myts =& MyTextSanitizer::getInstance();
! 					$xoopsTpl->assign('xoops_pagetitle', $myts->oopsHtmlSpecialChars($xoopsModule->name()));
! 					// 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->assign('xoops_contents', $xoopsTpl->fetch($xoopsContentsTpl));
! 			}
  		}
! 		$xoopsTpl->assign('xoops_footer', $footer);
  		header ('Content-Type:text/html; charset='._CHARSET);
! 		//$xoopsTpl->cache_lifetime = 0;
! 		$xoopsTpl->display('layout.html');
  	}
  }

[Xoops-cvs2] xoops-current/html/modules/system/language/spanish/admin mailusers.php,1.2,1.3

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

Update of /cvsroot/xoops/xoops-current/html/modules/system/language/spanish/admin
In directory usw-pr-cvs1:/tmp/cvs-serv26555/html/modules/system/language/spanish/admin

Modified Files:
	mailusers.php 
Log Message:
no comment

Index: mailusers.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/language/spanish/admin/mailusers.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mailusers.php	18 Aug 2002 05:59:03 -0000	1.2
--- mailusers.php	5 Sep 2002 06:26:29 -0000	1.3
***************
*** 1,3 ****
! <?php // Xoops Spanish Support (www.xoops.sytes.net) 
  //%%%%%%	Admin Module Name  MailUsers	%%%%%
  define("_AM_DBUPDATED","");
--- 1,3 ----
! <?php // Xoops Spanish Support (www.xoops.sytes.net)
  //%%%%%%	Admin Module Name  MailUsers	%%%%%
  define("_AM_DBUPDATED","");
***************
*** 14,17 ****
--- 14,18 ----
  define("_AM_IDLEMORE","Ultimo ingreso es mayor de  X dias atras (opcional)");
  define("_AM_IDLELESS","Ultimo ingreso es menor de X dias atras (opcional)");
+ define("_AM_MAILOK","Enviar mensaje solamente a usuarios que aceptan mensajes de notificación (optional)");
  define("_AM_INACTIVE","Enviar mensaje a usuarios inactivos solamente (opcional)");
  define("_AMIFCHECKD","Si este esta marcado,  Todo el envío de mensajes privados citado anteriormente sera ignorado");

[Xoops-cvs2] xoops-current/html/modules/newbb/class class.forumposts.php,1.5,1.6

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

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

Modified Files:
	class.forumposts.php 
Log Message:
no message

Index: class.forumposts.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/newbb/class/class.forumposts.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** class.forumposts.php	23 Aug 2002 06:32:13 -0000	1.5
--- class.forumposts.php	5 Sep 2002 05:23:15 -0000	1.6
***************
*** 274,278 ****
  			}
  		}
! 		if ( $this->istopic ) {
  			$sql = "DELETE FROM ".$this->db->prefix("bb_topics")." WHERE topic_id =".$this->topic_id."";
  			if ( !$result = $this->db->query($sql) ) {
--- 274,278 ----
  			}
  		}
! 		if ( $this->istopic() == true ) {
  			$sql = "DELETE FROM ".$this->db->prefix("bb_topics")." WHERE topic_id =".$this->topic_id."";
  			if ( !$result = $this->db->query($sql) ) {

[Xoops-cvs2] xoops-current/html/class xoopsmailer.php,1.1.1.1,1.2

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

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

Modified Files:
	xoopsmailer.php 
Log Message:
no message

Index: xoopsmailer.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopsmailer.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** xoopsmailer.php	15 Jul 2002 08:13:12 -0000	1.1.1.1
--- xoopsmailer.php	5 Sep 2002 04:12:26 -0000	1.2
***************
*** 203,208 ****
  			$text = str_replace("{X_UEMAIL}", $user->getVar("email"), $text );
  			$text = str_replace("{X_UNAME}", $user->getVar("uname"), $text );
! 			$text = str_replace("{X_UACTLINK}", XOOPS_URL."/user.php?op=actv&id=".$user->getVar("uid")."&key=".$user->getVar("actkey")."", $text );
! 			//echo $subject."<br>".$text."<br>".$headers."";
  			// send mail
  			if ( $this->isMail ) {
--- 203,207 ----
  			$text = str_replace("{X_UEMAIL}", $user->getVar("email"), $text );
  			$text = str_replace("{X_UNAME}", $user->getVar("uname"), $text );
! 			$text = str_replace("{X_UACTLINK}", XOOPS_URL."/user.php?op=actv&id=".$user->getVar("uid")."&actkey=".$user->getVar('actkey'), $text );
  			// send mail
  			if ( $this->isMail ) {

[Xoops-cvs2] xoops-current/html/modules/system/language/english/admin mailusers.php,1.1.1.1,1.2

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

Update of /cvsroot/xoops/xoops-current/html/modules/system/language/english/admin
In directory usw-pr-cvs1:/tmp/cvs-serv29630

Modified Files:
	mailusers.php 
Log Message:
no message

Index: mailusers.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/language/english/admin/mailusers.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** mailusers.php	15 Jul 2002 08:13:48 -0000	1.1.1.1
--- mailusers.php	5 Sep 2002 04:11:58 -0000	1.2
***************
*** 14,17 ****
--- 14,18 ----
  define("_AM_IDLEMORE","Last Login was more than X days ago (optional)");
  define("_AM_IDLELESS","Last Login was less than X days ago (optional)");
+ define("_AM_MAILOK","Send message only to users that accept notification messages (optional)");
  define("_AM_INACTIVE","Send message to inactive users only (optional)");
  define("_AMIFCHECKD", "If this is checked, all the above plus private messaging will be ignored");

[Xoops-cvs2] xoops-current/html/modules/system/admin/mailusers mailusers.php,1.2,1.3 mailform.php,1.1.1.1,1.2

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

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

Modified Files:
	mailusers.php mailform.php 
Log Message:
no message

Index: mailusers.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/mailusers/mailusers.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mailusers.php	4 Aug 2002 20:01:42 -0000	1.2
--- mailusers.php	5 Sep 2002 04:11:27 -0000	1.3
***************
*** 29,40 ****
  			$criteria[] = "level = 0";
  		} else {
! 			if ( !empty($HTTP_POST_VARS['mail_to_group']) ) {
! 				foreach ($HTTP_POST_VARS['mail_to_group'] as $groupid ) {
! 					$mailgroup = new XoopsGroup($groupid);
! 					$members = $mailgroup->getMembers(true);
! 					foreach ( $members as $member ) {
! 						if ( !in_array($member_id, $added) ) {
! 							$added_id[] = $member->uid;
! 							$added[] = $member;
  						}
  					}
--- 29,44 ----
  			$criteria[] = "level = 0";
  		} else {
! 			if (!empty($HTTP_POST_VARS['mail_mailok'])) {
! 				$criteria[] = 'user_mailok = 1';
! 			} else {
! 				if ( count($HTTP_POST_VARS['mail_to_group']) > 0 ) {
! 					foreach ($HTTP_POST_VARS['mail_to_group'] as $groupid ) {
! 						$mailgroup = new XoopsGroup($groupid);
! 						$members = $mailgroup->getMembers(true);
! 						foreach ( $members as $member ) {
! 							if ( !in_array($member_id, $added) ) {
! 								$added_id[] = $member->uid;
! 								$added[] = $member;
! 							}
  						}
  					}
***************
*** 71,74 ****
--- 75,79 ----
  				}
  			}
+ 			
  		}
  		if ( !empty($HTTP_POST_VARS['mail_regd_min']) ) {

Index: mailform.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/mailusers/mailform.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** mailform.php	15 Jul 2002 08:13:47 -0000	1.1.1.1
--- mailform.php	5 Sep 2002 04:11:27 -0000	1.2
***************
*** 24,30 ****
  	$idle_more = new XoopsFormText(_AM_IDLEMORE."<br />", "mail_idle_more", 10, 5);
  	$idle_less = new XoopsFormText(_AM_IDLELESS."<br />", "mail_idle_less", 10, 5);
  	$inactive_cbox = new XoopsFormCheckBox(_AM_INACTIVE."<br />", "mail_inactive");
  	$inactive_cbox->addOption(1, _AMIFCHECKD);
! 	$inactive_cbox->setExtra("onclick='javascript:disableElement(\"mail_lastlog_min\");disableElement(\"mail_lastlog_max\");disableElement(\"mail_idle_more\");disableElement(\"mail_idle_less\");disableElement(\"mail_to_group\");'");
  	$criteria_tray = new XoopsFormElementTray(_AM_SENDTOUSERS, "<br /><br />");
  	$criteria_tray->addElement($group_select);
--- 24,32 ----
  	$idle_more = new XoopsFormText(_AM_IDLEMORE."<br />", "mail_idle_more", 10, 5);
  	$idle_less = new XoopsFormText(_AM_IDLELESS."<br />", "mail_idle_less", 10, 5);
+ 	$mailok_cbox = new XoopsFormCheckBox('', 'mail_mailok');
+ 	$mailok_cbox->addOption(1, _AM_MAILOK);
  	$inactive_cbox = new XoopsFormCheckBox(_AM_INACTIVE."<br />", "mail_inactive");
  	$inactive_cbox->addOption(1, _AMIFCHECKD);
! 	$inactive_cbox->setExtra("onclick='javascript:disableElement(\"mail_lastlog_min\");disableElement(\"mail_lastlog_max\");disableElement(\"mail_idle_more\");disableElement(\"mail_idle_less\");disableElement(\"mail_to_group[]\");'");
  	$criteria_tray = new XoopsFormElementTray(_AM_SENDTOUSERS, "<br /><br />");
  	$criteria_tray->addElement($group_select);
***************
*** 33,36 ****
--- 35,39 ----
  	$criteria_tray->addElement($idle_more);
  	$criteria_tray->addElement($idle_less);
+ 	$criteria_tray->addElement($mailok_cbox);
  	$criteria_tray->addElement($inactive_cbox);
  	$criteria_tray->addElement($regd_min);

[Xoops-cvs2] xoops-current/html/modules/system/admin/users users.php,1.2,1.3 userform.php,1.1.1.1,1.2 main.php,1.2,1.3

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

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

Modified Files:
	users.php userform.php main.php 
Log Message:
no message

Index: users.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/users/users.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** users.php	6 Aug 2002 01:21:10 -0000	1.2
--- users.php	5 Sep 2002 04:11:11 -0000	1.3
***************
*** 58,61 ****
--- 58,62 ----
  	$bio_value = "";
  	$rank_value = 0;
+ 	$mailok_value = 0;
  	$op_value = "addUser";
  	$form_title = _AM_ADDUSER;
***************
*** 105,108 ****
--- 106,110 ----
  		$bio_value = $user->getVar("bio", "E");
  		$rank_value = $user->rank(false);
+ 		$mailok_value = $user->getVar('user_mailok', 'E');
  		$op_value = "updateUser";
  		$form_title = _AM_UPDATEUSER.": ".$user->getVar("uname");
***************
*** 130,134 ****
  }
  
! function updateUser($uid, $uname, $name, $url, $email, $user_icq, $user_aim, $user_yim, $user_msnm, $user_from, $user_occ, $user_intrest, $user_viewemail, $user_avatar, $user_sig, $attachsig, $theme, $pass, $pass2, $rank, $bio, $uorder, $umode, $timezone_offset) {
  
  	global $xoopsConfig, $xoopsDB, $xoopsModule;
--- 132,136 ----
  }
  
! function updateUser($uid, $uname, $name, $url, $email, $user_icq, $user_aim, $user_yim, $user_msnm, $user_from, $user_occ, $user_intrest, $user_viewemail, $user_avatar, $user_sig, $attachsig, $theme, $pass, $pass2, $rank, $bio, $uorder, $umode, $timezone_offset, $user_mailok) {
  
  	global $xoopsConfig, $xoopsDB, $xoopsModule;
***************
*** 157,160 ****
--- 159,163 ----
  	$edituser->setVar("user_occ", $user_occ);
  	$edituser->setVar("user_intrest", $user_intrest);
+ 	$edituser->setVar('user_mailok', $user_mailok);
  	if ($pass2 != "") {
                  if ( $pass != $pass2 ) {
***************
*** 169,173 ****
  	if ( !$edituser->store() ) {
  		xoops_cp_header();
! 		echo $editusers->getErrors();
  		xoops_cp_footer();
  	} else {
--- 172,176 ----
  	if ( !$edituser->store() ) {
  		xoops_cp_header();
! 		echo $edituser->getErrors();
  		xoops_cp_footer();
  	} else {

Index: userform.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/users/userform.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** userform.php	15 Jul 2002 08:13:47 -0000	1.1.1.1
--- userform.php	5 Sep 2002 04:11:12 -0000	1.2
***************
*** 74,77 ****
--- 74,78 ----
  	$pwd_text = new XoopsFormPassword(_AM_PASSWORD, "pass", 10, 20);
  	$pwd_text2 = new XoopsFormPassword(_AM_RETYPEPD, "pass2", 10, 20);
+ 	$mailok_radio = new XoopsFormRadioYN(_US_MAILOK, 'user_mailok', $mailok_value);
  	$fct_hidden = new XoopsFormHidden("fct", "users");
  	$op_hidden = new XoopsFormHidden("op", $op_value);
***************
*** 100,103 ****
--- 101,105 ----
  	$form->addElement($pwd_text);
  	$form->addElement($pwd_text2);
+ 	$form->addElement($mailok_radio);
  	$form->addElement($fct_hidden);
  	$form->addElement($op_hidden);

Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/users/main.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.php	6 Aug 2002 01:21:10 -0000	1.2
--- main.php	5 Sep 2002 04:11:12 -0000	1.3
***************
*** 14,18 ****
                          break;
                  case "updateUser":
!                         updateUser($uid, $uname, $name, $url, $email, $user_icq, $user_aim, $user_yim, $user_msnm, $user_from, $user_occ, $user_intrest, $user_viewemail, $user_avatar, $user_sig, $attachsig, $theme, $pass, $pass2, $rank, $bio, $uorder, $umode, $timezone_offset);
                          break;
                  case "delUser":
--- 14,18 ----
                          break;
                  case "updateUser":
!                         updateUser($uid, $uname, $name, $url, $email, $user_icq, $user_aim, $user_yim, $user_msnm, $user_from, $user_occ, $user_intrest, $user_viewemail, $user_avatar, $user_sig, $attachsig, $theme, $pass, $pass2, $rank, $bio, $uorder, $umode, $timezone_offset, $user_mailok);
                          break;
                  case "delUser":
***************
*** 113,116 ****
--- 113,117 ----
  			$newuser->setVar("user_occ", $user_occ);
  			$newuser->setVar("user_intrest", $user_intrest);
+ 			$newuser->setVar('user_mailok', $user_mailok);
  			if ( !$newuser->store() ) {
  				echo _AM_CNRNU;

[Xoops-cvs2] xoops-current/html user.php,1.2,1.3

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

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

Modified Files:
	user.php 
Log Message:
no message

Index: user.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/user.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** user.php	4 Aug 2002 09:38:12 -0000	1.2
--- user.php	5 Sep 2002 04:10:52 -0000	1.3
***************
*** 152,156 ****
  		break;
  	case "actv":
! 		activate($HTTP_GET_VARS['id'], $HTTP_GET_VARS['key']);
  		break;
  	case "delete":
--- 152,156 ----
  		break;
  	case "actv":
! 		activate($HTTP_GET_VARS['id'], $HTTP_GET_VARS['actkey']);
  		break;
  	case "delete":