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

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

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

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

Modified Files:
	common.php 
Log Message:
no message

Index: common.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/include/common.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** common.php	23 Aug 2002 05:12:42 -0000	1.6
--- common.php	18 Sep 2002 11:01:21 -0000	1.7
***************
*** 48,54 ****
   
  	// uncomment the following lines to show all warning messages (for debug)
! 	if ( $xoopsConfig['debug_mode'] == 1 ) {
  		error_reporting (2039);
! 	}
  	set_magic_quotes_runtime(0);
  	// #################### Include global config files ##################
--- 48,54 ----
   
  	// uncomment the following lines to show all warning messages (for debug)
! 	//if ( $xoopsConfig['debug_mode'] == 1 ) {
  		error_reporting (2039);
! 	//}
  	set_magic_quotes_runtime(0);
  	// #################### Include global config files ##################
***************
*** 95,108 ****
  	}
  
! 	// #################### Connect to DB ##################
! 	include(XOOPS_ROOT_PATH."/class/".$xoopsConfig['database'].".php");
  
! 	if ( $xoopsConfig['prefix'] && $xoopsConfig['dbhost'] && isset($xoopsConfig['dbuname']) && isset($xoopsConfig['dbpass']) && $xoopsConfig['dbname'] ) {
! 		$xoopsDB = new Database();
! 		if ( $xoopsConfig['debug_mode'] ==1 ) {
! 			$xoopsDB->setDebug(true); 
! 		}
! 		$xoopsDB->setPrefix($xoopsConfig['prefix']);
! 		$xoopsDB->connect($xoopsConfig['dbhost'], $xoopsConfig['dbuname'], $xoopsConfig['dbpass'], $xoopsConfig['dbname'], $xoopsConfig['db_pconnect']);
  	}
  	// ############## Login a user with a valid session ##############
--- 95,107 ----
  	}
  
! 	include_once(XOOPS_ROOT_PATH.'/class/xoopslogger.php');
! 	$xoopsLogger =& XoopsLogger::getInstance();
! 	$xoopsLogger->startTime();
  
! 	// #################### Connect to DB ##################
! 	if (defined('XOOPS_DB_PREFIX') && defined('XOOPS_DB_HOST') && defined('XOOPS_DB_USER') && defined('XOOPS_DB_PASS') && defined('XOOPS_DB_NAME')) {
! 		include(XOOPS_ROOT_PATH.'/class/'.XOOPS_DB_TYPE.'.php');
! 		$xoopsDB =& Database::getInstance();
! 		$xoopsDB->setPrefix(XOOPS_DB_PREFIX);
  	}
  	// ############## Login a user with a valid session ##############
***************
*** 128,135 ****
  	}
  
! 	$xoopsMyts = new MyTextSanitizer();
! 	if ( !empty($xoopsConfig['allow_image']) ) {
! 		$xoopsMyts->setAllowImage(true);
! 	}
  	
  	if ( file_exists("xoops_version.php") ) {
--- 127,133 ----
  	}
  
! 	//if ( !empty($xoopsConfig['allow_image']) ) {
! 	//	$xoopsMyts->setAllowImage(true);
! 	//}
  	
  	if ( file_exists("xoops_version.php") ) {
***************
*** 145,149 ****
  		}
  		if ( $xoopsUser ) {
! 			if ( !XoopsGroup::checkRight("module", $xoopsModule->mid(), $xoopsUser->groups()) ) {
  				redirect_header(XOOPS_URL."/",1,_NOPERM);
  				exit();
--- 143,147 ----
  		}
  		if ( $xoopsUser ) {
! 			if ( !XoopsGroup::checkRight("module", $xoopsModule->mid(), $xoopsUser->getGroups()) ) {
  				redirect_header(XOOPS_URL."/",1,_NOPERM);
  				exit();

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

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

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

Modified Files:
	mainfile.php 
Log Message:
no message

Index: mainfile.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/mainfile.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mainfile.php	16 Jul 2002 08:09:30 -0000	1.2
--- mainfile.php	18 Sep 2002 11:01:04 -0000	1.3
***************
*** 24,62 ****
  	// XOOPS Physical Path
  	// Physical path to your main XOOPS directory WITHOUT trailing slash
! 	define("XOOPS_ROOT_PATH","/path/to/xoops/directory");
  
  	// XOOPS Virtual Path (URL)
  	// Virtual path to your main XOOPS directory WITHOUT trailing slash
! 	define("XOOPS_URL", "http://url_to_xoops_directory");
  
  	// Database
  	// Choose the database to be used
! 	$xoopsConfig['database'] = "mysql";
  
  	// Table Prefix
  	// This prefix will be added to all new tables created to avoid name conflict in the database. If you are unsure, just use the default 'xoops'.
! 	$xoopsConfig['prefix'] = "xoops";
  
  	// Database Hostname
  	// Hostname of the database server. If you are unsure, 'localhost' works in most cases.
! 	$xoopsConfig['dbhost'] = "localhost";
  
  	// Database Username
  	// Your database user account on the host
! 	$xoopsConfig['dbuname'] = "";
  
  	// Database Password
  	// Password for your database user account
! 	$xoopsConfig['dbpass'] = "";
  
  	// Database Name
  	// The name of database on the host. The installer will attempt to create the database if not exist
! 	$xoopsConfig['dbname'] = "";
  
  	// Use persistent connection? (Yes=1 No=0)
  	// Default is 'Yes'. Choose 'Yes' if you are unsure.
! 	$xoopsConfig['db_pconnect'] = 0;
  
! 	include(XOOPS_ROOT_PATH."/include/common.php");
  }
  
--- 24,62 ----
  	// XOOPS Physical Path
  	// Physical path to your main XOOPS directory WITHOUT trailing slash
! 	define('XOOPS_ROOT_PATH', '/path/to/xoops/directory');
  
  	// XOOPS Virtual Path (URL)
  	// Virtual path to your main XOOPS directory WITHOUT trailing slash
! 	define('XOOPS_URL', 'http://url_to_xoops_directory');
  
  	// Database
  	// Choose the database to be used
! 	define('XOOPS_DB_TYPE', 'mysql');
  
  	// Table Prefix
  	// This prefix will be added to all new tables created to avoid name conflict in the database. If you are unsure, just use the default 'xoops'.
! 	define('XOOPS_DB_PREFIX', 'xoops');
  
  	// Database Hostname
  	// Hostname of the database server. If you are unsure, 'localhost' works in most cases.
! 	define('XOOPS_DB_HOST', 'localhost');
  
  	// Database Username
  	// Your database user account on the host
! 	define('XOOPS_DB_USER', '');
  
  	// Database Password
  	// Password for your database user account
! 	define('XOOPS_DB_PASS', '');
  
  	// Database Name
  	// The name of database on the host. The installer will attempt to create the database if not exist
! 	define('XOOPS_DB_NAME', '');
  
  	// Use persistent connection? (Yes=1 No=0)
  	// Default is 'Yes'. Choose 'Yes' if you are unsure.
! 	define('XOOPS_DB_PCONNECT', 0);
  
! 	include(XOOPS_ROOT_PATH.'/include/common.php');
  }
  

[Xoops-cvs2] xoops-current/html/class mysql.php,1.2,1.3 database.php,1.1.1.1,1.2

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

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

Modified Files:
	mysql.php database.php 
Log Message:
no message

Index: mysql.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/mysql.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mysql.php	21 Aug 2002 00:23:30 -0000	1.2
--- mysql.php	18 Sep 2002 11:00:23 -0000	1.3
***************
*** 31,57 ****
  
  	function &getInstance(){
! 		if ( isset($GLOBALS['xoopsDB']) && get_class($GLOBALS['xoopsDB']) == "database" ){
! 			return $GLOBALS['xoopsDB'];
  		}
! 		return new Database();
  	}
  	
! 	function connect($host, $user, $password, $db, $persistent=1) {
! 		if ( $persistent ) {
! 			$this->conn = @mysql_pconnect($host, $user, $password);
  		} else {
! 			$this->conn = @mysql_connect($host, $user, $password);
  		}
! 		if ( !$this->conn ) {
! 			return false;
! 			//print("<b>Error Connecting DB</b>: ".$this->error($this->conn).":".$this->errno($this->conn));
  		}
  		
! 		$selDB = mysql_select_db($db);
! 		if ( !$selDB ) {
! 			return false;
! 			//print("<b>Error Selecting DB</b>: ".$this->errno($this->conn).":".$this->error($this->conn));
  		}
- 		return true;
  	}
  		
--- 31,57 ----
  
  	function &getInstance(){
! 		static $instance;
! 		if (!isset($instance)) {
! 			$instance = new Database();
! 			$instance->setLogger(XoopsLogger::getInstance());
! 			$instance->connect();
  		}
! 		return $instance;
  	}
  	
! 	function connect() {
! 		if (XOOPS_DB_PCONNECT == 1) {
! 			$this->conn = @mysql_pconnect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
  		} else {
! 			$this->conn = @mysql_connect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
  		}
! 		if (!$this->conn) {
! 			$this->logger->addQuery($sql, $this->error(), $this->errno());
  		}
  		
! 		$selDB = mysql_select_db(XOOPS_DB_NAME);
! 		if (!$selDB) {
! 			$this->logger->addQuery($sql, $this->error(), $this->errno());
  		}
  	}
  		
***************
*** 97,111 ****
  				$start = 0;
  			}
! 			$sql = $sql. " LIMIT ".intval($start).",".intval($limit)."";
  		}
  		$result =& mysql_query($sql, $this->conn);
  		if ( $result ) {
  			return $result;
          	} else {
!             		if ( $this->debug ) {
! 				$errorMsg = @mysql_error($this->conn);
! 				$errorNum = @mysql_errno($this->conn);
! 				print( "<b>MySQL Query Error</b>: " . htmlentities( $sql ) . "<br /><b> Error number:</b>" . $errorNum . "<br /><b> Error message:</b> ". $errorMsg ."<br />" );
!             		}
              		return false;
          	}
--- 97,108 ----
  				$start = 0;
  			}
! 			$sql = $sql. ' LIMIT '.intval($start).', '.intval($limit);
  		}
  		$result =& mysql_query($sql, $this->conn);
  		if ( $result ) {
+ 			$this->logger->addQuery($sql);
  			return $result;
          	} else {
! 			$this->logger->addQuery($sql, $this->error(), $this->errno());
              		return false;
          	}
