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

[Xoops-cvs2] xoops2/kernel/member/manager user.php,1.3,1.4

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/kernel/member/manager
In directory sc8-pr-cvs1:/tmp/cvs-serv32451/kernel/member/manager

Modified Files:
	user.php 
Log Message:
fix for bug 318

Index: user.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/member/manager/user.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** user.php	5 Jan 2003 15:31:08 -0000	1.3
--- user.php	5 Jan 2003 15:45:09 -0000	1.4
***************
*** 142,146 ****
          if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
              $sql .= ' '.$criteria->renderWhere();
! 			$sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
              $limit = $criteria->getLimit();
              $start = $criteria->getStart();
--- 142,148 ----
          if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
              $sql .= ' '.$criteria->renderWhere();
! 			if ($criteria->getSort() != '') {
! 				$sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
! 			}
              $limit = $criteria->getLimit();
              $start = $criteria->getStart();

[Xoops-cvs2] xoops2/kernel/member/object user.php,1.1,1.2

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/kernel/member/object
In directory sc8-pr-cvs1:/tmp/cvs-serv32451/kernel/member/object

Modified Files:
	user.php 
Log Message:
fix for bug 318

Index: user.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/member/object/user.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** user.php	2 Jan 2003 16:32:34 -0000	1.1
--- user.php	5 Jan 2003 15:45:09 -0000	1.2
***************
*** 87,94 ****
      function getUnameFromId($userid)
      {
!         $member_handler =& xoops_gethandler('member');
!         $user =& $member_handler->getUser($userid);
!         $ts =& MyTextSanitizer::getInstance();
!         return $ts->htmlSpecialChars($user->getVar('uname'));
      }
      function incrementPost(){
--- 87,100 ----
      function getUnameFromId($userid)
      {
!         global $xoopsConfig;
! 		$userid = intval($userid);
! 		if ($userid > 0) {
!             $member_handler =& xoops_gethandler('member');
!             $user =& $member_handler->getUser($userid);
!             $ts =& MyTextSanitizer::getInstance();
!             return $ts->htmlSpecialChars($user->getVar('uname'));
!         } else {
!             return $xoopsConfig['anonymous'];
!         }
      }
      function incrementPost(){

[Xoops-cvs2] xoops2/modules/system/blocks system_blocks.php,1.1,1.2

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/modules/system/blocks
In directory sc8-pr-cvs1:/tmp/cvs-serv28207/modules/system/blocks

Modified Files:
	system_blocks.php 
Log Message:
fix for user object sorting problem

Index: system_blocks.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/system/blocks/system_blocks.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** system_blocks.php	2 Jan 2003 20:19:29 -0000	1.1
--- system_blocks.php	5 Jan 2003 15:31:28 -0000	1.2
***************
*** 291,309 ****
  	$criteria = new CriteriaCompo(new Criteria('level', 0, '>'));
  	$limit = (!empty($options[0])) ? $options[0] : 10;
! 	$criteria->setOrder('user_regdate');
! 	$criteria->setSort('DESC');
  	$criteria->setLimit($limit);
  	$member_handler =& xoops_gethandler('member');
  	$newmembers =& $member_handler->getUsers($criteria);
! 	$count = count($newmembers);
! 	for ($i = 0; $i < $count; $i++) {
! 		if ( $options[1] == 1 ) {
! 			$block['users'][$i]['avatar'] = $newmembers[$i]->getVar('user_avatar') != 'blank.gif' ? XOOPS_URL.'/uploads/'.$newmembers[$i]->getVar('user_avatar') : '';
! 		} else {
! 			$block['users'][$i]['avatar'] = '';
  		}
- 		$block['users'][$i]['id'] = $newmembers[$i]->getVar('uid');
- 		$block['users'][$i]['name'] = $newmembers[$i]->getVar('uname');
- 		$block['users'][$i]['joindate'] = formatTimestamp($newmembers[$i]->getVar('user_regdate'), 's');
  	}
  	return $block;
--- 291,311 ----
  	$criteria = new CriteriaCompo(new Criteria('level', 0, '>'));
  	$limit = (!empty($options[0])) ? $options[0] : 10;
! 	$criteria->setOrder('DESC');
! 	$criteria->setSort('user_regdate');
  	$criteria->setLimit($limit);
  	$member_handler =& xoops_gethandler('member');
  	$newmembers =& $member_handler->getUsers($criteria);
! 	if (is_array($newmembers)) {
! 		$count = count($newmembers);
! 		for ($i = 0; $i < $count; $i++) {
! 			if ( $options[1] == 1 ) {
! 				$block['users'][$i]['avatar'] = $newmembers[$i]->getVar('user_avatar') != 'blank.gif' ? XOOPS_URL.'/uploads/'.$newmembers[$i]->getVar('user_avatar') : '';
! 			} else {
! 				$block['users'][$i]['avatar'] = '';
! 			}
! 			$block['users'][$i]['id'] = $newmembers[$i]->getVar('uid');
! 			$block['users'][$i]['name'] = $newmembers[$i]->getVar('uname');
! 			$block['users'][$i]['joindate'] = formatTimestamp($newmembers[$i]->getVar('user_regdate'), 's');
  		}
  	}
  	return $block;
***************
*** 319,338 ****
  		$criteria->add(new Criteria('rank', $options[$i], '<>'));
  	}
! 	$criteria->setOrder('posts');
! 	$criteria->setSort('DESC');
  	$criteria->setLimit($limit);
  	$member_handler =& xoops_gethandler('member');
  	$topposters =& $member_handler->getUsers($criteria);
! 	$count = count($topposters);
! 	for ($i = 0; $i < $count; $i++) {
! 		$block['users'][$i]['rank'] = $i+1;
! 		if ( $options[1] == 1 ) {
! 			$block['users'][$i]['avatar'] = $topposters[$i]->getVar('user_avatar') != 'blank.gif' ? XOOPS_URL.'/uploads/'.$topposters[$i]->getVar('user_avatar') : '';
! 		} else {
! 			$block['users'][$i]['avatar'] = '';
  		}
- 		$block['users'][$i]['id'] = $topposters[$i]->getVar('uid');
- 		$block['users'][$i]['name'] = $topposters[$i]->getVar('uname');
- 		$block['users'][$i]['posts'] = $topposters[$i]->getVar('posts');
  	}
  	return $block;
--- 321,342 ----
  		$criteria->add(new Criteria('rank', $options[$i], '<>'));
  	}
