[Rt-commit] r14231 - in rt/branches/3.999-DANGEROUS: . bin lib/RT/Crypt lib/RT/Model share/html/Admin/Queues share/html/Ticket/Elements
sunnavy at bestpractical.com
sunnavy at bestpractical.com
Thu Jul 17 15:19:27 EDT 2008
Author: sunnavy
Date: Thu Jul 17 15:19:23 2008
New Revision: 14231
Modified:
rt/branches/3.999-DANGEROUS/ (props changed)
rt/branches/3.999-DANGEROUS/bin/rt-mailgate
rt/branches/3.999-DANGEROUS/etc/RT_Config.pm
rt/branches/3.999-DANGEROUS/lib/RT/Crypt/GnuPG.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/Attachment.pm
rt/branches/3.999-DANGEROUS/share/html/Admin/Queues/Modify.html
rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/ShowTransaction
Log:
r14645 at sunnavys-mb: sunnavy | 2008-07-18 03:07:47 +0800
name fixes
Modified: rt/branches/3.999-DANGEROUS/bin/rt-mailgate
==============================================================================
--- rt/branches/3.999-DANGEROUS/bin/rt-mailgate (original)
+++ rt/branches/3.999-DANGEROUS/bin/rt-mailgate Thu Jul 17 15:19:23 2008
@@ -112,7 +112,7 @@
$args{'message'} = [
undef, '',
'Content-Type' => 'application/octet-stream',
- content => ${ $message{'content'} },
+ Content => ${ $message{'content'} },
];
} else {
$args{'message'} = [
Modified: rt/branches/3.999-DANGEROUS/etc/RT_Config.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/RT_Config.pm (original)
+++ rt/branches/3.999-DANGEROUS/etc/RT_Config.pm Thu Jul 17 15:19:23 2008
@@ -560,18 +560,18 @@
=item C<%GnuPG>
-Set C<OutgoingMessagesFormat> to 'inline' to use inline encryption and
+Set C<outgoing_messages_format> to 'inline' to use inline encryption and
signatures instead of 'RFC' (GPG/MIME: RFC3156 and RFC1847) format.
If you want to allow people to encrypt attachments inside the DB then
-set C<AllowEncryptDataInDB> to true
+set C<allow_encrypt_data_in_db> to true
=cut
set( %GnuPG,
- Enable => 1,
- OutgoingMessagesFormat => 'RFC', # Inline
- AllowEncryptDataInDB => 0,
+ enable => 1,
+ outgoing_messages_format => 'RFC', # Inline
+ allow_encrypt_data_in_db => 0,
);
=item C<%GnuPGOptions>
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Crypt/GnuPG.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Crypt/GnuPG.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Crypt/GnuPG.pm Thu Jul 17 15:19:23 2008
@@ -139,7 +139,7 @@
=head3 Encrypting data in the database
You can allow users to encrypt data in the database using
-option C<AllowEncryptDataInDB>. By default it's disabled.
+option C<allow_encrypt_data_in_db>. By default it's disabled.
Users must have rights to see and modify tickets to use
this feature.
@@ -1180,8 +1180,8 @@
local $SIG{'CHLD'} = 'DEFAULT';
$gnupg->passphrase( $args{'passphrase'} );
my $pid = safe_run_child { $gnupg->decrypt( handles => $handles ) };
- $args{'data'}->bodyhandle->print( $handle{'input'} );
- close $handle{'input'};
+ $args{'data'}->bodyhandle->print( $handle{'stdin'} );
+ close $handle{'stdin'};
waitpid $pid, 0;
};
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Attachment.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Attachment.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Attachment.pm Thu Jul 17 15:19:23 2008
@@ -615,7 +615,7 @@
return ( 0, _('GnuPG integration is disabled') )
unless RT->config->get('GnuPG')->{'enable'};
return ( 0, _('Attachments encryption is disabled') )
- unless RT->config->get('GnuPG')->{'AllowEncryptDataInDB'};
+ unless RT->config->get('GnuPG')->{'allow_encrypt_data_in_db'};
require RT::Crypt::GnuPG;
Modified: rt/branches/3.999-DANGEROUS/share/html/Admin/Queues/Modify.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Admin/Queues/Modify.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Admin/Queues/Modify.html Thu Jul 17 15:19:23 2008
@@ -132,7 +132,8 @@
<%INIT>
my ($title, $current_tab, @results, $disabled, $enabled_checked);
-my $queue_obj = RT::Model::Queue->new();
+my $queue_obj = RT::Model::Queue->new( current_user =>
+ Jifty->web->current_user );
$queue_obj->load( $id ) if !$id || $id eq 'new';
$enabled_checked = 'checked="checked"';
@@ -156,7 +157,7 @@
}
if ( $queue_obj->id ) {
my @attribs= qw(description correspond_address comment_address name
- initial_priority final_priority default_due_in Sign Encrypt SubjectTag Disabled);
+ initial_priority final_priority default_due_in sign encrypt subject_tag disabled);
# we're asking about enabled on the web page but really care about disabled
if ( $set_enabled ) {
Modified: rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/ShowTransaction
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/ShowTransaction (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/ShowTransaction Thu Jul 17 15:19:23 2008
@@ -209,7 +209,7 @@
}
if ( $can_modify
&& RT->config->get('GnuPG')->{'enable'}
- && RT->config->get('GnuPG')->{'AllowEncryptDataInDB'}
+ && RT->config->get('GnuPG')->{'allow_encrypt_data_in_db'}
&& $ticket->current_user_has_right('ForwardMessage')
) {
$titlebar_commands .=
More information about the Rt-commit
mailing list