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

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

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

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

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

Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/metafooter/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:13:45 -0000	1.1.1.1
--- main.php	20 Sep 2002 16:30:03 -0000	1.2
***************
*** 1,4 ****
  <?php
! if ( !eregi("admin.php", $PHP_SELF) ) { 
  	die ("Access Denied"); 
  }
--- 1,4 ----
  <?php
! if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
  	die ("Access Denied"); 
  }

Index: metafooter.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/metafooter/metafooter.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** metafooter.php	15 Jul 2002 08:13:45 -0000	1.1.1.1
--- metafooter.php	20 Sep 2002 16:30:03 -0000	1.2
***************
*** 1,7 ****
  <?php
! if ( !eregi("admin.php", $PHP_SELF) ) {
  	die ("Access Denied"); 
  }
- if ( $xoopsUser->isAdmin($xoopsModule->mid()) ) {
  
  function saveMetaFooter($metacode,$footer){
--- 1,6 ----
  <?php
! if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
  	die ("Access Denied"); 
  }
  
  function saveMetaFooter($metacode,$footer){
***************
*** 70,77 ****
  <?php
  }
- 
- } else {
-     echo "Access Denied";
- }
- 
  ?>
--- 69,71 ----

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

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

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

Modified Files:
	mailusers.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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mailusers.php	5 Sep 2002 04:11:27 -0000	1.3
--- mailusers.php	20 Sep 2002 16:28:25 -0000	1.4
***************
*** 1,8 ****
  <?php
  // $Id$
! if (!eregi("admin.php", $PHP_SELF)) { 
  	die ("Access Denied"); 
! }
! if ( $xoopsUser->isAdmin($xoopsModule->mid()) ) {
  	include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
  	$op = "form";
--- 1,7 ----
  <?php
  // $Id$
! if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
  	die ("Access Denied"); 
! } else {
  	include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
  	$op = "form";
***************
*** 187,192 ****
  	}
  
- } else {
-     echo "Access Denied";
  }
! ?>
--- 186,189 ----
  	}
  
  }
! ?>
\ No newline at end of file

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

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

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

Modified Files:
	groups.php main.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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** groups.php	10 Sep 2002 04:09:29 -0000	1.4
--- groups.php	20 Sep 2002 16:28:11 -0000	1.5
***************
*** 1,7 ****
  <?php
! if (!eregi("admin.php", $PHP_SELF)) { 
  	die ("Access Denied"); 
  }
- if ( $xoopsUser->isAdmin($xoopsModule->mid()) ) {
  
  /*********************************************************/
--- 1,6 ----
  <?php
! if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
  	die ("Access Denied"); 
  }
  
  /*********************************************************/
***************
*** 177,184 ****
  	exit();
  }
- 
- } else {
-     echo "Access Denied";
- }
- 
  ?>
--- 176,178 ----

Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/groups/main.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.php	6 Aug 2002 01:20:51 -0000	1.2
--- main.php	20 Sep 2002 16:28:11 -0000	1.3
***************
*** 1,9 ****
  <?php
! if ( !eregi("admin.php", $PHP_SELF) ) {
! 	 die ("Access Denied"); 
! }
! include_once(XOOPS_ROOT_PATH."/modules/system/admin/groups/groups.php");
! include_once(XOOPS_ROOT_PATH."/class/xoopsgroup.php");
! if( $xoopsUser->isAdmin($xoopsModule->mid()) ) {
  	$op = "display";
  	if ( isset($HTTP_POST_VARS) ) {
--- 1,8 ----
  <?php
! if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
! 	die ("Access Denied"); 
! } else {
! 	include_once(XOOPS_ROOT_PATH."/modules/system/admin/groups/groups.php");
! 	include_once(XOOPS_ROOT_PATH."/class/xoopsgroup.php");
  	$op = "display";
  	if ( isset($HTTP_POST_VARS) ) {
***************
*** 100,105 ****
  	}
  
- } else {
-     	echo "Access Denied";
  }
  ?>
--- 99,102 ----

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

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

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

Modified Files:
	main.php 
Log Message:
no message

Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/findusers/main.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** main.php	6 Aug 2002 01:20:37 -0000	1.3
--- main.php	20 Sep 2002 16:23:16 -0000	1.4
***************
*** 1,9 ****
  <?php
  // $Id$
! if ( !eregi("admin.php", $PHP_SELF) ) {
! 	die("Access Denied");
  }
- if ( $xoopsUser->isAdmin($xoopsModule->mid()) ) {
- 
  $op = "form";
  
--- 1,7 ----
  <?php
  // $Id$
! if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
! 	die ("Access Denied"); 
  }
  $op = "form";
  
***************
*** 402,407 ****
  CloseTable();
  xoops_cp_footer();
- } else {
-     	echo "Access Denied";
- }
  ?>
