magellancms-cvs — Magellan CVS commits

[Magellancms-cvs] magellan/www/admin magellanmedia.php,1.7,1.8 magellanp3p.php,1.3,1.4 magellanpages.php,1.8,1.9 magellantemplates.php,1.8,1.9 magellanwebusers.php,1.8,1.9

[<bur...@us...>]

Update of /cvsroot/magellancms/magellan/www/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv27497/www/admin

Modified Files:
	magellanmedia.php magellanp3p.php magellanpages.php 
	magellantemplates.php magellanwebusers.php 
Log Message:
CHANGES:
- Removed all Hui::LoadAllWidgets() method calls. (wuh)


Index: magellanmedia.php
===================================================================
RCS file: /cvsroot/magellancms/magellan/www/admin/magellanmedia.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** magellanmedia.php	12 Mar 2003 14:03:09 -0000	1.7
--- magellanmedia.php	25 Jun 2003 08:48:16 -0000	1.8
***************
*** 32,36 ****
  
  $hui = new Hui( $env['ampdb'] );
! $hui->LoadAllWidgets();
  
  $hui_page = new HuiPage( 'page', array( 'title' => $site_locale->GetStr( 'medias_pagetitle' ) ) );
--- 32,69 ----
  
  $hui = new Hui( $env['ampdb'] );
!     $hui->LoadWidget( 'button' );
!     $hui->LoadWidget( 'checkbox' );
!     $hui->LoadWidget( 'combobox' );
!     $hui->LoadWidget( 'date' );
!     $hui->LoadWidget( 'empty' );
!     $hui->LoadWidget( 'file' );
!     $hui->LoadWidget( 'formarg' );
!     $hui->LoadWidget( 'form' );
!     $hui->LoadWidget( 'grid' );
!     $hui->LoadWidget( 'helpnode' );
!     $hui->LoadWidget( 'horizbar' );
!     $hui->LoadWidget( 'horizframe' );
!     $hui->LoadWidget( 'horizgroup' );
!     $hui->LoadWidget( 'image' );
!     $hui->LoadWidget( 'label' );
!     $hui->LoadWidget( 'link' );
!     $hui->LoadWidget( 'listbox' );
!     $hui->LoadWidget( 'menu' );
!     $hui->LoadWidget( 'page' );
!     $hui->LoadWidget( 'progressbar' );
!     $hui->LoadWidget( 'radio' );
!     $hui->LoadWidget( 'sessionkey' );
!     $hui->LoadWidget( 'statusbar' );
!     $hui->LoadWidget( 'string' );
!     $hui->LoadWidget( 'submit' );
!     $hui->LoadWidget( 'tab' );
!     $hui->LoadWidget( 'table' );
!     $hui->LoadWidget( 'text' );
!     $hui->LoadWidget( 'titlebar' );
!     $hui->LoadWidget( 'toolbar' );
!     $hui->LoadWidget( 'treemenu' );
!     $hui->LoadWidget( 'vertframe' );
!     $hui->LoadWidget( 'vertgroup' );
!     $hui->LoadWidget( 'xml' );
  
  $hui_page = new HuiPage( 'page', array( 'title' => $site_locale->GetStr( 'medias_pagetitle' ) ) );

Index: magellanp3p.php
===================================================================
RCS file: /cvsroot/magellancms/magellan/www/admin/magellanp3p.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** magellanp3p.php	12 Mar 2003 14:03:10 -0000	1.3
--- magellanp3p.php	25 Jun 2003 08:48:16 -0000	1.4
***************
*** 30,34 ****
  
  $gHui = new Hui( $gEnv['root']['db'] );
! $gHui->LoadAllWidgets();
  $gLocale = new Locale( 'magellan_site_p3p', $gEnv['user']['locale']['language'] );
  
--- 30,67 ----
  
  $gHui = new Hui( $gEnv['root']['db'] );
!     $hui->LoadWidget( 'button' );
!     $hui->LoadWidget( 'checkbox' );
!     $hui->LoadWidget( 'combobox' );
!     $hui->LoadWidget( 'date' );
!     $hui->LoadWidget( 'empty' );
!     $hui->LoadWidget( 'file' );
!     $hui->LoadWidget( 'formarg' );
!     $hui->LoadWidget( 'form' );
!     $hui->LoadWidget( 'grid' );
!     $hui->LoadWidget( 'helpnode' );
!     $hui->LoadWidget( 'horizbar' );
!     $hui->LoadWidget( 'horizframe' );
!     $hui->LoadWidget( 'horizgroup' );
!     $hui->LoadWidget( 'image' );
!     $hui->LoadWidget( 'label' );
!     $hui->LoadWidget( 'link' );
!     $hui->LoadWidget( 'listbox' );
!     $hui->LoadWidget( 'menu' );
!     $hui->LoadWidget( 'page' );
!     $hui->LoadWidget( 'progressbar' );
!     $hui->LoadWidget( 'radio' );
!     $hui->LoadWidget( 'sessionkey' );
!     $hui->LoadWidget( 'statusbar' );
!     $hui->LoadWidget( 'string' );
!     $hui->LoadWidget( 'submit' );
!     $hui->LoadWidget( 'tab' );
!     $hui->LoadWidget( 'table' );
!     $hui->LoadWidget( 'text' );
!     $hui->LoadWidget( 'titlebar' );
!     $hui->LoadWidget( 'toolbar' );
!     $hui->LoadWidget( 'treemenu' );
!     $hui->LoadWidget( 'vertframe' );
!     $hui->LoadWidget( 'vertgroup' );
!     $hui->LoadWidget( 'xml' );
  $gLocale = new Locale( 'magellan_site_p3p', $gEnv['user']['locale']['language'] );
  

Index: magellanpages.php
===================================================================
RCS file: /cvsroot/magellancms/magellan/www/admin/magellanpages.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** magellanpages.php	12 Mar 2003 14:03:10 -0000	1.8
--- magellanpages.php	25 Jun 2003 08:48:16 -0000	1.9
***************
*** 33,37 ****
  
  $hui = new Hui( $env['ampdb'] );
