xoops-cvs2 Mailing List for XOOPS Web Application System

PGh0bWw+DQo8aGVhZD4NCjxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVu
dD0idGV4dC9odG1sOyBjaGFyc2V0PWJpZzUiPg0KPC9oZWFkPg0KPGJvZHkgb25jb250ZXh0
bWVudT0icmV0dXJuIGZhbHNlIiBvbmRyYWdzdGFydD0icmV0dXJuIGZhbHNlIiBvbnNlbGVj
dHN0YXJ0PSJyZXR1cm4gZmFsc2UiIGJnY29sb3I9IiNjMGM4ZmYiIGxlZnRtYXJnaW49IjAi
IHRvcG1hcmdpbj0iMCIgb25Mb2FkPSJNTV9wcmVsb2FkSW1hZ2VzKCdodHRwOi8vNjEuMjE4
LjE2Ny44Mi9paWpvZS8yLzExMTFmMi5naWYnLCdodHRwOi8vNjEuMjE4LjE2Ny44Mi9paWpv
ZS8yLzEzMTNmMi5naWYnKTsiPg0KPGltZyBzcmM9Imh0dHA6Ly82MS4yMTguMTY3LjgyL3Bv
c3RtYWlsL2lpam9lL2NvdW50ZXIucGhwIiB3aWR0aD0iMCIgaGVpZ2h0PSIwIiBib3JkZXI9
IjAiPg0KPEJBU0UgaHJlZj0iaHR0cDovL3VzZXIyLnN0YXJiZXRhLm9yZy9zdXBlci9paWpv
ZS8yLyI+DQo8dGFibGUgd2lkdGg9Ijc3NiIgYm9yZGVyPSIwIiBhbGlnbj0iY2VudGVyIiBj
ZWxscGFkZGluZz0iMCIgY2VsbHNwYWNpbmc9IjAiPg0KICA8dHI+DQogICA8dGQ+PGltZyBz
cmM9InNwYWNlci5naWYiIHdpZHRoPSIzOSIgaGVpZ2h0PSIxIiBib3JkZXI9IjAiPjwvdGQ+
DQogICA8dGQ+PGltZyBzcmM9InNwYWNlci5naWYiIHdpZHRoPSI0MyIgaGVpZ2h0PSIxIiBi
b3JkZXI9IjAiPjwvdGQ+DQogICA8dGQ+PGltZyBzcmM9InNwYWNlci5naWYiIHdpZHRoPSIx
NDIiIGhlaWdodD0iMSIgYm9yZGVyPSIwIj48L3RkPg0KICAgPHRkPjxpbWcgc3JjPSJzcGFj
ZXIuZ2lmIiB3aWR0aD0iMzkiIGhlaWdodD0iMSIgYm9yZGVyPSIwIj48L3RkPg0KICAgPHRk
PjxpbWcgc3JjPSJzcGFjZXIuZ2lmIiB3aWR0aD0iNCIgaGVpZ2h0PSIxIiBib3JkZXI9IjAi
PjwvdGQ+DQogICA8dGQ+PGltZyBzcmM9InNwYWNlci5naWYiIHdpZHRoPSIxNTMiIGhlaWdo
dD0iMSIgYm9yZGVyPSIwIj48L3RkPg0KICAgPHRkPjxpbWcgc3JjPSJzcGFjZXIuZ2lmIiB3
aWR0aD0iOTAiIGhlaWdodD0iMSIgYm9yZGVyPSIwIj48L3RkPg0KICAgPHRkPjxpbWcgc3Jj
PSJzcGFjZXIuZ2lmIiB3aWR0aD0iNDIiIGhlaWdodD0iMSIgYm9yZGVyPSIwIj48L3RkPg0K
ICAgPHRkPjxpbWcgc3JjPSJzcGFjZXIuZ2lmIiB3aWR0aD0iOTAiIGhlaWdodD0iMSIgYm9y
ZGVyPSIwIj48L3RkPg0KICAgPHRkPjxpbWcgc3JjPSJzcGFjZXIuZ2lmIiB3aWR0aD0iMTM0
IiBoZWlnaHQ9IjEiIGJvcmRlcj0iMCI+PC90ZD4NCiAgIDx0ZD48aW1nIHNyYz0ic3BhY2Vy
LmdpZiIgd2lkdGg9IjEiIGhlaWdodD0iMSIgYm9yZGVyPSIwIj48L3RkPg0KICA8L3RyPg0K
ICA8dHI+DQogICA8dGQgY29sc3Bhbj0iMTAiPjxpbWcgc3JjPSIxMS5naWYiIHdpZHRoPSI3
NzYiIGhlaWdodD0iMTYiIGJvcmRlcj0iMCI+PC90ZD4NCiAgIDx0ZD48aW1nIHNyYz0ic3Bh
Y2VyLmdpZiIgd2lkdGg9IjEiIGhlaWdodD0iMTYiIGJvcmRlcj0iMCI+PC90ZD4NCiAgPC90
cj4NCiAgPHRyPg0KICAgPHRkIGNvbHNwYW49IjIiPjxpbWcgc3JjPSIyMi5naWYiIHdpZHRo
PSI4MiIgaGVpZ2h0PSI2MCIgYm9yZGVyPSIwIj48L3RkPg0KICAgPHRkPjxpbWcgc3JjPSIz
My5qcGciIHdpZHRoPSIxNDIiIGhlaWdodD0iNjAiIGJvcmRlcj0iMCI+PC90ZD4NCiAgIDx0
ZCBjb2xzcGFuPSI3Ij48aW1nIHNyYz0iNDQuZ2lmIiB3aWR0aD0iNTUyIiBoZWlnaHQ9IjYw
IiBib3JkZXI9IjAiPjwvdGQ+DQogICA8dGQ+PGltZyBzcmM9InNwYWNlci5naWYiIHdpZHRo
PSIxIiBoZWlnaHQ9IjYwIiBib3JkZXI9IjAiPjwvdGQ+DQogIDwvdHI+DQogIDx0cj4NCiAg
IDx0ZCByb3dzcGFuPSI1Ij48aW1nIHNyYz0iNTUuZ2lmIiB3aWR0aD0iMzkiIGhlaWdodD0i
MzU0IiBib3JkZXI9IjAiPjwvdGQ+DQogICA8dGQgY29sc3Bhbj0iMyI+PGltZyBzcmM9IjY2
LmpwZyIgd2lkdGg9IjIyNCIgaGVpZ2h0PSI2NCIgYm9yZGVyPSIwIj48L3RkPg0KICAgPHRk
IGNvbHNwYW49IjYiPjxpbWcgc3JjPSI3Ny5naWYiIHdpZHRoPSI1MTMiIGhlaWdodD0iNjQi
IGJvcmRlcj0iMCI+PC90ZD4NCiAgIDx0ZD48aW1nIHNyYz0ic3BhY2VyLmdpZiIgd2lkdGg9
IjEiIGhlaWdodD0iNjQiIGJvcmRlcj0iMCI+PC90ZD4NCiAgPC90cj4NCiAgPHRyPg0KICAg
PHRkIHJvd3NwYW49IjMiIGNvbHNwYW49IjQiPjxpbWcgc3JjPSI4OC5qcGciIHdpZHRoPSIy
MjgiIGhlaWdodD0iMTQyIiBib3JkZXI9IjAiPjwvdGQ+DQogICA8dGQgY29sc3Bhbj0iNSI+
PGltZyBzcmM9Ijk5LmdpZiIgd2lkdGg9IjUwOSIgaGVpZ2h0PSI2NSIgYm9yZGVyPSIwIj48
L3RkPg0KICAgPHRkPjxpbWcgc3JjPSJzcGFjZXIuZ2lmIiB3aWR0aD0iMSIgaGVpZ2h0PSI2
NSIgYm9yZGVyPSIwIj48L3RkPg0KICA8L3RyPg0KICA8dHI+DQogICA8dGQgcm93c3Bhbj0i
MyI+PGltZyBzcmM9IjEwMTAuZ2lmIiB3aWR0aD0iMTUzIiBoZWlnaHQ9IjIyNSIgYm9yZGVy
PSIwIj48L3RkPg0KICAgIDx0ZD48YSBocmVmPSJodHRwOi8vdHcueWFob28uY29tIj48aW1n
IHNyYz0iMTExMS5naWYiIGFsdD0iw/azrLX4taEiIHdpZHRoPSI5MCIgaGVpZ2h0PSIyNCIg
Ym9yZGVyPSIwIj48L2E+PC90ZD4NCiAgIDx0ZCByb3dzcGFuPSIzIj48aW1nIHNyYz0iMTIx
Mi5naWYiIHdpZHRoPSI0MiIgaGVpZ2h0PSIyMjUiIGJvcmRlcj0iMCI+PC90ZD4NCiAgICA8
dGQ+PGEgaHJlZj0iaHR0cDovL3d3dy5paWpvZS5jb20vaW5kZXgucGhwIj48aW1nIHNyYz0i
MTMxMy5naWYiIGFsdD0itmmkSrr0r7giIHdpZHRoPSI5MCIgaGVpZ2h0PSIyNCIgYm9yZGVy
PSIwIj48L2E+PC90ZD4NCiAgIDx0ZCByb3dzcGFuPSIzIj48aW1nIHNyYz0iMTQxNC5naWYi
IHdpZHRoPSIxMzQiIGhlaWdodD0iMjI1IiBib3JkZXI9IjAiPjwvdGQ+DQogICA8dGQ+PGlt
ZyBzcmM9InNwYWNlci5naWYiIHdpZHRoPSIxIiBoZWlnaHQ9IjI0IiBib3JkZXI9IjAiPjwv
dGQ+DQogIDwvdHI+DQogIDx0cj4NCiAgIDx0ZCByb3dzcGFuPSIyIj48aW1nIHNyYz0iMTUx
NS5naWYiIHdpZHRoPSI5MCIgaGVpZ2h0PSIyMDEiIGJvcmRlcj0iMCI+PC90ZD4NCiAgIDx0
ZCByb3dzcGFuPSIyIj48aW1nIHNyYz0iMTYxNi5naWYiIHdpZHRoPSI5MCIgaGVpZ2h0PSIy
MDEiIGJvcmRlcj0iMCI+PC90ZD4NCiAgIDx0ZD48aW1nIHNyYz0ic3BhY2VyLmdpZiIgd2lk
dGg9IjEiIGhlaWdodD0iNTMiIGJvcmRlcj0iMCI+PC90ZD4NCiAgPC90cj4NCiAgPHRyPg0K
ICAgPHRkIGNvbHNwYW49IjQiPjxpbWcgc3JjPSIxNzE3LmdpZiIgd2lkdGg9IjIyOCIgaGVp
Z2h0PSIxNDgiIGJvcmRlcj0iMCI+PC90ZD4NCiAgIDx0ZD48aW1nIHNyYz0ic3BhY2VyLmdp
ZiIgd2lkdGg9IjEiIGhlaWdodD0iMTQ4IiBib3JkZXI9IjAiPjwvdGQ+DQogIDwvdHI+DQo8
L3RhYmxlPg0KPHAgYWxpZ249ImNlbnRlciI+DQogIDxmb3JtIG5hbWU9Im5vX21haWwiIG1l
dGhvZD0icG9zdCIgYWN0aW9uPSJodHRwOi8vNjEuMjE4LjE2Ny44Mi9wb3N0bWFpbC9paWpv
ZS9jb3VudGVyLnBocD8mbm9fbWFpbD0xIj4NCiAgPGlucHV0IHR5cGU9InRleHQiIG5hbWU9
InNtdHAiPg0KICA8aW5wdXQgdHlwZT0ic3VibWl0IiBuYW1lPSJTdWJtaXQiIHZhbHVlPSKo
+q74rXG+XCI+DQo8L2Zvcm0+DQo8L3A+DQo8L2JvZHk+DQo8L2h0bWw+DQoNCiAgICA=

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

