[phpws-comm-commits] modules/article/class Article.php,1.15,1.16 Section.php,1.9,1.10

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

Update of /cvsroot/phpwebsite-comm/modules/article/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1462/class

Modified Files:
	Article.php Section.php 
Log Message:
Bug Fixes

Index: Section.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Section.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Section.php	19 Feb 2004 21:46:42 -0000	1.9
--- Section.php	21 Apr 2004 19:54:55 -0000	1.10
***************
*** 128,132 ****
          }
  
!         $image_string = '<img src="' . $temp_image 
              . '" width="' . $this->image['width'] . '" height="' 
              . $this->image['height'] . '" alt="' . $this->image['alt'] 
--- 128,132 ----
          }
  
!         $image_string = '<img src="./' . $temp_image 
              . '" width="' . $this->image['width'] . '" height="' 
              . $this->image['height'] . '" alt="' . $this->image['alt'] 
***************
*** 143,147 ****
  			$template_array['TITLE'] = PHPWS_Text::parseOutput($this->title);
  			$template_array['TEXT'] = PHPWS_Text::parseOutput($this->text);
! 			$template_array['PRINT_ICON'] = '<a href="index.php?module=article&amp;op=view_printable&amp;ARTICLE_id=' . $article_id . 
  			     '&amp;lay_quiet=1" target="_blank"><img src="mod/article/img/print.gif" border="0" width="22" height="20" alt="Printable Version"/></a>';
  			$template_array['CREATED_DATE'] = $created_date;
--- 143,147 ----
  			$template_array['TITLE'] = PHPWS_Text::parseOutput($this->title);
  			$template_array['TEXT'] = PHPWS_Text::parseOutput($this->text);
! 			$template_array['PRINT_ICON'] = '<a href="./index.php?module=article&amp;op=view_printable&amp;ARTICLE_id=' . $article_id . 
  			     '&amp;lay_quiet=1" target="_blank"><img src="mod/article/img/print.gif" border="0" width="22" height="20" alt="Printable Version"/></a>';
  			$template_array['CREATED_DATE'] = $created_date;

Index: Article.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Article.php	19 Feb 2004 21:46:42 -0000	1.15
--- Article.php	21 Apr 2004 19:54:32 -0000	1.16
***************
*** 212,216 ****
  		$copyright = '<a href="'.$rights[rand(0,2)].'"><img src="http://'.PHPWS_SOURCE_HTTP 
    			. 'mod/article/img/mark.gif" border="0" title="Article Manager module by by George! Software." alt="Article Manager module by by George! Software."></a>';
!     $article_link = 'index.php?module=article&amp;view='.$this->id; 
  
  		$article_tags['TITLE'] = $this->title;
--- 212,216 ----
  		$copyright = '<a href="'.$rights[rand(0,2)].'"><img src="http://'.PHPWS_SOURCE_HTTP 
    			. 'mod/article/img/mark.gif" border="0" title="Article Manager module by by George! Software." alt="Article Manager module by by George! Software."></a>';
!     $article_link = './index.php?module=article&amp;view='.$this->id; 
  
  		$article_tags['TITLE'] = $this->title;
***************
*** 346,350 ****
     			. $_SESSION['translate']->it('Printable Version') . '" title="'
     			. $_SESSION['translate']->it('Printable Version') . '"/></a>';
! 		  $article_tags['EMAIL'] = '<a href="index.php?module=article&amp;email='.$this->id
    			.'"><img src="http://'. PHPWS_SOURCE_HTTP 
    			. 'mod/article/img/mailto.png" border="0" width="19" height="12" alt="' 
--- 346,350 ----
     			. $_SESSION['translate']->it('Printable Version') . '" title="'
     			. $_SESSION['translate']->it('Printable Version') . '"/></a>';
! 		  $article_tags['EMAIL'] = '<a href="./index.php?module=article&amp;email='.$this->id
    			.'"><img src="http://'. PHPWS_SOURCE_HTTP 
    			. 'mod/article/img/mailto.png" border="0" width="19" height="12" alt="' 
***************
*** 359,368 ****
    			$article_tags['EDIT'] = '['. $_SESSION['translate']->it('Locked') . ']'; 
    		else
!   			$article_tags['EDIT'] = '[<a href="index.php?module=article&amp;edit='.$this->id 
    								.'">' . $_SESSION['translate']->it('Edit').'</a>]';
  		     					
  		/* if user can delete articles or can delete this article... */
   		if ($_SESSION['SES_ART_master']->can('delete',$this->created_username))
! 	     $article_tags['DELETE'] = '[<a href="index.php?module=article&amp;edit=delete&amp;ARTICLE_id='
  	          . $this->id.'">'.$_SESSION['translate']->it('Delete').' </a>]';
  
--- 359,368 ----
    			$article_tags['EDIT'] = '['. $_SESSION['translate']->it('Locked') . ']'; 
    		else
!   			$article_tags['EDIT'] = '[<a href="./index.php?module=article&amp;edit='.$this->id 
    								.'">' . $_SESSION['translate']->it('Edit').'</a>]';
  		     					
  		/* if user can delete articles or can delete this article... */
   		if ($_SESSION['SES_ART_master']->can('delete',$this->created_username))
! 	     $article_tags['DELETE'] = '[<a href="./index.php?module=article&amp;edit=delete&amp;ARTICLE_id='
  	          . $this->id.'">'.$_SESSION['translate']->it('Delete').' </a>]';