***************
*** 113,153 ****
  
  	function &query($sql, $limit=0, $start=0) {
- 		//echo $sql."<br />";
  		if ( !empty($limit) ) {
  			if ( empty($start) ) {
  				$start = 0;
  			}
! 			$sql = $sql. " LIMIT ".intval($start).",".intval($limit)."";
  		}
  		$result =& $this->my_mysql_query($sql);
         		if ( $result ) {
  			return $result;
         		} else {
! 			if ( $this->debug ) {
! 				$errorMsg = @mysql_error($this->conn);
!        				$errorNum = @mysql_errno($this->conn);
! 				print( "<b>MySQL Query Error</b>: " . htmlentities( $sql ) . "<br /><b> Error number:</b>" . $errorNum . "<br /><b> Error message:</b> ". $errorMsg ."<br />" );
!             		}
              		return false;
          	}
      	}
  
! 	function my_mysql_query($sql) {
     		if (preg_match("/^SELECT.*/i", $sql)) {
!         		$Query_ID = @mysql_query($sql, $this->conn);
!        			return $Query_ID;
  		}
- 
  		if (isPost()) {
      		} else {
         			return 0;
!    		}    
!     
     		if (myRefererCheck($errstr)) {
!        			$Query_ID = @mysql_query($sql, $this->conn);
     		} else {
         			return 0;
!    		}    
!    		return $Query_ID;
  	}
  
--- 110,142 ----
  
  	function &query($sql, $limit=0, $start=0) {
  		if ( !empty($limit) ) {
  			if ( empty($start) ) {
  				$start = 0;
  			}
! 			$sql = $sql. ' LIMIT '.intval($start).', '.intval($limit);
  		}
  		$result =& $this->my_mysql_query($sql);
         		if ( $result ) {
+ 			$this->logger->addQuery($sql);
  			return $result;
         		} else {
! 			$this->logger->addQuery($sql, $this->error(), $this->errno());
              		return false;
          	}
      	}
  
! 	function &my_mysql_query($sql) {
     		if (preg_match("/^SELECT.*/i", $sql)) {
!         		return @mysql_query($sql, $this->conn);
  		}
  		if (isPost()) {
      		} else {
         			return 0;
!    		}
     		if (myRefererCheck($errstr)) {
!        			return @mysql_query($sql, $this->conn);
     		} else {
         			return 0;
!    		}
  	}
  

