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

[Xoops-cvs2] xoops2/modules/mydownloads 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.2,1.3 ratefile.php,1.2,1.3 singlefile.php,1.2,1.3 viewcat.php,1.3,1.4 xoops_version.php,1.2,1.3

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

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

Modified Files:
	index.php ratefile.php singlefile.php viewcat.php 
	xoops_version.php 
Added Files:
	comment_delete.php comment_edit.php comment_new.php 
	comment_post.php comment_reply.php 
Log Message:
comment related additions

--- NEW FILE: comment_delete.php ---
<?php
// $Id: comment_delete.php,v 1.1 2003/01/09 15:41:43 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/09 15:41:46 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/09 15:41:46 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/09 15:41:47 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/09 15:41:47 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/mydownloads/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.php	6 Jan 2003 19:49:45 -0000	1.2
--- index.php	9 Jan 2003 15:41:33 -0000	1.3
***************
*** 48,51 ****
--- 48,53 ----
  	if ($myrow['imgurl'] && $myrow['imgurl'] != "http://"){
  		$imgurl = $myts->makeTboxData4Edit($myrow['imgurl']);
+ 	} else {
+ 		$imgurl = '';
  	}
  	$totaldownload = getTotalItems($myrow['cid'], 1);
***************
*** 102,105 ****
--- 104,108 ----
  $xoopsTpl->assign('lang_homepage' , _MD_HOMEPAGE);
  $xoopsTpl->assign('lang_latestlistings' , _MD_LATESTLIST);
+ $xoopsTpl->assign('lang_comments' , _COMMENTS);
  $result = $xoopsDB->query("SELECT d.lid, d.cid, d.title, d.url, d.homepage, d.version, d.size, d.platform, d.logourl, d.status, d.date, d.hits, d.rating, d.votes, d.comments, t.description FROM ".$xoopsDB->prefix("mydownloads_downloads")." d, ".$xoopsDB->prefix("mydownloads_text")." t WHERE d.status>0 AND d.lid=t.lid ORDER BY date DESC", $xoopsModuleConfig['newdownloads'], 0);
  while(list($lid, $cid, $dtitle, $url, $homepage, $version, $size, $platform, $logourl, $status, $time, $hits, $rating, $votes, $comments, $description)=$xoopsDB->fetchRow($result)) {
***************
*** 129,136 ****
  		$votestring = sprintf(_MD_NUMVOTES,$votes);
  	}
! 		$xoopsTpl->append('file', array('id' => $lid,'rating' => $rating,'title' => $dtitle.$new.$pop,'logourl' => $logourl,'updated' => $datetime,'description' => $description,'adminlink' => $adminlink,'hits' => $hits,'votes' => $votestring,'plataform' => $platform,'size'  => $size,'homepage' => $homepage,'version'  => $version,'category'  => $path,'lang_dltimes' => sprintf(_MD_DLTIMES,$hits),'mail_subject' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename'])),'mail_body' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mydownloads/singlelink.php?lid='.$lid)));
  }
  
- $xoopsContentsTpl = 'fileindex.html';
  include XOOPS_ROOT_PATH."/modules/mydownloads/footer.php";
  ?>
--- 132,138 ----
  		$votestring = sprintf(_MD_NUMVOTES,$votes);
  	}
! 		$xoopsTpl->append('file', array('id' => $lid,'rating' => $rating,'title' => $dtitle.$new.$pop,'logourl' => $logourl,'updated' => $datetime,'description' => $description,'adminlink' => $adminlink,'hits' => $hits,'votes' => $votestring, 'comments' => $comments, 'platform' => $platform,'size'  => $size,'homepage' => $homepage,'version'  => $version,'category'  => $path,'lang_dltimes' => sprintf(_MD_DLTIMES,$hits),'mail_subject' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename'])),'mail_body' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mydownloads/singlelink.php?lid='.$lid)));
  }
  
  include XOOPS_ROOT_PATH."/modules/mydownloads/footer.php";
  ?>

Index: ratefile.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/mydownloads/ratefile.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ratefile.php	6 Jan 2003 19:49:59 -0000	1.2
--- ratefile.php	9 Jan 2003 15:41:36 -0000	1.3
***************
*** 32,36 ****
  
  
! if($HTTP_POST_VARS['submit']) {
  	$eh = new ErrorHandler; //ErrorHandler object
  	if(!$xoopsUser){
--- 32,36 ----
  
  
! if(isset($HTTP_POST_VARS['submit'])) {
  	$eh = new ErrorHandler; //ErrorHandler object
  	if(!$xoopsUser){

Index: singlefile.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/mydownloads/singlefile.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** singlefile.php	6 Jan 2003 19:50:54 -0000	1.2
--- singlefile.php	9 Jan 2003 15:41:39 -0000	1.3
***************
*** 73,77 ****
  	$xoopsTpl->assign('lang_noscreenshot', _MD_NOSHOTS);
  }
! $xoopsTpl->assign('file', array('id' => $lid,'rating' => $rating,'title' => $dtitle.$new.$pop,'logourl' => $logourl,'updated' => $datetime,'description' => $description,'adminlink' => $adminlink,'hits' => $hits,'votes' => $votestring,'plataform' => $platform,'size'  => $size,'homepage' => $homepage,'version'  => $version,'category'  => $path,'lang_dltimes' => sprintf(_MD_DLTIMES,$hits),'mail_subject' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename'])),'mail_body' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mydownloads/singlelink.php?lid='.$lid)));
  $xoopsTpl->assign('lang_description', _MD_DESCRIPTIONC);
  $xoopsTpl->assign('lang_lastupdate', _MD_LASTUPDATEC);
--- 73,77 ----
  	$xoopsTpl->assign('lang_noscreenshot', _MD_NOSHOTS);
  }
! $xoopsTpl->assign('file', array('id' => $lid,'rating' => $rating,'title' => $dtitle.$new.$pop,'logourl' => $logourl,'updated' => $datetime,'description' => $description,'adminlink' => $adminlink,'hits' => $hits,'votes' => $votestring, 'platform' => $platform, 'comments' => $comments, 'size'  => $size,'homepage' => $homepage,'version'  => $version,'category'  => $path,'lang_dltimes' => sprintf(_MD_DLTIMES,$hits),'mail_subject' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename'])),'mail_body' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mydownloads/singlelink.php?lid='.$lid)));
  $xoopsTpl->assign('lang_description', _MD_DESCRIPTIONC);
  $xoopsTpl->assign('lang_lastupdate', _MD_LASTUPDATEC);
***************
*** 91,95 ****
  $xoopsTpl->assign('lang_platform' , _MD_SUPPORTEDPLAT);
  $xoopsTpl->assign('lang_homepage' , _MD_HOMEPAGE);
! 
  include XOOPS_ROOT_PATH.'/footer.php';
  ?>
--- 91,96 ----
  $xoopsTpl->assign('lang_platform' , _MD_SUPPORTEDPLAT);
  $xoopsTpl->assign('lang_homepage' , _MD_HOMEPAGE);
! $xoopsTpl->assign('lang_comments' , _COMMENTS);
! include XOOPS_ROOT_PATH.'/include/comment_view.php';
  include XOOPS_ROOT_PATH.'/footer.php';
  ?>

Index: viewcat.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/mydownloads/viewcat.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** viewcat.php	9 Jan 2003 12:50:28 -0000	1.3
--- viewcat.php	9 Jan 2003 15:41:40 -0000	1.4
***************
*** 35,39 ****
  include XOOPS_ROOT_PATH."/header.php";
  
! if ($HTTP_GET_VARS['show']!="") {
  	$show = intval($HTTP_GET_VARS['show']);
  } else {
--- 35,39 ----
  include XOOPS_ROOT_PATH."/header.php";
  
! if (isset($HTTP_GET_VARS['show']) && $HTTP_GET_VARS['show']!="") {
  	$show = intval($HTTP_GET_VARS['show']);
  } else {
***************
*** 120,123 ****
--- 120,124 ----
  	$xoopsTpl->assign('lang_platform' , _MD_SUPPORTEDPLAT);
  	$xoopsTpl->assign('lang_homepage' , _MD_HOMEPAGE);
+ 	$xoopsTpl->assign('lang_comments' , _COMMENTS);
  	$xoopsTpl->assign('show_links', true);
  	$q = "SELECT d.lid, d.title, d.url, d.homepage, d.version, d.size, d.platform, d.logourl, d.status, d.date, d.hits, d.rating, d.votes, d.comments, t.description FROM ".$xoopsDB->prefix("mydownloads_downloads")." d, ".$xoopsDB->prefix("mydownloads_text")." t WHERE cid=".$cid." AND d.status>0 AND d.lid=t.lid ORDER BY ".$orderby."";
***************
*** 161,165 ****
  			$votestring = sprintf(_MD_NUMVOTES,$votes);
  		}
! 		$xoopsTpl->append('file', array('id' => $lid,'rating' => $rating,'title' => $dtitle.$new.$pop,'logourl' => $logourl,'updated' => $datetime,'description' => $description,'adminlink' => $adminlink,'hits' => $hits,'votes' => $votestring,'plataform' => $platform,'size'  => $size,'homepage' => $homepage,'version'  => $version,'category'  => $path,'lang_dltimes' => sprintf(_MD_DLTIMES,$hits),'mail_subject' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename'])),'mail_body' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mydownloads/singlelink.php?lid='.$lid)));
  	}
  	$orderby = convertorderbyout($orderby);
--- 162,166 ----
  			$votestring = sprintf(_MD_NUMVOTES,$votes);
  		}
! 		$xoopsTpl->append('file', array('id' => $lid,'rating' => $rating,'title' => $dtitle.$new.$pop,'logourl' => $logourl,'updated' => $datetime,'description' => $description,'adminlink' => $adminlink,'hits' => $hits,'votes' => $votestring, 'comments' => $comments, 'plataform' => $platform,'size'  => $size,'homepage' => $homepage,'version'  => $version,'category'  => $path,'lang_dltimes' => sprintf(_MD_DLTIMES,$hits),'mail_subject' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename'])),'mail_body' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mydownloads/singlelink.php?lid='.$lid)));
  	}
  	$orderby = convertorderbyout($orderby);

Index: xoops_version.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/mydownloads/xoops_version.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** xoops_version.php	5 Jan 2003 19:16:56 -0000	1.2
--- xoops_version.php	9 Jan 2003 15:41:40 -0000	1.3
***************
*** 86,89 ****
--- 86,98 ----
  $modversion['search']['func'] = "mydownloads_search";
  
+ // Comments
+ $modversion['hasComments'] = 1;
+ $modversion['comments']['itemName'] = 'lid';
+ $modversion['comments']['pageName'] = 'singlefile.php';
+ // Comment callback functions
+ $modversion['comments']['callbackFile'] = 'include/comment_functions.php';
+ $modversion['comments']['callback']['approve'] = 'mydownloads_com_approve';
+ $modversion['comments']['callback']['update'] = 'mydownloads_com_update';
+ 
  // Templates
  $modversion['templates'][1]['file'] = 'mydownloads_brokenfile.html';

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

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

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

Modified Files:
	mydownloads_download.html mydownloads_singlefile.html 
Log Message:
comment related additions

Index: mydownloads_download.html
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/mydownloads/templates/mydownloads_download.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mydownloads_download.html	8 Jan 2003 00:05:33 -0000	1.2
--- mydownloads_download.html	9 Jan 2003 15:41:47 -0000	1.3
***************
*** 18,29 ****
    <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>
--- 18,27 ----
    <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.platform}>&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'>
      <div><b><{$lang_ratingc}></b> <{$down.rating}> (<{$down.votes}>)</div>
!     <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> | <a href="<{$xoops_url}>/modules/mydownloads/singlefile.php?lid=<{$down.id}>"><{$lang_comments}> (<{$down.comments}>)</a>
      </td>
    </tr>

Index: mydownloads_singlefile.html
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/mydownloads/templates/mydownloads_singlefile.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mydownloads_singlefile.html	2 Jan 2003 17:36:24 -0000	1.1
--- mydownloads_singlefile.html	9 Jan 2003 15:41:48 -0000	1.2
***************
*** 8,18 ****
  <div>
  <table width="97%" cellspacing="2" cellpadding="2" border="0">
! <tr><td class="newstitle"><{$category_path}></td></tr>
! </table></div>
  <br />
  <table width="100%" cellspacing="0" cellpadding="10" border="0">
! <tr>
! <td width="100%" align="center" valign="top">
      <{include file="db:mydownloads_download.html" down=$file}>   
!   </td></tr>
! </table>
\ No newline at end of file
--- 8,39 ----
  <div>
  <table width="97%" cellspacing="2" cellpadding="2" border="0">
