Release: (285ad68) Merge branch 'develop' into trunk

Author: dkotter

includes/Classifai/Admin/Onboarding.php

@@ -6,6 +6,7 @@
 use Classifai\Services\ServicesManager;
 
 class Onboarding {
+
 	/**
 	 * @var string $setup_url The admin onboarding URL.
 	 */
@@ -18,7 +19,6 @@ public function __construct() {
 		$this->setup_url = admin_url( 'admin.php?page=classifai_setup' );
 	}
 
-
 	/**
 	 * Inintialize the class and register the actions needed.
 	 */
@@ -64,6 +64,7 @@ public function render_setup_page() {
 			),
 		);
 		?>
+
 		<div class="classifai-content classifai-setup-page">
 			<?php
 			include_once 'templates/classifai-header.php';
@@ -143,6 +144,7 @@ public function render_setup_page() {
 			</div>
 
 		</div>
+
 		<?php
 	}
 
@@ -421,19 +423,22 @@ public function get_features() {
 			$display_name = $service->get_display_name();
 			$service_slug = $service->get_menu_slug();
 			$features     = array();
+
 			foreach ( $service->provider_classes as $provider_class ) {
 				$options = $provider_class->get_onboarding_options();
 				if ( ! empty( $options ) && ! empty( $options['features'] ) ) {
 					$features[ $provider_class->get_option_name() ] = $options['features'];
 				}
 			}
+
 			if ( ! empty( $features ) ) {
 				$onboarding_features[ $service_slug ] = array(
 					'title'    => $display_name,
 					'features' => $features,
 				);
 			}
 		}
+
 		return $onboarding_features;
 	}
 
@@ -457,6 +462,7 @@ public function get_providers() {
 				$providers[ $provider_class->get_option_name() ] = $provider_class;
 			}
 		}
+
 		return $providers;
 	}
 
@@ -535,9 +541,11 @@ public function handle_skip_setup_step() {
 			$onboarding_options = array(
 				'step_completed' => $step,
 			);
+
 			if ( 3 === $step ) {
 				$onboarding_options['status'] = 'completed';
 			}
+
 			$this->update_onboarding_options( $onboarding_options );
 
 			// Redirect to next step.
@@ -578,6 +586,7 @@ public function get_next_provider( $current_provider ) {
 		$enabled_providers = $this->get_enabled_providers();
 		$keys              = array_keys( $enabled_providers );
 		$index             = array_search( $current_provider, $keys, true );
+
 		if ( false === $index ) {
 			return false;
 		}
@@ -615,11 +624,13 @@ public function prevent_direct_step_visits() {
 	 */
 	public function has_configured_providers() {
 		$providers = $this->get_providers();
+
 		foreach ( $providers as $provider ) {
 			if ( $provider->is_configured() ) {
 				return true;
 			}
 		}
+
 		return false;
 	}
 
@@ -631,6 +642,7 @@ public function has_configured_providers() {
 	public function get_configured_features() {
 		$features            = $this->get_features();
 		$configured_features = array();
+
 		foreach ( $features as $feature ) {
 			foreach ( $feature['features'] as $provider_key => $provider_features ) {
 				foreach ( $provider_features as $feature_key => $feature_options ) {
@@ -640,6 +652,8 @@ public function get_configured_features() {
 				}
 			}
 		}
+
 		return $configured_features;
 	}
+
 }

includes/Classifai/Providers/Azure/ComputerVision.php

@@ -45,6 +45,7 @@ public function __construct( $service ) {
 				'enable_image_tagging'  => __( 'Automatically tag images', 'classifai' ),
 				'enable_smart_cropping' => __( 'Smart crop images', 'classifai' ),
 				'enable_ocr'            => __( 'Scan images for text', 'classifai' ),
+				'enable_read_pdf'       => __( 'Scan PDFs for text', 'classifai' ),
 			),
 		);
 	}
@@ -103,7 +104,7 @@ public function get_alt_text_settings() {
 		}
 
 		foreach ( $settings['enable_image_captions'] as $key => $value ) {
-			if ( '0' !== $value ) {
+			if ( 0 !== $value && '0' !== $value ) {
 				$enabled_fields[] = $key;
 			}
 		}
@@ -1162,6 +1163,8 @@ public function sanitize_settings( $settings ) {
 
 		if ( isset( $settings['image_tag_taxonomy'] ) && taxonomy_exists( $settings['image_tag_taxonomy'] ) ) {
 			$new_settings['image_tag_taxonomy'] = $settings['image_tag_taxonomy'];
+		} elseif ( taxonomy_exists( 'classifai-image-tags' ) ) {
+			$new_settings['image_tag_taxonomy'] = 'classifai-image-tags';
 		}
 
 		if ( isset( $settings['enable_image_captions'] ) ) {

includes/Classifai/Providers/OpenAI/ChatGPT.php

@@ -207,6 +207,8 @@ public function sanitize_settings( $settings ) {
 
 		if ( isset( $settings['roles'] ) && is_array( $settings['roles'] ) ) {
 			$new_settings['roles'] = array_map( 'sanitize_text_field', $settings['roles'] );
+		} else {
+			$new_settings['roles'] = array_keys( get_editable_roles() ?? [] );
 		}
 
 		if ( isset( $settings['length'] ) && is_numeric( $settings['length'] ) && (int) $settings['length'] >= 0 ) {

includes/Classifai/Providers/OpenAI/DallE.php

@@ -285,6 +285,8 @@ public function sanitize_settings( $settings ) {
 
 		if ( isset( $settings['roles'] ) && is_array( $settings['roles'] ) ) {
 			$new_settings['roles'] = array_map( 'sanitize_text_field', $settings['roles'] );
+		} else {
+			$new_settings['roles'] = array_keys( get_editable_roles() ?? [] );
 		}
 
 		if ( isset( $settings['number'] ) && is_numeric( $settings['number'] ) && (int) $settings['number'] >= 1 && (int) $settings['number'] <= 10 ) {