! $hui->LoadAllWidgets();
  
  $hui_page = new HuiPage( 'page', array( 'title' => $site_locale->GetStr( 'pages_pagetitle' ) ) );
--- 33,70 ----
  
  $hui = new Hui( $env['ampdb'] );
!     $hui->LoadWidget( 'button' );
!     $hui->LoadWidget( 'checkbox' );
!     $hui->LoadWidget( 'combobox' );
!     $hui->LoadWidget( 'date' );
!     $hui->LoadWidget( 'empty' );
!     $hui->LoadWidget( 'file' );
!     $hui->LoadWidget( 'formarg' );
!     $hui->LoadWidget( 'form' );
!     $hui->LoadWidget( 'grid' );
!     $hui->LoadWidget( 'helpnode' );
!     $hui->LoadWidget( 'horizbar' );
!     $hui->LoadWidget( 'horizframe' );
!     $hui->LoadWidget( 'horizgroup' );
!     $hui->LoadWidget( 'image' );
!     $hui->LoadWidget( 'label' );
!     $hui->LoadWidget( 'link' );
!     $hui->LoadWidget( 'listbox' );
!     $hui->LoadWidget( 'menu' );
!     $hui->LoadWidget( 'page' );
!     $hui->LoadWidget( 'progressbar' );
!     $hui->LoadWidget( 'radio' );
!     $hui->LoadWidget( 'sessionkey' );
!     $hui->LoadWidget( 'statusbar' );
!     $hui->LoadWidget( 'string' );
!     $hui->LoadWidget( 'submit' );
!     $hui->LoadWidget( 'tab' );
!     $hui->LoadWidget( 'table' );
!     $hui->LoadWidget( 'text' );
!     $hui->LoadWidget( 'titlebar' );
!     $hui->LoadWidget( 'toolbar' );
!     $hui->LoadWidget( 'treemenu' );
!     $hui->LoadWidget( 'vertframe' );
!     $hui->LoadWidget( 'vertgroup' );
!     $hui->LoadWidget( 'xml' );
  
  $hui_page = new HuiPage( 'page', array( 'title' => $site_locale->GetStr( 'pages_pagetitle' ) ) );

Index: magellantemplates.php
===================================================================
RCS file: /cvsroot/magellancms/magellan/www/admin/magellantemplates.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** magellantemplates.php	12 Mar 2003 14:03:15 -0000	1.8
--- magellantemplates.php	25 Jun 2003 08:48:16 -0000	1.9
***************
*** 33,37 ****
  
  $hui = new Hui( $env['ampdb'] );
! $hui->LoadAllWidgets();
  
  $hui_page = new HuiPage( 'page', array( 'title' => $site_locale->GetStr( 'templates_pagetitle' ) ) );
--- 33,70 ----
  
  $hui = new Hui( $env['ampdb'] );
!     $hui->LoadWidget( 'button' );
!     $hui->LoadWidget( 'checkbox' );
!     $hui->LoadWidget( 'combobox' );
!     $hui->LoadWidget( 'date' );
!     $hui->LoadWidget( 'empty' );
!     $hui->LoadWidget( 'file' );
!     $hui->LoadWidget( 'formarg' );
!     $hui->LoadWidget( 'form' );
!     $hui->LoadWidget( 'grid' );
!     $hui->LoadWidget( 'helpnode' );
!     $hui->LoadWidget( 'horizbar' );
!     $hui->LoadWidget( 'horizframe' );
!     $hui->LoadWidget( 'horizgroup' );
!     $hui->LoadWidget( 'image' );
!     $hui->LoadWidget( 'label' );
!     $hui->LoadWidget( 'link' );
!     $hui->LoadWidget( 'listbox' );
!     $hui->LoadWidget( 'menu' );
!     $hui->LoadWidget( 'page' );
!     $hui->LoadWidget( 'progressbar' );
!     $hui->LoadWidget( 'radio' );
!     $hui->LoadWidget( 'sessionkey' );
!     $hui->LoadWidget( 'statusbar' );
!     $hui->LoadWidget( 'string' );
!     $hui->LoadWidget( 'submit' );
!     $hui->LoadWidget( 'tab' );
!     $hui->LoadWidget( 'table' );
!     $hui->LoadWidget( 'text' );
!     $hui->LoadWidget( 'titlebar' );
!     $hui->LoadWidget( 'toolbar' );
!     $hui->LoadWidget( 'treemenu' );
!     $hui->LoadWidget( 'vertframe' );
!     $hui->LoadWidget( 'vertgroup' );
!     $hui->LoadWidget( 'xml' );
  
  $hui_page = new HuiPage( 'page', array( 'title' => $site_locale->GetStr( 'templates_pagetitle' ) ) );

Index: magellanwebusers.php
===================================================================
RCS file: /cvsroot/magellancms/magellan/www/admin/magellanwebusers.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** magellanwebusers.php	12 Mar 2003 14:03:17 -0000	1.8
--- magellanwebusers.php	25 Jun 2003 08:48:16 -0000	1.9
***************
*** 34,38 ****
  $amp_locale	= new Locale( 'magellan_site_webusers', $gEnv['user']['locale']['language'] );
  $hui		= new Hui( $env['ampdb'] );
! $hui->LoadAllWidgets();
  
  $hui_page = new HuiPage( 'page', array( 'title' => $amp_locale->GetStr( 'webusers_title' ) ) );
--- 34,71 ----
  $amp_locale	= new Locale( 'magellan_site_webusers', $gEnv['user']['locale']['language'] );
  $hui		= new Hui( $env['ampdb'] );
