| ' . __( 'Title' ) . ' | ' . __( 'Type' ) . ' | ' . __( 'Date' ) . ' | ' . __( 'Status' ) . ' | |
|---|---|---|---|---|
| '; - $html .= ' | ' . esc_html( $post_types[$post->post_type]->labels->singular_name ) . ' | '.esc_html( $time ) . ' | ' . esc_html( $stat ). ' | |
| '; + $html .= ' | ' . esc_html( $post_types[ $post->post_type ]->labels->singular_name ) . ' | ' . esc_html( $time ) . ' | ' . esc_html( $stat ) . ' |
' . __('An error has occurred. Please reload the page and try again.') . '
'; + $multi_number = ! empty( $_POST['multi_number'] ) ? (int) $_POST['multi_number'] : 0; + $settings = isset( $_POST[ 'widget-' . $id_base ] ) && is_array( $_POST[ 'widget-' . $id_base ] ) ? $_POST[ 'widget-' . $id_base ] : false; + $error = '' . __( 'An error has occurred. Please reload the page and try again.' ) . '
'; $sidebars = wp_get_sidebars_widgets(); - $sidebar = isset($sidebars[$sidebar_id]) ? $sidebars[$sidebar_id] : array(); + $sidebar = isset( $sidebars[ $sidebar_id ] ) ? $sidebars[ $sidebar_id ] : array(); // Delete. - if ( isset($_POST['delete_widget']) && $_POST['delete_widget'] ) { + if ( isset( $_POST['delete_widget'] ) && $_POST['delete_widget'] ) { - if ( !isset($wp_registered_widgets[$widget_id]) ) + if ( ! isset( $wp_registered_widgets[ $widget_id ] ) ) { wp_die( $error ); + } - $sidebar = array_diff( $sidebar, array($widget_id) ); - $_POST = array('sidebar' => $sidebar_id, 'widget-' . $id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1'); + $sidebar = array_diff( $sidebar, array( $widget_id ) ); + $_POST = array( + 'sidebar' => $sidebar_id, + 'widget-' . $id_base => array(), + 'the-widget-id' => $widget_id, + 'delete_widget' => '1', + ); /** This action is documented in wp-admin/widgets.php */ do_action( 'delete_widget', $widget_id, $sidebar_id, $id_base ); - } elseif ( $settings && preg_match( '/__i__|%i%/', key($settings) ) ) { - if ( !$multi_number ) + } elseif ( $settings && preg_match( '/__i__|%i%/', key( $settings ) ) ) { + if ( ! $multi_number ) { wp_die( $error ); + } - $_POST[ 'widget-' . $id_base ] = array( $multi_number => reset( $settings ) ); + $_POST[ 'widget-' . $id_base ] = array( + $multi_number => reset( $settings ), + ); $widget_id = $id_base . '-' . $multi_number; $sidebar[] = $widget_id; } @@ -1970,8 +2145,9 @@ foreach ( (array) $wp_registered_widget_updates as $name => $control ) { if ( $name == $id_base ) { - if ( !is_callable( $control['callback'] ) ) + if ( ! is_callable( $control['callback'] ) ) { continue; + } ob_start(); call_user_func_array( $control['callback'], $control['params'] ); @@ -1980,18 +2156,20 @@ } } - if ( isset($_POST['delete_widget']) && $_POST['delete_widget'] ) { - $sidebars[$sidebar_id] = $sidebar; - wp_set_sidebars_widgets($sidebars); + if ( isset( $_POST['delete_widget'] ) && $_POST['delete_widget'] ) { + $sidebars[ $sidebar_id ] = $sidebar; + wp_set_sidebars_widgets( $sidebars ); echo "deleted:$widget_id"; wp_die(); } - if ( !empty($_POST['add_new']) ) + if ( ! empty( $_POST['add_new'] ) ) { wp_die(); + } - if ( $form = $wp_registered_widget_controls[$widget_id] ) + if ( $form = $wp_registered_widget_controls[ $widget_id ] ) { call_user_func_array( $form['callback'], $form['params'] ); + } wp_die(); } @@ -2035,9 +2213,9 @@ $multi_number = array_pop( $pieces ); $id_base = implode( '-', $pieces ); $widget = get_option( 'widget_' . $id_base ); - unset( $widget[$multi_number] ); + unset( $widget[ $multi_number ] ); update_option( 'widget_' . $id_base, $widget ); - unset( $sidebars_widgets['wp_inactive_widgets'][$key] ); + unset( $sidebars_widgets['wp_inactive_widgets'][ $key ] ); } wp_set_sidebars_widgets( $sidebars_widgets ); @@ -2064,7 +2242,7 @@ 'data' => array( 'message' => __( 'Sorry, you are not allowed to upload files.' ), 'filename' => $_FILES['async-upload']['name'], - ) + ), ) ); wp_die(); @@ -2078,7 +2256,7 @@ 'data' => array( 'message' => __( 'Sorry, you are not allowed to attach files to this post.' ), 'filename' => $_FILES['async-upload']['name'], - ) + ), ) ); wp_die(); @@ -2098,7 +2276,7 @@ 'data' => array( 'message' => __( 'The uploaded file is not a valid image. Please try again.' ), 'filename' => $_FILES['async-upload']['name'], - ) + ), ) ); wp_die(); @@ -2113,22 +2291,25 @@ 'data' => array( 'message' => $attachment_id->get_error_message(), 'filename' => $_FILES['async-upload']['name'], - ) + ), ) ); wp_die(); } if ( isset( $post_data['context'] ) && isset( $post_data['theme'] ) ) { - if ( 'custom-background' === $post_data['context'] ) + if ( 'custom-background' === $post_data['context'] ) { update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', $post_data['theme'] ); + } - if ( 'custom-header' === $post_data['context'] ) + if ( 'custom-header' === $post_data['context'] ) { update_post_meta( $attachment_id, '_wp_attachment_is_custom_header', $post_data['theme'] ); + } } - if ( ! $attachment = wp_prepare_attachment_for_js( $attachment_id ) ) + if ( ! $attachment = wp_prepare_attachment_for_js( $attachment_id ) ) { wp_die(); + } echo wp_json_encode( array( 'success' => true, @@ -2144,9 +2325,10 @@ * @since 3.1.0 */ function wp_ajax_image_editor() { - $attachment_id = intval($_POST['postid']); - if ( empty($attachment_id) || !current_user_can('edit_post', $attachment_id) ) + $attachment_id = intval( $_POST['postid'] ); + if ( empty( $attachment_id ) || ! current_user_can( 'edit_post', $attachment_id ) ) { wp_die( -1 ); + } check_ajax_referer( "image_editor-$attachment_id" ); include_once( ABSPATH . 'wp-admin/includes/image-edit.php' ); @@ -2154,19 +2336,19 @@ $msg = false; switch ( $_POST['do'] ) { case 'save' : - $msg = wp_save_image($attachment_id); - $msg = wp_json_encode($msg); + $msg = wp_save_image( $attachment_id ); + $msg = wp_json_encode( $msg ); wp_die( $msg ); break; case 'scale' : - $msg = wp_save_image($attachment_id); + $msg = wp_save_image( $attachment_id ); break; case 'restore' : - $msg = wp_restore_image($attachment_id); + $msg = wp_restore_image( $attachment_id ); break; } - wp_image_editor($attachment_id, $msg); + wp_image_editor( $attachment_id, $msg ); wp_die(); } @@ -2179,15 +2361,16 @@ $json = ! empty( $_REQUEST['json'] ); // New-style request $post_ID = intval( $_POST['post_id'] ); - if ( ! current_user_can( 'edit_post', $post_ID ) ) + if ( ! current_user_can( 'edit_post', $post_ID ) ) { wp_die( -1 ); + } $thumbnail_id = intval( $_POST['thumbnail_id'] ); - if ( $json ) + if ( $json ) { check_ajax_referer( "update-post_$post_ID" ); - else - check_ajax_referer( "set_post_thumbnail-$post_ID" ); + } else { check_ajax_referer( "set_post_thumbnail-$post_ID" ); + } if ( $thumbnail_id == '-1' ) { if ( delete_post_thumbnail( $post_ID ) ) { @@ -2311,10 +2494,11 @@ $post = null; - if ( $post_id ) + if ( $post_id ) { $post = get_post( $post_id ); + } - check_ajax_referer('update-post_' . $post_id, '_wpnonce'); + check_ajax_referer( 'update-post_' . $post_id, '_wpnonce' ); $post_id = edit_post(); @@ -2332,12 +2516,14 @@ if ( $last_id = get_post_meta( $post_id, '_edit_last', true ) ) { $last_user = get_userdata( $last_id ); - $last_edited = sprintf( __('Last edited by %1$s on %2$s at %3$s'), esc_html( $last_user->display_name ), $last_date, $last_time ); + $last_edited = sprintf( __( 'Last edited by %1$s on %2$s at %3$s' ), esc_html( $last_user->display_name ), $last_date, $last_time ); } else { - $last_edited = sprintf( __('Last edited on %1$s at %2$s'), $last_date, $last_time ); + $last_edited = sprintf( __( 'Last edited on %1$s at %2$s' ), $last_date, $last_time ); } - wp_send_json_success( array( 'last_edited' => $last_edited ) ); + wp_send_json_success( array( + 'last_edited' => $last_edited, + ) ); } /** @@ -2346,20 +2532,24 @@ * @since 3.1.0 */ function wp_ajax_wp_remove_post_lock() { - if ( empty( $_POST['post_ID'] ) || empty( $_POST['active_post_lock'] ) ) + if ( empty( $_POST['post_ID'] ) || empty( $_POST['active_post_lock'] ) ) { wp_die( 0 ); + } $post_id = (int) $_POST['post_ID']; - if ( ! $post = get_post( $post_id ) ) + if ( ! $post = get_post( $post_id ) ) { wp_die( 0 ); + } check_ajax_referer( 'update-post_' . $post_id ); - if ( ! current_user_can( 'edit_post', $post_id ) ) + if ( ! current_user_can( 'edit_post', $post_id ) ) { wp_die( -1 ); + } $active_lock = array_map( 'absint', explode( ':', $_POST['active_post_lock'] ) ); - if ( $active_lock[1] != get_current_user_id() ) + if ( $active_lock[1] != get_current_user_id() ) { wp_die( 0 ); + } /** * Filters the post lock window duration. @@ -2381,15 +2571,17 @@ */ function wp_ajax_dismiss_wp_pointer() { $pointer = $_POST['pointer']; - if ( $pointer != sanitize_key( $pointer ) ) + if ( $pointer != sanitize_key( $pointer ) ) { wp_die( 0 ); + } -// check_ajax_referer( 'dismiss-pointer_' . $pointer ); + // check_ajax_referer( 'dismiss-pointer_' . $pointer ); $dismissed = array_filter( explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) ) ); - if ( in_array( $pointer, $dismissed ) ) + if ( in_array( $pointer, $dismissed ) ) { wp_die( 0 ); + } $dismissed[] = $pointer; $dismissed = implode( ',', $dismissed ); @@ -2404,23 +2596,29 @@ * @since 3.5.0 */ function wp_ajax_get_attachment() { - if ( ! isset( $_REQUEST['id'] ) ) + if ( ! isset( $_REQUEST['id'] ) ) { wp_send_json_error(); + } - if ( ! $id = absint( $_REQUEST['id'] ) ) + if ( ! $id = absint( $_REQUEST['id'] ) ) { wp_send_json_error(); + } - if ( ! $post = get_post( $id ) ) + if ( ! $post = get_post( $id ) ) { wp_send_json_error(); + } - if ( 'attachment' != $post->post_type ) + if ( 'attachment' != $post->post_type ) { wp_send_json_error(); + } - if ( ! current_user_can( 'upload_files' ) ) + if ( ! current_user_can( 'upload_files' ) ) { wp_send_json_error(); + } - if ( ! $attachment = wp_prepare_attachment_for_js( $id ) ) + if ( ! $attachment = wp_prepare_attachment_for_js( $id ) ) { wp_send_json_error(); + } wp_send_json_success( $attachment ); } @@ -2431,13 +2629,23 @@ * @since 3.5.0 */ function wp_ajax_query_attachments() { - if ( ! current_user_can( 'upload_files' ) ) + if ( ! current_user_can( 'upload_files' ) ) { wp_send_json_error(); + } $query = isset( $_REQUEST['query'] ) ? (array) $_REQUEST['query'] : array(); $keys = array( - 's', 'order', 'orderby', 'posts_per_page', 'paged', 'post_mime_type', - 'post_parent', 'post__in', 'post__not_in', 'year', 'monthnum' + 's', + 'order', + 'orderby', + 'posts_per_page', + 'paged', + 'post_mime_type', + 'post_parent', + 'post__in', + 'post__not_in', + 'year', + 'monthnum', ); foreach ( get_taxonomies_for_attachments( 'objects' ) as $t ) { if ( $t->query_var && isset( $query[ $t->query_var ] ) ) { @@ -2455,8 +2663,9 @@ $query['post_status'] = 'inherit'; } - if ( current_user_can( get_post_type_object( 'attachment' )->cap->read_private_posts ) ) + if ( current_user_can( get_post_type_object( 'attachment' )->cap->read_private_posts ) ) { $query['post_status'] .= ',private'; + } // Filter query clauses to include filenames. if ( isset( $query['s'] ) ) { @@ -2488,37 +2697,46 @@ * @since 3.5.0 */ function wp_ajax_save_attachment() { - if ( ! isset( $_REQUEST['id'] ) || ! isset( $_REQUEST['changes'] ) ) + if ( ! isset( $_REQUEST['id'] ) || ! isset( $_REQUEST['changes'] ) ) { wp_send_json_error(); + } - if ( ! $id = absint( $_REQUEST['id'] ) ) + if ( ! $id = absint( $_REQUEST['id'] ) ) { wp_send_json_error(); + } check_ajax_referer( 'update-post_' . $id, 'nonce' ); - if ( ! current_user_can( 'edit_post', $id ) ) + if ( ! current_user_can( 'edit_post', $id ) ) { wp_send_json_error(); + } $changes = $_REQUEST['changes']; $post = get_post( $id, ARRAY_A ); - if ( 'attachment' != $post['post_type'] ) + if ( 'attachment' != $post['post_type'] ) { wp_send_json_error(); + } - if ( isset( $changes['parent'] ) ) + if ( isset( $changes['parent'] ) ) { $post['post_parent'] = $changes['parent']; + } - if ( isset( $changes['title'] ) ) + if ( isset( $changes['title'] ) ) { $post['post_title'] = $changes['title']; + } - if ( isset( $changes['caption'] ) ) + if ( isset( $changes['caption'] ) ) { $post['post_excerpt'] = $changes['caption']; + } - if ( isset( $changes['description'] ) ) + if ( isset( $changes['description'] ) ) { $post['post_content'] = $changes['description']; + } - if ( MEDIA_TRASH && isset( $changes['status'] ) ) + if ( MEDIA_TRASH && isset( $changes['status'] ) ) { $post['post_status'] = $changes['status']; + } if ( isset( $changes['alt'] ) ) { $alt = wp_unslash( $changes['alt'] ); @@ -2562,25 +2780,30 @@ * @since 3.5.0 */ function wp_ajax_save_attachment_compat() { - if ( ! isset( $_REQUEST['id'] ) ) + if ( ! isset( $_REQUEST['id'] ) ) { wp_send_json_error(); + } - if ( ! $id = absint( $_REQUEST['id'] ) ) + if ( ! $id = absint( $_REQUEST['id'] ) ) { wp_send_json_error(); + } - if ( empty( $_REQUEST['attachments'] ) || empty( $_REQUEST['attachments'][ $id ] ) ) + if ( empty( $_REQUEST['attachments'] ) || empty( $_REQUEST['attachments'][ $id ] ) ) { wp_send_json_error(); + } $attachment_data = $_REQUEST['attachments'][ $id ]; check_ajax_referer( 'update-post_' . $id, 'nonce' ); - if ( ! current_user_can( 'edit_post', $id ) ) + if ( ! current_user_can( 'edit_post', $id ) ) { wp_send_json_error(); + } $post = get_post( $id, ARRAY_A ); - if ( 'attachment' != $post['post_type'] ) + if ( 'attachment' != $post['post_type'] ) { wp_send_json_error(); + } /** This filter is documented in wp-admin/includes/media.php */ $post = apply_filters( 'attachment_fields_to_save', $post, $attachment_data ); @@ -2593,12 +2816,14 @@ wp_update_post( $post ); foreach ( get_attachment_taxonomies( $post ) as $taxonomy ) { - if ( isset( $attachment_data[ $taxonomy ] ) ) + if ( isset( $attachment_data[ $taxonomy ] ) ) { wp_set_object_terms( $id, array_map( 'trim', preg_split( '/,+/', $attachment_data[ $taxonomy ] ) ), $taxonomy, false ); + } } - if ( ! $attachment = wp_prepare_attachment_for_js( $id ) ) + if ( ! $attachment = wp_prepare_attachment_for_js( $id ) ) { wp_send_json_error(); + } wp_send_json_success( $attachment ); } @@ -2609,31 +2834,41 @@ * @since 3.5.0 */ function wp_ajax_save_attachment_order() { - if ( ! isset( $_REQUEST['post_id'] ) ) + if ( ! isset( $_REQUEST['post_id'] ) ) { wp_send_json_error(); + } - if ( ! $post_id = absint( $_REQUEST['post_id'] ) ) + if ( ! $post_id = absint( $_REQUEST['post_id'] ) ) { wp_send_json_error(); + } - if ( empty( $_REQUEST['attachments'] ) ) + if ( empty( $_REQUEST['attachments'] ) ) { wp_send_json_error(); + } check_ajax_referer( 'update-post_' . $post_id, 'nonce' ); $attachments = $_REQUEST['attachments']; - if ( ! current_user_can( 'edit_post', $post_id ) ) + if ( ! current_user_can( 'edit_post', $post_id ) ) { wp_send_json_error(); + } foreach ( $attachments as $attachment_id => $menu_order ) { - if ( ! current_user_can( 'edit_post', $attachment_id ) ) + if ( ! current_user_can( 'edit_post', $attachment_id ) ) { continue; - if ( ! $attachment = get_post( $attachment_id ) ) + } + if ( ! $attachment = get_post( $attachment_id ) ) { continue; - if ( 'attachment' != $attachment->post_type ) + } + if ( 'attachment' != $attachment->post_type ) { continue; + } - wp_update_post( array( 'ID' => $attachment_id, 'menu_order' => $menu_order ) ); + wp_update_post( array( + 'ID' => $attachment_id, + 'menu_order' => $menu_order, + ) ); } wp_send_json_success(); @@ -2655,21 +2890,26 @@ $id = intval( $attachment['id'] ); - if ( ! $post = get_post( $id ) ) + if ( ! $post = get_post( $id ) ) { wp_send_json_error(); + } - if ( 'attachment' != $post->post_type ) + if ( 'attachment' != $post->post_type ) { wp_send_json_error(); + } if ( current_user_can( 'edit_post', $id ) ) { // If this attachment is unattached, attach it. Primarily a back compat thing. if ( 0 == $post->post_parent && $insert_into_post_id = intval( $_POST['post_id'] ) ) { - wp_update_post( array( 'ID' => $id, 'post_parent' => $insert_into_post_id ) ); + wp_update_post( array( + 'ID' => $id, + 'post_parent' => $insert_into_post_id, + ) ); } } $url = empty( $attachment['url'] ) ? '' : $attachment['url']; - $rel = ( strpos( $url, 'attachment_id') || get_attachment_link( $id ) == $url ); + $rel = ( strpos( $url, 'attachment_id' ) || get_attachment_link( $id ) == $url ); remove_filter( 'media_send_to_editor', 'image_media_send_to_editor' ); @@ -2686,7 +2926,7 @@ $title = ''; // We no longer insert title tags into\n"; - else - echo "
$string
\n"; + } else { echo "$string
\n"; + } } /** @@ -89,47 +94,48 @@ * * @param string|WP_Error $error */ - public function error($error) { - if ( is_string($error) && isset( $this->upgrader->strings[$error] ) ) - $this->error = $this->upgrader->strings[$error]; + public function error( $error ) { + if ( is_string( $error ) && isset( $this->upgrader->strings[ $error ] ) ) { + $this->error = $this->upgrader->strings[ $error ]; + } - if ( is_wp_error($error) ) { + if ( is_wp_error( $error ) ) { $messages = array(); foreach ( $error->get_error_messages() as $emessage ) { - if ( $error->get_error_data() && is_string( $error->get_error_data() ) ) + if ( $error->get_error_data() && is_string( $error->get_error_data() ) ) { $messages[] = $emessage . ' ' . esc_html( strip_tags( $error->get_error_data() ) ); - else - $messages[] = $emessage; + } else { $messages[] = $emessage; + } } - $this->error = implode(', ', $messages); + $this->error = implode( ', ', $messages ); } - echo ''; + echo ''; } /** * @access public */ public function bulk_header() { - $this->feedback('skin_upgrade_start'); + $this->feedback( 'skin_upgrade_start' ); } /** * @access public */ public function bulk_footer() { - $this->feedback('skin_upgrade_end'); + $this->feedback( 'skin_upgrade_end' ); } /** * * @param string $title */ - public function before($title = '') { + public function before( $title = '' ) { $this->in_loop = true; printf( '' . $this->upgrader->strings['skin_before_update_header'] . '
', $title, $this->upgrader->update_current, $this->upgrader->update_count ); - echo ''; + echo ''; // This progress messages div gets moved via JavaScript when clicking on "Show details.". - echo ''; } - echo ''; + echo ''; } $this->reset(); Index: src/wp-admin/includes/class-core-upgrader.php =================================================================== --- src/wp-admin/includes/class-core-upgrader.php (revision 40901) +++ src/wp-admin/includes/class-core-upgrader.php (working copy) @@ -27,13 +27,13 @@ * @access public */ public function upgrade_strings() { - $this->strings['up_to_date'] = __('WordPress is at the latest version.'); - $this->strings['locked'] = __('Another update is currently in progress.'); - $this->strings['no_package'] = __('Update package not available.'); - $this->strings['downloading_package'] = __('Downloading update from %s…'); - $this->strings['unpack_package'] = __('Unpacking the update…'); - $this->strings['copy_failed'] = __('Could not copy files.'); - $this->strings['copy_failed_space'] = __('Could not copy files. You may have run out of disk space.' ); + $this->strings['up_to_date'] = __( 'WordPress is at the latest version.' ); + $this->strings['locked'] = __( 'Another update is currently in progress.' ); + $this->strings['no_package'] = __( 'Update package not available.' ); + $this->strings['downloading_package'] = __( 'Downloading update from %s…' ); + $this->strings['unpack_package'] = __( 'Unpacking the update…' ); + $this->strings['copy_failed'] = __( 'Could not copy files.' ); + $this->strings['copy_failed_space'] = __( 'Could not copy files. You may have run out of disk space.' ); $this->strings['start_rollback'] = __( 'Attempting to roll back to previous version.' ); $this->strings['rollback_was_required'] = __( 'Due to an error during updating, WordPress has rolled back to your previous version.' ); } @@ -79,21 +79,23 @@ $this->upgrade_strings(); // Is an update available? - if ( !isset( $current->response ) || $current->response == 'latest' ) - return new WP_Error('up_to_date', $this->strings['up_to_date']); + if ( ! isset( $current->response ) || $current->response == 'latest' ) { + return new WP_Error( 'up_to_date', $this->strings['up_to_date'] ); + } $res = $this->fs_connect( array( ABSPATH, WP_CONTENT_DIR ), $parsed_args['allow_relaxed_file_ownership'] ); if ( ! $res || is_wp_error( $res ) ) { return $res; } - $wp_dir = trailingslashit($wp_filesystem->abspath()); + $wp_dir = trailingslashit( $wp_filesystem->abspath() ); $partial = true; - if ( $parsed_args['do_rollback'] ) + if ( $parsed_args['do_rollback'] ) { $partial = false; - elseif ( $parsed_args['pre_check_md5'] && ! $this->check_files() ) + } elseif ( $parsed_args['pre_check_md5'] && ! $this->check_files() ) { $partial = false; + } /* * If partial update is returned from the API, use that, unless we're doing @@ -101,17 +103,17 @@ * the new_bundled zip. Don't though if the constant is set to skip bundled items. * If the API returns a no_content zip, go with it. Finally, default to the full zip. */ - if ( $parsed_args['do_rollback'] && $current->packages->rollback ) + if ( $parsed_args['do_rollback'] && $current->packages->rollback ) { $to_download = 'rollback'; - elseif ( $current->packages->partial && 'reinstall' != $current->response && $wp_version == $current->partial_version && $partial ) + } elseif ( $current->packages->partial && 'reinstall' != $current->response && $wp_version == $current->partial_version && $partial ) { $to_download = 'partial'; - elseif ( $current->packages->new_bundled && version_compare( $wp_version, $current->new_bundled, '<' ) - && ( ! defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) ) + } elseif ( $current->packages->new_bundled && version_compare( $wp_version, $current->new_bundled, '<' ) + && ( ! defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) ) { $to_download = 'new_bundled'; - elseif ( $current->packages->no_content ) + } elseif ( $current->packages->no_content ) { $to_download = 'no_content'; - else - $to_download = 'full'; + } else { $to_download = 'full'; + } // Lock to prevent multiple Core Updates occurring $lock = WP_Upgrader::create_lock( 'core_updater', 15 * MINUTE_IN_SECONDS ); @@ -132,12 +134,12 @@ } // Copy update-core.php from the new version into place. - if ( !$wp_filesystem->copy($working_dir . '/wordpress/wp-admin/includes/update-core.php', $wp_dir . 'wp-admin/includes/update-core.php', true) ) { - $wp_filesystem->delete($working_dir, true); + if ( ! $wp_filesystem->copy( $working_dir . '/wordpress/wp-admin/includes/update-core.php', $wp_dir . 'wp-admin/includes/update-core.php', true ) ) { + $wp_filesystem->delete( $working_dir, true ); WP_Upgrader::release_lock( 'core_updater' ); return new WP_Error( 'copy_failed_for_update_core_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), 'wp-admin/includes/update-core.php' ); } - $wp_filesystem->chmod($wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE); + $wp_filesystem->chmod( $wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE ); require_once( ABSPATH . 'wp-admin/includes/update-core.php' ); @@ -158,12 +160,13 @@ * mkdir_failed__copy_dir, copy_failed__copy_dir_retry, and disk_full. * do_rollback allows for update_core() to trigger a rollback if needed. */ - if ( false !== strpos( $error_code, 'do_rollback' ) ) + if ( false !== strpos( $error_code, 'do_rollback' ) ) { $try_rollback = true; - elseif ( false !== strpos( $error_code, '__copy_dir' ) ) + } elseif ( false !== strpos( $error_code, '__copy_dir' ) ) { $try_rollback = true; - elseif ( 'disk_full' === $error_code ) + } elseif ( 'disk_full' === $error_code ) { $try_rollback = true; + } } if ( $try_rollback ) { @@ -173,15 +176,23 @@ /** This filter is documented in wp-admin/includes/update-core.php */ apply_filters( 'update_feedback', $this->strings['start_rollback'] ); - $rollback_result = $this->upgrade( $current, array_merge( $parsed_args, array( 'do_rollback' => true ) ) ); + $rollback_result = $this->upgrade( $current, array_merge( $parsed_args, array( + 'do_rollback' => true, + ) ) ); $original_result = $result; - $result = new WP_Error( 'rollback_was_required', $this->strings['rollback_was_required'], (object) array( 'update' => $original_result, 'rollback' => $rollback_result ) ); + $result = new WP_Error( 'rollback_was_required', $this->strings['rollback_was_required'], (object) array( + 'update' => $original_result, + 'rollback' => $rollback_result, + ) ); } - } + }// End if(). /** This action is documented in wp-admin/includes/class-wp-upgrader.php */ - do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'core' ) ); + do_action( 'upgrader_process_complete', $this, array( + 'action' => 'update', + 'type' => 'core', + ) ); // Clear the current updates delete_site_transient( 'update_core' ); @@ -192,7 +203,7 @@ 'success' => true, 'fs_method' => $wp_filesystem->method, 'fs_method_forced' => defined( 'FS_METHOD' ) || has_filter( 'filesystem_method' ), - 'fs_method_direct' => !empty( $GLOBALS['_wp_filesystem_direct_method'] ) ? $GLOBALS['_wp_filesystem_direct_method'] : '', + 'fs_method_direct' => ! empty( $GLOBALS['_wp_filesystem_direct_method'] ) ? $GLOBALS['_wp_filesystem_direct_method'] : '', 'time_taken' => time() - $start_time, 'reported' => $wp_version, 'attempted' => $current->version, @@ -238,7 +249,7 @@ public static function should_update_to_version( $offered_ver ) { include( ABSPATH . WPINC . '/version.php' ); // $wp_version; // x.y.z - $current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y + $current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y $new_branch = implode( '.', array_slice( preg_split( '/[.-]/', $offered_ver ), 0, 2 ) ); // x.y $current_is_development_version = (bool) strpos( $wp_version, '-' ); @@ -263,28 +274,33 @@ } // 1: If we're already on that version, not much point in updating? - if ( $offered_ver == $wp_version ) + if ( $offered_ver == $wp_version ) { return false; + } // 2: If we're running a newer version, that's a nope - if ( version_compare( $wp_version, $offered_ver, '>' ) ) + if ( version_compare( $wp_version, $offered_ver, '>' ) ) { return false; + } $failure_data = get_site_option( 'auto_core_update_failed' ); if ( $failure_data ) { // If this was a critical update failure, cannot update. - if ( ! empty( $failure_data['critical'] ) ) + if ( ! empty( $failure_data['critical'] ) ) { return false; + } // Don't claim we can update on update-core.php if we have a non-critical failure logged. - if ( $wp_version == $failure_data['current'] && false !== strpos( $offered_ver, '.1.next.minor' ) ) + if ( $wp_version == $failure_data['current'] && false !== strpos( $offered_ver, '.1.next.minor' ) ) { return false; + } // Cannot update if we're retrying the same A to B update that caused a non-critical failure. // Some non-critical failures do allow retries, like download_failed. // 3.7.1 => 3.7.2 resulted in files_not_writable, if we are still on 3.7.1 and still trying to update to 3.7.2. - if ( empty( $failure_data['retry'] ) && $wp_version == $failure_data['current'] && $offered_ver == $failure_data['attempted'] ) + if ( empty( $failure_data['retry'] ) && $wp_version == $failure_data['current'] && $offered_ver == $failure_data['attempted'] ) { return false; + } } // 3: 3.7-alpha-25000 -> 3.7-alpha-25678 -> 3.7-beta1 -> 3.7-beta2 @@ -298,9 +314,9 @@ * @param bool $upgrade_dev Whether to enable automatic updates for * development versions. */ - if ( ! apply_filters( 'allow_dev_auto_core_updates', $upgrade_dev ) ) + if ( ! apply_filters( 'allow_dev_auto_core_updates', $upgrade_dev ) ) { return false; - // Else fall through to minor + major branches below. + } } // 4: Minor In-branch updates (3.7.0 -> 3.7.1 -> 3.7.2 -> 3.7.4) @@ -349,15 +365,18 @@ $checksums = get_core_checksums( $wp_version, isset( $wp_local_package ) ? $wp_local_package : 'en_US' ); - if ( ! is_array( $checksums ) ) + if ( ! is_array( $checksums ) ) { return false; + } foreach ( $checksums as $file => $checksum ) { // Skip files which get updated - if ( 'wp-content' == substr( $file, 0, 10 ) ) + if ( 'wp-content' == substr( $file, 0, 10 ) ) { continue; - if ( ! file_exists( ABSPATH . $file ) || md5_file( ABSPATH . $file ) !== $checksum ) + } + if ( ! file_exists( ABSPATH . $file ) || md5_file( ABSPATH . $file ) !== $checksum ) { return false; + } } return true; Index: src/wp-admin/includes/class-file-upload-upgrader.php =================================================================== --- src/wp-admin/includes/class-file-upload-upgrader.php (revision 40901) +++ src/wp-admin/includes/class-file-upload-upgrader.php (working copy) @@ -56,18 +56,23 @@ */ public function __construct( $form, $urlholder ) { - if ( empty($_FILES[$form]['name']) && empty($_GET[$urlholder]) ) - wp_die(__('Please select a file')); + if ( empty( $_FILES[ $form ]['name'] ) && empty( $_GET[ $urlholder ] ) ) { + wp_die( __( 'Please select a file' ) ); + } //Handle a newly uploaded file, Else assume it's already been uploaded - if ( ! empty($_FILES) ) { - $overrides = array( 'test_form' => false, 'test_type' => false ); - $file = wp_handle_upload( $_FILES[$form], $overrides ); + if ( ! empty( $_FILES ) ) { + $overrides = array( + 'test_form' => false, + 'test_type' => false, + ); + $file = wp_handle_upload( $_FILES[ $form ], $overrides ); - if ( isset( $file['error'] ) ) + if ( isset( $file['error'] ) ) { wp_die( $file['error'] ); + } - $this->filename = $_FILES[$form]['name']; + $this->filename = $_FILES[ $form ]['name']; $this->package = $file['file']; // Construct the object array @@ -77,7 +82,7 @@ 'post_mime_type' => $file['type'], 'guid' => $file['url'], 'context' => 'upgrader', - 'post_status' => 'private' + 'post_status' => 'private', ); // Save the data. @@ -86,19 +91,21 @@ // Schedule a cleanup for 2 hours from now in case of failed install. wp_schedule_single_event( time() + 2 * HOUR_IN_SECONDS, 'upgrader_scheduled_cleanup', array( $this->id ) ); - } elseif ( is_numeric( $_GET[$urlholder] ) ) { + } elseif ( is_numeric( $_GET[ $urlholder ] ) ) { // Numeric Package = previously uploaded file, see above. - $this->id = (int) $_GET[$urlholder]; + $this->id = (int) $_GET[ $urlholder ]; $attachment = get_post( $this->id ); - if ( empty($attachment) ) - wp_die(__('Please select a file')); + if ( empty( $attachment ) ) { + wp_die( __( 'Please select a file' ) ); + } $this->filename = $attachment->post_title; $this->package = get_attached_file( $attachment->ID ); } else { // Else, It's set to something, Back compat for plugins using the old (pre-3.3) File_Uploader handler. - if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) ) + if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) ) { wp_die( $uploads['error'] ); + } $this->filename = sanitize_file_name( $_GET[ $urlholder ] ); $this->package = $uploads['basedir'] . '/' . $this->filename; @@ -106,7 +113,7 @@ if ( 0 !== strpos( realpath( $this->package ), realpath( $uploads['basedir'] ) ) ) { wp_die( __( 'Please select a file' ) ); } - } + }// End if(). } /** @@ -118,11 +125,12 @@ * @return bool Whether the cleanup was successful. */ public function cleanup() { - if ( $this->id ) + if ( $this->id ) { wp_delete_attachment( $this->id ); - elseif ( file_exists( $this->package ) ) + } elseif ( file_exists( $this->package ) ) { return @unlink( $this->package ); + } return true; } Index: src/wp-admin/includes/class-language-pack-upgrader-skin.php =================================================================== --- src/wp-admin/includes/class-language-pack-upgrader-skin.php (revision 40901) +++ src/wp-admin/includes/class-language-pack-upgrader-skin.php (working copy) @@ -26,7 +26,12 @@ * @param array $args */ public function __construct( $args = array() ) { - $defaults = array( 'url' => '', 'nonce' => '', 'title' => __( 'Update Translations' ), 'skip_header_footer' => false ); + $defaults = array( + 'url' => '', + 'nonce' => '', + 'title' => __( 'Update Translations' ), + 'skip_header_footer' => false, + ); $args = wp_parse_args( $args, $defaults ); if ( $args['skip_header_footer'] ) { $this->done_header = true; @@ -81,7 +86,8 @@ */ $update_actions = apply_filters( 'update_translations_complete_actions', $update_actions ); - if ( $update_actions && $this->display_footer_actions ) + if ( $update_actions && $this->display_footer_actions ) { $this->feedback( implode( ' | ', $update_actions ) ); + } } } Index: src/wp-admin/includes/class-language-pack-upgrader.php =================================================================== --- src/wp-admin/includes/class-language-pack-upgrader.php (revision 40901) +++ src/wp-admin/includes/class-language-pack-upgrader.php (working copy) @@ -176,8 +176,9 @@ $this->init(); $this->upgrade_strings(); - if ( ! $language_updates ) + if ( ! $language_updates ) { $language_updates = wp_get_translation_updates(); + } if ( empty( $language_updates ) ) { $this->skin->header(); @@ -188,8 +189,9 @@ return true; } - if ( 'upgrader_process_complete' == current_filter() ) + if ( 'upgrader_process_complete' == current_filter() ) { $this->skin->feedback( 'starting_upgrade' ); + } // Remove any existing upgrade filters from the plugin/theme upgraders #WP29425 & #WP29230 remove_all_filters( 'upgrader_pre_install' ); @@ -218,9 +220,11 @@ * as we then may need to create a /plugins or /themes directory inside of it. */ $remote_destination = $wp_filesystem->find_folder( WP_LANG_DIR ); - if ( ! $wp_filesystem->exists( $remote_destination ) ) - if ( ! $wp_filesystem->mkdir( $remote_destination, FS_CHMOD_DIR ) ) + if ( ! $wp_filesystem->exists( $remote_destination ) ) { + if ( ! $wp_filesystem->mkdir( $remote_destination, FS_CHMOD_DIR ) ) { return new WP_Error( 'mkdir_failed_lang_dir', $this->strings['mkdir_failed'], $remote_destination ); + } + } $language_updates_results = array(); @@ -229,10 +233,11 @@ $this->skin->language_update = $language_update; $destination = WP_LANG_DIR; - if ( 'plugin' == $language_update->type ) + if ( 'plugin' == $language_update->type ) { $destination .= '/plugins'; - elseif ( 'theme' == $language_update->type ) + } elseif ( 'theme' == $language_update->type ) { $destination .= '/themes'; + } $this->update_current++; @@ -246,7 +251,7 @@ 'hook_extra' => array( 'language_update_type' => $language_update->type, 'language_update' => $language_update, - ) + ), ); $result = $this->run( $options ); @@ -264,7 +269,7 @@ 'slug' => isset( $language_update->slug ) ? $language_update->slug : 'default', 'version' => $language_update->version, ); - } + }// End foreach(). // Remove upgrade hooks which are not required for translation updates. remove_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 ); @@ -277,7 +282,7 @@ 'action' => 'update', 'type' => 'translation', 'bulk' => true, - 'translations' => $language_updates_results + 'translations' => $language_updates_results, ) ); // Re-add upgrade hooks. @@ -317,8 +322,9 @@ public function check_package( $source, $remote_source ) { global $wp_filesystem; - if ( is_wp_error( $source ) ) + if ( is_wp_error( $source ) ) { return $source; + } // Check that the folder contains a valid language. $files = $wp_filesystem->dirlist( $remote_source ); @@ -326,10 +332,11 @@ // Check to see if a .po and .mo exist in the folder. $po = $mo = false; foreach ( (array) $files as $file => $filedata ) { - if ( '.po' == substr( $file, -3 ) ) + if ( '.po' == substr( $file, -3 ) ) { $po = true; - elseif ( '.mo' == substr( $file, -3 ) ) + } elseif ( '.mo' == substr( $file, -3 ) ) { $mo = true; + } } if ( ! $mo || ! $po ) { @@ -361,14 +368,16 @@ case 'theme': $theme = wp_get_theme( $update->slug ); - if ( $theme->exists() ) + if ( $theme->exists() ) { return $theme->Get( 'Name' ); + } break; case 'plugin': $plugin_data = get_plugins( '/' . $update->slug ); $plugin_data = reset( $plugin_data ); - if ( $plugin_data ) + if ( $plugin_data ) { return $plugin_data['Name']; + } break; } return ''; Index: src/wp-admin/includes/class-plugin-installer-skin.php =================================================================== --- src/wp-admin/includes/class-plugin-installer-skin.php (revision 40901) +++ src/wp-admin/includes/class-plugin-installer-skin.php (working copy) @@ -23,22 +23,29 @@ * * @param array $args */ - public function __construct($args = array()) { - $defaults = array( 'type' => 'web', 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => '' ); - $args = wp_parse_args($args, $defaults); + public function __construct( $args = array() ) { + $defaults = array( + 'type' => 'web', + 'url' => '', + 'plugin' => '', + 'nonce' => '', + 'title' => '', + ); + $args = wp_parse_args( $args, $defaults ); $this->type = $args['type']; - $this->api = isset($args['api']) ? $args['api'] : array(); + $this->api = isset( $args['api'] ) ? $args['api'] : array(); - parent::__construct($args); + parent::__construct( $args ); } /** * @access public */ public function before() { - if ( !empty($this->api) ) - $this->upgrader->strings['process_success'] = sprintf( __('Successfully installed the plugin %s %s.'), $this->api->name, $this->api->version); + if ( ! empty( $this->api ) ) { + $this->upgrader->strings['process_success'] = sprintf( __( 'Successfully installed the plugin %1$s %2$s.' ), $this->api->name, $this->api->version ); + } } /** @@ -49,12 +56,12 @@ $install_actions = array(); - $from = isset($_GET['from']) ? wp_unslash( $_GET['from'] ) : 'plugins'; + $from = isset( $_GET['from'] ) ? wp_unslash( $_GET['from'] ) : 'plugins'; - if ( 'import' == $from ) + if ( 'import' == $from ) { $install_actions['activate_plugin'] = '' . __( 'Activate Plugin & Run Importer' ) . ''; - else - $install_actions['activate_plugin'] = '' . __( 'Activate Plugin' ) . ''; + } else { $install_actions['activate_plugin'] = '' . __( 'Activate Plugin' ) . ''; + } if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) { $install_actions['network_activate'] = '' . __( 'Network Activate' ) . ''; @@ -71,7 +78,7 @@ $install_actions['plugins_page'] = '' . __( 'Return to Plugins page' ) . ''; } - if ( ! $this->result || is_wp_error($this->result) ) { + if ( ! $this->result || is_wp_error( $this->result ) ) { unset( $install_actions['activate_plugin'], $install_actions['network_activate'] ); } elseif ( ! current_user_can( 'activate_plugins' ) ) { unset( $install_actions['activate_plugin'] ); Index: src/wp-admin/includes/class-plugin-upgrader-skin.php =================================================================== --- src/wp-admin/includes/class-plugin-upgrader-skin.php (revision 40901) +++ src/wp-admin/includes/class-plugin-upgrader-skin.php (working copy) @@ -25,15 +25,20 @@ * @param array $args */ public function __construct( $args = array() ) { - $defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Update Plugin') ); - $args = wp_parse_args($args, $defaults); + $defaults = array( + 'url' => '', + 'plugin' => '', + 'nonce' => '', + 'title' => __( 'Update Plugin' ), + ); + $args = wp_parse_args( $args, $defaults ); $this->plugin = $args['plugin']; $this->plugin_active = is_plugin_active( $this->plugin ); $this->plugin_network_active = is_plugin_active_for_network( $this->plugin ); - parent::__construct($args); + parent::__construct( $args ); } /** @@ -41,19 +46,20 @@ */ public function after() { $this->plugin = $this->upgrader->plugin_info(); - if ( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){ + if ( ! empty( $this->plugin ) && ! is_wp_error( $this->result ) && $this->plugin_active ) { // Currently used only when JS is off for a single plugin update? echo ''; } $this->decrement_update_count( 'plugin' ); - $update_actions = array( - 'activate_plugin' => '' . __( 'Activate Plugin' ) . '', - 'plugins_page' => '' . __( 'Return to Plugins page' ) . '' + $update_actions = array( + 'activate_plugin' => '' . __( 'Activate Plugin' ) . '', + 'plugins_page' => '' . __( 'Return to Plugins page' ) . '', ); - if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugins' ) ) + if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugins' ) ) { unset( $update_actions['activate_plugin'] ); + } /** * Filters the list of action links available following a single plugin update. @@ -65,7 +71,8 @@ */ $update_actions = apply_filters( 'update_plugin_complete_actions', $update_actions, $this->plugin ); - if ( ! empty($update_actions) ) - $this->feedback(implode(' | ', (array)$update_actions)); + if ( ! empty( $update_actions ) ) { + $this->feedback( implode( ' | ', (array) $update_actions ) ); + } } } Index: src/wp-admin/includes/class-plugin-upgrader.php =================================================================== --- src/wp-admin/includes/class-plugin-upgrader.php (revision 40901) +++ src/wp-admin/includes/class-plugin-upgrader.php (working copy) @@ -47,15 +47,15 @@ * @access public */ public function upgrade_strings() { - $this->strings['up_to_date'] = __('The plugin is at the latest version.'); - $this->strings['no_package'] = __('Update package not available.'); - $this->strings['downloading_package'] = __('Downloading update from %s…'); - $this->strings['unpack_package'] = __('Unpacking the update…'); - $this->strings['remove_old'] = __('Removing the old version of the plugin…'); - $this->strings['remove_old_failed'] = __('Could not remove the old plugin.'); - $this->strings['process_failed'] = __('Plugin update failed.'); - $this->strings['process_success'] = __('Plugin updated successfully.'); - $this->strings['process_bulk_success'] = __('Plugins updated successfully.'); + $this->strings['up_to_date'] = __( 'The plugin is at the latest version.' ); + $this->strings['no_package'] = __( 'Update package not available.' ); + $this->strings['downloading_package'] = __( 'Downloading update from %s…' ); + $this->strings['unpack_package'] = __( 'Unpacking the update…' ); + $this->strings['remove_old'] = __( 'Removing the old version of the plugin…' ); + $this->strings['remove_old_failed'] = __( 'Could not remove the old plugin.' ); + $this->strings['process_failed'] = __( 'Plugin update failed.' ); + $this->strings['process_success'] = __( 'Plugin updated successfully.' ); + $this->strings['process_bulk_success'] = __( 'Plugins updated successfully.' ); } /** @@ -65,13 +65,13 @@ * @access public */ public function install_strings() { - $this->strings['no_package'] = __('Install package not available.'); - $this->strings['downloading_package'] = __('Downloading install package from %s…'); - $this->strings['unpack_package'] = __('Unpacking the package…'); - $this->strings['installing_package'] = __('Installing the plugin…'); - $this->strings['no_files'] = __('The plugin contains no files.'); - $this->strings['process_failed'] = __('Plugin install failed.'); - $this->strings['process_success'] = __('Plugin installed successfully.'); + $this->strings['no_package'] = __( 'Install package not available.' ); + $this->strings['downloading_package'] = __( 'Downloading install package from %s…' ); + $this->strings['unpack_package'] = __( 'Unpacking the package…' ); + $this->strings['installing_package'] = __( 'Installing the plugin…' ); + $this->strings['no_files'] = __( 'The plugin contains no files.' ); + $this->strings['process_failed'] = __( 'Plugin install failed.' ); + $this->strings['process_success'] = __( 'Plugin installed successfully.' ); } /** @@ -100,7 +100,7 @@ $this->init(); $this->install_strings(); - add_filter('upgrader_source_selection', array($this, 'check_package') ); + add_filter( 'upgrader_source_selection', array( $this, 'check_package' ) ); if ( $parsed_args['clear_update_cache'] ) { // Clear cache so wp_update_plugins() knows about the new plugin. add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 ); @@ -114,14 +114,15 @@ 'hook_extra' => array( 'type' => 'plugin', 'action' => 'install', - ) + ), ) ); remove_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9 ); - remove_filter('upgrader_source_selection', array($this, 'check_package') ); + remove_filter( 'upgrader_source_selection', array( $this, 'check_package' ) ); - if ( ! $this->result || is_wp_error($this->result) ) + if ( ! $this->result || is_wp_error( $this->result ) ) { return $this->result; + } // Force refresh of plugin update information wp_clean_plugins_cache( $parsed_args['clear_update_cache'] ); @@ -156,10 +157,10 @@ $this->upgrade_strings(); $current = get_site_transient( 'update_plugins' ); - if ( !isset( $current->response[ $plugin ] ) ) { + if ( ! isset( $current->response[ $plugin ] ) ) { $this->skin->before(); - $this->skin->set_result(false); - $this->skin->error('up_to_date'); + $this->skin->set_result( false ); + $this->skin->error( 'up_to_date' ); $this->skin->after(); return false; } @@ -167,8 +168,8 @@ // Get the URL to the zip file $r = $current->response[ $plugin ]; - add_filter('upgrader_pre_install', array($this, 'deactivate_plugin_before_upgrade'), 10, 2); - add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4); + add_filter( 'upgrader_pre_install', array( $this, 'deactivate_plugin_before_upgrade' ), 10, 2 ); + add_filter( 'upgrader_clear_destination', array( $this, 'delete_old_plugin' ), 10, 4 ); //'source_selection' => array($this, 'source_selection'), //there's a trac ticket to move up the directory for zip's which are made a bit differently, useful for non-.org plugins. if ( $parsed_args['clear_update_cache'] ) { // Clear cache so wp_update_plugins() knows about the new plugin. @@ -189,11 +190,12 @@ // Cleanup our hooks, in case something else does a upgrade on this connection. remove_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9 ); - remove_filter('upgrader_pre_install', array($this, 'deactivate_plugin_before_upgrade')); - remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin')); + remove_filter( 'upgrader_pre_install', array( $this, 'deactivate_plugin_before_upgrade' ) ); + remove_filter( 'upgrader_clear_destination', array( $this, 'delete_old_plugin' ) ); - if ( ! $this->result || is_wp_error($this->result) ) + if ( ! $this->result || is_wp_error( $this->result ) ) { return $this->result; + } // Force refresh of plugin update information wp_clean_plugins_cache( $parsed_args['clear_update_cache'] ); @@ -230,12 +232,12 @@ $current = get_site_transient( 'update_plugins' ); - add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4); + add_filter( 'upgrader_clear_destination', array( $this, 'delete_old_plugin' ), 10, 4 ); $this->skin->header(); // Connect to the Filesystem first. - $res = $this->fs_connect( array(WP_CONTENT_DIR, WP_PLUGIN_DIR) ); + $res = $this->fs_connect( array( WP_CONTENT_DIR, WP_PLUGIN_DIR ) ); if ( ! $res ) { $this->skin->footer(); return false; @@ -250,32 +252,34 @@ * @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible. */ $maintenance = ( is_multisite() && ! empty( $plugins ) ); - foreach ( $plugins as $plugin ) - $maintenance = $maintenance || ( is_plugin_active( $plugin ) && isset( $current->response[ $plugin] ) ); - if ( $maintenance ) - $this->maintenance_mode(true); + foreach ( $plugins as $plugin ) { + $maintenance = $maintenance || ( is_plugin_active( $plugin ) && isset( $current->response[ $plugin ] ) ); + } + if ( $maintenance ) { + $this->maintenance_mode( true ); + } $results = array(); - $this->update_count = count($plugins); + $this->update_count = count( $plugins ); $this->update_current = 0; foreach ( $plugins as $plugin ) { $this->update_current++; - $this->skin->plugin_info = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin, false, true); + $this->skin->plugin_info = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin, false, true ); - if ( !isset( $current->response[ $plugin ] ) ) { - $this->skin->set_result('up_to_date'); + if ( ! isset( $current->response[ $plugin ] ) ) { + $this->skin->set_result( 'up_to_date' ); $this->skin->before(); - $this->skin->feedback('up_to_date'); + $this->skin->feedback( 'up_to_date' ); $this->skin->after(); - $results[$plugin] = true; + $results[ $plugin ] = true; continue; } // Get the URL to the zip file. $r = $current->response[ $plugin ]; - $this->skin->plugin_active = is_plugin_active($plugin); + $this->skin->plugin_active = is_plugin_active( $plugin ); $result = $this->run( array( 'package' => $r->package, @@ -284,18 +288,19 @@ 'clear_working' => true, 'is_multi' => true, 'hook_extra' => array( - 'plugin' => $plugin - ) + 'plugin' => $plugin, + ), ) ); - $results[$plugin] = $this->result; + $results[ $plugin ] = $this->result; // Prevent credentials auth screen from displaying multiple times - if ( false === $result ) + if ( false === $result ) { break; - } //end foreach $plugins + } + } // End foreach(). - $this->maintenance_mode(false); + $this->maintenance_mode( false ); // Force refresh of plugin update information. wp_clean_plugins_cache( $parsed_args['clear_update_cache'] ); @@ -313,7 +318,7 @@ $this->skin->footer(); // Cleanup our hooks, in case something else does a upgrade on this connection. - remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin')); + remove_filter( 'upgrader_clear_destination', array( $this, 'delete_old_plugin' ) ); return $results; } @@ -333,15 +338,17 @@ * @return string|WP_Error The source as passed, or a WP_Error object * if no plugins were found. */ - public function check_package($source) { + public function check_package( $source ) { global $wp_filesystem; - if ( is_wp_error($source) ) + if ( is_wp_error( $source ) ) { return $source; + } - $working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source); - if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, let's not prevent installation. + $working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit( WP_CONTENT_DIR ), $source ); + if ( ! is_dir( $working_directory ) ) { // Sanity check, if the above fails, let's not prevent installation. return $source; + } // Check the folder contains at least 1 valid plugin. $plugins_found = false; @@ -356,8 +363,9 @@ } } - if ( ! $plugins_found ) + if ( ! $plugins_found ) { return new WP_Error( 'incompatible_archive_no_plugins', $this->strings['incompatible_archive'], __( 'No valid plugins were found.' ) ); + } return $source; } @@ -373,16 +381,19 @@ * @return string|false The full path to the main plugin file, or false. */ public function plugin_info() { - if ( ! is_array($this->result) ) + if ( ! is_array( $this->result ) ) { return false; - if ( empty($this->result['destination_name']) ) + } + if ( empty( $this->result['destination_name'] ) ) { return false; + } - $plugin = get_plugins('/' . $this->result['destination_name']); //Ensure to pass with leading slash - if ( empty($plugin) ) + $plugin = get_plugins( '/' . $this->result['destination_name'] ); //Ensure to pass with leading slash + if ( empty( $plugin ) ) { return false; + } - $pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list + $pluginfiles = array_keys( $plugin ); //Assume the requested plugin is the first in the list return $this->result['destination_name'] . '/' . $pluginfiles[0]; } @@ -400,22 +411,25 @@ * @param array $plugin Plugin package arguments. * @return bool|WP_Error The passed in $return param or WP_Error. */ - public function deactivate_plugin_before_upgrade($return, $plugin) { + public function deactivate_plugin_before_upgrade( $return, $plugin ) { - if ( is_wp_error($return) ) //Bypass. + if ( is_wp_error( $return ) ) { //Bypass. return $return; + } // When in cron (background updates) don't deactivate the plugin, as we require a browser to reactivate it - if ( wp_doing_cron() ) + if ( wp_doing_cron() ) { return $return; + } - $plugin = isset($plugin['plugin']) ? $plugin['plugin'] : ''; - if ( empty($plugin) ) - return new WP_Error('bad_request', $this->strings['bad_request']); + $plugin = isset( $plugin['plugin'] ) ? $plugin['plugin'] : ''; + if ( empty( $plugin ) ) { + return new WP_Error( 'bad_request', $this->strings['bad_request'] ); + } - if ( is_plugin_active($plugin) ) { + if ( is_plugin_active( $plugin ) ) { //Deactivate the plugin silently, Prevent deactivation hooks from running. - deactivate_plugins($plugin, true); + deactivate_plugins( $plugin, true ); } return $return; @@ -431,37 +445,41 @@ * @access public * * @global WP_Filesystem_Base $wp_filesystem Subclass - * + * * @param bool|WP_Error $removed * @param string $local_destination * @param string $remote_destination * @param array $plugin * @return WP_Error|bool */ - public function delete_old_plugin($removed, $local_destination, $remote_destination, $plugin) { + public function delete_old_plugin( $removed, $local_destination, $remote_destination, $plugin ) { global $wp_filesystem; - if ( is_wp_error($removed) ) + if ( is_wp_error( $removed ) ) { return $removed; //Pass errors through. + } - $plugin = isset($plugin['plugin']) ? $plugin['plugin'] : ''; - if ( empty($plugin) ) - return new WP_Error('bad_request', $this->strings['bad_request']); + $plugin = isset( $plugin['plugin'] ) ? $plugin['plugin'] : ''; + if ( empty( $plugin ) ) { + return new WP_Error( 'bad_request', $this->strings['bad_request'] ); + } $plugins_dir = $wp_filesystem->wp_plugins_dir(); - $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) ); + $this_plugin_dir = trailingslashit( dirname( $plugins_dir . $plugin ) ); - if ( ! $wp_filesystem->exists($this_plugin_dir) ) //If it's already vanished. + if ( ! $wp_filesystem->exists( $this_plugin_dir ) ) { //If it's already vanished. return $removed; + } // If plugin is in its own directory, recursively delete the directory. - if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory separator AND that it's not the root plugin folder - $deleted = $wp_filesystem->delete($this_plugin_dir, true); - else - $deleted = $wp_filesystem->delete($plugins_dir . $plugin); + if ( strpos( $plugin, '/' ) && $this_plugin_dir != $plugins_dir ) { //base check on if plugin includes directory separator AND that it's not the root plugin folder + $deleted = $wp_filesystem->delete( $this_plugin_dir, true ); + } else { $deleted = $wp_filesystem->delete( $plugins_dir . $plugin ); + } - if ( ! $deleted ) - return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']); + if ( ! $deleted ) { + return new WP_Error( 'remove_old_failed', $this->strings['remove_old_failed'] ); + } return true; } Index: src/wp-admin/includes/class-theme-installer-skin.php =================================================================== --- src/wp-admin/includes/class-theme-installer-skin.php (revision 40901) +++ src/wp-admin/includes/class-theme-installer-skin.php (working copy) @@ -23,36 +23,39 @@ * * @param array $args */ - public function __construct($args = array()) { + public function __construct( $args = array() ) { $defaults = array( 'type' => 'web', 'url' => '', 'theme' => '', 'nonce' => '', 'title' => '' ); - $args = wp_parse_args($args, $defaults); + $args = wp_parse_args( $args, $defaults ); $this->type = $args['type']; - $this->api = isset($args['api']) ? $args['api'] : array(); + $this->api = isset( $args['api'] ) ? $args['api'] : array(); - parent::__construct($args); + parent::__construct( $args ); } /** * @access public */ public function before() { - if ( !empty($this->api) ) - $this->upgrader->strings['process_success'] = sprintf( $this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version); + if ( ! empty( $this->api ) ) { + $this->upgrader->strings['process_success'] = sprintf( $this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version ); + } } /** * @access public */ public function after() { - if ( empty($this->upgrader->result['destination_name']) ) + if ( empty( $this->upgrader->result['destination_name'] ) ) { return; + } $theme_info = $this->upgrader->theme_info(); - if ( empty( $theme_info ) ) + if ( empty( $theme_info ) ) { return; + } - $name = $theme_info->display('Name'); + $name = $theme_info->display( 'Name' ); $stylesheet = $this->upgrader->result['destination_name']; $template = $theme_info->get_template(); @@ -60,7 +63,7 @@ 'action' => 'activate', 'template' => urlencode( $template ), 'stylesheet' => urlencode( $stylesheet ), - ), admin_url('themes.php') ); + ), admin_url( 'themes.php' ) ); $activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet ); $install_actions = array(); @@ -70,16 +73,19 @@ } $install_actions['activate'] = '' . sprintf( __( 'Activate “%s”' ), $name ) . ''; - if ( is_network_admin() && current_user_can( 'manage_network_themes' ) ) + if ( is_network_admin() && current_user_can( 'manage_network_themes' ) ) { $install_actions['network_enable'] = '' . __( 'Network Enable' ) . ''; + } - if ( $this->type == 'web' ) + if ( $this->type == 'web' ) { $install_actions['themes_page'] = '' . __( 'Return to Theme Installer' ) . ''; - elseif ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) ) + } elseif ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) ) { $install_actions['themes_page'] = '' . __( 'Return to Themes page' ) . ''; + } - if ( ! $this->result || is_wp_error($this->result) || is_network_admin() || ! current_user_can( 'switch_themes' ) ) + if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() || ! current_user_can( 'switch_themes' ) ) { unset( $install_actions['activate'], $install_actions['preview'] ); + } /** * Filters the list of action links available following a single theme installation. @@ -92,7 +98,8 @@ * @param WP_Theme $theme_info Theme object. */ $install_actions = apply_filters( 'install_theme_complete_actions', $install_actions, $this->api, $stylesheet, $theme_info ); - if ( ! empty($install_actions) ) - $this->feedback(implode(' | ', (array)$install_actions)); + if ( ! empty( $install_actions ) ) { + $this->feedback( implode( ' | ', (array) $install_actions ) ); + } } } Index: src/wp-admin/includes/class-theme-upgrader-skin.php =================================================================== --- src/wp-admin/includes/class-theme-upgrader-skin.php (revision 40901) +++ src/wp-admin/includes/class-theme-upgrader-skin.php (working copy) @@ -22,13 +22,18 @@ * * @param array $args */ - public function __construct($args = array()) { - $defaults = array( 'url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Update Theme') ); - $args = wp_parse_args($args, $defaults); + public function __construct( $args = array() ) { + $defaults = array( + 'url' => '', + 'theme' => '', + 'nonce' => '', + 'title' => __( 'Update Theme' ), + ); + $args = wp_parse_args( $args, $defaults ); $this->theme = $args['theme']; - parent::__construct($args); + parent::__construct( $args ); } /** @@ -39,7 +44,7 @@ $update_actions = array(); if ( ! empty( $this->upgrader->result['destination_name'] ) && $theme_info = $this->upgrader->theme_info() ) { - $name = $theme_info->display('Name'); + $name = $theme_info->display( 'Name' ); $stylesheet = $this->upgrader->result['destination_name']; $template = $theme_info->get_template(); @@ -47,7 +52,7 @@ 'action' => 'activate', 'template' => urlencode( $template ), 'stylesheet' => urlencode( $stylesheet ), - ), admin_url('themes.php') ); + ), admin_url( 'themes.php' ) ); $activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet ); if ( get_stylesheet() == $stylesheet ) { @@ -61,8 +66,9 @@ $update_actions['activate'] = '' . sprintf( __( 'Activate “%s”' ), $name ) . ''; } - if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() ) + if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() ) { unset( $update_actions['preview'], $update_actions['activate'] ); + } } $update_actions['themes_page'] = '' . __( 'Return to Themes page' ) . ''; @@ -77,7 +83,8 @@ */ $update_actions = apply_filters( 'update_theme_complete_actions', $update_actions, $this->theme ); - if ( ! empty($update_actions) ) - $this->feedback(implode(' | ', (array)$update_actions)); + if ( ! empty( $update_actions ) ) { + $this->feedback( implode( ' | ', (array) $update_actions ) ); + } } } Index: src/wp-admin/includes/class-theme-upgrader.php =================================================================== --- src/wp-admin/includes/class-theme-upgrader.php (revision 40901) +++ src/wp-admin/includes/class-theme-upgrader.php (working copy) @@ -46,14 +46,14 @@ * @access public */ public function upgrade_strings() { - $this->strings['up_to_date'] = __('The theme is at the latest version.'); - $this->strings['no_package'] = __('Update package not available.'); - $this->strings['downloading_package'] = __('Downloading update from %s…'); - $this->strings['unpack_package'] = __('Unpacking the update…'); - $this->strings['remove_old'] = __('Removing the old version of the theme…'); - $this->strings['remove_old_failed'] = __('Could not remove the old theme.'); - $this->strings['process_failed'] = __('Theme update failed.'); - $this->strings['process_success'] = __('Theme updated successfully.'); + $this->strings['up_to_date'] = __( 'The theme is at the latest version.' ); + $this->strings['no_package'] = __( 'Update package not available.' ); + $this->strings['downloading_package'] = __( 'Downloading update from %s…' ); + $this->strings['unpack_package'] = __( 'Unpacking the update…' ); + $this->strings['remove_old'] = __( 'Removing the old version of the theme…' ); + $this->strings['remove_old_failed'] = __( 'Could not remove the old theme.' ); + $this->strings['process_failed'] = __( 'Theme update failed.' ); + $this->strings['process_success'] = __( 'Theme updated successfully.' ); } /** @@ -63,23 +63,23 @@ * @access public */ public function install_strings() { - $this->strings['no_package'] = __('Install package not available.'); - $this->strings['downloading_package'] = __('Downloading install package from %s…'); - $this->strings['unpack_package'] = __('Unpacking the package…'); - $this->strings['installing_package'] = __('Installing the theme…'); - $this->strings['no_files'] = __('The theme contains no files.'); - $this->strings['process_failed'] = __('Theme install failed.'); - $this->strings['process_success'] = __('Theme installed successfully.'); + $this->strings['no_package'] = __( 'Install package not available.' ); + $this->strings['downloading_package'] = __( 'Downloading install package from %s…' ); + $this->strings['unpack_package'] = __( 'Unpacking the package…' ); + $this->strings['installing_package'] = __( 'Installing the theme…' ); + $this->strings['no_files'] = __( 'The theme contains no files.' ); + $this->strings['process_failed'] = __( 'Theme install failed.' ); + $this->strings['process_success'] = __( 'Theme installed successfully.' ); /* translators: 1: theme name, 2: version */ - $this->strings['process_success_specific'] = __('Successfully installed the theme %1$s %2$s.'); - $this->strings['parent_theme_search'] = __('This theme requires a parent theme. Checking if it is installed…'); + $this->strings['process_success_specific'] = __( 'Successfully installed the theme %1$s %2$s.' ); + $this->strings['parent_theme_search'] = __( 'This theme requires a parent theme. Checking if it is installed…' ); /* translators: 1: theme name, 2: version */ - $this->strings['parent_theme_prepare_install'] = __('Preparing to install %1$s %2$s…'); + $this->strings['parent_theme_prepare_install'] = __( 'Preparing to install %1$s %2$s…' ); /* translators: 1: theme name, 2: version */ - $this->strings['parent_theme_currently_installed'] = __('The parent theme, %1$s %2$s, is currently installed.'); + $this->strings['parent_theme_currently_installed'] = __( 'The parent theme, %1$s %2$s, is currently installed.' ); /* translators: 1: theme name, 2: version */ - $this->strings['parent_theme_install_success'] = __('Successfully installed the parent theme, %1$s %2$s.'); - $this->strings['parent_theme_not_found'] = __('The parent theme could not be found. You will need to install the parent theme, %s, before you can use this child theme.'); + $this->strings['parent_theme_install_success'] = __( 'Successfully installed the parent theme, %1$s %2$s.' ); + $this->strings['parent_theme_not_found'] = __( 'The parent theme could not be found. You will need to install the parent theme, %s, before you can use this child theme.' ); } /** @@ -99,24 +99,31 @@ // Check to see if we need to install a parent theme $theme_info = $this->theme_info(); - if ( ! $theme_info->parent() ) + if ( ! $theme_info->parent() ) { return $install_result; + } $this->skin->feedback( 'parent_theme_search' ); if ( ! $theme_info->parent()->errors() ) { - $this->skin->feedback( 'parent_theme_currently_installed', $theme_info->parent()->display('Name'), $theme_info->parent()->display('Version') ); + $this->skin->feedback( 'parent_theme_currently_installed', $theme_info->parent()->display( 'Name' ), $theme_info->parent()->display( 'Version' ) ); // We already have the theme, fall through. return $install_result; } // We don't have the parent theme, let's install it. - $api = themes_api('theme_information', array('slug' => $theme_info->get('Template'), 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth. + $api = themes_api( 'theme_information', array( + 'slug' => $theme_info->get( 'Template' ), + 'fields' => array( + 'sections' => false, + 'tags' => false, + ), + ) ); //Save on a bit of bandwidth. - if ( ! $api || is_wp_error($api) ) { - $this->skin->feedback( 'parent_theme_not_found', $theme_info->get('Template') ); + if ( ! $api || is_wp_error( $api ) ) { + $this->skin->feedback( 'parent_theme_not_found', $theme_info->get( 'Template' ) ); // Don't show activate or preview actions after install - add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') ); + add_filter( 'install_theme_complete_actions', array( $this, 'hide_activate_preview_actions' ) ); return $install_result; } @@ -128,23 +135,24 @@ $this->skin->api = $api; $this->strings['process_success_specific'] = $this->strings['parent_theme_install_success'];//, $api->name, $api->version); - $this->skin->feedback('parent_theme_prepare_install', $api->name, $api->version); + $this->skin->feedback( 'parent_theme_prepare_install', $api->name, $api->version ); - add_filter('install_theme_complete_actions', '__return_false', 999); // Don't show any actions after installing the theme. + add_filter( 'install_theme_complete_actions', '__return_false', 999 ); // Don't show any actions after installing the theme. // Install the parent theme $parent_result = $this->run( array( 'package' => $api->download_link, 'destination' => get_theme_root(), 'clear_destination' => false, //Do not overwrite files. - 'clear_working' => true + 'clear_working' => true, ) ); - if ( is_wp_error($parent_result) ) - add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') ); + if ( is_wp_error( $parent_result ) ) { + add_filter( 'install_theme_complete_actions', array( $this, 'hide_activate_preview_actions' ) ); + } // Start cleaning up after the parents installation - remove_filter('install_theme_complete_actions', '__return_false', 999); + remove_filter( 'install_theme_complete_actions', '__return_false', 999 ); // Reset child's result and data $this->result = $child_result; @@ -168,7 +176,7 @@ * @return array */ public function hide_activate_preview_actions( $actions ) { - unset($actions['activate'], $actions['preview']); + unset( $actions['activate'], $actions['preview'] ); return $actions; } @@ -199,8 +207,8 @@ $this->init(); $this->install_strings(); - add_filter('upgrader_source_selection', array($this, 'check_package') ); - add_filter('upgrader_post_install', array($this, 'check_parent_theme_filter'), 10, 3); + add_filter( 'upgrader_source_selection', array( $this, 'check_package' ) ); + add_filter( 'upgrader_post_install', array( $this, 'check_parent_theme_filter' ), 10, 3 ); if ( $parsed_args['clear_update_cache'] ) { // Clear cache so wp_update_themes() knows about the new theme. add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 ); @@ -218,11 +226,12 @@ ) ); remove_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9 ); - remove_filter('upgrader_source_selection', array($this, 'check_package') ); - remove_filter('upgrader_post_install', array($this, 'check_parent_theme_filter')); + remove_filter( 'upgrader_source_selection', array( $this, 'check_package' ) ); + remove_filter( 'upgrader_post_install', array( $this, 'check_parent_theme_filter' ) ); - if ( ! $this->result || is_wp_error($this->result) ) + if ( ! $this->result || is_wp_error( $this->result ) ) { return $this->result; + } // Refresh the Theme Update information wp_clean_themes_cache( $parsed_args['clear_update_cache'] ); @@ -258,9 +267,9 @@ // Is an update available? $current = get_site_transient( 'update_themes' ); - if ( !isset( $current->response[ $theme ] ) ) { + if ( ! isset( $current->response[ $theme ] ) ) { $this->skin->before(); - $this->skin->set_result(false); + $this->skin->set_result( false ); $this->skin->error( 'up_to_date' ); $this->skin->after(); return false; @@ -268,9 +277,9 @@ $r = $current->response[ $theme ]; - add_filter('upgrader_pre_install', array($this, 'current_before'), 10, 2); - add_filter('upgrader_post_install', array($this, 'current_after'), 10, 2); - add_filter('upgrader_clear_destination', array($this, 'delete_old_theme'), 10, 4); + add_filter( 'upgrader_pre_install', array( $this, 'current_before' ), 10, 2 ); + add_filter( 'upgrader_post_install', array( $this, 'current_after' ), 10, 2 ); + add_filter( 'upgrader_clear_destination', array( $this, 'delete_old_theme' ), 10, 4 ); if ( $parsed_args['clear_update_cache'] ) { // Clear cache so wp_update_themes() knows about the new theme. add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 ); @@ -289,12 +298,13 @@ ) ); remove_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9 ); - remove_filter('upgrader_pre_install', array($this, 'current_before')); - remove_filter('upgrader_post_install', array($this, 'current_after')); - remove_filter('upgrader_clear_destination', array($this, 'delete_old_theme')); + remove_filter( 'upgrader_pre_install', array( $this, 'current_before' ) ); + remove_filter( 'upgrader_post_install', array( $this, 'current_after' ) ); + remove_filter( 'upgrader_clear_destination', array( $this, 'delete_old_theme' ) ); - if ( ! $this->result || is_wp_error($this->result) ) + if ( ! $this->result || is_wp_error( $this->result ) ) { return $this->result; + } wp_clean_themes_cache( $parsed_args['clear_update_cache'] ); @@ -330,14 +340,14 @@ $current = get_site_transient( 'update_themes' ); - add_filter('upgrader_pre_install', array($this, 'current_before'), 10, 2); - add_filter('upgrader_post_install', array($this, 'current_after'), 10, 2); - add_filter('upgrader_clear_destination', array($this, 'delete_old_theme'), 10, 4); + add_filter( 'upgrader_pre_install', array( $this, 'current_before' ), 10, 2 ); + add_filter( 'upgrader_post_install', array( $this, 'current_after' ), 10, 2 ); + add_filter( 'upgrader_clear_destination', array( $this, 'delete_old_theme' ), 10, 4 ); $this->skin->header(); // Connect to the Filesystem first. - $res = $this->fs_connect( array(WP_CONTENT_DIR) ); + $res = $this->fs_connect( array( WP_CONTENT_DIR ) ); if ( ! $res ) { $this->skin->footer(); return false; @@ -350,26 +360,28 @@ // - a theme with an update available is currently in use. // @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible. $maintenance = ( is_multisite() && ! empty( $themes ) ); - foreach ( $themes as $theme ) + foreach ( $themes as $theme ) { $maintenance = $maintenance || $theme == get_stylesheet() || $theme == get_template(); - if ( $maintenance ) - $this->maintenance_mode(true); + } + if ( $maintenance ) { + $this->maintenance_mode( true ); + } $results = array(); - $this->update_count = count($themes); + $this->update_count = count( $themes ); $this->update_current = 0; foreach ( $themes as $theme ) { $this->update_current++; - $this->skin->theme_info = $this->theme_info($theme); + $this->skin->theme_info = $this->theme_info( $theme ); - if ( !isset( $current->response[ $theme ] ) ) { - $this->skin->set_result(true); + if ( ! isset( $current->response[ $theme ] ) ) { + $this->skin->set_result( true ); $this->skin->before(); $this->skin->feedback( 'up_to_date' ); $this->skin->after(); - $results[$theme] = true; + $results[ $theme ] = true; continue; } @@ -383,18 +395,19 @@ 'clear_working' => true, 'is_multi' => true, 'hook_extra' => array( - 'theme' => $theme + 'theme' => $theme, ), ) ); - $results[$theme] = $this->result; + $results[ $theme ] = $this->result; // Prevent credentials auth screen from displaying multiple times - if ( false === $result ) + if ( false === $result ) { break; - } //end foreach $plugins + } + } // End foreach(). - $this->maintenance_mode(false); + $this->maintenance_mode( false ); // Refresh the Theme Update information wp_clean_themes_cache( $parsed_args['clear_update_cache'] ); @@ -412,9 +425,9 @@ $this->skin->footer(); // Cleanup our hooks, in case something else does a upgrade on this connection. - remove_filter('upgrader_pre_install', array($this, 'current_before')); - remove_filter('upgrader_post_install', array($this, 'current_after')); - remove_filter('upgrader_clear_destination', array($this, 'delete_old_theme')); + remove_filter( 'upgrader_pre_install', array( $this, 'current_before' ) ); + remove_filter( 'upgrader_post_install', array( $this, 'current_after' ) ); + remove_filter( 'upgrader_clear_destination', array( $this, 'delete_old_theme' ) ); return $results; } @@ -437,13 +450,15 @@ public function check_package( $source ) { global $wp_filesystem; - if ( is_wp_error($source) ) + if ( is_wp_error( $source ) ) { return $source; + } // Check the folder contains a valid theme - $working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source); - if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, let's not prevent installation. + $working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit( WP_CONTENT_DIR ), $source ); + if ( ! is_dir( $working_directory ) ) { // Sanity check, if the above fails, let's not prevent installation. return $source; + } // A proper archive should have a style.css file in the single subdirectory if ( ! file_exists( $working_directory . 'style.css' ) ) { @@ -455,7 +470,10 @@ ); } - $info = get_file_data( $working_directory . 'style.css', array( 'Name' => 'Theme Name', 'Template' => 'Template' ) ); + $info = get_file_data( $working_directory . 'style.css', array( + 'Name' => 'Theme Name', + 'Template' => 'Template', + ) ); if ( empty( $info['Name'] ) ) { return new WP_Error( 'incompatible_archive_theme_no_name', $this->strings['incompatible_archive'], @@ -492,17 +510,20 @@ * @param array $theme * @return bool|WP_Error */ - public function current_before($return, $theme) { - if ( is_wp_error($return) ) + public function current_before( $return, $theme ) { + if ( is_wp_error( $return ) ) { return $return; + } - $theme = isset($theme['theme']) ? $theme['theme'] : ''; + $theme = isset( $theme['theme'] ) ? $theme['theme'] : ''; - if ( $theme != get_stylesheet() ) //If not current + if ( $theme != get_stylesheet() ) { //If not current return $return; + } //Change to maintenance mode now. - if ( ! $this->bulk ) - $this->maintenance_mode(true); + if ( ! $this->bulk ) { + $this->maintenance_mode( true ); + } return $return; } @@ -520,14 +541,16 @@ * @param array $theme * @return bool|WP_Error */ - public function current_after($return, $theme) { - if ( is_wp_error($return) ) + public function current_after( $return, $theme ) { + if ( is_wp_error( $return ) ) { return $return; + } - $theme = isset($theme['theme']) ? $theme['theme'] : ''; + $theme = isset( $theme['theme'] ) ? $theme['theme'] : ''; - if ( $theme != get_stylesheet() ) // If not current + if ( $theme != get_stylesheet() ) { // If not current return $return; + } // Ensure stylesheet name hasn't changed after the upgrade: if ( $theme == get_stylesheet() && $theme != $this->result['destination_name'] ) { @@ -537,8 +560,9 @@ } //Time to remove maintenance mode - if ( ! $this->bulk ) - $this->maintenance_mode(false); + if ( ! $this->bulk ) { + $this->maintenance_mode( false ); + } return $return; } @@ -562,17 +586,20 @@ public function delete_old_theme( $removed, $local_destination, $remote_destination, $theme ) { global $wp_filesystem; - if ( is_wp_error( $removed ) ) + if ( is_wp_error( $removed ) ) { return $removed; // Pass errors through. + } - if ( ! isset( $theme['theme'] ) ) + if ( ! isset( $theme['theme'] ) ) { return $removed; + } $theme = $theme['theme']; $themes_dir = trailingslashit( $wp_filesystem->wp_themes_dir( $theme ) ); if ( $wp_filesystem->exists( $themes_dir . $theme ) ) { - if ( ! $wp_filesystem->delete( $themes_dir . $theme, true ) ) + if ( ! $wp_filesystem->delete( $themes_dir . $theme, true ) ) { return false; + } } return true; @@ -590,13 +617,13 @@ * @return WP_Theme|false The theme's info object, or false `$theme` is not supplied * and the last result isn't set. */ - public function theme_info($theme = null) { + public function theme_info( $theme = null ) { - if ( empty($theme) ) { - if ( !empty($this->result['destination_name']) ) + if ( empty( $theme ) ) { + if ( ! empty( $this->result['destination_name'] ) ) { $theme = $this->result['destination_name']; - else - return false; + } else { return false; + } } return wp_get_theme( $theme ); } Index: src/wp-admin/includes/class-walker-category-checklist.php =================================================================== --- src/wp-admin/includes/class-walker-category-checklist.php (revision 40901) +++ src/wp-admin/includes/class-walker-category-checklist.php (working copy) @@ -18,7 +18,10 @@ */ class Walker_Category_Checklist extends Walker { public $tree_type = 'category'; - public $db_fields = array ('parent' => 'parent', 'id' => 'term_id'); //TODO: decouple this + public $db_fields = array( + 'parent' => 'parent', + 'id' => 'term_id', + ); //TODO: decouple this /** * Starts the list before the elements are added. @@ -32,7 +35,7 @@ * @param array $args An array of arguments. @see wp_terms_checklist() */ public function start_lvl( &$output, $depth = 0, $args = array() ) { - $indent = str_repeat("\t", $depth); + $indent = str_repeat( "\t", $depth ); $output .= "$indent- \n";
}
@@ -48,7 +51,7 @@
* @param array $args An array of arguments. @see wp_terms_checklist()
*/
public function end_lvl( &$output, $depth = 0, $args = array() ) {
- $indent = str_repeat("\t", $depth);
+ $indent = str_repeat( "\t", $depth );
$output .= "$indent
-
-
'post-query-submit' ) );
- }
+do_action( 'restrict_manage_comments' );
+submit_button( __( 'Filter' ), '', 'filter_action', false, array(
+ 'id' => 'post-query-submit',
+) );
+}
- if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_user_can( 'moderate_comments' ) && $this->has_items() ) {
- wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
- $title = ( 'spam' === $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
- submit_button( $title, 'apply', 'delete_all', false );
- }
+if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_user_can( 'moderate_comments' ) && $this->has_items() ) {
+ wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
+ $title = ( 'spam' === $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
+ submit_button( $title, 'apply', 'delete_all', false );
+}
/**
* Fires after the Filter submit button for comment types.
*
@@ -374,8 +384,9 @@
* @return string|false
*/
public function current_action() {
- if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
+ if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) ) {
return 'delete_all';
+ }
return parent::current_action();
}
@@ -391,8 +402,9 @@
$columns = array();
- if ( $this->checkbox )
+ if ( $this->checkbox ) {
$columns['cb'] = '';
+ }
$columns['author'] = __( 'Author' );
$columns['comment'] = _x( 'Comment', 'column name' );
@@ -415,7 +427,7 @@
return array(
'author' => 'comment_author',
'response' => 'comment_post_ID',
- 'date' => 'comment_date'
+ 'date' => 'comment_date',
);
}
@@ -435,7 +447,7 @@
* @access public
*/
public function display() {
- wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
+ wp_nonce_field( 'fetch-list-' . get_class( $this ), '_ajax_fetch_list_nonce' );
$this->display_tablenav( 'top' );
@@ -501,28 +513,28 @@
unset( $GLOBALS['post'], $GLOBALS['comment'] );
}
- /**
- * Generate and display row actions links.
- *
- * @since 4.3.0
- * @access protected
- *
- * @global string $comment_status Status for the current listed comments.
- *
- * @param WP_Comment $comment The comment object.
- * @param string $column_name Current column name.
- * @param string $primary Primary column name.
- * @return string|void Comment row actions output.
- */
- protected function handle_row_actions( $comment, $column_name, $primary ) {
- global $comment_status;
+ /**
+ * Generate and display row actions links.
+ *
+ * @since 4.3.0
+ * @access protected
+ *
+ * @global string $comment_status Status for the current listed comments.
+ *
+ * @param WP_Comment $comment The comment object.
+ * @param string $column_name Current column name.
+ * @param string $primary Primary column name.
+ * @return string|void Comment row actions output.
+ */
+ protected function handle_row_actions( $comment, $column_name, $primary ) {
+ global $comment_status;
if ( $primary !== $column_name ) {
return '';
}
- if ( ! $this->user_can ) {
- return;
+ if ( ! $this->user_can ) {
+ return;
}
$the_comment_status = wp_get_comment_status( $comment );
@@ -544,12 +556,16 @@
// Preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash.
$actions = array(
- 'approve' => '', 'unapprove' => '',
- 'reply' => '',
- 'quickedit' => '',
- 'edit' => '',
- 'spam' => '', 'unspam' => '',
- 'trash' => '', 'untrash' => '', 'delete' => ''
+ 'approve' => '',
+ 'unapprove' => '',
+ 'reply' => '',
+ 'quickedit' => '',
+ 'edit' => '',
+ 'spam' => '',
+ 'unspam' => '',
+ 'trash' => '',
+ 'untrash' => '',
+ 'delete' => '',
);
// Not looking at all comments.
@@ -574,14 +590,14 @@
$actions['untrash'] = "" . __( 'Restore' ) . '';
}
- if ( 'spam' === $the_comment_status || 'trash' === $the_comment_status || !EMPTY_TRASH_DAYS ) {
+ if ( 'spam' === $the_comment_status || 'trash' === $the_comment_status || ! EMPTY_TRASH_DAYS ) {
$actions['delete'] = "" . __( 'Delete Permanently' ) . '';
} else {
$actions['trash'] = "" . _x( 'Trash', 'verb' ) . '';
}
if ( 'spam' !== $the_comment_status && 'trash' !== $the_comment_status ) {
- $actions['edit'] = "". __( 'Edit' ) . '';
+ $actions['edit'] = "" . __( 'Edit' ) . '';
$format = '%s';
@@ -600,13 +616,13 @@
( ( ( 'approve' === $action || 'unapprove' === $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
// Reply and quickedit need a hide-if-no-js span when not added with ajax
- if ( ( 'reply' === $action || 'quickedit' === $action ) && ! wp_doing_ajax() )
+ if ( ( 'reply' === $action || 'quickedit' === $action ) && ! wp_doing_ajax() ) {
$action .= ' hide-if-no-js';
- elseif ( ( $action === 'untrash' && $the_comment_status === 'trash' ) || ( $action === 'unspam' && $the_comment_status === 'spam' ) ) {
- if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) )
+ } elseif ( ( $action === 'untrash' && $the_comment_status === 'trash' ) || ( $action === 'unspam' && $the_comment_status === 'spam' ) ) {
+ if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) ) {
$action .= ' approve';
- else
- $action .= ' unapprove';
+ } else { $action .= ' unapprove';
+ }
}
$out .= "$sep$link";
@@ -683,7 +699,9 @@
$author_url_display = wp_html_excerpt( $author_url_display, 49, '…' );
}
- echo ""; comment_author( $comment ); echo '
'; + echo ''; + comment_author( $comment ); + echo '
'; if ( ! empty( $author_url_display ) ) { printf( '%s
', esc_url( $author_url ), esc_html( $author_url_display ) ); } @@ -700,7 +718,10 @@ $author_ip = get_comment_author_IP( $comment ); if ( $author_ip ) { - $author_ip_url = add_query_arg( array( 's' => $author_ip, 'mode' => 'detail' ), admin_url( 'edit-comments.php' ) ); + $author_ip_url = add_query_arg( array( + 's' => $author_ip, + 'mode' => 'detail', + ), admin_url( 'edit-comments.php' ) ); if ( 'spam' === $comment_status ) { $author_ip_url = add_query_arg( 'comment_status', 'spam', $author_ip_url ); } @@ -723,7 +744,7 @@ ); echo '
', @@ -513,8 +526,8 @@ esc_attr( sprintf( __( 'Attach “%s” to existing content' ), $title ) ), __( 'Attach' ) ); - } - } +} + }// End if(). } /** @@ -694,9 +707,8 @@ __( 'Attach' ) ); } - } - else { - if ( current_user_can( 'edit_post', $post->ID ) && !$this->is_trash ) { + } else { + if ( current_user_can( 'edit_post', $post->ID ) && ! $this->is_trash ) { $actions['edit'] = sprintf( '%s', get_edit_post_link( $post->ID ), @@ -724,7 +736,7 @@ ); } if ( $this->is_trash || ! EMPTY_TRASH_DAYS || ! MEDIA_TRASH ) { - $delete_ays = ( !$this->is_trash && !MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : ''; + $delete_ays = ( ! $this->is_trash && ! MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : ''; $actions['delete'] = sprintf( '%s', wp_nonce_url( "post.php?action=delete&post=$post->ID", 'delete-post_' . $post->ID ), @@ -744,7 +756,7 @@ __( 'View' ) ); } - } + }// End if(). /** * Filters the action links for each attachment in the Media list table. Index: src/wp-admin/includes/class-wp-ms-sites-list-table.php =================================================================== --- src/wp-admin/includes/class-wp-ms-sites-list-table.php (revision 40901) +++ src/wp-admin/includes/class-wp-ms-sites-list-table.php (working copy) @@ -41,7 +41,7 @@ 'archived' => array( 'site-archived', __( 'Archived' ) ), 'spam' => array( 'site-spammed', _x( 'Spam', 'site' ) ), 'deleted' => array( 'site-deleted', __( 'Deleted' ) ), - 'mature' => array( 'site-mature', __( 'Mature' ) ) + 'mature' => array( 'site-mature', __( 'Mature' ) ), ); parent::__construct( array( @@ -81,22 +81,24 @@ $pagenum = $this->get_pagenum(); - $s = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST[ 's' ] ) ) : ''; + $s = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : ''; $wild = ''; - if ( false !== strpos($s, '*') ) { + if ( false !== strpos( $s, '*' ) ) { $wild = '*'; - $s = trim($s, '*'); + $s = trim( $s, '*' ); } /* * If the network is large and a search is not being performed, show only * the latest sites with no paging in order to avoid expensive count queries. */ - if ( !$s && wp_is_large_network() ) { - if ( !isset($_REQUEST['orderby']) ) + if ( ! $s && wp_is_large_network() ) { + if ( ! isset( $_REQUEST['orderby'] ) ) { $_GET['orderby'] = $_REQUEST['orderby'] = ''; - if ( !isset($_REQUEST['order']) ) + } + if ( ! isset( $_REQUEST['order'] ) ) { $_GET['order'] = $_REQUEST['order'] = 'DESC'; + } } $args = array( @@ -105,7 +107,7 @@ 'network_id' => get_current_network_id(), ); - if ( empty($s) ) { + if ( empty( $s ) ) { // Nothing to do. } elseif ( preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $s ) || preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) || @@ -148,7 +150,7 @@ $args['orderby'] = $order_by; if ( $order_by ) { - $args['order'] = ( isset( $_REQUEST['order'] ) && 'DESC' === strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC"; + $args['order'] = ( isset( $_REQUEST['order'] ) && 'DESC' === strtoupper( $_REQUEST['order'] ) ) ? 'DESC' : 'ASC'; } if ( wp_is_large_network() ) { @@ -198,8 +200,9 @@ */ protected function get_bulk_actions() { $actions = array(); - if ( current_user_can( 'delete_sites' ) ) + if ( current_user_can( 'delete_sites' ) ) { $actions['delete'] = __( 'Delete' ); + } $actions['spam'] = _x( 'Mark as Spam', 'site' ); $actions['notspam'] = _x( 'Not Spam', 'site' ); @@ -216,8 +219,9 @@ parent::pagination( $which ); - if ( 'top' === $which ) + if ( 'top' === $which ) { $this->view_switcher( $mode ); + } } /** @@ -402,7 +406,10 @@ public function column_users( $blog ) { $user_count = wp_cache_get( $blog['blog_id'] . '_user_count', 'blog-details' ); if ( ! $user_count ) { - $blog_users = get_users( array( 'blog_id' => $blog['blog_id'], 'fields' => 'ID' ) ); + $blog_users = get_users( array( + 'blog_id' => $blog['blog_id'], + 'fields' => 'ID', + ) ); $user_count = count( $blog_users ); unset( $blog_users ); wp_cache_set( $blog['blog_id'] . '_user_count', $user_count, 'blog-details', 12 * HOUR_IN_SECONDS ); @@ -515,10 +522,14 @@ // Preordered. $actions = array( - 'edit' => '', 'backend' => '', - 'activate' => '', 'deactivate' => '', - 'archive' => '', 'unarchive' => '', - 'spam' => '', 'unspam' => '', + 'edit' => '', + 'backend' => '', + 'activate' => '', + 'deactivate' => '', + 'archive' => '', + 'unarchive' => '', + 'spam' => '', + 'unspam' => '', 'delete' => '', 'visit' => '', ); Index: src/wp-admin/includes/class-wp-ms-themes-list-table.php =================================================================== --- src/wp-admin/includes/class-wp-ms-themes-list-table.php (revision 40901) +++ src/wp-admin/includes/class-wp-ms-themes-list-table.php (working copy) @@ -44,15 +44,17 @@ ) ); $status = isset( $_REQUEST['theme_status'] ) ? $_REQUEST['theme_status'] : 'all'; - if ( !in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search', 'broken' ) ) ) + if ( ! in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search', 'broken' ) ) ) { $status = 'all'; + } $page = $this->get_pagenum(); $this->is_site_themes = ( 'site-themes-network' === $this->screen->id ) ? true : false; - if ( $this->is_site_themes ) + if ( $this->is_site_themes ) { $this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0; + } } /** @@ -69,10 +71,10 @@ * @return bool */ public function ajax_user_can() { - if ( $this->is_site_themes ) + if ( $this->is_site_themes ) { return current_user_can( 'manage_sites' ); - else - return current_user_can( 'manage_network_themes' ); + } else { return current_user_can( 'manage_network_themes' ); + } } /** @@ -103,7 +105,9 @@ 'enabled' => array(), 'disabled' => array(), 'upgrade' => array(), - 'broken' => $this->is_site_themes ? array() : wp_get_themes( array( 'errors' => true ) ), + 'broken' => $this->is_site_themes ? array() : wp_get_themes( array( + 'errors' => true, + ) ), ); if ( $this->is_site_themes ) { @@ -137,11 +141,13 @@ } $totals = array(); - foreach ( $themes as $type => $list ) + foreach ( $themes as $type => $list ) { $totals[ $type ] = count( $list ); + } - if ( empty( $themes[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) ) + if ( empty( $themes[ $status ] ) && ! in_array( $status, array( 'all', 'search' ) ) ) { $status = 'all'; + } $this->items = $themes[ $status ]; WP_Theme::sort_by_name( $this->items ); @@ -169,8 +175,9 @@ $start = ( $page - 1 ) * $themes_per_page; - if ( $total_this_page > $themes_per_page ) + if ( $total_this_page > $themes_per_page ) { $this->items = array_slice( $this->items, $start, $themes_per_page, true ); + } $this->set_pagination_args( array( 'total_items' => $total_this_page, @@ -185,20 +192,24 @@ */ public function _search_callback( $theme ) { static $term = null; - if ( is_null( $term ) ) + if ( is_null( $term ) ) { $term = wp_unslash( $_REQUEST['s'] ); + } foreach ( array( 'Name', 'Description', 'Author', 'Author', 'AuthorURI' ) as $field ) { // Don't mark up; Do translate. - if ( false !== stripos( $theme->display( $field, false, true ), $term ) ) + if ( false !== stripos( $theme->display( $field, false, true ), $term ) ) { return true; + } } - if ( false !== stripos( $theme->get_stylesheet(), $term ) ) + if ( false !== stripos( $theme->get_stylesheet(), $term ) ) { return true; + } - if ( false !== stripos( $theme->get_template(), $term ) ) + if ( false !== stripos( $theme->get_template(), $term ) ) { return true; + } return false; } @@ -217,13 +228,14 @@ $a = $theme_a[ $orderby ]; $b = $theme_b[ $orderby ]; - if ( $a == $b ) + if ( $a == $b ) { return 0; + } - if ( 'DESC' === $order ) + if ( 'DESC' === $order ) { return ( $a < $b ) ? 1 : -1; - else - return ( $a < $b ) ? -1 : 1; + } else { return ( $a < $b ) ? -1 : 1; + } } /** @@ -282,8 +294,9 @@ $status_links = array(); foreach ( $totals as $type => $count ) { - if ( !$count ) + if ( ! $count ) { continue; + } switch ( $type ) { case 'all': @@ -303,19 +316,19 @@ break; } - if ( $this->is_site_themes ) + if ( $this->is_site_themes ) { $url = 'site-themes.php?id=' . $this->site_id; - else - $url = 'themes.php'; + } else { $url = 'themes.php'; + } if ( 'search' != $type ) { - $status_links[$type] = sprintf( "%s", - esc_url( add_query_arg('theme_status', $type, $url) ), + $status_links[ $type ] = sprintf( "%s", + esc_url( add_query_arg( 'theme_status', $type, $url ) ), ( $type === $status ) ? ' class="current"' : '', sprintf( $text, number_format_i18n( $count ) ) ); } - } + }// End foreach(). return $status_links; } @@ -329,15 +342,19 @@ global $status; $actions = array(); - if ( 'enabled' != $status ) + if ( 'enabled' != $status ) { $actions['enable-selected'] = $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' ); - if ( 'disabled' != $status ) + } + if ( 'disabled' != $status ) { $actions['disable-selected'] = $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' ); + } if ( ! $this->is_site_themes ) { - if ( current_user_can( 'update_themes' ) ) + if ( current_user_can( 'update_themes' ) ) { $actions['update-selected'] = __( 'Update' ); - if ( current_user_can( 'delete_themes' ) ) + } + if ( current_user_can( 'delete_themes' ) ) { $actions['delete-selected'] = __( 'Delete' ); + } } return $actions; } @@ -346,8 +363,9 @@ * @access public */ public function display_rows() { - foreach ( $this->items as $theme ) + foreach ( $this->items as $theme ) { $this->single_row( $theme ); + } } /** @@ -359,7 +377,7 @@ * @param WP_Theme $theme The current WP_Theme object. */ public function column_cb( $theme ) { - $checkbox_id = 'checkbox_' . md5( $theme->get('Name') ); + $checkbox_id = 'checkbox_' . md5( $theme->get( 'Name' ) ); ?> @@ -396,7 +414,7 @@ 'enable' => '', 'disable' => '', 'edit' => '', - 'delete' => '' + 'delete' => '', ); $stylesheet = $theme->get_stylesheet(); @@ -446,9 +464,9 @@ esc_attr( $aria_label ), ( $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' ) ) ); - } + }// End if(). - if ( current_user_can('edit_themes') ) { + if ( current_user_can( 'edit_themes' ) ) { $url = add_query_arg( array( 'theme' => $theme_key, ), 'theme-editor.php' ); @@ -549,8 +567,9 @@ } $class = ! $allowed ? 'inactive' : 'active'; - if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) ) + if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) ) { $class .= ' update'; + } echo "
array( 'href' => array(),'title' => array(), 'target' => array() ),
- 'abbr' => array( 'title' => array() ),'acronym' => array( 'title' => array() ),
- 'code' => array(), 'pre' => array(), 'em' => array(),'strong' => array(),
- 'ul' => array(), 'ol' => array(), 'li' => array(), 'p' => array(), 'br' => array()
+ 'a' => array(
+ 'href' => array(),
+ 'title' => array(),
+ 'target' => array(),
+ ),
+ 'abbr' => array(
+ 'title' => array(),
+ ),
+ 'acronym' => array(
+ 'title' => array(),
+ ),
+ 'code' => array(),
+ 'pre' => array(),
+ 'em' => array(),
+ 'strong' => array(),
+ 'ul' => array(),
+ 'ol' => array(),
+ 'li' => array(),
+ 'p' => array(),
+ 'br' => array(),
);
$plugins_group_titles = array(
@@ -484,7 +502,9 @@
$button_text = __( 'Network Activate' );
/* translators: %s: Plugin name */
$button_label = _x( 'Network Activate %s', 'plugin' );
- $activate_url = add_query_arg( array( 'networkwide' => 1 ), $activate_url );
+ $activate_url = add_query_arg( array(
+ 'networkwide' => 1,
+ ), $activate_url );
}
$action_links[] = sprintf(
@@ -497,20 +517,20 @@
$action_links[] = '';
}
break;
- }
- }
+ }// End switch().
+ }// End if().
$details_link = self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin['slug'] .
- '&TB_iframe=true&width=600&height=550' );
+ '&TB_iframe=true&width=600&height=550' );
/* translators: 1: Plugin name and version. */
$action_links[] = '' . __( 'More Details' ) . '';
- if ( !empty( $plugin['icons']['svg'] ) ) {
+ if ( ! empty( $plugin['icons']['svg'] ) ) {
$plugin_icon_url = $plugin['icons']['svg'];
- } elseif ( !empty( $plugin['icons']['2x'] ) ) {
+ } elseif ( ! empty( $plugin['icons']['2x'] ) ) {
$plugin_icon_url = $plugin['icons']['2x'];
- } elseif ( !empty( $plugin['icons']['1x'] ) ) {
+ } elseif ( ! empty( $plugin['icons']['1x'] ) ) {
$plugin_icon_url = $plugin['icons']['1x'];
} else {
$plugin_icon_url = $plugin['icons']['default'];
@@ -540,9 +560,9 @@
'; + echo ''; + comment_author( $comment ); + echo '
'; if ( ! empty( $author_url_display ) ) { printf( '%s
', esc_url( $author_url ), esc_html( $author_url_display ) ); } @@ -700,7 +718,10 @@ $author_ip = get_comment_author_IP( $comment ); if ( $author_ip ) { - $author_ip_url = add_query_arg( array( 's' => $author_ip, 'mode' => 'detail' ), admin_url( 'edit-comments.php' ) ); + $author_ip_url = add_query_arg( array( + 's' => $author_ip, + 'mode' => 'detail', + ), admin_url( 'edit-comments.php' ) ); if ( 'spam' === $comment_status ) { $author_ip_url = add_query_arg( 'comment_status', 'spam', $author_ip_url ); } @@ -723,7 +744,7 @@ ); echo '
';
- if ( 'approved' === wp_get_comment_status( $comment ) && ! empty ( $comment->comment_post_ID ) ) {
+ if ( 'approved' === wp_get_comment_status( $comment ) && ! empty( $comment->comment_post_ID ) ) {
printf(
'%s',
esc_url( get_comment_link( $comment ) ),
@@ -747,11 +768,11 @@
return;
}
- if ( isset( $this->pending_count[$post->ID] ) ) {
- $pending_comments = $this->pending_count[$post->ID];
+ if ( isset( $this->pending_count[ $post->ID ] ) ) {
+ $pending_comments = $this->pending_count[ $post->ID ];
} else {
$_pending_count_temp = get_pending_comments_num( array( $post->ID ) );
- $pending_comments = $this->pending_count[$post->ID] = $_pending_count_temp[$post->ID];
+ $pending_comments = $this->pending_count[ $post->ID ] = $_pending_count_temp[ $post->ID ];
}
if ( current_user_can( 'edit_post', $post->ID ) ) {
Index: src/wp-admin/includes/class-wp-community-events.php
===================================================================
--- src/wp-admin/includes/class-wp-community-events.php (revision 40901)
+++ src/wp-admin/includes/class-wp-community-events.php (working copy)
@@ -165,7 +165,7 @@
$this->maybe_log_events_response( 'Valid response received', $debugging_info );
return $response_body;
- }
+ }// End if().
}
/**
@@ -205,7 +205,7 @@
// Wrap the args in an array compatible with the second parameter of `wp_remote_get()`.
return array(
- 'body' => $args
+ 'body' => $args,
);
}
@@ -314,7 +314,7 @@
if ( isset( $location['ip'] ) ) {
$key = 'community-events-' . md5( $location['ip'] );
- } else if ( isset( $location['latitude'], $location['longitude'] ) ) {
+ } elseif ( isset( $location['latitude'], $location['longitude'] ) ) {
$key = 'community-events-' . md5( $location['latitude'] . $location['longitude'] );
}
Index: src/wp-admin/includes/class-wp-filesystem-base.php
===================================================================
--- src/wp-admin/includes/class-wp-filesystem-base.php (revision 40901)
+++ src/wp-admin/includes/class-wp-filesystem-base.php (working copy)
@@ -59,10 +59,11 @@
* @return string The location of the remote path.
*/
public function abspath() {
- $folder = $this->find_folder(ABSPATH);
+ $folder = $this->find_folder( ABSPATH );
// Perhaps the FTP folder is rooted at the WordPress install, Check for wp-includes folder in root, Could have some false positives, but rare.
- if ( ! $folder && $this->is_dir( '/' . WPINC ) )
+ if ( ! $folder && $this->is_dir( '/' . WPINC ) ) {
$folder = '/';
+ }
return $folder;
}
@@ -75,7 +76,7 @@
* @return string The location of the remote path.
*/
public function wp_content_dir() {
- return $this->find_folder(WP_CONTENT_DIR);
+ return $this->find_folder( WP_CONTENT_DIR );
}
/**
@@ -87,7 +88,7 @@
* @return string The location of the remote path.
*/
public function wp_plugins_dir() {
- return $this->find_folder(WP_PLUGIN_DIR);
+ return $this->find_folder( WP_PLUGIN_DIR );
}
/**
@@ -103,8 +104,9 @@
$theme_root = get_theme_root( $theme );
// Account for relative theme roots
- if ( '/themes' == $theme_root || ! is_dir( $theme_root ) )
+ if ( '/themes' == $theme_root || ! is_dir( $theme_root ) ) {
$theme_root = WP_CONTENT_DIR . $theme_root;
+ }
return $this->find_folder( $theme_root );
}
@@ -118,7 +120,7 @@
* @return string The location of the remote path.
*/
public function wp_lang_dir() {
- return $this->find_folder(WP_LANG_DIR);
+ return $this->find_folder( WP_LANG_DIR );
}
/**
@@ -139,7 +141,7 @@
* @return string The location of the remote path.
*/
public function find_base_dir( $base = '.', $echo = false ) {
- _deprecated_function(__FUNCTION__, '2.7.0', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' );
+ _deprecated_function( __FUNCTION__, '2.7.0', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' );
$this->verbose = $echo;
return $this->abspath();
}
@@ -161,7 +163,7 @@
* @return string The location of the remote path.
*/
public function get_base_dir( $base = '.', $echo = false ) {
- _deprecated_function(__FUNCTION__, '2.7.0', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' );
+ _deprecated_function( __FUNCTION__, '2.7.0', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' );
$this->verbose = $echo;
return $this->abspath();
}
@@ -179,29 +181,33 @@
* @return string|false The location of the remote path, false on failure.
*/
public function find_folder( $folder ) {
- if ( isset( $this->cache[ $folder ] ) )
+ if ( isset( $this->cache[ $folder ] ) ) {
return $this->cache[ $folder ];
+ }
- if ( stripos($this->method, 'ftp') !== false ) {
+ if ( stripos( $this->method, 'ftp' ) !== false ) {
$constant_overrides = array(
'FTP_BASE' => ABSPATH,
'FTP_CONTENT_DIR' => WP_CONTENT_DIR,
'FTP_PLUGIN_DIR' => WP_PLUGIN_DIR,
- 'FTP_LANG_DIR' => WP_LANG_DIR
+ 'FTP_LANG_DIR' => WP_LANG_DIR,
);
// Direct matches ( folder = CONSTANT/ )
foreach ( $constant_overrides as $constant => $dir ) {
- if ( ! defined( $constant ) )
+ if ( ! defined( $constant ) ) {
continue;
- if ( $folder === $dir )
+ }
+ if ( $folder === $dir ) {
return trailingslashit( constant( $constant ) );
+ }
}
// Prefix Matches ( folder = CONSTANT/subdir )
foreach ( $constant_overrides as $constant => $dir ) {
- if ( ! defined( $constant ) )
+ if ( ! defined( $constant ) ) {
continue;
+ }
if ( 0 === stripos( $folder, $dir ) ) { // $folder starts with $dir
$potential_folder = preg_replace( '#^' . preg_quote( $dir, '#' ) . '/#i', trailingslashit( constant( $constant ) ), $folder );
$potential_folder = trailingslashit( $potential_folder );
@@ -213,23 +219,25 @@
}
}
} elseif ( 'direct' == $this->method ) {
- $folder = str_replace('\\', '/', $folder); // Windows path sanitisation
- return trailingslashit($folder);
- }
+ $folder = str_replace( '\\', '/', $folder ); // Windows path sanitisation
+ return trailingslashit( $folder );
+ }// End if().
- $folder = preg_replace('|^([a-z]{1}):|i', '', $folder); // Strip out windows drive letter if it's there.
- $folder = str_replace('\\', '/', $folder); // Windows path sanitisation
+ $folder = preg_replace( '|^([a-z]{1}):|i', '', $folder ); // Strip out windows drive letter if it's there.
+ $folder = str_replace( '\\', '/', $folder ); // Windows path sanitisation
- if ( isset($this->cache[ $folder ] ) )
+ if ( isset( $this->cache[ $folder ] ) ) {
return $this->cache[ $folder ];
+ }
- if ( $this->exists($folder) ) { // Folder exists at that absolute path.
- $folder = trailingslashit($folder);
+ if ( $this->exists( $folder ) ) { // Folder exists at that absolute path.
+ $folder = trailingslashit( $folder );
$this->cache[ $folder ] = $folder;
return $folder;
}
- if ( $return = $this->search_for_folder($folder) )
+ if ( $return = $this->search_for_folder( $folder ) ) {
$this->cache[ $folder ] = $return;
+ }
return $return;
}
@@ -247,17 +255,18 @@
* @return string|false The location of the remote path, false to cease looping.
*/
public function search_for_folder( $folder, $base = '.', $loop = false ) {
- if ( empty( $base ) || '.' == $base )
- $base = trailingslashit($this->cwd());
+ if ( empty( $base ) || '.' == $base ) {
+ $base = trailingslashit( $this->cwd() );
+ }
- $folder = untrailingslashit($folder);
+ $folder = untrailingslashit( $folder );
if ( $this->verbose ) {
/* translators: 1: folder to locate, 2: folder to start searching from */
printf( "\n" . __( 'Looking for %1$s in %2$s' ) . "
\n", $folder, $base ); } - $folder_parts = explode('/', $folder); + $folder_parts = explode( '/', $folder ); $folder_part_keys = array_keys( $folder_parts ); $last_index = array_pop( $folder_part_keys ); $last_path = $folder_parts[ $last_index ]; @@ -265,8 +274,9 @@ $files = $this->dirlist( $base ); foreach ( $folder_parts as $index => $key ) { - if ( $index == $last_index ) + if ( $index == $last_index ) { continue; // We want this to be caught by the next code block. + } /* * Working from /home/ to /user/ to /wordpress/ see if that file exists within @@ -275,10 +285,10 @@ * folder level, and see if that matches, and so on. If it reaches the end, and still * cant find it, it'll return false for the entire function. */ - if ( isset($files[ $key ]) ){ + if ( isset( $files[ $key ] ) ) { // Let's try that folder: - $newdir = trailingslashit(path_join($base, $key)); + $newdir = trailingslashit( path_join( $base, $key ) ); if ( $this->verbose ) { /* translators: %s: directory name */ printf( "\n" . __( 'Changing to %s' ) . "
\n", $newdir ); @@ -286,25 +296,27 @@ // Only search for the remaining path tokens in the directory, not the full path again. $newfolder = implode( '/', array_slice( $folder_parts, $index + 1 ) ); - if ( $ret = $this->search_for_folder( $newfolder, $newdir, $loop) ) + if ( $ret = $this->search_for_folder( $newfolder, $newdir, $loop ) ) { return $ret; + } } } // Only check this as a last resort, to prevent locating the incorrect install. // All above procedures will fail quickly if this is the right branch to take. - if (isset( $files[ $last_path ] ) ) { + if ( isset( $files[ $last_path ] ) ) { if ( $this->verbose ) { /* translators: %s: directory name */ printf( "\n" . __( 'Found %s' ) . "
\n", $base . $last_path ); } - return trailingslashit($base . $last_path); + return trailingslashit( $base . $last_path ); } // Prevent this function from looping again. // No need to proceed if we've just searched in / - if ( $loop || '/' == $base ) + if ( $loop || '/' == $base ) { return false; + } // As an extra last resort, Change back to / if the folder wasn't found. // This comes into effect when the CWD is /home/user/ but WP is at /var/www/.... @@ -325,24 +337,25 @@ * @param string $file String filename. * @return string The *nix-style representation of permissions. */ - public function gethchmod( $file ){ + public function gethchmod( $file ) { $perms = intval( $this->getchmod( $file ), 8 ); - if (($perms & 0xC000) == 0xC000) // Socket + if ( ($perms & 0xC000) == 0xC000 ) { // Socket $info = 's'; - elseif (($perms & 0xA000) == 0xA000) // Symbolic Link + } elseif ( ($perms & 0xA000) == 0xA000 ) { // Symbolic Link $info = 'l'; - elseif (($perms & 0x8000) == 0x8000) // Regular + } elseif ( ($perms & 0x8000) == 0x8000 ) { // Regular $info = '-'; - elseif (($perms & 0x6000) == 0x6000) // Block special + } elseif ( ($perms & 0x6000) == 0x6000 ) { // Block special $info = 'b'; - elseif (($perms & 0x4000) == 0x4000) // Directory + } elseif ( ($perms & 0x4000) == 0x4000 ) { // Directory $info = 'd'; - elseif (($perms & 0x2000) == 0x2000) // Character special + } elseif ( ($perms & 0x2000) == 0x2000 ) { // Character special $info = 'c'; - elseif (($perms & 0x1000) == 0x1000) // FIFO pipe + } elseif ( ($perms & 0x1000) == 0x1000 ) { // FIFO pipe $info = 'p'; - else // Unknown + } else { // End if(). $info = 'u'; + } // Owner $info .= (($perms & 0x0100) ? 'r' : '-'); @@ -384,7 +397,7 @@ * * Converts '-rw-r--r--' to 0644 * From "info at rvgate dot nl"'s comment on the PHP documentation for chmod() - * + * * @link https://secure.php.net/manual/en/function.chmod.php#49614 * * @access public @@ -395,18 +408,23 @@ */ public function getnumchmodfromh( $mode ) { $realmode = ''; - $legal = array('', 'w', 'r', 'x', '-'); - $attarray = preg_split('//', $mode); + $legal = array( '', 'w', 'r', 'x', '-' ); + $attarray = preg_split( '//', $mode ); for ( $i = 0, $c = count( $attarray ); $i < $c; $i++ ) { - if ($key = array_search($attarray[$i], $legal)) { - $realmode .= $legal[$key]; - } + if ( $key = array_search( $attarray[ $i ], $legal ) ) { + $realmode .= $legal[ $key ]; + } } - $mode = str_pad($realmode, 10, '-', STR_PAD_LEFT); - $trans = array('-'=>'0', 'r'=>'4', 'w'=>'2', 'x'=>'1'); - $mode = strtr($mode,$trans); + $mode = str_pad( $realmode, 10, '-', STR_PAD_LEFT ); + $trans = array( + '-' => '0', + 'r' => '4', + 'w' => '2', + 'x' => '1', + ); + $mode = strtr( $mode,$trans ); $newmode = $mode[0]; $newmode .= $mode[1] + $mode[2] + $mode[3]; @@ -567,7 +585,7 @@ * @access public * @since 2.5.0 * @abstract - * + * * @param string $file Path to the file. * @return string|bool Username of the user or false on error. */ Index: src/wp-admin/includes/class-wp-filesystem-direct.php =================================================================== --- src/wp-admin/includes/class-wp-filesystem-direct.php (revision 40901) +++ src/wp-admin/includes/class-wp-filesystem-direct.php (working copy) @@ -23,7 +23,7 @@ * * @param mixed $arg ignored argument */ - public function __construct($arg) { + public function __construct( $arg ) { $this->method = 'direct'; $this->errors = new WP_Error(); } @@ -36,8 +36,8 @@ * @param string $file Name of the file to read. * @return string|bool The function returns the read data or false on failure. */ - public function get_contents($file) { - return @file_get_contents($file); + public function get_contents( $file ) { + return @file_get_contents( $file ); } /** @@ -48,8 +48,8 @@ * @param string $file Path to the file. * @return array|bool the file contents in an array or false on failure. */ - public function get_contents_array($file) { - return @file($file); + public function get_contents_array( $file ) { + return @file( $file ); } /** @@ -65,8 +65,9 @@ */ public function put_contents( $file, $contents, $mode = false ) { $fp = @fopen( $file, 'wb' ); - if ( ! $fp ) + if ( ! $fp ) { return false; + } mbstring_binary_safe_encoding(); @@ -78,8 +79,9 @@ fclose( $fp ); - if ( $data_length !== $bytes_written ) + if ( $data_length !== $bytes_written ) { return false; + } $this->chmod( $file, $mode ); @@ -105,8 +107,8 @@ * @param string $dir The new current directory. * @return bool Returns true on success or false on failure. */ - public function chdir($dir) { - return @chdir($dir); + public function chdir( $dir ) { + return @chdir( $dir ); } /** @@ -119,18 +121,22 @@ * @param bool $recursive Optional. If set True changes file group recursively. Default false. * @return bool Returns true on success or false on failure. */ - public function chgrp($file, $group, $recursive = false) { - if ( ! $this->exists($file) ) + public function chgrp( $file, $group, $recursive = false ) { + if ( ! $this->exists( $file ) ) { return false; - if ( ! $recursive ) - return @chgrp($file, $group); - if ( ! $this->is_dir($file) ) - return @chgrp($file, $group); + } + if ( ! $recursive ) { + return @chgrp( $file, $group ); + } + if ( ! $this->is_dir( $file ) ) { + return @chgrp( $file, $group ); + } // Is a directory, and we want recursive - $file = trailingslashit($file); - $filelist = $this->dirlist($file); - foreach ($filelist as $filename) - $this->chgrp($file . $filename, $group, $recursive); + $file = trailingslashit( $file ); + $filelist = $this->dirlist( $file ); + foreach ( $filelist as $filename ) { + $this->chgrp( $file . $filename, $group, $recursive ); + } return true; } @@ -146,23 +152,25 @@ * @param bool $recursive Optional. If set True changes file group recursively. Default false. * @return bool Returns true on success or false on failure. */ - public function chmod($file, $mode = false, $recursive = false) { + public function chmod( $file, $mode = false, $recursive = false ) { if ( ! $mode ) { - if ( $this->is_file($file) ) + if ( $this->is_file( $file ) ) { $mode = FS_CHMOD_FILE; - elseif ( $this->is_dir($file) ) + } elseif ( $this->is_dir( $file ) ) { $mode = FS_CHMOD_DIR; - else - return false; + } else { return false; + } } - if ( ! $recursive || ! $this->is_dir($file) ) - return @chmod($file, $mode); + if ( ! $recursive || ! $this->is_dir( $file ) ) { + return @chmod( $file, $mode ); + } // Is a directory, and we want recursive - $file = trailingslashit($file); - $filelist = $this->dirlist($file); - foreach ( (array)$filelist as $filename => $filemeta) - $this->chmod($file . $filename, $mode, $recursive); + $file = trailingslashit( $file ); + $filelist = $this->dirlist( $file ); + foreach ( (array) $filelist as $filename => $filemeta ) { + $this->chmod( $file . $filename, $mode, $recursive ); + } return true; } @@ -178,17 +186,20 @@ * Default false. * @return bool Returns true on success or false on failure. */ - public function chown($file, $owner, $recursive = false) { - if ( ! $this->exists($file) ) + public function chown( $file, $owner, $recursive = false ) { + if ( ! $this->exists( $file ) ) { return false; - if ( ! $recursive ) - return @chown($file, $owner); - if ( ! $this->is_dir($file) ) - return @chown($file, $owner); + } + if ( ! $recursive ) { + return @chown( $file, $owner ); + } + if ( ! $this->is_dir( $file ) ) { + return @chown( $file, $owner ); + } // Is a directory, and we want recursive - $filelist = $this->dirlist($file); - foreach ($filelist as $filename) { - $this->chown($file . '/' . $filename, $owner, $recursive); + $filelist = $this->dirlist( $file ); + foreach ( $filelist as $filename ) { + $this->chown( $file . '/' . $filename, $owner, $recursive ); } return true; } @@ -201,13 +212,15 @@ * @param string $file Path to the file. * @return string|bool Username of the user or false on error. */ - public function owner($file) { - $owneruid = @fileowner($file); - if ( ! $owneruid ) + public function owner( $file ) { + $owneruid = @fileowner( $file ); + if ( ! $owneruid ) { return false; - if ( ! function_exists('posix_getpwuid') ) + } + if ( ! function_exists( 'posix_getpwuid' ) ) { return $owneruid; - $ownerarray = posix_getpwuid($owneruid); + } + $ownerarray = posix_getpwuid( $owneruid ); return $ownerarray['name']; } @@ -221,7 +234,7 @@ * @param string $file Path to the file. * @return string Mode of the file (last 3 digits). */ - public function getchmod($file) { + public function getchmod( $file ) { return substr( decoct( @fileperms( $file ) ), -3 ); } @@ -231,13 +244,15 @@ * @param string $file * @return string|false */ - public function group($file) { - $gid = @filegroup($file); - if ( ! $gid ) + public function group( $file ) { + $gid = @filegroup( $file ); + if ( ! $gid ) { return false; - if ( ! function_exists('posix_getgrgid') ) + } + if ( ! function_exists( 'posix_getgrgid' ) ) { return $gid; - $grouparray = posix_getgrgid($gid); + } + $grouparray = posix_getgrgid( $gid ); return $grouparray['name']; } @@ -250,13 +265,15 @@ * @param int $mode * @return bool */ - public function copy($source, $destination, $overwrite = false, $mode = false) { - if ( ! $overwrite && $this->exists($destination) ) + public function copy( $source, $destination, $overwrite = false, $mode = false ) { + if ( ! $overwrite && $this->exists( $destination ) ) { return false; + } - $rtval = copy($source, $destination); - if ( $mode ) - $this->chmod($destination, $mode); + $rtval = copy( $source, $destination ); + if ( $mode ) { + $this->chmod( $destination, $mode ); + } return $rtval; } @@ -268,16 +285,18 @@ * @param bool $overwrite * @return bool */ - public function move($source, $destination, $overwrite = false) { - if ( ! $overwrite && $this->exists($destination) ) + public function move( $source, $destination, $overwrite = false ) { + if ( ! $overwrite && $this->exists( $destination ) ) { return false; + } // Try using rename first. if that fails (for example, source is read only) try copy. - if ( @rename($source, $destination) ) + if ( @rename( $source, $destination ) ) { return true; + } - if ( $this->copy($source, $destination, $overwrite) && $this->exists($destination) ) { - $this->delete($source); + if ( $this->copy( $source, $destination, $overwrite ) && $this->exists( $destination ) ) { + $this->delete( $source ); return true; } else { return false; @@ -292,30 +311,35 @@ * @param string $type * @return bool */ - public function delete($file, $recursive = false, $type = false) { - if ( empty( $file ) ) // Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem. + public function delete( $file, $recursive = false, $type = false ) { + if ( empty( $file ) ) { // Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem. return false; + } $file = str_replace( '\\', '/', $file ); // for win32, occasional problems deleting files otherwise - if ( 'f' == $type || $this->is_file($file) ) - return @unlink($file); - if ( ! $recursive && $this->is_dir($file) ) - return @rmdir($file); + if ( 'f' == $type || $this->is_file( $file ) ) { + return @unlink( $file ); + } + if ( ! $recursive && $this->is_dir( $file ) ) { + return @rmdir( $file ); + } // At this point it's a folder, and we're in recursive mode - $file = trailingslashit($file); - $filelist = $this->dirlist($file, true); + $file = trailingslashit( $file ); + $filelist = $this->dirlist( $file, true ); $retval = true; if ( is_array( $filelist ) ) { foreach ( $filelist as $filename => $fileinfo ) { - if ( ! $this->delete($file . $filename, $recursive, $fileinfo['type']) ) + if ( ! $this->delete( $file . $filename, $recursive, $fileinfo['type'] ) ) { $retval = false; + } } } - if ( file_exists($file) && ! @rmdir($file) ) + if ( file_exists( $file ) && ! @rmdir( $file ) ) { $retval = false; + } return $retval; } @@ -325,8 +349,8 @@ * @param string $file * @return bool */ - public function exists($file) { - return @file_exists($file); + public function exists( $file ) { + return @file_exists( $file ); } /** * @access public @@ -334,8 +358,8 @@ * @param string $file * @return bool */ - public function is_file($file) { - return @is_file($file); + public function is_file( $file ) { + return @is_file( $file ); } /** * @access public @@ -343,8 +367,8 @@ * @param string $path * @return bool */ - public function is_dir($path) { - return @is_dir($path); + public function is_dir( $path ) { + return @is_dir( $path ); } /** @@ -353,8 +377,8 @@ * @param string $file * @return bool */ - public function is_readable($file) { - return @is_readable($file); + public function is_readable( $file ) { + return @is_readable( $file ); } /** @@ -363,8 +387,8 @@ * @param string $file * @return bool */ - public function is_writable($file) { - return @is_writable($file); + public function is_writable( $file ) { + return @is_writable( $file ); } /** @@ -373,8 +397,8 @@ * @param string $file * @return int */ - public function atime($file) { - return @fileatime($file); + public function atime( $file ) { + return @fileatime( $file ); } /** @@ -383,8 +407,8 @@ * @param string $file * @return int */ - public function mtime($file) { - return @filemtime($file); + public function mtime( $file ) { + return @filemtime( $file ); } /** @@ -393,8 +417,8 @@ * @param string $file * @return int */ - public function size($file) { - return @filesize($file); + public function size( $file ) { + return @filesize( $file ); } /** @@ -405,12 +429,14 @@ * @param int $atime * @return bool */ - public function touch($file, $time = 0, $atime = 0) { - if ($time == 0) + public function touch( $file, $time = 0, $atime = 0 ) { + if ( $time == 0 ) { $time = time(); - if ($atime == 0) + } + if ( $atime == 0 ) { $atime = time(); - return @touch($file, $time, $atime); + } + return @touch( $file, $time, $atime ); } /** @@ -422,22 +448,27 @@ * @param mixed $chgrp * @return bool */ - public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) { + public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) { // Safe mode fails with a trailing slash under certain PHP versions. - $path = untrailingslashit($path); - if ( empty($path) ) + $path = untrailingslashit( $path ); + if ( empty( $path ) ) { return false; + } - if ( ! $chmod ) + if ( ! $chmod ) { $chmod = FS_CHMOD_DIR; + } - if ( ! @mkdir($path) ) + if ( ! @mkdir( $path ) ) { return false; - $this->chmod($path, $chmod); - if ( $chown ) - $this->chown($path, $chown); - if ( $chgrp ) - $this->chgrp($path, $chgrp); + } + $this->chmod( $path, $chmod ); + if ( $chown ) { + $this->chown( $path, $chown ); + } + if ( $chgrp ) { + $this->chgrp( $path, $chgrp ); + } return true; } @@ -448,8 +479,8 @@ * @param bool $recursive * @return bool */ - public function rmdir($path, $recursive = false) { - return $this->delete($path, $recursive); + public function rmdir( $path, $recursive = false ) { + return $this->delete( $path, $recursive ); } /** @@ -460,58 +491,63 @@ * @param bool $recursive * @return bool|array */ - public function dirlist($path, $include_hidden = true, $recursive = false) { - if ( $this->is_file($path) ) { - $limit_file = basename($path); - $path = dirname($path); + public function dirlist( $path, $include_hidden = true, $recursive = false ) { + if ( $this->is_file( $path ) ) { + $limit_file = basename( $path ); + $path = dirname( $path ); } else { $limit_file = false; } - if ( ! $this->is_dir($path) ) + if ( ! $this->is_dir( $path ) ) { return false; + } - $dir = @dir($path); - if ( ! $dir ) + $dir = @dir( $path ); + if ( ! $dir ) { return false; + } $ret = array(); - while (false !== ($entry = $dir->read()) ) { + while ( false !== ($entry = $dir->read()) ) { $struc = array(); $struc['name'] = $entry; - if ( '.' == $struc['name'] || '..' == $struc['name'] ) + if ( '.' == $struc['name'] || '..' == $struc['name'] ) { continue; + } - if ( ! $include_hidden && '.' == $struc['name'][0] ) + if ( ! $include_hidden && '.' == $struc['name'][0] ) { continue; + } - if ( $limit_file && $struc['name'] != $limit_file) + if ( $limit_file && $struc['name'] != $limit_file ) { continue; + } - $struc['perms'] = $this->gethchmod($path.'/'.$entry); - $struc['permsn'] = $this->getnumchmodfromh($struc['perms']); + $struc['perms'] = $this->gethchmod( $path . '/' . $entry ); + $struc['permsn'] = $this->getnumchmodfromh( $struc['perms'] ); $struc['number'] = false; - $struc['owner'] = $this->owner($path.'/'.$entry); - $struc['group'] = $this->group($path.'/'.$entry); - $struc['size'] = $this->size($path.'/'.$entry); - $struc['lastmodunix']= $this->mtime($path.'/'.$entry); - $struc['lastmod'] = date('M j',$struc['lastmodunix']); - $struc['time'] = date('h:i:s',$struc['lastmodunix']); - $struc['type'] = $this->is_dir($path.'/'.$entry) ? 'd' : 'f'; + $struc['owner'] = $this->owner( $path . '/' . $entry ); + $struc['group'] = $this->group( $path . '/' . $entry ); + $struc['size'] = $this->size( $path . '/' . $entry ); + $struc['lastmodunix'] = $this->mtime( $path . '/' . $entry ); + $struc['lastmod'] = date( 'M j',$struc['lastmodunix'] ); + $struc['time'] = date( 'h:i:s',$struc['lastmodunix'] ); + $struc['type'] = $this->is_dir( $path . '/' . $entry ) ? 'd' : 'f'; if ( 'd' == $struc['type'] ) { - if ( $recursive ) - $struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive); - else - $struc['files'] = array(); + if ( $recursive ) { + $struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive ); + } else { $struc['files'] = array(); + } } $ret[ $struc['name'] ] = $struc; - } + }// End while(). $dir->close(); - unset($dir); + unset( $dir ); return $ret; } } Index: src/wp-admin/includes/class-wp-filesystem-ftpext.php =================================================================== --- src/wp-admin/includes/class-wp-filesystem-ftpext.php (revision 40901) +++ src/wp-admin/includes/class-wp-filesystem-ftpext.php (working copy) @@ -27,40 +27,42 @@ $this->errors = new WP_Error(); // Check if possible to use ftp functions. - if ( ! extension_loaded('ftp') ) { - $this->errors->add('no_ftp_ext', __('The ftp PHP extension is not available')); + if ( ! extension_loaded( 'ftp' ) ) { + $this->errors->add( 'no_ftp_ext', __( 'The ftp PHP extension is not available' ) ); return; } // This Class uses the timeout on a per-connection basis, Others use it on a per-action basis. - if ( ! defined('FS_TIMEOUT') ) - define('FS_TIMEOUT', 240); + if ( ! defined( 'FS_TIMEOUT' ) ) { + define( 'FS_TIMEOUT', 240 ); + } - if ( empty($opt['port']) ) + if ( empty( $opt['port'] ) ) { $this->options['port'] = 21; - else - $this->options['port'] = $opt['port']; + } else { $this->options['port'] = $opt['port']; + } - if ( empty($opt['hostname']) ) - $this->errors->add('empty_hostname', __('FTP hostname is required')); - else - $this->options['hostname'] = $opt['hostname']; + if ( empty( $opt['hostname'] ) ) { + $this->errors->add( 'empty_hostname', __( 'FTP hostname is required' ) ); + } else { $this->options['hostname'] = $opt['hostname']; + } // Check if the options provided are OK. - if ( empty($opt['username']) ) - $this->errors->add('empty_username', __('FTP username is required')); - else - $this->options['username'] = $opt['username']; - - if ( empty($opt['password']) ) - $this->errors->add('empty_password', __('FTP password is required')); - else - $this->options['password'] = $opt['password']; + if ( empty( $opt['username'] ) ) { + $this->errors->add( 'empty_username', __( 'FTP username is required' ) ); + } else { $this->options['username'] = $opt['username']; + } + + if ( empty( $opt['password'] ) ) { + $this->errors->add( 'empty_password', __( 'FTP password is required' ) ); + } else { $this->options['password'] = $opt['password']; + } $this->options['ssl'] = false; - if ( isset($opt['connection_type']) && 'ftps' == $opt['connection_type'] ) + if ( isset( $opt['connection_type'] ) && 'ftps' == $opt['connection_type'] ) { $this->options['ssl'] = true; + } } /** @@ -69,10 +71,10 @@ * @return bool */ public function connect() { - if ( isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect') ) - $this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT); - else - $this->link = @ftp_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT); + if ( isset( $this->options['ssl'] ) && $this->options['ssl'] && function_exists( 'ftp_ssl_connect' ) ) { + $this->link = @ftp_ssl_connect( $this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT ); + } else { $this->link = @ftp_connect( $this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT ); + } if ( ! $this->link ) { $this->errors->add( 'connect', @@ -96,8 +98,9 @@ // Set the Connection to use Passive FTP @ftp_pasv( $this->link, true ); - if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT ) - @ftp_set_option($this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT); + if ( @ftp_get_option( $this->link, FTP_TIMEOUT_SEC ) < FS_TIMEOUT ) { + @ftp_set_option( $this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT ); + } return true; } @@ -113,8 +116,8 @@ * or if the file couldn't be retrieved. */ public function get_contents( $file ) { - $tempfile = wp_tempnam($file); - $temp = fopen($tempfile, 'w+'); + $tempfile = wp_tempnam( $file ); + $temp = fopen( $tempfile, 'w+' ); if ( ! $temp ) { unlink( $tempfile ); @@ -130,11 +133,11 @@ fseek( $temp, 0 ); // Skip back to the start of the file being written to $contents = ''; - while ( ! feof($temp) ) - $contents .= fread($temp, 8192); + while ( ! feof( $temp ) ) { $contents .= fread( $temp, 8192 ); + } - fclose($temp); - unlink($tempfile); + fclose( $temp ); + unlink( $tempfile ); return $contents; } @@ -144,8 +147,8 @@ * @param string $file * @return array */ - public function get_contents_array($file) { - return explode("\n", $this->get_contents($file)); + public function get_contents_array( $file ) { + return explode( "\n", $this->get_contents( $file ) ); } /** @@ -156,8 +159,8 @@ * @param bool|int $mode * @return bool */ - public function put_contents($file, $contents, $mode = false ) { - $tempfile = wp_tempnam($file); + public function put_contents( $file, $contents, $mode = false ) { + $tempfile = wp_tempnam( $file ); $temp = fopen( $tempfile, 'wb+' ); if ( ! $temp ) { @@ -182,10 +185,10 @@ $ret = @ftp_fput( $this->link, $file, $temp, FTP_BINARY ); - fclose($temp); - unlink($tempfile); + fclose( $temp ); + unlink( $tempfile ); - $this->chmod($file, $mode); + $this->chmod( $file, $mode ); return $ret; } @@ -196,9 +199,10 @@ * @return string */ public function cwd() { - $cwd = @ftp_pwd($this->link); - if ( $cwd ) - $cwd = trailingslashit($cwd); + $cwd = @ftp_pwd( $this->link ); + if ( $cwd ) { + $cwd = trailingslashit( $cwd ); + } return $cwd; } @@ -208,8 +212,8 @@ * @param string $dir * @return bool */ - public function chdir($dir) { - return @ftp_chdir($this->link, $dir); + public function chdir( $dir ) { + return @ftp_chdir( $this->link, $dir ); } /** @@ -220,27 +224,29 @@ * @param bool $recursive * @return bool */ - public function chmod($file, $mode = false, $recursive = false) { + public function chmod( $file, $mode = false, $recursive = false ) { if ( ! $mode ) { - if ( $this->is_file($file) ) + if ( $this->is_file( $file ) ) { $mode = FS_CHMOD_FILE; - elseif ( $this->is_dir($file) ) + } elseif ( $this->is_dir( $file ) ) { $mode = FS_CHMOD_DIR; - else - return false; + } else { return false; + } } // chmod any sub-objects if recursive. - if ( $recursive && $this->is_dir($file) ) { - $filelist = $this->dirlist($file); - foreach ( (array)$filelist as $filename => $filemeta ) - $this->chmod($file . '/' . $filename, $mode, $recursive); + if ( $recursive && $this->is_dir( $file ) ) { + $filelist = $this->dirlist( $file ); + foreach ( (array) $filelist as $filename => $filemeta ) { + $this->chmod( $file . '/' . $filename, $mode, $recursive ); + } } // chmod the file or directory - if ( ! function_exists('ftp_chmod') ) - return (bool)@ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file)); - return (bool)@ftp_chmod($this->link, $mode, $file); + if ( ! function_exists( 'ftp_chmod' ) ) { + return (bool) @ftp_site( $this->link, sprintf( 'CHMOD %o %s', $mode, $file ) ); + } + return (bool) @ftp_chmod( $this->link, $mode, $file ); } /** @@ -249,9 +255,9 @@ * @param string $file * @return string */ - public function owner($file) { - $dir = $this->dirlist($file); - return $dir[$file]['owner']; + public function owner( $file ) { + $dir = $this->dirlist( $file ); + return $dir[ $file ]['owner']; } /** * @access public @@ -259,9 +265,9 @@ * @param string $file * @return string */ - public function getchmod($file) { - $dir = $this->dirlist($file); - return $dir[$file]['permsn']; + public function getchmod( $file ) { + $dir = $this->dirlist( $file ); + return $dir[ $file ]['permsn']; } /** @@ -270,9 +276,9 @@ * @param string $file * @return string */ - public function group($file) { - $dir = $this->dirlist($file); - return $dir[$file]['group']; + public function group( $file ) { + $dir = $this->dirlist( $file ); + return $dir[ $file ]['group']; } /** @@ -284,13 +290,15 @@ * @param string|bool $mode * @return bool */ - public function copy($source, $destination, $overwrite = false, $mode = false) { - if ( ! $overwrite && $this->exists($destination) ) + public function copy( $source, $destination, $overwrite = false, $mode = false ) { + if ( ! $overwrite && $this->exists( $destination ) ) { return false; - $content = $this->get_contents($source); - if ( false === $content ) + } + $content = $this->get_contents( $source ); + if ( false === $content ) { return false; - return $this->put_contents($destination, $content, $mode); + } + return $this->put_contents( $destination, $content, $mode ); } /** @@ -301,8 +309,8 @@ * @param bool $overwrite * @return bool */ - public function move($source, $destination, $overwrite = false) { - return ftp_rename($this->link, $source, $destination); + public function move( $source, $destination, $overwrite = false ) { + return ftp_rename( $this->link, $source, $destination ); } /** @@ -313,19 +321,24 @@ * @param string $type * @return bool */ - public function delete($file, $recursive = false, $type = false) { - if ( empty($file) ) + public function delete( $file, $recursive = false, $type = false ) { + if ( empty( $file ) ) { return false; - if ( 'f' == $type || $this->is_file($file) ) - return @ftp_delete($this->link, $file); - if ( !$recursive ) - return @ftp_rmdir($this->link, $file); + } + if ( 'f' == $type || $this->is_file( $file ) ) { + return @ftp_delete( $this->link, $file ); + } + if ( ! $recursive ) { + return @ftp_rmdir( $this->link, $file ); + } - $filelist = $this->dirlist( trailingslashit($file) ); - if ( !empty($filelist) ) - foreach ( $filelist as $delete_file ) - $this->delete( trailingslashit($file) . $delete_file['name'], $recursive, $delete_file['type'] ); - return @ftp_rmdir($this->link, $file); + $filelist = $this->dirlist( trailingslashit( $file ) ); + if ( ! empty( $filelist ) ) { + foreach ( $filelist as $delete_file ) { + $this->delete( trailingslashit( $file ) . $delete_file['name'], $recursive, $delete_file['type'] ); + } + } + return @ftp_rmdir( $this->link, $file ); } /** @@ -334,14 +347,14 @@ * @param string $file * @return bool */ - public function exists($file) { - $list = @ftp_nlist($this->link, $file); + public function exists( $file ) { + $list = @ftp_nlist( $this->link, $file ); if ( empty( $list ) && $this->is_dir( $file ) ) { return true; // File is an empty directory. } - return !empty($list); //empty list = no file, so invert. + return ! empty( $list ); //empty list = no file, so invert. } /** @@ -350,8 +363,8 @@ * @param string $file * @return bool */ - public function is_file($file) { - return $this->exists($file) && !$this->is_dir($file); + public function is_file( $file ) { + return $this->exists( $file ) && ! $this->is_dir( $file ); } /** @@ -360,11 +373,11 @@ * @param string $path * @return bool */ - public function is_dir($path) { + public function is_dir( $path ) { $cwd = $this->cwd(); - $result = @ftp_chdir($this->link, trailingslashit($path) ); + $result = @ftp_chdir( $this->link, trailingslashit( $path ) ); if ( $result && $path == $this->cwd() || $this->cwd() != $cwd ) { - @ftp_chdir($this->link, $cwd); + @ftp_chdir( $this->link, $cwd ); return true; } return false; @@ -376,7 +389,7 @@ * @param string $file * @return bool */ - public function is_readable($file) { + public function is_readable( $file ) { return true; } @@ -386,7 +399,7 @@ * @param string $file * @return bool */ - public function is_writable($file) { + public function is_writable( $file ) { return true; } @@ -396,7 +409,7 @@ * @param string $file * @return bool */ - public function atime($file) { + public function atime( $file ) { return false; } @@ -406,8 +419,8 @@ * @param string $file * @return int */ - public function mtime($file) { - return ftp_mdtm($this->link, $file); + public function mtime( $file ) { + return ftp_mdtm( $this->link, $file ); } /** @@ -416,8 +429,8 @@ * @param string $file * @return int */ - public function size($file) { - return ftp_size($this->link, $file); + public function size( $file ) { + return ftp_size( $this->link, $file ); } /** @@ -426,7 +439,7 @@ * @param string $file * @return bool */ - public function touch($file, $time = 0, $atime = 0) { + public function touch( $file, $time = 0, $atime = 0 ) { return false; } @@ -439,14 +452,16 @@ * @param mixed $chgrp * @return bool */ - public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) { - $path = untrailingslashit($path); - if ( empty($path) ) + public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) { + $path = untrailingslashit( $path ); + if ( empty( $path ) ) { return false; + } - if ( !@ftp_mkdir($this->link, $path) ) + if ( ! @ftp_mkdir( $this->link, $path ) ) { return false; - $this->chmod($path, $chmod); + } + $this->chmod( $path, $chmod ); return true; } @@ -457,8 +472,8 @@ * @param bool $recursive * @return bool */ - public function rmdir($path, $recursive = false) { - return $this->delete($path, $recursive); + public function rmdir( $path, $recursive = false ) { + return $this->delete( $path, $recursive ); } /** @@ -468,45 +483,47 @@ * @param string $line * @return array */ - public function parselisting($line) { + public function parselisting( $line ) { static $is_windows = null; - if ( is_null($is_windows) ) - $is_windows = stripos( ftp_systype($this->link), 'win') !== false; + if ( is_null( $is_windows ) ) { + $is_windows = stripos( ftp_systype( $this->link ), 'win' ) !== false; + } - if ( $is_windows && preg_match('/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|) +(.+)/', $line, $lucifer) ) {
+ if ( $is_windows && preg_match( '/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|) +(.+)/', $line, $lucifer ) ) {
$b = array();
- if ( $lucifer[3] < 70 )
- $lucifer[3] +=2000;
- else
- $lucifer[3] += 1900; // 4digit year fix
+ if ( $lucifer[3] < 70 ) {
+ $lucifer[3] += 2000;
+ } else { $lucifer[3] += 1900; // End if().
+ }
$b['isdir'] = ( $lucifer[7] == '');
- if ( $b['isdir'] )
+ if ( $b['isdir'] ) {
$b['type'] = 'd';
- else
- $b['type'] = 'f';
+ } else { $b['type'] = 'f';
+ }
$b['size'] = $lucifer[7];
$b['month'] = $lucifer[1];
$b['day'] = $lucifer[2];
$b['year'] = $lucifer[3];
$b['hour'] = $lucifer[4];
$b['minute'] = $lucifer[5];
- $b['time'] = @mktime($lucifer[4] + (strcasecmp($lucifer[6], "PM") == 0 ? 12 : 0), $lucifer[5], 0, $lucifer[1], $lucifer[2], $lucifer[3]);
+ $b['time'] = @mktime( $lucifer[4] + (strcasecmp( $lucifer[6], 'PM' ) == 0 ? 12 : 0), $lucifer[5], 0, $lucifer[1], $lucifer[2], $lucifer[3] );
$b['am/pm'] = $lucifer[6];
$b['name'] = $lucifer[8];
- } elseif ( !$is_windows && $lucifer = preg_split('/[ ]/', $line, 9, PREG_SPLIT_NO_EMPTY)) {
+ } elseif ( ! $is_windows && $lucifer = preg_split( '/[ ]/', $line, 9, PREG_SPLIT_NO_EMPTY ) ) {
//echo $line."\n";
- $lcount = count($lucifer);
- if ( $lcount < 8 )
+ $lcount = count( $lucifer );
+ if ( $lcount < 8 ) {
return '';
+ }
$b = array();
$b['isdir'] = $lucifer[0]{0} === 'd';
$b['islink'] = $lucifer[0]{0} === 'l';
- if ( $b['isdir'] )
+ if ( $b['isdir'] ) {
$b['type'] = 'd';
- elseif ( $b['islink'] )
+ } elseif ( $b['islink'] ) {
$b['type'] = 'l';
- else
- $b['type'] = 'f';
+ } else { $b['type'] = 'f';
+ }
$b['perms'] = $lucifer[0];
$b['permsn'] = $this->getnumchmodfromh( $b['perms'] );
$b['number'] = $lucifer[1];
@@ -514,15 +531,15 @@
$b['group'] = $lucifer[3];
$b['size'] = $lucifer[4];
if ( $lcount == 8 ) {
- sscanf($lucifer[5], '%d-%d-%d', $b['year'], $b['month'], $b['day']);
- sscanf($lucifer[6], '%d:%d', $b['hour'], $b['minute']);
- $b['time'] = @mktime($b['hour'], $b['minute'], 0, $b['month'], $b['day'], $b['year']);
+ sscanf( $lucifer[5], '%d-%d-%d', $b['year'], $b['month'], $b['day'] );
+ sscanf( $lucifer[6], '%d:%d', $b['hour'], $b['minute'] );
+ $b['time'] = @mktime( $b['hour'], $b['minute'], 0, $b['month'], $b['day'], $b['year'] );
$b['name'] = $lucifer[7];
} else {
$b['month'] = $lucifer[5];
$b['day'] = $lucifer[6];
- if ( preg_match('/([0-9]{2}):([0-9]{2})/', $lucifer[7], $l2) ) {
- $b['year'] = date("Y");
+ if ( preg_match( '/([0-9]{2}):([0-9]{2})/', $lucifer[7], $l2 ) ) {
+ $b['year'] = date( 'Y' );
$b['hour'] = $l2[1];
$b['minute'] = $l2[2];
} else {
@@ -530,10 +547,10 @@
$b['hour'] = 0;
$b['minute'] = 0;
}
- $b['time'] = strtotime( sprintf('%d %s %d %02d:%02d', $b['day'], $b['month'], $b['year'], $b['hour'], $b['minute']) );
+ $b['time'] = strtotime( sprintf( '%d %s %d %02d:%02d', $b['day'], $b['month'], $b['year'], $b['hour'], $b['minute'] ) );
$b['name'] = $lucifer[8];
}
- }
+ }// End if().
// Replace symlinks formatted as "source -> target" with just the source name
if ( isset( $b['islink'] ) && $b['islink'] ) {
@@ -551,48 +568,54 @@
* @param bool $recursive
* @return bool|array
*/
- public function dirlist($path = '.', $include_hidden = true, $recursive = false) {
- if ( $this->is_file($path) ) {
- $limit_file = basename($path);
- $path = dirname($path) . '/';
+ public function dirlist( $path = '.', $include_hidden = true, $recursive = false ) {
+ if ( $this->is_file( $path ) ) {
+ $limit_file = basename( $path );
+ $path = dirname( $path ) . '/';
} else {
$limit_file = false;
}
- $pwd = @ftp_pwd($this->link);
- if ( ! @ftp_chdir($this->link, $path) ) // Cant change to folder = folder doesn't exist
+ $pwd = @ftp_pwd( $this->link );
+ if ( ! @ftp_chdir( $this->link, $path ) ) { // Cant change to folder = folder doesn't exist
return false;
- $list = @ftp_rawlist($this->link, '-a', false);
- @ftp_chdir($this->link, $pwd);
+ }
+ $list = @ftp_rawlist( $this->link, '-a', false );
+ @ftp_chdir( $this->link, $pwd );
- if ( empty($list) ) // Empty array = non-existent folder (real folder will show . at least)
+ if ( empty( $list ) ) { // Empty array = non-existent folder (real folder will show . at least)
return false;
+ }
$dirlist = array();
foreach ( $list as $k => $v ) {
- $entry = $this->parselisting($v);
- if ( empty($entry) )
+ $entry = $this->parselisting( $v );
+ if ( empty( $entry ) ) {
continue;
+ }
- if ( '.' == $entry['name'] || '..' == $entry['name'] )
+ if ( '.' == $entry['name'] || '..' == $entry['name'] ) {
continue;
+ }
- if ( ! $include_hidden && '.' == $entry['name'][0] )
+ if ( ! $include_hidden && '.' == $entry['name'][0] ) {
continue;
+ }
- if ( $limit_file && $entry['name'] != $limit_file)
+ if ( $limit_file && $entry['name'] != $limit_file ) {
continue;
+ }
$dirlist[ $entry['name'] ] = $entry;
}
$ret = array();
- foreach ( (array)$dirlist as $struc ) {
+ foreach ( (array) $dirlist as $struc ) {
if ( 'd' == $struc['type'] ) {
- if ( $recursive )
- $struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
- else
- $struc['files'] = array();
+ if ( $recursive ) {
+ $struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
+ } else { $struc['files'] = array();
+ }
}
$ret[ $struc['name'] ] = $struc;
@@ -604,7 +627,8 @@
* @access public
*/
public function __destruct() {
- if ( $this->link )
- ftp_close($this->link);
+ if ( $this->link ) {
+ ftp_close( $this->link );
+ }
}
}
Index: src/wp-admin/includes/class-wp-filesystem-ftpsockets.php
===================================================================
--- src/wp-admin/includes/class-wp-filesystem-ftpsockets.php (revision 40901)
+++ src/wp-admin/includes/class-wp-filesystem-ftpsockets.php (working copy)
@@ -26,7 +26,7 @@
*
* @param array $opt
*/
- public function __construct( $opt = '' ) {
+ public function __construct( $opt = '' ) {
$this->method = 'ftpsockets';
$this->errors = new WP_Error();
@@ -36,26 +36,26 @@
}
$this->ftp = new ftp();
- if ( empty($opt['port']) )
+ if ( empty( $opt['port'] ) ) {
$this->options['port'] = 21;
- else
- $this->options['port'] = (int) $opt['port'];
+ } else { $this->options['port'] = (int) $opt['port'];
+ }
- if ( empty($opt['hostname']) )
- $this->errors->add('empty_hostname', __('FTP hostname is required'));
- else
- $this->options['hostname'] = $opt['hostname'];
+ if ( empty( $opt['hostname'] ) ) {
+ $this->errors->add( 'empty_hostname', __( 'FTP hostname is required' ) );
+ } else { $this->options['hostname'] = $opt['hostname'];
+ }
// Check if the options provided are OK.
- if ( empty ($opt['username']) )
- $this->errors->add('empty_username', __('FTP username is required'));
- else
- $this->options['username'] = $opt['username'];
-
- if ( empty ($opt['password']) )
- $this->errors->add('empty_password', __('FTP password is required'));
- else
- $this->options['password'] = $opt['password'];
+ if ( empty( $opt['username'] ) ) {
+ $this->errors->add( 'empty_username', __( 'FTP username is required' ) );
+ } else { $this->options['username'] = $opt['username'];
+ }
+
+ if ( empty( $opt['password'] ) ) {
+ $this->errors->add( 'empty_password', __( 'FTP password is required' ) );
+ } else { $this->options['password'] = $opt['password'];
+ }
}
/**
@@ -64,10 +64,11 @@
* @return bool
*/
public function connect() {
- if ( ! $this->ftp )
+ if ( ! $this->ftp ) {
return false;
+ }
- $this->ftp->setTimeout(FS_CONNECT_TIMEOUT);
+ $this->ftp->setTimeout( FS_CONNECT_TIMEOUT );
if ( ! $this->ftp->SetServer( $this->options['hostname'], $this->options['port'] ) ) {
$this->errors->add( 'connect',
@@ -116,8 +117,9 @@
* or if the file doesn't exist.
*/
public function get_contents( $file ) {
- if ( ! $this->exists($file) )
+ if ( ! $this->exists( $file ) ) {
return false;
+ }
$temp = wp_tempnam( $file );
@@ -128,9 +130,9 @@
mbstring_binary_safe_encoding();
- if ( ! $this->ftp->fget($temphandle, $file) ) {
- fclose($temphandle);
- unlink($temp);
+ if ( ! $this->ftp->fget( $temphandle, $file ) ) {
+ fclose( $temphandle );
+ unlink( $temp );
reset_mbstring_encoding();
@@ -142,11 +144,11 @@
fseek( $temphandle, 0 ); // Skip back to the start of the file being written to
$contents = '';
- while ( ! feof($temphandle) )
- $contents .= fread($temphandle, 8192);
+ while ( ! feof( $temphandle ) ) { $contents .= fread( $temphandle, 8192 );
+ }
- fclose($temphandle);
- unlink($temp);
+ fclose( $temphandle );
+ unlink( $temp );
return $contents;
}
@@ -156,8 +158,8 @@
* @param string $file
* @return array
*/
- public function get_contents_array($file) {
- return explode("\n", $this->get_contents($file) );
+ public function get_contents_array( $file ) {
+ return explode( "\n", $this->get_contents( $file ) );
}
/**
@@ -168,10 +170,10 @@
* @param int|bool $mode
* @return bool
*/
- public function put_contents($file, $contents, $mode = false ) {
+ public function put_contents( $file, $contents, $mode = false ) {
$temp = wp_tempnam( $file );
- if ( ! $temphandle = @fopen($temp, 'w+') ) {
- unlink($temp);
+ if ( ! $temphandle = @fopen( $temp, 'w+' ) ) {
+ unlink( $temp );
return false;
}
@@ -190,14 +192,14 @@
fseek( $temphandle, 0 ); // Skip back to the start of the file being written to
- $ret = $this->ftp->fput($file, $temphandle);
+ $ret = $this->ftp->fput( $file, $temphandle );
reset_mbstring_encoding();
- fclose($temphandle);
- unlink($temp);
+ fclose( $temphandle );
+ unlink( $temp );
- $this->chmod($file, $mode);
+ $this->chmod( $file, $mode );
return $ret;
}
@@ -209,8 +211,9 @@
*/
public function cwd() {
$cwd = $this->ftp->pwd();
- if ( $cwd )
- $cwd = trailingslashit($cwd);
+ if ( $cwd ) {
+ $cwd = trailingslashit( $cwd );
+ }
return $cwd;
}
@@ -220,8 +223,8 @@
* @param string $file
* @return bool
*/
- public function chdir($file) {
- return $this->ftp->chdir($file);
+ public function chdir( $file ) {
+ return $this->ftp->chdir( $file );
}
/**
@@ -232,25 +235,26 @@
* @param bool $recursive
* @return bool
*/
- public function chmod($file, $mode = false, $recursive = false ) {
+ public function chmod( $file, $mode = false, $recursive = false ) {
if ( ! $mode ) {
- if ( $this->is_file($file) )
+ if ( $this->is_file( $file ) ) {
$mode = FS_CHMOD_FILE;
- elseif ( $this->is_dir($file) )
+ } elseif ( $this->is_dir( $file ) ) {
$mode = FS_CHMOD_DIR;
- else
- return false;
+ } else { return false;
+ }
}
// chmod any sub-objects if recursive.
- if ( $recursive && $this->is_dir($file) ) {
- $filelist = $this->dirlist($file);
- foreach ( (array)$filelist as $filename => $filemeta )
- $this->chmod($file . '/' . $filename, $mode, $recursive);
+ if ( $recursive && $this->is_dir( $file ) ) {
+ $filelist = $this->dirlist( $file );
+ foreach ( (array) $filelist as $filename => $filemeta ) {
+ $this->chmod( $file . '/' . $filename, $mode, $recursive );
+ }
}
// chmod the file or directory
- return $this->ftp->chmod($file, $mode);
+ return $this->ftp->chmod( $file, $mode );
}
/**
@@ -259,9 +263,9 @@
* @param string $file
* @return string
*/
- public function owner($file) {
- $dir = $this->dirlist($file);
- return $dir[$file]['owner'];
+ public function owner( $file ) {
+ $dir = $this->dirlist( $file );
+ return $dir[ $file ]['owner'];
}
/**
@@ -270,9 +274,9 @@
* @param string $file
* @return string
*/
- public function getchmod($file) {
- $dir = $this->dirlist($file);
- return $dir[$file]['permsn'];
+ public function getchmod( $file ) {
+ $dir = $this->dirlist( $file );
+ return $dir[ $file ]['permsn'];
}
/**
@@ -281,9 +285,9 @@
* @param string $file
* @return string
*/
- public function group($file) {
- $dir = $this->dirlist($file);
- return $dir[$file]['group'];
+ public function group( $file ) {
+ $dir = $this->dirlist( $file );
+ return $dir[ $file ]['group'];
}
/**
@@ -295,15 +299,17 @@
* @param int|bool $mode
* @return bool
*/
- public function copy($source, $destination, $overwrite = false, $mode = false) {
- if ( ! $overwrite && $this->exists($destination) )
+ public function copy( $source, $destination, $overwrite = false, $mode = false ) {
+ if ( ! $overwrite && $this->exists( $destination ) ) {
return false;
+ }
- $content = $this->get_contents($source);
- if ( false === $content )
+ $content = $this->get_contents( $source );
+ if ( false === $content ) {
return false;
+ }
- return $this->put_contents($destination, $content, $mode);
+ return $this->put_contents( $destination, $content, $mode );
}
/**
@@ -314,8 +320,8 @@
* @param bool $overwrite
* @return bool
*/
- public function move($source, $destination, $overwrite = false ) {
- return $this->ftp->rename($source, $destination);
+ public function move( $source, $destination, $overwrite = false ) {
+ return $this->ftp->rename( $source, $destination );
}
/**
@@ -326,15 +332,18 @@
* @param string $type
* @return bool
*/
- public function delete($file, $recursive = false, $type = false) {
- if ( empty($file) )
+ public function delete( $file, $recursive = false, $type = false ) {
+ if ( empty( $file ) ) {
return false;
- if ( 'f' == $type || $this->is_file($file) )
- return $this->ftp->delete($file);
- if ( !$recursive )
- return $this->ftp->rmdir($file);
+ }
+ if ( 'f' == $type || $this->is_file( $file ) ) {
+ return $this->ftp->delete( $file );
+ }
+ if ( ! $recursive ) {
+ return $this->ftp->rmdir( $file );
+ }
- return $this->ftp->mdel($file);
+ return $this->ftp->mdel( $file );
}
/**
@@ -350,7 +359,7 @@
return true; // File is an empty directory.
}
- return !empty( $list ); //empty list = no file, so invert.
+ return ! empty( $list ); //empty list = no file, so invert.
// Return $this->ftp->is_exists($file); has issues with ABOR+426 responses on the ncFTPd server.
}
@@ -360,11 +369,13 @@
* @param string $file
* @return bool
*/
- public function is_file($file) {
- if ( $this->is_dir($file) )
+ public function is_file( $file ) {
+ if ( $this->is_dir( $file ) ) {
return false;
- if ( $this->exists($file) )
+ }
+ if ( $this->exists( $file ) ) {
return true;
+ }
return false;
}
@@ -374,10 +385,10 @@
* @param string $path
* @return bool
*/
- public function is_dir($path) {
+ public function is_dir( $path ) {
$cwd = $this->cwd();
- if ( $this->chdir($path) ) {
- $this->chdir($cwd);
+ if ( $this->chdir( $path ) ) {
+ $this->chdir( $cwd );
return true;
}
return false;
@@ -389,7 +400,7 @@
* @param string $file
* @return bool
*/
- public function is_readable($file) {
+ public function is_readable( $file ) {
return true;
}
@@ -399,7 +410,7 @@
* @param string $file
* @return bool
*/
- public function is_writable($file) {
+ public function is_writable( $file ) {
return true;
}
@@ -409,7 +420,7 @@
* @param string $file
* @return bool
*/
- public function atime($file) {
+ public function atime( $file ) {
return false;
}
@@ -419,16 +430,16 @@
* @param string $file
* @return int
*/
- public function mtime($file) {
- return $this->ftp->mdtm($file);
+ public function mtime( $file ) {
+ return $this->ftp->mdtm( $file );
}
/**
* @param string $file
* @return int
*/
- public function size($file) {
- return $this->ftp->filesize($file);
+ public function size( $file ) {
+ return $this->ftp->filesize( $file );
}
/**
@@ -439,7 +450,7 @@
* @param int $atime
* @return bool
*/
- public function touch($file, $time = 0, $atime = 0 ) {
+ public function touch( $file, $time = 0, $atime = 0 ) {
return false;
}
@@ -452,16 +463,19 @@
* @param mixed $chgrp
* @return bool
*/
- public function mkdir($path, $chmod = false, $chown = false, $chgrp = false ) {
- $path = untrailingslashit($path);
- if ( empty($path) )
+ public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) {
+ $path = untrailingslashit( $path );
+ if ( empty( $path ) ) {
return false;
+ }
- if ( ! $this->ftp->mkdir($path) )
+ if ( ! $this->ftp->mkdir( $path ) ) {
return false;
- if ( ! $chmod )
+ }
+ if ( ! $chmod ) {
$chmod = FS_CHMOD_DIR;
- $this->chmod($path, $chmod);
+ }
+ $this->chmod( $path, $chmod );
return true;
}
@@ -472,8 +486,8 @@
* @param bool $recursive
* @return bool
*/
- public function rmdir($path, $recursive = false ) {
- return $this->delete($path, $recursive);
+ public function rmdir( $path, $recursive = false ) {
+ return $this->delete( $path, $recursive );
}
/**
@@ -484,17 +498,17 @@
* @param bool $recursive
* @return bool|array
*/
- public function dirlist($path = '.', $include_hidden = true, $recursive = false ) {
- if ( $this->is_file($path) ) {
- $limit_file = basename($path);
- $path = dirname($path) . '/';
+ public function dirlist( $path = '.', $include_hidden = true, $recursive = false ) {
+ if ( $this->is_file( $path ) ) {
+ $limit_file = basename( $path );
+ $path = dirname( $path ) . '/';
} else {
$limit_file = false;
}
mbstring_binary_safe_encoding();
- $list = $this->ftp->dirlist($path);
+ $list = $this->ftp->dirlist( $path );
if ( empty( $list ) && ! $this->exists( $path ) ) {
reset_mbstring_encoding();
@@ -505,25 +519,29 @@
$ret = array();
foreach ( $list as $struc ) {
- if ( '.' == $struc['name'] || '..' == $struc['name'] )
+ if ( '.' == $struc['name'] || '..' == $struc['name'] ) {
continue;
+ }
- if ( ! $include_hidden && '.' == $struc['name'][0] )
+ if ( ! $include_hidden && '.' == $struc['name'][0] ) {
continue;
+ }
- if ( $limit_file && $struc['name'] != $limit_file )
+ if ( $limit_file && $struc['name'] != $limit_file ) {
continue;
+ }
if ( 'd' == $struc['type'] ) {
- if ( $recursive )
- $struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
- else
- $struc['files'] = array();
+ if ( $recursive ) {
+ $struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
+ } else { $struc['files'] = array();
+ }
}
// Replace symlinks formatted as "source -> target" with just the source name
- if ( $struc['islink'] )
+ if ( $struc['islink'] ) {
$struc['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $struc['name'] );
+ }
// Add the Octal representation of the file permissions
$struc['permsn'] = $this->getnumchmodfromh( $struc['perms'] );
Index: src/wp-admin/includes/class-wp-filesystem-ssh2.php
===================================================================
--- src/wp-admin/includes/class-wp-filesystem-ssh2.php (revision 40901)
+++ src/wp-admin/includes/class-wp-filesystem-ssh2.php (working copy)
@@ -57,11 +57,11 @@
$this->errors = new WP_Error();
//Check if possible to use ssh2 functions.
- if ( ! extension_loaded('ssh2') ) {
- $this->errors->add('no_ssh2_ext', __('The ssh2 PHP extension is not available'));
+ if ( ! extension_loaded( 'ssh2' ) ) {
+ $this->errors->add( 'no_ssh2_ext', __( 'The ssh2 PHP extension is not available' ) );
return;
}
- if ( !function_exists('stream_get_contents') ) {
+ if ( ! function_exists( 'stream_get_contents' ) ) {
$this->errors->add(
'ssh2_php_requirement',
sprintf(
@@ -74,35 +74,39 @@
}
// Set defaults:
- if ( empty($opt['port']) )
+ if ( empty( $opt['port'] ) ) {
$this->options['port'] = 22;
- else
- $this->options['port'] = $opt['port'];
+ } else { $this->options['port'] = $opt['port'];
+ }
- if ( empty($opt['hostname']) )
- $this->errors->add('empty_hostname', __('SSH2 hostname is required'));
- else
- $this->options['hostname'] = $opt['hostname'];
+ if ( empty( $opt['hostname'] ) ) {
+ $this->errors->add( 'empty_hostname', __( 'SSH2 hostname is required' ) );
+ } else { $this->options['hostname'] = $opt['hostname'];
+ }
// Check if the options provided are OK.
- if ( !empty ($opt['public_key']) && !empty ($opt['private_key']) ) {
+ if ( ! empty( $opt['public_key'] ) && ! empty( $opt['private_key'] ) ) {
$this->options['public_key'] = $opt['public_key'];
$this->options['private_key'] = $opt['private_key'];
- $this->options['hostkey'] = array('hostkey' => 'ssh-rsa');
+ $this->options['hostkey'] = array(
+ 'hostkey' => 'ssh-rsa',
+ );
$this->keys = true;
- } elseif ( empty ($opt['username']) ) {
- $this->errors->add('empty_username', __('SSH2 username is required'));
+ } elseif ( empty( $opt['username'] ) ) {
+ $this->errors->add( 'empty_username', __( 'SSH2 username is required' ) );
}
- if ( !empty($opt['username']) )
+ if ( ! empty( $opt['username'] ) ) {
$this->options['username'] = $opt['username'];
+ }
- if ( empty ($opt['password']) ) {
+ if ( empty( $opt['password'] ) ) {
// Password can be blank if we are using keys.
- if ( !$this->keys )
- $this->errors->add('empty_password', __('SSH2 password is required'));
+ if ( ! $this->keys ) {
+ $this->errors->add( 'empty_password', __( 'SSH2 password is required' ) );
+ }
} else {
$this->options['password'] = $opt['password'];
}
@@ -115,9 +119,9 @@
*/
public function connect() {
if ( ! $this->keys ) {
- $this->link = @ssh2_connect($this->options['hostname'], $this->options['port']);
+ $this->link = @ssh2_connect( $this->options['hostname'], $this->options['port'] );
} else {
- $this->link = @ssh2_connect($this->options['hostname'], $this->options['port'], $this->options['hostkey']);
+ $this->link = @ssh2_connect( $this->options['hostname'], $this->options['port'], $this->options['hostkey'] );
}
if ( ! $this->link ) {
@@ -130,8 +134,8 @@
return false;
}
- if ( !$this->keys ) {
- if ( ! @ssh2_auth_password($this->link, $this->options['username'], $this->options['password']) ) {
+ if ( ! $this->keys ) {
+ if ( ! @ssh2_auth_password( $this->link, $this->options['username'], $this->options['password'] ) ) {
$this->errors->add( 'auth',
/* translators: %s: username */
sprintf( __( 'Username/Password incorrect for %s' ),
@@ -141,7 +145,7 @@
return false;
}
} else {
- if ( ! @ssh2_auth_pubkey_file($this->link, $this->options['username'], $this->options['public_key'], $this->options['private_key'], $this->options['password'] ) ) {
+ if ( ! @ssh2_auth_pubkey_file( $this->link, $this->options['username'], $this->options['public_key'], $this->options['private_key'], $this->options['password'] ) ) {
$this->errors->add( 'auth',
/* translators: %s: username */
sprintf( __( 'Public and Private keys incorrect for %s' ),
@@ -190,20 +194,21 @@
/**
* @access public
- *
+ *
* @param string $command
* @param bool $returnbool
* @return bool|string True on success, false on failure. String if the command was executed, `$returnbool`
* is false (default), and data from the resulting stream was retrieved.
*/
public function run_command( $command, $returnbool = false ) {
- if ( ! $this->link )
+ if ( ! $this->link ) {
return false;
+ }
- if ( ! ($stream = ssh2_exec($this->link, $command)) ) {
+ if ( ! ($stream = ssh2_exec( $this->link, $command )) ) {
$this->errors->add( 'command',
/* translators: %s: command */
- sprintf( __( 'Unable to perform command: %s'),
+ sprintf( __( 'Unable to perform command: %s' ),
$command
)
);
@@ -213,10 +218,10 @@
$data = stream_get_contents( $stream );
fclose( $stream );
- if ( $returnbool )
- return ( $data === false ) ? false : '' != trim($data);
- else
- return $data;
+ if ( $returnbool ) {
+ return ( $data === false ) ? false : '' != trim( $data );
+ } else { return $data;
+ }
}
return false;
}
@@ -237,7 +242,7 @@
* @param string $file
* @return array
*/
- public function get_contents_array($file) {
+ public function get_contents_array( $file ) {
return file( $this->sftp_path( $file ) );
}
@@ -249,13 +254,14 @@
* @param bool|int $mode
* @return bool
*/
- public function put_contents($file, $contents, $mode = false ) {
+ public function put_contents( $file, $contents, $mode = false ) {
$ret = file_put_contents( $this->sftp_path( $file ), $contents );
- if ( $ret !== strlen( $contents ) )
+ if ( $ret !== strlen( $contents ) ) {
return false;
+ }
- $this->chmod($file, $mode);
+ $this->chmod( $file, $mode );
return true;
}
@@ -279,8 +285,8 @@
* @param string $dir
* @return bool|string
*/
- public function chdir($dir) {
- return $this->run_command('cd ' . $dir, true);
+ public function chdir( $dir ) {
+ return $this->run_command( 'cd ' . $dir, true );
}
/**
@@ -292,12 +298,14 @@
*
* @return bool
*/
- public function chgrp($file, $group, $recursive = false ) {
- if ( ! $this->exists($file) )
+ public function chgrp( $file, $group, $recursive = false ) {
+ if ( ! $this->exists( $file ) ) {
return false;
- if ( ! $recursive || ! $this->is_dir($file) )
- return $this->run_command(sprintf('chgrp %s %s', escapeshellarg($group), escapeshellarg($file)), true);
- return $this->run_command(sprintf('chgrp -R %s %s', escapeshellarg($group), escapeshellarg($file)), true);
+ }
+ if ( ! $recursive || ! $this->is_dir( $file ) ) {
+ return $this->run_command( sprintf( 'chgrp %s %s', escapeshellarg( $group ), escapeshellarg( $file ) ), true );
+ }
+ return $this->run_command( sprintf( 'chgrp -R %s %s', escapeshellarg( $group ), escapeshellarg( $file ) ), true );
}
/**
@@ -308,22 +316,24 @@
* @param bool $recursive
* @return bool|string
*/
- public function chmod($file, $mode = false, $recursive = false) {
- if ( ! $this->exists($file) )
+ public function chmod( $file, $mode = false, $recursive = false ) {
+ if ( ! $this->exists( $file ) ) {
return false;
+ }
if ( ! $mode ) {
- if ( $this->is_file($file) )
+ if ( $this->is_file( $file ) ) {
$mode = FS_CHMOD_FILE;
- elseif ( $this->is_dir($file) )
+ } elseif ( $this->is_dir( $file ) ) {
$mode = FS_CHMOD_DIR;
- else
- return false;
+ } else { return false;
+ }
}
- if ( ! $recursive || ! $this->is_dir($file) )
- return $this->run_command(sprintf('chmod %o %s', $mode, escapeshellarg($file)), true);
- return $this->run_command(sprintf('chmod -R %o %s', $mode, escapeshellarg($file)), true);
+ if ( ! $recursive || ! $this->is_dir( $file ) ) {
+ return $this->run_command( sprintf( 'chmod %o %s', $mode, escapeshellarg( $file ) ), true );
+ }
+ return $this->run_command( sprintf( 'chmod -R %o %s', $mode, escapeshellarg( $file ) ), true );
}
/**
@@ -337,11 +347,13 @@
* @return bool True on success or false on failure.
*/
public function chown( $file, $owner, $recursive = false ) {
- if ( ! $this->exists($file) )
+ if ( ! $this->exists( $file ) ) {
return false;
- if ( ! $recursive || ! $this->is_dir($file) )
- return $this->run_command(sprintf('chown %s %s', escapeshellarg($owner), escapeshellarg($file)), true);
- return $this->run_command(sprintf('chown -R %s %s', escapeshellarg($owner), escapeshellarg($file)), true);
+ }
+ if ( ! $recursive || ! $this->is_dir( $file ) ) {
+ return $this->run_command( sprintf( 'chown %s %s', escapeshellarg( $owner ), escapeshellarg( $file ) ), true );
+ }
+ return $this->run_command( sprintf( 'chown -R %s %s', escapeshellarg( $owner ), escapeshellarg( $file ) ), true );
}
/**
@@ -350,13 +362,15 @@
* @param string $file
* @return string|false
*/
- public function owner($file) {
+ public function owner( $file ) {
$owneruid = @fileowner( $this->sftp_path( $file ) );
- if ( ! $owneruid )
+ if ( ! $owneruid ) {
return false;
- if ( ! function_exists('posix_getpwuid') )
+ }
+ if ( ! function_exists( 'posix_getpwuid' ) ) {
return $owneruid;
- $ownerarray = posix_getpwuid($owneruid);
+ }
+ $ownerarray = posix_getpwuid( $owneruid );
return $ownerarray['name'];
}
@@ -366,7 +380,7 @@
* @param string $file
* @return string
*/
- public function getchmod($file) {
+ public function getchmod( $file ) {
return substr( decoct( @fileperms( $this->sftp_path( $file ) ) ), -3 );
}
@@ -376,13 +390,15 @@
* @param string $file
* @return string|false
*/
- public function group($file) {
+ public function group( $file ) {
$gid = @filegroup( $this->sftp_path( $file ) );
- if ( ! $gid )
+ if ( ! $gid ) {
return false;
- if ( ! function_exists('posix_getgrgid') )
+ }
+ if ( ! function_exists( 'posix_getgrgid' ) ) {
return $gid;
- $grouparray = posix_getgrgid($gid);
+ }
+ $grouparray = posix_getgrgid( $gid );
return $grouparray['name'];
}
@@ -395,13 +411,15 @@
* @param int|bool $mode
* @return bool
*/
- public function copy($source, $destination, $overwrite = false, $mode = false) {
- if ( ! $overwrite && $this->exists($destination) )
+ public function copy( $source, $destination, $overwrite = false, $mode = false ) {
+ if ( ! $overwrite && $this->exists( $destination ) ) {
return false;
- $content = $this->get_contents($source);
- if ( false === $content)
+ }
+ $content = $this->get_contents( $source );
+ if ( false === $content ) {
return false;
- return $this->put_contents($destination, $content, $mode);
+ }
+ return $this->put_contents( $destination, $content, $mode );
}
/**
@@ -412,7 +430,7 @@
* @param bool $overwrite
* @return bool
*/
- public function move($source, $destination, $overwrite = false) {
+ public function move( $source, $destination, $overwrite = false ) {
return @ssh2_sftp_rename( $this->sftp_link, $source, $destination );
}
@@ -424,18 +442,20 @@
* @param string|bool $type
* @return bool
*/
- public function delete($file, $recursive = false, $type = false) {
- if ( 'f' == $type || $this->is_file($file) )
- return ssh2_sftp_unlink($this->sftp_link, $file);
- if ( ! $recursive )
- return ssh2_sftp_rmdir($this->sftp_link, $file);
- $filelist = $this->dirlist($file);
- if ( is_array($filelist) ) {
- foreach ( $filelist as $filename => $fileinfo) {
- $this->delete($file . '/' . $filename, $recursive, $fileinfo['type']);
+ public function delete( $file, $recursive = false, $type = false ) {
+ if ( 'f' == $type || $this->is_file( $file ) ) {
+ return ssh2_sftp_unlink( $this->sftp_link, $file );
+ }
+ if ( ! $recursive ) {
+ return ssh2_sftp_rmdir( $this->sftp_link, $file );
+ }
+ $filelist = $this->dirlist( $file );
+ if ( is_array( $filelist ) ) {
+ foreach ( $filelist as $filename => $fileinfo ) {
+ $this->delete( $file . '/' . $filename, $recursive, $fileinfo['type'] );
}
}
- return ssh2_sftp_rmdir($this->sftp_link, $file);
+ return ssh2_sftp_rmdir( $this->sftp_link, $file );
}
/**
@@ -444,7 +464,7 @@
* @param string $file
* @return bool
*/
- public function exists($file) {
+ public function exists( $file ) {
return file_exists( $this->sftp_path( $file ) );
}
@@ -454,7 +474,7 @@
* @param string $file
* @return bool
*/
- public function is_file($file) {
+ public function is_file( $file ) {
return is_file( $this->sftp_path( $file ) );
}
@@ -464,7 +484,7 @@
* @param string $path
* @return bool
*/
- public function is_dir($path) {
+ public function is_dir( $path ) {
return is_dir( $this->sftp_path( $path ) );
}
@@ -474,7 +494,7 @@
* @param string $file
* @return bool
*/
- public function is_readable($file) {
+ public function is_readable( $file ) {
return is_readable( $this->sftp_path( $file ) );
}
@@ -484,7 +504,7 @@
* @param string $file
* @return bool
*/
- public function is_writable($file) {
+ public function is_writable( $file ) {
// PHP will base it's writable checks on system_user === file_owner, not ssh_user === file_owner
return true;
}
@@ -495,7 +515,7 @@
* @param string $file
* @return int
*/
- public function atime($file) {
+ public function atime( $file ) {
return fileatime( $this->sftp_path( $file ) );
}
@@ -505,7 +525,7 @@
* @param string $file
* @return int
*/
- public function mtime($file) {
+ public function mtime( $file ) {
return filemtime( $this->sftp_path( $file ) );
}
@@ -515,7 +535,7 @@
* @param string $file
* @return int
*/
- public function size($file) {
+ public function size( $file ) {
return filesize( $this->sftp_path( $file ) );
}
@@ -526,7 +546,7 @@
* @param int $time
* @param int $atime
*/
- public function touch($file, $time = 0, $atime = 0) {
+ public function touch( $file, $time = 0, $atime = 0 ) {
//Not implemented.
}
@@ -539,19 +559,24 @@
* @param mixed $chgrp
* @return bool
*/
- public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
- $path = untrailingslashit($path);
- if ( empty($path) )
+ public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) {
+ $path = untrailingslashit( $path );
+ if ( empty( $path ) ) {
return false;
+ }
- if ( ! $chmod )
+ if ( ! $chmod ) {
$chmod = FS_CHMOD_DIR;
- if ( ! ssh2_sftp_mkdir($this->sftp_link, $path, $chmod, true) )
+ }
+ if ( ! ssh2_sftp_mkdir( $this->sftp_link, $path, $chmod, true ) ) {
return false;
- if ( $chown )
- $this->chown($path, $chown);
- if ( $chgrp )
- $this->chgrp($path, $chgrp);
+ }
+ if ( $chown ) {
+ $this->chown( $path, $chown );
+ }
+ if ( $chgrp ) {
+ $this->chgrp( $path, $chgrp );
+ }
return true;
}
@@ -562,8 +587,8 @@
* @param bool $recursive
* @return bool
*/
- public function rmdir($path, $recursive = false) {
- return $this->delete($path, $recursive);
+ public function rmdir( $path, $recursive = false ) {
+ return $this->delete( $path, $recursive );
}
/**
@@ -574,58 +599,63 @@
* @param bool $recursive
* @return bool|array
*/
- public function dirlist($path, $include_hidden = true, $recursive = false) {
- if ( $this->is_file($path) ) {
- $limit_file = basename($path);
- $path = dirname($path);
+ public function dirlist( $path, $include_hidden = true, $recursive = false ) {
+ if ( $this->is_file( $path ) ) {
+ $limit_file = basename( $path );
+ $path = dirname( $path );
} else {
$limit_file = false;
}
- if ( ! $this->is_dir($path) )
+ if ( ! $this->is_dir( $path ) ) {
return false;
+ }
$ret = array();
$dir = @dir( $this->sftp_path( $path ) );
- if ( ! $dir )
+ if ( ! $dir ) {
return false;
+ }
- while (false !== ($entry = $dir->read()) ) {
+ while ( false !== ($entry = $dir->read()) ) {
$struc = array();
$struc['name'] = $entry;
- if ( '.' == $struc['name'] || '..' == $struc['name'] )
+ if ( '.' == $struc['name'] || '..' == $struc['name'] ) {
continue; //Do not care about these folders.
+ }
- if ( ! $include_hidden && '.' == $struc['name'][0] )
+ if ( ! $include_hidden && '.' == $struc['name'][0] ) {
continue;
+ }
- if ( $limit_file && $struc['name'] != $limit_file )
+ if ( $limit_file && $struc['name'] != $limit_file ) {
continue;
+ }
- $struc['perms'] = $this->gethchmod($path.'/'.$entry);
- $struc['permsn'] = $this->getnumchmodfromh($struc['perms']);
+ $struc['perms'] = $this->gethchmod( $path . '/' . $entry );
+ $struc['permsn'] = $this->getnumchmodfromh( $struc['perms'] );
$struc['number'] = false;
- $struc['owner'] = $this->owner($path.'/'.$entry);
- $struc['group'] = $this->group($path.'/'.$entry);
- $struc['size'] = $this->size($path.'/'.$entry);
- $struc['lastmodunix']= $this->mtime($path.'/'.$entry);
- $struc['lastmod'] = date('M j',$struc['lastmodunix']);
- $struc['time'] = date('h:i:s',$struc['lastmodunix']);
- $struc['type'] = $this->is_dir($path.'/'.$entry) ? 'd' : 'f';
+ $struc['owner'] = $this->owner( $path . '/' . $entry );
+ $struc['group'] = $this->group( $path . '/' . $entry );
+ $struc['size'] = $this->size( $path . '/' . $entry );
+ $struc['lastmodunix'] = $this->mtime( $path . '/' . $entry );
+ $struc['lastmod'] = date( 'M j',$struc['lastmodunix'] );
+ $struc['time'] = date( 'h:i:s',$struc['lastmodunix'] );
+ $struc['type'] = $this->is_dir( $path . '/' . $entry ) ? 'd' : 'f';
if ( 'd' == $struc['type'] ) {
- if ( $recursive )
- $struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
- else
- $struc['files'] = array();
+ if ( $recursive ) {
+ $struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
+ } else { $struc['files'] = array();
+ }
}
$ret[ $struc['name'] ] = $struc;
- }
+ }// End while().
$dir->close();
- unset($dir);
+ unset( $dir );
return $ret;
}
}
Index: src/wp-admin/includes/class-wp-importer.php
===================================================================
--- src/wp-admin/includes/class-wp-importer.php (revision 40901)
+++ src/wp-admin/includes/class-wp-importer.php (working copy)
@@ -35,10 +35,10 @@
// Increment offset
$offset = ( $limit + $offset );
- if ( !empty( $results ) ) {
+ if ( ! empty( $results ) ) {
foreach ( $results as $r ) {
// Set permalinks into array
- $hashtable[$r->meta_value] = intval( $r->post_id );
+ $hashtable[ $r->meta_value ] = intval( $r->post_id );
}
}
} while ( count( $results ) == $limit );
@@ -69,8 +69,9 @@
$result = $wpdb->get_results( $sql );
- if ( !empty( $result ) )
+ if ( ! empty( $result ) ) {
$count = intval( $result[0]->cnt );
+ }
// Unset to save memory.
unset( $results );
@@ -102,7 +103,7 @@
// Increment offset
$offset = ( $limit + $offset );
- if ( !empty( $results ) ) {
+ if ( ! empty( $results ) ) {
foreach ( $results as $r ) {
// Explode comment_agent key
list ( $ca_bid, $source_comment_id ) = explode( '-', $r->comment_agent );
@@ -110,7 +111,7 @@
// Check if this comment came from this blog
if ( $bid == $ca_bid ) {
- $hashtable[$source_comment_id] = intval( $r->comment_ID );
+ $hashtable[ $source_comment_id ] = intval( $r->comment_ID );
}
}
}
@@ -132,14 +133,18 @@
$blog_id = (int) $blog_id;
} else {
$blog = 'http://' . preg_replace( '#^https?://#', '', $blog_id );
- if ( ( !$parsed = parse_url( $blog ) ) || empty( $parsed['host'] ) ) {
+ if ( ( ! $parsed = parse_url( $blog ) ) || empty( $parsed['host'] ) ) {
fwrite( STDERR, "Error: can not determine blog_id from $blog_id\n" );
exit();
}
if ( empty( $parsed['path'] ) ) {
$parsed['path'] = '/';
}
- $blogs = get_sites( array( 'domain' => $parsed['host'], 'number' => 1, 'path' => $parsed['path'] ) );
+ $blogs = get_sites( array(
+ 'domain' => $parsed['host'],
+ 'number' => 1,
+ 'path' => $parsed['path'],
+ ) );
if ( ! $blogs ) {
fwrite( STDERR, "Error: Could not find blog\n" );
exit();
@@ -149,8 +154,9 @@
}
if ( function_exists( 'is_multisite' ) ) {
- if ( is_multisite() )
+ if ( is_multisite() ) {
switch_to_blog( $blog_id );
+ }
}
return $blog_id;
@@ -168,7 +174,7 @@
$user_id = (int) username_exists( $user_id );
}
- if ( !$user_id || !wp_set_current_user( $user_id ) ) {
+ if ( ! $user_id || ! wp_set_current_user( $user_id ) ) {
fwrite( STDERR, "Error: can not find user\n" );
exit();
}
@@ -202,10 +208,12 @@
$headers = array();
$args = array();
- if ( true === $head )
+ if ( true === $head ) {
$args['method'] = 'HEAD';
- if ( !empty( $username ) && !empty( $password ) )
+ }
+ if ( ! empty( $username ) && ! empty( $password ) ) {
$headers['Authorization'] = 'Basic ' . base64_encode( "$username:$password" );
+ }
$args['headers'] = $headers;
@@ -281,37 +289,37 @@
$il = sizeof( $args );
for ( $i = 1, $il; $i < $il; $i++ ) {
- if ( (bool) preg_match( "/^--(.+)/", $args[$i], $match ) ) {
- $parts = explode( "=", $match[1] );
- $key = preg_replace( "/[^a-z0-9]+/", "", $parts[0] );
+ if ( (bool) preg_match( '/^--(.+)/', $args[ $i ], $match ) ) {
+ $parts = explode( '=', $match[1] );
+ $key = preg_replace( '/[^a-z0-9]+/', '', $parts[0] );
if ( isset( $parts[1] ) ) {
- $out[$key] = $parts[1];
+ $out[ $key ] = $parts[1];
} else {
- $out[$key] = true;
+ $out[ $key ] = true;
}
$last_arg = $key;
- } elseif ( (bool) preg_match( "/^-([a-zA-Z0-9]+)/", $args[$i], $match ) ) {
+ } elseif ( (bool) preg_match( '/^-([a-zA-Z0-9]+)/', $args[ $i ], $match ) ) {
for ( $j = 0, $jl = strlen( $match[1] ); $j < $jl; $j++ ) {
$key = $match[1]{$j};
- $out[$key] = true;
+ $out[ $key ] = true;
}
$last_arg = $key;
} elseif ( $last_arg !== null ) {
- $out[$last_arg] = $args[$i];
+ $out[ $last_arg ] = $args[ $i ];
}
}
// Check array for specified param
- if ( isset( $out[$param] ) ) {
+ if ( isset( $out[ $param ] ) ) {
// Set return value
- $return = $out[$param];
+ $return = $out[ $param ];
}
// Check for missing required param
- if ( !isset( $out[$param] ) && $required ) {
+ if ( ! isset( $out[ $param ] ) && $required ) {
// Display message and exit
echo "\"$param\" parameter is required but was not specified\n";
exit();
Index: src/wp-admin/includes/class-wp-internal-pointers.php
===================================================================
--- src/wp-admin/includes/class-wp-internal-pointers.php (revision 40901)
+++ src/wp-admin/includes/class-wp-internal-pointers.php (working copy)
@@ -47,8 +47,9 @@
);
// Check if screen related pointer is registered
- if ( empty( $registered_pointers[ $hook_suffix ] ) )
+ if ( empty( $registered_pointers[ $hook_suffix ] ) ) {
return;
+ }
$pointers = (array) $registered_pointers[ $hook_suffix ];
@@ -76,8 +77,9 @@
foreach ( array_diff( $pointers, $dismissed ) as $pointer ) {
if ( isset( $caps_required[ $pointer ] ) ) {
foreach ( $caps_required[ $pointer ] as $cap ) {
- if ( ! current_user_can( $cap ) )
+ if ( ! current_user_can( $cap ) ) {
continue 2;
+ }
}
}
@@ -86,8 +88,9 @@
$got_pointers = true;
}
- if ( ! $got_pointers )
+ if ( ! $got_pointers ) {
return;
+ }
// Add pointers script and style to queue
wp_enqueue_style( 'wp-pointer' );
@@ -106,8 +109,9 @@
* @param array $args Arguments to be passed to the pointer JS (see wp-pointer.js).
*/
private static function print_js( $pointer_id, $selector, $args ) {
- if ( empty( $pointer_id ) || empty( $selector ) || empty( $args ) || empty( $args['content'] ) )
+ if ( empty( $pointer_id ) || empty( $selector ) || empty( $args ) || empty( $args['content'] ) ) {
return;
+ }
?>
\n", wp_json_encode( $args ) );
Index: src/wp-admin/includes/class-wp-media-list-table.php
===================================================================
--- src/wp-admin/includes/class-wp-media-list-table.php (revision 40901)
+++ src/wp-admin/includes/class-wp-media-list-table.php (working copy)
@@ -44,7 +44,7 @@
$this->modes = array(
'list' => __( 'List View' ),
- 'grid' => __( 'Grid View' )
+ 'grid' => __( 'Grid View' ),
);
parent::__construct( array(
@@ -58,7 +58,7 @@
* @return bool
*/
public function ajax_user_can() {
- return current_user_can('upload_files');
+ return current_user_can( 'upload_files' );
}
/**
@@ -73,9 +73,9 @@
list( $post_mime_types, $avail_post_mime_types ) = wp_edit_attachments_query( $_REQUEST );
- $this->is_trash = isset( $_REQUEST['attachment-filter'] ) && 'trash' === $_REQUEST['attachment-filter'];
+ $this->is_trash = isset( $_REQUEST['attachment-filter'] ) && 'trash' === $_REQUEST['attachment-filter'];
- $mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
+ $mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
$this->set_pagination_args( array(
'total_items' => $wp_query->found_posts,
@@ -114,7 +114,7 @@
false
);
- $type_links[$mime_type] = sprintf(
+ $type_links[ $mime_type ] = sprintf(
'',
esc_attr( $mime_type ),
$selected,
@@ -123,7 +123,7 @@
}
$type_links['detached'] = '';
- if ( $this->is_trash || ( defined( 'MEDIA_TRASH') && MEDIA_TRASH ) ) {
+ if ( $this->is_trash || ( defined( 'MEDIA_TRASH' ) && MEDIA_TRASH ) ) {
$type_links['trash'] = sprintf(
'',
selected( 'trash' === $filter, true, false ),
@@ -150,8 +150,9 @@
$actions['delete'] = __( 'Delete Permanently' );
}
- if ( $this->detached )
+ if ( $this->detached ) {
$actions['attach'] = __( 'Attach' );
+ }
return $actions;
}
@@ -166,20 +167,22 @@
?>
@@ -279,7 +285,9 @@
$posts_columns['author'] = __( 'Author' );
$taxonomies = get_taxonomies_for_attachments( 'objects' );
- $taxonomies = wp_filter_object_list( $taxonomies, array( 'show_admin_column' => true ), 'and', 'name' );
+ $taxonomies = wp_filter_object_list( $taxonomies, array(
+ 'show_admin_column' => true,
+ ), 'and', 'name' );
/**
* Filters the taxonomy columns for attachments in the Media list table.
@@ -304,10 +312,11 @@
}
/* translators: column name */
- if ( !$this->detached ) {
+ if ( ! $this->detached ) {
$posts_columns['parent'] = _x( 'Uploaded to', 'column name' );
- if ( post_type_supports( 'attachment', 'comments' ) )
+ if ( post_type_supports( 'attachment', 'comments' ) ) {
$posts_columns['comments'] = '' . __( 'Comments' ) . '';
+ }
}
/* translators: column name */
$posts_columns['date'] = _x( 'Date', 'column name' );
@@ -366,7 +375,9 @@
list( $mime ) = explode( '/', $post->post_mime_type );
$title = _draft_or_post_title();
- $thumb = wp_get_attachment_image( $post->ID, array( 60, 60 ), true, array( 'alt' => '' ) );
+ $thumb = wp_get_attachment_image( $post->ID, array( 60, 60 ), true, array(
+ 'alt' => '',
+ ) );
$link_start = $link_end = '';
if ( current_user_can( 'edit_post', $post->ID ) && ! $this->is_trash ) {
@@ -411,7 +422,9 @@
*/
public function column_author( $post ) {
printf( '%s',
- esc_url( add_query_arg( array( 'author' => get_the_author_meta('ID') ), 'upload.php' ) ),
+ esc_url( add_query_arg( array(
+ 'author' => get_the_author_meta( 'ID' ),
+ ), 'upload.php' ) ),
get_the_author()
);
}
@@ -488,11 +501,11 @@
_e( '(Private post)' );
}
- if ( $user_can_edit ):
+ if ( $user_can_edit ) :
$detach_url = add_query_arg( array(
'parent_post_id' => $post->post_parent,
'media[]' => $post->ID,
- '_wpnonce' => wp_create_nonce( 'bulk-' . $this->_args['plural'] )
+ '_wpnonce' => wp_create_nonce( 'bulk-' . $this->_args['plural'] ),
), 'upload.php' );
printf(
'\n", $folder, $base ); } - $folder_parts = explode('/', $folder); + $folder_parts = explode( '/', $folder ); $folder_part_keys = array_keys( $folder_parts ); $last_index = array_pop( $folder_part_keys ); $last_path = $folder_parts[ $last_index ]; @@ -265,8 +274,9 @@ $files = $this->dirlist( $base ); foreach ( $folder_parts as $index => $key ) { - if ( $index == $last_index ) + if ( $index == $last_index ) { continue; // We want this to be caught by the next code block. + } /* * Working from /home/ to /user/ to /wordpress/ see if that file exists within @@ -275,10 +285,10 @@ * folder level, and see if that matches, and so on. If it reaches the end, and still * cant find it, it'll return false for the entire function. */ - if ( isset($files[ $key ]) ){ + if ( isset( $files[ $key ] ) ) { // Let's try that folder: - $newdir = trailingslashit(path_join($base, $key)); + $newdir = trailingslashit( path_join( $base, $key ) ); if ( $this->verbose ) { /* translators: %s: directory name */ printf( "\n" . __( 'Changing to %s' ) . "
\n", $newdir ); @@ -286,25 +296,27 @@ // Only search for the remaining path tokens in the directory, not the full path again. $newfolder = implode( '/', array_slice( $folder_parts, $index + 1 ) ); - if ( $ret = $this->search_for_folder( $newfolder, $newdir, $loop) ) + if ( $ret = $this->search_for_folder( $newfolder, $newdir, $loop ) ) { return $ret; + } } } // Only check this as a last resort, to prevent locating the incorrect install. // All above procedures will fail quickly if this is the right branch to take. - if (isset( $files[ $last_path ] ) ) { + if ( isset( $files[ $last_path ] ) ) { if ( $this->verbose ) { /* translators: %s: directory name */ printf( "\n" . __( 'Found %s' ) . "
\n", $base . $last_path ); } - return trailingslashit($base . $last_path); + return trailingslashit( $base . $last_path ); } // Prevent this function from looping again. // No need to proceed if we've just searched in / - if ( $loop || '/' == $base ) + if ( $loop || '/' == $base ) { return false; + } // As an extra last resort, Change back to / if the folder wasn't found. // This comes into effect when the CWD is /home/user/ but WP is at /var/www/.... @@ -325,24 +337,25 @@ * @param string $file String filename. * @return string The *nix-style representation of permissions. */ - public function gethchmod( $file ){ + public function gethchmod( $file ) { $perms = intval( $this->getchmod( $file ), 8 ); - if (($perms & 0xC000) == 0xC000) // Socket + if ( ($perms & 0xC000) == 0xC000 ) { // Socket $info = 's'; - elseif (($perms & 0xA000) == 0xA000) // Symbolic Link + } elseif ( ($perms & 0xA000) == 0xA000 ) { // Symbolic Link $info = 'l'; - elseif (($perms & 0x8000) == 0x8000) // Regular + } elseif ( ($perms & 0x8000) == 0x8000 ) { // Regular $info = '-'; - elseif (($perms & 0x6000) == 0x6000) // Block special + } elseif ( ($perms & 0x6000) == 0x6000 ) { // Block special $info = 'b'; - elseif (($perms & 0x4000) == 0x4000) // Directory + } elseif ( ($perms & 0x4000) == 0x4000 ) { // Directory $info = 'd'; - elseif (($perms & 0x2000) == 0x2000) // Character special + } elseif ( ($perms & 0x2000) == 0x2000 ) { // Character special $info = 'c'; - elseif (($perms & 0x1000) == 0x1000) // FIFO pipe + } elseif ( ($perms & 0x1000) == 0x1000 ) { // FIFO pipe $info = 'p'; - else // Unknown + } else { // End if(). $info = 'u'; + } // Owner $info .= (($perms & 0x0100) ? 'r' : '-'); @@ -384,7 +397,7 @@ * * Converts '-rw-r--r--' to 0644 * From "info at rvgate dot nl"'s comment on the PHP documentation for chmod() - * + * * @link https://secure.php.net/manual/en/function.chmod.php#49614 * * @access public @@ -395,18 +408,23 @@ */ public function getnumchmodfromh( $mode ) { $realmode = ''; - $legal = array('', 'w', 'r', 'x', '-'); - $attarray = preg_split('//', $mode); + $legal = array( '', 'w', 'r', 'x', '-' ); + $attarray = preg_split( '//', $mode ); for ( $i = 0, $c = count( $attarray ); $i < $c; $i++ ) { - if ($key = array_search($attarray[$i], $legal)) { - $realmode .= $legal[$key]; - } + if ( $key = array_search( $attarray[ $i ], $legal ) ) { + $realmode .= $legal[ $key ]; + } } - $mode = str_pad($realmode, 10, '-', STR_PAD_LEFT); - $trans = array('-'=>'0', 'r'=>'4', 'w'=>'2', 'x'=>'1'); - $mode = strtr($mode,$trans); + $mode = str_pad( $realmode, 10, '-', STR_PAD_LEFT ); + $trans = array( + '-' => '0', + 'r' => '4', + 'w' => '2', + 'x' => '1', + ); + $mode = strtr( $mode,$trans ); $newmode = $mode[0]; $newmode .= $mode[1] + $mode[2] + $mode[3]; @@ -567,7 +585,7 @@ * @access public * @since 2.5.0 * @abstract - * + * * @param string $file Path to the file. * @return string|bool Username of the user or false on error. */ Index: src/wp-admin/includes/class-wp-filesystem-direct.php =================================================================== --- src/wp-admin/includes/class-wp-filesystem-direct.php (revision 40901) +++ src/wp-admin/includes/class-wp-filesystem-direct.php (working copy) @@ -23,7 +23,7 @@ * * @param mixed $arg ignored argument */ - public function __construct($arg) { + public function __construct( $arg ) { $this->method = 'direct'; $this->errors = new WP_Error(); } @@ -36,8 +36,8 @@ * @param string $file Name of the file to read. * @return string|bool The function returns the read data or false on failure. */ - public function get_contents($file) { - return @file_get_contents($file); + public function get_contents( $file ) { + return @file_get_contents( $file ); } /** @@ -48,8 +48,8 @@ * @param string $file Path to the file. * @return array|bool the file contents in an array or false on failure. */ - public function get_contents_array($file) { - return @file($file); + public function get_contents_array( $file ) { + return @file( $file ); } /** @@ -65,8 +65,9 @@ */ public function put_contents( $file, $contents, $mode = false ) { $fp = @fopen( $file, 'wb' ); - if ( ! $fp ) + if ( ! $fp ) { return false; + } mbstring_binary_safe_encoding(); @@ -78,8 +79,9 @@ fclose( $fp ); - if ( $data_length !== $bytes_written ) + if ( $data_length !== $bytes_written ) { return false; + } $this->chmod( $file, $mode ); @@ -105,8 +107,8 @@ * @param string $dir The new current directory. * @return bool Returns true on success or false on failure. */ - public function chdir($dir) { - return @chdir($dir); + public function chdir( $dir ) { + return @chdir( $dir ); } /** @@ -119,18 +121,22 @@ * @param bool $recursive Optional. If set True changes file group recursively. Default false. * @return bool Returns true on success or false on failure. */ - public function chgrp($file, $group, $recursive = false) { - if ( ! $this->exists($file) ) + public function chgrp( $file, $group, $recursive = false ) { + if ( ! $this->exists( $file ) ) { return false; - if ( ! $recursive ) - return @chgrp($file, $group); - if ( ! $this->is_dir($file) ) - return @chgrp($file, $group); + } + if ( ! $recursive ) { + return @chgrp( $file, $group ); + } + if ( ! $this->is_dir( $file ) ) { + return @chgrp( $file, $group ); + } // Is a directory, and we want recursive - $file = trailingslashit($file); - $filelist = $this->dirlist($file); - foreach ($filelist as $filename) - $this->chgrp($file . $filename, $group, $recursive); + $file = trailingslashit( $file ); + $filelist = $this->dirlist( $file ); + foreach ( $filelist as $filename ) { + $this->chgrp( $file . $filename, $group, $recursive ); + } return true; } @@ -146,23 +152,25 @@ * @param bool $recursive Optional. If set True changes file group recursively. Default false. * @return bool Returns true on success or false on failure. */ - public function chmod($file, $mode = false, $recursive = false) { + public function chmod( $file, $mode = false, $recursive = false ) { if ( ! $mode ) { - if ( $this->is_file($file) ) + if ( $this->is_file( $file ) ) { $mode = FS_CHMOD_FILE; - elseif ( $this->is_dir($file) ) + } elseif ( $this->is_dir( $file ) ) { $mode = FS_CHMOD_DIR; - else - return false; + } else { return false; + } } - if ( ! $recursive || ! $this->is_dir($file) ) - return @chmod($file, $mode); + if ( ! $recursive || ! $this->is_dir( $file ) ) { + return @chmod( $file, $mode ); + } // Is a directory, and we want recursive - $file = trailingslashit($file); - $filelist = $this->dirlist($file); - foreach ( (array)$filelist as $filename => $filemeta) - $this->chmod($file . $filename, $mode, $recursive); + $file = trailingslashit( $file ); + $filelist = $this->dirlist( $file ); + foreach ( (array) $filelist as $filename => $filemeta ) { + $this->chmod( $file . $filename, $mode, $recursive ); + } return true; } @@ -178,17 +186,20 @@ * Default false. * @return bool Returns true on success or false on failure. */ - public function chown($file, $owner, $recursive = false) { - if ( ! $this->exists($file) ) + public function chown( $file, $owner, $recursive = false ) { + if ( ! $this->exists( $file ) ) { return false; - if ( ! $recursive ) - return @chown($file, $owner); - if ( ! $this->is_dir($file) ) - return @chown($file, $owner); + } + if ( ! $recursive ) { + return @chown( $file, $owner ); + } + if ( ! $this->is_dir( $file ) ) { + return @chown( $file, $owner ); + } // Is a directory, and we want recursive - $filelist = $this->dirlist($file); - foreach ($filelist as $filename) { - $this->chown($file . '/' . $filename, $owner, $recursive); + $filelist = $this->dirlist( $file ); + foreach ( $filelist as $filename ) { + $this->chown( $file . '/' . $filename, $owner, $recursive ); } return true; } @@ -201,13 +212,15 @@ * @param string $file Path to the file. * @return string|bool Username of the user or false on error. */ - public function owner($file) { - $owneruid = @fileowner($file); - if ( ! $owneruid ) + public function owner( $file ) { + $owneruid = @fileowner( $file ); + if ( ! $owneruid ) { return false; - if ( ! function_exists('posix_getpwuid') ) + } + if ( ! function_exists( 'posix_getpwuid' ) ) { return $owneruid; - $ownerarray = posix_getpwuid($owneruid); + } + $ownerarray = posix_getpwuid( $owneruid ); return $ownerarray['name']; } @@ -221,7 +234,7 @@ * @param string $file Path to the file. * @return string Mode of the file (last 3 digits). */ - public function getchmod($file) { + public function getchmod( $file ) { return substr( decoct( @fileperms( $file ) ), -3 ); } @@ -231,13 +244,15 @@ * @param string $file * @return string|false */ - public function group($file) { - $gid = @filegroup($file); - if ( ! $gid ) + public function group( $file ) { + $gid = @filegroup( $file ); + if ( ! $gid ) { return false; - if ( ! function_exists('posix_getgrgid') ) + } + if ( ! function_exists( 'posix_getgrgid' ) ) { return $gid; - $grouparray = posix_getgrgid($gid); + } + $grouparray = posix_getgrgid( $gid ); return $grouparray['name']; } @@ -250,13 +265,15 @@ * @param int $mode * @return bool */ - public function copy($source, $destination, $overwrite = false, $mode = false) { - if ( ! $overwrite && $this->exists($destination) ) + public function copy( $source, $destination, $overwrite = false, $mode = false ) { + if ( ! $overwrite && $this->exists( $destination ) ) { return false; + } - $rtval = copy($source, $destination); - if ( $mode ) - $this->chmod($destination, $mode); + $rtval = copy( $source, $destination ); + if ( $mode ) { + $this->chmod( $destination, $mode ); + } return $rtval; } @@ -268,16 +285,18 @@ * @param bool $overwrite * @return bool */ - public function move($source, $destination, $overwrite = false) { - if ( ! $overwrite && $this->exists($destination) ) + public function move( $source, $destination, $overwrite = false ) { + if ( ! $overwrite && $this->exists( $destination ) ) { return false; + } // Try using rename first. if that fails (for example, source is read only) try copy. - if ( @rename($source, $destination) ) + if ( @rename( $source, $destination ) ) { return true; + } - if ( $this->copy($source, $destination, $overwrite) && $this->exists($destination) ) { - $this->delete($source); + if ( $this->copy( $source, $destination, $overwrite ) && $this->exists( $destination ) ) { + $this->delete( $source ); return true; } else { return false; @@ -292,30 +311,35 @@ * @param string $type * @return bool */ - public function delete($file, $recursive = false, $type = false) { - if ( empty( $file ) ) // Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem. + public function delete( $file, $recursive = false, $type = false ) { + if ( empty( $file ) ) { // Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem. return false; + } $file = str_replace( '\\', '/', $file ); // for win32, occasional problems deleting files otherwise - if ( 'f' == $type || $this->is_file($file) ) - return @unlink($file); - if ( ! $recursive && $this->is_dir($file) ) - return @rmdir($file); + if ( 'f' == $type || $this->is_file( $file ) ) { + return @unlink( $file ); + } + if ( ! $recursive && $this->is_dir( $file ) ) { + return @rmdir( $file ); + } // At this point it's a folder, and we're in recursive mode - $file = trailingslashit($file); - $filelist = $this->dirlist($file, true); + $file = trailingslashit( $file ); + $filelist = $this->dirlist( $file, true ); $retval = true; if ( is_array( $filelist ) ) { foreach ( $filelist as $filename => $fileinfo ) { - if ( ! $this->delete($file . $filename, $recursive, $fileinfo['type']) ) + if ( ! $this->delete( $file . $filename, $recursive, $fileinfo['type'] ) ) { $retval = false; + } } } - if ( file_exists($file) && ! @rmdir($file) ) + if ( file_exists( $file ) && ! @rmdir( $file ) ) { $retval = false; + } return $retval; } @@ -325,8 +349,8 @@ * @param string $file * @return bool */ - public function exists($file) { - return @file_exists($file); + public function exists( $file ) { + return @file_exists( $file ); } /** * @access public @@ -334,8 +358,8 @@ * @param string $file * @return bool */ - public function is_file($file) { - return @is_file($file); + public function is_file( $file ) { + return @is_file( $file ); } /** * @access public @@ -343,8 +367,8 @@ * @param string $path * @return bool */ - public function is_dir($path) { - return @is_dir($path); + public function is_dir( $path ) { + return @is_dir( $path ); } /** @@ -353,8 +377,8 @@ * @param string $file * @return bool */ - public function is_readable($file) { - return @is_readable($file); + public function is_readable( $file ) { + return @is_readable( $file ); } /** @@ -363,8 +387,8 @@ * @param string $file * @return bool */ - public function is_writable($file) { - return @is_writable($file); + public function is_writable( $file ) { + return @is_writable( $file ); } /** @@ -373,8 +397,8 @@ * @param string $file * @return int */ - public function atime($file) { - return @fileatime($file); + public function atime( $file ) { + return @fileatime( $file ); } /** @@ -383,8 +407,8 @@ * @param string $file * @return int */ - public function mtime($file) { - return @filemtime($file); + public function mtime( $file ) { + return @filemtime( $file ); } /** @@ -393,8 +417,8 @@ * @param string $file * @return int */ - public function size($file) { - return @filesize($file); + public function size( $file ) { + return @filesize( $file ); } /** @@ -405,12 +429,14 @@ * @param int $atime * @return bool */ - public function touch($file, $time = 0, $atime = 0) { - if ($time == 0) + public function touch( $file, $time = 0, $atime = 0 ) { + if ( $time == 0 ) { $time = time(); - if ($atime == 0) + } + if ( $atime == 0 ) { $atime = time(); - return @touch($file, $time, $atime); + } + return @touch( $file, $time, $atime ); } /** @@ -422,22 +448,27 @@ * @param mixed $chgrp * @return bool */ - public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) { + public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) { // Safe mode fails with a trailing slash under certain PHP versions. - $path = untrailingslashit($path); - if ( empty($path) ) + $path = untrailingslashit( $path ); + if ( empty( $path ) ) { return false; + } - if ( ! $chmod ) + if ( ! $chmod ) { $chmod = FS_CHMOD_DIR; + } - if ( ! @mkdir($path) ) + if ( ! @mkdir( $path ) ) { return false; - $this->chmod($path, $chmod); - if ( $chown ) - $this->chown($path, $chown); - if ( $chgrp ) - $this->chgrp($path, $chgrp); + } + $this->chmod( $path, $chmod ); + if ( $chown ) { + $this->chown( $path, $chown ); + } + if ( $chgrp ) { + $this->chgrp( $path, $chgrp ); + } return true; } @@ -448,8 +479,8 @@ * @param bool $recursive * @return bool */ - public function rmdir($path, $recursive = false) { - return $this->delete($path, $recursive); + public function rmdir( $path, $recursive = false ) { + return $this->delete( $path, $recursive ); } /** @@ -460,58 +491,63 @@ * @param bool $recursive * @return bool|array */ - public function dirlist($path, $include_hidden = true, $recursive = false) { - if ( $this->is_file($path) ) { - $limit_file = basename($path); - $path = dirname($path); + public function dirlist( $path, $include_hidden = true, $recursive = false ) { + if ( $this->is_file( $path ) ) { + $limit_file = basename( $path ); + $path = dirname( $path ); } else { $limit_file = false; } - if ( ! $this->is_dir($path) ) + if ( ! $this->is_dir( $path ) ) { return false; + } - $dir = @dir($path); - if ( ! $dir ) + $dir = @dir( $path ); + if ( ! $dir ) { return false; + } $ret = array(); - while (false !== ($entry = $dir->read()) ) { + while ( false !== ($entry = $dir->read()) ) { $struc = array(); $struc['name'] = $entry; - if ( '.' == $struc['name'] || '..' == $struc['name'] ) + if ( '.' == $struc['name'] || '..' == $struc['name'] ) { continue; + } - if ( ! $include_hidden && '.' == $struc['name'][0] ) + if ( ! $include_hidden && '.' == $struc['name'][0] ) { continue; + } - if ( $limit_file && $struc['name'] != $limit_file) + if ( $limit_file && $struc['name'] != $limit_file ) { continue; + } - $struc['perms'] = $this->gethchmod($path.'/'.$entry); - $struc['permsn'] = $this->getnumchmodfromh($struc['perms']); + $struc['perms'] = $this->gethchmod( $path . '/' . $entry ); + $struc['permsn'] = $this->getnumchmodfromh( $struc['perms'] ); $struc['number'] = false; - $struc['owner'] = $this->owner($path.'/'.$entry); - $struc['group'] = $this->group($path.'/'.$entry); - $struc['size'] = $this->size($path.'/'.$entry); - $struc['lastmodunix']= $this->mtime($path.'/'.$entry); - $struc['lastmod'] = date('M j',$struc['lastmodunix']); - $struc['time'] = date('h:i:s',$struc['lastmodunix']); - $struc['type'] = $this->is_dir($path.'/'.$entry) ? 'd' : 'f'; + $struc['owner'] = $this->owner( $path . '/' . $entry ); + $struc['group'] = $this->group( $path . '/' . $entry ); + $struc['size'] = $this->size( $path . '/' . $entry ); + $struc['lastmodunix'] = $this->mtime( $path . '/' . $entry ); + $struc['lastmod'] = date( 'M j',$struc['lastmodunix'] ); + $struc['time'] = date( 'h:i:s',$struc['lastmodunix'] ); + $struc['type'] = $this->is_dir( $path . '/' . $entry ) ? 'd' : 'f'; if ( 'd' == $struc['type'] ) { - if ( $recursive ) - $struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive); - else - $struc['files'] = array(); + if ( $recursive ) { + $struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive ); + } else { $struc['files'] = array(); + } } $ret[ $struc['name'] ] = $struc; - } + }// End while(). $dir->close(); - unset($dir); + unset( $dir ); return $ret; } } Index: src/wp-admin/includes/class-wp-filesystem-ftpext.php =================================================================== --- src/wp-admin/includes/class-wp-filesystem-ftpext.php (revision 40901) +++ src/wp-admin/includes/class-wp-filesystem-ftpext.php (working copy) @@ -27,40 +27,42 @@ $this->errors = new WP_Error(); // Check if possible to use ftp functions. - if ( ! extension_loaded('ftp') ) { - $this->errors->add('no_ftp_ext', __('The ftp PHP extension is not available')); + if ( ! extension_loaded( 'ftp' ) ) { + $this->errors->add( 'no_ftp_ext', __( 'The ftp PHP extension is not available' ) ); return; } // This Class uses the timeout on a per-connection basis, Others use it on a per-action basis. - if ( ! defined('FS_TIMEOUT') ) - define('FS_TIMEOUT', 240); + if ( ! defined( 'FS_TIMEOUT' ) ) { + define( 'FS_TIMEOUT', 240 ); + } - if ( empty($opt['port']) ) + if ( empty( $opt['port'] ) ) { $this->options['port'] = 21; - else - $this->options['port'] = $opt['port']; + } else { $this->options['port'] = $opt['port']; + } - if ( empty($opt['hostname']) ) - $this->errors->add('empty_hostname', __('FTP hostname is required')); - else - $this->options['hostname'] = $opt['hostname']; + if ( empty( $opt['hostname'] ) ) { + $this->errors->add( 'empty_hostname', __( 'FTP hostname is required' ) ); + } else { $this->options['hostname'] = $opt['hostname']; + } // Check if the options provided are OK. - if ( empty($opt['username']) ) - $this->errors->add('empty_username', __('FTP username is required')); - else - $this->options['username'] = $opt['username']; - - if ( empty($opt['password']) ) - $this->errors->add('empty_password', __('FTP password is required')); - else - $this->options['password'] = $opt['password']; + if ( empty( $opt['username'] ) ) { + $this->errors->add( 'empty_username', __( 'FTP username is required' ) ); + } else { $this->options['username'] = $opt['username']; + } + + if ( empty( $opt['password'] ) ) { + $this->errors->add( 'empty_password', __( 'FTP password is required' ) ); + } else { $this->options['password'] = $opt['password']; + } $this->options['ssl'] = false; - if ( isset($opt['connection_type']) && 'ftps' == $opt['connection_type'] ) + if ( isset( $opt['connection_type'] ) && 'ftps' == $opt['connection_type'] ) { $this->options['ssl'] = true; + } } /** @@ -69,10 +71,10 @@ * @return bool */ public function connect() { - if ( isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect') ) - $this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT); - else - $this->link = @ftp_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT); + if ( isset( $this->options['ssl'] ) && $this->options['ssl'] && function_exists( 'ftp_ssl_connect' ) ) { + $this->link = @ftp_ssl_connect( $this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT ); + } else { $this->link = @ftp_connect( $this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT ); + } if ( ! $this->link ) { $this->errors->add( 'connect', @@ -96,8 +98,9 @@ // Set the Connection to use Passive FTP @ftp_pasv( $this->link, true ); - if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT ) - @ftp_set_option($this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT); + if ( @ftp_get_option( $this->link, FTP_TIMEOUT_SEC ) < FS_TIMEOUT ) { + @ftp_set_option( $this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT ); + } return true; } @@ -113,8 +116,8 @@ * or if the file couldn't be retrieved. */ public function get_contents( $file ) { - $tempfile = wp_tempnam($file); - $temp = fopen($tempfile, 'w+'); + $tempfile = wp_tempnam( $file ); + $temp = fopen( $tempfile, 'w+' ); if ( ! $temp ) { unlink( $tempfile ); @@ -130,11 +133,11 @@ fseek( $temp, 0 ); // Skip back to the start of the file being written to $contents = ''; - while ( ! feof($temp) ) - $contents .= fread($temp, 8192); + while ( ! feof( $temp ) ) { $contents .= fread( $temp, 8192 ); + } - fclose($temp); - unlink($tempfile); + fclose( $temp ); + unlink( $tempfile ); return $contents; } @@ -144,8 +147,8 @@ * @param string $file * @return array */ - public function get_contents_array($file) { - return explode("\n", $this->get_contents($file)); + public function get_contents_array( $file ) { + return explode( "\n", $this->get_contents( $file ) ); } /** @@ -156,8 +159,8 @@ * @param bool|int $mode * @return bool */ - public function put_contents($file, $contents, $mode = false ) { - $tempfile = wp_tempnam($file); + public function put_contents( $file, $contents, $mode = false ) { + $tempfile = wp_tempnam( $file ); $temp = fopen( $tempfile, 'wb+' ); if ( ! $temp ) { @@ -182,10 +185,10 @@ $ret = @ftp_fput( $this->link, $file, $temp, FTP_BINARY ); - fclose($temp); - unlink($tempfile); + fclose( $temp ); + unlink( $tempfile ); - $this->chmod($file, $mode); + $this->chmod( $file, $mode ); return $ret; } @@ -196,9 +199,10 @@ * @return string */ public function cwd() { - $cwd = @ftp_pwd($this->link); - if ( $cwd ) - $cwd = trailingslashit($cwd); + $cwd = @ftp_pwd( $this->link ); + if ( $cwd ) { + $cwd = trailingslashit( $cwd ); + } return $cwd; } @@ -208,8 +212,8 @@ * @param string $dir * @return bool */ - public function chdir($dir) { - return @ftp_chdir($this->link, $dir); + public function chdir( $dir ) { + return @ftp_chdir( $this->link, $dir ); } /** @@ -220,27 +224,29 @@ * @param bool $recursive * @return bool */ - public function chmod($file, $mode = false, $recursive = false) { + public function chmod( $file, $mode = false, $recursive = false ) { if ( ! $mode ) { - if ( $this->is_file($file) ) + if ( $this->is_file( $file ) ) { $mode = FS_CHMOD_FILE; - elseif ( $this->is_dir($file) ) + } elseif ( $this->is_dir( $file ) ) { $mode = FS_CHMOD_DIR; - else - return false; + } else { return false; + } } // chmod any sub-objects if recursive. - if ( $recursive && $this->is_dir($file) ) { - $filelist = $this->dirlist($file); - foreach ( (array)$filelist as $filename => $filemeta ) - $this->chmod($file . '/' . $filename, $mode, $recursive); + if ( $recursive && $this->is_dir( $file ) ) { + $filelist = $this->dirlist( $file ); + foreach ( (array) $filelist as $filename => $filemeta ) { + $this->chmod( $file . '/' . $filename, $mode, $recursive ); + } } // chmod the file or directory - if ( ! function_exists('ftp_chmod') ) - return (bool)@ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file)); - return (bool)@ftp_chmod($this->link, $mode, $file); + if ( ! function_exists( 'ftp_chmod' ) ) { + return (bool) @ftp_site( $this->link, sprintf( 'CHMOD %o %s', $mode, $file ) ); + } + return (bool) @ftp_chmod( $this->link, $mode, $file ); } /** @@ -249,9 +255,9 @@ * @param string $file * @return string */ - public function owner($file) { - $dir = $this->dirlist($file); - return $dir[$file]['owner']; + public function owner( $file ) { + $dir = $this->dirlist( $file ); + return $dir[ $file ]['owner']; } /** * @access public @@ -259,9 +265,9 @@ * @param string $file * @return string */ - public function getchmod($file) { - $dir = $this->dirlist($file); - return $dir[$file]['permsn']; + public function getchmod( $file ) { + $dir = $this->dirlist( $file ); + return $dir[ $file ]['permsn']; } /** @@ -270,9 +276,9 @@ * @param string $file * @return string */ - public function group($file) { - $dir = $this->dirlist($file); - return $dir[$file]['group']; + public function group( $file ) { + $dir = $this->dirlist( $file ); + return $dir[ $file ]['group']; } /** @@ -284,13 +290,15 @@ * @param string|bool $mode * @return bool */ - public function copy($source, $destination, $overwrite = false, $mode = false) { - if ( ! $overwrite && $this->exists($destination) ) + public function copy( $source, $destination, $overwrite = false, $mode = false ) { + if ( ! $overwrite && $this->exists( $destination ) ) { return false; - $content = $this->get_contents($source); - if ( false === $content ) + } + $content = $this->get_contents( $source ); + if ( false === $content ) { return false; - return $this->put_contents($destination, $content, $mode); + } + return $this->put_contents( $destination, $content, $mode ); } /** @@ -301,8 +309,8 @@ * @param bool $overwrite * @return bool */ - public function move($source, $destination, $overwrite = false) { - return ftp_rename($this->link, $source, $destination); + public function move( $source, $destination, $overwrite = false ) { + return ftp_rename( $this->link, $source, $destination ); } /** @@ -313,19 +321,24 @@ * @param string $type * @return bool */ - public function delete($file, $recursive = false, $type = false) { - if ( empty($file) ) + public function delete( $file, $recursive = false, $type = false ) { + if ( empty( $file ) ) { return false; - if ( 'f' == $type || $this->is_file($file) ) - return @ftp_delete($this->link, $file); - if ( !$recursive ) - return @ftp_rmdir($this->link, $file); + } + if ( 'f' == $type || $this->is_file( $file ) ) { + return @ftp_delete( $this->link, $file ); + } + if ( ! $recursive ) { + return @ftp_rmdir( $this->link, $file ); + } - $filelist = $this->dirlist( trailingslashit($file) ); - if ( !empty($filelist) ) - foreach ( $filelist as $delete_file ) - $this->delete( trailingslashit($file) . $delete_file['name'], $recursive, $delete_file['type'] ); - return @ftp_rmdir($this->link, $file); + $filelist = $this->dirlist( trailingslashit( $file ) ); + if ( ! empty( $filelist ) ) { + foreach ( $filelist as $delete_file ) { + $this->delete( trailingslashit( $file ) . $delete_file['name'], $recursive, $delete_file['type'] ); + } + } + return @ftp_rmdir( $this->link, $file ); } /** @@ -334,14 +347,14 @@ * @param string $file * @return bool */ - public function exists($file) { - $list = @ftp_nlist($this->link, $file); + public function exists( $file ) { + $list = @ftp_nlist( $this->link, $file ); if ( empty( $list ) && $this->is_dir( $file ) ) { return true; // File is an empty directory. } - return !empty($list); //empty list = no file, so invert. + return ! empty( $list ); //empty list = no file, so invert. } /** @@ -350,8 +363,8 @@ * @param string $file * @return bool */ - public function is_file($file) { - return $this->exists($file) && !$this->is_dir($file); + public function is_file( $file ) { + return $this->exists( $file ) && ! $this->is_dir( $file ); } /** @@ -360,11 +373,11 @@ * @param string $path * @return bool */ - public function is_dir($path) { + public function is_dir( $path ) { $cwd = $this->cwd(); - $result = @ftp_chdir($this->link, trailingslashit($path) ); + $result = @ftp_chdir( $this->link, trailingslashit( $path ) ); if ( $result && $path == $this->cwd() || $this->cwd() != $cwd ) { - @ftp_chdir($this->link, $cwd); + @ftp_chdir( $this->link, $cwd ); return true; } return false; @@ -376,7 +389,7 @@ * @param string $file * @return bool */ - public function is_readable($file) { + public function is_readable( $file ) { return true; } @@ -386,7 +399,7 @@ * @param string $file * @return bool */ - public function is_writable($file) { + public function is_writable( $file ) { return true; } @@ -396,7 +409,7 @@ * @param string $file * @return bool */ - public function atime($file) { + public function atime( $file ) { return false; } @@ -406,8 +419,8 @@ * @param string $file * @return int */ - public function mtime($file) { - return ftp_mdtm($this->link, $file); + public function mtime( $file ) { + return ftp_mdtm( $this->link, $file ); } /** @@ -416,8 +429,8 @@ * @param string $file * @return int */ - public function size($file) { - return ftp_size($this->link, $file); + public function size( $file ) { + return ftp_size( $this->link, $file ); } /** @@ -426,7 +439,7 @@ * @param string $file * @return bool */ - public function touch($file, $time = 0, $atime = 0) { + public function touch( $file, $time = 0, $atime = 0 ) { return false; } @@ -439,14 +452,16 @@ * @param mixed $chgrp * @return bool */ - public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) { - $path = untrailingslashit($path); - if ( empty($path) ) + public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) { + $path = untrailingslashit( $path ); + if ( empty( $path ) ) { return false; + } - if ( !@ftp_mkdir($this->link, $path) ) + if ( ! @ftp_mkdir( $this->link, $path ) ) { return false; - $this->chmod($path, $chmod); + } + $this->chmod( $path, $chmod ); return true; } @@ -457,8 +472,8 @@ * @param bool $recursive * @return bool */ - public function rmdir($path, $recursive = false) { - return $this->delete($path, $recursive); + public function rmdir( $path, $recursive = false ) { + return $this->delete( $path, $recursive ); } /** @@ -468,45 +483,47 @@ * @param string $line * @return array */ - public function parselisting($line) { + public function parselisting( $line ) { static $is_windows = null; - if ( is_null($is_windows) ) - $is_windows = stripos( ftp_systype($this->link), 'win') !== false; + if ( is_null( $is_windows ) ) { + $is_windows = stripos( ftp_systype( $this->link ), 'win' ) !== false; + } - if ( $is_windows && preg_match('/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|
is_trash ) {
- $this->months_dropdown( 'attachment' );
- }
+if ( ! is_singular() ) {
+ if ( ! $this->is_trash ) {
+ $this->months_dropdown( 'attachment' );
+ }
- /** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
- do_action( 'restrict_manage_posts', $this->screen->post_type, $which );
+ /** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
+ do_action( 'restrict_manage_posts', $this->screen->post_type, $which );
- submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
- }
+ submit_button( __( 'Filter' ), '', 'filter_action', false, array(
+ 'id' => 'post-query-submit',
+ ) );
+}
- if ( $this->is_trash && current_user_can( 'edit_others_posts' ) && $this->has_items() ) {
- submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
- } ?>
+if ( $this->is_trash && current_user_can( 'edit_others_posts' ) && $this->has_items() ) {
+ submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
+} ?>
screen->id}", array() );
// Back compat for pre-4.0 view links.
- if ( ! empty( $views ) ) {
- echo '- ';
- foreach ( $views as $class => $view ) {
- echo "
- $view "; - } - echo '
- ';
+ foreach ( $views as $class => $view ) {
+ echo "
- $view "; + } + echo '
', @@ -513,8 +526,8 @@ esc_attr( sprintf( __( 'Attach “%s” to existing content' ), $title ) ), __( 'Attach' ) ); - } - } +} + }// End if(). } /** @@ -694,9 +707,8 @@ __( 'Attach' ) ); } - } - else { - if ( current_user_can( 'edit_post', $post->ID ) && !$this->is_trash ) { + } else { + if ( current_user_can( 'edit_post', $post->ID ) && ! $this->is_trash ) { $actions['edit'] = sprintf( '%s', get_edit_post_link( $post->ID ), @@ -724,7 +736,7 @@ ); } if ( $this->is_trash || ! EMPTY_TRASH_DAYS || ! MEDIA_TRASH ) { - $delete_ays = ( !$this->is_trash && !MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : ''; + $delete_ays = ( ! $this->is_trash && ! MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : ''; $actions['delete'] = sprintf( '%s', wp_nonce_url( "post.php?action=delete&post=$post->ID", 'delete-post_' . $post->ID ), @@ -744,7 +756,7 @@ __( 'View' ) ); } - } + }// End if(). /** * Filters the action links for each attachment in the Media list table. Index: src/wp-admin/includes/class-wp-ms-sites-list-table.php =================================================================== --- src/wp-admin/includes/class-wp-ms-sites-list-table.php (revision 40901) +++ src/wp-admin/includes/class-wp-ms-sites-list-table.php (working copy) @@ -41,7 +41,7 @@ 'archived' => array( 'site-archived', __( 'Archived' ) ), 'spam' => array( 'site-spammed', _x( 'Spam', 'site' ) ), 'deleted' => array( 'site-deleted', __( 'Deleted' ) ), - 'mature' => array( 'site-mature', __( 'Mature' ) ) + 'mature' => array( 'site-mature', __( 'Mature' ) ), ); parent::__construct( array( @@ -81,22 +81,24 @@ $pagenum = $this->get_pagenum(); - $s = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST[ 's' ] ) ) : ''; + $s = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : ''; $wild = ''; - if ( false !== strpos($s, '*') ) { + if ( false !== strpos( $s, '*' ) ) { $wild = '*'; - $s = trim($s, '*'); + $s = trim( $s, '*' ); } /* * If the network is large and a search is not being performed, show only * the latest sites with no paging in order to avoid expensive count queries. */ - if ( !$s && wp_is_large_network() ) { - if ( !isset($_REQUEST['orderby']) ) + if ( ! $s && wp_is_large_network() ) { + if ( ! isset( $_REQUEST['orderby'] ) ) { $_GET['orderby'] = $_REQUEST['orderby'] = ''; - if ( !isset($_REQUEST['order']) ) + } + if ( ! isset( $_REQUEST['order'] ) ) { $_GET['order'] = $_REQUEST['order'] = 'DESC'; + } } $args = array( @@ -105,7 +107,7 @@ 'network_id' => get_current_network_id(), ); - if ( empty($s) ) { + if ( empty( $s ) ) { // Nothing to do. } elseif ( preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $s ) || preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) || @@ -148,7 +150,7 @@ $args['orderby'] = $order_by; if ( $order_by ) { - $args['order'] = ( isset( $_REQUEST['order'] ) && 'DESC' === strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC"; + $args['order'] = ( isset( $_REQUEST['order'] ) && 'DESC' === strtoupper( $_REQUEST['order'] ) ) ? 'DESC' : 'ASC'; } if ( wp_is_large_network() ) { @@ -198,8 +200,9 @@ */ protected function get_bulk_actions() { $actions = array(); - if ( current_user_can( 'delete_sites' ) ) + if ( current_user_can( 'delete_sites' ) ) { $actions['delete'] = __( 'Delete' ); + } $actions['spam'] = _x( 'Mark as Spam', 'site' ); $actions['notspam'] = _x( 'Not Spam', 'site' ); @@ -216,8 +219,9 @@ parent::pagination( $which ); - if ( 'top' === $which ) + if ( 'top' === $which ) { $this->view_switcher( $mode ); + } } /** @@ -402,7 +406,10 @@ public function column_users( $blog ) { $user_count = wp_cache_get( $blog['blog_id'] . '_user_count', 'blog-details' ); if ( ! $user_count ) { - $blog_users = get_users( array( 'blog_id' => $blog['blog_id'], 'fields' => 'ID' ) ); + $blog_users = get_users( array( + 'blog_id' => $blog['blog_id'], + 'fields' => 'ID', + ) ); $user_count = count( $blog_users ); unset( $blog_users ); wp_cache_set( $blog['blog_id'] . '_user_count', $user_count, 'blog-details', 12 * HOUR_IN_SECONDS ); @@ -515,10 +522,14 @@ // Preordered. $actions = array( - 'edit' => '', 'backend' => '', - 'activate' => '', 'deactivate' => '', - 'archive' => '', 'unarchive' => '', - 'spam' => '', 'unspam' => '', + 'edit' => '', + 'backend' => '', + 'activate' => '', + 'deactivate' => '', + 'archive' => '', + 'unarchive' => '', + 'spam' => '', + 'unspam' => '', 'delete' => '', 'visit' => '', ); Index: src/wp-admin/includes/class-wp-ms-themes-list-table.php =================================================================== --- src/wp-admin/includes/class-wp-ms-themes-list-table.php (revision 40901) +++ src/wp-admin/includes/class-wp-ms-themes-list-table.php (working copy) @@ -44,15 +44,17 @@ ) ); $status = isset( $_REQUEST['theme_status'] ) ? $_REQUEST['theme_status'] : 'all'; - if ( !in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search', 'broken' ) ) ) + if ( ! in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search', 'broken' ) ) ) { $status = 'all'; + } $page = $this->get_pagenum(); $this->is_site_themes = ( 'site-themes-network' === $this->screen->id ) ? true : false; - if ( $this->is_site_themes ) + if ( $this->is_site_themes ) { $this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0; + } } /** @@ -69,10 +71,10 @@ * @return bool */ public function ajax_user_can() { - if ( $this->is_site_themes ) + if ( $this->is_site_themes ) { return current_user_can( 'manage_sites' ); - else - return current_user_can( 'manage_network_themes' ); + } else { return current_user_can( 'manage_network_themes' ); + } } /** @@ -103,7 +105,9 @@ 'enabled' => array(), 'disabled' => array(), 'upgrade' => array(), - 'broken' => $this->is_site_themes ? array() : wp_get_themes( array( 'errors' => true ) ), + 'broken' => $this->is_site_themes ? array() : wp_get_themes( array( + 'errors' => true, + ) ), ); if ( $this->is_site_themes ) { @@ -137,11 +141,13 @@ } $totals = array(); - foreach ( $themes as $type => $list ) + foreach ( $themes as $type => $list ) { $totals[ $type ] = count( $list ); + } - if ( empty( $themes[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) ) + if ( empty( $themes[ $status ] ) && ! in_array( $status, array( 'all', 'search' ) ) ) { $status = 'all'; + } $this->items = $themes[ $status ]; WP_Theme::sort_by_name( $this->items ); @@ -169,8 +175,9 @@ $start = ( $page - 1 ) * $themes_per_page; - if ( $total_this_page > $themes_per_page ) + if ( $total_this_page > $themes_per_page ) { $this->items = array_slice( $this->items, $start, $themes_per_page, true ); + } $this->set_pagination_args( array( 'total_items' => $total_this_page, @@ -185,20 +192,24 @@ */ public function _search_callback( $theme ) { static $term = null; - if ( is_null( $term ) ) + if ( is_null( $term ) ) { $term = wp_unslash( $_REQUEST['s'] ); + } foreach ( array( 'Name', 'Description', 'Author', 'Author', 'AuthorURI' ) as $field ) { // Don't mark up; Do translate. - if ( false !== stripos( $theme->display( $field, false, true ), $term ) ) + if ( false !== stripos( $theme->display( $field, false, true ), $term ) ) { return true; + } } - if ( false !== stripos( $theme->get_stylesheet(), $term ) ) + if ( false !== stripos( $theme->get_stylesheet(), $term ) ) { return true; + } - if ( false !== stripos( $theme->get_template(), $term ) ) + if ( false !== stripos( $theme->get_template(), $term ) ) { return true; + } return false; } @@ -217,13 +228,14 @@ $a = $theme_a[ $orderby ]; $b = $theme_b[ $orderby ]; - if ( $a == $b ) + if ( $a == $b ) { return 0; + } - if ( 'DESC' === $order ) + if ( 'DESC' === $order ) { return ( $a < $b ) ? 1 : -1; - else - return ( $a < $b ) ? -1 : 1; + } else { return ( $a < $b ) ? -1 : 1; + } } /** @@ -282,8 +294,9 @@ $status_links = array(); foreach ( $totals as $type => $count ) { - if ( !$count ) + if ( ! $count ) { continue; + } switch ( $type ) { case 'all': @@ -303,19 +316,19 @@ break; } - if ( $this->is_site_themes ) + if ( $this->is_site_themes ) { $url = 'site-themes.php?id=' . $this->site_id; - else - $url = 'themes.php'; + } else { $url = 'themes.php'; + } if ( 'search' != $type ) { - $status_links[$type] = sprintf( "%s", - esc_url( add_query_arg('theme_status', $type, $url) ), + $status_links[ $type ] = sprintf( "%s", + esc_url( add_query_arg( 'theme_status', $type, $url ) ), ( $type === $status ) ? ' class="current"' : '', sprintf( $text, number_format_i18n( $count ) ) ); } - } + }// End foreach(). return $status_links; } @@ -329,15 +342,19 @@ global $status; $actions = array(); - if ( 'enabled' != $status ) + if ( 'enabled' != $status ) { $actions['enable-selected'] = $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' ); - if ( 'disabled' != $status ) + } + if ( 'disabled' != $status ) { $actions['disable-selected'] = $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' ); + } if ( ! $this->is_site_themes ) { - if ( current_user_can( 'update_themes' ) ) + if ( current_user_can( 'update_themes' ) ) { $actions['update-selected'] = __( 'Update' ); - if ( current_user_can( 'delete_themes' ) ) + } + if ( current_user_can( 'delete_themes' ) ) { $actions['delete-selected'] = __( 'Delete' ); + } } return $actions; } @@ -346,8 +363,9 @@ * @access public */ public function display_rows() { - foreach ( $this->items as $theme ) + foreach ( $this->items as $theme ) { $this->single_row( $theme ); + } } /** @@ -359,7 +377,7 @@ * @param WP_Theme $theme The current WP_Theme object. */ public function column_cb( $theme ) { - $checkbox_id = 'checkbox_' . md5( $theme->get('Name') ); + $checkbox_id = 'checkbox_' . md5( $theme->get( 'Name' ) ); ?> @@ -396,7 +414,7 @@ 'enable' => '', 'disable' => '', 'edit' => '', - 'delete' => '' + 'delete' => '', ); $stylesheet = $theme->get_stylesheet(); @@ -446,9 +464,9 @@ esc_attr( $aria_label ), ( $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' ) ) ); - } + }// End if(). - if ( current_user_can('edit_themes') ) { + if ( current_user_can( 'edit_themes' ) ) { $url = add_query_arg( array( 'theme' => $theme_key, ), 'theme-editor.php' ); @@ -549,8 +567,9 @@ } $class = ! $allowed ? 'inactive' : 'active'; - if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) ) + if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) ) { $class .= ' update'; + } echo "
" . $theme->display( 'Description' ) . "
@@ -552,7 +572,11 @@
@@ -586,7 +610,7 @@
- 'search-submit' ) ); ?> + 'search-submit', + ) ); ?>
!in_array( $status, array( 'mustuse', 'dropins' ) ) ? '' : '', + 'cb' => ! in_array( $status, array( 'mustuse', 'dropins' ) ) ? '' : '', 'name' => __( 'Plugin' ), 'description' => __( 'Description' ), ); @@ -406,8 +414,9 @@ $status_links = array(); foreach ( $totals as $type => $count ) { - if ( !$count ) + if ( ! $count ) { continue; + } switch ( $type ) { case 'all': @@ -434,13 +443,13 @@ } if ( 'search' !== $type ) { - $status_links[$type] = sprintf( "%s", - add_query_arg('plugin_status', $type, 'plugins.php'), + $status_links[ $type ] = sprintf( "%s", + add_query_arg( 'plugin_status', $type, 'plugins.php' ), ( $type === $status ) ? ' class="current"' : '', sprintf( $text, number_format_i18n( $count ) ) - ); + ); } - } + }// End foreach(). return $status_links; } @@ -455,17 +464,21 @@ $actions = array(); - if ( 'active' != $status ) + if ( 'active' != $status ) { $actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' ); + } - if ( 'inactive' != $status && 'recent' != $status ) + if ( 'inactive' != $status && 'recent' != $status ) { $actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' ); + } - if ( !is_multisite() || $this->screen->in_admin( 'network' ) ) { - if ( current_user_can( 'update_plugins' ) ) + if ( ! is_multisite() || $this->screen->in_admin( 'network' ) ) { + if ( current_user_can( 'update_plugins' ) ) { $actions['update-selected'] = __( 'Update' ); - if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) ) + } + if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) ) { $actions['delete-selected'] = __( 'Delete' ); + } } return $actions; @@ -478,8 +491,9 @@ public function bulk_actions( $which = '' ) { global $status; - if ( in_array( $status, array( 'mustuse', 'dropins' ) ) ) + if ( in_array( $status, array( 'mustuse', 'dropins' ) ) ) { return; + } parent::bulk_actions( $which ); } @@ -491,8 +505,9 @@ protected function extra_tablenav( $which ) { global $status; - if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins') ) ) + if ( ! in_array( $status, array( 'recently_activated', 'mustuse', 'dropins' ) ) ) { return; + } echo '';
@@ -516,8 +531,9 @@
* @return string
*/
public function current_action() {
- if ( isset($_POST['clear-recent-list']) )
+ if ( isset( $_POST['clear-recent-list'] ) ) {
return 'clear-recent-list';
+ }
return parent::current_action();
}
@@ -529,11 +545,13 @@
public function display_rows() {
global $status;
- if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) )
+ if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
return;
+ }
- foreach ( $this->items as $plugin_file => $plugin_data )
+ foreach ( $this->items as $plugin_file => $plugin_data ) {
$this->single_row( array( $plugin_file, $plugin_data ) );
+ }
}
/**
@@ -569,8 +587,9 @@
} elseif ( 'dropins' === $context ) {
$dropins = _get_dropins();
$plugin_name = $plugin_file;
- if ( $plugin_file != $plugin_data['Name'] )
+ if ( $plugin_file != $plugin_data['Name'] ) {
$plugin_name .= '
' . $plugin_data['Name']; + } if ( true === ( $dropins[ $plugin_file ][1] ) ) { // Doesn't require a constant $is_active = true; $description = '',
@@ -759,7 +779,7 @@
case 'name':
echo "$plugin_name";
echo $this->row_actions( $actions, true );
- echo " ";
+ echo '';
break;
case 'description':
$classes = 'column-description desc';
@@ -769,12 +789,14 @@
";
+ echo '';
break;
default:
$classes = "$column_name column-$column_name $class";
@@ -829,11 +851,11 @@
*/
do_action( 'manage_plugins_custom_column', $column_name, $plugin_file, $plugin_data );
- echo "";
- }
- }
+ echo '';
+ }// End switch().
+ }// End foreach().
- echo " ";
+ echo '';
/**
* Fires after each row in the Plugins list table.
Index: src/wp-admin/includes/class-wp-post-comments-list-table.php
===================================================================
--- src/wp-admin/includes/class-wp-post-comments-list-table.php (revision 40901)
+++ src/wp-admin/includes/class-wp-post-comments-list-table.php (working copy)
@@ -51,16 +51,16 @@
public function display( $output_empty = false ) {
$singular = $this->_args['singular'];
- wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
+ wp_nonce_field( 'fetch-list-' . get_class( $this ), '_ajax_fetch_list_nonce' );
?>
get_items_per_page( 'edit_' . $post_type . '_per_page' );
/** This filter is documented in wp-admin/includes/post.php */
- $per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
+ $per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
if ( $this->hierarchical_display ) {
$total_items = $wp_query->post_count;
@@ -166,7 +166,9 @@
$total_items = array_sum( $post_counts );
// Subtract post types that are not included in the admin all list.
- foreach ( get_post_stati( array( 'show_in_admin_all_list' => false ) ) as $state ) {
+ foreach ( get_post_stati( array(
+ 'show_in_admin_all_list' => false,
+ ) ) as $state ) {
$total_items -= $post_counts[ $state ];
}
}
@@ -183,7 +185,7 @@
$this->set_pagination_args( array(
'total_items' => $total_items,
- 'per_page' => $per_page
+ 'per_page' => $per_page,
) );
}
@@ -199,10 +201,10 @@
* @access public
*/
public function no_items() {
- if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] )
+ if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] ) {
echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
- else
- echo get_post_type_object( $this->screen->post_type )->labels->not_found;
+ } else { echo get_post_type_object( $this->screen->post_type )->labels->not_found;
+ }
}
/**
@@ -242,9 +244,9 @@
$class_html = '';
if ( ! empty( $class ) ) {
$class_html = sprintf(
- ' class="%s"',
- esc_attr( $class )
- );
+ ' class="%s"',
+ esc_attr( $class )
+ );
}
return sprintf(
@@ -266,8 +268,9 @@
$post_type = $this->screen->post_type;
- if ( !empty($locked_post_status) )
+ if ( ! empty( $locked_post_status ) ) {
return array();
+ }
$status_links = array();
$num_posts = wp_count_posts( $post_type, 'readable' );
@@ -275,11 +278,15 @@
$class = '';
$current_user_id = get_current_user_id();
- $all_args = array( 'post_type' => $post_type );
+ $all_args = array(
+ 'post_type' => $post_type,
+ );
$mine = '';
// Subtract post types that are not included in the admin all list.
- foreach ( get_post_stati( array( 'show_in_admin_all_list' => false ) ) as $state ) {
+ foreach ( get_post_stati( array(
+ 'show_in_admin_all_list' => false,
+ ) ) as $state ) {
$total_posts -= $num_posts->$state;
}
@@ -290,7 +297,7 @@
$mine_args = array(
'post_type' => $post_type,
- 'author' => $current_user_id
+ 'author' => $current_user_id,
);
$mine_inner_html = sprintf(
@@ -328,7 +335,9 @@
$status_links['mine'] = $mine;
}
- foreach ( get_post_stati(array('show_in_admin_status_list' => true), 'objects') as $status ) {
+ foreach ( get_post_stati( array(
+ 'show_in_admin_status_list' => true,
+ ), 'objects' ) as $status ) {
$class = '';
$status_name = $status->name;
@@ -337,7 +346,7 @@
continue;
}
- if ( isset($_REQUEST['post_status']) && $status_name === $_REQUEST['post_status'] ) {
+ if ( isset( $_REQUEST['post_status'] ) && $status_name === $_REQUEST['post_status'] ) {
$class = 'current';
}
@@ -359,7 +368,7 @@
$sticky_args = array(
'post_type' => $post_type,
- 'show_sticky' => 1
+ 'show_sticky' => 1,
);
$sticky_inner_html = sprintf(
@@ -373,7 +382,7 @@
);
$sticky_link = array(
- 'sticky' => $this->get_edit_link( $sticky_args, $sticky_inner_html, $class )
+ 'sticky' => $this->get_edit_link( $sticky_args, $sticky_inner_html, $class ),
);
// Sticky comes after Publish, or if not listed, after All.
@@ -443,7 +452,7 @@
'hierarchical' => 1,
'show_count' => 0,
'orderby' => 'name',
- 'selected' => $cat
+ 'selected' => $cat,
);
echo '';
@@ -458,13 +467,13 @@
?>
current_level );
- echo "";
+ echo '';
$format = get_post_format( $post->ID );
if ( $format ) {
@@ -927,7 +958,7 @@
$format_args = array(
'post_format' => $format,
- 'post_type' => $post->post_type
+ 'post_type' => $post->post_type,
);
echo $this->get_edit_link( $format_args, $label . ':', $format_class );
@@ -1055,7 +1086,7 @@
?>
' . $plugin_data['Name']; + } if ( true === ( $dropins[ $plugin_file ][1] ) ) { // Doesn't require a constant $is_active = true; $description = '
' . $dropins[ $plugin_file ][0] . '
'; @@ -586,8 +605,9 @@ 'wp-config.php'
) . '';
}
- if ( $plugin_data['Description'] )
+ if ( $plugin_data['Description'] ) {
$description .= '' . $plugin_data['Description'] . '
'; + } } else { if ( $screen->in_admin( 'network' ) ) { $is_active = is_plugin_active_for_network( $plugin_file ); @@ -602,7 +622,7 @@ if ( current_user_can( 'manage_network_plugins' ) ) { /* translators: %s: plugin name */ $actions['deactivate'] = '' . __( 'Network Deactivate' ) . ''; - } + } } else { if ( current_user_can( 'manage_network_plugins' ) ) { /* translators: %s: plugin name */ @@ -633,15 +653,14 @@ /* translators: %s: plugin name */ $actions['delete'] = '' . __( 'Delete' ) . ''; } - } // end if $is_active - - } // end if $screen->in_admin( 'network' ) + } + } // End if(). if ( ( ! is_multisite() || $screen->in_admin( 'network' ) ) && current_user_can( 'edit_plugins' ) && is_writable( WP_PLUGIN_DIR . '/' . $plugin_file ) ) { /* translators: %s: plugin name */ $actions['edit'] = '' . __( 'Edit' ) . ''; } - } // end if $context + } // End if(). $actions = array_filter( $actions ); @@ -719,14 +738,14 @@ */ $actions = apply_filters( "plugin_action_links_{$plugin_file}", $actions, $plugin_file, $plugin_data, $context ); - } + }// End if(). $class = $is_active ? 'active' : 'inactive'; - $checkbox_id = "checkbox_" . md5($plugin_data['Name']); + $checkbox_id = 'checkbox_' . md5( $plugin_data['Name'] ); if ( $restrict_network_active || $restrict_network_only || in_array( $status, array( 'mustuse', 'dropins' ) ) ) { $checkbox = ''; } else { - $checkbox = "" + $checkbox = "' . ""; } if ( 'dropins' != $context ) { @@ -734,8 +753,9 @@ $plugin_name = $plugin_data['Name']; } - if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) ) + if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) ) { $class .= ' update'; + } $plugin_slug = isset( $plugin_data['slug'] ) ? $plugin_data['slug'] : sanitize_title( $plugin_name ); printf( '
months_dropdown( $this->screen->post_type );
- $this->categories_dropdown( $this->screen->post_type );
+ $this->months_dropdown( $this->screen->post_type );
+ $this->categories_dropdown( $this->screen->post_type );
- /**
+ /**
* Fires before the Filter button on the Posts and Pages list tables.
*
* The Filter button allows sorting by date and/or category on the
@@ -479,19 +488,21 @@
* 'top' or 'bottom' for WP_Posts_List_Table,
* 'bar' for WP_Media_List_Table.
*/
- do_action( 'restrict_manage_posts', $this->screen->post_type, $which );
+ do_action( 'restrict_manage_posts', $this->screen->post_type, $which );
- $output = ob_get_clean();
+ $output = ob_get_clean();
- if ( ! empty( $output ) ) {
- echo $output;
- submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
- }
- }
+ if ( ! empty( $output ) ) {
+ echo $output;
+ submit_button( __( 'Filter' ), '', 'filter_action', false, array(
+ 'id' => 'post-query-submit',
+ ) );
+ }
+}
- if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_others_posts ) && $this->has_items() ) {
- submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
- }
+if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_others_posts ) && $this->has_items() ) {
+ submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
+}
?>
true ), 'and', 'name' );
+ $taxonomies = wp_filter_object_list( $taxonomies, array(
+ 'show_admin_column' => true,
+ ), 'and', 'name' );
/**
* Filters the taxonomy columns in the Posts list table.
@@ -561,19 +575,20 @@
$taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
foreach ( $taxonomies as $taxonomy ) {
- if ( 'category' === $taxonomy )
+ if ( 'category' === $taxonomy ) {
$column_key = 'categories';
- elseif ( 'post_tag' === $taxonomy )
+ } elseif ( 'post_tag' === $taxonomy ) {
$column_key = 'tags';
- else
- $column_key = 'taxonomy-' . $taxonomy;
+ } else { $column_key = 'taxonomy-' . $taxonomy;
+ }
$posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
}
- $post_status = !empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all';
- if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) )
+ $post_status = ! empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all';
+ if ( post_type_supports( $post_type, 'comments' ) && ! in_array( $post_status, array( 'pending', 'draft', 'future' ) ) ) {
$posts_columns['comments'] = '' . __( 'Comments' ) . '';
+ }
$posts_columns['date'] = __( 'Date' );
@@ -621,7 +636,7 @@
'title' => 'title',
'parent' => 'parent',
'comments' => 'comment_count',
- 'date' => array( 'date', true )
+ 'date' => array( 'date', true ),
);
}
@@ -634,8 +649,9 @@
public function display_rows( $posts = array(), $level = 0 ) {
global $wp_query, $per_page;
- if ( empty( $posts ) )
+ if ( empty( $posts ) ) {
$posts = $wp_query->posts;
+ }
add_filter( 'the_title', 'esc_html' );
@@ -654,13 +670,15 @@
// Create array of post IDs.
$post_ids = array();
- foreach ( $posts as $a_post )
+ foreach ( $posts as $a_post ) {
$post_ids[] = $a_post->ID;
+ }
$this->comment_pending_count = get_pending_comments_num( $post_ids );
- foreach ( $posts as $post )
+ foreach ( $posts as $post ) {
$this->single_row( $post, $level );
+ }
}
/**
@@ -676,10 +694,13 @@
$level = 0;
if ( ! $pages ) {
- $pages = get_pages( array( 'sort_column' => 'menu_order' ) );
+ $pages = get_pages( array(
+ 'sort_column' => 'menu_order',
+ ) );
- if ( ! $pages )
+ if ( ! $pages ) {
return;
+ }
}
/*
@@ -699,14 +720,18 @@
// Catch and repair bad pages.
if ( $page->post_parent == $page->ID ) {
$page->post_parent = 0;
- $wpdb->update( $wpdb->posts, array( 'post_parent' => 0 ), array( 'ID' => $page->ID ) );
+ $wpdb->update( $wpdb->posts, array(
+ 'post_parent' => 0,
+ ), array(
+ 'ID' => $page->ID,
+ ) );
clean_post_cache( $page );
}
- if ( 0 == $page->post_parent )
+ if ( 0 == $page->post_parent ) {
$top_level_pages[] = $page;
- else
- $children_pages[ $page->post_parent ][] = $page;
+ } else { $children_pages[ $page->post_parent ][] = $page;
+ }
}
$pages = &$top_level_pages;
@@ -718,28 +743,31 @@
$to_display = array();
foreach ( $pages as $page ) {
- if ( $count >= $end )
+ if ( $count >= $end ) {
break;
+ }
if ( $count >= $start ) {
- $to_display[$page->ID] = $level;
+ $to_display[ $page->ID ] = $level;
}
$count++;
- if ( isset( $children_pages ) )
+ if ( isset( $children_pages ) ) {
$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+ }
}
// If it is the last pagenum and there are orphaned pages, display them with paging as well.
- if ( isset( $children_pages ) && $count < $end ){
- foreach ( $children_pages as $orphans ){
+ if ( isset( $children_pages ) && $count < $end ) {
+ foreach ( $children_pages as $orphans ) {
foreach ( $orphans as $op ) {
- if ( $count >= $end )
+ if ( $count >= $end ) {
break;
+ }
if ( $count >= $start ) {
- $to_display[$op->ID] = 0;
+ $to_display[ $op->ID ] = 0;
}
$count++;
@@ -776,15 +804,17 @@
* @param array $to_display List of pages to be displayed. Passed by reference.
*/
private function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page, &$to_display ) {
- if ( ! isset( $children_pages[$parent] ) )
+ if ( ! isset( $children_pages[ $parent ] ) ) {
return;
+ }
$start = ( $pagenum - 1 ) * $per_page;
$end = $start + $per_page;
- foreach ( $children_pages[$parent] as $page ) {
- if ( $count >= $end )
+ foreach ( $children_pages[ $parent ] as $page ) {
+ if ( $count >= $end ) {
break;
+ }
// If the page starts in a subtree, print the parents.
if ( $count == $start && $page->post_parent > 0 ) {
@@ -799,27 +829,28 @@
$my_parent = get_post( $parent_id );
$my_parents[] = $my_parent;
- if ( !$my_parent->post_parent )
+ if ( ! $my_parent->post_parent ) {
break;
+ }
$my_parent = $my_parent->post_parent;
}
$num_parents = count( $my_parents );
while ( $my_parent = array_pop( $my_parents ) ) {
- $to_display[$my_parent->ID] = $level - $num_parents;
+ $to_display[ $my_parent->ID ] = $level - $num_parents;
$num_parents--;
}
}
if ( $count >= $start ) {
- $to_display[$page->ID] = $level;
+ $to_display[ $page->ID ] = $level;
}
$count++;
$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
- }
+ }// End foreach().
- unset( $children_pages[$parent] ); //required in order to keep track of orphans
+ unset( $children_pages[ $parent ] ); //required in order to keep track of orphans
}
/**
@@ -831,7 +862,7 @@
* @param WP_Post $post The current WP_Post object.
*/
public function column_cb( $post ) {
- if ( current_user_can( 'edit_post', $post->ID ) ): ?>
+ if ( current_user_can( 'edit_post', $post->ID ) ) : ?>
@@ -843,7 +874,7 @@
/* translators: %s: post title */
__( '“%s” is locked' ),
_draft_or_post_title()
- );
+ );
?>
comment_pending_count[$post->ID] ) ? $this->comment_pending_count[$post->ID] : 0;
+ $pending_comments = isset( $this->comment_pending_count[ $post->ID ] ) ? $this->comment_pending_count[ $post->ID ] : 0;
$this->comments_bubble( $post->ID, $pending_comments );
?>
@@ -1074,7 +1105,7 @@
public function column_author( $post ) {
$args = array(
'post_type' => $post->post_type,
- 'author' => get_the_author_meta( 'ID' )
+ 'author' => get_the_author_meta( 'ID' ),
);
echo $this->get_edit_link( $args, get_the_author() );
}
@@ -1192,10 +1223,10 @@
}
if ( $post->post_parent ) {
- $count = count( get_post_ancestors( $post->ID ) );
- $classes .= ' level-'. $count;
+ $count = count( get_post_ancestors( $post->ID ) );
+ $classes .= ' level-' . $count;
} else {
- $classes .= ' level-0';
+ $classes .= ' level-0';
}
?>
@@ -1378,15 +1409,23 @@
continue;
}
- if ( $taxonomy->hierarchical )
+ if ( $taxonomy->hierarchical ) {
$hierarchical_taxonomies[] = $taxonomy;
- else
- $flat_taxonomies[] = $taxonomy;
+ } else { $flat_taxonomies[] = $taxonomy;
+ }
}
$m = ( isset( $mode ) && 'excerpt' === $mode ) ? 'excerpt' : 'list';
$can_publish = current_user_can( $post_type_object->cap->publish_posts );
- $core_columns = array( 'cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true );
+ $core_columns = array(
+ 'cb' => true,
+ 'date' => true,
+ 'title' => true,
+ 'categories' => true,
+ 'tags' => true,
+ 'comments' => true,
+ 'author' => true,
+ );
?>
@@ -1426,7 +1465,7 @@
-
+
-
+