Index: database.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/database.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** database.php	15 Jul 2002 08:13:09 -0000	1.1.1.1
--- database.php	18 Sep 2002 11:00:24 -0000	1.2
***************
*** 22,27 ****
  
  class AbsDatabase {
! 	var $prefix;
! 	var $debug = false;
  
  	function AbsDatabase(){
--- 22,27 ----
  
  class AbsDatabase {
! 	var $prefix = '';
! 	var $logger;
  
  	function AbsDatabase(){
***************
*** 29,32 ****
--- 29,36 ----
  	}
  
+ 	function setLogger(&$logger){
+ 		$this->logger =& $logger;
+ 	}
+ 
  	function setPrefix($value) {
  		$this->prefix = $value;
***************
*** 38,49 ****
  		} else {
  			return $this->prefix;
- 		}
- 	}
- 
- 	function setDebug($flag=true) {
- 		if ( $flag ) {
- 			$this->debug = true;
- 		} else {
- 			$this->debug = false;
  		}
  	}
--- 42,45 ----

[Xoops-cvs2] xoops-current/html/class xoopsuser.php,1.7,1.8

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

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

Modified Files:
	xoopsuser.php 
Log Message:
no message

Index: xoopsuser.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopsuser.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** xoopsuser.php	12 Aug 2002 20:29:15 -0000	1.7
--- xoopsuser.php	18 Sep 2002 10:58:37 -0000	1.8
***************
*** 259,266 ****
  
  	function isAdmin($moduleid=0){
! 		if ( empty($this->groups) ) {
! 			$this->groups =& $this->groups();
! 		}
! 		if ( XoopsGroup::checkRight("module", $moduleid, $this->groups, "A") ) {
  			return true;
  		}
--- 259,263 ----
  
  	function isAdmin($moduleid=0){
! 		if ( XoopsGroup::checkRight("module", $moduleid, $this->getGroups(), "A") ) {
  			return true;
  		}
***************
*** 293,298 ****
  	*  returns an array of group ids this user belongs
  	*/
! 	function &groups(){
! 		return XoopsGroup::getByUser($this);
  	}
  
--- 290,298 ----
  	*  returns an array of group ids this user belongs
  	*/
! 	function &getGroups(){
! 		if (empty($this->groups)) {
! 			return XoopsGroup::getByUser($this);
! 		}
! 		return $this->groups;
  	}
  

[Xoops-cvs2] xoops-current/html/class/xoopsform themeform.php,1.1.1.1,1.2 formdhtmltextarea.php,1.2,1.3 form.php,1.1.1.1,1.2

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

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

Modified Files:
	themeform.php formdhtmltextarea.php form.php 
Log Message:
no message

Index: themeform.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopsform/themeform.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** themeform.php	15 Jul 2002 08:13:13 -0000	1.1.1.1
--- themeform.php	18 Sep 2002 10:44:49 -0000	1.2
***************
*** 29,37 ****
  
  	function render($value=""){
! 		$required = $this->getRequired();
! 		$ret = "<h4 style='text-align:left;'>".$this->getTitle()."</h4>\n<form name='".$this->getName()."' id='".$this->getName()."' action='".$this->getAction()."' method='".$this->getMethod()."'".$this->getExtra().">\n<table border='0' cellpadding='0' cellspacing='0' valign='top' width='100%'><tr><td class='bg2'><table width='100%' border='0' cellpadding='4' cellspacing='1'>\n";
  		foreach ( $this->getElements() as $ele ) {
  			if ( !$ele->isHidden() ) {
! 				$ret .= "<tr valign='top'><td class='bg3'><b>".$ele->getCaption()."</b></td><td class='bg1'>".$ele->render()."</td></tr>\n";
  			} else {
  				$ret .= $ele->render()."\n";
--- 29,37 ----
  
  	function render($value=""){
! 		$required =& $this->getRequired();
! 		$ret = "<h4 style='text-align:left;'>".$this->getTitle()."</h4>\n<form name='".$this->getName()."' id='".$this->getName()."' action='".$this->getAction()."' method='".$this->getMethod()."'".$this->getExtra().">\n<table width='100%' class='xoopsTable' cellpadding='4' cellspacing='1'>\n";
  		foreach ( $this->getElements() as $ele ) {
  			if ( !$ele->isHidden() ) {
! 				$ret .= "<tr valign='top'><td class='xoopsTableCaption'><b>".$ele->getCaption()."</b></td><td class='xoopsTableBody1'>".$ele->render()."</td></tr>\n";
  			} else {
  				$ret .= $ele->render()."\n";
***************
*** 48,54 ****
  		//--->
  		</script>";
! 		$ret .= "</table></td></tr></table>\n</form>\n";
  		$ret = $js.$ret;
  		return $ret;
  	}
  }
--- 48,89 ----
  		//--->
  		</script>";
! 		$ret .= "</table>\n</form>\n";
  		$ret = $js.$ret;
  		return $ret;
+ 	}
+ 
+ 	// assign to smarty form template instead of displaying directly
+ 	function assign(&$tpl){
+ 		$i = 0;
+ 		foreach ( $this->getElements() as $ele ) {
+ 			if ( !$ele->isHidden() ) {
+ 				$elements[$i]['caption'] = $ele->getCaption();
+ 				$elements[$i]['body'] = $ele->render();
+ 				$elements[$i]['hidden'] = false;
+ 			} else {
+ 				$elements[$i]['caption'] = '';
+ 				$elements[$i]['body'] = $ele->render();
+ 				$elements[$i]['hidden'] = true;
+ 			}
+ 			$i++;
+ 		}
+ 		$js = "
+ 		<!-- Start Form Vaidation JavaScript //-->
+ 		<script language='javascript'>
+ 		<!--
+ 		function xoopsFormValidate_".$this->getName()."(){
+ 		";
+ 		$required =& $this->getRequired();
+ 		$reqcount = count($required);
+ 		for ($i = 0; $i < $reqcount; $i++) {
+ 			$js .= "if ( document.".$this->getName().".".$required[$i]->getName().".value == \"\" ) {alert( \"".sprintf(_FORM_ENTER, $required[$i]->getCaption())."\" );document.".$this->getName().".".$required[$i]->getName().".focus();return false;\n}
+ 				";
+ 		}
+ 		$js .= "}
+ 		//-->
+ 		</script>
+ 		<!-- End Form Vaidation JavaScript //-->
+ 		";
+ 		$tpl->assign($this->getName(), array('title' => $this->getTitle(), 'name' => $this->getName(), 'action' => $this->getAction(),  'method' => $this->getMethod(), 'extra' => $this->getExtra(), 'javascript' => $js, 'elements' => $elements));
  	}
  }

Index: formdhtmltextarea.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopsform/formdhtmltextarea.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** formdhtmltextarea.php	30 Jul 2002 01:06:00 -0000	1.2
--- formdhtmltextarea.php	18 Sep 2002 10:44:49 -0000	1.3
***************
*** 33,37 ****
  
  	function render(){
! 		$ret = "<input type='button' value='URL' onclick='xoopsCodeUrl(\"".$this->getName()."\");' /><input type='button' value='IMG' onclick='xoopsCodeImg(\"".$this->getName()."\");' /><input type='button' value='EMAIL' onclick='xoopsCodeEmail(\"".$this->getName()."\");' /><input type='button' value='QUOTE' onclick='xoopsCodeQuote(\"".$this->getName()."\");' /><br />\n";
  
  		$sizearray = array("xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large");
--- 33,37 ----
  
  	function render(){
! 		$ret = "<input type='button' value='URL' onclick='xoopsCodeUrl(\"".$this->getName()."\");' /><input type='button' value='IMG' onclick='xoopsCodeImg(\"".$this->getName()."\");' /><input type='button' value='EMAIL' onclick='xoopsCodeEmail(\"".$this->getName()."\");' /><input type='button' value='CODE' onclick='xoopsCodeCode(\"".$this->getName()."\");' /><input type='button' value='QUOTE' onclick='xoopsCodeQuote(\"".$this->getName()."\");' /><br />\n";
  
  		$sizearray = array("xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large");

Index: form.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopsform/form.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** form.php	15 Jul 2002 08:13:13 -0000	1.1.1.1
--- form.php	18 Sep 2002 10:44:49 -0000	1.2
***************
*** 75,84 ****
  
  	// public
! 	function addElement($ele){
! 		$this->elements[] = $ele;
  	}
  
  	// public
! 	function getElements(){
  		return $this->elements;
  	}
--- 75,87 ----
  
  	// public
! 	function addElement(&$ele, $required=false){
! 		$this->elements[] =& $ele;
! 		if ($required) {
! 			$this->required[] =& $ele;
! 		}
  	}
  
  	// public
! 	function &getElements(){
  		return $this->elements;
  	}
***************
*** 88,92 ****
  	}
  
! 	function getExtra(){
  		if (isset($this->extra)) {
  			return $this->extra;
--- 91,95 ----
  	}
  
! 	function &getExtra(){
  		if (isset($this->extra)) {
  			return $this->extra;
***************
*** 94,108 ****
  	}
  
! 	function setRequired($required){
  		if ( is_array($required) ) {
  			foreach ( $required as $req ) {
! 				$this->required[] = $req;
  			}
  		} else {
! 			$this->required[] = $required;
  		}
  	}
  
! 	function getRequired(){
  		return $this->required;
  	}
--- 97,111 ----
  	}
  
! 	function setRequired(&$required){
  		if ( is_array($required) ) {
  			foreach ( $required as $req ) {
! 				$this->required[] =& $req;
  			}
  		} else {
! 			$this->required[] =& $required;
  		}
  	}
  
! 	function &getRequired(){
  		return $this->required;
  	}

[Xoops-cvs2] xoops-current/html/language/english global.php,1.5,1.6

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

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

Modified Files:
	global.php 
Log Message:
no comment

Index: global.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/language/english/global.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** global.php	17 Sep 2002 15:19:34 -0000	1.5
--- global.php	18 Sep 2002 02:43:59 -0000	1.6
***************
*** 31,37 ****
  define("_THREAD","Thread");
  define("_POSTER","Poster");
! define("_JOINED","Joined");
! define("_POSTS","Posts");
! define("_FROM","From");
  define("_POSTED","Posted"); // Posted date
  define("_PROFILE","Profile");
--- 31,37 ----
  define("_THREAD","Thread");
  define("_POSTER","Poster");
! define("_JOINED","Joined: ");
! define("_POSTS","Posts: ");
! define("_FROM","From: ");
  define("_POSTED","Posted"); // Posted date
  define("_PROFILE","Profile");
***************
*** 71,76 ****
  
  //%%%%%%	File Name misc.php (who's-online popup)	%%%%%
! define("_WHOSONLINE","Who's Online"); 
! define("_NOUSRONLINE","No users are currently online"); 
  define("_CLOSE","Close");  // Close window
  
--- 71,76 ----
  
  //%%%%%%	File Name misc.php (who's-online popup)	%%%%%
! define("_WHOSONLINE","Who's Online");
! define("_NOUSRONLINE","No users are currently online");
  define("_CLOSE","Close");  // Close window
  
***************
*** 233,263 ****
  define("_SHORTDATESTRING","Y/n/j");
  /*
! The following characters are recognized in the format string: 
! a - "am" or "pm" 
! A - "AM" or "PM" 
! d - day of the month, 2 digits with leading zeros; i.e. "01" to "31" 
! D - day of the week, textual, 3 letters; i.e. "Fri" 
! F - month, textual, long; i.e. "January" 
! h - hour, 12-hour format; i.e. "01" to "12" 
! H - hour, 24-hour format; i.e. "00" to "23" 
! g - hour, 12-hour format without leading zeros; i.e. "1" to "12" 
! G - hour, 24-hour format without leading zeros; i.e. "0" to "23" 
! i - minutes; i.e. "00" to "59" 
! j - day of the month without leading zeros; i.e. "1" to "31" 
! l (lowercase 'L') - day of the week, textual, long; i.e. "Friday" 
! L - boolean for whether it is a leap year; i.e. "0" or "1" 
! m - month; i.e. "01" to "12" 
! n - month without leading zeros; i.e. "1" to "12" 
! M - month, textual, 3 letters; i.e. "Jan" 
! s - seconds; i.e. "00" to "59" 
! S - English ordinal suffix, textual, 2 characters; i.e. "th", "nd" 
! t - number of days in the given month; i.e. "28" to "31" 
! T - Timezone setting of this machine; i.e. "MDT" 
! U - seconds since the epoch 
! w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday) 
! Y - year, 4 digits; i.e. "1999" 
! y - year, 2 digits; i.e. "99" 
! z - day of the year; i.e. "0" to "365" 
! Z - timezone offset in seconds (i.e. "-43200" to "43200") 
  */
  
--- 233,263 ----
  define("_SHORTDATESTRING","Y/n/j");
  /*
! The following characters are recognized in the format string:
! a - "am" or "pm"
! A - "AM" or "PM"
! d - day of the month, 2 digits with leading zeros; i.e. "01" to "31"
! D - day of the week, textual, 3 letters; i.e. "Fri"
! F - month, textual, long; i.e. "January"
! h - hour, 12-hour format; i.e. "01" to "12"
! H - hour, 24-hour format; i.e. "00" to "23"
! g - hour, 12-hour format without leading zeros; i.e. "1" to "12"
! G - hour, 24-hour format without leading zeros; i.e. "0" to "23"
! i - minutes; i.e. "00" to "59"
! j - day of the month without leading zeros; i.e. "1" to "31"
! l (lowercase 'L') - day of the week, textual, long; i.e. "Friday"
! L - boolean for whether it is a leap year; i.e. "0" or "1"
! m - month; i.e. "01" to "12"
! n - month without leading zeros; i.e. "1" to "12"
! M - month, textual, 3 letters; i.e. "Jan"
! s - seconds; i.e. "00" to "59"
! S - English ordinal suffix, textual, 2 characters; i.e. "th", "nd"
! t - number of days in the given month; i.e. "28" to "31"
! T - Timezone setting of this machine; i.e. "MDT"
! U - seconds since the epoch
! w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday)
! Y - year, 4 digits; i.e. "1999"
! y - year, 2 digits; i.e. "99"
! z - day of the year; i.e. "0" to "365"
! Z - timezone offset in seconds (i.e. "-43200" to "43200")
  */
  

[Xoops-cvs2] xoops-current/html/include xoopscodes.php,1.3,1.4

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

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

Modified Files:
	xoopscodes.php 
Log Message:
Replaced _ENTERCode  by _ENTERCODE

Index: xoopscodes.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/include/xoopscodes.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xoopscodes.php	17 Sep 2002 15:17:59 -0000	1.3
--- xoopscodes.php	17 Sep 2002 22:36:00 -0000	1.4
***************
*** 48,54 ****
  		var text2 = prompt("<?php echo _ENTERIMGPOS;?>\n<?php echo _IMGPOSRORL;?>", "");
  		while ( ( text2 != "" ) && ( text2 != "r" ) && ( text2 != "R" ) && ( text2 != "l" ) && ( text2 != "L" ) && ( text2 != null ) ) {
! 			text2 = prompt("<?php echo _ERRORIMGPOS;?>\n<?php echo _IMGPOSRORL;?>","");           
  		}
! 		if ( text2 == "l" || text2 == "L" ) { 
  			text2 = " align=left";
  		} else if ( text2 == "r" || text2 == "R" ) {
--- 48,54 ----
  		var text2 = prompt("<?php echo _ENTERIMGPOS;?>\n<?php echo _IMGPOSRORL;?>", "");
  		while ( ( text2 != "" ) && ( text2 != "r" ) && ( text2 != "R" ) && ( text2 != "l" ) && ( text2 != "L" ) && ( text2 != null ) ) {
! 			text2 = prompt("<?php echo _ERRORIMGPOS;?>\n<?php echo _IMGPOSRORL;?>","");
  		}
! 		if ( text2 == "l" || text2 == "L" ) {
  			text2 = " align=left";
  		} else if ( text2 == "r" || text2 == "R" ) {
***************
*** 85,89 ****
  
  function xoopsCodeCode(id){
! 	var text = prompt("<?php echo _ENTERCode;?>", "");
  	var dom = xoopsGetElementById(id);
  	if ( text != null && text != "" ) {
--- 85,89 ----
  
  function xoopsCodeCode(id){
! 	var text = prompt("<?php echo _ENTERCODE;?>", "");
  	var dom = xoopsGetElementById(id);
  	if ( text != null && text != "" ) {
***************
*** 171,175 ****
  		} else {
  			submitDom.disabled = true;
! 			return true; 
  		}
  	} else {
--- 171,175 ----
  		} else {
  			submitDom.disabled = true;
! 			return true;
  		}
  	} else {
***************
*** 240,244 ****
  	echo "<a href='javascript: justReturn()' onclick='xoopsCodeSmilie(\"$textarea_id\", \" :-P \");'><img width='15' height='15' src='".XOOPS_URL."/".$smileyPath."/icon_razz.gif' border='0' alt=':-P' /></a>";
  	echo "<a href='javascript: justReturn()' onclick='xoopsCodeSmilie(\"$textarea_id\", \" :-x \");'><img width='15' height='15' src='".XOOPS_URL."/".$smileyPath."/icon_mad.gif' border='0' alt=':-x' /></a>";
! 	echo "&nbsp;[<a href='javascript:openWithSelfMain(\"".XOOPS_URL."/misc.php?action=showpopups&amp;type=smilies&amp;target=".$textarea_id."\",\"smilies\",300,430);'>"._MORE."</a>]";		
  }
  ?>
--- 240,244 ----
  	echo "<a href='javascript: justReturn()' onclick='xoopsCodeSmilie(\"$textarea_id\", \" :-P \");'><img width='15' height='15' src='".XOOPS_URL."/".$smileyPath."/icon_razz.gif' border='0' alt=':-P' /></a>";
  	echo "<a href='javascript: justReturn()' onclick='xoopsCodeSmilie(\"$textarea_id\", \" :-x \");'><img width='15' height='15' src='".XOOPS_URL."/".$smileyPath."/icon_mad.gif' border='0' alt=':-x' /></a>";
! 	echo "&nbsp;[<a href='javascript:openWithSelfMain(\"".XOOPS_URL."/misc.php?action=showpopups&amp;type=smilies&amp;target=".$textarea_id."\",\"smilies\",300,430);'>"._MORE."</a>]";
  }
  ?>

[Xoops-cvs2] xoops-current/html/language/spanish global.php,1.5,1.6

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

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

Modified Files:
	global.php 
Log Message:
no comment

Index: global.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/language/spanish/global.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** global.php	17 Sep 2002 22:21:50 -0000	1.5
--- global.php	17 Sep 2002 22:32:48 -0000	1.6
***************
*** 179,183 ****
  define("_COLOR","Color");
  define("_EXAMPLE","EJEMPLO");
! define("_ENTERURL","Ingrrese el URL del enlace que quiere agregar:");
  define("_ENTERWEBTITLE","Ingrese el título del sitio web:");
  define("_ENTERIMGURL","Ingrrese el URL de la imágen que quiere agregar:");
--- 179,183 ----
  define("_COLOR","Color");
  define("_EXAMPLE","EJEMPLO");
! define("_ENTERURL","Ingrese el URL del enlace que quiere agregar:");
  define("_ENTERWEBTITLE","Ingrese el título del sitio web:");
  define("_ENTERIMGURL","Ingrrese el URL de la imágen que quiere agregar:");
***************
*** 187,191 ****
  define("_ENTEREMAIL","Ingrese la dirección de email que quiere agregar.");
  define("_ENTERCODE","Ingrese los códigos que usted desee agregar.");
! define("_ENTERQUOTE","Iingrese el texto que quiere que esté acotado.");
  define("_ENTERTEXTBOX","Por favor ingrese el texto dentro del cuadro de texto.");
  define("_ALLOWEDCHAR","Longitud de caracteres máx permitida: ");
--- 187,191 ----
  define("_ENTEREMAIL","Ingrese la dirección de email que quiere agregar.");
  define("_ENTERCODE","Ingrese los códigos que usted desee agregar.");
! define("_ENTERQUOTE","Ingrese el texto que quiere que esté acotado.");
  define("_ENTERTEXTBOX","Por favor ingrese el texto dentro del cuadro de texto.");
  define("_ALLOWEDCHAR","Longitud de caracteres máx permitida: ");

[Xoops-cvs2] xoops-current/html/language/spanish global.php,1.4,1.5

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

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

Modified Files:
	global.php 
Log Message:
no comment

Index: global.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/language/spanish/global.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** global.php	10 Aug 2002 18:27:24 -0000	1.4
--- global.php	17 Sep 2002 22:21:50 -0000	1.5
***************
*** 50,55 ****
  define("_TOP","Top");
  define("_ONLINE","<img border='0' src='\images\online.gif' alt='Usuario en línea'>");
! 
  define("_CANCEL","Cancelar");
  
  
--- 50,62 ----
  define("_TOP","Top");
  define("_ONLINE","<img border='0' src='\images\online.gif' alt='Usuario en línea'>");
! define('_NUMCOMMENTS', "%s comentarios");
! define('_NUMVIEWS', "%s vistas");
! define('_UPDATED', "Actualizado");
  define("_CANCEL","Cancelar");
+ define("_ASCENDING","Orden Ascendente");
+ define("_DESCENDING","Orden Descendente");
+ define("_RATING","Valoración");
+ define("_VIEWS","Vistas");
+ define("_COMMENTS",'Comentarios');
  
  
***************
*** 138,141 ****
--- 145,166 ----
  define('_WELCOMETO','Bienvenido a %s');
  define('_SEARCH','Buscar');
+ define('_CATEGORIES', 'Categorías');
+ define('_SUBCATEGORIES', 'Sub-Categorías');
+ define('_ALL', 'todos');
+ define('_NAVIGATION', 'Navegación');
+ define('_SECTION', 'Sección');
+ define('_SORTBY', 'Ordenado por');
+ define('_ORDERBY', 'Ordenado por');
+ define('_TITLE', 'Título');
+ define('_MESSAGE', 'Memsaje');
+ define('_OPTIONS', 'Opciones');
+ define('_DISABLEXCODE', 'Apagar xcode');
+ define('_ATTACHSIG', 'Agregar Firma');
+ define('_QUOTE', 'Acotación');
+ define('_RELATEDITEMS', 'Items Relacionados');
+ define('_EDITMESSAGE', 'Editar Mensaje');
+ define('_PREVMESSAGE', 'Previsualizar Mensaje');
+ define('_HASSUBMITTED', 'Su mensaje ha sido enviado!');
+ define('_ORIGMESSAGE', 'Mensaje Original');
  
  
***************
*** 161,164 ****
--- 186,190 ----
  define("_ERRORIMGPOS","ERROR! Ingrese la posición de la imágen.");
  define("_ENTEREMAIL","Ingrese la dirección de email que quiere agregar.");
+ define("_ENTERCODE","Ingrese los códigos que usted desee agregar.");
  define("_ENTERQUOTE","Iingrese el texto que quiere que esté acotado.");
  define("_ENTERTEXTBOX","Por favor ingrese el texto dentro del cuadro de texto.");

[Xoops-cvs2] xoops-current/html/language/japanese global.php,1.4,1.5

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

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

Modified Files:
	global.php 
Log Message:
no message

Index: global.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/language/japanese/global.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** global.php	4 Sep 2002 10:22:26 -0000	1.4
--- global.php	17 Sep 2002 15:28:58 -0000	1.5
***************
*** 156,159 ****
--- 156,160 ----
  define("_ERRORIMGPOS","ÆþÎϤ¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó¡£²èÁü¥Õ¥¡¥¤¥ë¤ÎÇÛÃÖ¤ò·è¤á¤Æ¤¯¤À¤µ¤¤¡£");
  define("_ENTEREMAIL","¥ê¥ó¥¯¤·¤¿¤¤¥á¡¼¥ë¥¢¥É¥ì¥¹¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤");
+ define("_ENTERCODE","¥×¥í¥°¥é¥à¥³¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤");
  define("_ENTERQUOTE","°úÍѤ·¤¿¤¤Ê¸¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤");
  define("_ENTERTEXTBOX","¥Æ¥­¥¹¥È¥Ü¥Ã¥¯¥¹¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤");

[Xoops-cvs2] xoops-current/html/language/english global.php,1.4,1.5

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

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

Modified Files:
	global.php 
Log Message:
no message

Index: global.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/language/english/global.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** global.php	10 Aug 2002 04:35:46 -0000	1.4
--- global.php	17 Sep 2002 15:19:34 -0000	1.5
***************
*** 31,38 ****
  define("_THREAD","Thread");
  define("_POSTER","Poster");
! define("_JOINED","Joined: ");
! define("_POSTS","Posts: ");
! define("_FROM","From: ");
! define("_POSTED","Posted: "); // Posted date
  define("_PROFILE","Profile");
  define("_VISITWEBSITE","Visit Website");
--- 31,38 ----
  define("_THREAD","Thread");
  define("_POSTER","Poster");
! define("_JOINED","Joined");
! define("_POSTS","Posts");
! define("_FROM","From");
! define("_POSTED","Posted"); // Posted date
  define("_PROFILE","Profile");
  define("_VISITWEBSITE","Visit Website");
***************
*** 51,56 ****
  define("_BOTTOM","Bottom");
  define("_ONLINE","Online!");
! 
  define("_CANCEL","Cancel");
  
  
--- 51,63 ----
  define("_BOTTOM","Bottom");
  define("_ONLINE","Online!");
! define('_NUMCOMMENTS', "%s comments");
! define('_NUMVIEWS', "%s views");
! define('_UPDATED', "Updated");
  define("_CANCEL","Cancel");
+ define("_ASCENDING","Ascending order");
+ define("_DESCENDING","Descending order");
+ define("_RATING","Rating");
+ define("_VIEWS","Views");
+ define("_COMMENTS",'Comments');
  
  
***************
*** 139,142 ****
--- 146,168 ----
  define('_WELCOMETO','Welcome to %s');
  define('_SEARCH','Search');
+ define('_CATEGORIES', 'Categories');
+ define('_SUBCATEGORIES', 'Sub-Categories');
+ define('_ALL', 'All');
+ define('_NAVIGATION', 'Navigation');
+ define('_SECTION', 'Section');
+ define('_SORTBY', 'Sort by');
+ define('_ORDERBY', 'Order by');
+ define('_TITLE', 'Title');
+ define('_MESSAGE', 'Message');
+ define('_OPTIONS', 'Options');
+ define('_DISABLEXCODE', 'Disable xcode');
+ define('_ATTACHSIG', 'Attach Signature');
+ define('_QUOTE', 'Quote');
+ define('_RELATEDITEMS', 'Related Items');
+ define('_EDITMESSAGE', 'Edit Message');
+ define('_PREVMESSAGE', 'Preview Message');
+ define('_HASSUBMITTED', 'Your message has been submitted!');
+ define('_ORIGMESSAGE', 'Original Message');
+ 
  
  //%%%%%	File Name class/xoopsform/formmatchoption.php 	%%%%%
***************
*** 161,164 ****
--- 187,191 ----
  define("_ERRORIMGPOS","ERROR! Enter the position of the image.");
  define("_ENTEREMAIL","Enter the email address you want to add.");
+ define("_ENTERCODE","Enter the codes that you want to add.");
  define("_ENTERQUOTE","Enter the text that you want to be quoted.");
  define("_ENTERTEXTBOX","Please input text into the textbox.");

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

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

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

Modified Files:
	xoopscodes.php 
Log Message:
no message

Index: xoopscodes.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/include/xoopscodes.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** xoopscodes.php	17 Jul 2002 07:39:34 -0000	1.2
--- xoopscodes.php	17 Sep 2002 15:17:59 -0000	1.3
***************
*** 84,87 ****
--- 84,97 ----
  }
  
+ function xoopsCodeCode(id){
+ 	var text = prompt("<?php echo _ENTERCode;?>", "");
+ 	var dom = xoopsGetElementById(id);
+ 	if ( text != null && text != "" ) {
+ 		var result = "[code]" + text + "[/code]";
+ 		dom.value += result;
+ 	}
+ 	dom.focus();
+ }
+ 
  function xoopsCodeText(id){
  	var textareaDom = xoopsGetElementById(id);
***************
*** 179,183 ****
  */
  function xoopsCodeTarea($textarea_id, $cols=50, $rows=10){
! 	echo "<input type='button' value='URL' onclick='xoopsCodeUrl(\"$textarea_id\");' /><input type='button' value='IMG' onclick='xoopsCodeImg(\"$textarea_id\");' /><input type='button' value='EMAIL' onclick='xoopsCodeEmail(\"$textarea_id\");' /><input type='button' value='QUOTE' onclick='xoopsCodeQuote(\"$textarea_id\");' /><br />\n";
  
  	$sizearray = array("xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large");
--- 189,193 ----
  */
  function xoopsCodeTarea($textarea_id, $cols=50, $rows=10){
! 	echo "<input type='button' value='URL' onclick='xoopsCodeUrl(\"$textarea_id\");' /><input type='button' value='IMG' onclick='xoopsCodeImg(\"$textarea_id\");' /><input type='button' value='EMAIL' onclick='xoopsCodeEmail(\"$textarea_id\");' /><input type='button' value='CODE' onclick='xoopsCodeCode(\"$textarea_id\");' /><input type='button' value='QUOTE' onclick='xoopsCodeQuote(\"$textarea_id\");' /><br />\n";
  
  	$sizearray = array("xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large");

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

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

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

Modified Files:
	index.php 
Log Message:
no message

Index: index.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/news/admin/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.php	11 Aug 2002 13:53:47 -0000	1.2
--- index.php	14 Sep 2002 12:43:06 -0000	1.3
***************
*** 3,7 ****
  include_once(XOOPS_ROOT_PATH."/class/xoopstopic.php");
  include_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/class/class.newsstory.php");
- include_once(XOOPS_ROOT_PATH."/class/module.errorhandler.php");
  include(XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/cache/config.php");
  
--- 3,6 ----

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

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

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

Modified Files:
	user.php 
Log Message:
no message

Index: user.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/user.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** user.php	11 Sep 2002 20:18:16 -0000	1.4
--- user.php	14 Sep 2002 08:09:57 -0000	1.5
***************
*** 78,81 ****
--- 78,92 ----
  }
  
+ if ($op == 'logout') {
+ 	$message = '';
+ 	if ( $xoopsUser ) {
+ 		$xoopsUser->logout();
+ 		$message = _US_LOGGEDOUT;
+ 		$message .= '<p>'._US_THANKYOUFORVISIT.'</p>';
+ 	}
+     	redirect_header('index.php', 1, $message);
+ 	exit();
+ }
+ 
  if ($op == 'actv') {
  	$id = intval($HTTP_GET_VARS['id']);

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

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

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

Modified Files:
	register.php 
Log Message:
no message

Index: register.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/register.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** register.php	5 Sep 2002 11:10:36 -0000	1.4
--- register.php	11 Sep 2002 20:24:07 -0000	1.5
***************
*** 19,40 ****
  // ------------------------------------------------------------------------- //
  
! $xoopsOption['pagetype'] = "user";
  
! include("mainfile.php");
  $myts =& MyTextSanitizer::getInstance();
  
  function userCheck($uname, $email, $pass, $vpass) {
  	global $xoopsConfig, $xoopsDB;
! 	include(XOOPS_ROOT_PATH."/modules/system/cache/badunames.php");
  	$myts =& MyTextSanitizer::getInstance();
! 	$stop = "";
  	if ( !checkEmail($email) ) {
! 		$stop .= _US_INVALIDMAIL."<br />";
  	}
  	if ( strrpos($uname,' ') > 0 ) {
! 		$stop .= _US_EMAILNOSPACES."<br />";
  	}
  	$uname = $myts->oopsStripSlashesGPC($uname);
! 	$strict = "^a-zA-Z0-9_";
  	$medium = $strict."<>,.$%#@!\'\"";
  	$loose = $medium."?{}\[\]\(\)\^&*`~;:\\+=";
--- 19,40 ----
  // ------------------------------------------------------------------------- //
  
! $xoopsOption['pagetype'] = 'user';
  
! include('mainfile.php');
  $myts =& MyTextSanitizer::getInstance();
  
  function userCheck($uname, $email, $pass, $vpass) {
  	global $xoopsConfig, $xoopsDB;
! 	include(XOOPS_ROOT_PATH.'/modules/system/cache/badunames.php');
  	$myts =& MyTextSanitizer::getInstance();
! 	$stop = '';
  	if ( !checkEmail($email) ) {
! 		$stop .= _US_INVALIDMAIL.'<br />';
  	}
  	if ( strrpos($uname,' ') > 0 ) {
! 		$stop .= _US_EMAILNOSPACES.'<br />';
  	}
  	$uname = $myts->oopsStripSlashesGPC($uname);
! 	$strict = '^a-zA-Z0-9_';
  	$medium = $strict."<>,.$%#@!\'\"";
  	$loose = $medium."?{}\[\]\(\)\^&*`~;:\\+=";
***************
*** 50,54 ****
  			break;
  	}
! 	if ( (!$uname) || ($uname=="") || (ereg("[".$restriction."-]",$uname)) ) {
  		$stop .= _US_INVALIDNICKNAME."<br />";
  	}
--- 50,54 ----
  			break;
  	}
! 	if ( (!$uname) || ($uname=='') || (ereg("[".$restriction."-]",$uname)) ) {
  		$stop .= _US_INVALIDNICKNAME."<br />";
  	}
***************
*** 65,69 ****
  		$stop .= _US_NICKNAMENOSPACES."<br />";
  	}
! 	$sql = "SELECT COUNT(*) FROM ".$xoopsDB->prefix("users")." WHERE uname='".addslashes($uname)."'";
  	$result = $xoopsDB->query($sql);
  	list($count) = $xoopsDB->fetchRow($result);
--- 65,69 ----
  		$stop .= _US_NICKNAMENOSPACES."<br />";
  	}
! 	$sql = "SELECT COUNT(*) FROM ".$xoopsDB->prefix('users')." WHERE uname='".addslashes($uname)."'";
  	$result = $xoopsDB->query($sql);
  	list($count) = $xoopsDB->fetchRow($result);
***************
*** 73,77 ****
  	$count = 0;
  	if ( $email ) {
! 		$sql = "SELECT COUNT(*) FROM ".$xoopsDB->prefix("users")." where email='".$myts->makeTboxData4Save($email)."'";
  		$result = $xoopsDB->query($sql);
  		list($count) = $xoopsDB->fetchRow($result);
--- 73,77 ----
  	$count = 0;
  	if ( $email ) {
! 		$sql = "SELECT COUNT(*) FROM ".$xoopsDB->prefix('users')." where email='".$myts->makeTboxData4Save($email)."'";
  		$result = $xoopsDB->query($sql);
  		list($count) = $xoopsDB->fetchRow($result);
***************
*** 80,94 ****
  		}
  	}
! 	if ( !isset($pass) || $pass == "" || !isset($vpass) || $vpass == "" ) {
! 		$stop .= _US_ENTERPWD."<br />";
  	} 
  	if ( (isset($pass)) && ($pass != $vpass) ) {
! 		$stop .= _US_PASSNOTSAME."<br />";
! 	} elseif ( ($pass != "") && (strlen($pass) < $xoopsConfig['minpass']) ) {
  		$stop .= sprintf(_US_PWDTOOSHORT,$xoopsConfig['minpass'])."<br />";
  	} 
  	return $stop;
  }
! $op = "register";
  foreach ( $HTTP_POST_VARS as $k => $v ) {
  	$$k = $v;
--- 80,95 ----
  		}
  	}
! 	if ( !isset($pass) || $pass == '' || !isset($vpass) || $vpass == '' ) {
! 		$stop .= _US_ENTERPWD.'<br />';
  	} 
  	if ( (isset($pass)) && ($pass != $vpass) ) {
! 		$stop .= _US_PASSNOTSAME.'<br />';
! 	} elseif ( ($pass != '') && (strlen($pass) < $xoopsConfig['minpass']) ) {
  		$stop .= sprintf(_US_PWDTOOSHORT,$xoopsConfig['minpass'])."<br />";
  	} 
  	return $stop;
  }
! 
! $op = 'register';
  foreach ( $HTTP_POST_VARS as $k => $v ) {
  	$$k = $v;
***************
*** 96,110 ****
  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();
! 		include("header.php");
  		$uname = trim($uname);
  		$email = trim($email);
--- 97,111 ----
  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();
! 		include('header.php');
  		$uname = trim($uname);
  		$email = trim($email);
***************
*** 114,127 ****
  		if ( empty($stop) ) {
  			OpenTable();
! 			echo ""._US_USERNAME.": ".$myts->makeTboxData4Preview($uname)."<br />";
! 			echo ""._US_EMAIL.": ".$myts->makeTboxData4Preview($email)."<br />";
! 			if ( $user_avatar != "" ) {
! 				echo ""._US_AVATAR.": <img src='images/avatar/".$user_avatar."' alt='' /><br />";
  			}
! 			if ( isset($url) && $url != "" ) {
  				$url = formatURL($myts->makeTboxData4Preview($url));
! 				echo ""._US_WEBSITE.": $url<br />";
  			}
! 			$f_timezone = ($timezone_offset < 0) ? "GMT ".$timezone_offset : "GMT +".$timezone_offset;
  			echo _US_TIMEZONE.": $f_timezone<br />";
  			echo "<form action='register.php' method='post'>
--- 115,128 ----
  		if ( empty($stop) ) {
  			OpenTable();
! 			echo _US_USERNAME.": ".$myts->makeTboxData4Preview($uname)."<br />";
! 			echo _US_EMAIL.": ".$myts->makeTboxData4Preview($email)."<br />";
! 			if ( $user_avatar != '' ) {
! 				echo _US_AVATAR.": <img src='images/avatar/".$user_avatar."' alt='' /><br />";
  			}
! 			if ( isset($url) && $url != '' ) {
  				$url = formatURL($myts->makeTboxData4Preview($url));
! 				echo _US_WEBSITE.": $url<br />";
  			}
! 			$f_timezone = ($timezone_offset < 0) ? 'GMT '.$timezone_offset : 'GMT +'.$timezone_offset;
  			echo _US_TIMEZONE.": $f_timezone<br />";
  			echo "<form action='register.php' method='post'>
***************
*** 139,149 ****
  		} else {
  			echo "<span style='color:#ff0000;'>$stop</span>";
! 			include("include/registerform.php");
  			$reg_form->display();
  		}
! 		include("footer.php");
  		break;
! 	case "finish":
! 		include("header.php");
  		$uname = trim($uname);
  		$email = trim($email);
--- 140,150 ----
  		} else {
  			echo "<span style='color:#ff0000;'>$stop</span>";
! 			include('include/registerform.php');
  			$reg_form->display();
  		}
! 		include('footer.php');
  		break;
! 	case 'finish':
! 		include('header.php');
  		$uname = trim($uname);
  		$email = trim($email);
***************
*** 154,177 ****
  			$newuser = new XoopsUser();
  			if ( isset($user_viewemail) ) {
! 				$newuser->setVar("user_viewemail",$user_viewemail);
  			}
  			if ( isset($attachsig) ) {
! 				$newuser->setVar("attachsig",$attachsig);
  			}
! 			$newuser->setVar("name",$name);
! 			$newuser->setVar("uname",$uname);
! 			$newuser->setVar("email",$email);
! 			if ( isset($url) && $url!="" ) {
! 				$newuser->setVar("url", formatURL($url));
  			}
! 			$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);
! 			$newuser->setVar("user_regdate", time());
! 			$newuser->setVar("uorder",$xoopsConfig['com_order']);
! 			$newuser->setVar("umode",$xoopsConfig['com_mode']);
! 			$newuser->setVar("user_mailok",$user_mailok);
  			if ($xoopsConfig['activation_type'] == 1) {
  				$newuser->setVar('level', 1);
--- 155,178 ----
  			$newuser = new XoopsUser();
  			if ( isset($user_viewemail) ) {
! 				$newuser->setVar('user_viewemail',$user_viewemail);
  			}
  			if ( isset($attachsig) ) {
! 				$newuser->setVar('attachsig',$attachsig);
  			}
! 			$newuser->setVar('name',$name);
! 			$newuser->setVar('uname',$uname);
! 			$newuser->setVar('email',$email);
! 			if ( isset($url) && $url!='' ) {
! 				$newuser->setVar('url', formatURL($url));
  			}
! 			$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);
! 			$newuser->setVar('user_regdate', time());
! 			$newuser->setVar('uorder',$xoopsConfig['com_order']);
! 			$newuser->setVar('umode',$xoopsConfig['com_mode']);
! 			$newuser->setVar('user_mailok',$user_mailok);
  			if ($xoopsConfig['activation_type'] == 1) {
  				$newuser->setVar('level', 1);
***************
*** 184,188 ****
  			}
  			if ($xoopsConfig['activation_type'] == 1) {
! 				redirect_header("user.php", 4, _US_ACTLOGIN);
  				exit();
  			}
--- 185,189 ----
  			}
  			if ($xoopsConfig['activation_type'] == 1) {
! 				redirect_header('user.php', 4, _US_ACTLOGIN);
  				exit();
  			}
***************
*** 191,198 ****
  				$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']);
--- 192,199 ----
  				$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']);
***************
*** 243,250 ****
  		} else {
  			echo "<span style='color:#ff0000; font-weight:bold;'>$stop</span>";
! 			include("include/registerform.php");
  			$reg_form->display();
  		}
! 		include("footer.php");
  		break;
  }
--- 244,251 ----
  		} else {
  			echo "<span style='color:#ff0000; font-weight:bold;'>$stop</span>";
! 			include('include/registerform.php');
  			$reg_form->display();
  		}
! 		include('footer.php');
  		break;
  }

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

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

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

Modified Files:
	user.php 
Log Message:
no message

Index: user.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/user.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** user.php	5 Sep 2002 04:10:52 -0000	1.3
--- user.php	11 Sep 2002 20:18:16 -0000	1.4
***************
*** 18,28 ****
  //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
  // ------------------------------------------------------------------------- //
! $xoopsOption['pagetype'] = "user";
  include('mainfile.php');
  
! function main() {
! 	global $xoopsUser, $HTTP_COOKIE_VARS, $xoopsConfig, $xoopsTheme;
  	if ( !$xoopsUser ) {
! 		include("header.php");
  		OpenTable();
  		echo "<form action='user.php' method='post'><b>"._US_USERLOGIN."</b><br /><br />". _US_NICKNAMECOLON."<input class='textbox' type='text' name='uname' size='26' maxlength='25'";
--- 18,35 ----
  //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
  // ------------------------------------------------------------------------- //
! $xoopsOption['pagetype'] = 'user';
  include('mainfile.php');
  
! $op = 'main';
! 
! if ( isset($HTTP_POST_VARS['op']) ) {
! 	$op = trim($HTTP_POST_VARS['op']);
! } elseif ( isset($HTTP_GET_VARS['op']) ) {
! 	$op = trim($HTTP_GET_VARS['op']);
! }
! 
! if ($op == 'main') {
  	if ( !$xoopsUser ) {
! 		include('header.php');
  		OpenTable();
  		echo "<form action='user.php' method='post'><b>"._US_USERLOGIN."</b><br /><br />". _US_NICKNAMECOLON."<input class='textbox' type='text' name='uname' size='26' maxlength='25'";
***************
*** 36,63 ****
  		echo "<b>"._US_LOSTPASSWORD."</b><br /><br />"._US_NOPROBLEM."<br /><form action='lostpass.php' method='post'>".  _US_YOUREMAIL ."<input class='textbox' type='text' name='email' size='26' maxlength='60' />&nbsp;&nbsp<input type='hidden' name='op' value='mailpasswd' /><input type='submit' value='"._US_SENDPASSWORD."' />";
  		CloseTable();
! 		echo "</form>";
! 		include("footer.php");
  	} elseif ( $xoopsUser ) {
! 		Header("Location: ".XOOPS_URL."/userinfo.php?uid=".$xoopsUser->getVar("uid")."");
! 		//redirect_header("userinfo.php?uid=".$xoopsUser->getVar("uid")."",0,_US_TAKINGYOU);
! 		exit();
! 	}
! }
! 
! function logout() {
! 	global $xoopsConfig, $xoopsUser;
! 	if ( $xoopsUser ) {
! 		$xoopsUser->logout();
  	}
- 	$message = _US_LOGGEDOUT;
- 	$message .= "<br />"._US_THANKYOUFORVISIT."<br />";
-     	redirect_header("index.php",1,$message);
  	exit();
  }
  
! function login($uname, $pass) {
! 	$uname = trim($uname);
! 	$pass = trim($pass);
! 	if ( !isset($uname) || !isset($pass) || $uname == "" || $pass == "" ) {
  		redirect_header("user.php",1,_US_INCORRECTLOGIN);
  		exit();
--- 43,58 ----
  		echo "<b>"._US_LOSTPASSWORD."</b><br /><br />"._US_NOPROBLEM."<br /><form action='lostpass.php' method='post'>".  _US_YOUREMAIL ."<input class='textbox' type='text' name='email' size='26' maxlength='60' />&nbsp;&nbsp<input type='hidden' name='op' value='mailpasswd' /><input type='submit' value='"._US_SENDPASSWORD."' />";
  		CloseTable();
! 		echo '</form>';
! 		include('footer.php');
  	} elseif ( $xoopsUser ) {
! 		header('Location: '.XOOPS_URL.'/userinfo.php?uid='.$xoopsUser->getVar('uid'));
  	}
  	exit();
  }
  
! if ($op == 'login') {
! 	$uname = trim($HTTP_POST_VARS['uname']);
! 	$pass = trim($HTTP_POST_VARS['pass']);
! 	if ( !isset($uname) || !isset($pass) || $uname == '' || $pass == '' ) {
  		redirect_header("user.php",1,_US_INCORRECTLOGIN);
  		exit();
***************
*** 66,70 ****
  	if ( false != $user) {
  		if ( 0 == $user->getVar('level') ) {
! 			redirect_header("index.php",5,_US_NOACTTPADM);
  			exit();
  		}
--- 61,65 ----
  	if ( false != $user) {
  		if ( 0 == $user->getVar('level') ) {
! 			redirect_header('index.php',5,_US_NOACTTPADM);
  			exit();
  		}
***************
*** 77,164 ****
  		$user->updateLastLogin();
  		redirect_header('index.php', 1, sprintf(_US_LOGGINGU, $user->getVar('uname')));
- 		exit();
  	} else {
! 		redirect_header("user.php",1,_US_INCORRECTLOGIN);
! 		exit();
  	}
  }
  
! function activate($id,$key) {
! 	global $xoopsDB;
! 	if ( empty($id) || !is_numeric($id) ) {
! 		redirect_header("index.php",1,"");
  		exit();
  	}
  	$thisuser = new XoopsUser($id);
! 	if ( $thisuser->actkey() != $key ) {
! 		redirect_header("index.php",5,_US_ACTKEYNOT);
! 		exit();
  	} else {
  		if ( $thisuser->isActive() ) {
! 			redirect_header("user.php",5,_US_ACONTACT);
! 			exit();
  		} else {
  			if ($thisuser->activate()) {
! 				redirect_header("user.php",5,_US_ACTLOGIN);
! 				exit();
  			} else {
! 				redirect_header("index.php",5,"Activation failed!");
! 				exit();
  			}
  		}
  	}
  }
  
! function delete($ok=0) {
! 	global $xoopsUser, $xoopsConfig, $xoopsTheme;
! 	if ( !$xoopsUser || !$xoopsConfig['self_delete'] ) {
! 		redirect_header("index.php",5,_US_NOPERMISS);
  		exit();
  	} else {
! 		if ( !$ok ) {
! 			include("header.php");
! 			echo "<div><h4>"._US_SURETODEL."</h4>". _US_REMOVEINFO."<br />";
! 			echo "<table><tr><td>\n";
! 			// need to change to POST here
! 			echo myTextForm("user.php?op=delete&amp;ok=1", _US_YES);
! 			echo "</td><td>\n";
! 			// need to change to POST here
! 			echo myTextForm("user.php", _US_NO);
! 			echo "</td></tr></table></div>\n";
! 			include("footer.php");
! 			exit();
  		} else {
  			$xoopsUser->delete();
! 			redirect_header("index.php",5,_US_BEENDELED);
! 			exit();
  		}
  	}
- }
- 
- 
- $op = "main";
- if ( isset($HTTP_POST_VARS['op']) ) {
- 	$op = trim($HTTP_POST_VARS['op']);
- } elseif ( isset($HTTP_GET_VARS['op']) ) {
- 	$op = trim($HTTP_GET_VARS['op']);
- }
- 
- switch($op) {
- 	case "logout":
- 		logout();
- 		break;
- 	case "login":
- 		login($HTTP_POST_VARS['uname'], $HTTP_POST_VARS['pass']);
- 		break;
- 	case "actv":
- 		activate($HTTP_GET_VARS['id'], $HTTP_GET_VARS['actkey']);
- 		break;
- 	case "delete":
- 		delete($HTTP_GET_VARS['ok']);
- 		break;
- 	case "main":
- 	default:
- 		main();
- 		break;
  }
  ?>
--- 72,126 ----
  		$user->updateLastLogin();
  		redirect_header('index.php', 1, sprintf(_US_LOGGINGU, $user->getVar('uname')));
  	} else {
! 		redirect_header('user.php',1,_US_INCORRECTLOGIN);
  	}
+ 	exit();
  }
  
! if ($op == 'actv') {
! 	$id = intval($HTTP_GET_VARS['id']);
! 	$actkey = trim($HTTP_GET_VARS['actkey']);
! 	if (empty($id)) {
! 		redirect_header('index.php',1,'');
  		exit();
  	}
  	$thisuser = new XoopsUser($id);
! 	if ( $thisuser->actkey() != $actkey ) {
! 		redirect_header('index.php',5,_US_ACTKEYNOT);
  	} else {
  		if ( $thisuser->isActive() ) {
! 			redirect_header('user.php',5,_US_ACONTACT);
  		} else {
  			if ($thisuser->activate()) {
! 				redirect_header('user.php',5,_US_ACTLOGIN);
  			} else {
! 				redirect_header('index.php',5,'Activation failed!');
  			}
  		}
  	}
+ 	exit();
  }
  
! if ($op == 'delete') {
! 	if (!$xoopsUser || !$xoopsConfig['self_delete']) {
! 		redirect_header('index.php',5,_US_NOPERMISS);
  		exit();
  	} else {
! 		$ok = !isset($HTTP_GET_VARS['ok']) ? 0 : intval($HTTP_GET_VARS['ok']);
! 		if ($ok != 1) {
! 			include('header.php');
! 			echo '<div><h4>'._US_SURETODEL.'</h4>'. _US_REMOVEINFO.'<br />';
! 			echo '<table><tr><td>';
! 			echo myTextForm('user.php?op=delete&amp;ok=1', _US_YES);
! 			echo '</td><td>';
! 			echo myTextForm('user.php', _US_NO);
! 			echo '</td></tr></table></div>';
! 			include('footer.php');
  		} else {
  			$xoopsUser->delete();
! 			redirect_header('index.php', 5, _US_BEENDELED);
  		}
+ 		exit();
  	}
  }
  ?>

[Xoops-cvs2] xoops-current/html/modules/news submit.php,1.1.1.1,1.2

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

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

Modified Files:
	submit.php 
Log Message:
no message

Index: submit.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/news/submit.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** submit.php	15 Jul 2002 08:13:36 -0000	1.1.1.1
--- submit.php	11 Sep 2002 12:21:06 -0000	1.2
***************
*** 24,28 ****
  // ------------------------------------------------------------------------- //
  include("header.php");
- include_once(XOOPS_ROOT_PATH."/class/xoopstree.php");
  include_once("class/class.newsstory.php");
  include("cache/config.php");
--- 24,27 ----

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

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

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

Modified Files:
	main.php 
Log Message:
no comment

Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/xoopsmembers/language/spanish/main.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** main.php	15 Jul 2002 08:14:04 -0000	1.1.1.1
--- main.php	10 Sep 2002 23:32:07 -0000	1.2
***************
*** 1,3 ****
! <?php // Xoops Spanish Support (www.xoops.sytes.net) 
  //%%%%%%	File Name memberslist.php 	%%%%%
  
--- 1,3 ----
! <?php // Xoops Spanish Support (www.xoops.sytes.net)
  //%%%%%%	File Name memberslist.php 	%%%%%
  
***************
*** 9,14 ****
  define("_MM_PM","PM");
  define("_MM_URL","URL");
! define("_MM_PREVIOUS","Anterior");
! define("_MM_NEXT","Proximo");
  define("_MM_USERSFOUND","%s miembro(s) encontrado(s)");
  
--- 9,14 ----
  define("_MM_PM","PM");
  define("_MM_URL","URL");
! define("_MM_PREVIOUS","<img border='0' src='/images/left.gif' alt='Anterior' />");
! define("_MM_NEXT","<img border='0' src='/images/right.gif' alt='Próximo' />");
  define("_MM_USERSFOUND","%s miembro(s) encontrado(s)");
  
***************
*** 38,40 ****
  define("_MM_LIMIT","Numero de miembros por pagina");
  define("_MM_RESULTS","Resultados de busqueda");
! ?>
--- 38,67 ----
  define("_MM_LIMIT","Numero de miembros por pagina");
  define("_MM_RESULTS","Resultados de busqueda");
! 
! // all.php add
! 
! define("_ML_SORTBY","Ordenar por:");
! define("_ML_ALL","Todos");
! define("_ML_OTHER","Otro");
! define("_ML_WELCOMETO","Bienvenido a la llista de miembros de %s");
! define("_ML_GREETINGS","Saludamos a nuestro último usuario registrado:");
! define("_ML_WEHAVESOFAR","Tenemos <b>%s</b> usuarios Registrados.");
! define("_ML_CURRENTONLINE","Usuarios registrados Actualmente en linea:");
! define("_ML_SEARCH","Buscar");
! define("_ML_RESETSEARCH","Limpiar Busqueda");
! define("_ML_AVATAR","Avatar");
! define("_ML_NICKNAME","Apodo");
! define("_ML_REALNAME","Nombre Real");
! define("_ML_REGDATE","Fecha de Registración");
! define("_ML_EMAIL","Email");
! define("_ML_PM","MP");
! define("_ML_URL","URL");
! define("_ML_FUNCTIONS","Funciones");
! define("_ML_EDIT","Editar");
! define("_ML_DELETE","Borrar");
! define("_ML_PREVIOUS","<img border='0' src='/images/left.gif' alt='Página Anterior' /> Página Anterior");
! define("_ML_NEXT","Página Siguiente <img border='0' src='/images/right.gif' alt='Página Siguiente' />");
! define("_ML_USERSFOUND","%s usuario(s) encontrado(s)");
! define("_ML_PEGESUSERS","%s pagina(s), %s usuario(s) mostrado(s)");
! define("_ML_NOUSERFOUND","Miempbros no enconrtados para %s");
! ?>
\ No newline at end of file

[Xoops-cvs2] xoops-current/html/language/spanish pmsg.php,1.1.1.1,1.2 search.php,1.1.1.1,1.2

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

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

Modified Files:
	pmsg.php search.php 
Log Message:
no comment

Index: pmsg.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/language/spanish/pmsg.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** pmsg.php	15 Jul 2002 08:14:09 -0000	1.1.1.1
--- pmsg.php	10 Sep 2002 23:32:07 -0000	1.2
***************
*** 1,3 ****
! <?php // Xoops Spanish Support (www.xoops.sytes.net) 
  //%%%%%%	File Name readpmsg.php 	%%%%%
  define("_PM_DELETED","Su mensaje fue Borrado.");
--- 1,3 ----
! <?php // Xoops Spanish Support (www.xoops.sytes.net)
  //%%%%%%	File Name readpmsg.php 	%%%%%
  define("_PM_DELETED","Su mensaje fue Borrado.");
***************
*** 14,19 ****
  
  define("_PM_ADDTOLIST","Agregar a la lista de Contactos");
! define("_PM_PREVIOUS","<img border='0' src='/images/left.gif' alt='Mensaje Anterior'>");
! define("_PM_NEXT","<img border='0' src='/images/right.gif' alt='Mensaje Siguiente'>");
  define("_PM_POSTSC","Envios: ");
  define("_PM_REPLY","Responder");
--- 14,19 ----
  
  define("_PM_ADDTOLIST","Agregar a la lista de Contactos");
! define("_PM_PREVIOUS","<img border='0' src='/images/left.gif' alt='Mensaje Anterior' />");
! define("_PM_NEXT","<img border='0' src='/images/right.gif' alt='Mensaje Siguiente' />");
  define("_PM_POSTSC","Envios: ");
  define("_PM_REPLY","Responder");

Index: search.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/language/spanish/search.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** search.php	15 Jul 2002 08:14:09 -0000	1.1.1.1
--- search.php	10 Sep 2002 23:32:07 -0000	1.2
***************
*** 1,3 ****
! <?php // Xoops Spanish Support (www.xoops.sytes.net) 
  //%%%%%%	File Name search.php 	%%%%%
  define("_SR_SEARCH","Buscar");
--- 1,3 ----
! <?php // Xoops Spanish Support (www.xoops.sytes.net)
  //%%%%%%	File Name search.php 	%%%%%
  define("_SR_SEARCH","Buscar");
***************
*** 11,16 ****
  define("_SR_EXACT","Exacta");
  define("_SR_SHOWALLR","Mostrar todos los Resultados");
! define("_SR_NEXT","<img border='0' src='/images/right.gif' alt='Siguiente'>");
! define("_SR_PREVIOUS","<img border='0' src='/images/left.gif' alt='Anterior'>");
  define("_SR_KEYWORDS","Palabras clave");
  define("_SR_TYPE","Tipo");
--- 11,16 ----
  define("_SR_EXACT","Exacta");
  define("_SR_SHOWALLR","Mostrar todos los Resultados");
! define("_SR_NEXT","<img border='0' src='/images/right.gif' alt='Siguiente' />");
! define("_SR_PREVIOUS","<img border='0' src='/images/left.gif' alt='Anterior' />");
  define("_SR_KEYWORDS","Palabras clave");
  define("_SR_TYPE","Tipo");

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

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

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

Modified Files:
	newbb_new.php 
Log Message:
Changes for have the xhtml  standard

Index: newbb_new.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/newbb/blocks/newbb_new.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** newbb_new.php	10 Sep 2002 07:02:22 -0000	1.5
--- newbb_new.php	10 Sep 2002 21:06:51 -0000	1.6
***************
*** 60,65 ****
  			$block['content'] .= "<td align='center'>".$arr["topic_views"]."</td>";
  			if ( $options[1] != 0 ) {
! 				$block['content'] .= "<td align='right'>".formatTimestamp($arr["topic_time"],"m"). "</td></tr>";
  			}
  		}
  		$block['content'] .= "</table></td></tr><tr class='bg4'><td align='right'><span style='font-weight:bold;'>&raquo;&raquo;</span>&nbsp;<b><a href='".XOOPS_URL."/modules/newbb/'>"._MB_NEWBB_VSTFRMS."</a></b>";
--- 60,66 ----
  			$block['content'] .= "<td align='center'>".$arr["topic_views"]."</td>";
  			if ( $options[1] != 0 ) {
! 				$block['content'] .= "<td align='right'>".formatTimestamp($arr["topic_time"],"m"). "</td>";
  			}
+ 			$block['content'] .= "</tr>";
  		}
  		$block['content'] .= "</table></td></tr><tr class='bg4'><td align='right'><span style='font-weight:bold;'>&raquo;&raquo;</span>&nbsp;<b><a href='".XOOPS_URL."/modules/newbb/'>"._MB_NEWBB_VSTFRMS."</a></b>";
***************
*** 70,73 ****
--- 71,75 ----
      	return $block;
  }
+ 
  
  function b_newbb_new_edit($options) {

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

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

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

Modified Files:
	index.php 
Log Message:
removed the valign='top' for xhtml standard

Index: index.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/xoopspoll/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** index.php	4 Aug 2002 19:36:00 -0000	1.3
--- index.php	10 Sep 2002 07:10:48 -0000	1.4
***************
*** 53,57 ****
  	$polls_count = count($polls_arr);
  	$max = ( $polls_count > $limit ) ? $limit : $polls_count;
! 	echo "<table border='0' cellpadding='0' cellspacing='0' valign='top' width='100%'><tr><td class='bg2'>
  	<table width='100%' border='0' cellpadding='4' cellspacing='1'>
  	<tr class='bg3'><td><b>"._PL_POLLQUESTION."</b></td><td align='center'><b>"._PL_VOTERS."</b></td><td align='center'><b>"._PL_VOTES."</b></td><td align='center'><b>"._PL_EXPIRATION."</b></td><td>&nbsp;</td></tr>";
--- 53,57 ----
  	$polls_count = count($polls_arr);
  	$max = ( $polls_count > $limit ) ? $limit : $polls_count;
! 	echo "<table border='0' cellpadding='0' cellspacing='0' width='100%'><tr><td class='bg2'>
  	<table width='100%' border='0' cellpadding='4' cellspacing='1'>
  	<tr class='bg3'><td><b>"._PL_POLLQUESTION."</b></td><td align='center'><b>"._PL_VOTERS."</b></td><td align='center'><b>"._PL_VOTES."</b></td><td align='center'><b>"._PL_EXPIRATION."</b></td><td>&nbsp;</td></tr>";

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

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

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

Modified Files:
	system_blocks.php 
Log Message:
removed line 145  $block['content'] .= "<tr><td colspan='2'>"; for xhtml standard

Index: system_blocks.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/blocks/system_blocks.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** system_blocks.php	25 Aug 2002 15:26:00 -0000	1.4
--- system_blocks.php	10 Sep 2002 07:04:19 -0000	1.5
***************
*** 143,147 ****
  				if ($prev_caption != $userinfo['groupname']) {
  				$prev_caption = $userinfo['groupname'];
- 				$block['content'] .= "<tr><td colspan='2'>";
  				$block['content'] .= "<small>";
  				$block['content'] .= "<b>".$myts->makeTboxData4Show($prev_caption)."</b>";
--- 143,146 ----

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

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

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

Modified Files:
	newbb_new.php 
Log Message:
no message

Index: newbb_new.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/newbb/blocks/newbb_new.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** newbb_new.php	9 Sep 2002 21:15:01 -0000	1.4
--- newbb_new.php	10 Sep 2002 07:02:22 -0000	1.5
***************
*** 60,67 ****
  			$block['content'] .= "<td align='center'>".$arr["topic_views"]."</td>";
  			if ( $options[1] != 0 ) {
! 				$block['content'] .= "<td align='right'>".formatTimestamp($arr["topic_time"],"m"). "</td>";
  			}
  		}
! 		$block['content'] .= "</tr></table></td></tr><tr class='bg4'><td align='right'><span style='font-weight:bold;'>&raquo;&raquo;</span>&nbsp;<b><a href='".XOOPS_URL."/modules/newbb/'>"._MB_NEWBB_VSTFRMS."</a></b>";
  		$block['content'] .= "</td></tr></table>";
  	} else {
--- 60,67 ----
  			$block['content'] .= "<td align='center'>".$arr["topic_views"]."</td>";
  			if ( $options[1] != 0 ) {
! 				$block['content'] .= "<td align='right'>".formatTimestamp($arr["topic_time"],"m"). "</td></tr>";
  			}
  		}
! 		$block['content'] .= "</table></td></tr><tr class='bg4'><td align='right'><span style='font-weight:bold;'>&raquo;&raquo;</span>&nbsp;<b><a href='".XOOPS_URL."/modules/newbb/'>"._MB_NEWBB_VSTFRMS."</a></b>";
  		$block['content'] .= "</td></tr></table>";
  	} else {

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

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

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

Modified Files:
	groups.php 
Log Message:
no message

Index: groups.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/groups/groups.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** groups.php	6 Aug 2002 01:20:51 -0000	1.3
--- groups.php	10 Sep 2002 04:09:29 -0000	1.4
***************
*** 11,20 ****
          global $xoopsDB, $xoopsConfig, $xoopsModule;
          xoops_cp_header();
!         OpenTable();
          echo "<h4 style='text-align:left'>"._AM_EDITADG."</h4>";
          $result = $xoopsDB->query("SELECT groupid, name, type FROM ".$xoopsDB->prefix("groups")."");
!         echo "<table border='0' cellpadding='0' cellspacing='0' valign='top' width='40%'>
! <tr><td class='bg2'>
! <table width='100%' border='0' cellpadding='4' cellspacing='1'>
  ";
  	$myts =& MyTextSanitizer::getInstance();
--- 11,18 ----
          global $xoopsDB, $xoopsConfig, $xoopsModule;
          xoops_cp_header();
!         //OpenTable();
          echo "<h4 style='text-align:left'>"._AM_EDITADG."</h4>";
          $result = $xoopsDB->query("SELECT groupid, name, type FROM ".$xoopsDB->prefix("groups")."");
!         echo "<table width='40%' border='0' cellpadding='4' cellspacing='1'>
  ";
  	$myts =& MyTextSanitizer::getInstance();
***************
*** 30,34 ****
                  }
          }
! 	echo "</table></td></tr></table>";
  	$name_value = "";
  	$desc_value = "";
--- 28,32 ----
                  }
          }
