[Openfirst-cvscommit] news rssfeed.php,1.7,1.8 viewnews.php,1.14,1.15

[Astronouth7303 <ast...@us...>]

Update of /cvsroot/openfirst/news
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20619/news

Modified Files:
	rssfeed.php viewnews.php 
Log Message:
-Corrected usage of $home
-Added $server

Index: viewnews.php
===================================================================
RCS file: /cvsroot/openfirst/news/viewnews.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** viewnews.php	13 Mar 2005 19:48:54 -0000	1.14
--- viewnews.php	14 Mar 2005 00:53:58 -0000	1.15
***************
*** 30,34 ****
    // Get a list of the users able to
    // be contacted via the feedback form.
!   global $basepath, $home;
    $query = ofirst_dbquery("SELECT * FROM ofirst_news ORDER BY ID DESC LIMIT $limit;");
  
--- 30,34 ----
    // Get a list of the users able to
    // be contacted via the feedback form.
!   global $basepath;
    $query = ofirst_dbquery("SELECT * FROM ofirst_news ORDER BY ID DESC LIMIT $limit;");
  
***************
*** 47,54 ****
            echo($news->news);
          }
!         echo("<br><br><center>[ <a href='$home$basepath/news/comments.php?ID=$news->ID'>View Comments</a> ]</center></td></tr>");
          if($admin){
!           echo('<tr><td class="sub"><div style="" align="right">Admin options: <a href="'.$home.$basepath.'/news/admin/editnews.php?id='.$news->ID.'"><img alt="Edit story" border=0 src="'.$home.$basepath.'/news/images/newdoc.gif" align=absmiddle>Edit story</a>');
!           echo('<a href="'.$home.$basepath.'/news/admin/killnews.php?id='.$news->ID.'"><img alt="Delete story" border=0 src="'.$home.$basepath.'/news/images/killdoc.gif" align=absmiddle>Delete story</a></div></td></tr>');
          }
         echo("</table><br>");
--- 47,54 ----
            echo($news->news);
          }
!         echo("<br><br><center>[ <a href='$basepath/news/comments.php?ID=$news->ID'>View Comments</a> ]</center></td></tr>");
          if($admin){
!           echo('<tr><td class="sub"><div style="" align="right">Admin options: <a href="'.$basepath.'/news/admin/editnews.php?id='.$news->ID.'"><img alt="Edit story" border=0 src="'.$basepath.'/news/images/newdoc.gif" align=absmiddle>Edit story</a>');
!           echo('<a href="'.$basepath.'/news/admin/killnews.php?id='.$news->ID.'"><img alt="Delete story" border=0 src="'.$basepath.'/news/images/killdoc.gif" align=absmiddle>Delete story</a></div></td></tr>');
          }
         echo("</table><br>");
***************
*** 59,63 ****
    }
    if($admin){
!     echo("<div align=center>[ <b><a href=\"$home$basepath/news/admin\">Post News</a></b> ]</div>");
    }
    return(0);
--- 59,63 ----
    }
    if($admin){
!     echo("<div align=center>[ <b><a href=\"$basepath/news/admin\">Post News</a></b> ]</div>");
    }
    return(0);

Index: rssfeed.php
===================================================================
RCS file: /cvsroot/openfirst/news/rssfeed.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rssfeed.php	25 Dec 2003 18:58:22 -0000	1.7
--- rssfeed.php	14 Mar 2005 00:53:58 -0000	1.8
***************
*** 43,47 ****
    }
  
!   $link = $home.$basepath."/news/rss/rss.php?headlines=".$numhead."&rss=".$_POST['version'];
  
  ?>
--- 43,47 ----
    }
  
!   $link = $server.$basepath."/news/rss/rss.php?headlines=".$numhead."&rss=".$_POST['version'];
  
  ?>