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

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

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

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

Modified Files:
	session.php 
Log Message:


Index: session.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/session/handler/session.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** session.php	2 Jan 2003 16:47:25 -0000	1.1
--- session.php	8 Jan 2003 14:23:17 -0000	1.2
***************
*** 55,61 ****
  	{
          $sql = "SELECT sess_data FROM ".$this->db->prefix('session')." WHERE sess_id = '$sess_id'";
! 		$result = $this->db->query($sql);
! 		if (list($sess_data) = $this->db->fetchRow($result)) {
! 			return $sess_data;
  		}
  		return '';
--- 55,62 ----
  	{
          $sql = "SELECT sess_data FROM ".$this->db->prefix('session')." WHERE sess_id = '$sess_id'";
! 		if (false != $result = $this->db->query($sql)) {
! 			if (list($sess_data) = $this->db->fetchRow($result)) {
! 				return $sess_data;
! 			}
  		}
  		return '';

[Xoops-cvs2] xoops2/images online.gif,1.1,NONE

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

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

Removed Files:
	online.gif 
Log Message:
removed the online image

--- online.gif DELETED ---

[Xoops-cvs2] xoops2/language/spanish comment.php,1.1,1.2

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

Update of /cvsroot/xoops/xoops2/language/spanish
In directory sc8-pr-cvs1:/tmp/cvs-serv10595/language/spanish

Modified Files:
	comment.php 
Log Message:
removed the online image

Index: comment.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/language/spanish/comment.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** comment.php	7 Jan 2003 20:35:57 -0000	1.1
--- comment.php	8 Jan 2003 11:58:30 -0000	1.2
***************
*** 15,19 ****
  define('_CM_TOP','Tope');
  define('_CM_BOTTOM','Abajo');
! define('_CM_ONLINE','<img border='0' src='".XOOPS_URL."/images/online.gif' alt='En Línea!'> En Línea!');
  define('_CM_POSTED','Enviado'); // Posted date
  define('_CM_UPDATED', 'Actualizado');
--- 15,19 ----
  define('_CM_TOP','Tope');
  define('_CM_BOTTOM','Abajo');
! define('_CM_ONLINE',"En Línea!");
  define('_CM_POSTED','Enviado'); // Posted date
  define('_CM_UPDATED', 'Actualizado');

[Xoops-cvs2] xoops2/images add.gif,1.1,NONE continue.gif,1.1,NONE folder.gif,1.1,NONE folder_open.gif,1.1,NONE friend.gif,1.1,NONE home.gif,1.1,NONE join.gif,1.1,NONE print.gif,1.1,NONE size.gif,1.1,NONE

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

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

Removed Files:
	add.gif continue.gif folder.gif folder_open.gif friend.gif 
	home.gif join.gif print.gif size.gif 
Log Message:
removed non-used image files

--- add.gif DELETED ---

--- continue.gif DELETED ---

--- folder.gif DELETED ---

--- folder_open.gif DELETED ---

--- friend.gif DELETED ---

--- home.gif DELETED ---

--- join.gif DELETED ---

--- print.gif DELETED ---

--- size.gif DELETED ---

[Xoops-cvs2] xoops2/modules/xoopspoll/language/spanish main.php,1.1,1.2

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

Update of /cvsroot/xoops/xoops2/modules/xoopspoll/language/spanish
In directory sc8-pr-cvs1:/tmp/cvs-serv28919/modules/xoopspoll/language/spanish

Modified Files:
	main.php 
Log Message:
spanish lang cleaning

Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/xoopspoll/language/spanish/main.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** main.php	2 Jan 2003 18:17:55 -0000	1.1
--- main.php	8 Jan 2003 11:16:24 -0000	1.2
***************
*** 2,17 ****
  // $Id$
  //%%%%%%	File Name pollresults.php 	%%%%%
- define("_PL_POSTERC","Enviór: ");
- define("_PL_DATEC","Fecha: ");
- define("_PL_EDITNOTALLOWED","Usted No tiene permitido Editar este comentatio!");
- define("_PL_ANONNOTALLOWED","Usuarios anónimos no pueden votar.");
- define("_PL_THANKSFORPOST","Gracias por su envío!");
- define("_PL_DELNOTALLOWED","Usted No tiene permitido Borrar este comentatio!");
- define("_PL_GOBACK","Regresar");
- define("_PL_AREYOUSURE","¿Está seguro que quiere borrar este comentario y todos los que dependen de el?");
- define("_PL_COMMENTSDEL","Borrado de Comentario(s) Exitoso!");
  define("_PL_TOTALVOTES","Total de Votos: %s");
  define("_PL_TOTALVOTERS","Total de electores: %s");
- define("_PL_COMMENTS_ADVERT" ,"Los comentarios son propiedad de quien los envió. No somos responsables por su contenido.");
  
  //%%%%%%	File Name index.php 	%%%%%
--- 2,7 ----
***************
*** 35,38 ****
  define("_PL_VOTE","Votar!");
  define("_PL_RESULTS","Resultados");
- 
  ?>
--- 25,27 ----

[Xoops-cvs2] xoops2/modules/news/language/spanish main.php,1.1,1.2

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

Update of /cvsroot/xoops/xoops2/modules/news/language/spanish
In directory sc8-pr-cvs1:/tmp/cvs-serv28740/modules/news/language/spanish

Modified Files:
	main.php 
Log Message:
spanish lang cleaning

Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/news/language/spanish/main.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** main.php	2 Jan 2003 19:35:16 -0000	1.1
--- main.php	8 Jan 2003 11:15:57 -0000	1.2
***************
*** 11,32 ****
  
  //%%%%%%		File Name article.php 		%%%%%
- define("_NW_COMMENTS_ADVERT" ,"Los comentarios son propiedad de quien los envió. No somos responsables por su contenido.");
  
  // %s represents a user name
  define("_NW_NEWSBY","Novedades por %s");
- 
- // %s represents a topic name
- define("_NW_TOP","Top");
- define("_NW_PARENT","Raiz");
- define("_NW_POSTERC","Envió:");
- define("_NW_DATEC","Fecha:");
- define("_NW_EDITNOTALLOWED","Usted no tiene permitido Editar este comentario!");
- define("_NW_ANONNOTALLOWED","Usuarios Anonimos no tienen permitido enviar.");
- define("_NW_THANKSFORPOST","Gracias por su Envío!");
- define("_NW_DELNOTALLOWED","Usted no tiene permitido Borrar este comentario!");
- define("_NW_GOBACK","Regresar");
- define("_NW_AREUSUREDEL","Está seguro que quiere borrar este comentario y todos los comentarios que le siguen?");
- define("_NW_NO","No");
- define("_NW_COMMENTSDEL","Borrado de Comentario(s)  Exitoso!");
  
  //%%%%%%		File Name submit.php		%%%%%
--- 11,17 ----

[Xoops-cvs2] xoops2/modules/xoopspoll/language/english main.php,1.1,1.2

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

Update of /cvsroot/xoops/xoops2/modules/xoopspoll/language/english
In directory sc8-pr-cvs1:/tmp/cvs-serv16862/modules/xoopspoll/language/english

Modified Files:
	main.php 
Log Message:
removed non-used phrases

Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/xoopspoll/language/english/main.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** main.php	2 Jan 2003 18:12:17 -0000	1.1
--- main.php	8 Jan 2003 10:41:09 -0000	1.2
***************
*** 2,17 ****
  // $Id$
  //%%%%%%	File Name pollresults.php 	%%%%%
- define("_PL_POSTERC","Poster: ");
- define("_PL_DATEC","Date: ");
- define("_PL_EDITNOTALLOWED","You're not allowed to edit this comment!");
- define("_PL_ANONNOTALLOWED","Anonymous users are not allowed to post.");
- define("_PL_THANKSFORPOST","Thanks for your submission!");
- define("_PL_DELNOTALLOWED","You're not allowed to delete this comment!");
- define("_PL_GOBACK","Go Back");
- define("_PL_AREYOUSURE","Are you sure you want to delete this comment and all its child comments?");
- define("_PL_COMMENTSDEL","Comment(s) Deleted Successfully!");
  define("_PL_TOTALVOTES","Total Votes: %s");
  define("_PL_TOTALVOTERS","Total Voters: %s");
- define("_PL_COMMENTS_ADVERT" ,"The comments are owned by the poster. We aren't responsible for their content.");
  
  //%%%%%%	File Name index.php 	%%%%%
--- 2,7 ----

[Xoops-cvs2] xoops2/modules/news/language/english main.php,1.1,1.2

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

Update of /cvsroot/xoops/xoops2/modules/news/language/english
In directory sc8-pr-cvs1:/tmp/cvs-serv16434/modules/news/language/english

Modified Files:
	main.php 
Log Message:
removed non-used phrases

Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/news/language/english/main.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** main.php	2 Jan 2003 20:16:02 -0000	1.1
--- main.php	8 Jan 2003 10:39:53 -0000	1.2
***************
*** 11,32 ****
  
  //%%%%%%		File Name article.php 		%%%%%
- define("_NW_COMMENTS_ADVERT" ,"The comments are owned by the poster. We aren't responsible for their content.");
  
  // %s represents a user name
  define("_NW_NEWSBY","News by %s");
- 
- // %s represents a topic name
- define("_NW_TOP","Top");
- define("_NW_PARENT","Parent");
- define("_NW_POSTERC","Poster:");
- define("_NW_DATEC","Date:");
- define("_NW_EDITNOTALLOWED","You're not allowed to edit this comment!");
- define("_NW_ANONNOTALLOWED","Anonymous users are not allowed to post.");
- define("_NW_THANKSFORPOST","Thanks for your submission!"); //submission of news comments
- define("_NW_DELNOTALLOWED","You're not allowed to delete this comment!");
- define("_NW_GOBACK","Go Back");
- define("_NW_AREUSUREDEL","Are you sure you want to delete this comment and all its child comments?");
- define("_NW_NO","No");
- define("_NW_COMMENTSDEL","Comment(s) Deleted Successfully!");
  
  //%%%%%%		File Name submit.php		%%%%%
--- 11,17 ----

[Xoops-cvs2] xoops2/language/spanish timezone.php,1.1,1.2

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

Update of /cvsroot/xoops/xoops2/language/spanish
In directory sc8-pr-cvs1:/tmp/cvs-serv27868/language/spanish

Modified Files:
	timezone.php 
Log Message:
fixed the timezone definitions

Index: timezone.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/language/spanish/timezone.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** timezone.php	7 Jan 2003 20:35:58 -0000	1.1
--- timezone.php	8 Jan 2003 03:59:00 -0000	1.2
***************
*** 2,34 ****
  // $Id$
  //%%%%%		Time Zone	%%%%
! define('_GMTM12', '(GMT-12:00) Eniwetok, Kwajalein');
! define('_GMTM11', '(GMT-11:00) Isla Midway, Samoa');
! define('_GMTM10', '(GMT-10:00) Hawaii');
! define('_GMTM9' , '(GMT-9:00) Alaska');
! define('_GMTM8' , '(GMT-8:00) Hora del Pacífico (EE.UU. y Canadá), Tijuana');
! define('_GMTM7' , '(GMT-7:00) Arizona, Hora de las Montañas Rocosas (EE.UU. y Canadá)');
! define('_GMTM6' , '(GMT-6:00) Ciudad de México, Hora central (EE.UU. y Canadá)');
! define('_GMTM5' , '(GMT-5:00) Bogotá, Hora oriental (EE.UU. y Canadá), Lima, Quito');
! define('_GMTM4' , '(GMT-4:00) Caracas, Hora del Atlántico (Canadá), La Paz, Santiago');
! define('_GMTM35', '(GMT-3:30) Newfoundland');
! define('_GMTM3' , '(GMT-3:00) Buenos Aires, Brasilia, Georgetown, Terranova');
! define('_GMTM2' , '(GMT-2:00) Atlántico Central');
! define('_GMTM1' , '(GMT-1:00) Azores, Isla del Cabo Verde ');
! define('_GMT0'  , '(GMT) Hora del Meridiano de Greenwich , Dublín, Edimburgo, Londres');
! define('_GMTP1' , '(GMT+1:00) Amsterdam, Berlín, Copenhague, Madrid, París, Roma');
! define('_GMTP2' , '(GMT+2:00) Atenas, Minsk, Helsinki, Jerusalem, El Cairo');
! define('_GMTP3' , '(GMT+3:00) Bagdad, Kuwait, Moscú, Nairobi, Riad, San Petersburgo');
! define('_GMTP35', '(GMT+3:30) Tehran');
! define('_GMTP4' , '(GMT+4:00) Abu Dhabi, Muscat, Baku, Tbilisi');
! define('_GMTP45', '(GMT+4:30) Kabul');
! define('_GMTP5' , '(GMT+5:00) Ekaterinburg, Islamabad, Karachi, Tashkent');
! define('_GMTP55', '(GMT+5:30) Bombay, Calcutta, Madras, Nueva Delhi');
! define('_GMTP6' , '(GMT+6:00) Astana, Almaty, Colombo, Dhaka');
! define('_GMTP7' , '(GMT+7:00) Bangkok, Hanoi, Jakarta');
! define('_GMTP8' , '(GMT+8:00) Beijing, Perth, Singapore, Hong Kong, Urumqi, Taipei');
! define('_GMTP9' , '(GMT+9:00) Tokyo, Seoul, Osaka, Sapporo, Yakutsk');
! define('_GMTP95', '(GMT+9:30) Adelaide, Darwin');
! define('_GMTP10', '(GMT+10:00) Canberra, Hobart, Melbourne, Sydney, Vladivostok');
! define('_GMTP11', '(GMT+11:00) Islas Salomón, Magadán, Nueva Caledonia');
! define('_GMTP12', '(GMT+12:00) Auckland, Fiji, Kamchatka, Islas Marchall, Wellington');
  ?>
--- 2,34 ----
  // $Id$
  //%%%%%		Time Zone	%%%%
! define('_TZ_GMTM12', '(GMT-12:00) Eniwetok, Kwajalein');
! define('_TZ_GMTM11', '(GMT-11:00) Isla Midway, Samoa');
! define('_TZ_GMTM10', '(GMT-10:00) Hawaii');
! define('_TZ_GMTM9' , '(GMT-9:00) Alaska');
! define('_TZ_GMTM8' , '(GMT-8:00) Hora del Pacífico (EE.UU. y Canadá), Tijuana');
! define('_TZ_GMTM7' , '(GMT-7:00) Arizona, Hora de las Montañas Rocosas (EE.UU. y Canadá)');
! define('_TZ_GMTM6' , '(GMT-6:00) Ciudad de México, Hora central (EE.UU. y Canadá)');
! define('_TZ_GMTM5' , '(GMT-5:00) Bogotá, Hora oriental (EE.UU. y Canadá), Lima, Quito');
! define('_TZ_GMTM4' , '(GMT-4:00) Caracas, Hora del Atlántico (Canadá), La Paz, Santiago');
! define('_TZ_GMTM35', '(GMT-3:30) Newfoundland');
! define('_TZ_GMTM3' , '(GMT-3:00) Buenos Aires, Brasilia, Georgetown, Terranova');
! define('_TZ_GMTM2' , '(GMT-2:00) Atlántico Central');
! define('_TZ_GMTM1' , '(GMT-1:00) Azores, Isla del Cabo Verde ');
! define('_TZ_GMT0'  , '(GMT) Hora del Meridiano de Greenwich , Dublín, Edimburgo, Londres');
! define('_TZ_GMTP1' , '(GMT+1:00) Amsterdam, Berlín, Copenhague, Madrid, París, Roma');
! define('_TZ_GMTP2' , '(GMT+2:00) Atenas, Minsk, Helsinki, Jerusalem, El Cairo');
! define('_TZ_GMTP3' , '(GMT+3:00) Bagdad, Kuwait, Moscú, Nairobi, Riad, San Petersburgo');
! define('_TZ_GMTP35', '(GMT+3:30) Tehran');
! define('_TZ_GMTP4' , '(GMT+4:00) Abu Dhabi, Muscat, Baku, Tbilisi');
! define('_TZ_GMTP45', '(GMT+4:30) Kabul');
! define('_TZ_GMTP5' , '(GMT+5:00) Ekaterinburg, Islamabad, Karachi, Tashkent');
! define('_TZ_GMTP55', '(GMT+5:30) Bombay, Calcutta, Madras, Nueva Delhi');
! define('_TZ_GMTP6' , '(GMT+6:00) Astana, Almaty, Colombo, Dhaka');
! define('_TZ_GMTP7' , '(GMT+7:00) Bangkok, Hanoi, Jakarta');
! define('_TZ_GMTP8' , '(GMT+8:00) Beijing, Perth, Singapore, Hong Kong, Urumqi, Taipei');
! define('_TZ_GMTP9' , '(GMT+9:00) Tokyo, Seoul, Osaka, Sapporo, Yakutsk');
! define('_TZ_GMTP95', '(GMT+9:30) Adelaide, Darwin');
! define('_TZ_GMTP10', '(GMT+10:00) Canberra, Hobart, Melbourne, Sydney, Vladivostok');
! define('_TZ_GMTP11', '(GMT+11:00) Islas Salomón, Magadán, Nueva Caledonia');
! define('_TZ_GMTP12', '(GMT+12:00) Auckland, Fiji, Kamchatka, Islas Marchall, Wellington');
  ?>

[Xoops-cvs2] xoops2/class/xoopsform themeform.php,1.1,1.2

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

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

Modified Files:
	themeform.php 
Log Message:
comment out javascript codes

Index: themeform.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/class/xoopsform/themeform.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** themeform.php	2 Jan 2003 15:32:06 -0000	1.1
--- themeform.php	8 Jan 2003 02:06:09 -0000	1.2
***************
*** 71,75 ****
  		$js = "
  		<script type='text/javascript'>
! 
  		function xoopsFormValidate_".$this->getName()."(){";
  		$required =& $this->getRequired();
--- 71,75 ----
  		$js = "
  		<script type='text/javascript'>
! 		<!--
  		function xoopsFormValidate_".$this->getName()."(){";
  		$required =& $this->getRequired();
***************
*** 79,83 ****
  		}
  		$js .= "}
! 
  		</script>";
  		$ret .= "</table></form>\n";
--- 79,83 ----
  		}
  		$js .= "}
! 		// -->
  		</script>";
  		$ret .= "</table></form>\n";

[Xoops-cvs2] xoops2/include functions.php,1.6,1.7

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

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

Modified Files:
	functions.php 
Log Message:
fixed typo

Index: functions.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/functions.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** functions.php	8 Jan 2003 01:50:20 -0000	1.6
--- functions.php	8 Jan 2003 01:52:02 -0000	1.7
***************
*** 432,436 ****
  	if (is_dir(XOOPS_ROOT_PATH.'/themes/'.$theme)) {
  		$filepath = XOOPS_ROOT_PATH.'/themes/'.$theme.'/style/'.$str_css;
! 		$default = XOOPS_ROOT_PATH.'/themes/'.$theme.'/style/'.style.css';
  	} else {
  		$filepath = XOOPS_ROOT_PATH.'/cache/'.$str_css;
--- 432,436 ----
  	if (is_dir(XOOPS_ROOT_PATH.'/themes/'.$theme)) {
  		$filepath = XOOPS_ROOT_PATH.'/themes/'.$theme.'/style/'.$str_css;
! 		$default = XOOPS_ROOT_PATH.'/themes/'.$theme.'/style/'.style.css;
  	} else {
  		$filepath = XOOPS_ROOT_PATH.'/cache/'.$str_css;

[Xoops-cvs2] xoops2/include functions.php,1.5,1.6

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

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

Modified Files:
	functions.php 
Log Message:
fix for stylesheet path bug in getcss()

Index: functions.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/functions.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** functions.php	7 Jan 2003 22:02:02 -0000	1.5
--- functions.php	8 Jan 2003 01:50:20 -0000	1.6
***************
*** 431,436 ****
  	}
  	if (is_dir(XOOPS_ROOT_PATH.'/themes/'.$theme)) {
! 		$filepath = XOOPS_ROOT_PATH.'/themes/'.$theme.'/'.$str_css;
! 		$default = XOOPS_ROOT_PATH.'/themes/'.$theme.'/style.css';
  	} else {
  		$filepath = XOOPS_ROOT_PATH.'/cache/'.$str_css;
--- 431,436 ----
  	}
  	if (is_dir(XOOPS_ROOT_PATH.'/themes/'.$theme)) {
! 		$filepath = XOOPS_ROOT_PATH.'/themes/'.$theme.'/style/'.$str_css;
! 		$default = XOOPS_ROOT_PATH.'/themes/'.$theme.'/style/'.style.css';
  	} else {
  		$filepath = XOOPS_ROOT_PATH.'/cache/'.$str_css;

[Xoops-cvs2] xoops2/modules/xoopspartners/templates xoopspartners_index.html,1.1,1.2

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

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

Modified Files:
	xoopspartners_index.html 
Log Message:
html cleanups

Index: xoopspartners_index.html
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/xoopspartners/templates/xoopspartners_index.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xoopspartners_index.html	2 Jan 2003 18:28:18 -0000	1.1
--- xoopspartners_index.html	8 Jan 2003 00:59:19 -0000	1.2
***************
*** 1,6 ****
! <h3><{$sitename}> <{$lang_main_partner}></h3>
! <br />
! <div align='center'>
! <table border='0' cellpadding='0' cellspacing='0' valign='top' width='98%'>
    <tr>
      <td width='50%' align='left'><{$partner_join}></td>
--- 1,5 ----
! <h4><{$sitename}> <{$lang_main_partner}></h4>
! 
! <table cellspacing='0' border='0' width='98%'>
    <tr>
      <td width='50%' align='left'><{$partner_join}></td>
***************
*** 8,45 ****
    </tr>
  </table>
- </div>
  
! <div align='center'>
! <table border='0' cellpadding='0' cellspacing='0' valign='top' width='98%'>
    <tr>
!     <td class='bg2'>
!        <table width='100%' border='0' cellpadding='4' cellspacing='1'>
!          <tr>
!            <td width='5%' align='left' nowrap><{$lang_partner}></td>
!            <td align='left'><{$lang_desc}></td>
!            <td width='1%' align='left' nowrap><{$lang_hits}></td>
!         </tr>
  
  <{section name=partner loop=$partners}>
!   <tr class='bg1' onmouseover='this.className='bg3';' onmouseout='this.className='bg1''>
!     <td width='5%' valign='middle' width='5%' align='center'><{$partners[partner].image}></td>
!     <td align='left' valign='top'><b><{$partners[partner].title}></b> <br /><{$partners[partner].description}><{$partners[partner].admin_option}></td>
!     <td width='1%' valign='middle' align='center'><{$partners[partner].hits}></td></tr>
    </tr>
  <{sectionelse}>
  
!   <tr class='bg1'>
!     <td width='100%' valign='middle' align='center' colspan='3'><{$lang_no_partners}></td>
    </tr>
  <{/section}>
  
-        </table>
-     </td>
-   </tr>
  </table>
- </div>
  
! <div align='center'>
! <table border='0' cellpadding='0' cellspacing='0' valign='top' width='98%'>
    <tr>
      <td width='50%' align='left'><{$partner_join}></td>
--- 7,34 ----
    </tr>
  </table>
  
! <table class='outer' cellspacing='1' width='98%'>
    <tr>
!     <th width='5%' align='left' nowrap='nowrap'><{$lang_partner}></th>
!     <th align='left'><{$lang_desc}></th>
!     <th width='1%' align='left' nowrap='nowrap'><{$lang_hits}></th>
!   </tr>
  
  <{section name=partner loop=$partners}>
!   <tr>
!     <td class='even' width='5%' valign='middle' align='center'><{$partners[partner].image}></td>
!     <td class='odd' align='left' valign='top'><b><{$partners[partner].title}></b> <br /><{$partners[partner].description}><{$partners[partner].admin_option}></td>
!     <td width='1%' valign='middle' align='center' class='even'><{$partners[partner].hits}></td>
    </tr>
  <{sectionelse}>
  
!   <tr>
!     <td class='even' valign='middle' align='center' colspan='3'><{$lang_no_partners}></td>
    </tr>
  <{/section}>
  
  </table>
  
! <table cellspacing='0' border='0' width='98%'>
    <tr>
      <td width='50%' align='left'><{$partner_join}></td>
***************
*** 47,49 ****
    </tr>
  </table>
- </div>
--- 36,37 ----

[Xoops-cvs2] xoops2/modules/newbb/include forumform.inc.php,1.1,1.2

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

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

Modified Files:
	forumform.inc.php 
Log Message:
cosmetic fix

Index: forumform.inc.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/newbb/include/forumform.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** forumform.inc.php	2 Jan 2003 18:38:28 -0000	1.1
--- forumform.inc.php	8 Jan 2003 00:46:53 -0000	1.2
***************
*** 33,59 ****
  include XOOPS_ROOT_PATH."/include/xoopscodes.php";
  
! echo "<table border='0' cellpadding='1' cellspacing='1' width='100%' class='bg2'><tr class='bg3' align='left'><td width='25%' valign='top' class='nw'><b>". _MD_ABOUTPOST .":</b></td>";
  
  if ( $forumdata['forum_access'] == 1 ) {
! 	echo "<td>". _MD_REGCANPOST ."</td>";
  } elseif ( $forumdata['forum_access'] == 2 ) {
! 	echo "<td>". _MD_ANONCANPOST ."</td>";
  } elseif ( $forumdata['forum_access'] == 3 ) {
! 	echo "<td>". _MD_MODSCANPOST ."</td>";
! }
! 
! echo "</tr><tr class='bg1' align='left'><form action='post.php' method='post' name='forumform' id='forumform' onsubmit='return xoopsValidate(\"subject\", \"message\", \"contents_submit\");'><td width='25%' valign='top' style='white-space: nowrap;'><b>". _MD_YOURNAME ."</b></td><td>";
! 
! if ( $xoopsUser ) {
! 	echo "<a href='".XOOPS_URL."/userinfo.php?uid=".$xoopsUser->getVar("uid")."'>".$xoopsUser->getVar("uname")."</a>&nbsp;[&nbsp;<a href='".XOOPS_URL."/user.php?op=logout'>"._MD_LOGOUT."</a>&nbsp;]";
! } else {
! 	echo "<span style='color: #ff0000;'>".$xoopsConfig['anonymous']."</span>";
! 	echo " [ <a href='".XOOPS_URL."/register.php'>"._MD_REGISTER."</a> ] ";
  }
  
! echo "</td></tr>
! <tr class='bg3' align='left'>
! <td valign='top' style='white-space: nowrap;'><b>". _MD_SUBJECTC ."</b></td>
! <td>";
  
  if ( !$istopic ) {
--- 33,50 ----
  include XOOPS_ROOT_PATH."/include/xoopscodes.php";
  
! echo "<form action='post.php' method='post' name='forumform' id='forumform' onsubmit='return xoopsValidate(\"subject\", \"message\", \"contents_submit\");'><table cellspacing='1' class='outer' width='100%'><tr><td class='head' width='25%' valign='top'>". _MD_ABOUTPOST .":</td>";
  
  if ( $forumdata['forum_access'] == 1 ) {
! 	echo "<td class='even'>". _MD_REGCANPOST ."</td>";
  } elseif ( $forumdata['forum_access'] == 2 ) {
! 	echo "<td class='even'>". _MD_ANONCANPOST ."</td>";
  } elseif ( $forumdata['forum_access'] == 3 ) {
! 	echo "<td class='even'>". _MD_MODSCANPOST ."</td>";
  }
  
! echo "</tr>
! <tr>
! <td class='head' valign='top' nowrap='nowrap'>". _MD_SUBJECTC ."</td>
! <td class='odd'>";
  
  if ( !$istopic ) {
***************
*** 64,73 ****
  
  echo "<input type='text' id='subject' name='subject' size='60' maxlength='100' value='$subject' /></td></tr>
! <tr class='bg1' align='left'>
! <td valign='top' style='white-space: nowrap;'><b>". _MD_MESSAGEICON ."</b></td>
! <td>
! <table>
! <tr align='left'>
! <td>";
  
  $lists = new XoopsLists;
--- 55,62 ----
  
  echo "<input type='text' id='subject' name='subject' size='60' maxlength='100' value='$subject' /></td></tr>
! <tr>
! <td class='head' valign='top' nowrap='nowrap'>". _MD_MESSAGEICON ."</td>
! <td class='even'>
! ";
  
  $lists = new XoopsLists;
***************
*** 88,96 ****
  }
  
! echo "</td></tr></table></td></tr>
! <tr class='bg3' align='left'>
! <td valign='top' style='white-space: nowrap;'><b>". _MD_MESSAGEC ."</b><br />
  </td>
! <td><br />";
  xoopsCodeTarea("message");
  
--- 77,85 ----
  }
  
! echo "</td></tr>
! <tr align='left'>
! <td class='head' valign='top' nowrap='nowrap'>". _MD_MESSAGEC ."
  </td>
! <td class='odd'>";
  xoopsCodeTarea("message");
  
***************
*** 101,115 ****
  }
  xoopsSmilies("message");
- echo "<br /><br />";
- 
- if ( $forumdata['allow_html'] ) {
- 	echo "<br />"._MD_ALLOWEDHTML."<br />";
- 	//echo get_allowed_html();
- }
  
  echo "</td></tr>
! <tr class='bg1' align='left'>";
! echo "<td valign='top' style='white-space: nowrap;'><b>"._MD_OPTIONS."</b></td>\n";
! echo "<td>";
  
  if ( $xoopsUser && $forumdata['forum_access'] == 2 && !empty($post_id) ) {
--- 90,98 ----
  }
  xoopsSmilies("message");
  
  echo "</td></tr>
! <tr>";
! echo "<td class='head' valign='top' nowrap='nowrap'>"._MD_OPTIONS."</td>\n";
! echo "<td class='even'>";
  
  if ( $xoopsUser && $forumdata['forum_access'] == 2 && !empty($post_id) ) {
***************
*** 169,173 ****
  $pid = isset($pid) ? intval($pid) : 0;
  echo "</td></tr>
! <tr class='bg3' align='left'><td colspan='2' align='center'><br />
  <input type='hidden' name='pid' value='".intval($pid)."' />
  <input type='hidden' name='post_id' value='".$post_id."' />
--- 152,156 ----
  $pid = isset($pid) ? intval($pid) : 0;
  echo "</td></tr>
! <tr><td class='head'></td><td class='odd'>
  <input type='hidden' name='pid' value='".intval($pid)."' />
  <input type='hidden' name='post_id' value='".$post_id."' />
***************
*** 184,190 ****
  }
  echo " value='"._MD_CANCELPOST."' />";
! echo "</form>\n";
! echo "</td></tr></table>\n";
! 
! 
  ?>
--- 167,170 ----
  }
  echo " value='"._MD_CANCELPOST."' />";
! echo "</td></tr></table></form>\n";
  ?>

[Xoops-cvs2] xoops2/modules/contact/templates contact_contactusform.html,1.1,1.2

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

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

Modified Files:
	contact_contactusform.html 
Log Message:
cosmetic fix

Index: contact_contactusform.html
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/contact/templates/contact_contactusform.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** contact_contactusform.html	2 Jan 2003 17:14:42 -0000	1.1
--- contact_contactusform.html	8 Jan 2003 00:31:35 -0000	1.2
***************
*** 1,12 ****
  <{$contactform.javascript}>
- <b><{$contactform.title}></b>
- <br /><br />
  <form name="<{$contactform.name}>" action="<{$contactform.action}>" method="<{$contactform.method}>" <{$contactform.extra}>>
!   <table class="outer" cellpadding="4" cellspacing="1">
      <!-- start of form elements loop -->
      <{foreach item=element from=$contactform.elements}>
        <{if $element.hidden != true}>
        <tr>
!         <td class="head"><b><{$element.caption}></b></td>
          <td class="<{cycle values="even,odd"}>"><{$element.body}></td>
        </tr>
--- 1,11 ----
  <{$contactform.javascript}>
  <form name="<{$contactform.name}>" action="<{$contactform.action}>" method="<{$contactform.method}>" <{$contactform.extra}>>
!   <table class="outer" cellspacing="1">
!     <th colspan="2"><{$contactform.title}></th>
      <!-- start of form elements loop -->
      <{foreach item=element from=$contactform.elements}>
        <{if $element.hidden != true}>
        <tr>
!         <td class="head"><{$element.caption}></td>
          <td class="<{cycle values="even,odd"}>"><{$element.body}></td>
        </tr>

[Xoops-cvs2] xoops2/modules/xoopsfaq/templates xoopsfaq_category.html,1.1,1.2 xoopsfaq_index.html,1.1,1.2

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

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

Modified Files:
	xoopsfaq_category.html xoopsfaq_index.html 
Log Message:
cosmetic fix

Index: xoopsfaq_category.html
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/xoopsfaq/templates/xoopsfaq_category.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xoopsfaq_category.html	2 Jan 2003 19:44:45 -0000	1.1
--- xoopsfaq_category.html	8 Jan 2003 00:21:25 -0000	1.2
***************
*** 1,10 ****
  <h4 style="text-align:left;"><{$lang_faq}></h4>
  <a id="top" name="top"><a href="index.php"><{$lang_main}></a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;<b><{$category_name}></b><br /><br />
! <table width="100%" cellpadding="4" cellspacing="0" border="0">
!   <tr class="bg3">
!     <td colspan="2"><span class="fg2"><b><{$lang_toc}></b></span></td>
    </tr>
    <tr>
!     <td colspan="2">
        <ul style="list-style-image:url(images/question.gif);">
  
--- 1,10 ----
  <h4 style="text-align:left;"><{$lang_faq}></h4>
  <a id="top" name="top"><a href="index.php"><{$lang_main}></a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;<b><{$category_name}></b><br /><br />
! <table width="100%" class="outer" cellspacing="1">
!   <tr>
!     <th colspan="2"><{$lang_toc}></th>
    </tr>
    <tr>
!     <td colspan="2" class="even">
        <ul style="list-style-image:url(images/question.gif);">
  
***************
*** 12,16 ****
        <{foreach item=question from=$questions}>
  
!         <li><a href="#q<{$question.id}>"><{$question.title}></a></li>
  
        <{/foreach}>
--- 12,16 ----
        <{foreach item=question from=$questions}>
  
!         <li>&nbsp;<a href="#q<{$question.id}>"><{$question.title}></a></li>
  
        <{/foreach}>
***************
*** 22,38 ****
  </table>
  <br /><br />
! <table width="100%" cellpadding="4" cellspacing="0" border="0">
  
  <!-- start question and answer loop -->
  <{foreach item=question from=$questions}>
  
-   <tr class="bg3">
-     <td><a id="q<{$question.id}>" name="q<{$question.id}>"><b><{$question.title}></b></a></td>
-   </tr>
    <tr>
!     <td><{$question.answer}></td>
    </tr>
    <tr>
!     <td align="right"><a href="#top"><{$lang_backtotop}></a></td>
    </tr>
  
--- 22,35 ----
  </table>
  <br /><br />
! <table width="100%" class="outer" cellspacing="1">
  
  <!-- start question and answer loop -->
  <{foreach item=question from=$questions}>
  
    <tr>
!     <th><a id="q<{$question.id}>" name="q<{$question.id}>"></a><{$question.title}></th>
    </tr>
    <tr>
!     <td class="even"><{$question.answer}><div style="text-align: right"><a href="#top"><{$lang_backtotop}></a></div></td>
    </tr>
  

Index: xoopsfaq_index.html
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/xoopsfaq/templates/xoopsfaq_index.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xoopsfaq_index.html	2 Jan 2003 19:44:45 -0000	1.1
--- xoopsfaq_index.html	8 Jan 2003 00:21:25 -0000	1.2
***************
*** 1,9 ****
  <h4 style="text-align:left;"><{$lang_faq}></h4>
! <table width="100%" cellpadding="4" cellspacing="0" border="0">
    <tr>
!     <td><b><{$lang_categories}></b></td>
    </tr>
    <tr>
!     <td>
  
        <!-- start category loop -->
--- 1,9 ----
  <h4 style="text-align:left;"><{$lang_faq}></h4>
! <table width="100%" cellspacing="1" class="outer">
    <tr>
!     <th><{$lang_categories}></th>
    </tr>
    <tr>
!     <td class="even">
  
        <!-- start category loop -->
***************
*** 16,20 ****
          <{foreach item=question from=$category.questions}>
  
!           <li><a href="index.php?cat_id=<{$category.id}>#q<{$question.id}>"><{$question.title}></a></li>
  
          <{/foreach}>
--- 16,20 ----
          <{foreach item=question from=$category.questions}>
  
!           <li>&nbsp;<a href="index.php?cat_id=<{$category.id}>#q<{$question.id}>"><{$question.title}></a></li>
  
          <{/foreach}>

[Xoops-cvs2] xoops2/modules/mylinks/templates mylinks_link.html,1.1,1.2

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

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

Modified Files:
	mylinks_link.html 
Log Message:
cosmetic fix

Index: mylinks_link.html
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/mylinks/templates/mylinks_link.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mylinks_link.html	2 Jan 2003 17:51:54 -0000	1.1
--- mylinks_link.html	8 Jan 2003 00:10:11 -0000	1.2
***************
*** 1,22 ****
! <table class="outer" width='100%' border='0' cellspacing='0' cellpadding='4' class='bg1'>
!   <tr class="head">
!     <td colspan='2' align='left' class='newstitle' height="18"><{$lang_category}> <{$link.category}></td>
    </tr>
!   <tr class="even">
!     <td width='60%' align='left' valign="bottom"><a href='visit.php?lid=<{$link.id}>' target='_blank'><img src='images/link.gif' border='0' alt='<{$lang_visit}>'></a><b><{$link.title}></b></td>
!     <td align='right' width='40%'><b><{$lang_lastupdate}></b><br /><{$link.updated}></td>
    </tr>
!   <tr class="odd">
!     <td colspan='2' align='left'><{$link.adminlink}><b><{$lang_description}></b><br />
  <{if $link.logourl != ""}>
     <a href="<{$xoops_url}>/modules/mylinks/visit.php?lid=<{$link.id}>" target="_blank"><img src="<{$xoops_url}>/modules/mylinks/images/shots/<{$link.logourl}>" width="<{$shotwidth}>" alt=""  align="right" vspace="3" hspace="7"/></a>
  <{/if}>
!     <div style="text-align: justify"><{$link.description}></div><br></td>
    </tr>
!   <tr class="even">
!     <td colspan='2' class='bg3' align='center'><b><{$lang_email}></b><a href="mailto:<{$link.email}>"><{$link.email}></a>&nbsp;&nbsp;<b><{$lang_hits}></b><{$link.hits}> <b><{if $link.rating != 0}>&nbsp;&nbsp;<{$lang_rating}></b><{$link.rating}> (<{$link.votes}>)<{/if}></td>
    </tr>
!   <tr class="foot">
!     <td colspan='2' class='bg2' align='center'><a href="<{$xoops_url}>/modules/mylinks/ratelink.php?lid=<{$link.id}>"><{$lang_ratethissite}></a> | <a href="<{$xoops_url}>/modules/mylinks/modlink.php?lid=<{$link.id}>"><{$lang_modify}></a> |
  <a href="<{$xoops_url}>/modules/mylinks/brokenlink.php?lid=<{$link.id}>"><{$lang_reportbroken}></a> | <a target="_top" href="mailto:?subject=<{$link.mail_subject}>&amp;body=<{$link.mail_body}>"><{$lang_tellafriend}></a></td>
    </tr>
--- 1,22 ----
! <table class="outer" width='100%' cellspacing='0'>
!   <tr>
!     <td class="head" colspan='2' align='left' class='newstitle' height="18"><{$lang_category}> <{$link.category}></td>
    </tr>
!   <tr>
!     <td class="even" width='60%' align='left' valign="bottom"><a href='visit.php?lid=<{$link.id}>' target='_blank'><img src='images/link.gif' border='0' alt='<{$lang_visit}>'></a><b><{$link.title}></b></td>
!     <td class="even" align='right' width='40%'><b><{$lang_lastupdate}></b><{$link.updated}></td>
    </tr>
!   <tr>
!     <td class="odd" colspan='2' align='left'><{$link.adminlink}><b><{$lang_description}></b><br />
  <{if $link.logourl != ""}>
     <a href="<{$xoops_url}>/modules/mylinks/visit.php?lid=<{$link.id}>" target="_blank"><img src="<{$xoops_url}>/modules/mylinks/images/shots/<{$link.logourl}>" width="<{$shotwidth}>" alt=""  align="right" vspace="3" hspace="7"/></a>
  <{/if}>
!     <div style="text-align: justify"><{$link.description}></div><br /></td>
    </tr>
!   <tr>
!     <td class="even" colspan='2' align='center'><b><{$lang_email}></b><a href="mailto:<{$link.email}>"><{$link.email}></a>&nbsp;&nbsp;<b><{$lang_hits}></b><{$link.hits}> <b><{if $link.rating != 0}>&nbsp;&nbsp;<{$lang_rating}></b><{$link.rating}> (<{$link.votes}>)<{/if}></td>
    </tr>
!   <tr>
!     <td class="foot" colspan='2' align='center'><a href="<{$xoops_url}>/modules/mylinks/ratelink.php?lid=<{$link.id}>"><{$lang_ratethissite}></a> | <a href="<{$xoops_url}>/modules/mylinks/modlink.php?lid=<{$link.id}>"><{$lang_modify}></a> |
  <a href="<{$xoops_url}>/modules/mylinks/brokenlink.php?lid=<{$link.id}>"><{$lang_reportbroken}></a> | <a target="_top" href="mailto:?subject=<{$link.mail_subject}>&amp;body=<{$link.mail_body}>"><{$lang_tellafriend}></a></td>
    </tr>

[Xoops-cvs2] xoops2/modules/mydownloads/templates mydownloads_download.html,1.1,1.2

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

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

Modified Files:
	mydownloads_download.html 
Log Message:
cosmetic fix

Index: mydownloads_download.html
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/mydownloads/templates/mydownloads_download.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mydownloads_download.html	2 Jan 2003 17:36:24 -0000	1.1
--- mydownloads_download.html	8 Jan 2003 00:05:33 -0000	1.2
***************
*** 1,17 ****
! <table width='100%' border='0' cellspacing='1' cellpadding='0' class='bg2'>
! <tr><td>
! <table width='100%' border='0' cellspacing='0' cellpadding='4' class='bg1'>
! <tr>
! <td colspan='2' align='left' class='newstitle' height="18">
! <b><{$lang_category}></b> <{$down.category}></td>
! </tr><tr>
! <td class='bg3' width='65%' align='left' valign="bottom">
! <a href='visit.php?lid=<{$down.id}>' target='_blank'>
! <img src='images/download.gif' border='0' alt='<{$lang_dlnow}>'></a>
! <b>&nbsp;<{$down.title}></b></td>
! <td class='bg3' align='right' width='35%'><b><{$lang_version}>:</b>&nbsp;<{$down.version}><br />
! <b><{$lang_subdate}>:</b>&nbsp;&nbsp;<{$down.updated}></td>
! </tr><tr><td colspan='2' class='bg1' align='left'>
! <{$down.adminlink}><b><{$lang_description}></b><br />
  
  <{if $down.logourl != ""}>
--- 1,12 ----
! <table width='100%' cellspacing='0' class='outer'>
!   <tr>
!     <td class="head" colspan='2' align='left' height="18"><{$lang_category}> <{$down.category}></td>
!   </tr>
!   <tr>
!     <td class='even' width='65%' align='left' valign="bottom"><a href='visit.php?lid=<{$down.id}>' target='_blank'><img src='images/download.gif' border='0' alt='<{$lang_dlnow}>' /></a><b>&nbsp;<{$down.title}></b></td>
!     <td class='even' align='right' width='35%'><b><{$lang_version}>:</b>&nbsp;<{$down.version}><br /><b><{$lang_subdate}>:</b>&nbsp;&nbsp;<{$down.updated}></td>
!   </tr>
!   <tr>
!     <td colspan='2' class='odd' align='left'><{$down.adminlink}><b><{$lang_description}></b><br />
  
  <{if $down.logourl != ""}>
***************
*** 19,44 ****
  <{/if}>
  
! <div style="text-align: justify"><{$down.description}></div><br></td>
! </tr><tr><td colspan='2' class='bg3' align='left'>
! <img src='images/counter.gif' border='0' align='absmiddle' alt='<{$down.lang_dltimes}>' />
! &nbsp;<{$down.hits}>&nbsp;&nbsp;
! <img src='images/size.gif' border='0' align='absmiddle' alt='<{$lang_size}>' />
! &nbsp;<{$down.size}>&nbsp;&nbsp;
! <img src='images/platform.gif' border='0' align='absmiddle' alt='<{$lang_platform}>' />
! &nbsp;<{$down.plataform}>&nbsp;&nbsp;
! <img src='images/home.gif' border='0' align='absmiddle' alt='<{$lang_homepage}>' />
! &nbsp;<a href="<{$down.homepage}>" target="_BLANK"><{$down.homepage}></a> </td>
! </tr><tr>
! <td colspan='2' class='bg2' align='center'>
! <{if $down.rating != 0}>
! <div><b><{$lang_ratingc}></b> <{$down.rating}> (<{$down.votes}>)</div>
! <{/if}>
! <a href="<{$xoops_url}>/modules/mydownloads/ratefile.php?lid=<{$down.id}>"><{$lang_ratethissite}></a> |
! <a href="<{$xoops_url}>/modules/mydownloads/modfile.php?lid=<{$down.id}>"><{$lang_modify}></a> |
! <a href="<{$xoops_url}>/modules/mydownloads/brokenfile.php?lid=<{$down.id}>"><{$lang_reportbroken}></a>
! |
! <a target="_top" href="mailto:?subject=<{$down.mail_subject}>&amp;body=<{$down.mail_body}>"><{$lang_tellafriend}></a>
! </td></tr></table>
! </td></tr></table>
  <br /><br />
  
--- 14,32 ----
  <{/if}>
  
! <div style="text-align: justify"><{$down.description}></div><br /></td>
!   </tr>
!   <tr>
!     <td colspan='2' class='even' align='left'><img src='images/counter.gif' border='0' align='absmiddle' alt='<{$down.lang_dltimes}>' />
! &nbsp;<{$down.hits}>&nbsp;&nbsp;<img src='images/size.gif' border='0' align='absmiddle' alt='<{$lang_size}>' />&nbsp;<{$down.size}>&nbsp;&nbsp;<img src='images/platform.gif' border='0' align='absmiddle' alt='<{$lang_platform}>' />&nbsp;<{$down.plataform}>&nbsp;&nbsp;<img src='images/home.gif' border='0' align='absmiddle' alt='<{$lang_homepage}>' />&nbsp;<a href="<{$down.homepage}>" target="_BLANK"><{$down.homepage}></a></td>
!   </tr>
!   <tr>
!     <td colspan='2' class='foot' align='center'>
!     <{if $down.rating != 0}>
!     <div><b><{$lang_ratingc}></b> <{$down.rating}> (<{$down.votes}>)</div>
!     <{/if}>
!     <a href="<{$xoops_url}>/modules/mydownloads/ratefile.php?lid=<{$down.id}>"><{$lang_ratethissite}></a> | <a href="<{$xoops_url}>/modules/mydownloads/modfile.php?lid=<{$down.id}>"><{$lang_modify}></a> | <a href="<{$xoops_url}>/modules/mydownloads/brokenfile.php?lid=<{$down.id}>"><{$lang_reportbroken}></a> | <a target="_top" href="mailto:?subject=<{$down.mail_subject}>&amp;body=<{$down.mail_body}>"><{$lang_tellafriend}></a>
!     </td>
!   </tr>
! </table>
  <br /><br />
  

[Xoops-cvs2] xoops2/modules/xoopspoll/templates xoopspoll_index.html,1.1,1.2 xoopspoll_results.html,1.2,1.3 xoopspoll_view.html,1.1,1.2

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

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

Modified Files:
	xoopspoll_index.html xoopspoll_results.html 
	xoopspoll_view.html 
Log Message:
cosmetic fix

Index: xoopspoll_index.html
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/xoopspoll/templates/xoopspoll_index.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xoopspoll_index.html	2 Jan 2003 18:22:06 -0000	1.1
--- xoopspoll_index.html	7 Jan 2003 23:56:22 -0000	1.2
***************
*** 1,21 ****
  <h4><{$lang_pollslist}></h4>
  
! <table width='100%' border='0' cellpadding='4' cellspacing='1'>
!   <tr class='bg3'>
!     <td><b><{$lang_pollquestion}></b></td>
!     <td align='center'><b><{$lang_pollvoters}></b></td>
!     <td align='center'><b><{$lang_votes}></b></td>
!     <td align='center'><b><{$lang_expiration}></b></td>
!     <td>&nbsp;</td>
    </tr>
  
  <!-- start polls item loop -->
  <{section name=i loop=$polls}>
!   <tr class='bg1'>
!     <td><{$polls[i].pollQuestion}></td>
!     <td align='center'><{$polls[i].pollVoters}></td>
!     <td align='center'><{$polls[i].pollVotes}></td>
!     <td align='center'><{$polls[i].pollEnd}></td>
!     <td align='right'><a href='pollresults.php?poll_id=<{$polls[i].pollId}>'><{$lang_results}></a></td>
    </tr>
  <{/section}>
--- 1,21 ----
  <h4><{$lang_pollslist}></h4>
  
! <table width="100%" class="outer" cellspacing='1'>
!   <tr>
!     <th><{$lang_pollquestion}></th>
!     <th align='center'><{$lang_pollvoters}></th>
!     <th align='center'><{$lang_votes}></th>
!     <th align='center'><{$lang_expiration}></th>
!     <th>&nbsp;</th>
    </tr>
  
  <!-- start polls item loop -->
  <{section name=i loop=$polls}>
!   <tr>
!     <td class="even"><{$polls[i].pollQuestion}></td>
!     <td align="center" class="odd"><{$polls[i].pollVoters}></td>
!     <td align="center" class="even"><{$polls[i].pollVotes}></td>
!     <td align="center" class="odd"><{$polls[i].pollEnd}></td>
!     <td align="right" class="even"><a href="pollresults.php?poll_id=<{$polls[i].pollId}>"><{$lang_results}></a></td>
    </tr>
  <{/section}>

Index: xoopspoll_results.html
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/xoopspoll/templates/xoopspoll_results.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** xoopspoll_results.html	7 Jan 2003 23:00:00 -0000	1.2
--- xoopspoll_results.html	7 Jan 2003 23:56:23 -0000	1.3
***************
*** 1,22 ****
! <div style='text-align:center'>
! <table width='60%' border='0' cellpadding='4' cellspacing='0'>
    <tr>
!     <td>
!     <span style='font-weight:bold;'><{$poll.question}></span>
!     </td>
    </tr>
    <tr>
!     <td>
      <{$poll.end_text}>
      </td>
    </tr>
! </table>
! <table width='60%' border='0' cellpadding='4' cellspacing='0'>
    <{foreach item=option from=$poll.options}>
    <tr>
!     <td width='30%' align='left'>
      <{$option.text}>
      </td>
!     <td width='70%' align='left'>
      <{$option.image}> <{$option.percent}>
      </td>
--- 1,19 ----
! <div style='text-align: center; margin: 3px;'>
! <table width="60%" class="outer" cellspacing="1">
    <tr>
!     <th colspan="2"><{$poll.question}></th>
    </tr>
    <tr>
!     <td class="head" align="right" colspan="2">
      <{$poll.end_text}>
      </td>
    </tr>
! 
    <{foreach item=option from=$poll.options}>
    <tr>
!     <td class="even" width="30%" align="left">
      <{$option.text}>
      </td>
!     <td class="odd" width="70%" align="left">
      <{$option.image}> <{$option.percent}>
      </td>
***************
*** 24,31 ****
    <{/foreach}>
    <tr>
!     <td colspan='2' align='center'>
!     <br /><b><{$poll.totalVotes}>
!     <br /><{$poll.totalVoters}>
!     <br /><{$poll.vote}>
      </td>
    </tr>
--- 21,26 ----
    <{/foreach}>
    <tr>
!     <td class="foot" colspan="2" align="center">
!       <{$poll.totalVotes}><br /><{$poll.totalVoters}><br /><{$poll.vote}>
      </td>
    </tr>

Index: xoopspoll_view.html
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/xoopspoll/templates/xoopspoll_view.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xoopspoll_view.html	2 Jan 2003 18:22:06 -0000	1.1
--- xoopspoll_view.html	7 Jan 2003 23:56:23 -0000	1.2
***************
*** 1,28 ****
! <table border="0" cellpadding="0" cellspacing="0" align="center">
!   <tr>
!     <td>
! 	  <form action='<{$poll.action}>' method='post'>
! 	  <table width='100%' border='0' cellpadding='3' cellspacing='0'>
! 	    <tr>
! 		  <td align='center' colspan='2'>
! 		  <input type='hidden' name='poll_id' value='<{$poll.pollId}>' />
! 		  <b><{$poll.question}></b></td></tr>
  
! 	   <{foreach item=option from=$poll.options}>
! 	   <tr>
!          <td align='left' width='2%'><{$option.input}></td>
!          <td align='left' width='98%'><{$option.text}></td>
!       </tr>
!      <{/foreach}>
  
  	<tr>
!       <td align='center' colspan='2'>
! 	  <input type='submit' value='<{$lang_vote}>'  class='formButton' />&nbsp;
! 	  <input type='button' value='<{$lang_results}>' class='formButton' onclick='location="<{$poll.viewresults}>"' />
! 	  </td>
!    </tr>
!  </table>
!  </form>
!     </td>
!   </tr>
! </table>
\ No newline at end of file
--- 1,18 ----
! <form action="<{$poll.action}>" method="post">
!   <table width="100%" class="outer" cellspacing="1">
!     <tr>
!       <th align="center" colspan="2"><input type="hidden" name="poll_id" value="<{$poll.pollId}>" /><{$poll.question}></th>
!     </tr>
  
!     <{foreach item=option from=$poll.options}>
! 	<tr>
!       <td class="even" align="left" width="2%"><{$option.input}></td>
!       <td class="odd" align="left" width="98%"><{$option.text}></td>
!     </tr>
!     <{/foreach}>
  
  	<tr>
!       <td align="center" colspan="2" class="foot"><input type="submit" value="<{$lang_vote}>" />&nbsp;<input type="button" value="<{$lang_results}>" onclick="location='<{$poll.viewresults}>'" /></td>
!     </tr>
!   </table>
! </form>
\ No newline at end of file

[Xoops-cvs2] xoops2/modules/xoopspoll/admin index.php,1.1,1.2

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

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

Modified Files:
	index.php 
Log Message:
converted to utilize new comments feature

Index: index.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/xoopspoll/admin/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** index.php	2 Jan 2003 18:05:20 -0000	1.1
--- index.php	7 Jan 2003 22:59:58 -0000	1.2
***************
*** 27,31 ****
  include "admin_header.php";
  include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
- include_once XOOPS_ROOT_PATH."/class/xoopscomments.php";
  include_once XOOPS_ROOT_PATH."/class/xoopslists.php";
  include_once XOOPS_ROOT_PATH."/class/xoopsblock.php";
--- 27,30 ----
***************
*** 358,367 ****
  		xoops_template_clear_module_cache($xoopsModule->getVar('mid'));
  		// delete comments for this poll
! 		$com = new XoopsComments($xoopsDB->prefix("xoopspollcomments"));
! 		$criteria = array("item_id=".$poll->getVar("poll_id")."", "pid=0");
! 		$commentsarray = $com->getAllComments($criteria);
! 		foreach ( $commentsarray as $comment ) {
! 			$comment->delete();
! 		}
  	}
  	redirect_header("index.php",1,_AM_DBUPDATED);
--- 357,362 ----
  		xoops_template_clear_module_cache($xoopsModule->getVar('mid'));
  		// delete comments for this poll
! 		xoops_comment_delete($xoopsModule->getVar('mid'), $poll->getVar('poll_id'));
! 
  	}
  	redirect_header("index.php",1,_AM_DBUPDATED);

