[Rt-commit] r11802 - rt/branches/3.8-TESTING/html/installation
sunnavy at bestpractical.com
sunnavy at bestpractical.com
Mon Apr 21 04:51:58 EDT 2008
Author: sunnavy
Date: Mon Apr 21 04:51:57 2008
New Revision: 11802
Added:
rt/branches/3.8-TESTING/html/installation/Step4.html
- copied, changed from r11800, /rt/branches/3.8-TESTING/html/installation/Step3.html
Modified:
rt/branches/3.8-TESTING/html/installation/Step3.html
Log:
split email stuff to step 4
Modified: rt/branches/3.8-TESTING/html/installation/Step3.html
==============================================================================
--- rt/branches/3.8-TESTING/html/installation/Step3.html (original)
+++ rt/branches/3.8-TESTING/html/installation/Step3.html Mon Apr 21 04:51:57 2008
@@ -48,7 +48,7 @@
<& /Elements/Header, Title => 'Install' &>
<& /Elements/Tabs,
- current_toptab => 'Install', Title => 'Step 3: Customize your RT' &>
+ current_toptab => 'Install', Title => 'Step 3: Customize Basics' &>
<& /Elements/ListActions, actions => \@results &>
@@ -61,8 +61,7 @@
% if ( $_ eq 'TimeZone' ) {
<& /Elements/SelectTimezone, Name => 'Timezone', &>
% } else {
-<input type="text" <% ( $_ eq 'MininumPasswordLength' || $_ eq
-'MaxAttachmentSize' ) ? q[onchange="(!this.value || this.value.match(/^\d+$/)) ?
+<input type="text" <% $_ eq 'MininumPasswordLength' ? q[onchange="(!this.value || this.value.match(/^\d+$/)) ?
this.style.background='white' : this.style.background='red'" ]: () |n %>
name="<% $_ %>" value="<% $ARGS{$_} || $session{InstallConfig}{$_} %>" />
% }
@@ -72,14 +71,13 @@
</table>
<input type="hidden" name="Run" value="1">
-<& /Elements/Submit, Label => loc('Next: Initialize Database') &>
+<& /Elements/Submit, Label => loc('Next: Customize Emails') &>
</form>
<%init>
my @results;
-my @types = qw/rtname Organization TimeZone MininumPasswordLength
-MaxAttachmentSize OwnerEmail CommentAddress CorrespondAddress/;
+my @types = qw/rtname Organization TimeZone MininumPasswordLength/;
my %title = (
rtname => <<'EOF'
rtname is the string that RT will look for in mail messages to figure out what ticket a new piece of mail belongs to Your domain name is recommended, so as not to pollute the namespace. once you start using a given tag, you should probably never change it.
@@ -98,24 +96,6 @@
$MinimumPasswordLength defines the minimum length for user passwords. Setting it to 0 disables this check
EOF
,
-MaxAttachmentSize => <<'EOF'
-$MaxAttachmentSize sets the maximum size (in bytes) of attachments stored in the database.
-EOF
-,
-OwnerEmail => <<'EOF'
-OwnerEmail is the address of a human who manages RT. RT will send
-errors generated by the mail gateway to this address. This address
-should _not_ be an address that's managed by your RT instance.
-EOF
-,
-CommentAddress => <<'EOF'
-CommentAddress is the default address that will be listed in From: and Reply-To: headers of comment mail tracked by RT, unless overridden by a queue-specific address.
-EOF
-,
-CorrespondAddress => <<'EOF'
-CorrespondAddress is the default address that will be listed in From: and Reply-To: headers of correspondence mail tracked by RT, unless overridden by a queue-specific address.
-EOF
-,
);
if ( $Run ) {
@@ -125,31 +105,14 @@
}
$session{TimeStamp} = time;
- for ( qw/MininumPasswordLength MaxAttachmentSize/ ) {
+ for ( qw/MininumPasswordLength/ ) {
if ( $ARGS{$_} && $ARGS{$_} !~ /^\d+$/ ) {
push @results, "Invalid $_: it should be a number";
}
}
unless ( @results ) {
-
-
- require File::Spec;
- my $file = File::Spec->catfile($RT::EtcPath, 'RT_SiteConfig.pm');
-
- if ( open my $fh, '>', $file ) {
- for ( keys %{$session{InstallConfig}} ) {
- print $fh "Set( \$$_, '$session{InstallConfig}{$_}' );\n";
- }
- print $fh "Set( \$Installed, 1 );\n";
- print $fh "1;\n";
- close $fh;
-
- RT::Interface::Web::Redirect(RT->Config->Get('WebURL') . 'installation/Step4.html');
- }
- else {
- push @results, "Can't open config file $file to write: $!";
- }
+ RT::Interface::Web::Redirect(RT->Config->Get('WebURL') . 'installation/Step4.html');
}
}
Copied: rt/branches/3.8-TESTING/html/installation/Step4.html (from r11800, /rt/branches/3.8-TESTING/html/installation/Step3.html)
==============================================================================
--- /rt/branches/3.8-TESTING/html/installation/Step3.html (original)
+++ rt/branches/3.8-TESTING/html/installation/Step4.html Mon Apr 21 04:51:57 2008
@@ -48,7 +48,7 @@
<& /Elements/Header, Title => 'Install' &>
<& /Elements/Tabs,
- current_toptab => 'Install', Title => 'Step 3: Customize your RT' &>
+ current_toptab => 'Install', Title => 'Step 4: Customize Emails' &>
<& /Elements/ListActions, actions => \@results &>
@@ -58,46 +58,22 @@
<tr title="<% $title{$_} |n%>">
<td class="label"><% loc($_) %>:</td>
<td>
-% if ( $_ eq 'TimeZone' ) {
-<& /Elements/SelectTimezone, Name => 'Timezone', &>
-% } else {
-<input type="text" <% ( $_ eq 'MininumPasswordLength' || $_ eq
-'MaxAttachmentSize' ) ? q[onchange="(!this.value || this.value.match(/^\d+$/)) ?
-this.style.background='white' : this.style.background='red'" ]: () |n %>
+<input type="text" <% $_ eq 'MaxAttachmentSize' ? q[onchange="(!this.value || this.value.match(/^\d+$/)) ? this.style.background='white' : this.style.background='red'" ]: () |n %>
name="<% $_ %>" value="<% $ARGS{$_} || $session{InstallConfig}{$_} %>" />
-% }
</td>
</tr>
% }
</table>
<input type="hidden" name="Run" value="1">
-<& /Elements/Submit, Label => loc('Next: Initialize Database') &>
+<& /Elements/Submit, Label => loc('Next: Customize Sendmails') &>
</form>
<%init>
my @results;
-my @types = qw/rtname Organization TimeZone MininumPasswordLength
-MaxAttachmentSize OwnerEmail CommentAddress CorrespondAddress/;
+my @types = qw/MaxAttachmentSize OwnerEmail CommentAddress CorrespondAddress/;
my %title = (
-rtname => <<'EOF'
-rtname is the string that RT will look for in mail messages to figure out what ticket a new piece of mail belongs to Your domain name is recommended, so as not to pollute the namespace. once you start using a given tag, you should probably never change it.
-(otherwise, mail for existing tickets won't get put in the right place
-EOF
-,
-Organization => <<'EOF'
-You should set this to your organization's DNS domain. For example, fsck.com or asylum.arkham.ma.us. It's used by the linking interface to guarantee that ticket URIs are unique and easy to construct.
-EOF
-,
-TimeZone => <<'EOF'
-$Timezone is used to convert times entered by users into GMT and back again It should be set to a timezone recognized by your local unix box.
-EOF
-,
-MininumPasswordLength => <<'EOF'
-$MinimumPasswordLength defines the minimum length for user passwords. Setting it to 0 disables this check
-EOF
-,
MaxAttachmentSize => <<'EOF'
$MaxAttachmentSize sets the maximum size (in bytes) of attachments stored in the database.
EOF
@@ -125,31 +101,14 @@
}
$session{TimeStamp} = time;
- for ( qw/MininumPasswordLength MaxAttachmentSize/ ) {
+ for ( qw/MaxAttachmentSize/ ) {
if ( $ARGS{$_} && $ARGS{$_} !~ /^\d+$/ ) {
push @results, "Invalid $_: it should be a number";
}
}
unless ( @results ) {
-
-
- require File::Spec;
- my $file = File::Spec->catfile($RT::EtcPath, 'RT_SiteConfig.pm');
-
- if ( open my $fh, '>', $file ) {
- for ( keys %{$session{InstallConfig}} ) {
- print $fh "Set( \$$_, '$session{InstallConfig}{$_}' );\n";
- }
- print $fh "Set( \$Installed, 1 );\n";
- print $fh "1;\n";
- close $fh;
-
- RT::Interface::Web::Redirect(RT->Config->Get('WebURL') . 'installation/Step4.html');
- }
- else {
- push @results, "Can't open config file $file to write: $!";
- }
+ RT::Interface::Web::Redirect(RT->Config->Get('WebURL') . 'installation/Step5.html');
}
}
More information about the Rt-commit
mailing list