!     $hui->LoadWidget( 'button' );
!     $hui->LoadWidget( 'checkbox' );
!     $hui->LoadWidget( 'combobox' );
!     $hui->LoadWidget( 'date' );
!     $hui->LoadWidget( 'empty' );
!     $hui->LoadWidget( 'file' );
!     $hui->LoadWidget( 'formarg' );
!     $hui->LoadWidget( 'form' );
!     $hui->LoadWidget( 'grid' );
!     $hui->LoadWidget( 'helpnode' );
!     $hui->LoadWidget( 'horizbar' );
!     $hui->LoadWidget( 'horizframe' );
!     $hui->LoadWidget( 'horizgroup' );
!     $hui->LoadWidget( 'image' );
!     $hui->LoadWidget( 'label' );
!     $hui->LoadWidget( 'link' );
!     $hui->LoadWidget( 'listbox' );
!     $hui->LoadWidget( 'menu' );
!     $hui->LoadWidget( 'page' );
!     $hui->LoadWidget( 'progressbar' );
!     $hui->LoadWidget( 'radio' );
!     $hui->LoadWidget( 'sessionkey' );
!     $hui->LoadWidget( 'statusbar' );
!     $hui->LoadWidget( 'string' );
!     $hui->LoadWidget( 'submit' );
!     $hui->LoadWidget( 'tab' );
!     $hui->LoadWidget( 'table' );
!     $hui->LoadWidget( 'text' );
!     $hui->LoadWidget( 'titlebar' );
!     $hui->LoadWidget( 'toolbar' );
!     $hui->LoadWidget( 'treemenu' );
!     $hui->LoadWidget( 'vertframe' );
!     $hui->LoadWidget( 'vertgroup' );
!     $hui->LoadWidget( 'xml' );
  
  $hui_page = new HuiPage( 'page', array( 'title' => $amp_locale->GetStr( 'webusers_title' ) ) );

[Magellancms-cvs] magellan/defs general.def,1.21,1.22

[<bur...@us...>]

Update of /cvsroot/magellancms/magellan/defs
In directory sc8-pr-cvs1:/tmp/cvs-serv27497/defs

Modified Files:
	general.def 
Log Message:
CHANGES:
- Removed all Hui::LoadAllWidgets() method calls. (wuh)


Index: general.def
===================================================================
RCS file: /cvsroot/magellancms/magellan/defs/general.def,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** general.def	7 May 2003 15:26:43 -0000	1.21
--- general.def	25 Jun 2003 08:48:16 -0000	1.22
***************
*** 3,10 ****
  
  # Module version number
! MODULEVERSION      = 3.2
  
  # Module release date
! MODULEDATE         = 2003/05/07
  
  # Module long description
--- 3,10 ----
  
  # Module version number
! MODULEVERSION      = 3.3
  
  # Module release date
! MODULEDATE         = 2003/05/15
  
  # Module long description

[Magellancms-cvs] magellan CHANGES,1.25,1.26 VERSION,1.17,1.18 build.sh,1.17,1.18

[<bur...@us...>]

Update of /cvsroot/magellancms/magellan
In directory sc8-pr-cvs1:/tmp/cvs-serv27497

Modified Files:
	CHANGES VERSION build.sh 
Log Message:
CHANGES:
- Removed all Hui::LoadAllWidgets() method calls. (wuh)


Index: CHANGES
===================================================================
RCS file: /cvsroot/magellancms/magellan/CHANGES,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** CHANGES	7 May 2003 15:26:42 -0000	1.25
--- CHANGES	25 Jun 2003 08:48:16 -0000	1.26
***************
*** 11,14 ****
--- 11,23 ----
  
  
+ 3.3 - 2003/05/15
+ ----------------
+ NEW FEATURES:
+ 
+ CHANGES:
+ - Removed all Hui::LoadAllWidgets() method calls. (wuh)
+ 
+ 
+ 
  3.2 - 2003/05/07
  ----------------

Index: VERSION
===================================================================
RCS file: /cvsroot/magellancms/magellan/VERSION,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** VERSION	7 May 2003 15:26:43 -0000	1.17
--- VERSION	25 Jun 2003 08:48:16 -0000	1.18
***************
*** 11,13 ****
  
  
! Magellan 3.2
--- 11,13 ----
  
  
! Magellan 3.3

Index: build.sh
===================================================================
RCS file: /cvsroot/magellancms/magellan/build.sh,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** build.sh	7 May 2003 15:26:43 -0000	1.17
--- build.sh	25 Jun 2003 08:48:16 -0000	1.18
***************
*** 10,14 ****
  WHERE=`pwd`
  
! TGZ_NAME="magellan-3.2.tgz"
  DIR_NAME="magellan"
  ./sdk.sh
--- 10,14 ----
  WHERE=`pwd`
  
! TGZ_NAME="magellan-3.3.tgz"
  DIR_NAME="magellan"
  ./sdk.sh

[Magellancms-cvs] magellan CHANGES,1.24,1.25 VERSION,1.16,1.17 build.sh,1.16,1.17

[<bur...@us...>]

Update of /cvsroot/magellancms/magellan
In directory sc8-pr-cvs1:/tmp/cvs-serv29239

Modified Files:
	CHANGES VERSION build.sh 
Log Message:
Changed version to 3.2. (wuh)


Index: CHANGES
===================================================================
RCS file: /cvsroot/magellancms/magellan/CHANGES,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** CHANGES	7 May 2003 15:24:43 -0000	1.24
--- CHANGES	7 May 2003 15:26:42 -0000	1.25
***************
*** 11,16 ****
  
  
! 3.2.0 - 2003/05/07
! ------------------
  NEW FEATURES:
  - Added customizable page fields. (wuh)
--- 11,16 ----
  
  
! 3.2 - 2003/05/07
! ----------------
  NEW FEATURES:
  - Added customizable page fields. (wuh)

Index: VERSION
===================================================================
RCS file: /cvsroot/magellancms/magellan/VERSION,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** VERSION	12 Mar 2003 14:02:53 -0000	1.16
--- VERSION	7 May 2003 15:26:43 -0000	1.17
***************
*** 11,13 ****
  
  
! Magellan 3.2.0
--- 11,13 ----
  
  
! Magellan 3.2

