phpwebsite-comm-cvs-commits

[Eloi G. <ada...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/article/inc
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19018/inc

Modified Files:
	A_mail.php runtime_chronological.php runtime.php 
Log Message:
mod-rewite URIs now look like the 1.6 spec to insure backwards compatibility


Index: runtime_chronological.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/runtime_chronological.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** runtime_chronological.php	18 Nov 2008 05:08:55 -0000	1.14
--- runtime_chronological.php	21 Nov 2008 14:16:26 -0000	1.15
***************
*** 116,124 ****
  	{
  		if ($i>0)
! 			$content .= '<br />';
! 		if (MOD_REWRITE_ENABLED && $result[$i]['id'])
! 			$link = PHPWS_Text::rewriteLink($result[$i]['title'], 'article', $result[$i]['id']);
! 		else
! 			$link = PHPWS_Text::moduleLink($result[$i]['title'], 'article',array('id'=>$result[$i]['id']));
  		$content .= date('F d', $result[$i]['updated_date']).' <br />'.$link.'&#013;';
  	}
--- 116,121 ----
  	{
  		if ($i>0)
! 			$content .= '<br />';
! 		$link = PHPWS_Text::rewriteLink($result[$i]['title'], 'article', array('id'=>$result[$i]['id']));
  		$content .= date('F d', $result[$i]['updated_date']).' <br />'.$link.'&#013;';
  	}

Index: runtime.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/runtime.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** runtime.php	21 Nov 2008 06:13:14 -0000	1.17
--- runtime.php	21 Nov 2008 14:16:26 -0000	1.18
***************
*** 68,75 ****
  			$content = '';
  		    foreach($result AS $summary) {
! 				if (MOD_REWRITE_ENABLED && $summary['id'] > 0)
! 					$link = PHPWS_Text::rewriteLink($summary['title'], 'article', $summary['id']);
! 				else
! 		    		$link = PHPWS_Text::moduleLink($summary['title'], 'article', array('id'=> $summary['id']));
  		    	$content .= '<li>'.$link.'</li><br />&#013;';
  		    }
--- 68,72 ----
  			$content = '';
  		    foreach($result AS $summary) {
! 				$link = PHPWS_Text::rewriteLink($summary['title'], 'article', array('id'=> $summary['id']));
  		    	$content .= '<li>'.$link.'</li><br />&#013;';
  		    }

Index: A_mail.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_mail.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** A_mail.php	21 Aug 2008 20:17:19 -0000	1.13
--- A_mail.php	21 Nov 2008 14:16:26 -0000	1.14
***************
*** 101,108 ****
      if ($this->summary) 
          $tags['SUMMARYTEXT'] = PHPWS_AM_Data::parseOutput($this->summary);
!     if (MOD_REWRITE_ENABLED && $this->id > 0)
!         $link = PHPWS_Text::rewriteLink(dgettext('article', 'Back to Article'), 'article', $this->id);
!     else
!         $link = PHPWS_Text::moduleLink(dgettext('article', 'Back to Article'), 'article', array('id' => $this->id));
      $tags['BACKLINK'] = '["../"]'; 
      $tags['R_MAIL_ERROR'] = dgettext('article', 'Friend\'s Email').':';
--- 101,105 ----
      if ($this->summary) 
          $tags['SUMMARYTEXT'] = PHPWS_AM_Data::parseOutput($this->summary);
!     $link = PHPWS_Text::rewriteLink(dgettext('article', 'Back to Article'), 'article', array('id'=>$this->id));
      $tags['BACKLINK'] = '["../"]'; 
      $tags['R_MAIL_ERROR'] = dgettext('article', 'Friend\'s Email').':';