From: Chad Horohoe
Date: Tue, 3 Jun 2008 14:56:25 +0000 (+0000)
Subject: Partial revert of r35794. Additional file added to commit that shouldn't have gone.
X-Git-Tag: 1.31.0-rc.0~47214
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=6065ac5fc856c1614c0586361439828caae704d8;p=lhc%2Fweb%2Fwiklou.git
Partial revert of r35794. Additional file added to commit that shouldn't have gone.
---
diff --git a/config/index.php b/config/index.php
index 763d6c1593..52b4441679 100644
--- a/config/index.php
+++ b/config/index.php
@@ -597,7 +597,6 @@ print "Environment check
$conf->RootUser = importPost( "RootUser", "root" );
$conf->RootPW = importPost( "RootPW", "" );
$useRoot = importCheck( 'useroot', false );
- $createAdminSettings = importCheck('createadminsettings', false);
$conf->LanguageCode = importPost( "LanguageCode", "en" );
## MySQL specific:
@@ -1110,35 +1109,13 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
}
if(fwrite( $f, $localSettings ) ) {
fclose( $f );
- print " \n";
+ print " \n";
+ writeSuccessMessage();
} else {
fclose( $f );
die("An error occured while writing the config/LocalSettings.php file. Check user rights and disk space then try again.
\n");
print "\n";
}
-
- /* Create AdminSettings.php if we've enabled that */
- if ( $createAdminSettings ){
- print "\n";
- print "Creating AdminSettings.php...
\n\n";
- $f = file_get_contents( '../AdminSettings.sample' );
-
- if( $f == false ) {
- dieout( "Couldn't write out AdminSettings.php. Check that the directory permissions are correct.
\n" );
- }
-
- $f = str_replace( 'wikiadmin', $conf->RootUser, $f );
- $f = str_replace( 'adminpass', $conf->RootPW, $f );
-
- if ( file_put_contents( 'AdminSettings.php', $f ) ) {
- print " \n";
- } else {
- die("An error occured while writing the config/AdminSettings.php file. Check user rights and disk space then try again.
\n");
- print "\n";
- }
- }
- print "\n ";
- writeSuccessMessage();
} while( false );
}
@@ -1406,16 +1383,6 @@ if( count( $errs ) ) {
the database (if needed) or tables within it, please check the box and provide details
of a superuser account, such as root , which does.
-
- AdminSettings.php:
- checked="checked" />
- Create AdminSettings.php
-
-
-
- If the superuser account above is specified, you can optionally create an AdminSettings.php
- file. This is used for running the maintenance scripts.
-