[Magellancms-cvs] magellan/var/handlers pages.handler,1.6,1.7

[<ro...@us...>]

Update of /cvsroot/magellancms/magellan/var/handlers
In directory sc8-pr-cvs1:/tmp/cvs-serv19428/var/handlers

Modified Files:
	pages.handler 
Log Message:
Corrected a bug in pages.handler: now the page fields tag are not resolved
if the $tpagegen->pageid is not set (pages created "on-the-fly").


Index: pages.handler
===================================================================
RCS file: /cvsroot/magellancms/magellan/var/handlers/pages.handler,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pages.handler	12 Mar 2003 14:02:55 -0000	1.6
--- pages.handler	3 Apr 2003 10:56:15 -0000	1.7
***************
*** 162,225 ****
  // ----- Fields -----
  
! $types_query = &$GLOBALS['gEnv']['site']['db']->Execute(
!     'SELECT id,type,tag,image '.
!     'FROM magellanpagefieldtypes'
!     );
! 
! if ( $types_query->NumRows() )
  {
!     $types = array();
  
!     while ( !$types_query->eof )
      {
!         $types[$types_query->Fields( 'id' )] = array(
!             'type' => $types_query->Fields( 'type' ),
!             'tag' => $types_query->Fields( 'tag' ),
!             'image' => $types_query->Fields( 'image' ) == $GLOBALS['gEnv']['site']['db']->fmttrue ? true : false
!             );
!         $types_query->MoveNext();
!     }
  
!     $types_query->Free();
  
!     $fields_query = &$GLOBALS['gEnv']['site']['db']->Execute(
!         'SELECT typeid,value '.
!         'FROM magellanpagefields '.
!         'WHERE pageid='.$tpagegen->pageid
!         );
  
!     while ( !$fields_query->eof )
!     {
!         $type_id = $fields_query->Fields( 'typeid' );
!         $value = $fields_query->Fields( 'value' );
  
!         if ( $types[$type_id]['image'] )
          {
!             $media_query = &$GLOBALS['gEnv']['site']['db']->Execute(
!                 'SELECT mediaurl '.
!                 'FROM medias '.
!                 'WHERE id='.(int)$value
!                 );
  
!             if ( $media_query->NumRows() )
              {
!                 $value = $GLOBALS['gEnv']['site']['data']['siteurl'].'/'.$media_query->Fields( 'mediaurl' );
              }
-             else $value = '';
  
!             $media_query->Free();
!         }
  
!         $pageshandler->RegisterGeneralTag(
!             'PAGE_FIELD_'.$types[$type_id]['tag'],
!             $value
!             );
  
!         $fields_query->MoveNext();
      }
- 
-     $fields_query->Free();
  }
- 
  // ----- Commit -----
  
--- 162,227 ----
  // ----- Fields -----
  
! if ( $tpagegen->pageid )
  {
!     $types_query = &$GLOBALS['gEnv']['site']['db']->Execute(
!         'SELECT id,type,tag,image '.
!         'FROM magellanpagefieldtypes'
!         );
  
!     if ( $types_query->NumRows() )
      {
!         $types = array();
  
!         while ( !$types_query->eof )
!         {
!             $types[$types_query->Fields( 'id' )] = array(
!                 'type' => $types_query->Fields( 'type' ),
!                 'tag' => $types_query->Fields( 'tag' ),
!                 'image' => $types_query->Fields( 'image' ) == $GLOBALS['gEnv']['site']['db']->fmttrue ? true : false
!                 );
!             $types_query->MoveNext();
!         }
  
!         $types_query->Free();
  
!         $fields_query = &$GLOBALS['gEnv']['site']['db']->Execute(
!             'SELECT typeid,value '.
!             'FROM magellanpagefields '.
!             'WHERE pageid='.$tpagegen->pageid
!             );
  
!         while ( !$fields_query->eof )
          {
!             $type_id = $fields_query->Fields( 'typeid' );
!             $value = $fields_query->Fields( 'value' );
  
!             if ( $types[$type_id]['image'] )
              {
!                 $media_query = &$GLOBALS['gEnv']['site']['db']->Execute(
!                     'SELECT mediaurl '.
!                     'FROM medias '.
!                     'WHERE id='.(int)$value
!                     );
! 
!                 if ( $media_query->NumRows() )
!                 {
!                     $value = $GLOBALS['gEnv']['site']['data']['siteurl'].'/'.$media_query->Fields( 'mediaurl' );
!                 }
!                 else $value = '';
! 
!                 $media_query->Free();
              }
  
!             $pageshandler->RegisterGeneralTag(
!                 'PAGE_FIELD_'.$types[$type_id]['tag'],
!                 $value
!                 );
  
!             $fields_query->MoveNext();
!         }
  
!         $fields_query->Free();
      }
  }
  // ----- Commit -----