!   <tr>
!     <td class="newstitle"><{$category_path}></td>
!   </tr>
! </table>
! </div>
  <br />
  <table width="100%" cellspacing="0" cellpadding="10" border="0">
!   <tr>
!     <td width="100%" align="center" valign="top">
      <{include file="db:mydownloads_download.html" down=$file}>   
!     </td>
!   </tr>
! </table>
! 
! <div style="text-align: center; padding: 3px; margin:3px;">
!   <{$commentsnav}>
!   <{$lang_notice}>
! </div>
! 
! <div style="margin: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 -->
! </div>
\ No newline at end of file

[Xoops-cvs2] xoops2/include comment_delete.php,1.3,1.4 comment_edit.php,1.1,1.2 comment_new.php,1.2,1.3 comment_post.php,1.1,1.2 comment_reply.php,1.2,1.3 comment_view.php,1.3,1.4

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

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

Modified Files:
	comment_delete.php comment_edit.php comment_new.php 
	comment_post.php comment_reply.php comment_view.php 
Log Message:
comment related additions

Index: comment_delete.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/comment_delete.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** comment_delete.php	7 Jan 2003 22:00:43 -0000	1.3
--- comment_delete.php	9 Jan 2003 15:41:27 -0000	1.4
***************
*** 33,45 ****
  	exit();
  }
! include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
  $accesserror = false;
  if (!is_object($xoopsUser)) {
  	$accesserror = true;
  } else {
! 	if (!$xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
! 			$accesserror = true;
  	}
  }
  if (false != $accesserror) {
  	$ref = xoops_getenv('HTTP_REFERER');
--- 33,66 ----
  	exit();
  }
! 
! if ('system' == $xoopsModule->getVar('dirname')) {
! 	$comment_handler =& xoops_gethandler('comment');
! 	$comment =& $comment_handler->get($com_id);
! 	$module_handler =& xoops_gethandler('module');
! 	$module =& $module_handler->get($comment->getVar('com_modid'));
! 	$comment_config = $module->getInfo('comments');
! 	$com_modid = $module->getVar('mid');
! 	$redirect_page = XOOPS_URL.'/modules/system/admin.php?fct=comments&com_modid='.$com_modid.'&com_itemid';
! 	$moddir = $module->getVar('dirname');
! 	unset($comment);
! } else {
! 	$comment_config = $xoopsModule->getInfo('comments');
! 	$com_modid = $xoopsModule->getVar('mid');
! 	$redirect_page = $comment_config['pageName'].'?'.$comment_config['itemName'];
! 	$moddir = $xoopsModule->getVar('dirname');
! }
! 
  $accesserror = false;
  if (!is_object($xoopsUser)) {
  	$accesserror = true;
  } else {
! 	if (!$xoopsUser->isAdmin($com_modid)) {
! 			$sysperm_handler =& xoops_gethandler('permission', 'systemperm');
! 			if (!$sysperm_handler->checkRight(XOOPS_SYSTEM_COMMENT, $xoopsUser->getGroups(), 'A')) {
! 				$accesserror = true;
! 			}
  	}
  }
+ 
  if (false != $accesserror) {
  	$ref = xoops_getenv('HTTP_REFERER');
***************
*** 47,56 ****
  		redirect_header($ref, 2, _NOPERM);
  	} else {
! 		$comment_config = $xoopsModule->getInfo('comments');
! 		redirect_header($comment_config['pageName'].'?'.$comment_config['itemName'].'='.intval($com_itemid), 2, _NOPERM);
  	}
  	exit();
  }
  
  $op = 'delete';
  if (isset($HTTP_POST_VARS)) {
--- 68,79 ----
  		redirect_header($ref, 2, _NOPERM);
  	} else {
! 		redirect_header($redirect_page.'?'.$comment_config['itemName'].'='.intval($com_itemid), 2, _NOPERM);
  	}
  	exit();
  }
  
+ include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
+ include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
+ 
  $op = 'delete';
  if (isset($HTTP_POST_VARS)) {
***************
*** 67,70 ****
--- 90,94 ----
  
  }
+ 
  switch ($op) {
  case 'delete_one':
***************
*** 77,80 ****
--- 101,132 ----
  		exit();
  	}
+ 
+ 	$com_itemid = $comment->getVar('com_itemid');
+ 
+ 	// execute updateStat callback function if set
+ 	if (isset($comment_config['callback']['update']) && trim($comment_config['callback']['update']) != '') {
+ 		$skip = false;
+ 		if (!function_exists($comment_config['callback']['update'])) {
+ 			if (isset($comment_config['callbackFile'])) {
+ 				$callbackfile = trim($comment_config['callbackFile']);
+ 				if ($callbackfile != '' && file_exists(XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile)) {
+ 					include_once XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile;
+ 				}
+ 				if (!function_exists($comment_config['callback']['update'])) {
+ 					$skip = true;
+ 				}
+ 			} else {
+ 				$skip = true;
+ 			}
+ 		}
+ 		if (!$skip) {
+ 			$criteria = new CriteriaCompo(new Criteria('com_modid', $com_modid));
+ 			$criteria->add(new Criteria('com_itemid', $com_itemid));
+ 			$criteria->add(new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
+ 			$comment_count = $comment_handler->getCount($criteria);
+ 			$comment_config['callback']['update']($com_itemid, $comment_count);
+ 		}
+ 	}
+ 
  	// update user posts if its not an anonymous post
  	if ($comment->getVar('com_uid') != 0) {
***************
*** 126,132 ****
  		exit();
  	}
! 	$com_itemid = $comment->getVar('com_itemid');
! 	$comment_config = $xoopsModule->getInfo('comments');
! 	redirect_header($comment_config['pageName'].'?'.$comment_config['itemName'].'='.$com_itemid.'&com_order='.$com_order.'&com_mode='.$com_mode, 1, _CM_COMDELETED);
  	break;
  
--- 178,182 ----
  		exit();
  	}
! 	redirect_header($redirect_page.'='.$com_itemid.'&com_order='.$com_order.'&com_mode='.$com_mode, 1, _CM_COMDELETED);
  	break;
  
***************
*** 165,173 ****
  		$member_handler->updateUserByField($com_poster, 'posts', $com_poster->getVar('posts') - $post_num);
  	}
  	include XOOPS_ROOT_PATH.'/header.php';
  	xoops_result($msgs);
! 	$com_itemid = $comment->getVar('com_itemid');
! 	$comment_config = $xoopsModule->getInfo('comments');
! 	echo '<br /><a href="'.$comment_config['pageName'].'?'.$comment_config['itemName'].'='.$com_itemid.'&amp;com_order='.$com_order.'&amp;com_mode='.$com_mode.'">'._BACK.'</a>';
  	include XOOPS_ROOT_PATH.'/footer.php';
  	break;
--- 215,249 ----
  		$member_handler->updateUserByField($com_poster, 'posts', $com_poster->getVar('posts') - $post_num);
  	}
+ 
+ 	$com_itemid = $comment->getVar('com_itemid');
+ 
+ 	// execute updateStat callback function if set
+ 	if (isset($comment_config['callback']['update']) && trim($comment_config['callback']['update']) != '') {
+ 		$skip = false;
+ 		if (!function_exists($comment_config['callback']['update'])) {
+ 			if (isset($comment_config['callbackFile'])) {
+ 				$callbackfile = trim($comment_config['callbackFile']);
+ 				if ($callbackfile != '' && file_exists(XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile)) {
+ 					include_once XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile;
+ 				}
+ 				if (!function_exists($comment_config['callback']['update'])) {
+ 					$skip = true;
+ 				}
+ 			} else {
+ 				$skip = true;
+ 			}
+ 		}
+ 		if (!$skip) {
+ 			$criteria = new CriteriaCompo(new Criteria('com_modid', $com_modid));
+ 			$criteria->add(new Criteria('com_itemid', $com_itemid));
+ 			$criteria->add(new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
+ 			$comment_count = $comment_handler->getCount($criteria);
+ 			$comment_config['callback']['update']($com_itemid, $comment_count);
+ 		}
+ 	}
+ 
  	include XOOPS_ROOT_PATH.'/header.php';
  	xoops_result($msgs);
! 	echo '<br /><a href="'.$redirect_page.'='.$com_itemid.'&amp;com_order='.$com_order.'&amp;com_mode='.$com_mode.'">'._BACK.'</a>';
  	include XOOPS_ROOT_PATH.'/footer.php';
  	break;

Index: comment_edit.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/comment_edit.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** comment_edit.php	7 Jan 2003 21:32:42 -0000	1.1
--- comment_edit.php	9 Jan 2003 15:41:28 -0000	1.2
***************
*** 35,42 ****
  include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
  $com_id = isset($HTTP_GET_VARS['com_id']) ? intval($HTTP_GET_VARS['com_id']) : 0;
! if (isset($HTTP_GET_VARS['com_mode'])) {
! 	$com_mode = htmlspecialchars(trim($HTTP_GET_VARS['com_mode']), ENT_QUOTES);
  }
! if (isset($HTTP_GET_VARS['com_order'])) {
  	$com_order = intval($HTTP_GET_VARS['com_order']);
  }
--- 35,53 ----
  include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
  $com_id = isset($HTTP_GET_VARS['com_id']) ? intval($HTTP_GET_VARS['com_id']) : 0;
! $com_mode = isset($HTTP_GET_VARS['com_mode']) ? htmlspecialchars(trim($HTTP_GET_VARS['com_mode']), ENT_QUOTES) : '';
! if ($com_mode == '') {
! 	if (is_object($xoopsUser)) {
! 		$com_mode = $xoopsUser->getVar('umode');
! 	} else {
! 		$com_mode = $xoopsConfig['com_mode'];
! 	}
  }
! if (!isset($HTTP_GET_VARS['com_order'])) {
! 	if (is_object($xoopsUser)) {
! 		$com_order = $xoopsUser->getVar('uorder');
! 	} else {
! 		$com_order = $xoopsConfig['com_order'];
! 	}
! } else {
  	$com_order = intval($HTTP_GET_VARS['com_order']);
  }
***************
*** 54,59 ****
  $com_status = $comment->getVar('com_status');
  $com_rootid = $comment->getVar('com_rootid');
! include XOOPS_ROOT_PATH.'/header.php';
! include XOOPS_ROOT_PATH.'/include/comment_form.php';
! include XOOPS_ROOT_PATH.'/footer.php';
  ?>
--- 65,76 ----
  $com_status = $comment->getVar('com_status');
  $com_rootid = $comment->getVar('com_rootid');
! if ($xoopsModule->getVar('dirname') != 'system') {
! 	include XOOPS_ROOT_PATH.'/header.php';
! 	include XOOPS_ROOT_PATH.'/include/comment_form.php';
! 	include XOOPS_ROOT_PATH.'/footer.php';
! } else {
! 	xoops_cp_header();
! 	include XOOPS_ROOT_PATH.'/include/comment_form.php';
! 	xoops_cp_footer();
! }
  ?>

Index: comment_new.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/comment_new.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** comment_new.php	7 Jan 2003 22:18:47 -0000	1.2
--- comment_new.php	9 Jan 2003 15:41:28 -0000	1.3
***************
*** 50,57 ****
  		$com_title = '';
  	}
! 	if (isset($HTTP_GET_VARS['com_mode'])) {
! 		$com_mode = htmlspecialchars(trim($HTTP_GET_VARS['com_mode']), ENT_QUOTES);
  	}
! 	if (isset($HTTP_GET_VARS['com_order'])) {
  		$com_order = intval($HTTP_GET_VARS['com_order']);
  	}
--- 50,69 ----
  		$com_title = '';
  	}
! 	$com_mode = isset($HTTP_GET_VARS['com_mode']) ? htmlspecialchars(trim($HTTP_GET_VARS['com_mode']), ENT_QUOTES) : '';
! 	if ($com_mode == '') {
! 		if (is_object($xoopsUser)) {
! 			$com_mode = $xoopsUser->getVar('umode');
! 		} else {
! 			$com_mode = $xoopsConfig['com_mode'];
! 		}
  	}
! 	
! 	if (!isset($HTTP_GET_VARS['com_order'])) {
! 		if (is_object($xoopsUser)) {
! 			$com_order = $xoopsUser->getVar('uorder');
! 		} else {
! 			$com_order = $xoopsConfig['com_order'];
! 		}
! 	} else {
  		$com_order = intval($HTTP_GET_VARS['com_order']);
  	}

Index: comment_post.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/comment_post.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** comment_post.php	7 Jan 2003 21:32:46 -0000	1.1
--- comment_post.php	9 Jan 2003 15:41:29 -0000	1.2
***************
*** 35,40 ****
  include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
  include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