! 	echo "</table>";
  	$name_value = "";
  	$desc_value = "";
***************
*** 42,46 ****
  	$form_title = _AM_CREATENEWADG;
  	include(XOOPS_ROOT_PATH."/modules/system/admin/groups/groupform.php");
! 	CloseTable();
          xoops_cp_footer();
  }
--- 40,44 ----
  	$form_title = _AM_CREATENEWADG;
  	include(XOOPS_ROOT_PATH."/modules/system/admin/groups/groupform.php");
! 	//CloseTable();
          xoops_cp_footer();
  }
***************
*** 62,66 ****
  	}
          xoops_cp_header();
!         OpenTable();
  	echo '<a href="admin.php?fct=groups">'. _AM_GROUPSMAIN .'</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;'. _AM_MODIFYADG.'<br /><br />';
  	$thisgroup = new XoopsGroup($g_id);
--- 60,64 ----
  	}
          xoops_cp_header();
!         //OpenTable();
  	echo '<a href="admin.php?fct=groups">'. _AM_GROUPSMAIN .'</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;'. _AM_MODIFYADG.'<br /><br />';
  	$thisgroup = new XoopsGroup($g_id);
***************
*** 153,157 ****
  		</form>";
  	}	
! 	CloseTable();
  	xoops_cp_footer();
  }
