[vhffs-dev] [1806] No more HTML::Template in admin/mail/list

[subversion@xxxxxxxxxxxxx]

Revision: 1806
Author:   beuss
Date:     2011-05-24 08:13:28 +0200 (Tue, 24 May 2011)
Log Message:
-----------
No more HTML::Template in admin/mail/list

Modified Paths:
--------------
    trunk/vhffs-api/src/Vhffs/Panel/Mail.pm
    trunk/vhffs-panel/admin/mail/list.pl
    trunk/vhffs-panel/templates/Makefile.am

Removed Paths:
-------------
    trunk/vhffs-panel/templates/admin/mail/part.tmpl

Modified: trunk/vhffs-api/src/Vhffs/Panel/Mail.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Mail.pm	2011-05-24 06:13:16 UTC (rev 1805)
+++ trunk/vhffs-api/src/Vhffs/Panel/Mail.pm	2011-05-24 06:13:28 UTC (rev 1806)
@@ -48,28 +48,23 @@
 
 sub search {
     my ($main, $name) = @_;
-    my $sql;
+
     my @params;
-    my $mails = [];
+    my $sql = 'SELECT m.domain as label, g.groupname as owner_group, o.state, u.username as owner_user '.
+        '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) '.
+        'INNER JOIN vhffs_users u ON (u.uid = o.owner_uid) ';
 
     if( defined $name ) {
-        $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 ?';
+        $sql .= 'WHERE m.domain LIKE ? ';
         push(@params, '%'.lc($name).'%');
-    } else {
-        $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();
-    my $sth = $dbh->prepare($sql) or return undef;
+    $sql .= 'ORDER BY label';
 
-    return undef unless($sth->execute(@params));
-
-    while(my $m = $sth->fetchrow_hashref('NAME_lc')) {
-        $m->{state} = Vhffs::Functions::status_string_from_status_id($m->{state});
-        push(@$mails, $m);
-    }
-
-    return $mails
+    my $dbh = $main->get_db_object();
+    return $dbh->selectall_arrayref($sql, { Slice => {} }, @params);
 }
 
 =pod

Modified: trunk/vhffs-panel/admin/mail/list.pl
===================================================================
--- trunk/vhffs-panel/admin/mail/list.pl	2011-05-24 06:13:16 UTC (rev 1805)
+++ trunk/vhffs-panel/admin/mail/list.pl	2011-05-24 06:13:28 UTC (rev 1806)
@@ -32,64 +32,30 @@
 use strict;
 use utf8;
 use POSIX qw(locale_h);
-use HTML::Template;
 use locale;
 use Locale::gettext;
 use CGI;
 use CGI::Session;
 
 use lib '%VHFFS_LIB_DIR%';
-use Vhffs::Panel::Main;
+use Vhffs::Panel::Admin;
 use Vhffs::Panel::Mail;
 
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
+my $panel = new Vhffs::Panel::Admin();
 
 my $vhffs = $panel->{'vhffs'};
-my $user = $panel->{'user'};
 my $cgi = $panel->{'cgi'};
-my $templatedir = $panel->{'templatedir'};
-my $template;
+my $name = $cgi->param('NAME');
+my $vars = {
+    type => 'mail'
+};
 
-if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
-{
-	$template = new HTML::Template( filename => $templatedir.'/panel/misc/simplemsg.tmpl' );
-	$template->param( MESSAGE => gettext('You are not allowed to see it') );
+if( defined( $name ) ) {
+    $vars->{list_title} = sprintf( gettext('Search result for %s'), $name );
+} else {
+    $vars->{list_title} = gettext('List of all mail-domain');
 }
-else
-{
-	$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 );
-	}
-	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') );
-
-	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') );
-		}
-
-		$subtemplate->param( MAILS => $mails );
-		$template->param( LIST => $subtemplate->output );
-	}
-}
-
-$panel->build( $template );
-$panel->display;
+$vars->{label_title} = gettext('Domain Name');
+$vars->{list} = Vhffs::Panel::Mail::search( $vhffs , $name );
+$panel->render('admin/misc/list.tt', $vars);

Modified: trunk/vhffs-panel/templates/Makefile.am
===================================================================
--- trunk/vhffs-panel/templates/Makefile.am	2011-05-24 06:13:16 UTC (rev 1805)
+++ trunk/vhffs-panel/templates/Makefile.am	2011-05-24 06:13:28 UTC (rev 1806)
@@ -9,7 +9,6 @@
 	admin/group/part.tmpl \
 	admin/group/search.tmpl \
 	admin/mail/search.tmpl \
-	admin/mail/part.tmpl \
 	admin/mailinglist/search.tmpl \
 	admin/main/general-modo.tmpl \
 	admin/main/general.tmpl \

Deleted: trunk/vhffs-panel/templates/admin/mail/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mail/part.tmpl	2011-05-24 06:13:16 UTC (rev 1805)
+++ trunk/vhffs-panel/templates/admin/mail/part.tmpl	2011-05-24 06:13:28 UTC (rev 1806)
@@ -1,17 +0,0 @@
-<TMPL_LOOP NAME="MAILS">
-<tr>
-	<td>
-		<TMPL_VAR ESCAPE=1 NAME="DOMAIN">
-	</td>
-	<td>
-		<TMPL_VAR ESCAPE=1 NAME="GROUPNAME"> 
-	</td>
-	<td>
-		<TMPL_VAR ESCAPE=1 NAME="STATE"> 
-	</td>
-	<td>
-		<a href="/mail/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR ESCAPE=1 NAME="DOMAIN">"><TMPL_VAR ESCAPE=1 NAME="ACTION"></a>
-	</td>
-</tr>
-</TMPL_LOOP>
-