Changeset 4525

Timestamp:

12/13/2016 08:45:19 PM (10 years ago)

Author:

coreymckrill

Message:

Mentor Dashboard: Use dotorg usernames to id mentors instead of email

• Adds the Mentor WordPress.org User Name field to wcpt.
• Introduces "protected" fields in wcpt, which will be marked as readonly unless current user has specific caps. Used to make all mentor fields in the wcpt edit screen readonly unless current user can manage the network.
• Adds a dropdown pick list of current mentors next to Mentor WordPress.org User Name that will fill in username, name, and email when a mentor is chosen. This only appears if current user has the right caps.
• Adds a field in the Mentor Dashboard for managing the list of current mentors based on their dotorg usernames.
• Uses dotorg username to determine which camps a mentor currently has, with their dotorg account email address as a backup.
• All camps that don't have a value for Mentor WordPress.org User Name or whose value doesn't match a current mentor will appear in the "Active Camps that don't have a mentor" list.
• Enqueues existing admin.js script for wcpt instead of printing it in the footer.

Location:

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt

Files:

• javascript/wcpt-wordcamp/admin.js (modified) (3 diffs)
• mentors/dashboard.php (modified) (5 diffs)
• views/mentors/dashboard.php (modified) (2 diffs)
• views/mentors/manage-mentors.php (added)
• views/mentors/mentors.php (modified) (2 diffs)
• views/mentors/unmentored-camps.php (modified) (3 diffs)
• wcpt-wordcamp/wordcamp-admin.php (modified) (11 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/javascript/wcpt-wordcamp/admin.js

@@ -10 +10 @@
          */
         self.initialize = function() {
-                var createSiteCheckbox = $( '#wcpt_create-site-in-network' );
+                var createSiteCheckbox = $( '#wcpt_create-site-in-network' ),
+                        $mentorUserName = $( '#wcpt_mentor_wordpress_org_user_name' );
 
+                // Sponsor region
                 createSiteCheckbox.change( self.toggleSponsorRegionRequired );
                 createSiteCheckbox.trigger( 'change' );
 
+                // Date fields
                 $( '.date-field' ).datepicker( {
                         dateFormat: 'yy-mm-dd',
@@ -20 +23 @@
                         changeYear:  true
                 } );
+
+                // Mentor username picker
+                if ( $mentorUserName.length && ! $mentorUserName.is( '[readonly]' ) ) {
+                        self.initializeMentorPicker( $mentorUserName );
+                }
         };
 
@@ -39 +47 @@
         };
 
