iqltechnologies / brighty

brighty/wp-admin/theme-editor.php

Braces +8 added lines, -3 removed lines

@@ -277,10 +277,13 @@ 
 <?php
 if ( $error ) :
 	echo '<div class="error"><p>' . __( 'File does not exist! Please double check the name and try again.' ) . '</p></div>';
-else :
+else {
+    :
 	?>
 	<form name="template" id="template" action="theme-editor.php" method="post">
-		<?php wp_nonce_field( 'edit-theme_' . $stylesheet . '_' . $relative_file, 'nonce' ); ?>
+		<?php wp_nonce_field( 'edit-theme_' . $stylesheet . '_' . $relative_file, 'nonce' );
+}
+?>
 		<div>
 			<label for="newcontent" id="theme-plugin-editor-label"><?php _e( 'Selected file content:' ); ?></label>
 			<textarea cols="70" rows="30" name="newcontent" id="newcontent" aria-describedby="editor-keyboard-trap-help-1 editor-keyboard-trap-help-2 editor-keyboard-trap-help-3 editor-keyboard-trap-help-4"><?php echo $content; ?></textarea>
@@ -315,7 +318,8 @@ 
 					<?php submit_button( __( 'Update File' ), 'primary', 'submit', false ); ?>
 					<span class="spinner"></span>
 				</p>
-			<?php else : ?>
+			<?php else {
+    : ?>
 				<p>
 					<?php
 					printf(
@@ -323,6 +327,7 @@ 
 						__( 'You need to make this file writable before you can save your changes. See <a href="%s">Changing File Permissions</a> for more information.' ),
 						__( 'https://wordpress.org/support/article/changing-file-permissions/' )
 					);
+}
 					?>
 				</p>
 			<?php endif; ?>

brighty/wp-admin/post.php

Switch Indentation +263 added lines, -263 removed lines

@@ -70,108 +70,108 @@ 
 }
 
 switch ( $action ) {
-	case 'post-quickdraft-save':
-		// Check nonce and capabilities.
-		$nonce     = $_REQUEST['_wpnonce'];
-		$error_msg = false;
-
-		// For output of the Quick Draft dashboard widget.
-		require_once ABSPATH . 'wp-admin/includes/dashboard.php';
-
-		if ( ! wp_verify_nonce( $nonce, 'add-post' ) ) {
-			$error_msg = __( 'Unable to submit this form, please refresh and try again.' );
-		}
-
-		if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
-			exit;
-		}
-
-		if ( $error_msg ) {
-			return wp_dashboard_quick_press( $error_msg );
-		}
-
-		$post = get_post( $_REQUEST['post_ID'] );
-		check_admin_referer( 'add-' . $post->post_type );
-
-		$_POST['comment_status'] = get_default_comment_status( $post->post_type );
-		$_POST['ping_status']    = get_default_comment_status( $post->post_type, 'pingback' );
-
-		// Wrap Quick Draft content in the Paragraph block.
-		if ( false === strpos( $_POST['content'], '<!-- wp:paragraph -->' ) ) {
-			$_POST['content'] = sprintf(
-				'<!-- wp:paragraph -->%s<!-- /wp:paragraph -->',
-				str_replace( array( "\r\n", "\r", "\n" ), '<br />', $_POST['content'] )
-			);
-		}
-
-		edit_post();
-		wp_dashboard_quick_press();
-		exit;
-
-	case 'postajaxpost':
-	case 'post':
-		check_admin_referer( 'add-' . $post_type );
-		$post_id = 'postajaxpost' === $action ? edit_post() : write_post();
-		redirect_post( $post_id );
-		exit;
-
-	case 'edit':
-		$editing = true;
-
-		if ( empty( $post_id ) ) {
-			wp_redirect( admin_url( 'post.php' ) );
-			exit;
-		}
-
-		if ( ! $post ) {
-			wp_die( __( 'You attempted to edit an item that does not exist. Perhaps it was deleted?' ) );
-		}
-
-		if ( ! $post_type_object ) {
-			wp_die( __( 'Invalid post type.' ) );
-		}
-
-		if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ), true ) ) {
-			wp_die( __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
-		}
-
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
-			wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
-		}
-
-		if ( 'trash' === $post->post_status ) {
-			wp_die( __( 'You cannot edit this item because it is in the Trash. Please restore it and try again.' ) );
-		}
-
-		if ( ! empty( $_GET['get-post-lock'] ) ) {
-			check_admin_referer( 'lock-post_' . $post_id );
-			wp_set_post_lock( $post_id );
-			wp_redirect( get_edit_post_link( $post_id, 'url' ) );
-			exit;
-		}
-
-		$post_type = $post->post_type;
-		if ( 'post' === $post_type ) {
-			$parent_file   = 'edit.php';
-			$submenu_file  = 'edit.php';
-			$post_new_file = 'post-new.php';
-		} elseif ( 'attachment' === $post_type ) {
-			$parent_file   = 'upload.php';
-			$submenu_file  = 'upload.php';
-			$post_new_file = 'media-new.php';
-		} else {
-			if ( isset( $post_type_object ) && $post_type_object->show_in_menu && true !== $post_type_object->show_in_menu ) {
-				$parent_file = $post_type_object->show_in_menu;
-			} else {
-				$parent_file = "edit.php?post_type=$post_type";
-			}
-			$submenu_file  = "edit.php?post_type=$post_type";
-			$post_new_file = "post-new.php?post_type=$post_type";
-		}
-
-		$title = $post_type_object->labels->edit_item;
-
-		/**
+	    case 'post-quickdraft-save':
+		    // Check nonce and capabilities.
+		    $nonce     = $_REQUEST['_wpnonce'];
+		    $error_msg = false;
+
+		    // For output of the Quick Draft dashboard widget.
+		    require_once ABSPATH . 'wp-admin/includes/dashboard.php';
+
+		    if ( ! wp_verify_nonce( $nonce, 'add-post' ) ) {
+			    $error_msg = __( 'Unable to submit this form, please refresh and try again.' );
+		    }
+
+		    if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
+			    exit;
+		    }
+
+		    if ( $error_msg ) {
+			    return wp_dashboard_quick_press( $error_msg );
+		    }
+
+		    $post = get_post( $_REQUEST['post_ID'] );
+		    check_admin_referer( 'add-' . $post->post_type );
+
+		    $_POST['comment_status'] = get_default_comment_status( $post->post_type );
+		    $_POST['ping_status']    = get_default_comment_status( $post->post_type, 'pingback' );
+
+		    // Wrap Quick Draft content in the Paragraph block.
+		    if ( false === strpos( $_POST['content'], '<!-- wp:paragraph -->' ) ) {
+			    $_POST['content'] = sprintf(
+				    '<!-- wp:paragraph -->%s<!-- /wp:paragraph -->',
+				    str_replace( array( "\r\n", "\r", "\n" ), '<br />', $_POST['content'] )
+			    );
+		    }
+
+		    edit_post();
+		    wp_dashboard_quick_press();
+		    exit;
+
+	    case 'postajaxpost':
+	    case 'post':
+		    check_admin_referer( 'add-' . $post_type );
+		    $post_id = 'postajaxpost' === $action ? edit_post() : write_post();
+		    redirect_post( $post_id );
+		    exit;
+
+	    case 'edit':
+		    $editing = true;
+
+		    if ( empty( $post_id ) ) {
+			    wp_redirect( admin_url( 'post.php' ) );
+			    exit;
+		    }
+
+		    if ( ! $post ) {
+			    wp_die( __( 'You attempted to edit an item that does not exist. Perhaps it was deleted?' ) );
+		    }
+
+		    if ( ! $post_type_object ) {
+			    wp_die( __( 'Invalid post type.' ) );
+		    }
+
+		    if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ), true ) ) {
+			    wp_die( __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
+		    }
+
+		    if ( ! current_user_can( 'edit_post', $post_id ) ) {
+			    wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
+		    }
+
+		    if ( 'trash' === $post->post_status ) {
+			    wp_die( __( 'You cannot edit this item because it is in the Trash. Please restore it and try again.' ) );
+		    }
+
+		    if ( ! empty( $_GET['get-post-lock'] ) ) {
+			    check_admin_referer( 'lock-post_' . $post_id );
+			    wp_set_post_lock( $post_id );
+			    wp_redirect( get_edit_post_link( $post_id, 'url' ) );
+			    exit;
+		    }
+
+		    $post_type = $post->post_type;
+		    if ( 'post' === $post_type ) {
+			    $parent_file   = 'edit.php';
+			    $submenu_file  = 'edit.php';
+			    $post_new_file = 'post-new.php';
+		    } elseif ( 'attachment' === $post_type ) {
+			    $parent_file   = 'upload.php';
+			    $submenu_file  = 'upload.php';
+			    $post_new_file = 'media-new.php';
+		    } else {
+			    if ( isset( $post_type_object ) && $post_type_object->show_in_menu && true !== $post_type_object->show_in_menu ) {
+				    $parent_file = $post_type_object->show_in_menu;
+			    } else {
+				    $parent_file = "edit.php?post_type=$post_type";
+			    }
+			    $submenu_file  = "edit.php?post_type=$post_type";
+			    $post_new_file = "post-new.php?post_type=$post_type";
+		    }
+
+		    $title = $post_type_object->labels->edit_item;
+
+		    /**
 		 * Allows replacement of the editor.
 		 *
 		 * @since 4.9.0
@@ -179,179 +179,179 @@ 
 		 * @param bool    $replace Whether to replace the editor. Default false.
 		 * @param WP_Post $post    Post object.
 		 */
