summaryrefslogtreecommitdiff
path: root/rt/share/html/Install
diff options
context:
space:
mode:
Diffstat (limited to 'rt/share/html/Install')
-rw-r--r--rt/share/html/Install/Basics.html11
-rw-r--r--rt/share/html/Install/DatabaseDetails.html2
-rw-r--r--rt/share/html/Install/DatabaseType.html4
-rw-r--r--rt/share/html/Install/Elements/Errors2
-rw-r--r--rt/share/html/Install/Elements/Wrapper9
-rw-r--r--rt/share/html/Install/Finish.html11
-rw-r--r--rt/share/html/Install/Global.html5
-rw-r--r--rt/share/html/Install/Initialize.html13
-rw-r--r--rt/share/html/Install/Sendmail.html2
-rw-r--r--rt/share/html/Install/autohandler2
-rw-r--r--rt/share/html/Install/index.html15
11 files changed, 41 insertions, 35 deletions
diff --git a/rt/share/html/Install/Basics.html b/rt/share/html/Install/Basics.html
index d3e0a3ea0..6b5522431 100644
--- a/rt/share/html/Install/Basics.html
+++ b/rt/share/html/Install/Basics.html
@@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
@@ -81,9 +81,16 @@ if ( $Run ) {
push @errors, loc("Invalid [_1]: it should be a number", 'WebPort');
}
- unless ( $ARGS{Password} ) {
+ if ( !$ARGS{Password} ) {
push @errors, loc("You must enter an Administrative password");
}
+ else {
+ my $dummy_user = RT::User->new($session{CurrentUser});
+ my ($ok, $msg) = $dummy_user->ValidatePassword($ARGS{Password});
+ unless ($ok) {
+ push @errors, $msg;
+ }
+ }
if ( $Back ) {
RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .
diff --git a/rt/share/html/Install/DatabaseDetails.html b/rt/share/html/Install/DatabaseDetails.html
index 904d6b848..ff7aa9e7f 100644
--- a/rt/share/html/Install/DatabaseDetails.html
+++ b/rt/share/html/Install/DatabaseDetails.html
@@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
diff --git a/rt/share/html/Install/DatabaseType.html b/rt/share/html/Install/DatabaseType.html
index 60bf79cf2..68f8a67ed 100644
--- a/rt/share/html/Install/DatabaseType.html
+++ b/rt/share/html/Install/DatabaseType.html
@@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
@@ -58,7 +58,7 @@
<&|/l&>SQLite is a database that doesn't need a server or any configuration whatsoever. RT's authors recommend it for testing, demoing and development, but it's not quite right for a high-volume production RT server.</&>
</b></p>
<p>
-<&|/l, '<a href="http://search.cpan.org" target="_new">CPAN</a>' &>If your preferred database isn't listed in the dropdown below, that means RT couldn't find a <i>database driver</i> for it installed locally. You may be able to remedy this by using [_1] to download and install DBD::MySQL, DBD::Oracle or DBD::Pg.</&>
+<&|/l_unsafe, '<a href="http://search.cpan.org" target="_new">CPAN</a>' &>If your preferred database isn't listed in the dropdown below, that means RT couldn't find a <i>database driver</i> for it installed locally. You may be able to remedy this by using [_1] to download and install DBD::MySQL, DBD::Oracle or DBD::Pg.</&>
</p>
</div>
diff --git a/rt/share/html/Install/Elements/Errors b/rt/share/html/Install/Elements/Errors
index 192ba53de..ceb120221 100644
--- a/rt/share/html/Install/Elements/Errors
+++ b/rt/share/html/Install/Elements/Errors
@@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
diff --git a/rt/share/html/Install/Elements/Wrapper b/rt/share/html/Install/Elements/Wrapper
index 809481323..66271d7bf 100644
--- a/rt/share/html/Install/Elements/Wrapper
+++ b/rt/share/html/Install/Elements/Wrapper
@@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
@@ -48,13 +48,6 @@
<&/Elements/Header, title => $Title &>
<& /Elements/PageLayout,
title => $Title,
- toptabs => { a => { title => loc('Install RT'),
- path => 'Install/'
- },
- b => { title => loc('Buy Support'),
- path => 'mailto:sales@bestpractical.com'}
- },
-
show_menu => 1
&>
<a name="skipnav" id="skipnav" accesskey="8"></a>
diff --git a/rt/share/html/Install/Finish.html b/rt/share/html/Install/Finish.html
index 3ebd407ea..24ac0ff71 100644
--- a/rt/share/html/Install/Finish.html
+++ b/rt/share/html/Install/Finish.html
@@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
@@ -53,11 +53,11 @@
</p>
<p>
-<&|/l&>You should be taken directly to a login page. You'll be able to log in with username of <tt>root</tt> and the password you set earlier.</&>
+<&|/l_unsafe, '<tt>root</tt>' &>You should be taken directly to a login page. You'll be able to log in with username of [_1] and the password you set earlier.</&>
</p>
<p>
-<&|/l&>If you've change the Port that RT runs on, you'll need to restart the server in order to log in.</&>
+<&|/l&>If you've changed the Port that RT runs on, you'll need to restart the server in order to log in.</&>
</p>
<p>
@@ -82,9 +82,10 @@ if ( $Run ) {
system( 'chmod -w ' . RT::Installer->ConfigFile ) &&
$RT::Logger->error(
'failed to make ' . RT::Installer->ConfigFile . ' readonly' );
- my $root = RT::User->new( $RT::SystemUser );
+ my $root = RT::User->new( RT->SystemUser );
$root->Load('root');
- $root->SetPassword( $RT::Installer->{InstallConfig}{Password} );
+ my ($ok, $val) = $root->SetPassword( $RT::Installer->{InstallConfig}{Password} );
+ $RT::Logger->warning("Unable to set root password: $val") if !$ok;
RT::Interface::Web::Redirect(RT->Config->Get('WebURL'));
}
diff --git a/rt/share/html/Install/Global.html b/rt/share/html/Install/Global.html
index 5292d21c1..ea0114983 100644
--- a/rt/share/html/Install/Global.html
+++ b/rt/share/html/Install/Global.html
@@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
@@ -53,7 +53,6 @@
<p><&|/l&>When RT sends an email it sets the From: and Reply-To: headers so users can add to the conversation by just hitting Reply in their mail client. It uses different addresses for Replies and Comments. These can be changed for each of your queues. These addresses will need to be configured to use the <tt>rt-mailgate</tt> program.</&></p>
-<p><&|/l&>By default, RT will use the timezone of your system. This lets you set a global default for the display of dates and times in RT. Your users can choose a different Timezone in their preferences.</&></p>
<form method="post">
<& /Widgets/BulkEdit, Types => \@Types,Meta => $RT::Installer->{Meta},
CurrentValue => RT::Installer->CurrentValues(@Types)
@@ -70,7 +69,7 @@
<%init>
my @errors;
-my @Types = qw/CommentAddress CorrespondAddress Timezone/;
+my @Types = qw/CommentAddress CorrespondAddress/;
if ( $Run ) {
diff --git a/rt/share/html/Install/Initialize.html b/rt/share/html/Install/Initialize.html
index 0b9ed6d39..0cc39aff6 100644
--- a/rt/share/html/Install/Initialize.html
+++ b/rt/share/html/Install/Initialize.html
@@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
@@ -73,6 +73,11 @@ if ( $Run ) {
my @actions = split /,/, $RT::Installer->{DatabaseAction};
+ # RT::Handle's ISA is dynamical, so we need to unshift the right one.
+ my $class = 'DBIx::SearchBuilder::Handle::' . RT->Config->Get('DatabaseType');
+ $class->require or die $UNIVERSAL::require::ERROR;
+ unshift @RT::Handle::ISA, $class;
+
my $sysdbh = DBI->connect(
RT::Handle->SystemDSN,
$RT::Installer->{InstallConfig}{DatabaseAdmin},
@@ -110,17 +115,17 @@ if ( $Run ) {
($status, $msg) = RT::Handle->InsertACL( $dbh );
}
elsif ( $action eq 'coredata' ) {
- $RT::Handle = new RT::Handle;
+ $RT::Handle = RT::Handle->new;
$RT::Handle->dbh( undef );
RT::ConnectToDatabase();
RT::InitLogging();
($status, $msg) = $RT::Handle->InsertInitialData;
}
elsif ( $action eq 'insert' ) {
- $RT::Handle = new RT::Handle;
+ $RT::Handle = RT::Handle->new;
RT::Init();
my $file = $RT::EtcPath . "/initialdata";
- ($status, $msg) = $RT::Handle->InsertData( $file );
+ ($status, $msg) = $RT::Handle->InsertData( $file, undef, disconnect_after => 0 );
}
unless ( $status ) {
push @errors, loc('ERROR: [_1]', $msg);
diff --git a/rt/share/html/Install/Sendmail.html b/rt/share/html/Install/Sendmail.html
index 269916eb0..132433da0 100644
--- a/rt/share/html/Install/Sendmail.html
+++ b/rt/share/html/Install/Sendmail.html
@@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
diff --git a/rt/share/html/Install/autohandler b/rt/share/html/Install/autohandler
index eabde3fd4..da7bd0ba8 100644
--- a/rt/share/html/Install/autohandler
+++ b/rt/share/html/Install/autohandler
@@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
diff --git a/rt/share/html/Install/index.html b/rt/share/html/Install/index.html
index bc9573bdc..78069afe3 100644
--- a/rt/share/html/Install/index.html
+++ b/rt/share/html/Install/index.html
@@ -2,7 +2,7 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
@@ -76,11 +76,12 @@
<h2><% loc('Getting started') %></h2>
<p>
<b>
-<&|/l&>You're seeing this screen because you started up an RT server without a working database. Most likely, this is the first time you're running RT. If you click <i>Let's go!</i> below, RT will guide you through setting up your RT server and database.</&>
+<&|/l, loc("Let's go!") &>You're seeing this screen because you started up an RT server without a working database. Most likely, this is the first time you're running RT. If you click "[_1]" below, RT will guide you through setting up your RT server and database.</&>
</b>
</p>
<p>
-<&|/l&>If you already have a working RT server and database, you should take this opportunity to make sure that your database server is running and that the RT server can connect to it. Once you've done that, stop and start the RT server.</p></&>
+<&|/l&>If you already have a working RT server and database, you should take this opportunity to make sure that your database server is running and that the RT server can connect to it. Once you've done that, stop and start the RT server.</&>
+</p>
</div>
<& /Elements/Submit, Label => loc( "Let's go!"), Name => 'Run' &>
@@ -91,7 +92,7 @@
my @errors;
my $locked;
-my $file = File::Spec->catfile( $RT::EtcPath, 'RT_SiteConfig.pm' );
+my $file = RT::Installer->ConfigFile;
if ( ! -e $file ) {
# write a blank RT_SiteConfig.pm
@@ -110,7 +111,7 @@ elsif ( $Run ) {
for my $field (
qw/DatabaseType DatabaseName DatabaseHost DatabasePort
DatabaseUser DatabaseRequireSSL rtname
- Organization Timezone CommentAddress CorrespondAddress
+ Organization CommentAddress CorrespondAddress
SendmailPath WebDomain WebPort/
) {
$RT::Installer->{InstallConfig}{$field} ||= RT->Config->Get($field);
@@ -124,12 +125,12 @@ elsif ( $Run ) {
RT::Interface::Web::Redirect(RT->Config->Get('WebURL') . 'Install/DatabaseType.html');
} elsif ( $ChangeLang && $Lang ) {
# hackish, but works
- $session{'CurrentUser'} = new RT::CurrentUser;
+ $session{'CurrentUser'} = RT::CurrentUser->new;
$session{'CurrentUser'}->LanguageHandle( $Lang );
}
my $lang_handle = do { local $@;
eval {
- ($session{'CurrentUser'} || RT::CurrentUser->new($RT::SystemUser->Id))
+ ($session{'CurrentUser'} || RT::CurrentUser->new(RT->SystemUser->Id))
->LanguageHandle
}
};
generated by cgit v1.2.1 (git 2.18.0) at 2025-10-19 01:14:36 +0000