[geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.646,1.647

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv76772/public_html

Modified Files:
	lib-common.php 
Log Message:
Make COM_makeList more fault-tolerant (since it's often called from 3rd party code)


Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.646
retrieving revision 1.647
diff -C2 -d -r1.646 -r1.647
*** lib-common.php	9 Aug 2007 07:13:39 -0000	1.646
--- lib-common.php	18 Aug 2007 18:11:14 -0000	1.647
***************
*** 4789,4825 ****
  * and listitem.thtml templates.
  *
! * @param        array       $listofitems        Items to list out
! * @return   string  HTML unordered list of array items
  */
! 
! function COM_makeList( $listofitems, $classname = '' )
  {
      global $_CONF;
  
!     $list = new Template( $_CONF['path_layout'] );
!     $list->set_file( array( 'list'     => 'list.thtml',
!                             'listitem' => 'listitem.thtml' ));
!     $list->set_var( 'site_url', $_CONF['site_url'] );
!     $list->set_var( 'layout_url', $_CONF['layout_url'] );
!     if( empty( $classname ))
!     {
!         $list->set_var( 'list_class', '' );
!         $list->set_var( 'list_class_name', '' );
!     }
!     else
!     {
!         $list->set_var( 'list_class', 'class="' . $classname . '"' );
!         $list->set_var( 'list_class_name', $classname );
      }
  
!     foreach( $listofitems as $oneitem )
!     {
!         $list->set_var( 'list_item', $oneitem );
!         $list->parse( 'list_items', 'listitem', true );
      }
  
!     $list->parse( 'newlist', 'list', true );
  
!     return $list->finish( $list->get_var( 'newlist' ));
  }
  
--- 4789,4823 ----
  * and listitem.thtml templates.
  *
! * @param    array   $listofitems    Items to list out
! * @return   string                  HTML unordered list of array items
  */
! function COM_makeList($listofitems, $classname = '')
  {
      global $_CONF;
  
!     $list = new Template($_CONF['path_layout']);
!     $list->set_file(array('list'     => 'list.thtml',
!                           'listitem' => 'listitem.thtml'));
!     $list->set_var('site_url', $_CONF['site_url']);
!     $list->set_var('layout_url', $_CONF['layout_url']);
! 
!     if (empty($classname)) {
!         $list->set_var('list_class',      '');
!         $list->set_var('list_class_name', '');
!     } else {
!         $list->set_var('list_class',      'class="' . $classname . '"');
!         $list->set_var('list_class_name', $classname);
      }
  
!     if (is_array($listofitems)) {
!         foreach ($listofitems as $oneitem) {
!             $list->set_var('list_item', $oneitem);
!             $list->parse('list_items', 'listitem', true);
!         }
      }
  
!     $list->parse('newlist', 'list', true);
  
!     return $list->finish($list->get_var('newlist'));
  }