| [vhffs-dev] [1032] Merged admin part into user part |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 1032
Author: gradator
Date: 2007-10-26 19:39:45 +0000 (Fri, 26 Oct 2007)
Log Message:
-----------
Merged admin part into user part
Modified Paths:
--------------
trunk/vhffs-api/src/Vhffs/Panel/Admin.pm
trunk/vhffs-api/src/Vhffs/Panel/Cvs.pm
trunk/vhffs-api/src/Vhffs/Panel/DNS.pm
trunk/vhffs-api/src/Vhffs/Panel/Git.pm
trunk/vhffs-api/src/Vhffs/Panel/Group.pm
trunk/vhffs-api/src/Vhffs/Panel/Mail.pm
trunk/vhffs-api/src/Vhffs/Panel/MailingList.pm
trunk/vhffs-api/src/Vhffs/Panel/Main.pm
trunk/vhffs-api/src/Vhffs/Panel/Mysql.pm
trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm
trunk/vhffs-api/src/Vhffs/Panel/Repository.pm
trunk/vhffs-api/src/Vhffs/Panel/Svn.pm
trunk/vhffs-api/src/Vhffs/Panel/User.pm
trunk/vhffs-panel/Makefile.am
trunk/vhffs-panel/admin/cvs/list.pl
trunk/vhffs-panel/admin/dns/list.pl
trunk/vhffs-panel/admin/git/list.pl
trunk/vhffs-panel/admin/group/list.pl
trunk/vhffs-panel/admin/mail/list.pl
trunk/vhffs-panel/admin/mailinglist/list.pl
trunk/vhffs-panel/admin/mysql/list.pl
trunk/vhffs-panel/admin/pgsql/list.pl
trunk/vhffs-panel/admin/repository/list.pl
trunk/vhffs-panel/admin/svn/list.pl
trunk/vhffs-panel/admin/user/list.pl
trunk/vhffs-panel/admin/web/list.pl
trunk/vhffs-panel/cvs/prefs.pl
trunk/vhffs-panel/dns/prefs.pl
trunk/vhffs-panel/git/prefs.pl
trunk/vhffs-panel/group/prefs.pl
trunk/vhffs-panel/mail/prefs.pl
trunk/vhffs-panel/mailinglist/prefs.pl
trunk/vhffs-panel/mysql/prefs.pl
trunk/vhffs-panel/pgsql/prefs.pl
trunk/vhffs-panel/repository/prefs.pl
trunk/vhffs-panel/subscribe.pl
trunk/vhffs-panel/svn/prefs.pl
trunk/vhffs-panel/templates/Makefile.am
trunk/vhffs-panel/templates/admin/cvs/part.tmpl
trunk/vhffs-panel/templates/admin/dns/part.tmpl
trunk/vhffs-panel/templates/admin/git/part.tmpl
trunk/vhffs-panel/templates/admin/group/part.tmpl
trunk/vhffs-panel/templates/admin/mail/part.tmpl
trunk/vhffs-panel/templates/admin/mailinglist/part.tmpl
trunk/vhffs-panel/templates/admin/mysql/part.tmpl
trunk/vhffs-panel/templates/admin/pgsql/part.tmpl
trunk/vhffs-panel/templates/admin/repository/part.tmpl
trunk/vhffs-panel/templates/admin/svn/part.tmpl
trunk/vhffs-panel/templates/admin/user/part.tmpl
trunk/vhffs-panel/templates/admin/web/part.tmpl
trunk/vhffs-panel/templates/cvs/prefs.tmpl
trunk/vhffs-panel/templates/dns/prefs.tmpl
trunk/vhffs-panel/templates/git/prefs.tmpl
trunk/vhffs-panel/templates/group/prefs.tmpl
trunk/vhffs-panel/templates/mail/prefs.tmpl
trunk/vhffs-panel/templates/mailinglist/prefs.tmpl
trunk/vhffs-panel/templates/mysql/prefs.tmpl
trunk/vhffs-panel/templates/pgsql/prefs.tmpl
trunk/vhffs-panel/templates/repository/prefs.tmpl
trunk/vhffs-panel/templates/svn/prefs.tmpl
trunk/vhffs-panel/templates/user/prefs.tmpl
trunk/vhffs-panel/user/prefs.pl
Removed Paths:
-------------
trunk/vhffs-panel/admin/cvs/edit.pl
trunk/vhffs-panel/admin/cvs/edit_submit.pl
trunk/vhffs-panel/admin/cvs/show.pl
trunk/vhffs-panel/admin/group/edit.pl
trunk/vhffs-panel/admin/group/edit_submit.pl
trunk/vhffs-panel/admin/group/show.pl
trunk/vhffs-panel/admin/mail/change_forward.pl
trunk/vhffs-panel/admin/mail/delete_box.pl
trunk/vhffs-panel/admin/mail/delete_forward.pl
trunk/vhffs-panel/admin/mail/edit.pl
trunk/vhffs-panel/admin/mail/password_box.pl
trunk/vhffs-panel/admin/mail/show.pl
trunk/vhffs-panel/admin/mysql/edit.pl
trunk/vhffs-panel/admin/mysql/edit_submit.pl
trunk/vhffs-panel/admin/mysql/show.pl
trunk/vhffs-panel/admin/pgsql/edit.pl
trunk/vhffs-panel/admin/pgsql/edit_submit.pl
trunk/vhffs-panel/admin/pgsql/show.pl
trunk/vhffs-panel/admin/repository/edit.pl
trunk/vhffs-panel/admin/repository/edit_submit.pl
trunk/vhffs-panel/admin/repository/show.pl
trunk/vhffs-panel/admin/user/edit.pl
trunk/vhffs-panel/admin/user/edit_note.pl
trunk/vhffs-panel/admin/user/edit_submit.pl
trunk/vhffs-panel/admin/user/show.pl
trunk/vhffs-panel/templates/admin/cvs/edit.tmpl
trunk/vhffs-panel/templates/admin/cvs/part-modo.tmpl
trunk/vhffs-panel/templates/admin/cvs/show.tmpl
trunk/vhffs-panel/templates/admin/dns/TODO
trunk/vhffs-panel/templates/admin/dns/part-modo.tmpl
trunk/vhffs-panel/templates/admin/git/part-modo.tmpl
trunk/vhffs-panel/templates/admin/group/edit.tmpl
trunk/vhffs-panel/templates/admin/group/part-modo.tmpl
trunk/vhffs-panel/templates/admin/group/show.tmpl
trunk/vhffs-panel/templates/admin/mail/admin_box-modo.tmpl
trunk/vhffs-panel/templates/admin/mail/admin_box.tmpl
trunk/vhffs-panel/templates/admin/mail/admin_forward-modo.tmpl
trunk/vhffs-panel/templates/admin/mail/admin_forward.tmpl
trunk/vhffs-panel/templates/admin/mail/edit.tmpl
trunk/vhffs-panel/templates/admin/mail/part-modo.tmpl
trunk/vhffs-panel/templates/admin/mail/show.tmpl
trunk/vhffs-panel/templates/admin/mysql/edit.tmpl
trunk/vhffs-panel/templates/admin/mysql/part-modo.tmpl
trunk/vhffs-panel/templates/admin/mysql/show.tmpl
trunk/vhffs-panel/templates/admin/pgsql/edit.tmpl
trunk/vhffs-panel/templates/admin/pgsql/part-modo.tmpl
trunk/vhffs-panel/templates/admin/pgsql/show.tmpl
trunk/vhffs-panel/templates/admin/repository/edit.tmpl
trunk/vhffs-panel/templates/admin/repository/part-modo.tmpl
trunk/vhffs-panel/templates/admin/repository/show.tmpl
trunk/vhffs-panel/templates/admin/svn/part-modo.tmpl
trunk/vhffs-panel/templates/admin/user/edit-note.tmpl
trunk/vhffs-panel/templates/admin/user/edit.tmpl
trunk/vhffs-panel/templates/admin/user/group-part-show.tmpl
trunk/vhffs-panel/templates/admin/user/group-part.tmpl
trunk/vhffs-panel/templates/admin/user/part-modo.tmpl
trunk/vhffs-panel/templates/admin/user/show.tmpl
trunk/vhffs-panel/templates/admin/web/edit.tmpl
trunk/vhffs-panel/templates/admin/web/part-modo.tmpl
trunk/vhffs-panel/templates/admin/web/show.tmpl
Modified: trunk/vhffs-api/src/Vhffs/Panel/Admin.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Admin.pm 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-api/src/Vhffs/Panel/Admin.pm 2007-10-26 19:39:45 UTC (rev 1032)
@@ -335,11 +335,11 @@
push @$categories, get_cvs_category if($config->get_service_availability('cvs'));
push @$categories, get_svn_category if($config->get_service_availability('svn'));
push @$categories, get_dns_category if($config->get_service_availability('dns'));
+ push @$categories, get_git_category if($config->get_service_availability('git'));
push @$categories, get_mail_category if($config->get_service_availability('mail'));
push @$categories, get_mailing_category if($config->get_service_availability('mailinglist'));
push @$categories, get_repo_category if($config->get_service_availability('repository'));
-
return $categories;
}
@@ -366,12 +366,12 @@
push @$categories, get_pgsql_category if($config->get_service_availability('pgsql'));
push @$categories, get_cvs_category if($config->get_service_availability('cvs'));
push @$categories, get_svn_category if($config->get_service_availability('svn'));
+ push @$categories, get_git_category if($config->get_service_availability('git'));
push @$categories, get_dns_category if($config->get_service_availability('dns'));
push @$categories, get_mail_category if($config->get_service_availability('mail'));
push @$categories, get_mailing_category if($config->get_service_availability('mailinglist'));
push @$categories, get_repo_category if($config->get_service_availability('repository'));
-
return $categories;
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Cvs.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Cvs.pm 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-api/src/Vhffs/Panel/Cvs.pm 2007-10-26 19:39:45 UTC (rev 1032)
@@ -56,10 +56,10 @@
my $cvs = [];
if( defined $name ) {
- $sql = 'SELECT c.cvsroot, g.groupname, c.object_id AS oid, o.state FROM vhffs_cvs c INNER JOIN vhffs_object o ON o.object_id = c.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid WHERE cvsroot LIKE ?';
+ $sql = 'SELECT c.cvsroot, g.groupname, o.state FROM vhffs_cvs c INNER JOIN vhffs_object o ON o.object_id = c.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid WHERE cvsroot LIKE ?';
push(@params, '%'.$name.'%');
} else {
- $sql = 'SELECT c.cvsroot, g.groupname, c.object_id AS oid, o.state FROM vhffs_cvs c INNER JOIN vhffs_object o ON o.object_id = c.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid';
+ $sql = 'SELECT c.cvsroot, g.groupname, o.state FROM vhffs_cvs c INNER JOIN vhffs_object o ON o.object_id = c.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid';
}
my $dbh = $main->get_db_object();
my $sth = $dbh->prepare($sql) or return undef;
Modified: trunk/vhffs-api/src/Vhffs/Panel/DNS.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/DNS.pm 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-api/src/Vhffs/Panel/DNS.pm 2007-10-26 19:39:45 UTC (rev 1032)
@@ -56,10 +56,10 @@
my @params;
if( defined $name ) {
- $sql = 'SELECT ns.domain, ns.object_id AS oid, g.groupname, o.state FROM vhffs_dns ns INNER JOIN vhffs_object o ON o.object_id = ns.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid WHERE ns.domain LIKE ?';
+ $sql = 'SELECT ns.domain, g.groupname, o.state FROM vhffs_dns ns INNER JOIN vhffs_object o ON o.object_id = ns.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid WHERE ns.domain LIKE ?';
push(@params, '%'.$name.'%');
} else {
- $sql = 'SELECT ns.domain, ns.object_id AS oid, g.groupname, o.state FROM vhffs_dns ns INNER JOIN vhffs_object o ON o.object_id = ns.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid';
+ $sql = 'SELECT ns.domain, g.groupname, o.state FROM vhffs_dns ns INNER JOIN vhffs_object o ON o.object_id = ns.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid';
}
my $dbh = $main->get_db_object();
Modified: trunk/vhffs-api/src/Vhffs/Panel/Git.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Git.pm 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-api/src/Vhffs/Panel/Git.pm 2007-10-26 19:39:45 UTC (rev 1032)
@@ -89,10 +89,10 @@
my $gits = [];
if( defined $name ) {
- $sql = 'SELECT s.reponame AS gitroot, g.groupname, o.state, s.object_id AS oid FROM vhffs_git s INNER JOIN vhffs_object o ON o.object_id=s.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid WHERE s.reponame LIKE ?';
+ $sql = 'SELECT s.reponame AS gitroot, g.groupname, o.state FROM vhffs_git s INNER JOIN vhffs_object o ON o.object_id=s.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid WHERE s.reponame LIKE ?';
push(@params, '%'.$name.'%');
} else {
- $sql = 'SELECT s.reponame AS gitroot, g.groupname, o.state, s.object_id AS oid FROM vhffs_git s INNER JOIN vhffs_object o ON o.object_id=s.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid';
+ $sql = 'SELECT s.reponame AS gitroot, g.groupname, o.state FROM vhffs_git s INNER JOIN vhffs_object o ON o.object_id=s.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid';
}
my $dbh = $main->get_db_object();
Modified: trunk/vhffs-api/src/Vhffs/Panel/Group.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Group.pm 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-api/src/Vhffs/Panel/Group.pm 2007-10-26 19:39:45 UTC (rev 1032)
@@ -84,10 +84,10 @@
my $groups = [];
if( defined $name ) {
- $sql = 'SELECT g.groupname, g.object_id AS OID, o.state, u.username FROM vhffs_groups g INNER JOIN vhffs_object o ON g.object_id = o.object_id INNER JOIN vhffs_users u ON u.uid = o.owner_uid WHERE g.groupname LIKE ?';
+ $sql = 'SELECT g.groupname, o.state, u.username FROM vhffs_groups g INNER JOIN vhffs_object o ON g.object_id = o.object_id INNER JOIN vhffs_users u ON u.uid = o.owner_uid WHERE g.groupname LIKE ?';
push(@params, '%'.$name.'%');
} else {
- $sql = 'SELECT g.groupname, g.object_id AS OID, o.state, u.username FROM vhffs_groups g INNER JOIN vhffs_object o ON g.object_id = o.object_id INNER JOIN vhffs_users u ON u.uid = o.owner_uid WHERE g.groupname NOT IN ( SELECT username FROM vhffs_users )';
+ $sql = 'SELECT g.groupname, o.state, u.username FROM vhffs_groups g INNER JOIN vhffs_object o ON g.object_id = o.object_id INNER JOIN vhffs_users u ON u.uid = o.owner_uid WHERE g.groupname NOT IN ( SELECT username FROM vhffs_users )';
}
my $dbh = $main->get_db_object();
my $sth = $dbh->prepare( $sql ) or return undef;
Modified: trunk/vhffs-api/src/Vhffs/Panel/Mail.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Mail.pm 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-api/src/Vhffs/Panel/Mail.pm 2007-10-26 19:39:45 UTC (rev 1032)
@@ -53,10 +53,10 @@
my $mails = [];
if( defined $name ) {
- $sql = 'SELECT m.domain, m.object_id AS oid, o.state, g.groupname FROM vhffs_mxdomain m INNER JOIN vhffs_object o ON o.object_id = m.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid WHERE m.domain LIKE ?';
+ $sql = 'SELECT m.domain, o.state, g.groupname FROM vhffs_mxdomain m INNER JOIN vhffs_object o ON o.object_id = m.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid WHERE m.domain LIKE ?';
push(@params, '%'.$name.'%');
} else {
- $sql = 'SELECT m.domain, m.object_id AS oid, o.state, g.groupname FROM vhffs_mxdomain m INNER JOIN vhffs_object o ON o.object_id = m.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid';
+ $sql = 'SELECT m.domain, o.state, g.groupname FROM vhffs_mxdomain m INNER JOIN vhffs_object o ON o.object_id = m.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid';
}
my $dbh = $main->get_db_object();
Modified: trunk/vhffs-api/src/Vhffs/Panel/MailingList.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/MailingList.pm 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-api/src/Vhffs/Panel/MailingList.pm 2007-10-26 19:39:45 UTC (rev 1032)
@@ -54,11 +54,11 @@
my $mls = [];
if( defined $name ) {
- $sql = 'SELECT l.local_part, l.domain, g.groupname, l.object_id AS oid, o.state FROM vhffs_ml l INNER JOIN vhffs_object o ON o.object_id = l.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid WHERE l.local_part LIKE ? OR l.domain LIKE ?';
+ $sql = 'SELECT l.local_part, l.domain, g.groupname, o.state FROM vhffs_ml l INNER JOIN vhffs_object o ON o.object_id = l.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid WHERE l.local_part LIKE ? OR l.domain LIKE ?';
push(@params, '%'.$name.'%');
push(@params, '%'.$name.'%');
} else {
- $sql = 'SELECT l.local_part, l.domain, g.groupname, l.object_id AS oid, o.state FROM vhffs_ml l INNER JOIN vhffs_object o ON o.object_id = l.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid';
+ $sql = 'SELECT l.local_part, l.domain, g.groupname, o.state FROM vhffs_ml l INNER JOIN vhffs_object o ON o.object_id = l.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid';
}
my $dbh = $main->get_db_object();
my $sth = $dbh->prepare($sql) or return undef;
Modified: trunk/vhffs-api/src/Vhffs/Panel/Main.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Main.pm 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-api/src/Vhffs/Panel/Main.pm 2007-10-26 19:39:45 UTC (rev 1032)
@@ -407,7 +407,7 @@
$groupname = $session->param('project');
if( defined $groupname ) {
my $group = Vhffs::Group::get_by_groupname( $vhffs, $groupname );
- if( defined $group && $group->get_status == Vhffs::Constants::ACTIVATED && $group->is_user_in_group( $user ) ) {
+ if( defined $group && $group->get_status == Vhffs::Constants::ACTIVATED && $user->can_view( $group ) ) {
$panel->{'group'} = $group;
$panel->{'groupname'} = $groupname;
}
Modified: trunk/vhffs-api/src/Vhffs/Panel/Mysql.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Mysql.pm 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-api/src/Vhffs/Panel/Mysql.pm 2007-10-26 19:39:45 UTC (rev 1032)
@@ -66,11 +66,11 @@
my $mys = [];
if( defined $name ) {
- $sql = 'SELECT m.dbname, m.object_id AS oid, g.groupname, o.state FROM vhffs_mysql m INNER JOIN vhffs_object o ON o.object_id = m.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid WHERE m.dbname LIKE ? OR m.dbuser LIKE ?';
+ $sql = 'SELECT m.dbname, g.groupname, o.state FROM vhffs_mysql m INNER JOIN vhffs_object o ON o.object_id = m.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid WHERE m.dbname LIKE ? OR m.dbuser LIKE ?';
push(@params, '%'.$name.'%');
push(@params, '%'.$name.'%');
} else {
- $sql = 'SELECT m.dbname, m.object_id AS oid, g.groupname, o.state FROM vhffs_mysql m INNER JOIN vhffs_object o ON o.object_id = m.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid';
+ $sql = 'SELECT m.dbname, g.groupname, o.state FROM vhffs_mysql m INNER JOIN vhffs_object o ON o.object_id = m.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid';
}
my $dbh = $main->get_db_object();
Modified: trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm 2007-10-26 19:39:45 UTC (rev 1032)
@@ -56,10 +56,10 @@
my $pgs = [];
if( defined $name ) {
- $sql = 'SELECT p.dbname, p.object_id AS oid, g.groupname, o.state FROM vhffs_pgsql p INNER JOIN vhffs_object o ON o.object_id = p.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid WHERE p.dbname LIKE ? OR p.dbuser LIKE ?';
+ $sql = 'SELECT p.dbname, g.groupname, o.state FROM vhffs_pgsql p INNER JOIN vhffs_object o ON o.object_id = p.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid WHERE p.dbname LIKE ? OR p.dbuser LIKE ?';
push(@params, '%'.$name.'%', '%'.$name.'%');
} else {
- $sql = 'SELECT p.dbname, p.object_id AS oid, g.groupname, o.state FROM vhffs_pgsql p INNER JOIN vhffs_object o ON o.object_id = p.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid';
+ $sql = 'SELECT p.dbname, g.groupname, o.state FROM vhffs_pgsql p INNER JOIN vhffs_object o ON o.object_id = p.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid';
}
my $dbh = $main->get_db_object();
Modified: trunk/vhffs-api/src/Vhffs/Panel/Repository.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Repository.pm 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-api/src/Vhffs/Panel/Repository.pm 2007-10-26 19:39:45 UTC (rev 1032)
@@ -85,10 +85,10 @@
my $reps = [];
if( defined $name ) {
- $sql = 'SELECT r.name, g.groupname, o.state, r.object_id AS oid FROM vhffs_repository r INNER JOIN vhffs_object o ON o.object_id=r.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid WHERE r.name LIKE ?';
+ $sql = 'SELECT r.name, g.groupname, o.state FROM vhffs_repository r INNER JOIN vhffs_object o ON o.object_id=r.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid WHERE r.name LIKE ?';
push(@params, '%'.$name.'%');
} else {
- $sql = 'SELECT r.name, g.groupname, o.state, r.object_id AS oid FROM vhffs_repository r INNER JOIN vhffs_object o ON o.object_id=r.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid';
+ $sql = 'SELECT r.name, g.groupname, o.state FROM vhffs_repository r INNER JOIN vhffs_object o ON o.object_id=r.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid';
}
my $dbh = $main->get_db_object();
Modified: trunk/vhffs-api/src/Vhffs/Panel/Svn.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Svn.pm 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-api/src/Vhffs/Panel/Svn.pm 2007-10-26 19:39:45 UTC (rev 1032)
@@ -88,10 +88,10 @@
my $svns = [];
if( defined $name ) {
- $sql = 'SELECT s.reponame AS svnroot, g.groupname, o.state, s.object_id AS oid FROM vhffs_svn s INNER JOIN vhffs_object o ON o.object_id=s.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid WHERE s.reponame LIKE ?';
+ $sql = 'SELECT s.reponame AS svnroot, g.groupname, o.state FROM vhffs_svn s INNER JOIN vhffs_object o ON o.object_id=s.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid WHERE s.reponame LIKE ?';
push(@params, '%'.$name.'%');
} else {
- $sql = 'SELECT s.reponame AS svnroot, g.groupname, o.state, s.object_id AS oid FROM vhffs_svn s INNER JOIN vhffs_object o ON o.object_id=s.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid';
+ $sql = 'SELECT s.reponame AS svnroot, g.groupname, o.state FROM vhffs_svn s INNER JOIN vhffs_object o ON o.object_id=s.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid';
}
my $dbh = $main->get_db_object();
Modified: trunk/vhffs-api/src/Vhffs/Panel/User.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/User.pm 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-api/src/Vhffs/Panel/User.pm 2007-10-26 19:39:45 UTC (rev 1032)
@@ -102,11 +102,11 @@
my $users = [];
if( defined $name ) {
- $sql = 'SELECT u.uid, u.username, u.firstname, u.lastname , o.object_id AS oid, o.state FROM vhffs_users u INNER JOIN vhffs_object o ON o.object_id = u.object_id WHERE u.username LIKE ? OR u.firstname LIKE ? OR u.lastname LIKE ?';
+ $sql = 'SELECT u.username, u.firstname, u.lastname , o.state FROM vhffs_users u INNER JOIN vhffs_object o ON o.object_id = u.object_id WHERE u.username LIKE ? OR u.firstname LIKE ? OR u.lastname LIKE ?';
my $p = '%'.$name.'%';
push(@params, $p, $p, $p);
} else {
- $sql = 'SELECT u.uid, u.username, u.firstname, u.lastname , o.object_id AS oid, o.state FROM vhffs_users u INNER JOIN vhffs_object o ON o.object_id = u.object_id';
+ $sql = 'SELECT u.username, u.firstname, u.lastname , o.state FROM vhffs_users u INNER JOIN vhffs_object o ON o.object_id = u.object_id';
}
my $dbh = $main->get_db_object();
Modified: trunk/vhffs-panel/Makefile.am
===================================================================
--- trunk/vhffs-panel/Makefile.am 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/Makefile.am 2007-10-26 19:39:45 UTC (rev 1032)
@@ -17,69 +17,44 @@
acl/view.pl \
ajax/help.pl \
admin/index.pl \
- admin/cvs/edit_submit.pl \
- admin/cvs/edit.pl \
admin/cvs/index.pl \
admin/cvs/list.pl \
admin/cvs/search.pl \
- admin/cvs/show.pl \
admin/dns/index.pl \
admin/dns/list.pl \
admin/dns/search.pl \
- admin/group/edit_submit.pl \
- admin/group/edit.pl \
admin/group/index.pl \
admin/group/list.pl \
admin/group/search.pl \
- admin/group/show.pl \
- admin/mail/change_forward.pl \
- admin/mail/delete_box.pl \
- admin/mail/delete_forward.pl \
- admin/mail/edit.pl \
admin/mail/index.pl \
admin/mail/list.pl \
- admin/mail/password_box.pl \
admin/mail/search.pl \
- admin/mail/show.pl \
admin/mailinglist/index.pl \
admin/mailinglist/list.pl \
admin/mailinglist/search.pl \
- admin/mysql/edit_submit.pl \
- admin/mysql/edit.pl \
admin/mysql/index.pl \
admin/mysql/list.pl \
admin/mysql/search.pl \
- admin/mysql/show.pl \
admin/object/delete_avatar.pl \
admin/object/edit_submit.pl \
admin/object/edit.pl \
admin/object/list.pl \
admin/object/search.pl \
- admin/pgsql/edit_submit.pl \
- admin/pgsql/edit.pl \
admin/pgsql/index.pl \
admin/pgsql/list.pl \
admin/pgsql/search.pl \
- admin/pgsql/show.pl \
- admin/repository/edit_submit.pl \
- admin/repository/edit.pl \
admin/repository/index.pl \
admin/repository/list.pl \
admin/repository/search.pl \
- admin/repository/show.pl \
admin/svn/index.pl \
admin/svn/list.pl \
admin/svn/search.pl \
admin/git/index.pl \
admin/git/list.pl \
admin/git/search.pl \
- admin/user/edit_note.pl \
- admin/user/edit_submit.pl \
- admin/user/edit.pl \
admin/user/index.pl \
admin/user/list.pl \
admin/user/search.pl \
- admin/user/show.pl \
admin/web/index.pl \
admin/web/list.pl \
admin/web/search.pl \
Deleted: trunk/vhffs-panel/admin/cvs/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/cvs/edit.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/cvs/edit.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,207 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
-my $template;
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $object;
-
-if( $user->is_admin != 1 )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $name )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "CGI ERROR !");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined ( $object = Vhffs::Services::Cvs::get_by_cvsroot( $vhffs , $name ) ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "Cannot fetch object");
- $template->param( MESSAGE => $message );
-}
-else
-{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/cvs/edit.tmpl" );
-
- $template->param( TITLE => gettext("Edit CVS") );
-
-
- $template->param( TEXT_CVSROOT => gettext("Cvsroot") );
- $template->param( TEXT_PUBLIC => gettext("Public") );
- $template->param( TEXT_GROUP => gettext("Group") );
- $template->param( TEXT_OWNER => gettext("Owner") );
- $template->param( TEXT_STATUS => gettext("Status") );
- $template->param( TEXT_DESCRIPTION => gettext("Description") );
- $template->param( SEND => gettext("Send") );
- $template->param( TEXT_HISTORY => gettext("History") );
-
- $template->param( VALUE_PRIVATE => gettext("No") );
- $template->param( VALUE_PUBLIC => gettext("Yes") );
-
- if( $object->is_public == 1 )
- {
- $template->param( PUBLIC_SELECTED => "selected" );
- }
- else
- {
- $template->param( PRIVATE_SELECTED => "selected" );
- }
-
- $template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $object->get_description ) );
- $template->param( VALUE_CVSROOT => $object->get_cvsroot);
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
-
- my $oid = $object->{'object_id'};
- $template->param( VALUE_HISTORY => "/history.pl?OID=$oid" );
-
- $template->param( TEXT_STATUS_WAITING_FOR_VALIDATION => gettext("Waiting for validation") );
- $template->param( TEXT_STATUS_VALIDATION_REFUSED => gettext("Validation refused") );
- $template->param( TEXT_STATUS_WAITING_FOR_CREATION => gettext("Waiting for creation") );
- $template->param( TEXT_STATUS_CREATING_ERROR => gettext("Creating error") );
- $template->param( TEXT_STATUS_ACTIVATED => gettext("Activated") );
- $template->param( TEXT_STATUS_CREATED => gettext("Created") );
- $template->param( TEXT_STATUS_SUSPENDED => gettext("Suspended") );
- $template->param( TEXT_STATUS_SUSPENDED_BEFORE_DELETED => gettext("Suspended") );
- $template->param( TEXT_STATUS_WAITING_FOR_MODIFICATION => gettext("Waiting for modification") );
- $template->param( TEXT_STATUS_MODIFICATION_ERROR => gettext("Modification error") );
- $template->param( TEXT_STATUS_MODIFICATION_APPLIED => gettext("Modification applied") );
- $template->param( TEXT_STATUS_TO_DELETE => gettext("Will be deleted") );
-
-
- $template->param( VALUE_STATUS_WAITING_FOR_VALIDATION => Vhffs::Constants::WAITING_FOR_VALIDATION );
- $template->param( VALUE_STATUS_VALIDATION_REFUSED => Vhffs::Constants::VALIDATION_REFUSED );
- $template->param( VALUE_STATUS_WAITING_FOR_CREATION => Vhffs::Constants::WAITING_FOR_CREATION );
- $template->param( VALUE_STATUS_CREATING_ERROR => Vhffs::Constants::CREATING_ERROR );
- $template->param( VALUE_STATUS_ACTIVATED => Vhffs::Constants::ACTIVATED );
- $template->param( VALUE_STATUS_CREATED => Vhffs::Constants::CREATED );
- $template->param( VALUE_STATUS_SUSPENDED => Vhffs::Constants::SUSPENDED );
- $template->param( VALUE_STATUS_SUSPENDED_BEFORE_DELETED => Vhffs::Constants::SUSPENDED_BEFORE_DELETED );
- $template->param( VALUE_STATUS_WAITING_FOR_MODIFICATION => Vhffs::Constants::WAITING_FOR_MODIFICATION );
- $template->param( VALUE_STATUS_MODIFICATION_ERROR => Vhffs::Constants::MODIFICATION_ERROR );
- $template->param( VALUE_STATUS_MODIFICATION_APPLIED => Vhffs::Constants::MODIFICATION_APPLIED );
- $template->param( VALUE_STATUS_TO_DELETE => Vhffs::Constants::TO_DELETE );
-
- my $status = $object->get_status;
-
- if( $status == Vhffs::Constants::WAITING_FOR_VALIDATION )
- {
- $template->param( SELECTED_STATUS_WAITING_FOR_VALIDATION => "selected" );
- }
- elsif( $status == Vhffs::Constants::VALIDATION_REFUSED )
- {
- $template->param( SELECTED_STATUS_VALIDATION_REFUSED => "selected" );
- }
- elsif( $status == Vhffs::Constants::WAITING_FOR_CREATION )
- {
- $template->param( SELECTED_STATUS_WAITING_FOR_CREATION => "selected" );
- }
- elsif( $status == Vhffs::Constants::CREATING_ERROR )
- {
- $template->param( SELECTED_STATUS_CREATING_ERROR => "selected" );
- }
- elsif( $status == Vhffs::Constants::CREATED )
- {
- $template->param( SELECTED_STATUS_CREATED => "selected" );
- }
- elsif( $status == Vhffs::Constants::ACTIVATED )
- {
- $template->param( SELECTED_STATUS_ACTIVATED => "selected" );
- }
- elsif( $status == Vhffs::Constants::SUSPENDED )
- {
- $template->param( SELECTED_STATUS_SUSPENDED => "selected" );
- }
- elsif( $status == Vhffs::Constants::SUSPENDED_BEFORE_DELETED )
- {
- $template->param( SELECTED_STATUS_SUSPENDED_BEFORE_DELETED => "selected" );
- }
- elsif( $status == Vhffs::Constants::WAITING_FOR_MODIFICATION )
- {
- $template->param( SELECTED_STATUS_WAITING_FOR_MODIFICATION => "selected" );
- }
- elsif( $status == Vhffs::Constants::MODIFICATION_ERROR )
- {
- $template->param( SELECTED_STATUS_MODIFICATION_ERROR => "selected" );
- }
- elsif( $status == Vhffs::Constants::MODIFICATION_APPLIED )
- {
- $template->param( SELECTED_STATUS_MODIFICATION_APPLIED => "selected" );
- }
- elsif( $status == Vhffs::Constants::TO_DELETE )
- {
- $template->param( SELECTED_STATUS_TO_DELETE => "selected" );
- }
-
-}
-
-$panel->build( $template );
-$panel->display;
-
Deleted: trunk/vhffs-panel/admin/cvs/edit_submit.pl
===================================================================
--- trunk/vhffs-panel/admin/cvs/edit_submit.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/cvs/edit_submit.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,116 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
-use Vhffs::Services::Cvs;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
-my $template;
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $object;
-my $message;
-if( $user->is_admin != 1 )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $name )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "CGI ERROR !");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined ( $object = Vhffs::Services::Cvs::get_by_cvsroot( $vhffs , $name ) ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = sprintf( gettext("Cannot fetch object %s"), $name );
- $template->param( MESSAGE => $message );
-}
-else
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
-
- $object->set_status( $cgi->param( "STATUS" ) );
-
-
- if( $object->commit < 0 )
- {
- $message = gettext("Can't modify object...");
- }
- else
- {
- $message = gettext("Modifications successfully added");
- }
-
- $template->param( MESSAGE => $message );
-
-
-
-}
-
-
-$panel->set_refresh_url( "/admin/cvs/list.pl" );
-$panel->build( $template );
-$panel->display;
Modified: trunk/vhffs-panel/admin/cvs/list.pl
===================================================================
--- trunk/vhffs-panel/admin/cvs/list.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/cvs/list.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -29,7 +29,7 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-
+use strict;
use utf8;
use POSIX qw(locale_h);
use HTML::Template;
@@ -37,18 +37,11 @@
use Locale::gettext;
use CGI;
use CGI::Session;
-use strict;
-
use lib '%VHFFS_LIB_DIR%';
use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
use Vhffs::Panel::Cvs;
-use Vhffs::Stats;
-use Vhffs::Constants;
my $panel = new Vhffs::Panel::Main();
exit 0 unless $panel;
@@ -56,54 +49,46 @@
exit 0 unless $session;
my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
+my $templatedir = $panel->{'templatedir'};
my $template;
-my $templatesdir = $vhffs->get_config->get_templatedir;
-
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
-
- $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
+ $template = new HTML::Template( filename => $templatedir.'/panel/misc/simplemsg.tmpl' );
+ $template->param( MESSAGE => gettext('You are not allowed to see it') );
}
else
{
- $template = new HTML::Template( filename => $templatesdir."/panel/admin/misc/list.tmpl" );
+ $template = new HTML::Template( filename => $templatedir.'/panel/admin/misc/list.tmpl' );
+ my $name = $cgi->param('NAME');
if( defined( $name ) )
{
- $template->param( TITLE => gettext("Search result for CVS repository") . ": " .$name );
+ $template->param( TITLE => gettext('Search result for CVS repository').': '.$name );
}
else
{
- $template->param( TITLE => gettext("List of all CVS repositories") );
+ $template->param( TITLE => gettext('List of all CVS repositories') );
}
- $template->param( TEXT_TITLE1 => gettext('CVS Root') );
- $template->param( TEXT_TITLE2 => gettext('Group') );
- $template->param( TEXT_TITLE3 => gettext('State') );
+ $template->param( TEXT_TITLE1 => gettext('CVS Root') );
+ $template->param( TEXT_TITLE2 => gettext('Group') );
+ $template->param( TEXT_TITLE3 => gettext('State') );
my $cvs = Vhffs::Panel::Cvs::search( $vhffs, $name );
- my $subtemplate;
- if( $user->is_admin == 1 ) {
- $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/cvs/part.tmpl", global_vars => 1);
- $subtemplate->param( SEND => gettext('Modify') );
- } else {
- # die_on_bad_param => 0 is required since the values provided by Vhffs::Panel::Cvs::search
- # contains fields that are not used in moderator's template.
- $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/cvs/part-modo.tmpl", global_vars => 1);
- $subtemplate->param( SEND => gettext('Show') );
- }
-
- $subtemplate->param(CVSES => $cvs);
- $template->param( LIST => $subtemplate->output );
+ if( defined $cvs ) {
+ my $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/cvs/part.tmpl', global_vars => 1);
+ if( $user->is_admin == 1 ) {
+ $subtemplate->param( ACTION => gettext('Modify') );
+ } else {
+ $subtemplate->param( ACTION => gettext('Show') );
+ }
+
+ $subtemplate->param(CVSES => $cvs);
+ $template->param( LIST => $subtemplate->output );
+ }
}
$panel->build( $template );
Deleted: trunk/vhffs-panel/admin/cvs/show.pl
===================================================================
--- trunk/vhffs-panel/admin/cvs/show.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/cvs/show.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,124 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
-my $template;
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $object;
-
-if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $name )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "CGI ERROR !");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined ( $object = Vhffs::Services::Cvs::get_by_cvsroot( $vhffs , $name ) ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "Cannot fetch object");
- $template->param( MESSAGE => $message );
-}
-else
-{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/cvs/show.tmpl" );
-
- $template->param( TITLE => gettext("Show CVS") );
-
- $template->param( TEXT_CVSROOT => gettext("Cvsroot") );
- $template->param( TEXT_PUBLIC => gettext("Public") );
- $template->param( TEXT_GROUP => gettext("Group") );
- $template->param( TEXT_OWNER => gettext("Owner") );
- $template->param( TEXT_STATUS => gettext("Status") );
- $template->param( TEXT_DESCRIPTION => gettext("Description") );
- $template->param( TEXT_HISTORY => gettext("History") );
-
- if( $object->is_public == 1 )
- {
- $template->param( VALUE_PUBLIC => gettext("Yes") );
- }
- else
- {
- $template->param( VALUE_PUBLIC => gettext("No") );
- }
-
- $template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $object->get_description ) );
- $template->param( VALUE_CVSROOT => $object->get_cvsroot);
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
- $template->param( VALUE_STATUS => Vhffs::Functions::status_string_from_status_id ($object->get_status) );
-
- my $oid = $object->{'object_id'};
- $template->param( VALUE_HISTORY => "/history.pl?OID=$oid" );
-}
-
-$panel->build( $template );
-$panel->display;
-
Modified: trunk/vhffs-panel/admin/dns/list.pl
===================================================================
--- trunk/vhffs-panel/admin/dns/list.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/dns/list.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,4 +1,4 @@
-#!%PERL% -w
+#!%PERL% -w
# Copyright (c) vhffs project and its contributors
# All rights reserved.
#
@@ -29,7 +29,7 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-
+use strict;
use utf8;
use POSIX qw(locale_h);
use HTML::Template;
@@ -37,17 +37,10 @@
use Locale::gettext;
use CGI;
use CGI::Session;
-use strict;
-
use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
+use Vhffs::Panel::Web;
my $panel = new Vhffs::Panel::Main();
exit 0 unless $panel;
@@ -55,61 +48,48 @@
exit 0 unless $session;
my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
+my $templatedir = $panel->{'templatedir'};
my $template;
-my $templatedir = $vhffs->get_config->get_templatedir;
-
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
+ $template = new HTML::Template( filename => $templatedir.'/panel/misc/simplemsg.tmpl' );
+ $template->param( MESSAGE => gettext('You are not allowed to see it') );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/misc/list.tmpl" );
+ $template = new HTML::Template( filename => $templatedir.'/panel/admin/misc/list.tmpl' );
+ my $name = $cgi->param('NAME');
if( defined( $name ) )
{
- $template->param( TITLE => gettext("Search result for domain") . ": " .$name );
+ $template->param( TITLE => gettext('Search result for domain').': '.$name );
}
else
{
- $template->param( TITLE => gettext("List of all domains") );
+ $template->param( TITLE => gettext('List of all domains') );
}
- $template->param( TEXT_TITLE1 => gettext('Domain Name') );
- $template->param( TEXT_TITLE2 => gettext('Group') );
- $template->param( TEXT_TITLE3 => gettext('State') );
+ $template->param( TEXT_TITLE1 => gettext('Domain Name') );
+ $template->param( TEXT_TITLE2 => gettext('Group') );
+ $template->param( TEXT_TITLE3 => gettext('State') );
- use Vhffs::Panel::Web;
-
my $domains = Vhffs::Panel::DNS::search( $vhffs , $name );
-
if( defined $domains )
{
- my $subtemplate;
- if( $user->is_admin == 1 ) {
- $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/dns/part.tmpl", global_vars => 1 );
- $subtemplate->param(SEND => gettext('Modify') );
- } else {
- $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/dns/part-modo.tmpl", die_on_bad_params => 0 )
- }
-
- $subtemplate->param(DNSES => $domains);
+ my $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/dns/part.tmpl', global_vars => 1 );
+ if( $user->is_admin == 1 ) {
+ $subtemplate->param( ACTION => gettext('Modify') );
+ } else {
+ $subtemplate->param( ACTION => gettext('Show') );
+ }
+
+ $subtemplate->param( DNSES => $domains);
$template->param( LIST => $subtemplate->output );
}
-
-
}
-
$panel->build( $template );
$panel->display;
Modified: trunk/vhffs-panel/admin/git/list.pl
===================================================================
--- trunk/vhffs-panel/admin/git/list.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/git/list.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -30,7 +30,6 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-
use strict;
use utf8;
use HTML::Template;
@@ -46,54 +45,46 @@
exit 0 unless $session;
my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
+my $templatedir = $panel->{'templatedir'};
my $template;
-my $templatesdir = $vhffs->get_config->get_templatedir;
-
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
- $template->param( MESSAGE => gettext( "You are not allowed to see it") );
+ $template = new HTML::Template( filename => $templatedir.'/panel/misc/simplemsg.tmpl' );
+ $template->param( MESSAGE => gettext('You are not allowed to see it') );
}
else
{
- $template = new HTML::Template( filename => $templatesdir."/panel/admin/misc/list.tmpl" );
+ $template = new HTML::Template( filename => $templatedir.'/panel/admin/misc/list.tmpl' );
+ my $name = $cgi->param('NAME');
if( defined( $name ) )
{
- $template->param( TITLE => gettext("Search result for git repository") . ": " .$name );
+ $template->param( TITLE => gettext('Search result for git repository').': '.$name );
}
else
{
- $template->param( TITLE => gettext("All git repositories lists") );
+ $template->param( TITLE => gettext('All git repositories lists') );
}
- $template->param(TEXT_TITLE1 => gettext('GIT root'));
- $template->param(TEXT_TITLE2 => gettext('Group'));
- $template->param(TEXT_TITLE3 => gettext('State'));
+ $template->param(TEXT_TITLE1 => gettext('GIT root'));
+ $template->param(TEXT_TITLE2 => gettext('Group'));
+ $template->param(TEXT_TITLE3 => gettext('State'));
my $repos = Vhffs::Panel::Git::search( $vhffs, $name );
-
if( defined $repos )
{
- my $subtemplate;
+ my $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/git/part.tmpl', global_vars => 1 );
if( $user->is_admin == 1 ) {
- $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/git/part.tmpl", global_vars => 1 );
- $subtemplate->param(SEND => gettext('Modify'));
+ $subtemplate->param( ACTION => gettext('Modify') );
} else {
- $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/git/part-modo.tmpl", global_vars => 1, die_on_bad_params => 0);
+ $subtemplate->param( ACTION => gettext('Show') );
}
- $subtemplate->param( GITREPOS => $repos);
+ $subtemplate->param( GITREPOS => $repos);
$template->param( LIST => $subtemplate->output );
}
-
-
}
$panel->build( $template );
Deleted: trunk/vhffs-panel/admin/group/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/group/edit.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/group/edit.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,202 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $groupname = $cgi->param("NAME");
-my $template;
-my $group;
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-if( $user->is_admin != 1 )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $groupname )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "CGI ERROR !");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined ( $group = Vhffs::Group::get_by_groupname($vhffs, $groupname) ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "Cannot fetch object");
- $template->param( MESSAGE => $message );
-}
-else
-{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/group/edit.tmpl" );
-
- $panel->set_title( gettext('Edit Group') );
-
-
- $template->param( THEME => $panel->{theme} );
- $template->param( TEXT_GROUPNAME => gettext("Groupname") );
- $template->param( TEXT_GID => gettext("GID") );
- $template->param( TEXT_OWNER => gettext("Owner") );
- $template->param( TEXT_QUOTA => gettext("Quota"));
- $template->param( TEXT_QUOTA_USED => gettext("Quota used") );
- $template->param( TEXT_STATUS => gettext("Status") );
- $template->param( TEXT_DESCRIPTION => gettext("Description") );
- $template->param( SEND => gettext("Send") );
- $template->param( TEXT_HISTORY => gettext("History") );
-
- $template->param( VALUE_GROUPNAME => $group->get_groupname );
- $template->param( VALUE_GID => $group->get_gid );
- $template->param( VALUE_OWNER => $group->get_owner_username );
-
- # Quota stuff
- $template->param( QUOTA_VALUE => sprintf( gettext("Quota (used/total) : %s/%s") , $group->get_quota_used , $group->get_quota ) );
- # Yes, sorry quota progress image has to be 300px width max
- $template->param( QUOTA_WIDTH => ( ($group->get_quota_used / $group->get_quota) * 300 ) );
-
- $template->param( VALUE_QUOTA => $group->get_quota );
- $template->param( VALUE_QUOTA_USED => $group->get_quota_used );
- $template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $group->get_description ) );
-
- my $oid = $group->get_oid;
- $template->param( VALUE_HISTORY => "/history.pl?OID=$oid" );
-
- $template->param( TEXT_STATUS_WAITING_FOR_VALIDATION => gettext("Waiting for validation") );
- $template->param( TEXT_STATUS_VALIDATION_REFUSED => gettext("Validation refused") );
- $template->param( TEXT_STATUS_WAITING_FOR_CREATION => gettext("Waiting for creation") );
- $template->param( TEXT_STATUS_CREATING_ERROR => gettext("Creating error") );
- $template->param( TEXT_STATUS_ACTIVATED => gettext("Activated") );
- $template->param( TEXT_STATUS_CREATED => gettext("Created") );
- $template->param( TEXT_STATUS_SUSPENDED => gettext("Suspended") );
- $template->param( TEXT_STATUS_SUSPENDED_BEFORE_DELETED => gettext("Suspended") );
- $template->param( TEXT_STATUS_WAITING_FOR_MODIFICATION => gettext("Waiting for modification") );
- $template->param( TEXT_STATUS_MODIFICATION_ERROR => gettext("Modification error") );
- $template->param( TEXT_STATUS_MODIFICATION_APPLIED => gettext("Modification applied") );
- $template->param( TEXT_STATUS_TO_DELETE => gettext("Will be deleted") );
-
-
- $template->param( VALUE_STATUS_WAITING_FOR_VALIDATION => Vhffs::Constants::WAITING_FOR_VALIDATION );
- $template->param( VALUE_STATUS_VALIDATION_REFUSED => Vhffs::Constants::VALIDATION_REFUSED );
- $template->param( VALUE_STATUS_WAITING_FOR_CREATION => Vhffs::Constants::WAITING_FOR_CREATION );
- $template->param( VALUE_STATUS_CREATING_ERROR => Vhffs::Constants::CREATING_ERROR );
- $template->param( VALUE_STATUS_ACTIVATED => Vhffs::Constants::ACTIVATED );
- $template->param( VALUE_STATUS_CREATED => Vhffs::Constants::CREATED );
- $template->param( VALUE_STATUS_SUSPENDED => Vhffs::Constants::SUSPENDED );
- $template->param( VALUE_STATUS_SUSPENDED_BEFORE_DELETED => Vhffs::Constants::SUSPENDED_BEFORE_DELETED );
- $template->param( VALUE_STATUS_WAITING_FOR_MODIFICATION => Vhffs::Constants::WAITING_FOR_MODIFICATION );
- $template->param( VALUE_STATUS_MODIFICATION_ERROR => Vhffs::Constants::MODIFICATION_ERROR );
- $template->param( VALUE_STATUS_MODIFICATION_APPLIED => Vhffs::Constants::MODIFICATION_APPLIED );
- $template->param( VALUE_STATUS_TO_DELETE => Vhffs::Constants::TO_DELETE );
-
- my $status = $group->get_status;
-
- if( $status == Vhffs::Constants::WAITING_FOR_VALIDATION )
- {
- $template->param( SELECTED_STATUS_WAITING_FOR_VALIDATION => "selected" );
- }
- elsif( $status == Vhffs::Constants::VALIDATION_REFUSED )
- {
- $template->param( SELECTED_STATUS_VALIDATION_REFUSED => "selected" );
- }
- elsif( $status == Vhffs::Constants::WAITING_FOR_CREATION )
- {
- $template->param( SELECTED_STATUS_WAITING_FOR_CREATION => "selected" );
- }
- elsif( $status == Vhffs::Constants::CREATING_ERROR )
- {
- $template->param( SELECTED_STATUS_CREATING_ERROR => "selected" );
- }
- elsif( $status == Vhffs::Constants::CREATED )
- {
- $template->param( SELECTED_STATUS_CREATED => "selected" );
- }
- elsif( $status == Vhffs::Constants::ACTIVATED )
- {
- $template->param( SELECTED_STATUS_ACTIVATED => "selected" );
- }
- elsif( $status == Vhffs::Constants::SUSPENDED )
- {
- $template->param( SELECTED_STATUS_SUSPENDED => "selected" );
- }
- elsif( $status == Vhffs::Constants::SUSPENDED_BEFORE_DELETED )
- {
- $template->param( SELECTED_STATUS_SUSPENDED_BEFORE_DELETED => "selected" );
- }
- elsif( $status == Vhffs::Constants::WAITING_FOR_MODIFICATION )
- {
- $template->param( SELECTED_STATUS_WAITING_FOR_MODIFICATION => "selected" );
- }
- elsif( $status == Vhffs::Constants::MODIFICATION_ERROR )
- {
- $template->param( SELECTED_STATUS_MODIFICATION_ERROR => "selected" );
- }
- elsif( $status == Vhffs::Constants::MODIFICATION_APPLIED )
- {
- $template->param( SELECTED_STATUS_MODIFICATION_APPLIED => "selected" );
- }
- elsif( $status == Vhffs::Constants::TO_DELETE )
- {
- $template->param( SELECTED_STATUS_TO_DELETE => "selected" );
- }
-
-}
-
-$panel->build( $template );
-$panel->display;
Deleted: trunk/vhffs-panel/admin/group/edit_submit.pl
===================================================================
--- trunk/vhffs-panel/admin/group/edit_submit.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/group/edit_submit.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,126 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $groupname = $cgi->param("NAME");
-my $template;
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $group;
-my $message;
-my $status = $cgi->param( "STATUS" );
-my $quota = $cgi->param( "QUOTA" );
-my $quotau = $cgi->param( "QUOTA_USED" );
-
-
-if( $user->is_admin != 1 )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $groupname )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "CGI ERROR !");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined ( $group = Vhffs::Group::get_by_groupname($vhffs, $groupname) ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "Cannot fetch object");
- $template->param( MESSAGE => $message );
-}
-elsif( ( ! defined $status ) || ( ! defined $quota ) || ( ! defined $quota ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "CGI Error !");
- $template->param( MESSAGE => $message );
-}
-else
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
-
- $group->set_status( $status );
- $group->set_quota( $quota );
- $group->set_quota_used( $quotau );
-
-
- if( $group->commit < 0 )
- {
- $message = gettext("Can't modify object...");
- }
- else
- {
- $message = gettext("Modifications successfully added");
- }
-
- $template->param( MESSAGE => $message );
-
-
-
-}
-
-$panel->set_refresh_url( "/admin/group/list.pl" );
-$panel->build( $template );
-$panel->display;
Modified: trunk/vhffs-panel/admin/group/list.pl
===================================================================
--- trunk/vhffs-panel/admin/group/list.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/group/list.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -29,7 +29,7 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-
+use strict;
use utf8;
use POSIX qw(locale_h);
use HTML::Template;
@@ -37,9 +37,7 @@
use Locale::gettext;
use CGI;
use CGI::Session;
-use strict;
-
use lib '%VHFFS_LIB_DIR%';
use Vhffs::User;
use Vhffs::Group;
@@ -56,57 +54,44 @@
exit 0 unless $session;
my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
+my $templatedir = $panel->{'templatedir'};
my $template;
-my $templatedir = $vhffs->get_config->get_templatedir;
-
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
+{
+ $template = new HTML::Template( filename => $templatedir.'/panel/misc/simplemsg.tmpl' );
+ $template->param( MESSAGE => gettext('You are not allowed to see it') );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/misc/list.tmpl" );
-
+ $template = new HTML::Template( filename => $templatedir.'/panel/admin/misc/list.tmpl' );
+ my $name = $cgi->param('NAME');
if( ! defined $name)
{
- $template->param( TITLE => gettext("List of all groups") );
+ $template->param( TITLE => gettext('List of all groups') );
}
else
{
- $template->param( TITLE => gettext("Search result") );
-
+ $template->param( TITLE => gettext('Search result') );
}
- $template->param( TEXT_TITLE1 => gettext('Groupname') );
- $template->param( TEXT_TITLE2 => gettext('Owner name') );
- $template->param( TEXT_TITLE3 => gettext('State') );
-
+ $template->param( TEXT_TITLE1 => gettext('Groupname') );
+ $template->param( TEXT_TITLE2 => gettext('Owner name') );
+ $template->param( TEXT_TITLE3 => gettext('State') );
-
my $groups = Vhffs::Panel::Group::search( $vhffs, $name );
if( defined $groups )
{
- my $subtemplate;
- if( $user->is_admin == 1 ) {
- $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/group/part.tmpl", global_vars => 1 );
- $subtemplate->param(SEND => gettext('Modify'));
- } else {
- $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/group/part-modo.tmpl", global_vars => 1 );
- $subtemplate->param(SEND => gettext('Show'));
- }
+ my $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/group/part.tmpl', global_vars => 1 );
+ if( $user->is_admin == 1 ) {
+ $subtemplate->param( ACTION => gettext('Modify') );
+ } else {
+ $subtemplate->param( ACTION => gettext('Show') );
+ }
-
- $subtemplate->param( GROUPS => $groups );
+ $subtemplate->param( GROUPS => $groups );
$template->param( LIST => $subtemplate->output );
}
}
Deleted: trunk/vhffs-panel/admin/group/show.pl
===================================================================
--- trunk/vhffs-panel/admin/group/show.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/group/show.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,116 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $groupname = $cgi->param("NAME");
-my $template;
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $group;
-
-if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $groupname )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = sprintf( gettext("CGI ERROR ! %s"), $groupname );
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined ( $group = Vhffs::Group::get_by_groupname( $vhffs , $groupname ) ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "Cannot fetch object");
- $template->param( MESSAGE => $message );
-}
-else
-{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/group/show.tmpl" );
-
- $template->param( TITLE => gettext("Show Group") );
-
- $template->param( TEXT_GROUPNAME => gettext("Groupname") );
- $template->param( TEXT_GID => gettext("GID") );
- $template->param( TEXT_OWNER => gettext("Owner") );
- $template->param( TEXT_QUOTA => gettext("Quota"));
- $template->param( TEXT_QUOTA_USED => gettext("Quota used") );
- $template->param( TEXT_STATUS => gettext("Status") );
- $template->param( TEXT_DESCRIPTION => gettext("Description") );
- $template->param( TEXT_HISTORY => gettext("History") );
-
- $template->param( VALUE_GROUPNAME => $group->get_groupname );
- $template->param( VALUE_GID => $group->get_gid );
- $template->param( VALUE_OWNER => $group->get_owner_username );
- $template->param( VALUE_QUOTA => $group->get_quota );
- $template->param( VALUE_QUOTA_USED => $group->get_quota_used );
- $template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $group->get_description ) );
- $template->param( VALUE_STATUS => Vhffs::Functions::status_string_from_status_id ($group->get_status) );
-
- my $oid = $group->{'object_id'};
- $template->param( VALUE_HISTORY => "/history.pl?OID=$oid" );
-}
-
-$panel->build( $template );
-$panel->display;
Deleted: trunk/vhffs-panel/admin/mail/change_forward.pl
===================================================================
--- trunk/vhffs-panel/admin/mail/change_forward.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/mail/change_forward.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,117 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Services::Mail;
-use Vhffs::Acl;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-my $group = $panel->{'group'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $domain = $cgi->param("DOMAIN");
-my $boxname = $cgi->param("LOCALPART");
-my $forward = $cgi->param("FORWARD");
-my $template;
-my $message;
-my $mail = Vhffs::Services::Mail::get_by_mxdomain( $vhffs , $domain );
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $retour;
-
-if( ! defined $mail )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- $message = sprintf( gettext("Unable to get information on mail domain %s"), $domain );
- $template->param( MESSAGE => $message );
-}
-elsif( ( ! defined $boxname ) || ( ! defined $forward ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- $message = gettext( "CGI ERROR");
- $template->param( MESSAGE => $message );
-}
-elsif( $mail->get_status != Vhffs::Constants::ACTIVATED )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- $message = gettext( "This object is not functionnal yet. Please wait creation or moderation.");
- $template->param( MESSAGE => $message );
-}
-elsif( ( Vhffs::Acl::what_perm_for_user( $user , $mail , $vhffs ) < Vhffs::Constants::ACL_VIEW ) || ( $user->is_admin != 1 ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- $message = gettext("You're not allowed to do this (ACL rights)");
- $template->param( MESSAGE => $message );
-}
-else
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
-
- if( ( $retour = $mail->change_forward( $boxname , $forward ) ) < 0 )
- {
- $message = sprintf(gettext('Unable to modify forward %s (%d)'), $boxname, $retour);
- }
- else
- {
- $message = sprintf(gettext('Forward %s successfully added'), $boxname );
- }
- $template->param( MESSAGE => $message );
-}
-
-$panel->build( $template );
-$panel->display;
-
Deleted: trunk/vhffs-panel/admin/mail/delete_box.pl
===================================================================
--- trunk/vhffs-panel/admin/mail/delete_box.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/mail/delete_box.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,116 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Services::Mail;
-use Vhffs::Acl;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-my $group = $panel->{'group'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $domain = $cgi->param("DOMAIN");
-my $boxname = $cgi->param("LOCALPART");
-my $template;
-my $message;
-my $mail = Vhffs::Services::Mail::get_by_mxdomain($vhffs, $domain);
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $retour;
-
-if( ! defined $mail )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- $message = sprintf( gettext("Unable to get information on mail domain %s"), $domain );
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $boxname )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- $message = gettext( "CGI ERROR");
- $template->param( MESSAGE => $message );
-}
-elsif( $mail->get_status != Vhffs::Constants::ACTIVATED )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- $message = gettext( "This object is not functionnal yet. Please wait creation or moderation.");
- $template->param( MESSAGE => $message );
-}
-elsif( ( Vhffs::Acl::what_perm_for_user( $user , $mail , $vhffs ) < Vhffs::Constants::ACL_VIEW ) || ( $user->is_admin != 1 ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- $message = gettext("You're not allowed to do this (ACL rights)");
- $template->param( MESSAGE => $message );
-}
-else
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
-
- if( ( $retour = $mail->delbox( $boxname ) ) < 0 )
- {
- $message = "Can't delete box $boxname , $retour";
- }
- else
- {
- $message = "Succesfully deleted account $boxname $domain";
- }
- $template->param( MESSAGE => $message );
-}
-
-$panel->build( $template );
-$panel->display;
-
Deleted: trunk/vhffs-panel/admin/mail/delete_forward.pl
===================================================================
--- trunk/vhffs-panel/admin/mail/delete_forward.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/mail/delete_forward.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,117 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Services::Mail;
-use Vhffs::Acl;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-my $group = $panel->{'group'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $domain = $cgi->param("DOMAIN");
-my $boxname = $cgi->param("LOCALPART");
-my $template;
-my $message;
-
-my $mail = Vhffs::Services::Mail::get_by_mxdomain( $vhffs, $domain );
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $retour;
-
-if( ! defined $mail )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- $message = sprintf( gettext("Unable to get information on mail domain %s"), $domain );
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $boxname )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- $message = gettext( "CGI ERROR");
- $template->param( MESSAGE => $message );
-}
-elsif( $mail->get_status != Vhffs::Constants::ACTIVATED )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- $message = gettext( "This object is not functionnal yet. Please wait creation or moderation.");
- $template->param( MESSAGE => $message );
-}
-elsif( ( Vhffs::Acl::what_perm_for_user( $user , $mail , $vhffs ) < Vhffs::Constants::ACL_VIEW ) || ( $user->is_admin != 1 ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- $message = gettext("You're not allowed to do this (ACL rights) " . $domain . "l" );
- $template->param( MESSAGE => $message );
-}
-else
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
-
- if( ( $retour = $mail->delforward( $boxname ) ) < 0 )
- {
- $message = sprintf(gettext('Unable to delete forward %s (%d)'), $boxname, $retour);
- }
- else
- {
- $message = sprintf(gettext('Forward %s deleted'), $boxname);
- }
- $template->param( MESSAGE => $message );
-}
-
-$panel->build( $template );
-$panel->display;
-
Deleted: trunk/vhffs-panel/admin/mail/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/mail/edit.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/mail/edit.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,238 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $domain_name = $cgi->param("NAME");
-my $template;
-my $output;
-my $subtemplate;
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $object;
-
-if( $user->is_admin != 1 )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $domain_name )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "CGI ERROR !");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined ( $object = Vhffs::Services::Mail::get_by_mxdomain( $vhffs , $domain_name ) ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "Cannot fetch object");
- $template->param( MESSAGE => $message );
-}
-else
-{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/mail/edit.tmpl" );
-
- $template->param( TITLE => gettext("Edit Mail Domain") .": " . $object->get_domain);
-
-
- $template->param( TEXT_DOMAIN => gettext("Domain") );
- $template->param( TEXT_CATCHALL => gettext("Catchall") );
- $template->param( TEXT_GROUP => gettext("Group") );
- $template->param( TEXT_OWNER => gettext("Owner") );
- $template->param( TEXT_STATUS => gettext("Status") );
- $template->param( TEXT_DESCRIPTION => gettext("Description") );
- $template->param( SEND => gettext("Send") );
- $template->param( TEXT_HISTORY => gettext("History") );
-
- $template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $object->get_description ) );
- $template->param( VALUE_DOMAIN => $object->get_domain );
- $template->param( VALUE_CATCHALL => $object->get_catchall );
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
-
- my $oid = $object->{'object_id'};
- $template->param( VALUE_HISTORY => "/history.pl?OID=$oid" );
-
- $template->param( TEXT_FORWARD => gettext("Forward for") ." " . $object->get_domain );
- $template->param( TEXT_POPBOXES => gettext("Popboxes for") ." " . $object->get_domain );
-
-
- $output = "";
- my $forwards = $object->get_forwards;
- foreach( keys %{$forwards} )
- {
- $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/mail/admin_forward.tmpl" );
- $subtemplate->param( LOCAL_PART => $_ . "\@" . $object->get_domain );
- $subtemplate->param( DOMAIN => $object->get_domain );
- $subtemplate->param( FORWARD_MAIL => $forwards->{$_}{'remote_name'} );
- $subtemplate->param( LOCALPART => $_ );
- $subtemplate->param( TEXT_MODIFY_FORWARD => gettext( "Change forward" ) );
- $subtemplate->param( TEXT_DELETE => gettext( "Delete this mail account" ) );
- $output .= $subtemplate->output;
- }
- $template->param( FORWARDS => $output );
-
-
-
- $output = "";
- my $boxes = $object->get_boxes;
- foreach( keys %{$boxes} )
- {
- $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/mail/admin_box.tmpl" );
- $subtemplate->param( ACCOUNT => $_ . "\@" . $object->get_domain );
- $subtemplate->param( TEXT_CHANGE_PASSWORD => gettext( "Change Password" ) );
- $subtemplate->param( LOCALPART => $_ );
- $subtemplate->param( TEXT_DELETE => gettext( "Delete this forward" ) );
- $subtemplate->param( DOMAIN => $object->get_domain );
-
- $output .= $subtemplate->output;
- }
-
- $template->param( POPBOXES => $output );
-
-
-
-
-
- $template->param( TEXT_STATUS_WAITING_FOR_VALIDATION => gettext("Waiting for validation") );
- $template->param( TEXT_STATUS_VALIDATION_REFUSED => gettext("Validation refused") );
- $template->param( TEXT_STATUS_WAITING_FOR_CREATION => gettext("Waiting for creation") );
- $template->param( TEXT_STATUS_CREATING_ERROR => gettext("Creating error") );
- $template->param( TEXT_STATUS_ACTIVATED => gettext("Activated") );
- $template->param( TEXT_STATUS_CREATED => gettext("Created") );
- $template->param( TEXT_STATUS_SUSPENDED => gettext("Suspended") );
- $template->param( TEXT_STATUS_SUSPENDED_BEFORE_DELETED => gettext("Suspended") );
- $template->param( TEXT_STATUS_WAITING_FOR_MODIFICATION => gettext("Waiting for modification") );
- $template->param( TEXT_STATUS_MODIFICATION_ERROR => gettext("Modification error") );
- $template->param( TEXT_STATUS_MODIFICATION_APPLIED => gettext("Modification applied") );
- $template->param( TEXT_STATUS_TO_DELETE => gettext("Will be deleted") );
-
-
- $template->param( VALUE_STATUS_WAITING_FOR_VALIDATION => Vhffs::Constants::WAITING_FOR_VALIDATION );
- $template->param( VALUE_STATUS_VALIDATION_REFUSED => Vhffs::Constants::VALIDATION_REFUSED );
- $template->param( VALUE_STATUS_WAITING_FOR_CREATION => Vhffs::Constants::WAITING_FOR_CREATION );
- $template->param( VALUE_STATUS_CREATING_ERROR => Vhffs::Constants::CREATING_ERROR );
- $template->param( VALUE_STATUS_ACTIVATED => Vhffs::Constants::ACTIVATED );
- $template->param( VALUE_STATUS_CREATED => Vhffs::Constants::CREATED );
- $template->param( VALUE_STATUS_SUSPENDED => Vhffs::Constants::SUSPENDED );
- $template->param( VALUE_STATUS_SUSPENDED_BEFORE_DELETED => Vhffs::Constants::SUSPENDED_BEFORE_DELETED );
- $template->param( VALUE_STATUS_WAITING_FOR_MODIFICATION => Vhffs::Constants::WAITING_FOR_MODIFICATION );
- $template->param( VALUE_STATUS_MODIFICATION_ERROR => Vhffs::Constants::MODIFICATION_ERROR );
- $template->param( VALUE_STATUS_MODIFICATION_APPLIED => Vhffs::Constants::MODIFICATION_APPLIED );
- $template->param( VALUE_STATUS_TO_DELETE => Vhffs::Constants::TO_DELETE );
-
- my $status = $object->get_status;
-
- if( $status == Vhffs::Constants::WAITING_FOR_VALIDATION )
- {
- $template->param( SELECTED_STATUS_WAITING_FOR_VALIDATION => "selected" );
- }
- elsif( $status == Vhffs::Constants::VALIDATION_REFUSED )
- {
- $template->param( SELECTED_STATUS_VALIDATION_REFUSED => "selected" );
- }
- elsif( $status == Vhffs::Constants::WAITING_FOR_CREATION )
- {
- $template->param( SELECTED_STATUS_WAITING_FOR_CREATION => "selected" );
- }
- elsif( $status == Vhffs::Constants::CREATING_ERROR )
- {
- $template->param( SELECTED_STATUS_CREATING_ERROR => "selected" );
- }
- elsif( $status == Vhffs::Constants::CREATED )
- {
- $template->param( SELECTED_STATUS_CREATED => "selected" );
- }
- elsif( $status == Vhffs::Constants::ACTIVATED )
- {
- $template->param( SELECTED_STATUS_ACTIVATED => "selected" );
- }
- elsif( $status == Vhffs::Constants::SUSPENDED )
- {
- $template->param( SELECTED_STATUS_SUSPENDED => "selected" );
- }
- elsif( $status == Vhffs::Constants::SUSPENDED_BEFORE_DELETED )
- {
- $template->param( SELECTED_STATUS_SUSPENDED_BEFORE_DELETED => "selected" );
- }
- elsif( $status == Vhffs::Constants::WAITING_FOR_MODIFICATION )
- {
- $template->param( SELECTED_STATUS_WAITING_FOR_MODIFICATION => "selected" );
- }
- elsif( $status == Vhffs::Constants::MODIFICATION_ERROR )
- {
- $template->param( SELECTED_STATUS_MODIFICATION_ERROR => "selected" );
- }
- elsif( $status == Vhffs::Constants::MODIFICATION_APPLIED )
- {
- $template->param( SELECTED_STATUS_MODIFICATION_APPLIED => "selected" );
- }
- elsif( $status == Vhffs::Constants::TO_DELETE )
- {
- $template->param( SELECTED_STATUS_TO_DELETE => "selected" );
- }
-
-}
-
-$panel->build( $template );
-$panel->display;
Modified: trunk/vhffs-panel/admin/mail/list.pl
===================================================================
--- trunk/vhffs-panel/admin/mail/list.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/mail/list.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -29,7 +29,7 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-
+use strict;
use utf8;
use POSIX qw(locale_h);
use HTML::Template;
@@ -37,17 +37,10 @@
use Locale::gettext;
use CGI;
use CGI::Session;
-use strict;
-
use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
+use Vhffs::Panel::Mail;
my $panel = new Vhffs::Panel::Main();
exit 0 unless $panel;
@@ -55,65 +48,48 @@
exit 0 unless $session;
my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
my $user = $panel->{'user'};
-my $group = $panel->{'group'};
-my $projectname = $session->param("project");
my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
+my $templatedir = $panel->{'templatedir'};
my $template;
-my $templatedir = $vhffs->get_config->get_templatedir;
-
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
+ $template = new HTML::Template( filename => $templatedir.'/panel/misc/simplemsg.tmpl' );
+ $template->param( MESSAGE => gettext('You are not allowed to see it') );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/misc/list.tmpl" );
+ $template = new HTML::Template( filename => $templatedir.'/panel/admin/misc/list.tmpl' );
- if( defined( $name ) )
- {
- $template->param( TITLE => gettext("Search result for") . ": " .$name );
- }
- else
- {
- $template->param( TITLE => gettext("List of all mail-domain") );
- }
+ my $name = $cgi->param('NAME');
+ if( defined( $name ) )
+ {
+ $template->param( TITLE => gettext('Search result for').': '.$name );
+ }
+ else
+ {
+ $template->param( TITLE => gettext('List of all mail-domain') );
+ }
- $template->param( TEXT_TITLE1 => gettext('Domain Name') );
- $template->param( TEXT_TITLE2 => gettext('Group') );
- $template->param( TEXT_TITLE3 => gettext('State') );
+ $template->param( TEXT_TITLE1 => gettext('Domain Name') );
+ $template->param( TEXT_TITLE2 => gettext('Group') );
+ $template->param( TEXT_TITLE3 => gettext('State') );
- use Vhffs::Panel::Mail;
+ my $mails = Vhffs::Panel::Mail::search( $vhffs , $name );
+ if( defined $mails )
+ {
+ my $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/mail/part.tmpl', global_vars => 1 );
+ if( $user->is_admin == 1 ) {
+ $subtemplate->param( ACTION => gettext('Modify') );
+ } else {
+ $subtemplate->param( ACTION => gettext('Show') );
+ }
- my $mails = Vhffs::Panel::Mail::search( $vhffs , $name );
-
- if( defined $mails )
- {
- my $subtemplate;
- my $tmplmails;
- my $mailhash;
- my $send;
- if( $user->is_admin == 1 ) {
- $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/mail/part.tmpl", global_vars => 1 );
- $subtemplate->param( SEND => gettext('Modify') );
- } else {
- $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/mail/part-modo.tmpl", global_vars => 1 );
- $subtemplate->param( SEND => gettext('Show'));
- }
-
- $subtemplate->param( MAILS => $mails );
- $template->param( LIST => $subtemplate->output );
- }
-
-
+ $subtemplate->param( MAILS => $mails );
+ $template->param( LIST => $subtemplate->output );
+ }
}
$panel->build( $template );
$panel->display;
-
Deleted: trunk/vhffs-panel/admin/mail/password_box.pl
===================================================================
--- trunk/vhffs-panel/admin/mail/password_box.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/mail/password_box.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,117 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Services::Mail;
-use Vhffs::Acl;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-my $group = $panel->{'group'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $domain = $cgi->param("DOMAIN");
-my $boxname = $cgi->param("LOCALPART");
-my $password = $cgi->param("PASSWORD");
-my $template;
-my $message;
-my $mail = Vhffs::Services::Mail::get_by_mxdomain( $vhffs, $domain );
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $retour;
-
-if( ! defined $mail )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- $message = sprintf( gettext("Unable to get information on mail domain %s"), $domain );
- $template->param( MESSAGE => $message );
-}
-elsif( ( ! defined $password ) || ( ! defined $boxname ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- $message = gettext( "CGI ERROR");
- $template->param( MESSAGE => $message );
-}
-elsif( $mail->get_status != Vhffs::Constants::ACTIVATED )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- $message = gettext( "This object is not functionnal yet. Please wait creation or moderation.");
- $template->param( MESSAGE => $message );
-}
-elsif( ( Vhffs::Acl::what_perm_for_user( $user , $mail , $vhffs ) < Vhffs::Constants::ACL_VIEW ) || ( $user->is_admin != 1 ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- $message = gettext("You're not allowed to do this (ACL rights)");
- $template->param( MESSAGE => $message );
-}
-else
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
-
- if( ( $retour = $mail->change_box_password( $boxname , $password ) ) < 0 )
- {
- $message = sprintf(gettext('Unable to change password for box %s (%d)'), $boxname, $retour);
- }
- else
- {
- $message = sprintf(gettext('Password changed for box %s'), $boxname);
- }
- $template->param( MESSAGE => $message );
-}
-
-
-$panel->build( $template );
-$panel->display;
Deleted: trunk/vhffs-panel/admin/mail/show.pl
===================================================================
--- trunk/vhffs-panel/admin/mail/show.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/mail/show.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,145 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $domain_name = $cgi->param("NAME");
-my $template;
-my $output;
-my $subtemplate;
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $object;
-
-if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $domain_name )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "CGI ERROR !");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined ( $object = Vhffs::Services::Mail::get_by_mxdomain( $vhffs , $domain_name ) ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "Cannot fetch object");
- $template->param( MESSAGE => $message );
-}
-else
-{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/mail/show.tmpl" );
-
- $template->param( TITLE => gettext("Show Mail Domain") .": " . $object->get_domain);
-
-
- $template->param( TEXT_DOMAIN => gettext("Domain") );
- $template->param( TEXT_CATCHALL => gettext("Catchall") );
- $template->param( TEXT_GROUP => gettext("Group") );
- $template->param( TEXT_OWNER => gettext("Owner") );
- $template->param( TEXT_STATUS => gettext("Status") );
- $template->param( TEXT_DESCRIPTION => gettext("Description") );
- $template->param( TEXT_HISTORY => gettext("History") );
-
- $template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $object->get_description ) );
- $template->param( VALUE_DOMAIN => $object->get_domain );
- $template->param( VALUE_CATCHALL => $object->get_catchall );
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
- $template->param( VALUE_STATUS => Vhffs::Functions::status_string_from_status_id ($object->get_status) );
-
- my $oid = $object->{'object_id'};
- $template->param( VALUE_HISTORY => "/history.pl?OID=$oid" );
-
- $template->param( TEXT_FORWARD => gettext("Forward for") ." " . $object->get_domain );
- $template->param( TEXT_POPBOXES => gettext("Popboxes for") ." " . $object->get_domain );
-
-
- $output = "";
- my $forwards = $object->get_forwards;
- foreach( keys %{$forwards} )
- {
- $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/mail/admin_forward-modo.tmpl" );
- $subtemplate->param( LOCAL_PART => $_ . "\@" . $object->get_domain );
- $subtemplate->param( FORWARD_MAIL => $forwards->{$_}{'remote_name'} );
- $output .= $subtemplate->output;
- }
- $template->param( FORWARDS => $output );
-
-
- $output = "";
- my $boxes = $object->get_boxes;
- foreach( keys %{$boxes} )
- {
- $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/mail/admin_box-modo.tmpl" );
- $subtemplate->param( ACCOUNT => $_ . "\@" . $object->get_domain );
- $output .= $subtemplate->output;
- }
-
- $template->param( POPBOXES => $output );
-}
-
-$panel->build( $template );
-$panel->display;
Modified: trunk/vhffs-panel/admin/mailinglist/list.pl
===================================================================
--- trunk/vhffs-panel/admin/mailinglist/list.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/mailinglist/list.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -29,7 +29,7 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-
+use strict;
use utf8;
use POSIX qw(locale_h);
use HTML::Template;
@@ -37,7 +37,6 @@
use Locale::gettext;
use CGI;
use CGI::Session;
-use strict;
use lib '%VHFFS_LIB_DIR%';
use Vhffs::User;
@@ -53,59 +52,47 @@
exit 0 unless $session;
my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
+my $templatedir = $panel->{'templatedir'};
my $template;
-my $templatedir = $vhffs->get_config->get_templatedir;
-
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
+ $template = new HTML::Template( filename => $templatedir.'/panel/misc/simplemsg.tmpl' );
+ $template->param( MESSAGE => gettext('You are not allowed to see it') );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/misc/list.tmpl" );
+ $template = new HTML::Template( filename => $templatedir.'/panel/admin/misc/list.tmpl' );
- if( defined( $name ) )
- {
- $template->param( TITLE => gettext("Search result for") . ": " .$name );
- }
- else
- {
- $template->param( TITLE => gettext("List of all mailing-list") );
- }
+ my $name = $cgi->param('NAME');
+ if( defined( $name ) )
+ {
+ $template->param( TITLE => gettext('Search result for').': '.$name );
+ }
+ else
+ {
+ $template->param( TITLE => gettext('List of all mailing-list') );
+ }
- $template->param( TEXT_TITLE1 => gettext('Mailing List') );
- $template->param( TEXT_TITLE2 => gettext('Group') );
- $template->param( TEXT_TITLE3 => gettext('State') );
+ $template->param( TEXT_TITLE1 => gettext('Mailing List') );
+ $template->param( TEXT_TITLE2 => gettext('Group') );
+ $template->param( TEXT_TITLE3 => gettext('State') );
-
- my $lists = Vhffs::Panel::MailingList::search( $vhffs, $name );
-
- if( defined $lists )
- {
- my $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/mailinglist/part.tmpl", global_vars => 1 );
- if( $user->is_admin == 1 ) {
- $subtemplate->param( SEND => gettext('Modify') );
- } else {
- $subtemplate->param( SEND => gettext('Show') );
- }
-
- $subtemplate->param( LISTS => $lists );
- $template->param( LIST => $subtemplate->output );
+ my $lists = Vhffs::Panel::MailingList::search( $vhffs, $name );
+ if( defined $lists )
+ {
+ my $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/mailinglist/part.tmpl', global_vars => 1 );
+ if( $user->is_admin == 1 ) {
+ $subtemplate->param( ACTION => gettext('Modify') );
+ } else {
+ $subtemplate->param( ACTION => gettext('Show') );
+ }
+ $subtemplate->param( LISTS => $lists );
+ $template->param( LIST => $subtemplate->output );
}
-
+}
- }
-
- $panel->build( $template );
+$panel->build( $template );
$panel->display;
-
Deleted: trunk/vhffs-panel/admin/mysql/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/mysql/edit.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/mysql/edit.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,198 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
-my $template;
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $object;
-
-if( $user->is_admin != 1 )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $name )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "CGI ERROR !");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined ( $object = Vhffs::Services::Mysql::get_by_dbname( $vhffs , $name ) ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "Cannot fetch object");
- $template->param( MESSAGE => $message );
-}
-else
-{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/mysql/edit.tmpl" );
-
- $template->param( TITLE => gettext("Edit MySQL database") );
-
-
- $template->param( TEXT_DBNAME => gettext("Servername") );
- $template->param( TEXT_DBUSER => gettext("User") );
- $template->param( TEXT_DBPASS => gettext("Password") );
- $template->param( TEXT_GROUP => gettext("Group") );
- $template->param( TEXT_OWNER => gettext("Owner") );
- $template->param( TEXT_STATUS => gettext("Status") );
- $template->param( TEXT_DESCRIPTION => gettext("Description") );
- $template->param( SEND => gettext("Send") );
- $template->param( TEXT_HISTORY => gettext("History") );
-
- $template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $object->get_description ) );
- $template->param( VALUE_DBNAME => $object->get_dbname );
- $template->param( VALUE_DBUSER => $object->get_dbusername );
- $template->param( VALUE_DBPASS => $object->get_dbpassword);
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
-
- my $oid = $object->{'object_id'};
- $template->param( VALUE_HISTORY => "/history.pl?OID=$oid" );
-
- $template->param( TEXT_STATUS_WAITING_FOR_VALIDATION => gettext("Waiting for validation") );
- $template->param( TEXT_STATUS_VALIDATION_REFUSED => gettext("Validation refused") );
- $template->param( TEXT_STATUS_WAITING_FOR_CREATION => gettext("Waiting for creation") );
- $template->param( TEXT_STATUS_CREATING_ERROR => gettext("Creating error") );
- $template->param( TEXT_STATUS_ACTIVATED => gettext("Activated") );
- $template->param( TEXT_STATUS_CREATED => gettext("Created") );
- $template->param( TEXT_STATUS_SUSPENDED => gettext("Suspended") );
- $template->param( TEXT_STATUS_SUSPENDED_BEFORE_DELETED => gettext("Suspended") );
- $template->param( TEXT_STATUS_WAITING_FOR_MODIFICATION => gettext("Waiting for modification") );
- $template->param( TEXT_STATUS_MODIFICATION_ERROR => gettext("Modification error") );
- $template->param( TEXT_STATUS_MODIFICATION_APPLIED => gettext("Modification applied") );
- $template->param( TEXT_STATUS_TO_DELETE => gettext("Will be deleted") );
-
-
- $template->param( VALUE_STATUS_WAITING_FOR_VALIDATION => Vhffs::Constants::WAITING_FOR_VALIDATION );
- $template->param( VALUE_STATUS_VALIDATION_REFUSED => Vhffs::Constants::VALIDATION_REFUSED );
- $template->param( VALUE_STATUS_WAITING_FOR_CREATION => Vhffs::Constants::WAITING_FOR_CREATION );
- $template->param( VALUE_STATUS_CREATING_ERROR => Vhffs::Constants::CREATING_ERROR );
- $template->param( VALUE_STATUS_ACTIVATED => Vhffs::Constants::ACTIVATED );
- $template->param( VALUE_STATUS_CREATED => Vhffs::Constants::CREATED );
- $template->param( VALUE_STATUS_SUSPENDED => Vhffs::Constants::SUSPENDED );
- $template->param( VALUE_STATUS_SUSPENDED_BEFORE_DELETED => Vhffs::Constants::SUSPENDED_BEFORE_DELETED );
- $template->param( VALUE_STATUS_WAITING_FOR_MODIFICATION => Vhffs::Constants::WAITING_FOR_MODIFICATION );
- $template->param( VALUE_STATUS_MODIFICATION_ERROR => Vhffs::Constants::MODIFICATION_ERROR );
- $template->param( VALUE_STATUS_MODIFICATION_APPLIED => Vhffs::Constants::MODIFICATION_APPLIED );
- $template->param( VALUE_STATUS_TO_DELETE => Vhffs::Constants::TO_DELETE );
-
- my $status = $object->get_status;
-
- if( $status == Vhffs::Constants::WAITING_FOR_VALIDATION )
- {
- $template->param( SELECTED_STATUS_WAITING_FOR_VALIDATION => "selected" );
- }
- elsif( $status == Vhffs::Constants::VALIDATION_REFUSED )
- {
- $template->param( SELECTED_STATUS_VALIDATION_REFUSED => "selected" );
- }
- elsif( $status == Vhffs::Constants::WAITING_FOR_CREATION )
- {
- $template->param( SELECTED_STATUS_WAITING_FOR_CREATION => "selected" );
- }
- elsif( $status == Vhffs::Constants::CREATING_ERROR )
- {
- $template->param( SELECTED_STATUS_CREATING_ERROR => "selected" );
- }
- elsif( $status == Vhffs::Constants::CREATED )
- {
- $template->param( SELECTED_STATUS_CREATED => "selected" );
- }
- elsif( $status == Vhffs::Constants::ACTIVATED )
- {
- $template->param( SELECTED_STATUS_ACTIVATED => "selected" );
- }
- elsif( $status == Vhffs::Constants::SUSPENDED )
- {
- $template->param( SELECTED_STATUS_SUSPENDED => "selected" );
- }
- elsif( $status == Vhffs::Constants::SUSPENDED_BEFORE_DELETED )
- {
- $template->param( SELECTED_STATUS_SUSPENDED_BEFORE_DELETED => "selected" );
- }
- elsif( $status == Vhffs::Constants::WAITING_FOR_MODIFICATION )
- {
- $template->param( SELECTED_STATUS_WAITING_FOR_MODIFICATION => "selected" );
- }
- elsif( $status == Vhffs::Constants::MODIFICATION_ERROR )
- {
- $template->param( SELECTED_STATUS_MODIFICATION_ERROR => "selected" );
- }
- elsif( $status == Vhffs::Constants::MODIFICATION_APPLIED )
- {
- $template->param( SELECTED_STATUS_MODIFICATION_APPLIED => "selected" );
- }
- elsif( $status == Vhffs::Constants::TO_DELETE )
- {
- $template->param( SELECTED_STATUS_TO_DELETE => "selected" );
- }
-
-}
-
-$panel->build( $template );
-$panel->display;
-
Deleted: trunk/vhffs-panel/admin/mysql/edit_submit.pl
===================================================================
--- trunk/vhffs-panel/admin/mysql/edit_submit.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/mysql/edit_submit.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,118 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
-my $template;
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $object;
-my $message;
-if( $user->is_admin != 1 )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $name )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "CGI ERROR !");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined ( $object = Vhffs::Services::Mysql::get_by_dbname( $vhffs , $name ) ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = sprintf( gettext("Cannot fetch object %s"), $name );
- $template->param( MESSAGE => $message );
-}
-else
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $pass = $cgi->param( "DBPASS" );
- if( $pass ne '' ) {
- $object->set_dbpassword( $pass );
- $object->set_status(Vhffs::Constants::WAITING_FOR_MODIFICATION);
- } else {
- $object->blank_password;
- $object->set_status( $cgi->param( "STATUS" ) );
- }
-
- if( $object->commit < 0 )
- {
- $message = gettext("Unable to modify the object");
- }
- else
- {
- $message = gettext("Modifications successfully added");
- }
-
- $template->param( MESSAGE => $message );
-
-
-
-}
-
-$panel->set_refresh_url( "/admin/mysql/list.pl" );
-$panel->build( $template );
-$panel->display;
Modified: trunk/vhffs-panel/admin/mysql/list.pl
===================================================================
--- trunk/vhffs-panel/admin/mysql/list.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/mysql/list.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -29,7 +29,7 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-
+use strict;
use utf8;
use POSIX qw(locale_h);
use HTML::Template;
@@ -37,7 +37,6 @@
use Locale::gettext;
use CGI;
use CGI::Session;
-use strict;
use lib '%VHFFS_LIB_DIR%';
@@ -56,59 +55,48 @@
exit 0 unless $session;
my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
+my $templatedir = $panel->{'templatedir'};
my $template;
-my $templatedir = $vhffs->get_config->get_templatedir;
-
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
+{
+ $template = new HTML::Template( filename => $templatedir.'/panel/misc/simplemsg.tmpl' );
+ $template->param( MESSAGE => gettext('You are not allowed to see it') );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/misc/list.tmpl" );
+ $template = new HTML::Template( filename => $templatedir.'/panel/admin/misc/list.tmpl' );
+ my $name = $cgi->param('NAME');
if( defined( $name ) )
{
- $template->param( TITLE => gettext("Search result for database") . ": " .$name );
+ $template->param( TITLE => gettext('Search result for database').': '.$name );
}
else
{
- $template->param( TITLE => gettext("List of all MySQL databases") );
+ $template->param( TITLE => gettext('List of all MySQL databases') );
}
- $template->param( TEXT_TITLE1 => gettext('DB Name') );
- $template->param( TEXT_TITLE2 => gettext('Group') );
- $template->param( TEXT_TITLE3 => gettext('State') );
+ $template->param( TEXT_TITLE1 => gettext('DB Name') );
+ $template->param( TEXT_TITLE2 => gettext('Group') );
+ $template->param( TEXT_TITLE3 => gettext('State') );
my $dbs = Vhffs::Panel::Mysql::search( $vhffs , $name );
if( defined $dbs )
{
- my $subtemplate;
+ my $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/mysql/part.tmpl', global_vars => 1 );
+ if( $user->is_admin == 1 ) {
+ $subtemplate->param( ACTION => gettext('Modify') );
+ } else {
+ $subtemplate->param( ACTION => gettext('Show') );
+ }
- if( $user->is_admin == 1 ) {
- $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/mysql/part.tmpl', global_vars => 1 );
- $subtemplate->param( SEND => gettext('Modify'));
- } else {
- $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/mysql/part-modo.tmpl', global_vars => 1 );
- $subtemplate->param( SEND => gettext('Show'));
- }
-
- $subtemplate->param(DBS => $dbs);
+ $subtemplate->param(DBS => $dbs);
$template->param( LIST => $subtemplate->output );
}
-
-
}
$panel->build( $template );
Deleted: trunk/vhffs-panel/admin/mysql/show.pl
===================================================================
--- trunk/vhffs-panel/admin/mysql/show.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/mysql/show.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,115 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
-my $template;
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $object;
-
-if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $name )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "CGI ERROR !");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined ( $object = Vhffs::Services::Mysql::get_by_dbname( $vhffs , $name ) ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "Cannot fetch object");
- $template->param( MESSAGE => $message );
-}
-else
-{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/mysql/show.tmpl" );
-
- $template->param( TITLE => gettext("Show MySQL database") );
-
- $template->param( TEXT_DBNAME => gettext("Servername") );
- $template->param( TEXT_DBUSER => gettext("User") );
- $template->param( TEXT_GROUP => gettext("Group") );
- $template->param( TEXT_OWNER => gettext("Owner") );
- $template->param( TEXT_STATUS => gettext("Status") );
- $template->param( TEXT_DESCRIPTION => gettext("Description") );
- $template->param( TEXT_STATUS => gettext("Status") );
- $template->param( TEXT_HISTORY => gettext("History") );
-
- $template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $object->get_description ) );
- $template->param( VALUE_DBNAME => $object->get_dbname );
- $template->param( VALUE_DBUSER => $object->get_dbusername );
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
- $template->param( VALUE_STATUS => Vhffs::Functions::status_string_from_status_id ($object->get_status) );
-
- my $oid = $object->{'object_id'};
- $template->param( VALUE_HISTORY => "/history.pl?OID=$oid" );
-}
-
-$panel->build( $template );
-$panel->display;
Deleted: trunk/vhffs-panel/admin/pgsql/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/pgsql/edit.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/pgsql/edit.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,197 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
-my $template;
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $object;
-
-if( $user->is_admin != 1 )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $name )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "CGI ERROR !");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined ( $object = Vhffs::Services::Pgsql::get_by_dbname( $vhffs , $name ) ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "Cannot fetch object");
- $template->param( MESSAGE => $message );
-}
-else
-{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/pgsql/edit.tmpl" );
-
- $template->param( TITLE => gettext("Edit PostgreSQL database") );
-
-
- $template->param( TEXT_DBNAME => gettext("Database Name") );
- $template->param( TEXT_DBUSER => gettext("User") );
- $template->param( TEXT_DBPASS => gettext("Password") );
- $template->param( TEXT_GROUP => gettext("Group") );
- $template->param( TEXT_OWNER => gettext("Owner") );
- $template->param( TEXT_STATUS => gettext("Status") );
- $template->param( TEXT_DESCRIPTION => gettext("Description") );
- $template->param( SEND => gettext("Send") );
- $template->param( TEXT_HISTORY => gettext("History") );
-
- $template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $object->get_description ) );
- $template->param( VALUE_DBNAME => $object->get_dbname );
- $template->param( VALUE_DBUSER => $object->get_dbusername );
- $template->param( VALUE_DBPASS => $object->get_dbpassword);
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
-
- my $oid = $object->{'object_id'};
- $template->param( VALUE_HISTORY => "/history.pl?OID=$oid" );
-
- $template->param( TEXT_STATUS_WAITING_FOR_VALIDATION => gettext("Waiting for validation") );
- $template->param( TEXT_STATUS_VALIDATION_REFUSED => gettext("Validation refused") );
- $template->param( TEXT_STATUS_WAITING_FOR_CREATION => gettext("Waiting for creation") );
- $template->param( TEXT_STATUS_CREATING_ERROR => gettext("Creating error") );
- $template->param( TEXT_STATUS_ACTIVATED => gettext("Activated") );
- $template->param( TEXT_STATUS_CREATED => gettext("Created") );
- $template->param( TEXT_STATUS_SUSPENDED => gettext("Suspended") );
- $template->param( TEXT_STATUS_SUSPENDED_BEFORE_DELETED => gettext("Suspended") );
- $template->param( TEXT_STATUS_WAITING_FOR_MODIFICATION => gettext("Waiting for modification") );
- $template->param( TEXT_STATUS_MODIFICATION_ERROR => gettext("Modification error") );
- $template->param( TEXT_STATUS_MODIFICATION_APPLIED => gettext("Modification applied") );
- $template->param( TEXT_STATUS_TO_DELETE => gettext("Will be deleted") );
-
-
- $template->param( VALUE_STATUS_WAITING_FOR_VALIDATION => Vhffs::Constants::WAITING_FOR_VALIDATION );
- $template->param( VALUE_STATUS_VALIDATION_REFUSED => Vhffs::Constants::VALIDATION_REFUSED );
- $template->param( VALUE_STATUS_WAITING_FOR_CREATION => Vhffs::Constants::WAITING_FOR_CREATION );
- $template->param( VALUE_STATUS_CREATING_ERROR => Vhffs::Constants::CREATING_ERROR );
- $template->param( VALUE_STATUS_ACTIVATED => Vhffs::Constants::ACTIVATED );
- $template->param( VALUE_STATUS_CREATED => Vhffs::Constants::CREATED );
- $template->param( VALUE_STATUS_SUSPENDED => Vhffs::Constants::SUSPENDED );
- $template->param( VALUE_STATUS_SUSPENDED_BEFORE_DELETED => Vhffs::Constants::SUSPENDED_BEFORE_DELETED );
- $template->param( VALUE_STATUS_WAITING_FOR_MODIFICATION => Vhffs::Constants::WAITING_FOR_MODIFICATION );
- $template->param( VALUE_STATUS_MODIFICATION_ERROR => Vhffs::Constants::MODIFICATION_ERROR );
- $template->param( VALUE_STATUS_MODIFICATION_APPLIED => Vhffs::Constants::MODIFICATION_APPLIED );
- $template->param( VALUE_STATUS_TO_DELETE => Vhffs::Constants::TO_DELETE );
-
- my $status = $object->get_status;
-
- if( $status == Vhffs::Constants::WAITING_FOR_VALIDATION )
- {
- $template->param( SELECTED_STATUS_WAITING_FOR_VALIDATION => "selected" );
- }
- elsif( $status == Vhffs::Constants::VALIDATION_REFUSED )
- {
- $template->param( SELECTED_STATUS_VALIDATION_REFUSED => "selected" );
- }
- elsif( $status == Vhffs::Constants::WAITING_FOR_CREATION )
- {
- $template->param( SELECTED_STATUS_WAITING_FOR_CREATION => "selected" );
- }
- elsif( $status == Vhffs::Constants::CREATING_ERROR )
- {
- $template->param( SELECTED_STATUS_CREATING_ERROR => "selected" );
- }
- elsif( $status == Vhffs::Constants::CREATED )
- {
- $template->param( SELECTED_STATUS_CREATED => "selected" );
- }
- elsif( $status == Vhffs::Constants::ACTIVATED )
- {
- $template->param( SELECTED_STATUS_ACTIVATED => "selected" );
- }
- elsif( $status == Vhffs::Constants::SUSPENDED )
- {
- $template->param( SELECTED_STATUS_SUSPENDED => "selected" );
- }
- elsif( $status == Vhffs::Constants::SUSPENDED_BEFORE_DELETED )
- {
- $template->param( SELECTED_STATUS_SUSPENDED_BEFORE_DELETED => "selected" );
- }
- elsif( $status == Vhffs::Constants::WAITING_FOR_MODIFICATION )
- {
- $template->param( SELECTED_STATUS_WAITING_FOR_MODIFICATION => "selected" );
- }
- elsif( $status == Vhffs::Constants::MODIFICATION_ERROR )
- {
- $template->param( SELECTED_STATUS_MODIFICATION_ERROR => "selected" );
- }
- elsif( $status == Vhffs::Constants::MODIFICATION_APPLIED )
- {
- $template->param( SELECTED_STATUS_MODIFICATION_APPLIED => "selected" );
- }
- elsif( $status == Vhffs::Constants::TO_DELETE )
- {
- $template->param( SELECTED_STATUS_TO_DELETE => "selected" );
- }
-
-}
-
-$panel->build( $template );
-$panel->display;
Deleted: trunk/vhffs-panel/admin/pgsql/edit_submit.pl
===================================================================
--- trunk/vhffs-panel/admin/pgsql/edit_submit.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/pgsql/edit_submit.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,115 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
-my $template;
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $object;
-my $message;
-if( $user->is_admin != 1 )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $name )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "CGI ERROR !");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined ( $object = Vhffs::Services::Pgsql::get_by_dbname( $vhffs , $name ) ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = sprintf( gettext("Cannot fetch object %s"), $name );
- $template->param( MESSAGE => $message );
-}
-else
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
-
- $object->set_status( $cgi->param( "STATUS" ) );
-
-
- if( $object->commit < 0 )
- {
- $message = gettext("Unable to modify the object");
- }
- else
- {
- $message = gettext("Modifications successfully added");
- }
-
- $template->param( MESSAGE => $message );
-
-
-
-}
-
-
-$panel->set_refresh_url( "/admin/pgsql/list.pl" );
-$panel->build( $template );
-$panel->display;
Modified: trunk/vhffs-panel/admin/pgsql/list.pl
===================================================================
--- trunk/vhffs-panel/admin/pgsql/list.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/pgsql/list.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -29,7 +29,7 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-
+use strict;
use utf8;
use POSIX qw(locale_h);
use HTML::Template;
@@ -37,17 +37,11 @@
use Locale::gettext;
use CGI;
use CGI::Session;
-use strict;
-
use lib '%VHFFS_LIB_DIR%';
use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
+use Vhffs::Panel::Pgsql;
my $panel = new Vhffs::Panel::Main();
exit 0 unless $panel;
@@ -55,63 +49,48 @@
exit 0 unless $session;
my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
+my $templatedir = $panel->{'templatedir'};
my $template;
-my $templatedir = $vhffs->get_config->get_templatedir;
-
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
+ $template = new HTML::Template( filename => $templatedir.'/panel/misc/simplemsg.tmpl' );
+ $template->param( MESSAGE => gettext('You are not allowed to see it') );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/misc/list.tmpl" );
+ $template = new HTML::Template( filename => $templatedir.'/panel/admin/misc/list.tmpl' );
+ my $name = $cgi->param('NAME');
if( defined( $name ) )
{
- $template->param( TITLE => gettext("Search result for database") . ": " .$name );
+ $template->param( TITLE => gettext('Search result for database').': '.$name );
}
else
{
- $template->param( TITLE => gettext("List of all PostgreSQL databases") );
+ $template->param( TITLE => gettext('List of all PostgreSQL databases') );
}
- $template->param( TEXT_TITLE1 => gettext('DB Name') );
- $template->param( TEXT_TITLE2 => gettext('Group') );
- $template->param( TEXT_TITLE3 => gettext('State') );
+ $template->param( TEXT_TITLE1 => gettext('DB Name') );
+ $template->param( TEXT_TITLE2 => gettext('Group') );
+ $template->param( TEXT_TITLE3 => gettext('State') );
-
my $dbs = Vhffs::Panel::Pgsql::search( $vhffs , $name );
-
if( defined $dbs )
{
- my $subtemplate;
- my $send;
- my $tmpldbs;
- if( $user->is_admin == 1 ) {
- $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/pgsql/part.tmpl', global_vars => 1 );
- $subtemplate->param(SEND => gettext('Modify'));
- } else {
- $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/pgsql/part-modo.tmpl', global_vars => 1 );
- $subtemplate->param(SEND => gettext('Show'));
- }
+ my $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/pgsql/part.tmpl', global_vars => 1 );
+ if( $user->is_admin == 1 ) {
+ $subtemplate->param( ACTION => gettext('Modify') );
+ } else {
+ $subtemplate->param( ACTION => gettext('Show') );
+ }
- $subtemplate->param( DBS => $dbs );
+ $subtemplate->param( DBS => $dbs );
$template->param( LIST => $subtemplate->output );
- }
-
-
}
+}
$panel->build( $template );
$panel->display;
-
Deleted: trunk/vhffs-panel/admin/pgsql/show.pl
===================================================================
--- trunk/vhffs-panel/admin/pgsql/show.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/pgsql/show.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,115 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
-my $template;
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $object;
-
-if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $name )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "CGI ERROR !");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined ( $object = Vhffs::Services::Pgsql::get_by_dbname( $vhffs , $name ) ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "Cannot fetch object");
- $template->param( MESSAGE => $message );
-}
-else
-{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/pgsql/show.tmpl" );
-
- $template->param( TITLE => gettext("Show PostgreSQL database") );
-
- $template->param( TEXT_DBNAME => gettext("Database Name") );
- $template->param( TEXT_DBUSER => gettext("User") );
- $template->param( TEXT_GROUP => gettext("Group") );
- $template->param( TEXT_OWNER => gettext("Owner") );
- $template->param( TEXT_STATUS => gettext("Status") );
- $template->param( TEXT_DESCRIPTION => gettext("Description") );
- $template->param( TEXT_HISTORY => gettext("History") );
-
- $template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $object->get_description ) );
- $template->param( VALUE_DBNAME => $object->get_dbname );
- $template->param( VALUE_DBUSER => $object->get_dbusername );
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
- $template->param( VALUE_STATUS => Vhffs::Functions::status_string_from_status_id ($object->get_status) );
-
- my $oid = $object->{'object_id'};
- $template->param( VALUE_HISTORY => "/history.pl?OID=$oid" );
-}
-
-$panel->build( $template );
-$panel->display;
Deleted: trunk/vhffs-panel/admin/repository/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/repository/edit.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/repository/edit.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,198 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
-my $template;
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $object;
-
-if( $user->is_admin != 1 )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $name )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "CGI ERROR !");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined ( $object = Vhffs::Services::Repository::get_by_reponame( $vhffs , $name ) ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "Cannot fetch object");
- $template->param( MESSAGE => $message );
-}
-else
-{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/repository/edit.tmpl" );
-
- $template->param( TITLE => gettext("Edit Download repository") );
-
-
- $template->param( TEXT_NAME => gettext("Name") );
- $template->param( TEXT_GROUP => gettext("Group") );
- $template->param( TEXT_OWNER => gettext("Owner") );
- $template->param( TEXT_STATUS => gettext("Status") );
- $template->param( TEXT_DESCRIPTION => gettext("Description") );
- $template->param( SEND => gettext("Send") );
- $template->param( TEXT_HISTORY => gettext("History") );
- $template->param( TEXT_QUOTA => gettext("Quota") );
- $template->param( TEXT_QUOTAUSED => gettext("Quota used") );
-
- $template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $object->get_description ) );
- $template->param( VALUE_NAME => $object->get_name);
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
- $template->param( VALUE_QUOTA => $object->get_quota);
- $template->param( VALUE_QUOTAUSED => $object->get_quota_used);
-
- my $oid = $object->{'object_id'};
- $template->param( VALUE_HISTORY => "/history.pl?OID=$oid" );
-
- $template->param( TEXT_STATUS_WAITING_FOR_VALIDATION => gettext("Waiting for validation") );
- $template->param( TEXT_STATUS_VALIDATION_REFUSED => gettext("Validation refused") );
- $template->param( TEXT_STATUS_WAITING_FOR_CREATION => gettext("Waiting for creation") );
- $template->param( TEXT_STATUS_CREATING_ERROR => gettext("Creating error") );
- $template->param( TEXT_STATUS_ACTIVATED => gettext("Activated") );
- $template->param( TEXT_STATUS_CREATED => gettext("Created") );
- $template->param( TEXT_STATUS_SUSPENDED => gettext("Suspended") );
- $template->param( TEXT_STATUS_SUSPENDED_BEFORE_DELETED => gettext("Suspended") );
- $template->param( TEXT_STATUS_WAITING_FOR_MODIFICATION => gettext("Waiting for modification") );
- $template->param( TEXT_STATUS_MODIFICATION_ERROR => gettext("Modification error") );
- $template->param( TEXT_STATUS_MODIFICATION_APPLIED => gettext("Modification applied") );
- $template->param( TEXT_STATUS_TO_DELETE => gettext("Will be deleted") );
-
-
- $template->param( VALUE_STATUS_WAITING_FOR_VALIDATION => Vhffs::Constants::WAITING_FOR_VALIDATION );
- $template->param( VALUE_STATUS_VALIDATION_REFUSED => Vhffs::Constants::VALIDATION_REFUSED );
- $template->param( VALUE_STATUS_WAITING_FOR_CREATION => Vhffs::Constants::WAITING_FOR_CREATION );
- $template->param( VALUE_STATUS_CREATING_ERROR => Vhffs::Constants::CREATING_ERROR );
- $template->param( VALUE_STATUS_ACTIVATED => Vhffs::Constants::ACTIVATED );
- $template->param( VALUE_STATUS_CREATED => Vhffs::Constants::CREATED );
- $template->param( VALUE_STATUS_SUSPENDED => Vhffs::Constants::SUSPENDED );
- $template->param( VALUE_STATUS_SUSPENDED_BEFORE_DELETED => Vhffs::Constants::SUSPENDED_BEFORE_DELETED );
- $template->param( VALUE_STATUS_WAITING_FOR_MODIFICATION => Vhffs::Constants::WAITING_FOR_MODIFICATION );
- $template->param( VALUE_STATUS_MODIFICATION_ERROR => Vhffs::Constants::MODIFICATION_ERROR );
- $template->param( VALUE_STATUS_MODIFICATION_APPLIED => Vhffs::Constants::MODIFICATION_APPLIED );
- $template->param( VALUE_STATUS_TO_DELETE => Vhffs::Constants::TO_DELETE );
-
- my $status = $object->get_status;
-
- if( $status == Vhffs::Constants::WAITING_FOR_VALIDATION )
- {
- $template->param( SELECTED_STATUS_WAITING_FOR_VALIDATION => "selected" );
- }
- elsif( $status == Vhffs::Constants::VALIDATION_REFUSED )
- {
- $template->param( SELECTED_STATUS_VALIDATION_REFUSED => "selected" );
- }
- elsif( $status == Vhffs::Constants::WAITING_FOR_CREATION )
- {
- $template->param( SELECTED_STATUS_WAITING_FOR_CREATION => "selected" );
- }
- elsif( $status == Vhffs::Constants::CREATING_ERROR )
- {
- $template->param( SELECTED_STATUS_CREATING_ERROR => "selected" );
- }
- elsif( $status == Vhffs::Constants::CREATED )
- {
- $template->param( SELECTED_STATUS_CREATED => "selected" );
- }
- elsif( $status == Vhffs::Constants::ACTIVATED )
- {
- $template->param( SELECTED_STATUS_ACTIVATED => "selected" );
- }
- elsif( $status == Vhffs::Constants::SUSPENDED )
- {
- $template->param( SELECTED_STATUS_SUSPENDED => "selected" );
- }
- elsif( $status == Vhffs::Constants::SUSPENDED_BEFORE_DELETED )
- {
- $template->param( SELECTED_STATUS_SUSPENDED_BEFORE_DELETED => "selected" );
- }
- elsif( $status == Vhffs::Constants::WAITING_FOR_MODIFICATION )
- {
- $template->param( SELECTED_STATUS_WAITING_FOR_MODIFICATION => "selected" );
- }
- elsif( $status == Vhffs::Constants::MODIFICATION_ERROR )
- {
- $template->param( SELECTED_STATUS_MODIFICATION_ERROR => "selected" );
- }
- elsif( $status == Vhffs::Constants::MODIFICATION_APPLIED )
- {
- $template->param( SELECTED_STATUS_MODIFICATION_APPLIED => "selected" );
- }
- elsif( $status == Vhffs::Constants::TO_DELETE )
- {
- $template->param( SELECTED_STATUS_TO_DELETE => "selected" );
- }
-
-}
-
-$panel->build( $template );
-$panel->display;
-
Deleted: trunk/vhffs-panel/admin/repository/edit_submit.pl
===================================================================
--- trunk/vhffs-panel/admin/repository/edit_submit.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/repository/edit_submit.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,117 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
-use Vhffs::Services::Repository;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
-my $template;
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $object;
-my $message;
-if( $user->is_admin != 1 )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $name )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "CGI ERROR !");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined ( $object = Vhffs::Services::Repository::get_by_reponame( $vhffs , $name ) ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = sprintf( gettext("Cannot fetch object %s"), $name );
- $template->param( MESSAGE => $message );
-}
-else
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
-
- $object->set_status( $cgi->param( "STATUS" ) );
- $object->set_quota( $cgi->param( "QUOTA" ) );
-
-
- if( $object->commit < 0 )
- {
- $message = gettext("Can't modify object...");
- }
- else
- {
- $message = gettext("Modifications successfully added");
- }
-
- $template->param( MESSAGE => $message );
-
-
-
-}
-
-
-$panel->set_refresh_url( "/admin/repository/list.pl" );
-$panel->build( $template );
-$panel->display;
Modified: trunk/vhffs-panel/admin/repository/list.pl
===================================================================
--- trunk/vhffs-panel/admin/repository/list.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/repository/list.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -29,7 +29,7 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-
+use strict;
use utf8;
use POSIX qw(locale_h);
use HTML::Template;
@@ -37,18 +37,10 @@
use Locale::gettext;
use CGI;
use CGI::Session;
-use strict;
-
use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
use Vhffs::Panel::Repository;
-use Vhffs::Stats;
-use Vhffs::Constants;
my $panel = new Vhffs::Panel::Main();
exit 0 unless $panel;
@@ -56,60 +48,46 @@
exit 0 unless $session;
my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
+my $templatedir = $panel->{'templatedir'};
my $template;
-my $templatesdir = $vhffs->get_config->get_templatedir;
-
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
-
- $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
+ $template = new HTML::Template( filename => $templatedir.'/panel/misc/simplemsg.tmpl' );
+ $template->param( MESSAGE => gettext('You are not allowed to see it') );
}
else
{
- $template = new HTML::Template( filename => $templatesdir."/panel/admin/misc/list.tmpl" );
+ $template = new HTML::Template( filename => $templatedir.'/panel/admin/misc/list.tmpl' );
+ my $name = $cgi->param('NAME');
if( defined( $name ) )
{
- $template->param( TITLE => gettext("Search result for Download repository") . ": " .$name );
+ $template->param( TITLE => gettext('Search result for Download repository').': '.$name );
}
else
{
- $template->param( TITLE => gettext("List of all Download repositories") );
+ $template->param( TITLE => gettext('List of all Download repositories') );
}
- $template->param( TEXT_TITLE1 => gettext('Repository Name') );
- $template->param( TEXT_TITLE2 => gettext('Group') );
- $template->param( TEXT_TITLE3 => gettext('State') );
+ $template->param( TEXT_TITLE1 => gettext('Repository Name') );
+ $template->param( TEXT_TITLE2 => gettext('Group') );
+ $template->param( TEXT_TITLE3 => gettext('State') );
my $repos = Vhffs::Panel::Repository::search( $vhffs, $name );
-
if( defined $repos )
{
- my $subtemplate;
- my $send;
- my $tmplrepos;
- if( $user->is_admin == 1 ) {
- $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/repository/part.tmpl", global_vars => 1 );
- $subtemplate->param(SEND => gettext('Modify'));
- } else {
- $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/repository/part-modo.tmpl", global_vars => 1 );
- $subtemplate->param(SEND => gettext('Show'));
- }
-
- $subtemplate->param( REPOSITORIES => $repos );
+ my $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/repository/part.tmpl', global_vars => 1 );
+ if( $user->is_admin == 1 ) {
+ $subtemplate->param( ACTION => gettext('Modify') );
+ } else {
+ $subtemplate->param( ACTION => gettext('Show') );
+ }
+ $subtemplate->param( REPOSITORIES => $repos );
$template->param( LIST => $subtemplate->output );
}
-
-
}
$panel->build( $template );
Deleted: trunk/vhffs-panel/admin/repository/show.pl
===================================================================
--- trunk/vhffs-panel/admin/repository/show.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/repository/show.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,118 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
-my $template;
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $object;
-
-if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $name )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "CGI ERROR !");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined ( $object = Vhffs::Services::Repository::get_by_reponame( $vhffs , $name ) ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "Cannot fetch object");
- $template->param( MESSAGE => $message );
-}
-else
-{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/repository/show.tmpl" );
-
- $template->param( TITLE => gettext("Show Download repository") );
-
- $template->param( TEXT_NAME => gettext("Name") );
- $template->param( TEXT_GROUP => gettext("Group") );
- $template->param( TEXT_OWNER => gettext("Owner") );
- $template->param( TEXT_STATUS => gettext("Status") );
- $template->param( TEXT_DESCRIPTION => gettext("Description") );
- $template->param( TEXT_HISTORY => gettext("History") );
- $template->param( TEXT_QUOTA => gettext("Quota") );
- $template->param( TEXT_QUOTAUSED => gettext("Quota used") );
-
- $template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $object->get_description ) );
- $template->param( VALUE_NAME => $object->get_name);
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
- $template->param( VALUE_STATUS => Vhffs::Functions::status_string_from_status_id ($object->get_status) );
- $template->param( VALUE_QUOTA => $object->get_quota);
- $template->param( VALUE_QUOTAUSED => $object->get_quota_used);
-
- my $oid = $object->{'object_id'};
- $template->param( VALUE_HISTORY => "/history.pl?OID=$oid" );
-}
-
-$panel->build( $template );
-$panel->display;
-
Modified: trunk/vhffs-panel/admin/svn/list.pl
===================================================================
--- trunk/vhffs-panel/admin/svn/list.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/svn/list.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -29,7 +29,6 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-
use strict;
use utf8;
use HTML::Template;
@@ -45,54 +44,46 @@
exit 0 unless $session;
my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
+my $templatedir = $panel->{'templatedir'};
my $template;
-my $templatesdir = $vhffs->get_config->get_templatedir;
-
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
- $template->param( MESSAGE => gettext( "You are not allowed to see it") );
+ $template = new HTML::Template( filename => $templatedir.'/panel/misc/simplemsg.tmpl' );
+ $template->param( MESSAGE => gettext('You are not allowed to see it') );
}
else
{
- $template = new HTML::Template( filename => $templatesdir."/panel/admin/misc/list.tmpl" );
-
+ $template = new HTML::Template( filename => $templatedir.'/panel/admin/misc/list.tmpl' );
+ my $name = $cgi->param('NAME');
if( defined( $name ) )
{
- $template->param( TITLE => gettext("Search result for Subversion repository") . ": " .$name );
+ $template->param( TITLE => gettext('Search result for Subversion repository').': '.$name );
}
else
{
- $template->param( TITLE => gettext("All Subversion repositories lists") );
+ $template->param( TITLE => gettext('All Subversion repositories lists') );
}
- $template->param(TEXT_TITLE1 => gettext('SVN root'));
- $template->param(TEXT_TITLE2 => gettext('Group'));
- $template->param(TEXT_TITLE3 => gettext('State'));
+ $template->param(TEXT_TITLE1 => gettext('SVN root'));
+ $template->param(TEXT_TITLE2 => gettext('Group'));
+ $template->param(TEXT_TITLE3 => gettext('State'));
my $repos = Vhffs::Panel::Svn::search( $vhffs, $name );
-
if( defined $repos )
{
- my $subtemplate;
+ my $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/svn/part.tmpl', global_vars => 1 );
if( $user->is_admin == 1 ) {
- $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/svn/part.tmpl", global_vars => 1 );
- $subtemplate->param(SEND => gettext('Modify'));
+ $subtemplate->param( ACTION => gettext('Modify') );
} else {
- $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/svn/part-modo.tmpl", global_vars => 1, die_on_bad_params => 0);
+ $subtemplate->param( ACTION => gettext('Show') );
}
- $subtemplate->param( SVNREPOS => $repos);
+
+ $subtemplate->param( SVNREPOS => $repos);
$template->param( LIST => $subtemplate->output );
}
-
-
}
$panel->build( $template );
Deleted: trunk/vhffs-panel/admin/user/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/user/edit.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/user/edit.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,264 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $username = $cgi->param("NAME");
-my $template;
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $object;
-
-if( $user->is_admin != 1 )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $username )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "CGI ERROR !");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined ( $object = Vhffs::User::get_by_username( $vhffs , $username ) ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "Cannot fetch object");
- $template->param( MESSAGE => $message );
-}
-else
-{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/user/edit.tmpl" );
-
- $template->param( TITLE => gettext("Edit User") );
-
-
- $template->param( TEXT_USERNAME => gettext("Username:") );
- $template->param( TEXT_FIRSTNAME => gettext("Firstname") );
- $template->param( TEXT_LASTNAME => gettext("Lastname") );
- $template->param( TEXT_SHELL => gettext("Shell") );
- $template->param( TEXT_PASSWD => gettext("Password") );
- $template->param( TEXT_HOMEDIR => gettext("Home") );
- $template->param( TEXT_ADMIN => gettext("Admin") );
- $template->param( TEXT_UID => gettext("UID") );
- $template->param( TEXT_GID => gettext("GID") );
- $template->param( TEXT_ADDRESS => gettext("Address") );
- $template->param( TEXT_CITY => gettext("City") );
- $template->param( TEXT_ZIPCODE => gettext("Zipcode") );
- $template->param( TEXT_COUNTRY => gettext("Country") );
- $template->param( TEXT_MAIL => gettext("Mail") );
- $template->param( TEXT_GPG => gettext("GPG key") );
- $template->param( TEXT_HISTORY => gettext("History") );
- $template->param( SEND => gettext("Send") );
-
- $template->param( VALUE_USERNAME => $object->get_username );
- $template->param( VALUE_FIRSTNAME => $object->get_firstname );
- $template->param( VALUE_LASTNAME => $object->get_lastname );
- $template->param( VALUE_SHELL => $object->get_shell );
- $template->param( VALUE_HOMEDIR => $object->get_home );
- $template->param( VALUE_ADDRESS => $object->get_address );
- $template->param( VALUE_MAIL => $object->get_mail );
- $template->param( VALUE_ZIPCODE => $object->get_zipcode );
- $template->param( VALUE_COUNTRY => $object->get_country );
- $template->param( VALUE_UID => $object->get_uid );
- $template->param( VALUE_GID => $object->get_gid );
- $template->param( VALUE_CITY => $object->get_city );
-
- $template->param( VALUE_MODERATOR_USER => Vhffs::Constants::USER_MODERATOR );
- $template->param( VALUE_NORMAL_USER => Vhffs::Constants::USER_NORMAL );
- $template->param( VALUE_ADMIN_USER => Vhffs::Constants::USER_ADMIN );
-
- $template->param( TEXT_MODERATOR_USER => gettext("Moderator") );
- $template->param( TEXT_ADMIN_USER => gettext("Admin") );
- $template->param( TEXT_NORMAL_USER => gettext("Hosted") );
-
- my $oid = $object->{'object_id'};
- $template->param( VALUE_HISTORY => "/history.pl?OID=$oid" );
-
- $template->param( TEXT_STATUS => gettext("Status") );
-
- $template->param( TEXT_STATUS_WAITING_FOR_VALIDATION => gettext("Waiting for validation") );
- $template->param( TEXT_STATUS_VALIDATION_REFUSED => gettext("Validation refused") );
- $template->param( TEXT_STATUS_WAITING_FOR_CREATION => gettext("Waiting for creation") );
- $template->param( TEXT_STATUS_CREATING_ERROR => gettext("Creating error") );
- $template->param( TEXT_STATUS_ACTIVATED => gettext("Activated") );
- $template->param( TEXT_STATUS_CREATED => gettext("Created") );
- $template->param( TEXT_STATUS_SUSPENDED => gettext("Suspended") );
- $template->param( TEXT_STATUS_SUSPENDED_BEFORE_DELETED => gettext("Suspended before deletion") );
- $template->param( TEXT_STATUS_WAITING_FOR_MODIFICATION => gettext("Waiting for modification") );
- $template->param( TEXT_STATUS_MODIFICATION_ERROR => gettext("Modification error") );
- $template->param( TEXT_STATUS_MODIFICATION_APPLIED => gettext("Modification applied") );
- $template->param( TEXT_STATUS_TO_DELETE => gettext("Will be deleted") );
-
-
- $template->param( VALUE_STATUS_WAITING_FOR_VALIDATION => Vhffs::Constants::WAITING_FOR_VALIDATION );
- $template->param( VALUE_STATUS_VALIDATION_REFUSED => Vhffs::Constants::VALIDATION_REFUSED );
- $template->param( VALUE_STATUS_WAITING_FOR_CREATION => Vhffs::Constants::WAITING_FOR_CREATION );
- $template->param( VALUE_STATUS_CREATING_ERROR => Vhffs::Constants::CREATING_ERROR );
- $template->param( VALUE_STATUS_ACTIVATED => Vhffs::Constants::ACTIVATED );
- $template->param( VALUE_STATUS_CREATED => Vhffs::Constants::CREATED );
- $template->param( VALUE_STATUS_SUSPENDED => Vhffs::Constants::SUSPENDED );
- $template->param( VALUE_STATUS_SUSPENDED_BEFORE_DELETED => Vhffs::Constants::SUSPENDED_BEFORE_DELETED );
- $template->param( VALUE_STATUS_WAITING_FOR_MODIFICATION => Vhffs::Constants::WAITING_FOR_MODIFICATION );
- $template->param( VALUE_STATUS_MODIFICATION_ERROR => Vhffs::Constants::MODIFICATION_ERROR );
- $template->param( VALUE_STATUS_MODIFICATION_APPLIED => Vhffs::Constants::MODIFICATION_APPLIED );
- $template->param( VALUE_STATUS_TO_DELETE => Vhffs::Constants::TO_DELETE );
-
- my $status = $object->get_status;
-
- if( $status == Vhffs::Constants::WAITING_FOR_VALIDATION )
- {
- $template->param( SELECTED_STATUS_WAITING_FOR_VALIDATION => "selected" );
- }
- elsif( $status == Vhffs::Constants::VALIDATION_REFUSED )
- {
- $template->param( SELECTED_STATUS_VALIDATION_REFUSED => "selected" );
- }
- elsif( $status == Vhffs::Constants::WAITING_FOR_CREATION )
- {
- $template->param( SELECTED_STATUS_WAITING_FOR_CREATION => "selected" );
- }
- elsif( $status == Vhffs::Constants::CREATING_ERROR )
- {
- $template->param( SELECTED_STATUS_CREATING_ERROR => "selected" );
- }
- elsif( $status == Vhffs::Constants::CREATED )
- {
- $template->param( SELECTED_STATUS_CREATED => "selected" );
- }
- elsif( $status == Vhffs::Constants::ACTIVATED )
- {
- $template->param( SELECTED_STATUS_ACTIVATED => "selected" );
- }
- elsif( $status == Vhffs::Constants::SUSPENDED )
- {
- $template->param( SELECTED_STATUS_SUSPENDED => "selected" );
- }
- elsif( $status == Vhffs::Constants::SUSPENDED_BEFORE_DELETED )
- {
- $template->param( SELECTED_STATUS_SUSPENDED_BEFORE_DELETED => "selected" );
- }
- elsif( $status == Vhffs::Constants::WAITING_FOR_MODIFICATION )
- {
- $template->param( SELECTED_STATUS_WAITING_FOR_MODIFICATION => "selected" );
- }
- elsif( $status == Vhffs::Constants::MODIFICATION_ERROR )
- {
- $template->param( SELECTED_STATUS_MODIFICATION_ERROR => "selected" );
- }
- elsif( $status == Vhffs::Constants::MODIFICATION_APPLIED )
- {
- $template->param( SELECTED_STATUS_MODIFICATION_APPLIED => "selected" );
- }
- elsif( $status == Vhffs::Constants::TO_DELETE )
- {
- $template->param( SELECTED_STATUS_TO_DELETE => "selected" );
- }
-
-
- my $groups = Vhffs::Group::getall_by_user( $vhffs , undef , $object );
- my $g;
- my $subtemplate;
- my $tmp = "";
- foreach $g ( @{$groups} )
- {
- $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/user/group-part.tmpl" );
- $subtemplate->param( GROUPNAME => $g->get_groupname );
- $subtemplate->param( OWNER_TEXT => gettext("Owner of this group") );
- $subtemplate->param( OWNER => $g->get_owner_username );
- $subtemplate->param( STATE => Vhffs::Functions::status_string_from_status_id( $g->get_status) );
-
- $tmp .= $subtemplate->output;
- }
-
- $template->param( TEXT_GROUPS => gettext("Groups of this user") );
- $template->param( GROUPS => $tmp );
-
-
- if( $object->is_moderator )
- {
- $template->param( SELECTED_MODERATOR_USER => "selected" );
- }
- elsif( $object->is_admin )
- {
- $template->param( SELECTED_ADMIN_USER => "selected" );
- }
- else
- {
- $template->param( SELECTED_NORMAL_USER => "selected" );
- }
-
- if( $vhffs->get_config->get_users->{'use_notation'} eq 'yes' )
- {
- my $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/user/edit-note.tmpl" );
- $subtemplate->param( TEXT_NOTE => "Note" );
- $subtemplate->param( VALUE_NOTE => $object->get_note );
- $subtemplate->param( VALUE_USERNAME => $object->get_username );
- $subtemplate->param( SEND => gettext("Update note") );
-
- $template->param( NOTE => $subtemplate->output );
- }
-}
-
-$panel->build( $template );
-$panel->display;
Deleted: trunk/vhffs-panel/admin/user/edit_note.pl
===================================================================
--- trunk/vhffs-panel/admin/user/edit_note.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/user/edit_note.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,110 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-my $group = $panel->{'group'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $username = $cgi->param("USERNAME");
-
-
-my $template;
-my $object;
-my $message;
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
-
-if( $user->is_admin != 1 )
-{
- $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $username )
-{
- #Here, this is a directly call to the script, username is not defined
- $message = gettext( "CGI ERROR !" );
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined ( $object = Vhffs::User::get_by_username( $vhffs , $username) ) )
-{
- $message = gettext( "Cannot fetch object" );
- $template->param( MESSAGE => $message );
-}
-else
-{
-
- my $note = $cgi->param("NOTE");
-
- if( defined $note )
- {
- $object->set_note( $note );
- $object->commit;
- $message = gettext("Note successfully modified");
- }
- else
- {
- $message = gettext("Failed to modify note");
- }
- $template->param( MESSAGE => $message );
-
-}
-
-$panel->set_refresh_url( "/admin/user/list.pl" );
-$panel->build( $template );
-$panel->display;
Deleted: trunk/vhffs-panel/admin/user/edit_submit.pl
===================================================================
--- trunk/vhffs-panel/admin/user/edit_submit.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/user/edit_submit.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,145 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-my $group = $panel->{'group'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $username = $cgi->param("USERNAME");
-
-
-my $template;
-my $object;
-my $message;
-my $mail;
-my $firstname;
-my $lastname;
-my $city;
-my $shell;
-my $gpg_key;
-my $zipcode;
-my $status;
-my $admin;
-my $passwd;
-my $country;
-my $address;
-my $templatedir = $vhffs->get_config->get_templatedir;
-$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
-
-if( $user->is_admin != 1 )
-{
- $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $username )
-{
- #Here, this is a directly call to the script, username is not defined
- $message = gettext( "CGI ERROR !" );
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined ( $object = Vhffs::User::get_by_username( $vhffs , $username ) ) )
-{
- $message = gettext( "Cannot fetch object" );
- $template->param( MESSAGE => $message );
-}
-else
-{
-
- $firstname = $cgi->param( "FIRSTNAME");
- $lastname = $cgi->param( "LASTNAME" );
- $gpg_key = $cgi->param( "GPG" );
- $shell = $cgi->param( "SHELL" );
- $zipcode = $cgi->param( "ZIPCODE" );
- $city = $cgi->param( "CITY" );
- $country = $cgi->param( "COUNTRY" );
- $address = $cgi->param( "ADDRESS" );
- $status = $cgi->param( "STATUS" );
- $admin = $cgi->param( "ADMIN" );
- $mail = $cgi->param( "USERMEL" );
- $passwd = $cgi->param( "PASSWORD" );
-
- $object->set_status ( $status );
- $object->set_admin ( $admin );
- $object->set_firstname( $firstname ) if( defined $firstname );
- $object->set_lastname ( $lastname ) if( defined $lastname );
- $object->set_gpgkey ( $gpg_key ) if( defined $gpg_key );
- $object->set_shell ( $shell ) if( defined $shell );
- $object->set_zipcode ( $zipcode ) if( defined $zipcode );
- $object->set_country ( $country ) if( defined $country );
- $object->set_address ( $address ) if( defined $address );
- $object->set_city ( $city ) if( defined $city );
- $object->set_mail ( $mail ) if( defined $mail );
- $object->set_password ( $passwd ) if( ( defined $passwd ) &&( length( $passwd ) > 1 ) );
-
-
- if( $object->commit < 0 )
- {
- $message = gettext("An error occured while updating");
- }
- else
- {
- $message = gettext("Modifications successfully applied");
- }
-
- $template->param( MESSAGE => $message );
-
-}
-
-$panel->set_refresh_url( "/admin/user/list.pl" );
-$panel->build( $template );
-$panel->display;
Modified: trunk/vhffs-panel/admin/user/list.pl
===================================================================
--- trunk/vhffs-panel/admin/user/list.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/user/list.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -29,7 +29,6 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-
use strict;
use utf8;
use HTML::Template;
@@ -37,7 +36,6 @@
use lib '%VHFFS_LIB_DIR%';
use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
use Vhffs::Panel::User;
my $panel = new Vhffs::Panel::Main();
@@ -46,55 +44,43 @@
exit 0 unless $session;
my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
+my $templatedir = $panel->{'templatedir'};
my $template;
-my $templatedir = $vhffs->get_config->get_templatedir;
-
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
+{
+ $template = new HTML::Template( filename => $templatedir.'/panel/misc/simplemsg.tmpl' );
+ $template->param( MESSAGE => gettext('You are not allowed to see it') );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/misc/list.tmpl", die_on_bad_params => 0 );
-
+ $template = new HTML::Template( filename => $templatedir.'/panel/admin/misc/list.tmpl' );
+ my $name = $cgi->param('MAME');
if( defined( $name ) )
{
- $template->param( TITLE => gettext("Search result for") . ": " .$name );
+ $template->param( TITLE => gettext('Search result for').': '.$name );
}
else
{
- $template->param( TITLE => gettext("List of all users") );
+ $template->param( TITLE => gettext('List of all users') );
}
- $template->param( TEXT_TITLE1 => gettext('Username') );
- $template->param( TEXT_TITLE2 => gettext('Real Name') );
- $template->param( TEXT_TITLE3 => gettext('State') );
+ $template->param( TEXT_TITLE1 => gettext('Username') );
+ $template->param( TEXT_TITLE2 => gettext('Real Name') );
+ $template->param( TEXT_TITLE3 => gettext('State') );
my $users = Vhffs::Panel::User::search( $vhffs, $name );
-
- if( defined $users )
+ if( defined $users )
{
- my $subtemplate;
-
+ my $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/user/part.tmpl', global_vars => 1 );
if( $user->is_admin == 1 ) {
- $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/user/part.tmpl', global_vars => 1, die_on_bad_params => 0 );
- $subtemplate->param( SEND => gettext('Modify') );
+ $subtemplate->param( ACTION => gettext('Modify') );
} else {
- $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/user/part-modo.tmpl', global_vars => 1 , die_on_bad_params => 0);
- $subtemplate->param( SEND => gettext('Show') );
+ $subtemplate->param( ACTION => gettext('Show') );
}
-
- $subtemplate->param( USERS => $users );
+ $subtemplate->param( USERS => $users );
$template->param( LIST => $subtemplate->output );
}
}
Deleted: trunk/vhffs-panel/admin/user/show.pl
===================================================================
--- trunk/vhffs-panel/admin/user/show.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/user/show.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,160 +0,0 @@
-#!%PERL% -w
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#3. Neither the name of vhffs nor the names of its contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-use utf8;
-use POSIX qw(locale_h);
-use HTML::Template;
-use locale;
-use Locale::gettext;
-use CGI;
-use CGI::Session;
-use strict;
-
-
-use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Group;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Stats;
-use Vhffs::Constants;
-use Vhffs::Functions;
-
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
-
-my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
-my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
-my $cgi = $panel->{'cgi'};
-my $username = $cgi->param("NAME");
-my $template;
-
-my $templatedir = $vhffs->get_config->get_templatedir;
-
-my $object;
-
-if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
-{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined $username )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "CGI ERROR !");
- $template->param( MESSAGE => $message );
-}
-elsif( ! defined ( $object = Vhffs::User::get_by_username( $vhffs , $username ) ) )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "Cannot fetch object");
- $template->param( MESSAGE => $message );
-}
-else
-{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/user/show.tmpl" );
-
- $template->param( TITLE => gettext("Show User") );
-
- $template->param( TEXT_USERNAME => gettext("Username:") );
- $template->param( TEXT_FIRSTNAME => gettext("Firstname") );
- $template->param( TEXT_LASTNAME => gettext("Lastname") );
- $template->param( TEXT_SHELL => gettext("Shell") );
- $template->param( TEXT_HOMEDIR => gettext("Home") );
- $template->param( TEXT_ADMIN => gettext("Admin") );
- $template->param( TEXT_UID => gettext("UID") );
- $template->param( TEXT_GID => gettext("GID") );
- $template->param( TEXT_ADDRESS => gettext("Address") );
- $template->param( TEXT_CITY => gettext("City") );
- $template->param( TEXT_ZIPCODE => gettext("Zipcode") );
- $template->param( TEXT_COUNTRY => gettext("Country") );
- $template->param( TEXT_MAIL => gettext("Mail") );
- $template->param( TEXT_GPG => gettext("GPG key") );
- $template->param( TEXT_STATUS => gettext("Status") );
- $template->param( TEXT_HISTORY => gettext("History") );
-
- $template->param( VALUE_USERNAME => $object->get_username );
- $template->param( VALUE_FIRSTNAME => $object->get_firstname );
- $template->param( VALUE_LASTNAME => $object->get_lastname );
- $template->param( VALUE_SHELL => $object->get_shell );
- $template->param( VALUE_HOMEDIR => $object->get_home );
- $template->param( VALUE_ADDRESS => $object->get_address );
- $template->param( VALUE_MAIL => $object->get_mail );
- $template->param( VALUE_ZIPCODE => $object->get_zipcode );
- $template->param( VALUE_COUNTRY => $object->get_country );
- $template->param( VALUE_UID => $object->get_uid );
- $template->param( VALUE_GID => $object->get_gid );
- $template->param( VALUE_CITY => $object->get_city );
- $template->param( VALUE_STATUS => Vhffs::Functions::status_string_from_status_id ($object->get_status) );
-
- my $oid = $object->{'object_id'};
- $template->param( VALUE_HISTORY => "/history.pl?OID=$oid" );
-
- if( $object->is_moderator )
- {
- $template->param( VALUE_ADMIN => gettext("Moderator") );
- }
- elsif( $object->is_admin )
- {
- $template->param( VALUE_ADMIN => gettext("Admin") );
- }
- else
- {
- $template->param( VALUE_ADMIN => gettext("Hosted") );
- }
-
- my $tmp = "";
- my $groups = Vhffs::Group::getall_by_user( $vhffs , undef , $object );
- foreach my $group ( @{$groups} ) {
- my $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/user/group-part-show.tmpl" );
- $subtemplate->param( GROUPNAME => $group->get_groupname );
- $subtemplate->param( OWNER_TEXT => gettext("Owner of this group") );
- $subtemplate->param( OWNER => $group->get_owner_username );
- $subtemplate->param( STATE => Vhffs::Functions::status_string_from_status_id( $group->get_status) );
- $tmp .= $subtemplate->output;
- }
-
- $template->param( TEXT_GROUPS => gettext("Groups of this user") );
- $template->param( GROUPS => $tmp );
-}
-
-
-$panel->build( $template );
-$panel->display;
Modified: trunk/vhffs-panel/admin/web/list.pl
===================================================================
--- trunk/vhffs-panel/admin/web/list.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/admin/web/list.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -29,12 +29,10 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-
use strict;
use utf8;
use Locale::gettext;
-
use lib '%VHFFS_LIB_DIR%';
use Vhffs::Panel::Main;
use Vhffs::Panel::Web;
@@ -45,60 +43,48 @@
exit 0 unless $session;
my $vhffs = $panel->{'vhffs'};
-my $maintemplate = $panel->{'template'};
my $user = $panel->{'user'};
-#my $group = $panel->{'group'};
-my $projectname = $session->param("project");
my $cgi = $panel->{'cgi'};
-my $name = $cgi->param("NAME");
+my $templatedir = $panel->{'templatedir'};
my $template;
-my $templatedir = $vhffs->get_config->get_templatedir;
-
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
-
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- my $message = gettext( "You are not allowed to see it");
- $template->param( MESSAGE => $message );
+ $template = new HTML::Template( filename => $templatedir.'/panel/misc/simplemsg.tmpl' );
+ $template->param( MESSAGE => gettext('You are not allowed to see it') );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/panel/admin/misc/list.tmpl" );
+ $template = new HTML::Template( filename => $templatedir.'/panel/admin/misc/list.tmpl' );
+ my $name = $cgi->param('NAME');
if( defined( $name ) )
{
- $template->param( TITLE => gettext("Search result for") . ": " .$name );
+ $template->param( TITLE => gettext('Search result for').': '.$name );
}
else
{
- $template->param( TITLE => gettext("List of all websites") );
+ $template->param( TITLE => gettext('List of all websites') );
}
- $template->param( TEXT_TITLE1 => gettext('Servername') );
- $template->param( TEXT_TITLE2 => gettext('Group') );
- $template->param( TEXT_TITLE3 => gettext('State') );
+ $template->param( TEXT_TITLE1 => gettext('Servername') );
+ $template->param( TEXT_TITLE2 => gettext('Group') );
+ $template->param( TEXT_TITLE3 => gettext('State') );
-
my $webs = Vhffs::Panel::Web::search( $vhffs, $name );
my $web;
if( defined $webs )
{
- my $subtemplate;
-
- if( $user->is_admin == 1 ) {
- $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/web/part.tmpl", global_vars => 1 );
- $subtemplate->param( EDIT => gettext('Edit') );
+ my $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/web/part.tmpl', global_vars => 1 );
+ if( $user->is_admin == 1 ) {
+ $subtemplate->param( ACTION => gettext('Edit') );
} else {
- $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/web/part-modo.tmpl", global_vars => 1 );
- $subtemplate->param( SHOW => gettext('Show'));
+ $subtemplate->param( ACTION => gettext('Show') );
}
- $subtemplate->param( WEBS => $webs );
+ $subtemplate->param( WEBS => $webs );
$template->param( LIST => $subtemplate->output );
}
-
-
}
$panel->build( $template );
Modified: trunk/vhffs-panel/cvs/prefs.pl
===================================================================
--- trunk/vhffs-panel/cvs/prefs.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/cvs/prefs.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -42,10 +42,10 @@
use lib '%VHFFS_LIB_DIR%';
use Vhffs::User;
-use Vhffs::Group;
use Vhffs::Main;
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
+use Vhffs::Panel::Object;
my $panel = new Vhffs::Panel::Main();
exit 0 unless $panel;
@@ -55,7 +55,6 @@
my $vhffs = $panel->{'vhffs'};
my $maintemplate = $panel->{'template'};
my $user = $panel->{'user'};
-my $group = $panel->{'group'};
my $projectname = $session->param("project");
my $cgi = $panel->{'cgi'};
my $repo_name = $cgi->param("name");
@@ -137,6 +136,8 @@
$template->param( PERM_BUTTON => "Fix it" );
$template->param( PUBLIC => $cvs->is_public );
+
+ $template->param( ADMIN_PART => Vhffs::Panel::Object::admin_part( $panel, $cvs )->output );
}
$panel->build( $template );
Modified: trunk/vhffs-panel/dns/prefs.pl
===================================================================
--- trunk/vhffs-panel/dns/prefs.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/dns/prefs.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -46,6 +46,7 @@
use Vhffs::Main;
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
+use Vhffs::Panel::Object;
my $panel = new Vhffs::Panel::Main();
@@ -424,6 +425,8 @@
$subtemplate->param( OPART_TITLE => gettext("Object part") );
$template->param( OPART => $subtemplate->output );
}
+
+ $template->param( ADMIN_PART => Vhffs::Panel::Object::admin_part( $panel, $dns )->output );
}
$panel->build( $template );
Modified: trunk/vhffs-panel/git/prefs.pl
===================================================================
--- trunk/vhffs-panel/git/prefs.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/git/prefs.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -42,11 +42,12 @@
use lib '%VHFFS_LIB_DIR%';
use Vhffs::User;
-use Vhffs::Group;
use Vhffs::Main;
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
+use Vhffs::Panel::Object;
+
my $panel = new Vhffs::Panel::Main();
exit 0 unless $panel;
my $session = $panel->get_session;
@@ -55,10 +56,8 @@
my $vhffs = $panel->{'vhffs'};
my $maintemplate = $panel->{'template'};
my $user = $panel->{'user'};
-my $group = $panel->{'group'};
my $projectname = $session->param("project");
my $cgi = $panel->{'cgi'};
-my $cgigroupname = $cgi->param('cgigroup');
my $repo_name = $cgi->param("name");
my $template;
my $output;
@@ -69,25 +68,14 @@
$templatedir = $vhffs->get_config->get_templatedir;
-if( defined $cgigroupname )
-{
- $group = Vhffs::Group::get_by_groupname( $vhffs , $cgigroupname );
-}
-
$git = Vhffs::Services::Git::get_by_reponame( $vhffs , $repo_name );
-
if( ! defined $repo_name )
{
$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "CGI Error" );
$template->param( MESSAGE => $message );
}
-elsif( ! defined $group )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- $template->param( MESSAGE => gettext("Grant an user access to this repository") );
-}
elsif( !defined $git )
{
$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
@@ -158,8 +146,9 @@
$template->param( OPART => $subtemplate->output );
}
-
+ $template->param( ADMIN_PART => Vhffs::Panel::Object::admin_part( $panel, $git )->output );
}
$panel->build( $template );
$panel->display;
+
Modified: trunk/vhffs-panel/group/prefs.pl
===================================================================
--- trunk/vhffs-panel/group/prefs.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/group/prefs.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -46,6 +46,7 @@
use Vhffs::Main;
use Vhffs::Panel::Main;
use Vhffs::Panel::Group;
+use Vhffs::Panel::Object;
use Vhffs::Functions;
use Vhffs::Services::MailGroup;
@@ -255,6 +256,8 @@
$template->param( NO_USER_TEXT => gettext( 'No user for this group' ) );
$template->param( USERS_TEXT => gettext( 'Users' ) );
$template->param( CURRENT_USERS => gettext( 'All users in this group' ) );
+
+ $template->param( ADMIN_PART => Vhffs::Panel::Object::admin_part( $panel, $group )->output );
}
$panel->build( $template );
Modified: trunk/vhffs-panel/mail/prefs.pl
===================================================================
--- trunk/vhffs-panel/mail/prefs.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/mail/prefs.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -46,6 +46,7 @@
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
use Vhffs::Panel::Template;
+use Vhffs::Panel::Object;
use Vhffs::Services::Mail;
use Vhffs::Acl;
use Vhffs::Constants;
@@ -171,6 +172,8 @@
my @forwards = sort { $a->{local_part} cmp $b->{local_part} } (values %{$mail->get_forwards});
$template->param( FORWARDS => ( \@forwards ) );
+
+ $template->param( ADMIN_PART => Vhffs::Panel::Object::admin_part( $panel, $mail )->output );
}
$panel->build( $template );
Modified: trunk/vhffs-panel/mailinglist/prefs.pl
===================================================================
--- trunk/vhffs-panel/mailinglist/prefs.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/mailinglist/prefs.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -47,6 +47,7 @@
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
use Vhffs::Panel::Template;
+use Vhffs::Panel::Object;
use Vhffs::Services::MailingList;
use Vhffs::Acl;
use Vhffs::Constants;
@@ -207,7 +208,7 @@
$template->param( OPART => $subtemplate->output );
}
-
+ $template->param( ADMIN_PART => Vhffs::Panel::Object::admin_part( $panel, $list )->output );
}
$panel->build( $template );
Modified: trunk/vhffs-panel/mysql/prefs.pl
===================================================================
--- trunk/vhffs-panel/mysql/prefs.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/mysql/prefs.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -45,6 +45,7 @@
use Vhffs::Main;
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
+use Vhffs::Panel::Object;
use Vhffs::Panel::Template;
my $panel = new Vhffs::Panel::Main();
@@ -125,6 +126,8 @@
$template->param( YES => gettext("Yes I'm sure of what I do") );
$template->param( NO => gettext("No, I'm not sure, I prefer to keep this project.") );
$template->param( TEXT_DELETE => gettext("Delete") );
+
+ $template->param( ADMIN_PART => Vhffs::Panel::Object::admin_part( $panel, $mysql )->output );
}
$panel->build( $template );
Modified: trunk/vhffs-panel/pgsql/prefs.pl
===================================================================
--- trunk/vhffs-panel/pgsql/prefs.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/pgsql/prefs.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -44,6 +44,7 @@
use Vhffs::Main;
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
+use Vhffs::Panel::Object;
use Vhffs::Panel::Template;
my $panel = new Vhffs::Panel::Main();
@@ -109,6 +110,8 @@
$template->param( YES => gettext("Yes I'm sure of what I do") );
$template->param( NO => gettext("No, I'm not sure, I prefer to keep this project.") );
$template->param( TEXT_DELETE => gettext("Delete") );
+
+ $template->param( ADMIN_PART => Vhffs::Panel::Object::admin_part( $panel, $pgsql )->output );
}
$panel->build( $template );
Modified: trunk/vhffs-panel/repository/prefs.pl
===================================================================
--- trunk/vhffs-panel/repository/prefs.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/repository/prefs.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -46,6 +46,7 @@
use Vhffs::Main;
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
+use Vhffs::Panel::Object;
my $panel = new Vhffs::Panel::Main();
exit 0 unless $panel;
@@ -111,6 +112,8 @@
$template->param( TEXT_ACL_ADMIN => "Admin Rights on this object (ACL)" );
$template->param( EXPLAIN_ADMIN_ACL => "You can Manage rights on this service for each user in the VHFFS database. Please read help before manage it." );
$template->param( ADMIN_ACL => "Ok, go to ACL admin" );
+
+ $template->param( ADMIN_PART => Vhffs::Panel::Object::admin_part( $panel, $repo )->output );
}
$panel->build( $template );
Modified: trunk/vhffs-panel/subscribe.pl
===================================================================
--- trunk/vhffs-panel/subscribe.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/subscribe.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -190,6 +190,9 @@
$template->param( TEXT_BACK => gettext("Back to Login") );
$template->param( GOOD_NEWS => $good_news );
$template->param( GOOD_NEWS2 => $good_news2 );
+
+ Vhffs::Acl::add_acl( $user , $user , Vhffs::Constants::ACL_DELETE , $vhffs );
+ Vhffs::Acl::add_acl( $user->get_group , $user , Vhffs::Constants::ACL_DENIED , $vhffs );
}
}
}
Modified: trunk/vhffs-panel/svn/prefs.pl
===================================================================
--- trunk/vhffs-panel/svn/prefs.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/svn/prefs.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -41,10 +41,10 @@
use lib '%VHFFS_LIB_DIR%';
use Vhffs::User;
-use Vhffs::Group;
use Vhffs::Main;
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
+use Vhffs::Panel::Object;
my $panel = new Vhffs::Panel::Main();
exit 0 unless $panel;
@@ -54,10 +54,8 @@
my $vhffs = $panel->{'vhffs'};
my $maintemplate = $panel->{'template'};
my $user = $panel->{'user'};
-my $group = $panel->{'group'};
my $projectname = $session->param("project");
my $cgi = $panel->{'cgi'};
-my $cgigroupname = $cgi->param('cgigroup');
my $repo_name = $cgi->param("name");
my $template;
my $output;
@@ -68,25 +66,14 @@
$templatedir = $vhffs->get_config->get_templatedir;
-if( defined $cgigroupname )
-{
- $group = Vhffs::Group::get_by_groupname( $vhffs , $cgigroupname );
-}
-
$svn = Vhffs::Services::Svn::get_by_reponame( $vhffs , $repo_name );
-
if( ! defined $repo_name )
{
$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "CGI Error" );
$template->param( MESSAGE => $message );
}
-elsif( ! defined $group )
-{
- $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
- $template->param( MESSAGE => gettext("Grant an user access to this repository") );
-}
elsif( !defined $svn )
{
$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
@@ -154,7 +141,7 @@
$template->param( OPART => $subtemplate->output );
}
-
+ $template->param( ADMIN_PART => Vhffs::Panel::Object::admin_part( $panel, $svn )->output );
}
$panel->build( $template );
Modified: trunk/vhffs-panel/templates/Makefile.am
===================================================================
--- trunk/vhffs-panel/templates/Makefile.am 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/Makefile.am 2007-10-26 19:39:45 UTC (rev 1032)
@@ -2,30 +2,16 @@
nobase_paneltemplates_DATA = \
acl/view.tmpl \
admin/index.tmpl \
- admin/cvs/edit.tmpl \
- admin/cvs/part-modo.tmpl \
admin/cvs/part.tmpl \
admin/cvs/search.tmpl \
- admin/cvs/show.tmpl \
- admin/dns/part-modo.tmpl \
admin/dns/part.tmpl \
admin/dns/search.tmpl \
- admin/group/edit.tmpl \
- admin/group/part-modo.tmpl \
admin/group/part.tmpl \
admin/group/search.tmpl \
- admin/group/show.tmpl \
- admin/mail/admin_box-modo.tmpl \
- admin/mail/admin_box.tmpl \
- admin/mail/admin_forward-modo.tmpl \
- admin/mail/admin_forward.tmpl \
- admin/mail/edit.tmpl \
+ admin/mail/search.tmpl \
+ admin/mail/part.tmpl \
admin/mailinglist/part.tmpl \
admin/mailinglist/search.tmpl \
- admin/mail/part-modo.tmpl \
- admin/mail/part.tmpl \
- admin/mail/search.tmpl \
- admin/mail/show.tmpl \
admin/main/general-modo.tmpl \
admin/main/general.tmpl \
admin/main/main.tmpl \
@@ -41,44 +27,24 @@
admin/misc/opart.tmpl \
admin/misc/stats.tmpl \
admin/misc/su.tmpl \
- admin/mysql/edit.tmpl \
- admin/mysql/part-modo.tmpl \
admin/mysql/part.tmpl \
admin/mysql/search.tmpl \
- admin/mysql/show.tmpl \
admin/object/edit.tmpl \
admin/object/editembedded.tmpl \
admin/object/part.tmpl \
admin/object/search.tmpl \
- admin/pgsql/edit.tmpl \
- admin/pgsql/part-modo.tmpl \
admin/pgsql/part.tmpl \
admin/pgsql/search.tmpl \
- admin/pgsql/show.tmpl \
- admin/repository/edit.tmpl \
- admin/repository/part-modo.tmpl \
admin/repository/part.tmpl \
admin/repository/search.tmpl \
- admin/repository/show.tmpl \
- admin/svn/part-modo.tmpl \
admin/svn/part.tmpl \
admin/svn/search.tmpl \
- admin/git/part-modo.tmpl \
admin/git/part.tmpl \
admin/git/search.tmpl \
- admin/user/edit-note.tmpl \
- admin/user/edit.tmpl \
- admin/user/group-part.tmpl \
- admin/user/group-part-show.tmpl \
- admin/user/part-modo.tmpl \
admin/user/part.tmpl \
admin/user/search.tmpl \
- admin/user/show.tmpl \
- admin/web/edit.tmpl \
- admin/web/part-modo.tmpl \
admin/web/part.tmpl \
admin/web/search.tmpl \
- admin/web/show.tmpl \
cvs/create.tmpl \
cvs/prefs.tmpl \
dns/create.tmpl \
Deleted: trunk/vhffs-panel/templates/admin/cvs/edit.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/cvs/edit.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/cvs/edit.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,68 +0,0 @@
-<form method="post" action="edit_submit.pl" accept-charset="utf-8">
- <h1><TMPL_VAR NAME="TITLE"></h1>
-
- <p>
- <label for="CVSROOT">
- <TMPL_VAR NAME="TEXT_CVSROOT">
- </label>
- <input type="text" name="CVSROOT" id="CVSROOT" value="<TMPL_VAR NAME="VALUE_CVSROOT">" />
- </p>
- <p>
- <label for="OWNER">
- <TMPL_VAR NAME="TEXT_PUBLIC">
- </label>
- <select name="PUBLIC" id="OWNER" >
- <option value="0" <TMPL_VAR name="PRIVATE_SELECTED">> <TMPL_VAR NAME="VALUE_PRIVATE">
- <option value="1" <TMPL_VAR name="PUBLIC_SELECTED">> <TMPL_VAR NAME="VALUE_PUBLIC">
- </select>
- </p>
- <p>
- <label for="OWNER">
- <TMPL_VAR NAME="TEXT_OWNER">
- </label>
- <input type="text" name="OWNER" id="OWNER" value="<TMPL_VAR NAME="VALUE_OWNER">" />
- </p>
- <p>
- <label for="GROUP">
- <TMPL_VAR NAME="TEXT_GROUP">
- </label>
- <input TYPE="text" name="GROUP" id="GROUP" value="<TMPL_VAR NAME="VALUE_GROUP">" />
- </p>
- <p>
- <label for="STATUS">
- <TMPL_VAR NAME="TEXT_STATUS">
- </label>
- <select name="STATUS" id="STATUS" >
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_VALIDATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_VALIDATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_VALIDATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_VALIDATION_REFUSED">" <TMPL_VAR NAME="SELECTED_STATUS_VALIDATION_REFUSED">> <TMPL_VAR NAME="TEXT_STATUS_VALIDATION_REFUSED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_CREATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_CREATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_CREATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_CREATING_ERROR">" <TMPL_VAR NAME="SELECTED_STATUS_CREATING_ERROR">> <TMPL_VAR NAME="TEXT_STATUS_CREATING_ERROR"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_CREATED">" <TMPL_VAR NAME="SELECTED_STATUS_CREATED">> <TMPL_VAR NAME="TEXT_STATUS_CREATED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_ACTIVATED">" <TMPL_VAR NAME="SELECTED_STATUS_ACTIVATED">> <TMPL_VAR NAME="TEXT_STATUS_ACTIVATED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_SUSPENDED">" <TMPL_VAR NAME="SELECTED_STATUS_SUSPENDED">> <TMPL_VAR NAME="TEXT_STATUS_SUSPENDED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_SUSPENDED_BEFORE_DELETED">" <TMPL_VAR NAME="SELECTED_STATUS_SUSPENDED_BEFORE_DELETED">> <TMPL_VAR NAME="TEXT_STATUS_SUSPENDED_BEFORE_DELETED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_MODIFICATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_MODIFICATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_MODIFICATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_MODIFICATION_ERROR">" <TMPL_VAR NAME="SELECTED_STATUS_MODIFICATION_ERROR">> <TMPL_VAR NAME="TEXT_STATUS_MODIFICATION_ERROR"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_MODIFICATION_APPLIED">" <TMPL_VAR NAME="SELECTED_STATUS_MODIFICATION_APPLIED">> <TMPL_VAR NAME="TEXT_STATUS_MODIFICATION_APPLIED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_TO_DELETE">" <TMPL_VAR NAME="SELECTED_STATUS_TO_DELETE">> <TMPL_VAR NAME="TEXT_STATUS_TO_DELETE"></option>
- </select>
- </p>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_DESCRIPTION">:
- </label>
- <TMPL_VAR NAME="VALUE_DESCRIPTION">
- </p>
-
- <p class="button" id="buttonSend">
- <input type="hidden" name="NAME" value="<TMPL_VAR NAME="VALUE_CVSROOT">" />
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </p>
-
- <p>
- <label for="HISTORY">
- <a href="<TMPL_VAR NAME="VALUE_HISTORY">"><TMPL_VAR NAME="TEXT_HISTORY"></a>
- </label>
- </p>
-</form>
-
Deleted: trunk/vhffs-panel/templates/admin/cvs/part-modo.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/cvs/part-modo.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/cvs/part-modo.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,20 +0,0 @@
-<TMPL_LOOP NAME="CVSES">
-<tr>
- <td>
- <TMPL_VAR NAME="CVSROOT">
- </td>
- <td>
- <TMPL_VAR NAME="GROUPNAME">
- </td>
- <td>
- <TMPL_VAR NAME="STATE">
- </td>
- <td>
- <form method="post" action="show.pl" accept-charset="utf-8">
- <input type="HIDDEN" name="OID" value="<TMPL_VAR NAME="OID">" />
- <input type="HIDDEN" name="NAME" value="<TMPL_VAR NAME="CVSROOT">" />
- <input type="SUBMIT" value="<TMPL_VAR NAME="SEND">" />
- </form>
- </td>
-</tr>
-</TMPL_LOOP>
Modified: trunk/vhffs-panel/templates/admin/cvs/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/cvs/part.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/cvs/part.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -10,11 +10,7 @@
<TMPL_VAR NAME="STATE">
</td>
<td>
- <form method="post" action="edit.pl" accept-charset="utf-8">
- <input type="HIDDEN" name="OID" value="<TMPL_VAR NAME="OID">" />
- <input type="HIDDEN" name="NAME" value="<TMPL_VAR NAME="CVSROOT">" />
- <input type="SUBMIT" value="<TMPL_VAR NAME="SEND">" />
- </form>
+ <a href="/cvs/prefs.pl?name=<TMPL_VAR NAME="CVSROOT">"><TMPL_VAR NAME="ACTION"></a>
</td>
</tr>
</TMPL_LOOP>
Deleted: trunk/vhffs-panel/templates/admin/cvs/show.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/cvs/show.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/cvs/show.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,60 +0,0 @@
- <h1><TMPL_VAR NAME="TITLE"></h1>
- <p>
- <label for="CVSROOT">
- <TMPL_VAR NAME="TEXT_CVSROOT">
- </label>
- <label for="CVSROOT">
- <TMPL_VAR NAME="VALUE_CVSROOT">
- </label>
- <br/>
- </p>
- <p>
- <label for="OWNER">
- <TMPL_VAR NAME="TEXT_PUBLIC">
- </label>
- <label for="OWNER">
- <TMPL_VAR NAME="VALUE_PUBLIC">
- </label>
- <br/>
- </p>
- <p>
- <label for="OWNER">
- <TMPL_VAR NAME="TEXT_OWNER">
- </label>
- <label for="OWNER">
- <TMPL_VAR NAME="VALUE_OWNER">
- </label>
- <br/>
- </p>
- <p>
- <label for="GROUP">
- <TMPL_VAR NAME="TEXT_GROUP">
- </label>
- <label for="GROUP">
- <TMPL_VAR NAME="VALUE_GROUP">
- </label>
- <br/>
- </p>
- <p>
- <label for="STATUS">
- <TMPL_VAR NAME="TEXT_STATUS">
- </label>
- <label for="STATUS">
- <TMPL_VAR NAME="VALUE_STATUS">
- </label>
- <br/>
- </p>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_DESCRIPTION">:
- </label>
- <label>
- <TMPL_VAR NAME="VALUE_DESCRIPTION">
- </label>
- <br/>
- </p>
- <p>
- <label for="HISTORY">
- <a href="<TMPL_VAR NAME="VALUE_HISTORY">"><TMPL_VAR NAME="TEXT_HISTORY"></a>
- </label>
- </p>
Deleted: trunk/vhffs-panel/templates/admin/dns/TODO
===================================================================
--- trunk/vhffs-panel/templates/admin/dns/TODO 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/dns/TODO 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1 +0,0 @@
-- Stats for Mailing list
Deleted: trunk/vhffs-panel/templates/admin/dns/part-modo.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/dns/part-modo.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/dns/part-modo.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,13 +0,0 @@
-<TMPL_LOOP NAME="DNSES">
-<tr>
- <td>
- <TMPL_VAR NAME="DOMAIN">
- </td>
- <td>
- <TMPL_VAR NAME="GROUPNAME">
- </td>
- <td>
- <TMPL_VAR NAME="STATE">
- </td>
-</tr>
-</TMPL_LOOP>
Modified: trunk/vhffs-panel/templates/admin/dns/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/dns/part.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/dns/part.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -10,11 +10,7 @@
<TMPL_VAR NAME="STATE">
</td>
<td>
- <form method="post" action="/dns/prefs.pl" accept-charset="utf-8">
- <input type="hidden" name="OID" value="<TMPL_VAR NAME="OID">" />
- <input type="hidden" name="name" value="<TMPL_VAR NAME="DOMAIN">" />
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </form>
+ <a href="/dns/prefs.pl?name=<TMPL_VAR NAME="DOMAIN">"><TMPL_VAR NAME="ACTION"></a>
</td>
</tr>
</TMPL_LOOP>
Deleted: trunk/vhffs-panel/templates/admin/git/part-modo.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/git/part-modo.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/git/part-modo.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,13 +0,0 @@
-<TMPL_LOOP NAME="GITREPOS">
-<tr>
- <td>
- <TMPL_VAR NAME="GITROOT">
- </td>
- <td>
- <TMPL_VAR NAME="GROUPNAME">
- </td>
- <td>
- <TMPL_VAR NAME="STATE">
- </td>
-</tr>
-</TMPL_LOOP>
Modified: trunk/vhffs-panel/templates/admin/git/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/git/part.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/git/part.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -10,12 +10,7 @@
<TMPL_VAR NAME="STATE">
</td>
<td>
- <form method="post" action="../../git/prefs.pl" accept-charset="utf-8">
- <input type="hidden" id="OID" name="OID" value="<TMPL_VAR NAME="OID">" />
- <input type="hidden" id="name" name="name" value="<TMPL_VAR NAME="GITROOT">" />
- <input type="hidden" id="cgigroup" name="cgigroup" value="<TMPL_VAR NAME="GROUPNAME">" />
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </form>
+ <a href="/git/prefs.pl?name=<TMPL_VAR NAME="GITROOT">"><TMPL_VAR NAME="ACTION"></a>
</td>
</tr>
</TMPL_LOOP>
Deleted: trunk/vhffs-panel/templates/admin/group/edit.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/group/edit.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/group/edit.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,79 +0,0 @@
-<p>
-<div class="info_quota">
- <div id="group_quota">
- <img src="/themes/<tmpl_var name="THEME">/images/quota_progress.png" width="<tmpl_var name="QUOTA_WIDTH">" alt="<tmpl_var name="QUOTA_WIDTH">"/>
- </div>
- <p><tmpl_var name="QUOTA_VALUE"></p>
-</div>
-</p>
-
-<form method="post" action="edit_submit.pl" accept-charset="utf-8">
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_GID">
- </label>
- <TMPL_VAR NAME="VALUE_GID">
- </p>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_GROUPNAME">
- </label>
- <TMPL_VAR NAME="VALUE_GROUPNAME">
- </p>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_OWNER">
- </label>
- <TMPL_VAR NAME="VALUE_OWNER">
- </p>
- <p>
- <label for="QUOTA">
- <TMPL_VAR NAME="TEXT_QUOTA">
- </label>
- <input type="text" name="QUOTA" id="QUOTA" value="<TMPL_VAR NAME="VALUE_QUOTA">" />
- </p>
- <p>
- <label for="QUOTA_USED">
- <TMPL_VAR NAME="TEXT_QUOTA_USED">
- </label>
- <input type="text" name="QUOTA_USED" id="QUOTA_USED" value="<TMPL_VAR NAME="VALUE_QUOTA_USED">" />
- </p>
- <p>
- <label for="STATUS">
- <TMPL_VAR NAME="TEXT_STATUS">
- </label>
- <select name="STATUS" id="STATUS" >
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_VALIDATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_VALIDATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_VALIDATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_VALIDATION_REFUSED">" <TMPL_VAR NAME="SELECTED_STATUS_VALIDATION_REFUSED">> <TMPL_VAR NAME="TEXT_STATUS_VALIDATION_REFUSED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_CREATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_CREATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_CREATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_CREATING_ERROR">" <TMPL_VAR NAME="SELECTED_STATUS_CREATING_ERROR">> <TMPL_VAR NAME="TEXT_STATUS_CREATING_ERROR"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_CREATED">" <TMPL_VAR NAME="SELECTED_STATUS_CREATED">> <TMPL_VAR NAME="TEXT_STATUS_CREATED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_ACTIVATED">" <TMPL_VAR NAME="SELECTED_STATUS_ACTIVATED">> <TMPL_VAR NAME="TEXT_STATUS_ACTIVATED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_SUSPENDED">" <TMPL_VAR NAME="SELECTED_STATUS_SUSPENDED">> <TMPL_VAR NAME="TEXT_STATUS_SUSPENDED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_SUSPENDED_BEFORE_DELETED">" <TMPL_VAR NAME="SELECTED_STATUS_SUSPENDED_BEFORE_DELETED">> <TMPL_VAR NAME="TEXT_STATUS_SUSPENDED_BEFORE_DELETED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_MODIFICATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_MODIFICATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_MODIFICATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_MODIFICATION_ERROR">" <TMPL_VAR NAME="SELECTED_STATUS_MODIFICATION_ERROR">> <TMPL_VAR NAME="TEXT_STATUS_MODIFICATION_ERROR"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_MODIFICATION_APPLIED">" <TMPL_VAR NAME="SELECTED_STATUS_MODIFICATION_APPLIED">> <TMPL_VAR NAME="TEXT_STATUS_MODIFICATION_APPLIED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_TO_DELETE">" <TMPL_VAR NAME="SELECTED_STATUS_TO_DELETE">> <TMPL_VAR NAME="TEXT_STATUS_TO_DELETE"></option>
- </select>
- </p>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_DESCRIPTION">:
- </label>
- <TMPL_VAR NAME="VALUE_DESCRIPTION">
- </span>
- </p>
- <p class="button" id="buttonSend">
- <input type="hidden" name="NAME" value="<TMPL_VAR NAME="VALUE_GROUPNAME">" />
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </p>
-</form>
-
-<p>
- <label for="HISTORY">
- <a href="<TMPL_VAR NAME="VALUE_HISTORY">"><TMPL_VAR NAME="TEXT_HISTORY"></a>
- </label>
-</p>
-
-
Deleted: trunk/vhffs-panel/templates/admin/group/part-modo.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/group/part-modo.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/group/part-modo.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,20 +0,0 @@
-<TMPL_LOOP NAME="GROUPS">
-<tr>
- <td>
- <TMPL_VAR NAME="GROUPNAME">
- </td>
- <td>
- <TMPL_VAR NAME="USERNAME">
- </td>
- <td>
- <TMPL_VAR NAME="STATE">
- </td>
- <td>
- <form method="post" action="show.pl" accept-charset="utf-8">
- <input type="hidden" name="NAME" value="<TMPL_VAR NAME="GROUPNAME">" />
- <input type="hidden" name="OID" value="<TMPL_VAR NAME="OID">"/>
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </form>
- </td>
-</tr>
-</TMPL_LOOP>
Modified: trunk/vhffs-panel/templates/admin/group/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/group/part.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/group/part.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,20 +1,16 @@
<TMPL_LOOP NAME="GROUPS">
<tr>
<td>
- <TMPL_VAR NAME="GROUPNAME">
+ <TMPL_VAR NAME="GROUPNAME">
</td>
<td>
- <TMPL_VAR NAME="USERNAME">
+ <TMPL_VAR NAME="USERNAME">
</td>
<td>
- <TMPL_VAR NAME="STATE">
+ <TMPL_VAR NAME="STATE">
</td>
- <td>
- <form method="post" action="edit.pl" accept-charset="utf-8">
- <input type="hidden" name="NAME" value="<TMPL_VAR NAME="GROUPNAME">" />
- <input type="hidden" name="OID" value="<TMPL_VAR NAME="OID">"/>
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </form>
- </td>
+ <td>
+ <a href="/group/prefs.pl?project=<TMPL_VAR NAME="GROUPNAME">"><TMPL_VAR NAME="ACTION"></a>
+ </td>
</tr>
</TMPL_LOOP>
Deleted: trunk/vhffs-panel/templates/admin/group/show.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/group/show.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/group/show.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,70 +0,0 @@
-<h1><TMPL_VAR NAME="TITLE"></h1>
-
- <p>
- <label for="GROUPNAME">
- <TMPL_VAR NAME="TEXT_GROUPNAME">
- </label>
- <label for="GROUPNAME">
- <TMPL_VAR NAME="VALUE_GROUPNAME">
- </label>
- <br/>
- </p>
- <p>
- <label for="QUOTA">
- <TMPL_VAR NAME="TEXT_QUOTA">
- </label>
- <label for="QUOTA">
- <TMPL_VAR NAME="VALUE_QUOTA">
- </label>
- <br/>
- </p>
- <p>
- <label for="QUOTA_USED">
- <TMPL_VAR NAME="TEXT_QUOTA_USED">
- </label>
- <TMPL_VAR NAME="VALUE_QUOTA_USED">
- </label>
- <br/>
- </p>
- <p>
- <label for="GID">
- <TMPL_VAR NAME="TEXT_GID">
- </label>
- <label for="GID">
- <TMPL_VAR NAME="VALUE_GID">
- </label>
- <br/>
- </p>
- <p>
- <label for="OWNER">
- <TMPL_VAR NAME="TEXT_OWNER">
- </label>
- <label for="OWNER">
- <TMPL_VAR NAME="VALUE_OWNER">
- </label>
- <br/>
- </p>
- <p>
- <label for="STATUS">
- <TMPL_VAR NAME="TEXT_STATUS">
- </label>
- <label for="STATUS">
- <TMPL_VAR NAME="VALUE_STATUS">
- </label>
- <br/>
- </p>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_DESCRIPTION">:
- </label>
- <label>
- <TMPL_VAR NAME="VALUE_DESCRIPTION">
- </label>
- <br/>
- </p>
- <p>
- <label for="HISTORY">
- <a href="<TMPL_VAR NAME="VALUE_HISTORY">"><TMPL_VAR NAME="TEXT_HISTORY"></a>
- </label>
- </p>
-
Deleted: trunk/vhffs-panel/templates/admin/mail/admin_box-modo.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mail/admin_box-modo.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/mail/admin_box-modo.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,5 +0,0 @@
-<tr>
- <td>
- <tmpl_var name="ACCOUNT">
- </td>
-</tr>
Deleted: trunk/vhffs-panel/templates/admin/mail/admin_box.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mail/admin_box.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/mail/admin_box.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,22 +0,0 @@
-<tr>
- <td>
- <tmpl_var name="ACCOUNT">
- </td>
- <td>
- <form method="post" action="password_box.pl" accept-charset="utf-8">
- <input type="text" value="" name="PASSWORD" />
- <input type="hidden" name="ACCOUNT" value="<tmpl_var name="ACCOUNT">" />
- <input type="hidden" name="LOCALPART" value="<tmpl_var name="LOCALPART">" />
- <input type="hidden" name="DOMAIN" value="<tmpl_var name="DOMAIN">" />
- <input type="submit" value="<tmpl_var name="TEXT_CHANGE_PASSWORD">" />
- </form>
- </td>
- <td>
- <form method="post" action="delete_box.pl" accept-charset="utf-8">
- <input type="hidden" name="ACCOUNT" value="<tmpl_var name="ACCOUNT">" />
- <input type="hidden" name="LOCALPART" value="<tmpl_var name="LOCALPART">" />
- <input type="hidden" name="DOMAIN" value="<tmpl_var name="DOMAIN">" />
- <input type="submit" value="<tmpl_var name="TEXT_DELETE">" />
- </form>
- </td>
-</tr>
Deleted: trunk/vhffs-panel/templates/admin/mail/admin_forward-modo.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mail/admin_forward-modo.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/mail/admin_forward-modo.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,8 +0,0 @@
-<tr>
- <td>
- <tmpl_var name="LOCAL_PART">
- </td>
- <td>
- <tmpl_var name="FORWARD_MAIL">
- </td>
-</tr>
Deleted: trunk/vhffs-panel/templates/admin/mail/admin_forward.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mail/admin_forward.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/mail/admin_forward.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,25 +0,0 @@
-<tr>
- <td>
- <tmpl_var name="LOCAL_PART">
- </td>
- <td>
- <input type="text" name="FORWARD" value="<tmpl_var name="FORWARD_MAIL">" />
- </td>
- <td>
- <form method="post" action="change_forward.pl" accept-charset="utf-8">
- <input type="text" name="FORWARD" value="<tmpl_var name="FORWARD_MAIL">" />
- <input type="hidden" name="LOCALPART" value="<tmpl_var name="LOCALPART">" />
- <input type="hidden" name="DOMAIN" value="<tmpl_var name="DOMAIN">" />
- <input type="submit" value="<tmpl_var name="TEXT_MODIFY_FORWARD">" />
- </form>
- </td>
- <td>
- <form method="post" action="delete_forward.pl" accept-charset="utf-8">
- <input type="hidden" name="LOCALPART" value="<tmpl_var name="LOCALPART">" />
- <input type="hidden" name="DOMAIN" value="<tmpl_var name="DOMAIN">" />
- <input type="submit" value="<tmpl_var name="TEXT_DELETE">" />
- </form>
- </td>
-</tr>
-
-
Deleted: trunk/vhffs-panel/templates/admin/mail/edit.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mail/edit.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/mail/edit.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,74 +0,0 @@
-<h1><TMPL_VAR NAME="TITLE"></h1>
-
-<form method="post" action="edit_submit.pl" accept-charset="utf-8">
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_DOMAIN">
- </label>
- <TMPL_VAR NAME="VALUE_DOMAIN">
- </p>
- <p>
- <label for="CATCHALL">
- <TMPL_VAR NAME="TEXT_CATCHALL">
- </label>
- <input type="text" name="CATCHALL" id="CATCHALL" value="<TMPL_VAR NAME="VALUE_CATCHALL">" />
- </p>
- <p>
- <label for="TEXT_GROUP">
- <TMPL_VAR NAME="TEXT_GROUP">
- </label>
- <input type="text" name="TEXT_GROUP" id="TEXT_GROUP" value="<TMPL_VAR NAME="VALUE_GROUP">" />
- </p>
- <p>
- <label for="OWNER">
- <TMPL_VAR NAME="TEXT_OWNER">
- </label>
- <input type="text" name="OWNER" id="OWNER" value="<TMPL_VAR NAME="VALUE_OWNER">" />
- </p>
- <p>
- <label for="STATUS">
- <TMPL_VAR NAME="TEXT_STATUS">
- </label>
- <select name="STATUS" id="STATUS" >
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_VALIDATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_VALIDATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_VALIDATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_VALIDATION_REFUSED">" <TMPL_VAR NAME="SELECTED_STATUS_VALIDATION_REFUSED">> <TMPL_VAR NAME="TEXT_STATUS_VALIDATION_REFUSED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_CREATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_CREATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_CREATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_CREATING_ERROR">" <TMPL_VAR NAME="SELECTED_STATUS_CREATING_ERROR">> <TMPL_VAR NAME="TEXT_STATUS_CREATING_ERROR"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_CREATED">" <TMPL_VAR NAME="SELECTED_STATUS_CREATED">> <TMPL_VAR NAME="TEXT_STATUS_CREATED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_ACTIVATED">" <TMPL_VAR NAME="SELECTED_STATUS_ACTIVATED">> <TMPL_VAR NAME="TEXT_STATUS_ACTIVATED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_SUSPENDED">" <TMPL_VAR NAME="SELECTED_STATUS_SUSPENDED">> <TMPL_VAR NAME="TEXT_STATUS_SUSPENDED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_SUSPENDED_BEFORE_DELETED">" <TMPL_VAR NAME="SELECTED_STATUS_SUSPENDED_BEFORE_DELETED">> <TMPL_VAR NAME="TEXT_STATUS_SUSPENDED_BEFORE_DELETED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_MODIFICATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_MODIFICATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_MODIFICATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_MODIFICATION_ERROR">" <TMPL_VAR NAME="SELECTED_STATUS_MODIFICATION_ERROR">> <TMPL_VAR NAME="TEXT_STATUS_MODIFICATION_ERROR"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_MODIFICATION_APPLIED">" <TMPL_VAR NAME="SELECTED_STATUS_MODIFICATION_APPLIED">> <TMPL_VAR NAME="TEXT_STATUS_MODIFICATION_APPLIED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_TO_DELETE">" <TMPL_VAR NAME="SELECTED_STATUS_TO_DELETE">> <TMPL_VAR NAME="TEXT_STATUS_TO_DELETE"></option>
- </select>
- </p>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_DESCRIPTION">:
- </label>
- <TMPL_VAR NAME="VALUE_DESCRIPTION">
- </p>
-
- <p class="button" id="buttonSend">
- <input type="hidden" name="NAME" value="<TMPL_VAR NAME="VALUE_DOMAIN">">
- <input type="submit" value="<TMPL_VAR NAME="SEND">">
- </p>
-
- <p>
- <label for="HISTORY">
- <a href="<TMPL_VAR NAME="VALUE_HISTORY">"><TMPL_VAR NAME="TEXT_HISTORY"></a>
- </label>
- </p>
-</form>
-
-<h2><TMPL_VAR NAME="TEXT_POPBOXES"></h2>
-<table>
- <TMPL_VAR NAME="POPBOXES">
-</table>
-
-<h2><TMPL_VAR NAME="TEXT_FORWARD"></h2>
-<table>
- <TMPL_VAR NAME="FORWARDS">
-</table>
Deleted: trunk/vhffs-panel/templates/admin/mail/part-modo.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mail/part-modo.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/mail/part-modo.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,20 +0,0 @@
-<TMPL_LOOP NAME="MAILS">
-<tr>
- <td>
- <TMPL_VAR NAME="DOMAIN">
- </td>
- <td>
- <TMPL_VAR NAME="GROUPNAME">
- </td>
- <td>
- <TMPL_VAR NAME="STATE">
- </td>
- <td>
- <form method="post" action="show.pl" accept-charset="utf-8">
- <input type="hidden" name="OID" value="<TMPL_VAR NAME="OID">" />
- <input type="hidden" name="NAME" value="<TMPL_VAR NAME="DOMAIN">" />
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </form>
- </td>
-</tr>
-</TMPL_LOOP>
Modified: trunk/vhffs-panel/templates/admin/mail/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mail/part.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/mail/part.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -10,11 +10,8 @@
<TMPL_VAR NAME="STATE">
</td>
<td>
- <form method="post" action="edit.pl" accept-charset="utf-8">
- <input type="hidden" name="OID" value="<TMPL_VAR NAME="OID">" />
- <input type="hidden" name="NAME" value="<TMPL_VAR NAME="DOMAIN">" />
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </form>
+ <a href="/mail/prefs.pl?name=<TMPL_VAR NAME="DOMAIN">"><TMPL_VAR NAME="ACTION"></a>
</td>
</tr>
</TMPL_LOOP>
+
Deleted: trunk/vhffs-panel/templates/admin/mail/show.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mail/show.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/mail/show.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,70 +0,0 @@
-<h1><TMPL_VAR NAME="TITLE"></h1>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_DOMAIN">
- </label>
- <label>
- <TMPL_VAR NAME="VALUE_DOMAIN">
- </label>
- <br/>
- </p>
- <p>
- <label for="CATCHALL">
- <TMPL_VAR NAME="TEXT_CATCHALL">
- </label>
- <label for="CATCHALL">
- <TMPL_VAR NAME="VALUE_CATCHALL">
- </label>
- <br/>
- </p>
- <p>
- <label for="TEXT_GROUP">
- <TMPL_VAR NAME="TEXT_GROUP">
- </label>
- <label for="TEXT_GROUP">
- <TMPL_VAR NAME="VALUE_GROUP">
- </label>
- <br/>
- </p>
- <p>
- <label for="OWNER">
- <TMPL_VAR NAME="TEXT_OWNER">
- </label>
- <label for="OWNER">
- <TMPL_VAR NAME="VALUE_OWNER">
- </label>
- <br/>
- </p>
- <p>
- <label for="STATUS">
- <TMPL_VAR NAME="TEXT_STATUS">
- </label>
- <label for="STATUS">
- <TMPL_VAR NAME="VALUE_STATUS">
- </label>
- <br/>
- </p>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_DESCRIPTION">:
- </label>
- <label>
- <TMPL_VAR NAME="VALUE_DESCRIPTION">
- </label>
- <br/>
- </p>
- <p>
- <label for="HISTORY">
- <a href="<TMPL_VAR NAME="VALUE_HISTORY">"><TMPL_VAR NAME="TEXT_HISTORY"></a>
- </label>
- </p>
-
-<h2><TMPL_VAR NAME="TEXT_POPBOXES"></h2>
-<table>
- <TMPL_VAR NAME="POPBOXES">
-</table>
-
-<h2><TMPL_VAR NAME="TEXT_FORWARD"></h2>
-<table>
- <TMPL_VAR NAME="FORWARDS">
-</table>
Modified: trunk/vhffs-panel/templates/admin/mailinglist/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mailinglist/part.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/mailinglist/part.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -10,13 +10,7 @@
<TMPL_VAR NAME="STATE">
</td>
<td>
- <form method="post" action="/mailinglist/prefs.pl" accept-charset="utf-8">
- <input type="hidden" name="OID" value="<TMPL_VAR NAME="OID">" />
- <input type="hidden" name="NAME" value="<TMPL_VAR NAME="DOMAIN">" />
- <input type="hidden" name="local" value="<TMPL_VAR NAME="LPART">" />
- <input type="hidden" name="domain" value="<TMPL_VAR NAME="DOMAIN">" />
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </form>
+ <a href="/mailinglist/prefs.pl?name=<TMPL_VAR NAME="LOCAL_PART">@<TMPL_VAR NAME="DOMAIN">"><TMPL_VAR NAME="ACTION"></a>
</td>
</tr>
</TMPL_LOOP>
Deleted: trunk/vhffs-panel/templates/admin/mysql/edit.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mysql/edit.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/mysql/edit.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,72 +0,0 @@
-<h1><TMPL_VAR NAME="TITLE"></h1>
-
-<form method="post" action="edit_submit.pl" accept-charset="utf-8">
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_DBNAME">
- </label>
- <TMPL_VAR NAME="VALUE_DBNAME">
- </p>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_DBUSER">
- </label>
- <TMPL_VAR NAME="VALUE_DBUSER">
- </p>
- <p>
- <label for="DBPASS">
- <TMPL_VAR NAME="TEXT_DBPASS">
- </label>
- <input type="text" name="DBPASS" id="DBPASS" value="<TMPL_VAR NAME="VALUE_DBPASS">" />
- </p>
- <p>
- </p>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_OWNER">
- </label>
- <TMPL_VAR NAME="VALUE_OWNER">
- </p>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_GROUP">
- </label>
- <TMPL_VAR NAME="VALUE_GROUP">
- </p>
- <p>
- <label for="STATUS">
- <TMPL_VAR NAME="TEXT_STATUS">
- </label>
- <select name="STATUS" id="STATUS" >
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_VALIDATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_VALIDATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_VALIDATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_VALIDATION_REFUSED">" <TMPL_VAR NAME="SELECTED_STATUS_VALIDATION_REFUSED">> <TMPL_VAR NAME="TEXT_STATUS_VALIDATION_REFUSED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_CREATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_CREATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_CREATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_CREATING_ERROR">" <TMPL_VAR NAME="SELECTED_STATUS_CREATING_ERROR">> <TMPL_VAR NAME="TEXT_STATUS_CREATING_ERROR"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_CREATED">" <TMPL_VAR NAME="SELECTED_STATUS_CREATED">> <TMPL_VAR NAME="TEXT_STATUS_CREATED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_ACTIVATED">" <TMPL_VAR NAME="SELECTED_STATUS_ACTIVATED">> <TMPL_VAR NAME="TEXT_STATUS_ACTIVATED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_SUSPENDED">" <TMPL_VAR NAME="SELECTED_STATUS_SUSPENDED">> <TMPL_VAR NAME="TEXT_STATUS_SUSPENDED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_SUSPENDED_BEFORE_DELETED">" <TMPL_VAR NAME="SELECTED_STATUS_SUSPENDED_BEFORE_DELETED">> <TMPL_VAR NAME="TEXT_STATUS_SUSPENDED_BEFORE_DELETED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_MODIFICATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_MODIFICATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_MODIFICATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_MODIFICATION_ERROR">" <TMPL_VAR NAME="SELECTED_STATUS_MODIFICATION_ERROR">> <TMPL_VAR NAME="TEXT_STATUS_MODIFICATION_ERROR"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_MODIFICATION_APPLIED">" <TMPL_VAR NAME="SELECTED_STATUS_MODIFICATION_APPLIED">> <TMPL_VAR NAME="TEXT_STATUS_MODIFICATION_APPLIED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_TO_DELETE">" <TMPL_VAR NAME="SELECTED_STATUS_TO_DELETE">> <TMPL_VAR NAME="TEXT_STATUS_TO_DELETE"></option>
- </select>
- </p>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_DESCRIPTION">:
- </label>
- <TMPL_VAR NAME="VALUE_DESCRIPTION">
- </p>
-
- <p class="button" id="buttonSend">
- <input type="hidden" name="NAME" value="<TMPL_VAR NAME="VALUE_DBNAME">" />
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </p>
-
- <p>
- <label for="HISTORY">
- <a href="<TMPL_VAR NAME="VALUE_HISTORY">"><TMPL_VAR NAME="TEXT_HISTORY"></a>
- </label>
- </p>
-</form>
Deleted: trunk/vhffs-panel/templates/admin/mysql/part-modo.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mysql/part-modo.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/mysql/part-modo.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,20 +0,0 @@
-<TMPL_LOOP NAME="DBS">
-<tr>
- <td>
- <TMPL_VAR NAME="DBNAME">
- </td>
- <td>
- <TMPL_VAR NAME="GROUPNAME">
- </td>
- <td>
- <TMPL_VAR NAME="STATE">
- </td>
- <td>
- <form method="post" action="show.pl" accept-charset="utf-8">
- <input type="hidden" name="OID" value="<TMPL_VAR NAME="OID">" />
- <input type="hidden" name="NAME" value="<TMPL_VAR NAME="DBNAME">" />
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </form>
- </td>
-</tr>
-</TMPL_LOOP>
Modified: trunk/vhffs-panel/templates/admin/mysql/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mysql/part.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/mysql/part.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -10,11 +10,7 @@
<TMPL_VAR NAME="STATE">
</td>
<td>
- <form method="post" action="edit.pl" accept-charset="utf-8">
- <input type="hidden" name="OID" value="<TMPL_VAR NAME="OID">" />
- <input type="hidden" name="NAME" value="<TMPL_VAR NAME="DBNAME">" />
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </form>
+ <a href="/mysql/prefs.pl?name=<TMPL_VAR NAME="DBNAME">"><TMPL_VAR NAME="ACTION"></a>
</td>
</tr>
</TMPL_LOOP>
Deleted: trunk/vhffs-panel/templates/admin/mysql/show.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mysql/show.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/mysql/show.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,61 +0,0 @@
-<h1><TMPL_VAR NAME="TITLE"></h1>
- <p>
- <label for="DBNAME">
- <TMPL_VAR NAME="TEXT_DBNAME">
- </label>
- <label for="DBNAME">
- <TMPL_VAR NAME="VALUE_DBNAME">
- </label>
- <br/>
- </p>
- <p>
- <label for="DBUSER">
- <TMPL_VAR NAME="TEXT_DBUSER">
- </label>
- <label for="DBUSER">
- <TMPL_VAR NAME="VALUE_DBUSER">
- </label>
- <br/>
- </p>
- <p>
- <label for="OWNER">
- <TMPL_VAR NAME="TEXT_OWNER">
- </label>
- <label for="OWNER">
- <TMPL_VAR NAME="VALUE_OWNER">
- </label>
- <br/>
- </p>
- <p>
- <label for="GROUP">
- <TMPL_VAR NAME="TEXT_GROUP">
- </label>
- <label for="GROUP">
- <TMPL_VAR NAME="VALUE_GROUP">
- </label>
- <br/>
- </p>
- <p>
- <label for="STATUS">
- <TMPL_VAR NAME="TEXT_STATUS">
- </label>
- <label for="STATUS">
- <TMPL_VAR NAME="VALUE_STATUS">
- </label>
- <br/>
- </p>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_DESCRIPTION">:
- </label>
- <label>
- <TMPL_VAR NAME="VALUE_DESCRIPTION">
- </label>
- <br/>
- </p>
- <p>
- <label for="HISTORY">
- <a href="<TMPL_VAR NAME="VALUE_HISTORY">"><TMPL_VAR NAME="TEXT_HISTORY"></a>
- </label>
- </p>
-
Deleted: trunk/vhffs-panel/templates/admin/pgsql/edit.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/pgsql/edit.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/pgsql/edit.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,70 +0,0 @@
-<h1><TMPL_VAR NAME="TITLE"></h1>
-
-<form method="post" action="edit_submit.pl" accept-charset="utf-8">
- <p>
- <label for="DBNAME">
- <TMPL_VAR NAME="TEXT_DBNAME">
- </label>
- <input type="text" name="DBNAME" id="DBNAME" value="<TMPL_VAR NAME="VALUE_DBNAME">" />
- </p>
- <p>
- <label for="DBUSER">
- <TMPL_VAR NAME="TEXT_DBUSER">
- </label>
- <input type="text" name="DBUSER" id="DBUSER" value="<TMPL_VAR NAME="VALUE_DBUSER">" />
- </p>
- <p>
- <label for="DBPASS">
- <TMPL_VAR NAME="TEXT_DBPASS">
- </label>
- <input type="text" name="DBPASS" id="DBPASS" value="<TMPL_VAR NAME="VALUE_DBPASS">" />
- </p>
- <p>
- <label for="OWNER">
- <TMPL_VAR NAME="TEXT_OWNER">
- </label>
- <input type="text" name="OWNER" id="OWNER" value="<TMPL_VAR NAME="VALUE_OWNER">" />
- </p>
- <p>
- <label for="GROUP">
- <TMPL_VAR NAME="TEXT_GROUP">
- </label>
- <input type="text" name="GROUP" id="GROUP" value="<TMPL_VAR NAME="VALUE_GROUP">" />
- </p>
- <p>
- <label for="STATUS">
- <TMPL_VAR NAME="TEXT_STATUS">
- </label>
- <select name="STATUS" id="STATUS" >
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_VALIDATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_VALIDATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_VALIDATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_VALIDATION_REFUSED">" <TMPL_VAR NAME="SELECTED_STATUS_VALIDATION_REFUSED">> <TMPL_VAR NAME="TEXT_STATUS_VALIDATION_REFUSED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_CREATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_CREATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_CREATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_CREATING_ERROR">" <TMPL_VAR NAME="SELECTED_STATUS_CREATING_ERROR">> <TMPL_VAR NAME="TEXT_STATUS_CREATING_ERROR"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_CREATED">" <TMPL_VAR NAME="SELECTED_STATUS_CREATED">> <TMPL_VAR NAME="TEXT_STATUS_CREATED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_ACTIVATED">" <TMPL_VAR NAME="SELECTED_STATUS_ACTIVATED">> <TMPL_VAR NAME="TEXT_STATUS_ACTIVATED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_SUSPENDED">" <TMPL_VAR NAME="SELECTED_STATUS_SUSPENDED">> <TMPL_VAR NAME="TEXT_STATUS_SUSPENDED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_SUSPENDED_BEFORE_DELETED">" <TMPL_VAR NAME="SELECTED_STATUS_SUSPENDED_BEFORE_DELETED">> <TMPL_VAR NAME="TEXT_STATUS_SUSPENDED_BEFORE_DELETED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_MODIFICATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_MODIFICATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_MODIFICATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_MODIFICATION_ERROR">" <TMPL_VAR NAME="SELECTED_STATUS_MODIFICATION_ERROR">> <TMPL_VAR NAME="TEXT_STATUS_MODIFICATION_ERROR"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_MODIFICATION_APPLIED">" <TMPL_VAR NAME="SELECTED_STATUS_MODIFICATION_APPLIED">> <TMPL_VAR NAME="TEXT_STATUS_MODIFICATION_APPLIED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_TO_DELETE">" <TMPL_VAR NAME="SELECTED_STATUS_TO_DELETE">> <TMPL_VAR NAME="TEXT_STATUS_TO_DELETE"></option>
- </select>
- </p>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_DESCRIPTION">:
- </label>
- <TMPL_VAR NAME="VALUE_DESCRIPTION">
- </p>
-
- <p class="button" id="buttonSend">
- <input type="hidden" name="NAME" value="<TMPL_VAR NAME="VALUE_DBNAME">" />
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </p>
-
- <p>
- <label for="HISTORY">
- <a href="<TMPL_VAR NAME="VALUE_HISTORY">"><TMPL_VAR NAME="TEXT_HISTORY"></a>
- </label>
- </p>
-</form>
Deleted: trunk/vhffs-panel/templates/admin/pgsql/part-modo.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/pgsql/part-modo.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/pgsql/part-modo.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,20 +0,0 @@
-<TMPL_LOOP NAME="DBS">
-<tr>
- <td>
- <TMPL_VAR NAME="DBNAME">
- </td>
- <td>
- <TMPL_VAR NAME="GROUPNAME">
- </td>
- <td>
- <TMPL_VAR NAME="STATE">
- </td>
- <td>
- <form method="post" action="show.pl" accept-charset="utf-8">
- <input type="hidden" name="OID" value="<TMPL_VAR NAME="OID">" />
- <input type="hidden" name="NAME" value="<TMPL_VAR NAME="DBNAME">" />
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </form>
- </td>
-</tr>
-</TMPL_LOOP>
Modified: trunk/vhffs-panel/templates/admin/pgsql/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/pgsql/part.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/pgsql/part.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -10,11 +10,7 @@
<TMPL_VAR NAME="STATE">
</td>
<td>
- <form method="post" action="edit.pl" accept-charset="utf-8">
- <input type="hidden" name="OID" value="<TMPL_VAR NAME="OID">" />
- <input type="hidden" name="NAME" value="<TMPL_VAR NAME="DBNAME">" />
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </form>
+ <a href="/pgsql/prefs.pl?name=<TMPL_VAR NAME="DBNAME">"><TMPL_VAR NAME="ACTION"></a>
</td>
</tr>
</TMPL_LOOP>
Deleted: trunk/vhffs-panel/templates/admin/pgsql/show.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/pgsql/show.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/pgsql/show.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,60 +0,0 @@
-<h1><TMPL_VAR NAME="TITLE"></h1>
- <p>
- <label for="DBNAME">
- <TMPL_VAR NAME="TEXT_DBNAME">
- </label>
- <label for="DBNAME">
- <TMPL_VAR NAME="VALUE_DBNAME">
- </label>
- <br/>
- </p>
- <p>
- <label for="DBUSER">
- <TMPL_VAR NAME="TEXT_DBUSER">
- </label>
- <label for="DBUSER">
- <TMPL_VAR NAME="VALUE_DBUSER">
- </label>
- <br/>
- </p>
- <p>
- <label for="OWNER">
- <TMPL_VAR NAME="TEXT_OWNER">
- </label>
- <label for="OWNER">
- <TMPL_VAR NAME="VALUE_OWNER">
- </label>
- <br/>
- </p>
- <p>
- <label for="GROUP">
- <TMPL_VAR NAME="TEXT_GROUP">
- </label>
- <label for="GROUP">
- <TMPL_VAR NAME="VALUE_GROUP">
- </label>
- <br/>
- </p>
- <p>
- <label for="STATUS">
- <TMPL_VAR NAME="TEXT_STATUS">
- </label>
- <label for="STATUS">
- <TMPL_VAR NAME="VALUE_STATUS">
- </label>
- <br/>
- </p>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_DESCRIPTION">:
- </label>
- <label>
- <TMPL_VAR NAME="VALUE_DESCRIPTION">
- </label>
- <br/>
- </p>
- <p>
- <label for="HISTORY">
- <a href="<TMPL_VAR NAME="VALUE_HISTORY">"><TMPL_VAR NAME="TEXT_HISTORY"></a>
- </label>
- </p>
Deleted: trunk/vhffs-panel/templates/admin/repository/edit.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/repository/edit.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/repository/edit.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,72 +0,0 @@
-<form method="post" action="edit_submit.pl" accept-charset="utf-8">
- <h1><TMPL_VAR NAME="TITLE"></h1>
-
- <p>
- <label for="NAME">
- <TMPL_VAR NAME="TEXT_NAME">
- </label>
- <input type="text" name="NAME" id="NAME" value="<TMPL_VAR NAME="VALUE_NAME">" />
- </p>
- <p>
- <label for="OWNER">
- <TMPL_VAR NAME="TEXT_OWNER">
- </label>
- <input type="text" name="OWNER" id="OWNER" value="<TMPL_VAR NAME="VALUE_OWNER">" />
- </p>
- <p>
- <label for="GROUP">
- <TMPL_VAR NAME="TEXT_GROUP">
- </label>
- <input TYPE="text" name="GROUP" id="GROUP" value="<TMPL_VAR NAME="VALUE_GROUP">" />
- </p>
- <p>
- <label for="QUOTA">
- <TMPL_VAR NAME="TEXT_QUOTA">
- </label>
- <input TYPE="text" name="QUOTA" id="QUOTA" value="<TMPL_VAR NAME="VALUE_QUOTA">" />
- </p>
- <p>
- <label for="QUOTAUSED">
- <TMPL_VAR NAME="TEXT_QUOTAUSED">
- </label>
- <TMPL_VAR NAME="VALUE_QUOTAUSED">
- <br/>
- </p>
- <p>
- <label for="STATUS">
- <TMPL_VAR NAME="TEXT_STATUS">
- </label>
- <select name="STATUS" id="STATUS" >
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_VALIDATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_VALIDATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_VALIDATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_VALIDATION_REFUSED">" <TMPL_VAR NAME="SELECTED_STATUS_VALIDATION_REFUSED">> <TMPL_VAR NAME="TEXT_STATUS_VALIDATION_REFUSED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_CREATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_CREATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_CREATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_CREATING_ERROR">" <TMPL_VAR NAME="SELECTED_STATUS_CREATING_ERROR">> <TMPL_VAR NAME="TEXT_STATUS_CREATING_ERROR"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_CREATED">" <TMPL_VAR NAME="SELECTED_STATUS_CREATED">> <TMPL_VAR NAME="TEXT_STATUS_CREATED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_ACTIVATED">" <TMPL_VAR NAME="SELECTED_STATUS_ACTIVATED">> <TMPL_VAR NAME="TEXT_STATUS_ACTIVATED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_SUSPENDED">" <TMPL_VAR NAME="SELECTED_STATUS_SUSPENDED">> <TMPL_VAR NAME="TEXT_STATUS_SUSPENDED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_SUSPENDED_BEFORE_DELETED">" <TMPL_VAR NAME="SELECTED_STATUS_SUSPENDED_BEFORE_DELETED">> <TMPL_VAR NAME="TEXT_STATUS_SUSPENDED_BEFORE_DELETED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_MODIFICATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_MODIFICATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_MODIFICATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_MODIFICATION_ERROR">" <TMPL_VAR NAME="SELECTED_STATUS_MODIFICATION_ERROR">> <TMPL_VAR NAME="TEXT_STATUS_MODIFICATION_ERROR"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_MODIFICATION_APPLIED">" <TMPL_VAR NAME="SELECTED_STATUS_MODIFICATION_APPLIED">> <TMPL_VAR NAME="TEXT_STATUS_MODIFICATION_APPLIED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_TO_DELETE">" <TMPL_VAR NAME="SELECTED_STATUS_TO_DELETE">> <TMPL_VAR NAME="TEXT_STATUS_TO_DELETE"></option>
- </select>
- </p>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_DESCRIPTION">:
- </label>
- <TMPL_VAR NAME="VALUE_DESCRIPTION">
- </p>
-
- <p class="button" id="buttonSend">
- <input type="hidden" name="NAME" value="<TMPL_VAR NAME="VALUE_NAME">" />
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </p>
-
- <p>
- <label for="HISTORY">
- <a href="<TMPL_VAR NAME="VALUE_HISTORY">"><TMPL_VAR NAME="TEXT_HISTORY"></a>
- </label>
- </p>
-</form>
-
Deleted: trunk/vhffs-panel/templates/admin/repository/part-modo.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/repository/part-modo.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/repository/part-modo.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,20 +0,0 @@
-<TMPL_LOOP NAME="REPOSITORIES">
-<tr>
- <td>
- <TMPL_VAR NAME="NAME">
- </td>
- <td>
- <TMPL_VAR NAME="GROUPNAME">
- </td>
- <td>
- <TMPL_VAR NAME="STATE">
- </td>
- <td>
- <form method="post" action="show.pl" accept-charset="utf-8">
- <input type="HIDDEN" name="OID" value="<TMPL_VAR NAME="OID">" />
- <input type="HIDDEN" name="NAME" value="<TMPL_VAR NAME="NAME">" />
- <input type="SUBMIT" value="<TMPL_VAR NAME="SEND">" />
- </form>
- </td>
-</tr>
-</TMPL_LOOP>
Modified: trunk/vhffs-panel/templates/admin/repository/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/repository/part.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/repository/part.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -10,11 +10,7 @@
<TMPL_VAR NAME="STATE">
</td>
<td>
- <form method="post" action="edit.pl" accept-charset="utf-8">
- <input type="HIDDEN" name="OID" value="<TMPL_VAR NAME="OID">" />
- <input type="HIDDEN" name="NAME" value="<TMPL_VAR NAME="NAME">" />
- <input type="SUBMIT" value="<TMPL_VAR NAME="SEND">" />
- </form>
+ <a href="/repository/prefs.pl?name=<TMPL_VAR NAME="NAME">"><TMPL_VAR NAME="ACTION"></a>
</td>
</tr>
</TMPL_LOOP>
Deleted: trunk/vhffs-panel/templates/admin/repository/show.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/repository/show.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/repository/show.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,70 +0,0 @@
- <h1><TMPL_VAR NAME="TITLE"></h1>
- <p>
- <label for="NAME">
- <TMPL_VAR NAME="TEXT_NAME">
- </label>
- <label for="NAME">
- <TMPL_VAR NAME="VALUE_NAME">
- </label>
- <br/>
- </p>
- <p>
- <label for="OWNER">
- <TMPL_VAR NAME="TEXT_OWNER">
- </label>
- <label for="OWNER">
- <TMPL_VAR NAME="VALUE_OWNER">
- </label>
- <br/>
- </p>
- <p>
- <label for="GROUP">
- <TMPL_VAR NAME="TEXT_GROUP">
- </label>
- <label for="GROUP">
- <TMPL_VAR NAME="VALUE_GROUP">
- </label>
- <br/>
- </p>
- <p>
- <label for="QUOTA">
- <TMPL_VAR NAME="TEXT_QUOTA">
- </label>
- <label for="QUOTA">
- <TMPL_VAR NAME="VALUE_QUOTA">
- </label>
- <br/>
- </p>
- <p>
- <label for="QUOTAUSED">
- <TMPL_VAR NAME="TEXT_QUOTAUSED">
- </label>
- <label for="QUOTAUSED">
- <TMPL_VAR NAME="VALUE_QUOTAUSED">
- </label>
- <br/>
- </p>
- <p>
- <label for="STATUS">
- <TMPL_VAR NAME="TEXT_STATUS">
- </label>
- <label for="STATUS">
- <TMPL_VAR NAME="VALUE_STATUS">
- </label>
- <br/>
- </p>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_DESCRIPTION">:
- </label>
- <label>
- <TMPL_VAR NAME="VALUE_DESCRIPTION">
- </label>
- <br/>
- </p>
- <p>
- <label for="HISTORY">
- <a href="<TMPL_VAR NAME="VALUE_HISTORY">"><TMPL_VAR NAME="TEXT_HISTORY"></a>
- </label>
- <br/>
- </p>
Deleted: trunk/vhffs-panel/templates/admin/svn/part-modo.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/svn/part-modo.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/svn/part-modo.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,13 +0,0 @@
-<TMPL_LOOP NAME="SVNREPOS">
-<tr>
- <td>
- <TMPL_VAR NAME="SVNROOT">
- </td>
- <td>
- <TMPL_VAR NAME="GROUPNAME">
- </td>
- <td>
- <TMPL_VAR NAME="STATE">
- </td>
-</tr>
-</TMPL_LOOP>
Modified: trunk/vhffs-panel/templates/admin/svn/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/svn/part.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/svn/part.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -10,12 +10,7 @@
<TMPL_VAR NAME="STATE">
</td>
<td>
- <form method="post" action="../../svn/prefs.pl" accept-charset="utf-8">
- <input type="hidden" id="OID" name="OID" value="<TMPL_VAR NAME="OID">" />
- <input type="hidden" id="name" name="name" value="<TMPL_VAR NAME="SVNROOT">" />
- <input type="hidden" id="cgigroup" name="cgigroup" value="<TMPL_VAR NAME="GROUPNAME">" />
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </form>
+ <a href="/svn/prefs.pl?name=<TMPL_VAR NAME="SVNROOT">"><TMPL_VAR NAME="ACTION"></a>
</td>
</tr>
</TMPL_LOOP>
Deleted: trunk/vhffs-panel/templates/admin/user/edit-note.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/user/edit-note.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/user/edit-note.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,20 +0,0 @@
-<h2><TMPL_VAR NAME="TITLE_NOTE"></h2>
-
-
-
-
-
-<form method="post" action="edit_note.pl" accept-charset="utf-8">
- <input type="hidden" name="USERNAME" value="<TMPL_VAR NAME="VALUE_USERNAME">"/>
- <p>
- <label for="USERNAME">
- <TMPL_VAR NAME="TEXT_NOTE">
- </label>
- <input type="text" name="NOTE" id="NOTE" value="<TMPL_VAR NAME="VALUE_NOTE">" />
- </p>
- <p class="button" id="buttonSend">
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </p>
-
-</form>
-
Deleted: trunk/vhffs-panel/templates/admin/user/edit.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/user/edit.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/user/edit.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,153 +0,0 @@
-<h1><TMPL_VAR NAME="TITLE"></h1>
-
-
-
-
-
-<form method="post" action="edit_submit.pl" accept-charset="utf-8">
- <p>
- <label for="USERNAME">
- <TMPL_VAR NAME="TEXT_USERNAME">
- </label>
- <input type="text" name="USERNAME" id="USERNAME" value="<TMPL_VAR NAME="VALUE_USERNAME">" />
- </p>
- <p>
- <label for="FIRSTNAME">
- <TMPL_VAR NAME="TEXT_FIRSTNAME">
- </label>
- <input type="text" name="FIRSTNAME" id="FIRSTNAME" value="<TMPL_VAR NAME="VALUE_FIRSTNAME">" />
- </p>
- <p>
- <label for="LASTNAME">
- <TMPL_VAR NAME="TEXT_LASTNAME">
- </label>
- <input type="text" name="LASTNAME" id="LASTNAME" value="<TMPL_VAR NAME="VALUE_LASTNAME">" />
- </p>
- <p>
- <label for="PASSWORD">
- <TMPL_VAR NAME="TEXT_MAIL">
- </label>
- <input type="text" name="USERMEL" id="PASSWORD" value="<TMPL_VAR NAME="VALUE_MAIL">" />
- </p>
- <p>
- <label for="PASSWORD">
- <TMPL_VAR NAME="TEXT_PASSWD">
- </label>
- <input type="text" name="PASSWORD" id="PASSWORD" value="<TMPL_VAR NAME="VALUE_PASSWD">" />
- </p>
- <p>
- <label for="PASSWORD">
- <TMPL_VAR NAME="TEXT_SHELL">
- </label>
- <input type="text" name="SHELL" id="PASSWORD" value="<TMPL_VAR NAME="VALUE_SHELL">" />
- </p>
- <p>
- <label for="HOMEDIR">
- <TMPL_VAR NAME="TEXT_HOMEDIR">
- </label>
- <input type="text" name="HOMEDIR" id="HOMEDIR" value="<TMPL_VAR NAME="VALUE_HOMEDIR">" />
- </p>
- <p>
- <label for="ADMIN">
- <TMPL_VAR NAME="TEXT_ADMIN">
- </label>
- <select name="ADMIN" id="ADMIN">
- <option value="<TMPL_VAR NAME="VALUE_NORMAL_USER">" <TMPL_VAR NAME="SELECTED_NORMAL_USER">><TMPL_VAR NAME="TEXT_NORMAL_USER" ></option>
- <option value="<TMPL_VAR NAME="VALUE_MODERATOR_USER">" <TMPL_VAR NAME="SELECTED_MODERATOR_USER">><TMPL_VAR NAME="TEXT_MODERATOR_USER"></option>
- <option value="<TMPL_VAR NAME="VALUE_ADMIN_USER">" <TMPL_VAR NAME="SELECTED_ADMIN_USER">><TMPL_VAR NAME="TEXT_ADMIN_USER"></option>
- </select>
- </p>
- <p>
- <label for="UID">
- <TMPL_VAR NAME="TEXT_UID">
- </label>
- <input type="text" name="UID" id="UID" value="<TMPL_VAR NAME="VALUE_UID">" />
- </p>
- <p>
- <label for="GID">
- <TMPL_VAR NAME="TEXT_GID">
- </label>
- <input name="text" name="GID" id="GID" value="<TMPL_VAR NAME="VALUE_GID">" />
- </p>
- <p>
- <label for="PASSWORD">
- <TMPL_VAR NAME="TEXT_ADDRESS">
- </label>
- <input type="text" name="ADDRESS" id="PASSWORD" value="<TMPL_VAR NAME="VALUE_ADDRESS">" />
- </p>
-
-
- <p>
- <label for="PASSWORD">
- <TMPL_VAR NAME="TEXT_CITY">
- </label>
- <input type="text" name="CITY" id="PASSWORD" value="<TMPL_VAR NAME="VALUE_CITY">" />
- </p>
-
- <p>
- <label for="PASSWORD">
- <TMPL_VAR NAME="TEXT_ZIPCODE">
- </label>
- <input type="text" name="ZIPCODE" id="PASSWORD" value="<TMPL_VAR NAME="VALUE_ZIPCODE">" />
- </p>
-
- <p>
- <label for="PASSWORD">
- <TMPL_VAR NAME="TEXT_COUNTRY">
- </label>
- <input type="text" name="COUNTRY" id="PASSWORD" value="<TMPL_VAR NAME="VALUE_COUNTRY">" />
- </p>
-
-
- <p>
- <label for="GPG">
- <TMPL_VAR NAME="TEXT_GPG">
- </label>
- <input name="text" name="GPG" id="GPG" value="<TMPL_VAR NAME="VALUE_GPG">" />
- </p>
- <p>
- <label for="STATUS">
- <TMPL_VAR NAME="TEXT_STATUS">
- </label>
- <select name="STATUS" id="STATUS">
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_VALIDATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_VALIDATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_VALIDATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_VALIDATION_REFUSED">" <TMPL_VAR NAME="SELECTED_STATUS_VALIDATION_REFUSED">> <TMPL_VAR NAME="TEXT_STATUS_VALIDATION_REFUSED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_CREATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_CREATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_CREATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_CREATING_ERROR">" <TMPL_VAR NAME="SELECTED_STATUS_CREATING_ERROR">> <TMPL_VAR NAME="TEXT_STATUS_CREATING_ERROR"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_CREATED">" <TMPL_VAR NAME="SELECTED_STATUS_CREATED">> <TMPL_VAR NAME="TEXT_STATUS_CREATED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_ACTIVATED">" <TMPL_VAR NAME="SELECTED_STATUS_ACTIVATED">> <TMPL_VAR NAME="TEXT_STATUS_ACTIVATED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_SUSPENDED">" <TMPL_VAR NAME="SELECTED_STATUS_SUSPENDED">> <TMPL_VAR NAME="TEXT_STATUS_SUSPENDED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_SUSPENDED_BEFORE_DELETED">" <TMPL_VAR NAME="SELECTED_STATUS_SUSPENDED_BEFORE_DELETED">> <TMPL_VAR NAME="TEXT_STATUS_SUSPENDED_BEFORE_DELETED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_MODIFICATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_MODIFICATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_MODIFICATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_MODIFICATION_ERROR">" <TMPL_VAR NAME="SELECTED_STATUS_MODIFICATION_ERROR">> <TMPL_VAR NAME="TEXT_STATUS_MODIFICATION_ERROR"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_MODIFICATION_APPLIED">" <TMPL_VAR NAME="SELECTED_STATUS_MODIFICATION_APPLIED">> <TMPL_VAR NAME="TEXT_STATUS_MODIFICATION_APPLIED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_TO_DELETE">" <TMPL_VAR NAME="SELECTED_STATUS_TO_DELETE">> <TMPL_VAR NAME="TEXT_STATUS_TO_DELETE"></option>
- </select>
- </p>
-
- <p class="button" id="buttonSend">
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </p>
-
-</form>
-
-
-<p>
-<TMPL_VAR NAME="NOTE">
-</p>
-
-
- <p>
- <label for="HISTORY">
- <a href="<TMPL_VAR NAME="VALUE_HISTORY">"><TMPL_VAR NAME="TEXT_HISTORY"></a>
- </label>
- </p>
-
- <p>
- <h2><TMPL_VAR NAME="TEXT_GROUPS"></h2>
- <label for="GROUPS">
- <ul>
- <TMPL_VAR NAME="GROUPS">
- </ul>
- </label>
- </p>
Deleted: trunk/vhffs-panel/templates/admin/user/group-part-show.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/user/group-part-show.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/user/group-part-show.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,6 +0,0 @@
-
-<li>
- <a href="../group/show.pl?NAME=<TMPL_VAR NAME="GROUPNAME">"><TMPL_VAR NAME="GROUPNAME"></a>
- ( <TMPL_VAR NAME="OWNER_TEXT">: <a href="show.pl?NAME=<TMPL_VAR NAME="OWNER">"><TMPL_VAR NAME="OWNER"></a> )
- : <TMPL_VAR NAME="STATE">
-</li>
Deleted: trunk/vhffs-panel/templates/admin/user/group-part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/user/group-part.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/user/group-part.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,6 +0,0 @@
-
-<li>
- <a href="../group/edit.pl?NAME=<TMPL_VAR NAME="GROUPNAME">"><TMPL_VAR NAME="GROUPNAME"></a>
- ( <TMPL_VAR NAME="OWNER_TEXT">: <a href="edit.pl?NAME=<TMPL_VAR NAME="OWNER">"><TMPL_VAR NAME="OWNER"></a> )
- : <TMPL_VAR NAME="STATE">
-</li>
Deleted: trunk/vhffs-panel/templates/admin/user/part-modo.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/user/part-modo.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/user/part-modo.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,23 +0,0 @@
-<TMPL_LOOP NAME="USERS">
-<tr>
- <td>
- <TMPL_VAR NAME="USERNAME">
- </td>
- <td>
- <TMPL_VAR NAME="FIRSTNAME">
- </td>
- <td>
- <TMPL_VAR NAME="LASTNAME">
- </td>
- <td>
- <TMPL_VAR NAME="STATE">
- </td>
- <td>
- <form method="post" action="show.pl" accept-charset="utf-8">
- <input type="hidden" name="NAME" value="<TMPL_VAR NAME="USERNAME">" />
- <input type="hidden" name="OID" value="<TMPL_VAR NAME="OID">" />
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </form>
- </td>
-</tr>
-</TMPL_LOOP>
Modified: trunk/vhffs-panel/templates/admin/user/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/user/part.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/user/part.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,20 +1,16 @@
<TMPL_LOOP NAME="USERS">
<tr>
<td>
- <TMPL_VAR NAME="USERNAME">
+ <TMPL_VAR NAME="USERNAME">
</td>
<td>
- <TMPL_VAR NAME="FIRSTNAME"> <TMPL_VAR NAME="LASTNAME">
+ <TMPL_VAR NAME="FIRSTNAME"> <TMPL_VAR NAME="LASTNAME">
</td>
<td>
- <TMPL_VAR NAME="STATE">
+ <TMPL_VAR NAME="STATE">
</td>
<td>
- <form method="post" action="edit.pl" accept-charset="utf-8">
- <input type="hidden" name="NAME" value="<TMPL_VAR NAME="USERNAME">" />
- <input type="hidden" name="OID" value="<TMPL_VAR NAME="OID">" />
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </form>
+ <a href="/user/prefs.pl?name=<TMPL_VAR NAME="USERNAME">"><TMPL_VAR NAME="ACTION"></a>
</td>
</tr>
</TMPL_LOOP>
Deleted: trunk/vhffs-panel/templates/admin/user/show.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/user/show.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/user/show.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,150 +0,0 @@
-<h1><TMPL_VAR NAME="TITLE"></h1>
-
- <p>
- <label for="USERNAME">
- <TMPL_VAR NAME="TEXT_USERNAME">
- </label>
- <label for="USERNAME">
- <TMPL_VAR NAME="VALUE_USERNAME">
- </label>
- <br/>
- </p>
- <p>
- <label for="FIRSTNAME">
- <TMPL_VAR NAME="TEXT_FIRSTNAME">
- </label>
- <label for="FIRSTNAME">
- <TMPL_VAR NAME="VALUE_FIRSTNAME">
- </label>
- <br/>
- </p>
- <p>
- <label for="LASTNAME">
- <TMPL_VAR NAME="TEXT_LASTNAME">
- </label>
- <label for="LASTNAME">
- <TMPL_VAR NAME="VALUE_LASTNAME">
- </label>
- <br/>
- </p>
- <p>
- <label for="SHELL">
- <TMPL_VAR NAME="TEXT_SHELL">
- </label>
- <label for="SHELL">
- <TMPL_VAR NAME="VALUE_SHELL">
- </label>
- <br/>
- </p>
- <p>
- <label for="HOMEDIR">
- <TMPL_VAR NAME="TEXT_HOMEDIR">
- </label>
- <label for="HOMEDIR">
- <TMPL_VAR NAME="VALUE_HOMEDIR">
- </label>
- <br/>
- </p>
- <p>
- <label for="ADMIN">
- <TMPL_VAR NAME="TEXT_ADMIN">
- </label>
- <label for="ADMIN">
- <TMPL_VAR NAME="VALUE_ADMIN">
- </label>
- <br/>
- </p>
- <p>
- <label for="UID">
- <TMPL_VAR NAME="TEXT_UID">
- </label>
- <label for="UID">
- <TMPL_VAR NAME="VALUE_UID">
- </label>
- <br/>
- </p>
- <p>
- <label for="GID">
- <TMPL_VAR NAME="TEXT_GID">
- </label>
- <label for="GID">
- <TMPL_VAR NAME="VALUE_GID">
- </label>
- <br/>
- </p>
- <p>
- <label for="ADDRESS">
- <TMPL_VAR NAME="TEXT_ADDRESS">
- </label>
- <label for="ADDRESS">
- <TMPL_VAR NAME="VALUE_ADDRESS">
- </label>
- <br/>
- </p>
- <p>
- <label for="CITY">
- <TMPL_VAR NAME="TEXT_CITY">
- </label>
- <label for="CITY">
- <TMPL_VAR NAME="VALUE_CITY">
- </label>
- <br/>
- </p>
- <p>
- <label for="ZIPCODE">
- <TMPL_VAR NAME="TEXT_ZIPCODE">
- </label>
- <label for="ZIPCODE">
- <TMPL_VAR NAME="VALUE_ZIPCODE">
- </label>
- <br/>
- </p>
- <p>
- <label for="COUNTRY">
- <TMPL_VAR NAME="TEXT_COUNTRY">
- </label>
- <label for="COUNTRY">
- <TMPL_VAR NAME="VALUE_COUNTRY">
- </label>
- <br/>
- </p>
- <p>
- <label for="MAIL">
- <TMPL_VAR NAME="TEXT_MAIL">
- </label>
- <label for="MAIL">
- <TMPL_VAR NAME="VALUE_MAIL">
- </label>
- <br/>
- </p>
- <p>
- <label for="GPG">
- <TMPL_VAR NAME="TEXT_GPG">
- </label>
- <label for="GPG">
- <TMPL_VAR NAME="VALUE_GPG">
- </label>
- <br/>
- </p>
- <p>
- <label for="STATUS">
- <TMPL_VAR NAME="TEXT_STATUS">
- </label>
- <label for="STATUS">
- <TMPL_VAR NAME="VALUE_STATUS">
- </label>
- <br/>
- </p>
- <p>
- <label for="HISTORY">
- <a href="<TMPL_VAR NAME="VALUE_HISTORY">"><TMPL_VAR NAME="TEXT_HISTORY"></a>
- </label>
- </p>
- <p>
- <h2><TMPL_VAR NAME="TEXT_GROUPS"></h2>
- <label for="GROUPS">
- <ul>
- <TMPL_VAR NAME="GROUPS">
- </ul>
- </label>
- </p>
Deleted: trunk/vhffs-panel/templates/admin/web/edit.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/web/edit.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/web/edit.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,57 +0,0 @@
-<h1><TMPL_VAR NAME="TITLE"></h1>
-
-<form method="post" action="edit_submit.pl" accept-charset="utf-8">
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_SERVERNAME">
- </label>
- <TMPL_VAR NAME="VALUE_SERVERNAME">
- </p>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_GROUP">
- </label>
- <TMPL_VAR NAME="VALUE_GROUP">
- </p>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_OWNER">
- </label>
- <TMPL_VAR NAME="VALUE_OWNER">
- </p>
- <p>
- <label for="STATUS">
- <TMPL_VAR NAME="TEXT_STATUS">
- </label>
- <select name="STATUS" id="STATUS" >
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_VALIDATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_VALIDATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_VALIDATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_VALIDATION_REFUSED">" <TMPL_VAR NAME="SELECTED_STATUS_VALIDATION_REFUSED">> <TMPL_VAR NAME="TEXT_STATUS_VALIDATION_REFUSED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_CREATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_CREATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_CREATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_CREATING_ERROR">" <TMPL_VAR NAME="SELECTED_STATUS_CREATING_ERROR">> <TMPL_VAR NAME="TEXT_STATUS_CREATING_ERROR"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_CREATED">" <TMPL_VAR NAME="SELECTED_STATUS_CREATED">> <TMPL_VAR NAME="TEXT_STATUS_CREATED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_ACTIVATED">" <TMPL_VAR NAME="SELECTED_STATUS_ACTIVATED">> <TMPL_VAR NAME="TEXT_STATUS_ACTIVATED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_SUSPENDED">" <TMPL_VAR NAME="SELECTED_STATUS_SUSPENDED">> <TMPL_VAR NAME="TEXT_STATUS_SUSPENDED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_SUSPENDED_BEFORE_DELETED">" <TMPL_VAR NAME="SELECTED_STATUS_SUSPENDED_BEFORE_DELETED">> <TMPL_VAR NAME="TEXT_STATUS_SUSPENDED_BEFORE_DELETED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_MODIFICATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_MODIFICATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_MODIFICATION"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_MODIFICATION_ERROR">" <TMPL_VAR NAME="SELECTED_STATUS_MODIFICATION_ERROR">> <TMPL_VAR NAME="TEXT_STATUS_MODIFICATION_ERROR"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_MODIFICATION_APPLIED">" <TMPL_VAR NAME="SELECTED_STATUS_MODIFICATION_APPLIED">> <TMPL_VAR NAME="TEXT_STATUS_MODIFICATION_APPLIED"></option>
- <option value="<TMPL_VAR NAME="VALUE_STATUS_TO_DELETE">" <TMPL_VAR NAME="SELECTED_STATUS_TO_DELETE">> <TMPL_VAR NAME="TEXT_STATUS_TO_DELETE"></option>
- </select>
- </p>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_DESCRIPTION">:
- </label>
- <TMPL_VAR NAME="VALUE_DESCRIPTION">
- </p>
-
- <p class="button" id="buttonSend">
- <input type="hidden" name="NAME" value="<TMPL_VAR NAME="VALUE_SERVERNAME">" />
- <input type="submit" value="<TMPL_VAR NAME="SEND">" />
- </p>
- <p>
- <label for="HISTORY">
- <a href="<TMPL_VAR NAME="VALUE_HISTORY">"><TMPL_VAR NAME="TEXT_HISTORY"></a>
- </label>
- <p>
-</form>
Deleted: trunk/vhffs-panel/templates/admin/web/part-modo.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/web/part-modo.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/web/part-modo.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,16 +0,0 @@
-<TMPL_LOOP NAME="WEBS">
-<tr>
- <td>
- <a href="http://<TMPL_VAR NAME="SERVERNAME">"><TMPL_VAR NAME="SERVERNAME"></a>
- </td>
- <td>
- <TMPL_VAR NAME="GROUPNAME">
- </td>
- <td>
- <TMPL_VAR NAME="STATE">
- </td>
- <td>
- <a href="/web/prefs.pl?name=<TMPL_VAR NAME="SERVERNAME">"><TMPL_VAR NAME="SHOW"></a>
- </td>
-</tr>
-</TMPL_LOOP>
Modified: trunk/vhffs-panel/templates/admin/web/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/web/part.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/web/part.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -10,7 +10,7 @@
<TMPL_VAR NAME="STATE">
</td>
<td>
- <a href="/web/prefs.pl?name=<TMPL_VAR NAME="SERVERNAME">"><TMPL_VAR NAME="EDIT"></a>
+ <a href="/web/prefs.pl?name=<TMPL_VAR NAME="SERVERNAME">"><TMPL_VAR NAME="ACTION"></a>
</td>
</tr>
</TMPL_LOOP>
Deleted: trunk/vhffs-panel/templates/admin/web/show.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/web/show.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/admin/web/show.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -1,52 +0,0 @@
-<h1><TMPL_VAR NAME="TITLE"></h1>
- <p>
- <label for="SERVERNAME">
- <TMPL_VAR NAME="TEXT_SERVERNAME">
- </label>
- <label for="SERVERNAME">
- <TMPL_VAR NAME="VALUE_SERVERNAME">
- </label>
- <br/>
- </p>
- <p>
- <label for="TEXT_GROUP">
- <TMPL_VAR NAME="TEXT_GROUP">
- </label>
- <label for="TEXT_GROUP">
- <TMPL_VAR NAME="VALUE_GROUP">
- </label>
- <br/>
- </p>
- <p>
- <label for="OWNER">
- <TMPL_VAR NAME="TEXT_OWNER">
- </label>
- <label for="OWNER">
- <TMPL_VAR NAME="VALUE_OWNER">
- </label>
- <br/>
- </p>
- <p>
- <label for="STATUS">
- <TMPL_VAR NAME="TEXT_STATUS">
- </label>
- <label for="STATUS">
- <TMPL_VAR NAME="VALUE_STATUS">
- </label>
- <br/>
- </p>
- <p>
- <label>
- <TMPL_VAR NAME="TEXT_DESCRIPTION">:
- </label>
- <label>
- <TMPL_VAR NAME="VALUE_DESCRIPTION">
- </label>
- <br/>
- </p>
- <p>
- <label for="HISTORY">
- <a href="<TMPL_VAR NAME="VALUE_HISTORY">"><TMPL_VAR NAME="TEXT_HISTORY"></a>
- </label>
- </p>
-
Modified: trunk/vhffs-panel/templates/cvs/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/cvs/prefs.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/cvs/prefs.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -71,3 +71,5 @@
<input type="submit" value="<tmpl_var name="TEXT_DELETE">" />
</p>
</form>
+
+<tmpl_var name="ADMIN_PART">
Modified: trunk/vhffs-panel/templates/dns/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/prefs.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/dns/prefs.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -226,3 +226,4 @@
<tmpl_var name="OPART">
+<tmpl_var name="ADMIN_PART">
Modified: trunk/vhffs-panel/templates/git/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/git/prefs.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/git/prefs.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -89,3 +89,4 @@
</form>
<tmpl_var name="OPART">
+<tmpl_var name="ADMIN_PART">
Modified: trunk/vhffs-panel/templates/group/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/group/prefs.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/group/prefs.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -103,3 +103,5 @@
</p>
</form>
+
+<tmpl_var name="ADMIN_PART">
Modified: trunk/vhffs-panel/templates/mail/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mail/prefs.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/mail/prefs.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -119,5 +119,4 @@
</form>
-
-
+<tmpl_var name="ADMIN_PART">
Modified: trunk/vhffs-panel/templates/mailinglist/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mailinglist/prefs.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/mailinglist/prefs.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -149,6 +149,4 @@
<tmpl_var name="OPART">
-
-
-
+<tmpl_var name="ADMIN_PART">
Modified: trunk/vhffs-panel/templates/mysql/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mysql/prefs.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/mysql/prefs.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -71,3 +71,5 @@
</p>
</form>
+
+<tmpl_var name="ADMIN_PART">
Modified: trunk/vhffs-panel/templates/pgsql/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/pgsql/prefs.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/pgsql/prefs.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -67,3 +67,5 @@
</p>
</form>
+
+<tmpl_var name="ADMIN_PART">
Modified: trunk/vhffs-panel/templates/repository/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/repository/prefs.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/repository/prefs.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -49,3 +49,5 @@
<input type="submit" value="<tmpl_var name="TEXT_DELETE">" />
</p>
</form>
+
+<tmpl_var name="ADMIN_PART">
Modified: trunk/vhffs-panel/templates/svn/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/svn/prefs.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/svn/prefs.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -75,3 +75,4 @@
</form>
<tmpl_var name="OPART">
+<tmpl_var name="ADMIN_PART">
Modified: trunk/vhffs-panel/templates/user/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/user/prefs.tmpl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/templates/user/prefs.tmpl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -72,7 +72,6 @@
</p>
<tmpl_var name="MAILUSER">
-
<p class="button" id="buttonModify">
<tmpl_if name="HELP_URL">
@@ -80,6 +79,8 @@
</tmpl_if>
<input type="submit" value="<tmpl_var name="TEXT_SEND">" name="prefs_submit" id="prefs_submit"/>
</p>
+
+ <input type="hidden" name="name" value="<tmpl_var name="VALUE_USERNAME">" />
</form>
<tmpl_var name="AVATAR">
@@ -111,3 +112,5 @@
</p>
</form>
+
+ <tmpl_var name="ADMIN_PART">
Modified: trunk/vhffs-panel/user/prefs.pl
===================================================================
--- trunk/vhffs-panel/user/prefs.pl 2007-10-25 22:41:29 UTC (rev 1031)
+++ trunk/vhffs-panel/user/prefs.pl 2007-10-26 19:39:45 UTC (rev 1032)
@@ -43,8 +43,8 @@
use Vhffs::User;
use Vhffs::Main;
use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
use Vhffs::Panel::User;
+use Vhffs::Panel::Object;
use Vhffs::Services::MailUser;
my $panel = new Vhffs::Panel::Main();
@@ -56,372 +56,395 @@
my $vhffs = $panel->{vhffs};
my $maintemplate = $panel->{template};
my $user = $panel->{user};
+my $templatedir = $panel->{templatedir};
+my $template;
+my $userp;
-my $submitted = defined($cgi->param('prefs_submit'));
+my $username = $cgi->param('name');
+if( defined $username ) {
+ $userp = Vhffs::User::get_by_username( $vhffs, $username );
+} else {
+ $userp = $user;
+}
-if($submitted) {
- my $mail = $cgi->param( 'MAIL' );
- my $firstname = Encode::decode_utf8( $cgi->param( 'FIRSTNAME' ) );
- my $lastname = Encode::decode_utf8( $cgi->param( 'LASTNAME' ) );
- my $city = Encode::decode_utf8( $cgi->param( 'CITY' ) );
- my $zipcode = Encode::decode_utf8( $cgi->param( 'ZIPCODE' ) );
- my $country = Encode::decode_utf8( $cgi->param( 'COUNTRY' ) );
- my $address = Encode::decode_utf8( $cgi->param( 'ADDRESS' ) );
- my $pass1 = $cgi->param( 'PASSWORD1' );
- my $pass2 = $cgi->param( 'PASSWORD2' );
+unless( defined $userp ) {
+ $template = new HTML::Template( filename => $templatedir.'/panel/misc/simplemsg.tmpl' );
+ $template->param( MESSAGE => gettext('Cannot get informations on this object') );
+}
+elsif( $userp->get_status != Vhffs::Constants::ACTIVATED )
+{
+ $template = new HTML::Template( filename => $templatedir.'/panel/misc/simplemsg.tmpl' );
+ $template->param( MESSAGE => gettext('This object is not functionnal yet. Please wait creation or moderation.') );
+}
+elsif( ! $user->can_modify( $userp ) )
+{
+ $template = new HTML::Template( filename => $templatedir.'/panel/misc/simplemsg.tmpl' );
+ $template->param( MESSAGE => gettext('You\'re not allowed to do this (ACL rights)') );
+}
+else
+{
- my $theme = $cgi->param( 'THEME' );
- my $lang = $cgi->param( 'LANG' );
- my $shell = $cgi->param( 'SHELL' );
+ my $submitted = defined($cgi->param('prefs_submit'));
- my $pwd_change = 0;
- my $mail_change = 0;
+ if($submitted) {
+ my $mail = $cgi->param( 'MAIL' );
+ my $firstname = Encode::decode_utf8( $cgi->param( 'FIRSTNAME' ) );
+ my $lastname = Encode::decode_utf8( $cgi->param( 'LASTNAME' ) );
+ my $city = Encode::decode_utf8( $cgi->param( 'CITY' ) );
+ my $zipcode = Encode::decode_utf8( $cgi->param( 'ZIPCODE' ) );
+ my $country = Encode::decode_utf8( $cgi->param( 'COUNTRY' ) );
+ my $address = Encode::decode_utf8( $cgi->param( 'ADDRESS' ) );
+ my $pass1 = $cgi->param( 'PASSWORD1' );
+ my $pass2 = $cgi->param( 'PASSWORD2' );
- # Checks data and perform requested modifications
- $panel->add_cookie( CGI->cookie( -name=>'theme', -value=>$theme, -expires=>'+10y' ) );
- Vhffs::Panel::User::set_theme( $user, $theme );
+ my $theme = $cgi->param( 'THEME' );
+ my $lang = $cgi->param( 'LANG' );
+ my $shell = $cgi->param( 'SHELL' );
- $panel->add_cookie( CGI->cookie( -name=>'language', -value=>$lang, -expires=>'+10y' ) );
- Vhffs::Panel::User::set_lang( $user, $lang );
+ my $pwd_change = 0;
+ my $mail_change = 0;
+ if( $userp->{uid} == $user->{uid} ) {
+ # Checks data and perform requested modifications
+ $panel->add_cookie( CGI->cookie( -name=>'theme', -value=>$theme, -expires=>'+10y' ) );
+ Vhffs::Panel::User::set_theme( $user, $theme );
-# Commit all the changes for the current user
-if( ( ! defined $firstname ) || ( ! defined $lastname ) || ( ! defined $city ) || ( ! defined $mail ) || ( ! defined $zipcode ) || ( ! defined $country ) || ( ! defined $address ) || ( ! defined $shell ) ) {
- $panel->add_error( gettext( "CGI Error!" ) );
-} else {
- # We don't really care about what user use as firstname, lastname, ... we just
- # want it not to break everything
- if( $firstname !~ /^[^<">]+$/ ) {
- $panel->add_error( gettext( 'Firstname is not correct !') );
- }
- if( $lastname !~ /^[^<">]+$/ ) {
- $panel->add_error( gettext( 'Lastname is not correct !') );
- }
- if( $city !~ /^[^<">]+$/ ) {
- $panel->add_error( gettext( 'City is not correct !') );
- }
- if( ! Vhffs::Functions::valid_mail($mail) ) {
- $panel->add_error( gettext( 'Email is not correct !') );
- }
- if( ! ( $zipcode =~ /^[\w\d\s\-]+$/ ) ) {
- $panel->add_error( gettext( "Zipcode is not correct !" ) );
- }
- if( $country !~ /^[^<">]+$/ ) {
- $panel->add_error( gettext( 'Country is not correct !') );
- }
- if( $address !~ /^[^<">]+$/ ) {
- $panel->add_error( gettext( 'Address is not correct !') );
- }
- if( $pass1 ne $pass2 ) {
- $panel->add_error( gettext( "Passwords don't match" ) );
- }
- if( $user->have_activegroups > 0 ) {
- my $valid=0;
- foreach( Vhffs::Panel::User::list_shells( $vhffs ) ) {
- $valid = 1 if($shell eq $_);
- }
- unless( $valid ) {
- $panel->add_error( gettext( "Wanted shell is not in the shell list" ) );
- }
- }
- else {
- $shell = Vhffs::Panel::User::default_shell( $ vhffs );
- }
- if(! $panel->has_errors) {
- $user->set_firstname( $firstname );
- $user->set_lastname( $lastname );
- $user->set_city( $city );
- $user->set_zipcode( $zipcode );
- $user->set_country( $country );
- $user->set_address( $address );
- $user->set_shell( $shell );
+ $panel->add_cookie( CGI->cookie( -name=>'language', -value=>$lang, -expires=>'+10y' ) );
+ Vhffs::Panel::User::set_lang( $user, $lang );
+ }
- if( ( length( $pass1 ) > 1 ) && ( $pass1 eq $pass2 ) ) {
- $pwd_change = 1;
- $user->set_password( $pass1 );
- $panel->add_info( gettext('Password changed') );
+ # Commit all the changes for the current user
+ unless( defined $firstname && defined $lastname && defined $city && defined $mail && defined $zipcode && defined $country && defined $address && defined $shell ) {
+ $panel->add_error( gettext( 'CGI Error!' ) );
+ }
+ else {
+ # We don't really care about what user use as firstname, lastname, ... we just
+ # want it not to break everything
+ if( $firstname !~ /^[^<">]+$/ ) {
+ $panel->add_error( gettext( 'Firstname is not correct !') );
+ }
+ if( $lastname !~ /^[^<">]+$/ ) {
+ $panel->add_error( gettext( 'Lastname is not correct !') );
+ }
+ if( $city !~ /^[^<">]+$/ ) {
+ $panel->add_error( gettext( 'City is not correct !') );
+ }
+ if( ! Vhffs::Functions::valid_mail($mail) ) {
+ $panel->add_error( gettext( 'Email is not correct !') );
+ }
+ if( ! ( $zipcode =~ /^[\w\d\s\-]+$/ ) ) {
+ $panel->add_error( gettext( "Zipcode is not correct !" ) );
+ }
+ if( $country !~ /^[^<">]+$/ ) {
+ $panel->add_error( gettext( 'Country is not correct !') );
+ }
+ if( $address !~ /^[^<">]+$/ ) {
+ $panel->add_error( gettext( 'Address is not correct !') );
+ }
+ if( $pass1 ne $pass2 ) {
+ $panel->add_error( gettext( "Passwords don't match" ) );
+ }
+ if( $userp->have_activegroups > 0 ) {
+ my $valid=0;
+ foreach( Vhffs::Panel::User::list_shells( $vhffs ) ) {
+ $valid = 1 if($shell eq $_);
+ }
+ unless( $valid ) {
+ $panel->add_error( gettext( 'Wanted shell is not in the shell list' ) );
+ }
+ }
+ else {
+ $shell = Vhffs::Panel::User::default_shell( $ vhffs );
+ }
- my $mu = init Vhffs::Services::MailUser( $vhffs , $user );
- if( defined $mu && $mu->exists_box) {
- $mu->changepassword( $pass1 );
- }
- }
+ if(! $panel->has_errors) {
+ $userp->set_firstname( $firstname );
+ $userp->set_lastname( $lastname );
+ $userp->set_city( $city );
+ $userp->set_zipcode( $zipcode );
+ $userp->set_country( $country );
+ $userp->set_address( $address );
+ $userp->set_shell( $shell );
- my $prevmail = $user->get_mail();
- if( $prevmail ne $mail ) {
- $mail_change = 1;
- $user->set_mail( $mail );
- my $subject = gettext("Mailbox modified");
- my $content = sprintf( gettext("Hello %s %s,\n\nYou changed your email, here are your new personal information :\n\nUser: %s\nMail: %s\n\nVHFFS administrators\n"), $user->get_firstname, $user->get_lastname, $user->get_username, $user->get_mail);
- $user->send_mail_user( $subject, $content );
- $panel->add_info( gettext('Email address changed') );
- }
+ if( ( length( $pass1 ) > 1 ) && ( $pass1 eq $pass2 ) ) {
+ $pwd_change = 1;
+ $userp->set_password( $pass1 );
+ $panel->add_info( gettext('Password changed') );
- if( $user->commit < 0 ) {
- $panel->clear_infos();
- $panel->add_error( gettext("An error occured while updating the user account") );
- }
+ my $mu = init Vhffs::Services::MailUser( $vhffs , $userp );
+ if( defined $mu && $mu->exists_box) {
+ $mu->changepassword( $pass1 );
+ }
+ }
+ my $prevmail = $userp->get_mail();
+ if( $prevmail ne $mail ) {
+ $mail_change = 1;
+ $userp->set_mail( $mail );
+ my $subject = gettext("Mailbox modified");
+ my $content = sprintf( gettext("Hello %s %s,\n\nYou changed your email, here are your new personal information :\n\nUser: %s\nMail: %s\n\nVHFFS administrators\n"), $userp->get_firstname, $userp->get_lastname, $userp->get_username, $userp->get_mail);
+ $userp->send_mail_user( $subject, $content );
+ $panel->add_info( gettext('Email address changed') );
+ }
- # -- Mail User
- my $mu = init Vhffs::Services::MailUser( $vhffs , $user );
- if( defined $mu ) {
+ if( $userp->commit < 0 ) {
+ $panel->clear_infos();
+ $panel->add_error( gettext('An error occured while updating the user account') );
+ }
- my $mail_activate = $cgi->param( "mail_activate" );
- my $nospam = $cgi->param( "mail_nospam" );
- my $novirus = $cgi->param( "mail_novirus" );
- $nospam = (( defined $nospam ) && ( $nospam eq "on" ));
- $novirus = ( ( defined $novirus ) && ( $novirus eq "on" ) );
+ # -- Mail User
+ my $mu = init Vhffs::Services::MailUser( $vhffs , $userp );
+ if( defined $mu ) {
+
+ my $mail_activate = $cgi->param( "mail_activate" );
+ my $nospam = $cgi->param( "mail_nospam" );
+ my $novirus = $cgi->param( "mail_novirus" );
+ $nospam = (( defined $nospam ) && ( $nospam eq "on" ));
+ $novirus = ( ( defined $novirus ) && ( $novirus eq "on" ) );
- if( ( defined $mail_activate ) && ( $mail_activate eq "on" ) ) {
- my $usage = $cgi->param( "mail_usage" );
- if( ! defined $usage ) {
- $panel->add_error( gettext("You must choose a method for your mail") );
- } elsif( $usage == 1 ) {
- #Delete forward if necessary
- #In this case, we treat for popable accounts
- if( $mu->exists_box == 0 ) {
- # Box doesn't exists, need a password
- if( $pwd_change == 0 ) {
- $panel->add_error( gettext("Error ! You MUST provide a password in your account when you create your popable account") );
- } else {
- #del forward if needed
- $mu->delforward;
- if( $mu->addbox($pass1 ) < 0 ) {
- $panel->add_error( gettext("An error occured while adding the box") );
- } elsif( $nospam && ( $mu->change_spam_status < 0 ) ) {
- $panel->add_error( gettext("An error occured while adding the box (anti-spam adding)") );
- } elsif( $novirus && ( $mu->change_virus_status < 0 ) ) {
- $panel->add_error( gettext("An error occured while adding the box (anti-virus adding)") );
- } else {
- $panel->add_info( gettext("Mailbox successfully added") );
- }
- }
- } else {
- #Box already exists
- # The user changed his password, we must update password for mail
- if( $pwd_change ) {
- $mu->changepassword( $pass1);
- }
+ if( ( defined $mail_activate ) && ( $mail_activate eq "on" ) ) {
+ my $usage = $cgi->param( "mail_usage" );
+ if( ! defined $usage ) {
+ $panel->add_error( gettext("You must choose a method for your mail") );
+ }
+ elsif( $usage == 1 ) {
+ #Delete forward if necessary
+ #In this case, we treat for popable accounts
+ if( $mu->exists_box == 0 ) {
+ # Box doesn't exists, need a password
+ if( $pwd_change == 0 ) {
+ $panel->add_error( gettext("Error ! You MUST provide a password in your account when you create your popable account") );
+ } else {
+ # Del forward if needed
+ $mu->delforward;
+ if( $mu->addbox($pass1 ) < 0 ) {
+ $panel->add_error( gettext("An error occured while adding the box") );
+ } elsif( $nospam && ( $mu->change_spam_status < 0 ) ) {
+ $panel->add_error( gettext("An error occured while adding the box (anti-spam adding)") );
+ } elsif( $novirus && ( $mu->change_virus_status < 0 ) ) {
+ $panel->add_error( gettext("An error occured while adding the box (anti-virus adding)") );
+ } else {
+ $panel->add_info( gettext("Mailbox successfully added") );
+ }
+ }
+ } else {
+ #Box already exists
+ # The user changed his password, we must update password for mail
+ if( $pwd_change ) {
+ $mu->changepassword( $pass1);
+ }
- # We change the spam status. if the spam status changed
- if( $vhffs->get_config->get_service('mail')->{'use_nospam'} eq 'yes' ) {
- if( $nospam != $mu->use_nospam ) {
- if( $mu->change_spam_status == 1 ) {
- $panel->add_info( gettext( "Change spam protection status for your account\n" ) );
- } else {
- $panel->add_error( gettext( "Error for spam protection\n" ) );
- }
- }
- }
+ # We change the spam status. if the spam status changed
+ if( $vhffs->get_config->get_service('mail')->{'use_nospam'} eq 'yes' ) {
+ if( $nospam != $mu->use_nospam ) {
+ if( $mu->change_spam_status == 1 ) {
+ $panel->add_info( gettext( "Change spam protection status for your account\n" ) );
+ } else {
+ $panel->add_error( gettext( "Error for spam protection\n" ) );
+ }
+ }
+ }
- # As spam, the virus status changes only if the user changed values
- if( $vhffs->get_config->get_service('mail')->{'use_novirus'} eq 'yes' ) {
- if( $novirus != $mu->use_novirus ) {
- if( $mu->change_virus_status == 1 ) {
- $panel->add_info( gettext( "Changed anti-virus status for your account\n" ) );
- } else {
- $panel->add_error( gettext( "Error for virus protection\n" ) );
- }
- }
- }
- }
- } elsif( $usage == 2 ) {
- #Here, we create the forward
- my $ad = $user->get_mail;
- if( $mu->exists_forward == 0 ) {
- if( ! defined $ad ) {
- $panel->add_error( gettext("There is a problem with the address you filled in your profile, unable to add forwarding") );
- } else {
- #Delete the box if necessary
- $mu->delbox;
- if( $mu->addforward( $user->get_mail ) < 0) {
- $panel->add_error( gettext("An error occured while adding the forwarding") );
- } else {
- $panel->add_info( gettext('Forward added') );
+ # As spam, the virus status changes only if the user changed values
+ if( $vhffs->get_config->get_service('mail')->{'use_novirus'} eq 'yes' ) {
+ if( $novirus != $mu->use_novirus ) {
+ if( $mu->change_virus_status == 1 ) {
+ $panel->add_info( gettext( "Changed anti-virus status for your account\n" ) );
+ } else {
+ $panel->add_error( gettext( "Error for virus protection\n" ) );
+ }
+ }
+ }
+ }
+ }
+ elsif( $usage == 2 ) {
+ #Here, we create the forward
+ my $ad = $userp->get_mail;
+ if( $mu->exists_forward == 0 ) {
+ if( ! defined $ad ) {
+ $panel->add_error( gettext("There is a problem with the address you filled in your profile, unable to add forwarding") );
+ } else {
+ # Delete the box if necessary
+ $mu->delbox;
+ if( $mu->addforward( $userp->get_mail ) < 0) {
+ $panel->add_error( gettext("An error occured while adding the forwarding") );
+ } else {
+ $panel->add_info( gettext('Forward added') );
+ }
+ }
+ }
+ elsif( $mail_change == 1 ) {
+ $mu->delforward;
+ if( $mu->addforward( $mail ) < 0 ) {
+ $panel->add_error( gettext("An error occured while the forwarding") );
+ } else {
+ $panel->add_info( gettext('Forward updated') );
+ }
+ }
+ }
+ } elsif($mu->exists_box || $mu->exists_forward) {
+ $panel->add_info( gettext('Mail deleted') );
+ # User doesn't want mail anymore
+ $mu->delbox;
+ $mu->delforward;
+ }
}
}
- } elsif( $mail_change ==1 ) {
- $mu->delforward;
- if( $mu->addforward( $mail ) < 0 ) {
- $panel->add_error( gettext("An error occured while the forwarding") );
- } else {
- $panel->add_info( gettext('Forward updated') );
- }
- }
- }
- } elsif($mu->exists_box || $mu->exists_forward) {
- $panel->add_info( gettext('Mail deleted') );
- # User doesn't want mail anymore
- $mu->delbox;
- $mu->delforward;
- }
- }
- }
-}
-} # if($submitted)
+ }
+ } # if($submitted)
-my $username = $user->get_username();
-my $usermail = $user->get_mail();
+ $panel->set_title( gettext("User Preferences") );
-$panel->set_title( gettext("User Preferences") );
+ $template = new HTML::Template( filename => $templatedir."/panel/user/prefs.tmpl" );
-my $templatedir = $vhffs->get_config->get_templatedir;
-my $template = new HTML::Template( filename => $templatedir."/panel/user/prefs.tmpl" );
+ $template->param( TEXT_USERNAME => gettext("Username") );
+ $template->param( TEXT_MAIL => gettext("mail") );
+ $template->param( TEXT_FIRSTNAME => gettext("Firstname") );
+ $template->param( TEXT_LASTNAME => gettext("Lastname") );
+ $template->param( TEXT_ZIPCODE => gettext("Zipcode") );
+ $template->param( TEXT_CITY => gettext("City") );
+ $template->param( TEXT_ADDRESS => gettext("Address") );
+ $template->param( TEXT_COUNTRY => gettext("Country") );
+ $template->param( TEXT_PASSWORD1 => gettext("Password") );
+ $template->param( TEXT_PASSWORD2 => gettext("Confirm Password") );
+ $template->param( TEXT_LANG => gettext("Language") );
+ $template->param( TEXT_THEME => gettext("Theme") );
+ $template->param( TEXT_SHELL => gettext("Shell") );
+ $template->param( TEXT_SEND => gettext("Modify") );
-$template->param( TEXT_USERNAME => gettext("Username") );
-$template->param( TEXT_MAIL => gettext("mail") );
-$template->param( TEXT_FIRSTNAME => gettext("Firstname") );
-$template->param( TEXT_LASTNAME => gettext("Lastname") );
-$template->param( TEXT_ZIPCODE => gettext("Zipcode") );
-$template->param( TEXT_CITY => gettext("City") );
-$template->param( TEXT_ADDRESS => gettext("Address") );
-$template->param( TEXT_COUNTRY => gettext("Country") );
-$template->param( TEXT_PASSWORD1 => gettext("Password") );
-$template->param( TEXT_PASSWORD2 => gettext("Confirm Password") );
-$template->param( TEXT_LANG => gettext("Language") );
-$template->param( TEXT_THEME => gettext("Theme") );
-$template->param( TEXT_SHELL => gettext("Shell") );
-$template->param( TEXT_SEND => gettext("Modify") );
+ $template->param( VALUE_USERNAME => $userp->get_username );
+ $template->param( VALUE_MAIL => $userp->get_mail );
+ $template->param( VALUE_FIRSTNAME => $userp->get_firstname );
+ $template->param( VALUE_LASTNAME => $userp->get_lastname );
+ $template->param( VALUE_ZIPCODE => $userp->get_zipcode );
+ $template->param( VALUE_CITY => $userp->get_city );
+ $template->param( VALUE_ADDRESS => $userp->get_address );
+ $template->param( VALUE_COUNTRY => $userp->get_country );
-$template->param( VALUE_USERNAME => $user->get_username );
-$template->param( VALUE_MAIL => $user->get_mail );
-$template->param( VALUE_FIRSTNAME => $user->get_firstname );
-$template->param( VALUE_LASTNAME => $user->get_lastname );
-$template->param( VALUE_ZIPCODE => $user->get_zipcode );
-$template->param( VALUE_CITY => $user->get_city );
-$template->param( VALUE_ADDRESS => $user->get_address );
-$template->param( VALUE_COUNTRY => $user->get_country );
+ $template->param( TEXT_DELETE_USER => gettext("Delete YOUR user") );
+ $template->param( TEXT_BEFORE_DELETE => gettext("This action is non-reversible. WHEN YOU DELETE IT, YOU CANNOT CANCEL.") );
+ $template->param( ASK_DELETE_USER => gettext("Are you SURE you want DELETE this user?") );
+ $template->param( YES => gettext("Yes I'm sure of what I do") );
+ $template->param( NO => gettext("No, I'm not sure, I prefer to keep it.") );
+ $template->param( TEXT_DELETE => gettext("Delete") );
-$template->param( TEXT_DELETE_USER => gettext("Delete YOUR user") );
-$template->param( TEXT_BEFORE_DELETE => gettext("This action is non-reversible. WHEN YOU DELETE IT, YOU CANNOT CANCEL.") );
-$template->param( ASK_DELETE_USER => gettext("Are you SURE you want DELETE this user?") );
-$template->param( YES => gettext("Yes I'm sure of what I do") );
-$template->param( NO => gettext("No, I'm not sure, I prefer to keep it.") );
-$template->param( TEXT_DELETE => gettext("Delete") );
+ if( $panel->use_users_avatars ) {
-if( $panel->use_users_avatars ) {
+ my $ta = new HTML::Template( filename => $templatedir."/panel/user/prefs_avatar.tmpl" );
- my $ta = new HTML::Template( filename => $templatedir."/panel/user/prefs_avatar.tmpl" );
+ $ta->param( SEND_AVATAR => gettext("Send my avatar") );
+ $ta->param( CURRENT_AVATAR => gettext("Current avatar") );
+ $ta->param( TEXT_AVATAR => gettext("Send my avatar") );
+ $ta->param( EXPLAIN_AVATAR => gettext("The avatar is a pictures that describes you. You can upload an PNG image and use it as avatar. This image will then appear in the public section.") );
+ $ta->param( VALUE_OID => $userp->get_oid );
- $ta->param( SEND_AVATAR => gettext("Send my avatar") );
- $ta->param( CURRENT_AVATAR => gettext("Current avatar") );
- $ta->param( TEXT_AVATAR => gettext("Send my avatar") );
- $ta->param( EXPLAIN_AVATAR => gettext("The avatar is a pictures that describes you. You can upload an PNG image and use it as avatar. This image will then appear in the public section.") );
- $ta->param( VALUE_OID => $user->get_oid );
-
- $template->param( AVATAR => $ta->output );
-}
-
-
-# themes
-
-my @themes = Vhffs::Panel::Main::list_themes( $vhffs );
-my $curtheme = Vhffs::Panel::User::get_theme( $user );
-my $themelist;
-foreach( @themes )
-{
- if($curtheme ne $_)
- {
- $themelist .= "<option value=\"".$_."\">".$_."</option>\n";
+ $template->param( AVATAR => $ta->output );
}
- else
- {
- $themelist .= "<option value=\"".$_."\" selected=\"selected\">".$_."</option>\n";
- }
-}
-$template->param( THEME_LIST => $themelist );
-
-# languages
-
-my @langs = Vhffs::Panel::Main::list_languages( $vhffs );
-my $curlang = Vhffs::Panel::User::get_lang( $user );
-my $langlist;
-foreach( @langs ) {
- if($curlang ne $_) {
- $langlist .= "<option value=\"".$_."\">".$_."</option>\n";
- } else {
- $langlist .= "<option value=\"".$_."\" selected=\"selected\">".$_."</option>\n";
- }
-}
-$template->param( LANG_LIST => $langlist );
-
-
-# shells
-
-if( $user->have_activegroups > 0 ) {
- my @shells = Vhffs::Panel::User::list_shells( $vhffs );
- my $curshell = Vhffs::Panel::User::get_shell( $user );
- my $shelllist = "";
- foreach( @shells )
+ # themes
+ my @themes = Vhffs::Panel::Main::list_themes( $vhffs );
+ my $curtheme = Vhffs::Panel::User::get_theme( $userp );
+ my $themelist;
+ foreach( @themes )
{
- if($curshell ne $_)
+ if($curtheme ne $_)
{
- $shelllist .= "<option value=\"".$_."\">".$_."</option>\n";
+ $themelist .= "<option value=\"".$_."\">".$_."</option>\n";
}
else
{
- $shelllist .= "<option value=\"".$_."\" selected=\"selected\">".$_."</option>\n";
+ $themelist .= "<option value=\"".$_."\" selected=\"selected\">".$_."</option>\n";
}
}
- $template->param( SHELL_LIST => $shelllist );
-}
-else {
- my $defaultshell = Vhffs::Panel::User::default_shell( $vhffs );
- $template->param( SHELL_LIST => "<option value=\"".$defaultshell."\" selected=\"selected\">".$defaultshell."</option>\n" );
-}
+ $template->param( THEME_LIST => $themelist );
+ # languages
+ my @langs = Vhffs::Panel::Main::list_languages( $vhffs );
+ my $curlang = Vhffs::Panel::User::get_lang( $userp );
+ my $langlist;
+ foreach( @langs ) {
+ if($curlang ne $_) {
+ $langlist .= "<option value=\"".$_."\">".$_."</option>\n";
+ } else {
+ $langlist .= "<option value=\"".$_."\" selected=\"selected\">".$_."</option>\n";
+ }
+ }
+ $template->param( LANG_LIST => $langlist );
+ # shells
+ if( $userp->have_activegroups > 0 ) {
+ my @shells = Vhffs::Panel::User::list_shells( $vhffs );
+ my $curshell = Vhffs::Panel::User::get_shell( $userp );
+ my $shelllist = "";
+ foreach( @shells )
+ {
+ if($curshell ne $_)
+ {
+ $shelllist .= "<option value=\"".$_."\">".$_."</option>\n";
+ }
+ else
+ {
+ $shelllist .= "<option value=\"".$_."\" selected=\"selected\">".$_."</option>\n";
+ }
+ }
+ $template->param( SHELL_LIST => $shelllist );
+ }
+ else {
+ my $defaultshell = Vhffs::Panel::User::default_shell( $vhffs );
+ $template->param( SHELL_LIST => "<option value=\"".$defaultshell."\" selected=\"selected\">".$defaultshell."</option>\n" );
+ }
-my $mu = init Vhffs::Services::MailUser( $vhffs , $user );
-if( defined $mu ) {
+ my $mu = init Vhffs::Services::MailUser( $vhffs , $userp );
+ if( defined $mu ) {
- my $subtemplate = new HTML::Template( filename => $templatedir.'/panel/user/mailuser.tmpl' );
- my $config = $vhffs->get_config->get_service( 'mailuser' );
+ my $subtemplate = new HTML::Template( filename => $templatedir.'/panel/user/mailuser.tmpl' );
+ my $config = $vhffs->get_config->get_service( 'mailuser' );
- #nothing, a forward, or a box but activated
- if( !$mu->exists || $mu->exists_forward || ( $mu->exists_box && $mu->get_box_status == Vhffs::Constants::ACTIVATED ) ) {
- my $tmp = '';
+ #nothing, a forward, or a box but activated
+ if( !$mu->exists || $mu->exists_forward || ( $mu->exists_box && $mu->get_box_status == Vhffs::Constants::ACTIVATED ) ) {
+ my $tmp = '';
- $subtemplate->param( ACTIV_CHECKED => 1 ) if( $mu->exists == 1 );
- $subtemplate->param( POP_CHECKED => 1 ) if( $mu->exists_box == 1 && $mu->exists_forward == 0 );
- $subtemplate->param( FWD_CHECKED => 1 ) if( $mu->exists_forward == 1 );
- $subtemplate->param( TEXT_MAILACTIV => sprintf( gettext("Activate %s\@%s email"), $username, $config->{domain}) );
- $subtemplate->param( TEXT_MAILINFO2 => gettext("There is two possible usages :") );
- $subtemplate->param( TEXT_MAILBOX => sprintf( gettext("Use VHFFS servers to manage this mail,<br/>you should use use the host pop.%s or imap.%s to fetch your mails") , $config->{domain} , $config->{domain} ) );
- $subtemplate->param( TEXT_MAILFORWARD => sprintf( gettext("Forward emails from %s\@%s to %s"), $username, $config->{domain}, $usermail ) );
+ $subtemplate->param( ACTIV_CHECKED => 1 ) if( $mu->exists == 1 );
+ $subtemplate->param( POP_CHECKED => 1 ) if( $mu->exists_box == 1 && $mu->exists_forward == 0 );
+ $subtemplate->param( FWD_CHECKED => 1 ) if( $mu->exists_forward == 1 );
+ $subtemplate->param( TEXT_MAILACTIV => sprintf( gettext("Activate %s\@%s email"), $userp->get_username, $config->{domain}) );
+ $subtemplate->param( TEXT_MAILINFO2 => gettext("There is two possible usages :") );
+ $subtemplate->param( TEXT_MAILBOX => sprintf( gettext("Use VHFFS servers to manage this mail,<br/>you should use use the host pop.%s or imap.%s to fetch your mails") , $config->{domain} , $config->{domain} ) );
+ $subtemplate->param( TEXT_MAILFORWARD => sprintf( gettext("Forward emails from %s\@%s to %s"), $userp->get_username, $config->{domain}, $userp->get_mail ) );
- if( defined ( my $url = $config->{'url_doc'} ) ) {
- $template->param( HELP_TEXT => gettext('Help') );
- $template->param( HELP_URL => $url );
- }
+ if( defined ( my $url = $config->{'url_doc'} ) ) {
+ $template->param( HELP_TEXT => gettext('Help') );
+ $template->param( HELP_URL => $url );
+ }
- if( $vhffs->get_config->get_service('mail')->{'use_nospam'} eq 'yes' )
- {
- my $subtemplate2 = new HTML::Template( filename => $templatedir.'/panel/user/mailuserspam.tmpl' );
- $subtemplate2->param( TEXT_NOSPAM => gettext("Use anti-spam protection") );
- $subtemplate2->param( ACTIV_CHECKED => "checked" ) if( $mu->use_nospam == 1 );
- $tmp .= $subtemplate2->output;
+ if( $vhffs->get_config->get_service('mail')->{'use_nospam'} eq 'yes' )
+ {
+ my $subtemplate2 = new HTML::Template( filename => $templatedir.'/panel/user/mailuserspam.tmpl' );
+ $subtemplate2->param( TEXT_NOSPAM => gettext("Use anti-spam protection") );
+ $subtemplate2->param( ACTIV_CHECKED => "checked" ) if( $mu->use_nospam == 1 );
+ $tmp .= $subtemplate2->output;
+ }
+
+ if( $vhffs->get_config->get_service('mail')->{'use_novirus'} eq 'yes' )
+ {
+ my $subtemplate2 = new HTML::Template( filename => $templatedir.'/panel/user/mailuservirus.tmpl' );
+ $subtemplate2->param( TEXT_VIRUS => gettext("Use anti-virus protection") );
+ $subtemplate2->param( ACTIV_CHECKED => "checked" ) if( $mu->use_novirus == 1 );
+ $tmp .= $subtemplate2->output;
+ }
+
+ $subtemplate->param( MAILUSER_OPTIONS => $tmp );
}
+ else {
+ $subtemplate->param( STATUSSTR => Vhffs::Functions::status_string_from_status_id( $mu->get_box_status ) );
+ }
- if( $vhffs->get_config->get_service('mail')->{'use_novirus'} eq 'yes' )
- {
- my $subtemplate2 = new HTML::Template( filename => $templatedir.'/panel/user/mailuservirus.tmpl' );
- $subtemplate2->param( TEXT_VIRUS => gettext("Use anti-virus protection") );
- $subtemplate2->param( ACTIV_CHECKED => "checked" ) if( $mu->use_novirus == 1 );
- $tmp .= $subtemplate2->output;
- }
-
- $subtemplate->param( MAILUSER_OPTIONS => $tmp );
+ $subtemplate->param( TEXT_LEGEND => sprintf( gettext("We offer you the possibility to have one email box on the domain %s") , $config->{domain}) );
+ $template->param( MAILUSER => $subtemplate->output );
}
- else {
- $subtemplate->param( STATUSSTR => Vhffs::Functions::status_string_from_status_id( $mu->get_box_status ) );
- }
- $subtemplate->param( TEXT_LEGEND => sprintf( gettext("We offer you the possibility to have one email box on the domain %s") , $config->{domain}) );
- $template->param( MAILUSER => $subtemplate->output );
+ $template->param( ADMIN_PART => Vhffs::Panel::Object::admin_part( $panel, $userp )->output );
}
$panel->build( $template );