[geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.212,1.213

[dhaun at geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv6036

Modified Files:
	lib-common.php 
Log Message:
Moved hard-coded HTML for the login form (User Functions block) to template files,
added an ugly little hack for RSS feeds that have whitespace before the XML header


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.212
retrieving revision 1.213
diff -C2 -d -r1.212 -r1.213
*** lib-common.php	28 Mar 2003 18:19:56 -0000	1.212
--- lib-common.php	29 Mar 2003 17:30:02 -0000	1.213
***************
*** 2063,2075 ****
      else
      {
!         $retval .= COM_startBlock( $LANG01[47], $help, COM_getBlockTemplate( 'user_block', 'header' ))
!             . '<form action="' . $_CONF['site_url'] . '/users.php" method="post">' . LB
!             . '<b>' . $LANG01[21] . ':</b><br>' . LB
!             . '<input type="text" size="10" name="loginname" value=""><br>' . LB
!             . '<b>' . $LANG01[57] . ':</b><br>' . LB
!             . '<input type="password" size="10" name="passwd"><br>' . LB
!             . '<input type="submit" value="' . $LANG01[58] . '">' . LB
!             . '</form>' . $LANG01[59] . LB
!             . COM_endBlock( COM_getBlockTemplate( 'user_block', 'footer' ));
      }
  
--- 2063,2079 ----
      else
      {
!         $retval .= COM_startBlock( $LANG01[47], $help, COM_getBlockTemplate( 'user_block', 'header' ));
! 
!         $login = new Template( $_CONF['path_layout'] );
!         $login->set_file( 'form', 'loginform.thtml' );
!         $login->set_var( 'site_url', $_CONF['site_url'] );
!         $login->set_var( 'layout_url', $_CONF['layout_url'] );
!         $login->set_var( 'lang_username', $LANG01[21] );
!         $login->set_var( 'lang_password', $LANG01[57] );
!         $login->set_var( 'lang_login', $LANG01[58] );
!         $login->set_var( 'lang_signup', $LANG01[59] );
!         $retval .= $login->parse( 'output', 'form' );
! 
!         $retval .= COM_endBlock( COM_getBlockTemplate( 'user_block', 'footer' ));
      }
  
***************
*** 3320,3325 ****
--- 3324,3335 ----
      if( $fp = @fopen( $rdfurl, 'r' ))
      {
+         $startoffeed = true;
          while( $data = fread( $fp, 4096 ))
          {
+             if( $startoffeed )
+             {
+                 $data = ltrim( $data );
+                 $startoffeed = false;
+             }
              if( !xml_parse( $xml_parser, $data, feof( $fp )))
              {