Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1 0 4 #97

Merged
merged 16 commits into from
Oct 17, 2023
Merged

1 0 4 #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1b3871f
Design issue fixed #16
iamakram22 Jul 26, 2023
917a0a6
Added copied key button #36
iamakram22 Jul 28, 2023
dcb87c8
added copy button on keys #36
iamakram22 Jul 28, 2023
bd12a29
COpy button text change on copy #36
iamakram22 Aug 1, 2023
b5446ca
Repeated ajax requests sending while selecting color fixed #12
iamakram22 Aug 3, 2023
0cf7202
Plugin description updated #10
iamakram22 Aug 3, 2023
ac8c810
showing the save message while saving App Branding #15
iamakram22 Aug 3, 2023
c6c8811
enable app name field in the addon #78
iamakram22 Aug 8, 2023
89de10a
Application name removed from access and added in General #78
iamakram22 Aug 11, 2023
a6f7702
Merge pull request #96 from wpeventmanager/akram
ritakikani Sep 1, 2023
322b996
Unalbe to change title name #78
ritakikani Sep 1, 2023
879dd8c
Need to remove message from the App branding page #93
ritakikani Sep 1, 2023
065f4eb
Code improvement #88
ritakikani Sep 6, 2023
a9a4796
Version 1.0.4 improvements #95
ritakikani Sep 15, 2023
183fad6
#95
krinaydhanani Oct 17, 2023
c86945a
#95
krinaydhanani Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop

This file was deleted.

206 changes: 79 additions & 127 deletions admin/templates/html-app-branding.php
View file
Open in desktop

Large diffs are not rendered by default.

288 changes: 134 additions & 154 deletions admin/templates/html-keys-edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,188 +1,146 @@
<?php
/**
* Admin view: Edit API keys
*
*/

defined( 'ABSPATH' ) || exit;
?>
defined( 'ABSPATH' ) || exit; ?>

<div id="key-fields" class="settings-panel">
<h3 class="wpem-admin-tab-title"><?php esc_html_e( 'Key details', 'wpem-rest-api' ); ?></h3>

<input type="hidden" id="key_id" value="<?php echo esc_attr( $key_id ); ?>" />
<div class="wpem-admin-body">
<table id="api-keys-options" class="form-table">
<tbody>
<tr valign="top">
<th scope="row" class="titledesc">
<label for="key_description">
<?php esc_html_e( 'Description', 'wpem-rest-api' ); ?>
<?php _e( 'Friendly name for identifying this key.', 'wpem-rest-api' ); ?>
</label>
</th>
<td class="forminp">
<input id="key_description" type="text" class="input-text regular-input" value="<?php echo esc_attr( $key_data['description'] ); ?>" />
</td>
</tr>
<tr valign="top">
<th scope="row" class="titledesc">
<label for="key_user">
<?php //esc_html_e( 'Event', 'wpem-rest-api' ); ?>

</label>
</th>
<td class="forminp">
<?php
$event_id = ! empty( $key_data['event_id'] ) ? absint( $key_data['event_id'] ) : '';
// $events = get_posts(array(
// 'post_type' => 'event_listing',
// 'numberposts' =>-1,
// 'author' => get_current_user_id(),
// 'post_status' => 'publish',
// ));

$events = array();

?>
<!-- <select class="wpem-enhanced-select" id="event_id" data-placeholder="<?php esc_attr_e( 'Search for a user&hellip;', 'wpem-rest-api' ); ?>" data-allow_clear="true">
<option value=""><?php _e('All Events','wpem-rest-api');?></option>
<?php foreach ($events as $keys => $event) { ?>
<option value="<?php echo esc_attr( $event->ID ); ?>" <?php if($event_id == $event->ID ) echo 'selected="selected"';?>><?php echo htmlspecialchars( wp_kses_post($event->post_title ) ); // htmlspecialchars to prevent XSS when rendered by chosen. ?></option>
<?php
}
?>

