[geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.653,1.654

[Oliver]

Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv30432

Modified Files:
	lib-common.php 
Log Message:
using list-semantics instead of <br>

Index: lib-common.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.653
retrieving revision 1.654
diff -C2 -d -r1.653 -r1.654
*** lib-common.php	2 Sep 2007 07:50:56 -0000	1.653
--- lib-common.php	17 Sep 2007 04:37:22 -0000	1.654
***************
*** 1981,1984 ****
--- 1981,1985 ----
                                      'inactive' => 'topicoption_off.thtml' ));
      }
+     $retval = '<ul>';
      $sections->set_var( 'site_url', $_CONF['site_url'] );
      $sections->set_var( 'layout_url', $_CONF['layout_url'] );
***************
*** 2095,2099 ****
          }
      }
! 
      return $retval;
  }
--- 2096,2100 ----
          }
      }
!     $retval .= '</ul>';
      return $retval;
  }
***************
*** 2145,2148 ****
--- 2146,2150 ----
          $retval .= COM_startBlock( $title, $help,
                             COM_getBlockTemplate( 'user_block', 'header' ));
+         $retval .= '<ul>';
  
          // This function will show the user options for all installed plugins
***************
*** 2196,2200 ****
          $usermenu->set_var( 'option_url', $url );
          $retval .= $usermenu->parse( 'item', 'option' );
! 
          $retval .=  COM_endBlock( COM_getBlockTemplate( 'user_block', 'footer' ));
      }
--- 2198,2202 ----
          $usermenu->set_var( 'option_url', $url );
          $retval .= $usermenu->parse( 'item', 'option' );
!         $retval .= '</ul>';
          $retval .=  COM_endBlock( COM_getBlockTemplate( 'user_block', 'footer' ));
      }
***************
*** 2203,2207 ****
          $retval .= COM_startBlock( $LANG01[47], $help,
                             COM_getBlockTemplate( 'user_block', 'header' ));
! 
          $login = new Template( $_CONF['path_layout'] );
          $login->set_file( 'form', 'loginform.thtml' );
--- 2205,2209 ----
          $retval .= COM_startBlock( $LANG01[47], $help,
                             COM_getBlockTemplate( 'user_block', 'header' ));
!         $retval .= '<ul>';
          $login = new Template( $_CONF['path_layout'] );
          $login->set_file( 'form', 'loginform.thtml' );
***************
*** 2266,2270 ****
  
          $retval .= $login->parse( 'output', 'form' );
! 
          $retval .= COM_endBlock( COM_getBlockTemplate( 'user_block', 'footer' ));
      }
--- 2268,2272 ----
  
          $retval .= $login->parse( 'output', 'form' );
!         $retval .= '</ul>';
          $retval .= COM_endBlock( COM_getBlockTemplate( 'user_block', 'footer' ));
      }
***************
*** 2329,2332 ****
--- 2331,2335 ----
          $retval .= COM_startBlock( $title, $help,
                             COM_getBlockTemplate( 'admin_block', 'header' ));
+         $retval .= "<ul>";
  
          $topicsql = '';
***************
*** 2642,2646 ****
              $retval .= $link;
          }
! 
          $retval .= COM_endBlock( COM_getBlockTemplate( 'admin_block', 'footer' ));
      }
--- 2645,2649 ----
              $retval .= $link;
          }
!         $retval .= "</ul>";
          $retval .= COM_endBlock( COM_getBlockTemplate( 'admin_block', 'footer' ));
      }
***************
*** 3254,3258 ****
  
      $blocksql['mysql'] = "SELECT *,UNIX_TIMESTAMP(rdfupdated) AS date ";
!     
      $commonsql = "FROM {$_TABLES['blocks']} WHERE is_enabled = 1";
  
--- 3257,3261 ----
  
      $blocksql['mysql'] = "SELECT *,UNIX_TIMESTAMP(rdfupdated) AS date ";
! 
      $commonsql = "FROM {$_TABLES['blocks']} WHERE is_enabled = 1";
  
***************
*** 6326,6330 ****
  {
      global $_USER;
!     
      /* If no user was specified, fail over to the current user if there is one */
      if( empty( $uid ) )
--- 6329,6333 ----
  {
      global $_USER;
! 
      /* If no user was specified, fail over to the current user if there is one */
      if( empty( $uid ) )
***************
*** 6334,6339 ****
              $uid = $_USER['uid'];
          }
!     }   
!     
      if( !empty( $uid ) )
      {
--- 6337,6342 ----
              $uid = $_USER['uid'];
          }
!     }
! 
      if( !empty( $uid ) )
      {