use constants

This commit is contained in:
Matthias Pfefferle 2024-10-08 15:00:34 +02:00
parent 1cf0439bcb
commit 493e920df0
4 changed files with 12 additions and 8 deletions

View file

@ -45,6 +45,10 @@ require_once __DIR__ . '/includes/functions.php';
\defined( 'ACTIVITYPUB_SEND_VARY_HEADER' ) || \define( 'ACTIVITYPUB_SEND_VARY_HEADER', false );
\defined( 'ACTIVITYPUB_DEFAULT_OBJECT_TYPE' ) || \define( 'ACTIVITYPUB_DEFAULT_OBJECT_TYPE', 'note' );
\define( 'ACTIVITYPUB_ACTOR_MODE', '1' );
\define( 'ACTIVITYPUB_BLOG_MODE', '2' );
\define( 'ACTIVITYPUB_ACTOR_AND_BLOG_MODE', '3' );
\define( 'ACTIVITYPUB_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
\define( 'ACTIVITYPUB_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
\define( 'ACTIVITYPUB_PLUGIN_FILE', plugin_dir_path( __FILE__ ) . '/' . basename( __FILE__ ) );

View file

@ -273,17 +273,17 @@ class Migration {
'1' === $blog_profile &&
'1' === $author_profiles
) {
\update_option( 'activitypub_actor_mode', '3' );
\update_option( 'activitypub_actor_mode', ACTIVITYPUB_ACTOR_AND_BLOG_MODE );
} elseif (
'1' === $blog_profile &&
'1' !== $author_profiles
) {
\update_option( 'activitypub_actor_mode', '2' );
\update_option( 'activitypub_actor_mode', ACTIVITYPUB_BLOG_MODE );
} elseif (
'1' !== $blog_profile &&
'1' === $author_profiles
) {
\update_option( 'activitypub_actor_mode', '1' );
\update_option( 'activitypub_actor_mode', ACTIVITYPUB_ACTOR_MODE );
}
}

View file

@ -479,7 +479,7 @@ function is_user_type_disabled( $type ) {
break;
}
if ( '1' === \get_option( 'activitypub_actor_mode', '1' ) ) {
if ( ACTIVITYPUB_ACTOR_MODE === \get_option( 'activitypub_actor_mode', ACTIVITYPUB_ACTOR_MODE ) ) {
$return = true;
break;
}
@ -499,7 +499,7 @@ function is_user_type_disabled( $type ) {
break;
}
if ( '2' === \get_option( 'activitypub_actor_mode', '1' ) ) {
if ( ACTIVITYPUB_BLOG_MODE === \get_option( 'activitypub_actor_mode', ACTIVITYPUB_ACTOR_MODE ) ) {
$return = true;
break;
}

View file

@ -26,7 +26,7 @@
<td>
<p>
<label>
<input type="radio" name="activitypub_actor_mode" id="activitypub_actor_mode" value="1" <?php echo \checked( '1', \get_option( 'activitypub_actor_mode', '1' ) ); ?> />
<input type="radio" name="activitypub_actor_mode" id="activitypub_actor_mode" value="<?php echo ACTIVITYPUB_ACTOR_MODE; ?>" <?php echo \checked( ACTIVITYPUB_ACTOR_MODE, \get_option( 'activitypub_actor_mode', ACTIVITYPUB_ACTOR_MODE ) ); ?> />
<strong><?php \esc_html_e( 'Author Profiles Only', 'activitypub' ); ?></strong>
</label>
</p>
@ -38,7 +38,7 @@
</p>
<p>
<label>
<input type="radio" name="activitypub_actor_mode" id="activitypub_actor_mode" value="2" <?php echo \checked( '2', \get_option( 'activitypub_actor_mode', '1' ) ); ?> />
<input type="radio" name="activitypub_actor_mode" id="activitypub_actor_mode" value="<?php echo ACTIVITYPUB_BLOG_MODE; ?>" <?php echo \checked( ACTIVITYPUB_BLOG_MODE, \get_option( 'activitypub_actor_mode', ACTIVITYPUB_ACTOR_MODE ) ); ?> />
<strong><?php \esc_html_e( 'Blog Profile Only', 'activitypub' ); ?></strong>
</label>
</p>
@ -47,7 +47,7 @@
</p>
<p>
<label>
<input type="radio" name="activitypub_actor_mode" id="activitypub_actor_mode" value="3" <?php echo \checked( '3', \get_option( 'activitypub_actor_mode', '1' ) ); ?> />
<input type="radio" name="activitypub_actor_mode" id="activitypub_actor_mode" value="<?php echo ACTIVITYPUB_ACTOR_AND_BLOG_MODE; ?>" <?php echo \checked( ACTIVITYPUB_ACTOR_AND_BLOG_MODE, \get_option( 'activitypub_actor_mode', ACTIVITYPUB_ACTOR_MODE ) ); ?> />
<strong><?php \esc_html_e( 'Author and Blog Profiles', 'activitypub' ); ?></strong>
</label>
</p>