! 	$criteria->setOrder('DESC');
! 	$criteria->setSort('posts');
  	$criteria->setLimit($limit);
  	$member_handler =& xoops_gethandler('member');
  	$topposters =& $member_handler->getUsers($criteria);
! 	if (is_array($topposters)) {
! 		$count = count($topposters);
! 		for ($i = 0; $i < $count; $i++) {
! 			$block['users'][$i]['rank'] = $i+1;
! 			if ( $options[1] == 1 ) {
! 				$block['users'][$i]['avatar'] = $topposters[$i]->getVar('user_avatar') != 'blank.gif' ? XOOPS_URL.'/uploads/'.$topposters[$i]->getVar('user_avatar') : '';
! 			} else {
! 				$block['users'][$i]['avatar'] = '';
! 			}
! 			$block['users'][$i]['id'] = $topposters[$i]->getVar('uid');
! 			$block['users'][$i]['name'] = $topposters[$i]->getVar('uname');
! 			$block['users'][$i]['posts'] = $topposters[$i]->getVar('posts');
  		}
  	}
  	return $block;

[Xoops-cvs2] xoops2/kernel/member/manager user.php,1.2,1.3

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/kernel/member/manager
In directory sc8-pr-cvs1:/tmp/cvs-serv28078/kernel/member/manager

Modified Files:
	user.php 
Log Message:
fix for user object sorting problem

Index: user.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/member/manager/user.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** user.php	5 Jan 2003 13:55:47 -0000	1.2
--- user.php	5 Jan 2003 15:31:08 -0000	1.3
***************
*** 142,145 ****
--- 142,146 ----
          if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
              $sql .= ' '.$criteria->renderWhere();
+ 			$sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
              $limit = $criteria->getLimit();
              $start = $criteria->getStart();

[Xoops-cvs2] xoops2/class module.textsanitizer.php,1.1,1.2

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/class
In directory sc8-pr-cvs1:/tmp/cvs-serv4324/class

Modified Files:
	module.textsanitizer.php 
Log Message:


Index: module.textsanitizer.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/class/module.textsanitizer.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** module.textsanitizer.php	2 Jan 2003 15:15:21 -0000	1.1
--- module.textsanitizer.php	5 Jan 2003 14:21:38 -0000	1.2
***************
*** 85,89 ****
  	}
  
! 	function &xoopsCodeDecode(&$text, $allowimage=1)
  	{
  		$patterns = array();
--- 85,89 ----
  	}
  
! 	function &xoopsCodeDecode(&$text, $allowimage = 1)
  	{
  		$patterns = array();
***************
*** 141,145 ****
  	}
  
! 	function &addSlashes($text, $force=false)
  	{
  		if ($force) {
--- 141,145 ----
  	}
  
! 	function &addSlashes($text, $force = false)
  	{
  		if ($force) {
***************
*** 178,182 ****
  	*  Filters textarea form data in DB for display
  	*/
! 	function &displayTarea(&$text, $html=0, $smiley=1, $xcode=1, $image=1)
  	{
  		if ($html != 1) {
--- 178,182 ----
  	*  Filters textarea form data in DB for display
  	*/
! 	function &displayTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
  	{
  		if ($html != 1) {
***************
*** 188,193 ****
  			// process smiley
  			$text =& $this->smiley($text);
!         	}
! 
  		if ($xcode != 0) {
  			// decode xcode
--- 188,192 ----
  			// process smiley
  			$text =& $this->smiley($text);
! 		}
  		if ($xcode != 0) {
  			// decode xcode
***************
*** 200,204 ****
  			}
  		}
! 		$text =& $this->nl2Br($text);
  		return $text;
  	}
--- 199,205 ----
  			}
  		}
! 		if ($br != 0) {
! 			$text =& $this->nl2Br($text);
! 		}
  		return $text;
  	}
***************
*** 207,211 ****
  	*  Filters textarea form data submitted for preview
  	*/
! 	function &previewTarea(&$text, $html=0, $smiley=1, $xcode=1, $image=1)
  	{
  		$text =& $this->stripSlashesGPC($text);
--- 208,212 ----
  	*  Filters textarea form data submitted for preview
  	*/
! 	function &previewTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
  	{
  		$text =& $this->stripSlashesGPC($text);
***************
*** 229,233 ****
  			}
  		}
! 		$text =& $this->nl2Br($text);
  		return $text;
  	}