[Xoops-cvs2] xoops2/modules/xoopspoll comment_delete.php,NONE,1.1 comment_edit.php,NONE,1.1 comment_new.php,NONE,1.1 comment_post.php,NONE,1.1 comment_reply.php,NONE,1.1 index.php,1.3,1.4 pollresults.php,1.2,1.3 xoops_version.php,1.1,1.2 deletecomment.php,1.1,NONE editcomment.php,1.1,NONE header.php,1.1,NONE newcomment.php,1.1,NONE postcomment.php,1.1,NONE replycomment.php,1.1,NONE

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

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

Modified Files:
	index.php pollresults.php xoops_version.php 
Added Files:
	comment_delete.php comment_edit.php comment_new.php 
	comment_post.php comment_reply.php 
Removed Files:
	deletecomment.php editcomment.php header.php newcomment.php 
	postcomment.php replycomment.php 
Log Message:
converted to utilize new comments feature

--- NEW FILE: comment_delete.php ---
<?php
// $Id: comment_delete.php,v 1.1 2003/01/07 22:59:59 okazu Exp $
//  ------------------------------------------------------------------------ //
//                XOOPS - PHP Content Management System                      //
//                    Copyright (c) 2000 XOOPS.org                           //
//                       <http://www.xoops.org/>                             //
//  ------------------------------------------------------------------------ //
//  This program is free software; you can redistribute it and/or modify     //
//  it under the terms of the GNU General Public License as published by     //
//  the Free Software Foundation; either version 2 of the License, or        //
//  (at your option) any later version.                                      //
//                                                                           //
//  You may not change or alter any portion of this comment or credits       //
//  of supporting developers from this source code or any supporting         //
//  source code which is considered copyrighted (c) material of the          //
//  original comment or credit authors.                                      //
//                                                                           //
//  This program is distributed in the hope that it will be useful,          //
//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
//  GNU General Public License for more details.                             //
//                                                                           //
//  You should have received a copy of the GNU General Public License        //
//  along with this program; if not, write to the Free Software              //
//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
//  ------------------------------------------------------------------------ //
include '../../mainfile.php';
include XOOPS_ROOT_PATH.'/include/comment_delete.php';
?>
--- NEW FILE: comment_edit.php ---
<?php
// $Id: comment_edit.php,v 1.1 2003/01/07 22:59:59 okazu Exp $
//  ------------------------------------------------------------------------ //
//                XOOPS - PHP Content Management System                      //
//                    Copyright (c) 2000 XOOPS.org                           //
//                       <http://www.xoops.org/>                             //
//  ------------------------------------------------------------------------ //
//  This program is free software; you can redistribute it and/or modify     //
//  it under the terms of the GNU General Public License as published by     //
//  the Free Software Foundation; either version 2 of the License, or        //
//  (at your option) any later version.                                      //
//                                                                           //
//  You may not change or alter any portion of this comment or credits       //
//  of supporting developers from this source code or any supporting         //
//  source code which is considered copyrighted (c) material of the          //
//  original comment or credit authors.                                      //
//                                                                           //
//  This program is distributed in the hope that it will be useful,          //
//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
//  GNU General Public License for more details.                             //
//                                                                           //
//  You should have received a copy of the GNU General Public License        //
//  along with this program; if not, write to the Free Software              //
//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
//  ------------------------------------------------------------------------ //
include '../../mainfile.php';
include XOOPS_ROOT_PATH.'/include/comment_edit.php';
?>
--- NEW FILE: comment_new.php ---
<?php
// $Id: comment_new.php,v 1.1 2003/01/07 22:59:59 okazu Exp $
//  ------------------------------------------------------------------------ //
//                XOOPS - PHP Content Management System                      //
//                    Copyright (c) 2000 XOOPS.org                           //
//                       <http://www.xoops.org/>                             //
//  ------------------------------------------------------------------------ //
//  This program is free software; you can redistribute it and/or modify     //
//  it under the terms of the GNU General Public License as published by     //
//  the Free Software Foundation; either version 2 of the License, or        //
//  (at your option) any later version.                                      //
//                                                                           //
//  You may not change or alter any portion of this comment or credits       //
//  of supporting developers from this source code or any supporting         //
//  source code which is considered copyrighted (c) material of the          //
//  original comment or credit authors.                                      //
//                                                                           //
//  This program is distributed in the hope that it will be useful,          //
//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
//  GNU General Public License for more details.                             //
//                                                                           //
//  You should have received a copy of the GNU General Public License        //
//  along with this program; if not, write to the Free Software              //
//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
//  ------------------------------------------------------------------------ //
include '../../mainfile.php';
include XOOPS_ROOT_PATH.'/include/comment_new.php';
?>
--- NEW FILE: comment_post.php ---
<?php
// $Id: comment_post.php,v 1.1 2003/01/07 23:00:00 okazu Exp $
//  ------------------------------------------------------------------------ //
//                XOOPS - PHP Content Management System                      //
//                    Copyright (c) 2000 XOOPS.org                           //
//                       <http://www.xoops.org/>                             //
//  ------------------------------------------------------------------------ //
//  This program is free software; you can redistribute it and/or modify     //
//  it under the terms of the GNU General Public License as published by     //
//  the Free Software Foundation; either version 2 of the License, or        //
//  (at your option) any later version.                                      //
//                                                                           //
//  You may not change or alter any portion of this comment or credits       //
//  of supporting developers from this source code or any supporting         //
//  source code which is considered copyrighted (c) material of the          //
//  original comment or credit authors.                                      //
//                                                                           //
//  This program is distributed in the hope that it will be useful,          //
//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
//  GNU General Public License for more details.                             //
//                                                                           //
//  You should have received a copy of the GNU General Public License        //
//  along with this program; if not, write to the Free Software              //
//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
//  ------------------------------------------------------------------------ //
include '../../mainfile.php';
include XOOPS_ROOT_PATH.'/include/comment_post.php';
?>
--- NEW FILE: comment_reply.php ---
<?php
// $Id: comment_reply.php,v 1.1 2003/01/07 23:00:00 okazu Exp $
//  ------------------------------------------------------------------------ //
//                XOOPS - PHP Content Management System                      //
//                    Copyright (c) 2000 XOOPS.org                           //
//                       <http://www.xoops.org/>                             //
//  ------------------------------------------------------------------------ //
//  This program is free software; you can redistribute it and/or modify     //
//  it under the terms of the GNU General Public License as published by     //
//  the Free Software Foundation; either version 2 of the License, or        //
//  (at your option) any later version.                                      //
//                                                                           //
//  You may not change or alter any portion of this comment or credits       //
//  of supporting developers from this source code or any supporting         //
//  source code which is considered copyrighted (c) material of the          //
//  original comment or credit authors.                                      //
//                                                                           //
//  This program is distributed in the hope that it will be useful,          //
//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
//  GNU General Public License for more details.                             //
//                                                                           //
//  You should have received a copy of the GNU General Public License        //
//  along with this program; if not, write to the Free Software              //
//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
//  ------------------------------------------------------------------------ //
include '../../mainfile.php';
include XOOPS_ROOT_PATH.'/include/comment_reply.php';
?>
Index: index.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/xoopspoll/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** index.php	6 Jan 2003 20:08:25 -0000	1.3
--- index.php	7 Jan 2003 22:59:59 -0000	1.4
***************
*** 25,29 ****
  //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
  //  ------------------------------------------------------------------------ //