! $com_modid = $xoopsModule->getVar('mid');
! $comment_config = $xoopsModule->getInfo('comments');
  $op = '';
  if (isset($HTTP_POST_VARS)) {
--- 35,54 ----
  include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
  include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
! if ('system' == $xoopsModule->getVar('dirname')) {
! 	$comment_handler =& xoops_gethandler('comment');
! 	$comment =& $comment_handler->get($com_id);
! 	$module_handler =& xoops_gethandler('module');
! 	$module =& $module_handler->get($comment->getVar('com_modid'));
! 	$comment_config = $module->getInfo('comments');
! 	$com_modid = $module->getVar('mid');
! 	$redirect_page = XOOPS_URL.'/modules/system/admin.php?fct=comments&amp;com_modid='.$com_modid.'&amp;com_itemid';
! 	$moddir = $module->getVar('dirname');
! 	unset($comment);
! } else {
! 	$comment_config = $xoopsModule->getInfo('comments');
! 	$com_modid = $xoopsModule->getVar('mid');
! 	$redirect_page = $comment_config['pageName'].'?'.$comment_config['itemName'];
! 	$moddir = $xoopsModule->getVar('dirname');
! }
  $op = '';
  if (isset($HTTP_POST_VARS)) {
***************
*** 63,79 ****
  	$doimage = 1;
  	$com_title = $myts->htmlSpecialChars($myts->stripSlashesGPC($com_title));
! 	if ($xoopsUser && $xoopsUser->isAdmin($com_modid)) {
! 		$dohtml = isset($dohtml) ? intval($dohtml) : 0;
! 	} else {
! 		$dohtml = 0;
  	}
  	$p_comment =& $myts->previewTarea($com_text, $dohtml, $dosmiley, $doxcode, $doimage, $dobr);
- 	include XOOPS_ROOT_PATH.'/header.php';
- 	themecenterposts($com_title, $p_comment);
  	$com_icon = isset($com_icon) ? $com_icon : '';
  	$noname = isset($noname) ? intval($noname) : 0;
  	$com_text = $myts->htmlSpecialChars($myts->stripSlashesGPC($com_text));
! 	include XOOPS_ROOT_PATH.'/include/comment_form.php';
! 	include XOOPS_ROOT_PATH.'/footer.php';
  	break;
  case "post":
--- 77,102 ----
  	$doimage = 1;
  	$com_title = $myts->htmlSpecialChars($myts->stripSlashesGPC($com_title));
! 	$dohtml = isset($dohtml) ? intval($dohtml) : 0;
! 	if (!$xoopsUser->isAdmin($com_modid)) {
! 		$sysperm_handler =& xoops_gethandler('permission', 'systemperm');
! 		if (!$sysperm_handler->checkRight(XOOPS_SYSTEM_COMMENT, $xoopsUser->getGroups(), 'A')) {
! 			$dohtml = 0;
! 		}
  	}
  	$p_comment =& $myts->previewTarea($com_text, $dohtml, $dosmiley, $doxcode, $doimage, $dobr);
  	$com_icon = isset($com_icon) ? $com_icon : '';
  	$noname = isset($noname) ? intval($noname) : 0;
  	$com_text = $myts->htmlSpecialChars($myts->stripSlashesGPC($com_text));
! 	if ($xoopsModule->getVar('dirname') != 'system') {
! 		include XOOPS_ROOT_PATH.'/header.php';
! 		themecenterposts($com_title, $p_comment);
! 		include XOOPS_ROOT_PATH.'/include/comment_form.php';
! 		include XOOPS_ROOT_PATH.'/footer.php';
! 	} else {
! 		xoops_cp_header();
! 		themecenterposts($com_title, $p_comment);
! 		include XOOPS_ROOT_PATH.'/include/comment_form.php';
! 		xoops_cp_footer();
! 	}
  	break;
  case "post":
***************
*** 81,107 ****
  	$comment_handler =& xoops_gethandler('comment');
  	$add_userpost = false;
  	if (!empty($com_id)) {
  		$comment =& $comment_handler->get($com_id);
! 		$accesserror = 0;
  		if (is_object($xoopsUser)) {
! 			if (false != $xoopsUser->isAdmin($com_modid)) {
  				$dohtml = (!empty($dohtml)) ? 1 : 0;
! 				if (!empty($com_status) && $com_status != XOOPS_COMMENT_PENDING && $com_status != $comment->getVar('com_status')) {
  					$comment->setVar('com_status', $com_status);
  					// if changing status from pending state, increment user post 
! 					$add_userpost = ($comment->getVar('com_status') != XOOPS_COMMENT_PENDING) ? false : true;
  				}
  			} else {
  				$dohtml = 0;
  				if ($comment->getVar('com_uid') != $xoopsUser->getVar('uid')) {
! 					$accesserror = 1;
  				}
  			}
  		} else {
  			$dohtml = 0;
! 			$accesserror = 1;
  		}
! 		if ($accesserror == 1) {
! 			redirect_header($comment_config['pageName'].'?'.$comment_config['itemName'].'='.$com_itemid.'&amp;com_id='.$com_id.'&amp;com_mode='.$com_mode.'&amp;com_order='.$com_order, 1, _NOPERM);
  			exit();
  		}
--- 104,145 ----
  	$comment_handler =& xoops_gethandler('comment');
  	$add_userpost = false;
+ 	$call_approvefunc = false;
+ 	$call_updatefunc = false;
  	if (!empty($com_id)) {
  		$comment =& $comment_handler->get($com_id);
! 		$accesserror = false;
! 
  		if (is_object($xoopsUser)) {
! 			$sysperm_handler =& xoops_gethandler('permission', 'systemperm');
! 			if ($xoopsUser->isAdmin($com_modid) || $sysperm_handler->checkRight(XOOPS_SYSTEM_COMMENT, $xoopsUser->getGroups(), 'A')) {
  				$dohtml = (!empty($dohtml)) ? 1 : 0;
! 				if (!empty($com_status) && $com_status != XOOPS_COMMENT_PENDING) {
! 					$old_com_status = $comment->getVar('com_status');
  					$comment->setVar('com_status', $com_status);
  					// if changing status from pending state, increment user post 
! 					if (XOOPS_COMMENT_PENDING == $old_com_status) {
! 						$add_userpost = true;
! 						if (XOOPS_COMMENT_ACTIVE == $com_status) {
! 							$call_updatefunc = true;
! 							$call_approvefunc = true;
! 						}
! 					} elseif (XOOPS_COMMENT_HIDDEN == $old_com_status && XOOPS_COMMENT_ACTIVE == $com_status) {
! 						$call_updatefunc = true;
! 					} elseif (XOOPS_COMMENT_ACTIVE == $old_com_status && XOOPS_COMMENT_HIDDEN == $com_status) {
! 						$call_updatefunc = true;
! 					}
  				}
  			} else {
  				$dohtml = 0;
  				if ($comment->getVar('com_uid') != $xoopsUser->getVar('uid')) {
! 					$accesserror = true;
  				}
  			}
  		} else {
  			$dohtml = 0;
! 			$accesserror = true;
  		}
! 		if (false != $accesserror) {
! 			redirect_header($redirect_page.'='.$com_itemid.'&amp;com_id='.$com_id.'&amp;com_mode='.$com_mode.'&amp;com_order='.$com_order, 1, _NOPERM);
  			exit();
  		}
***************
*** 114,121 ****
  		$comment->setVar('com_ip', xoops_getenv('REMOTE_ADDR'));
  		if (is_object($xoopsUser)) {
! 			if (false != $xoopsUser->isAdmin($com_modid)) {
  				$dohtml = (!empty($dohtml)) ? 1 : 0;
  				$comment->setVar('com_status', XOOPS_COMMENT_ACTIVE);
  				$add_userpost = true;
  			} else {
  				$dohtml = 0;
--- 152,162 ----
  		$comment->setVar('com_ip', xoops_getenv('REMOTE_ADDR'));
  		if (is_object($xoopsUser)) {
! 			$sysperm_handler =& xoops_gethandler('permission', 'systemperm');
! 			if ($xoopsUser->isAdmin($com_modid) || $sysperm_handler->checkRight(XOOPS_SYSTEM_COMMENT, $xoopsUser->getGroups(), 'A')) {
  				$dohtml = (!empty($dohtml)) ? 1 : 0;
  				$comment->setVar('com_status', XOOPS_COMMENT_ACTIVE);
  				$add_userpost = true;
+ 				$call_approvefunc = true;
+ 				$call_updatefunc = true;
  			} else {
  				$dohtml = 0;
***************
*** 125,128 ****
--- 166,171 ----
  					$comment->setVar('com_status', XOOPS_COMMENT_ACTIVE);
  					$add_userpost = true;
+ 					$call_approvefunc = true;
+ 					$call_updatefunc = true;
  					break;
  				case XOOPS_COMMENT_APPROVEADMIN:
***************
*** 141,145 ****
  			$uid = 0;
  			if ($xoopsModuleConfig['com_anonpost'] != 1) {
! 				redirect_header($comment_config['pageName'].'?'.$comment_config['itemName'].'='.$com_itemid.'&amp;com_id='.$com_id.'&amp;com_mode='.$com_mode.'&amp;com_order='.$com_order, 1, _NOPERM);
  				exit();
  			}
--- 184,188 ----
  			$uid = 0;
  			if ($xoopsModuleConfig['com_anonpost'] != 1) {
! 				redirect_header($redirect_page.'='.$com_itemid.'&amp;com_id='.$com_id.'&amp;com_mode='.$com_mode.'&amp;com_order='.$com_order, 1, _NOPERM);
  				exit();
  			}
***************
*** 150,153 ****
--- 193,198 ----
  				$comment->setVar('com_status', XOOPS_COMMENT_ACTIVE);
  				$add_userpost = true;
+ 				$call_approvefunc = true;
+ 				$call_updatefunc = true;
  				break;
  			case XOOPS_COMMENT_APPROVEADMIN:
***************
*** 185,188 ****
--- 230,279 ----
  		}
  
+ 		// call custom approve function if any
+ 		if (false != $call_approvefunc && isset($comment_config['callback']['approve']) && trim($comment_config['callback']['approve']) != '') {
+ 			$skip = false;
+ 			if (!function_exists($comment_config['callback']['approve'])) {
+ 				if (isset($comment_config['callbackFile'])) {
+ 					$callbackfile = trim($comment_config['callbackFile']);
+ 					if ($callbackfile != '' && file_exists(XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile)) {
+ 						include_once XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile;
+ 					}
+ 					if (!function_exists($comment_config['callback']['approve'])) {
+ 						$skip = true;
+ 					}
+ 				} else {
+ 					$skip = true;
+ 				}
+ 			}
+ 			if (!$skip) {
+ 				$comment_config['callback']['approve']($comment);
+ 			}
+ 		}
+ 
+ 		// call custom update function if any
+ 		if (false != $call_updatefunc && isset($comment_config['callback']['update']) && trim($comment_config['callback']['update']) != '') {
+ 			$skip = false;
+ 			if (!function_exists($comment_config['callback']['update'])) {
+ 				if (isset($comment_config['callbackFile'])) {
+ 					$callbackfile = trim($comment_config['callbackFile']);
+ 					if ($callbackfile != '' && file_exists(XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile)) {
+ 						include_once XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile;
+ 					}
+ 					if (!function_exists($comment_config['callback']['update'])) {
+ 						$skip = true;
+ 					}
+ 				} else {
+ 					$skip = true;
+ 				}
+ 			}
+ 			if (!$skip) {
+ 				$criteria = new CriteriaCompo(new Criteria('com_modid', $com_modid));
+ 				$criteria->add(new Criteria('com_itemid', $com_itemid));
+ 				$criteria->add(new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
+ 				$comment_count = $comment_handler->getCount($criteria);
+ 				$comment_config['callback']['update']($com_itemid, $comment_count);
+ 			}
+ 		}
+ 
  		// increment user post if needed
  		$uid = $comment->getVar('com_uid');
***************
*** 193,202 ****
  		}
  
! 		// if aproved, redirect to posted comment
  		if ($comment->getVar('com_status') == XOOPS_COMMENT_ACTIVE) {
! 			redirect_header($comment_config['pageName'].'?'.$comment_config['itemName'].'='.$com_itemid.'&amp;com_id='.$newcid.'&amp;com_rootid='.$com_rootid.'&amp;com_mode='.$com_mode.'&amp;com_order='.$com_order.'#'.$newcid, 2, _CM_THANKSPOST);
  		} else {
! 			// not approved yet, to redirect to top comment page
! 			redirect_header($comment_config['pageName'].'?'.$comment_config['itemName'].'='.$com_itemid.'&amp;com_mode='.$com_mode.'&amp;com_order='.$com_order.'#'.$newcid, 2, _CM_THANKSPOST);
  		}
  	} else {
--- 284,293 ----
  		}
  
! 		// if the comment is active, redirect to posted comment
  		if ($comment->getVar('com_status') == XOOPS_COMMENT_ACTIVE) {
! 			redirect_header($redirect_page.'='.$com_itemid.'&amp;com_id='.$newcid.'&amp;com_rootid='.$com_rootid.'&amp;com_mode='.$com_mode.'&amp;com_order='.$com_order.'#'.$newcid, 2, _CM_THANKSPOST);
  		} else {
! 			// not active, so redirect to top comment page
! 			redirect_header($redirect_page.'='.$com_itemid.'&amp;com_mode='.$com_mode.'&amp;com_order='.$com_order.'#'.$newcid, 2, _CM_THANKSPOST);
  		}
  	} else {

Index: comment_reply.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/comment_reply.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** comment_reply.php	7 Jan 2003 22:53:49 -0000	1.2
--- comment_reply.php	9 Jan 2003 15:41:30 -0000	1.3
***************
*** 35,42 ****
  include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
  $com_id = isset($HTTP_GET_VARS['com_id']) ? intval($HTTP_GET_VARS['com_id']) : 0;
! if (isset($HTTP_GET_VARS['com_mode'])) {
! 	$com_mode = htmlspecialchars(trim($HTTP_GET_VARS['com_mode']), ENT_QUOTES);
  }
! if (isset($HTTP_GET_VARS['com_order'])) {
  	$com_order = intval($HTTP_GET_VARS['com_order']);
  }
--- 35,53 ----
  include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
  $com_id = isset($HTTP_GET_VARS['com_id']) ? intval($HTTP_GET_VARS['com_id']) : 0;
! $com_mode = isset($HTTP_GET_VARS['com_mode']) ? htmlspecialchars(trim($HTTP_GET_VARS['com_mode']), ENT_QUOTES) : '';
! if ($com_mode == '') {
! 	if (is_object($xoopsUser)) {
! 		$com_mode = $xoopsUser->getVar('umode');
! 	} else {
! 		$com_mode = $xoopsConfig['com_mode'];
! 	}
  }
! if (!isset($HTTP_GET_VARS['com_order'])) {
! 	if (is_object($xoopsUser)) {
! 		$com_order = $xoopsUser->getVar('uorder');
! 	} else {
! 		$com_order = $xoopsConfig['com_order'];
! 	}
! } else {
  	$com_order = intval($HTTP_GET_VARS['com_order']);
  }

Index: comment_view.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/comment_view.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** comment_view.php	8 Jan 2003 18:32:53 -0000	1.3
--- comment_view.php	9 Jan 2003 15:41:31 -0000	1.4
***************
*** 35,39 ****
  include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
  include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
- $com_modid = $xoopsModule->getVar('mid');
  $comment_config = $xoopsModule->getInfo('comments');
  $com_itemid = (trim($comment_config['itemName']) != '' && isset($HTTP_GET_VARS[$comment_config['itemName']])) ? intval($HTTP_GET_VARS[$comment_config['itemName']]) : 0;
--- 35,38 ----
***************
*** 66,70 ****
  	}
  	// admins can view all comments and IPs, others can only view approved(active) comments
! 	if (is_object($xoopsUser) && $xoopsUser->isAdmin($com_modid)) {
  		$admin_view = true;
  	} else {
--- 65,69 ----
  	}
  	// admins can view all comments and IPs, others can only view approved(active) comments
! 	if (is_object($xoopsUser) && $xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
  		$admin_view = true;
  	} else {
***************
*** 77,81 ****
  	$comment_handler =& xoops_gethandler('comment');
  	if ($com_mode == 'flat') {
! 		$comments =& $comment_handler->getByItemId($com_modid, $com_itemid, $db_order);
  		include_once XOOPS_ROOT_PATH.'/class/commentrenderer.php';
  		$renderer =& XoopsCommentRenderer::instance($xoopsTpl);
--- 76,80 ----
  	$comment_handler =& xoops_gethandler('comment');
  	if ($com_mode == 'flat') {
! 		$comments =& $comment_handler->getByItemId($xoopsModule->getVar('mid'), $com_itemid, $db_order);
  		include_once XOOPS_ROOT_PATH.'/class/commentrenderer.php';
  		$renderer =& XoopsCommentRenderer::instance($xoopsTpl);
***************
*** 95,99 ****
  		} else {
  			// Show all threads
! 			$top_comments =& $comment_handler->getTopComments($com_modid, $com_itemid, $db_order);
  			$c_count = count($top_comments);
  			if (is_array($top_comments) && $c_count> 0) {
--- 94,98 ----
  		} else {
  			// Show all threads
! 			$top_comments =& $comment_handler->getTopComments($xoopsModule->getVar('mid'), $com_itemid, $db_order);
  			$c_count = count($top_comments);
  			if (is_array($top_comments) && $c_count> 0) {
***************
*** 113,117 ****
  	} else {
  		// Show all threads
! 		$top_comments =& $comment_handler->getTopComments($com_modid, $com_itemid, $db_order);
  		$c_count = count($top_comments);
  		if (is_array($top_comments) && $c_count> 0) {
--- 112,116 ----
  	} else {
  		// Show all threads
! 		$top_comments =& $comment_handler->getTopComments($xoopsModule->getVar('mid'), $com_itemid, $db_order);
  		$c_count = count($top_comments);
  		if (is_array($top_comments) && $c_count> 0) {

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

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

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

Modified Files:
	admin.php modinfo.php 
Log Message:
comment related additions

Index: admin.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/system/language/english/admin.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** admin.php	2 Jan 2003 20:23:37 -0000	1.1
--- admin.php	9 Jan 2003 15:42:07 -0000	1.2
***************
*** 20,22 ****
--- 20,23 ----
  define('_MD_AM_AVATARS', 'Avatars');
  define('_MD_AM_THEMES', 'Themes');
+ define('_MD_AM_COMMENTS', 'Comments');
  ?>

Index: modinfo.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/system/language/english/modinfo.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** modinfo.php	2 Jan 2003 20:23:37 -0000	1.1
--- modinfo.php	9 Jan 2003 15:42:08 -0000	1.2
***************
*** 35,37 ****
--- 35,38 ----
  define("_MI_SYSTEM_ADMENU14", "Avatars");
  define("_MI_SYSTEM_ADMENU15", "Themes");
+ define("_MI_SYSTEM_ADMENU16", "Comments");
  ?>

[Xoops-cvs2] xoops2/modules/system constants.php,1.1,1.2 menu.php,1.1,1.2

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

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

Modified Files:
	constants.php menu.php 
Log Message:
comment related additions

Index: constants.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/system/constants.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** constants.php	2 Jan 2003 19:52:41 -0000	1.1
--- constants.php	9 Jan 2003 15:42:05 -0000	1.2
***************
*** 13,15 ****
--- 13,16 ----
  define('XOOPS_SYSTEM_SMILE', 12);
  define('XOOPS_SYSTEM_BANNER', 13);
+ define('XOOPS_SYSTEM_COMMENT', 14);
  ?>

Index: menu.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/system/menu.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** menu.php	2 Jan 2003 19:52:41 -0000	1.1
--- menu.php	9 Jan 2003 15:42:07 -0000	1.2
***************
*** 56,58 ****
--- 56,60 ----
  $adminmenu[12]['title'] = _MI_SYSTEM_ADMENU15;
  $adminmenu[12]['link'] = "admin.php?fct=themes";
+ $adminmenu[13]['title'] = _MI_SYSTEM_ADMENU16;
+ $adminmenu[13]['link'] = "admin.php?fct=comments";
  ?>

[Xoops-cvs2] xoops2/modules/mylinks 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.2,1.3 singlelink.php,1.2,1.3 submit.php,1.4,1.5 viewcat.php,1.2,1.3 xoops_version.php,1.2,1.3

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

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

Modified Files:
	index.php singlelink.php submit.php viewcat.php 
	xoops_version.php 
Added Files:
	comment_delete.php comment_edit.php comment_new.php 
	comment_post.php comment_reply.php 
Log Message:
comment related additions

--- NEW FILE: comment_delete.php ---
<?php
// $Id: comment_delete.php,v 1.1 2003/01/09 15:41:56 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/09 15:41: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/09 15:42:01 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/09 15:42:01 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/09 15:42:01 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/mylinks/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.php	6 Jan 2003 19:57:33 -0000	1.2
--- index.php	9 Jan 2003 15:41:50 -0000	1.3
***************
*** 97,100 ****
--- 97,101 ----
  $xoopsTpl->assign('lang_category' , _MD_CATEGORYC);
  $xoopsTpl->assign('lang_visit' , _MD_VISIT);
+ $xoopsTpl->assign('lang_comments' , _COMMENTS);
  
  $result = $xoopsDB->query("SELECT l.lid, l.cid, l.title, l.url, l.email, l.logourl, l.status, l.date, l.hits, l.rating, l.votes, l.comments, t.description FROM ".$xoopsDB->prefix("mylinks_links")." l, ".$xoopsDB->prefix("mylinks_text")." t where l.status>0 and l.lid=t.lid ORDER BY date DESC", $xoopsModuleConfig['newlinks'], 0);
***************
*** 115,119 ****
  	$new = newlinkgraphic($time, $status);
  	$pop = popgraphic($hits);
! 	$xoopsTpl->append('links', array('id' => $lid, 'rating' => number_format($rating, 2), 'title' => $myts->makeTboxData4Show($ltitle).$new.$pop, 'email' => $myts->makeTboxData4Show($email), 'category' => $path, 'logourl' => $myts->makeTboxData4Show($logourl), 'updated' => formatTimestamp($time,"m"), 'description' => $myts->makeTareaData4Show($description,0), 'adminlink' => $adminlink, 'hits' => $hits, 'votes' => $votestring, 'mail_subject' => rawurlencode(sprintf(_MD_INTRESTLINK,$xoopsConfig['sitename'])), 'mail_body' => rawurlencode(sprintf(_MD_INTLINKFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mylinks/singlelink.php?lid='.$lid)));
  }
  include XOOPS_ROOT_PATH.'/footer.php';
--- 116,120 ----
  	$new = newlinkgraphic($time, $status);
  	$pop = popgraphic($hits);
! 	$xoopsTpl->append('links', array('id' => $lid, 'rating' => number_format($rating, 2), 'title' => $myts->makeTboxData4Show($ltitle).$new.$pop, 'email' => $myts->makeTboxData4Show($email), 'category' => $path, 'logourl' => $myts->makeTboxData4Show($logourl), 'updated' => formatTimestamp($time,"m"), 'description' => $myts->makeTareaData4Show($description,0), 'adminlink' => $adminlink, 'hits' => $hits, 'votes' => $votestring, 'comments' => $comments, 'mail_subject' => rawurlencode(sprintf(_MD_INTRESTLINK,$xoopsConfig['sitename'])), 'mail_body' => rawurlencode(sprintf(_MD_INTLINKFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mylinks/singlelink.php?lid='.$lid)));
  }
  include XOOPS_ROOT_PATH.'/footer.php';

Index: singlelink.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/mylinks/singlelink.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** singlelink.php	6 Jan 2003 19:57:35 -0000	1.2
--- singlelink.php	9 Jan 2003 15:41:51 -0000	1.3
***************
*** 62,66 ****
  $new = newlinkgraphic($time, $status);
  $pop = popgraphic($hits);
! $xoopsTpl->assign('link', array('id' => $lid, 'rating' => number_format($rating, 2), 'title' => $myts->makeTboxData4Show($ltitle).$new.$pop, 'email' => $myts->makeTboxData4Show($email), 'category' => $path, 'logourl' => $myts->makeTboxData4Show($logourl), 'updated' => formatTimestamp($time,"m"), 'description' => $myts->makeTareaData4Show($description,0), 'adminlink' => $adminlink, 'hits' => $hits, 'votes' => $votestring, 'mail_subject' => rawurlencode(sprintf(_MD_INTRESTLINK,$xoopsConfig['sitename'])), 'mail_body' => rawurlencode(sprintf(_MD_INTLINKFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mylinks/singlelink.php?lid='.$lid)));
  $xoopsTpl->assign('lang_description', _MD_DESCRIPTIONC);
  $xoopsTpl->assign('lang_lastupdate', _MD_LASTUPDATEC);
--- 62,66 ----
  $new = newlinkgraphic($time, $status);
  $pop = popgraphic($hits);
! $xoopsTpl->assign('link', array('id' => $lid, 'rating' => number_format($rating, 2), 'title' => $myts->makeTboxData4Show($ltitle).$new.$pop, 'email' => $myts->makeTboxData4Show($email), 'category' => $path, 'logourl' => $myts->makeTboxData4Show($logourl), 'updated' => formatTimestamp($time,"m"), 'description' => $myts->makeTareaData4Show($description,0), 'adminlink' => $adminlink, 'hits' => $hits, 'votes' => $votestring, 'comments' => $comments, 'mail_subject' => rawurlencode(sprintf(_MD_INTRESTLINK,$xoopsConfig['sitename'])), 'mail_body' => rawurlencode(sprintf(_MD_INTLINKFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mylinks/singlelink.php?lid='.$lid)));
  $xoopsTpl->assign('lang_description', _MD_DESCRIPTIONC);
  $xoopsTpl->assign('lang_lastupdate', _MD_LASTUPDATEC);
***************
*** 74,77 ****
--- 74,79 ----
  $xoopsTpl->assign('lang_category' , _MD_CATEGORYC);
  $xoopsTpl->assign('lang_visit' , _MD_VISIT);
+ $xoopsTpl->assign('lang_comments' , _COMMENTS);
+ include XOOPS_ROOT_PATH.'/include/comment_view.php';
  include XOOPS_ROOT_PATH.'/footer.php';
  ?>

Index: submit.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/mylinks/submit.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** submit.php	6 Jan 2003 19:57:41 -0000	1.4
--- submit.php	9 Jan 2003 15:41:52 -0000	1.5
***************
*** 104,108 ****
  	$xoopsTpl->assign('lang_category', _MD_CATEGORYC);
  	$xoopsTpl->assign('lang_contactemail', _MD_CONTACTEMAIL);
! 	$xoopsTpl->assign('lang_description', _MD_DESCRIPTION);
  	$xoopsTpl->assign('lang_submit', _SUBMIT);
  	$xoopsTpl->assign('lang_cancel', _CANCEL);
--- 104,108 ----
  	$xoopsTpl->assign('lang_category', _MD_CATEGORYC);
  	$xoopsTpl->assign('lang_contactemail', _MD_CONTACTEMAIL);
! 	$xoopsTpl->assign('lang_description', _MD_DESCRIPTIONC);
  	$xoopsTpl->assign('lang_submit', _SUBMIT);
  	$xoopsTpl->assign('lang_cancel', _CANCEL);

Index: viewcat.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/mylinks/viewcat.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** viewcat.php	6 Jan 2003 19:57:44 -0000	1.2
--- viewcat.php	9 Jan 2003 15:41:53 -0000	1.3
***************
*** 114,117 ****
--- 114,118 ----
          $xoopsTpl->assign('lang_visit' , _MD_VISIT);
          $xoopsTpl->assign('show_links', true);
+ 		$xoopsTpl->assign('lang_comments' , _COMMENTS);
          $q = "select l.lid, l.cid, l.title, l.url, l.email, l.logourl, l.status, l.date, l.hits, l.rating, l.votes, l.comments, t.description from ".$xoopsDB->prefix("mylinks_links")." l, ".$xoopsDB->prefix("mylinks_text")." t where cid=$cid and l.lid=t.lid and status>0 order by $orderby";
          $result=$xoopsDB->query($q,$show,$min);
***************
*** 144,148 ****
                  $new = newlinkgraphic($time, $status);
                  $pop = popgraphic($hits);
!                 $xoopsTpl->append('links', array('id' => $lid, 'rating' => number_format($rating, 2), 'title' => $myts->makeTboxData4Show($ltitle).$new.$pop, 'email' => $myts->makeTboxData4Show($email), 'category' => $path, 'logourl' => $myts->makeTboxData4Show($logourl), 'updated' => formatTimestamp($time,"m"), 'description' => $myts->makeTareaData4Show($description,0), 'adminlink' => $adminlink, 'hits' => $hits, 'votes' => $votestring, 'mail_subject' => rawurlencode(sprintf(_MD_INTRESTLINK,$xoopsConfig['sitename'])), 'mail_body' => rawurlencode(sprintf(_MD_INTLINKFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mylinks/singlelink.php?lid='.$lid)));
             }
             $orderby = convertorderbyout($orderby);
--- 145,149 ----
                  $new = newlinkgraphic($time, $status);
                  $pop = popgraphic($hits);
!                 $xoopsTpl->append('links', array('id' => $lid, 'rating' => number_format($rating, 2), 'title' => $myts->makeTboxData4Show($ltitle).$new.$pop, 'email' => $myts->makeTboxData4Show($email), 'category' => $path, 'logourl' => $myts->makeTboxData4Show($logourl), 'updated' => formatTimestamp($time,"m"), 'description' => $myts->makeTareaData4Show($description,0), 'adminlink' => $adminlink, 'hits' => $hits, 'comments' => $comments, 'votes' => $votestring, 'mail_subject' => rawurlencode(sprintf(_MD_INTRESTLINK,$xoopsConfig['sitename'])), 'mail_body' => rawurlencode(sprintf(_MD_INTLINKFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mylinks/singlelink.php?lid='.$lid)));
             }
             $orderby = convertorderbyout($orderby);

Index: xoops_version.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/mylinks/xoops_version.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** xoops_version.php	5 Jan 2003 19:17:59 -0000	1.2
--- xoops_version.php	9 Jan 2003 15:41:54 -0000	1.3
***************
*** 84,87 ****
--- 84,96 ----
  $modversion['search']['func'] = "mylinks_search";
  
+ // Comments
+ $modversion['hasComments'] = 1;
+ $modversion['comments']['itemName'] = 'lid';
+ $modversion['comments']['pageName'] = 'singlelink.php';
+ // Comment callback functions
+ $modversion['comments']['callbackFile'] = 'include/comment_functions.php';
+ $modversion['comments']['callback']['approve'] = 'mylinks_com_approve';
+ $modversion['comments']['callback']['update'] = 'mylinks_com_update';
+ 
  // Templates
  $modversion['templates'][1]['file'] = 'mylinks_brokenlink.html';

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

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

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

Modified Files:
	systemperm.php 
Log Message:
comment related additions

Index: systemperm.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/kernel/permission/handler/systemperm.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** systemperm.php	2 Jan 2003 16:41:35 -0000	1.1
--- systemperm.php	9 Jan 2003 15:41:32 -0000	1.2
***************
*** 33,36 ****
--- 33,37 ----
  
  require_once XOOPS_ROOT_PATH.'/kernel/permission/handler/permission.php';
+ require_once XOOPS_ROOT_PATH.'/modules/system/constants.php';
  
  class XoopsSystemPermHandler extends XoopsGroupPermHandler

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

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

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

Modified Files:
	mylinks_link.html mylinks_singlelink.html 
Log Message:
comment related additions

Index: mylinks_link.html
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/mylinks/templates/mylinks_link.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mylinks_link.html	8 Jan 2003 00:10:11 -0000	1.2
--- mylinks_link.html	9 Jan 2003 15:42:02 -0000	1.3
***************
*** 15,23 ****
    </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>
  </table>
--- 15,22 ----
    </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>&nbsp;&nbsp;<{$lang_rating}></b><{$link.rating}> (<{$link.votes}>)</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> | <a href="<{$xoops_url}>/modules/mylinks/singlelink.php?lid=<{$link.id}>"><{$lang_comments}> (<{$link.comments}>)</a></td>
    </tr>
  </table>

Index: mylinks_singlelink.html
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/mylinks/templates/mylinks_singlelink.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mylinks_singlelink.html	2 Jan 2003 17:51:54 -0000	1.1
--- mylinks_singlelink.html	9 Jan 2003 15:42:04 -0000	1.2
***************
*** 22,23 ****
--- 22,40 ----
    </tr>
  </table>
+ 
+ <div style="text-align: center; padding: 3px; margin:3px;">
+   <{$commentsnav}>
+   <{$lang_notice}>
+ </div>
+ 
+ <div style="margin: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 -->
+ </div>
\ No newline at end of file

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

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

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

Added Files:
	comments.php 
Log Message:
comment related additions

--- NEW FILE: comments.php ---
<?php
// $Id
//%%%%%% Comment Manager %%%%%
define('_MD_AM_COMMMAN','Comment Manager');

define('_MD_AM_LISTCOMM','List Comments');
define('_MD_AM_ALLMODS','All modules');
define('_MD_AM_ALLSTATUS','Any status');
define('_MD_AM_MODULE','Module');
define('_MD_AM_COMFOUND','%s comment(s) found.');

?>

[Xoops-cvs2] xoops2/modules/mylinks/include comment_functions.php,NONE,1.1

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

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

Added Files:
	comment_functions.php 
Log Message:
comment related additions

--- NEW FILE: comment_functions.php ---
<?php
// comment callback functions

function mylinks_com_update($link_id, $total_num){
	$db =& Database::getInstance();
	$sql = 'UPDATE '.$db->prefix('mylinks_links').' SET comments = '.$total_num.' WHERE lid = '.$link_id;
	$db->query($sql);
}

function mylinks_com_approve(&$comment){
	// notification mail here
}
?>

[Xoops-cvs2] xoops2/modules/mydownloads/include comment_functions.php,NONE,1.1

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

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

Added Files:
	comment_functions.php 
Log Message:
comment related additions

--- NEW FILE: comment_functions.php ---
<?php
// comment callback functions

function mydownloads_com_update($download_id, $total_num){
	$db =& Database::getInstance();
	$sql = 'UPDATE '.$db->prefix('mydownloads_downloads').' SET comments = '.$total_num.' WHERE lid = '.$download_id;
	$db->query($sql);
}

function mydownloads_com_approve(&$comment){
	// notification mail here
}
?>

[Xoops-cvs2] xoops2/modules/xoopsmembers/language/tchinese blocks.php,1.1,NONE index.html,1.1,NONE main.php,1.1,NONE modinfo.php,1.1,NONE

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

Update of /cvsroot/xoops/xoops2/modules/xoopsmembers/language/tchinese
In directory sc8-pr-cvs1:/tmp/cvs-serv18976/modules/xoopsmembers/language/tchinese

Removed Files:
	blocks.php index.html main.php modinfo.php 
Log Message:
removed waiting the translations

--- blocks.php DELETED ---

--- index.html DELETED ---

--- main.php DELETED ---

--- modinfo.php DELETED ---

[Xoops-cvs2] xoops2/modules/xoopsmembers/language/schinese blocks.php,1.1,NONE index.html,1.1,NONE main.php,1.1,NONE modinfo.php,1.1,NONE

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

Update of /cvsroot/xoops/xoops2/modules/xoopsmembers/language/schinese
In directory sc8-pr-cvs1:/tmp/cvs-serv18976/modules/xoopsmembers/language/schinese

Removed Files:
	blocks.php index.html main.php modinfo.php 
Log Message:
removed waiting the translations

--- blocks.php DELETED ---

--- index.html DELETED ---

--- main.php DELETED ---

--- modinfo.php DELETED ---

[Xoops-cvs2] xoops2/modules/xoopsmembers/language/nederlands blocks.php,1.1,NONE index.html,1.1,NONE main.php,1.1,NONE modinfo.php,1.1,NONE

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

Update of /cvsroot/xoops/xoops2/modules/xoopsmembers/language/nederlands
In directory sc8-pr-cvs1:/tmp/cvs-serv18976/modules/xoopsmembers/language/nederlands

Removed Files:
	blocks.php index.html main.php modinfo.php 
Log Message:
removed waiting the translations

--- blocks.php DELETED ---

--- index.html DELETED ---

--- main.php DELETED ---

--- modinfo.php DELETED ---

[Xoops-cvs2] xoops2/modules/xoopsmembers/language/italian blocks.php,1.1,NONE index.html,1.1,NONE main.php,1.1,NONE modinfo.php,1.1,NONE

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

Update of /cvsroot/xoops/xoops2/modules/xoopsmembers/language/italian
In directory sc8-pr-cvs1:/tmp/cvs-serv18976/modules/xoopsmembers/language/italian

Removed Files:
	blocks.php index.html main.php modinfo.php 
Log Message:
removed waiting the translations

--- blocks.php DELETED ---

--- index.html DELETED ---

--- main.php DELETED ---

--- modinfo.php DELETED ---

[Xoops-cvs2] xoops2/modules/xoopsmembers/language/danish blocks.php,1.1,NONE index.html,1.1,NONE main.php,1.1,NONE modinfo.php,1.1,NONE

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

Update of /cvsroot/xoops/xoops2/modules/xoopsmembers/language/danish
In directory sc8-pr-cvs1:/tmp/cvs-serv18976/modules/xoopsmembers/language/danish

Removed Files:
	blocks.php index.html main.php modinfo.php 
Log Message:
removed waiting the translations

--- blocks.php DELETED ---

--- index.html DELETED ---

--- main.php DELETED ---

--- modinfo.php DELETED ---

[Xoops-cvs2] xoops2/language/german/mail_template activated.tpl,NONE,1.1 adminactivate.tpl,NONE,1.1 lostpass1.tpl,NONE,1.1 lostpass2.tpl,NONE,1.1 register.tpl,NONE,1.1 tellfriend.tpl,NONE,1.1

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

Update of /cvsroot/xoops/xoops2/language/german/mail_template
In directory sc8-pr-cvs1:/tmp/cvs-serv16056

Added Files:
	activated.tpl adminactivate.tpl lostpass1.tpl lostpass2.tpl 
	register.tpl tellfriend.tpl 
Log Message:
added the german lang

--- NEW FILE: activated.tpl ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: adminactivate.tpl ---
Hallo {X_UNAME},

Das neue Mitglied {USERNAME} ({USEREMAIL}) hat sich gerade auf {SITENAME} 
registriert.

Wenn Sie unten auf den Link klicken, wird dieser Account aktiviert.

{USERACTLINK}

-----------
{SITENAME} ({SITEURL}) 
webmaster
{ADMINMAIL}
--- NEW FILE: lostpass1.tpl ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: lostpass2.tpl ---
Hallo {X_UNAME},

ein Besucher von {IP} hat gerade ein neues Passwort angefordert.
Hier sind Ihre Login-Daten von {SITENAME}.

Username: {X_UNAME}
Neues Passwort: {NEWPWD}

Nach dem Login können Sie Ihr Passwort auf {SITEURL}user.php ändern.

Sollten Sie kein neues Passwort angefordert haben, ist die sicherlich ein
Versehen. Nur Sie erhalten diese Nachricht.

Wenn dies ein Fehler sein sollte, bitten wir, diesen zu entschuldigen, aber 
bitte nutzten Sie die neuen Login-Daten um sich anzumelden (!).

-----------
{SITENAME} ({SITEURL}) 
webmaster
{ADMINMAIL}
--- NEW FILE: register.tpl ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: tellfriend.tpl ---
Guten Tag {FRIEND_NAME},

Ihrem Freund {YOUR_NAME} gefiehl unsere Webseite und er wollte Sie unbedingt
an Sie weiterempfehlen.

Site Name: {SITENAME}
Site URL:  {SITEURL}

-----------
{SITENAME} ({SITEURL}) 
webmaster
{ADMINMAIL}

[Xoops-cvs2] xoops2/language/german admin.php,NONE,1.1 comment.php,NONE,1.1 global.php,NONE,1.1 index.html,NONE,1.1 misc.php,NONE,1.1 pmsg.php,NONE,1.1 search.php,NONE,1.1 timezone.php,NONE,1.1 user.php,NONE,1.1

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

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

Added Files:
	admin.php comment.php global.php index.html misc.php pmsg.php 
	search.php timezone.php user.php 
Log Message:
added the german lang

--- NEW FILE: admin.php ---
<?php
// $Id: admin.php,v 1.1 2003/01/09 15:26:24 w4z004 Exp $
//%%%%%%	File Name  admin.php 	%%%%%
define("_AD_NORIGHT","Sie haben nicht die erforderlichen Rechte, um diesen Bereich zu betreten");
define("_AD_ACTION","Funktionen:");
define("_AD_EDIT","Ändern");
define("_AD_DELETE","Löschen");
define("_AD_LASTTENUSERS","Die 10 zuletzt registrierten Mitglieder:");
define("_AD_NICKNAME","Nickname:");
define("_AD_EMAIL","Email:");
define("_AD_AVATAR","Avatar:");
define("_AD_REGISTERED","Registriert am:"); //Registered Date
define('_AD_PRESSGEN', 'Dies ist das erste Mal, dass Sie den Admin-Bereich betreten. Bitte klicken Sie auf "Weiter", um fortzufahren.');
define('_AD_LOGINADMIN', 'LOGIN..');
?>
--- NEW FILE: comment.php ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: global.php ---
<?php
// $Id: global.php,v 1.1 2003/01/09 15:26:30 w4z004 Exp $
//%%%%%%	File Name mainfile.php 	%%%%%
define("_PLEASEWAIT","Bitte Warten");
define("_FETCHING","Loading...");
define("_TAKINGBACK","Gehen Sie bitte noch einmal zurück von woher Sie gekommen sind....");
define("_YOURNAME","Ihr Name");
define("_LOGOUT","Logout");
define("_SUBJECT","Thema");
define("_MESSAGEICON","Nachrichten Symbol");
define("_COMMENT","Kommentar");
define("_ALLOWEDHTML","erlaubtes HTML:");
define("_POSTANON","Anonym schreiben");
define("_DISABLESMILEY","Smilies deaktivieren");
define("_DISABLEHTML","HTML deaktivieren");
define("_PREVIEW","Vorschau");
define("_POSTCOMMENT","Kommentar schreiben");
define("_GO","weiter!");
define("_NOCOMMENTS","Keine Antworten");
define("_FLAT","Flach");
define("_THREADED","Thread");
define("_OLDESTFIRST","Älteste zuerst");
define("_NEWESTFIRST","Neuste zuerst");
define("_REFRESH","Aktualisieren");
define("_MORE","mehr...");
define("_IFNOTRELOAD","Wenn die Seite nicht automatisch neu lädt, klicken Sie bitte <a href=%s>Hier</a>");
define("_WARNINSTALL2","WARNUNG: Das Verzeichnis %s existiert noch auf dem Server. Entfernen Sie bitte dieses Verzeichnis aus Sicherheitsgründen.");
define("_WARNINWRITEABLE","WARNUNG: Die Datei %s ist nicht schreibgeschützt auf dem Server. <br />Bitte setzen Sie die Zugriffsrechte richtig. Ansonsten wird das zu einem Sicherheitsrisiko!<br /> (unter Unix (444), unter Win32 (read-only))");

//%%%%%%	File Name themeuserpost.php 	%%%%%
define("_THREAD","Thread");
define("_POSTER","Autor");
define("_JOINED","Mitglied seit: ");
define("_POSTS","Beiträge: ");
define("_FROM","Aus: ");
define("_POSTED","geschrieben am: "); // Posted date
define("_PROFILE","Profil");
define("_VISITWEBSITE","Homepage");
define("_SENDPMTO","Private Nachricht schreiben an %s");
define("_SENDEMAILTO","Email schreiben an %s");
define("_ADDTOLIST","Hinzufügen zu Ihrer Kontaktliste von ICQ");
define("_ADD","Hinzufügen");
define("_REPLY","Antworten");
define("_EDITTHISPOST","diesen Beitrag ändern");
define("_DELETETHISPOST","diesen Beitrag löschen");
define("_POSTEDBY","Geschrieben von");
define("_DATE","am");   // Posted date
define("_REPLIES","Antworten");
define("_PARENT","Parent");
define("_TOP","Oben");
define("_BOTTOM","Unten");
define("_ONLINE","Online!");
define('_NUMCOMMENTS', "%s Kommentare");
define('_UPDATED', "Aktualisiert");
define("_CANCEL","Abbrechen");
define("_ASCENDING","Ascending order");
define("_DESCENDING","Descending order");
define("_RATING","Bewertung");
define("_VIEWS","Views");
define("_COMMENTS",'Kommentare');


//%%%%%%	File Name admin_functions.php 	%%%%%
define("_MAIN","Startseite");
define("_MANUAL","Hilfe");
define("_INFO","Info");
define("_CPHOME","Einstellungen-Indexseite");
define("_YOURHOME","Zurück zur Homepage");

//%%%%%%	File Name misc.php (who's-online popup)	%%%%%
define("_WHOSONLINE","Wer ist Online?");
define('_GUESTS', 'Gäste');
define('_MEMBERS', 'Mitglieder');
define("_ONLINEPHRASE","<b>%s</b> Besucher online");
define("_ONLINEPHRASEX","davon <b>%s</b> Besucher in <b>%s</b>");
define("_CLOSE","Schliessen");  // Close window

//%%%%%%	File Name misc.php (avatars popup)	%%%%%
define("_AVAVATARS","vorhandene Avatars");
define("_SELECT","Auswählen");

//%%%%%%	File Name misc.php (smiles popup)	%%%%%
define("_SMILIES","Smilies");
define("_CLICKASMILIE","Klicken Sie bitte ein Smilie an, um es in Ihrer Nachricht einzusetzen.");
define("_CODE","Code");
define("_EMOTION","Emotion");
define("_IMAGE","Bild");

//%%%%%%	File Name misc.php (send-to-friend popup)	%%%%%
define("_YOURNAMEC","Ihr Name: ");
define("_YOUREMAILC","Ihre Email: ");
define("_FRIENDNAMEC","Name Ihres Freundes: ");
define("_FRIENDEMAILC","Email Ihres Freundes: ");
define("_SEND","Senden");

define("_RECOMMENDSITE","Empfehlen Sie diese Seite einem Freund");

// %s is your site name
define("_INTSITE","Interessante Seite: %s");

// %s is the name of your friend
define("_HELLO","Hallo %s,");

define("_SITENAME","Homepage Name:");
define("_SITEURL","Homepage URL:");
define("_REFERENCESENT","Ihrem Freund ist die Empfehlung geschickt worden. Danke für Ihr Vertrauen!");

define("_ENTERYNAME","Bitte geben Sie Ihren Namen ein");
define("_ENTERFNAME","Bitte geben Sie den Namen Ihres Freundes ein");
define("_ENTERFMAIL","Bitte geben Sie die Email-Adresse Ihres Freundes ein");
define("_NEEDINFO","Sie müssen die angeforderten Informationen eintragen!");
define("_INVALIDEMAIL1","Die angebene Email-Adresse besitzt kein gültiges Format.");
define("_INVALIDEMAIL2","Bitte überprüfen Sie diese und versuchen es nochmal.");

//%%%%%%	File Name module.textsanitizer.php 	%%%%%
define("_QUOTEC","Zitat:");

//%%%%%%	File Name admin.php 	%%%%%
define("_NOPERM","Entschuldigung, Sie haben nicht die Erlaubnis, diesen Bereich zu betreten. Gegebenfalls setzten Sie sich mit dem Webmaster in Verbindung.");

//%%%%%		Common Phrases		%%%%%
define("_NO","Nein");
define("_YES","Ja");
define("_EDIT","Ändern");
define("_DELETE","Löschen");
define("_SUBMIT","Absenden");
define("_MODULENOEXIST","Das gewähltes Modul konnte nicht gefunden werden!");
define("_ALIGN","Ausrichtung");
define("_LEFT","Links");
define("_CENTER","Mittig");
define("_RIGHT","Rechts");
define("_FORM_ENTER", "Bitte geben Sie %s ein!");
// %s represents file name
define("_MUSTWABLE","Datei %s muß durch den Server beschreibbar sein!");
// Module info
define('_PREFERENCES', 'Einstellungen');
define("_VERSION", "Version");
define("_DESCRIPTION", "Beschreibung");
define("_ERRORS", "Fehler");
define("_NONE", "kein");
define('_ON','am');
define('_READS','gelesen');
define('_WELCOMETO','Herzlich Willkommen auf %s');
define('_SEARCH','Suche');
define('_CATEGORIES', 'Kathegorien');
define('_ALL', 'Alle');
define('_SECTION', 'Section');
define('_SORTBY', 'Sortiert nach');
define('_TITLE', 'Titel');
define('_MESSAGE', 'Nachricht');
define('_OPTIONS', 'Optionen');
define('_ATTACHSIG', 'Attach Signature');
define('_QUOTE', 'Zitat');
define('_LIST', 'Liste');
define('_LOGIN','Mitglieder-Login');
define('_USERNAME','Username: ');
define('_PASSWORD','Passwort: ');

/* Image manager */
define('_IMGMANAGER','Image Manager');
define('_NUMIMAGES', '%s Bilder');
define('_ADDIMAGE','Bilddatei hinzufügen');
define('_IMAGENAME','Name:');
define('_IMGMAXSIZE','maximale Grösse (kb):');
define('_IMGMAXWIDTH','maximale Breite (pixels):');
define('_IMGMAXHEIGHT','maximale Höhe (pixels):');
define('_IMAGECAT','Kathegorie:');
define('_IMAGEFILE','Bilddatei:');
define('_IMGWEIGHT','Display order in image manager:');
define('_IMGDISPLAY','Dieses Bild anzeigen?');
define('_IMAGEMIME','MIME type:');
define('_FAILFETCHIMG', 'Could not get uploaded file %s');
define('_FAILSAVEIMG', 'Failed storing image %s into the database');
define('_BACK', 'Zurück');
define('_NOCACHE', 'Kein Cache');
define('_CLONE', 'Clone');

//%%%%%	File Name class/xoopsform/formmatchoption.php 	%%%%%
define("_STARTSWITH", "Beginnen mit");
define("_ENDSWITH", "Beenden mit");
define("_MATCHES", "Übereinstimmungen");
define("_CONTAINS", "enthalten");

//%%%%%%	File Name commentform.php 	%%%%%
define("_REGISTER","Registrieren");

//%%%%%%	File Name xoopscodes.php 	%%%%%
define("_SIZE","Größe");  // font size
define("_FONT","Schriftart");  // font family
define("_COLOR","Farbe");  // font color
define("_EXAMPLE","Beispiel");
define("_ENTERURL","Tragen Sie die URL des Links ein, den Sie hinzufügen möchten:");
define("_ENTERWEBTITLE","Tragen Sie den Webseiten Titel ein:");
define("_ENTERIMGURL","Tragen Sie die URL des Bildes ein, welches Sie hinzufügen möchten.");
define("_ENTERIMGPOS","Jetzt tragen Sie die Position des Bildes ein.");
define("_IMGPOSRORL","'R' oder 'r' für rechts, 'L' oder 'l' für links, oder lassen Sie es frei.");
define("_ERRORIMGPOS","FEHLER! Tragen Sie die Position des Bildes ein.");
define("_ENTEREMAIL","Tragen Sie die Email-Adresse ein, die Sie hinzufügen möchten.");
define("_ENTERCODE","Tragen Sie den Code ein, den Sie hinzufügen möchten.");
define("_ENTERQUOTE","Tragen Sie den Text ein, den Sie zitieren möchten.");
define("_ENTERTEXTBOX","Bitte geben Sie einen Text in das Eingabefeld ein.");
define("_ALLOWEDCHAR","Erlaubte maximale Textlänge: ");
define("_CURRCHAR","Momentane Textlänge: ");
define("_PLZCOMPLETE","Bitte füllen Sie alle erforderlichen Felder aus.");
define("_MESSAGETOOLONG","Ihre Nachricht ist zu lang.");

//%%%%%		TIME FORMAT SETTINGS   %%%%%

define("_DATESTRING","d.m.Y H:i");
define("_MEDIUMDATESTRING","d.m.Y H:i");
define("_SHORTDATESTRING","d.m.Y");

define('_JANUARY', 'Januar');
define('_FEBRUARY', 'Februar');
define('_MARCH', 'März');
define('_APRIL', 'April');
define('_MAY', 'Mai');
define('_JUNE', 'Juni');
define('_JULY', 'Juli');
define('_AUGUST', 'August');
define('_SEPTEMBER', 'September');
define('_OCTOBER', 'Oktober');
define('_NOVEMBER', 'November');
define('_DECEMBER', 'Dezember');

define('_SECOND', '1 Sekunde');
define('_SECONDS', '%s Sekunden');
define('_MINUTE', '1 Minute');
define('_MINUTES', '%s Minuten');
define('_HOUR', '1 Stunde');
define('_HOURS', '%s Stunden');
define('_DAY', '1 Tag');
define('_DAYS', '%s Tage');
define('_WEEK', '1 Woche(n)');
define('_MONTH', '1 Monat(e)');

/*
The following characters are recognized in the format string:
a - "am" or "pm"
A - "AM" or "PM"
d - day of the month, 2 digits with leading zeros; i.e. "01" to "31"
D - day of the week, textual, 3 letters; i.e. "Fri"
F - month, textual, long; i.e. "January"
h - hour, 12-hour format; i.e. "01" to "12"
H - hour, 24-hour format; i.e. "00" to "23"
g - hour, 12-hour format without leading zeros; i.e. "1" to "12"
G - hour, 24-hour format without leading zeros; i.e. "0" to "23"
i - minutes; i.e. "00" to "59"
j - day of the month without leading zeros; i.e. "1" to "31"
l (lowercase 'L') - day of the week, textual, long; i.e. "Friday"
L - boolean for whether it is a leap year; i.e. "0" or "1"
m - month; i.e. "01" to "12"
n - month without leading zeros; i.e. "1" to "12"
M - month, textual, 3 letters; i.e. "Jan"
s - seconds; i.e. "00" to "59"
S - English ordinal suffix, textual, 2 characters; i.e. "th", "nd"
t - number of days in the given month; i.e. "28" to "31"
T - Timezone setting of this machine; i.e. "MDT"
U - seconds since the epoch
w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday)
Y - year, 4 digits; i.e. "1999"
y - year, 2 digits; i.e. "99"
z - day of the year; i.e. "0" to "365"
Z - timezone offset in seconds (i.e. "-43200" to "43200")
*/


//%%%%%		LANGUAGE SPECIFIC SETTINGS   %%%%%
define('_CHARSET', 'ISO-8859-1');
define('_LANGCODE', 'de');

// change 0 to 1 if this language is a multi-bytes language
define("XOOPS_USE_MULTIBYTES", "0");

?>

--- NEW FILE: index.html ---
 <script>history.go(-1);</script>
--- NEW FILE: misc.php ---
<?php
// $Id: misc.php,v 1.1 2003/01/09 15:26:31 w4z004 Exp $
define("_MSC_YOURNAMEC","Ihr Name: ");
define("_MSC_YOUREMAILC","Ihre Email: ");
define("_MSC_FRIENDNAMEC","Der Name Ihres Freundes: ");
define("_MSC_FRIENDEMAILC","Email Adresse Ihre Freundes: ");
define("_MSC_RECOMMENDSITE","Empfehlen Sie unsere Seite");
// %s is your site name
define("_MSC_INTSITE","Interesting Site: %s");
define("_MSC_REFERENCESENT","Die Empfehlung wurde an Ihren Freund übersand! Danke !");
define("_MSC_ENTERYNAME","Tragen Sie bitte Ihren Namen ein");
define("_MSC_ENTERFNAME","Tragen Sie bitte den Namen Ihres Freundes ein");
define("_MSC_ENTERFMAIL","Tragen Sie bitte die Email Adresse Ihres Freundes ein");
define("_MSC_NEEDINFO","Sie müssen alle angeforderten Informationen einschreiben");
define("_MSC_INVALIDEMAIL1","Diese Emal Adresse ist leider nicht korrekt.");
define("_MSC_INVALIDEMAIL2","Bitte überprüfen Sie die Adresse und versuchen es noch einmal");

define("_MSC_AVAVATARS","Vorhandene Avatars");

define("_MSC_SMILIES","Smilies");
define("_MSC_CLICKASMILIE","Klicken Sie ein Smilie an, um es in ihrer Nachricht einzufügen.");
define("_MSC_CODE","Code");
define("_MSC_EMOTION","Emotion");
?>

--- NEW FILE: pmsg.php ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: search.php ---
<?php
// $Id: search.php,v 1.1 2003/01/09 15:26:35 w4z004 Exp $
//%%%%%%	File Name search.php 	%%%%%
define("_SR_SEARCH","Suchen");
define("_SR_PLZENTER","Geben Sie bitte alle erforderlichen Daten ein!");
define("_SR_SEARCHRESULTS","Suchergebnisse");
define("_SR_NOMATCH","Diese Abfrage brachte keine Ergebnisse. Bitte versuchen Sie eine andere Abfrage.");
define("_SR_FOUND","<b>%s</b> Übereinstimmung(en) gefunden");
define("_SR_SHOWING","(zeigt %d - %d)");
define("_SR_ANY","Einer der Begriffe (OR)");
define("_SR_ALL","Alle Suchbegriffe (AND)");
define("_SR_EXACT","Genaue Übereinstimmung");
define("_SR_SHOWALLR","Alle Resultate anzeigen");
define("_SR_NEXT","Nächste >>");
define("_SR_PREVIOUS","<< Vorherige");
define("_SR_KEYWORDS","Suchbegriffe");
define("_SR_TYPE","Typ");
define("_SR_SEARCHIN","Suchen in");
define('_SR_KEYTOOSHORT', 'Suchbegriffe müssen mehr als <b>%s</b> Buchstaben haben!');
?>
--- NEW FILE: timezone.php ---
<?php
// $Id: timezone.php,v 1.1 2003/01/09 15:26:36 w4z004 Exp $
//%%%%%		Time Zone	%%%%
define("_TZ_GMTM12", "(GMT-12:00) Eniwetok, Kwajalein");
define("_TZ_GMTM11", "(GMT-11:00) Midway Island, Samoa");
define("_TZ_GMTM10", "(GMT-10:00) Hawaii");
define("_TZ_GMTM9", "(GMT-9:00) Alaska");
define("_TZ_GMTM8", "(GMT-8:00) Pacific Time (US &amp; Canada)");
define("_TZ_GMTM7", "(GMT-7:00) Mountain Time (US &amp; Canada)");
define("_TZ_GMTM6", "(GMT-6:00) Central Time (US &amp; Canada), Mexico City");
define("_TZ_GMTM5", "(GMT-5:00) Eastern Time (US &amp; Canada), Bogota, Lima, Quito");
define("_TZ_GMTM4", "(GMT-4:00) Atlantic Time (Canada), Caracas, La Paz");
define("_TZ_GMTM35", "(GMT-3:30) Newfoundland");
define("_TZ_GMTM3", "(GMT-3:00) Brasilia, Buenos Aires, Georgetown");
define("_TZ_GMTM2", "(GMT-2:00) Mid-Atlantic");
define("_TZ_GMTM1", "(GMT-1:00) Azores, Cape Verde Islands");
define("_TZ_GMT0", "(GMT) Greenwich Mean Time, London, Dublin, Lisbon, Casablanca, Monrovia");
define("_TZ_GMTP1", "(GMT+1:00) Amsterdam, Berlin, Rome, Copenhagen, Brussels, Madrid, Paris");
define("_TZ_GMTP2", "(GMT+2:00) Athens, Istanbul, Minsk, Helsinki, Jerusalem, South Africa");
define("_TZ_GMTP3", "(GMT+3:00) Baghdad, Kuwait, Riyadh, Moscow, St. Petersburg");
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, New Delhi");
define("_TZ_GMTP6", "(GMT+6:00) Almaty, Dhaka, Colombo");
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) Brisbane, Canberra, Melbourne, Sydney, Guam,Vlasdiostok");
define("_TZ_GMTP11", "(GMT+11:00) Magadan, Solomon Islands, New Caledonia");
define("_TZ_GMTP12", "(GMT+12:00) Auckland, Wellington, Fiji, Kamchatka, Marshall Island");
?>
--- NEW FILE: user.php ---
<?php
// $Id: user.php,v 1.1 2003/01/09 15:26:37 w4z004 Exp $
//%%%%%%		File Name user.php 		%%%%%
define('_US_NOTREGISTERED','Sie sind noch nicht registriert?  Klicken Sie <a href=register.php>hier</a>.');
define('_US_LOSTPASSWORD','Passwort vergessen?');
define('_US_NOPROBLEM','Kein Problem. Geben Sie hier Ihre E-Mail Adresse ein, mit der Sie sich registriert haben.');
define('_US_YOUREMAIL','Ihre Email: ');
define('_US_SENDPASSWORD','Passwort zuschicken');
define('_US_LOGGEDOUT','Sie wurden ausgeloggt.');
define('_US_THANKYOUFORVISIT','Danke für Ihren Besuch!');
define('_US_INCORRECTLOGIN','Fehler beim Anmelden!');
define('_US_LOGGINGU','Danke, das Sie sich einloggen, %s.');

// 2001-11-17 ADD
define('_US_NOACTTPADM','Das gewählte Mitglied ist nicht in unserer Datenbank oder es hat seine Registrierung noch nicht bestätigt.<br>Bitte setzen Sie sich mit dem Webmaster in Verbindung für Details.');
define('_US_ACTKEYNOT','Falscher Aktivierungs-Code!');
define('_US_ACONTACT','Der ausgewählte Account ist bereits aktiviert worden!');
define('_US_ACTLOGIN','Ihr Account wurde aktiviert. Bitte melden Sie sich mit dem registrierten Passwort an.');
define('_US_NOPERMISS','Sorry, Sie haben nicht die entsprechenden Zugriffsrechte!');
define('_US_SURETODEL','Sind Sie sich sicher, daß Sie Ihre Mitgliedschaft löschen möchten?');
define('_US_REMOVEINFO','Es werden alle Daten von Ihnen aus unserer Datenbank gelöscht.');
define('_US_BEENDELED','Ihr Account wurde vollständig gelöscht.');
//

//%%%%%%		File Name register.php 		%%%%%
define('_US_USERREG','Mitglieds-Registration:');
define('_US_NICKNAME','Nickname');
define('_US_EMAIL','Email');
define('_US_ALLOWVIEWEMAIL','Diese Information anderen Mitgliedern sichtbar machen.');
define('_US_WEBSITE','Homepage');
define('_US_TIMEZONE','Zeitzone<br>(+1 für Deutschland)');
define('_US_AVATAR','Avatar');
define('_US_VERIFYPASS','Passwort wiederholen:');
define('_US_SUBMIT','Absenden');
define('_US_USERNAME','Mitgliedsname');
define('_US_FINISH','Fertigstellen');
define('_US_REGISTERNG','Der neue Benutzer konnte nicht angelegt werden.');
define('_US_MAILOK','Wollen Sie dem Administrator und den <br /> Moderatoren erlauben, Ihnen E-Mail Nachrichten zu schicken ?');
define('_US_DISCLAIMER','Disclaimer');
define('_US_IAGREE','Ich habe den Disclaimer gelesen und stimme ihm zu.');
define('_US_UNEEDAGREE', 'Sorry, aber Sie müssen dem Disclaimer zustimmen, um Mitglied zu werden.');
define('_US_NOREGISTER','Sorry, im Moment werden keine Neuregistrierungen durchgeführt');


// %s is username. This is a subject for email
define('_US_USERKEYFOR','Benutzeraktivierungscode für %s');

define('_US_YOURREGISTERED','Sie sind nun registriert. Der Benutzeraktivierungscode wurde an die angegebene Adresse geschickt. Bitte folgen Sie den Hinweisen der E-Mail um Deine Mitgliedschaft zu bestätigen. ');
define('_US_YOURREGMAILNG','Sie sind nun registriert. Leider konnten wir durch einen internen Fehler keine Aktivierungs-Mail verschicken. Setzen Sie sich bitte mit dem Webmaster in Verbindung.');
define('_US_YOURREGISTERED2','Sie sind nun registriert.  Bitte warten Sie, bis Ihr Account vom Administrator freigeschaltet wurde.  Sie erhalten einmalig eine Bestätigungsmail, wenn es soweit ist.  Dieser Vorgang kann unter Umständen etwas Zeit beanspruchen, bitte haben Sie Geduld.');

// %s is your site name
define('_US_NEWUSERREGAT','Neues Mitglied auf %s');
// %s is a username
define('_US_HASJUSTREG','%s hat sich soeben registriert!');

define('_US_INVALIDMAIL','FEHLER: Ungültige E-Mail Adresse!');
define('_US_EMAILNOSPACES','FEHLER: Email-Addresse enthält Leerzeichen!');
define('_US_INVALIDNICKNAME','FEHLER: Unzulässiger Nickname!');
define('_US_NICKNAMETOOLONG','Nickname ist zu lang! Er darf maximal %s Zeichen haben.');
define('_US_NICKNAMETOOSHORT','Nickname ist zu kurz! Er muss mindestens %s Zeichen haben.');
define('_US_NAMERESERVED','FEHLER: Dieser Benutzername ist bereits reserviert!');
define('_US_NICKNAMENOSPACES','Der Benutzername darf keine Leerzeichen enthalten!');
define('_US_NICKNAMETAKEN','FEHLER: Dieser Benutzername ist bereits vergeben!');
define('_US_EMAILTAKEN','FEHLER: Diese E-Mail Adresse befindet sich bereits in unserer Datenbank!');
define('_US_ENTERPWD','FEHLER: Sie müßen ein Passwort angeben!');
define('_US_SORRYNOTFOUND','Keine entsprechenden Mitglieder-Informationen gefunden!');




// %s is your site name
define('_US_NEWPWDREQ','Neue Passwortanforderung auf %s');
define('_US_YOURACCOUNT', 'Ihr Account auf %s');

define('_US_MAILPWDNG','mail_password: Ihre Einstellungen konnten nicht aktualisiert werden!. Setze Sie sich bitte mit dem Webmaster in Verbindung!');

// %s is a username
define('_US_PWDMAILED','Passwort für %s verschickt.');
define('_US_CONFMAIL','Bestätigungs E-Mail für %s verschickt.');
define('_US_ACTVMAILNG', 'Fehler beim Versenden der Aktivierungs E-Mail an %s');
define('_US_ACTVMAILOK', 'Aktivierungs E-Mail an %s verschickt.');

//%%%%%%		File Name userinfo.php 		%%%%%
define('_US_SELECTNG','Es wurde kein Mitglied ausgewählt! Bitte gehen Sie zurück und versuchen es noch einmal.');
define('_US_PM','PM');
define('_US_ICQ','ICQ');
define('_US_AIM','AIM');
define('_US_YIM','YIM');
define('_US_MSNM','MSNM');
define('_US_LOCATION','Wohnort');
define('_US_OCCUPATION','Beruf');
define('_US_INTEREST','Interessen');
define('_US_SIGNATURE','Signatur');
define('_US_EXTRAINFO','Extra Infos');
define('_US_EDITPROFILE','Profil bearbeiten');
define('_US_LOGOUT','Logout');
define('_US_INBOX','Private Nachrichten');
define('_US_MEMBERSINCE','Mitglied seit');
define('_US_RANK','Rang');
define('_US_POSTS','Kommentare/Foren Beiträge');
define('_US_LASTLOGIN','Letzter Besuch');
define('_US_ALLABOUT','Alles über %s');
define('_US_STATISTICS','Statistiken');
define('_US_MYINFO','Meine Informationen');
define('_US_BASICINFO','Basic information');
define('_US_MOREABOUT','Mehr über mich');
define('_US_SHOWALL','Show All');

//%%%%%%		File Name edituser.php 		%%%%%
define('_US_PROFILE','Profil');
define('_US_REALNAME','Name');
define('_US_SHOWSIG','Ihre Signatur immer anzeigen');
define('_US_CDISPLAYMODE','Kommentar Ansicht');
define('_US_CSORTORDER','Reihenfolge der Kommentare:');
define('_US_PASSWORD','Passwort');
define('_US_TYPEPASSTWICE','(Geben Sie Ihr neues Passwort 2x mal ein um es zu ändern)');
define('_US_SAVECHANGES','Einstellungen Speichern');
define('_US_NOEDITRIGHT',"FEHLER: Sie haben nicht die entsprechenden Zugriffsrechte zum ändern dieser Mitgliederinformation.");
define('_US_PASSNOTSAME','Beide Kennwörter sind verschieden. Sie müssen identisch sein.');
define('_US_PWDTOOSHORT','Das Passwort muss aus mindestens <b>%s</b> Zeichen lang sein.');
define('_US_PROFUPDATED','Ihr Profil wurde aktualisiert!');
define('_US_USECOOKIE','Soll Ihr Mitgliedsname für ein Jahr in einem Cookie gespeichert werden?');
define('_US_NO','Nein');
define('_US_DELACCOUNT','Mitgliedschaft Löschen');
define('_US_MYAVATAR', 'Mein Avatar');
define('_US_UPLOADMYAVATAR', 'Uploaden Sie Ihr Avatar');
define('_US_MAXPIXEL','max. Bildgröße');
define('_US_MAXIMGSZ','max. Dateigröße');
define('_US_SELFILE','Durchsuchen');
define('_US_OLDDELETED','Ihr altes Avatar wird dann gelöscht!');
define('_US_CHOOSEAVT', 'Wählen Sie einen Avatar aus der Liste!');
?>

[Xoops-cvs2] xoops2/language/german/mail_template - New directory

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

Update of /cvsroot/xoops/xoops2/language/german/mail_template
In directory sc8-pr-cvs1:/tmp/cvs-serv15408/mail_template

Log Message:
Directory /cvsroot/xoops/xoops2/language/german/mail_template added to the repository

[Xoops-cvs2] xoops2/language/german - New directory

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

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

Log Message:
Directory /cvsroot/xoops/xoops2/language/german added to the repository

[Xoops-cvs2] xoops2/install/language/german install.php,NONE,1.1

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

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

Added Files:
	install.php 
Log Message:
added the german lang

--- NEW FILE: install.php ---
(This appears to be a binary file; contents omitted.)

[Xoops-cvs2] xoops2/install/language/german - New directory

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

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

Log Message:
Directory /cvsroot/xoops/xoops2/install/language/german added to the repository

[Xoops-cvs2] xoops2/language/spanish comment.php,1.3,1.4 global.php,1.3,1.4

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

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

Modified Files:
	comment.php global.php 
Log Message:
spanish lang updates

Index: comment.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/language/spanish/comment.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** comment.php	9 Jan 2003 12:39:45 -0000	1.3
--- comment.php	9 Jan 2003 15:21:13 -0000	1.4
***************
*** 2,5 ****
--- 2,6 ----
  // $Id$
  define('_CM_TITLE','Título');
+ define('_CM_MESSAGE','Mensaje');
  define('_CM_DOSMILEY','Habilitar Caritas');
  define('_CM_DOHTML','Habilitar código HTML');

Index: global.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/language/spanish/global.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** global.php	7 Jan 2003 19:40:04 -0000	1.3
--- global.php	9 Jan 2003 15:21:15 -0000	1.4
***************
*** 8,12 ****
  define('_SUBJECT','Tema');
  define('_MESSAGEICON','Icono del Mensaje');
! define('_COMMENT','Comentario');
  define('_POSTANON','Enviar Anonimamente');
  define('_DISABLESMILEY','Desactivar Caritas');
--- 8,12 ----
  define('_SUBJECT','Tema');
  define('_MESSAGEICON','Icono del Mensaje');
! define('_COMMENTS','Comentarios');
  define('_POSTANON','Enviar Anonimamente');
  define('_DISABLESMILEY','Desactivar Caritas');

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

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

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

Modified Files:
	cp_functions.php old_theme_functions.php 
Log Message:
fix for duplicate define functions

Index: cp_functions.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/cp_functions.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** cp_functions.php	7 Jan 2003 22:47:28 -0000	1.4
--- cp_functions.php	9 Jan 2003 15:01:51 -0000	1.5
***************
*** 154,157 ****
--- 154,162 ----
  }
  
+ function themecenterposts($title, $content)
+ {
+ 	echo '<table cellpadding="4" cellspacing="1" width="98%" class="outer"><tr><td class="head">'.$title.'</td></tr><tr><td><br />'.$content.'<br /></td></tr></table>';
+ }
+ 
  function myTextForm($url , $value)
  {

Index: old_theme_functions.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/include/old_theme_functions.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** old_theme_functions.php	7 Jan 2003 08:20:35 -0000	1.2
--- old_theme_functions.php	9 Jan 2003 15:01:52 -0000	1.3
***************
*** 3,19 ****
  // These are needed when viewing old modules (that don't use Smarty template files) when a theme that use Smarty templates are selected.
  
! function OpenTable($width='100%')
! {
! 	echo '<table width="'.$width.'" cellspacing="0" class="outer"><tr><td class="even">';
  }
  
! function CloseTable()
! {
! 	echo '</td></tr></table>';
  }
  
! function themecenterposts($title, $content)
! {
! 	echo '<table cellpadding="4" cellspacing="1" width="98%" class="outer"><tr><td class="head">'.$title.'</td></tr><tr><td><br />'.$content.'<br /></td></tr></table>';
  }
  ?>
--- 3,27 ----
  // These are needed when viewing old modules (that don't use Smarty template files) when a theme that use Smarty templates are selected.
  
! // function_exists check is needed for inclusion from the admin side
! 
! if (!function_exists('opentable')) {
! 	function OpenTable($width='100%')
! 	{
! 		echo '<table width="'.$width.'" cellspacing="0" class="outer"><tr><td class="even">';
! 	}
  }
  
! if (!function_exists('closetable')) {
! 	function CloseTable()
! 	{
! 		echo '</td></tr></table>';
! 	}
  }
  
! if (!function_exists('themecenterposts')) {
! 	function themecenterposts($title, $content)
! 	{
! 		echo '<table cellpadding="4" cellspacing="1" width="98%" class="outer"><tr><td class="head">'.$title.'</td></tr><tr><td><br />'.$content.'<br /></td></tr></table>';
! 	}
  }
  ?>

[Xoops-cvs2] xoops2/modules/mydownloads/include functions.php,1.1,1.2

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

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

Modified Files:
	functions.php 
Log Message:
fix for undefined vars

Index: functions.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/mydownloads/include/functions.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** functions.php	2 Jan 2003 17:26:54 -0000	1.1
--- functions.php	9 Jan 2003 15:00:15 -0000	1.2
***************
*** 44,52 ****
  
  function popgraphic($hits) {
! 		global $xoopsModuleConfig;
! 		if ($hits >= $xoopsModuleConfig['popular']) {
! 			$popular = "&nbsp;<img src =\"".XOOPS_URL."/modules/mydownloads/images/pop.gif\" alt=\""._MD_POPULAR."\" />";
! 		}
! 	return $popular;
  }
  //Reusable Link Sorting Functions
--- 44,52 ----
  
  function popgraphic($hits) {
! 	global $xoopsModuleConfig;
! 	if ($hits >= $xoopsModuleConfig['popular']) {
! 		return "&nbsp;<img src =\"".XOOPS_URL."/modules/mydownloads/images/pop.gif\" alt=\""._MD_POPULAR."\" />";
! 	}
! 	return '';
  }
  //Reusable Link Sorting Functions