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

[Xoops-cvs2] xoops-current/html header.php,1.17,1.18

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

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

Modified Files:
	header.php 
Log Message:
no message

Index: header.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/header.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** header.php	26 Sep 2002 22:34:36 -0000	1.17
--- header.php	27 Sep 2002 12:23:47 -0000	1.18
***************
*** 174,178 ****
  		}
  		if (!isset($show_rblock)) { 
! 			$xoopsTpl->assign('xoops_showrblock', 0);               		} 
  		if (!isset($show_cblock)) {
  			$xoopsTpl->assign('xoops_showcblock', 0);
--- 174,179 ----
  		}
  		if (!isset($show_rblock)) { 
! 			$xoopsTpl->assign('xoops_showrblock', 0);
! 		}
  		if (!isset($show_cblock)) {
  			$xoopsTpl->assign('xoops_showcblock', 0);

[Xoops-cvs2] xoops-current/html edituser.php,1.9,1.10

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

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

Modified Files:
	edituser.php 
Log Message:
no message

Index: edituser.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/edituser.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** edituser.php	27 Sep 2002 10:36:03 -0000	1.9
--- edituser.php	27 Sep 2002 10:36:56 -0000	1.10
***************
*** 33,37 ****
  $op = "editprofile";
  
- // if GET/POST is set, change $op
  if ( isset($HTTP_POST_VARS) ) {
  	foreach ($HTTP_POST_VARS as $k => $v) {
--- 33,36 ----
***************
*** 95,104 ****
  	}
  	$form->addElement($avatar_tray);
- 	//if ( $xoopsConfig['allow_theme'] == 1 ) {
- 	//	$temp = $xoopsUser->getVar("theme");
- 	//	$usertheme = empty($temp) ? $xoopsConfig['default_theme'] : $temp;
- 	//	$theme_select = new XoopsFormSelectTheme(_US_THEME, "theme", $usertheme);
- 	//	$form->addElement($theme_select);
- 	//}
  	$timezone_select = new XoopsFormSelectTimezone(_US_TIMEZONE, "timezone_offset", $xoopsUser->getVar("timezone_offset"));
  	$icq_text = new XoopsFormText(_US_ICQ, "user_icq", 30, 100, $xoopsUser->getVar("user_icq", "E"));
--- 94,97 ----

[Xoops-cvs2] xoops-current/html edituser.php,1.8,1.9

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

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

Modified Files:
	edituser.php 
Log Message:
no message

Index: edituser.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/edituser.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** edituser.php	25 Sep 2002 13:07:51 -0000	1.8
--- edituser.php	27 Sep 2002 10:36:03 -0000	1.9
***************
*** 37,40 ****
--- 37,41 ----
  	foreach ($HTTP_POST_VARS as $k => $v) {
  		${$k} =  $v;
+ 	}
  } elseif ( isset($HTTP_GET_VARS['op']) ) {
  	$op =  $HTTP_GET_VARS['op'];

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

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

Update of /cvsroot/xoops/xoops-current/html/language/english
In directory usw-pr-cvs1:/tmp/cvs-serv25271/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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** global.php	18 Sep 2002 02:43:59 -0000	1.6
--- global.php	27 Sep 2002 09:23:29 -0000	1.7
***************
*** 34,38 ****
  define("_POSTS","Posts: ");
  define("_FROM","From: ");
! define("_POSTED","Posted"); // Posted date
  define("_PROFILE","Profile");
  define("_VISITWEBSITE","Visit Website");
--- 34,38 ----
  define("_POSTS","Posts: ");
  define("_FROM","From: ");
! define("_POSTED","Posted: "); // Posted date
  define("_PROFILE","Profile");
  define("_VISITWEBSITE","Visit Website");

[Xoops-cvs2] xoops-current/html header.php,1.16,1.17

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

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

Modified Files:
	header.php 
Log Message:
no message

Index: header.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/header.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** header.php	26 Sep 2002 13:03:40 -0000	1.16
--- header.php	26 Sep 2002 22:34:36 -0000	1.17
***************
*** 64,70 ****
  		if ( $theme_css != '' ) {
  			$xoopsTpl->assign("xoops_themecss", $theme_css);
- 			//$xoopsTpl->assign("xoops_themecss", '<!-- @import url('.$theme_css.'); -->');
  		}
  		unset($theme_css);
  		// assign theme specific language variables if any
  		if ( isset($xoopsTheme) && is_array($xoopsTheme) ) {
--- 64,70 ----
  		if ( $theme_css != '' ) {
  			$xoopsTpl->assign("xoops_themecss", $theme_css);
  		}
  		unset($theme_css);
+ 		$xoopsTpl->assign('xoops_theme', $xoopsConfig['default_theme']);
  		// assign theme specific language variables if any
  		if ( isset($xoopsTheme) && is_array($xoopsTheme) ) {

[Xoops-cvs2] xoops-current/html/class/xoopsform formselect.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-serv17042

Modified Files:
	formselect.php 
Log Message:
no message

Index: formselect.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopsform/formselect.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** formselect.php	15 Jul 2002 08:13:14 -0000	1.1.1.1
--- formselect.php	26 Sep 2002 19:15:45 -0000	1.2
***************
*** 37,46 ****
  
  	// public
! 	function XoopsFormSelect($caption, $name, $value="", $size=1, $multiple=false){
  		$this->setCaption($caption);
  		$this->setName($name);
  		$this->multiple = $multiple;
  		$this->size = intval($size);
! 		if ( $value != "" ) {
  			if ( is_array($value) ) {
  				foreach ( $value as $v ) {
--- 37,46 ----
  
  	// public
! 	function XoopsFormSelect($caption, $name, $value=null, $size=1, $multiple=false){
  		$this->setCaption($caption);
  		$this->setName($name);
  		$this->multiple = $multiple;
  		$this->size = intval($size);
! 		if (isset($value)) {
  			if ( is_array($value) ) {
  				foreach ( $value as $v ) {

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

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

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

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

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

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

[Xoops-cvs2] xoops-current/html/class xoopsobject.php,1.3,1.4 xoopscomments.php,1.1.1.1,1.2

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

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

Modified Files:
	xoopsobject.php xoopscomments.php 
Log Message:
no message

Index: xoopsobject.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopsobject.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xoopsobject.php	4 Sep 2002 09:54:28 -0000	1.3
--- xoopsobject.php	26 Sep 2002 17:33:27 -0000	1.4
***************
*** 106,113 ****
  			switch ($format) {
  				case "S":
! 					$html = (!empty($this->vars[$key]['nohtml'])) ? 0 :1;
! 					$smiley = (!empty($this->vars[$key]['nosmiley'])) ? 0 : 1;
  
! 					$xcode = (!empty($this->vars[$key]['noxcode'])) ? 0 : 1;
  					return $myts->makeTareaData4Show($this->vars[$key]['value'], $html, $smiley, $xcode);
  					break;
--- 106,113 ----
  			switch ($format) {
  				case "S":
! 					$html = (!empty($this->vars['nohtml']['value'])) ? 0 :1;
! 					$smiley = (!empty($this->vars['nosmiley']['value'])) ? 0 : 1;
  
! 					$xcode = (!empty($this->vars['noxcode']['value'])) ? 0 : 1;
  					return $myts->makeTareaData4Show($this->vars[$key]['value'], $html, $smiley, $xcode);
  					break;
***************
*** 116,123 ****
  					break;
  				case "P":
! 					$html = (!empty($this->vars[$key]['nohtml'])) ? 0 :1;
! 					$smiley = (!empty($this->vars[$key]['nosmiley'])) ? 0 : 1;
  
! 					$xcode = (!empty($this->vars[$key]['noxcode'])) ? 0 : 1;
  					return $myts->makeTareaData4Preview($this->vars[$key]['value'], $html, $smiley, $xcode);
  					break;
--- 116,123 ----
  					break;
  				case "P":
! 					$html = (!empty($this->vars['nohtml']['value'])) ? 0 :1;
! 					$smiley = (!empty($this->vars['nosmiley']['value'])) ? 0 : 1;
  
! 					$xcode = (!empty($this->vars['noxcode']['value'])) ? 0 : 1;
  					return $myts->makeTareaData4Preview($this->vars[$key]['value'], $html, $smiley, $xcode);
  					break;

Index: xoopscomments.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopscomments.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** xoopscomments.php	15 Jul 2002 08:13:11 -0000	1.1.1.1
--- xoopscomments.php	26 Sep 2002 17:33:28 -0000	1.2
***************
*** 41,45 ****
  		$this->initVar("pid", "int", 0, false);
  		$this->initVar("date", "int", NULL, false);
! 		$this->initVar("nohtml", "int", 0, false);
  		$this->initVar("nosmiley", "int", 0, false);
  		$this->initVar("noxcode", "int", 0, false);
--- 41,45 ----
  		$this->initVar("pid", "int", 0, false);
  		$this->initVar("date", "int", NULL, false);
! 		$this->initVar("nohtml", "int", 1, false);
  		$this->initVar("nosmiley", "int", 0, false);
  		$this->initVar("noxcode", "int", 0, false);
***************
*** 75,81 ****
  			$isnew = true;
  			$comment_id = $this->db->genId($this->ctable."_comment_id_seq");
! 			$sql = "INSERT INTO ".$this->ctable." (comment_id, pid, item_id, date, user_id, ip, subject, comment, nohtml, nosmiley, noxcode, icon) VALUES ($comment_id,".$pid.",".$item_id.",".time().",".$user_id.",'".$ip."','".$subject."','".$comment."',".$nohtml.",".$nosmiley.",".$noxcode.",'".$icon."')";
  		} else {
! 			$sql = "UPDATE ".$this->ctable." SET subject='".$subject."',comment='".$comment."',nohtml=".$nohtml.",nosmiley=".$nosmiley.",noxcode=".$noxcode.",icon='".$icon."' WHERE comment_id=".$comment_id."";
  		}
  		if ( !$result = $this->db->query($sql) ) {
--- 75,81 ----
  			$isnew = true;
  			$comment_id = $this->db->genId($this->ctable."_comment_id_seq");
! 			$sql = "INSERT INTO ".$this->ctable." (comment_id, pid, item_id, date, user_id, ip, subject, comment, nohtml, nosmiley, noxcode, icon) VALUES ($comment_id,".$pid.",".$item_id.",".time().",".$user_id.",'".$ip."','".$subject."','".$comment."',1,".$nosmiley.",".$noxcode.",'".$icon."')";
  		} else {
! 			$sql = "UPDATE ".$this->ctable." SET subject='".$subject."',comment='".$comment."',nohtml=1,nosmiley=".$nosmiley.",noxcode=".$noxcode.",icon='".$icon."' WHERE comment_id=".$comment_id."";
  		}
  		if ( !$result = $this->db->query($sql) ) {

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

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

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

Modified Files:
	postcomment.php 
Log Message:
no message

Index: postcomment.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/xoopspoll/postcomment.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** postcomment.php	15 Jul 2002 08:14:01 -0000	1.1.1.1
--- postcomment.php	26 Sep 2002 17:31:08 -0000	1.2
***************
*** 8,24 ****
  		$myts =& MyTextSanitizer::getInstance();
  		$p_subject = $myts->makeTboxData4Preview($HTTP_POST_VARS['subject']);
! 		if ( $HTTP_POST_VARS['nosmiley'] == 1 && $HTTP_POST_VARS['nohtml'] == 1 ) {
  			$p_comment = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],0,0,1);
- 		} elseif ( $HTTP_POST_VARS['nohtml'] == 1 ) {
- 			$p_comment = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],0,1,1);
- 		} elseif ( $HTTP_POST_VARS['nosmiley'] == 1 ) {
- 			$p_comment = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],1,0,1);
  		} else {
! 			$p_comment = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],1,1,1);
  		}
  		themecenterposts($p_subject,$p_comment);
  		$icon = $HTTP_POST_VARS['icon'];
  		$noname = $HTTP_POST_VARS['noname'];
! 		$nohtml = $HTTP_POST_VARS['nohtml'];
  		$nosmiley = $HTTP_POST_VARS['nosmiley'];
  		$pid = $HTTP_POST_VARS['pid'];
--- 8,20 ----
  		$myts =& MyTextSanitizer::getInstance();
  		$p_subject = $myts->makeTboxData4Preview($HTTP_POST_VARS['subject']);
! 		if ( $HTTP_POST_VARS['nosmiley'] == 1 ) {
  			$p_comment = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],0,0,1);
  		} else {
! 			$p_comment = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],0,1,1);
  		}
  		themecenterposts($p_subject,$p_comment);
  		$icon = $HTTP_POST_VARS['icon'];
  		$noname = $HTTP_POST_VARS['noname'];
! 		$nohtml = 1;
  		$nosmiley = $HTTP_POST_VARS['nosmiley'];
  		$pid = $HTTP_POST_VARS['pid'];
***************
*** 68,72 ****
  		$pollcomment->setVar("subject", $HTTP_POST_VARS['subject']);
  		$pollcomment->setVar("comment", $HTTP_POST_VARS['message']);
! 		$pollcomment->setVar("nohtml", $HTTP_POST_VARS['nohtml']);
  		$pollcomment->setVar("nosmiley", $HTTP_POST_VARS['nosmiley']);
  		$pollcomment->setVar("icon", $HTTP_POST_VARS['icon']);
--- 64,68 ----
  		$pollcomment->setVar("subject", $HTTP_POST_VARS['subject']);
  		$pollcomment->setVar("comment", $HTTP_POST_VARS['message']);
! 		$pollcomment->setVar("nohtml", 1);
  		$pollcomment->setVar("nosmiley", $HTTP_POST_VARS['nosmiley']);
  		$pollcomment->setVar("icon", $HTTP_POST_VARS['icon']);

[Xoops-cvs2] xoops-current/html/modules/news postcomment.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-serv31588

Modified Files:
	postcomment.php 
Log Message:
no message

Index: postcomment.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/news/postcomment.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** postcomment.php	15 Jul 2002 08:13:36 -0000	1.1.1.1
--- postcomment.php	26 Sep 2002 17:30:23 -0000	1.2
***************
*** 8,24 ****
  		$myts =& MyTextSanitizer::getInstance();
  		$p_subject = $myts->makeTboxData4Preview($HTTP_POST_VARS['subject']);
! 		if ( $HTTP_POST_VARS['nosmiley'] == 1 && $HTTP_POST_VARS['nohtml'] == 1 ) {
  			$p_comment = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],0,0,1);
- 		} elseif ( $HTTP_POST_VARS['nohtml'] == 1 ) {
- 			$p_comment = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],0,1,1);
- 		} elseif ( $HTTP_POST_VARS['nosmiley'] == 1 ) {
- 			$p_comment = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],1,0,1);
  		} else {
! 			$p_comment = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],1,1,1);
  		}
  		themecenterposts($p_subject,$p_comment);
  		$icon = $HTTP_POST_VARS['icon'];
  		$noname = $HTTP_POST_VARS['noname'];
