[otrs-cvs] otrs/Kernel/Output/HTML ArticleComposeSign.pm, 1.26, 1.27
"CVS commits notifications of OTRS.org" <[email protected]>
| Newsgroups | gmane.comp.otrs.cvs |
|---|---|
| Message-ID | <[email protected]> |
Comments:
Update of /home/cvs/otrs/Kernel/Output/HTML
In directory lancelot:/tmp/cvs-serv18044/Kernel/Output/HTML
Modified Files:
ArticleComposeSign.pm
Log Message:
- 2013-02-15 Fixed bug#9155 - SMIME: DefaultSignKey not selected in AJAX refreshes.
Author: cr
Index: ArticleComposeSign.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Output/HTML/ArticleComposeSign.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -2 -u -d -r1.26 -r1.27
--- ArticleComposeSign.pm 20 Nov 2012 14:56:18 -0000 1.26
+++ ArticleComposeSign.pm 15 Feb 2013 22:21:48 -0000 1.27
@@ -1,5 +1,5 @@
# --
# Kernel/Output/HTML/ArticleComposeSign.pm
-# Copyright (C) 2001-2012 OTRS AG, http://otrs.org/
+# Copyright (C) 2001-2013 OTRS AG, http://otrs.org/
# --
# $Id$
@@ -157,4 +157,22 @@
}
+sub GetParamAJAX {
+ my ( $Self, %Param ) = @_;
+
+ # check if pgp or smime is disabled
+ return if !$Self->{ConfigObject}->Get('PGP') && !$Self->{ConfigObject}->Get('SMIME');
+
+ my %Result;
+
+ # get default signing key
+ if ( $Param{QueueID} ) {
+ my $QueueObject = Kernel::System::Queue->new( %{$Self} );
+ my %Queue = $QueueObject->QueueGet( ID => $Param{QueueID} );
+ $Result{SignKeyID} = $Queue{DefaultSignKey} || '';
+ }
+
+ return %Result;
+}
+
sub Error {
my ( $Self, %Param ) = @_;
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log