! include "header.php";
  include_once XOOPS_ROOT_PATH."/modules/xoopspoll/class/xoopspoll.php";
  include_once XOOPS_ROOT_PATH."/modules/xoopspoll/class/xoopspolloption.php";
--- 25,30 ----
  //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
  //  ------------------------------------------------------------------------ //
! include "../../mainfile.php";
! include XOOPS_ROOT_PATH."/modules/xoopspoll/include/constants.php";
  include_once XOOPS_ROOT_PATH."/modules/xoopspoll/class/xoopspoll.php";
  include_once XOOPS_ROOT_PATH."/modules/xoopspoll/class/xoopspolloption.php";

Index: pollresults.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/xoopspoll/pollresults.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pollresults.php	6 Jan 2003 20:08:31 -0000	1.2
--- pollresults.php	7 Jan 2003 22:59:59 -0000	1.3
***************
*** 26,31 ****
  //  ------------------------------------------------------------------------ //
  
! include "header.php";
! include_once XOOPS_ROOT_PATH."/class/xoopscomments.php";
  include_once XOOPS_ROOT_PATH."/modules/xoopspoll/class/xoopspoll.php";
  include_once XOOPS_ROOT_PATH."/modules/xoopspoll/class/xoopspolloption.php";
--- 26,31 ----
  //  ------------------------------------------------------------------------ //
  