--- 230,236 ----
  			}
  		}
! 		if ($br != 0) {
! 			$text =& $this->nl2Br($text);
! 		}
  		return $text;
  	}

[Xoops-cvs2] xoops2/modules/news/templates news_article.html,1.1,1.2

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/modules/news/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv3383/modules/news/templates

Modified Files:
	news_article.html 
Log Message:
cosmetic fix

Index: news_article.html
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/news/templates/news_article.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** news_article.html	2 Jan 2003 19:23:31 -0000	1.1
--- news_article.html	5 Jan 2003 14:18:45 -0000	1.2
***************
*** 7,11 ****
  </div>
  
! <div style="margin: 0; padding: 0;">
    <{$commentsnav}>
    <{$lang_commentsad}>
--- 7,11 ----
  </div>
  
! <div style="text-align:center; margin: 0; padding: 0;">
    <{$commentsnav}>
    <{$lang_commentsad}>

[Xoops-cvs2] xoops2/modules/xoopspoll/class xoopspoll.php,1.1,1.2 xoopspolllog.php,1.1,1.2 xoopspolloption.php,1.1,1.2

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/modules/xoopspoll/class
In directory sc8-pr-cvs1:/tmp/cvs-serv29406/modules/xoopspoll/class

Modified Files:
	xoopspoll.php xoopspolllog.php xoopspolloption.php 
Log Message:
removed deprecated isCleaned() method

