| Index: trunk/phase3/config/index.php |
| — | — | @@ -702,7 +702,6 @@ |
| 703 | 703 | $conf->Emailuser = importRequest("Emailuser", "emailuser_enabled"); |
| 704 | 704 | $conf->Enotif = importRequest("Enotif", "enotif_allpages"); |
| 705 | 705 | $conf->Eauthent = importRequest("Eauthent", "eauthent_enabled"); |
| 706 | | -$conf->Api = importRequest("Api", "api_enabled_readonly" ); |
| 707 | 706 | |
| 708 | 707 | if( $conf->posted && ( 0 == count( $errs ) ) ) { |
| 709 | 708 | do { /* So we can 'continue' to end prematurely */ |
| — | — | @@ -1239,20 +1238,6 @@ |
| 1240 | 1239 | MediaWiki can also detect and support eAccelerator, Turck MMCache, APC, and XCache, but |
| 1241 | 1240 | these should not be used if the wiki will be running on multiple application servers. |
| 1242 | 1241 | </p> |
| 1243 | | - <div class="config-input"> |
| 1244 | | - <label class='column'>External API:</label> |
| 1245 | | - |
| 1246 | | - <ul class="plain"> |
| 1247 | | - <li><?php aField( $conf, "Api", "Enabled for Reading and Writing", "radio", "api_enabled_readwrite" ); ?></li> |
| 1248 | | - <li><?php aField( $conf, "Api", "Enabled for Reading only", "radio", "api_enabled_readonly" ); ?></li> |
| 1249 | | - <li><?php aField( $conf, "Api", "Disabled", "radio", "api_disabled" ); ?></li> |
| 1250 | | - </ul> |
| 1251 | | - </div> |
| 1252 | | - <p class="config-desc"> |
| 1253 | | - API allows programs and scripts to directly access MediaWiki data in computer-readable formats. |
| 1254 | | - Once enabled, it will be accessible through |
| 1255 | | - <?php echo htmlspecialchars( $conf->ScriptPath ); ?>/api.php |
| 1256 | | - </p> |
| 1257 | 1242 | </div> |
| 1258 | 1243 | |
| 1259 | 1244 | <h2>E-mail, e-mail notification and authentication setup</h2> |
| — | — | @@ -1542,22 +1527,6 @@ |
| 1543 | 1528 | $enotifwatchlist = 'false'; |
| 1544 | 1529 | } |
| 1545 | 1530 | |
| 1546 | | - switch ( $conf->Api ) { |
| 1547 | | - case "api_enabled_readwrite": |
| 1548 | | - $apiEnabled = 'true'; |
| 1549 | | - $apiWriteEnabled = 'true'; |
| 1550 | | - break; |
| 1551 | | - case "api_enabled_readonly": |
| 1552 | | - $apiEnabled = 'true'; |
| 1553 | | - $apiWriteEnabled = 'false'; |
| 1554 | | - break; |
| 1555 | | - case "api_disabled": |
| 1556 | | - default: |
| 1557 | | - $apiEnabled = 'false'; |
| 1558 | | - $apiWriteEnabled = 'false'; |
| 1559 | | - break; |
| 1560 | | - } |
| 1561 | | - |
| 1562 | 1531 | $file = @fopen( "/dev/urandom", "r" ); |
| 1563 | 1532 | if ( $file ) { |
| 1564 | 1533 | $secretKey = bin2hex( fread( $file, 32 ) ); |
| — | — | @@ -1702,11 +1671,6 @@ |
| 1703 | 1672 | # sure that cached pages are cleared. |
| 1704 | 1673 | \$configdate = gmdate( 'YmdHis', @filemtime( __FILE__ ) ); |
| 1705 | 1674 | \$wgCacheEpoch = max( \$wgCacheEpoch, \$configdate ); |
| 1706 | | - |
| 1707 | | -# Enable direct access to the data API through api.php |
| 1708 | | -\$wgEnableAPI = $apiEnabled; |
| 1709 | | -\$wgEnableWriteAPI = $apiWriteEnabled; |
| 1710 | | - |
| 1711 | 1675 | "; ## End of setting the $localsettings string |
| 1712 | 1676 | |
| 1713 | 1677 | // Keep things in Unix line endings internally; |