! include "../../mainfile.php";
! include XOOPS_ROOT_PATH."/modules/xoopspoll/include/constants.php";
  include_once XOOPS_ROOT_PATH."/modules/xoopspoll/class/xoopspoll.php";
  include_once XOOPS_ROOT_PATH."/modules/xoopspoll/class/xoopspolloption.php";
***************
*** 41,70 ****
  $xoopsOption['template_main'] = 'xoopspoll_results.html';
  include XOOPS_ROOT_PATH."/header.php";
! // set comment mode if not set
! if (!isset($mode) || trim($mode) == '' || ($mode != 'nocomments' && $mode != 'thread' && $mode != 'flat') ) {
! 	if ( $xoopsUser ) {
! 		$mode = $xoopsUser->getVar('umode');
! 	} else {
! 		$mode = $xoopsConfig['com_mode'];
! 	}
! }
! $xoopsTpl->assign('commentmode', $mode);
! // set comment order if not set
! if (!isset($order)) {
! 	if ($xoopsUser) {
! 		$order = $xoopsUser->getVar('uorder');
! 	} else {
! 		$order = $xoopsConfig['com_order'];
! 	}
! }
! $order = intval($order);
! if ( !empty($comment_id) ){
! 	$pollcomment = new XoopsComments($xoopsDB->prefix("xoopspollcomments"),$comment_id);
! } else {
! 	$pollcomment = new XoopsComments($xoopsDB->prefix("xoopspollcomments"));
! }
  $item_id = (!empty($poll_id)) ? $poll_id : $item_id;
