| Index: trunk/phase3/config/index.php |
| — | — | @@ -597,7 +597,6 @@ |
| 598 | 598 | $conf->RootUser = importPost( "RootUser", "root" ); |
| 599 | 599 | $conf->RootPW = importPost( "RootPW", "" ); |
| 600 | 600 | $useRoot = importCheck( 'useroot', false ); |
| 601 | | - $createAdminSettings = importCheck('createadminsettings', false); |
| 602 | 601 | $conf->LanguageCode = importPost( "LanguageCode", "en" ); |
| 603 | 602 | |
| 604 | 603 | ## MySQL specific: |
| — | — | @@ -1110,35 +1109,13 @@ |
| 1111 | 1110 | } |
| 1112 | 1111 | if(fwrite( $f, $localSettings ) ) { |
| 1113 | 1112 | fclose( $f ); |
| 1114 | | - print "</li>\n"; |
| | 1113 | + print "</li></ul><hr/>\n"; |
| | 1114 | + writeSuccessMessage(); |
| 1115 | 1115 | } else { |
| 1116 | 1116 | fclose( $f ); |
| 1117 | 1117 | die("<p class='error'>An error occured while writing the config/LocalSettings.php file. Check user rights and disk space then try again.</p>\n"); |
| 1118 | 1118 | print "</li></ul>\n"; |
| 1119 | 1119 | } |
| 1120 | | - |
| 1121 | | - /* Create AdminSettings.php if we've enabled that */ |
| 1122 | | - if ( $createAdminSettings ){ |
| 1123 | | - print "<li style=\"list-style: none\">\n"; |
| 1124 | | - print "<p>Creating AdminSettings.php...</p>\n\n"; |
| 1125 | | - $f = file_get_contents( '../AdminSettings.sample' ); |
| 1126 | | - |
| 1127 | | - if( $f == false ) { |
| 1128 | | - dieout( "<p>Couldn't write out AdminSettings.php. Check that the directory permissions are correct.</p>\n" ); |
| 1129 | | - } |
| 1130 | | - |
| 1131 | | - $f = str_replace( 'wikiadmin', $conf->RootUser, $f ); |
| 1132 | | - $f = str_replace( 'adminpass', $conf->RootPW, $f ); |
| 1133 | | - |
| 1134 | | - if ( file_put_contents( 'AdminSettings.php', $f ) ) { |
| 1135 | | - print "</li>\n"; |
| 1136 | | - } else { |
| 1137 | | - die("<p class='error'>An error occured while writing the config/AdminSettings.php file. Check user rights and disk space then try again.</p>\n"); |
| 1138 | | - print "</li></ul>\n"; |
| 1139 | | - } |
| 1140 | | - } |
| 1141 | | - print "</ul>\n<hr />"; |
| 1142 | | - writeSuccessMessage(); |
| 1143 | 1120 | |
| 1144 | 1121 | } while( false ); |
| 1145 | 1122 | } |
| — | — | @@ -1406,17 +1383,7 @@ |
| 1407 | 1384 | the database (if needed) or tables within it, please check the box and provide details |
| 1408 | 1385 | of a superuser account, such as <strong>root</strong>, which does. |
| 1409 | 1386 | </p> |
| 1410 | | - <div class="config-input"> |
| 1411 | | - <label class="column">AdminSettings.php:</label> |
| 1412 | | - <input type="checkbox" name="createadminsettings" id="createadminsettings" <?php if( $createAdminSettings ) { ?>checked="checked" <?php } ?>/> |
| 1413 | | - <label for="useroot">Create AdminSettings.php</label> |
| 1414 | | - </div> |
| 1415 | 1387 | |
| 1416 | | - <p class="config-desc"> |
| 1417 | | - If the superuser account above is specified, you can optionally create an AdminSettings.php |
| 1418 | | - file. This is used for running the maintenance scripts. |
| 1419 | | - </p> |
| 1420 | | - |
| 1421 | 1388 | <?php database_switcher('mysql'); ?> |
| 1422 | 1389 | <div class="config-input"><?php |
| 1423 | 1390 | aField( $conf, "DBprefix", "Database table prefix:" ); |