ampoliros-cvs Mailing List for Ampoliros

Update of /cvsroot/ampoliros/ampoliros
In directory sc8-pr-cvs1:/tmp/cvs-serv30066

Modified Files:
	CHANGES 
Log Message:
Added encoding of confirmmessage label for buttons in AmpToolbar
hui widget. (robywan)


Index: CHANGES
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/CHANGES,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** CHANGES	10 Jun 2003 15:29:12 -0000	1.90
--- CHANGES	25 Jun 2003 09:14:35 -0000	1.91
***************
*** 38,41 ****
--- 38,43 ----
  - Added missing xml widget load in root/modules.php (thanks to Damien
    Fressard and Benoit Boirel). (wuh)
+ - Added encoding of confirmmessage label for buttons in AmpToolbar
+   hui widget. (robywan)
  
  SECURITY:

Update of /cvsroot/ampoliros/ampoliros/var/handlers
In directory sc8-pr-cvs1:/tmp/cvs-serv30066/var/handlers

Modified Files:
	amptoolbar.hui 
Log Message:
Added encoding of confirmmessage label for buttons in AmpToolbar
hui widget. (robywan)


Index: amptoolbar.hui
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/var/handlers/amptoolbar.hui,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** amptoolbar.hui	21 Dec 2002 11:06:55 -0000	1.5
--- amptoolbar.hui	25 Jun 2003 09:14:35 -0000	1.6
***************
*** 83,87 ****
                              <args><label>'.$button['label'].'</label><themeimage>'.( isset( $button['themeimage'] ) ? $button['themeimage'] : '' ).'</themeimage><themeimagetype>'.( isset( $button['themeimagetype'] ) ? $button['themeimagetype'] : '' ).'</themeimagetype><image>'.( isset( $button['image'] ) ? CGI_URL.$button['image'] : '' ).'</image><action type="encoded">'.urlencode( isset( $button['action'] ) ? $button['action'] : '' ).'</action>';
  
!                         if ( isset( $button['needconfirm'] ) and isset( $button['confirmmessage'] ) and ( $button['needconfirm'] == 'true' ) and strlen( $button['confirmmessage'] ) ) $this->mDefinition .= '<needconfirm>true</needconfirm><confirmmessage>'.$button['confirmmessage'].'</confirmmessage>';
                          if ( isset( $button['horiz'] ) ) $this->mDefinition .= '<horiz>'.$button['horiz'].'</horiz>';
                          if ( isset( $button['disabled'] ) ) $this->mDefinition .= '<disabled>'.$button['disabled'].'</disabled>';
--- 83,87 ----
                              <args><label>'.$button['label'].'</label><themeimage>'.( isset( $button['themeimage'] ) ? $button['themeimage'] : '' ).'</themeimage><themeimagetype>'.( isset( $button['themeimagetype'] ) ? $button['themeimagetype'] : '' ).'</themeimagetype><image>'.( isset( $button['image'] ) ? CGI_URL.$button['image'] : '' ).'</image><action type="encoded">'.urlencode( isset( $button['action'] ) ? $button['action'] : '' ).'</action>';
  
!                         if ( isset( $button['needconfirm'] ) and isset( $button['confirmmessage'] ) and ( $button['needconfirm'] == 'true' ) and strlen( $button['confirmmessage'] ) ) $this->mDefinition .= '<needconfirm>true</needconfirm><confirmmessage type="encoded">'.urlencode( $button['confirmmessage'] ).'</confirmmessage>';
                          if ( isset( $button['horiz'] ) ) $this->mDefinition .= '<horiz>'.$button['horiz'].'</horiz>';
                          if ( isset( $button['disabled'] ) ) $this->mDefinition .= '<disabled>'.$button['disabled'].'</disabled>';

Update of /cvsroot/ampoliros/ampoliros/www/themes/icons/crystal/mini
In directory sc8-pr-cvs1:/tmp/cvs-serv15014

Modified Files:
	Mime.png netscape.png shellscript.png tar.png tgz.png zip.png 
Added Files:
	1downarrow.png 1leftarrow.png 1rightarrow.png 1uparrow.png 
	2downarrow.png 2leftarrow.png 2rightarrow.png 2uparrow.png 
	about_kde.png airbrush.png amor.png artsbuilderexecute.png 
	atlantik.png attach.png back.png blend.png bookmark.png 
	bookmark2.png bookmark_add.png bookmark_add2.png 
	bookmark_folder.png bookmark_folder2.png bookmark_toolbar.png 
	bookmark_toolbar2.png bottom.png camera_test.png cancel.png 
	charset.png clear_left.png color_fill.png color_line.png 
	colorize.png colorpicker.png compfile.png completion.png 
	configure.png configure_shortcuts.png configure_toolbars.png 
	connect_creating.png connect_established.png connect_no.png 
	contents.png contents2.png contexthelp.png crop.png 
	decrypted.png down.png edit.png editclear.png editcopy.png 
	editcut.png editdelete.png editpaste.png editshred.png 
	edittrash.png endturn.png eraser.png exit.png fileclose.png 
	fileexport.png filefind.png fileimport.png filenew.png 
	fileopen.png fileprint.png filequickprint.png filesave.png 
	filesaveas.png fill.png filter.png find.png finish.png 
	flag.png folder_new.png fontsizedown.png fontsizeup.png 
	forward.png frame_edit.png frame_formula.png frame_image.png 
	frame_query.png frame_spreadsheet.png frame_text.png 
	frameprint.png gear.png gohome.png goto.png halfencrypted.png 
	help.png highscore.png history.png history_clear.png idea.png 
	identity.png inline_image.png inline_table.png kaphorism.png 
	kasteroids.png kbackgammon.png kbackgammon_engine.png 
	kbattleship.png kblackbox.png kbounce.png kde1.png kde2.png 
	kde3.png kde4.png kde5.png kde6.png kenolaba.png key_enter.png 
	kjumpingcube.png klines.png kmahjongg.png kmines.png kmoon.png 
	kodo.png kolf.png konquest.png kpat.png kpoker.png 
	kreversi.png ksame.png kshisen.png ksirtet.png ksmiletris.png 
	ksnake.png ksokoban.png kspaceduel.png kteatime.png ktron.png 
	kwin4.png kworldclock.png launch.png locationbar_erase.png 
	lock.png mail_find.png mail_forward.png mail_generic.png 
	mail_get.png mail_new.png mail_post_to.png mail_reply.png 
	mail_replyall.png mail_replylist.png mail_send.png 
	make_kdevelop.png math_abs.png math_brace.png 
	math_brackets.png math_frac.png math_int.png math_lsub.png 
	math_lsup.png math_matrix.png math_onetwomatrix.png 
	math_paren.png math_prod.png math_rsub.png math_rsup.png 
	math_sqrt.png math_sum.png move.png music_32ndnote.png 
	music_cleficon.png music_cross.png music_dottednote.png 
	music_eightnote.png music_fermatenote.png music_flat.png 
	music_fullnote.png music_halfnote.png music_natur.png 
	music_quarternote.png music_sixteenthnote.png 
	news_subscribe.png news_unsubscribe.png next.png no.png ok.png 
	openterm.png paintbrush.png palette_color.png palette_gray.png 
	palette_halftone.png palette_lineart.png pencil.png 
	player_end.png player_fwd.png player_pause.png player_play.png 
	player_rew.png player_start.png player_stop.png previous.png 
	project_open.png queue.png rebuild.png redo.png reload.png 
	reload_page.png remove.png revert.png roll.png rotate.png 
	rotate_ccw.png rotate_cw.png run.png save_all.png share.png 
	signature.png spellcheck.png stamp.png start.png stop.png 
	tab_breakoff.png tab_duplicate.png tab_new.png tab_new_bg.png 
	tab_new_raised.png tab_remove.png text.png text_block.png 
	text_bold.png text_center.png text_italic.png text_left.png 
	text_right.png text_strike.png text_sub.png text_super.png 
	text_under.png thumbnail.png toggle_log.png top.png 
	transform.png translate.png undo.png unlock.png up.png 
	view_bottom.png view_choose.png view_detailed.png 
	view_icon.png view_left_right.png view_multicolumn.png 
	view_remove.png view_right.png view_sidetree.png view_text.png 
	view_top_bottom.png view_tree.png viewmag+.png viewmag-.png 
	viewmag.png viewmag1.png viewmagfit.png window_fullscreen.png 
	window_new.png window_nofullscreen.png wizard.png 
Log Message:
NEW FEATURES:
- Added 261 new mini icons in Crystal icons set. (wuh)


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Index: Mime.png
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/www/themes/icons/crystal/mini/Mime.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvs4PA7Od and /tmp/cvs8EZ0oh differ

Index: netscape.png
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/www/themes/icons/crystal/mini/netscape.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsPRBpHg and /tmp/cvs0f3D9m differ

Index: shellscript.png
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/www/themes/icons/crystal/mini/shellscript.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsSwCtgh and /tmp/cvsGwTjDq differ

Index: tar.png
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/www/themes/icons/crystal/mini/tar.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvszAhR9j and /tmp/cvselfM4t differ

Index: tgz.png
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/www/themes/icons/crystal/mini/tgz.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvs6INH1m and /tmp/cvsiChtOz differ

Index: zip.png
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/www/themes/icons/crystal/mini/zip.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsfTaODn and /tmp/cvsAsyO2A differ

Update of /cvsroot/ampoliros/ampoliros/www/root
In directory sc8-pr-cvs1:/tmp/cvs-serv24349/www/root

Modified Files:
	auth.php modules.php 
Log Message:
NEW FEATURES:
- Added the possibility to check string and text widget values before sending
  a form. (robywan)
- Added arrowup, arrowupshadow, arrowleft and arrowleftshadow theme
  styles. (wuh)
- Added arrowup, arrowupshadow, arrowleft and arrowleftshadow icons for
  Amp3000 theme. (wuh)
- Added columns sorting to Hui table widget. (wuh)

CHANGES:
- DBLayer::GetTimestampFromDateArray() (dblayer.library) is now more
  tolerant with date arrays with missing keys. (wuh)

FIXES:
- Added missing xml widget load in root/modules.php (thanks to Damien
  Fressard and Benoit Boirel). (wuh)

SECURITY:
- Added logging of wrong accesses in access.log. (wuh)


Index: auth.php
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/www/root/auth.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** auth.php	7 Apr 2003 15:47:03 -0000	1.13
--- auth.php	10 Jun 2003 15:29:24 -0000	1.14
***************
*** 131,134 ****
--- 131,139 ----
              $amp_security = new AmpolirosSecurityHandler();
              $amp_security->SendAlert( 'Wrong root local login from remote address '.$_SERVER['REMOTE_ADDR'] );
+             $amp_security->LogFailedAccess(
+                 '',
+                 true,
+                 $_SERVER['REMOTE_ADDR']
+                 );
          }
  
***************
*** 190,194 ****
                  '',
                  false,
!                 false,
                  $_SERVER['REMOTE_ADDR']
                  );
--- 195,199 ----
                  '',
                  false,
!                 true,
                  $_SERVER['REMOTE_ADDR']
                  );

Index: modules.php
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/www/root/modules.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** modules.php	8 May 2003 15:56:08 -0000	1.17
--- modules.php	10 Jun 2003 15:29:24 -0000	1.18
***************
*** 73,76 ****
--- 73,77 ----
      $hui->LoadWidget( 'vertframe' );
      $hui->LoadWidget( 'vertgroup' );
