Niels Breet xfade at lists.slony.info
Fri Feb 2 09:18:20 PST 2007
Update of /home/cvsd/slony1/slony1-www
In directory main:/tmp/cvs-serv27961

Modified Files:
	index.php 
Log Message:
Trim trailing \n etc.

Index: index.php
===================================================================
RCS file: /home/cvsd/slony1/slony1-www/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** index.php	31 Jan 2007 18:06:39 -0000	1.4
--- index.php	2 Feb 2007 17:18:18 -0000	1.5
***************
*** 15,20 ****
  	$fp = fopen('./content/cvs.txt','r');
  	if ($fp){
! 		$title=fgets($fp,256);
! 		$link=fgets($fp,256);
  		$text="";
  		while (!feof($fp)) $text.=fgets($fp,256);
--- 15,20 ----
  	$fp = fopen('./content/cvs.txt','r');
  	if ($fp){
! 		$title=trim(fgets($fp,256));
! 		$link=trim(fgets($fp,256));
  		$text="";
  		while (!feof($fp)) $text.=fgets($fp,256);
***************
*** 28,33 ****
  	$fp = fopen('./content/intro.txt','r');
  	if ($fp){
! 		$title=fgets($fp,256);
! 		$link=fgets($fp,256);
  		$text="";
  		while (!feof($fp)) $text.=fgets($fp,256);
--- 28,33 ----
  	$fp = fopen('./content/intro.txt','r');
  	if ($fp){
! 		$title=trim(fgets($fp,256));
! 		$link=trim(fgets($fp,256));
  		$text="";
  		while (!feof($fp)) $text.=fgets($fp,256);
***************
*** 44,49 ****
  				if ($text != "") echo layout_defaultblock($title,$link,$text);
  				$text = "";
! 				$title = @fgets($fp,256);
! 				$link = @fgets($fp,256);
  			 } else {
  				$text .= $buf;
--- 44,49 ----
  				if ($text != "") echo layout_defaultblock($title,$link,$text);
  				$text = "";
! 				$title = trim(@fgets($fp,256));
! 				$link = trim(@fgets($fp,256));
  			 } else {
  				$text .= $buf;
***************
*** 64,69 ****
  				if ($text != "") echo layout_defaultblock($title,$link,$text,$stamp,$poster);
  				$text = "";
! 				$title = @fgets($fp,256);
! 				$link = @fgets($fp,256);
  				$stamp = @fgets($fp,256);
  				$poster = @fgets($fp,256);
--- 64,69 ----
  				if ($text != "") echo layout_defaultblock($title,$link,$text,$stamp,$poster);
  				$text = "";
! 				$title = trim(@fgets($fp,256));
! 				$link = trim(@fgets($fp,256));
  				$stamp = @fgets($fp,256);
  				$poster = @fgets($fp,256);




More information about the Slony1-commit mailing list