- $pollcomment->setVar("item_id", $item_id);
- $parentid = $pollcomment->getVar("pid");
  
  $poll = new XoopsPoll($item_id);
--- 41,46 ----
  $xoopsOption['template_main'] = 'xoopspoll_results.html';
  include XOOPS_ROOT_PATH."/header.php";
! 
  $item_id = (!empty($poll_id)) ? $poll_id : $item_id;
  
  $poll = new XoopsPoll($item_id);
***************
*** 72,198 ****
  $renderer->assignResults($xoopsTpl);
  
! if ($order == 1) {
! 	$orderby = 'date DESC';
! 	$xoopsTpl->assign('commentorder', 1);
! 	$xoopsTpl->assign('order_other', 0);
! } else {
! 	$xoopsTpl->assign('commentorder', 0);
! 	$xoopsTpl->assign('order_other', 1);
! 	$orderby = 'date ASC';
! }
! 
! if ($mode == 'flat') {
! 	$criteria = array('item_id='.$item_id);
! 	$commentsArray = $pollcomment->getAllComments($criteria, true, $orderby);
! } elseif ($mode == 'thread') {
! 	$criteria = array('item_id='.$item_id, 'pid='.$pollcomment->getVar('pid'));
! 	$commentsArray = $pollcomment->getAllComments($criteria, true, $orderby);
! } else {
! 	$commentsArray = array();
! }
  