+     $hui->LoadWidget( 'xml' );
  
  $hui_page = new HuiPage( 'page', array(

Update of /cvsroot/ampoliros/ampoliros/var/locale
In directory sc8-pr-cvs1:/tmp/cvs-serv24349/var/locale

Modified Files:
	amp_root_security.catalog amp_root_security_it.catalog 
	france.country 
Log Message:
NEW FEATURES:
- Added the possibility to check string and text widget values before sending
  a form. (robywan)
- Added arrowup, arrowupshadow, arrowleft and arrowleftshadow theme
  styles. (wuh)
- Added arrowup, arrowupshadow, arrowleft and arrowleftshadow icons for
  Amp3000 theme. (wuh)
- Added columns sorting to Hui table widget. (wuh)

CHANGES:
- DBLayer::GetTimestampFromDateArray() (dblayer.library) is now more
  tolerant with date arrays with missing keys. (wuh)

FIXES:
- Added missing xml widget load in root/modules.php (thanks to Damien
  Fressard and Benoit Boirel). (wuh)

SECURITY:
- Added logging of wrong accesses in access.log. (wuh)


Index: amp_root_security.catalog
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/var/locale/amp_root_security.catalog,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** amp_root_security.catalog	18 Dec 2002 18:04:17 -0000	1.2
--- amp_root_security.catalog	10 Jun 2003 15:29:21 -0000	1.3
***************
*** 69,70 ****
--- 69,75 ----
  check_password_ok.label             = Ok
  check_password_unsafe.label         = Not safe enough
+ 
+ loggedusers.tab                     = Logged users sessions
+ root_sessions.label                 = Root sessions
+ users_sessions.label                = Users sessions
+ logout.button                       = Force logout

Index: amp_root_security_it.catalog
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/var/locale/amp_root_security_it.catalog,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** amp_root_security_it.catalog	20 Dec 2002 18:56:26 -0000	1.2
--- amp_root_security_it.catalog	10 Jun 2003 15:29:21 -0000	1.3
***************
*** 69,70 ****
--- 69,75 ----
  check_password_ok.label             = Ok
  check_password_unsafe.label         = Non abbastanza sicura
+ 
+ loggedusers.tab                     = Sessioni degli utenti loggati
+ root_sessions.label                 = Sessioni root
+ users_sessions.label                = Sessioni utenti
+ logout.button                       = Forza il logout

Index: france.country
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/var/locale/france.country,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** france.country	24 Aug 2002 15:22:26 -0000	1.1.1.1
--- france.country	10 Jun 2003 15:29:22 -0000	1.2
***************
*** 41,51 ****
  
  # Time format string
! TIMEFORMAT              = %H:%M:%S
  
  # Date format string
! DATEFORMAT              = %H:%M:%S
  
  # Short date format string
! SHORTDATEFORMAT         = %H:%M:%S
  
  # True if week starts on Monday
--- 41,51 ----
  
  # Time format string
! TIMEFORMAT              = H:i:s
  
  # Date format string
! DATEFORMAT              = d/m/Y
  
  # Short date format string
! SHORTDATEFORMAT         = d/m/Y
  
  # True if week starts on Monday
***************
*** 54,56 ****
  DATESEPARATOR			= /
  
! DATEORDER				= mdy
--- 54,56 ----
  DATESEPARATOR			= /
  
! DATEORDER				= dmy

Update of /cvsroot/ampoliros/ampoliros/www/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv24349/www/admin

Modified Files:
	auth.php 
Log Message:
NEW FEATURES:
- Added the possibility to check string and text widget values before sending
  a form. (robywan)
- Added arrowup, arrowupshadow, arrowleft and arrowleftshadow theme
  styles. (wuh)
- Added arrowup, arrowupshadow, arrowleft and arrowleftshadow icons for
  Amp3000 theme. (wuh)
- Added columns sorting to Hui table widget. (wuh)

CHANGES:
- DBLayer::GetTimestampFromDateArray() (dblayer.library) is now more
  tolerant with date arrays with missing keys. (wuh)

FIXES:
- Added missing xml widget load in root/modules.php (thanks to Damien
  Fressard and Benoit Boirel). (wuh)

SECURITY:
- Added logging of wrong accesses in access.log. (wuh)


Index: auth.php
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/www/admin/auth.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** auth.php	7 Apr 2003 15:46:49 -0000	1.14
--- auth.php	10 Jun 2003 15:29:23 -0000	1.15
***************
*** 133,136 ****
--- 133,141 ----
              $amp_security = new AmpolirosSecurityHandler();
              $amp_security->SendAlert( 'Wrong user local login for user '.$event_data['username'].' from remote address '.$_SERVER['REMOTE_ADDR'] );
+             $amp_security->LogFailedAccess(
+                 $event_data['username'],
+                 false,
+                 $_SERVER['REMOTE_ADDR']
+                 );
          }
  

Update of /cvsroot/ampoliros/ampoliros/var/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv24349/var/lib

Modified Files:
	dblayer.library security.library 
Log Message:
NEW FEATURES:
- Added the possibility to check string and text widget values before sending
  a form. (robywan)
- Added arrowup, arrowupshadow, arrowleft and arrowleftshadow theme
  styles. (wuh)
- Added arrowup, arrowupshadow, arrowleft and arrowleftshadow icons for
  Amp3000 theme. (wuh)
- Added columns sorting to Hui table widget. (wuh)

CHANGES:
- DBLayer::GetTimestampFromDateArray() (dblayer.library) is now more
  tolerant with date arrays with missing keys. (wuh)

FIXES:
- Added missing xml widget load in root/modules.php (thanks to Damien
  Fressard and Benoit Boirel). (wuh)

SECURITY:
- Added logging of wrong accesses in access.log. (wuh)


Index: dblayer.library
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/var/lib/dblayer.library,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** dblayer.library	21 Apr 2003 13:01:04 -0000	1.15
--- dblayer.library	10 Jun 2003 15:29:18 -0000	1.16
***************
*** 956,959 ****
--- 956,966 ----
      function GetTimestampFromDateArray( $date )
      {
+         if ( !isset( $date['year'] ) ) $date['year'] = '';
+         if ( !isset( $date['mon'] ) ) $date['mon'] = '';
+         if ( !isset( $date['mday'] ) ) $date['mday'] = '';
+         if ( !isset( $date['hours'] ) ) $date['hours'] = '';
+         if ( !isset( $date['minutes'] ) ) $date['minutes'] = '';
+         if ( !isset( $date['seconda'] ) ) $date['seconds'] = '';
+ 
          $date['year'] = str_pad( $date['year'], 4, '0', STR_PAD_LEFT );
          $date['mon'] = str_pad( $date['mon'], 2, '0', STR_PAD_LEFT );
***************
*** 963,967 ****
          $date['seconds'] = str_pad( $date['seconds'], 2, '0', STR_PAD_LEFT );
  
!         return sprintf( "%s-%s-%s %s:%s:%s", $date['year'], $date['mon'], $date['mday'], $date['hours'], $date['minutes'], $date['seconds'] );
      }
  
--- 970,982 ----
          $date['seconds'] = str_pad( $date['seconds'], 2, '0', STR_PAD_LEFT );
  
!         return sprintf(
!             "%s-%s-%s %s:%s:%s",
!             $date['year'],
!             $date['mon'],
!             $date['mday'],
!             $date['hours'],
!             $date['minutes'],
!             $date['seconds']
!             );
      }
  

Index: security.library
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/var/lib/security.library,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** security.library	19 May 2003 14:36:25 -0000	1.9
--- security.library	10 Jun 2003 15:29:20 -0000	1.10
***************
*** 434,438 ****
      /*!
      @function LogAccess
!     
      @abstract Logs an access to the administration area.
  
--- 434,438 ----
      /*!
      @function LogAccess
! 
      @abstract Logs an access to the administration area.
  
***************
*** 455,458 ****
--- 455,486 ----
              ( $logout ? 'logged out' : 'logged in' ).
              ( strlen( $ip ) ? ' from address '.$ip : '' ),
+             LOGGER_NOTICE
+             );
+ 
+         return true;
+     }
+ 
+     /*!
+     @function LogFailedAccess
+ 
+     @abstract Logs a failed access to the administration area.
+ 
+     @result Always true.
+     */
+     function LogFailedAccess(
+         $user = '',
+         $root = false,
+         $ip = ''
+         )
+     {
+         OpenLibrary( 'logger.library' );
+ 
+         $log = new Logger( $this->mAccessLog );
+ 
+         $log->LogEvent(
+             'ampoliros',
+             'Wrong access from '.
+             ( $root ? 'root ' : 'user '.$user.' ' ).
+             ( strlen( $ip ) ? 'from address '.$ip : '' ),
              LOGGER_NOTICE
              );

Update of /cvsroot/ampoliros/ampoliros/var/handlers
In directory sc8-pr-cvs1:/tmp/cvs-serv24349/var/handlers

Modified Files:
	table.hui 
Log Message:
NEW FEATURES:
- Added the possibility to check string and text widget values before sending
  a form. (robywan)
- Added arrowup, arrowupshadow, arrowleft and arrowleftshadow theme
  styles. (wuh)
- Added arrowup, arrowupshadow, arrowleft and arrowleftshadow icons for
  Amp3000 theme. (wuh)
- Added columns sorting to Hui table widget. (wuh)

CHANGES:
- DBLayer::GetTimestampFromDateArray() (dblayer.library) is now more
  tolerant with date arrays with missing keys. (wuh)

FIXES:
- Added missing xml widget load in root/modules.php (thanks to Damien
  Fressard and Benoit Boirel). (wuh)

SECURITY:
- Added logging of wrong accesses in access.log. (wuh)


Index: table.hui
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/var/handlers/table.hui,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** table.hui	19 May 2003 12:24:33 -0000	1.11
--- table.hui	10 Jun 2003 15:29:18 -0000	1.12
***************
*** 50,53 ****
--- 50,55 ----
      var $mPagesNavigatorPosition;
      var $mWidth;
+     var $mSortBy;
+     var $mSortDirection;
  
      function HuiTable( $elemName, $elemArgs = '', $elemTheme = '', $dispEvents = '' )
***************
*** 66,74 ****
  
          if ( isset( $this->mArgs['pagenumber'] ) and strlen( $this->mArgs['pagenumber'] ) ) $this->mPageNumber = $this->mArgs['pagenumber'];
!         else if ( isset( $tmp_sess['pagenumber'] ) and strlen( $tmp_sess['pagenumber'] ) ) $this->mPageNumber = $tmp_sess['pagenumber'];
          else $this->mPageNumber = 1;
  
          if ( isset( $this->mArgs['rowsperpage'] ) ) $this->mRowsPerPage = $this->mArgs['rowsperpage'];
!         else if ( isset( $tmp_sess['rowsperpage'] ) ) $this->mRowsPerPage = $tmp_sess['rowsperpage'];
  
          if ( isset( $this->mArgs['pagesactionfunction'] ) ) $this->mPagesActionFunction = $this->mArgs['pagesactionfunction'];
--- 68,76 ----
  
          if ( isset( $this->mArgs['pagenumber'] ) and strlen( $this->mArgs['pagenumber'] ) ) $this->mPageNumber = $this->mArgs['pagenumber'];
!         elseif ( isset( $tmp_sess['pagenumber'] ) and strlen( $tmp_sess['pagenumber'] ) ) $this->mPageNumber = $tmp_sess['pagenumber'];
          else $this->mPageNumber = 1;
  
          if ( isset( $this->mArgs['rowsperpage'] ) ) $this->mRowsPerPage = $this->mArgs['rowsperpage'];
!         elseif ( isset( $tmp_sess['rowsperpage'] ) ) $this->mRowsPerPage = $tmp_sess['rowsperpage'];
  
          if ( isset( $this->mArgs['pagesactionfunction'] ) ) $this->mPagesActionFunction = $this->mArgs['pagesactionfunction'];
***************
*** 87,93 ****
          }
  
  
          $this->StoreSession( array(
!                                    'pagenumber' => $this->mPageNumber
                                    )
                             );
