whitespace and general cleanup #63

Merged
lemsmyth merged 29 commits from master into master 2022-02-14 19:22:29 +01:00
2 changed files with 43 additions and 5 deletions
Showing only changes of commit 1245d0d9fb - Show all commits

View file

@ -25,7 +25,6 @@ class LBRY_Admin
*/ */
public function create_options_page() public function create_options_page()
{ {
add_menu_page( add_menu_page(
__( 'LBRYPress Settings', 'lbrypress' ), __( 'LBRYPress Settings', 'lbrypress' ),
__( 'LBRYPress', 'lbrypress' ), __( 'LBRYPress', 'lbrypress' ),
@ -91,6 +90,13 @@ class LBRY_Admin
LBRY_SETTINGS_SECTION_GENERAL LBRY_SETTINGS_SECTION_GENERAL
); );
add_settings_field(
'default_lbry_channel',
'Default Publish Channel',
array( $this, 'default_channel_callback' ),
LBRY_ADMIN_PAGE,
LBRY_SETTINGS_SECTION_GENERAL
);
add_settings_field( add_settings_field(
LBRY_LICENSE, LBRY_LICENSE,
'LBRY Publishing License', 'LBRY Publishing License',
@ -255,6 +261,37 @@ class LBRY_Admin
); );
} }
/**
* Prints select to choose a default to publish to channel
*/
public function default_channel_callback()
{
$options = '';
$channel_list = LBRY()->daemon->channel_list();
if ( $channel_list ) {
foreach ( $channel_list as $channel ) {
$selected = $this->options['default_lbry_channel'] === $channel->claim_id;
$options .= '<option value="' . esc_attr( $channel->claim_id ) . '"';
if ( $selected ) {
$options .= ' selected';
}
$options .= '>' . esc_html( $channel->name ) . '</option>';
}
printf(
'<select id="' . esc_attr('%1$s') . '" name="' . esc_attr('%2$s[%1$s]') . '">' . esc_html('%3$s') . '</select>',
'default_lbry_channel',
LBRY_SETTINGS,
$options
);
} else { ?>
<p>Looks like you haven't added any channels yet, you can do that now on the <a href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'lbrypress', 'tab' => 'channels' ), 'options.php' ) ) ); ?>" class="">Channels Tab</a></p>
<?php }
}
/** /**
* Prints License input * Prints License input
*/ */
@ -282,6 +319,7 @@ class LBRY_Admin
); );
} }
/** /**
* Prints LBC per publish input * Prints LBC per publish input
*/ */

View file

@ -79,11 +79,11 @@ class LBRY_Network
return $post_id; return $post_id;
} }
$will_publish = (isset($_POST[LBRY_WILL_PUBLISH]) ? $_POST[LBRY_WILL_PUBLISH] : false); $channel = $_POST[LBRY_POST_PUB_CHANNEL];
$new_channel = (isset($_POST[LBRY_POST_CHANNEL]) ? $_POST[LBRY_POST_CHANNEL] : null); $cur_channel = ( get_post_meta( $post_id, LBRY_POST_PUB_CHANNEL, true ) ? get_post_meta( $post_id, LBRY_POST_PUB_CHANNEL, true ) : get_post_meta( $post_id, '_lbry_channel', true ) );
$cur_channel = get_post_meta($post_id, LBRY_POST_CHANNEL, true);
$license = $_POST[LBRY_POST_PUB_LICENSE]; $license = $_POST[LBRY_POST_PUB_LICENSE];
$cur_license = get_post_meta( $post_id, LBRY_POST_PUB_LICENSE, true ); $cur_license = get_post_meta( $post_id, LBRY_POST_PUB_LICENSE, true );
$will_publish = $_POST[LBRY_WILL_PUBLISH];
// Update meta acordingly // Update meta acordingly
if (!$will_publish) { if (!$will_publish) {