[geeklog-cvs] geeklog-1.3/public_html profiles.php,1.34,1.35

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/public_html
In directory www:/tmp/cvs-serv20466/public_html

Modified Files:
	profiles.php 
Log Message:
Threw in a few COM_buildUrl calls for article URLs


Index: profiles.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/profiles.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** profiles.php	6 Aug 2004 08:55:36 -0000	1.34
--- profiles.php	8 Aug 2004 19:59:45 -0000	1.35
***************
*** 216,228 ****
   	global $_CONF, $_TABLES, $_USER, $LANG01, $LANG08;
  
      // check for correct $_CONF permission
      if (empty ($_USER['username']) &&
          (($_CONF['loginrequired'] == 1) || ($_CONF['emailstoryloginrequired'] == 1))) {
!         return COM_refresh ($_CONF['site_url'] . '/article.php?story=' . $sid);
      }
  
      // check if emailing of stories is disabled
      if ($_CONF['hideemailicon'] == 1) {
!         return COM_refresh ($_CONF['site_url'] . '/article.php?story=' . $sid);
      }
  
--- 216,231 ----
   	global $_CONF, $_TABLES, $_USER, $LANG01, $LANG08;
  
+     $retval = COM_refresh (COM_buildUrl ($_CONF['site_url']
+                                          . '/article.php?story=' . $sid));
+ 
      // check for correct $_CONF permission
      if (empty ($_USER['username']) &&
          (($_CONF['loginrequired'] == 1) || ($_CONF['emailstoryloginrequired'] == 1))) {
!         return $retval;
      }
  
      // check if emailing of stories is disabled
      if ($_CONF['hideemailicon'] == 1) {
!         return $retval;
      }
  
***************
*** 230,234 ****
      COM_clearSpeedlimit ($_CONF['speedlimit'], 'mail');
      if (COM_checkSpeedlimit ('mail') > 0) {
!         return COM_refresh ($_CONF['site_url'] . '/article.php?story=' . $sid);
      }
  
--- 233,237 ----
      COM_clearSpeedlimit ($_CONF['speedlimit'], 'mail');
      if (COM_checkSpeedlimit ('mail') > 0) {
!         return $retval;
      }
  
***************
*** 251,258 ****
      }
      $mailtext .= LB
! 		.COM_undoSpecialChars(stripslashes(strip_tags($A['introtext']))).LB.LB
! 		.COM_undoSpecialChars(stripslashes(strip_tags($A['bodytext']))).LB.LB
! 		.'------------------------------------------------------------'.LB
! 		.$LANG08[24].LB.$_CONF['site_url'].'/article.php?story='.$sid.'#comments';
  
   	$mailto = $to . ' <' . $toemail . '>';
--- 254,263 ----
      }
      $mailtext .= LB
! 		. COM_undoSpecialChars(stripslashes(strip_tags($A['introtext']))).LB.LB
! 		. COM_undoSpecialChars(stripslashes(strip_tags($A['bodytext']))).LB.LB
! 		. '------------------------------------------------------------'.LB
! 		. $LANG08[24] . LB
!         . COM_buildUrl ($_CONF['site_url'] . '/article.php?story=' . $sid
!                         . '#comments');
  
   	$mailto = $to . ' <' . $toemail . '>';
***************
*** 263,268 ****
      COM_updateSpeedlimit ('mail');
  
-  	$retval .= COM_refresh ($_CONF['site_url'] . '/article.php?story=' . $sid);
- 
  	// Increment numemails counter for story
      DB_query ("UPDATE {$_TABLES['stories']} SET numemails = numemails + 1 WHERE sid = '$sid'");
--- 268,271 ----
***************
*** 353,358 ****
              $display = COM_refresh ($_CONF['site_url'] . '/index.php');
          } else if ($_CONF['hideemailicon'] == 1) {
!             $display = COM_refresh ($_CONF['site_url']
!                                     . '/article.php?story=' . $sid);
          } else {
              $display .= COM_siteHeader ('menu', $LANG08[17])
--- 356,361 ----
              $display = COM_refresh ($_CONF['site_url'] . '/index.php');
          } else if ($_CONF['hideemailicon'] == 1) {
!             $display = COM_refresh (COM_buildUrl ($_CONF['site_url']
!                                     . '/article.php?story=' . $sid));
          } else {
              $display .= COM_siteHeader ('menu', $LANG08[17])