--- 89,104 ----
          }
  
+         if ( isset( $this->mArgs['sortby'] ) and strlen( $this->mArgs['sortby'] ) ) $this->mSortBy = $this->mArgs['sortby'];
+         elseif ( isset( $tmp_sess['sortby'] ) and strlen( $tmp_sess['sortby'] ) ) $this->mSortBy = $tmp_sess['sortby'];
+         else $this->mSortBy = '';
+ 
+         if ( isset( $this->mArgs['sortdirection'] ) and strlen( $this->mArgs['sortdirection'] ) ) $this->mSortDirection = $this->mArgs['sortdirection'];
+         elseif ( isset( $tmp_sess['sortdirection'] ) and strlen( $tmp_sess['sortdirection'] ) ) $this->mSortDirection = $tmp_sess['sortdirection'];
+         else $this->mSortDirection = 'down';
  
          $this->StoreSession( array(
!                                    'pagenumber' => $this->mPageNumber,
!                                    'sortby' => $this->mSortBy,
!                                    'sortdirection' => $this->mSortDirection
                                    )
                             );
***************
*** 136,146 ****
                  for ( $col = 0; $col < $this->mCols; $col++ )
                  {
!                     $this->mLayout .= '<td valign="top" align="center" bgcolor="'.
                          $this->mThemeHandler->mColorsSet['tables']['headerbgcolor'].
                          '" class="bold">'.
                          ( ( isset( $this->mHeaders[$col]['link'] ) and strlen( $this->mHeaders[$col]['link'] ) ) ? '<a href="'.$this->mHeaders[$col]['link'].'">' : '' ).
                          ( ( isset( $this->mHeaders[$col]['label'] ) and strlen( $this->mHeaders[$col]['label'] ) ) ? $this->mHeaders[$col]['label'] : '&nbsp;' ).
!                         ( ( isset( $this->mHeaders[$col]['link'] ) and strlen( $this->mHeaders[$col]['link'] ) ) ? '<a>' : '' ).
                          "</td>\n";
                  }
                  $this->mLayout .= "</tr>\n";
--- 147,180 ----
                  for ( $col = 0; $col < $this->mCols; $col++ )
                  {
!                     $this->mLayout .= '<td><table cellpadding="0" cellspacing="1" width="100%"><tr>';
! 
!                     if ( isset( $this->mHeaders[$col]['link'] ) and strlen( $this->mHeaders[$col]['link'] ) )
!                     {
!                         $this->mLayout .= '<td valign="middle" bgcolor="'.
!                             $this->mThemeHandler->mColorsSet['tables']['headerbgcolor'].
!                             '"><a href="'.$this->mHeaders[$col]['link'].'"><img src="'.(
!                                 $this->mSortBy == $col ?
!                                 (
!                                     $this->mSortDirection == 'up' ?
!                                     $this->mThemeHandler->mStyle['arrowup'] :
!                                     $this->mThemeHandler->mStyle['arrowdown']
!                                 ) :
!                                 $this->mThemeHandler->mStyle['arrowrightshadow']
!                                 ).'" border="0"></a></td>';
!                     }
!                     else
!                     {
!                         $this->mLayout .= '<td></td>';
!                     }
! 
!                     $this->mLayout .= '<td width="100%" valign="top" align="center" bgcolor="'.
                          $this->mThemeHandler->mColorsSet['tables']['headerbgcolor'].
                          '" class="bold">'.
                          ( ( isset( $this->mHeaders[$col]['link'] ) and strlen( $this->mHeaders[$col]['link'] ) ) ? '<a href="'.$this->mHeaders[$col]['link'].'">' : '' ).
                          ( ( isset( $this->mHeaders[$col]['label'] ) and strlen( $this->mHeaders[$col]['label'] ) ) ? $this->mHeaders[$col]['label'] : '&nbsp;' ).
!                         ( ( isset( $this->mHeaders[$col]['link'] ) and strlen( $this->mHeaders[$col]['link'] ) ) ? '</a>' : '' ).
                          "</td>\n";
+ 
+                     $this->mLayout .= '</tr></table></td>';
                  }
                  $this->mLayout .= "</tr>\n";

Update of /cvsroot/ampoliros/ampoliros/etc
In directory sc8-pr-cvs1:/tmp/cvs-serv24349/etc

Modified Files:
	amp3000.huistyle ampmaintenance.php 
Log Message:
NEW FEATURES:
- Added the possibility to check string and text widget values before sending
  a form. (robywan)
- Added arrowup, arrowupshadow, arrowleft and arrowleftshadow theme
  styles. (wuh)
- Added arrowup, arrowupshadow, arrowleft and arrowleftshadow icons for
  Amp3000 theme. (wuh)
- Added columns sorting to Hui table widget. (wuh)

CHANGES:
- DBLayer::GetTimestampFromDateArray() (dblayer.library) is now more
  tolerant with date arrays with missing keys. (wuh)

FIXES:
- Added missing xml widget load in root/modules.php (thanks to Damien
  Fressard and Benoit Boirel). (wuh)

SECURITY:
- Added logging of wrong accesses in access.log. (wuh)


Index: amp3000.huistyle
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/etc/amp3000.huistyle,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** amp3000.huistyle	1 Apr 2003 16:05:30 -0000	1.4
--- amp3000.huistyle	10 Jun 2003 15:29:17 -0000	1.5
***************
*** 26,29 ****
--- 26,33 ----
  STYLE.ARROWRIGHT = arrowright.gif
  STYLE.ARROWRIGHTSHADOW = arrowrightgray.gif
+ STYLE.ARROWUP = arrowup.gif
+ STYLE.ARROWUPSHADOW = arrowupgray.gif
+ STYLE.ARROWLEFT = arrowleft.gif
+ STYLE.ARROWLEFTSHADOW = arrowleftgray.gif
  
  STYLE.BLUEBALL = blueball.gif