Index: xoopspoll.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/xoopspoll/class/xoopspoll.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xoopspoll.php	2 Jan 2003 19:47:45 -0000	1.1
--- xoopspoll.php	5 Jan 2003 13:55:48 -0000	1.2
***************
*** 63,70 ****
  	function store()
  	{
! 		if ( !$this->isCleaned() ) {
! 			if ( !$this->cleanVars() ) {
! 				return false;
! 			}
  		}
  		foreach ( $this->cleanVars as $k=>$v ) {
--- 63,68 ----
  	function store()
  	{
! 		if ( !$this->cleanVars() ) {
! 			return false;
  		}
  		foreach ( $this->cleanVars as $k=>$v ) {

Index: xoopspolllog.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/xoopspoll/class/xoopspolllog.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xoopspolllog.php	2 Jan 2003 19:47:45 -0000	1.1
--- xoopspolllog.php	5 Jan 2003 13:55:48 -0000	1.2
***************
*** 57,64 ****
  	function store()
  	{
! 		if ( !$this->isCleaned() ) {
! 			if ( !$this->cleanVars() ) {
! 				return false;
! 			}
  		}
  		foreach ( $this->cleanVars as $k=>$v ) {
--- 57,62 ----
  	function store()
  	{
! 		if ( !$this->cleanVars() ) {
! 			return false;
  		}
  		foreach ( $this->cleanVars as $k=>$v ) {

Index: xoopspolloption.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/xoopspoll/class/xoopspolloption.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xoopspolloption.php	2 Jan 2003 19:47:45 -0000	1.1
--- xoopspolloption.php	5 Jan 2003 13:55:48 -0000	1.2
***************
*** 56,63 ****
  	function store()
  	{
! 		if ( !$this->isCleaned() ) {
! 			if ( !$this->cleanVars() ) {
! 				return false;
! 			}
  		}
  		foreach ( $this->cleanVars as $k=>$v ) {
--- 56,61 ----
  	function store()
  	{
! 		if ( !$this->cleanVars() ) {
! 			return false;
  		}
  		foreach ( $this->cleanVars as $k=>$v ) {

[Xoops-cvs2] xoops2/modules/xoopsheadlines/class headline.php,1.1,1.2

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/modules/xoopsheadlines/class
In directory sc8-pr-cvs1:/tmp/cvs-serv29406/modules/xoopsheadlines/class

Modified Files:
	headline.php 
Log Message:
removed deprecated isCleaned() method

Index: headline.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/xoopsheadlines/class/headline.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** headline.php	2 Jan 2003 18:09:56 -0000	1.1
--- headline.php	5 Jan 2003 13:55:48 -0000	1.2
***************
*** 102,109 ****
  			return false;
  		}
! 		if (!$headline->isCleaned()) {
! 			if (!$headline->cleanVars()) {
! 				return false;
! 			}
  		}
  		foreach ($headline->cleanVars as $k => $v) {
--- 102,107 ----
  			return false;
  		}
! 		if (!$headline->cleanVars()) {
! 			return false;
  		}
  		foreach ($headline->cleanVars as $k => $v) {

[Xoops-cvs2] xoops2/kernel/themeset/manager themeset.php,1.1,1.2 tplfile.php,1.1,1.2

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/kernel/themeset/manager
In directory sc8-pr-cvs1:/tmp/cvs-serv29406/kernel/themeset/manager

Modified Files:
	themeset.php tplfile.php 
Log Message:
removed deprecated isCleaned() method

Index: themeset.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/themeset/manager/themeset.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** themeset.php	2 Jan 2003 16:50:57 -0000	1.1
--- themeset.php	5 Jan 2003 13:55:48 -0000	1.2
***************
*** 111,118 ****
              return true;
          }
! 		if (!$themeset->isCleaned()) {
! 			if (!$themeset->cleanVars()) {
! 				return false;
! 			}
  		}
  		foreach ($themeset->cleanVars as $k => $v) {
--- 111,116 ----
              return true;
          }
! 		if (!$themeset->cleanVars()) {
! 			return false;
  		}
  		foreach ($themeset->cleanVars as $k => $v) {

Index: tplfile.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/themeset/manager/tplfile.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tplfile.php	2 Jan 2003 16:50:57 -0000	1.1
--- tplfile.php	5 Jan 2003 13:55:48 -0000	1.2
***************
*** 112,119 ****
              return true;
          }
! 		if (!$tplfile->isCleaned()) {
! 			if (!$tplfile->cleanVars()) {
! 				return false;
! 			}
  		}
  		foreach ($tplfile->cleanVars as $k => $v) {
--- 112,117 ----
              return true;
          }
! 		if (!$tplfile->cleanVars()) {
! 			return false;
  		}
  		foreach ($tplfile->cleanVars as $k => $v) {

[Xoops-cvs2] xoops2/kernel/permission/manager groupperm.php,1.1,1.2

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/kernel/permission/manager
In directory sc8-pr-cvs1:/tmp/cvs-serv29406/kernel/permission/manager

Modified Files:
	groupperm.php 
Log Message:
removed deprecated isCleaned() method

Index: groupperm.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/permission/manager/groupperm.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** groupperm.php	2 Jan 2003 16:42:34 -0000	1.1
--- groupperm.php	5 Jan 2003 13:55:47 -0000	1.2
***************
*** 87,94 ****
              return true;
          }
!         if ( !$perm->isCleaned() ) {
!             if (!$perm->cleanVars()) {
!                 return false;
!             }
          }
          foreach ($perm->cleanVars as $k => $v) {
--- 87,92 ----
              return true;
          }
!         if (!$perm->cleanVars()) {
!             return false;
          }
          foreach ($perm->cleanVars as $k => $v) {

[Xoops-cvs2] xoops2/kernel/object/object object.php,1.1,1.2

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/kernel/object/object
In directory sc8-pr-cvs1:/tmp/cvs-serv29406/kernel/object/object

Modified Files:
	object.php 
Log Message:
removed deprecated isCleaned() method

Index: object.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/object/object/object.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** object.php	2 Jan 2003 16:38:56 -0000	1.1
--- object.php	5 Jan 2003 13:55:47 -0000	1.2
***************
*** 64,71 ****
  
      // private
-     // is it already cleaned?
-     var $_isCleaned = false;
- 
-     // private
      var $_errors = array();
  
--- 64,67 ----
***************
*** 358,377 ****
              return false;
          }
!         $this->_isCleaned = true;
          return true;
-     }
- 
-     // public
-     // returns all variables for the object that have been cleaned by cleanVars() method
-     function &getCleanVars()
-     {
-         return $this->cleanVars;
-     }
- 
-     // public
-     // checks if cleanVars() has been processed or completed without fail
-     function isCleaned()
-     {
-         return $this->_isCleaned;
      }
  
--- 354,359 ----
              return false;
          }
!         $this->unsetDirty();
          return true;
      }
  

[Xoops-cvs2] xoops2/kernel/member/manager group.php,1.1,1.2 membership.php,1.1,1.2 user.php,1.1,1.2

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/kernel/member/manager
In directory sc8-pr-cvs1:/tmp/cvs-serv29406/kernel/member/manager

Modified Files:
	group.php membership.php user.php 
Log Message:
removed deprecated isCleaned() method

Index: group.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/member/manager/group.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** group.php	2 Jan 2003 16:31:03 -0000	1.1
--- group.php	5 Jan 2003 13:55:47 -0000	1.2
***************
*** 92,99 ****
              return true;
          }
!         if (!$group->isCleaned()) {
!             if (!$group->cleanVars()) {
!                 return false;
!             }
          }
          foreach ($group->cleanVars as $k => $v) {
--- 92,97 ----
              return true;
          }
!         if (!$group->cleanVars()) {
!             return false;
          }
          foreach ($group->cleanVars as $k => $v) {

Index: membership.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/member/manager/membership.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** membership.php	2 Jan 2003 16:31:03 -0000	1.1
--- membership.php	5 Jan 2003 13:55:47 -0000	1.2
***************
*** 92,99 ****
              return true;
          }
!         if (!$mship->isCleaned()) {
!             if (!$mship->cleanVars()) {
!                 return false;
!             }
          }
          foreach ($mship->cleanVars as $k => $v) {
--- 92,97 ----
              return true;
          }
!         if (!$mship->cleanVars()) {
!             return false;
          }
          foreach ($mship->cleanVars as $k => $v) {

Index: user.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/member/manager/user.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** user.php	2 Jan 2003 16:31:03 -0000	1.1
--- user.php	5 Jan 2003 13:55:47 -0000	1.2
***************
*** 92,99 ****
              return true;
          }
!         if (!$user->isCleaned()) {
!             if (!$user->cleanVars()) {
!                 return false;
!             }
          }
          foreach ($user->cleanVars as $k => $v) {
--- 92,97 ----
              return true;
          }
!         if (!$user->cleanVars()) {
!             return false;
          }
          foreach ($user->cleanVars as $k => $v) {

[Xoops-cvs2] xoops2/kernel/module/manager module.php,1.1,1.2

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/kernel/module/manager
In directory sc8-pr-cvs1:/tmp/cvs-serv29406/kernel/module/manager

Modified Files:
	module.php 
Log Message:
removed deprecated isCleaned() method

Index: module.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/module/manager/module.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** module.php	2 Jan 2003 16:33:31 -0000	1.1
--- module.php	5 Jan 2003 13:55:47 -0000	1.2
***************
*** 110,117 ****
              return true;
          }
!         if (!$module->isCleaned()) {
!             if (!$module->cleanVars()) {
!                 return false;
!             }
          }
          foreach ($module->cleanVars as $k => $v) {
--- 110,115 ----
              return true;
          }
!         if (!$module->cleanVars()) {
!             return false;
          }
          foreach ($module->cleanVars as $k => $v) {

[Xoops-cvs2] xoops2/kernel/privmessage/manager privmessage.php,1.1,1.2

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/kernel/privmessage/manager
In directory sc8-pr-cvs1:/tmp/cvs-serv29406/kernel/privmessage/manager

Modified Files:
	privmessage.php 
Log Message:
removed deprecated isCleaned() method

Index: privmessage.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/privmessage/manager/privmessage.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** privmessage.php	2 Jan 2003 16:45:10 -0000	1.1
--- privmessage.php	5 Jan 2003 13:55:48 -0000	1.2
***************
*** 94,101 ****
              return true;
          }
!         if (!$pm->isCleaned()) {
!             if (!$pm->cleanVars()) {
!                 return false;
!             }
          }
          foreach ($pm->cleanVars as $k => $v) {
--- 94,99 ----
              return true;
          }
!         if (!$pm->cleanVars()) {
!             return false;
          }
          foreach ($pm->cleanVars as $k => $v) {

[Xoops-cvs2] xoops2/kernel/imageset/manager imageset.php,1.1,1.2 imagesetimg.php,1.1,1.2

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/kernel/imageset/manager
In directory sc8-pr-cvs1:/tmp/cvs-serv29406/kernel/imageset/manager

Modified Files:
	imageset.php imagesetimg.php 
Log Message:
removed deprecated isCleaned() method

Index: imageset.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/imageset/manager/imageset.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** imageset.php	2 Jan 2003 16:25:23 -0000	1.1
--- imageset.php	5 Jan 2003 13:55:47 -0000	1.2
***************
*** 92,99 ****
              return true;
          }
! 		if (!$imgset->isCleaned()) {
! 			if (!$imgset->cleanVars()) {
! 				return false;
! 			}
  		}
  		foreach ($imgset->cleanVars as $k => $v) {
--- 92,97 ----
              return true;
          }
! 		if (!$imgset->cleanVars()) {
! 			return false;
  		}
  		foreach ($imgset->cleanVars as $k => $v) {

Index: imagesetimg.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/imageset/manager/imagesetimg.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** imagesetimg.php	2 Jan 2003 16:25:23 -0000	1.1
--- imagesetimg.php	5 Jan 2003 13:55:47 -0000	1.2
***************
*** 93,100 ****
              return true;
          }
! 		if (!$imgsetimg->isCleaned()) {
! 			if (!$imgsetimg->cleanVars()) {
! 				return false;
! 			}
  		}
  		foreach ($imgsetimg->cleanVars as $k => $v) {
--- 93,98 ----
              return true;
          }
! 		if (!$imgsetimg->cleanVars()) {
! 			return false;
  		}
  		foreach ($imgsetimg->cleanVars as $k => $v) {

[Xoops-cvs2] xoops2/kernel/config/manager config.php,1.1,1.2 configcategory.php,1.1,1.2 configoption.php,1.1,1.2

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/kernel/config/manager
In directory sc8-pr-cvs1:/tmp/cvs-serv29406/kernel/config/manager

Modified Files:
	config.php configcategory.php configoption.php 
Log Message:
removed deprecated isCleaned() method

Index: config.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/config/manager/config.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config.php	2 Jan 2003 16:19:56 -0000	1.1
--- config.php	5 Jan 2003 13:55:47 -0000	1.2
***************
*** 97,104 ****
              return true;
          }
!         if (!$config->isCleaned()) {
!             if (!$config->cleanVars()) {
!                 return false;
!             }
          }
          foreach ($config->cleanVars as $k => $v) {
--- 97,102 ----
              return true;
          }
!         if (!$config->cleanVars()) {
!             return false;
          }
          foreach ($config->cleanVars as $k => $v) {

Index: configcategory.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/config/manager/configcategory.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** configcategory.php	2 Jan 2003 16:19:56 -0000	1.1
--- configcategory.php	5 Jan 2003 13:55:47 -0000	1.2
***************
*** 95,102 ****
              return true;
          }
!         if (!$confcat->isCleaned()) {
!             if (!$confcat->cleanVars()) {
!                 return false;
!             }
          }
          foreach ($confcat->cleanVars as $k => $v) {
--- 95,100 ----
              return true;
          }
!         if (!$confcat->cleanVars()) {
!             return false;
          }
          foreach ($confcat->cleanVars as $k => $v) {

Index: configoption.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/config/manager/configoption.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** configoption.php	2 Jan 2003 16:19:56 -0000	1.1
--- configoption.php	5 Jan 2003 13:55:47 -0000	1.2
***************
*** 94,101 ****
              return true;
          }
!         if (!$confoption->isCleaned()) {
!             if (!$confoption->cleanVars()) {
!                 return false;
!             }
          }
          foreach ($confoption->cleanVars as $k => $v) {
--- 94,99 ----
              return true;
          }
!         if (!$confoption->cleanVars()) {
!             return false;
          }
          foreach ($confoption->cleanVars as $k => $v) {

[Xoops-cvs2] xoops2/kernel/block/manager block.php,1.1,1.2

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/kernel/block/manager
In directory sc8-pr-cvs1:/tmp/cvs-serv29406/kernel/block/manager

Modified Files:
	block.php 
Log Message:
removed deprecated isCleaned() method

Index: block.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/block/manager/block.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** block.php	2 Jan 2003 16:08:20 -0000	1.1
--- block.php	5 Jan 2003 13:55:47 -0000	1.2
***************
*** 91,98 ****
              return true;
          }
!         if (!$block->isCleaned()) {
!             if (!$block->cleanVars()) {
!                 return false;
!             }
          }
          foreach ($block->cleanVars as $k => $v) {
--- 91,96 ----
              return true;
          }
!         if (!$block->cleanVars()) {
!             return false;
          }
          foreach ($block->cleanVars as $k => $v) {

[Xoops-cvs2] xoops2/kernel/image/manager image.php,1.1,1.2 imgcat.php,1.1,1.2

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/kernel/image/manager
In directory sc8-pr-cvs1:/tmp/cvs-serv29406/kernel/image/manager

Modified Files:
	image.php imgcat.php 
Log Message:
removed deprecated isCleaned() method

Index: image.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/image/manager/image.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** image.php	2 Jan 2003 16:22:47 -0000	1.1
--- image.php	5 Jan 2003 13:55:47 -0000	1.2
***************
*** 94,101 ****
              return true;
          }
! 		if (!$image->isCleaned()) {
! 			if (!$image->cleanVars()) {
! 				return false;
! 			}
  		}
  		foreach ($image->cleanVars as $k => $v) {
--- 94,99 ----
              return true;
          }
! 		if (!$image->cleanVars()) {
! 			return false;
  		}
  		foreach ($image->cleanVars as $k => $v) {

Index: imgcat.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/image/manager/imgcat.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** imgcat.php	2 Jan 2003 16:22:48 -0000	1.1
--- imgcat.php	5 Jan 2003 13:55:47 -0000	1.2
***************
*** 92,99 ****
              return true;
          }
! 		if (!$imgcat->isCleaned()) {
! 			if (!$imgcat->cleanVars()) {
! 				return false;
! 			}
  		}
  		foreach ($imgcat->cleanVars as $k => $v) {
--- 92,97 ----
              return true;
          }
! 		if (!$imgcat->cleanVars()) {
! 			return false;
  		}
  		foreach ($imgcat->cleanVars as $k => $v) {

[Xoops-cvs2] xoops2/kernel/avatar/manager avatar.php,1.1,1.2

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/kernel/avatar/manager
In directory sc8-pr-cvs1:/tmp/cvs-serv29406/kernel/avatar/manager

Modified Files:
	avatar.php 
Log Message:
removed deprecated isCleaned() method

Index: avatar.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/avatar/manager/avatar.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** avatar.php	2 Jan 2003 15:52:29 -0000	1.1
--- avatar.php	5 Jan 2003 13:55:47 -0000	1.2
***************
*** 93,100 ****
              return true;
          }
!         if (!$avatar->isCleaned()) {
!             if (!$avatar->cleanVars()) {
!                 return false;
!             }
          }
          foreach ($avatar->cleanVars as $k => $v) {
--- 93,98 ----
              return true;
          }
!         if (!$avatar->cleanVars()) {
!             return false;
          }
          foreach ($avatar->cleanVars as $k => $v) {

[Xoops-cvs2] xoops2/class xoopsblock.php,1.1,1.2 xoopscomments.php,1.1,1.2

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/class
In directory sc8-pr-cvs1:/tmp/cvs-serv29406/class

Modified Files:
	xoopsblock.php xoopscomments.php 
Log Message:
removed deprecated isCleaned() method

Index: xoopsblock.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/class/xoopsblock.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xoopsblock.php	2 Jan 2003 15:15:23 -0000	1.1
--- xoopsblock.php	5 Jan 2003 13:55:47 -0000	1.2
***************
*** 81,88 ****
  	function store()
  	{
! 		if ( !$this->isCleaned() ) {
! 			if ( !$this->cleanVars() ) {
! 				return false;
! 			}
  		}
  		foreach ( $this->cleanVars as $k=>$v ) {
--- 81,86 ----
  	function store()
  	{
! 		if ( !$this->cleanVars() ) {
! 			return false;
  		}
  		foreach ( $this->cleanVars as $k=>$v ) {

Index: xoopscomments.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/class/xoopscomments.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xoopscomments.php	2 Jan 2003 15:15:23 -0000	1.1
--- xoopscomments.php	5 Jan 2003 13:55:47 -0000	1.2
***************
*** 77,84 ****
  	function store()
  	{
! 		if ( !$this->isCleaned() ) {
! 			if ( !$this->cleanVars() ) {
! 				return false;
! 			}
  		}
  		foreach ( $this->cleanVars as $k=>$v ) {
--- 77,82 ----
  	function store()
  	{
! 		if ( !$this->cleanVars() ) {
! 			return false;
  		}
  		foreach ( $this->cleanVars as $k=>$v ) {

[Xoops-cvs2] xoops2/install index.php,1.4,1.5

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

Update of /cvsroot/xoops/xoops2/install
In directory sc8-pr-cvs1:/tmp/cvs-serv12696/install

Modified Files:
	index.php 
Log Message:
added a space into the (c) and the year

Index: index.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/install/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** index.php	4 Jan 2003 15:46:05 -0000	1.4
--- index.php	4 Jan 2003 21:48:23 -0000	1.5
***************
*** 1449,1453 ****
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (38, 0, 1, 'bad_ips', '_MD_AM_BADIPS', '', '_MD_AM_BADIPSDSC', 'textarea', 'array', 42)");
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (39, 0, 3, 'meta_keywords', '_MD_AM_METAKEY', 'news, technology, headlines, xoops, xoop, nuke, myphpnuke, myphp-nuke, phpnuke, SE, geek, geeks, hacker, hackers, linux, software, download, downloads, free, community, mp3, forum, forums, bulletin, board, boards, bbs, php, survey, poll, polls, kernel, comment, comments, portal, odp, open, source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, weblog, guru, module, modules, theme, themes, cms, content management', '_MD_AM_METAKEYDSC', 'textarea', 'text', 0)");
!         $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (40, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS 2.0 &copy;2001-2003 <a href=\"http://www.xoops.org/\" target=\"_blank\">The XOOPS Project</a>', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)");
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (41, 0, 4, 'censor_enable', '_MD_AM_DOCENSOR', '0', '_MD_AM_DOCENSORDSC', 'yesno', 'int', 0)");
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (42, 0, 4, 'censor_words', '_MD_AM_CENSORWRD', 'fuck|shit', '_MD_AM_CENSORWRDDSC', 'textarea', 'array', 1)");
--- 1449,1453 ----
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (38, 0, 1, 'bad_ips', '_MD_AM_BADIPS', '', '_MD_AM_BADIPSDSC', 'textarea', 'array', 42)");
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (39, 0, 3, 'meta_keywords', '_MD_AM_METAKEY', 'news, technology, headlines, xoops, xoop, nuke, myphpnuke, myphp-nuke, phpnuke, SE, geek, geeks, hacker, hackers, linux, software, download, downloads, free, community, mp3, forum, forums, bulletin, board, boards, bbs, php, survey, poll, polls, kernel, comment, comments, portal, odp, open, source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, weblog, guru, module, modules, theme, themes, cms, content management', '_MD_AM_METAKEYDSC', 'textarea', 'text', 0)");
!         $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (40, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS 2.0 &copy; 2001-2003 <a href=\"http://www.xoops.org/\" target=\"_blank\">The XOOPS Project</a>', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)");
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (41, 0, 4, 'censor_enable', '_MD_AM_DOCENSOR', '0', '_MD_AM_DOCENSORDSC', 'yesno', 'int', 0)");
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (42, 0, 4, 'censor_words', '_MD_AM_CENSORWRD', 'fuck|shit', '_MD_AM_CENSORWRDDSC', 'textarea', 'array', 1)");

[Xoops-cvs2] xoops2/modules/newbb/language/french main.php,1.2,1.3

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

Update of /cvsroot/xoops/xoops2/modules/newbb/language/french
In directory sc8-pr-cvs1:/tmp/cvs-serv24141/modules/newbb/language/french

Modified Files:
	main.php 
Log Message:
fixed a little detail in the french lang

Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/newbb/language/french/main.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.php	4 Jan 2003 14:38:37 -0000	1.2
--- main.php	4 Jan 2003 20:32:36 -0000	1.3
***************
*** 54,58 ****
  define("_MD_POSTER","Expéditeur");
  define("_MD_VIEWS","Lectures");
! define("_MD_MORETHAN","Plus de %s envois");
  define("_MD_TOPICSTICKY","Sujet fixe (reste au sommet)");
  define("_MD_TOPICLOCKED","Sujet verrouillé (Pas de nouvel envoi possible)");
--- 54,59 ----
  define("_MD_POSTER","Expéditeur");
  define("_MD_VIEWS","Lectures");
! define("_MD_MORETHAN","Nouveaux messages[ Populaire ]");
! define("_MD_MORETHAN2","Pas de nouveaux messages [ Populaire ]");
  define("_MD_TOPICSTICKY","Sujet fixe (reste au sommet)");
  define("_MD_TOPICLOCKED","Sujet verrouillé (Pas de nouvel envoi possible)");

[Xoops-cvs2] xoops2/modules/system/language/english/admin banners.php,1.1,1.2

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

Update of /cvsroot/xoops/xoops2/modules/system/language/english/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv13276/modules/system/language/english/admin

Modified Files:
	banners.php 
Log Message:
added the html code to the lang (waititng the new codes for the banners)

Index: banners.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/system/language/english/admin/banners.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** banners.php	2 Jan 2003 20:24:53 -0000	1.1
--- banners.php	4 Jan 2003 19:56:49 -0000	1.2
***************
*** 53,56 ****
--- 53,58 ----
  define("_AM_EXTINFO","Extra Info:");
  define("_AM_CHGCLI","Change Client");
+ define("_AM_USEHTML","Use Html?");
+ define("_AM_CODEHTML","Code Html:");
  
  ?>

[Xoops-cvs2] xoops2/modules/system/language/spanish/admin banners.php,1.1,1.2

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

Update of /cvsroot/xoops/xoops2/modules/system/language/spanish/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv13276/modules/system/language/spanish/admin

Modified Files:
	banners.php 
Log Message:
added the html code to the lang (waititng the new codes for the banners)

Index: banners.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/system/language/spanish/admin/banners.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** banners.php	2 Jan 2003 20:34:19 -0000	1.1
--- banners.php	4 Jan 2003 19:56:50 -0000	1.2
***************
*** 53,56 ****
--- 53,58 ----
  define("_AM_EXTINFO","Información Extra:");
  define("_AM_CHGCLI","Cambiar Cliente");
+ define("_AM_USEHTML","¿Usa Html?");
+ define("_AM_CODEHTML","Código Html:");
  
  ?>

[Xoops-cvs2] xoops2/install index.php,1.3,1.4

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

Update of /cvsroot/xoops/xoops2/install
In directory sc8-pr-cvs1:/tmp/cvs-serv29807/install

Modified Files:
	index.php 
Log Message:
changed the copyright from 2002  to 2001-2003

Index: index.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/install/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** index.php	4 Jan 2003 13:53:08 -0000	1.3
--- index.php	4 Jan 2003 15:46:05 -0000	1.4
***************
*** 1449,1453 ****
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (38, 0, 1, 'bad_ips', '_MD_AM_BADIPS', '', '_MD_AM_BADIPSDSC', 'textarea', 'array', 42)");
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (39, 0, 3, 'meta_keywords', '_MD_AM_METAKEY', 'news, technology, headlines, xoops, xoop, nuke, myphpnuke, myphp-nuke, phpnuke, SE, geek, geeks, hacker, hackers, linux, software, download, downloads, free, community, mp3, forum, forums, bulletin, board, boards, bbs, php, survey, poll, polls, kernel, comment, comments, portal, odp, open, source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, weblog, guru, module, modules, theme, themes, cms, content management', '_MD_AM_METAKEYDSC', 'textarea', 'text', 0)");
!         $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (40, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS 2.0 ?c?2002 <a href=\"http://www.xoops.org/\" target=\"_blank\">The XOOPS Project</a>', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)");
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (41, 0, 4, 'censor_enable', '_MD_AM_DOCENSOR', '0', '_MD_AM_DOCENSORDSC', 'yesno', 'int', 0)");
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (42, 0, 4, 'censor_words', '_MD_AM_CENSORWRD', 'fuck|shit', '_MD_AM_CENSORWRDDSC', 'textarea', 'array', 1)");
--- 1449,1453 ----
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (38, 0, 1, 'bad_ips', '_MD_AM_BADIPS', '', '_MD_AM_BADIPSDSC', 'textarea', 'array', 42)");
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (39, 0, 3, 'meta_keywords', '_MD_AM_METAKEY', 'news, technology, headlines, xoops, xoop, nuke, myphpnuke, myphp-nuke, phpnuke, SE, geek, geeks, hacker, hackers, linux, software, download, downloads, free, community, mp3, forum, forums, bulletin, board, boards, bbs, php, survey, poll, polls, kernel, comment, comments, portal, odp, open, source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, weblog, guru, module, modules, theme, themes, cms, content management', '_MD_AM_METAKEYDSC', 'textarea', 'text', 0)");
!         $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (40, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS 2.0 &copy;2001-2003 <a href=\"http://www.xoops.org/\" target=\"_blank\">The XOOPS Project</a>', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)");
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (41, 0, 4, 'censor_enable', '_MD_AM_DOCENSOR', '0', '_MD_AM_DOCENSORDSC', 'yesno', 'int', 0)");
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (42, 0, 4, 'censor_words', '_MD_AM_CENSORWRD', 'fuck|shit', '_MD_AM_CENSORWRDDSC', 'textarea', 'array', 1)");
***************
*** 1460,1464 ****
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (48, 0, 3, 'meta_rating', '_MD_AM_METARATING', 'general', '_MD_AM_METARATINGDSC', 'select', 'text', 4)");
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (50, 0, 3, 'meta_author', '_MD_AM_METAAUTHOR', 'XOOPS', '_MD_AM_METAAUTHORDSC', 'textbox', 'text', 6)");
!         $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (51, 0, 3, 'meta_copyright', '_MD_AM_METACOPYR', 'Copyright(c) 2002', '_MD_AM_METACOPYRDSC', 'textbox', 'text', 8)");
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (52, 0, 3, 'meta_description', '_MD_AM_METADESC', 'XOOPS is a dynamic Object Oriented based open source portal script written in PHP.', '_MD_AM_METADESCDSC', 'textarea', 'text', 1)");
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (53, 0, 2, 'allow_chgmail', '_MD_AM_ALLWCHGMAIL', '0', '_MD_AM_ALLWCHGMAILDSC', 'yesno', 'int', 3)");
--- 1460,1464 ----
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (48, 0, 3, 'meta_rating', '_MD_AM_METARATING', 'general', '_MD_AM_METARATINGDSC', 'select', 'text', 4)");
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (50, 0, 3, 'meta_author', '_MD_AM_METAAUTHOR', 'XOOPS', '_MD_AM_METAAUTHORDSC', 'textbox', 'text', 6)");
!         $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (51, 0, 3, 'meta_copyright', '_MD_AM_METACOPYR', 'Copyright &copy; 2001-2003', '_MD_AM_METACOPYRDSC', 'textbox', 'text', 8)");
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (52, 0, 3, 'meta_description', '_MD_AM_METADESC', 'XOOPS is a dynamic Object Oriented based open source portal script written in PHP.', '_MD_AM_METADESCDSC', 'textarea', 'text', 1)");
          $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix('config')." VALUES (53, 0, 2, 'allow_chgmail', '_MD_AM_ALLWCHGMAIL', '0', '_MD_AM_ALLWCHGMAILDSC', 'yesno', 'int', 3)");