--- 400,402 ----

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

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

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

Modified Files:
	filter.php 
Log Message:
no message

Index: filter.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/filter/filter.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** filter.php	15 Jul 2002 08:13:47 -0000	1.1.1.1
--- filter.php	20 Sep 2002 16:22:36 -0000	1.2
***************
*** 1,7 ****
  <?php
! if ( !eregi("admin.php", $PHP_SELF) ) { 
  	die ("Access Denied"); 
  }
- if ( $xoopsUser->isAdmin($xoopsModule->mid()) ) {
  
  $op = "add";
--- 1,6 ----
  <?php
! if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
  	die ("Access Denied"); 
  }
  
  $op = "add";
***************
*** 100,104 ****
  		redirect_header("admin.php?fct=filter",1,_MD_AM_DBUPDATED);
  	}
- }
  }
  ?>
--- 99,102 ----

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

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

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

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

Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/blocksadmin/main.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.php	18 Sep 2002 12:23:51 -0000	1.2
--- main.php	20 Sep 2002 16:21:07 -0000	1.3
***************
*** 1,4 ****
  <?php
! if (!eregi("admin.php", $PHP_SELF)) die("Access Denied"); 
  include (XOOPS_ROOT_PATH."/modules/system/admin/blocksadmin/blocksadmin.php");
  $op = "list";
--- 1,6 ----
  <?php
! if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
! 	die ("Access Denied"); 
! }
  include (XOOPS_ROOT_PATH."/modules/system/admin/blocksadmin/blocksadmin.php");
  $op = "list";

Index: blocksadmin.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/blocksadmin/blocksadmin.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** blocksadmin.php	18 Sep 2002 12:23:51 -0000	1.3
--- blocksadmin.php	20 Sep 2002 16:21:07 -0000	1.4
***************
*** 1,6 ****
  <?php
  // $Id$
! if ( !eregi('admin.php', $PHP_SELF) ) { 
! 	die ('Access Denied'); 
  }
  // check if the user is authorised
--- 1,6 ----
  <?php
  // $Id$
! if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
! 	die ("Access Denied"); 
  }
  // check if the user is authorised

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

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

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

Modified Files:
	main.php 
Log Message:
no message

Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/banners/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:13:44 -0000	1.1.1.1
--- main.php	20 Sep 2002 16:19:34 -0000	1.2
***************
*** 1,4 ****
  <?php
! if (!eregi("admin.php", $PHP_SELF)) { die ("Access Denied"); }
  include_once(XOOPS_ROOT_PATH."/modules/system/admin/banners/banners.php");
  include_once(XOOPS_ROOT_PATH."/class/module.textsanitizer.php");
--- 1,6 ----
  <?php
! if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
! 	die ("Access Denied"); 
! }
  include_once(XOOPS_ROOT_PATH."/modules/system/admin/banners/banners.php");
  include_once(XOOPS_ROOT_PATH."/class/module.textsanitizer.php");

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

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

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

Modified Files:
	banners.php 
Log Message:
no message

Index: banners.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/banners/banners.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** banners.php	20 Sep 2002 15:42:18 -0000	1.2
--- banners.php	20 Sep 2002 16:17:10 -0000	1.3
***************
*** 1,5 ****
  <?php
! if ( !eregi("admin.php", $PHP_SELF) ) { die ("Access Denied"); }
! if ( $xoopsUser->isAdmin($xoopsModule->mid()) ) {
  
  /*********************************************************/
--- 1,6 ----
  <?php
! if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
! 	die ("Access Denied"); 
! } else {
  
  /*********************************************************/
***************
*** 392,397 ****
  }
  
- } else {
-     	echo "Access Denied";
  }
  