</select> -->
<!-- <p class="description"><?php _e('select the event for which the key is generating. You can keep it All events if you want to connect the other end point for all of them.
','wpem-rest-api');?></p> -->
</td>
</tr>
<tr valign="top">
<th scope="row" class="titledesc">
<label for="key_user">
<?php esc_html_e( 'User', 'wpem-rest-api' ); ?>
<?php _e( 'Owner of these keys.', 'wpem-rest-api' ); ?>
</label>
</th>
<td class="forminp">
<?php

$all_users = get_users( );

$user_id = ! empty( $key_data['user_id'] ) ? absint( $key_data['user_id'] ) : '';

?>
<select class="event-manager-select-chosen" id="key_user" data-placeholder="<?php esc_attr_e( 'Search for a user&hellip;', 'wpem-rest-api' ); ?>" data-allow_clear="true">
<table id="api-keys-options" class="form-table">
<tbody>
<tr valign="top">
<th scope="row" class="titledesc">
<label for="key_description">
<?php esc_html_e( 'Description', 'wpem-rest-api' ); ?>
</label>
</th>
<td class="forminp">
<input id="key_description" type="text" class="input-text regular-input" value="<?php echo esc_attr( $key_data['description'] ); ?>" />
<p class="description"><?php _e( 'Friendly name for identifying this key.', 'wpem-rest-api' );?></p>
</td>
</tr>
<tr valign="top">
<th scope="row" class="titledesc">
<label for="key_user"> </label>
</th>
<td class="forminp">
<?php
// Array of WP_User objects.
foreach ( $all_users as $user ) { ?>
<option value="<?php echo esc_attr( $user->ID ); ?>" <?php if($user->ID == $user_id ) echo 'selected="selected"';?>><?php
echo '#';
printf(__('%d','wpem-rest-api'),$user->ID);
echo ' ';
printf(__('%s','wpem-rest-api'),$user->user_login); // htmlspecialchars to prevent XSS when rendered by chosen. ?></option>
<?php
}

?>

</select>
<p class="description"><?php _e('Name of the owner of the Key.
','wpem-rest-api');?></p>
</td>
</tr>
<tr valign="top">
<th scope="row" class="titledesc">
<label for="key_description">
<?php esc_html_e( 'Expiry date', 'wpem-rest-api' ); ?>
</label>
</th>
<td class="forminp">
<?php
//convert date and time into date format
if(isset($key_data['date_expires']) && !empty($key_data['date_expires']))
$expiry_date = date('Y-m-d',strtotime($key_data['date_expires']));
else
$expiry_date = '';
?>
<input id="date_expires" type="text" class="input-text regular-input" value="<?php echo esc_attr($expiry_date ); ?>" />
<p class="description"><?php _e('Set an expiry date till which the key should be activated.','wpem-rest-api');?></p>
</td>
</tr>
<tr valign="top">
<th scope="row" class="titledesc">
<label for="key_permissions">
<?php esc_html_e( 'Permissions', 'wpem-rest-api' ); ?>

</label>
</th>
<td class="forminp">
<select id="key_permissions" class="wpem-enhanced-select">
$event_id = ! empty( $key_data['event_id'] ) ? absint( $key_data['event_id'] ) : '';
$events = array(); ?>
</td>
</tr>
<tr valign="top">
<th scope="row" class="titledesc">
<label for="key_user">
<?php esc_html_e( 'User', 'wpem-rest-api' ); ?>
<?php _e( 'Owner of these keys.', 'wpem-rest-api' ); ?>
</label>
</th>
<td class="forminp">
<?php
$permissions = array(
'read' => __( 'Read', 'wpem-rest-api' ),
'write' => __( 'Write', 'wpem-rest-api' ),
'read_write' => __( 'Read/Write', 'wpem-rest-api' ),
);

foreach ( $permissions as $permission_id => $permission_name ) :
?>
<option value="<?php echo esc_attr( $permission_id ); ?>" <?php selected( $key_data['permissions'], $permission_id, true ); ?>><?php echo esc_html( $permission_name ); ?></option>
<?php endforeach; ?>
</select>
<p class="description">
<?php _e( 'Select the access type of these keys.', 'wpem-rest-api' ); ?></p>
</td>
</tr>

<?php if ( 0 !== $key_id ) : ?>
$all_users = get_users( );
$user_id = ! empty( $key_data['user_id'] ) ? absint( $key_data['user_id'] ) : ''; ?>
<select class="event-manager-select-chosen" id="key_user" data-placeholder="<?php esc_attr_e( 'Search for a user&hellip;', 'wpem-rest-api' ); ?>" data-allow_clear="true">
<?php
foreach ( $all_users as $user ) { ?>
<option value="<?php echo esc_attr( $user->ID ); ?>" <?php if($user->ID == $user_id ) echo 'selected="selected"';?>><?php
echo '#';
printf(__('%d','wpem-rest-api'),$user->ID);
echo ' ';
printf(__('%s','wpem-rest-api'),$user->user_login); // htmlspecialchars to prevent XSS when rendered by chosen. ?></option>
<?php
} ?>
</select>
<p class="description"><?php _e( 'Name of the owner of the Key.', 'wpem-rest-api' );?></p>
</td>
</tr>
<tr valign="top">
<th scope="row" class="titledesc">
<?php esc_html_e( 'Consumer key ending in', 'wpem-rest-api' ); ?>
<label for="key_description">
<?php esc_html_e( 'Expiry date', 'wpem-rest-api' ); ?>
</label>
</th>
<td class="forminp">
<code>&hellip;<?php echo esc_html( $key_data['truncated_key'] ); ?></code>
<?php
//convert date and time into date format
if( isset( $key_data['date_expires'] ) && !empty( $key_data['date_expires'] ) ) {
$expiry_date = date( 'Y-m-d', strtotime( $key_data['date_expires'] ) );
} else {
$expiry_date = '';
} ?>
<input id="date_expires" type="text" class="input-text regular-input" value="<?php echo esc_attr($expiry_date ); ?>" />
<p class="description">
<?php _e( 'Set an expiry date till which the key should be activated.','wpem-rest-api' );?>
</p>
</td>
</tr>
<tr valign="top">
<th scope="row" class="titledesc">
<?php esc_html_e( 'Last access', 'wpem-rest-api' ); ?>
<label for="key_permissions">
<?php esc_html_e( 'Permissions', 'wpem-rest-api' ); ?>
</label>
</th>
<td class="forminp">
<span>
<?php
if ( ! empty( $key_data['last_access'] ) ) {
/* translators: 1: last access date 2: last access time */
$date = sprintf( __( '%1$s at %2$s', 'wp-event-manager-organizer-app-access' ), date_i18n( get_option('date_format'), strtotime( $key_data['last_access'] ) ), date_i18n(get_option('time_format'), strtotime( $key_data['last_access'] ) ) );

echo esc_html( apply_filters( 'wpem_api_key_last_access_datetime', $date, $key_data['last_access'] ) );
} else {
esc_html_e( 'Unknown', 'wpem-rest-api' );
}
?>
</span>
<select id="key_permissions" class="wpem-enhanced-select">
<?php
$permissions = array(
'read' => __( 'Read', 'wpem-rest-api' ),
'write' => __( 'Write', 'wpem-rest-api' ),
'read_write' => __( 'Read/Write', 'wpem-rest-api' ),
);
foreach ( $permissions as $permission_id => $permission_name ) : ?>
<option value="<?php echo esc_attr( $permission_id ); ?>" <?php selected( $key_data['permissions'], $permission_id, true ); ?>><?php echo esc_html( $permission_name ); ?></option>
<?php endforeach; ?>
</select>
<p class="description">
<?php _e( 'Select the access type of these keys.', 'wpem-rest-api' ); ?></p>
</td>
</tr>
<?php endif ?>
</tbody>
</table>

<?php if ( 0 !== $key_id ) : ?>
<tr valign="top">
<th scope="row" class="titledesc">
<?php esc_html_e( 'Consumer key ending in', 'wpem-rest-api' ); ?>
</th>
<td class="forminp">
<code>&hellip;<?php echo esc_html( $key_data['truncated_key'] ); ?></code>
</td>
</tr>
<tr valign="top">
<th scope="row" class="titledesc">
<?php esc_html_e( 'Last access', 'wpem-rest-api' ); ?>
</th>
<td class="forminp">
<span>
<?php
if ( ! empty( $key_data['last_access'] ) ) {
/* translators: 1: last access date 2: last access time */
$date = sprintf( __( '%1$s at %2$s', 'wp-event-manager-organizer-app-access' ), date_i18n( get_option('date_format'), strtotime( $key_data['last_access'] ) ), date_i18n(get_option('time_format'), strtotime( $key_data['last_access'] ) ) );

echo esc_html( apply_filters( 'wpem_api_key_last_access_datetime', $date, $key_data['last_access'] ) );
} else {
esc_html_e( 'Unknown', 'wpem-rest-api' );
} ?>
</span>
</td>
</tr>
<?php endif ?>
</tbody>
</table>
</div>

<?php do_action( 'wpem_admin_key_fields', $key_data ); ?>
<?php do_action( 'wpem_admin_key_fields', $key_data );

<?php
if ( 0 === intval( $key_id ) ) {
submit_button( __( 'Generate API key', 'wp-event-manager-organizer-app-access' ), 'primary wpem-backend-theme-button', 'update_api_key' );
} else {
?>
} else { ?>
<p class="submit">
<?php submit_button( __( 'Save changes', 'wp-event-manager-organizer-app-access' ), 'primary wpem-backend-theme-button', 'update_api_key', false ); ?>
<a class="wpem-backend-theme-button wpem-revoke-button" href="<?php echo esc_url( wp_nonce_url( add_query_arg( array( 'revoke-key' => $key_id ), admin_url( 'edit.php?post_type=event_listing&page=wpem-rest-api-settings&tab=api-access' ) ), 'revoke' ) ); ?>"><?php esc_html_e( 'Revoke key', 'wpem-rest-api' ); ?></a>
</p>
<?php
}
?>
} ?>
</div>

<script type="text/template" id="tmpl-api-keys-template">
Expand All @@ -195,6 +153,7 @@
</th>
<td class="forminp">
<input id="app_key" type="text" value="{{ data.app_key }}" size="55" readonly="readonly">
<button class="wpem-backend-theme-button" type="button" onClick="app_key_copy_fun()" style="cursor:pointer">Copy App Key</button>
</td>
</tr>
<tr valign="top">
Expand All @@ -203,6 +162,7 @@
</th>
<td class="forminp">
<input id="key_consumer_key" type="text" value="{{ data.consumer_key }}" size="55" readonly="readonly">
<button class="wpem-backend-theme-button" type="button" onClick="consumer_copy_fun()" style="cursor:pointer">Copy Consumer Key</button>
</td>
</tr>
<tr valign="top">
Expand All @@ -211,6 +171,7 @@
</th>
<td class="forminp">
<input id="key_consumer_secret" type="text" value="{{ data.consumer_secret }}" size="55" readonly="readonly">
<button class="wpem-backend-theme-button" type="button" onClick="secret_copy_fun()" style="cursor:pointer">Copy Consumer Secret</button>
</td>
</tr>

Expand All @@ -219,4 +180,23 @@
</div>
</script>


<script>
function app_key_copy_fun() {
var app_key_copy = document.getElementById( "app_key" );
var btn_text_app = document.querySelector( '#app_key + button' );
navigator.clipboard.writeText( app_key_copy.value );
btn_text_app.innerHTML = 'copied';
}
function consumer_copy_fun() {
var consumer_copy = document.getElementById( "key_consumer_key" );
var btn_text_key = document.querySelector( '#key_consumer_key + button' );
navigator.clipboard.writeText( consumer_copy.value );
btn_text_key.innerHTML = 'copied';
}
function secret_copy_fun() {
var secret_copy = document.getElementById( "key_consumer_secret" );
var btn_text_secret = document.querySelector( '#key_consumer_secret + button' );
navigator.clipboard.writeText( secret_copy.value );
btn_text_secret.innerHTML = 'copied';
}
</script>
Loading