--- 151,155 ----
  		</form>";
  	}	
! 	//CloseTable();
  	xoops_cp_footer();
  }

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

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

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

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.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modulesadmin.php	4 Aug 2002 19:54:44 -0000	1.2
--- modulesadmin.php	10 Sep 2002 04:09:16 -0000	1.3
***************
*** 8,16 ****
  	global $xoopsConfig, $xoopsUser, $xoopsDB, $xoopsModule;
          xoops_cp_header();
! 	OpenTable();
  	echo "
  	<h4 style='text-align:left'>"._MD_AM_MODADMIN."</h4>
  	<form action='admin.php' method='post' name='moduleadmin' id='moduleadmin'>
- 	<table border='0' cellpadding='0' cellspacing='0' valign='top' width='100%'><tr><td class='bg2'>
  	<table width='100%' border='0' cellpadding='4' cellspacing='1'>
  	<tr valign='middle' class='bg3' align='center'><td><b>"._MD_AM_MODULE."</b></td><td><b>"._MD_AM_VERSION."</b></td><td><b>"._MD_AM_LASTUP."</b></td><td><b>"._MD_AM_ACTION."</b></td><td><b>"._MD_AM_ORDER."</b><br /><small>"._MD_AM_ORDER0."</small></td><td><b>"._INFO."</b></td></tr>