! 		$nohtml = $HTTP_POST_VARS['nohtml'];
  		$nosmiley = $HTTP_POST_VARS['nosmiley'];
  		$pid = $HTTP_POST_VARS['pid'];
--- 8,20 ----
  		$myts =& MyTextSanitizer::getInstance();
  		$p_subject = $myts->makeTboxData4Preview($HTTP_POST_VARS['subject']);
! 		if ( $HTTP_POST_VARS['nosmiley'] == 1 ) {
  			$p_comment = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],0,0,1);
  		} else {
! 			$p_comment = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],0,1,1);
  		}
  		themecenterposts($p_subject,$p_comment);
  		$icon = $HTTP_POST_VARS['icon'];
  		$noname = $HTTP_POST_VARS['noname'];
! 		$nohtml = 1;
  		$nosmiley = $HTTP_POST_VARS['nosmiley'];
  		$pid = $HTTP_POST_VARS['pid'];
***************
*** 68,72 ****
  		$artcomment->setVar("subject", $HTTP_POST_VARS['subject']);
  		$artcomment->setVar("comment", $HTTP_POST_VARS['message']);
! 		$artcomment->setVar("nohtml", $HTTP_POST_VARS['nohtml']);
  		$artcomment->setVar("nosmiley", $HTTP_POST_VARS['nosmiley']);
  		$artcomment->setVar("icon", $HTTP_POST_VARS['icon']);