- ob_start();
- $pollcomment->printNavBar($item_id, $mode, $order);
- $xoopsTpl->assign('commentsnav', ob_get_contents());
- $xoopsTpl->assign('item_id' , $item_id);
- ob_end_clean();
- // Now, show comments
- $count = count($commentsArray);
- if (is_array($commentsArray) && $count > 0) {
- 	if ($xoopsUser) {
- 		$xoopsTpl->assign('viewer_userid', $xoopsUser->getVar('uid'));
- 		if (!isset($isadmin)) {
- 			if ($xoopsUser->isAdmin($xoopsModule->mid())) {
- 				$xoopsTpl->assign('isadmin', true);
- 			}
- 		} else {
- 			$xoopsTpl->assign('isadmin', $isadmin);
- 		}
- 	} else {
- 		$xoopsTpl->assign('viewer_userid', 0);
- 		$xoopsTpl->assign('isadmin', false);
- 		$xoopsTpl->assign('anon_canpost', $xoopsConfig['anonpost']);
- 	}
- 	$xoopsTpl->assign('commentorder', $order);
- 	if ($mode == 'flat') {
- 		$temp_posters = array();
- 		for ($i = 0; $i < $count; $i++) {
- 			$icon_image = $commentsArray[$i]->getVar('icon');
- 			$icon_image = ($icon_image != '') ? '<img src="'.XOOPS_URL.'/images/subject/'.$icon_image.'" alt="" />' : '<img src="'.XOOPS_URL.'/images/icons/fposticon.gif" alt="" />';
- 			$poster_id = $commentsArray[$i]->getVar('user_id');
- 			if ($poster_id > 0) {
- 				if (!in_array($poster_id, array_keys($temp_posters))) {
- 					$temp_posters[$poster_id] =& new XoopsUser($poster_id);
- 				}
- 				$poster_rank = $temp_posters[$poster_id]->rank();
- 				$poster_status = $temp_posters[$poster_id]->isOnline() ? _ONLINE : '';
- 				if ( $poster_rank['image'] != '' ) {
- 					$poster_rank['image'] = '<img src="'.XOOPS_URL.'/uploads/'.$poster_rank['image'].'" alt="" />';
- 				}
- 				$xoopsTpl->append('comments', array('ip' => $commentsArray[$i]->getVar('ip'), 'id' => $commentsArray[$i]->getVar('comment_id'), 'image' => $icon_image, 'title' => $commentsArray[$i]->getVar('subject'), 'text' => $commentsArray[$i]->getVar('comment'), 'date' => formatTimestamp($commentsArray[$i]->getVar('date'), 'm'), 'poster_id' => $poster_id, 'poster' => '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$poster_id.'">'.$temp_posters[$poster_id]->getVar('uname').'</a>', 'poster_rank_image' => $poster_rank['image'], 'poster_rank_title' => $poster_rank['title'], 'poster_avatar' => $temp_posters[$poster_id]->getVar('user_avatar'), 'poster_regdate' => formatTimestamp($temp_posters[$poster_id]->getVar('user_regdate'), 's'), 'poster_from' => $temp_posters[$poster_id]->getVar('user_from'), 'poster_postnum' => $temp_posters[$poster_id]->getVar('posts'), 'poster_status' => $poster_status));
- 			} else {
- 				$xoopsTpl->append('comments', array('ip' => $commentsArray[$i]->getVar('ip'), 'id' => $commentsArray[$i]->getVar('comment_id'), 'image' => $icon_image, 'title' => $commentsArray[$i]->getVar('subject'), 'text' => $commentsArray[$i]->getVar('comment'), 'date' => formatTimestamp($commentsArray[$i]->getVar('date'), 'm'), 'poster_id' => 0, 'poster' => $xoopsConfig['anonymous']));
- 			}
- 		}
- 	} elseif ($mode == 'thread') {
- 		$temp_posters = array();
- 		for ($i = 0; $i < $count; $i++) {
- 			$treeArray =& $commentsArray[$i]->getCommentTree();
- 			$tcount = count($treeArray);
- 			$comment_trees = array();
- 			if ($tcount >0) {
- 				for ($j = 0; $j < $tcount; $j++) {
- 					$prefix = str_replace('.', '&nbsp;&nbsp;&nbsp;&nbsp;', $treeArray[$j]->getVar('prefix'));
- 					$date = formatTimestamp($treeArray[$j]->getVar('date'),'m');
- 					if ( $treeArray[$j]->getVar('icon') != '' ) {
- 						$icon = 'subject/'.$treeArray[$j]->getVar('icon', 'E');
- 					} else {
- 						$icon = 'icons/fposticon.gif';
- 					}
- 					$comment_trees[] = array('image' => '<img src="'.XOOPS_URL.'/images/'.$icon.'" alt="" />', 'prefix' => $prefix, 'date' => $date, 'title' => '<a href="'.XOOPS_URL.'/modules/xoopspoll/pollresults.php?item_id='.$item_id.'&amp;mode='.$mode.'&amp;order='.$order.'&amp;comment_id='.$treeArray[$j]->getVar('comment_id').'">'.$treeArray[$j]->getVar('subject').'</a>', 'poster' => '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$treeArray[$j]->getVar('user_id').'">'.XoopsUser::getUnameFromId($treeArray[$j]->getVar('user_id')).'</a>');
- 				}
- 			}
- 			$icon_image = $commentsArray[$i]->getVar('icon');
- 			$icon_image = ($icon_image != '') ? '<img src="'.XOOPS_URL.'/images/subject/'.$icon_image.'" alt="" />' : '<img src="'.XOOPS_URL.'/images/icons/fposticon.gif" alt="" />';
- 			if ($commentsArray[$i]->getVar('pid') != 0) {
- 				$xoopsTpl->assign('lang_top', _TOP);
- 				$xoopsTpl->assign('lang_parent', _PARENT);
- 				$xoopsTpl->assign('showthreadnav', true);
- 			} else {
- 				$xoopsTpl->assign('showthreadnav', false);
- 			}
- 			$poster_id = $commentsArray[$i]->getVar('user_id');
- 			if ($poster_id > 0) {
- 				if (!in_array($poster_id, array_keys($temp_posters))) {
- 					$temp_posters[$poster_id] =& new XoopsUser($poster_id);
- 				}
- 				$poster_rank = $temp_posters[$poster_id]->rank();
- 				$poster_status = $temp_posters[$poster_id]->isOnline() ? _ONLINE : '';
- 				if ( $poster_rank['image'] != '' ) {
- 					$poster_rank['image'] = '<img src="'.XOOPS_URL.'/uploads/'.$poster_rank['image'].'" alt="" />';
- 				}
- 				$xoopsTpl->append('comments', array('ip' => $commentsArray[$i]->getVar('ip'), 'pid' => $commentsArray[$i]->getVar('pid'), 'id' => $commentsArray[$i]->getVar('comment_id'), 'image' => $icon_image, 'title' => $commentsArray[$i]->getVar('subject'), 'text' => $commentsArray[$i]->getVar('comment'), 'date' => formatTimestamp($commentsArray[$i]->getVar('date'), 'm'), 'poster_id' => $poster_id, 'poster' => '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$poster_id.'">'.$temp_posters[$poster_id]->getVar('uname').'</a>', 'poster_rank_image' => $poster_rank['image'], 'poster_rank_title' => $poster_rank['title'], 'poster_avatar' => $temp_posters[$poster_id]->getVar('user_avatar'), 'poster_regdate' => formatTimestamp($temp_posters[$poster_id]->getVar('user_regdate'), 's'), 'poster_from' => $temp_posters[$poster_id]->getVar('user_from'), 'poster_postnum' => $temp_posters[$poster_id]->getVar('posts'), 'poster_status' => $poster_status, 'trees' => $comment_trees));
- 			} else {
- 				$xoopsTpl->append('comments', array('ip' => $commentsArray[$i]->getVar('ip'), 'pid' => $commentsArray[$i]->getVar('pid'), 'id' => $commentsArray[$i]->getVar('comment_id'), 'image' => $icon_image, 'title' => $commentsArray[$i]->getVar('subject'), 'text' => $commentsArray[$i]->getVar('comment'), 'date' => formatTimestamp($commentsArray[$i]->getVar('date'), 'm'), 'poster_id' => 0, 'poster' => $xoopsConfig['anonymous'], 'trees' => $comment_trees));
- 			}
- 			unset($comment_trees);
- 		}
- 	} else {
- 	}
- }
- $xoopsTpl->assign('lang_on', _ON);
- $xoopsTpl->assign('lang_postedby', _POSTEDBY);
- $xoopsTpl->assign('lang_reads', _READS);
- $xoopsTpl->assign('lang_from', _FROM);
- $xoopsTpl->assign('lang_joined', _JOINED);
- $xoopsTpl->assign('lang_posts', _POSTS);
- $xoopsTpl->assign('lang_poster', _POSTER);
- $xoopsTpl->assign('lang_thread', _THREAD);
- $xoopsTpl->assign('lang_edit', _EDIT);
- $xoopsTpl->assign('lang_delete', _DELETE);
- $xoopsTpl->assign('lang_reply', _REPLY);
- $xoopsTpl->assign('lang_subject', _REPLIES);
- $xoopsTpl->assign('lang_date', _DATE);
- $xoopsTpl->assign('lang_commentsad' , _PL_COMMENTS_ADVERT);
  include XOOPS_ROOT_PATH."/footer.php";
  ?>
--- 48,54 ----
  $renderer->assignResults($xoopsTpl);
  
! $com_itemid = $item_id;
! include XOOPS_ROOT_PATH.'/include/comment_view.php';
  
  include XOOPS_ROOT_PATH."/footer.php";
  ?>

Index: xoops_version.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/xoopspoll/xoops_version.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xoops_version.php	2 Jan 2003 18:03:32 -0000	1.1
--- xoops_version.php	7 Jan 2003 22:59:59 -0000	1.2
***************
*** 45,50 ****
  $modversion['tables'][0] = "xoopspoll_option";
  $modversion['tables'][1] = "xoopspoll_desc";
! $modversion['tables'][2] = "xoopspollcomments";
! $modversion['tables'][3] = "xoopspoll_log";
  
  // Admin things
--- 45,49 ----
  $modversion['tables'][0] = "xoopspoll_option";
  $modversion['tables'][1] = "xoopspoll_desc";
! $modversion['tables'][2] = "xoopspoll_log";
  
  // Admin things
***************
*** 59,68 ****
  $modversion['templates'][3]['file'] = 'xoopspoll_results.html';
  $modversion['templates'][3]['description'] = '';
- $modversion['templates'][4]['file'] = 'xoopspoll_comment.html';
- $modversion['templates'][4]['description'] = '';
- $modversion['templates'][5]['file'] = 'xoopspoll_comments_flat.html';
- $modversion['templates'][5]['description'] = '';
- $modversion['templates'][6]['file'] = 'xoopspoll_comments_thread.html';
- $modversion['templates'][6]['description'] = '';
  
  //Blocks
--- 58,61 ----
***************
*** 75,77 ****
--- 68,75 ----
  // Menu
  $modversion['hasMain'] = 1;
+ 
+ // Comments
+ $modversion['hasComments'] = 1;
+ $modversion['comments']['pageName'] = 'pollresults.php';
+ $modversion['comments']['itemName'] = 'poll_id';
  ?>

--- deletecomment.php DELETED ---

--- editcomment.php DELETED ---

--- header.php DELETED ---

--- newcomment.php DELETED ---

--- postcomment.php DELETED ---

--- replycomment.php DELETED ---

[Xoops-cvs2] xoops2/modules/xoopspoll/sql mysql.sql,1.1,1.2

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

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

Modified Files:
	mysql.sql 
Log Message:
converted to utilize new comments feature

Index: mysql.sql
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/xoopspoll/sql/mysql.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mysql.sql	2 Jan 2003 18:20:44 -0000	1.1
--- mysql.sql	7 Jan 2003 23:00:00 -0000	1.2
***************
*** 61,87 ****
  # --------------------------------------------------------
  
- #
- # Table structure for table `pollcomments`
- #
- 
- CREATE TABLE xoopspollcomments (
-   comment_id int(8) unsigned NOT NULL auto_increment,
-   pid int(8) unsigned NOT NULL default '0',
-   item_id int(8) unsigned NOT NULL default '0',
-   date int(10) unsigned NOT NULL default '0',
-   user_id int(5) unsigned NOT NULL default '0',
-   ip varchar(15) NOT NULL default '',
-   subject varchar(255) NOT NULL default '',
-   comment text NOT NULL,
-   nohtml tinyint(1) unsigned NOT NULL default '0',
-   nosmiley tinyint(1) unsigned NOT NULL default '0',
-   noxcode tinyint(1) unsigned NOT NULL default '0',
-   icon varchar(25) NOT NULL default '',
-   PRIMARY KEY  (comment_id),
-   KEY pid (pid),
-   KEY item_id (item_id),
-   KEY user_id (user_id),
-   KEY subject (subject(40))
- ) TYPE=MyISAM;
  
  INSERT INTO xoopspoll_desc VALUES (1, 'What do you think about XOOPS?', 'A simple survey about the content management script used on this site.', 1, 1020447898, 1051983686, 0, 0, 0, 1, 0, 0);
--- 61,64 ----

[Xoops-cvs2] xoops2/modules/xoopspoll/templates xoopspoll_results.html,1.1,1.2 xoopspoll_comment.html,1.1,NONE xoopspoll_comments_flat.html,1.1,NONE xoopspoll_comments_thread.html,1.1,NONE

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

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

Modified Files:
	xoopspoll_results.html 
Removed Files:
	xoopspoll_comment.html xoopspoll_comments_flat.html 
	xoopspoll_comments_thread.html 
Log Message:
converted to utilize new comments feature

Index: xoopspoll_results.html
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/xoopspoll/templates/xoopspoll_results.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xoopspoll_results.html	2 Jan 2003 18:22:06 -0000	1.1
--- xoopspoll_results.html	7 Jan 2003 23:00:00 -0000	1.2
***************
*** 34,48 ****
  <br />
  
! <div style="margin: 0; padding: 0;">
    <{$commentsnav}>
!   <{$lang_commentsad}>
  </div>
  
! <div style="margin: 0; padding: 0;">
  <!-- start comments loop -->
! <{if $commentmode == "flat"}>
!   <{include file="db:xoopspoll_comments_flat.html"}>
  <{else}>
!   <{include file="db:xoopspoll_comments_thread.html"}>
  <{/if}>
  <!-- end comments loop -->
--- 34,50 ----
  <br />
  
! <div style="text-align:center; padding: 3px; margin-right:3px;">
    <{$commentsnav}>
!   <{$lang_notice}>
  </div>
  
! <div style="margin-top: 3px; margin-right:3px; padding: 3px;">
  <!-- start comments loop -->
! <{if $comment_mode == "flat"}>
!   <{include file="db:system_comments_flat.html"}>
! <{elseif $comment_mode == "thread"}>
!   <{include file="db:system_comments_thread.html"}>
  <{else}>
!   <{include file="db:system_comments_nest.html"}>
  <{/if}>
  <!-- end comments loop -->

--- xoopspoll_comment.html DELETED ---

--- xoopspoll_comments_flat.html DELETED ---

--- xoopspoll_comments_thread.html DELETED ---

[Xoops-cvs2] xoops2/include comment_reply.php,1.1,1.2

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

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

Modified Files:
	comment_reply.php 
Log Message:
lang fix

Index: comment_reply.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/comment_reply.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** comment_reply.php	7 Jan 2003 21:32:47 -0000	1.1
--- comment_reply.php	7 Jan 2003 22:53:49 -0000	1.2
***************
*** 44,48 ****
  $comment =& $comment_handler->get($com_id);
  $r_name = XoopsUser::getUnameFromId($comment->getVar('com_uid'));
! $r_text = _NW_POSTERC.'&nbsp;'.$r_name.'&nbsp;'._NW_DATEC.'&nbsp;'.formatTimestamp($comment->getVar('com_created')).'<br /><br />'.$comment->getVar('com_text');$com_title = $comment->getVar('com_title', 'E');
  if (!preg_match("/^re:/i", $com_title)) {
  	$com_title = "Re: ".substr($com_title, 0, 56);
--- 44,48 ----
  $comment =& $comment_handler->get($com_id);
  $r_name = XoopsUser::getUnameFromId($comment->getVar('com_uid'));
! $r_text = _CM_POSTER.': <b>'.$r_name.'</b>&nbsp;&nbsp;'._CM_POSTED.': <b>'.formatTimestamp($comment->getVar('com_created')).'</b><br /><br />'.$comment->getVar('com_text');$com_title = $comment->getVar('com_title', 'E');
  if (!preg_match("/^re:/i", $com_title)) {
  	$com_title = "Re: ".substr($com_title, 0, 56);

[Xoops-cvs2] xoops2/include cp_functions.php,1.3,1.4

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

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

Modified Files:
	cp_functions.php 
Log Message:
fixed bug where comments preference menu was not created on popup box

Index: cp_functions.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/cp_functions.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cp_functions.php	4 Jan 2003 15:40:06 -0000	1.3
--- cp_functions.php	7 Jan 2003 22:47:28 -0000	1.4
***************
*** 225,229 ****
  			$cnt++;
  			$adminmenu = $mod->getAdminMenu();
! 			if ($mod->getInfo('config') && is_array($mod->getInfo('config'))) {
  				$adminmenu[] = array('link' => '".XOOPS_URL."/modules/system/admin.php?fct=preferences&op=showmod&mod='.$mod->getVar('mid'), 'title' => _PREFERENCES, 'absolute' => true);
  			}
--- 225,229 ----
  			$cnt++;
  			$adminmenu = $mod->getAdminMenu();
! 			if (($mod->getInfo('config') && is_array($mod->getInfo('config'))) || ($mod->getInfo('comments') && is_array($mod->getInfo('comments')))) {
  				$adminmenu[] = array('link' => '".XOOPS_URL."/modules/system/admin.php?fct=preferences&op=showmod&mod='.$mod->getVar('mid'), 'title' => _PREFERENCES, 'absolute' => true);
  			}