-		if ( true === apply_filters( 'replace_editor', false, $post ) ) {
-			break;
-		}
-
-		if ( use_block_editor_for_post( $post ) ) {
-			require ABSPATH . 'wp-admin/edit-form-blocks.php';
-			break;
-		}
-
-		if ( ! wp_check_post_lock( $post->ID ) ) {
-			$active_post_lock = wp_set_post_lock( $post->ID );
-
-			if ( 'attachment' !== $post_type ) {
-				wp_enqueue_script( 'autosave' );
-			}
-		}
-
-		$post = get_post( $post_id, OBJECT, 'edit' );
-
-		if ( post_type_supports( $post_type, 'comments' ) ) {
-			wp_enqueue_script( 'admin-comments' );
-			enqueue_comment_hotkeys_js();
-		}
-
-		require ABSPATH . 'wp-admin/edit-form-advanced.php';
+		    if ( true === apply_filters( 'replace_editor', false, $post ) ) {
+			    break;
+		    }
 
-		break;
+		    if ( use_block_editor_for_post( $post ) ) {
+			    require ABSPATH . 'wp-admin/edit-form-blocks.php';
+			    break;
+		    }
 
-	case 'editattachment':
-		check_admin_referer( 'update-post_' . $post_id );
+		    if ( ! wp_check_post_lock( $post->ID ) ) {
+			    $active_post_lock = wp_set_post_lock( $post->ID );
 
-		// Don't let these be changed.
-		unset( $_POST['guid'] );
-		$_POST['post_type'] = 'attachment';
+			    if ( 'attachment' !== $post_type ) {
+				    wp_enqueue_script( 'autosave' );
+			    }
+		    }
 
-		// Update the thumbnail filename.
-		$newmeta          = wp_get_attachment_metadata( $post_id, true );
-		$newmeta['thumb'] = wp_basename( $_POST['thumb'] );
+		    $post = get_post( $post_id, OBJECT, 'edit' );
 
-		wp_update_attachment_metadata( $post_id, $newmeta );
+		    if ( post_type_supports( $post_type, 'comments' ) ) {
+			    wp_enqueue_script( 'admin-comments' );
+			    enqueue_comment_hotkeys_js();
+		    }
+
+		    require ABSPATH . 'wp-admin/edit-form-advanced.php';
 
-		// Intentional fall-through to trigger the edit_post() call.
-	case 'editpost':
-		check_admin_referer( 'update-post_' . $post_id );
+		    break;
+
+	    case 'editattachment':
+		    check_admin_referer( 'update-post_' . $post_id );
 
-		$post_id = edit_post();
+		    // Don't let these be changed.
+		    unset( $_POST['guid'] );
+		    $_POST['post_type'] = 'attachment';
 
-		// Session cookie flag that the post was saved.
-		if ( isset( $_COOKIE['wp-saving-post'] ) && $_COOKIE['wp-saving-post'] === $post_id . '-check' ) {
-			setcookie( 'wp-saving-post', $post_id . '-saved', time() + DAY_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, is_ssl() );
-		}
-
-		redirect_post( $post_id ); // Send user on their way while we keep working.
+		    // Update the thumbnail filename.
+		    $newmeta          = wp_get_attachment_metadata( $post_id, true );
+		    $newmeta['thumb'] = wp_basename( $_POST['thumb'] );
 
-		exit;
+		    wp_update_attachment_metadata( $post_id, $newmeta );
+
+		    // Intentional fall-through to trigger the edit_post() call.
+	    case 'editpost':
+		    check_admin_referer( 'update-post_' . $post_id );
+
+		    $post_id = edit_post();
+
+		    // Session cookie flag that the post was saved.
+		    if ( isset( $_COOKIE['wp-saving-post'] ) && $_COOKIE['wp-saving-post'] === $post_id . '-check' ) {
+			    setcookie( 'wp-saving-post', $post_id . '-saved', time() + DAY_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, is_ssl() );
+		    }
+
+		    redirect_post( $post_id ); // Send user on their way while we keep working.
+
+		    exit;
+
+	    case 'trash':
+		    check_admin_referer( 'trash-post_' . $post_id );
 
-	case 'trash':
-		check_admin_referer( 'trash-post_' . $post_id );
+		    if ( ! $post ) {
+			    wp_die( __( 'The item you are trying to move to the Trash no longer exists.' ) );
+		    }
 
-		if ( ! $post ) {
-			wp_die( __( 'The item you are trying to move to the Trash no longer exists.' ) );
-		}
-
-		if ( ! $post_type_object ) {
-			wp_die( __( 'Invalid post type.' ) );
-		}
+		    if ( ! $post_type_object ) {
+			    wp_die( __( 'Invalid post type.' ) );
+		    }
+
+		    if ( ! current_user_can( 'delete_post', $post_id ) ) {
+			    wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
+		    }
 
-		if ( ! current_user_can( 'delete_post', $post_id ) ) {
-			wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
-		}
-
-		$user_id = wp_check_post_lock( $post_id );
-		if ( $user_id ) {
-			$user = get_userdata( $user_id );
-			/* translators: %s: User's display name. */
-			wp_die( sprintf( __( 'You cannot move this item to the Trash. %s is currently editing.' ), $user->display_name ) );
-		}
-
-		if ( ! wp_trash_post( $post_id ) ) {
-			wp_die( __( 'Error in moving the item to Trash.' ) );
-		}
-
-		wp_redirect(
-			add_query_arg(
-				array(
-					'trashed' => 1,
-					'ids'     => $post_id,
-				),
-				$sendback
-			)
-		);
-		exit;
-
-	case 'untrash':
-		check_admin_referer( 'untrash-post_' . $post_id );
-
-		if ( ! $post ) {
-			wp_die( __( 'The item you are trying to restore from the Trash no longer exists.' ) );
-		}
-
-		if ( ! $post_type_object ) {
-			wp_die( __( 'Invalid post type.' ) );
-		}
+		    $user_id = wp_check_post_lock( $post_id );
+		    if ( $user_id ) {
+			    $user = get_userdata( $user_id );
+			    /* translators: %s: User's display name. */
+			    wp_die( sprintf( __( 'You cannot move this item to the Trash. %s is currently editing.' ), $user->display_name ) );
+		    }
+
+		    if ( ! wp_trash_post( $post_id ) ) {
+			    wp_die( __( 'Error in moving the item to Trash.' ) );
+		    }
+
+		    wp_redirect(
+			    add_query_arg(
+				    array(
+					    'trashed' => 1,
+					    'ids'     => $post_id,
+				    ),
+				    $sendback
+			    )
+		    );
+		    exit;
+
+	    case 'untrash':
+		    check_admin_referer( 'untrash-post_' . $post_id );
+
+		    if ( ! $post ) {
+			    wp_die( __( 'The item you are trying to restore from the Trash no longer exists.' ) );
+		    }
+
+		    if ( ! $post_type_object ) {
+			    wp_die( __( 'Invalid post type.' ) );
+		    }
 