--- 64,68 ----
  		$artcomment->setVar("subject", $HTTP_POST_VARS['subject']);
  		$artcomment->setVar("comment", $HTTP_POST_VARS['message']);
! 		$artcomment->setVar("nohtml", 1);
  		$artcomment->setVar("nosmiley", $HTTP_POST_VARS['nosmiley']);
  		$artcomment->setVar("icon", $HTTP_POST_VARS['icon']);

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

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

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

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.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** submit.php	11 Sep 2002 12:21:06 -0000	1.2
--- submit.php	26 Sep 2002 17:29:37 -0000	1.3
***************
*** 46,57 ****
  		OpenTable();
  		$p_subject = $myts->makeTboxData4Preview($HTTP_POST_VARS['subject']);
!   		if ( !empty($HTTP_POST_VARS['nosmiley']) && !empty($HTTP_POST_VARS['nohtml']) ){
  			$p_message = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],0,0,1);
- 		} elseif ( !empty($HTTP_POST_VARS['nohtml']) ) {
- 			$p_message = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],0,1,1);
- 		} elseif ( !empty($HTTP_POST_VARS['nosmiley']) ) {
- 			$p_message = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],1,0,1);
  		} else {
! 			$p_message = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],1,1,1);
  		}
  		$subject = $myts->makeTboxData4PreviewInForm($HTTP_POST_VARS['subject']);
--- 46,53 ----
  		OpenTable();
  		$p_subject = $myts->makeTboxData4Preview($HTTP_POST_VARS['subject']);
!   		if ( !empty($HTTP_POST_VARS['nosmiley']) ) {
  			$p_message = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],0,0,1);
  		} else {
! 			$p_message = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],0,1,1);
  		}
  		$subject = $myts->makeTboxData4PreviewInForm($HTTP_POST_VARS['subject']);
***************
*** 59,63 ****
  		$noname = intval($HTTP_POST_VARS['noname']);
  		$nosmiley = intval($HTTP_POST_VARS['nosmiley']);
! 		$nohtml = intval($HTTP_POST_VARS['nohtml']);
  		$notifypub = intval($HTTP_POST_VARS['notifypub']);
  		echo "<b>"._NW_SUBMITNEWS."</b><br><br>";
--- 55,59 ----
  		$noname = intval($HTTP_POST_VARS['noname']);
  		$nosmiley = intval($HTTP_POST_VARS['nosmiley']);
! 		$nohtml = 1;
  		$notifypub = intval($HTTP_POST_VARS['notifypub']);
  		echo "<b>"._NW_SUBMITNEWS."</b><br><br>";
***************
*** 88,92 ****
  		$story->setTopicId($HTTP_POST_VARS['topic_id']);
  		$story->setHostname($GLOBALS['REMOTE_ADDR']);
! 		$story->setNohtml($HTTP_POST_VARS['nohtml']);
  		$story->setNosmiley($HTTP_POST_VARS['nosmiley']);
  		$story->setNotifyPub($HTTP_POST_VARS['notifypub']);
--- 84,88 ----
  		$story->setTopicId($HTTP_POST_VARS['topic_id']);
  		$story->setHostname($GLOBALS['REMOTE_ADDR']);
! 		$story->setNohtml(1);
  		$story->setNosmiley($HTTP_POST_VARS['nosmiley']);
  		$story->setNotifyPub($HTTP_POST_VARS['notifypub']);

[Xoops-cvs2] xoops-current/html/modules/newbb index.php,1.8,1.9

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

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

Modified Files:
	index.php 
Log Message:
no message

Index: index.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/newbb/index.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** index.php	26 Sep 2002 17:17:26 -0000	1.8
--- index.php	26 Sep 2002 17:26:09 -0000	1.9
***************
*** 29,33 ****
  	$xoopsOption['show_rblock'] =1;
  	include(XOOPS_ROOT_PATH."/header.php");
! 	//make_cblock();
  	echo "<br />";
  }else{
--- 29,33 ----
  	$xoopsOption['show_rblock'] =1;
  	include(XOOPS_ROOT_PATH."/header.php");
! 	make_cblock();
  	echo "<br />";
  }else{
***************
*** 67,70 ****
--- 67,72 ----
  	$sql .= ' WHERE f.cat_id = '.$viewcat;
  	$xoopsTpl->assign('forum_index_title', sprintf(_MD_FORUMINDEX,$xoopsConfig['sitename']));
+ } else {
+ 	$xoopsTpl->assign('forum_index_title', '');
  }
  $sql .= ' ORDER BY f.cat_id, f.forum_id';
***************
*** 76,143 ****
  }
  $cat_count = count($categories);