Index: build.sh
===================================================================
RCS file: /cvsroot/magellancms/magellan/build.sh,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** build.sh	12 Mar 2003 14:02:53 -0000	1.16
--- build.sh	7 May 2003 15:26:43 -0000	1.17
***************
*** 10,21 ****
  WHERE=`pwd`
  
! if [ -a .encoded ]; then
!   TGZ_NAME="magellan-enc-3.2.0.tgz"
!   DIR_NAME="magellan-enc"
! else
!   TGZ_NAME="magellan-3.2.0.tgz"
!   DIR_NAME="magellan"
!   ./sdk.sh
! fi
  
  cd ..
--- 10,16 ----
  WHERE=`pwd`
  
! TGZ_NAME="magellan-3.2.tgz"
! DIR_NAME="magellan"
! ./sdk.sh
  
  cd ..

[Magellancms-cvs] magellan/defs general.def,1.20,1.21

[<bur...@us...>]

Update of /cvsroot/magellancms/magellan/defs
In directory sc8-pr-cvs1:/tmp/cvs-serv29239/defs

Modified Files:
	general.def 
Log Message:
Changed version to 3.2. (wuh)


Index: general.def
===================================================================
RCS file: /cvsroot/magellancms/magellan/defs/general.def,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** general.def	7 May 2003 15:24:43 -0000	1.20
--- general.def	7 May 2003 15:26:43 -0000	1.21
***************
*** 3,7 ****
  
  # Module version number
! MODULEVERSION      = 3.2.0
  
  # Module release date
--- 3,7 ----
  
  # Module version number
! MODULEVERSION      = 3.2
  
  # Module release date

[Magellancms-cvs] magellan/var/lib magellan.library,1.14,1.15

[<bur...@us...>]

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

Modified Files:
	magellan.library 
Log Message:
3.2.0 - 2003/05/07
------------------
NEW FEATURES:
- Added customizable page fields. (wuh)
- Added the possibility of image resizing when inserting a new image. (robywan)

CHANGES:
- Removed the old "STORE" type tags. (wuh)
- Added the scaleimagelib module suggestion. (robywan)
- Removed all the uniqid() commands. This speed up things. (wuh)

FIXES:
- Fixed typo in magellan.library that prevented the correct update of an image
  type page field when the corresponding image is removed. (robywan)
- Fixed two wrong queries that prevent associations to be correctly
  removed in MagellanRelationsHandler::RemoveAllRelations()
  (magellan.library). (robywan)
- Fixed 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"). (robywan)


Index: magellan.library
===================================================================
RCS file: /cvsroot/magellancms/magellan/var/lib/magellan.library,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** magellan.library	19 Apr 2003 13:08:30 -0000	1.14
--- magellan.library	7 May 2003 15:24:44 -0000	1.15
***************
*** 616,619 ****
--- 616,621 ----
  }
  
+ if ( isset( $GLOBALS['gEnv']['site'] ) )
+ {
  OpenLibrary( 'modules.library' );
  
***************
*** 781,784 ****
--- 783,788 ----
          return $this->mImage;
      }
+ }
+ 
  }
  

[Magellancms-cvs] magellan/defs general.def,1.19,1.20

[<bur...@us...>]

Update of /cvsroot/magellancms/magellan/defs
In directory sc8-pr-cvs1:/tmp/cvs-serv27464/defs

Modified Files:
	general.def 
Log Message:
3.2.0 - 2003/05/07
------------------
NEW FEATURES:
- Added customizable page fields. (wuh)
- Added the possibility of image resizing when inserting a new image. (robywan)

CHANGES:
- Removed the old "STORE" type tags. (wuh)
- Added the scaleimagelib module suggestion. (robywan)
- Removed all the uniqid() commands. This speed up things. (wuh)

FIXES:
- Fixed typo in magellan.library that prevented the correct update of an image
  type page field when the corresponding image is removed. (robywan)
- Fixed two wrong queries that prevent associations to be correctly
  removed in MagellanRelationsHandler::RemoveAllRelations()
  (magellan.library). (robywan)
- Fixed 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"). (robywan)


Index: general.def
===================================================================
RCS file: /cvsroot/magellancms/magellan/defs/general.def,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** general.def	4 Apr 2003 16:46:00 -0000	1.19
--- general.def	7 May 2003 15:24:43 -0000	1.20
***************
*** 6,10 ****
  
  # Module release date
! MODULEDATE         = 2003/03/07
  
  # Module long description
--- 6,10 ----
  
  # Module release date
! MODULEDATE         = 2003/05/07
  
  # Module long description

[Magellancms-cvs] magellan CHANGES,1.23,1.24

[<bur...@us...>]

Update of /cvsroot/magellancms/magellan
In directory sc8-pr-cvs1:/tmp/cvs-serv27464

Modified Files:
	CHANGES 
Log Message:
3.2.0 - 2003/05/07
------------------
NEW FEATURES:
- Added customizable page fields. (wuh)
- Added the possibility of image resizing when inserting a new image. (robywan)

CHANGES:
- Removed the old "STORE" type tags. (wuh)
- Added the scaleimagelib module suggestion. (robywan)
- Removed all the uniqid() commands. This speed up things. (wuh)

FIXES:
- Fixed typo in magellan.library that prevented the correct update of an image
  type page field when the corresponding image is removed. (robywan)
- Fixed two wrong queries that prevent associations to be correctly
  removed in MagellanRelationsHandler::RemoveAllRelations()
  (magellan.library). (robywan)
- Fixed 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"). (robywan)


Index: CHANGES
===================================================================
RCS file: /cvsroot/magellancms/magellan/CHANGES,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** CHANGES	19 Apr 2003 13:08:29 -0000	1.23
--- CHANGES	7 May 2003 15:24:43 -0000	1.24
***************
*** 11,15 ****
  
  
! 3.2.0 - 2003/03/07
  ------------------
  NEW FEATURES:
--- 11,15 ----
  
  
! 3.2.0 - 2003/05/07
  ------------------
  NEW FEATURES:

[Magellancms-cvs] magellan CHANGES,1.22,1.23

[<bur...@us...>]

Update of /cvsroot/magellancms/magellan
In directory sc8-pr-cvs1:/tmp/cvs-serv15484

Modified Files:
	CHANGES 
Log Message:
posix_getpid() is no more used.


Index: CHANGES
===================================================================
RCS file: /cvsroot/magellancms/magellan/CHANGES,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** CHANGES	4 Apr 2003 16:45:56 -0000	1.22
--- CHANGES	19 Apr 2003 13:08:29 -0000	1.23
***************
*** 26,30 ****
    type page field when the corresponding image is removed. (robywan)
  - Fixed two wrong queries that prevent associations to be correctly
!   removed in MagellanRelationsHandler::RemoveAllRelations() (magellan.library). (robywan)
  
  
--- 26,34 ----
    type page field when the corresponding image is removed. (robywan)
  - Fixed two wrong queries that prevent associations to be correctly
!   removed in MagellanRelationsHandler::RemoveAllRelations()
!   (magellan.library). (robywan)
! - Fixed 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"). (robywan)
! 
  
  

[Magellancms-cvs] magellan/var/lib magellan.library,1.13,1.14 pagebuilder.library,1.12,1.13 session.library,1.7,1.8

[<bur...@us...>]

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

Modified Files:
	magellan.library pagebuilder.library session.library 
Log Message:
posix_getpid() is no more used.


Index: magellan.library
===================================================================
RCS file: /cvsroot/magellancms/magellan/var/lib/magellan.library,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** magellan.library	4 Apr 2003 16:46:05 -0000	1.13
--- magellan.library	19 Apr 2003 13:08:30 -0000	1.14
***************
*** 873,877 ****
  			global $env;
  
! 			$template_file = md5( microtime().posix_getpid() );
  
  			// If no template file is provided, then create an empty one
--- 873,877 ----
  			global $env;
  
! 			$template_file = md5( microtime() );
  
  			// If no template file is provided, then create an empty one

Index: pagebuilder.library
===================================================================
RCS file: /cvsroot/magellancms/magellan/var/lib/pagebuilder.library,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** pagebuilder.library	4 Apr 2003 16:46:10 -0000	1.12
--- pagebuilder.library	19 Apr 2003 13:08:30 -0000	1.13
***************
*** 116,120 ****
              }
  
!             $tmpfn = TMP_PATH.'magellanpages/'.md5( microtime().posix_getpid() );
              // Page generator object
              //
--- 116,120 ----
              }
  
!             $tmpfn = TMP_PATH.'magellanpages/'.md5( microtime() );
              // Page generator object
              //

Index: session.library
===================================================================
RCS file: /cvsroot/magellancms/magellan/var/lib/session.library,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** session.library	4 Apr 2003 16:46:11 -0000	1.7
--- session.library	19 Apr 2003 13:08:30 -0000	1.8
***************
*** 82,86 ****
  		if ( !headers_sent() )
  		{
!         	$this->sessid = md5( microtime().posix_getpid() );
          	//setcookie( 'amp_sessid', $this->sessid, '', '/' );
          	setcookie( 'amp_sessid', $this->sessid, SESSION_MAXLIFE, '/' );
--- 82,86 ----
  		if ( !headers_sent() )
  		{
!         	$this->sessid = md5( microtime() );
          	//setcookie( 'amp_sessid', $this->sessid, '', '/' );
          	setcookie( 'amp_sessid', $this->sessid, SESSION_MAXLIFE, '/' );

[Magellancms-cvs] magellan/var/lib magellan.library,1.12,1.13 pagebuilder.library,1.11,1.12 session.library,1.6,1.7 webusers.library,1.8,1.9

[<bur...@us...>]

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

Modified Files:
	magellan.library pagebuilder.library session.library 
	webusers.library 
Log Message:
CHANGES:
- Removed all the uniqid() commands. This speed up things. (wuh)


Index: magellan.library
===================================================================
RCS file: /cvsroot/magellancms/magellan/var/lib/magellan.library,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** magellan.library	31 Mar 2003 10:51:59 -0000	1.12
--- magellan.library	4 Apr 2003 16:46:05 -0000	1.13
***************
*** 169,173 ****
                                                     $this->mrSiteDb->Format_Text( $pageData['title'] ).','.
                                                     $this->mrSiteDb->Format_Text( $pageData['metadesc'] ).','.
!                                                    $this->mrSiteDb->Format_Text( $pageData['metakey'] ).",0,'')" ) )
                      {
                          $this->mPageId = $page_id;
--- 169,173 ----
                                                     $this->mrSiteDb->Format_Text( $pageData['title'] ).','.
                                                     $this->mrSiteDb->Format_Text( $pageData['metadesc'] ).','.
!                                                    $this->mrSiteDb->Format_Text( $pageData['metakey'] ).",0,0)" ) )
                      {
                          $this->mPageId = $page_id;
***************
*** 873,877 ****
  			global $env;
  
! 			$template_file = md5( uniqid( rand() ) );
  
  			// If no template file is provided, then create an empty one
--- 873,877 ----
  			global $env;
  
! 			$template_file = md5( microtime().posix_getpid() );
  
  			// If no template file is provided, then create an empty one

Index: pagebuilder.library
===================================================================
RCS file: /cvsroot/magellancms/magellan/var/lib/pagebuilder.library,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pagebuilder.library	24 Feb 2003 14:05:27 -0000	1.11
--- pagebuilder.library	4 Apr 2003 16:46:10 -0000	1.12
***************
*** 73,76 ****
--- 73,81 ----
          // to extract the template id
          //
+ 
+         if ( isset( $_GET['tid'] ) ) $tid = $_GET['tid'];
+         elseif ( isset( $_POST['tid'] ) ) $tid = $_POST['tid'];
+         else $tid = '';
+ 
          if ( !empty( $pageid ) )
          {
***************
*** 111,115 ****
              }
  
!             $tmpfn = TMP_PATH.'magellanpages/'.md5( uniqid( rand() ) );
              // Page generator object
              //
--- 116,120 ----
              }
  
