[vhffs-dev] Quelques patches mineurs et un plus gros (licen[cs]e)

[ Thread Index | Date Index | More vhffs.org/vhffs-dev Archives ]

To: vhffs-dev@xxxxxxxxx
Subject: [vhffs-dev] Quelques patches mineurs et un plus gros (licen[cs]e)
From: Cyril Brulebois <cyril.brulebois@xxxxxxxxxxxxxxxx>
Date: Sat, 10 Jun 2006 02:16:02 +0200

Bon(jour|soir| matin|ne nuit),

au menu :
 - un patch cosmétique pour le Makefile. À appliquer ou non, mais perso
   je trouve le Makefile plus lisible ainsi.
 - un patch cosmétique+correction de typo pour le vhffs-rfc (*)
 - un patch corrections de typo pour vhffs-doc (*)
 - un minipatch typos pour vhffs-irc
 - un patch pour les fichiers à la racine 

(*) : faire un cd dans le rep en question avant de lancer un patch -p0

Et pour finir, un gros patch pour tous les Licence/License (quelle que
soit la casse). ATTENTION ! Il y a un champ 'licence' dans la table
'vhffs_largefile'. À vous de voir si vous voulez y retoucher, et dans
l'affirmative, comment ce faire lors d'une mise à jour. ;-)

[Note : pour des raisons de chevauchement, ce patch inclut le comestic
pour le Makefile.]

Une petite manip à faire niveau svn pour renommer les fichiers (après
avoir appliqué le patch) :
  for i in `find -name LICENCE`; do svn mv $i ${i/LICENCE/LICENSE}; done

(Ça casse peut-être d'autres choses, mais je pense que non, vu le
'grep -ri' sur tout le trunk, mais bon, il est tard. Note, il reste
quelques occurrences de « licence » mais c'est normal, traduction
française.)

Et merci aux gens qui écrivent de la doc, c'est sympa à bouquiner. ;-)

Cordialement,

-- 
Cyril Brulebois

PS : Et bien sûr n'hésitez pas à me recontacter et/ou me taper dessus en
cas de souci.

Index: Makefile
===================================================================
--- Makefile	(rÃ©vision 209)
+++ Makefile	(copie de travail)
@@ -1,18 +1,18 @@
 #!/usr/bin/make
 
-APIDIR=$(DESTDIR)/usr/share/vhffs/api/
-PANELDIR=$(DESTDIR)/usr/share/vhffs/panel/
-TEMPLATESDIR=$(DESTDIR)/usr/share/vhffs/templates/
-DOCDIR=$(DESTDIR)/usr/share/doc/vhffs/
-BACKENDDIR=$(DESTDIR)/usr/share/vhffs/backend/
-CONFDIR=$(DESTDIR)/etc/vhffs/
-INTLDIR=$(DESTDIR)/usr/share/vhffs/intl/
-BOTSDIR=$(DESTDIR)/usr/lib/vhffs/bots/
-LEDIR=$(DESTDIR)/usr/lib/vhffs/listengine/
-TOOLSDIR=$(DESTDIR)/usr/bin/
-SHELLDIR=$(DESTDIR)/usr/bin/
-JABBERDIR=$(DESTDIR)/usr/share/vhffs/jabber/
-LEWEB=$(DESTDIR)/usr/share/vhffs/listengine/
+CONFDIR      = $(DESTDIR)/etc/vhffs/
+DOCDIR       = $(DESTDIR)/usr/share/doc/vhffs/
+APIDIR       = $(DESTDIR)/usr/share/vhffs/api/
+PANELDIR     = $(DESTDIR)/usr/share/vhffs/panel/
+TEMPLATESDIR = $(DESTDIR)/usr/share/vhffs/templates/
+BACKENDDIR   = $(DESTDIR)/usr/share/vhffs/backend/
+INTLDIR      = $(DESTDIR)/usr/share/vhffs/intl/
+BOTSDIR      = $(DESTDIR)/usr/lib/vhffs/bots/
+LEDIR        = $(DESTDIR)/usr/lib/vhffs/listengine/
+TOOLSDIR     = $(DESTDIR)/usr/bin/
+SHELLDIR     = $(DESTDIR)/usr/bin/
+JABBERDIR    = $(DESTDIR)/usr/share/vhffs/jabber/
+LEWEB        = $(DESTDIR)/usr/share/vhffs/listengine/
 
 PERL_MODULES=HTML::Template Digest::MD5 CGI Locale::gettext Config::General DBI Email::Valid Crypt::PasswdMD5 GD::Text::Wrap GD MIME::Lite XML::RSS CGI::Session Encode utf8 LockFile::Simple  Mail::Internet Email::Valid
 DEBIAN_PACKAGES=libxml-rss-perl liblocale-gettext-perl libconfig-general-perl libhtml-template-perl libcrypt-passwdmd5-perl libgd-text-perl libmime-lite-perl libcgi-session-perl liblockfile-simple-perl libgd-perl libclass-dbi-pg-perl libclass-dbi-perl libdbd-pg-perl libemail-valid-perl libc6-dev
@@ -82,19 +82,19 @@
 install-bots:
 	install -d -m 755 $(BOTSDIR)	
 	install -d -m 755 $(BOTSDIR)/misc/