--- 393,396 ----

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

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

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

Modified Files:
	admin.php 
Log Message:
no message

Index: admin.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** admin.php	15 Jul 2002 08:13:43 -0000	1.1.1.1
--- admin.php	20 Sep 2002 16:14:34 -0000	1.2
***************
*** 104,109 ****
  	$counter = 0;
  	while ($file = readdir($handle)) {
! 		if ( !ereg('[.]',$file) ) {
! 			include($admin_dir."/".$file."/xoops_version.php");
  			if ( $modversion['hasAdmin'] ) {
  				echo "<td align='center' valign='bottom' width='19%'>";
--- 104,109 ----
  	$counter = 0;
  	while ($file = readdir($handle)) {
! 		if (!preg_match("/[.]/", $file) && !is_dir($file)) {
! 			include($admin_dir.'/'.$file.'/xoops_version.php');
  			if ( $modversion['hasAdmin'] ) {
  				echo "<td align='center' valign='bottom' width='19%'>";

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

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

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

Modified Files:
	themeform.php 
Log Message:
no message

Index: themeform.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopsform/themeform.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** themeform.php	18 Sep 2002 10:44:49 -0000	1.2
--- themeform.php	20 Sep 2002 16:08:34 -0000	1.3
***************
*** 42,47 ****
  		<!--
  		function xoopsFormValidate_".$this->getName()."(){";
! 		foreach ( $required as $req ) {
! 			$js .= "if ( document.".$this->getName().".".$req.".value == \"\" ){alert( \"".sprintf(_FORM_ENTER, $req)."\" );document.".$this->getName().".".$req.".focus();return false;}";
  		}
  		$js .= "}
--- 42,49 ----
  		<!--
  		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;}";
  		}
  		$js .= "}

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

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

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

Modified Files:
	register.php 
Log Message:
no message

Index: register.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/register.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** register.php	11 Sep 2002 20:24:07 -0000	1.5
--- register.php	20 Sep 2002 16:06:29 -0000	1.6
***************
*** 36,40 ****
  	}
  	$uname = $myts->oopsStripSlashesGPC($uname);
! 	$strict = '^a-zA-Z0-9_';
  	$medium = $strict."<>,.$%#@!\'\"";
  	$loose = $medium."?{}\[\]\(\)\^&*`~;:\\+=";
--- 36,40 ----
  	}
  	$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 (!isset($uname) || $uname == '' || preg_match("/[".$restriction."]/",$uname)) {
  		$stop .= _US_INVALIDNICKNAME."<br />";
  	}

[Xoops-cvs2] xoops-current/html/modules/mylinks/images logo.gif,1.1.1.1,1.2

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

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

Modified Files:
	logo.gif 
Log Message:
Logo changed

Index: logo.gif
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/mylinks/images/logo.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
Binary files /tmp/cvs2TgYR9 and /tmp/cvsoRIrv9 differ

[Xoops-cvs2] xoops-current/html/modules/mydownloads/images logo-en.gif,1.1.1.1,1.2

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

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

Modified Files:
	logo-en.gif 
Log Message:
Logo changed

Index: logo-en.gif
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/mydownloads/images/logo-en.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
Binary files /tmp/cvswAdKhW and /tmp/cvsMfi0EK differ

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

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

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

Modified Files:
	banners.php 
Log Message:
no message

Index: banners.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/banners/banners.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** banners.php	15 Jul 2002 08:13:44 -0000	1.1.1.1
--- banners.php	20 Sep 2002 15:42:18 -0000	1.2
***************
*** 8,12 ****
  
  function BannersAdmin() {
!     	global $xoopsDB, $xoopsConfig, $xoopsModule;
  	xoops_cp_header();
  	//$xoopsModule->printAdminMenu();
--- 8,13 ----
  
  function BannersAdmin() {
!     	global $xoopsConfig, $xoopsModule;
! 	$xoopsDB =& Database::getInstance();
  	xoops_cp_header();
  	//$xoopsModule->printAdminMenu();
***************
*** 25,29 ****
  	<td>"._AM_FUNCTION."</td></tr><tr align='center'>";
  	$result = $xoopsDB->query("SELECT bid, cid, imptotal, impmade, clicks, date FROM ".$xoopsDB->prefix("banner")." ORDER BY bid");
! 	$myts = new MyTextSanitizer;
  	while(list($bid, $cid, $imptotal, $impmade, $clicks, $date) = $xoopsDB->fetchRow($result)) {
  		$result2 = $xoopsDB->query("SELECT cid, name FROM ".$xoopsDB->prefix("bannerclient")." WHERE cid=$cid");
--- 26,30 ----
  	<td>"._AM_FUNCTION."</td></tr><tr align='center'>";
  	$result = $xoopsDB->query("SELECT bid, cid, imptotal, impmade, clicks, date FROM ".$xoopsDB->prefix("banner")." ORDER BY bid");
! 	$myts =& MyTextSanitizer::getInstance();
  	while(list($bid, $cid, $imptotal, $impmade, $clicks, $date) = $xoopsDB->fetchRow($result)) {
  		$result2 = $xoopsDB->query("SELECT cid, name FROM ".$xoopsDB->prefix("bannerclient")." WHERE cid=$cid");
***************
*** 168,172 ****
  
  function BannersAdd($name, $cid, $imageurl, $clickurl, $imptotal=0) {
! 	global $xoopsDB;
  	$nowtime = time();
  	$newid = $xoopsDB->genId($xoopsDB->prefix("banner")."_bid_seq");
--- 169,173 ----
  
  function BannersAdd($name, $cid, $imageurl, $clickurl, $imptotal=0) {
! 	$xoopsDB =& Database::getInstance();
  	$nowtime = time();
  	$newid = $xoopsDB->genId($xoopsDB->prefix("banner")."_bid_seq");
***************
*** 180,185 ****
  
  function BannerAddClient($name, $contact, $email, $login, $passwd, $extrainfo) {
! 	global $xoopsDB;
! 	$myts = new MyTextSanitizer;
  	$name = $myts->makeTboxData4Save($name);
  	$contact = $myts->makeTboxData4Save($contact);
--- 181,186 ----
  
  function BannerAddClient($name, $contact, $email, $login, $passwd, $extrainfo) {
! 	$xoopsDB =& Database::getInstance();
! 	$myts =& MyTextSanitizer::getInstance();
  	$name = $myts->makeTboxData4Save($name);
  	$contact = $myts->makeTboxData4Save($contact);
***************
*** 199,203 ****
  
  function BannerDelete($bid, $ok=0) {
! 	global $xoopsDB, $xoopsConfig, $xoopsModule;
  	if ( $ok == 1 ) {
  	    	$xoopsDB->query("DELETE FROM ".$xoopsDB->prefix("banner")." WHERE bid=$bid");
--- 200,205 ----
  
  function BannerDelete($bid, $ok=0) {
! 	global $xoopsConfig, $xoopsModule;
! 	$xoopsDB =& Database::getInstance();
  	if ( $ok == 1 ) {
  	    	$xoopsDB->query("DELETE FROM ".$xoopsDB->prefix("banner")." WHERE bid=$bid");
***************
*** 205,209 ****
  		exit();
  	} else {
! 		$myts = new MyTextSanitizer;
  	    	xoops_cp_header();
  	 	//$xoopsModule->printAdminMenu();
--- 207,211 ----
  		exit();
  	} else {
! 		$myts =& MyTextSanitizer::getInstance();
  	    	xoops_cp_header();
  	 	//$xoopsModule->printAdminMenu();
***************
*** 254,262 ****
  
  function BannerEdit($bid) {
! 	global $xoopsDB, $xoopsConfig, $xoopsModule;
  	xoops_cp_header();
! 	//$xoopsModule->printAdminMenu();
! 	//echo "<br />";
! 	$myts = new MyTextSanitizer;
  	$result=$xoopsDB->query("SELECT cid, imptotal, impmade, clicks, imageurl, clickurl FROM ".$xoopsDB->prefix("banner")." where bid=$bid");
  	list($cid, $imptotal, $impmade, $clicks, $imageurl, $clickurl) = $xoopsDB->fetchRow($result);
--- 256,263 ----
  
  function BannerEdit($bid) {
! 	global $xoopsConfig, $xoopsModule;
  	xoops_cp_header();
! 	$xoopsDB =& Database::getInstance();
! 	$myts =& MyTextSanitizer::getInstance();
  	$result=$xoopsDB->query("SELECT cid, imptotal, impmade, clicks, imageurl, clickurl FROM ".$xoopsDB->prefix("banner")." where bid=$bid");
  	list($cid, $imptotal, $impmade, $clicks, $imageurl, $clickurl) = $xoopsDB->fetchRow($result);
***************
*** 307,311 ****
  
  function BannerClientDelete($cid, $ok=0) {
! 	global $xoopsDB, $xoopsConfig, $xoopsModule;
  	if ( $ok == 1 ) {
  	    	$xoopsDB->query("DELETE FROM ".$xoopsDB->prefix("banner")." WHERE cid=$cid");
--- 308,313 ----
  
  function BannerClientDelete($cid, $ok=0) {
! 	global $xoopsConfig, $xoopsModule;
! 	$xoopsDB =& Database::getInstance();
  	if ( $ok == 1 ) {
  	    	$xoopsDB->query("DELETE FROM ".$xoopsDB->prefix("banner")." WHERE cid=$cid");
***************
*** 314,318 ****
  		exit();
  	} else {
! 		$myts = new MyTextSanitizer;
  	    	xoops_cp_header();
  	    	//$xoopsModule->printAdminMenu();
--- 316,320 ----
  		exit();
  	} else {
! 		$myts =& MyTextSanitizer::getInstance();
  	    	xoops_cp_header();
  	    	//$xoopsModule->printAdminMenu();
***************
*** 351,356 ****
  
  function BannerClientEdit($cid) {
! 	global $xoopsDB, $xoopsConfig, $xoopsModule;
! 	$myts = new MyTextSanitizer;
  	xoops_cp_header();
  	//$xoopsModule->printAdminMenu();
--- 353,359 ----
  
  function BannerClientEdit($cid) {
! 	global $xoopsConfig, $xoopsModule;
! 	$xoopsDB =& Database::getInstance();
! 	$myts =& MyTextSanitizer::getInstance();
  	xoops_cp_header();
  	//$xoopsModule->printAdminMenu();
***************
*** 380,385 ****
  
  function BannerClientChange($cid, $name, $contact, $email, $extrainfo, $login, $passwd) {
! 	global $xoopsDB;
! 	$myts = new MyTextSanitizer;
  	$name = $myts->makeTboxData4Save($name);
  	$contact = $myts->makeTboxData4Save($contact);
--- 383,388 ----
  
  function BannerClientChange($cid, $name, $contact, $email, $extrainfo, $login, $passwd) {
! 	$xoopsDB =& Database::getInstance();
! 	$myts =& MyTextSanitizer::getInstance();
  	$name = $myts->makeTboxData4Save($name);
  	$contact = $myts->makeTboxData4Save($contact);

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

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

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

Modified Files:
	form.php 
Log Message:
no message

Index: form.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopsform/form.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** form.php	20 Sep 2002 08:45:27 -0000	1.3
--- form.php	20 Sep 2002 14:16:29 -0000	1.4
***************
*** 98,109 ****
  
  	function setRequired(&$required){
! 		if ( is_array($required) ) {
! 			$count = count($required);
! 			for ($i = 0; $i < $count; $i++) {
! 				$this->required[] =& $required[$i];
! 			}
! 		} else {
! 			$this->required[] =& $required;
! 		}
  	}
  
--- 98,102 ----
  
  	function setRequired(&$required){
! 		$this->required[] =& $required;
  	}
  

[Xoops-cvs2] xoops-current/html/modules/contact contactform.php,1.1.1.1,1.2

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

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

Modified Files:
	contactform.php 
Log Message:
no message

Index: contactform.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/contact/contactform.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** contactform.php	15 Jul 2002 08:13:15 -0000	1.1.1.1
--- contactform.php	20 Sep 2002 14:15:15 -0000	1.2
***************
*** 17,20 ****
  $contact_form->addElement($comment_textarea);
  $contact_form->addElement($submit_button);
! $contact_form->setRequired(array("usersName","usersEmail","usersComments"));
  ?>
--- 17,22 ----
  $contact_form->addElement($comment_textarea);
  $contact_form->addElement($submit_button);
! $contact_form->setRequired($name_text);
! $contact_form->setRequired($email_text);
! $contact_form->setRequired($comment_textarea);
  ?>

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

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

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

Modified Files:
	userform.php 
Log Message:
no message

Index: userform.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/users/userform.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** userform.php	20 Sep 2002 08:41:37 -0000	1.3
--- userform.php	20 Sep 2002 14:14:23 -0000	1.4
***************
*** 109,113 ****
  		$form->addElement($uid_hidden);
  	}
! 	$form->setRequired(array($uname_text,$email_text));
  	$form->display();
  ?>
--- 109,114 ----
  		$form->addElement($uid_hidden);
  	}
! 	$form->setRequired($uname_text);
! 	$form->setRequired($email_text);
  	$form->display();
  ?>

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

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

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

Modified Files:
	mailform.php 
Log Message:
no message

Index: mailform.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/mailusers/mailform.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mailform.php	20 Sep 2002 08:42:51 -0000	1.3
--- mailform.php	20 Sep 2002 14:13:08 -0000	1.4
***************
*** 69,72 ****
  $form->addElement($start_hidden);
  $form->addElement($submit_button);
! $form->setRequired(array($subject_text, $body_text, $to_checkbox));
  ?>
--- 69,74 ----
  $form->addElement($start_hidden);
  $form->addElement($submit_button);
! $form->setRequired($subject_text);
! $form->setRequired($body_text);
! $form->setRequired($to_checkbox);
  ?>

[Xoops-cvs2] xoops-current/html/include searchform.php,1.1.1.1,1.2

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

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

Modified Files:
	searchform.php 
Log Message:
no message

Index: searchform.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/include/searchform.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** searchform.php	15 Jul 2002 08:13:15 -0000	1.1.1.1
--- searchform.php	20 Sep 2002 14:11:27 -0000	1.2
***************
*** 40,42 ****
--- 40,43 ----
  $search_form->addElement($action_hidden);
  $search_form->addElement($submit_button);
+ $search_form->setRequired($query_text);
  ?>

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

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

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

Modified Files:
	registerform.php 
Log Message:
no message

Index: registerform.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/include/registerform.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** registerform.php	20 Sep 2002 08:39:40 -0000	1.4
--- registerform.php	20 Sep 2002 14:10:08 -0000	1.5
***************
*** 84,87 ****
  $reg_form->addElement($op_hidden);
  $reg_form->addElement($submit_button);
! $reg_form->setRequired(array($nickname_text, $email_text, $pwd_text, $pwd_text2));
  ?>
--- 84,90 ----
  $reg_form->addElement($op_hidden);
  $reg_form->addElement($submit_button);
! $reg_form->setRequired($nickname_text);
! $reg_form->setRequired($email_text);
! $reg_form->setRequired($pwd_text);
! $reg_form->setRequired($pwd_text2);
  ?>

[Xoops-cvs2] xoops-current/html/modules/xoopspoll/sql index.html,NONE,1.1

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

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

Added Files:
	index.html 
Log Message:
no comment

--- NEW FILE: index.html ---
 <script>history.go(-1);</script>

[Xoops-cvs2] xoops-current/html/modules/xoopspoll/language/tchinese index.html,NONE,1.1

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

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

Added Files:
	index.html 
Log Message:
no comment

--- NEW FILE: index.html ---
 <script>history.go(-1);</script>

[Xoops-cvs2] xoops-current/html/modules/xoopspoll/images/colorbars index.html,NONE,1.1

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

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

Added Files:
	index.html 
Log Message:
no comment

--- NEW FILE: index.html ---
 <script>history.go(-1);</script>

[Xoops-cvs2] xoops-current/html/modules/xoopsmembers/language/tchinese index.html,NONE,1.1

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

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

Added Files:
	index.html 
Log Message:
no comment

--- NEW FILE: index.html ---
 <script>history.go(-1);</script>

[Xoops-cvs2] xoops-current/html/modules/xoopsfaq/sql index.html,NONE,1.1

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

Update of /cvsroot/xoops/xoops-current/html/modules/xoopsfaq/sql
In directory usw-pr-cvs1:/tmp/cvs-serv24066/html/modules/xoopsfaq/sql

Added Files:
	index.html 
Log Message:
no comment

--- NEW FILE: index.html ---
 <script>history.go(-1);</script>