!             $tmpfn = TMP_PATH.'magellanpages/'.md5( microtime().posix_getpid() );
              // Page generator object
              //
***************
*** 145,149 ****
  
              $hook->CallHooks( 'rendering', $null, '' );
! 
              include( $tmpfn );
              @unlink( $tmpfn );
--- 150,161 ----
  
              $hook->CallHooks( 'rendering', $null, '' );
! /*
!             $fp = fopen( $tmpfn, 'r' );
!             while ( !feof( $fp ) )
!             {
!                 echo fread( $fp, filesize( $tmpfn ) );
!             }
!             fclose( $fp );
! */
              include( $tmpfn );
              @unlink( $tmpfn );

Index: session.library
===================================================================
RCS file: /cvsroot/magellancms/magellan/var/lib/session.library,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** session.library	24 Feb 2003 14:05:27 -0000	1.6
--- session.library	4 Apr 2003 16:46:11 -0000	1.7
***************
*** 82,86 ****
  		if ( !headers_sent() )
  		{
!         	$this->sessid = md5( uniqid( rand() ) );
          	//setcookie( 'amp_sessid', $this->sessid, '', '/' );
          	setcookie( 'amp_sessid', $this->sessid, SESSION_MAXLIFE, '/' );
--- 82,86 ----
  		if ( !headers_sent() )
  		{
!         	$this->sessid = md5( microtime().posix_getpid() );
          	//setcookie( 'amp_sessid', $this->sessid, '', '/' );
          	setcookie( 'amp_sessid', $this->sessid, SESSION_MAXLIFE, '/' );

Index: webusers.library
===================================================================
RCS file: /cvsroot/magellancms/magellan/var/lib/webusers.library,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** webusers.library	12 Feb 2003 11:33:04 -0000	1.8
--- webusers.library	4 Apr 2003 16:46:12 -0000	1.9
***************
*** 64,68 ****
                                    'Invalid site database handler' );
  
!         if ( is_object( $rampDb ) ) $this->mrAmpDb = &$rampDb;
  
          $this->mUid = $userid;
--- 64,68 ----
                                    'Invalid site database handler' );
  
!         $this->mrAmpDb = &$GLOBALS['gEnv']['root']['db'];
  
          $this->mUid = $userid;

[Magellancms-cvs] magellan/var/handlers webusers.handler,1.8,1.9

[<bur...@us...>]

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

Modified Files:
	webusers.handler 
Log Message:
CHANGES:
- Removed all the uniqid() commands. This speed up things. (wuh)


