[Magellancms-cvs] magellan/www/admin magellanmedia.php,1.6,1.7 magellanp3p.php,1.2,1.3 magellanpages
Brought to you by:
burzmali
Menu
▾
▴
[Magellancms-cvs] magellan/www/admin magellanmedia.php,1.6,1.7 magellanp3p.php,1.2,1.3 magellanpages.php,1.7,1.8 magellantemplates.php,1.7,1.8 magellanwebusers.php,1.7,1.8 magellanwebusersprefs.php,1.3,1.4
Update of /cvsroot/magellancms/magellan/www/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv32105/www/admin
Modified Files:
magellanmedia.php magellanp3p.php magellanpages.php
magellantemplates.php magellanwebusers.php
magellanwebusersprefs.php
Log Message:
Added the possibility of image resizing when inserting a new image.
Added the scaleimagelib module suggestion.
Fixed typo in magellan.library that prevented the correct update of an image
type page field when the corresponing image is removed.
Index: magellanmedia.php
===================================================================
RCS file: /cvsroot/magellancms/magellan/www/admin/magellanmedia.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** magellanmedia.php 24 Feb 2003 14:05:27 -0000 1.6
--- magellanmedia.php 12 Mar 2003 14:03:09 -0000 1.7
***************
*** 53,62 ****
$home_action = new HuiEventsCall();
$home_action->AddEvent( new HuiEvent( 'main', 'default', '' ) );
! $hui_homebutton = new HuiButton( 'homebutton', array( 'label' => $site_locale->GetStr( 'medias_button' ), 'themeimage' => 'view_tree', 'action' => $home_action->GetEventsCallString() ) );
$hui_mediastoolbar->AddChild( $hui_homebutton );
$newmedia_action = new HuiEventsCall();
$newmedia_action->AddEvent( new HuiEvent( 'main', 'newmedia', '' ) );
! $hui_newmediabutton = new HuiButton( 'newmediabutton', array( 'label' => $site_locale->GetStr( 'newmedia_button' ), 'themeimage' => 'filenew', 'action' => $newmedia_action->GetEventsCallString() ) );
$hui_mediastoolbar->AddChild( $hui_newmediabutton );
--- 53,62 ----
$home_action = new HuiEventsCall();
$home_action->AddEvent( new HuiEvent( 'main', 'default', '' ) );
! $hui_homebutton = new HuiButton( 'homebutton', array( 'horiz' => 'true', 'label' => $site_locale->GetStr( 'medias_button' ), 'themeimage' => 'view_tree', 'action' => $home_action->GetEventsCallString() ) );
$hui_mediastoolbar->AddChild( $hui_homebutton );
$newmedia_action = new HuiEventsCall();
$newmedia_action->AddEvent( new HuiEvent( 'main', 'newmedia', '' ) );
! $hui_newmediabutton = new HuiButton( 'newmediabutton', array( 'horiz' => 'true', 'label' => $site_locale->GetStr( 'newmedia_button' ), 'themeimage' => 'filenew', 'action' => $newmedia_action->GetEventsCallString() ) );
$hui_mediastoolbar->AddChild( $hui_newmediabutton );
***************
*** 67,71 ****
$help_action = new HuiEventsCall();
$help_action->AddEvent( new HuiEvent( 'main', 'help', '' ) );
! $hui_helpbutton = new HuiButton( 'helpbutton', array( 'label' => $site_locale->GetStr( 'help_button' ), 'themeimage' => 'help', 'action' => $help_action->GetEventsCallString() ) );
// Toolbar frame
--- 67,71 ----
$help_action = new HuiEventsCall();
$help_action->AddEvent( new HuiEvent( 'main', 'help', '' ) );
! $hui_helpbutton = new HuiButton( 'helpbutton', array( 'horiz' => 'true', 'label' => $site_locale->GetStr( 'help_button' ), 'themeimage' => 'help', 'action' => $help_action->GetEventsCallString() ) );
// Toolbar frame
***************
*** 93,96 ****
--- 93,117 ----
if ( is_uploaded_file( $eventData['mediafile']['tmp_name'] ) )
{
+ if ( $eventData['resize'] == 1 )
+ {
+ OpenLibrary( 'scaleimage.library' );
+
+ $image = new ScaleImage( $eventData['mediafile']['tmp_name'] );
+ $image->quality = 75;
+
+ if ( ( !empty( $eventData['height'] ) ) && ( !empty( $eventData['width'] ) ) )
+ {
+ $image->ScaleXY( $eventData['height'], $eventData['width'], $eventData['mediafile']['tmp_name'], $image->imageType );
+ }
+ elseif ( !empty( $eventData['height'] ) )
+ {
+ $image->ScaleMaxHeight( $eventData['height'], $eventData['mediafile']['tmp_name'] );
+ }
+ elseif ( !empty( $eventData['width'] ) )
+ {
+ $image->ScaleMaxWidth( $eventData['width'], $eventData['mediafile']['tmp_name'] );
+ }
+ }
+
$tempData['medianame'] = $eventData['medianame'];
$tempData['description'] = $eventData['description'];
***************
*** 113,116 ****
--- 134,180 ----
}
}
+
+ if ( $eventData['resize'] == 2 )
+ {
+ OpenLibrary( 'scaleimage.library' );
+
+ $tempData['medianame'] = sprintf( $site_locale->GetStr( 'media_resized' ), $eventData['medianame'] );
+ $tempData['description'] = $eventData['description'];
+ $tempData['location'] = $eventData['mediafile']['tmp_name'];
+ $tempData['mediafilename'] = substr( $eventData['mediafile']['name'], 0, strpos( $eventData['mediafile']['name'], '.' ) ).'_resized'.strrchr( $eventData['mediafile']['name'], '.' );
+
+ $image = new ScaleImage( $eventData['mediafile']['tmp_name'] );
+ $image->quality = 85;
+
+ if ( ( !empty( $eventData['height'] ) ) && ( !empty( $eventData['width'] ) ) )
+ {
+ $image->ScaleXY( $eventData['height'], $eventData['width'], $eventData['mediafile']['tmp_name'], $image->imageType );
+ }
+ elseif ( !empty( $eventData['height'] ) )
+ {
+ $image->ScaleMaxHeight( $eventData['height'], $eventData['mediafile']['tmp_name'] );
+ }
+ elseif ( !empty( $eventData['width'] ) )
+ {
+ $image->ScaleMaxWidth( $eventData['width'], $eventData['mediafile']['tmp_name'] );
+ }
+
+ $media = new MagellanMedia( $env['ampdb'], $env['db'] );
+ if ( $media->Create( $tempData ) ) $hui_mainstatus->mStatus = $site_locale->GetStr( 'pass_newmedia_newmedia_created_status' );
+ else
+ {
+ switch ( $media->mLastError )
+ {
+ case MAGELLAN_MAGELLANMEDIA_CREATE_FILE_DOESNT_EXISTS:
+ $hui_mainstatus->mStatus = $site_locale->GetStr( 'pass_newmedia_newmedia_notcreated_file_not_exists_status' );
+ break;
+
+ default:
+ $hui_mainstatus->mStatus = $site_locale->GetStr( 'pass_newmedia_newmedia_notcreated_status' );
+ break;
+ }
+ }
+ }
+
@unlink( $eventData['mediafile']['tmp_name'] );
}
***************
*** 364,367 ****
--- 428,432 ----
{
global $env, $hui_mainframe, $site_locale, $hui_titlebar;
+ $module_dep = new ModuleDep( $GLOBALS['gEnv']['root']['db'] );
$vert_group = new HuiVertGroup( 'vertgroup' );
***************
*** 377,380 ****
--- 442,469 ----
$media_grid->AddChild( new HuiText( 'description', array( 'disp' => 'pass', 'cols' => '40', 'rows' => '5' ) ), 2, 1, '', 'top' );
+ if ( $module_dep->IsInstalled( 'scaleimagelib' ) )
+ {
+ $resize_elements[0] = $site_locale->GetStr( 'mediaresize_noresize_element' );
+ $resize_elements[1] = $site_locale->GetStr( 'mediaresize_resize_element' );
+ $resize_elements[2] = $site_locale->GetStr( 'mediaresize_copyresize_element' );
+
+ $media_grid->AddChild( new HuiHorizBar( 'horizbar2' ), 3, 0, '', 'top' );
+ $media_grid->AddChild( new HuiHorizBar( 'horizbar3' ), 3, 1, '', 'top' );
+
+ $media_grid->AddChild( new HuiLabel( 'resizelabel', array( 'label' => $site_locale->GetStr( 'mediaresize_label' ).' (**)' ) ), 4, 0, '', 'top' );
+ $media_grid->AddChild( new HuiComboBox( 'resize', array( 'disp' => 'pass', 'elements' => $resize_elements ) ), 4, 1, '', 'top' );
+
+ $media_grid->AddChild( new HuiLabel( 'dimslabel', array( 'label' => $site_locale->GetStr( 'mediadimensions_label' ) ) ), 5, 0, '', 'top' );
+
+ $dims_grid = new HuiGrid( 'dimsgrid', array( 'rows' => '1', 'cols' => '4' ) );
+
+ $dims_grid->AddChild( new HuiLabel( 'heightlabel', array( 'label' => $site_locale->GetStr( 'mediaheight_label' ) ) ), 0, 0, '', 'top' );
+ $dims_grid->AddChild( new HuiString( 'width', array( 'disp' => 'pass', 'size' => '4' ) ), 0, 1, '', 'top' );
+ $dims_grid->AddChild( new HuiLabel( 'widthlabel', array( 'label' => $site_locale->GetStr( 'mediawidth_label' ) ) ), 1, 0, '', 'top' );
+ $dims_grid->AddChild( new HuiString( 'height', array( 'disp' => 'pass', 'size' => '4' ) ), 1, 1, '', 'top' );
+
+ $media_grid->AddChild( $dims_grid, 5, 1, '', 'top' );
+ }
+
$vert_group->AddChild( $media_grid );
$vert_group->AddChild( new HuiSubmit( 'submit', array( 'caption' => $site_locale->GetStr( 'newmedia_submit' ) ) ) );
***************
*** 382,385 ****
--- 471,478 ----
$vert_group->AddChild( new HuiHorizBar( 'horizbar1' ) );
$vert_group->AddChild( new HuiLabel( 'reqfieldslabel', array( 'label' => $site_locale->GetStr( 'requiredfield_label' ) ) ) );
+ if ( $module_dep->IsInstalled( 'scaleimagelib' ) )
+ {
+ $vert_group->AddChild( new HuiLabel( 'typeslabel', array( 'label' => '(**) '.$site_locale->GetStr( 'mediatypes_label' ) ) ) );
+ }
$form_events_call = new HuiEventsCall();
Index: magellanp3p.php
===================================================================
RCS file: /cvsroot/magellancms/magellan/www/admin/magellanp3p.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** magellanp3p.php 24 Feb 2003 14:05:28 -0000 1.2
--- magellanp3p.php 12 Mar 2003 14:03:10 -0000 1.3
***************
*** 88,92 ****
$gMain_disp->Dispatch();
! $toolbars['main'] = array( 'main' => array( 'label' => $gLocale->GetStr( 'default.button' ), 'themeimage' => 'lock', 'action' => build_events_call_string( '', array( array( 'main', 'default', '' ) ) ) ) );
$gToolbars = array( new HuiAmpToolBar( 'main', array( 'toolbars' => $toolbars ) ) );
--- 88,92 ----
$gMain_disp->Dispatch();
! $toolbars['main'] = array( 'main' => array( 'label' => $gLocale->GetStr( 'default.button' ), 'horiz' => 'true', 'themeimage' => 'lock', 'action' => build_events_call_string( '', array( array( 'main', 'default', '' ) ) ) ) );
$gToolbars = array( new HuiAmpToolBar( 'main', array( 'toolbars' => $toolbars ) ) );
Index: magellanpages.php
===================================================================
RCS file: /cvsroot/magellancms/magellan/www/admin/magellanpages.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** magellanpages.php 24 Feb 2003 14:05:28 -0000 1.7
--- magellanpages.php 12 Mar 2003 14:03:10 -0000 1.8
***************
*** 51,60 ****
$home_action = new HuiEventsCall();
$home_action->AddEvent( new HuiEvent( 'main', 'default', '' ) );
! $hui_homebutton = new HuiButton( 'homebutton', array( 'label' => $site_locale->GetStr( 'pages_button' ), 'themeimage' => 'view_tree', 'action' => $home_action->GetEventsCallString() ) );
$hui_pagestoolbar->AddChild( $hui_homebutton );
$newpage_action = new HuiEventsCall();
$newpage_action->AddEvent( new HuiEvent( 'main', 'newpage', '' ) );
! $hui_newpagebutton = new HuiButton( 'newpagebutton', array( 'label' => $site_locale->GetStr( 'newpage_button' ), 'themeimage' => 'filenew', 'action' => $newpage_action->GetEventsCallString() ) );
$hui_pagestoolbar->AddChild( $hui_newpagebutton );
--- 51,60 ----
$home_action = new HuiEventsCall();
$home_action->AddEvent( new HuiEvent( 'main', 'default', '' ) );
! $hui_homebutton = new HuiButton( 'homebutton', array( 'horiz' => 'true', 'label' => $site_locale->GetStr( 'pages_button' ), 'themeimage' => 'view_tree', 'action' => $home_action->GetEventsCallString() ) );
$hui_pagestoolbar->AddChild( $hui_homebutton );
$newpage_action = new HuiEventsCall();
$newpage_action->AddEvent( new HuiEvent( 'main', 'newpage', '' ) );
! $hui_newpagebutton = new HuiButton( 'newpagebutton', array( 'horiz' => 'true', 'label' => $site_locale->GetStr( 'newpage_button' ), 'themeimage' => 'filenew', 'action' => $newpage_action->GetEventsCallString() ) );
$hui_pagestoolbar->AddChild( $hui_newpagebutton );
***************
*** 65,69 ****
$help_action = new HuiEventsCall();
$help_action->AddEvent( new HuiEvent( 'main', 'help', '' ) );
! $hui_helpbutton = new HuiButton( 'helpbutton', array( 'label' => $site_locale->GetStr( 'help_button' ), 'themeimage' => 'help', 'action' => $help_action->GetEventsCallString() ) );
// Toolbar frame
--- 65,69 ----
$help_action = new HuiEventsCall();
$help_action->AddEvent( new HuiEvent( 'main', 'help', '' ) );
! $hui_helpbutton = new HuiButton( 'helpbutton', array( 'horiz' => 'true', 'label' => $site_locale->GetStr( 'help_button' ), 'themeimage' => 'help', 'action' => $help_action->GetEventsCallString() ) );
// Toolbar frame
***************
*** 88,92 ****
$page = new MagellanPage( $env['ampdb'], $env['db'] );
! if ( $page->Create( $eventData, TRUE ) ) $hui_mainstatus->mStatus = $site_locale->GetStr( 'pass_newpage_newpage_created_status' );
else
{
--- 88,121 ----
$page = new MagellanPage( $env['ampdb'], $env['db'] );
! if ( $page->Create( $eventData, TRUE ) )
! {
! OpenLibrary( 'modules.library' );
!
! $mod = new ModuleDep( $GLOBALS['gEnv']['root']['db'] );
! if ( $mod->IsSubModuleEnabled(
! 'magellan',
! 'free fields',
! $GLOBALS['gEnv']['site']['serial']
! )
! )
! {
! $types_query = &$GLOBALS['gEnv']['site']['db']->Execute(
! 'SELECT id,type '.
! 'FROM magellanpagefieldtypes'
! );
!
! while ( !$types_query->eof )
! {
! $page->SetTagValue(
! $types_query->Fields( 'id' ),
! $eventData['field_'.$types_query->Fields( 'id' )]
! );
!
! $types_query->MoveNext();
! }
! }
!
! $hui_mainstatus->mStatus = $site_locale->GetStr( 'pass_newpage_newpage_created_status' );
! }
else
{
***************
*** 110,114 ****
$page = new MagellanPage( $env['ampdb'], $env['db'], $eventData['pageid'] );
! if ( $page->Update( $eventData ) ) $hui_mainstatus->mStatus = $site_locale->GetStr( 'pass_editpage_page_changed_status' );
else
{
--- 139,172 ----
$page = new MagellanPage( $env['ampdb'], $env['db'], $eventData['pageid'] );
! if ( $page->Update( $eventData ) )
! {
! OpenLibrary( 'modules.library' );
!
! $mod = new ModuleDep( $GLOBALS['gEnv']['root']['db'] );
! if ( $mod->IsSubModuleEnabled(
! 'magellan',
! 'free fields',
! $GLOBALS['gEnv']['site']['serial']
! )
! )
! {
! $types_query = &$GLOBALS['gEnv']['site']['db']->Execute(
! 'SELECT id,type '.
! 'FROM magellanpagefieldtypes'
! );
!
! while ( !$types_query->eof )
! {
! $page->SetTagValue(
! $types_query->Fields( 'id' ),
! $eventData['field_'.$types_query->Fields( 'id' )]
! );
!
! $types_query->MoveNext();
! }
! }
!
! $hui_mainstatus->mStatus = $site_locale->GetStr( 'pass_editpage_page_changed_status' );
! }
else
{
***************
*** 458,462 ****
$page_grid->AddChild( new HuiString( 'linkname', array( 'disp' => 'pass', 'size' => '80' ) ), 8, 1, '', 'top' );
! $vert_group->AddChild( $page_grid );
$vert_group->AddChild( new HuiSubmit( 'submit', array( 'caption' => $site_locale->GetStr( 'newpage_submit' ) ) ) );
--- 516,614 ----
$page_grid->AddChild( new HuiString( 'linkname', array( 'disp' => 'pass', 'size' => '80' ) ), 8, 1, '', 'top' );
! OpenLibrary( 'modules.library' );
!
! $mod = new ModuleDep( $GLOBALS['gEnv']['root']['db'] );
! if ( $mod->IsSubModuleEnabled(
! 'magellan',
! 'free fields',
! $GLOBALS['gEnv']['site']['serial']
! )
! )
! {
! $types_query = &$GLOBALS['gEnv']['site']['db']->Execute(
! 'SELECT id,type,image '.
! 'FROM magellanpagefieldtypes '.
! 'ORDER BY type'
! );
!
! if ( $types_query->NumRows() )
! {
! $page_grid->AddChild( new HuiHorizBar( '', '' ), 9, 0, '', 'top' );
! $page_grid->AddChild( new HuiHorizBar( '', '' ), 9, 1, '', 'top' );
!
! $headers[0]['label'] = $site_locale->GetStr( 'fieldname.header' );
! $headers[1]['label'] = $site_locale->GetStr( 'fieldvalue.header' );
!
! $xml_def =
! '<table>
! <args>
! <headers type="array">'.huixml_encode( $headers ).'</headers>
! </args>
! <children>';
!
! $images = array();
!
! $images_query = &$GLOBALS['gEnv']['site']['db']->Execute(
! 'SELECT id,medianame '.
! 'FROM medias '.
! 'ORDER BY medianame'
! );
!
! $images[0] = $site_locale->GetStr( 'noimage.label' );
!
! while ( !$images_query->eof )
! {
! $images[$images_query->Fields( 'id' )] = $images_query->Fields( 'medianame' );
! $images_query->MoveNext();
! }
!
! $row = 0;
!
! while ( !$types_query->eof )
! {
! $xml_def .=
! '<label row="'.$row.'" col="0" halign="" valign="top">
! <args>
! <label type="encoded">'.urlencode( $types_query->Fields( 'type' ) ).'</label>
! </args>
! </label>';
!
! if ( $types_query->Fields( 'image' ) == $GLOBALS['gEnv']['site']['db']->fmttrue )
! {
! $xml_def .=
! '<combobox row="'.$row.'" col="1" halign="" valign="top"><name>field_'.$types_query->Fields( 'id' ).'</name>
! <args>
! <disp>pass</disp>
! <elements type="array">'.huixml_encode( $images ).'</elements>
! </args>
! </combobox>';
! }
! else
! {
! $xml_def .=
! '<text row="'.$row.'" col="1" halign="" valign="top"><name>field_'.$types_query->Fields( 'id' ).'</name>
! <args>
! <disp>pass</disp>
! <rows>3</rows>
! <cols>60</cols>
! </args>
! </text>';
! }
!
! $row++;
! $types_query->MoveNext();
! }
!
! $xml_def .=
! ' </children>
! </table>';
!
! $page_grid->AddChild( new HuiLabel( 'linknamelabel', array( 'label' => $site_locale->GetStr( 'fields_label' ) ) ), 10, 0, '', 'top' );
! $page_grid->AddChild( new HuiXml( 'page', array( 'definition' => $xml_def ) ), 10, 1, '', 'top' );
! }
! }
!
! $vert_group->AddChild( $page_grid );
!
$vert_group->AddChild( new HuiSubmit( 'submit', array( 'caption' => $site_locale->GetStr( 'newpage_submit' ) ) ) );
***************
*** 487,490 ****
--- 639,648 ----
if ( $page_query->NumRows() )
{
+ $page = new MagellanPage(
+ $GLOBALS['gEnv']['root']['db'],
+ $GLOBALS['gEnv']['site']['db'],
+ $eventData['pageid']
+ );
+
$templates_query = &$env['db']->Execute( 'SELECT id,templatename '.
'FROM templates '.
***************
*** 534,538 ****
$page_grid->AddChild( new HuiLabel( 'metakeylabel', array( 'label' => $site_locale->GetStr( 'metakey_label' ) ) ), 6, 0, '', 'top' );
$page_grid->AddChild( new HuiString( 'metakey', array( 'disp' => 'pass', 'size' => '80', 'value' => $page_query->Fields( 'metakey' ) ) ), 6, 1, '', 'top' );
!
$page_grid->AddChild( new HuiLabel( 'medialabel', array( 'label' => $site_locale->GetStr( 'media_label' ) ) ), 7, 0, '', 'top' );
$page_grid->AddChild( new HuiListBox( 'mediaid', array( 'disp' => 'pass', 'elements' => $media, 'size' => '10', 'default' => $page_query->Fields( 'mediaid' ) ) ), 7, 1, '', 'top' );
--- 692,696 ----
$page_grid->AddChild( new HuiLabel( 'metakeylabel', array( 'label' => $site_locale->GetStr( 'metakey_label' ) ) ), 6, 0, '', 'top' );
$page_grid->AddChild( new HuiString( 'metakey', array( 'disp' => 'pass', 'size' => '80', 'value' => $page_query->Fields( 'metakey' ) ) ), 6, 1, '', 'top' );
!
$page_grid->AddChild( new HuiLabel( 'medialabel', array( 'label' => $site_locale->GetStr( 'media_label' ) ) ), 7, 0, '', 'top' );
$page_grid->AddChild( new HuiListBox( 'mediaid', array( 'disp' => 'pass', 'elements' => $media, 'size' => '10', 'default' => $page_query->Fields( 'mediaid' ) ) ), 7, 1, '', 'top' );
***************
*** 540,543 ****
--- 698,796 ----
$page_grid->AddChild( new HuiLabel( 'linknamelabel', array( 'label' => $site_locale->GetStr( 'linkname_label' ) ) ), 8, 0, '', 'top' );
$page_grid->AddChild( new HuiString( 'linkname', array( 'disp' => 'pass', 'size' => '80', 'value' => $page_query->Fields( 'linkname' ) ) ), 8, 1, '', 'top' );
+
+ OpenLibrary( 'modules.library' );
+
+ $mod = new ModuleDep( $GLOBALS['gEnv']['root']['db'] );
+ if ( $mod->IsSubModuleEnabled(
+ 'magellan',
+ 'free fields',
+ $GLOBALS['gEnv']['site']['serial']
+ )
+ )
+ {
+
+ $types_query = &$GLOBALS['gEnv']['site']['db']->Execute(
+ 'SELECT id,type,image '.
+ 'FROM magellanpagefieldtypes '.
+ 'ORDER BY type'
+ );
+
+ if ( $types_query->NumRows() )
+ {
+ $page_grid->AddChild( new HuiHorizBar( '', '' ), 9, 0, '', 'top' );
+ $page_grid->AddChild( new HuiHorizBar( '', '' ), 9, 1, '', 'top' );
+
+ $headers[0]['label'] = $site_locale->GetStr( 'fieldname.header' );
+ $headers[1]['label'] = $site_locale->GetStr( 'fieldvalue.header' );
+
+ $xml_def =
+ '<table>
+ <args>
+ <headers type="array">'.huixml_encode( $headers ).'</headers>
+ </args>
+ <children>';
+
+ $images = array();
+
+ $images_query = &$GLOBALS['gEnv']['site']['db']->Execute(
+ 'SELECT id,medianame '.
+ 'FROM medias '.
+ 'ORDER BY medianame'
+ );
+
+ $images[0] = $site_locale->GetStr( 'noimage.label' );
+
+ while ( !$images_query->eof )
+ {
+ $images[$images_query->Fields( 'id' )] = $images_query->Fields( 'medianame' );
+ $images_query->MoveNext();
+ }
+
+ $row = 0;
+ while ( !$types_query->eof )
+ {
+ $xml_def .=
+ '<label row="'.$row.'" col="0" halign="" valign="top">
+ <args>
+ <label type="encoded">'.urlencode( $types_query->Fields( 'type' ) ).'</label>
+ </args>
+ </label>';
+
+ if ( $types_query->Fields( 'image' ) == $GLOBALS['gEnv']['site']['db']->fmttrue )
+ {
+ $xml_def .=
+ '<combobox row="'.$row.'" col="1" halign="" valign="top"><name>field_'.$types_query->Fields( 'id' ).'</name>
+ <args>
+ <disp>pass</disp>
+ <elements type="array">'.huixml_encode( $images ).'</elements>
+ <default>'.$page->GetTagValue( $types_query->Fields( 'id' ) ).'</default>
+ </args>
+ </combobox>';
+ }
+ else
+ {
+ $xml_def .=
+ '<text row="'.$row.'" col="1" halign="" valign="top"><name>field_'.$types_query->Fields( 'id' ).'</name>
+ <args>
+ <disp>pass</disp>
+ <rows>3</rows>
+ <cols>60</cols>
+ <value type="encoded">'.urlencode( $page->GetTagValue( $types_query->Fields( 'id' ) ) ).'</value>
+ </args>
+ </text>';
+ }
+
+ $row++;
+ $types_query->MoveNext();
+ }
+
+ $xml_def .=
+ ' </children>
+ </table>';
+
+ $page_grid->AddChild( new HuiLabel( 'linknamelabel', array( 'label' => $site_locale->GetStr( 'fields_label' ) ) ), 10, 0, '', 'top' );
+ $page_grid->AddChild( new HuiXml( 'page', array( 'definition' => $xml_def ) ), 10, 1, '', 'top' );
+ }
+ }
$vert_group->AddChild( $page_grid );
Index: magellantemplates.php
===================================================================
RCS file: /cvsroot/magellancms/magellan/www/admin/magellantemplates.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** magellantemplates.php 24 Feb 2003 14:05:28 -0000 1.7
--- magellantemplates.php 12 Mar 2003 14:03:15 -0000 1.8
***************
*** 51,60 ****
$home_action = new HuiEventsCall();
$home_action->AddEvent( new HuiEvent( 'main', 'default', '' ) );
! $hui_homebutton = new HuiButton( 'homebutton', array( 'label' => $site_locale->GetStr( 'templates_button' ), 'themeimage' => 'view_tree', 'action' => $home_action->GetEventsCallString() ) );
$hui_templatestoolbar->AddChild( $hui_homebutton );
$newtemplate_action = new HuiEventsCall();
$newtemplate_action->AddEvent( new HuiEvent( 'main', 'newtemplate', '' ) );
! $hui_newtemplatebutton = new HuiButton( 'newtemplatebutton', array( 'label' => $site_locale->GetStr( 'newtemplate_button' ), 'themeimage' => 'filenew', 'action' => $newtemplate_action->GetEventsCallString() ) );
$hui_templatestoolbar->AddChild( $hui_newtemplatebutton );
--- 51,60 ----
$home_action = new HuiEventsCall();
$home_action->AddEvent( new HuiEvent( 'main', 'default', '' ) );
! $hui_homebutton = new HuiButton( 'homebutton', array( 'horiz' => 'true', 'label' => $site_locale->GetStr( 'templates_button' ), 'themeimage' => 'view_tree', 'action' => $home_action->GetEventsCallString() ) );
$hui_templatestoolbar->AddChild( $hui_homebutton );
$newtemplate_action = new HuiEventsCall();
$newtemplate_action->AddEvent( new HuiEvent( 'main', 'newtemplate', '' ) );
! $hui_newtemplatebutton = new HuiButton( 'newtemplatebutton', array( 'horiz' => 'true', 'label' => $site_locale->GetStr( 'newtemplate_button' ), 'themeimage' => 'filenew', 'action' => $newtemplate_action->GetEventsCallString() ) );
$hui_templatestoolbar->AddChild( $hui_newtemplatebutton );
***************
*** 65,69 ****
$help_action = new HuiEventsCall();
$help_action->AddEvent( new HuiEvent( 'main', 'help', '' ) );
! $hui_helpbutton = new HuiButton( 'helpbutton', array( 'label' => $site_locale->GetStr( 'help_button' ), 'themeimage' => 'help', 'action' => $help_action->GetEventsCallString() ) );
// Toolbar frame
--- 65,69 ----
$help_action = new HuiEventsCall();
$help_action->AddEvent( new HuiEvent( 'main', 'help', '' ) );
! $hui_helpbutton = new HuiButton( 'helpbutton', array( 'horiz' => 'true', 'label' => $site_locale->GetStr( 'help_button' ), 'themeimage' => 'help', 'action' => $help_action->GetEventsCallString() ) );
// Toolbar frame
Index: magellanwebusers.php
===================================================================
RCS file: /cvsroot/magellancms/magellan/www/admin/magellanwebusers.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** magellanwebusers.php 24 Feb 2003 14:05:28 -0000 1.7
--- magellanwebusers.php 12 Mar 2003 14:03:17 -0000 1.8
***************
*** 52,61 ****
$home_action = new HuiEventsCall();
$home_action->AddEvent( new HuiEvent( 'main', 'default', '' ) );
! $hui_homebutton = new HuiButton( 'homebutton', array( 'label' => $amp_locale->GetStr( 'users_button' ), 'themeimage' => 'view_tree', 'action' => $home_action->GetEventsCallString() ) );
$hui_maintoolbar->AddChild( $hui_homebutton );
$new_action = new HuiEventsCall();
$new_action->AddEvent( new HuiEvent( 'main', 'newuser', '' ) );
! $hui_newbutton = new HuiButton( 'newbutton', array( 'label' => $amp_locale->GetStr( 'newuser_button' ), 'themeimage' => 'filenew', 'action' => $new_action->GetEventsCallString() ) );
$hui_maintoolbar->AddChild( $hui_newbutton );
--- 52,61 ----
$home_action = new HuiEventsCall();
$home_action->AddEvent( new HuiEvent( 'main', 'default', '' ) );
! $hui_homebutton = new HuiButton( 'homebutton', array( 'horiz' => 'true', 'label' => $amp_locale->GetStr( 'users_button' ), 'themeimage' => 'view_tree', 'action' => $home_action->GetEventsCallString() ) );
$hui_maintoolbar->AddChild( $hui_homebutton );
$new_action = new HuiEventsCall();
$new_action->AddEvent( new HuiEvent( 'main', 'newuser', '' ) );
! $hui_newbutton = new HuiButton( 'newbutton', array( 'horiz' => 'true', 'label' => $amp_locale->GetStr( 'newuser_button' ), 'themeimage' => 'filenew', 'action' => $new_action->GetEventsCallString() ) );
$hui_maintoolbar->AddChild( $hui_newbutton );
***************
*** 64,73 ****
$groups_action = new HuiEventsCall();
$groups_action->AddEvent( new HuiEvent( 'main', 'groups', '' ) );
! $hui_groupsbutton = new HuiButton( 'groupsbutton', array( 'label' => $amp_locale->GetStr( 'groups.button' ), 'themeimage' => 'view_tree', 'action' => $groups_action->GetEventsCallString() ) );
$hui_groupstoolbar->AddChild( $hui_groupsbutton );
$newgroup_action = new HuiEventsCall();
$newgroup_action->AddEvent( new HuiEvent( 'main', 'newgroup', '' ) );
! $hui_newgroupbutton = new HuiButton( 'newgroupbutton', array( 'label' => $amp_locale->GetStr( 'newgroup.button' ), 'themeimage' => 'filenew', 'action' => $newgroup_action->GetEventsCallString() ) );
$hui_groupstoolbar->AddChild( $hui_newgroupbutton );
--- 64,73 ----
$groups_action = new HuiEventsCall();
$groups_action->AddEvent( new HuiEvent( 'main', 'groups', '' ) );
! $hui_groupsbutton = new HuiButton( 'groupsbutton', array( 'horiz' => 'true', 'label' => $amp_locale->GetStr( 'groups.button' ), 'themeimage' => 'view_tree', 'action' => $groups_action->GetEventsCallString() ) );
$hui_groupstoolbar->AddChild( $hui_groupsbutton );
$newgroup_action = new HuiEventsCall();
$newgroup_action->AddEvent( new HuiEvent( 'main', 'newgroup', '' ) );
! $hui_newgroupbutton = new HuiButton( 'newgroupbutton', array( 'horiz' => 'true', 'label' => $amp_locale->GetStr( 'newgroup.button' ), 'themeimage' => 'filenew', 'action' => $newgroup_action->GetEventsCallString() ) );
$hui_groupstoolbar->AddChild( $hui_newgroupbutton );
***************
*** 78,82 ****
$permissions_action = new HuiEventsCall();
$permissions_action->AddEvent( new HuiEvent( 'main', 'permissions', '' ) );
! $hui_permissionsbutton = new HuiButton( 'permissionsbutton', array( 'label' => $amp_locale->GetStr( 'permissions.button' ), 'themeimage' => 'encrypted', 'action' => $permissions_action->GetEventsCallString() ) );
$hui_permissionstoolbar->AddChild( $hui_permissionsbutton );
--- 78,82 ----
$permissions_action = new HuiEventsCall();
$permissions_action->AddEvent( new HuiEvent( 'main', 'permissions', '' ) );
! $hui_permissionsbutton = new HuiButton( 'permissionsbutton', array( 'horiz' => 'true', 'label' => $amp_locale->GetStr( 'permissions.button' ), 'themeimage' => 'encrypted', 'action' => $permissions_action->GetEventsCallString() ) );
$hui_permissionstoolbar->AddChild( $hui_permissionsbutton );
***************
*** 87,91 ****
$help_action = new HuiEventsCall();
$help_action->AddEvent( new HuiEvent( 'main', 'help', '' ) );
! $hui_helpbutton = new HuiButton( 'helpbutton', array( 'label' => $amp_locale->GetStr( 'help_button' ), 'themeimage' => 'help', 'action' => $help_action->GetEventsCallString() ) );
// Toolbar frame
--- 87,91 ----
$help_action = new HuiEventsCall();
$help_action->AddEvent( new HuiEvent( 'main', 'help', '' ) );
! $hui_helpbutton = new HuiButton( 'helpbutton', array( 'horiz' => 'true', 'label' => $amp_locale->GetStr( 'help_button' ), 'themeimage' => 'help', 'action' => $help_action->GetEventsCallString() ) );
// Toolbar frame
Index: magellanwebusersprefs.php
===================================================================
RCS file: /cvsroot/magellancms/magellan/www/admin/magellanwebusersprefs.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** magellanwebusersprefs.php 24 Feb 2003 14:05:28 -0000 1.3
--- magellanwebusersprefs.php 12 Mar 2003 14:03:19 -0000 1.4
***************
*** 49,52 ****
--- 49,53 ----
'label' => $gLocale->GetStr( 'default.button' ),
'themeimage' => 'configure',
+ 'horiz' => 'true',
'action' => build_events_call_string( '', array( array( 'main', 'default', '' ) ) )
)
|
