[vhffs-dev] [1528] added email contact list for admins, added firstname and lastname for users

[subversion@xxxxxxxxxxxxx]

Revision: 1528
Author:   gradator
Date:     2009-12-21 16:36:18 +0100 (Mon, 21 Dec 2009)
Log Message:
-----------
added email contact list for admins, added firstname and lastname for users

Modified Paths:
--------------
    trunk/vhffs-api/src/Vhffs/Panel/Group.pm
    trunk/vhffs-panel/templates/group/prefs.tmpl

Modified: trunk/vhffs-api/src/Vhffs/Panel/Group.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Group.pm	2009-12-11 23:43:13 UTC (rev 1527)
+++ trunk/vhffs-api/src/Vhffs/Panel/Group.pm	2009-12-21 15:36:18 UTC (rev 1528)
@@ -63,7 +63,7 @@
 sub getall_users
 {
     my ($main, $gid) = @_;
-    my $sql = 'SELECT u.uid, u.username, ug.state FROM vhffs_users u INNER JOIN vhffs_user_group ug ON ug.uid = u.uid WHERE ug.gid = ?';
+    my $sql = 'SELECT u.uid, u.username, u.firstname, u.lastname, u.mail, ug.state FROM vhffs_users u INNER JOIN vhffs_user_group ug ON ug.uid = u.uid WHERE ug.gid = ?';
     my $dbh = $main->get_db_object;
     my $sth = $dbh->prepare($sql) or return -1;
     $sth->execute($gid) or return -2;

Modified: trunk/vhffs-panel/templates/group/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/group/prefs.tmpl	2009-12-11 23:43:13 UTC (rev 1527)
+++ trunk/vhffs-panel/templates/group/prefs.tmpl	2009-12-21 15:36:18 UTC (rev 1528)
@@ -42,12 +42,19 @@
 <form action="#" method="post" accept-charset="utf-8">
 <input type="hidden" name="uid" value="<TMPL_VAR ESCAPE=1 NAME="uid">"/>
 <input type="hidden" name="group" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_PROJECTNAME">"/>
-<p><label><TMPL_VAR ESCAPE=1 NAME="username"></label><input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="REMOVE_USER_TEXT">" name="remove_user_submit"/></p>
+<p><label><TMPL_VAR ESCAPE=1 NAME="username"> (<TMPL_VAR ESCAPE=1 NAME="FIRSTNAME"> <TMPL_VAR ESCAPE=1 NAME="LASTNAME">)</label><input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="REMOVE_USER_TEXT">" name="remove_user_submit"/></p>
 </form>
 <tmpl_else>
-<p><TMPL_VAR ESCAPE=1 NAME="USERNAME"> &mdash; <TMPL_VAR ESCAPE=1 NAME="STATE"></p>
+<p><TMPL_VAR ESCAPE=1 NAME="USERNAME"> (<TMPL_VAR ESCAPE=1 NAME="FIRSTNAME"> <TMPL_VAR ESCAPE=1 NAME="LASTNAME">) &mdash; <TMPL_VAR ESCAPE=1 NAME="STATE"></p>
 </TMPL_IF>
 </TMPL_LOOP>
+<TMPL_IF NAME="ADMIN">
+<p>
+<TMPL_LOOP NAME="USERS">
+<TMPL_VAR ESCAPE=1 NAME="FIRSTNAME"> <TMPL_VAR ESCAPE=1 NAME="LASTNAME"> &lt;<TMPL_VAR ESCAPE=1 NAME="MAIL">&gt;, 
+</TMPL_LOOP>
+</p>
+</TMPL_IF>
 
 <a name="add_user"></a>
 <h3><TMPL_VAR ESCAPE=1 NAME="TEXT_JOIN_GROUP"></h3>