[geeklog-cvs] geeklog-1.3/public_html users.php,1.66,1.67

[geeklog-cvs-admin at lists.geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory geeklog_prod:/tmp/cvs-serv23321

Modified Files:
	users.php 
Log Message:
Fixed links to a user's comments (from the Last 10 Comments block in the user profile) and removed all \r from the mail bodies of emails sent from here.


Index: users.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/users.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** users.php	25 Jun 2003 08:39:02 -0000	1.66
--- users.php	25 Jul 2003 08:11:28 -0000	1.67
***************
*** 201,212 ****
                      '<a href="' . $_CONF['site_url'] .
                      '/comment.php?mode=display&sid=' . $C['sid'] .
!                     '&title=' . urlencode($C['title']) . '&pid=' .
!                     $C['pid'] . '">');
              } else {
                  $user_templates->set_var('comment_begin_href',
                      '<a href="' . $_CONF['site_url'] .
                      '/comment.php?mode=display&sid=' . $C['sid'] .
!                     '&title=' . urlencode($C['title']) . '&pid=' .
!                     $C['pid'] . '&qid=' . $C['sid'] . '">');
              }
              $C['title'] = str_replace('$','$',$C['title']);
--- 201,213 ----
                      '<a href="' . $_CONF['site_url'] .
                      '/comment.php?mode=display&sid=' . $C['sid'] .
!                     '&type=' . $C['type'] . '&title=' .
!                     urlencode($C['title']) . '&pid=' .  $C['pid'] . '">');
              } else {
                  $user_templates->set_var('comment_begin_href',
                      '<a href="' . $_CONF['site_url'] .
                      '/comment.php?mode=display&sid=' . $C['sid'] .
!                     '&type=' . $C['type'] . '&title=' .
!                     urlencode($C['title']) . '&pid=' .  $C['pid'] .
!                     '&qid=' . $C['sid'] . '">');
              }
              $C['title'] = str_replace('$','$',$C['title']);
***************
*** 275,284 ****
          DB_change($_TABLES['users'],'passwd',"$passwd2",'username',$username);
          DB_change($_TABLES['users'],'pwrequestid',"NULL",'username',$username);
!         $mailtext = "{$LANG04[15]}\r\n\r\n";
!         $mailtext .= "{$LANG04[2]}: $username\r\n";
!         $mailtext .= "{$LANG04[4]}: $passwd\r\n\r\n";
!         $mailtext .= "{$LANG04[14]}\r\n\r\n";
!         $mailtext .= "{$_CONF["site_name"]}\r\n";
!         $mailtext .= "{$_CONF['site_url']}\r\n";
          if (empty ($LANG_CHARSET)) {
              $charset = $_CONF['default_charset'];
--- 276,285 ----
          DB_change($_TABLES['users'],'passwd',"$passwd2",'username',$username);
          DB_change($_TABLES['users'],'pwrequestid',"NULL",'username',$username);
!         $mailtext = "{$LANG04[15]}\n\n";
!         $mailtext .= "{$LANG04[2]}: $username\n";
!         $mailtext .= "{$LANG04[4]}: $passwd\n\n";
!         $mailtext .= "{$LANG04[14]}\n\n";
!         $mailtext .= "{$_CONF["site_name"]}\n";
!         $mailtext .= "{$_CONF['site_url']}\n";
          if (empty ($LANG_CHARSET)) {
              $charset = $_CONF['default_charset'];
***************
*** 413,427 ****
             $LANG29;
  
!     $mailbody = "$LANG04[2]: $username\r\n"
!               . "$LANG04[5]: $email\r\n"
!               . "$LANG28[14]: " . strftime ($_CONF['date']) . "\r\n\r\n";
      if ($queued) {
!         $mailbody .= "$LANG01[10] <{$_CONF['site_admin_url']}/moderation.php>\r\n\r\n";
      } else {
!         $mailbody .= "$LANG29[4] <{$_CONF['site_url']}/users.php?mode=profile&uid={$uid}>\r\n\r\n";
      }
!     $mailbody .= "\r\n------------------------------\r\n";
!     $mailbody .= "\r\n$LANG08[34]\r\n";
!     $mailbody .= "\r\n------------------------------\r\n";
  
      $mailsubject = $_CONF['site_name'] . ' ' . $LANG29[40];
--- 414,428 ----
             $LANG29;
  
!     $mailbody = "$LANG04[2]: $username\n"
!               . "$LANG04[5]: $email\n"
!               . "$LANG28[14]: " . strftime ($_CONF['date']) . "\n\n";
      if ($queued) {
!         $mailbody .= "$LANG01[10] <{$_CONF['site_admin_url']}/moderation.php>\n\n";
      } else {
!         $mailbody .= "$LANG29[4] <{$_CONF['site_url']}/users.php?mode=profile&uid={$uid}>\n\n";
      }
!     $mailbody .= "\n------------------------------\n";
!     $mailbody .= "\n$LANG08[34]\n";
!     $mailbody .= "\n------------------------------\n";
  
      $mailsubject = $_CONF['site_name'] . ' ' . $LANG29[40];