+    /**
+         * Insert a Mentor picker after the Mentor username field.
+         *
+     * @param $el jQuery object for the Mentor username field.
+     */
+        self.initializeMentorPicker = function( $el ) {
+                if ( 'undefined' === typeof window.wordCampPostType.Mentors.data ) {
+                        return;
+                }
+
+                var data     = window.wordCampPostType.Mentors.data,
+                        l10n     = window.wordCampPostType.Mentors.l10n,
+                        $select  = $( '<select id="wcpt-mentor-picker"><option></option></select>' ),
+                        $wrapper = $( '<span class="description">' ),
+                        $label   = $( '<label>' ).text( l10n.selectLabel );
+
+                $.each( data, function( key, value ) {
+                        var $option = $( '<option>' );
+
+                        $option.val(key)
+                                .data({
+                                        name: value.name,
+                                        email: value.email
+                                })
+                                .text( value.name );
+
+                        if ( $option.val() === $el.val() ) {
+                                $option.prop( 'selected', 'selected' );
+                        }
+
+                        $select.append( $option );
+                });
+
+                $wrapper.append( $label )
+                        .append( $select )
+                        .insertAfter( $el );
+
+                // Bind events
+                $select.on( 'change', function() {
+                        var $option = $( this ).find( 'option:selected' );
+                        self.updateMentor( $option );
+                });
+        };
+
+    /**
+         * Update the Mentor fields with the data for the mentor chosen in the picker.
+         *
+     * @param $option jQuery object for the selected option element.
+     */
+        self.updateMentor = function( $option ) {
+                var l10n            = window.wordCampPostType.Mentors.l10n,
+                        $mentorUserName = $( '#wcpt_mentor_wordpress_org_user_name' ),
+                        $mentorName     = $( '#wcpt_mentor_name' ),
+                        $mentorEmail    = $( '#wcpt_mentor_e-mail_address' );
+
+                // Confirm before changing Mentor field contents
+                if ( $option.val() && confirm( l10n.confirm ) ) {
+            $mentorUserName.val( $option.val() );
+            $mentorName.val( $option.data('name') );
+            $mentorEmail.val( $option.data('email') );
+                }
+        };
+
+    /**
+         * Kick things off
+     */
         $( document ).ready( function( $ ) {
                 self.initialize();

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/mentors/dashboard.php

@@ -3 +3 @@
 namespace WordCamp\Mentors_Dashboard;
 defined( 'WPINC' ) or die();
+
+const USERNAMES_KEY     = 'wcpt-mentors-usernames';
+const MENTORS_CACHE_KEY = 'wcpt-mentors-data';
+
+const STATUS_UPDATED       = 'Mentor usernames updated.';
+const STATUS_INVALID_NONCE = 'Invalid nonce. Mentor usernames were not updated.';
+const STATUS_NO_USERNAME   = 'No username data was submitted.';
+const STATUS_UPDATE_FAILED = 'Mentor usernames could not be updated.';
+
+
+add_action( 'admin_init', __NAMESPACE__ . '\admin_init' );
+
+/**
+ * Initialize admin functionality
+ */
+function admin_init() {
+        if ( isset( $_GET['wcpt-status'] ) ) {
+                add_action( 'admin_notices', __NAMESPACE__ . '\status_admin_notice' );
+        }
+}
 
 add_action( 'admin_menu', __NAMESPACE__ . '\add_admin_pages' );
@@ -26 +46 @@
         $mentors          = get_mentors();
         $unmentored_camps = get_unmentored_camps();
+        $usernames        = get_usernames();
 
         require_once( dirname( __DIR__ ) . '/views/mentors/dashboard.php' );
@@ -36 +57 @@
  */
 function get_mentors() {
-        $mentors = array();
-
-        $mentored_camps = get_posts( array(
-                'post_type'      => WCPT_POST_TYPE_ID,
-                'post_status'    => \WordCamp_Loader::get_mentored_post_statuses(),
-                'posts_per_page' => 10000,
-                'meta_query'     => array(
-                        array(
-                                'key'     => 'Mentor E-mail Address',
-                                'value'   => '',
-                                'compare' => '!='
-                        ),
-                ),
-        ) );
-
-        foreach ( $mentored_camps as $camp ) {
-                $email = get_post_meta( $camp->ID, 'Mentor E-mail Address', true );
-
-                /*
-                 * Closed camps were included in the query above, in order to get all mentors, even if they're not
-                 * currently mentoring any active camps. Closed camps shouldn't be included in the list of camps being
-                 * actively mentored, though.
-                 */
-                $count_camp = 'wcpt-closed' !== $camp->post_status;
-
-                if ( array_key_exists( $email, $mentors ) ) {
-                        if ( $count_camp ) {
-                                $mentors[ $email ]['camps_mentoring'][] = $camp->post_title;
-                        }
-                } else {
-                        $mentor_name = get_post_meta( $camp->ID, 'Mentor Name', true );
-
-                        $mentors[ $email ] = array(
-                                'name'            => $mentor_name,
-                                'camps_mentoring' => $count_camp ? array( $camp->post_title ) : array(),
-                        );
-                }
-        }
-
-        return $mentors;
-}
-
-/**
- * Count the total number of camps being mentored
- *
- * @param array $mentors
- *
- * @return int
- */
-function count_camps_being_mentored( $mentors ) {
-        $camps_being_mentored = 0;
-
-        foreach ( $mentors as $mentor ) {
-                $camps_being_mentored += count( $mentor['camps_mentoring'] );
-        }
-
-        return $camps_being_mentored;
-}
-
-/**
- * Get active camps that haven't been assigned a mentor
- *
- * @return array
- */
-function get_unmentored_camps() {
-        $unmentored_camps = array();
+        $mentors = get_all_mentor_data();
+
+        if ( empty( $mentors ) ) {
+                return array();
+        }
+
+        $mentor_email = wp_list_pluck( $mentors, 'email' );
 
         $post_statuses = array_diff(
@@ -108 +70 @@
         );
 
+        $mentored_camps = get_posts( array(
+                'post_type'      => WCPT_POST_TYPE_ID,
+                'post_status'    => $post_statuses,
+                'posts_per_page' => 10000,
+                'order'          => 'ASC',
+                'orderby'        => 'name',
+                'meta_query'     => array(
+                        'relation' => 'OR',
+                        array(
+                                'key'     => 'Mentor WordPress.org User Name',
+                                'value'   => get_usernames(),
+                                'compare' => 'IN',
+                        ),
+                        array(
+                                'key'     => 'Mentor E-mail Address',
+                                'value'   => $mentor_email,
+                                'compare' => 'IN',
+                        ),
+                ),
+        ) );
+
+        $mentors = array_map( function( $value ) {
+                $value['camps_mentoring'] = array();
+                return $value;
+        }, $mentors );
+
+        foreach ( $mentored_camps as $camp ) {
+                $username = get_post_meta( $camp->ID, 'Mentor WordPress.org User Name', true );
+                $email    = get_post_meta( $camp->ID, 'Mentor E-mail Address', true );
+
+                // Camp has username
+                if ( false !== $username && isset( $mentors[ $username ] ) ) {
+                        $mentors[ $username ]['camps_mentoring'][ $camp->ID ] = $camp->post_title;
+                }
+                // Camp doesn't have username, but has email
+                else if ( false !== $email && false !== $key = array_search( $email, $mentor_email ) ) {
+                        // Add asterisk to show camp has mentor email but not username
+                        $mentors[ $key ]['camps_mentoring'][ $camp->ID ] = $camp->post_title . ' *';
+                }
+        }
+
+        return $mentors;
+}
+
+/**
+ * Count the total number of camps being mentored
+ *
+ * @param array $mentors
+ *
+ * @return int
+ */
+function count_camps_being_mentored( $mentors ) {
+        $camps_being_mentored = 0;
+
+        foreach ( $mentors as $mentor ) {
+                $camps_being_mentored += count( $mentor['camps_mentoring'] );
+        }
+
+        return $camps_being_mentored;
+}
+
+/**
+ * Get active camps that haven't been assigned a mentor
+ *
+ * @return array
+ */
+function get_unmentored_camps() {
+        $unmentored_camps = array();
+
+        $post_statuses = array_diff(
+                \WordCamp_Loader::get_mentored_post_statuses(),
+                array( 'wcpt-closed' )
+        );
+
         $posts = get_posts( array(
                 'post_type'      => WCPT_POST_TYPE_ID,
                 'post_status'    => $post_statuses,
                 'posts_per_page' => 10000,
+                'order'          => 'ASC',
+                'orderby'        => 'name',
                 'meta_query'     => array(
+                        'relation' => 'OR',
                         array(
-                                'key'     => 'Mentor E-mail Address',
-                                'value'   => '',
-                                'compare' => '='
+                                'key'     => 'Mentor WordPress.org User Name',
+                                'value'   => get_usernames(),
+                                'compare' => 'NOT IN'
+                        ),
+                        array(
+                                'key'     => 'Mentor WordPress.org User Name',
+                                'compare' => 'NOT EXISTS'
                         ),
                 ),
@@ -122 +165 @@
 
         foreach ( $posts as $post ) {
-                $unmentored_camps[ $post->ID ] = $post->post_title;
+                $email = get_post_meta( $post->ID, 'Mentor E-mail Address', true );
+                $camp_name = $post->post_title;
+
+                if ( $email ) {
+                        $camp_name .= ' *';
+                }
+
+                $unmentored_camps[ $post->ID ] = $camp_name;
         }
 
         return $unmentored_camps;
 }
+
+/**
+ * Get the stored array of mentor usernames and sanitize before returning.
+ *
+ * @return array
+ */
+function get_usernames() {
+        $raw_usernames = get_site_option( USERNAMES_KEY, array() );
+
+        return sanitize_usernames( $raw_usernames );
+}
+
+/**
+ * Sanitize a list of usernames and store in the database.
+ *
+ * @param string|array $usernames
+ *
+ * @return bool
+ */
+function set_usernames( $usernames ) {
+        $sanitized_usernames = sanitize_usernames( $usernames );
+
+        return update_site_option( USERNAMES_KEY, $sanitized_usernames );
+}
+
+/**
+ * Sanitize an array of usernames. Convert to an array first if a string is provided.
+ *
+ * @param string|array $usernames
+ *
+ * @return array
+ */
+function sanitize_usernames( $usernames ) {
+        if ( ! is_array( $usernames ) ) {
+                $usernames = explode( ',', $usernames );
+        }
+
+        $usernames = array_map( 'trim', $usernames );
+
+        $usernames = array_map( 'sanitize_user', $usernames );
+
+        // Remove empty array items
+        return array_filter( $usernames );
+}
+
+/**
+ * @todo
+ *
+ * @param array $sanitized_usernames
+ */
+function validate_usernames( array $sanitized_usernames ) {
+        // todo
+}
+
+add_action( 'admin_post_wcpt-mentors-update-usernames', __NAMESPACE__ . '\update_usernames' );
+
+/**
+ * Admin Post callback to receive a list of usernames from a form and store it in the database.
+ */
+function update_usernames() {
+        // Base redirect URL
+        $redirect_url = add_query_arg( array(
+                'post_type' => 'wordcamp',
+                'page'      => 'mentors',
+        ), admin_url( 'edit.php' ) );
+
+        // Invalid nonce
+        if ( ! isset( $_POST['wcpt-mentors-nonce'] ) ||
+                 ! wp_verify_nonce( $_POST['wcpt-mentors-nonce'], 'wcpt-mentors-update-usernames' ) ) {
+                $status_code = 'invalid-nonce';
+        }
+        // No usernames field
+        else if ( ! isset( $_POST['wcpt-mentors-usernames'] ) ) {
+                $status_code = 'no-username';
+        }
+        //
+        else {
+                $raw_usernames = $_POST['wcpt-mentors-usernames'];
+
+                $success = set_usernames( $raw_usernames );
+
+                if ( $success ) {
+                        $status_code = 'updated';
+
+                        // Bust cache
+                        delete_site_transient( MENTORS_CACHE_KEY );
+                } else {
+                        $status_code = 'update-failed';
+                }
+        }
+
+        $redirect_url = add_query_arg( 'wcpt-status', $status_code, $redirect_url );
+
+        wp_safe_redirect( esc_url_raw( $redirect_url ) );
+}
+
+/**
+ * Display the result of `update_usernames`
+ */
+function status_admin_notice() {
+        if ( ! isset( $_GET['wcpt-status'] ) ) {
+                return;
+        }
+
+        $status = 'STATUS_' . strtoupper( str_replace( '-', '_', $_GET['wcpt-status'] ) );
+
+        if ( ! defined( __NAMESPACE__ . '\\' . $status ) ) {
+                return;
+        }
+
+        $type = 'success';
+        if ( 'STATUS_UPDATED' !== $status ) {
+                $type = 'error';
+        }
+
+        $message = constant( __NAMESPACE__ . '\\' . $status );
+
+        ?>
+        <div class="notice notice-<?php echo esc_attr( $type ); ?> is-dismissible">
+                <?php echo wpautop( esc_html( $message ) ); ?>
+        </div>
+<?php
+}
+
+/**
+ * Retrieve name and email for a particular mentor username.
+ *
+ * @param string $username
+ *
+ * @return array
+ */
+function get_mentor_data( $username ) {
+        $usernames = get_usernames();
+        $data = array();
+
+        // Data for specific mentor
+        if ( in_array( $username, $usernames ) ) {
+                $user = \get_user_by( 'login', $username );
+
+                if ( $user instanceof \WP_User ) {
+                        $data[ $username ] = array(
+                                'name'  => $user->display_name,
+                                'email' => $user->user_email,
+                        );
+                }
+        }
+
+        return $data;
+}
+
+/**
+ * Retrieve data for all the mentor usernames in the list.
+ *
+ * @return array
+ */
+function get_all_mentor_data() {
+        if ( false !== $data = \get_site_transient( MENTORS_CACHE_KEY ) ) {
+                return $data;
+        }
+
+        $usernames = get_usernames();
+        $data = array();
+
+        foreach ( $usernames as $username ) {
+                $data = array_merge( $data, get_mentor_data( $username ) );
+        }
+
+        ksort( $data );
+
+        \set_site_transient( MENTORS_CACHE_KEY, $data, WEEK_IN_SECONDS );
+
+        return $data;
+}

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/views/mentors/dashboard.php

@@ -12 +12 @@
         <h1>WordCamp Mentors Dashboard</h1>
 
-        <p class="description">
-                Note: This page doesn't include people who have agreed to be a mentor, but have never been assigned to a
-                camp.
-        </p>
-
         <ul>
                 <li>Number of mentors:             <?php echo count( $mentors );                                ?></li>
@@ -25 +20 @@
         <?php require_once( __DIR__ . '/mentors.php'          ); ?>
         <?php require_once( __DIR__ . '/unmentored-camps.php' ); ?>
+        <?php require_once( __DIR__ . '/manage-mentors.php' ); ?>
 </div>

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/views/mentors/mentors.php

@@ -13 +13 @@
         <thead>
                 <th>Mentor</th>
+                <th>Username</th>
                 <th>Email Address</th>
                 <th># Currently Mentoring</th>
-                <th>Currently Mentoring</th>
+                <th>Camps</th>
         </thead>
 
         <tbody>
-                <?php foreach ( $mentors as $email_address => $mentor ) : ?>
+                <?php foreach ( $mentors as $username => $mentor ) : ?>
                         <tr>
                                 <td><?php echo esc_html( $mentor['name'] );         ?></td>
-                                <td><?php echo esc_html( $email_address );          ?></td>
+                                <td><?php echo esc_html( $username );               ?></td>
+                                <td><?php echo esc_html( $mentor['email'] );        ?></td>
                                 <td><?php echo count( $mentor['camps_mentoring'] ); ?></td>
                                 <td>
                                         <ul>
-                                                <?php foreach ( $mentor['camps_mentoring'] as $camp ) : ?>
-                                                        <li><?php echo esc_html( $camp ); ?></li>
+                                                <?php foreach ( $mentor['camps_mentoring'] as $camp_id => $camp_name ) : ?>
+                                                        <li>
+                                                                <a href="<?php echo esc_url( admin_url( "post.php?post=$camp_id&action=edit#wcpt_mentor_wordpress_org_user_name" ) ); ?>">
+                                                                        <?php echo esc_html( $camp_name ); ?>
+                                                                </a>
+                                                        </li>
                                                 <?php endforeach; ?>
                                         </ul>
@@ -35 +41 @@
         </tbody>
 </table>
+
+<p class="description">(*) Camp has a Mentor email address but not a WordPress.org username.</p>

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/views/mentors/unmentored-camps.php

@@ -10 +10 @@
 <h2>Active Camps without a Mentor</h2>
 
+<p class="description">Note: This is based on the <strong>Mentor WordPress.org User Name</strong> field. Some of these camps may have Mentor name and/or email data, but have not yet been updated with the WordPress.org username.</p>
+
 <?php if ( $unmentored_camps ) : ?>
 
@@ -15 +17 @@
                 <?php foreach ( $unmentored_camps as $id => $name ) : ?>
                         <li>
-                                <a href="<?php echo esc_url( admin_url( "post.php?post=$id&action=edit" ) ); ?>">
+                                <a href="<?php echo esc_url( admin_url( "post.php?post=$id&action=edit#wcpt_mentor_wordpress_org_user_name" ) ); ?>">
                                         <?php echo esc_html( $name ); ?>
                                 </a>
@@ -22 +24 @@
         </ul>
 
+        <p class="description">(*) Camp has a Mentor email address but no WordPress.org username.</p>
+
 <?php else : ?>
 

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php

@@ -1 +1 @@
 <?php
+
+use WordCamp\Mentors_Dashboard;
 
 if ( ! class_exists( 'WordCamp_Admin' ) ) :
@@ -37 +39 @@
                 // Scripts and CSS
                 add_action( 'admin_enqueue_scripts',                          array( $this, 'admin_scripts' ) );
-                add_action( 'admin_print_scripts',                            array( $this, 'admin_print_scripts' ), 99 );
                 add_action( 'admin_print_styles',                             array( $this, 'admin_styles' ) );
 
@@ -179 +180 @@
                         $post_value   = wcpt_key_to_str( $key, 'wcpt_' );
                         $values[ $key ] = isset( $_POST[ $post_value ] ) ? esc_attr( $_POST[ $post_value ] ) : '';
+
+                        // Don't update protected fields
+                        if ( self::is_protected_field( $key ) ) {
+                                continue;
+                        }
 
                         switch ( $value ) {
@@ -381 +387 @@
                                         'Safety Wrangler Name'                           => 'text',
                                         'Safety Wrangler E-mail Address'                 => 'text',
+                                        'Mentor WordPress.org User Name'                 => 'text',
                                         'Mentor Name'                                    => 'text',
                                         'Mentor E-mail Address'                          => 'text',
@@ -461 +468 @@
                                         'Safety Wrangler Name'                           => 'text',
                                         'Safety Wrangler E-mail Address'                 => 'text',
+                                        'Mentor WordPress.org User Name'                 => 'text',
                                         'Mentor Name'                                    => 'text',
                                         'Mentor E-mail Address'                          => 'text',
@@ -484 +492 @@
          */
         function admin_scripts() {
-                if ( get_post_type() == WCPT_POST_TYPE_ID )
-                        wp_enqueue_script( 'jquery-ui-datepicker' );
-        }
-
-        /**
-         * Print our scripts for the Edit WordCamp screen
-         *
-         * If this file grows larger, it'd make sense to switch to using wp_enqueue_script().
-         */
-        function admin_print_scripts() {
-                if ( WCPT_POST_TYPE_ID !== get_post_type() ) {
-                        return;
-                }
-
-                ?>
-
-                <script>
-                        <?php require_once( dirname( __DIR__ ) . '/javascript/wcpt-wordcamp/admin.js' ); ?>
-                </script>
-
-                <?php
+                wp_register_script(
+                        'wcpt-admin',
+                        WCPT_URL . 'javascript/wcpt-wordcamp/admin.js',
+                        array( 'jquery', 'jquery-ui-datepicker' ),
+                        WCPT_VERSION,
+                        true
+                );
+
+                // Edit WordCamp screen
+                if ( WCPT_POST_TYPE_ID === get_post_type() ) {
+                        wp_enqueue_script( 'wcpt-admin' );
+
+                        // Default data
+            $data = array(
+                    'Mentors' => array(
+                    'l10n' => array(
+                        'selectLabel' => esc_html__( 'Available mentors', 'wordcamporg' ),
+                        'confirm'     => esc_html__( 'Update Mentor field contents?', 'wordcamporg' ),
+                    ),
+                    )
+            );
+
+            // Only include mentor data if the Mentor username field is editable
+            if ( current_user_can( 'manage_network' ) ) {
+                $data['Mentors']['data'] = Mentors_Dashboard\get_all_mentor_data();
+            }
+
+                        wp_localize_script(
+                                'wcpt-admin',
+                                'wordCampPostType',
+                                $data
+                        );
+                }
         }
 
@@ -905 +925 @@
 
         /**
+         * Check if a field should be readonly, based on the current user's caps.
+         *
+         * @param string $field_name The field to check.
+         *
+         * @return bool
+         */
+        public static function is_protected_field( $field_name ) {
+                $protected_fields = array();
+
+                if ( ! current_user_can( 'manage_network' ) ) {
+                        $protected_fields += array(
+                                'Mentor WordPress.org User Name',
+                                'Mentor Name',
+                                'Mentor E-mail Address',
+                        );
+                }
+
+                return in_array( $field_name, $protected_fields );
+        }
+
+        /**
          * Add our custom admin notice keys to the redirect URL.
          *
@@ -1083 +1124 @@
         foreach ( $meta_keys as $key => $value ) :
                 $object_name = wcpt_key_to_str( $key, 'wcpt_' );
+                $readonly = ( WordCamp_Admin::is_protected_field( $key ) ) ? ' readonly="readonly"' : '';
         ?>
 
@@ -1090 +1132 @@
                                 <p>
                                         <strong><?php echo $key; ?></strong>:
-                                        <input type="checkbox" name="<?php echo $object_name; ?>" id="<?php echo $object_name; ?>" <?php checked( get_post_meta( $post_id, $key, true ) ); ?> />
+                                        <input type="checkbox" name="<?php echo $object_name; ?>" id="<?php echo $object_name; ?>" <?php checked( get_post_meta( $post_id, $key, true ) ); ?><?php echo $readonly; ?> />
                                 </p>
 
@@ -1108 +1150 @@
                                                 case 'text' : ?>
 
-                                                        <input type="text" size="36" name="<?php echo $object_name; ?>" id="<?php echo $object_name; ?>" value="<?php echo esc_attr( get_post_meta( $post_id, $key, true ) ); ?>" />
+                                                        <input type="text" size="36" name="<?php echo $object_name; ?>" id="<?php echo $object_name; ?>" value="<?php echo esc_attr( get_post_meta( $post_id, $key, true ) ); ?>"<?php echo $readonly; ?> />
 
                                                 <?php break;
@@ -1120 +1162 @@
                                                         ?>
 
-                                                        <input type="text" size="36" class="date-field" name="<?php echo $object_name; ?>" id="<?php echo $object_name; ?>" value="<?php echo $date; ?>" />
+                                                        <input type="text" size="36" class="date-field" name="<?php echo $object_name; ?>" id="<?php echo $object_name; ?>" value="<?php echo $date; ?>"<?php echo $readonly; ?> />
 
                                                 <?php break;
                                                 case 'textarea' : ?>
 
-                                                        <textarea rows="4" cols="23" name="<?php echo $object_name; ?>" id="<?php echo $object_name; ?>"><?php echo esc_attr( get_post_meta( $post_id, $key, true ) ); ?></textarea>
+                                                        <textarea rows="4" cols="23" name="<?php echo $object_name; ?>" id="<?php echo $object_name; ?>"<?php echo $readonly; ?>><?php echo esc_attr( get_post_meta( $post_id, $key, true ) ); ?></textarea>
 
                                                 <?php break;