mirror of
git://develop.git.wordpress.org/
synced 2025-01-17 21:08:44 +01:00
Revert [31749], see #31528.
git-svn-id: https://develop.svn.wordpress.org/trunk@31755 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dominik Schilling (ocean90)
parent
21134a0c89
commit
94768cad74
@ -850,26 +850,6 @@ table.form-table td .updated p {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
/*------------------------------------------------------------------------------
|
||||
Credentials check dialog for Install and Updates
|
||||
------------------------------------------------------------------------------*/
|
||||
|
||||
.request-filesystem-credentials-dialog {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.request-filesystem-credentials-dialog .notification-dialog{
|
||||
top: 15%
|
||||
}
|
||||
|
||||
.request-filesystem-credentials-dialog-content{
|
||||
margin: 25px;
|
||||
}
|
||||
.request-filesystem-credentials-dialog-content input[type="text"],
|
||||
.request-filesystem-credentials-dialog-content input[type="password"]{
|
||||
width:85%;
|
||||
}
|
||||
|
||||
/* =Media Queries
|
||||
-------------------------------------------------------------- */
|
||||
|
||||
|
||||
@ -2913,10 +2913,6 @@ function wp_ajax_install_plugin() {
|
||||
if ( is_wp_error( $result ) ) {
|
||||
$status['error'] = $result->get_error_message();
|
||||
wp_send_json_error( $status );
|
||||
} else if ( is_null( $result ) ) {
|
||||
$status['errorCode'] = 'unable_to_connect_to_filesystem';
|
||||
$status['error'] = __( 'Unable to connect to the filesystem. Please confirm your credentials.' );
|
||||
wp_send_json_error( $status );
|
||||
}
|
||||
|
||||
$plugin_status = install_plugin_install_status( $api );
|
||||
@ -2958,16 +2954,17 @@ function wp_ajax_update_plugin() {
|
||||
|
||||
$upgrader = new Plugin_Upgrader( new Automatic_Upgrader_Skin() );
|
||||
$result = $upgrader->bulk_upgrade( array( $plugin ) );
|
||||
|
||||
if ( is_array( $result ) ) {
|
||||
wp_send_json_success( $status );
|
||||
} else if ( is_wp_error( $result ) ) {
|
||||
$result = $result[ $plugin ];
|
||||
}
|
||||
|
||||
if ( is_wp_error( $result ) ) {
|
||||
$status['error'] = $result->get_error_message();
|
||||
wp_send_json_error( $status );
|
||||
} else if ( is_bool( $result ) && ! $result ) {
|
||||
$status['errorCode'] = 'unable_to_connect_to_filesystem';
|
||||
$status['error'] = __( 'Unable to connect to the filesystem. Please confirm your credentials.' );
|
||||
wp_send_json_error( $status );
|
||||
}
|
||||
|
||||
wp_send_json_success( $status );
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -21,35 +21,6 @@ window.wp = window.wp || {};
|
||||
*/
|
||||
wp.updates.l10n = window._wpUpdatesSettings.l10n;
|
||||
|
||||
/**
|
||||
* Whether filesystem credentials need to be requested from the user.
|
||||
*
|
||||
* @since 4.2.0
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
wp.updates.shouldRequestFilesystemCredentials = window._wpUpdatesSettings.requestFilesystemCredentials;
|
||||
|
||||
/**
|
||||
* Filesystem credentials to be packaged along with the request.
|
||||
*
|
||||
* @since 4.2.0
|
||||
*
|
||||
* @var object
|
||||
*/
|
||||
wp.updates.filesystemCredentials = {
|
||||
ftp: {
|
||||
host: null,
|
||||
username: null,
|
||||
password: null,
|
||||
connectionType: null
|
||||
},
|
||||
ssh: {
|
||||
publicKey: null,
|
||||
privateKey: null
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Flag if we're waiting for an install/update to complete.
|
||||
*
|
||||
@ -59,15 +30,6 @@ window.wp = window.wp || {};
|
||||
*/
|
||||
wp.updates.updateLock = false;
|
||||
|
||||
/**
|
||||
* Flag if we've done an install or update successfully.
|
||||
*
|
||||
* @since 4.2.0
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
wp.updates.updateDoneSuccessfully = false;
|
||||
|
||||
/**
|
||||
* If the user tries to install/update a plugin while an install/update is
|
||||
* already happening, it can be placed in this queue to perform later.
|
||||
@ -162,14 +124,8 @@ window.wp = window.wp || {};
|
||||
|
||||
var data = {
|
||||
'_ajax_nonce': wp.updates.ajaxNonce,
|
||||
'plugin': plugin,
|
||||
'slug': slug,
|
||||
username: wp.updates.filesystemCredentials.ftp.username,
|
||||
password: wp.updates.filesystemCredentials.ftp.password,
|
||||
hostname: wp.updates.filesystemCredentials.ftp.hostname,
|
||||
connection_type: wp.updates.filesystemCredentials.ftp.connectionType,
|
||||
public_key: wp.updates.filesystemCredentials.ssh.publicKey,
|
||||
private_key: wp.updates.filesystemCredentials.ssh.privateKey
|
||||
'plugin': plugin,
|
||||
'slug': slug
|
||||
};
|
||||
|
||||
wp.ajax.post( 'update-plugin', data )
|
||||
@ -201,8 +157,6 @@ window.wp = window.wp || {};
|
||||
wp.a11y.speak( wp.updates.l10n.updatedMsg );
|
||||
|
||||
wp.updates.decrementCount( 'plugin' );
|
||||
|
||||
wp.updates.updateDoneSuccessfully = true;
|
||||
};
|
||||
|
||||
/**
|
||||
@ -214,11 +168,6 @@ window.wp = window.wp || {};
|
||||
*/
|
||||
wp.updates.updateError = function( response ) {
|
||||
var $message;
|
||||
wp.updates.updateDoneSuccessfully = false;
|
||||
if ( response.errorCode && response.errorCode == 'unable_to_connect_to_filesystem' ) {
|
||||
wp.updates.credentialError( response, 'update-plugin' );
|
||||
return;
|
||||
}
|
||||
if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
|
||||
$message = $( '#' + response.slug ).next().find( '.update-message' );
|
||||
} else if ( 'plugin-install' === pagenow ) {
|
||||
@ -229,21 +178,6 @@ window.wp = window.wp || {};
|
||||
wp.a11y.speak( wp.updates.l10n.updateFailed );
|
||||
};
|
||||
|
||||
/**
|
||||
* Show an
|
||||
*
|
||||
* @param {string} message
|
||||
* @since 4.2.0
|
||||
*/
|
||||
wp.updates.showErrorInCredentialsForm = function( message ) {
|
||||
var $notificationDialog = $( '.notification-dialog' );
|
||||
|
||||
// Remove any existing error
|
||||
$notificationDialog.find( '.error' ).remove();
|
||||
|
||||
$notificationDialog.find( 'h3' ).after( '<div class="error">' + message + '</div>' );
|
||||
};
|
||||
|
||||
/**
|
||||
* After an update attempt has completed, check the queue.
|
||||
*
|
||||
@ -282,14 +216,8 @@ window.wp = window.wp || {};
|
||||
wp.updates.updateLock = true;
|
||||
|
||||
var data = {
|
||||
'_ajax_nonce': wp.updates.ajaxNonce,
|
||||
'slug': slug,
|
||||
'username': wp.updates.filesystemCredentials.ftp.username,
|
||||
'password': wp.updates.filesystemCredentials.ftp.password,
|
||||
'hostname': wp.updates.filesystemCredentials.ftp.hostname,
|
||||
'connection_type': wp.updates.filesystemCredentials.ftp.connectionType,
|
||||
'public_key': wp.updates.filesystemCredentials.ssh.publicKey,
|
||||
'private_key': wp.updates.filesystemCredentials.ssh.privateKey
|
||||
'_ajax_nonce': wp.updates.ajaxNonce,
|
||||
'slug': slug
|
||||
};
|
||||
|
||||
wp.ajax.post( 'install-plugin', data )
|
||||
@ -311,7 +239,6 @@ window.wp = window.wp || {};
|
||||
$message.removeClass( 'updating-message' ).addClass( 'updated-message button-disabled' );
|
||||
$message.text( wp.updates.l10n.installed );
|
||||
wp.a11y.speak( wp.updates.l10n.installedMsg );
|
||||
wp.updates.updateDoneSuccessfully = true;
|
||||
};
|
||||
|
||||
/**
|
||||
@ -323,35 +250,11 @@ window.wp = window.wp || {};
|
||||
*/
|
||||
wp.updates.installError = function( response ) {
|
||||
var $message = $( '.plugin-card-' + response.slug ).find( '.install-now' );
|
||||
wp.updates.updateDoneSuccessfully = false;
|
||||
if ( response.errorCode && response.errorCode == 'unable_to_connect_to_filesystem' ) {
|
||||
wp.updates.credentialError( response, 'update-plugin' );
|
||||
return;
|
||||
}
|
||||
|
||||
$message.removeClass( 'updating-message' );
|
||||
$message.text( wp.updates.l10n.installNow );
|
||||
};
|
||||
|
||||
/**
|
||||
* Events that need to happen when there is a credential error
|
||||
*
|
||||
* @since 4.2.0
|
||||
*/
|
||||
wp.updates.credentialError = function( response, type ) {
|
||||
wp.updates.updateQueue.push( {
|
||||
'type': type,
|
||||
'data': {
|
||||
// Not cool that we're depending on response for this data.
|
||||
// This would feel more whole in a view all tied together.
|
||||
plugin: response.plugin,
|
||||
slug: response.slug
|
||||
}
|
||||
} );
|
||||
wp.updates.showErrorInCredentialsForm( response.error );
|
||||
wp.updates.requestFilesystemCredentials();
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* If an install/update job has been placed in the queue, queueChecker pulls it out and runs it.
|
||||
@ -378,47 +281,10 @@ window.wp = window.wp || {};
|
||||
break;
|
||||
}
|
||||
};
|
||||
/**
|
||||
* Request the users filesystem credentials if we don't have them already
|
||||
*
|
||||
* @since 4.2.0
|
||||
*/
|
||||
wp.updates.requestFilesystemCredentials = function() {
|
||||
if ( wp.updates.updateDoneSuccessfully === false ) {
|
||||
wp.updates.updateLock = true;
|
||||
$( 'body' ).addClass( 'modal-open' );
|
||||
$( '#request-filesystem-credentials-dialog' ).show();
|
||||
}
|
||||
};
|
||||
|
||||
// Bind various click handlers.
|
||||
$( document ).ready( function() {
|
||||
// File system credentials form submit noop-er / handler.
|
||||
$( '#request-filesystem-credentials-dialog form' ).on( 'submit', function() {
|
||||
// Persist the credentials input by the user for the duration of the page load.
|
||||
wp.updates.filesystemCredentials.ftp.hostname = $('#hostname').val();
|
||||
wp.updates.filesystemCredentials.ftp.username = $('#username').val();
|
||||
wp.updates.filesystemCredentials.ftp.password = $('#password').val();
|
||||
wp.updates.filesystemCredentials.ftp.connectionType = $('input[name="connection_type"]:checked').val();
|
||||
wp.updates.filesystemCredentials.ssh.publicKey = $('#public_key').val();
|
||||
wp.updates.filesystemCredentials.ssh.privateKey = $('#private_key').val();
|
||||
|
||||
$( '#request-filesystem-credentials-dialog' ).hide();
|
||||
$( 'body' ).removeClass( 'modal-open' );
|
||||
|
||||
// Unlock and invoke the queue.
|
||||
wp.updates.updateLock = false;
|
||||
wp.updates.queueChecker();
|
||||
|
||||
return false;
|
||||
});
|
||||
|
||||
// Click handler for plugin updates in List Table view.
|
||||
$( '.plugin-update-tr .update-link' ).on( 'click', function( e ) {
|
||||
e.preventDefault();
|
||||
if ( wp.updates.shouldRequestFilesystemCredentials === '1' && ! wp.updates.updateLock ) {
|
||||
wp.updates.requestFilesystemCredentials();
|
||||
}
|
||||
var $row = $( e.target ).parents( '.plugin-update-tr' );
|
||||
wp.updates.updatePlugin( $row.data( 'plugin' ), $row.data( 'slug' ) );
|
||||
} );
|
||||
@ -449,10 +315,6 @@ window.wp = window.wp || {};
|
||||
|
||||
$( '.plugin-card .install-now' ).on( 'click', function( e ) {
|
||||
e.preventDefault();
|
||||
if ( wp.updates.shouldRequestFilesystemCredentials === '1' && ! wp.updates.updateLock ) {
|
||||
wp.updates.requestFilesystemCredentials();
|
||||
}
|
||||
|
||||
var $button = $( e.target );
|
||||
if ( $button.hasClass( 'button-disabled' ) ) {
|
||||
return;
|
||||
|
||||
@ -128,16 +128,6 @@ if ( $tab !== 'upload' ) {
|
||||
*/
|
||||
do_action( "install_plugins_$tab", $paged ); ?>
|
||||
</div>
|
||||
|
||||
<div id="request-filesystem-credentials-dialog" class="notification-dialog-wrap request-filesystem-credentials-dialog">
|
||||
<div class="notification-dialog-background"></div>
|
||||
<div class="notification-dialog">
|
||||
<div class="request-filesystem-credentials-dialog-content">
|
||||
<?php request_filesystem_credentials( site_url() ); ?>
|
||||
<div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php
|
||||
/**
|
||||
* WordPress Administration Template Footer.
|
||||
|
||||
@ -475,13 +475,5 @@ do_action( 'pre_current_active_plugins', $plugins['all'] );
|
||||
|
||||
</div>
|
||||
|
||||
<div id="request-filesystem-credentials-dialog" class="notification-dialog-wrap request-filesystem-credentials-dialog">
|
||||
<div class="notification-dialog-background"></div>
|
||||
<div class="notification-dialog">
|
||||
<div class="request-filesystem-credentials-dialog-content">
|
||||
<?php request_filesystem_credentials( site_url() ); ?>
|
||||
<div>
|
||||
</div>
|
||||
</div>
|
||||
<?php
|
||||
include(ABSPATH . 'wp-admin/admin-footer.php');
|
||||
|
||||
@ -542,21 +542,8 @@ function wp_default_scripts( &$scripts ) {
|
||||
) );
|
||||
|
||||
$scripts->add( 'updates', "/wp-admin/js/updates$suffix.js", array( 'jquery', 'wp-util', 'wp-a11y' ) );
|
||||
|
||||
/*
|
||||
* Determine whether the user will need to enter filesystem credentials
|
||||
* on the front-end.
|
||||
*/
|
||||
require_once(ABSPATH . 'wp-admin/includes/file.php');
|
||||
$filesystem_method = get_filesystem_method();
|
||||
ob_start();
|
||||
$filesystem_credentials_are_stored = request_filesystem_credentials( self_admin_url() );
|
||||
ob_end_clean();
|
||||
$request_filesystem_credentials = ( $filesystem_method != 'direct' && ! $filesystem_credentials_are_stored ) ? 1 : 0;
|
||||
|
||||
did_action( 'init' ) && $scripts->localize( 'updates', '_wpUpdatesSettings', array(
|
||||
'ajax_nonce' => wp_create_nonce( 'updates' ),
|
||||
'requestFilesystemCredentials' => $request_filesystem_credentials,
|
||||
'l10n' => array(
|
||||
'updating' => __( 'Updating...' ),
|
||||
'updated' => __( 'Updated!' ),
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user