[vhffs-dev] [vhffs-dev] [svn] commit: r128 - in /trunk: ./ vhffs-api/src/Vhffs/ vhffs-api/src/Vhffs/Panel/ vhffs-api/src/Vhffs/Robots/ vhffs-backend/tools/ vhffs-jabber/ vhffs-panel/templates/admin/web/ vhffs-robots/src/ vhffs-tools/src/ |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
- To: vhffs-dev@xxxxxxxxx
- Subject: [vhffs-dev] [vhffs-dev] [svn] commit: r128 - in /trunk: ./ vhffs-api/src/Vhffs/ vhffs-api/src/Vhffs/Panel/ vhffs-api/src/Vhffs/Robots/ vhffs-backend/tools/ vhffs-jabber/ vhffs-panel/templates/admin/web/ vhffs-robots/src/ vhffs-tools/src/
- From: vhffs-dev@xxxxxxxxx
- Date: Thu Jan 5 20:54:36 2006 +00
- Delivery-date: Fri, 06 Jan 2006 15:31:07 +0100
Author: soda
Date: Thu Jan 5 21:54:32 2006
New Revision: 128
Log:
* Mass bugfixes
* Add vhffs-jabber, not functionnal now
Added:
trunk/Relases.notes
trunk/vhffs-jabber/
trunk/vhffs-jabber/README
trunk/vhffs-jabber/vhffspipe.pl (with props)
trunk/vhffs-robots/src/refused_web.pl (with props)
trunk/vhffs-tools/src/vhffs-moderate
- copied unchanged from r124, trunk/vhffs-tools/src/vhffs-moderate.pl
Removed:
trunk/vhffs-tools/src/vhffs-moderate.pl
Modified:
trunk/Makefile
trunk/make_release2
trunk/vhffs-api/src/Vhffs/Constants.pm
trunk/vhffs-api/src/Vhffs/Panel/User.pm
trunk/vhffs-api/src/Vhffs/Robots.pm
trunk/vhffs-api/src/Vhffs/Robots/Group.pm
trunk/vhffs-backend/tools/vhffs-initdb
trunk/vhffs-panel/templates/admin/web/part-modo.tmpl
trunk/vhffs-panel/templates/admin/web/part.tmpl
trunk/vhffs-robots/src/create_mysql.pl
trunk/vhffs-robots/src/create_pgsql.pl
trunk/vhffs-robots/src/delete_users.pl
Modified: trunk/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Jan 5 21:54:32 2006
@@ -17,6 +17,7 @@
BOTSDIR=3D"${DESDTIR}/usr/lib/vhffs/bots/"
LEDIR=3D"${DESDTIR}/usr/lib/vhffs/listengine/"
TOOLSDIR=3D"${DESDTIR}/usr/bin/"
+JABBERDIR=3D"${DESDTIR}/usr/share/vhffs/jabber/"
LEARCHIVES=3D"${DESDTIR}/usr/share/vhffs/listengine/archives"
=20
=20
@@ -108,6 +109,18 @@
fi
echo "done"
=20
+echo -n "Install VHFFS jabber driver ... "
+ rm -rf "${DESTDIR}/${JABBERDIR}" 1>/dev/null 2>&1
+ mkdir -p "${DESTDIR}/${JABBERDIR}"
+ if [ ! -d "${CURRENTDIR}/vhffs-jabber/" ]; then
+ echo "vhffs-jabber module not found in sources"
+ else
+ cp -f vhffs-jabber/vhffspipe.pl "${DESTDIR}/${JABBERDIR}/"
+ cp -f vhffs-jabber/README "${DESTDIR}/${JABBERDIR}/"
+ chmod 755 "${DESTDIR}/${JABBERDIR}/vhffspipe.pl"
+ chmod 644 "${DESTDIR}/${JABBERDIR}/README"
+ echo "done"
+ fi
=20
echo -n "Install VHFFS intl ... "
rm -rf "${DESTDIR}/${INTLDIR}" 1>/dev/null 2>&1
@@ -200,3 +213,12 @@
done
echo "done"
fi=20
+
+echo ""
+echo "*********************************"
+echo ""
+echo "VHFFS is now probably installed."
+echo "You can check your installation with vhffs-checkinstall."
+echo "For help: http://vhffs.org or post on vhffs@xxxxxxxxx."
+
+exit 0
Modified: trunk/make_release2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/make_release2 (original)
+++ trunk/make_release2 Thu Jan 5 21:54:32 2006
@@ -7,7 +7,7 @@
use File::Copy;
use IO::Handle;
=20
-my $VERSION =3D "4.0rc8";
+my $VERSION =3D "4.0rc9";
my @files_to_delete =3D qw(backup.sh fixperm.sh make_release make_release2=
svn-commit);
my @files_to_package =3D qw( TODO Makefile Changelog AUTHORS vhffs-api vhf=
fs-backend vhffs-doc vhffs-intl vhffs-listengine vhffs-panel vhffs-robots v=
hffs-shells debian vhffs-tools);
my $VERBOSE =3D 0;
Modified: trunk/vhffs-api/src/Vhffs/Constants.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/vhffs-api/src/Vhffs/Constants.pm (original)
+++ trunk/vhffs-api/src/Vhffs/Constants.pm Thu Jan 5 21:54:32 2006
@@ -8,7 +8,7 @@
use constant
{
VHFFS_VERSION =3D> 4.0,
- VHFFS_RELEASE_NAME =3D> "VHFFS4 RC7",
+ VHFFS_RELEASE_NAME =3D> "VHFFS4 RC9",
=20
WAITING_FOR_VALIDATION =3D> 1,
VALIDATION_REFUSED =3D> 2,
Modified: trunk/vhffs-api/src/Vhffs/Panel/User.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/vhffs-api/src/Vhffs/Panel/User.pm (original)
+++ trunk/vhffs-api/src/Vhffs/Panel/User.pm Thu Jan 5 21:54:32 2006
@@ -4,12 +4,8 @@
=20
use DBI;
use POSIX qw(locale_h);
-use HTML::Template;
use locale;
use Locale::gettext;
-use Data::Dumper;
-use CGI;
-use CGI::Session;
use strict;
use Vhffs::User;
use Vhffs::Main;
Modified: trunk/vhffs-api/src/Vhffs/Robots.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/vhffs-api/src/Vhffs/Robots.pm (original)
+++ trunk/vhffs-api/src/Vhffs/Robots.pm Thu Jan 5 21:54:32 2006
@@ -4,7 +4,7 @@
use LockFile::Simple qw(lock trylock unlock);
use constant
{
- LOCKFILE =3D> "/tmp/vhffslock",
+ LOCKFILE =3D> "/var/lock/vhffs",
LOGFILE =3D> "/var/log/vhffs"
};
=20
@@ -12,20 +12,20 @@
=20
sub lock
{
- LockFile::Simple::lock( ::LOCKFILE ) or exit( 1 );
+ LockFile::Simple::lock( LOCKFILE ) or exit( 1 );
return 0;
}
=20
sub unlock
{
- LockFile::Simple::unlock( ::LOCKFILE );
+ LockFile::Simple::unlock( LOCKFILE );
return 0;
}
=20
sub vhffs_log
{
my $sent =3D shift;
- my $file =3D ::LOGFILE;
+ my $file =3D LOGFILE;
open( FILE , ">>$file" ) or return -1;
=09
print FILE $sent."\n";
Modified: trunk/vhffs-api/src/Vhffs/Robots/Group.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/vhffs-api/src/Vhffs/Robots/Group.pm (original)
+++ trunk/vhffs-api/src/Vhffs/Robots/Group.pm Thu Jan 5 21:54:32 2006
@@ -64,6 +64,8 @@
{
my $main =3D shift;
my $group =3D shift;
+ my $cmd;
+
=20
my $hash;
if( ( defined $group ) && ( $group->fetch > 0 ) )
@@ -72,10 +74,15 @@
my $hash =3D Vhffs::Functions::hash_groupname( $group->get_groupname , $=
main );=09
if( -d $hash )
{
- my $cmd =3D "rmdir $hash ";
+ $cmd =3D "rm -f $hash/* ";
+ system( $cmd );
+
+ $cmd =3D "rmdir $hash ";
system( $cmd );
}
}
+
+ return 0;
}
=20
=20
Modified: trunk/vhffs-backend/tools/vhffs-initdb
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/vhffs-backend/tools/vhffs-initdb (original)
+++ trunk/vhffs-backend/tools/vhffs-initdb Thu Jan 5 21:54:32 2006
@@ -3,8 +3,8 @@
#Create VHFFS database
#This script should be run with the identity of the postgres superuser
=20
-SCRIPTDIR=3D"/home/soda/vhffs/vhffs-backend/src/pgsql"
-FILES=3D"create_object.sql create_object_history.sql create_acl.sql create=
_user.sql create_use_info.sql create_groups.sql create_groups_info.sql crea=
te_user_info.sql create_user_group.sql create_shadow_view.sql create_pass_v=
iew.sql create_panel_prefs.sql create_notes.sql create_mxdomain.sql create_=
boxes.sql create_forward.sql create_dns.sql create_cvs.sql create_ml.sql cr=
eate_mysql.sql create_postgreql.sql create_svn.sql create_mailings.sql crea=
te_ml.sql create_confirmation.sql create_httpd.sql create_postgresql.sql"
+SCRIPTDIR=3D"/usr/share/vhffs/backend/"
+FILES=3D"create_object.sql create_object_history.sql create_acl.sql create=
_user.sql create_use_info.sql create_groups.sql create_groups_info.sql crea=
te_user_info.sql create_user_group.sql create_shadow_view.sql create_pass_v=
iew.sql create_panel_prefs.sql create_notes.sql create_mxdomain.sql create_=
boxes.sql create_forward.sql create_dns.sql create_cvs.sql create_ml.sql cr=
eate_mysql.sql create_postgreql.sql create_svn.sql create_mailings.sql crea=
te_ml.sql create_confirmation.sql create_postgresql.sql create_httpd.sql"
DB=3D$1
DBUSER=3D$2
=20
Modified: trunk/vhffs-panel/templates/admin/web/part-modo.tmpl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/vhffs-panel/templates/admin/web/part-modo.tmpl (original)
+++ trunk/vhffs-panel/templates/admin/web/part-modo.tmpl Thu Jan 5 21:54:3=
2 2006
@@ -1,7 +1,7 @@
=20
<tr>
<td>
- <a href=3D"<TMPL_VAR NAME=3D"SERVERNAME">"><TMPL_VAR NAME=3D"SERVERNAME"=
></a>
+ <a href=3D"http://<TMPL_VAR NAME=3D"SERVERNAME">"><TMPL_VAR NAME=3D"SERV=
ERNAME"></a>
</td>
<td>
<TMPL_VAR NAME=3D"GROUP">=20
Modified: trunk/vhffs-panel/templates/admin/web/part.tmpl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/vhffs-panel/templates/admin/web/part.tmpl (original)
+++ trunk/vhffs-panel/templates/admin/web/part.tmpl Thu Jan 5 21:54:32 2006
@@ -1,7 +1,7 @@
=20
<tr>
<td>
- <a href=3D"<TMPL_VAR NAME=3D"SERVERNAME">"><TMPL_VAR NAME=3D"SERVERNAME"=
></a>
+ <a href=3D"http://<TMPL_VAR NAME=3D"SERVERNAME">"><TMPL_VAR NAME=3D"SERV=
ERNAME"></a>
</td>
<td>
<TMPL_VAR NAME=3D"GROUP">=20
Modified: trunk/vhffs-robots/src/create_mysql.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/vhffs-robots/src/create_mysql.pl (original)
+++ trunk/vhffs-robots/src/create_mysql.pl Thu Jan 5 21:54:32 2006
@@ -9,7 +9,7 @@
use Vhffs::Constants;
use Vhffs::Main;
=20
-lock();
+Vhffs::Robots::lock();
=20
my $main =3D init Vhffs::Main;
my $dbs =3D Vhffs::Services::Mysql::getall( $main , Vhffs::Constants::WAIT=
ING_FOR_CREATION , undef , undef );
@@ -30,5 +30,5 @@
}
=20
=20
-unlock();
+Vhffs::Robots::unlock();
exit 0;
Modified: trunk/vhffs-robots/src/create_pgsql.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/vhffs-robots/src/create_pgsql.pl (original)
+++ trunk/vhffs-robots/src/create_pgsql.pl Thu Jan 5 21:54:32 2006
@@ -8,7 +8,7 @@
Vhffs::Robots::lock();
=20
my $main =3D init Vhffs::Main;
-my $dbs =3D Vhffs::Services::Postgres::getall( $main );
+my $dbs =3D Vhffs::Services::Postgres::getall( $main , Vhffs::Constants::W=
AITING_FOR_CREATION );
my $db;
=20
foreach $db ( @{$dbs} )
Modified: trunk/vhffs-robots/src/delete_users.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/vhffs-robots/src/delete_users.pl (original)
+++ trunk/vhffs-robots/src/delete_users.pl Thu Jan 5 21:54:32 2006
@@ -36,7 +36,7 @@
=09
if( $ok =3D=3D 1 )
{
- vhffs_log( sprintf( "USER delete user %s" , $user->get_username ) );
+ Vhffs::Robots::vhffs_log( sprintf( "USER delete user %s" , $user->get_u=
sername ) );
if( Vhffs::Robots::User::delete( $vhffs, $user ) < 0 )
{
Vhffs::Robots::vhffs_log( sprintf("Cannot delete user files %s" , $use=
r->get_username ) );
@@ -48,7 +48,7 @@
=20
if( $user->delete < 0 )
{
- Vhffs::Robots::vhffs_log( sprintf("Cannot delete object files %s" , $u=
ser->get_username ) );
+ Vhffs::Robots::vhffs_log( sprintf("Cannot delete user object %s" , $us=
er->get_username ) );
}
else