--- 8,15 ----
  	global $xoopsConfig, $xoopsUser, $xoopsDB, $xoopsModule;
          xoops_cp_header();
! 	//OpenTable();
  	echo "
  	<h4 style='text-align:left'>"._MD_AM_MODADMIN."</h4>
  	<form action='admin.php' method='post' name='moduleadmin' id='moduleadmin'>
  	<table width='100%' border='0' cellpadding='4' cellspacing='1'>
  	<tr valign='middle' class='bg3' align='center'><td><b>"._MD_AM_MODULE."</b></td><td><b>"._MD_AM_VERSION."</b></td><td><b>"._MD_AM_LASTUP."</b></td><td><b>"._MD_AM_ACTION."</b></td><td><b>"._MD_AM_ORDER."</b><br /><small>"._MD_AM_ORDER0."</small></td><td><b>"._INFO."</b></td></tr>
***************
*** 51,57 ****
  	}
  	echo "
! 	</table></td></tr></table>
  	<br />
- 	<table border='0' cellpadding='0' cellspacing='0' valign='top' width='100%'><tr><td class='bg2'>
  	<table width='100%' border='0' cellpadding='4' cellspacing='1'>
  	<tr valign='middle' class='bg3' align='center'><td><b>"._MD_AM_MODULE."</b></td><td><b>"._MD_AM_VERSION."</b></td><td><b>"._MD_AM_LASTUP."</b></td><td><b>"._MD_AM_ACTION."</b></td><td><b>"._MD_AM_ORDER."</b><br /><small>"._MD_AM_ORDER0."</small></td><td><b>"._INFO."</b></td></tr>