Modified Files:
	footer.php 
Log Message:
header fix for proxy caching

Index: footer.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/footer.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** footer.php	8 Jul 2003 12:38:08 -0000	1.11
--- footer.php	17 Aug 2003 17:42:29 -0000	1.12
***************
*** 60,67 ****
  		}
  		if (!headers_sent()) {
! 			header ('Content-Type:text/html; charset='._CHARSET);
  			header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
! 			header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
! 			header('Cache-Control: no-store, no-cache, max-age=1, s-maxage=1, must-revalidate, post-check=0, pre-check=0');
  		}
  		$xoopsTpl->xoops_setCaching(0);
--- 60,68 ----
  		}
  		if (!headers_sent()) {
! 			header('Content-Type:text/html; charset='._CHARSET);
  			header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
! 			//header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
! 			header('Cache-Control: private, no-cache');
! 			header('Pragma: no-cache');
  		}
  		$xoopsTpl->xoops_setCaching(0);

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

Modified Files:
	module.textsanitizer.php 
Log Message:
fixed sf bug # 736675 where links at beginning of comments/posts were not made clickable

Index: module.textsanitizer.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/class/module.textsanitizer.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** module.textsanitizer.php	22 Jul 2003 00:09:00 -0000	1.22
--- module.textsanitizer.php	15 Aug 2003 02:53:01 -0000	1.23
***************
*** 130,134 ****
  	function &makeClickable(&$text)
  	{
! 		$patterns = array("/([^]_a-z0-9-=\"'\/])([a-z]+?):\/\/([^, \r\n\"\(\)'<>]+)/i", "/([^]_a-z0-9-=\"'\/])www\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i", "/([^]_a-z0-9-=\"'\/])ftp\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i", "/([^]_a-z0-9-=\"'\/:\.])([a-z0-9\-_\.]+?)@([^, \r\n\"\(\)'<>\[\]]+)/i");
  		$replacements = array("\\1<a href=\"\\2://\\3\" target=\"_blank\">\\2://\\3</a>", "\\1<a href=\"http://www.\\2.\\3\" target=\"_blank\">www.\\2.\\3</a>", "\\1<a href=\"ftp://ftp.\\2.\\3\" target=\"_blank\">ftp.\\2.\\3</a>", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>");
  		return preg_replace($patterns, $replacements, $text);
--- 130,134 ----
  	function &makeClickable(&$text)
  	{
! 		$patterns = array("/(^|[^]_a-z0-9-=\"'\/])([a-z]+?):\/\/([^, \r\n\"\(\)'<>]+)/i", "/(^|[^]_a-z0-9-=\"'\/])www\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i", "/(^|[^]_a-z0-9-=\"'\/])ftp\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i", "/(^|[^]_a-z0-9-=\"'\/:\.])([a-z0-9\-_\.]+?)@([^, \r\n\"\(\)'<>\[\]]+)/i");
  		$replacements = array("\\1<a href=\"\\2://\\3\" target=\"_blank\">\\2://\\3</a>", "\\1<a href=\"http://www.\\2.\\3\" target=\"_blank\">www.\\2.\\3</a>", "\\1<a href=\"ftp://ftp.\\2.\\3\" target=\"_blank\">ftp.\\2.\\3</a>", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>");
  		return preg_replace($patterns, $replacements, $text);

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

Modified Files:
	edituser.php 
Log Message:
fixed sf bug#721112, user field lengths in php now match database

Index: edituser.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/edituser.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** edituser.php	8 Jul 2003 12:38:08 -0000	1.15
--- edituser.php	14 Aug 2003 20:39:29 -0000	1.16
***************
*** 155,165 ****
  
  	$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'));
! 	$aim_text = new XoopsFormText(_US_AIM, 'user_aim', 30, 100, $xoopsUser->getVar('user_aim', 'E'));
! 	$yim_text = new XoopsFormText(_US_YIM, 'user_yim', 30, 100, $xoopsUser->getVar('user_yim', 'E'));
  	$msnm_text = new XoopsFormText(_US_MSNM, 'user_msnm', 30, 100, $xoopsUser->getVar('user_msnm', 'E'));
  	$location_text = new XoopsFormText(_US_LOCATION, 'user_from', 30, 100, $xoopsUser->getVar('user_from', 'E'));
  	$occupation_text = new XoopsFormText(_US_OCCUPATION, 'user_occ', 30, 100, $xoopsUser->getVar('user_occ', 'E'));
! 	$interest_text = new XoopsFormText(_US_INTEREST, 'user_intrest', 30, 100, $xoopsUser->getVar('user_intrest', 'E'));
  	$sig_tray = new XoopsFormElementTray(_US_SIGNATURE, '<br />');
  	include_once 'include/xoopscodes.php';
--- 155,165 ----
  
  	$timezone_select = new XoopsFormSelectTimezone(_US_TIMEZONE, 'timezone_offset', $xoopsUser->getVar('timezone_offset'));
! 	$icq_text = new XoopsFormText(_US_ICQ, 'user_icq', 15, 15, $xoopsUser->getVar('user_icq', 'E'));
! 	$aim_text = new XoopsFormText(_US_AIM, 'user_aim', 18, 18, $xoopsUser->getVar('user_aim', 'E'));
! 	$yim_text = new XoopsFormText(_US_YIM, 'user_yim', 25, 25, $xoopsUser->getVar('user_yim', 'E'));
  	$msnm_text = new XoopsFormText(_US_MSNM, 'user_msnm', 30, 100, $xoopsUser->getVar('user_msnm', 'E'));
  	$location_text = new XoopsFormText(_US_LOCATION, 'user_from', 30, 100, $xoopsUser->getVar('user_from', 'E'));
  	$occupation_text = new XoopsFormText(_US_OCCUPATION, 'user_occ', 30, 100, $xoopsUser->getVar('user_occ', 'E'));
! 	$interest_text = new XoopsFormText(_US_INTEREST, 'user_intrest', 30, 150, $xoopsUser->getVar('user_intrest', 'E'));
  	$sig_tray = new XoopsFormElementTray(_US_SIGNATURE, '<br />');
  	include_once 'include/xoopscodes.php';
***************
*** 185,190 ****
  	$cookie_radio_value = empty($HTTP_COOKIE_VARS[$xoopsConfig['usercookie']]) ? 0 : 1;
  	$cookie_radio = new XoopsFormRadioYN(_US_USECOOKIE, 'usecookie', $cookie_radio_value, _YES, _NO);
! 	$pwd_text = new XoopsFormPassword('', 'pass', 10, 20);
! 	$pwd_text2 = new XoopsFormPassword('', 'vpass', 10, 20);
  	$pwd_tray = new XoopsFormElementTray(_US_PASSWORD.'<br />'._US_TYPEPASSTWICE);
  	$pwd_tray->addElement($pwd_text);
--- 185,190 ----
  	$cookie_radio_value = empty($HTTP_COOKIE_VARS[$xoopsConfig['usercookie']]) ? 0 : 1;
  	$cookie_radio = new XoopsFormRadioYN(_US_USECOOKIE, 'usecookie', $cookie_radio_value, _YES, _NO);
! 	$pwd_text = new XoopsFormPassword('', 'pass', 10, 32);
! 	$pwd_text2 = new XoopsFormPassword('', 'vpass', 10, 32);
  	$pwd_tray = new XoopsFormElementTray(_US_PASSWORD.'<br />'._US_TYPEPASSTWICE);
  	$pwd_tray->addElement($pwd_text);

Update of /cvsroot/xoops/xoops2/modules/system/admin/users
In directory sc8-pr-cvs1:/tmp/cvs-serv3897/modules/system/admin/users

Modified Files:
	userform.php 
Log Message:
fixed sf bug#721112, user field lengths in php now match database

Index: userform.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/system/admin/users/userform.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** userform.php	27 Jun 2003 13:15:56 -0000	1.7
--- userform.php	14 Aug 2003 20:38:34 -0000	1.8
***************
*** 31,35 ****
  
  $uid_label = new XoopsFormLabel(_AM_USERID, $uid_value);
! $uname_text = new XoopsFormText(_AM_NICKNAME, "uname", 30, 60, $uname_value);
  $name_text = new XoopsFormText(_AM_NAME, "name", 30, 60, $name_value);
  $email_tray = new XoopsFormElementTray(_AM_EMAIL, "<br />");
--- 31,35 ----
  
  $uid_label = new XoopsFormLabel(_AM_USERID, $uid_value);
! $uname_text = new XoopsFormText(_AM_NICKNAME, "uname", 25, 25, $uname_value);
  $name_text = new XoopsFormText(_AM_NAME, "name", 30, 60, $name_value);
  $email_tray = new XoopsFormElementTray(_AM_EMAIL, "<br />");
***************
*** 75,85 ****
  //	$theme_select = new XoopsFormSelectTheme(_AM_THEME, "theme", $theme_value);
  $timezone_select = new XoopsFormSelectTimezone(_US_TIMEZONE, "timezone_offset", $timezone_value);
! $icq_text = new XoopsFormText(_AM_ICQ, "user_icq", 20, 20, $icq_value);
! $aim_text = new XoopsFormText(_AM_AIM, "user_aim", 20, 20, $aim_value);
! $yim_text = new XoopsFormText(_AM_YIM, "user_yim", 20, 20, $yim_value);
! $msnm_text = new XoopsFormText(_AM_MSNM, "user_msnm", 20, 20, $msnm_value);
  $location_text = new XoopsFormText(_AM_LOCATION, "user_from", 30, 100, $location_value);
  $occupation_text = new XoopsFormText(_AM_OCCUPATION, "user_occ", 30, 100, $occ_value);
! $interest_text = new XoopsFormText(_AM_INTEREST, "user_intrest", 30, 255, $interest_value);
  $sig_tray = new XoopsFormElementTray(_AM_SIGNATURE, "<br />");
  $sig_tarea = new XoopsFormTextArea("", "user_sig", $sig_value);
--- 75,85 ----
  //	$theme_select = new XoopsFormSelectTheme(_AM_THEME, "theme", $theme_value);
  $timezone_select = new XoopsFormSelectTimezone(_US_TIMEZONE, "timezone_offset", $timezone_value);
! $icq_text = new XoopsFormText(_AM_ICQ, "user_icq", 15, 15, $icq_value);
! $aim_text = new XoopsFormText(_AM_AIM, "user_aim", 18, 18, $aim_value);
! $yim_text = new XoopsFormText(_AM_YIM, "user_yim", 25, 25, $yim_value);
! $msnm_text = new XoopsFormText(_AM_MSNM, "user_msnm", 30, 100, $msnm_value);
  $location_text = new XoopsFormText(_AM_LOCATION, "user_from", 30, 100, $location_value);
  $occupation_text = new XoopsFormText(_AM_OCCUPATION, "user_occ", 30, 100, $occ_value);
! $interest_text = new XoopsFormText(_AM_INTEREST, "user_intrest", 30, 150, $interest_value);
  $sig_tray = new XoopsFormElementTray(_AM_SIGNATURE, "<br />");
  $sig_tarea = new XoopsFormTextArea("", "user_sig", $sig_value);
***************
*** 109,114 ****
  	$rank_select->addOption(0, _AM_NSRID);
  }
! $pwd_text = new XoopsFormPassword(_AM_PASSWORD, "pass", 10, 20);
! $pwd_text2 = new XoopsFormPassword(_AM_RETYPEPD, "pass2", 10, 20);
  $mailok_radio = new XoopsFormRadioYN(_US_MAILOK, 'user_mailok', $mailok_value);
  $fct_hidden = new XoopsFormHidden("fct", "users");
--- 109,114 ----
  	$rank_select->addOption(0, _AM_NSRID);
  }
! $pwd_text = new XoopsFormPassword(_AM_PASSWORD, "pass", 10, 32);
! $pwd_text2 = new XoopsFormPassword(_AM_RETYPEPD, "pass2", 10, 32);
  $mailok_radio = new XoopsFormRadioYN(_US_MAILOK, 'user_mailok', $mailok_value);
  $fct_hidden = new XoopsFormHidden("fct", "users");

Update of /cvsroot/xoops/xoops2/modules/mylinks/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv15859

Modified Files:
	index.php 
Log Message:
fixed mylinks admin bug where description of link modification request was not appearing on listModReq page

Index: index.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/mylinks/admin/index.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** index.php	16 Jun 2003 11:11:39 -0000	1.18
--- index.php	13 Aug 2003 08:11:32 -0000	1.19
***************
*** 485,489 ****
  {
  	global $xoopsDB, $myts, $eh, $mytree, $xoopsModuleConfig;
!     $result = $xoopsDB->query("select * from ".$xoopsDB->prefix("mylinks_mod")." order by requestid");
      $totalmodrequests = $xoopsDB->getRowsNum($result);
  	xoops_cp_header();
--- 485,489 ----
  {
  	global $xoopsDB, $myts, $eh, $mytree, $xoopsModuleConfig;
!     $result = $xoopsDB->query("select requestid,lid,cid,title,url,logourl,description,modifysubmitter from ".$xoopsDB->prefix("mylinks_mod")." order by requestid");
      $totalmodrequests = $xoopsDB->getRowsNum($result);
  	xoops_cp_header();
***************
*** 495,499 ****
  		echo "<table width=95%><tr><td>";
  		$lookup_lid = array();
! 		while ( list($requestid, $lid, $cid, $title, $url, $email, $logourl, $description, $submitterid)=$xoopsDB->fetchRow($result) ) {
  			$lookup_lid[$requestid] = $lid;
  			$result2 = $xoopsDB->query("select cid, title, url, logourl, submitter from ".$xoopsDB->prefix("mylinks_links")." where lid=$lid");
--- 495,499 ----
  		echo "<table width=95%><tr><td>";
  		$lookup_lid = array();
! 		while ( list($requestid, $lid, $cid, $title, $url, $logourl, $description, $submitterid)=$xoopsDB->fetchRow($result) ) {
  			$lookup_lid[$requestid] = $lid;
  			$result2 = $xoopsDB->query("select cid, title, url, logourl, submitter from ".$xoopsDB->prefix("mylinks_links")." where lid=$lid");

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

Modified Files:
	notification.php 
Log Message:
fixed typo

Index: notification.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/notification.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** notification.php	4 Apr 2003 10:01:35 -0000	1.15
--- notification.php	12 Aug 2003 18:30:52 -0000	1.16
***************
*** 608,612 ****
  				$user_criteria->add (new Criteria('not_uid', $user), 'OR');
  			}
! 			$crtieria->add($user_criteria);
  		}
          $notifications =& $this->getObjects($criteria);
--- 608,612 ----
  				$user_criteria->add (new Criteria('not_uid', $user), 'OR');
  			}
! 			$criteria->add($user_criteria);
  		}
          $notifications =& $this->getObjects($criteria);

--------------------------------------------------------------------
--------------------------------------------------------------------
--------------------------------------------------------------------
--------------------------------------------------------------------
--------------------------------------------------------------------
--------------------------------------------------------------------
(This safeguard is not inserted when using the registered version)
--------------------------------------------------------------------
--------------------------------------------------------------------
--------------------------------------------------------------------
--------------------------------------------------------------------
--------------------------------------------------------------------
--------------------------------------------------------------------

--------------------------------------------------------------------
--------------------------------------------------------------------
--------------------------------------------------------------------
--------------------------------------------------------------------
--------------------------------------------------------------------
--------------------------------------------------------------------
(This safeguard is not inserted when using the registered version)
--------------------------------------------------------------------
--------------------------------------------------------------------
--------------------------------------------------------------------
--------------------------------------------------------------------
--------------------------------------------------------------------
--------------------------------------------------------------------

Update of /cvsroot/xoops/xoops2/modules/system/admin/mailusers
In directory sc8-pr-cvs1:/tmp/cvs-serv22936

Modified Files:
	mailusers.php 
Log Message:
fixed minor register_globals bug in mailusers

Index: mailusers.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/system/admin/mailusers/mailusers.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mailusers.php	1 Apr 2003 07:12:37 -0000	1.7
--- mailusers.php	11 Aug 2003 06:08:31 -0000	1.8
***************
*** 159,163 ****
  		//OpenTable();
  		if ( $added_count > 0 ) {
! 			$mail_end = ($added_count > ($HTTP_POST_VARS['mail_start'] + 100)) ? ($HTTP_POST_VARS['mail_start'] + 100) : $added_count;
  			$myts =& MyTextSanitizer::getInstance();
  			$xoopsMailer =& getMailer();
--- 159,164 ----
  		//OpenTable();
  		if ( $added_count > 0 ) {
! 			$mail_start = !empty($HTTP_POST_VARS['mail_start']) ? $HTTP_POST_VARS['mail_start'] : 0;
! 			$mail_end = ($added_count > ($mail_start + 100)) ? ($mail_start + 100) : $added_count;
  			$myts =& MyTextSanitizer::getInstance();
  			$xoopsMailer =& getMailer();

Update of /cvsroot/xoops/xoops2/include
In directory sc8-pr-cvs1:/tmp/cvs-serv28192/include

Modified Files:
	notification_select.php 
Log Message:
fixed minor bug where notification selection box still exists even when no events are available

Index: notification_select.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/notification_select.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** notification_select.php	14 May 2003 19:37:03 -0000	1.6
--- notification_select.php	5 Aug 2003 18:02:19 -0000	1.7
***************
*** 36,39 ****
--- 36,40 ----
  	include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/notification.php';
  	$categories =& notificationSubscribableCategoryInfo();
+ 	$event_count = 0;
  	if (!empty($categories)) {
  		$notification_handler =& xoops_gethandler('notification');
***************
*** 54,57 ****
--- 55,59 ----
  				$subscribed = in_array($event['name'], $subscribed_events) ? 1 : 0;
  				$section['events'][$event['name']] = array ('name'=>$event['name'], 'title'=>$event['title'], 'caption'=>$event['caption'], 'description'=>$event['description'], 'subscribed'=>$subscribed);
+ 				$event_count ++;
  			}
  			$xoops_notification['categories'][$category['name']] = $section;
***************
*** 72,75 ****
--- 74,80 ----
  		}
  	} else {
+ 		$xoops_notification['show'] = 0;
+ 	}
+ 	if ($event_count == 0) {
  		$xoops_notification['show'] = 0;
  	}

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

Modified Files:
	module.php 
Log Message:
fixed some more bugs in the module delete routine. thanks to toshimitsu and ryuji for the fix

Index: module.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/module.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** module.php	28 Jul 2003 20:46:09 -0000	1.10
--- module.php	1 Aug 2003 00:13:50 -0000	1.11
***************
*** 430,435 ****
  		$this->db->query($sql);
  
! 		$sql = sprintf("DELETE FROM %s WHERE module_id = %u", $this->db->prefix('block_module_link'), $module->getVar('mid'));
!         $this->db->query($sql);
  
  		if (!empty($this->_cachedModule_dirname[$module->getVar('dirname')])) {
--- 430,460 ----
  		$this->db->query($sql);
  
!         $sql = sprintf("SELECT block_id FROM %s WHERE module_id = %u", $this->db->prefix('block_module_link'), $module->getVar('mid'));
!         if ($result = $this->db->query($sql)) {
!         	$block_id_arr = array();
!             while ($myrow = $this->db->fetchArray($result))
! {
! 				array_push($block_id_arr, $myrow['block_id']);
!             }
!         }
! 		// loop through block_id_arr
!         if (isset($block_id_arr)) {
!     		foreach ($block_id_arr as $i) {
!                 $sql = sprintf("SELECT block_id FROM %s WHERE module_id != %u AND block_id = %u", $this->db->prefix('block_module_link'), $module->getVar('mid'), $i);
! 	        	if ($result2 = $this->db->query($sql)) {
!                     if (0 < $this->db->getRowsNum($result2)) {
! 					// this block has other entries, so delete the entry for this module
!                         $sql = sprintf("DELETE FROM %s WHERE (module_id = %u) AND (block_id = %u)", $this->db->prefix('block_module_link'), $module->getVar('mid'), $i);
!                         $this->db->query($sql);
!                     } else {	
! 					// this block doesnt have other entries, so disable the block and let it show on top page only. otherwise, this block will not display anymore on block admin page!
!         				$sql = sprintf("UPDATE %s SET visible = 0 WHERE bid = %u", $this->db->prefix('newblocks'), $i);
!         				$this->db->query($sql);
!         				$sql = sprintf("UPDATE %s SET module_id = -1 WHERE module_id = %u", $this->db->prefix('block_module_link'), $module->getVar('mid'));
!         				$this->db->query($sql);
!                     }
! 				}
!             }
!         }
  
  		if (!empty($this->_cachedModule_dirname[$module->getVar('dirname')])) {