[geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.240,1.241

[geeklog-cvs-admin at lists.geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory geeklog_prod:/tmp/cvs-serv12142

Modified Files:
	lib-common.php 
Log Message:
Introduced new variable {rss_url} that points to the site's RSS feed and can be used in header.thtml and footer.thtml (same as {rdf_file} that was already available in footer.thtml).
Added an htmlspecialchars() call to escape special characters in the body text of the site's RSS feed.


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.240
retrieving revision 1.241
diff -C2 -d -r1.240 -r1.241
*** lib-common.php	16 Jul 2003 13:04:19 -0000	1.240
--- lib-common.php	26 Jul 2003 19:13:38 -0000	1.241
***************
*** 748,757 ****
      $header->set_var( 'site_name', $_CONF['site_name'] );
      $header->set_var( 'site_slogan', $_CONF['site_slogan'] );
  
!     $msg = ' '.$LANG01[67].' '.$_CONF['site_name'];
  
      if( !empty( $_USER['username'] ))
      {
!         $msg .= ', '.$_USER['username'];
      }
  
--- 748,761 ----
      $header->set_var( 'site_name', $_CONF['site_name'] );
      $header->set_var( 'site_slogan', $_CONF['site_slogan'] );
+     $rdf = substr_replace( $_CONF['rdf_file'], $_CONF['site_url'], 0,
+                            strlen( $_CONF['path_html'] ) - 1 );
+     $header->set_var( 'rdf_file', $rdf );
+     $header->set_var( 'rss_url', $rdf );
  
!     $msg = ' ' . $LANG01[67] . ' ' . $_CONF['site_name'];
  
      if( !empty( $_USER['username'] ))
      {
!         $msg .= ', ' . $_USER['username'];
      }
  
***************
*** 948,951 ****
--- 952,956 ----
                             strlen( $_CONF['path_html'] ) - 1 );
      $footer->set_var( 'rdf_file', $rdf );
+     $footer->set_var( 'rss_url', $rdf );
  
      $year = date( 'Y' );
***************
*** 1387,1391 ****
                      }
  
!                     $desc .= $storytext . "</description>\n";
                  }
                  else
--- 1392,1397 ----
                      }
  
!                     $desc .= htmlspecialchars( $storytext )
!                           . "</description>\n";
                  }
                  else