--- 50,55 ----
  	}
  	echo "
! 	</table>
  	<br />
  	<table width='100%' border='0' cellpadding='4' cellspacing='1'>
  	<tr valign='middle' class='bg3' align='center'><td><b>"._MD_AM_MODULE."</b></td><td><b>"._MD_AM_VERSION."</b></td><td><b>"._MD_AM_LASTUP."</b></td><td><b>"._MD_AM_ACTION."</b></td><td><b>"._MD_AM_ORDER."</b><br /><small>"._MD_AM_ORDER0."</small></td><td><b>"._INFO."</b></td></tr>
***************
*** 87,92 ****
  	}
  	echo "
! 	</table></td></tr>
! 	<tr align='center'><td><br />
  	<input type='hidden' name='fct' value='modulesadmin' />
  	<input type='hidden' name='op' value='confirm' />
--- 85,89 ----
  	}
  	echo "
! 	<tr><td align='center' colspan='6'><br />
  	<input type='hidden' name='fct' value='modulesadmin' />
  	<input type='hidden' name='op' value='confirm' />
***************
*** 95,99 ****
  	</form>
  	";
! 	CloseTable();
  	xoops_cp_footer();
  }
--- 92,96 ----
  	</form>
  	";
! 	//CloseTable();
  	xoops_cp_footer();
  }