! for ( $i = 0; $i < $cat_count; $i++ ) {
! 	$categories[$i]['cat_title'] = $myts->makeTboxData4Show($categories[$i]['cat_title']);
! 	if ( $viewcat != 0 && $categories[$i]['cat_id'] != $viewcat ) {
! 		$xoopsTpl->append("categories", $categories[$i]);
! 		continue;
! 	}
! 	foreach ( $forums as $forum_row ) {
! 		unset($last_post);
! 		if ( $forum_row['cat_id'] == $categories[$i]['cat_id'] ) {
! 			if ($forum_row['post_time']) {
! 				//$forum_row['subject'] = $myts->makeTboxData4Show($forum_row['subject']);
! 				$categories[$i]['forums']['forum_lastpost_time'][] = formatTimestamp($forum_row['post_time']);
! 				$last_post_icon = '<a href="'.XOOPS_URL.'/modules/newbb/viewtopic.php?post_id='.$forum_row['forum_last_post_id'].'&amp;topic_id='.$forum_row['topic_id'].'&amp;forum='.$forum_row['forum_id'].'#'.$forum_row['forum_last_post_id'].'">';
! 				if ( $forum_row['icon'] ) {
! 					$last_post_icon .= '<img src="'.XOOPS_URL.'/images/subject/'.$forum_row['icon'].'" border="0" alt="" />';
! 				} else {
! 					$last_post_icon .= '<img src="'.XOOPS_URL.'/images/subject/icon1.gif" width="15" height="15" border="0" alt="" />';
! 				}
! 				$last_post_icon .= '</a>';
! 				$categories[$i]['forums']['forum_lastpost_icon'][] = $last_post_icon;
! 				if ( $forum_row['uid'] != 0 && $forum_row['uname'] ){
! 					$categories[$i]['forums']['forum_lastpost_user'][] = '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$forum_row['uid'].'">' . $myts->makeTboxData4Show($forum_row['uname']).'</a>';
! 				} else {
! 					$categories[$i]['forums']['forum_lastpost_user'][] = $xoopsConfig['anonymous'];
! 				}
! 				if ( $forum_row['forum_type'] == 1 ) {
! 					$categories[$i]['forums']['forum_folder'][] = $bbImage['locked'];
! 				} elseif ( $forum_row['post_time'] > $last_visit && $last_post != _MD_NOPOSTS ) {
! 					$categories[$i]['forums']['forum_folder'][] = $bbImage['newposts'];
! 				} else {
! 					$categories[$i]['forums']['forum_folder'][] = $bbImage['folder'];
! 				}
! 			} else {
! 				// no forums, so put empty values
! 				$categories[$i]['forums']['forum_lastpost_time'][] = "";
! 				$categories[$i]['forums']['forum_lastpost_icon'][] = "";
! 				$categories[$i]['forums']['forum_lastpost_user'][] = "";
! 				if ( $forum_row['forum_type'] == 1 ) {
! 					$categories[$i]['forums']['forum_folder'][] = $bbImage['locked'];
  				} else {
! 					$categories[$i]['forums']['forum_folder'][] = $bbImage['folder'];
  				}
! 			}
! 			$categories[$i]['forums']['forum_id'][] = $forum_row['forum_id'];
! 			$categories[$i]['forums']['forum_name'][] = $myts->makeTboxData4Show($forum_row['forum_name']);
! 			$categories[$i]['forums']['forum_desc'][] = $myts->makeTareaData4Show($forum_row['forum_desc']);
! 			$categories[$i]['forums']['forum_topics'][] = $forum_row['forum_topics'];
! 			$categories[$i]['forums']['forum_posts'][] = $forum_row['forum_posts'];
! 	 		$all_moderators = get_moderators($forum_row['forum_id']);
! 	 		$count = 0;
! 			$forum_moderators = '';
! 			foreach ( $all_moderators as $mods) {
! 				foreach ( $mods as $mod_id => $mod_name) {
! 					if ( $count > 0 ) {
! 						$forum_moderators .= ', ';
  					}
- 					$forum_moderators .= '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$mod_id.'">'.$myts->makeTboxData4Show($mod_name).'</a>';
- 					$count = 1;
  				}
  			}
- 			$categories[$i]['forums']['forum_moderators'][] = $forum_moderators;
  		}
  	}
! 	$xoopsTpl->append("categories", $categories[$i]);
  }
  $xoopsTpl->assign("img_hotfolder", $bbImage['newposts']);
--- 78,149 ----
  }
  $cat_count = count($categories);
! if ($cat_count > 0) {
! 	for ( $i = 0; $i < $cat_count; $i++ ) {
! 		$categories[$i]['cat_title'] = $myts->makeTboxData4Show($categories[$i]['cat_title']);
! 		if ( $viewcat != 0 && $categories[$i]['cat_id'] != $viewcat ) {
! 			$xoopsTpl->append("categories", $categories[$i]);
! 			continue;
! 		}
! 		foreach ( $forums as $forum_row ) {
! 			unset($last_post);
! 			if ( $forum_row['cat_id'] == $categories[$i]['cat_id'] ) {
! 				if ($forum_row['post_time']) {
! 					//$forum_row['subject'] = $myts->makeTboxData4Show($forum_row['subject']);
! 					$categories[$i]['forums']['forum_lastpost_time'][] = formatTimestamp($forum_row['post_time']);
! 					$last_post_icon = '<a href="'.XOOPS_URL.'/modules/newbb/viewtopic.php?post_id='.$forum_row['forum_last_post_id'].'&amp;topic_id='.$forum_row['topic_id'].'&amp;forum='.$forum_row['forum_id'].'#'.$forum_row['forum_last_post_id'].'">';
! 					if ( $forum_row['icon'] ) {
! 						$last_post_icon .= '<img src="'.XOOPS_URL.'/images/subject/'.$forum_row['icon'].'" border="0" alt="" />';
! 					} else {
! 						$last_post_icon .= '<img src="'.XOOPS_URL.'/images/subject/icon1.gif" width="15" height="15" border="0" alt="" />';
! 					}
! 					$last_post_icon .= '</a>';
! 					$categories[$i]['forums']['forum_lastpost_icon'][] = $last_post_icon;
! 					if ( $forum_row['uid'] != 0 && $forum_row['uname'] ){
! 						$categories[$i]['forums']['forum_lastpost_user'][] = '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$forum_row['uid'].'">' . $myts->makeTboxData4Show($forum_row['uname']).'</a>';
! 					} else {
! 						$categories[$i]['forums']['forum_lastpost_user'][] = $xoopsConfig['anonymous'];
! 					}
! 					if ( $forum_row['forum_type'] == 1 ) {
! 						$categories[$i]['forums']['forum_folder'][] = $bbImage['locked'];
! 					} elseif ( $forum_row['post_time'] > $last_visit && $last_post != _MD_NOPOSTS ) {
! 						$categories[$i]['forums']['forum_folder'][] = $bbImage['newposts'];
! 					} else {
! 						$categories[$i]['forums']['forum_folder'][] = $bbImage['folder'];
! 					}
  				} else {
! 					// no forums, so put empty values
! 					$categories[$i]['forums']['forum_lastpost_time'][] = "";
! 					$categories[$i]['forums']['forum_lastpost_icon'][] = "";
! 					$categories[$i]['forums']['forum_lastpost_user'][] = "";
! 					if ( $forum_row['forum_type'] == 1 ) {
! 						$categories[$i]['forums']['forum_folder'][] = $bbImage['locked'];
! 					} else {
! 						$categories[$i]['forums']['forum_folder'][] = $bbImage['folder'];
! 					}
  				}
! 				$categories[$i]['forums']['forum_id'][] = $forum_row['forum_id'];
! 				$categories[$i]['forums']['forum_name'][] = $myts->makeTboxData4Show($forum_row['forum_name']);
! 				$categories[$i]['forums']['forum_desc'][] = $myts->makeTareaData4Show($forum_row['forum_desc']);
! 				$categories[$i]['forums']['forum_topics'][] = $forum_row['forum_topics'];
! 				$categories[$i]['forums']['forum_posts'][] = $forum_row['forum_posts'];
! 	 			$all_moderators = get_moderators($forum_row['forum_id']);
! 	 			$count = 0;
! 				$forum_moderators = '';
! 				foreach ( $all_moderators as $mods) {
! 					foreach ( $mods as $mod_id => $mod_name) {
! 						if ( $count > 0 ) {
! 							$forum_moderators .= ', ';
! 						}
! 						$forum_moderators .= '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$mod_id.'">'.$myts->makeTboxData4Show($mod_name).'</a>';
! 						$count = 1;
  					}
  				}
+ 				$categories[$i]['forums']['forum_moderators'][] = $forum_moderators;
  			}
  		}
+ 		$xoopsTpl->append("categories", $categories[$i]);
  	}
! } else {
! 	$xoopsTpl->append("categories", array());
  }
  $xoopsTpl->assign("img_hotfolder", $bbImage['newposts']);

[Xoops-cvs2] xoops-current/html/modules/newbb index.php,1.7,1.8

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

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

Modified Files:
	index.php 
Log Message:
no message

Index: index.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/newbb/index.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** index.php	5 Sep 2002 11:11:45 -0000	1.7
--- index.php	26 Sep 2002 17:17:26 -0000	1.8
***************
*** 58,61 ****
--- 58,62 ----
  
  $viewcat = !empty($HTTP_GET_VARS['cat']) ? intval($HTTP_GET_VARS['cat']) : 0;