Index: webusers.handler
===================================================================
RCS file: /cvsroot/magellancms/magellan/var/handlers/webusers.handler,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** webusers.handler	24 Feb 2003 14:05:25 -0000	1.8
--- webusers.handler	4 Apr 2003 16:46:03 -0000	1.9
***************
*** 169,180 ****
          if ( $sets->GetKey( 'magellanwebregistration' ) != '0' )
          {
!             $wuser = new webuser( $GLOBALS['gEnv']['site']['db'], false, $GLOBALS['gEnv']['root']['db'] );
              if ( $wuser->Register( $params['wudata'] ) )
!             {            
                  $form_fields->MoveFirst();
                  while ( !$form_fields->eof )
                  {
                      $field_name = $form_fields->Fields( 'fieldname' );
!                     $wuser->SetKey( 'magellan', $form_fields->Fields( 'fieldname' ), $params['wudata'][$form_fields->Fields( 'fieldname' )] );
                      $form_fields->MoveNext();
                  }
--- 169,189 ----
          if ( $sets->GetKey( 'magellanwebregistration' ) != '0' )
          {
!             $wuser = new WebUser(
!                 $GLOBALS['gEnv']['site']['db'],
!                 false,
!                 $GLOBALS['gEnv']['root']['db']
!                 );
! 
              if ( $wuser->Register( $params['wudata'] ) )
!             {
                  $form_fields->MoveFirst();
                  while ( !$form_fields->eof )
                  {
                      $field_name = $form_fields->Fields( 'fieldname' );
!                     $wuser->SetKey(
!                         'magellan',
!                         $form_fields->Fields( 'fieldname' ),
!                         $params['wudata'][$form_fields->Fields( 'fieldname' )]
!                         );
                      $form_fields->MoveNext();
                  }

[Magellancms-cvs] magellan CHANGES,1.21,1.22 README,1.4,1.5 TODO,1.6,1.7

[<bur...@us...>]

Update of /cvsroot/magellancms/magellan
In directory sc8-pr-cvs1:/tmp/cvs-serv21007

Modified Files:
	CHANGES README TODO 
Log Message:
CHANGES:
- Removed all the uniqid() commands. This speed up things. (wuh)


Index: CHANGES
===================================================================
RCS file: /cvsroot/magellancms/magellan/CHANGES,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** CHANGES	31 Mar 2003 10:51:58 -0000	1.21
--- CHANGES	4 Apr 2003 16:45:56 -0000	1.22
***************
*** 20,23 ****
--- 20,24 ----
  - Removed the old "STORE" type tags. (wuh)
  - Added the scaleimagelib module suggestion. (robywan)
+ - Removed all the uniqid() commands. This speed up things. (wuh)
  
  FIXES:

Index: README
===================================================================
RCS file: /cvsroot/magellancms/magellan/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** README	7 Sep 2002 11:03:50 -0000	1.4
--- README	4 Apr 2003 16:45:57 -0000	1.5
***************
*** 21,24 ****
--- 21,42 ----
  	- an Intranet/Internet/Extranet/Portal server
  
+ Features:
+ 
+ - all Ampoliros general features
+ - separation of content from aspect
+ - template driven aspect
+ - database driven content
+ - can produce any type of text based documents (HTML, XML, etc)
+ - template tags as HTML/XML comments
+ - fully customizable templates - aspect is not limited by Magellan
+ - handling of web users
+ - handling of groups of web users
+ - pages permissions at group level
+ - objects permissions at group level
+ - extensible structure through other modules
+ - P3P privacy support
+ - can be integrated in already existing sites
+ 
+ 
  
  License

Index: TODO
===================================================================
RCS file: /cvsroot/magellancms/magellan/TODO,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TODO	24 Feb 2003 14:05:24 -0000	1.6
--- TODO	4 Apr 2003 16:45:58 -0000	1.7
***************
*** 11,15 ****
  
  
- - Free attributes for each page.
  - Multiple language templates.
  - User definable images directory in place of the default "media" one.
--- 11,14 ----
***************
*** 19,20 ****
--- 18,20 ----
  - Page generation time optimization.
  - XmlRpc methods.
+ - Enable/disable reinterpretation of built page.

[Magellancms-cvs] magellan/defs general.def,1.18,1.19

[<bur...@us...>]

Update of /cvsroot/magellancms/magellan/defs
In directory sc8-pr-cvs1:/tmp/cvs-serv21007/defs

Modified Files:
	general.def 
Log Message:
CHANGES:
- Removed all the uniqid() commands. This speed up things. (wuh)


Index: general.def
===================================================================
RCS file: /cvsroot/magellancms/magellan/defs/general.def,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** general.def	12 Mar 2003 14:18:46 -0000	1.18
--- general.def	4 Apr 2003 16:46:00 -0000	1.19
***************
*** 19,24 ****
  MODULE_SUBMODULES  = web users,free fields
  
- MODULE_SUBMODULES  = web users,free fields
- 
  MODULE_AUTHOR        = Solarix
  
--- 19,22 ----

[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 -----
  

[Magellancms-cvs] magellan CHANGES,1.20,1.21

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

Update of /cvsroot/magellancms/magellan
In directory sc8-pr-cvs1:/tmp/cvs-serv4810

Modified Files:
	CHANGES 
Log Message:
Fixed two wrong queries that prevent associations to be correctly
removed in MagellanRelationsHandler::RemoveAllRelations() (magellan.library).


Index: CHANGES
===================================================================
RCS file: /cvsroot/magellancms/magellan/CHANGES,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** CHANGES	12 Mar 2003 14:30:14 -0000	1.20
--- CHANGES	31 Mar 2003 10:51:58 -0000	1.21
***************
*** 24,28 ****
  - Fixed typo in magellan.library that prevented the correct update of an image
    type page field when the corresponding image is removed. (robywan)
! 
  
  
--- 24,29 ----
  - Fixed typo in magellan.library that prevented the correct update of an image
    type page field when the corresponding image is removed. (robywan)
! - Fixed two wrong queries that prevent associations to be correctly
!   removed in MagellanRelationsHandler::RemoveAllRelations() (magellan.library). (robywan)
  
  

[Magellancms-cvs] magellan/var/lib magellan.library,1.11,1.12

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

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

Modified Files:
	magellan.library 
Log Message:
Fixed two wrong queries that prevent associations to be correctly
removed in MagellanRelationsHandler::RemoveAllRelations() (magellan.library).


Index: magellan.library
===================================================================
RCS file: /cvsroot/magellancms/magellan/var/lib/magellan.library,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** magellan.library	12 Mar 2003 14:03:00 -0000	1.11
--- magellan.library	31 Mar 2003 10:51:59 -0000	1.12
***************
*** 1674,1680 ****
  				case MAGELLAN_RELATION_CONTAINER:
  					$result = $this->mrSiteDb->Execute( "DELETE FROM links ".
! 						"WHERE ".
! 						"pageid=".$containerId." AND ".
! 						"srctype=".$containerType );
  					break;
  
--- 1674,1680 ----
  				case MAGELLAN_RELATION_CONTAINER:
  					$result = $this->mrSiteDb->Execute( "DELETE FROM links ".
!                                                 "WHERE ".
!                                                 "pageid=".$id." AND ".
!                                                 "srctype=".$type );
  					break;
  
***************
*** 1686,1692 ****
  					if ( $type_query->NumRows() > 0 )
  					{
!                         $this->mrSiteDb->Execute( 'DELETE FROM magellanacls '.
!                             'WHERE itemtype='.$this->mrSiteDb->Format_Text( $type_query->Fields( 'id' ) ).' '.
!                             'AND itemid='.$id );
  
  						$result = $this->mrSiteDb->Execute( "DELETE FROM links ".
--- 1686,1692 ----
  					if ( $type_query->NumRows() > 0 )
  					{
!                                                 $this->mrSiteDb->Execute( 'DELETE FROM magellanacls '.
!                                                 'WHERE itemtype='.$this->mrSiteDb->Format_Text( $type ).' '.
!                                                 'AND itemid='.$id );
  
  						$result = $this->mrSiteDb->Execute( "DELETE FROM links ".

[Magellancms-cvs] magellan/var/locale magellan_site_media.catalog,1.4,1.5 magellan_site_media_en.catalog,1.3,1.4

[<bur...@us...>]

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

Modified Files:
	magellan_site_media.catalog magellan_site_media_en.catalog 
Log Message:
Fixed minor typo.


Index: magellan_site_media.catalog
===================================================================
RCS file: /cvsroot/magellancms/magellan/var/locale/magellan_site_media.catalog,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** magellan_site_media.catalog	12 Mar 2003 14:03:07 -0000	1.4
--- magellan_site_media.catalog	12 Mar 2003 14:30:15 -0000	1.5
***************
*** 37,41 ****
  media_resized                   = %s (resized)
  mediaresize_label               = Resize
! mediatypes_label                = only jpg e png.
  mediadimensions_label           = Dimensions
  mediaheight_label               = Height
--- 37,41 ----
  media_resized                   = %s (resized)
  mediaresize_label               = Resize
! mediatypes_label                = only jpg and png.
  mediadimensions_label           = Dimensions
  mediaheight_label               = Height

Index: magellan_site_media_en.catalog
===================================================================
RCS file: /cvsroot/magellancms/magellan/var/locale/magellan_site_media_en.catalog,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** magellan_site_media_en.catalog	12 Mar 2003 14:03:08 -0000	1.3
--- magellan_site_media_en.catalog	12 Mar 2003 14:30:16 -0000	1.4
***************
*** 37,41 ****
  media_resized                   = %s (resized)
  mediaresize_label               = Resize
! mediatypes_label                = only jpg e png.
  mediadimensions_label           = Dimensions
  mediaheight_label               = Height
--- 37,41 ----
  media_resized                   = %s (resized)
  mediaresize_label               = Resize
! mediatypes_label                = only jpg and png.
  mediadimensions_label           = Dimensions
  mediaheight_label               = Height

[Magellancms-cvs] magellan CHANGES,1.19,1.20

[<bur...@us...>]

Update of /cvsroot/magellancms/magellan
In directory sc8-pr-cvs1:/tmp/cvs-serv13674

Modified Files:
	CHANGES 
Log Message:
Fixed minor typo.


Index: CHANGES
===================================================================
RCS file: /cvsroot/magellancms/magellan/CHANGES,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** CHANGES	12 Mar 2003 14:02:52 -0000	1.19
--- CHANGES	12 Mar 2003 14:30:14 -0000	1.20
***************
*** 23,27 ****
  FIXES:
  - Fixed typo in magellan.library that prevented the correct update of an image
!   type page field when the corresponing image is removed. (robywan)
  
  
--- 23,27 ----
  FIXES:
  - Fixed typo in magellan.library that prevented the correct update of an image
!   type page field when the corresponding image is removed. (robywan)
  
  

[Magellancms-cvs] magellan/www/cgi magellan_logo.png,NONE,1.1

[<bur...@us...>]

Update of /cvsroot/magellancms/magellan/www/cgi
In directory sc8-pr-cvs1:/tmp/cvs-serv7204/www/cgi

Added Files:
	magellan_logo.png 
Log Message:
Solved conflicts.


--- NEW FILE: magellan_logo.png ---
(This appears to be a binary file; contents omitted.)

[Magellancms-cvs] magellan/www/admin magellanprefs.php,1.3,1.4

[<bur...@us...>]

Update of /cvsroot/magellancms/magellan/www/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv7204/www/admin

Added Files:
	magellanprefs.php 
Log Message:
Solved conflicts.

[Magellancms-cvs] magellan/var/locale magellan_site_prefs.catalog,NONE,1.1 magellan_site_prefs_en.catalog,NONE,1.1 magellan_site_prefs_it.catalog,NONE,1.1

[<bur...@us...>]

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

Added Files:
	magellan_site_prefs.catalog magellan_site_prefs_en.catalog 
	magellan_site_prefs_it.catalog 
Log Message:
Solved conflicts.


--- NEW FILE: magellan_site_prefs.catalog ---

--- NEW FILE: magellan_site_prefs_en.catalog ---

--- NEW FILE: magellan_site_prefs_it.catalog ---
# Global

magellanprefs.title         = Impostazioni Magellan
types.toolbar               = Tipi
newtype.toolbar             = Nuovo tipo

# main default

type.header                 = Tipo
tag.header                  = Tag
image.header                = Immagine
notypes.status              = Non ci sono tipi definiti.
edittype.button             = Modifica
removetype.button           = Rimuovi
remove_type.confirm         = Vuoi veramente eliminare questo tipo? Tutti i dati associati saranno eliminati
image_yes.label             = Sì
image_no.label              = No

# main newtype

type.label                  = Tipo
tag.label                   = Tag
image.label                 = Immagine
newtype.button              = Aggiungi

# action newtype

newtype_added.status        = Tipo aggiunto.
newtype_not_added.status    = ERRORE: Tipo non aggiunto.

# action edittype

edittype_updated.status       = Tipo aggiornato.

# action removetype

removetype_removed.status   = Tipo rimosso.

[Magellancms-cvs] magellan/var/db magellanpagefields.xsql,NONE,1.1 magellanpagefieldtypes.xsql,NONE,1.1

[<bur...@us...>]

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

Added Files:
	magellanpagefields.xsql magellanpagefieldtypes.xsql 
Log Message:
Solved conflicts.


--- NEW FILE: magellanpagefields.xsql ---
<?xml version='1.0'?>
<database>

    <table name="magellanpagefields">
        <field name="pageid" type="integer" notnull="1"/>
        <field name="typeid" type="integer" notnull="1"/>
        <field name="value" type="text"/>
    </table>

</database>

--- NEW FILE: magellanpagefieldtypes.xsql ---
<?xml version='1.0'?>
<database>

    <table name="magellanpagefieldtypes">
        <field name="id" type="integer" notnull="1"/>
        <field name="type" type="string" length="50" notnull="1"/>
        <field name="tag" type="string" length="50" notnull="1"/>
        <field name="image" type="boolean"/>
        <key field="id" type="unique"/>
    </table>

    <sequence name="magellanpagefieldtypes_id_seq"/>

</database>

[Magellancms-cvs] magellan/defs general.def,1.17,1.18

[<bur...@us...>]

Update of /cvsroot/magellancms/magellan/defs
In directory sc8-pr-cvs1:/tmp/cvs-serv7204/defs

Modified Files:
	general.def 
Log Message:
Solved conflicts.


Index: general.def
===================================================================
RCS file: /cvsroot/magellancms/magellan/defs/general.def,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** general.def	12 Mar 2003 14:02:54 -0000	1.17
--- general.def	12 Mar 2003 14:18:46 -0000	1.18
***************
*** 19,22 ****
--- 19,24 ----
  MODULE_SUBMODULES  = web users,free fields
  
+ MODULE_SUBMODULES  = web users,free fields
+ 
  MODULE_AUTHOR        = Solarix
  

[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

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

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', '' ) ) )
                                            )