-		if ( ! current_user_can( 'delete_post', $post_id ) ) {
-			wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
-		}
-
-		if ( ! wp_untrash_post( $post_id ) ) {
-			wp_die( __( 'Error in restoring the item from Trash.' ) );
-		}
-
-		$sendback = add_query_arg(
-			array(
-				'untrashed' => 1,
-				'ids'       => $post_id,
-			),
-			$sendback
-		);
-		wp_redirect( $sendback );
-		exit;
-
-	case 'delete':
-		check_admin_referer( 'delete-post_' . $post_id );
-
-		if ( ! $post ) {
-			wp_die( __( 'This item has already been deleted.' ) );
-		}
-
-		if ( ! $post_type_object ) {
-			wp_die( __( 'Invalid post type.' ) );
-		}
-
-		if ( ! current_user_can( 'delete_post', $post_id ) ) {
-			wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
-		}
-
-		if ( 'attachment' === $post->post_type ) {
-			$force = ( ! MEDIA_TRASH );
-			if ( ! wp_delete_attachment( $post_id, $force ) ) {
-				wp_die( __( 'Error in deleting the attachment.' ) );
-			}
-		} else {
-			if ( ! wp_delete_post( $post_id, true ) ) {
-				wp_die( __( 'Error in deleting the item.' ) );
-			}
-		}
-
-		wp_redirect( add_query_arg( 'deleted', 1, $sendback ) );
-		exit;
-
-	case 'preview':
-		check_admin_referer( 'update-post_' . $post_id );
-
-		$url = post_preview();
-
-		wp_redirect( $url );
-		exit;
-
-	case 'toggle-custom-fields':
-		check_admin_referer( 'toggle-custom-fields', 'toggle-custom-fields-nonce' );
-
-		$current_user_id = get_current_user_id();
-		if ( $current_user_id ) {
-			$enable_custom_fields = (bool) get_user_meta( $current_user_id, 'enable_custom_fields', true );
-			update_user_meta( $current_user_id, 'enable_custom_fields', ! $enable_custom_fields );
-		}
+		    if ( ! current_user_can( 'delete_post', $post_id ) ) {
+			    wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
+		    }
 
-		wp_safe_redirect( wp_get_referer() );
-		exit;
+		    if ( ! wp_untrash_post( $post_id ) ) {
+			    wp_die( __( 'Error in restoring the item from Trash.' ) );
+		    }
 
-	default:
-		/**
+		    $sendback = add_query_arg(
+			    array(
+				    'untrashed' => 1,
+				    'ids'       => $post_id,
+			    ),
+			    $sendback
+		    );
+		    wp_redirect( $sendback );
+		    exit;
+
+	    case 'delete':
+		    check_admin_referer( 'delete-post_' . $post_id );
+
+		    if ( ! $post ) {
+			    wp_die( __( 'This item has already been deleted.' ) );
+		    }
+
+		    if ( ! $post_type_object ) {
+			    wp_die( __( 'Invalid post type.' ) );
+		    }
+
+		    if ( ! current_user_can( 'delete_post', $post_id ) ) {
+			    wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
+		    }
+
+		    if ( 'attachment' === $post->post_type ) {
+			    $force = ( ! MEDIA_TRASH );
+			    if ( ! wp_delete_attachment( $post_id, $force ) ) {
+				    wp_die( __( 'Error in deleting the attachment.' ) );
+			    }
+		    } else {
+			    if ( ! wp_delete_post( $post_id, true ) ) {
+				    wp_die( __( 'Error in deleting the item.' ) );
+			    }
+		    }
+
+		    wp_redirect( add_query_arg( 'deleted', 1, $sendback ) );
+		    exit;
+
+	    case 'preview':
+		    check_admin_referer( 'update-post_' . $post_id );
+
+		    $url = post_preview();
+
+		    wp_redirect( $url );
+		    exit;
+
+	    case 'toggle-custom-fields':
+		    check_admin_referer( 'toggle-custom-fields', 'toggle-custom-fields-nonce' );
+
+		    $current_user_id = get_current_user_id();
+		    if ( $current_user_id ) {
+			    $enable_custom_fields = (bool) get_user_meta( $current_user_id, 'enable_custom_fields', true );
+			    update_user_meta( $current_user_id, 'enable_custom_fields', ! $enable_custom_fields );
+		    }
+
+		    wp_safe_redirect( wp_get_referer() );
+		    exit;
+
+	    default:
+		    /**
 		 * Fires for a given custom post action request.
 		 *
 		 * The dynamic portion of the hook name, `$action`, refers to the custom post action.
@@ -360,10 +360,10 @@ 
 		 *
 		 * @param int $post_id Post ID sent with the request.
 		 */
-		do_action( "post_action_{$action}", $post_id );
+		    do_action( "post_action_{$action}", $post_id );
 
-		wp_redirect( admin_url( 'edit.php' ) );
-		exit;
+		    wp_redirect( admin_url( 'edit.php' ) );
+		    exit;
 } // End switch.
 
 require_once ABSPATH . 'wp-admin/admin-footer.php';

brighty/wp-admin/options-media.php

Braces +5 added lines, -2 removed lines

@@ -139,10 +139,13 @@
 </tr>
 <tr>
 <td colspan="2" class="td-full">
-<?php else : ?>
+<?php else {
+    : ?>
 <tr>
 <td class="td-full">
-<?php endif; ?>
+<?php endif;
+}
+?>
 <label for="uploads_use_yearmonth_folders">
 <input name="uploads_use_yearmonth_folders" type="checkbox" id="uploads_use_yearmonth_folders" value="1"<?php checked( '1', get_option( 'uploads_use_yearmonth_folders' ) ); ?> />
 	<?php _e( 'Organize my uploads into month- and year-based folders' ); ?>

brighty/wp-admin/options-permalink.php

Braces +6 added lines, -2 removed lines

@@ -390,7 +390,8 @@ 
 				);
 				?>
 </p>
-		<?php else : ?>
+		<?php else {
+    : ?>
 <p id="iis-description-b">
 			<?php
 			printf(
@@ -401,6 +402,7 @@ 
 				'<kbd>Ctrl + A</kbd>',
 				'<kbd>⌘ + A</kbd>'
 			);
+}
 			?>
 </p>
 <form action="options-permalink.php" method="post">
@@ -419,7 +421,8 @@ 
 		<?php endif; ?>
 	<?php endif; ?>
 		<?php
-else :
+else {
+    :
 	if ( $permalink_structure && ! $using_index_permalinks && ! $writable && $htaccess_update_required ) :
 		?>
 <p id="htaccess-description">
@@ -432,6 +435,7 @@ 
 			'<kbd>Ctrl + A</kbd>',
 			'<kbd>⌘ + A</kbd>'
 		);
+}
 		?>
 </p>
 <form action="options-permalink.php" method="post">

brighty/wp-admin/customize.php

Braces +5 added lines, -2 removed lines

@@ -195,8 +195,11 @@
 					<?php submit_button( $save_text, 'primary save', 'save', false ); ?>
 					<button id="publish-settings" class="publish-settings button-primary button dashicons dashicons-admin-generic" aria-label="<?php esc_attr_e( 'Publish Settings' ); ?>" aria-expanded="false" disabled></button>
 				</div>