+ $categories = array();
  while ( $cat_row = $xoopsDB->fetchArray($result) ) {
  	$categories[] = $cat_row;

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

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

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

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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** main.php	20 Sep 2002 16:21:07 -0000	1.3
--- main.php	26 Sep 2002 17:13:32 -0000	1.4
***************
*** 36,45 ****
  
  if ( $op == "save" ) {
!       	save_block($bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $btemplate, $balias, $bcachetime, $bmodule);
  	exit();
  }
  
  if ( $op == "update" ) {
! 	update_block($bid, $bside, $bweight, $bposition, $bvisible, $btitle, $btemplate, $bcontent, $bctype, $balias, $bcachetime, $bmodule, $options);
  }
  
--- 36,45 ----
  
  if ( $op == "save" ) {
!       	save_block($bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $btemplate, $bcachetime, $bmodule);
  	exit();
  }
  
  if ( $op == "update" ) {
! 	update_block($bid, $bside, $bweight, $bposition, $bvisible, $btitle, $btemplate, $bcontent, $bctype, $bcachetime, $bmodule, $options);
  }
  

Index: blocksadmin.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/blocksadmin/blocksadmin.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** blocksadmin.php	24 Sep 2002 17:42:35 -0000	1.6
--- blocksadmin.php	26 Sep 2002 17:13:33 -0000	1.7
***************
*** 155,159 ****
  	}
  
! 	function save_block($bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $btemplate, $balias, $bcachetime, $bmodule){
  		global $xoopsUser;
  		$myblock = new XoopsBlock();
--- 155,159 ----
  	}
  