-	install -m 755 vhffs-robots/src/*.pl $(BOTSDIR)/
-	install -m 644 vhffs-robots/misc/awstats.conf $(BOTSDIR)/misc/
+	install -m 755 vhffs-robots/src/*.pl            $(BOTSDIR)/
+	install -m 644 vhffs-robots/misc/awstats.conf   $(BOTSDIR)/misc/
 	install -m 644 vhffs-robots/misc/awstats.sample $(BOTSDIR)/misc/
 
 install-doc:
 	install -d -m 755 $(DOCDIR)	
 	install -d -m 755 $(DOCDIR)/config
 	install -d -m 755 $(DOCDIR)/config/apache
-	install -m 644 vhffs-doc/AUTHORS $(DOCDIR)/
-	install -m 644 vhffs-doc/CONVENTION-fr $(DOCDIR)/
-	install -m 644 vhffs-doc/HOWTO* $(DOCDIR)/
-	install -m 644 vhffs-doc/README* $(DOCDIR)/
-	install -m 644 vhffs-doc/LICENCE* $(DOCDIR)/
+	install -m 644 vhffs-doc/AUTHORS         $(DOCDIR)/
+	install -m 644 vhffs-doc/CONVENTION-fr   $(DOCDIR)/
+	install -m 644 vhffs-doc/HOWTO*          $(DOCDIR)/
+	install -m 644 vhffs-doc/README*         $(DOCDIR)/
+	install -m 644 vhffs-doc/LICENSE*        $(DOCDIR)/
 	install -m 644 vhffs-doc/config/apache/* $(DOCDIR)/config/apache/
 
 install-conf:
@@ -105,7 +105,7 @@
 	install -d -m 755 $(BACKENDDIR)
 	install -d -m 755 $(BACKENDDIR)/pgsql
 	install -d -m 755 $(BACKENDDIR)/tools
-	install -m 644 vhffs-backend/src/pgsql/*.sql $(BACKENDDIR)/pgsql/
+	install -m 644 vhffs-backend/src/pgsql/*.sql    $(BACKENDDIR)/pgsql/
 	install -m 755 vhffs-backend/tools/vhffs-initdb $(BACKENDDIR)/tools/vhffs-initdb
 
 install-intl:
@@ -118,27 +118,27 @@
 
 install-tools:
 	install -d -m 755 $(TOOLSDIR)
-	install -m 755 vhffs-tools/src/vhffs-blankmysql $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-dumpmysql $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-blankmysql   $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-dumpmysql    $(TOOLSDIR)/
 	install -m 755 vhffs-tools/src/vhffs-checkinstall $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-groupdel $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-groupinfo $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-moderate $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-passwd $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-quota $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-userdel $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-userinfo $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-usermod $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-webdir $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-firstadmin $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-groupdel     $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-groupinfo    $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-moderate     $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-passwd       $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-quota        $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-userdel      $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-userinfo     $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-usermod      $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-webdir       $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-firstadmin   $(TOOLSDIR)/
 
 
 install-listengine-web:
 	install -d -m 755 $(LEWEB)
 	install -d -m 755 $(LEWEB)/archives
 	install -d -m 755 $(LEWEB)/templates
-	install -m 755 vhffs-listengine/src/archives/archives.pl $(LEWEB)/archives/
-	install -m 755 vhffs-listengine/src/archives/show_msg.pl $(LEWEB)/archives/
+	install -m 755 vhffs-listengine/src/archives/archives.pl      $(LEWEB)/archives/
+	install -m 755 vhffs-listengine/src/archives/show_msg.pl      $(LEWEB)/archives/
 	install -m 644 vhffs-listengine/src/archives/templates/*.tmpl $(LEWEB)/templates
 	ln -fs $(PANELDIR)/themes $(LEWEB)/archives/themes
 
@@ -249,43 +249,43 @@
 	install -d -m 755 $(PANELDIR)/user
 	install -d -m 755 $(PANELDIR)/web
 	#install files
-	install -m 644 vhffs-panel/*.js $(PANELDIR)/
-	install -m 644 vhffs-panel/*.ico $(PANELDIR)/
-	install -m 755 vhffs-panel/*.pl $(PANELDIR)/
-	install -m 755 vhffs-panel/acl/*.pl $(PANELDIR)/acl/
-	install -m 755 vhffs-panel/admin/*.pl $(PANELDIR)/admin/
-	install -m 755 vhffs-panel/admin/cvs/*.pl $(PANELDIR)/admin/cvs/
-	install -m 755 vhffs-panel/admin/dns/*.pl $(PANELDIR)/admin/dns/
-	install -m 755 vhffs-panel/admin/group/*.pl $(PANELDIR)/admin/group/
+	install -m 644 vhffs-panel/*.js                 $(PANELDIR)/
+	install -m 644 vhffs-panel/*.ico                $(PANELDIR)/
+	install -m 755 vhffs-panel/*.pl                 $(PANELDIR)/
+	install -m 755 vhffs-panel/acl/*.pl             $(PANELDIR)/acl/
+	install -m 755 vhffs-panel/admin/*.pl           $(PANELDIR)/admin/
+	install -m 755 vhffs-panel/admin/cvs/*.pl       $(PANELDIR)/admin/cvs/
+	install -m 755 vhffs-panel/admin/dns/*.pl       $(PANELDIR)/admin/dns/
+	install -m 755 vhffs-panel/admin/group/*.pl     $(PANELDIR)/admin/group/
 	install -m 755 vhffs-panel/admin/largefile/*.pl $(PANELDIR)/admin/largefile/
-	install -m 755 vhffs-panel/admin/mail/*.pl $(PANELDIR)/admin/mail/
-	install -m 755 vhffs-panel/admin/mailing/*.pl $(PANELDIR)/admin/mailing/
-	install -m 755 vhffs-panel/admin/mysql/*.pl $(PANELDIR)/admin/mysql/
-	install -m 755 vhffs-panel/admin/object/*.pl $(PANELDIR)/admin/object/
-	install -m 755 vhffs-panel/admin/pgsql/*.pl $(PANELDIR)/admin/pgsql/
-	install -m 755 vhffs-panel/admin/svn/*.pl $(PANELDIR)/admin/svn/
-	install -m 755 vhffs-panel/admin/user/*.pl $(PANELDIR)/admin/user/
-	install -m 755 vhffs-panel/admin/web/*.pl $(PANELDIR)/admin/web/
-	install -m 755 vhffs-panel/cvs/*.pl $(PANELDIR)/cvs/
-	install -m 755 vhffs-panel/dns/*.pl $(PANELDIR)/dns/
-	install -m 755 vhffs-panel/group/*.pl $(PANELDIR)/group/
-	install -m 755 vhffs-panel/help/*.html $(PANELDIR)/help/
-	install -m 755 vhffs-panel/largefile/*.pl $(PANELDIR)/largefile/
-	install -m 755 vhffs-panel/mail/*.pl $(PANELDIR)/mail/
-	install -m 755 vhffs-panel/mailinglist/*.pl $(PANELDIR)/mailinglist/
-	install -m 755 vhffs-panel/mysql/*.pl $(PANELDIR)/mysql/
-	install -m 755 vhffs-panel/object/*.pl $(PANELDIR)/object/
-	install -m 755 vhffs-panel/pgsql/*.pl $(PANELDIR)/pgsql/
-	install -m 755 vhffs-panel/public/*.pl $(PANELDIR)/public/
-	install -m 755 vhffs-panel/public/rss/*.pl $(PANELDIR)/public/rss/
-	install -m 755 vhffs-panel/svn/*.pl $(PANELDIR)/svn/
-	install -m 755 vhffs-panel/user/*.pl $(PANELDIR)/user/
-	install -m 755 vhffs-panel/web/*.pl $(PANELDIR)/web/
+	install -m 755 vhffs-panel/admin/mail/*.pl      $(PANELDIR)/admin/mail/
+	install -m 755 vhffs-panel/admin/mailing/*.pl   $(PANELDIR)/admin/mailing/
+	install -m 755 vhffs-panel/admin/mysql/*.pl     $(PANELDIR)/admin/mysql/
+	install -m 755 vhffs-panel/admin/object/*.pl    $(PANELDIR)/admin/object/
+	install -m 755 vhffs-panel/admin/pgsql/*.pl     $(PANELDIR)/admin/pgsql/
+	install -m 755 vhffs-panel/admin/svn/*.pl       $(PANELDIR)/admin/svn/
+	install -m 755 vhffs-panel/admin/user/*.pl      $(PANELDIR)/admin/user/
+	install -m 755 vhffs-panel/admin/web/*.pl       $(PANELDIR)/admin/web/
+	install -m 755 vhffs-panel/cvs/*.pl             $(PANELDIR)/cvs/
+	install -m 755 vhffs-panel/dns/*.pl             $(PANELDIR)/dns/
+	install -m 755 vhffs-panel/group/*.pl           $(PANELDIR)/group/
+	install -m 755 vhffs-panel/help/*.html          $(PANELDIR)/help/
+	install -m 755 vhffs-panel/largefile/*.pl       $(PANELDIR)/largefile/
+	install -m 755 vhffs-panel/mail/*.pl            $(PANELDIR)/mail/
+	install -m 755 vhffs-panel/mailinglist/*.pl     $(PANELDIR)/mailinglist/
+	install -m 755 vhffs-panel/mysql/*.pl           $(PANELDIR)/mysql/
+	install -m 755 vhffs-panel/object/*.pl          $(PANELDIR)/object/
+	install -m 755 vhffs-panel/pgsql/*.pl           $(PANELDIR)/pgsql/
+	install -m 755 vhffs-panel/public/*.pl          $(PANELDIR)/public/
+	install -m 755 vhffs-panel/public/rss/*.pl      $(PANELDIR)/public/rss/
+	install -m 755 vhffs-panel/svn/*.pl             $(PANELDIR)/svn/
+	install -m 755 vhffs-panel/user/*.pl            $(PANELDIR)/user/
+	install -m 755 vhffs-panel/web/*.pl             $(PANELDIR)/web/
 	#install themes now
 	#default theme
 	install -d -m 755 $(PANELDIR)/themes/default
 	install -d -m 755 $(PANELDIR)/themes/default/images
-	install -m 644 vhffs-panel/themes/default/*.css $(PANELDIR)/themes/default/
+	install -m 644 vhffs-panel/themes/default/*.css        $(PANELDIR)/themes/default/
 	install -m 644 vhffs-panel/themes/default/images/*.png $(PANELDIR)/themes/default/images

Index: largefile
===================================================================
--- largefile	(rÃ©vision 209)
+++ largefile	(copie de travail)
@@ -21,7 +21,7 @@
 -----------
 We considers:
 - /ftppublic/ the root of the public ftp path
-- /ftppriv/ the root of the private ftp to put files
+- /ftppriv/ the root of the private ftp to put files into
 
 Largefile database schema and informations
 ------------
@@ -31,22 +31,22 @@
 
 vhffs_largefile
 (
-	filename as string,
-	size as number,
+	filename     as string,
+	size         as number,
 	counted_size as number,
-	username as string,
-	password as string,
-	directory as string,
-	hash as string,
-	gid	as number REFERENCES vhffs_groups( gid ),
-	object_id REFERENCES vhffs_object( object_id )
+	username     as string,
+	password     as string,
+	directory    as string,
+	hash         as string,
+	gid	     as number REFERENCES vhffs_groups( gid ),
+	object_id    REFERENCES vhffs_object( object_id )
 );
 
 - filename will be the name of the file. So, the user has to 
   put on FTP servers a file with the SAME name. Another name
   will be refused.
 - gid will be the gid of the group (Group Identifier)
-- uid will be the uid of the person who ask the hosting of this largefile
+- uid will be the uid of the person who asks for the hosting of this largefile
 - size will be the size of the file
 - counted_size will be used by vhffs-bots
 - hash will be the md5 result of the file
@@ -69,7 +69,7 @@
 and generate a password to put the file on the server. It will delivery
 a new FTP access. The username and the password are sent by mail.
 
-If the user forgot the username and password to put the file, they can 
+If the user forgot the username and password to put the file, he can 
 ask to send it by mail.
 
 It's better to generate a new access by FTP than using the existing.
@@ -88,21 +88,21 @@
 
 Largefile bots
 --------------
-Largefile has bots and will be transfer tranfered largefiles on the FTP public
-server. A bot detects that a file is succesfully uploaded when his size
-doesn't change since the last run. When the bot detects that the file is
+Largefile has bots and will be transfer incoming largefiles on the FTP public
+server. A bot detects that a file is succesfully uploaded when its size
+hasn't change since the last run. When the bot detects that the file is
 fully uploaded, the state of the largefile changes on ACTIVATED.
 When it is ACTIVATED, new FTP access cannot be delivered and the file 
 is available on public FTP server.
-The file is copied on the directory :
+The file is copied on the directory:
 /ftppublic/group/filename
 
-When a file is activated, the single action which can be made is DELETE.
+When a file is activated, the only action which can be operated is DELETE.
 
-Several bots will be created :
-- One bot for copy files from privftp to pubftp
+Several bots will be created:
+- One bot to copy files from privftp to pubftp
 - One bot to clean privftp direcory without erased some files in uploading
-- One bot for delete files
+- One bot to delete files
 - One bot to create XML relative files
 - One bot to active privftp access and send email to have privftp 
   username and password
@@ -111,23 +111,23 @@
 Largefile search
 --------------
 Largefile service will offer a web-service to search files.
-The search can be made on :
+The search can be made on:
 - group description
 - group name
 - filename
 - size
 
 The web-service does not need VHFFS database. It has to be independant.
-In fact, vhffs-bots will create a xml file which contains all informations
-about largefiles. The web-service will search in this XML file.
+In fact, vhffs-bots will create a XML file which contains all informations
+about largefiles. The web-service will search into this XML file.
 
-Webservice will be capable to generate .torrent file for download.
+Webservice will be capable of generating .torrent file for download.
 
 
 Largefile public access
 --------------
 The hosted largefiles will be available with public-ftp or bittorent
-client. Largefile service will provides .torrent files and FTP 
+client. Largefile service will provide .torrent files and FTP 
 anonymous access.

Index: debian/docs
===================================================================
--- debian/docs	(revision 209)
+++ debian/docs	(working copy)
@@ -4,7 +4,6 @@
 Files-fr
 HOWTO-Contribute
 HOWTO-Robots
-HOWTO-Service
 HOWTO-ServiceACL-fr
 README-fr
 api
Index: HOWTO-ServiceACL-fr
===================================================================
--- HOWTO-ServiceACL-fr	(revision 209)
+++ HOWTO-ServiceACL-fr	(working copy)
@@ -3,13 +3,13 @@
 
 Ce document va essayer de poser quelques bases à propos de
 l'implémentation des services sous Vhffs4 (d'ailleurs, faudrait
-penser à changer de nom un jour[1].
+penser à changer de nom un jour [1]).
 
 L'idée générale est de créer une table générale pour chaque service.
 Typiquement, pour apache, on aura une table contenant :
 - le servername
 - la description
-- autres parametres étant propres aux services
+- autres paramètres étant propres aux services
 
 PLUS :
 - un état : 0 = service à mettre en place (un robot le met en place.
@@ -64,22 +64,22 @@
  1004 , 1 , 700
  1005 , 1 , 500
 
-Bien sur, ce système d'ACL serait propre à Vhffs et ne serait aucunement
+Bien sûr, ce système d'ACL serait propre à Vhffs et ne serait aucunement
 appliqué sur le système de fichiers. Cela permet par contre à plusieurs
 personnes travaillant sur un même projet de gérer les différents outils
 avec lesquels ils travaillent.
-Je pense que ça peut etre interessant, car trop de personnes vont à terme
-utiliser le CVS de "leur pote qui a perdu son pass et qui peut plus
+Je pense que ça peut être intéressant, car trop de personnes vont à terme
+utiliser le SVN de "leur pote qui a perdu son pass et qui peut plus
 configurer tel ou tel service" ...
 
-De plus, les ACL ne sont clairement pas pretes aujourd'hui pour qu'on les
+De plus, les ACL ne sont clairement pas prêtes aujourd'hui pour qu'on les
 utilise sous Linux (et donc, avec Debian, qui est le système de référence
 pour Vhffs). Néanmoins, les développer actuellement de manière interne à
 Vhffs nous permettra plus tard de pouvoir les implémenter facilement sur le
-système de fichiers. En très très ***gros***, après deux trois recompilation
-du kernel, trois robots et deux patchs, on ***devrait*** pouvoir le faire
-(***touss touss***). Bien sur, tout cela n'est que théorique, et on sait
-tous très bien comment ça finira ("mais heu, pourquoi tu as tout effacé 
+système de fichiers. En très très ***gros***, après deux trois recompilations
+du kernel, trois robots et deux patches, on ***devrait*** pouvoir le faire
+(***touss touss***). Bien sûr, tout cela n'est que théorique, et on sait
+tous très bien comment ça finira ("mais heu, pourquoi tu as tout effacé"
 ;-)))
 
 -------------------------
Index: CONVENTION-fr
===================================================================
--- CONVENTION-fr	(revision 209)
+++ CONVENTION-fr	(working copy)
@@ -3,5 +3,5 @@
   Le mieux est de faire un identifiant qui sera lié au nom du service.
 - Toujours envoyer ses changements si vous n'avez pas d'accès cvs. Envoyez
   pour le moment à  : julien AT gunnm DOT org. Si vous avez un acces CVS,
-  comittez, sans quoi, vous aurez une fessée
+  committez, sans quoi, vous aurez une fessée
 
Index: Architecture-fr
===================================================================
--- Architecture-fr	(revision 209)
+++ Architecture-fr	(working copy)
@@ -28,7 +28,7 @@
 
 - Robots
   Les robots de Vhffs seront de simples binaires qui s'appuieront
-  sur l'API développée précédemment pour executer quelques tâches
+  sur l'API développée précédemment pour exécuter quelques tâches
   triviales (création des utilisateurs, création des répertoires, 
   modifications des droits, vérification de l'intégrité du système, ...)
 
Index: HOWTO-Service
===================================================================
--- HOWTO-Service	(revision 209)
+++ HOWTO-Service	(working copy)
@@ -1 +0,0 @@
-Ce document va ess
Index: README-fr
===================================================================
--- README-fr	(revision 209)
+++ README-fr	(working copy)
@@ -9,8 +9,8 @@
 la plate-forme développée spécialement pour Tuxfamily, afin de gérer
 tous les services. A l'heure actuelle, quelques sociétés utilisent
 le programme (Africa Computing, Lost-Oasis, Ouvaton, ...).
-La distribution standard inclut toute les configurations des services,
-une API pour uniformisée les opérations dans les bases de données
+La distribution standard inclut toutes les configurations des services,
+une API uniformisée pour les opérations dans les bases de données
 propres à Vhffs et un panel, véritable interface entre l'utilisateur
 et les services.
 
@@ -18,14 +18,14 @@
 Quels sont les besoins matériels pour faire fonctionner Vhffs ?
 ---------------------
 Si vous souhaitez faire de l'hébergement, massif, il vous faut alors
-des machines :-) Objectivement, il n'y a pas de minimum requis. 
+des machines. :-) Objectivement, il n'y a pas de minimum requis. 
 Néanmoins, la distribution standard de Vhffs est packagée uniquement
 pour Debian GNU/Linux. Cependant, des versions non-officielles peuvent
-exister, mais nous n'apporteront aucun support pour ces dernieres.
+exister, mais nous n'apporterons aucun support pour ces dernières.
 Il vous faut donc disposer de plusieurs machines fonctionnant avec
 Debian GNU/Linux. La version minimale requise est la Sarge.
 
-Une puissance minimum est tout de meme requise. Pour un petit serveur,
+Une puissance minimum est tout de même requise. Pour un petit serveur,
 un pentium II 350 me semble le minimum.
 
 Comment est développé Vhffs ?
@@ -44,19 +44,19 @@
 Important
 -------------------
 Les points suivants sont importants pour les futurs utilisateurs 
-et développeurs de Vhffs:
-- Rapportez les bugs. 
-            Un bug rapporté est un bug à moitié corrigé. Il est très
-	    important de pouvoir rapporter les bugs auprès des développeurs
+et développeurs de Vhffs :
+- Signalez les bogues. 
+            Un bogue rapporté est un bogue à moitié corrigé. Il est très
+	    important de pouvoir signaler les bogues auprès des développeurs
 	    de Vhffs afin d'améliorer le programme.
 
 - Prenez votre temps et lisez bien toute la documentation avant de poser
-  une question stupide. L'un des inconvénient de Vhffs2 a été son manque
+  une question stupide. L'un des inconvénients de Vhffs2 a été son manque
   de documentation. Vhffs4 sera beaucoup fourni en terme de documentation.
 
-- COMITTEZ vos changements. Si vous trouvez un bug et que vous avez la
+- COMMITTEZ vos changements. Si vous trouvez un bogue et que vous avez la
   capacité de le corriger, n'hésitez pas à le corriger. Cependant, vous
-  devez nous envoyer le correctif ou même le comitter sur le cvs si vous
+  devez nous envoyer le correctif ou même le committer sur le SVN si vous
   avez un accès à celui-ci.
   
 
Index: config/apache/panelconf
===================================================================
--- config/apache/panelconf	(revision 209)
+++ config/apache/panelconf	(working copy)
@@ -17,8 +17,8 @@
 
         ErrorLog /var/log/apache2/panel-error.log
 
-        # Possible values include: debug, info, notice, warn, error, crit,
-        # alert, emerg.
+        # Possible values include: 
+	#   debug, info, notice, warn, error, crit, alert, emerg
         LogLevel warn
 
         CustomLog /var/log/apache2/panel-access.log combined
Index: HOWTO-Robots
===================================================================
--- HOWTO-Robots	(revision 209)
+++ HOWTO-Robots	(working copy)
@@ -1,7 +1,8 @@
 The VHFFS Robots should run with crontab.
 For example, you can call them every 2 minutes. They will create what you need.
-Be careful, they don't have lock file at this time, so 2 robots create_user.pl 
-could run at the same time. You should leave at least one minute between the execution of all robots.
+Be careful, they don't have lock files at this time, so 2 create_user.pl robots
+could run at the same time. You should leave at least one minute between the 
+execution of all robots.
 
 The robots will create what is specified in the panel.
 
Index: Files-fr
===================================================================
--- Files-fr	(revision 209)
+++ Files-fr	(working copy)
@@ -14,7 +14,7 @@
 Group.pm : gestion des groupes
 
 Object.pm : gestion des objets de bases de Vhffs. Chaque entité est un objet
-            (utilisateurs, groupes, services, ...), et sera soumis au systeme
+            (utilisateurs, groupes, services, ...), et sera soumis au système
 	    d'ACL. Chaque classe de l'API hérite de cette classe.
 
 Httpd.pm : gestion du service d'hébergement WEB
Index: api/General-Informations.tex
===================================================================
--- api/General-Informations.tex	(revision 209)
+++ api/General-Informations.tex	(working copy)
@@ -26,25 +26,25 @@
 \item{Vhffs::Main} : Some trivial functions used by Vhffs. This is not a fully class of Vhffs, this module contains useful functions which can't be put in another module (DB connection, ...).
 \item{Vhffs::User} : The user implementation of Vhffs. It gives you the possibility to create, modify or delete a user.
 \item{Vhffs::Group} : The group implementation of Vhffs. The methods of this module allows you to modify, create or delete groups.
-\item{Vhffs::Conf} : The gestion of the configuration files. It use libappconfig of perl. Many methods return some informations of the configuration (useful to get a part of the configuration).
+\item{Vhffs::Conf} : The gestion of the configuration files. It uses libappconfig of perl. Many methods return some informations about the configuration (useful to get a part of the configuration).
 \end{itemize}
 \end{center}
 
 
-\section{HowTo use the modules ?}
+\section{HowTo use the modules?}
 
-This section will present some elementary rules to use Vhffs API. You can ignore it, but your programe should be buggy if you don't read it ;-) \footnote{Be careful, the API can be buggy too :-)}.
+This section will present some elementary rules to use Vhffs API. You can ignore it, but your program should be buggy if you don't read it . ;-) \footnote{Be careful, the API can be buggy too :-)}
 
 \subsection{Always check the return value}
-The methods of each modules \textbf{always} return something. They can return a reference to a hash or an object, but if the method is instance method, it return a number > 0 if the methode encounter no problem, and a number < 0 else.
+The methods of each modules \textbf{always} return something. They can return a reference to a hash or an object, but if the method is an instance method, it returns a number > 0 if the method encounters no problem, and a number < 0 else.
 \\
-It's very important. Imagine : you use a Vhffs::User object, and want to create the User. Imagine you use this code :
+It's very important. Imagine: you use a Vhffs::User object, and want to create the User. Imagine you use this code:
 \begin{verbatim}
   $user = new Vhffs::User( 10001 , ``john'' );
   $user->create();
 \end{verbatim}
 
-It will \textbf{NOT} working. The create() method will return a negative value if it cannot create the user in the database (eg : a user with this name can exists). A good code can be this :
+It will \textbf{NOT} work. The create() method will return a negative value if it cannot create the user in the database (e.g.: a user with this name already exists). A good code can be this:
 
 \begin{verbatim}
   $user = new Vhffs::User( 10001 , ``john'' );
@@ -56,8 +56,8 @@
 
 \subsection{Use the oriented object schema of Vhffs}
 
-Vhffs has been developped with an oriented object method. So, you have to use this way of programming, it is easier to use, and Vhffs modules are each others.
+Vhffs has been developped with an oriented object method. So, you have to use this way of programming, it is easier to use, and Vhffs modules are FIXME each others.
 \\
-More, oriented object method is easier to maintain, the code is easier to read.
+Moreover, an oriented object method is easier to maintain, the code is easier to read.
 
-\end{document}
\ No newline at end of file
+\end{document}
Index: HOWTO-Contribute
===================================================================
--- HOWTO-Contribute	(revision 209)
+++ HOWTO-Contribute	(working copy)
@@ -2,13 +2,13 @@
 ---------------------
 
 
-CVS Access
+SVN Access
 ----------
-Vhffs has a CVS server hosted by naquadah network.
-CVS access are given to person who are involved in Vhffs.
+Vhffs has a SVN server hosted by naquadah network.
+SVN access is given to persons who are involved in Vhffs.
 In other words, you will not have an access as soon as you
 send patches, but if you contribute often to the project, a 
-cvs access will be given.
+SVN access will be given.
 
 
 Conventions
@@ -19,12 +19,12 @@
 
 2 - All methods or functions MUST return a value (a reference
 or an integer). So, you HAVE TO respect this way of programming.
-A successfull execution will return a positive value, often 1, 
+A successful execution will return a positive value, often 1, 
 otherwise, the method will return a negative value.
 
 3 - You have to make an OO code. The oriented object method is
 more clear than others, and current Vhffs modules are in this way.
-So, you have to respect this rule. This imply that you will
+So, you have to respect this rule. This implies that you will
 create new method in each module, ... Of course, class method
 are allowed, as in Vhffs::User module with get_all method.

Index: vhffs-irc/modobot.pl
===================================================================
--- vhffs-irc/modobot.pl	(rÃ©vision 209)
+++ vhffs-irc/modobot.pl	(copie de travail)
@@ -50,7 +50,7 @@
 
 my $irc=new Net::IRC;
 
-# Connexion
+# Connection
 my $conn=$irc->newconn(Nick     =>  $botname,
                        Server   =>      $srv,
                        Port     =>     $port,
@@ -341,17 +341,17 @@
 
     if( ! defined $object )
     {
-        $bot->privmsg($chan, "Error : Object is null");
+        $bot->privmsg($chan, "Error: Object is null");
         return ( -1 );
     }
     elsif( $object->fetch < 0 )
     {
-        $bot->privmsg($chan, "Error : Cannot fetch object");
+        $bot->privmsg($chan, "Error: Cannot fetch object");
         return ( -1 );
     }
     elsif( $object->get_status != Vhffs::Constants::WAITING_FOR_VALIDATION )
     {
-        $bot->privmsg($chan, "Error : Object is not waiting for validation");
+        $bot->privmsg($chan, "Error: Object is not waiting for validation");
         return ( -2 );
     }
     else

Index: Relases.notes
===================================================================
--- Relases.notes	(rÃ©vision 209)
+++ Relases.notes	(copie de travail)
@@ -1,7 +1,7 @@
 Release Notes for 4.0:
 **********************
 * Of course, those notes are not so complete, and it is recommended
-  to get a look at http://www.vhffs.org
+  to have a look at http://www.vhffs.org
 
 
 ***************************************************************
Index: TODO
===================================================================
--- TODO	(rÃ©vision 209)
+++ TODO	(copie de travail)
@@ -1,5 +1,5 @@
 - improve listengine
 - improve archives format for listengine
-- improve panel, see ajax or css design
-- continue the document of the API
+- improve panel, see AJAX or CSS design
+- continue API documentation

Index: vhffs-api/LICENCE
===================================================================
--- vhffs-api/LICENCE	(rÃ©vision 209)
+++ vhffs-api/LICENCE	(copie de travail)
@@ -1,2 +1,2 @@
-See LICENCE file in the vhffs-doc to get the licence
+See LICENSE file in the vhffs-doc to get the license
 
Index: vhffs-api/src/Vhffs/Note.pm
===================================================================
--- vhffs-api/src/Vhffs/Note.pm	(rÃ©vision 209)
+++ vhffs-api/src/Vhffs/Note.pm	(copie de travail)
@@ -2,7 +2,7 @@
 
 #Vhffs::Note written by sod` <dieu AT gunnm DOT org>
 
-# This software is free software, please read LICENCE file
+# This software is free software, please read LICENSE file
 
 use Vhffs::Constants;
 
Index: vhffs-api/src/Vhffs/Services/DNS.pm
===================================================================
--- vhffs-api/src/Vhffs/Services/DNS.pm	(rÃ©vision 209)
+++ vhffs-api/src/Vhffs/Services/DNS.pm	(copie de travail)
@@ -2,7 +2,7 @@
 
 # Vhffs::Services::DNS
 # This file is a part of VHFFS4 program. It is used to manage domain name server (DNS)
-# Please respect the licence of this program.
+# Please respect the license of this program.
 
 # Author: soda < dieu at gunnm dot org >
 
Index: vhffs-api/src/Vhffs/Services/Mysql.pm
===================================================================
--- vhffs-api/src/Vhffs/Services/Mysql.pm	(rÃ©vision 209)
+++ vhffs-api/src/Vhffs/Services/Mysql.pm	(copie de travail)
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
-# This file is a part of VHFFS4 platofmrm
-# Please respect the licence
+# This file is a part of VHFFS4 platform
+# Please respect the license
 
 # Author: soda < dieu at gunnm dot org>
 
Index: vhffs-api/src/Vhffs/Services/Postgres.pm
===================================================================
--- vhffs-api/src/Vhffs/Services/Postgres.pm	(rÃ©vision 209)
+++ vhffs-api/src/Vhffs/Services/Postgres.pm	(copie de travail)
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
-# This file is a part of VHFFS4 platofmrm
-# Please respect the licence
+# This file is a part of VHFFS4 platform
+# Please respect the license
 
 # Author: soda < dieu at gunnm dot org>
 
Index: vhffs-api/src/Vhffs/Services/Svn.pm
===================================================================
--- vhffs-api/src/Vhffs/Services/Svn.pm	(rÃ©vision 209)
+++ vhffs-api/src/Vhffs/Services/Svn.pm	(copie de travail)
@@ -2,7 +2,7 @@
 
 
 # This file is a part of VHFFS4 Hosting Platform
-# Please respect the licence of this file and the whole software
+# Please respect the license of this file and the whole software
 
 # Author: soda < dieu at gunnm dot org>
 
Index: vhffs-api/src/Vhffs/Services/LargeFile.pm
===================================================================
--- vhffs-api/src/Vhffs/Services/LargeFile.pm	(rÃ©vision 209)
+++ vhffs-api/src/Vhffs/Services/LargeFile.pm	(copie de travail)
@@ -2,7 +2,7 @@
 
 
 # This file is a part of VHFFS4 Hosting Platform
-# Please respect the licence of this file and the whole software
+# Please respect the license of this file and the whole software
 
 # Author: soda < dieu at gunnm dot org>
 
@@ -174,7 +174,7 @@
 	my $self = shift;	
 	my ( $query , $handle );
 
-	$self->{'licence'} = "unknown licence" if( ! defined $self->{'licence'} );
+	$self->{'license'} = "unknown license" if( ! defined $self->{'license'} );
 	$self->{'password'} = "" if( ! defined $self->{'password'} );
 	$self->{'hash'} = "" if( ! defined $self->{'hash'} );
 	$self->{'size'} = "unknown type" if( ! defined $self->{'type'} );
@@ -183,7 +183,7 @@
 
 	$query = "UPDATE vhffs_largefile SET 
 										size				=	'".$self->{'size'}."',
-										licence				=	'".$self->{'licence'}."',
+										license				=	'".$self->{'license'}."',
 										username			=	'".$self->{'username'}."',
 										password			=	'".$self->{'password'}."',
 										hash				=	'".$self->{'hash'}."'
@@ -209,20 +209,20 @@
 	return( $self->{'filename'} );
 }
 
-sub set_licence
+sub set_license
 {
 	my $self = shift;
-	my $licence = shift;
-	$self->{'licence'} = quotemeta( $licence );
+	my $license = shift;
+	$self->{'license'} = quotemeta( $license );
 
 	return 1;
 }
 
-sub get_licence
+sub get_license
 {
 	my $self	=	shift;
 	
-	return( Vhffs::Functions::stripslashes( $self->{'licence'} ) );
+	return( Vhffs::Functions::stripslashes( $self->{'license'} ) );
 }
 
 sub set_size
@@ -469,7 +469,7 @@
 Manage hosted files in VHFFS platform. Methods returns negative
 values if error or positive value (most of case 1).
 The object contains at least type and filename. After, you can add
-licence or size informations. 
+license or size informations.
 
 The username and password properties are present only if the 
 administrator want use an FTP server for each files. For example, for
@@ -492,9 +492,9 @@
 
 get_filename()
 
-get_licence()
+get_license()
 
-set_licence( "mylicence" )
+set_license( "mylicense" )
 
 set_size( "100" )
 
Index: vhffs-api/src/Vhffs/Services/Cvs.pm
===================================================================
--- vhffs-api/src/Vhffs/Services/Cvs.pm	(rÃ©vision 209)
+++ vhffs-api/src/Vhffs/Services/Cvs.pm	(copie de travail)
@@ -2,7 +2,7 @@
 
 
 # This file is a part of VHFFS4 Hosting Platform
-# Please respect the licence of this file and the whole software
+# Please respect the license of this file and the whole software
 
 # Author: soda < dieu at gunnm dot org>
 
Index: vhffs-api/src/Vhffs/Services/Mailing.pm
===================================================================
--- vhffs-api/src/Vhffs/Services/Mailing.pm	(rÃ©vision 209)
+++ vhffs-api/src/Vhffs/Services/Mailing.pm	(copie de travail)
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # This file is a part of VHFFS4 software, a hosting platform suite
-# Please respect the licence of this file and whole program
+# Please respect the license of this file and whole program
 
 # Author : soda < god at gunnm dot org >
 
Index: vhffs-api/src/Vhffs/Services/MailUser.pm
===================================================================
--- vhffs-api/src/Vhffs/Services/MailUser.pm	(rÃ©vision 209)
+++ vhffs-api/src/Vhffs/Services/MailUser.pm	(copie de travail)
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # This file is a part of VHFFS4 software, a hosting platform suite
-# Please respect the licence of this file and whole program
+# Please respect the license of this file and whole program
 
 # Author : soda < dieu at gunnm dot org >
 
Index: vhffs-api/src/Vhffs/Services/Mail.pm
===================================================================
--- vhffs-api/src/Vhffs/Services/Mail.pm	(rÃ©vision 209)
+++ vhffs-api/src/Vhffs/Services/Mail.pm	(copie de travail)
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # This file is a part of VHFFS4 software, a hosting platform suite
-# Please respect the licence of this file and whole program
+# Please respect the license of this file and whole program
 
 # Author : soda < dieu at gunnm dot org >
 
Index: vhffs-api/src/Vhffs/Services/Httpd.pm
===================================================================
--- vhffs-api/src/Vhffs/Services/Httpd.pm	(rÃ©vision 209)
+++ vhffs-api/src/Vhffs/Services/Httpd.pm	(copie de travail)
@@ -3,7 +3,7 @@
 
 # This file is a part of VHFFS4
 # It is used to manage Web Area in VHFFS hosting platform
-# Please respect the licence of this file, and the whole VHFFS software.
+# Please respect the license of this file, and the whole VHFFS software.
 
 # Author: soda < dieu at gunnm dot org>
 
Index: vhffs-api/src/Vhffs/Misc/Mailings.pm
===================================================================
--- vhffs-api/src/Vhffs/Misc/Mailings.pm	(rÃ©vision 209)
+++ vhffs-api/src/Vhffs/Misc/Mailings.pm	(copie de travail)
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 # This file is a part of the VHFFS plateform
-# Please respect the entire licence of VHFFS
+# Please respect the entire license of VHFFS
 # 
 # Author : Julien Delange < dieu at gunnm dot org >
 
Index: vhffs-api/src/Vhffs/Panel/LargeFile.pm
===================================================================
--- vhffs-api/src/Vhffs/Panel/LargeFile.pm	(rÃ©vision 209)
+++ vhffs-api/src/Vhffs/Panel/LargeFile.pm	(copie de travail)
@@ -75,7 +75,7 @@
 	my $filename	= shift;
 	my $size		= shift;
 	my $type		= shift;
-	my $licence		= shift;
+	my $license		= shift;
 	my $hash		= shift;
 	my $description	= shift;
 	my $user		= shift;
@@ -91,7 +91,7 @@
     $file->set_user( $user );
     $file->set_group( $group );
 	return undef if( $file->fetch > 0 );
-	return undef if( $file->set_licence( $licence ) < 0 );
+	return undef if( $file->set_license( $license ) < 0 );
     return undef if ( $file->set_size( $size ) < 0 );
     return undef if ( $file->set_type( $type ) < 0 );
     return undef if ( $file->set_hash( $hash ) < 0 );
@@ -105,7 +105,7 @@
     return undef if ( Vhffs::Acl::add_acl( $group , $file , Vhffs::Constants::ACL_VIEW , $vhffs ) < 0 );
 
 	return undef if( $file->fetch < 0 );
-	return undef if( $file->set_licence( $licence ) < 0 );
+	return undef if( $file->set_license( $license ) < 0 );
 	if( defined $hash )
 	{
 		$file->set_hash( $hash );
Index: vhffs-api/src/Vhffs/Stats.pm
===================================================================
--- vhffs-api/src/Vhffs/Stats.pm	(rÃ©vision 209)
+++ vhffs-api/src/Vhffs/Stats.pm	(copie de travail)
@@ -2,7 +2,7 @@
 
 #Vhffs::ACL written by sod` <dieu AT gunnm DOT org>
 
-# This software is free software, please read LICENCE file
+# This software is free software, please read LICENSE file
 package Vhffs::Stats;
 
 #General perl modules
Index: vhffs-api/src/Vhffs/Acl.pm
===================================================================
--- vhffs-api/src/Vhffs/Acl.pm	(rÃ©vision 209)
+++ vhffs-api/src/Vhffs/Acl.pm	(copie de travail)
@@ -2,7 +2,7 @@
 
 #Vhffs::ACL written by sod` <dieu AT gunnm DOT org>
 
-# This software is free software, please read LICENCE file
+# This software is free software, please read LICENSE file
 
 use Vhffs::Constants;
 
Index: vhffs-backend/LICENCE
===================================================================
--- vhffs-backend/LICENCE	(rÃ©vision 209)
+++ vhffs-backend/LICENCE	(copie de travail)
@@ -1,2 +1,2 @@
-See LICENCE file in the vhffs-doc module to get
-more informations about the licence of Vhffs
+See LICENSE file in the vhffs-doc module to get
+more informations about the license of Vhffs
Index: vhffs-backend/src/pgsql/create_largefile.sql
===================================================================
--- vhffs-backend/src/pgsql/create_largefile.sql	(rÃ©vision 209)
+++ vhffs-backend/src/pgsql/create_largefile.sql	(copie de travail)
@@ -18,7 +18,7 @@
 	filename varchar NOT NULL,
 	size			int4 NOT NULL,
 	type			varchar NOT NULL,
-	licence			varchar,
+	license			varchar,
 	hash			varchar,
 	creating_date	DATE,
 	last_check		DATE,
Index: vhffs-panel/public/largefile.pl
===================================================================
--- vhffs-panel/public/largefile.pl	(rÃ©vision 209)
+++ vhffs-panel/public/largefile.pl	(copie de travail)
@@ -79,7 +79,7 @@
 	$template->param( TEXT_TYPE => gettext("File type") );
 	$template->param( TEXT_SIZE => gettext("Size") );
 	$template->param( TEXT_HASH => gettext("Hash") );
-	$template->param( TEXT_LICENCE => gettext("License of this file") );
+	$template->param( TEXT_LICENSE => gettext("License of this file") );
 
 	$template->param( VALUE_TYPE => gettext("File type") );
 	$template->param( VALUE_SIZE => gettext("Size") );
@@ -92,7 +92,7 @@
 	{
 		$template->param( VALUE_HASH => $file->get_hash );
 	}
-	$template->param( VALUE_LICENCE => $file->get_licence );
+	$template->param( VALUE_LICENSE => $file->get_license );
 	$template->param( VALUE_SIZE => $file->get_size );
 	$template->param( VALUE_TYPE => $file->get_type );
 
Index: vhffs-panel/public/group.pl
===================================================================
--- vhffs-panel/public/group.pl	(rÃ©vision 209)
+++ vhffs-panel/public/group.pl	(copie de travail)
@@ -172,7 +172,7 @@
 			   	 	$subtemplate = new HTML::Template( filename => $templatedir."/public/misc/largefile-part.tmpl" );
 			    	$subtemplate->param( FILENAME => $_->get_filename );
 			    	$subtemplate->param( TYPE => $_->get_type );
-			    	$subtemplate->param( LICENCE => $_->get_description );
+			    	$subtemplate->param( LICENSE => $_->get_description );
 					$subtemplate->param( DOWNLOAD  => "Download this file" );
 					$subtemplate->param( GROUPNAME  => $_->get_group->get_groupname );
 			    	$output .= $subtemplate->output;
Index: vhffs-panel/largefile/prefs.pl
===================================================================
--- vhffs-panel/largefile/prefs.pl	(rÃ©vision 209)
+++ vhffs-panel/largefile/prefs.pl	(copie de travail)
@@ -87,8 +87,8 @@
 	$template->param( TEXT_FILENAME => gettext("Filename") );
 	$template->param( VALUE_FILENAME => $file->get_filename() );
 
-	$template->param( TEXT_LICENCE => gettext("License") );
-	$template->param( VALUE_LICENCE => $file->get_licence() );
+	$template->param( TEXT_LICENSE => gettext("License") );
+	$template->param( VALUE_LICENSE => $file->get_license() );
 
 	$template->param( TEXT_FILESIZE => gettext("Size") );
 	$template->param( VALUE_FILESIZE => $file->get_size() );
Index: vhffs-panel/largefile/create.pl
===================================================================
--- vhffs-panel/largefile/create.pl	(rÃ©vision 209)
+++ vhffs-panel/largefile/create.pl	(copie de travail)
@@ -34,7 +34,7 @@
 $template->param( FILENAME => gettext("Filename") );
 $template->param( SIZE => gettext("Size (in Mo)") );
 $template->param( TYPE => gettext("Filetype (extension, ...)") );
-$template->param( LICENCE => gettext("License") );
+$template->param( LICENSE => gettext("License") );
 $template->param( GROUP => $group->get_groupname );
 $template->param( GROUP_NAME => gettext("Group for this new file") );
 $template->param( HASH => gettext("Hash") );
Index: vhffs-panel/largefile/submit.pl
===================================================================
--- vhffs-panel/largefile/submit.pl	(rÃ©vision 209)
+++ vhffs-panel/largefile/submit.pl	(copie de travail)
@@ -31,7 +31,7 @@
 my $size = $cgi->param('size');
 my $type = $cgi->param('type');
 my $description = $cgi->param("description");
-my $licence = $cgi->param("licence");
+my $license = $cgi->param("license");
 my $hash = $cgi->param("hash");
 my $message;
 my $file;
@@ -39,7 +39,7 @@
 my $templatedir = $vhffs->get_config->get_templatedir;
 
 
-if( ( ! defined $filename ) || ( ! defined $size ) || ( ! defined $type ) || ( ! defined $licence ) || ( ! defined $description ))
+if( ( ! defined $filename ) || ( ! defined $size ) || ( ! defined $type ) || ( ! defined $license ) || ( ! defined $description ))
 {
 	$message = gettext( "CGI Error !");
 }
@@ -47,7 +47,7 @@
 {
 	$message = gettext("Filename is too short. Must contains at least 3 caracters");
 }
-elsif( length( $licence ) < 3 )
+elsif( length( $license ) < 3 )
 {
 	$message = gettext( "License is too short. Please tell us about legal aspects concerning the use of this new file." );
 }
@@ -55,7 +55,7 @@
 {
 	$message = gettext( "Size is only a number (in Mo)" );
 }
-elsif( defined ( $file = Vhffs::Panel::LargeFile::create_largefile($vhffs,$filename,$size,$type,$licence,$hash,$description,$user,$group ) ) )
+elsif( defined ( $file = Vhffs::Panel::LargeFile::create_largefile($vhffs,$filename,$size,$type,$license,$hash,$description,$user,$group ) ) )
 {
 	$file->set_description( $description );
 	$file->commit;
Index: vhffs-panel/templates/largefile/prefs.tmpl
===================================================================
--- vhffs-panel/templates/largefile/prefs.tmpl	(rÃ©vision 209)
+++ vhffs-panel/templates/largefile/prefs.tmpl	(copie de travail)
@@ -5,7 +5,7 @@
 		<li><tmpl_var name="TEXT_FILENAME">: <tmpl_var name="VALUE_FILENAME">
 		<li><tmpl_var name="TEXT_FILETYPE">: <tmpl_var name="VALUE_FILETYPE">
 		<li><tmpl_var name="TEXT_FILESIZE">: <tmpl_var name="VALUE_FILESIZE">
-		<li><tmpl_var name="TEXT_LICENCE">: <tmpl_var name="VALUE_LICENCE">
+		<li><tmpl_var name="TEXT_LICENSE">: <tmpl_var name="VALUE_LICENSE">
 </ul>
 
 
Index: vhffs-panel/templates/largefile/create.tmpl
===================================================================
--- vhffs-panel/templates/largefile/create.tmpl	(rÃ©vision 209)
+++ vhffs-panel/templates/largefile/create.tmpl	(copie de travail)
@@ -29,10 +29,10 @@
 		<input type="text" name="type" id="type"/>
 	</p>
 	<p>
-		<label for="LICENCE">
-			<TMPL_VAR NAME="LICENCE">:
+		<label for="LICENSE">
+			<TMPL_VAR NAME="LICENSE">:
 		</label>
-		<textarea name="licence" id="licence"/></textarea>
+		<textarea name="license" id="license"/></textarea>
 	</p>
 	<p>
 		<label for="hash">
Index: vhffs-panel/templates/public/largefile.tmpl
===================================================================
--- vhffs-panel/templates/public/largefile.tmpl	(rÃ©vision 209)
+++ vhffs-panel/templates/public/largefile.tmpl	(copie de travail)
@@ -18,7 +18,7 @@
 			<li><tmpl_var name="TEXT_TYPE">: <tmpl_var name="VALUE_TYPE"></li>
 			<li><tmpl_var name="TEXT_SIZE">: <tmpl_var name="VALUE_SIZE"></li>
 			<li><tmpl_var name="TEXT_HASH">: <tmpl_var name="VALUE_HASH"></li>
-			<li><tmpl_var name="TEXT_LICENCE">: <tmpl_var name="VALUE_LICENCE"></li>
+			<li><tmpl_var name="TEXT_LICENSE">: <tmpl_var name="VALUE_LICENSE"></li>
 		</ul>
 
 		<h2><tmpl_var name="TEXT_MIRRORS"></h2>
Index: vhffs-panel/templates/public/misc/largefile-part.tmpl
===================================================================
--- vhffs-panel/templates/public/misc/largefile-part.tmpl	(rÃ©vision 209)
+++ vhffs-panel/templates/public/misc/largefile-part.tmpl	(copie de travail)
@@ -1,7 +1,7 @@
 <li>
 <tmpl_var name="FILENAME">
 <tmpl_var name="TYPE">
-<tmpl_var name="LICENCE">
+<tmpl_var name="LICENSE">
 <a href="largefile.pl?filename=<tmpl_var name="FILENAME">&groupname=<tmpl_var name="GROUPNAME">">
 <tmpl_var name="DOWNLOAD">
 </a>
Index: vhffs-tools/src/vhffs-quota
===================================================================
--- vhffs-tools/src/vhffs-quota	(rÃ©vision 209)
+++ vhffs-tools/src/vhffs-quota	(copie de travail)
@@ -2,7 +2,7 @@
 
 
 #This is a part of VHFFS distribution
-#Please respect the licence and my dog
+#Please respect the license and my dog
 
 
 #Use some VHFFS modules, it can be useful
Index: vhffs-listengine/src/listengine.pl
===================================================================
--- vhffs-listengine/src/listengine.pl	(rÃ©vision 209)
+++ vhffs-listengine/src/listengine.pl	(copie de travail)
@@ -1,10 +1,10 @@
 #!/usr/bin/perl
 #
 # This is listengine, the list software for VHFFS
-# This software is free software, so, please respect this work and its licence
+# This software is free software, so, please respect this work and its license
 # Special thanks to myself, my cat, my mother and my girlfriend who hangs in my dream
-# Feel free to copy it, use it, print it, ... according to its licence
-# Licence may be GPL, maybe BSD. We don't know, but it's sure it's free :-)
+# Feel free to copy it, use it, print it, ... according to its license
+# License may be GPL, maybe BSD. We don't know, but it's sure it's free :-)
 #
 # Written by soda <soda at gunnm dot org>
 
Index: Makefile
===================================================================
--- Makefile	(rÃ©vision 209)
+++ Makefile	(copie de travail)
@@ -1,18 +1,18 @@
 #!/usr/bin/make
 
-APIDIR=$(DESTDIR)/usr/share/vhffs/api/
-PANELDIR=$(DESTDIR)/usr/share/vhffs/panel/
-TEMPLATESDIR=$(DESTDIR)/usr/share/vhffs/templates/
-DOCDIR=$(DESTDIR)/usr/share/doc/vhffs/
-BACKENDDIR=$(DESTDIR)/usr/share/vhffs/backend/
-CONFDIR=$(DESTDIR)/etc/vhffs/
-INTLDIR=$(DESTDIR)/usr/share/vhffs/intl/
-BOTSDIR=$(DESTDIR)/usr/lib/vhffs/bots/
-LEDIR=$(DESTDIR)/usr/lib/vhffs/listengine/
-TOOLSDIR=$(DESTDIR)/usr/bin/
-SHELLDIR=$(DESTDIR)/usr/bin/
-JABBERDIR=$(DESTDIR)/usr/share/vhffs/jabber/
-LEWEB=$(DESTDIR)/usr/share/vhffs/listengine/
+CONFDIR      = $(DESTDIR)/etc/vhffs/
+DOCDIR       = $(DESTDIR)/usr/share/doc/vhffs/
+APIDIR       = $(DESTDIR)/usr/share/vhffs/api/
+PANELDIR     = $(DESTDIR)/usr/share/vhffs/panel/
+TEMPLATESDIR = $(DESTDIR)/usr/share/vhffs/templates/
+BACKENDDIR   = $(DESTDIR)/usr/share/vhffs/backend/
+INTLDIR      = $(DESTDIR)/usr/share/vhffs/intl/
+BOTSDIR      = $(DESTDIR)/usr/lib/vhffs/bots/
+LEDIR        = $(DESTDIR)/usr/lib/vhffs/listengine/
+TOOLSDIR     = $(DESTDIR)/usr/bin/
+SHELLDIR     = $(DESTDIR)/usr/bin/
+JABBERDIR    = $(DESTDIR)/usr/share/vhffs/jabber/
+LEWEB        = $(DESTDIR)/usr/share/vhffs/listengine/
 
 PERL_MODULES=HTML::Template Digest::MD5 CGI Locale::gettext Config::General DBI Email::Valid Crypt::PasswdMD5 GD::Text::Wrap GD MIME::Lite XML::RSS CGI::Session Encode utf8 LockFile::Simple  Mail::Internet Email::Valid
 DEBIAN_PACKAGES=libxml-rss-perl liblocale-gettext-perl libconfig-general-perl libhtml-template-perl libcrypt-passwdmd5-perl libgd-text-perl libmime-lite-perl libcgi-session-perl liblockfile-simple-perl libgd-perl libclass-dbi-pg-perl libclass-dbi-perl libdbd-pg-perl libemail-valid-perl libc6-dev
@@ -82,19 +82,19 @@
 install-bots:
 	install -d -m 755 $(BOTSDIR)	
 	install -d -m 755 $(BOTSDIR)/misc/
-	install -m 755 vhffs-robots/src/*.pl $(BOTSDIR)/
-	install -m 644 vhffs-robots/misc/awstats.conf $(BOTSDIR)/misc/
+	install -m 755 vhffs-robots/src/*.pl            $(BOTSDIR)/
+	install -m 644 vhffs-robots/misc/awstats.conf   $(BOTSDIR)/misc/
 	install -m 644 vhffs-robots/misc/awstats.sample $(BOTSDIR)/misc/
 
 install-doc:
 	install -d -m 755 $(DOCDIR)	
 	install -d -m 755 $(DOCDIR)/config
 	install -d -m 755 $(DOCDIR)/config/apache
-	install -m 644 vhffs-doc/AUTHORS $(DOCDIR)/
-	install -m 644 vhffs-doc/CONVENTION-fr $(DOCDIR)/
-	install -m 644 vhffs-doc/HOWTO* $(DOCDIR)/
-	install -m 644 vhffs-doc/README* $(DOCDIR)/
-	install -m 644 vhffs-doc/LICENCE* $(DOCDIR)/
+	install -m 644 vhffs-doc/AUTHORS         $(DOCDIR)/
+	install -m 644 vhffs-doc/CONVENTION-fr   $(DOCDIR)/
+	install -m 644 vhffs-doc/HOWTO*          $(DOCDIR)/
+	install -m 644 vhffs-doc/README*         $(DOCDIR)/
+	install -m 644 vhffs-doc/LICENSE*        $(DOCDIR)/
 	install -m 644 vhffs-doc/config/apache/* $(DOCDIR)/config/apache/
 
 install-conf:
@@ -105,7 +105,7 @@
 	install -d -m 755 $(BACKENDDIR)
 	install -d -m 755 $(BACKENDDIR)/pgsql
 	install -d -m 755 $(BACKENDDIR)/tools
-	install -m 644 vhffs-backend/src/pgsql/*.sql $(BACKENDDIR)/pgsql/
+	install -m 644 vhffs-backend/src/pgsql/*.sql    $(BACKENDDIR)/pgsql/
 	install -m 755 vhffs-backend/tools/vhffs-initdb $(BACKENDDIR)/tools/vhffs-initdb
 
 install-intl:
@@ -118,27 +118,27 @@
 
 install-tools:
 	install -d -m 755 $(TOOLSDIR)
-	install -m 755 vhffs-tools/src/vhffs-blankmysql $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-dumpmysql $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-blankmysql   $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-dumpmysql    $(TOOLSDIR)/
 	install -m 755 vhffs-tools/src/vhffs-checkinstall $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-groupdel $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-groupinfo $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-moderate $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-passwd $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-quota $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-userdel $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-userinfo $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-usermod $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-webdir $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-firstadmin $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-groupdel     $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-groupinfo    $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-moderate     $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-passwd       $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-quota        $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-userdel      $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-userinfo     $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-usermod      $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-webdir       $(TOOLSDIR)/
+	install -m 755 vhffs-tools/src/vhffs-firstadmin   $(TOOLSDIR)/
 
 
 install-listengine-web:
 	install -d -m 755 $(LEWEB)
 	install -d -m 755 $(LEWEB)/archives
 	install -d -m 755 $(LEWEB)/templates
-	install -m 755 vhffs-listengine/src/archives/archives.pl $(LEWEB)/archives/
-	install -m 755 vhffs-listengine/src/archives/show_msg.pl $(LEWEB)/archives/
+	install -m 755 vhffs-listengine/src/archives/archives.pl      $(LEWEB)/archives/
+	install -m 755 vhffs-listengine/src/archives/show_msg.pl      $(LEWEB)/archives/
 	install -m 644 vhffs-listengine/src/archives/templates/*.tmpl $(LEWEB)/templates
 	ln -fs $(PANELDIR)/themes $(LEWEB)/archives/themes
 
@@ -249,43 +249,43 @@
 	install -d -m 755 $(PANELDIR)/user
 	install -d -m 755 $(PANELDIR)/web
 	#install files
-	install -m 644 vhffs-panel/*.js $(PANELDIR)/
-	install -m 644 vhffs-panel/*.ico $(PANELDIR)/
-	install -m 755 vhffs-panel/*.pl $(PANELDIR)/
-	install -m 755 vhffs-panel/acl/*.pl $(PANELDIR)/acl/
-	install -m 755 vhffs-panel/admin/*.pl $(PANELDIR)/admin/
-	install -m 755 vhffs-panel/admin/cvs/*.pl $(PANELDIR)/admin/cvs/
-	install -m 755 vhffs-panel/admin/dns/*.pl $(PANELDIR)/admin/dns/
-	install -m 755 vhffs-panel/admin/group/*.pl $(PANELDIR)/admin/group/
+	install -m 644 vhffs-panel/*.js                 $(PANELDIR)/
+	install -m 644 vhffs-panel/*.ico                $(PANELDIR)/
+	install -m 755 vhffs-panel/*.pl                 $(PANELDIR)/
+	install -m 755 vhffs-panel/acl/*.pl             $(PANELDIR)/acl/
+	install -m 755 vhffs-panel/admin/*.pl           $(PANELDIR)/admin/
+	install -m 755 vhffs-panel/admin/cvs/*.pl       $(PANELDIR)/admin/cvs/
+	install -m 755 vhffs-panel/admin/dns/*.pl       $(PANELDIR)/admin/dns/
+	install -m 755 vhffs-panel/admin/group/*.pl     $(PANELDIR)/admin/group/
 	install -m 755 vhffs-panel/admin/largefile/*.pl $(PANELDIR)/admin/largefile/
-	install -m 755 vhffs-panel/admin/mail/*.pl $(PANELDIR)/admin/mail/
-	install -m 755 vhffs-panel/admin/mailing/*.pl $(PANELDIR)/admin/mailing/
-	install -m 755 vhffs-panel/admin/mysql/*.pl $(PANELDIR)/admin/mysql/
-	install -m 755 vhffs-panel/admin/object/*.pl $(PANELDIR)/admin/object/
-	install -m 755 vhffs-panel/admin/pgsql/*.pl $(PANELDIR)/admin/pgsql/
-	install -m 755 vhffs-panel/admin/svn/*.pl $(PANELDIR)/admin/svn/
-	install -m 755 vhffs-panel/admin/user/*.pl $(PANELDIR)/admin/user/
-	install -m 755 vhffs-panel/admin/web/*.pl $(PANELDIR)/admin/web/
-	install -m 755 vhffs-panel/cvs/*.pl $(PANELDIR)/cvs/
-	install -m 755 vhffs-panel/dns/*.pl $(PANELDIR)/dns/
-	install -m 755 vhffs-panel/group/*.pl $(PANELDIR)/group/
-	install -m 755 vhffs-panel/help/*.html $(PANELDIR)/help/
-	install -m 755 vhffs-panel/largefile/*.pl $(PANELDIR)/largefile/
-	install -m 755 vhffs-panel/mail/*.pl $(PANELDIR)/mail/
-	install -m 755 vhffs-panel/mailinglist/*.pl $(PANELDIR)/mailinglist/
-	install -m 755 vhffs-panel/mysql/*.pl $(PANELDIR)/mysql/
-	install -m 755 vhffs-panel/object/*.pl $(PANELDIR)/object/
-	install -m 755 vhffs-panel/pgsql/*.pl $(PANELDIR)/pgsql/
-	install -m 755 vhffs-panel/public/*.pl $(PANELDIR)/public/
-	install -m 755 vhffs-panel/public/rss/*.pl $(PANELDIR)/public/rss/
-	install -m 755 vhffs-panel/svn/*.pl $(PANELDIR)/svn/
-	install -m 755 vhffs-panel/user/*.pl $(PANELDIR)/user/
-	install -m 755 vhffs-panel/web/*.pl $(PANELDIR)/web/
+	install -m 755 vhffs-panel/admin/mail/*.pl      $(PANELDIR)/admin/mail/
+	install -m 755 vhffs-panel/admin/mailing/*.pl   $(PANELDIR)/admin/mailing/
+	install -m 755 vhffs-panel/admin/mysql/*.pl     $(PANELDIR)/admin/mysql/
+	install -m 755 vhffs-panel/admin/object/*.pl    $(PANELDIR)/admin/object/
+	install -m 755 vhffs-panel/admin/pgsql/*.pl     $(PANELDIR)/admin/pgsql/
+	install -m 755 vhffs-panel/admin/svn/*.pl       $(PANELDIR)/admin/svn/
+	install -m 755 vhffs-panel/admin/user/*.pl      $(PANELDIR)/admin/user/
+	install -m 755 vhffs-panel/admin/web/*.pl       $(PANELDIR)/admin/web/
+	install -m 755 vhffs-panel/cvs/*.pl             $(PANELDIR)/cvs/
+	install -m 755 vhffs-panel/dns/*.pl             $(PANELDIR)/dns/
+	install -m 755 vhffs-panel/group/*.pl           $(PANELDIR)/group/
+	install -m 755 vhffs-panel/help/*.html          $(PANELDIR)/help/
+	install -m 755 vhffs-panel/largefile/*.pl       $(PANELDIR)/largefile/
+	install -m 755 vhffs-panel/mail/*.pl            $(PANELDIR)/mail/
+	install -m 755 vhffs-panel/mailinglist/*.pl     $(PANELDIR)/mailinglist/
+	install -m 755 vhffs-panel/mysql/*.pl           $(PANELDIR)/mysql/
+	install -m 755 vhffs-panel/object/*.pl          $(PANELDIR)/object/
+	install -m 755 vhffs-panel/pgsql/*.pl           $(PANELDIR)/pgsql/
+	install -m 755 vhffs-panel/public/*.pl          $(PANELDIR)/public/
+	install -m 755 vhffs-panel/public/rss/*.pl      $(PANELDIR)/public/rss/
+	install -m 755 vhffs-panel/svn/*.pl             $(PANELDIR)/svn/
+	install -m 755 vhffs-panel/user/*.pl            $(PANELDIR)/user/
+	install -m 755 vhffs-panel/web/*.pl             $(PANELDIR)/web/
 	#install themes now
 	#default theme
 	install -d -m 755 $(PANELDIR)/themes/default
 	install -d -m 755 $(PANELDIR)/themes/default/images
-	install -m 644 vhffs-panel/themes/default/*.css $(PANELDIR)/themes/default/
+	install -m 644 vhffs-panel/themes/default/*.css        $(PANELDIR)/themes/default/
 	install -m 644 vhffs-panel/themes/default/images/*.png $(PANELDIR)/themes/default/images

Attachment: pgpkOzYJfrGdh.pgp
Description: PGP signature

Follow-Ups:
- [vhffs-dev] Patch licence/license - suite et fin ?
  - From: Cyril Brulebois

Messages sorted by: [ date | thread ]
Prev by Date: [vhffs-dev] [svn] commit: r209 - in /trunk/vhffs-intl: DOC createpot.sh src/fr/fr.pot src/vhffs.pot
Next by Date: [vhffs-dev] unsubscribe
Previous by thread: [vhffs-dev] [svn] commit: r209 - in /trunk/vhffs-intl: DOC createpot.sh src/fr/fr.pot src/vhffs.pot
Next by thread: [vhffs-dev] Patch licence/license - suite et fin ?

Mail converted by MHonArc 2.6.19+

http://listengine.tuxfamily.org/