-			<?php else : ?>
-				<?php $save_text = _x( 'Cannot Activate', 'theme' ); ?>
+			<?php else {
+    : ?>
+				<?php $save_text = _x( 'Cannot Activate', 'theme' );
+}
+?>
 				<div id="customize-save-button-wrapper" class="customize-save-button-wrapper disabled" >
 					<button class="button button-primary disabled" aria-label="<?php esc_attr_e( 'Publish Settings' ); ?>" aria-expanded="false" disabled><?php echo $save_text; ?></button>
 				</div>

brighty/wp-admin/my-sites.php

Braces +3 added lines, -1 removed lines

@@ -77,7 +77,8 @@ 
 	echo '<p>';
 	_e( 'You must be a member of at least one site to use this page.' );
 	echo '</p>';
-else :
+else {
+    :
 	?>
 
 <hr class="wp-header-end">
@@ -85,6 +86,7 @@ 
 <form id="myblogs" method="post">
 	<?php
 	choose_primary_blog();
+}
 	/**
 	 * Fires before the sites list on the My Sites screen.
 	 *

brighty/wp-admin/users.php

Braces +30 added lines, -12 removed lines

@@ -326,8 +326,11 @@ 
 
 		<?php if ( 1 === count( $all_userids ) ) : ?>
 	<p><?php _e( 'You have specified this user for deletion:' ); ?></p>
-		<?php else : ?>
-	<p><?php _e( 'You have specified these users for deletion:' ); ?></p>
+		<?php else {
+    : ?>
+	<p><?php _e( 'You have specified these users for deletion:' );
+}
+?></p>
 		<?php endif; ?>
 
 <ul>
@@ -352,11 +355,17 @@ 
 			if ( ! $users_have_content ) :
 				?>
 			<input type="hidden" name="delete_option" value="delete" />
-			<?php else : ?>
+			<?php else {
+    : ?>
 				<?php if ( 1 == $go_delete ) : ?>
-			<fieldset><p><legend><?php _e( 'What should be done with content owned by this user?' ); ?></legend></p>
-		<?php else : ?>
-			<fieldset><p><legend><?php _e( 'What should be done with content owned by these users?' ); ?></legend></p>
+			<fieldset><p><legend><?php _e( 'What should be done with content owned by this user?' );
+}
+?></legend></p>
+		<?php else {
+    : ?>
+			<fieldset><p><legend><?php _e( 'What should be done with content owned by these users?' );
+}
+?></legend></p>
 		<?php endif; ?>
 		<ul style="list-style:none;">
 			<li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" />
@@ -389,8 +398,11 @@ 
 			?>
 	<input type="hidden" name="action" value="dodelete" />
 			<?php submit_button( __( 'Confirm Deletion' ), 'primary' ); ?>
-	<?php else : ?>
-	<p><?php _e( 'There are no valid users selected for deletion.' ); ?></p>
+	<?php else {
+    : ?>
+	<p><?php _e( 'There are no valid users selected for deletion.' );
+}
+?></p>
 	<?php endif; ?>
 	</div>
 	</form>
@@ -463,8 +475,11 @@ 
 
 		<?php if ( 1 === count( $userids ) ) : ?>
 	<p><?php _e( 'You have specified this user for removal:' ); ?></p>
-		<?php else : ?>
-	<p><?php _e( 'You have specified these users for removal:' ); ?></p>
+		<?php else {
+    : ?>
+	<p><?php _e( 'You have specified these users for removal:' );
+}
+?></p>
 		<?php endif; ?>
 
 <ul>
@@ -487,8 +502,11 @@ 
 		<?php if ( $go_remove ) : ?>
 		<input type="hidden" name="action" value="doremove" />
 			<?php submit_button( __( 'Confirm Removal' ), 'primary' ); ?>
-	<?php else : ?>
-	<p><?php _e( 'There are no valid users selected for removal.' ); ?></p>
+	<?php else {
+    : ?>
+	<p><?php _e( 'There are no valid users selected for removal.' );
+}
+?></p>
 	<?php endif; ?>
 	</div>
 	</form>

brighty/wp-admin/includes/class-ftp.php

Braces +434 added lines, -168 removed lines

@@ -20,7 +20,9 @@ 
  * @since 2.5.0
  * @var string
  */
-if(!defined('CRLF')) define('CRLF',"\r\n");
+if(!defined('CRLF')) {
+    define('CRLF',"\r\n");
+}
 
 /**
  * Sets whatever to autodetect ASCII mode.
@@ -30,7 +32,9 @@ 
  * @since 2.5.0
  * @var int
  */
-if(!defined("FTP_AUTOASCII")) define("FTP_AUTOASCII", -1);
+if(!defined("FTP_AUTOASCII")) {
+    define("FTP_AUTOASCII", -1);
+}
 
 /**
  *
@@ -38,7 +42,9 @@ 
  * @since 2.5.0
  * @var int
  */
-if(!defined("FTP_BINARY")) define("FTP_BINARY", 1);
+if(!defined("FTP_BINARY")) {
+    define("FTP_BINARY", 1);
+}
 
 /**
  *
@@ -46,7 +52,9 @@ 
  * @since 2.5.0
  * @var int
  */
-if(!defined("FTP_ASCII")) define("FTP_ASCII", 0);
+if(!defined("FTP_ASCII")) {
+    define("FTP_ASCII", 0);
+}
 
 /**
  * Whether to force FTP.
@@ -56,7 +64,9 @@ 
  * @since 2.5.0
  * @var bool
  */