! 	function save_block($bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $btemplate, $bcachetime, $bmodule){
  		global $xoopsUser;
  		$myblock = new XoopsBlock();
***************
*** 168,172 ****
  		$myblock->setVar('type', 'C');
  		$myblock->setVar('btemplate', $btemplate);
! 		$myblock->setVar('balias', $balias);
  		$myblock->setVar('bcachetime', $bcachetime);
  		switch ($bctype) {
--- 168,172 ----
  		$myblock->setVar('type', 'C');
  		$myblock->setVar('btemplate', $btemplate);
! 		//$myblock->setVar('balias', $balias);
  		$myblock->setVar('bcachetime', $bcachetime);
  		switch ($bctype) {
***************
*** 346,350 ****
  	}
  
! 	function update_block($bid, $bside, $bweight, $bposition, $bvisible, $btitle, $btemplate, $bcontent, $bctype, $balias, $bcachetime, $bmodule, $options=array()){
  		global $xoopsConfig;
  		$myblock = new XoopsBlock($bid);
--- 346,350 ----
  	}
  
! 	function update_block($bid, $bside, $bweight, $bposition, $bvisible, $btitle, $btemplate, $bcontent, $bctype, $bcachetime, $bmodule, $options=array()){
  		global $xoopsConfig;
  		$myblock = new XoopsBlock($bid);
***************
*** 357,361 ****
  		$myblock->setVar('content', $bcontent);
  		$myblock->setVar('btemplate', $btemplate);
! 		$myblock->setVar('balias', $balias);
  		$myblock->setVar('bcachetime', $bcachetime);
  		if ( isset($options) && (count($options) > 0) ) {
--- 357,361 ----
  		$myblock->setVar('content', $bcontent);
  		$myblock->setVar('btemplate', $btemplate);
! 		//$myblock->setVar('balias', $balias);
  		$myblock->setVar('bcachetime', $bcachetime);
  		if ( isset($options) && (count($options) > 0) ) {

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

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

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

Modified Files:
	old_theme_functions.php 
Log Message:
no message

Index: old_theme_functions.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/include/old_theme_functions.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** old_theme_functions.php	26 Sep 2002 17:06:02 -0000	1.2
--- old_theme_functions.php	26 Sep 2002 17:10:01 -0000	1.3
***************
*** 3,13 ****
  // These are needed when viewing old modules (that don't use Smarty template files) when a theme that use Smarty templates are selected.
  
- // moved to language/global.php
- define("_TH_POSTEDBY","Enviado por");
- define("_TH_ON","el");
- define("_TH_READS","leidos");
- define("_TH_WELCOMETO","Bienvenido a %s");
- define("_TH_SEARCH","Buscar");
- 
  function OpenTable($width="100%") {
   echo "<table width='".$width."' border='0' cellspacing='0' cellpadding='0' class='bg2'><tr><td>\n";
--- 3,6 ----
***************
*** 51,55 ****
             ."</tr>"
  	       ."<tr>"
! 	         ."<td class='bg3'>"._TH_POSTEDBY." <span class='postedby'>$poster</span> "._TH_ON." $time ($counter "._TH_READS.") </td>"
  	       ."</tr>"
  	       ."<tr>"
--- 44,48 ----
             ."</tr>"
  	       ."<tr>"
! 	         ."<td class='bg3'>"._POSTEDBY." <span class='postedby'>$poster</span> "._ON." $time ($counter "._READS.") </td>"
  	       ."</tr>"
  	       ."<tr>"

[Xoops-cvs2] xoops-current/html/include old_theme_functions.php,1.1,1.2

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

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

Modified Files:
	old_theme_functions.php 
Log Message:
no message

Index: old_theme_functions.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/include/old_theme_functions.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** old_theme_functions.php	23 Aug 2002 04:09:34 -0000	1.1
--- old_theme_functions.php	26 Sep 2002 17:06:02 -0000	1.2
***************
*** 4,74 ****
  
  // moved to language/global.php
! //define("_TH_POSTEDBY","Posted by");
! //define("_TH_ON","on");
! //define("_TH_READS","reads");
! //define("_TH_WELCOMETO","Welcome to %s");
! //define("_TH_SEARCH","Search");
  
  function OpenTable($width="100%") {
! 	echo "
! 	<table width='".$width."' border='0' cellspacing='1' cellpadding='0' class='bg2'>
! 	  <tr>
! 	    <td valign='top'>
! 	      <table width='100%' border='0' cellspacing='1' cellpadding='8' class='bg3'>
! 	        <tr>
! 	          <td valign='top' align='left'>
! 	";
! }
  
  function CloseTable() {
! 	echo "
! 	          </td>
! 	        </tr>
! 	      </table>
! 	    </td>
! 	  </tr>
! 	</table>
! 	";
  }
  
  function themecenterposts($title, $content) {
! 	echo"
! 	<table border='0' cellpadding='0' cellspacing='0'>
! 	  <tr>
! 	    <td><span class='xoopsOldNewsTitle'>$title</span><br /></td>
! 	  </tr>
! 	  <tr>
! 	    <td><span class='xoopsOldNewsText'>$content</span></td>
! 	  </tr>
! 	  <tr>
! 	    <td align='right'>&nbsp;</td>
! 	  </tr>
! 	</table>
! 	";
  }
  
  function themenews ($poster, $time, $title, $counter, $thetext, $timglink, $adminlink, $morelink="") {
! 	global $xoopsTheme;
! 	echo "
! 	<table border='0' cellpadding='3' cellspacing='5' width='100%'>
! 	  <tr>
! 	    <td>&nbsp;<span class='xoopsOldNewsTitle'>$title</span><br />&nbsp;&nbsp;<img src='".XOOPS_URL."/images/join.gif' width='9' height='9' alt='' />&nbsp;<span class='xoopsOldNewsPostedby'>"._POSTEDBY." $poster "._ON." $time ($counter "._READS.")</span><br /></td>
! 	  </tr>
! 	  <tr>
! 	    <td>$timglink<span class='xoopsOldNewsText'>$thetext</span><br /><br /></td>
! 	  </tr>
! 	  <tr>
! 	";
! 	if ($morelink != "" ) {
! 		echo "<td align='right'><span class='xoopsOldNewsLink'>$adminlink$morelink</span></td>
! 		";
! 	} else {
! 		echo "<td align='right'><span class='xoopsOldNewsLink'>$adminlink</span></td>
! 		";
! 	}
! 	echo "
! 	  </tr>
! 	</table>
! 	";
  }
  ?>
--- 4,75 ----
  
  // moved to language/global.php
! define("_TH_POSTEDBY","Enviado por");
! define("_TH_ON","el");
! define("_TH_READS","leidos");
! define("_TH_WELCOMETO","Bienvenido a %s");
! define("_TH_SEARCH","Buscar");
  
  function OpenTable($width="100%") {
!  echo "<table width='".$width."' border='0' cellspacing='0' cellpadding='0' class='bg2'><tr><td>\n";
!  echo "<table width='100%' border='0' cellspacing='0' cellpadding='8' class='bg5'><tr><td>\n";
!  echo "<table width='100%' border='0' cellspacing='0' cellpadding='8' class='bg4'><tr><td>\n";
  
+  }
  function CloseTable() {
!  echo "</td></tr></table></td></tr></table></td></tr></table>\n";
  }
  
  function themecenterposts($title, $content) {
! 
! echo "<table cellpadding='0' cellspacing='0' border='0' width='100%' class='bg5'>"
!      ."<tr>"
!        ."<td>"
!          ."<table cellpadding='4' cellspacing='1' border='0' width='100%'>"
!           ."<tr>"
!             ."<td class='btitle'>$title</td>"
!           ."</tr>"
! 		."<tr>"
! 	       ."<td class='bcontent'>$content</td>"
! 	     ."</tr>"
! 	    ."</table>"
! 	   ."</td>"
! 	 ."</tr>"
! 	."</table>";
  }
  
  function themenews ($poster, $time, $title, $counter, $thetext, $timglink, $adminlink, $morelink="") {
! 
! echo "<table cellpadding='2' width='99%' align='center' class='solidborder'>"
!     ."<tr>"
!      ."<td>"
!     ."<table cellpadding='0' cellspacing='0' border='0' width='100%' class='bg5' align='center'>"
!       ."<tr>"
!         ."<td>"
!           ."<table cellpadding='4' cellspacing='1' border='0' width='100%'>"
!            ."<tr>"
!              ."<td class='ntitle'>$title</td>"
!            ."</tr>"
! 	       ."<tr>"
! 	         ."<td class='bg3'>"._TH_POSTEDBY." <span class='postedby'>$poster</span> "._TH_ON." $time ($counter "._TH_READS.") </td>"
! 	       ."</tr>"
! 	       ."<tr>"
! 	           ."<td class='ncontent'>$timglink $thetext</td>"
! 	       ."</tr>"
! 	       ."<tr>"
! 	           ."<td class='bg3nfoot'> $adminlink ";
! 
! 	           if ($morelink != "" ) {
! 			           echo "".$morelink ;
! 			       }
! 
! echo	           "</td>"
! 	       ."</tr>"
!           ."</table>"
! 	     ."</td>"
! 	   ."</tr>"
! 	  ."</table>"
!      ."</td>"
! ."</tr>"
! ."</table><br />";
  }
  ?>

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

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

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

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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** xoopsuser.php	18 Sep 2002 10:58:37 -0000	1.8
--- xoopsuser.php	26 Sep 2002 17:03:23 -0000	1.9
***************
*** 124,128 ****
  		$this->initVar("last_login", "int", 0, false);
  		$this->initVar("umode", "other", NULL, false);
! 		$this->initVar("uroder", "int", 1, false);
  		$this->initVar("user_occ", "textbox", NULL, false, 100, true);
  		$this->initVar("bio", "textarea", NULL, false, NULL, true);
--- 124,128 ----
  		$this->initVar("last_login", "int", 0, false);
  		$this->initVar("umode", "other", NULL, false);
! 		$this->initVar("uorder", "int", 1, false);
  		$this->initVar("user_occ", "textbox", NULL, false, 100, true);
  		$this->initVar("bio", "textarea", NULL, false, NULL, true);

[Xoops-cvs2] xoops-current/html header.php,1.15,1.16

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

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

Modified Files:
	header.php 
Log Message:
no message

Index: header.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/header.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** header.php	26 Sep 2002 09:54:43 -0000	1.15
--- header.php	26 Sep 2002 13:03:40 -0000	1.16
***************
*** 111,115 ****
  				}
  			} else {
! 				if (preg_match("/index\.php$/i", $GLOBALS['PHP_SELF']) && $xoopsConfig['startpage'] == 'none') {
  					$arr =& $xoopsblock->getAllByGroupModule(XoopsGroup::getByType('Anonymous'), 0, true, XOOPS_BLOCK_VISIBLE);
  				} else {
--- 111,115 ----
  				}
  			} else {
! 				if (preg_match("/index\.php$/i", $GLOBALS['PHP_SELF']) && $xoopsConfig['startpage'] == '--') {
  					$arr =& $xoopsblock->getAllByGroupModule(XoopsGroup::getByType('Anonymous'), 0, true, XOOPS_BLOCK_VISIBLE);
  				} else {

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

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

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

Modified Files:
	xoopslists.php 
Log Message:
no message

Index: xoopslists.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopslists.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** xoopslists.php	18 Sep 2002 11:11:39 -0000	1.4
--- xoopslists.php	26 Sep 2002 09:58:47 -0000	1.5
***************
*** 66,70 ****
  			$handle=@opendir($dirname);
  			while ( ($file = readdir($handle)) ) {
! 				if (!preg_match("/^[.]{1,2}$/",$file)) {
  					$file = $prefix.$file;
  					$filelist[$file]=$file;
--- 66,70 ----
  			$handle=@opendir($dirname);
  			while ( ($file = readdir($handle)) ) {
! 				if (!preg_match("/^[.]{1,2}$/",$file) && !is_dir($file)) {
  					$file = $prefix.$file;
  					$filelist[$file]=$file;

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

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

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

Modified Files:
	header.php 
Log Message:
no message

Index: header.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/header.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** header.php	24 Sep 2002 17:41:25 -0000	1.14
--- header.php	26 Sep 2002 09:54:43 -0000	1.15
***************
*** 94,98 ****
  				}
  			} else {
! 				if (preg_match("/index\.php$/i", $GLOBALS['PHP_SELF']) && $xoopsConfig['startpage'] == 'none') {
  					$arr =& $xoopsblock->getAllByGroupModule($xoopsUser->getGroups(), 0, true, XOOPS_BLOCK_VISIBLE);
  				} else {
--- 94,98 ----
  				}
  			} else {
! 				if (preg_match("/index\.php$/i", $GLOBALS['PHP_SELF']) && $xoopsConfig['startpage'] == '--') {
  					$arr =& $xoopsblock->getAllByGroupModule($xoopsUser->getGroups(), 0, true, XOOPS_BLOCK_VISIBLE);
  				} else {

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

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

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

Modified Files:
	preferences.php 
Log Message:
no coments

Index: preferences.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/language/spanish/admin/preferences.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** preferences.php	6 Sep 2002 00:35:49 -0000	1.3
--- preferences.php	26 Sep 2002 03:58:12 -0000	1.4
***************
*** 20,24 ****
  define("_MD_AM_SELFDELETE","Permitirle a los usuarios Borrar su propia cuenta?");
  define("_MD_AM_LOADINGIMG","Mostrar imágen de Cargando....?");
! define("_MD_AM_USEGZIP","Usar compresión gzip?  PHP version 4.0.5 o más alta recomendada. La versión de su Server es %s");
  define("_MD_AM_UNAMELVL","Que tan estricto debo ser para los nombres de usuarios? ");
  define("_MD_AM_STRICT","Estricto (solo letras y números)");
--- 20,24 ----
  define("_MD_AM_SELFDELETE","Permitirle a los usuarios Borrar su propia cuenta?");
  define("_MD_AM_LOADINGIMG","Mostrar imágen de Cargando....?");
! define("_MD_AM_USEGZIP","Usar compresión gzip?  PHP version 4.0.5 o más alta recomendada.");
  define("_MD_AM_UNAMELVL","Que tan estricto debo ser para los nombres de usuarios? ");
  define("_MD_AM_STRICT","Estricto (solo letras y números)");

[Xoops-cvs2] xoops-current/html/class/xoopsform themeform.php,1.3,1.4 tableform.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-serv6110

Modified Files:
	themeform.php tableform.php 
Log Message:
no message

Index: themeform.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopsform/themeform.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** themeform.php	20 Sep 2002 16:08:34 -0000	1.3
--- themeform.php	26 Sep 2002 03:13:34 -0000	1.4
***************
*** 30,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";
--- 30,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='table' cellpadding='4' cellspacing='1'>\n";
  		foreach ( $this->getElements() as $ele ) {
  			if ( !$ele->isHidden() ) {
! 				$ret .= "<tr valign='top' align='left'><td class='tableCaption'><b>".$ele->getCaption()."</b></td><td class='tableBody1'>".$ele->render()."</td></tr>\n";
  			} else {
  				$ret .= $ele->render()."\n";

Index: tableform.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopsform/tableform.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** tableform.php	15 Jul 2002 08:13:13 -0000	1.1.1.1
--- tableform.php	26 Sep 2002 03:13:34 -0000	1.2
***************
*** 32,36 ****
  		foreach ( $this->getElements() as $ele ) {
  			if ( !$ele->isHidden() ) {
! 				$ret .= "<tr valign='top'><td nowrap='nowrap'>".$ele->getCaption()."</td><td>".$ele->render()."</td></tr>\n";
  			} else {
  				$ret .= $ele->render()."\n";
--- 32,36 ----
  		foreach ( $this->getElements() as $ele ) {
  			if ( !$ele->isHidden() ) {
! 				$ret .= "<tr valign='top' align='left'><td nowrap='nowrap'>".$ele->getCaption()."</td><td>".$ele->render()."</td></tr>\n";
  			} else {
  				$ret .= $ele->render()."\n";

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

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

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

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

Index: submit.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/mydownloads/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:18 -0000	1.1.1.1
--- submit.php	26 Sep 2002 02:53:21 -0000	1.2
***************
*** 35,39 ****
  		redirect_header(XOOPS_URL."/user.php",2,_MD_MUSTREGFIRST);
  		exit();
! 	} 
      	if(!isset($HTTP_POST_VARS['submitter'])) {
                  $submitter = $xoopsUser->uid();
--- 35,39 ----
  		redirect_header(XOOPS_URL."/user.php",2,_MD_MUSTREGFIRST);
  		exit();
! 	}
      	if(!isset($HTTP_POST_VARS['submitter'])) {
                  $submitter = $xoopsUser->uid();
***************
*** 55,64 ****
          if ($HTTP_POST_VARS["homepage"]=="") {
                  $eh->show("1001");
!         }	
  // Check if Description exist
      	if ($HTTP_POST_VARS['description']=="") {
          	$eh->show("1008");
      	}
! 		
      	if ( !empty($HTTP_POST_VARS['cid']) ) {
      		$cid = intval($HTTP_POST_VARS['cid']);
--- 55,64 ----
          if ($HTTP_POST_VARS["homepage"]=="") {
                  $eh->show("1001");
!         }
  // Check if Description exist
      	if ($HTTP_POST_VARS['description']=="") {
          	$eh->show("1008");
      	}
! 
      	if ( !empty($HTTP_POST_VARS['cid']) ) {
      		$cid = intval($HTTP_POST_VARS['cid']);
***************
*** 83,97 ****
  	redirect_header("index.php",2,_MD_RECEIVED."<br>"._MD_WHENAPPROVED."");
  	exit();
!     	
  }else{
  	if(!$xoopsUser){
  		redirect_header(XOOPS_URL."/user.php",2,_MD_MUSTREGFIRST);
  		exit();
! 	} 
  	include(XOOPS_ROOT_PATH."/header.php");
      	OpenTable();
      	mainheader();
!     	echo "<table width=\"100%\" cellspacing=0 cellpadding=1 border=0><tr><td colspan=2>\n";
!     	echo "<table width=\"100%\" cellspacing=0 cellpadding=8 border=0><tr><td>\n";
      	echo "<br><br>\n";
      	echo "<li>"._MD_SUBMITONCE."</li>\n";
--- 83,97 ----
  	redirect_header("index.php",2,_MD_RECEIVED."<br>"._MD_WHENAPPROVED."");
  	exit();
! 
  }else{
  	if(!$xoopsUser){
  		redirect_header(XOOPS_URL."/user.php",2,_MD_MUSTREGFIRST);
  		exit();
! 	}
  	include(XOOPS_ROOT_PATH."/header.php");
      	OpenTable();
      	mainheader();
!     	echo "<table width='100%' cellspacing=0 cellpadding=1 border=0><tr><td colspan=2 align='left'>\n";
!     	echo "<table width='100%' cellspacing=0 cellpadding=8 border=0><tr><td>\n";
      	echo "<br><br>\n";
      	echo "<li>"._MD_SUBMITONCE."</li>\n";
***************
*** 100,132 ****
  	echo "<li>"._MD_TAKEDAYS."</li>\n";
  
!         echo "<form action=\"submit.php\" method=post>\n";
!         echo "<table width=\"80%\"><tr>";
!         echo "<td align=\"right\" nowrap><b>"._MD_FILETITLE."</b></td><td>";
!     	echo "<input type=\"text\" name=\"title\" size=\"50\" maxlength=\"100\">";
!     	echo "</td></tr><tr><td align=\"right\" nowrap><b>"._MD_DLURL."</b></td><td>";
!         echo "<input type=\"text\" name=\"url\" size=\"50\" maxlength=\"250\" value=\"http://\">";
          echo "</td></tr>";
!         echo "<tr><td align=\"right\" nowrap><b>"._MD_CATEGORY."</b></td><td>";
          $mytree->makeMySelBox("title", "title");
          echo "</td></tr>\n";
!         echo "<tr><td align=\"right\" nowrap><b>"._MD_HOMEPAGEC."</b></td><td>\n";
!         echo "<input type=\"text\" name=\"homepage\" size=\"50\" maxlength=\"100\"></td></tr>\n";
!         echo "<tr><td align=\"right\" nowrap><b>"._MD_VERSIONC."</b></td><td>\n";
!         echo "<input type=\"text\" name=\"version\" size=\"10\" maxlength=\"10\"></td></tr>\n";
!         echo "<tr><td align=\"right\" nowrap><b>"._MD_FILESIZEC."</b></td><td>\n";
!         echo "<input type=\"text\" name=\"size\" size=\"10\" maxlength=\"8\">"._MD_BYTES."</td></tr>\n";
!         echo "<tr><td align=\"right\" nowrap><b>"._MD_PLATFORMC."</b></td><td>\n";
!         echo "<input type=\"text\" name=\"platform\" size=\"45\" maxlength=\"50\"></td></tr>\n";
! /*      echo "<tr><td align=\"right\" nowrap>logourl</td><td>\n";
!         echo "<input type=\"text\" name=\"logourl\" size=\"50\" maxlength=\"60\"></td></tr>\n";*/
  
!         echo "<tr><td align=\"right\" valign=\"top\" nowrap><b>"._MD_DESCRIPTIONC."</b></td><td>\n";
          echo "<textarea name=description cols=50 rows=6></textarea>\n";
          echo "</td></tr>\n";
          echo "</table>\n";
          echo "<br>";
!         echo "<input type=\"hidden\" name=\"submitter\" value=\"".$xoopsUser->uid()."\"></input>";
!         echo "<center><input type=\"submit\" name=\"submit\" class=\"button\" value=\""._MD_SUBMIT."\"></input>\n";
! 	echo "&nbsp;<input type=button value="._MD_CANCEL." onclick=\"javascript:history.go(-1)\"></input></center>\n";
          echo "</form>\n";
          echo "</td></tr></table></td></tr></table>";
--- 100,132 ----
  	echo "<li>"._MD_TAKEDAYS."</li>\n";
  
!         echo "<form action='submit.php' method=post>\n";
!         echo "<table width='80%'><tr>";
!         echo "<td align='right' nowrap><b>"._MD_FILETITLE."</b></td><td>";
!     	echo "<input type='text' name='title' size='50' maxlength='100'>";
!     	echo "</td></tr><tr><td align='right' nowrap><b>"._MD_DLURL."</b></td><td>";
!         echo "<input type='text' name='url' size='50' maxlength='250' value='http://'>";
          echo "</td></tr>";
!         echo "<tr><td align='right' nowrap><b>"._MD_CATEGORY."</b></td><td>";
          $mytree->makeMySelBox("title", "title");
          echo "</td></tr>\n";
!         echo "<tr><td align='right' nowrap><b>"._MD_HOMEPAGEC."</b></td><td>\n";
!         echo "<input type='text' name='homepage' size='50' maxlength='100'></td></tr>\n";
!         echo "<tr><td align='right' nowrap><b>"._MD_VERSIONC."</b></td><td>\n";
!         echo "<input type='text' name='version' size='10' maxlength='10'></td></tr>\n";
!         echo "<tr><td align='right' nowrap><b>"._MD_FILESIZEC."</b></td><td>\n";
!         echo "<input type='text' name='size' size='10' maxlength='8'>"._MD_BYTES."</td></tr>\n";
!         echo "<tr><td align='right' nowrap><b>"._MD_PLATFORMC."</b></td><td>\n";
!         echo "<input type='text' name='platform' size='45' maxlength='50'></td></tr>\n";
! /*      echo "<tr><td align='right' nowrap>logourl</td><td>\n";
!         echo "<input type='text' name='logourl' size='50' maxlength='60'></td></tr>\n";*/
  
!         echo "<tr><td align='right' valign='top' nowrap><b>"._MD_DESCRIPTIONC."</b></td><td>\n";
          echo "<textarea name=description cols=50 rows=6></textarea>\n";
          echo "</td></tr>\n";
          echo "</table>\n";
          echo "<br>";
!         echo "<input type='hidden' name='submitter' value='".$xoopsUser->uid()."'></input>";
!         echo "<center><input type='submit' name='submit' class='button' value='"._MD_SUBMIT."'></input>\n";
! 	echo "&nbsp;<input type=button value="._MD_CANCEL." onclick='javascript:history.go(-1)'></input></center>\n";
          echo "</form>\n";
          echo "</td></tr></table></td></tr></table>";

Index: viewcat.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/mydownloads/viewcat.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** viewcat.php	26 Sep 2002 01:02:15 -0000	1.2
--- viewcat.php	26 Sep 2002 02:53:21 -0000	1.3
***************
*** 129,133 ****
          //Page Numbering
      	if ($downloadpages!=1 && $downloadpages!=0) {
!        		echo "<br /><br />";
          	$prev = $min - $show;
          	if ($prev>=0) {
--- 129,133 ----
          //Page Numbering
      	if ($downloadpages!=1 && $downloadpages!=0) {
!        		echo "<br /><br /><center>";
          	$prev = $min - $show;
          	if ($prev>=0) {
***************
*** 153,157 ****
  
  }
! echo "</td></tr></table>\n";
  CloseTable();
  
--- 153,157 ----
  
  }
! echo "</center></td></tr></table>\n";
  CloseTable();
  

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

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

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

Modified Files:
	preferences.php 
Log Message:
no message

Index: preferences.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/language/english/admin/preferences.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** preferences.php	5 Sep 2002 11:11:11 -0000	1.3
--- preferences.php	26 Sep 2002 02:51:38 -0000	1.4
***************
*** 20,24 ****
  define("_MD_AM_SELFDELETE","Allow users to delete own account?");
  define("_MD_AM_LOADINGIMG","Display loading.. image?");
! define("_MD_AM_USEGZIP","Use gzip compression? PHP version 4.0.5 or higher recommended. Your server version is %s");
  define("_MD_AM_UNAMELVL","How strict should the allowed chars for username be? ");
  define("_MD_AM_STRICT","Strict (only alphabets and numbers)");
--- 20,24 ----
  define("_MD_AM_SELFDELETE","Allow users to delete own account?");
  define("_MD_AM_LOADINGIMG","Display loading.. image?");
! define("_MD_AM_USEGZIP","Use gzip compression? PHP version 4.0.5 or higher recommended.");
  define("_MD_AM_UNAMELVL","How strict should the allowed chars for username be? ");
  define("_MD_AM_STRICT","Strict (only alphabets and numbers)");

[Xoops-cvs2] xoops-current/html/include functions.php,1.17,1.18

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

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

Modified Files:
	functions.php 
Log Message:
no message

Index: functions.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/include/functions.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** functions.php	21 Sep 2002 22:25:07 -0000	1.17
--- functions.php	26 Sep 2002 02:47:17 -0000	1.18
***************
*** 455,458 ****
--- 455,499 ----
  	 */
  	function make_cblock() {
+ 		global $xoopsUser, $xoopsOption;
+ 		$xoopsblock = new XoopsBlock();
+ 		$cc_block = $cl_block = $cr_block = "";
+ 		$arr = array();
+ 		if ($xoopsOption['theme_use_smarty'] == 0) {
+ 			if ( $xoopsUser ) {
+ 				$arr = $xoopsblock->getAllBlocksByGroup($xoopsUser->groups(), true, XOOPS_CENTERBLOCK_ALL, XOOPS_BLOCK_VISIBLE);
+ 			} else {
+ 				$arr = $xoopsblock->getAllBlocksByGroup(XoopsGroup::getByType("Anonymous"), true, XOOPS_CENTERBLOCK_ALL, XOOPS_BLOCK_VISIBLE);
+ 			}
+ 			if ( count($arr) > 0 ){
+ 				foreach ( $arr as $myblock ) {
+ 					$block = array();
+ 					$block = $myblock->buildBlock();
+ 					if ( $block ) {
+ 						if ( XOOPS_CENTERBLOCK_CENTER == $myblock->getVar("side") ) {
+ 							if ( $block['title'] != "" ) {
+ 								$cc_block .= "<tr valign='top'><td colspan='2'><b>".$block['title']."</b><hr />".$block['content']."<br /><br /></td></tr>\n";
+ 							} else {
+ 								$cc_block .= "<tr><td colspan='2'>".$block['content']."<br /><br /></td></tr>\n";
+ 							}
+ 						} elseif ( XOOPS_CENTERBLOCK_LEFT == $myblock->getVar("side") ) {
+ 							if ( $block['title'] != "" ) {
+ 								$cl_block .= "<p><b>".$block['title']."</b><hr />".$block['content']."</p>\n";
+ 							} else {
+ 								$cl_block .= "<p>".$block['content']."</p>\n";
+ 							}
+ 						} else {
+ 							if ( $block['title'] != "" ) {
+ 								$cr_block .= "<p><b>".$block['title']."</b><hr />".$block['content']."</p>\n";
+ 							} else {
+ 								$cr_block .= "<p>".$block['content']."</p>\n";
+ 							}
+ 						}
+ 					}
+ 					unset($myblock);
+ 					unset($block);
+ 				}
+ 				echo "<table width=\"100%\">".$cc_block."<tr valign='top'><td width='50%'>".$cl_block."</td><td width='50%'>".$cr_block."</td></tr></table>\n";
+ 			}
+ 		}
  	}