Index: ampmaintenance.php
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/etc/ampmaintenance.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ampmaintenance.php	12 May 2003 13:38:46 -0000	1.3
--- ampmaintenance.php	10 Jun 2003 15:29:18 -0000	1.4
***************
*** 41,45 ****
  
  $hook = new Hook(
!     $gEnv['root']['db'],
      'ampoliros',
      'instance'
--- 41,45 ----
  
  $hook = new Hook(
!     $GLOBALS['gEnv']['root']['db'],
      'ampoliros',
      'instance'

Update of /cvsroot/ampoliros/ampoliros
In directory sc8-pr-cvs1:/tmp/cvs-serv24349

Modified Files:
	AUTHORS CHANGES TODO configure 
Log Message:
NEW FEATURES:
- Added the possibility to check string and text widget values before sending
  a form. (robywan)
- Added arrowup, arrowupshadow, arrowleft and arrowleftshadow theme
  styles. (wuh)
- Added arrowup, arrowupshadow, arrowleft and arrowleftshadow icons for
  Amp3000 theme. (wuh)
- Added columns sorting to Hui table widget. (wuh)

CHANGES:
- DBLayer::GetTimestampFromDateArray() (dblayer.library) is now more
  tolerant with date arrays with missing keys. (wuh)

FIXES:
- Added missing xml widget load in root/modules.php (thanks to Damien
  Fressard and Benoit Boirel). (wuh)

SECURITY:
- Added logging of wrong accesses in access.log. (wuh)


Index: AUTHORS
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/AUTHORS,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** AUTHORS	27 Mar 2003 13:06:28 -0000	1.14
--- AUTHORS	10 Jun 2003 15:29:10 -0000	1.15
***************
*** 15,47 ****
  
  Alex Pagnoni (wuh,burzmali) <al...@am...>
! - Whole idea, design and coding, Windows porting, Hui design, web site.
  
  Roberto Ricci (robywan)     <rob...@so...>
! - Some ideas, features and bug reports.
  
  Carlo Farinella (radion)    <car...@so...>
! - Beta testing.
! 
! 
! 
! Past contributors
! -----------------
! 
! Willynux
! - Original configure script.
! 
! Diego Costantini (evil)     <co...@in...>
! - Beta testing.
! 
! John Voth (zeke)            <ze...@am...>
! - Site and forum maintenance, bug reports.
! 
! 
! 
! Thanks to
! ---------
! 
! Marco Vassura
! - Security bug report.      <vx...@li...>
  
  
--- 15,25 ----
  
  Alex Pagnoni (wuh,burzmali) <al...@am...>
! - Original concept, design, coding, testing, webmaster.
  
  Roberto Ricci (robywan)     <rob...@so...>
! - Suggestions, coding and testing.
  
  Carlo Farinella (radion)    <car...@so...>
! - Testing.
  
  
***************
*** 91,94 ****
--- 69,97 ----
  Saravanan                   <win...@ya...>
  - Mail class in mail.library.
+ 
+ 
+ 
+ Past contributors
+ -----------------
+ 
+ Willynux
+ - Original configure script.
+ 
+ Diego Costantini (evil)     <co...@in...>
+ - Testing.
+ 
+ John Voth (zeke)            <ze...@am...>
+ - Site and forum maintenance, bug reports.
+ 
+ 
+ 
+ Thanks to
+ ---------
+ 
+ Marco Vassura
+ - Security bug report.      <vx...@li...>
+ 
+ Damien Fressard and Benoit Boire
+ - Bug reports, suggestions.
  
  

Index: CHANGES
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/CHANGES,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** CHANGES	23 May 2003 15:02:29 -0000	1.89
--- CHANGES	10 Jun 2003 15:29:12 -0000	1.90
***************
*** 20,23 ****
--- 20,28 ----
  - Added the possibility to check string and text widget values before sending
    a form. (robywan)
+ - Added arrowup, arrowupshadow, arrowleft and arrowleftshadow theme
+   styles. (wuh)
+ - Added arrowup, arrowupshadow, arrowleft and arrowleftshadow icons for
+   Amp3000 theme. (wuh)
+ - Added columns sorting to Hui table widget. (wuh)
  
  CHANGES:
***************
*** 25,32 ****
--- 30,41 ----
  - Now Hui table widget pages navigator supports word wrapping when it is
    longer than the table width. (wuh)
+ - DBLayer::GetTimestampFromDateArray() (dblayer.library) is now more
+   tolerant with date arrays with missing keys. (wuh)
  - Updated the sites.php root page using the new form elements check feature.
    (robywan)
  
  FIXES:
+ - Added missing xml widget load in root/modules.php (thanks to Damien
+   Fressard and Benoit Boirel). (wuh)
  
  SECURITY:
***************
*** 35,38 ****
--- 44,49 ----
  - Added logged root and users sessions list in security administration
    (security.php). (wuh)
+ - Added logging of wrong accesses in access.log. (wuh)
+ 
  
  

Index: TODO
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/TODO,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** TODO	19 May 2003 16:27:45 -0000	1.48
--- TODO	10 Jun 2003 15:29:15 -0000	1.49
***************
*** 11,16 ****
  
  
! PHP 4.3.0
! ---------
  - Check PostgreSQL support.
  - Check the new declare() global support, it may be useful for debug purposes.
--- 11,16 ----
  
  
! New PHP features and changes to consider
! ----------------------------------------
  - Check PostgreSQL support.
  - Check the new declare() global support, it may be useful for debug purposes.
***************
*** 82,86 ****
  CHANGES:
  
- - Logging of wrong accesses in access.log.
  - Better cron management.
  
--- 82,85 ----

Index: configure
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/configure,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** configure	8 Jan 2003 11:27:21 -0000	1.3
--- configure	10 Jun 2003 15:29:16 -0000	1.4
***************
*** 1,3 ****
! # !/bin/sh
  #
  #
--- 1,3 ----
! #!/bin/sh
  #
  #

Update of /cvsroot/ampoliros/ampoliros/defs
In directory sc8-pr-cvs1:/tmp/cvs-serv24349/defs

Modified Files:
	structure.xml 
Log Message:
NEW FEATURES:
- Added the possibility to check string and text widget values before sending
  a form. (robywan)
- Added arrowup, arrowupshadow, arrowleft and arrowleftshadow theme
  styles. (wuh)
- Added arrowup, arrowupshadow, arrowleft and arrowleftshadow icons for
  Amp3000 theme. (wuh)
- Added columns sorting to Hui table widget. (wuh)

CHANGES:
- DBLayer::GetTimestampFromDateArray() (dblayer.library) is now more
  tolerant with date arrays with missing keys. (wuh)

FIXES:
- Added missing xml widget load in root/modules.php (thanks to Damien
  Fressard and Benoit Boirel). (wuh)

SECURITY:
- Added logging of wrong accesses in access.log. (wuh)


Index: structure.xml
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/defs/structure.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** structure.xml	19 May 2003 14:36:24 -0000	1.31
--- structure.xml	10 Jun 2003 15:29:16 -0000	1.32
***************
*** 1538,1541 ****
--- 1538,1551 ----
          file="semaphores.library"/>
  
+     <!-- Clipboard -->
+ 
+     <tempdir
+         name="clipboard"
+         file="clipboard"/>
+ 
+     <library
+         name="clipboard"
+         file="clipboard.library"/>
+ 
      <!-- Remote procedures -->
  

Update of /cvsroot/ampoliros/ampoliros/www/themes/styles/amp3000
In directory sc8-pr-cvs1:/tmp/cvs-serv24349/www/themes/styles/amp3000

Added Files:
	arrowleft.gif arrowleftgray.gif arrowup.gif arrowupgray.gif 
Log Message:
NEW FEATURES:
- Added the possibility to check string and text widget values before sending
  a form. (robywan)
- Added arrowup, arrowupshadow, arrowleft and arrowleftshadow theme
  styles. (wuh)
- Added arrowup, arrowupshadow, arrowleft and arrowleftshadow icons for
  Amp3000 theme. (wuh)
- Added columns sorting to Hui table widget. (wuh)

CHANGES:
- DBLayer::GetTimestampFromDateArray() (dblayer.library) is now more
  tolerant with date arrays with missing keys. (wuh)

FIXES:
- Added missing xml widget load in root/modules.php (thanks to Damien
  Fressard and Benoit Boirel). (wuh)

SECURITY:
- Added logging of wrong accesses in access.log. (wuh)


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

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

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

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

Update of /cvsroot/ampoliros/ampoliros
In directory sc8-pr-cvs1:/tmp/cvs-serv837

Modified Files:
	CHANGES 
Log Message:
Added the possibility to check string and text widget values before sending
a form. (robywan)
Updated the sites.php root page using the new form elements check feature.
(robywan)


Index: CHANGES
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/CHANGES,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** CHANGES	19 May 2003 16:27:45 -0000	1.88
--- CHANGES	23 May 2003 15:02:29 -0000	1.89
***************
*** 18,21 ****
--- 18,23 ----
  - Added semaphores feature (semaphores.library). (wuh)
  - Added clipboard feature (clipboard.library). (wuh)
+ - Added the possibility to check string and text widget values before sending
+   a form. (robywan)
  
  CHANGES:
***************
*** 23,26 ****
--- 25,30 ----
  - Now Hui table widget pages navigator supports word wrapping when it is
    longer than the table width. (wuh)
+ - Updated the sites.php root page using the new form elements check feature.
+   (robywan)
  
  FIXES:

Update of /cvsroot/ampoliros/ampoliros/www/root
In directory sc8-pr-cvs1:/tmp/cvs-serv837/www/root

Modified Files:
	sites.php 
Log Message:
Added the possibility to check string and text widget values before sending
a form. (robywan)
Updated the sites.php root page using the new form elements check feature.
(robywan)


Index: sites.php
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/www/root/sites.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** sites.php	7 Apr 2003 15:51:36 -0000	1.19
--- sites.php	23 May 2003 15:02:33 -0000	1.20
***************
*** 591,601 ****
      //
      $hui_site_grid->AddChild( new HuiLabel( 'namelabel', array( 'label' => $amp_locale->GetStr( 'sitename_label' ).' (*)' ) ), 0, 0 );
!     $hui_site_grid->AddChild( new HuiString( 'sitename', array( 'disp' => 'pass', 'tabindex' => $tab_index++ ) ), 0, 1 );
  
      $hui_site_grid->AddChild( new HuiLabel( 'idlabel', array( 'label' => $amp_locale->GetStr( 'siteid_label' ).' (*)' ) ), 1, 0 );
!     $hui_site_grid->AddChild( new HuiString( 'siteid', array( 'disp' => 'pass', 'tabindex' => $tab_index++ ) ), 1, 1 );
  
      $hui_site_grid->AddChild( new HuiLabel( 'passwordlabel', array( 'label' => $amp_locale->GetStr( 'sitepassword_label' ).' (*)' ) ), 2, 0 );
!     $hui_site_grid->AddChild( new HuiString( 'sitepassword', array( 'disp' => 'pass', 'tabindex' => $tab_index++, 'password' => 'true' ) ), 2, 1 );
  
      $hui_site_grid->AddChild( new HuiLabel( 'pathlabel', array( 'label' => $amp_locale->GetStr( 'sitepath_label' ).' (**)' ) ), 3, 0 );
--- 591,601 ----
      //
      $hui_site_grid->AddChild( new HuiLabel( 'namelabel', array( 'label' => $amp_locale->GetStr( 'sitename_label' ).' (*)' ) ), 0, 0 );
!     $hui_site_grid->AddChild( new HuiString( 'sitename', array( 'disp' => 'pass', 'checkmessage' => $amp_locale->GetStr( 'sitename_label' ), 'required' => 'true', 'tabindex' => $tab_index++ ) ), 0, 1 );
  
      $hui_site_grid->AddChild( new HuiLabel( 'idlabel', array( 'label' => $amp_locale->GetStr( 'siteid_label' ).' (*)' ) ), 1, 0 );
!     $hui_site_grid->AddChild( new HuiString( 'siteid', array( 'disp' => 'pass', 'checkmessage' => $amp_locale->GetStr( 'siteid_label' ), 'required' => 'true', 'tabindex' => $tab_index++ ) ), 1, 1 );
  
      $hui_site_grid->AddChild( new HuiLabel( 'passwordlabel', array( 'label' => $amp_locale->GetStr( 'sitepassword_label' ).' (*)' ) ), 2, 0 );
!     $hui_site_grid->AddChild( new HuiString( 'sitepassword', array( 'disp' => 'pass', 'checkmessage' => $amp_locale->GetStr( 'sitepassword_label' ), 'required' => 'true', 'tabindex' => $tab_index++, 'password' => 'true' ) ), 2, 1 );
  
      $hui_site_grid->AddChild( new HuiLabel( 'pathlabel', array( 'label' => $amp_locale->GetStr( 'sitepath_label' ).' (**)' ) ), 3, 0 );
***************
*** 635,639 ****
  
      $hui_vgroup->AddChild( $hui_site_grid );
!     $hui_vgroup->AddChild( new HuiSubmit( 'submit1', array( 'caption' => $amp_locale->GetStr( 'createsite_submit' ), 'tabindex' => $tab_index++ ) ) );
  
      $hui_vgroup->AddChild( new HuiHorizBar( 'horizbar1' ) );
--- 635,651 ----
  
      $hui_vgroup->AddChild( $hui_site_grid );
!     
!     $form_events_call = new HuiEventsCall();
!     $form_events_call->AddEvent( new HuiEvent( 'pass', 'createsite', '' ) );
!     $form_events_call->AddEvent( new HuiEvent( 'main', 'default', '' ) );
! 
!     //$hui_vgroup->AddChild( new HuiSubmit( 'submit1', array( 'caption' => $amp_locale->GetStr( 'createsite_submit' ), 'tabindex' => $tab_index++ ) ) );
!     $hui_vgroup->AddChild( new HuiButton( 'submit1', array(
!         'label' => $amp_locale->GetStr( 'createsite_submit' ),
!         'themeimage' => 'button_ok',
!         'horiz' => 'true',
!         'formsubmit' => 'newsiteform',
!         'formcheckmessage' => $amp_locale->GetStr( 'newsite_formcheck.message' ),
!         'action' => $form_events_call->GetEventsCallString() ) ) );
  
      $hui_vgroup->AddChild( new HuiHorizBar( 'horizbar1' ) );
***************
*** 642,649 ****
      $hui_vgroup->AddChild( new HuiLabel( 'dbcreatenotelabel', array( 'label' => $amp_locale->GetStr( 'createdbnote_label' ) ) ) );
  
-     $form_events_call = new HuiEventsCall();
-     $form_events_call->AddEvent( new HuiEvent( 'pass', 'createsite', '' ) );
-     $form_events_call->AddEvent( new HuiEvent( 'main', 'default', '' ) );
- 
      $hui_form = new HuiForm( 'newsiteform', array( 'action' => $form_events_call->GetEventsCallString() ) );
      $hui_form->AddChild( $hui_vgroup );
--- 654,657 ----
***************
*** 677,681 ****
  		//
  		$hui_site_grid->AddChild( new HuiLabel( 'namelabel', array( 'label' => $amp_locale->GetStr( 'sitename_label' ).' (*)' ) ), 0, 0 );
! 		$hui_site_grid->AddChild( new HuiString( 'sitename', array( 'disp' => 'pass', 'tabindex' => $tab_index++, 'value' => $site_data['sitename'] ) ), 0, 1 );
  
  		$hui_site_grid->AddChild( new HuiLabel( 'passwordlabel', array( 'label' => $amp_locale->GetStr( 'sitepassword_label' ).' (*)' ) ), 2, 0 );
--- 685,689 ----
  		//
  		$hui_site_grid->AddChild( new HuiLabel( 'namelabel', array( 'label' => $amp_locale->GetStr( 'sitename_label' ).' (*)' ) ), 0, 0 );
! 		$hui_site_grid->AddChild( new HuiString( 'sitename', array( 'disp' => 'pass', 'checkmessage' => $amp_locale->GetStr( 'sitename_label' ), 'required' => 'true', 'tabindex' => $tab_index++, 'value' => $site_data['sitename'] ) ), 0, 1 );
  
  		$hui_site_grid->AddChild( new HuiLabel( 'passwordlabel', array( 'label' => $amp_locale->GetStr( 'sitepassword_label' ).' (*)' ) ), 2, 0 );
***************
*** 719,730 ****
  		$hui_vgroup->AddChild( $hui_site_grid );
  
- 		$hui_vgroup->AddChild( new HuiSubmit( 'submit1', array( 'caption' => $amp_locale->GetStr( 'editsite_submit' ), 'tabindex' => $tab_index++ ) ) );
- 
- 		$hui_vgroup->AddChild( new HuiHorizBar( 'horizbar1' ) );
- 		$hui_vgroup->AddChild( new HuiLabel( 'reqfieldslabel', array( 'label' => $amp_locale->GetStr( 'requiredfields_label' ) ) ) );
- 
  		$form_events_call = new HuiEventsCall();
  		$form_events_call->AddEvent( new HuiEvent( 'pass', 'updatesite', array( 'siteserial' => $site_data['id'] ) ) );
  		$form_events_call->AddEvent( new HuiEvent( 'main', 'default', '' ) );
  
  		$hui_form = new HuiForm( 'editsiteform', array( 'action' => $form_events_call->GetEventsCallString() ) );
--- 727,744 ----
  		$hui_vgroup->AddChild( $hui_site_grid );
  
  		$form_events_call = new HuiEventsCall();
  		$form_events_call->AddEvent( new HuiEvent( 'pass', 'updatesite', array( 'siteserial' => $site_data['id'] ) ) );
  		$form_events_call->AddEvent( new HuiEvent( 'main', 'default', '' ) );
+ 
+         $hui_vgroup->AddChild( new HuiButton( 'submit1', array(
+             'label' => $amp_locale->GetStr( 'editsite_submit' ),
+             'themeimage' => 'button_ok',
+             'horiz' => 'true',
+             'formsubmit' => 'editsiteform',
+             'formcheckmessage' => $amp_locale->GetStr( 'editsite_formcheck.message' ),
+             'action' => $form_events_call->GetEventsCallString() ) ) );
+ 
+ 		$hui_vgroup->AddChild( new HuiHorizBar( 'horizbar1' ) );
+ 		$hui_vgroup->AddChild( new HuiLabel( 'reqfieldslabel', array( 'label' => $amp_locale->GetStr( 'requiredfields_label' ) ) ) );
  
  		$hui_form = new HuiForm( 'editsiteform', array( 'action' => $form_events_call->GetEventsCallString() ) );

Update of /cvsroot/ampoliros/ampoliros/www/cgi
In directory sc8-pr-cvs1:/tmp/cvs-serv837/www/cgi

Modified Files:
	hui.js 
Log Message:
Added the possibility to check string and text widget values before sending
a form. (robywan)
Updated the sites.php root page using the new form elements check feature.
(robywan)


Index: hui.js
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/www/cgi/hui.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** hui.js	28 Aug 2002 17:25:53 -0000	1.3
--- hui.js	23 May 2003 15:02:33 -0000	1.4
***************
*** 1,5 ****
! function submitForm( form, action )
  {
! 	eval( "document." + form + ".action = '" + action + "'" )
! 	eval( "document." + form + ".submit()" )
  }
--- 1,103 ----
! var requiredFields = new Array();
! 
! function huiCheckEmpty( s )
  {
!     return ( (s == null ) || ( s.length == 0 ) );
! }
! 
! function huiCheckInteger( s )
! {
!     for ( var i = 0; i < s.length; i++ )
!     {
!         var c = s.charAt(i);
! 
!         if (!((c >= "0") && (c <= "9"))) return false;
!     }
! 
!     return true;
! }
! 
! function huiCheckEmail( s )
! {
!     var i = 1;
!     var sLength = s.length;
! 
!     if ( huiCheckEmpty( s ) ) return true;
! 
!     while ((i < sLength) && (s.charAt(i) != "@"))
!     { i++
!     }
! 
!     if ((i >= sLength) || (s.charAt(i) != "@")) return false;
!     else i += 2;
! 
!     while ((i < sLength) && (s.charAt(i) != "."))
!     { i++
!     }
! 
!     if ((i >= sLength - 1) || (s.charAt(i) != ".")) return false;
!     else return true;
! }
! 
! function submitForm( formName, action, formNotValidMessage )
! {
!     eval( "var form = document." + formName );
!     var validForm = true;
!     var validField;
!     formNotValidMessage += "\n";
! 
!     for ( var i = 0; i < form.elements.length; i++ )
!     {
!         for ( var j = 0; j < requiredFields.length; j++ )
!         {
!             if ( form.elements[i].name == requiredFields[j][0] )
!             {
!                 var field = form.elements[i];
!                 validField = true;
! 
!                 for ( var y = 2; y < requiredFields[j].length; y++ )
!                 {
!                     if ( requiredFields[j][y] == "required" )
!                     {
!                         if ( huiCheckEmpty( field.value ) == true )
!                         {
!                             validField = false;
!                         }
!                     }
! 
!                     if ( requiredFields[j][y] == "integer" )
!                     {
!                         if ( huiCheckInteger( field.value ) == false )
!                         {
!                             validField = false;
!                         }
!                     }
!                     
!                     if ( requiredFields[j][y] == "email" )
!                     {
!                         if ( huiCheckEmail( field.value ) == false )
!                         {
!                             validField = false;
!                         }
!                     }
!                 }
! 
!                 if ( validField == false )
!                 {
!                     validForm = false;
!                     formNotValidMessage += "- " + requiredFields[j][1] + "\n";
!                 }
!             }
!         }
!     }
! 
!     if ( validForm == true )
!     {
!         form.action = action;
!         form.submit();
!     }
!     else
!     {
!         alert( formNotValidMessage );
!     }
  }

Update of /cvsroot/ampoliros/ampoliros/var/locale
In directory sc8-pr-cvs1:/tmp/cvs-serv837/var/locale

Modified Files:
	amp_root_sites.catalog amp_root_sites_it.catalog 
Log Message:
Added the possibility to check string and text widget values before sending
a form. (robywan)
Updated the sites.php root page using the new form elements check feature.
(robywan)


Index: amp_root_sites.catalog
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/var/locale/amp_root_sites.catalog,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** amp_root_sites.catalog	28 Nov 2002 16:50:24 -0000	1.4
--- amp_root_sites.catalog	23 May 2003 15:02:32 -0000	1.5
***************
*** 75,78 ****
--- 75,86 ----
  disunmetdeps_status				= Unmet dependencies:
  
+ # main_newsite
+ 
+ newsite_formcheck.message       = Some fields have wrong data:
+ 
+ # main_editsite
+ 
+ editsite_formcheck.message       = Some fields have wrong data:
+ 
  # main_removesite
  

Index: amp_root_sites_it.catalog
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/var/locale/amp_root_sites_it.catalog,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** amp_root_sites_it.catalog	28 Nov 2002 16:50:25 -0000	1.4
--- amp_root_sites_it.catalog	23 May 2003 15:02:32 -0000	1.5
***************
*** 75,78 ****
--- 75,86 ----
  disunmetdeps_status				= Dipendenze non soddisfatte:
  
+ # main_newsite
+ 
+ newsite_formcheck.message       = Alcuni campi contengono dati errati:
+ 
+ # main_editsite
+ 
+ editsite_formcheck.message       = Alcuni campi contengono dati errati:
+ 
  # main_removesite
  

Update of /cvsroot/ampoliros/ampoliros/var/handlers
In directory sc8-pr-cvs1:/tmp/cvs-serv837/var/handlers

Modified Files:
	button.hui string.hui text.hui 
Log Message:
Added the possibility to check string and text widget values before sending
a form. (robywan)
Updated the sites.php root page using the new form elements check feature.
(robywan)


Index: button.hui
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/var/handlers/button.hui,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** button.hui	8 May 2003 15:56:04 -0000	1.8
--- button.hui	23 May 2003 15:02:31 -0000	1.9
***************
*** 76,79 ****
--- 76,80 ----
          if ( isset( $this->mArgs['needconfirm'] ) ) $this->mNeedConfirm = $this->mArgs['needconfirm'];
          if ( isset( $this->mArgs['confirmmessage'] ) ) $this->mConfirmMessage = addslashes( $this->mArgs['confirmmessage'] );
+         if ( isset( $this->mArgs['formcheckmessage'] ) ) $this->mFormCheckMessage = $this->mArgs['formcheckmessage'];
  
          if ( isset( $this->mArgs['disabled'] ) and
***************
*** 128,132 ****
              '<table border="0"><tr valign="middle"><td class="normalsmall" align="center" '.( $this->mNoWrap == 'true' ? 'nowrap style="white-space: nowrap" ' : '' ).' valign="middle"><center>'.
              ( $this->mDisabled == 'true' ? '' :
!               ( strlen( $this->mFormSubmit ) ? '<a href="javascript:void(submitForm(\''.$this->mFormSubmit.'\',\''.$this->mAction.'\'))"' : '<a href="'.$this->mAction.'"' ).
                ( $this->mNeedConfirm == 'true' ? ' onClick="return confirm(\''.$this->mConfirmMessage.'\')"' : '' ).
                //( strlen( $this->mHint ) ? ' onMouseOver="showHelpPopup(\''.$this->mHint.'\'); " onMouseOut="hideHelpPopup();"' : '' ).
--- 129,133 ----
              '<table border="0"><tr valign="middle"><td class="normalsmall" align="center" '.( $this->mNoWrap == 'true' ? 'nowrap style="white-space: nowrap" ' : '' ).' valign="middle"><center>'.
              ( $this->mDisabled == 'true' ? '' :
!               ( strlen( $this->mFormSubmit ) ? '<a href="javascript:void(submitForm(\''.$this->mFormSubmit.'\',\''.$this->mAction.'\',\''.$this->mFormCheckMessage.'\'))"' : '<a href="'.$this->mAction.'"' ).
                ( $this->mNeedConfirm == 'true' ? ' onClick="return confirm(\''.$this->mConfirmMessage.'\')"' : '' ).
                //( strlen( $this->mHint ) ? ' onMouseOver="showHelpPopup(\''.$this->mHint.'\'); " onMouseOut="hideHelpPopup();"' : '' ).
***************
*** 136,140 ****
                ( strlen( $this->mHint ) ? ' alt="'.$this->mHint.'"' : 'alt=""' ).'>'.
                ( $this->mHoriz == 'true' ? '</a></center></td><td class="normalsmall" align="center" '.( $this->mNoWrap == 'true' ? 'nowrap style="white-space: nowrap"' : '' ).' valign="middle"><center>'.
!                 ( strlen( $this->mFormSubmit ) ? '<a href="javascript:submitForm(\''.$this->mFormSubmit.'\',\''.$this->mAction.'\')"' : '<a href="'.$this->mAction.'"' ).
                  ( $this->mNeedConfirm == 'true' ? ' onclick="return confirm(\''.$this->mConfirmMessage.'\')"' : '' ).
                  //( strlen( $this->mHint ) ? ' onMouseOver="showHelpPopup(\''.$this->mHint.'\'); " onMouseOut="hideHelpPopup();"' : '' ).
--- 137,141 ----
                ( strlen( $this->mHint ) ? ' alt="'.$this->mHint.'"' : 'alt=""' ).'>'.
                ( $this->mHoriz == 'true' ? '</a></center></td><td class="normalsmall" align="center" '.( $this->mNoWrap == 'true' ? 'nowrap style="white-space: nowrap"' : '' ).' valign="middle"><center>'.
!                 ( strlen( $this->mFormSubmit ) ? '<a href="javascript:submitForm(\''.$this->mFormSubmit.'\',\''.$this->mAction.'\',\''.$this->mFormCheckMessage.'\')"' : '<a href="'.$this->mAction.'"' ).
                  ( $this->mNeedConfirm == 'true' ? ' onclick="return confirm(\''.$this->mConfirmMessage.'\')"' : '' ).
                  //( strlen( $this->mHint ) ? ' onMouseOver="showHelpPopup(\''.$this->mHint.'\'); " onMouseOut="hideHelpPopup();"' : '' ).

Index: string.hui
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/var/handlers/string.hui,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** string.hui	21 Dec 2002 11:06:58 -0000	1.5
--- string.hui	23 May 2003 15:02:31 -0000	1.6
***************
*** 50,53 ****
--- 50,61 ----
      /*! @var mReadOnly boolean - Set to 'true' if this is a read only string. */
      var $mReadOnly;
+     /*! @var mRequired boolean - Set to 'true' if the value of the widget cannot be empty. */
+     var $mRequired;
+     /*! @var mInteger boolean - Set to 'true' if the value of the widget must be an integer. */
+     var $mInteger;
+     /*! @var mEmail boolean - Set to 'true' if the value of the widget must be an e-mail address. */
+     var $mEmail;
+     /*! @var mCheckMessage string - Verbal description of the checks. */
+     var $mCheckMessage;
      /*! @var mSize integer - Width in characters of the widget. */
      var $mSize;
***************
*** 66,69 ****
--- 74,81 ----
          if ( isset( $this->mArgs['password'] ) ) $this->mPassword = $this->mArgs['password'];
          if ( isset( $this->mArgs['readonly'] ) ) $this->mReadOnly = $this->mArgs['readonly'];
+         if ( isset( $this->mArgs['required'] ) ) $this->mRequired = $this->mArgs['required'];
+         if ( isset( $this->mArgs['integer'] ) ) $this->mInteger = $this->mArgs['integer'];
+         if ( isset( $this->mArgs['email'] ) ) $this->mEmail = $this->mArgs['email'];
+         if ( isset( $this->mArgs['checkmessage'] ) ) $this->mCheckMessage = $this->mArgs['checkmessage'];
          if ( isset( $this->mArgs['size'] ) ) $this->mSize = $this->mArgs['size'];
          if ( isset( $this->mArgs['maxlength'] ) ) $this->mMaxLength = $this->mArgs['maxlength'];
***************
*** 79,82 ****
--- 91,112 ----
          $event_data = new HuiEventRawData( $this->mDisp, $this->mName );
  
+         if (
+             ( $this->mRequired == 'true' ) ||
+             ( $this->mInteger == 'true' ) ||
+             ( $this->mEmail == 'true' )
+             )
+         {
+             $check_script = '
+ <script language="JavaScript" type="text/javascript">
+ <!--
+ requiredFields[requiredFields.length] = new Array( "'.$event_data->GetDataString().'", "'.$this->mCheckMessage.'"'.
+             ( $this->mRequired == 'true' ? ', "required"' : '' ).
+             ( $this->mInteger == 'true' ? ', "integer"' : '' ).
+             ( $this->mEmail == 'true' ? ', "email"' : '' ).
+             ' );
+ -->
+ </script>';
+         }
+ 
          $this->mLayout = ( $this->mComments ? '<!-- begin '.$this->mName.' string -->' : '' ).'<input type="'.( $this->mPassword == 'true' ? 'password' : 'text' ).'" name="'.$event_data->GetDataString().'"'.
              ' tabindex="'.$this->mTabIndex.'"'.
***************
*** 87,91 ****
              ( strlen( $this->mMaxLength ) ? ' maxlength="'.$this->mMaxLength.'"' : '' ).
              ( strlen( $this->mReadOnly ) ? ' readonly' : '' ).
!             '>'.( $this->mComments ? '<!-- end '.$this->mName." string -->\n" : '' );
          $result = true;
  
--- 117,122 ----
              ( strlen( $this->mMaxLength ) ? ' maxlength="'.$this->mMaxLength.'"' : '' ).
              ( strlen( $this->mReadOnly ) ? ' readonly' : '' ).
!             '>'.( strlen( $check_script ) ? $check_script : '' ).
!             ( $this->mComments ? '<!-- end '.$this->mName." string -->\n" : '' );
          $result = true;
  

Index: text.hui
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/var/handlers/text.hui,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** text.hui	21 Dec 2002 11:06:58 -0000	1.5
--- text.hui	23 May 2003 15:02:31 -0000	1.6
***************
*** 47,50 ****
--- 47,58 ----
      var $mCols;
      var $mReadOnly;
+     /*! @var mRequired boolean - Set to 'true' if the value of the widget cannot be empty. */
+     var $mRequired;
+     /*! @var mInteger boolean - Set to 'true' if the value of the widget must be an integer. */
+     var $mInteger;
+     /*! @var mEmail boolean - Set to 'true' if the value of the widget must be an e-mail address. */
+     var $mEmail;
+     /*! @var mCheckMessage string - Verbal description of the checks. */
+     var $mCheckMessage;
      var $mBgColor;
      /*! @var mTabIndex integer - Position of the current element in the tabbing order. */
***************
*** 60,63 ****
--- 68,75 ----
          if ( isset( $this->mArgs['cols'] ) ) $this->mCols     = $this->mArgs['cols'];
          if ( isset( $this->mArgs['readonly'] ) ) $this->mReadOnly = $this->mArgs['readonly'];
+         if ( isset( $this->mArgs['required'] ) ) $this->mRequired = $this->mArgs['required'];
+         if ( isset( $this->mArgs['integer'] ) ) $this->mInteger = $this->mArgs['integer'];
+         if ( isset( $this->mArgs['email'] ) ) $this->mEmail = $this->mArgs['email'];
+         if ( isset( $this->mArgs['checkmessage'] ) ) $this->mCheckMessage = $this->mArgs['checkmessage'];
          if ( isset( $this->mArgs['tabindex'] ) ) $this->mTabIndex = $this->mArgs['tabindex'];
  
***************
*** 72,75 ****
--- 84,105 ----
          $event_data = new HuiEventRawData( $this->mDisp, $this->mName );
  
+         if (
+             ( $this->mRequired == 'true' ) ||
+             ( $this->mInteger == 'true' ) ||
+             ( $this->mEmail == 'true' )
+             )
+         {
+             $check_script = '
+ <script language="JavaScript" type="text/javascript">
+ <!--
+ requiredFields[requiredFields.length] = new Array( "'.$event_data->GetDataString().'", "'.$this->mCheckMessage.'"'.
+             ( $this->mRequired == 'true' ? ', "required"' : '' ).
+             ( $this->mInteger == 'true' ? ', "integer"' : '' ).
+             ( $this->mEmail == 'true' ? ', "email"' : '' ).
+             ' );
+ -->
+ </script>';
+         }
+ 
          $this->mLayout = ( $this->mComments ? '<!-- begin '.$this->mName.
                            ' textarea -->' : '' ).'<textarea name="'.$event_data->GetDataString().'"'.
***************
*** 80,84 ****
              ( strlen( $this->mReadOnly ) ? ' readonly' : '' ).'>'.
              ( strlen( $this->mValue ) ? htmlentities( $this->mValue ) : '' ).
!             '</textarea>'.( $this->mComments ? '<!-- end '.$this->mName." textarea -->\n" : '' );
  
          $result = true;
--- 110,115 ----
              ( strlen( $this->mReadOnly ) ? ' readonly' : '' ).'>'.
              ( strlen( $this->mValue ) ? htmlentities( $this->mValue ) : '' ).
!             '</textarea>'.( strlen( $check_script ) ? $check_script : '' ).
!             ( $this->mComments ? '<!-- end '.$this->mName." textarea -->\n" : '' );
  
          $result = true;

Update of /cvsroot/ampoliros/ampoliros/var/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv4305/var/lib

Modified Files:
	semaphores.library 
Added Files:
	clipboard.library 
Log Message:
NEW FEATURES:
- Added clipboard feature (clipboard.library). (wuh)


--- NEW FILE: clipboard.library ---
<?php
/*
 *
 *                 Ampoliros Web Applications Platform
 *
 *                      http://www.ampoliros.com
 *
 *
 *
 *   Copyright (C) 2000-2003 Solarix
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
 *   This program is distributed in the hope that it will be useful,
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *   GNU General Public License for more details.
 *
 *   You should have received a copy of the GNU General Public License
 *   along with this program; if not, write to the Free Software
 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 */

if ( defined( 'CLIPBOARD_LIBRARY' ) ) return;
else define( 'CLIPBOARD_LIBRARY', true );

define( 'AMPOLIROS_CLIPBOARD_TYPE_TEXT', 'text' );
define( 'AMPOLIROS_CLIPBOARD_TYPE_TEXT', 'raw' );
define( 'AMPOLIROS_CLIPBOARD_TYPE_FILE', 'file' );
define( 'AMPOLIROS_CLIPBOARD_TYPE_ARRAY', 'array' );
define( 'AMPOLIROS_CLIPBOARD_TYPE_OBJECT', 'object' );
define( 'AMPOLIROS_CLIPBOARD_TYPE_CUSTOM', 'custom' );

class Clipboard
{
    var $mType;
    var $mCustomType;
    var $mUnit;
    var $mModule;
    var $mSite;
    var $mUser;

    var $mFileName;

    function Clipboard(
        $type,
        $customType = '',
        $unit = 0,
        $module = '',
        $site = '',
        $user = ''
        )
    {
        OpenLibrary( 'semaphores.library' );

        $this->mType = $type;
        if ( $this->mType == AMPOLIROS_CLIPBOARD_TYPE_CUSTOM )
        {
            $this->mCustomType = $customType;
        }
        $this->mUnit = $unit;
        $this->mModule = $module;
        $this->mSite = $site;
        $this->mUser = $user;

        $this->mFileName = TMP_PATH.'clipboard/'.
            $this->mType.'_'.
            $this->mCustomType.'_'.
            $this->mUnit.'_'.
            $this->mModule.'_'.
            $this->mSite.'_'.
            $this->mUser.'.clipboard';
    }

    function IsValid()
    {
        clearstatcache();

        return file_exists( $this->mFileName );
    }

    function Store(
        $item
        )
    {
        $result = false;

        $sem = new Semaphore( 'clipboard', $this->mFileName );
        $sem->WaitGreen();

        $sem->SetRed();

        if ( $fh = fopen( $this->mFileName, 'wb' ) )
        {
            switch ( $this->mType )
            {
            case AMPOLIROS_CLIPBOARD_TYPE_TEXT:
            case AMPOLIROS_CLIPBOARD_TYPE_RAW:
                fwrite( $fh, $item );
                break;

            case AMPOLIROS_CLIPBOARD_TYPE_FILE:
                fwrite( $fh, serialize( array( 'filename' => $item, 'content' => $item ) ) );
                break;

            case AMPOLIROS_CLIPBOARD_TYPE_OBJECT:
            case AMPOLIROS_CLIPBOARD_TYPE_ARRAY:
            case AMPOLIROS_CLIPBOARD_TYPE_CUSTOM:
                fwrite( $fh, serialize( $item ) );
                break;
            }

            fclose( $fh );

            $sem->SetGreen();
        }

        return $result;
    }

    function Retrieve()
    {
        $result = '';

        $sem = new Semaphore( 'clipboard', $this->mFileName );
        $sem->WaitGreen();

        if ( $this->IsValid() )
        {
            $sem->SetRed();

            if ( $fh = fopen( $this->mFileName, 'rb' ) )
            {
                switch ( $this->mType )
                {
                case AMPOLIROS_CLIPBOARD_TYPE_TEXT:
                case AMPOLIROS_CLIPBOARD_TYPE_RAW:
                    $result = fread( $fh, filesize( $this->mFileName ) );
                    break;

                case AMPOLIROS_CLIPBOARD_TYPE_FILE:
                case AMPOLIROS_CLIPBOARD_TYPE_OBJECT:
                case AMPOLIROS_CLIPBOARD_TYPE_ARRAY:
                case AMPOLIROS_CLIPBOARD_TYPE_CUSTOM:
                    $result = unserialize( fread( $fh, filesize( $this->mFileName ) ) );
                    break;
                }

                $sem->SetGreen();
            }
        }

        return $result;
    }

    function Erase()
    {
        $result = false;

        if ( $this->IsValid() )
        {
            $sem = new Semaphore( 'clipboard', $this->mFileName );
            $sem->WaitGreen();

            $sem->SetRed();

            $result = unlink( $this->mFileName );

            $sem->SetGreen();
        }
        else $result = true;

        return $result;
    }
}

?>
Index: semaphores.library
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/var/lib/semaphores.library,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** semaphores.library	19 May 2003 14:36:25 -0000	1.1
--- semaphores.library	19 May 2003 16:27:46 -0000	1.2
***************
*** 32,49 ****
  define( 'AMPOLIROS_SEMAPHORE_STATUS_RED', 'red' );
  
- define( 'AMPOLIROS_SEMAPHORE_RESOURCE_TYPE_FILE', 'file' );
- define( 'AMPOLIROS_SEMAPHORE_RESOURCE_TYPE_MISC', 'misc' );
- 
  class Semaphore
  {
      var $mResource;
  
      function Semaphore(
          $resource
          )
      {
          $this->mResource = $resource;
      }
  
      function SetResource(
          $resource
--- 32,61 ----
  define( 'AMPOLIROS_SEMAPHORE_STATUS_RED', 'red' );
  
  class Semaphore
  {
+     var $mResourceType;
      var $mResource;
  
      function Semaphore(
+         $resourceType,
          $resource
          )
      {
+         $this->mResourceType = $resourceType;
          $this->mResource = $resource;
      }
  
+     function SetResourceType(
+         $resourceType
+         )
+     {
+         $this->mResourceType = $resourceType;
+     }
+ 
+     function GetResourceType()
+     {
+         return $this->mResourceType;
+     }
+ 
      function SetResource(
          $resource
***************
*** 58,61 ****
--- 70,85 ----
      }
  
+     function GetFileName()
+     {
+         $result = '';
+ 
+         if ( $this->mResourceType and $this->mResource )
+         {
+             $result = TMP_PATH.'semaphores/'.md5( $this->mResourceType.'_'.$this->mResource ).'.semaphore';
+         }
+ 
+         return $result;
+     }
+ 
      function CheckStatus()
      {
***************
*** 66,70 ****
              clearstatcache();
  
!             if ( file_exists( TMP_PATH.'semaphores/'.md5( $this->mResource ).'.semaphore' ) )
                  $result = AMPOLIROS_SEMAPHORE_STATUS_RED;
          }
--- 90,94 ----
              clearstatcache();
  
!             if ( file_exists( $this->GetFileName() ) )
                  $result = AMPOLIROS_SEMAPHORE_STATUS_RED;
          }
***************
*** 86,91 ****
                  clearstatcache();
  
!                 if ( file_exists( TMP_PATH.'semaphores' ) )
!                     unlink( TMP_PATH.'semaphores/'.md5( $this->mResource ).'.semaphore' );
  
                  $result = true;
--- 110,115 ----
                  clearstatcache();
  
!                 if ( file_exists( $this->GetFileName() ) )
!                     unlink( $this->GetFileName() );
  
                  $result = true;
***************
*** 98,104 ****
                  clearstatcache();
  
!                 if ( !file_exists( TMP_PATH.'semaphores/'.md5( $this->mResource ).'.semaphore' ) )
                  {
!                     if ( $fh = fopen( TMP_PATH.'semaphores/'.md5( $this->mResource ).'.semaphore', 'w' ) )
                      {
                          fputs( $fh, serialize(
--- 122,128 ----
                  clearstatcache();
  
!                 if ( !file_exists( $this->GetFileName() ) )
                  {
!                     if ( $fh = fopen( $this->GetFileName(), 'w' ) )
                      {
                          fputs( $fh, serialize(
***************
*** 120,123 ****
--- 144,157 ----
      }
  
+     function SetGreen()
+     {
+         $this->SetStatus( AMPOLIROS_SEMAPHORE_STATUS_GREEN );
+     }
+ 
+     function SetRed()
+     {
+         $this->SetStatus( AMPOLIROS_SEMAPHORE_STATUS_RED );
+     }
+ 
      function GetSemaphoreData()
      {
***************
*** 129,138 ****
              $this->mResource
              and
!             file_exists( TMP_PATH.'semaphores/'.md5( $this->mResource ).'.semaphore' )
              )
          {
!             if ( $fh = fopen( TMP_PATH.'semaphores/'.md5( $this->mResource ).'.semaphore', 'r' ) )
              {
!                 $content = fread( $fh, filesize( TMP_PATH.'semaphores/'.md5( $this->mResource ).'.semaphore' ) );
  
                  $result = unserialize( $content );
--- 163,172 ----
              $this->mResource
              and
!             file_exists( $this->GetFileName() )
              )
          {
!             if ( $fh = fopen( $this->GetFileName(), 'r' ) )
              {
!                 $content = fread( $fh, filesize( $this->GetFileName() ) );
  
                  $result = unserialize( $content );
***************
*** 169,173 ****
                      $maxDelay
                      and
!                     time > $start + $maxDelay
                      ) return false;
  
--- 203,207 ----
                      $maxDelay
                      and
!                     time() > $start + $maxDelay
                      ) return false;
  

Update of /cvsroot/ampoliros/ampoliros
In directory sc8-pr-cvs1:/tmp/cvs-serv4305

Modified Files:
	CHANGES TODO 
Log Message:
NEW FEATURES:
- Added clipboard feature (clipboard.library). (wuh)


Index: CHANGES
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/CHANGES,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** CHANGES	19 May 2003 14:36:24 -0000	1.87
--- CHANGES	19 May 2003 16:27:45 -0000	1.88
***************
*** 16,22 ****
  - Added IFrame Hui widget. (wuh)
  - Added "refresh" option to page Hui widget. (wuh)
- - Added AmpolirosSecurityHandler::GetLoggedSessions() (security.library)
-   method. (wuh)
  - Added semaphores feature (semaphores.library). (wuh)
  
  CHANGES:
--- 16,21 ----
  - Added IFrame Hui widget. (wuh)
  - Added "refresh" option to page Hui widget. (wuh)
  - Added semaphores feature (semaphores.library). (wuh)
+ - Added clipboard feature (clipboard.library). (wuh)
  
  CHANGES:
***************
*** 28,31 ****
--- 27,32 ----
  
  SECURITY:
+ - Added AmpolirosSecurityHandler::GetLoggedSessions() (security.library)
+   method. (wuh)
  - Added logged root and users sessions list in security administration
    (security.php). (wuh)

Index: TODO
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/TODO,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** TODO	19 May 2003 14:36:24 -0000	1.47
--- TODO	19 May 2003 16:27:45 -0000	1.48
***************
*** 38,42 ****
  Major features
  
- - Clipboard.
  - "provider" dependencies.
  - Namespace definition.
--- 38,41 ----
***************
*** 52,60 ****
  - "notnull" flag for Hui form widgets with js validation.
  - Calendar Hui widget.
  - Table of all sites with the list of the enabled modules.
  - Add enable/disable all modules from site modules administration.
  - Handling of Ampoliros admin urls with a given port.
- - Javascript popup based lookup for Hui widgets like HuiDate.
- - Widget hints.
  - System generated messages to root (like important changes between releases).
  - Modules hooks list.
--- 51,59 ----
  - "notnull" flag for Hui form widgets with js validation.
  - Calendar Hui widget.
+ - Javascript popup based lookup for Hui widgets like HuiDate.
+ - Widget hints.
  - Table of all sites with the list of the enabled modules.
  - Add enable/disable all modules from site modules administration.
  - Handling of Ampoliros admin urls with a given port.
  - System generated messages to root (like important changes between releases).
  - Modules hooks list.
***************
*** 66,69 ****
--- 65,70 ----
  - Scheduled maintenance: check of Ampoliros and modules requirements
    (PHP, extensions, etc)
+ - Scheduled maintenance: removal of old semaphores.
+ - Scheduled maintenance: clean clipboard.
  
  Security features

Update of /cvsroot/ampoliros/ampoliros/www/root
In directory sc8-pr-cvs1:/tmp/cvs-serv4779/www/root

Modified Files:
	security.php 
Log Message:
SECURITY:
- Added logged root and users sessions list in security administration
  (security.php). (wuh)

NEW FEATURES:
- Added semaphores feature (semaphores.library). (wuh)


Index: security.php
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/www/root/security.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** security.php	17 Feb 2003 10:33:26 -0000	1.6
--- security.php	19 May 2003 14:36:25 -0000	1.7
***************
*** 212,220 ****
      //$tabs[0]['label'] = $gLocale->GetStr( 'currentactivities.tab' );
      $tabs[0]['label'] = $gLocale->GetStr( 'accesslog.tab' );
!     $tabs[1]['label'] = $gLocale->GetStr( 'securitycheck.tab' );
  
      $amp_security = new AmpolirosSecurityHandler();
      $security_check = $amp_security->SecurityCheck();
  
      $tmp_key = array_search( '', $security_check['unsecurewebservicesaccounts'] );
      if ( strlen( $tmp_key ) ) $security_check['unsecurewebservicesaccounts'][$tmp_key] = 'Anonymous';
--- 212,240 ----
      //$tabs[0]['label'] = $gLocale->GetStr( 'currentactivities.tab' );
      $tabs[0]['label'] = $gLocale->GetStr( 'accesslog.tab' );
!     $tabs[1]['label'] = $gLocale->GetStr( 'loggedusers.tab' );
!     $tabs[2]['label'] = $gLocale->GetStr( 'securitycheck.tab' );
  
      $amp_security = new AmpolirosSecurityHandler();
      $security_check = $amp_security->SecurityCheck();
  
+     $logged_users = $amp_security->GetLoggedSessions();
+ 
+     $root_sessions = $users_sessions = array();
+ 
+     foreach ( $logged_users['root'] as $root_session )
+     {
+         $root_sessions[$root_session] = $root_session;
+     }
+ 
+     foreach ( $logged_users['sites'] as $user => $sessions )
+     {
+         $users_sessions[$user] = $user;
+ 
+         foreach ( $sessions as $session )
+         {
+             $users_sessions[$user.'-'.$session] = '- '.$session;
+         }
+     }
+ 
      $tmp_key = array_search( '', $security_check['unsecurewebservicesaccounts'] );
      if ( strlen( $tmp_key ) ) $security_check['unsecurewebservicesaccounts'][$tmp_key] = 'Anonymous';
***************
*** 274,277 ****
--- 294,333 ----
  
        </children>
+     </vertgroup>
+ 
+     <vertgroup>
+       <children>
+ 
+         <label>
+           <args>
+             <label type="encoded">'.urlencode( $gLocale->GetStr( 'root_sessions.label' ) ).'</label>
+             <bold>true</bold>
+           </args>
+         </label>
+ 
+         <listbox><name>rootsessions</name>
+           <args>
+             <size>5</size>
+             <elements type="array">'.huixml_encode( $root_sessions ).'</elements>
+           </args>
+         </listbox>';
+ 
+     $gXml_def .=
+ '        <label>
+           <args>
+             <label type="encoded">'.urlencode( $gLocale->GetStr( 'users_sessions.label' ) ).'</label>
+             <bold>true</bold>
+           </args>
+         </label>
+ 
+         <listbox><name>userssessions</name>
+           <args>
+             <size>15</size>
+             <elements type="array">'.huixml_encode( $users_sessions ).'</elements>
+           </args>
+         </listbox>';
+ 
+     $gXml_def .=
+ '      </children>
      </vertgroup>
  

Update of /cvsroot/ampoliros/ampoliros
In directory sc8-pr-cvs1:/tmp/cvs-serv4779

Modified Files:
	TODO CHANGES 
Log Message:
SECURITY:
- Added logged root and users sessions list in security administration
  (security.php). (wuh)

NEW FEATURES:
- Added semaphores feature (semaphores.library). (wuh)


Index: TODO
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/TODO,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** TODO	19 May 2003 12:24:33 -0000	1.46
--- TODO	19 May 2003 14:36:24 -0000	1.47
***************
*** 42,46 ****
  - Namespace definition.
  - Access lists for single items.
- - Semaphores
  - Ampoliros network
  
--- 42,45 ----
***************
*** 75,81 ****
  - Wrong root and user logins on reports.
  - Disable root cron security setting.
! - Current activity and users.
  - IP based access lists for root administration area.
- - Sessions tracking.
  - Forced logout.
  - Only https access flag.
--- 74,79 ----
  - Wrong root and user logins on reports.
  - Disable root cron security setting.
! - Current activity.
  - IP based access lists for root administration area.
  - Forced logout.
  - Only https access flag.

Index: CHANGES
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/CHANGES,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** CHANGES	19 May 2003 12:24:33 -0000	1.86
--- CHANGES	19 May 2003 14:36:24 -0000	1.87
***************
*** 16,19 ****
--- 16,22 ----
  - Added IFrame Hui widget. (wuh)
  - Added "refresh" option to page Hui widget. (wuh)
+ - Added AmpolirosSecurityHandler::GetLoggedSessions() (security.library)
+   method. (wuh)
+ - Added semaphores feature (semaphores.library). (wuh)
  
  CHANGES:
***************
*** 24,27 ****
--- 27,33 ----
  FIXES:
  
+ SECURITY:
+ - Added logged root and users sessions list in security administration
+   (security.php). (wuh)
  
  

Update of /cvsroot/ampoliros/ampoliros/var/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv4779/var/lib

Modified Files:
	security.library 
Added Files:
	semaphores.library 
Log Message:
SECURITY:
- Added logged root and users sessions list in security administration
  (security.php). (wuh)

NEW FEATURES:
- Added semaphores feature (semaphores.library). (wuh)


--- NEW FILE: semaphores.library ---
<?php
/*
 *
 *                 Ampoliros Web Applications Platform
 *
 *                      http://www.ampoliros.com
 *
 *
 *
 *   Copyright (C) 2000-2003 Solarix
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
 *   This program is distributed in the hope that it will be useful,
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *   GNU General Public License for more details.
 *
 *   You should have received a copy of the GNU General Public License
 *   along with this program; if not, write to the Free Software
 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 */

if ( defined( 'SEMAPHORES_LIBRARY' ) ) return;
else define( 'SEMAPHORES_LIBRARY' );

define( 'AMPOLIROS_SEMAPHORE_STATUS_GREEN', 'green' );
define( 'AMPOLIROS_SEMAPHORE_STATUS_RED', 'red' );

define( 'AMPOLIROS_SEMAPHORE_RESOURCE_TYPE_FILE', 'file' );
define( 'AMPOLIROS_SEMAPHORE_RESOURCE_TYPE_MISC', 'misc' );

class Semaphore
{
    var $mResource;

    function Semaphore(
        $resource
        )
    {
        $this->mResource = $resource;
    }

    function SetResource(
        $resource
        )
    {
        $this->mResource = $resource;
    }

    function GetResource()
    {
        return $this->mResource;
    }

    function CheckStatus()
    {
        $result = AMPOLIROS_SEMAPHORE_STATUS_GREEN;

        if ( $this->mResource )
        {
            clearstatcache();

            if ( file_exists( TMP_PATH.'semaphores/'.md5( $this->mResource ).'.semaphore' ) )
                $result = AMPOLIROS_SEMAPHORE_STATUS_RED;
        }

        return $result;
    }

    function SetStatus(
        $status
        )
    {
        $result = false;

        if ( $this->mResource )
        {
            switch ( $status )
            {
            case AMPOLIROS_SEMAPHORE_STATUS_GREEN:
                clearstatcache();

                if ( file_exists( TMP_PATH.'semaphores' ) )
                    unlink( TMP_PATH.'semaphores/'.md5( $this->mResource ).'.semaphore' );

                $result = true;

                break;

            case AMPOLIROS_SEMAPHORE_STATUS_RED:
                $result = true;

                clearstatcache();

                if ( !file_exists( TMP_PATH.'semaphores/'.md5( $this->mResource ).'.semaphore' ) )
                {
                    if ( $fh = fopen( TMP_PATH.'semaphores/'.md5( $this->mResource ).'.semaphore', 'w' ) )
                    {
                        fputs( $fh, serialize(
                            array(
                                'pid' => $GLOBALS['gEnv']['runtime']['pid'],
                                'time' => time(),
                                'resource' => $this->mResource
                                )
                            ) );
                        fclose( $fh );
                    }
                    else $result = false;
                }
                break;
            }
        }

        return $result;
    }

    function GetSemaphoreData()
    {
        $result = array();

        clearstatcache();

        if (
            $this->mResource
            and
            file_exists( TMP_PATH.'semaphores/'.md5( $this->mResource ).'.semaphore' )
            )
        {
            if ( $fh = fopen( TMP_PATH.'semaphores/'.md5( $this->mResource ).'.semaphore', 'r' ) )
            {
                $content = fread( $fh, filesize( TMP_PATH.'semaphores/'.md5( $this->mResource ).'.semaphore' ) );

                $result = unserialize( $content );

                fclose( $fh );
            }
        }

        return $result;
    }

    function WaitGreen(
        $checkDelay = 1,
        $maxDelay = 0
        )
    {
        $result = false;

        if ( $this->mResource )
        {
            if ( $maxDelay ) $start = time();

            $result = true;

            while ( !( $this->CheckStatus() == AMPOLIROS_SEMAPHORE_STATUS_GREEN ) )
            {
                /*
                If delay exceeds the optional maximum, the function returns false and
                the user code should not execute the code that should be executed when
                the semaphore is green.
                */

                if (
                    $maxDelay
                    and
                    time > $start + $maxDelay
                    ) return false;

                sleep( $checkDelay );
            }
        }

        return $result;
    }
}

?>
Index: security.library
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/var/lib/security.library,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** security.library	1 Apr 2003 16:05:36 -0000	1.8
--- security.library	19 May 2003 14:36:25 -0000	1.9
***************
*** 647,651 ****
          $result = true;
  
!         $fh = @fopen( 
              CONFIG_PATH.'amprootpwd.cfg', 
              'r'
--- 647,651 ----
          $result = true;
  
!         $fh = @fopen(
              CONFIG_PATH.'amprootpwd.cfg', 
              'r'
***************
*** 714,720 ****
      /*!
      @function GetRegisterGlobalsSetting
!     
      @abstract Gets the PHP register_globals ini setting.
!     
      @result True if set to on, false if set to off.
      */
--- 714,720 ----
      /*!
      @function GetRegisterGlobalsSetting
! 
      @abstract Gets the PHP register_globals ini setting.
! 
      @result True if set to on, false if set to off.
      */
***************
*** 723,726 ****
--- 723,790 ----
          if ( ini_get( 'register_globals' ) ) return true;
          else return false;
+     }
+ 
+     /*!
+     @function GetLoggedSessions
+ 
+     @abstract Gets the list of the sessions with logged root and site users.
+ 
+     @result Array of sessions.
+     */
+     function GetLoggedSessions()
+     {
+         $result['root'] = $result['sites'] = array();
+ 
+         $dir = TMP_PATH.'phpsessions/';
+ 
+         if ( is_dir( $dir ) )
+         {
+             if ( $dh = opendir( $dir ) )
+             {
+                 while ( ( $file = readdir( $dh ) ) !== false )
+                 {
+                     if ( $file != '.' and $file != '..' )
+                     {
+                         if ( filesize( $dir.$file ) )
+                         {
+                             $content = file( $dir.$file );
+ 
+                             $extracted = $this->_sess_string_to_array( $content[0] );
+ 
+                             if ( isset( $extracted['AMPROOT_AUTH_USER'] ) )
+                             {
+                                 $result['root'][] = $file;
+                             }
+ 
+                             if ( isset( $extracted['AMP_AUTH_USER'] ) )
+                             {
+                                 $result['sites'][$extracted['AMP_AUTH_USER']][] = $file;
+                             }
+                         }
+                     }
+                 }
+ 
+                 closedir( $dh );
+             }
+         }
+ 
+         return $result;
+     }
+ 
+     function _sess_string_to_array( $sd )
+     {
+         $sess_array = Array();
+         $vars = explode(';', $sd);
+ 
+         for ($i=0; $i < sizeof($vars); $i++)
+         {
+             $parts = explode('|', $vars[$i]);
+             $key = $parts[0];
+             $val = unserialize($parts[1].';');
+ 
+             $sess_array[$key] = $val;
+         }
+ 
+         return $sess_array;
      }
  

Update of /cvsroot/ampoliros/ampoliros/defs
In directory sc8-pr-cvs1:/tmp/cvs-serv4779/defs

Modified Files:
	structure.xml 
Log Message:
SECURITY:
- Added logged root and users sessions list in security administration
  (security.php). (wuh)

NEW FEATURES:
- Added semaphores feature (semaphores.library). (wuh)


Index: structure.xml
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/defs/structure.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** structure.xml	19 May 2003 12:24:34 -0000	1.30
--- structure.xml	19 May 2003 14:36:24 -0000	1.31
***************
*** 1528,1531 ****
--- 1528,1541 ----
          file="amp_misc_maintenance_it.catalog"/>
  
+     <!-- Semaphores -->
+ 
+     <tempdir
+         name="semaphores"
+         file="semaphores"/>
+ 
+     <library
+         name="semaphores"
+         file="semaphores.library"/>
+ 
      <!-- Remote procedures -->
  

Update of /cvsroot/ampoliros/ampoliros/defs
In directory sc8-pr-cvs1:/tmp/cvs-serv1530/defs

Modified Files:
	structure.xml 
Log Message:
NEW FEATURES:
- Added IFrame Hui widget. (wuh)
- Added "refresh" option to page Hui widget. (wuh)

CHANGES:
- Set "iso-8859-1" as Hui page charset. (wuh)
- Now Hui table widget pages navigator supports word wrapping when it is
  longer than the table width. (wuh)


Index: structure.xml
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/defs/structure.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** structure.xml	9 May 2003 16:42:31 -0000	1.29
--- structure.xml	19 May 2003 12:24:34 -0000	1.30
***************
*** 1092,1095 ****
--- 1092,1098 ----
          file="horizgroup.hui"/>
      <huielement
+         name="iframe"
+         file="iframe.hui"/>
+     <huielement
          name="image"
          file="image.hui"/>

Update of /cvsroot/ampoliros/ampoliros/var/db
In directory sc8-pr-cvs1:/tmp/cvs-serv1530/var/db

Modified Files:
	amproot.xsql 
Log Message:
NEW FEATURES:
- Added IFrame Hui widget. (wuh)
- Added "refresh" option to page Hui widget. (wuh)

CHANGES:
- Set "iso-8859-1" as Hui page charset. (wuh)
- Now Hui table widget pages navigator supports word wrapping when it is
  longer than the table width. (wuh)


Index: amproot.xsql
===================================================================
RCS file: /cvsroot/ampoliros/ampoliros/var/db/amproot.xsql,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** amproot.xsql	8 May 2003 15:56:04 -0000	1.15
--- amproot.xsql	19 May 2003 12:24:34 -0000	1.16
***************
*** 69,73 ****
  	</table>
  
! 	<sequence name="huielements_id_seq"	start="38"/>
  
  	<insert table="huielements">
--- 69,73 ----
  	</table>
  
! 	<sequence name="huielements_id_seq"	start="39"/>
  
  	<insert table="huielements">
***************
*** 123,126 ****
--- 123,132 ----
  		<data field="name"	value="horizgroup"/>
  		<data field="file"	value="horizgroup.hui"/>
+ 	</insert>
+ 
+ 	<insert table="huielements">
+ 		<data field="id"	value="38"/>
+ 		<data field="name"	value="iframe"/>
+ 		<data field="file"	value="iframe.hui"/>
  	</insert>