[vhffs-dev] [632] Fixed bugs #199 & #200.

[subversion@xxxxxxxxx]

Revision: 632
Author:   beuss
Date:     2007-05-30 06:47:42 +0000 (Wed, 30 May 2007)

Log Message:
-----------
Fixed bugs #199 & #200.

Modified Paths:
--------------
    trunk/vhffs-api/src/Vhffs/Panel/Cvs.pm
    trunk/vhffs-api/src/Vhffs/Panel/DNS.pm
    trunk/vhffs-api/src/Vhffs/Panel/Mail.pm
    trunk/vhffs-api/src/Vhffs/Panel/Mailinglist.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/Web.pm
    trunk/vhffs-intl/src/fr.po


Modified: trunk/vhffs-api/src/Vhffs/Panel/Cvs.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Cvs.pm	2007-05-29 15:26:04 UTC (rev 631)
+++ trunk/vhffs-api/src/Vhffs/Panel/Cvs.pm	2007-05-30 06:47:42 UTC (rev 632)
@@ -119,7 +119,7 @@
     my ( $main, $gid ) = @_;
 
     my $dbh = $main->get_db_object;
-    my $sql = 'SELECT c.object_id AS oid, c.cvsroot AS displayname, o.state FROM vhffs_cvs c INNER JOIN vhffs_object o ON c.object_id = o.object_id WHERE c.owner_gid = ?';
+    my $sql = 'SELECT c.object_id AS oid, c.cvsroot AS displayname, o.state FROM vhffs_cvs c INNER JOIN vhffs_object o ON c.object_id = o.object_id WHERE c.owner_gid = ? ORDER BY c.cvsroot';
     my $sth = $dbh->prepare($sql) or return -1;
     $sth->execute($gid) or return -2;
     my $cvs = [];

Modified: trunk/vhffs-api/src/Vhffs/Panel/DNS.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/DNS.pm	2007-05-29 15:26:04 UTC (rev 631)
+++ trunk/vhffs-api/src/Vhffs/Panel/DNS.pm	2007-05-30 06:47:42 UTC (rev 632)
@@ -137,7 +137,7 @@
     my ( $main, $gid ) = @_;
 
     my $dbh = $main->get_db_object;
-    my $sql = 'SELECT ns.object_id AS oid, ns.domain AS displayname, o.state FROM vhffs_dns ns INNER JOIN vhffs_object o ON ns.object_id = o.object_id WHERE ns.owner_gid = ?';
+    my $sql = 'SELECT ns.object_id AS oid, ns.domain AS displayname, o.state FROM vhffs_dns ns INNER JOIN vhffs_object o ON ns.object_id = o.object_id WHERE ns.owner_gid = ? ORDER BY ns.domain';
     my $sth = $dbh->prepare($sql) or return -1;
     $sth->execute($gid) or return -2;
     my $dns = [];

Modified: trunk/vhffs-api/src/Vhffs/Panel/Mail.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Mail.pm	2007-05-29 15:26:04 UTC (rev 631)
+++ trunk/vhffs-api/src/Vhffs/Panel/Mail.pm	2007-05-30 06:47:42 UTC (rev 632)
@@ -102,7 +102,7 @@
     my ( $main, $gid ) = @_;
 
     my $dbh = $main->get_db_object;
-    my $sql = 'SELECT m.object_id AS oid, m.domain AS displayname, o.state FROM vhffs_mxdomain m INNER JOIN vhffs_object o ON m.object_id = o.object_id WHERE m.owner_gid = ?';
+    my $sql = 'SELECT m.object_id AS oid, m.domain AS displayname, o.state FROM vhffs_mxdomain m INNER JOIN vhffs_object o ON m.object_id = o.object_id WHERE m.owner_gid = ? ORDER BY m.domain';
     my $sth = $dbh->prepare($sql) or return -1;
     $sth->execute($gid) or return -2;
     my $mails = [];

Modified: trunk/vhffs-api/src/Vhffs/Panel/Mailinglist.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Mailinglist.pm	2007-05-29 15:26:04 UTC (rev 631)
+++ trunk/vhffs-api/src/Vhffs/Panel/Mailinglist.pm	2007-05-30 06:47:42 UTC (rev 632)
@@ -101,7 +101,7 @@
     my ( $main, $gid ) = @_;
 
     my $dbh = $main->get_db_object;
-    my $sql = 'SELECT l.object_id AS oid, l.local_part || \'@\' || l.domain AS displayname, o.state FROM vhffs_ml l INNER JOIN vhffs_object o ON l.object_id = o.object_id WHERE l.owner_gid = ?';
+    my $sql = 'SELECT l.object_id AS oid, l.local_part || \'@\' || l.domain AS displayname, o.state FROM vhffs_ml l INNER JOIN vhffs_object o ON l.object_id = o.object_id WHERE l.owner_gid = ? ORDER BY l.local_part, l.domain';
     my $sth = $dbh->prepare($sql) or return -1;
     $sth->execute($gid) or return -2;
     my $mls = [];

Modified: trunk/vhffs-api/src/Vhffs/Panel/Mysql.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Mysql.pm	2007-05-29 15:26:04 UTC (rev 631)
+++ trunk/vhffs-api/src/Vhffs/Panel/Mysql.pm	2007-05-30 06:47:42 UTC (rev 632)
@@ -135,7 +135,7 @@
     my ( $main, $gid ) = @_;
 
     my $dbh = $main->get_db_object;