-if(!defined('FTP_FORCE')) define('FTP_FORCE', true);
+if(!defined('FTP_FORCE')) {
+    define('FTP_FORCE', true);
+}
 
 /**
  * @since 2.5.0
@@ -149,8 +159,11 @@ 
 	    $this->OS_local=FTP_OS_Unix;
 		$this->OS_remote=FTP_OS_Unix;
 		$this->features=array();
-		if(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') $this->OS_local=FTP_OS_Windows;
-		elseif(strtoupper(substr(PHP_OS, 0, 3)) === 'MAC') $this->OS_local=FTP_OS_Mac;
+		if(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+		    $this->OS_local=FTP_OS_Windows;
+		} elseif(strtoupper(substr(PHP_OS, 0, 3)) === 'MAC') {
+		    $this->OS_local=FTP_OS_Mac;
+		}
 	}
 
 	function ftp_base($port_mode=FALSE) {
@@ -167,10 +180,11 @@ 
 			$b = array();
 			if ($lucifer[3]<70) { $lucifer[3]+=2000; } else { $lucifer[3]+=1900; } // 4digit year fix
 			$b['isdir'] = ($lucifer[7]=="<DIR>");
-			if ( $b['isdir'] )
-				$b['type'] = 'd';
-			else
-				$b['type'] = 'f';
+			if ( $b['isdir'] ) {
+							$b['type'] = 'd';
+			} else {
+							$b['type'] = 'f';
+			}
 			$b['size'] = $lucifer[7];
 			$b['month'] = $lucifer[1];
 			$b['day'] = $lucifer[2];
@@ -183,16 +197,19 @@ 
 		} else if (!$is_windows && $lucifer=preg_split("/[ ]/",$line,9,PREG_SPLIT_NO_EMPTY)) {
 			//echo $line."\n";
 			$lcount=count($lucifer);
-			if ($lcount<8) return '';
+			if ($lcount<8) {
+			    return '';
+			}
 			$b = array();
 			$b['isdir'] = $lucifer[0][0] === "d";
 			$b['islink'] = $lucifer[0][0] === "l";
-			if ( $b['isdir'] )
-				$b['type'] = 'd';
-			elseif ( $b['islink'] )
-				$b['type'] = 'l';
-			else
-				$b['type'] = 'f';
+			if ( $b['isdir'] ) {
+							$b['type'] = 'd';
+			} elseif ( $b['islink'] ) {
+							$b['type'] = 'l';
+			} else {
+							$b['type'] = 'f';
+			}
 			$b['perms'] = $lucifer[0];
 			$b['number'] = $lucifer[1];
 			$b['owner'] = $lucifer[2];
@@ -245,20 +262,29 @@ 
 		if($this->_ready) {
 			if($mode==FTP_BINARY) {
 				if($this->_curtype!=FTP_BINARY) {
-					if(!$this->_exec("TYPE I", "SetType")) return FALSE;
+					if(!$this->_exec("TYPE I", "SetType")) {
+					    return FALSE;
+					}
 					$this->_curtype=FTP_BINARY;
 				}
 			} elseif($this->_curtype!=FTP_ASCII) {
-				if(!$this->_exec("TYPE A", "SetType")) return FALSE;
+				if(!$this->_exec("TYPE A", "SetType")) {
+				    return FALSE;
+				}
 				$this->_curtype=FTP_ASCII;
 			}
-		} else return FALSE;
+		} else {
+		    return FALSE;
+		}
 		return TRUE;
 	}
 
 	function Passive($pasv=NULL) {
-		if(is_null($pasv)) $this->_passive=!$this->_passive;
-		else $this->_passive=$pasv;
+		if(is_null($pasv)) {
+		    $this->_passive=!$this->_passive;
+		} else {
+		    $this->_passive=$pasv;
+		}
 		if(!$this->_port_available and !$this->_passive) {
 			$this->SendMSG("Only passive connections available!");
 			$this->_passive=TRUE;
@@ -276,8 +302,12 @@ 
 		} else {
 			$ip=@gethostbyname($host);
 	        $dns=@gethostbyaddr($host);
-	        if(!$ip) $ip=$host;
-	        if(!$dns) $dns=$host;
+	        if(!$ip) {
+	            $ip=$host;
+	        }
+	        if(!$dns) {
+	            $dns=$host;
+	        }
 	        // Validate the IPAddress PHP4 returns -1 for invalid, PHP5 false
 	        // -1 === "255.255.255.255" which is the broadcast address which is also going to be invalid
 	        $ipaslong = ip2long($ip);
@@ -294,8 +324,12 @@ 
 		if($reconnect){
 			if($this->_connected) {
 				$this->SendMSG("Reconnecting");
-				if(!$this->quit(FTP_FORCE)) return FALSE;
-				if(!$this->connect()) return FALSE;
+				if(!$this->quit(FTP_FORCE)) {
+				    return FALSE;
+				}
+				if(!$this->connect()) {
+				    return FALSE;
+				}
 			}
 		}
 		return TRUE;
@@ -311,16 +345,21 @@ 
 	function SetTimeout($timeout=30) {
 		$this->_timeout=$timeout;
 		$this->SendMSG("Timeout ".$this->_timeout);
-		if($this->_connected)
-			if(!$this->_settimeout($this->_ftp_control_sock)) return FALSE;
+		if($this->_connected) {
+					if(!$this->_settimeout($this->_ftp_control_sock)) return FALSE;
+		}
 		return TRUE;
 	}
 
 	function connect($server=NULL) {
 		if(!empty($server)) {
-			if(!$this->SetServer($server)) return false;
+			if(!$this->SetServer($server)) {
+			    return false;
+			}
+		}
+		if($this->_ready) {
+		    return true;
 		}
-		if($this->_ready) return true;
 	    $this->SendMsg('Local OS : '.$this->OS_FullName[$this->OS_local]);
 		if(!($this->_ftp_control_sock = $this->_connect($this->_host, $this->_port))) {
 			$this->SendMSG("Error : Cannot connect to remote host \"".$this->_fullhost." :".$this->_port."\"");
@@ -328,29 +367,46 @@ 
 		}
 		$this->SendMSG("Connected to remote host \"".$this->_fullhost.":".$this->_port."\". Waiting for greeting.");
 		do {
-			if(!$this->_readmsg()) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
+			if(!$this->_readmsg()) {
+			    return FALSE;
+			}
+			if(!$this->_checkCode()) {
+			    return FALSE;
+			}
 			$this->_lastaction=time();
 		} while($this->_code<200);
 		$this->_ready=true;
 		$syst=$this->systype();
-		if(!$syst) $this->SendMSG("Cannot detect remote OS");
-		else {
-			if(preg_match("/win|dos|novell/i", $syst[0])) $this->OS_remote=FTP_OS_Windows;
-			elseif(preg_match("/os/i", $syst[0])) $this->OS_remote=FTP_OS_Mac;
-			elseif(preg_match("/(li|u)nix/i", $syst[0])) $this->OS_remote=FTP_OS_Unix;
-			else $this->OS_remote=FTP_OS_Mac;
+		if(!$syst) {
+		    $this->SendMSG("Cannot detect remote OS");
+		} else {
+			if(preg_match("/win|dos|novell/i", $syst[0])) {
+			    $this->OS_remote=FTP_OS_Windows;
+			} elseif(preg_match("/os/i", $syst[0])) {
+			    $this->OS_remote=FTP_OS_Mac;
+			} elseif(preg_match("/(li|u)nix/i", $syst[0])) {
+			    $this->OS_remote=FTP_OS_Unix;
+			} else {
+			    $this->OS_remote=FTP_OS_Mac;
+			}
 			$this->SendMSG("Remote OS: ".$this->OS_FullName[$this->OS_remote]);
 		}
-		if(!$this->features()) $this->SendMSG("Cannot get features list. All supported - disabled");
-		else $this->SendMSG("Supported features: ".implode(", ", array_keys($this->_features)));
+		if(!$this->features()) {
+		    $this->SendMSG("Cannot get features list. All supported - disabled");
+		} else {
+		    $this->SendMSG("Supported features: ".implode(", ", array_keys($this->_features)));
+		}
 		return TRUE;
 	}
 
 	function quit($force=false) {
 		if($this->_ready) {
-			if(!$this->_exec("QUIT") and !$force) return FALSE;
-			if(!$this->_checkCode() and !$force) return FALSE;
+			if(!$this->_exec("QUIT") and !$force) {
+			    return FALSE;
+			}
+			if(!$this->_checkCode() and !$force) {
+			    return FALSE;
+			}
 			$this->_ready=false;
 			$this->SendMSG("Session finished");
 		}
@@ -359,61 +415,108 @@ 
 	}
 
 	function login($user=NULL, $pass=NULL) {
-		if(!is_null($user)) $this->_login=$user;
-		else $this->_login="anonymous";
-		if(!is_null($pass)) $this->_password=$pass;
-		else $this->_password="anon@anon.com";
-		if(!$this->_exec("USER ".$this->_login, "login")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!is_null($user)) {
+		    $this->_login=$user;
+		} else {
+		    $this->_login="anonymous";
+		}
+		if(!is_null($pass)) {
+		    $this->_password=$pass;
+		} else {
+		    $this->_password="anon@anon.com";
+		}
+		if(!$this->_exec("USER ".$this->_login, "login")) {
+		    return FALSE;
+		}
+		if(!$this->_checkCode()) {
+		    return FALSE;
+		}
 		if($this->_code!=230) {
-			if(!$this->_exec((($this->_code==331)?"PASS ":"ACCT ").$this->_password, "login")) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
+			if(!$this->_exec((($this->_code==331)?"PASS ":"ACCT ").$this->_password, "login")) {
+			    return FALSE;
+			}
+			if(!$this->_checkCode()) {
+			    return FALSE;
+			}
 		}
 		$this->SendMSG("Authentication succeeded");
 		if(empty($this->_features)) {
-			if(!$this->features()) $this->SendMSG("Cannot get features list. All supported - disabled");
-			else $this->SendMSG("Supported features: ".implode(", ", array_keys($this->_features)));
+			if(!$this->features()) {
+			    $this->SendMSG("Cannot get features list. All supported - disabled");
+			} else {
+			    $this->SendMSG("Supported features: ".implode(", ", array_keys($this->_features)));
+			}
 		}
 		return TRUE;
 	}
 
 	function pwd() {
-		if(!$this->_exec("PWD", "pwd")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("PWD", "pwd")) {
+		    return FALSE;
+		}
+		if(!$this->_checkCode()) {
+		    return FALSE;
+		}
 		return preg_replace("/^[0-9]{3} \"(.+)\".*$/s", "\\1", $this->_message);
 	}
 
 	function cdup() {
-		if(!$this->_exec("CDUP", "cdup")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("CDUP", "cdup")) {
+		    return FALSE;
+		}
+		if(!$this->_checkCode()) {
+		    return FALSE;
+		}
 		return true;
 	}
 
 	function chdir($pathname) {
-		if(!$this->_exec("CWD ".$pathname, "chdir")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("CWD ".$pathname, "chdir")) {
+		    return FALSE;
+		}
+		if(!$this->_checkCode()) {
+		    return FALSE;
+		}
 		return TRUE;
 	}
 
 	function rmdir($pathname) {
-		if(!$this->_exec("RMD ".$pathname, "rmdir")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("RMD ".$pathname, "rmdir")) {
+		    return FALSE;
+		}
+		if(!$this->_checkCode()) {
+		    return FALSE;
+		}
 		return TRUE;
 	}
 
 	function mkdir($pathname) {
-		if(!$this->_exec("MKD ".$pathname, "mkdir")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("MKD ".$pathname, "mkdir")) {
+		    return FALSE;
+		}
+		if(!$this->_checkCode()) {
+		    return FALSE;
+		}
 		return TRUE;
 	}
 
 	function rename($from, $to) {
-		if(!$this->_exec("RNFR ".$from, "rename")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("RNFR ".$from, "rename")) {
+		    return FALSE;
+		}
+		if(!$this->_checkCode()) {
+		    return FALSE;
+		}
 		if($this->_code==350) {
-			if(!$this->_exec("RNTO ".$to, "rename")) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
-		} else return FALSE;
+			if(!$this->_exec("RNTO ".$to, "rename")) {
+			    return FALSE;
+			}
+			if(!$this->_checkCode()) {
+			    return FALSE;
+			}
+		} else {
+		    return FALSE;
+		}
 		return TRUE;
 	}
 
@@ -422,17 +525,29 @@ 
 			$this->PushError("filesize", "not supported by server");
 			return FALSE;
 		}
-		if(!$this->_exec("SIZE ".$pathname, "filesize")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("SIZE ".$pathname, "filesize")) {
+		    return FALSE;
+		}
+		if(!$this->_checkCode()) {
+		    return FALSE;
+		}
 		return preg_replace("/^[0-9]{3} ([0-9]+).*$/s", "\\1", $this->_message);
 	}
 
 	function abort() {
-		if(!$this->_exec("ABOR", "abort")) return FALSE;
+		if(!$this->_exec("ABOR", "abort")) {
+		    return FALSE;
+		}
 		if(!$this->_checkCode()) {
-			if($this->_code!=426) return FALSE;
-			if(!$this->_readmsg("abort")) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
+			if($this->_code!=426) {
+			    return FALSE;
+			}
+			if(!$this->_readmsg("abort")) {
+			    return FALSE;
+			}
+			if(!$this->_checkCode()) {
+			    return FALSE;
+			}
 		}
 		return true;
 	}
@@ -442,8 +557,12 @@ 
 			$this->PushError("mdtm", "not supported by server");
 			return FALSE;
 		}
-		if(!$this->_exec("MDTM ".$pathname, "mdtm")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("MDTM ".$pathname, "mdtm")) {
+		    return FALSE;
+		}
+		if(!$this->_checkCode()) {
+		    return FALSE;
+		}
 		$mdtm = preg_replace("/^[0-9]{3} ([0-9]+).*$/s", "\\1", $this->_message);
 		$date = sscanf($mdtm, "%4d%2d%2d%2d%2d%2d");
 		$timestamp = mktime($date[3], $date[4], $date[5], $date[1], $date[2], $date[0]);
@@ -451,26 +570,40 @@ 
 	}
 
 	function systype() {
-		if(!$this->_exec("SYST", "systype")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("SYST", "systype")) {
+		    return FALSE;
+		}
+		if(!$this->_checkCode()) {
+		    return FALSE;
+		}
 		$DATA = explode(" ", $this->_message);
 		return array($DATA[1], $DATA[3]);
 	}
 
 	function delete($pathname) {
-		if(!$this->_exec("DELE ".$pathname, "delete")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("DELE ".$pathname, "delete")) {
+		    return FALSE;
+		}
+		if(!$this->_checkCode()) {
+		    return FALSE;
+		}
 		return TRUE;
 	}
 
 	function site($command, $fnction="site") {
-		if(!$this->_exec("SITE ".$command, $fnction)) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("SITE ".$command, $fnction)) {
+		    return FALSE;
+		}
+		if(!$this->_checkCode()) {
+		    return FALSE;
+		}
 		return TRUE;
 	}
 
 	function chmod($pathname, $mode) {
-		if(!$this->site( sprintf('CHMOD %o %s', $mode, $pathname), "chmod")) return FALSE;
+		if(!$this->site( sprintf('CHMOD %o %s', $mode, $pathname), "chmod")) {
+		    return FALSE;
+		}
 		return TRUE;
 	}
 
@@ -483,14 +616,22 @@ 
 			$this->PushError("restore", "cannot restore in ASCII mode");
 			return FALSE;
 		}
-		if(!$this->_exec("REST ".$from, "resore")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("REST ".$from, "resore")) {
+		    return FALSE;
+		}
+		if(!$this->_checkCode()) {
+		    return FALSE;
+		}
 		return TRUE;
 	}
 
 	function features() {
-		if(!$this->_exec("FEAT", "features")) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_exec("FEAT", "features")) {
+		    return FALSE;
+		}
+		if(!$this->_checkCode()) {
+		    return FALSE;
+		}
 		$f=preg_split("/[".CRLF."]+/", preg_replace("/[0-9]{3}[ -].*[".CRLF."]+/", "", $this->_message), -1, PREG_SPLIT_NO_EMPTY);
 		$this->_features=array();
 		foreach($f as $k=>$v) {
@@ -514,25 +655,38 @@ 
 
 	function file_exists($pathname) {
 		$exists=true;
-		if(!$this->_exec("RNFR ".$pathname, "rename")) $exists=FALSE;
-		else {
-			if(!$this->_checkCode()) $exists=FALSE;
+		if(!$this->_exec("RNFR ".$pathname, "rename")) {
+		    $exists=FALSE;
+		} else {
+			if(!$this->_checkCode()) {
+			    $exists=FALSE;
+			}
 			$this->abort();
 		}
-		if($exists) $this->SendMSG("Remote file ".$pathname." exists");
-		else $this->SendMSG("Remote file ".$pathname." does not exist");
+		if($exists) {
+		    $this->SendMSG("Remote file ".$pathname." exists");
+		} else {
+		    $this->SendMSG("Remote file ".$pathname." does not exist");
+		}
 		return $exists;
 	}
 
 	function fget($fp, $remotefile, $rest=0) {
-		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
+		if($this->_can_restore and $rest!=0) {
+		    fseek($fp, $rest);
+		}
 		$pi=pathinfo($remotefile);
-		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
-		else $mode=FTP_BINARY;
+		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) {
+		    $mode=FTP_ASCII;
+		} else {
+		    $mode=FTP_BINARY;
+		}
 		if(!$this->_data_prepare($mode)) {
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) $this->restore($rest);
+		if($this->_can_restore and $rest!=0) {
+		    $this->restore($rest);
+		}
 		if(!$this->_exec("RETR ".$remotefile, "get")) {
 			$this->_data_close();
 			return FALSE;
@@ -543,28 +697,43 @@ 
 		}
 		$out=$this->_data_read($mode, $fp);
 		$this->_data_close();
-		if(!$this->_readmsg()) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_readmsg()) {
+		    return FALSE;
+		}
+		if(!$this->_checkCode()) {
+		    return FALSE;
+		}
 		return $out;
 	}
 
 	function get($remotefile, $localfile=NULL, $rest=0) {
-		if(is_null($localfile)) $localfile=$remotefile;
-		if (@file_exists($localfile)) $this->SendMSG("Warning : local file will be overwritten");
+		if(is_null($localfile)) {
+		    $localfile=$remotefile;
+		}
+		if (@file_exists($localfile)) {
+		    $this->SendMSG("Warning : local file will be overwritten");
+		}
 		$fp = @fopen($localfile, "w");
 		if (!$fp) {
 			$this->PushError("get","cannot open local file", "Cannot create \"".$localfile."\"");
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
+		if($this->_can_restore and $rest!=0) {
+		    fseek($fp, $rest);
+		}
 		$pi=pathinfo($remotefile);
-		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
-		else $mode=FTP_BINARY;
+		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) {
+		    $mode=FTP_ASCII;
+		} else {
+		    $mode=FTP_BINARY;
+		}
 		if(!$this->_data_prepare($mode)) {
 			fclose($fp);
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) $this->restore($rest);
+		if($this->_can_restore and $rest!=0) {
+		    $this->restore($rest);
+		}
 		if(!$this->_exec("RETR ".$remotefile, "get")) {
 			$this->_data_close();
 			fclose($fp);
@@ -578,20 +747,31 @@ 
 		$out=$this->_data_read($mode, $fp);
 		fclose($fp);
 		$this->_data_close();
-		if(!$this->_readmsg()) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_readmsg()) {
+		    return FALSE;
+		}
+		if(!$this->_checkCode()) {
+		    return FALSE;
+		}
 		return $out;
 	}
 
 	function fput($remotefile, $fp, $rest=0) {
-		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
+		if($this->_can_restore and $rest!=0) {
+		    fseek($fp, $rest);
+		}
 		$pi=pathinfo($remotefile);
-		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
-		else $mode=FTP_BINARY;
+		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) {
+		    $mode=FTP_ASCII;
+		} else {
+		    $mode=FTP_BINARY;
+		}
 		if(!$this->_data_prepare($mode)) {
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) $this->restore($rest);
+		if($this->_can_restore and $rest!=0) {
+		    $this->restore($rest);
+		}
 		if(!$this->_exec("STOR ".$remotefile, "put")) {
 			$this->_data_close();
 			return FALSE;
@@ -602,13 +782,19 @@ 
 		}
 		$ret=$this->_data_write($mode, $fp);
 		$this->_data_close();
-		if(!$this->_readmsg()) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_readmsg()) {
+		    return FALSE;
+		}
+		if(!$this->_checkCode()) {
+		    return FALSE;
+		}
 		return $ret;
 	}
 
 	function put($localfile, $remotefile=NULL, $rest=0) {
-		if(is_null($remotefile)) $remotefile=$localfile;
+		if(is_null($remotefile)) {
+		    $remotefile=$localfile;
+		}
 		if (!file_exists($localfile)) {
 			$this->PushError("put","cannot open local file", "No such file or directory \"".$localfile."\"");
 			return FALSE;
@@ -619,15 +805,22 @@ 
 			$this->PushError("put","cannot open local file", "Cannot read file \"".$localfile."\"");
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) fseek($fp, $rest);
+		if($this->_can_restore and $rest!=0) {
+		    fseek($fp, $rest);
+		}
 		$pi=pathinfo($localfile);
-		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) $mode=FTP_ASCII;
-		else $mode=FTP_BINARY;
+		if($this->_type==FTP_ASCII or ($this->_type==FTP_AUTOASCII and in_array(strtoupper($pi["extension"]), $this->AutoAsciiExt))) {
+		    $mode=FTP_ASCII;
+		} else {
+		    $mode=FTP_BINARY;
+		}
 		if(!$this->_data_prepare($mode)) {
 			fclose($fp);
 			return FALSE;
 		}
-		if($this->_can_restore and $rest!=0) $this->restore($rest);
+		if($this->_can_restore and $rest!=0) {
+		    $this->restore($rest);
+		}
 		if(!$this->_exec("STOR ".$remotefile, "put")) {
 			$this->_data_close();
 			fclose($fp);
@@ -641,8 +834,12 @@ 
 		$ret=$this->_data_write($mode, $fp);
 		fclose($fp);
 		$this->_data_close();
-		if(!$this->_readmsg()) return FALSE;
-		if(!$this->_checkCode()) return FALSE;
+		if(!$this->_readmsg()) {
+		    return FALSE;
+		}
+		if(!$this->_checkCode()) {
+		    return FALSE;
+		}
 		return $ret;
 	}
 
@@ -652,27 +849,41 @@ 
 			$this->PushError("mput","cannot open local folder", "Cannot stat folder \"".$local."\"");
 			return FALSE;
 		}
-		if(!is_dir($local)) return $this->put($local, $remote);
-		if(empty($remote)) $remote=".";
-		elseif(!$this->file_exists($remote) and !$this->mkdir($remote)) return FALSE;
+		if(!is_dir($local)) {
+		    return $this->put($local, $remote);
+		}
+		if(empty($remote)) {
+		    $remote=".";
+		} elseif(!$this->file_exists($remote) and !$this->mkdir($remote)) {
+		    return FALSE;
+		}
 		if($handle = opendir($local)) {
 			$list=array();
 			while (false !== ($file = readdir($handle))) {
-				if ($file != "." && $file != "..") $list[]=$file;
+				if ($file != "." && $file != "..") {
+				    $list[]=$file;
+				}
 			}
 			closedir($handle);
 		} else {
 			$this->PushError("mput","cannot open local folder", "Cannot read folder \"".$local."\"");
 			return FALSE;
 		}
-		if(empty($list)) return TRUE;
+		if(empty($list)) {
+		    return TRUE;
+		}
 		$ret=true;
 		foreach($list as $el) {
-			if(is_dir($local."/".$el)) $t=$this->mput($local."/".$el, $remote."/".$el);
-			else $t=$this->put($local."/".$el, $remote."/".$el);
+			if(is_dir($local."/".$el)) {
+			    $t=$this->mput($local."/".$el, $remote."/".$el);
+			} else {
+			    $t=$this->put($local."/".$el, $remote."/".$el);
+			}
 			if(!$t) {
 				$ret=FALSE;
-				if(!$continious) break;
+				if(!$continious) {
+				    break;
+				}
 			}
 		}
 		return $ret;
@@ -685,7 +896,9 @@ 
 			$this->PushError("mget","cannot read remote folder list", "Cannot read remote folder \"".$remote."\" contents");
 			return FALSE;
 		}
-		if(empty($list)) return true;
+		if(empty($list)) {
+		    return true;
+		}
 		if(!@file_exists($local)) {
 			if(!@mkdir($local)) {
 				$this->PushError("mget","cannot create local folder", "Cannot create folder \"".$local."\"");
@@ -694,7 +907,9 @@ 
 		}
 		foreach($list as $k=>$v) {
 			$list[$k]=$this->parselisting($v);
-			if( ! $list[$k] or $list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]);
+			if( ! $list[$k] or $list[$k]["name"]=="." or $list[$k]["name"]=="..") {
+			    unset($list[$k]);
+			}
 		}
 		$ret=true;
 		foreach($list as $el) {
@@ -702,18 +917,24 @@ 
 				if(!$this->mget($remote."/".$el["name"], $local."/".$el["name"], $continious)) {
 					$this->PushError("mget", "cannot copy folder", "Cannot copy remote folder \"".$remote."/".$el["name"]."\" to local \"".$local."/".$el["name"]."\"");
 					$ret=false;
-					if(!$continious) break;
+					if(!$continious) {
+					    break;
+					}
 				}
 			} else {
 				if(!$this->get($remote."/".$el["name"], $local."/".$el["name"])) {
 					$this->PushError("mget", "cannot copy file", "Cannot copy remote file \"".$remote."/".$el["name"]."\" to local \"".$local."/".$el["name"]."\"");
 					$ret=false;
-					if(!$continious) break;
+					if(!$continious) {
+					    break;
+					}
 				}
 			}
 			@chmod($local."/".$el["name"], $el["perms"]);
 			$t=strtotime($el["date"]);
-			if($t!==-1 and $t!==false) @touch($local."/".$el["name"], $t);
+			if($t!==-1 and $t!==false) {
+			    @touch($local."/".$el["name"], $t);
+			}
 		}
 		return $ret;
 	}
@@ -727,24 +948,31 @@ 
 
 		foreach($list as $k=>$v) {
 			$list[$k]=$this->parselisting($v);
-			if( ! $list[$k] or $list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]);
+			if( ! $list[$k] or $list[$k]["name"]=="." or $list[$k]["name"]=="..") {
+			    unset($list[$k]);
+			}
 		}
 		$ret=true;
 
 		foreach($list as $el) {
-			if ( empty($el) )
-				continue;
+			if ( empty($el) ) {
+							continue;
+			}
 
 			if($el["type"]=="d") {
 				if(!$this->mdel($remote."/".$el["name"], $continious)) {
 					$ret=false;
-					if(!$continious) break;
+					if(!$continious) {
+					    break;
+					}
 				}
 			} else {
 				if (!$this->delete($remote."/".$el["name"])) {
 					$this->PushError("mdel", "cannot delete file", "Cannot delete remote file \"".$remote."/".$el["name"]."\"");
 					$ret=false;
-					if(!$continious) break;
+					if(!$continious) {
+					    break;
+					}
 				}
 			}
 		}
@@ -757,9 +985,15 @@ 
 	}
 
 	function mmkdir($dir, $mode = 0777) {
-		if(empty($dir)) return FALSE;
-		if($this->is_exists($dir) or $dir == "/" ) return TRUE;
-		if(!$this->mmkdir(dirname($dir), $mode)) return false;
+		if(empty($dir)) {
+		    return FALSE;
+		}
+		if($this->is_exists($dir) or $dir == "/" ) {
+		    return TRUE;
+		}
+		if(!$this->mmkdir(dirname($dir), $mode)) {
+		    return false;
+		}
 		$r=$this->mkdir($dir, $mode);
 		$this->chmod($dir,$mode);
 		return $r;
@@ -767,28 +1001,39 @@ 
 
 	function glob($pattern, $handle=NULL) {
 		$path=$output=null;
-		if(PHP_OS=='WIN32') $slash='\\';
-		else $slash='/';
+		if(PHP_OS=='WIN32') {
+		    $slash='\\';
+		} else {
+		    $slash='/';
+		}
 		$lastpos=strrpos($pattern,$slash);
 		if(!($lastpos===false)) {
 			$path=substr($pattern,0,-$lastpos-1);
 			$pattern=substr($pattern,$lastpos);
-		} else $path=getcwd();
+		} else {
+		    $path=getcwd();
+		}
 		if(is_array($handle) and !empty($handle)) {
 			foreach($handle as $dir) {
-				if($this->glob_pattern_match($pattern,$dir))
-				$output[]=$dir;
+				if($this->glob_pattern_match($pattern,$dir)) {
+								$output[]=$dir;
+				}
 			}
 		} else {
 			$handle=@opendir($path);
-			if($handle===false) return false;
+			if($handle===false) {
+			    return false;
+			}
 			while($dir=readdir($handle)) {
-				if($this->glob_pattern_match($pattern,$dir))
-				$output[]=$dir;
+				if($this->glob_pattern_match($pattern,$dir)) {
+								$output[]=$dir;
+				}
 			}
 			closedir($handle);
 		}
-		if(is_array($output)) return $output;
+		if(is_array($output)) {
+		    return $output;
+		}
 		return false;
 	}
 
@@ -797,21 +1042,25 @@ 
 		$chunks=explode(';',$pattern);
 		foreach($chunks as $pattern) {
 			$escape=array('$','^','.','{','}','(',')','[',']','|');
-			while(strpos($pattern,'**')!==false)
-				$pattern=str_replace('**','*',$pattern);
-			foreach($escape as $probe)
-				$pattern=str_replace($probe,"\\$probe",$pattern);
+			while(strpos($pattern,'**')!==false) {
+							$pattern=str_replace('**','*',$pattern);
+			}
+			foreach($escape as $probe) {
+							$pattern=str_replace($probe,"\\$probe",$pattern);
+			}
 			$pattern=str_replace('?*','*',
 				str_replace('*?','*',
 					str_replace('*',".*",
 						str_replace('?','.{1,1}',$pattern))));
 			$out[]=$pattern;
 		}
-		if(count($out)==1) return($this->glob_regexp("^$out[0]$",$subject));
-		else {
-			foreach($out as $tester)
-				// TODO: This should probably be glob_regexp(), but needs tests.
+		if(count($out)==1) {
+		    return($this->glob_regexp("^$out[0]$",$subject));
+		} else {
+			foreach($out as $tester) {
+							// TODO: This should probably be glob_regexp(), but needs tests.
 				if($this->my_regexp("^$tester$",$subject)) return true;
+			}
 		}
 		return false;
 	}
@@ -834,11 +1083,13 @@ 
 		$dirlist = array();
 		foreach($list as $k=>$v) {
 			$entry=$this->parselisting($v);
-			if ( empty($entry) )
-				continue;
+			if ( empty($entry) ) {
+							continue;
+			}
 
-			if($entry["name"]=="." or $entry["name"]=="..")
-				continue;
+			if($entry["name"]=="." or $entry["name"]=="..") {
+							continue;
+			}
 
 			$dirlist[$entry['name']] = $entry;
 		}
@@ -853,7 +1104,9 @@ 
 	}
 
 	function _list($arg="", $cmd="LIST", $fnction="_list") {
-		if(!$this->_data_prepare()) return false;
+		if(!$this->_data_prepare()) {
+		    return false;
+		}
 		if(!$this->_exec($cmd.$arg, $fnction)) {
 			$this->_data_close();
 			return FALSE;
@@ -866,9 +1119,15 @@ 
 		if($this->_code<200) {
 			$out=$this->_data_read();
 			$this->_data_close();
-			if(!$this->_readmsg()) return FALSE;
-			if(!$this->_checkCode()) return FALSE;
-			if($out === FALSE ) return FALSE;
+			if(!$this->_readmsg()) {
+			    return FALSE;
+			}
+			if(!$this->_checkCode()) {
+			    return FALSE;
+			}
+			if($out === FALSE ) {
+			    return FALSE;
+			}
 			$out=preg_split("/[".CRLF."]+/", $out, -1, PREG_SPLIT_NO_EMPTY);
 //			$this->SendMSG(implode($this->_eol_code[$this->OS_local], $out));
 		}
@@ -885,15 +1144,22 @@ 
 		$error['fctname']=$fctname;
 		$error['msg']=$msg;
 		$error['desc']=$desc;
-		if($desc) $tmp=' ('.$desc.')'; else $tmp='';
+		if($desc) {
+		    $tmp=' ('.$desc.')';
+		} else {
+		    $tmp='';
+		}
 		$this->SendMSG($fctname.': '.$msg.$tmp);
 		return(array_push($this->_error_array,$error));
 	}
 
 // Rcupre une erreur externe
 	function PopError(){
-		if(count($this->_error_array)) return(array_pop($this->_error_array));
-			else return(false);
+		if(count($this->_error_array)) {
+		    return(array_pop($this->_error_array));
+		} else {
+			    return(false);
+			}
 	}
 }
 

brighty/wp-admin/includes/media.php

Braces +3 added lines, -1 removed lines

@@ -3186,7 +3186,8 @@ 
 		</div>
 		<?php
 
-	else :
+	else {
+	    :
 
 		/**
 		 * Fires when an attachment type can't be rendered in the edit form.
@@ -3196,6 +3197,7 @@ 
 		 * @param WP_Post $post A post object.
 		 */
 		do_action( 'wp_edit_form_attachment_display', $post );
+	}
 
 	endif;