-    my $sql = 'SELECT m.object_id AS oid, m.dbname AS displayname, o.state FROM vhffs_mysql m INNER JOIN vhffs_object o ON m.object_id = o.object_id WHERE m.owner_gid = ?';
+    my $sql = 'SELECT m.object_id AS oid, m.dbname AS displayname, o.state FROM vhffs_mysql m INNER JOIN vhffs_object o ON m.object_id = o.object_id WHERE m.owner_gid = ? ORDER BY m.dbname';
     my $sth = $dbh->prepare($sql) or return -1;
     $sth->execute($gid) or return -2;
     my $mysql = [];

Modified: trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm	2007-05-29 15:26:04 UTC (rev 631)
+++ trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm	2007-05-30 06:47:42 UTC (rev 632)
@@ -102,7 +102,7 @@
     my ( $main, $gid ) = @_;
 
     my $dbh = $main->get_db_object;
-    my $sql = 'SELECT p.object_id AS oid, p.dbname AS displayname, o.state FROM vhffs_pgsql p INNER JOIN vhffs_object o ON p.object_id = o.object_id WHERE p.owner_gid = ?';
+    my $sql = 'SELECT p.object_id AS oid, p.dbname AS displayname, o.state FROM vhffs_pgsql p INNER JOIN vhffs_object o ON p.object_id = o.object_id WHERE p.owner_gid = ? ORDER BY p.dbname';
     my $sth = $dbh->prepare($sql) or return -1;
     $sth->execute($gid) or return -2;
     my $pgsql = [];

Modified: trunk/vhffs-api/src/Vhffs/Panel/Repository.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Repository.pm	2007-05-29 15:26:04 UTC (rev 631)
+++ trunk/vhffs-api/src/Vhffs/Panel/Repository.pm	2007-05-30 06:47:42 UTC (rev 632)
@@ -74,7 +74,7 @@
     my ( $main, $gid ) = @_;
 
     my $dbh = $main->get_db_object;
-    my $sql = 'SELECT r.object_id AS oid, r.name AS displayname, o.state FROM vhffs_repository r INNER JOIN vhffs_object o ON r.object_id = o.object_id WHERE r.owner_gid = ?';
+    my $sql = 'SELECT r.object_id AS oid, r.name AS displayname, o.state FROM vhffs_repository r INNER JOIN vhffs_object o ON r.object_id = o.object_id WHERE r.owner_gid = ? ORDER BY r.name';
     my $sth = $dbh->prepare($sql) or return -1;
     $sth->execute($gid) or return -2;
     my $mysql = [];

Modified: trunk/vhffs-api/src/Vhffs/Panel/Svn.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Svn.pm	2007-05-29 15:26:04 UTC (rev 631)
+++ trunk/vhffs-api/src/Vhffs/Panel/Svn.pm	2007-05-30 06:47:42 UTC (rev 632)
@@ -78,7 +78,7 @@
     my ( $main, $gid ) = @_;
 
     my $dbh = $main->get_db_object;
-    my $sql = 'SELECT s.object_id AS oid, s.reponame AS displayname, o.state FROM vhffs_svn s INNER JOIN vhffs_object o ON s.object_id = o.object_id WHERE s.owner_gid = ?';
+    my $sql = 'SELECT s.object_id AS oid, s.reponame AS displayname, o.state FROM vhffs_svn s INNER JOIN vhffs_object o ON s.object_id = o.object_id WHERE s.owner_gid = ? ORDER BY s.reponame';
     my $sth = $dbh->prepare($sql) or return -1;
     $sth->execute($gid) or return -2;
     my $svn = [];

Modified: trunk/vhffs-api/src/Vhffs/Panel/Web.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Web.pm	2007-05-29 15:26:04 UTC (rev 631)
+++ trunk/vhffs-api/src/Vhffs/Panel/Web.pm	2007-05-30 06:47:42 UTC (rev 632)
@@ -84,7 +84,7 @@
     my ($main, $gid) = @_;
 
     my $dbh = $main->get_db_object;
-    my $sql = 'SELECT w.servername AS displayname, w.object_id AS oid, o.state FROM vhffs_httpd w INNER JOIN vhffs_object o ON o.object_id = w.object_id WHERE w.owner_gid = ?';
+    my $sql = 'SELECT w.servername AS displayname, w.object_id AS oid, o.state FROM vhffs_httpd w INNER JOIN vhffs_object o ON o.object_id = w.object_id WHERE w.owner_gid = ? ORDER BY w.servername';
     my $sth = $dbh->prepare($sql) or return -1;
     $sth->execute($gid) or return -2;
     my $web = [];

Modified: trunk/vhffs-intl/src/fr.po
===================================================================
--- trunk/vhffs-intl/src/fr.po	2007-05-29 15:26:04 UTC (rev 631)
+++ trunk/vhffs-intl/src/fr.po	2007-05-30 06:47:42 UTC (rev 632)
@@ -5059,7 +5059,7 @@
 #: ../vhffs-api/src/Vhffs/Listengine/Intl.pm:80
 #: ../vhffs-api/src/Vhffs/Listengine/Intl.pm:98
 msgid "You must confirm your request by sending a confirmation email\n"
-msgstr ""
+msgstr "Vous devez valider votre demande en envoyant un email de confirmation.\n"
 
 #: ../vhffs-panel/subscribe.pl:121
 msgid "You must declare a valid mail address"