; ?>)
 ); ?>)
; ?>)
; ?>)
 ); ?>)
 ); ?>)
+
+ {{kbsearch}}
+
+
+ {{kbbreadcrumb}}
+
+
+ {{knowledgebase product="-1"}}
+
+
+translation_strings['page_header'] ); ?>
prefix . '_settings_page_header' ); ?> @@ -874,7 +905,12 @@ public function plugin_settings() {' . wp_kses_post( $args['desc'] ) . '
'; - } else { - $desc = ''; - } + $desc = ! empty( $args['desc'] ) ? '' . wp_kses_post( $args['desc'] ) . '
' : ''; /** * After Settings Output filter @@ -86,15 +81,16 @@ public function get_field_description( $args ) { * @param array $args Arguments array. */ $desc = apply_filters( $this->prefix . '_setting_field_description', $desc, $args ); + return $desc; } /** * Get the value of a settings field. * - * @param string $option Settings field name. - * @param string $default_value Default text if it's not found. - * @return string + * @param string $option Settings field name. + * @param mixed $default_value Default value if option is not found. + * @return mixed */ public function get_option( $option, $default_value = '' ) { @@ -107,6 +103,39 @@ public function get_option( $option, $default_value = '' ) { return $default_value; } + /** + * Get field ID and name attributes. + * + * @param array $args Field arguments. + * @return array Array containing field_id and field_name. + */ + protected function get_field_attributes( $args ) { + $id = sanitize_key( $args['id'] ); + if ( isset( $args['_repeater_id'] ) && isset( $args['_index'] ) ) { + $field_id = sprintf( + '%s-%s-%s-fields-%s', + $this->settings_key, + $args['_repeater_id'], + $args['_index'], + $id + ); + $field_name = sprintf( + '%s[%s][%s][fields][%s]', + $this->settings_key, + $args['_repeater_id'], + $args['_index'], + $id + ); + } else { + $field_id = $this->settings_key . '-' . $id; + $field_name = $this->settings_key . '[' . $id . ']'; + } + + return array( + 'field_id' => $field_id, + 'field_name' => $field_name, + ); + } /** * Miscellaneous callback funcion * @@ -156,23 +185,25 @@ public function callback_descriptive_text( $args ) { * @param array $args Array of arguments. */ public function callback_text( $args ) { - $value = isset( $args['value'] ) ? $args['value'] : $this->get_option( $args['id'], $args['options'] ); $size = sanitize_html_class( isset( $args['size'] ) ? $args['size'] : 'regular' ); $class = sanitize_html_class( $args['field_class'] ); $placeholder = empty( $args['placeholder'] ) ? '' : ' placeholder="' . $args['placeholder'] . '"'; $disabled = ( ! empty( $args['disabled'] ) || $args['pro'] ) ? ' disabled="disabled"' : ''; $readonly = ( isset( $args['readonly'] ) && true === $args['readonly'] ) ? ' readonly="readonly"' : ''; - $attributes = $disabled . $readonly; + $required = ( isset( $args['required'] ) && true === $args['required'] ) ? ' required' : ''; + $attributes = $disabled . $readonly . $required; foreach ( (array) $args['field_attributes'] as $attribute => $val ) { $attributes .= sprintf( ' %1$s="%2$s"', $attribute, esc_attr( $val ) ); } + $field_attributes = $this->get_field_attributes( $args ); + $html = sprintf( - '', - $this->settings_key, - sanitize_key( $args['id'] ), + '', + $field_attributes['field_id'], + $field_attributes['field_name'], $class . ' ' . $size . '-text', esc_attr( stripslashes( $value ) ), $attributes, @@ -242,7 +273,8 @@ public function callback_textarea( $args ) { $placeholder = empty( $args['placeholder'] ) ? '' : ' placeholder="' . $args['placeholder'] . '"'; $disabled = ( ! empty( $args['disabled'] ) || $args['pro'] ) ? ' disabled="disabled"' : ''; $readonly = ( isset( $args['readonly'] ) && true === $args['readonly'] ) ? ' readonly="readonly"' : ''; - $attributes = $disabled . $readonly; + $required = ( isset( $args['required'] ) && true === $args['required'] ) ? ' required' : ''; + $attributes = $disabled . $readonly . $required; $html = sprintf( '', @@ -327,7 +359,11 @@ public function callback_multicheck( $args ) { $disabled = ( ! empty( $args['disabled'] ) || $args['pro'] ) ? ' disabled="disabled"' : ''; if ( ! empty( $args['options'] ) ) { - $html .= sprintf( '', $this->settings_key, sanitize_key( $args['id'] ) ); + $html .= sprintf( + '', + $this->settings_key, + sanitize_key( $args['id'] ) + ); foreach ( $args['options'] as $key => $option ) { if ( in_array( $key, $value_array, true ) ) { @@ -504,6 +540,9 @@ public function callback_number( $args ) { $size = isset( $args['size'] ) ? $args['size'] : 'regular'; $placeholder = empty( $args['placeholder'] ) ? '' : ' placeholder="' . esc_attr( $args['placeholder'] ) . '"'; $disabled = ( ! empty( $args['disabled'] ) || $args['pro'] ) ? ' disabled="disabled"' : ''; + $readonly = ( isset( $args['readonly'] ) && true === $args['readonly'] ) ? ' readonly="readonly"' : ''; + $required = ( isset( $args['required'] ) && true === $args['required'] ) ? ' required' : ''; + $attributes = $disabled . $readonly . $required; $html = sprintf( '', @@ -515,7 +554,7 @@ public function callback_number( $args ) { esc_attr( stripslashes( $value ) ), $placeholder, $this->settings_key, - $disabled + $attributes ); $html .= $this->get_field_description( $args ); @@ -532,24 +571,29 @@ public function callback_number( $args ) { * @return void */ public function callback_select( $args ) { - $value = isset( $args['value'] ) ? $args['value'] : $this->get_option( $args['id'], $args['default'] ); - $disabled = ( ! empty( $args['disabled'] ) || $args['pro'] ) ? ' disabled="disabled"' : ''; + $value = isset( $args['value'] ) ? $args['value'] : $this->get_option( $args['id'], $args['default'] ); + $class = sanitize_html_class( $args['field_class'] ); + $disabled = ( ! empty( $args['disabled'] ) || $args['pro'] ) ? ' disabled="disabled"' : ''; + $required = ( isset( $args['required'] ) && true === $args['required'] ) ? ' required' : ''; + $attributes = $disabled . $required; + + foreach ( (array) $args['field_attributes'] as $attribute => $val ) { + $attributes .= sprintf( ' %1$s="%2$s"', $attribute, esc_attr( $val ) ); + } if ( isset( $args['chosen'] ) ) { - $chosen = 'class="chosen"'; - } else { - $chosen = ''; + $class .= ' chosen'; } $html = sprintf( - '', + '', $this->settings_key, sanitize_key( $args['id'] ), - $chosen, - $disabled + $class, + $attributes ); - foreach ( $args['options'] as $option => $name ) { + foreach ( (array) $args['options'] as $option => $name ) { $html .= sprintf( '', sanitize_key( $option ), selected( $option, $value, false ), $name ); } @@ -675,7 +719,7 @@ public function callback_wysiwyg( $args ) { $value = isset( $args['value'] ) ? $args['value'] : $this->get_option( $args['id'], $args['options'] ); $size = isset( $args['size'] ) ? $args['size'] : '500px'; - echo '';
+ printf( '
' );
echo $this->get_field_description( $args ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
}
@@ -732,15 +776,257 @@ public function callback_password( $args ) {
$class = sanitize_html_class( $args['field_class'] );
$html = sprintf(
- '',
+ '',
$class . ' ' . $size . '-text',
$this->settings_key,
sanitize_key( $args['id'] ),
- esc_attr( $value )
+ esc_attr( $value ),
+ ! empty( $value ) ? 'placeholder="' . esc_attr__( 'Previously saved', 'glue-link' ) . '"' : ''
);
$html .= $this->get_field_description( $args );
/** This filter has been defined in class-settings-api.php */
echo apply_filters( $this->prefix . '_after_setting_output', $html, $args ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
}
+
+ /**
+ * Callback for repeater field.
+ *
+ * @param array $args Array of arguments.
+ * @return void
+ */
+ public function callback_repeater( $args ) {
+ $value = isset( $args['value'] ) ? (array) $args['value'] : $this->get_option( $args['id'], array() );
+ $value = ! empty( $value ) && is_array( $value ) ? $value : array();
+
+ $class = ! empty( $args['field_class'] ) ? sanitize_html_class( $args['field_class'] ) : '';
+ $disabled = ( ! empty( $args['disabled'] ) || ! empty( $args['pro'] ) ) ? ' disabled="disabled"' : '';
+ $readonly = ( isset( $args['readonly'] ) && true === $args['readonly'] ) ? ' readonly="readonly"' : '';
+ $attributes = $disabled . $readonly;
+
+ // Process additional field attributes.
+ foreach ( (array) $args['field_attributes'] as $attribute => $val ) {
+ $attributes .= sprintf( ' %1$s="%2$s"', sanitize_key( $attribute ), esc_attr( $val ) );
+ }
+
+ ?>
+ ', esc_attr( $size ) );
$editor_settings = array(
'teeny' => true,
@@ -689,7 +733,7 @@ public function callback_wysiwyg( $args ) {
wp_editor( $value, $args['section'] . '-' . $args['id'], $editor_settings );
- echo '
';
+ printf( '>
+
+
+
+ get_field_description( $args );
+
+ /** This filter has been defined in class-settings-api.php */
+ echo apply_filters( $this->prefix . '_after_setting_output', $html, $args ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+ }
+
+ /**
+ * Render a single repeater item.
+ *
+ * @param array $args Repeater field arguments.
+ * @param string|int $index Current item index.
+ * @param array|null $item Item data if exists.
+ * @return void
+ */
+ private function render_repeater_item( $args, $index, $item = null ) {
+ if ( empty( $args['fields'] ) || ! is_array( $args['fields'] ) ) {
+ return;
+ }
+
+ ?>
+
+ $item ) {
+ $this->render_repeater_item( $args, $index, $item );
+ }
+ }
+ ?>
+
+
+
+
+
+
+
+
+ get_option( $args['id'], $args['options'] );
+ $decrypted_key = Settings_API::decrypt_api_key( $encrypted_key );
+
+ $args['value'] = $decrypted_key ? str_repeat( '*', strlen( $decrypted_key ) - 4 ) . substr( $decrypted_key, -4 ) : '';
+
+ $this->callback_text( $args );
+ }
}
diff --git a/includes/admin/settings/class-settings-sanitize.php b/includes/admin/settings/class-settings-sanitize.php
index 93f31c9..79f6613 100644
--- a/includes/admin/settings/class-settings-sanitize.php
+++ b/includes/admin/settings/class-settings-sanitize.php
@@ -20,10 +20,56 @@
*/
class Settings_Sanitize {
+ /**
+ * Settings Key.
+ *
+ * @var string Settings Key.
+ */
+ public $settings_key;
+
+ /**
+ * Prefix which is used for creating the unique filters and actions.
+ *
+ * @var string Prefix.
+ */
+ public $prefix;
+
/**
* Main constructor class.
+ *
+ * @param mixed $args {
+ * Array or string of arguments. Default is blank array.
+ * @type string $settings_key Settings key.
+ * @type string $prefix Prefix.
+ * }
*/
- public function __construct() {
+ public function __construct( $args ) {
+ $defaults = array(
+ 'settings_key' => '',
+ 'prefix' => '',
+ );
+ $args = wp_parse_args( $args, $defaults );
+
+ foreach ( $args as $name => $value ) {
+ $this->$name = $value;
+ }
+ }
+
+ /**
+ * Get the value of a settings field.
+ *
+ * @param string $option Settings field name.
+ * @param mixed $default_value Default value if option is not found.
+ * @return mixed
+ */
+ public function get_option( $option, $default_value = '' ) {
+ $options = \get_option( $this->settings_key );
+
+ if ( isset( $options[ $option ] ) ) {
+ return $options[ $option ];
+ }
+
+ return $default_value;
}
/**
@@ -194,6 +240,115 @@ public function sanitize_color_field( $value ) {
return sanitize_hex_color( $value );
}
+ /**
+ * Sanitize email fields.
+ *
+ * @param string $value The field value.
+ * @return string Sanitized value
+ */
+ public function sanitize_email_field( $value ) {
+ return sanitize_email( $value );
+ }
+
+ /**
+ * Sanitize URL fields.
+ *
+ * @param string $value The field value.
+ * @return string Sanitized value
+ */
+ public function sanitize_url_field( $value ) {
+ return esc_url_raw( $value );
+ }
+
+ /**
+ * Sanitize sensitive fields.
+ *
+ * @param string $value The field value.
+ * @param string|array $key The field key.
+ * @return string Sanitized value
+ */
+ public function sanitize_sensitive_field( $value, $key ) {
+ if ( is_array( $key ) ) {
+ if ( isset( $key['id'] ) ) {
+ $key = $key['id'];
+ } else {
+ return $value;
+ }
+ }
+
+ $stored_encrypted_key = $this->get_option( $key );
+
+ // If input is masked, return existing encrypted key.
+ if ( empty( $value ) || strpos( $value, '**' ) !== false ) {
+ return $stored_encrypted_key;
+ }
+
+ return Settings_API::encrypt_api_key( $value );
+ }
+
+ /**
+ * Sanitize repeater field.
+ *
+ * @param array $value Array of repeater values.
+ * @param array $field Field configuration array.
+ * @return array Sanitized array
+ */
+ public function sanitize_repeater_field( $value, $field = array() ) {
+ if ( ! is_array( $value ) ) {
+ return array();
+ }
+
+ $sanitized_value = array();
+
+ // Get the subfields configuration.
+ $subfields = ! empty( $field['fields'] ) ? $field['fields'] : array();
+
+ foreach ( $value as $index => $row ) {
+ // Ensure we have a valid row structure.
+ if ( ! isset( $row['fields'] ) || ! is_array( $row['fields'] ) ) {
+ continue;
+ }
+
+ $sanitized_row = array(
+ 'fields' => array(),
+ );
+
+ foreach ( $row['fields'] as $field_key => $field_value ) {
+ $field_key = sanitize_key( $field_key );
+
+ // Skip if field_key is not in our subfields configuration.
+ $field_config = null;
+ foreach ( $subfields as $subfield ) {
+ if ( isset( $subfield['id'] ) && $subfield['id'] === $field_key ) {
+ $field_config = $subfield;
+ break;
+ }
+ }
+
+ if ( null === $field_config ) {
+ continue;
+ }
+
+ // Get the field type from the subfield configuration.
+ $field_type = isset( $field_config['type'] ) ? $field_config['type'] : 'text';
+
+ // Call the appropriate sanitization method.
+ $sanitize_method = 'sanitize_' . $field_type . '_field';
+ if ( method_exists( $this, $sanitize_method ) ) {
+ $sanitized_row['fields'][ $field_key ] = $this->$sanitize_method( $field_value, $field_config );
+ } else {
+ $sanitized_row['fields'][ $field_key ] = $this->sanitize_text_field( $field_value );
+ }
+ }
+
+ if ( ! empty( $sanitized_row['fields'] ) ) {
+ $sanitized_value[ $index ] = $sanitized_row;
+ }
+ }
+
+ return $sanitized_value;
+ }
+
/**
* Convert a string to CSV.
*
diff --git a/includes/admin/settings/css/admin-style.css b/includes/admin/settings/css/admin-style.css
new file mode 100644
index 0000000..2e585a3
--- /dev/null
+++ b/includes/admin/settings/css/admin-style.css
@@ -0,0 +1,264 @@
+/* General styles for the repeater wrapper */
+.wz-repeater-wrapper {
+ position: relative;
+ margin-bottom: 1.5rem;
+}
+
+/* Repeater items container */
+.wz-repeater-wrapper .wz-repeater-item {
+ display: flex;
+ flex-direction: column;
+ background: #f9f9f9;
+ border: 1px solid #ddd;
+ padding: 1rem;
+ margin-bottom: 1rem;
+ border-radius: 4px;
+}
+
+.wz-repeater-item .repeater-item-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ border-bottom: 1px solid #ddd;
+ padding-bottom: 0.5rem;
+ cursor: pointer;
+ font-weight: bold;
+}
+
+/* Header for repeater field */
+.wz-repeater-field-header {
+ margin-bottom: 0.5rem;
+}
+
+.wz-repeater-field-label {
+ font-weight: bold;
+ font-size: 0.9rem;
+}
+
+/* Input field styles */
+.wz-repeater-field-input {
+ margin-bottom: 1rem;
+}
+
+/* Repeater item actions (buttons) */
+.repeater-item-actions {
+ display: flex;
+ gap: 0.5rem;
+ justify-content: flex-start;
+ margin-top: 1rem;
+}
+
+.repeater-item-actions .button {
+ display: inline-flex;
+ align-items: center;
+ gap: 0.25rem;
+}
+
+.repeater-item-actions .dashicons {
+ font-size: 16px;
+}
+
+/* Move up/down button styles */
+.repeater-item-actions .move-up,
+.repeater-item-actions .move-down {
+ background: #f4f4f4;
+ color: #333;
+ border: 1px solid #ddd;
+ border-radius: 3px;
+ padding: 0.5rem;
+}
+
+.repeater-item-actions .move-up:hover,
+.repeater-item-actions .move-down:hover {
+ background: #e0e0e0;
+}
+
+/* Remove button styles */
+.repeater-item-actions .remove-item {
+ background: #fdd;
+ border-color: #fbb;
+}
+
+.repeater-item-actions .remove-item:hover {
+ background: #fbb;
+}
+
+/* Add item button styling */
+.wz-repeater-wrapper .add-item {
+ background-color: #0073aa;
+ color: #fff;
+ padding: 0.5rem 1rem;
+ border: none;
+ border-radius: 4px;
+ cursor: pointer;
+ font-size: 1rem;
+ margin-top: 1rem;
+}
+
+.wz-repeater-wrapper .add-item:hover {
+ background-color: #005177;
+ color: #fff;
+ border-color: #004063;
+}
+
+/* Template styling for new items (hidden template) */
+.repeater-template {
+ display: none;
+}
+
+/* Responsiveness for smaller screens */
+@media screen and (max-width: 768px) {
+ .wz-repeater-wrapper {
+ margin-bottom: 1rem;
+ }
+
+ .wz-repeater-item {
+ flex-direction: column;
+ }
+
+ .repeater-item-actions {
+ flex-direction: column;
+ align-items: flex-start;
+ }
+
+ .repeater-item-actions .button {
+ margin-bottom: 0.5rem;
+ }
+}
+
+/* Field input responsive tweaks */
+@media screen and (max-width: 480px) {
+ .wz-repeater-field-label {
+ font-size: 0.85rem;
+ }
+
+ .wz-repeater-field-input {
+ font-size: 0.85rem;
+ }
+
+ .repeater-item-actions .button {
+ font-size: 0.85rem;
+ }
+
+ .add-item {
+ font-size: 1rem;
+ padding: 0.5rem;
+ }
+}
+
+/* Repeater Fields */
+.wz-repeater-item {
+ background: #fff;
+ border: 1px solid #ccd0d4;
+ box-shadow: 0 1px 1px rgba(0, 0, 0, .04);
+ margin-bottom: 15px;
+ border-radius: 3px;
+}
+
+.repeater-item-content {
+ padding: 15px;
+}
+
+.wz-repeater-field {
+ margin-bottom: 15px;
+}
+
+.wz-repeater-field:last-child {
+ margin-bottom: 0;
+}
+
+.wz-repeater-field-header {
+ margin-bottom: 8px;
+}
+
+.wz-repeater-field-label {
+ display: block;
+ font-weight: 600;
+ margin-bottom: 4px;
+}
+
+.wz-repeater-field-description {
+ color: #666;
+ font-style: italic;
+ margin: 4px 0 0;
+ font-size: 13px;
+}
+
+.wz-repeater-field-input input[type="text"],
+.wz-repeater-field-input input[type="url"],
+.wz-repeater-field-input input[type="number"],
+.wz-repeater-field-input input[type="password"],
+.wz-repeater-field-input input[type="email"],
+.wz-repeater-field-input textarea,
+.wz-repeater-field-input select {
+ width: 100%;
+ max-width: 100%;
+}
+
+.repeater-item-footer {
+ background: #f5f5f5;
+ border-top: 1px solid #ddd;
+ padding: 10px 15px;
+ text-align: right;
+}
+
+.repeater-item-footer .remove-item {
+ color: #b32d2e;
+}
+
+.repeater-item-footer .remove-item:hover {
+ color: #dc3232;
+}
+
+.repeater-item-footer .dashicons {
+ margin-top: 4px;
+}
+
+/* Required field indicator */
+.required {
+ color: #d63638;
+ font-weight: bold;
+ margin-left: 2px;
+ font-size: 1.3em;
+}
+
+/* Tom Select Customizations */
+.ts-wrapper.loading .spinner {
+ display: inline-block;
+ visibility: visible;
+ float: none;
+ margin: 5px auto;
+}
+
+.ts-wrapper .no-results {
+ padding: 5px 10px;
+ color: #666;
+ font-style: italic;
+}
+
+.ts-wrapper.form-control {
+ border: 1px solid #8c8f94;
+ border-radius: 4px;
+ min-height: 30px;
+}
+
+.ts-wrapper.focus {
+ border-color: #2271b1;
+ box-shadow: 0 0 0 1px #2271b1;
+ outline: 2px solid transparent;
+}
+
+.ts-dropdown {
+ border: 1px solid #8c8f94;
+ border-radius: 4px;
+ box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
+}
+
+.ts-dropdown .option {
+ padding: 6px 10px;
+}
+
+.ts-dropdown .active {
+ background-color: #2271b1;
+ color: #fff;
+}
\ No newline at end of file
diff --git a/includes/admin/settings/css/admin-style.min.css b/includes/admin/settings/css/admin-style.min.css
new file mode 100644
index 0000000..1dbdfcb
--- /dev/null
+++ b/includes/admin/settings/css/admin-style.min.css
@@ -0,0 +1 @@
+.wz-repeater-wrapper{position:relative;margin-bottom:1.5rem;}.wz-repeater-wrapper .wz-repeater-item{display:flex;flex-direction:column;background:#f9f9f9;border:1px solid #ddd;padding:1rem;margin-bottom:1rem;border-radius:4px;}.wz-repeater-item .repeater-item-header{display:flex;justify-content:space-between;align-items:center;border-bottom:1px solid #ddd;padding-bottom:.5rem;cursor:pointer;font-weight:bold;}.wz-repeater-field-header{margin-bottom:.5rem;}.wz-repeater-field-label{font-weight:bold;font-size:.9rem;}.wz-repeater-field-input{margin-bottom:1rem;}.repeater-item-actions{display:flex;gap:.5rem;justify-content:flex-start;margin-top:1rem;}.repeater-item-actions .button{display:inline-flex;align-items:center;gap:.25rem;}.repeater-item-actions .dashicons{font-size:16px;}.repeater-item-actions .move-up,.repeater-item-actions .move-down{background:#f4f4f4;color:#333;border:1px solid #ddd;border-radius:3px;padding:.5rem;}.repeater-item-actions .move-up:hover,.repeater-item-actions .move-down:hover{background:#e0e0e0;}.repeater-item-actions .remove-item{background:#fdd;border-color:#fbb;}.repeater-item-actions .remove-item:hover{background:#fbb;}.wz-repeater-wrapper .add-item{background-color:#0073aa;color:#fff;padding:.5rem 1rem;border:none;border-radius:4px;cursor:pointer;font-size:1rem;margin-top:1rem;}.wz-repeater-wrapper .add-item:hover{background-color:#005177;color:#fff;border-color:#004063;}.repeater-template{display:none;}@media screen and (max-width:768px){.wz-repeater-wrapper{margin-bottom:1rem}.wz-repeater-item{flex-direction:column}.repeater-item-actions{flex-direction:column;align-items:flex-start}.repeater-item-actions .button{margin-bottom:.5rem}}@media screen and (max-width:480px){.wz-repeater-field-label{font-size:.85rem}.wz-repeater-field-input{font-size:.85rem}.repeater-item-actions .button{font-size:.85rem}.add-item{font-size:1rem;padding:.5rem}}.wz-repeater-item{background:#fff;border:1px solid #ccd0d4;box-shadow:0 1px 1px rgba(0,0,0,.04);margin-bottom:15px;border-radius:3px;}.repeater-item-content{padding:15px;}.wz-repeater-field{margin-bottom:15px;}.wz-repeater-field:last-child{margin-bottom:0;}.wz-repeater-field-header{margin-bottom:8px;}.wz-repeater-field-label{display:block;font-weight:600;margin-bottom:4px;}.wz-repeater-field-description{color:#666;font-style:italic;margin:4px 0 0;font-size:13px;}.wz-repeater-field-input input[type="text"],.wz-repeater-field-input input[type="url"],.wz-repeater-field-input input[type="number"],.wz-repeater-field-input input[type="password"],.wz-repeater-field-input input[type="email"],.wz-repeater-field-input textarea,.wz-repeater-field-input select{width:100%;max-width:100%;}.repeater-item-footer{background:#f5f5f5;border-top:1px solid #ddd;padding:10px 15px;text-align:right;}.repeater-item-footer .remove-item{color:#b32d2e;}.repeater-item-footer .remove-item:hover{color:#dc3232;}.repeater-item-footer .dashicons{margin-top:4px;}.required{color:#d63638;font-weight:bold;margin-left:2px;font-size:1.3em;}.ts-wrapper.loading .spinner{display:inline-block;visibility:visible;float:none;margin:5px auto;}.ts-wrapper .no-results{padding:5px 10px;color:#666;font-style:italic;}.ts-wrapper.form-control{border:1px solid #8c8f94;border-radius:4px;min-height:30px;}.ts-wrapper.focus{border-color:#2271b1;box-shadow:0 0 0 1px #2271b1;outline:2px solid transparent;}.ts-dropdown{border:1px solid #8c8f94;border-radius:4px;box-shadow:0 2px 5px rgba(0,0,0,.1);}.ts-dropdown .option{padding:6px 10px;}.ts-dropdown .active{background-color:#2271b1;color:#fff;}
\ No newline at end of file
diff --git a/includes/admin/settings/js/settings-admin-scripts.js b/includes/admin/settings/js/settings-admin-scripts.js
index 85de344..f886f74 100644
--- a/includes/admin/settings/js/settings-admin-scripts.js
+++ b/includes/admin/settings/js/settings-admin-scripts.js
@@ -58,7 +58,7 @@ jQuery(document).ready(function ($) {
});
});
- // Initialise ColorPicker.
+ // Initialize ColorPicker.
$('.color-field').each(function (i, element) {
$(element).wpColorPicker();
});
diff --git a/includes/admin/settings/js/settings-admin-scripts.min.js b/includes/admin/settings/js/settings-admin-scripts.min.js
index 17ab277..96a0aba 100644
--- a/includes/admin/settings/js/settings-admin-scripts.min.js
+++ b/includes/admin/settings/js/settings-admin-scripts.min.js
@@ -1 +1 @@
-jQuery(document).ready(function(t){function n(){i=1}function e(){if(1==i)return!0}function a(){i=0}t(".file-browser").on("click",function(n){n.preventDefault();var e=t(this),a=wp.media.frames.file_frame=wp.media({title:e.data("uploader_title"),button:{text:e.data("uploader_button_text")},multiple:!1});a.on("select",function(){attachment=a.state().get("selection").first().toJSON(),e.prev(".file-url").val(attachment.url).change()}),a.open()});var i=0;t("form").on("change","input, textarea, select",n),window.onbeforeunload=e,t('input[name="submit"], input#search-submit, input#doaction, input#doaction2, input[name="filter_action"]').on("click",a),t(function(){t("#post-body-content").tabs({create:function(n,e){t(e.tab.find("a")).addClass("nav-tab-active")},activate:function(n,e){t(e.oldTab.find("a")).removeClass("nav-tab-active"),t(e.newTab.find("a")).addClass("nav-tab-active")}})}),t(".color-field").each(function(n,e){t(e).wpColorPicker()}),t(".reset-default-thumb").on("click",function(){t("#wzkb_settings\\[thumb_default\\]").val(wzkb_admin.thumb_default)})});
\ No newline at end of file
+jQuery(document).ready((function(t){t(".file-browser").on("click",(function(e){e.preventDefault();var n=t(this),a=wp.media.frames.file_frame=wp.media({title:n.data("uploader_title"),button:{text:n.data("uploader_button_text")},multiple:!1});a.on("select",(function(){attachment=a.state().get("selection").first().toJSON(),n.prev(".file-url").val(attachment.url).change()})),a.open()}));var e=0;t("form").on("change","input, textarea, select",(function(){e=1})),window.onbeforeunload=function(){if(1==e)return!0},t('input[name="submit"], input#search-submit, input#doaction, input#doaction2, input[name="filter_action"]').on("click",(function(){e=0})),t((function(){t("#post-body-content").tabs({create:function(e,n){t(n.tab.find("a")).addClass("nav-tab-active")},activate:function(e,n){t(n.oldTab.find("a")).removeClass("nav-tab-active"),t(n.newTab.find("a")).addClass("nav-tab-active")}})})),t(".color-field").each((function(e,n){t(n).wpColorPicker()})),t(".reset-default-thumb").on("click",(function(){t("#wzkb_settings\\[thumb_default\\]").val(wzkb_admin.thumb_default)}))}));
\ No newline at end of file
diff --git a/includes/admin/settings/js/taxonomy-suggest.js b/includes/admin/settings/js/taxonomy-suggest.js
index c5a9eb9..4c59a2b 100644
--- a/includes/admin/settings/js/taxonomy-suggest.js
+++ b/includes/admin/settings/js/taxonomy-suggest.js
@@ -105,8 +105,4 @@ jQuery(document).ready(function($) {
$( '.category_autocomplete' ).each( function ( i, element ) {
$( element ).WZTagsSuggest();
});
-
- $('.widget-liquid-right, #customize-controls').on( 'click', '.category_autocomplete', function() {
- $( '.category_autocomplete' ).WZTagsSuggest();
- });
});
diff --git a/includes/admin/settings/js/taxonomy-suggest.min.js b/includes/admin/settings/js/taxonomy-suggest.min.js
index cf097e7..6988548 100644
--- a/includes/admin/settings/js/taxonomy-suggest.min.js
+++ b/includes/admin/settings/js/taxonomy-suggest.min.js
@@ -1 +1 @@
-jQuery(document).ready((function(t){t.fn.WZTagsSuggest=function(e){var o,n,a=t(this),u=(e=e||{}).taxonomy||a.attr("data-wp-taxonomy")||"category",c=e.tag_search||a.attr("data-wp-action")||"wz_tags_search";function i(t){return t.split(/,(?=(?:(?:[^"]*"){2})*[^"]*$)/)}function r(t){return i(t).pop()}delete e.taxonomy,delete e.tag_search,e=t.extend({minLength:2,position:{my:"left top+2",at:"left bottom",collision:"none"},source:function(e,a){var i;n!==e.term?(i=r(e.term),n!==e.term?(t.ajax({type:"POST",dataType:"json",url:ajaxurl,data:{action:c,tax:u,q:i}}).done((function(t){o=t,a(t)})),n=e.term):a(o)):a(o)},search:function(){if(r(this.value).length<2)return!1},focus:function(t,e){t.preventDefault()},select:function(t,e){var o=i(this.value),n=e.item.value;return-1!==n.indexOf(",")&&(n='"'+n+'"'),o.pop(),o.push(n),o.push(""),this.value=o.join(", "),!1}},e),a.on("keydown",(function(e){e.keyCode===t.ui.keyCode.TAB&&t(this).autocomplete("instance").menu.active&&e.preventDefault()})).autocomplete(e)},t(".category_autocomplete").each((function(e,o){t(o).WZTagsSuggest()})),t(".widget-liquid-right, #customize-controls").on("click",".category_autocomplete",(function(){t(".category_autocomplete").WZTagsSuggest()}))}));
\ No newline at end of file
+jQuery(document).ready((function(t){t.fn.WZTagsSuggest=function(e){var n,a,o=t(this),u=(e=e||{}).taxonomy||o.attr("data-wp-taxonomy")||"category",i=e.tag_search||o.attr("data-wp-action")||"wz_tags_search";function c(t){return t.split(/,(?=(?:(?:[^"]*"){2})*[^"]*$)/)}function r(t){return c(t).pop()}delete e.taxonomy,delete e.tag_search,e=t.extend({minLength:2,position:{my:"left top+2",at:"left bottom",collision:"none"},source:function(e,o){var c;a!==e.term?(c=r(e.term),a!==e.term?(t.ajax({type:"POST",dataType:"json",url:ajaxurl,data:{action:i,tax:u,q:c}}).done((function(t){n=t,o(t)})),a=e.term):o(n)):o(n)},search:function(){if(r(this.value).length<2)return!1},focus:function(t,e){t.preventDefault()},select:function(t,e){var n=c(this.value),a=e.item.value;return-1!==a.indexOf(",")&&(a='"'+a+'"'),n.pop(),n.push(a),n.push(""),this.value=n.join(", "),!1}},e),o.on("keydown",(function(e){e.keyCode===t.ui.keyCode.TAB&&t(this).autocomplete("instance").menu.active&&e.preventDefault()})).autocomplete(e)},t(".category_autocomplete").each((function(e,n){t(n).WZTagsSuggest()}))}));
\ No newline at end of file
diff --git a/includes/admin/settings/js/tom-select-init.js b/includes/admin/settings/js/tom-select-init.js
new file mode 100644
index 0000000..009f2b0
--- /dev/null
+++ b/includes/admin/settings/js/tom-select-init.js
@@ -0,0 +1,106 @@
+/* global ajaxurl, WZTomSelectSettings, jQuery, TomSelect */
+
+(function ($) {
+ 'use strict';
+
+ function initTomSelect() {
+ const elements = document.querySelectorAll('.ts_autocomplete');
+
+ elements.forEach(function (element) {
+ const prefix = element.getAttribute('data-wp-prefix') || 'WZ';
+ const settingsKey = `${prefix}TomSelectSettings`;
+ const settings = window[settingsKey] || WZTomSelectSettings;
+
+ const action = element.getAttribute('data-wp-action') || settings.action;
+ const nonce = element.getAttribute('data-wp-nonce') || settings.nonce;
+ const endpoint = element.getAttribute('data-wp-endpoint') || settings.endpoint;
+ const forms = settings.forms;
+ const tags = settings.tags;
+ const custom_fields = settings.custom_fields;
+ const strings = settings.strings;
+
+ const options = endpoint === 'forms' ? forms : (endpoint === 'tags' ? tags : (endpoint === 'custom_fields' ? custom_fields : []));
+
+ if (!options || !Array.isArray(options)) {
+ console.error('Invalid options for endpoint:', endpoint);
+ return;
+ }
+
+ const formattedOptions = options.map(item => ({ value: item.id, text: item.name }));
+
+ const savedIds = element.value.split(',').map(id => id.trim()).filter(Boolean);
+
+ // Get any custom config from data attributes
+ let customConfig = {};
+ const configAttr = element.getAttribute('data-ts-config');
+
+ if (configAttr) {
+ try {
+ customConfig = JSON.parse(configAttr);
+ console.log('Parsed custom config:', customConfig); // Debug log
+ } catch (e) {
+ console.error('Error parsing custom config:', configAttr, e);
+ }
+ }
+
+ // Default config
+ const defaultConfig = {
+ plugins: ['dropdown_input', 'clear_button', 'remove_button'],
+ valueField: 'value',
+ labelField: 'text',
+ searchField: ['text', 'value'],
+ options: formattedOptions,
+ items: savedIds,
+ persist: true,
+ createOnBlur: false,
+ create: false,
+ render: {
+ no_results: (data, escape) => `
+
+
+
+
+
+
+
+ ${strings.no_results.replace('%s', escape(data.input))}
`,
+ option: (data, escape) => `${escape(data.text)} (${escape(data.value)})
`,
+ item: (data, escape) => `${escape(data.text)} (${escape(data.value)})
`
+ },
+ load: function (query, callback) {
+ if (!query.length) {
+ callback();
+ return;
+ }
+
+ $.ajax({
+ url: ajaxurl,
+ type: 'POST',
+ dataType: 'json',
+ data: {
+ action: action,
+ nonce: nonce,
+ q: query,
+ endpoint: endpoint
+ },
+ error: function () {
+ callback();
+ },
+ success: function (res) {
+ if (res.success && Array.isArray(res.data)) {
+ callback(res.data.map(item => ({ value: item.id, text: item.name })));
+ } else {
+ callback();
+ }
+ }
+ });
+ }
+ };
+
+ // Merge default config with custom config
+ const finalConfig = { ...defaultConfig, ...customConfig };
+ console.log('Final config:', finalConfig); // Debug log
+
+ // Initialize Tom Select with merged config
+ try {
+ new TomSelect(element, finalConfig);
+ } catch (error) {
+ console.error('Tom Select initialization error:', error);
+ }
+ });
+ }
+
+ $(document).ready(initTomSelect);
+})(jQuery);
diff --git a/includes/admin/settings/js/tom-select-init.min.js b/includes/admin/settings/js/tom-select-init.min.js
new file mode 100644
index 0000000..2a93861
--- /dev/null
+++ b/includes/admin/settings/js/tom-select-init.min.js
@@ -0,0 +1 @@
+!function(t){"use strict";t(document).ready((function(){document.querySelectorAll(".ts_autocomplete").forEach((function(e){const a=e.getAttribute("data-wp-prefix")||"WZ",n=window[`${a}TomSelectSettings`]||WZTomSelectSettings,i=e.getAttribute("data-wp-action")||n.action,o=e.getAttribute("data-wp-nonce")||n.nonce,r=e.getAttribute("data-wp-endpoint")||n.endpoint,s=n.forms,c=n.tags,u=n.custom_fields,l=n.strings,d="forms"===r?s:"tags"===r?c:"custom_fields"===r?u:[];if(!d||!Array.isArray(d))return;const p=d.map((t=>({value:t.id,text:t.name}))),m=e.value.split(",").map((t=>t.trim())).filter(Boolean);let f={};const v=e.getAttribute("data-ts-config");if(v)try{f=JSON.parse(v)}catch(t){}const g={...{plugins:["dropdown_input","clear_button","remove_button"],valueField:"value",labelField:"text",searchField:["text","value"],options:p,items:m,persist:!0,createOnBlur:!1,create:!1,render:{no_results:(t,e)=>`${l.no_results.replace("%s",e(t.input))}
`,option:(t,e)=>`${e(t.text)} (${e(t.value)})
`,item:(t,e)=>`${e(t.text)} (${e(t.value)})
`},load:function(e,a){e.length?t.ajax({url:ajaxurl,type:"POST",dataType:"json",data:{action:i,nonce:o,q:e,endpoint:r},error:function(){a()},success:function(t){t.success&&Array.isArray(t.data)?a(t.data.map((t=>({value:t.id,text:t.name})))):a()}}):a()}},...f};try{new TomSelect(e,g)}catch(t){}}))}))}(jQuery);
\ No newline at end of file
diff --git a/includes/admin/settings/sidebar.php b/includes/admin/sidebar.php
similarity index 85%
rename from includes/admin/settings/sidebar.php
rename to includes/admin/sidebar.php
index 1e036e0..c15558f 100644
--- a/includes/admin/settings/sidebar.php
+++ b/includes/admin/sidebar.php
@@ -9,7 +9,7 @@
\ No newline at end of file
diff --git a/includes/autoloader.php b/includes/autoloader.php
index 9d58ad8..bb87e86 100644
--- a/includes/autoloader.php
+++ b/includes/autoloader.php
@@ -1,6 +1,6 @@
_x( 'Knowledge Base', 'Post Type General Name', 'knowledgebase' ),
- 'singular_name' => _x( 'Knowledge Base', 'Post Type Singular Name', 'knowledgebase' ),
- 'menu_name' => __( 'Knowledge Base', 'knowledgebase' ),
- 'name_admin_bar' => __( 'Knowledge Base Article', 'knowledgebase' ),
- 'parent_item_colon' => __( 'Parent Article', 'knowledgebase' ),
- 'all_items' => __( 'All Articles', 'knowledgebase' ),
- 'add_new_item' => __( 'Add New Article', 'knowledgebase' ),
- 'add_new' => __( 'Add New Article', 'knowledgebase' ),
- 'new_item' => __( 'New Article', 'knowledgebase' ),
- 'edit_item' => __( 'Edit Article', 'knowledgebase' ),
- 'update_item' => __( 'Update Article', 'knowledgebase' ),
- 'view_item' => __( 'View Article', 'knowledgebase' ),
- 'search_items' => __( 'Search Article', 'knowledgebase' ),
- 'not_found' => __( 'Not found', 'knowledgebase' ),
- 'not_found_in_trash' => __( 'Not found in Trash', 'knowledgebase' ),
+ 'name' => _x( 'Knowledge Base', 'Post Type General Name', 'knowledgebase' ),
+ 'singular_name' => _x( 'Knowledge Base', 'Post Type Singular Name', 'knowledgebase' ),
+ 'menu_name' => __( 'Knowledge Base', 'knowledgebase' ),
+ 'name_admin_bar' => __( 'KB Article', 'knowledgebase' ),
+ 'parent_item_colon' => __( 'Parent Article:', 'knowledgebase' ),
+ 'all_items' => __( 'All Articles', 'knowledgebase' ),
+ 'add_new_item' => __( 'Add New Article', 'knowledgebase' ),
+ 'add_new' => __( 'Add New Article', 'knowledgebase' ),
+ 'new_item' => __( 'New Article', 'knowledgebase' ),
+ 'edit_item' => __( 'Edit Article', 'knowledgebase' ),
+ 'update_item' => __( 'Update Article', 'knowledgebase' ),
+ 'view_item' => __( 'View Article', 'knowledgebase' ),
+ 'search_items' => __( 'Search Articles', 'knowledgebase' ),
+ 'not_found' => __( 'Not found', 'knowledgebase' ),
+ 'not_found_in_trash' => __( 'Not found in Trash', 'knowledgebase' ),
+ 'featured_image' => __( 'Article Featured Image', 'knowledgebase' ),
+ 'set_featured_image' => __( 'Set Article featured image', 'knowledgebase' ),
+ 'remove_featured_image' => __( 'Remove Article featured image', 'knowledgebase' ),
+ 'use_featured_image' => __( 'Use as Article featured image', 'knowledgebase' ),
+ 'insert_into_item' => __( 'Insert into Article', 'knowledgebase' ),
+ 'uploaded_to_this_item' => __( 'Uploaded to this Article', 'knowledgebase' ),
+ 'items_list' => __( 'Articles list', 'knowledgebase' ),
+ 'items_list_navigation' => __( 'Articles list navigation', 'knowledgebase' ),
+ 'filter_items_list' => __( 'Filter Articles list', 'knowledgebase' ),
);
/**
@@ -99,103 +108,140 @@ public static function register_post_type() {
}
/**
- * Register Knowledgebase Custom Taxonomies.
+ * Get base arguments for taxonomies.
*
- * @since 2.3.0
+ * @since 2.5.0
+ *
+ * @param string $slug Taxonomy slug.
+ * @param bool $is_hierarchical Whether the taxonomy is hierarchical.
+ *
+ * @return array Base arguments for the taxonomy.
*/
- public static function register_taxonomies() {
- $catslug = \wzkb_get_option( 'category_slug', 'section' );
- $tagslug = \wzkb_get_option( 'tag_slug', 'kb-tags' );
-
- $args = array(
- 'hierarchical' => true,
+ private static function get_taxonomy_base_args( string $slug, bool $is_hierarchical = true ): array {
+ return array(
+ 'hierarchical' => $is_hierarchical,
'show_admin_column' => true,
- 'show_tagcloud' => false,
'show_in_rest' => true,
+ 'show_tagcloud' => ! $is_hierarchical,
'rewrite' => array(
- 'slug' => $catslug,
+ 'slug' => $slug,
'with_front' => true,
- 'hierarchical' => true,
+ 'hierarchical' => $is_hierarchical,
),
);
+ }
- // Now register categories for the Knowledge Base.
- $catlabels = array(
- 'name' => _x( 'Sections', 'Taxonomy General Name', 'knowledgebase' ),
- 'singular_name' => _x( 'Section', 'Taxonomy Singular Name', 'knowledgebase' ),
- 'menu_name' => __( 'Sections', 'knowledgebase' ),
- 'all_items' => __( 'All Sections', 'knowledgebase' ),
- 'parent_item' => __( 'Parent Section', 'knowledgebase' ),
- 'parent_item_colon' => __( 'Parent Section:', 'knowledgebase' ),
- 'new_item_name' => __( 'New Section Name', 'knowledgebase' ),
- 'add_new_item' => __( 'Add New Section', 'knowledgebase' ),
- 'edit_item' => __( 'Edit Section', 'knowledgebase' ),
- 'update_item' => __( 'Update Section', 'knowledgebase' ),
- 'view_item' => __( 'View Section', 'knowledgebase' ),
- 'separate_items_with_commas' => __( 'Separate sections with commas', 'knowledgebase' ),
- 'add_or_remove_items' => __( 'Add or remove sections', 'knowledgebase' ),
+ /**
+ * Get full taxonomy labels.
+ *
+ * @since 2.5.0
+ *
+ * @param string $singular Singular name.
+ * @param string $plural Plural name.
+ *
+ * @return array Taxonomy labels.
+ */
+ private static function get_taxonomy_labels( string $singular, string $plural ): array {
+ $labels = array(
+ /* translators: 1: Plural taxonomy name. */
+ 'name' => sprintf( _x( 'Knowledge Base %1$s', 'Taxonomy General Name', 'knowledgebase' ), $plural ),
+ /* translators: 1: Singular taxonomy name. */
+ 'singular_name' => sprintf( _x( 'Knowledge Base %1$s', 'Taxonomy Singular Name', 'knowledgebase' ), $singular ),
+ /* translators: 1: Plural taxonomy name. */
+ 'menu_name' => $plural,
+ /* translators: 1: Plural taxonomy name. */
+ 'all_items' => sprintf( __( 'All %1$s', 'knowledgebase' ), $plural ),
+ /* translators: 1: Singular taxonomy name. */
+ 'parent_item' => sprintf( __( 'Parent %1$s', 'knowledgebase' ), $singular ),
+ /* translators: 1: Singular taxonomy name. */
+ 'parent_item_colon' => sprintf( __( 'Parent %1$s:', 'knowledgebase' ), $singular ),
+ /* translators: 1: Singular taxonomy name. */
+ 'new_item_name' => sprintf( __( 'New %1$s Name', 'knowledgebase' ), $singular ),
+ /* translators: 1: Singular taxonomy name. */
+ 'add_new_item' => sprintf( __( 'Add New %1$s', 'knowledgebase' ), $singular ),
+ /* translators: 1: Singular taxonomy name. */
+ 'edit_item' => sprintf( __( 'Edit %1$s', 'knowledgebase' ), $singular ),
+ /* translators: 1: Singular taxonomy name. */
+ 'update_item' => sprintf( __( 'Update %1$s', 'knowledgebase' ), $singular ),
+ /* translators: 1: Singular taxonomy name. */
+ 'view_item' => sprintf( __( 'View %1$s', 'knowledgebase' ), $singular ),
+ /* translators: 1: Plural taxonomy name. */
+ 'separate_items_with_commas' => sprintf( __( 'Separate %1$s with commas', 'knowledgebase' ), $plural ),
+ /* translators: 1: Plural taxonomy name. */
+ 'add_or_remove_items' => sprintf( __( 'Add or remove %1$s', 'knowledgebase' ), $plural ),
'choose_from_most_used' => __( 'Choose from the most used', 'knowledgebase' ),
- 'popular_items' => __( 'Popular Sections', 'knowledgebase' ),
- 'search_items' => __( 'Search Sections', 'knowledgebase' ),
+ /* translators: 1: Plural taxonomy name. */
+ 'popular_items' => sprintf( __( 'Popular %1$s', 'knowledgebase' ), $plural ),
+ /* translators: 1: Plural taxonomy name. */
+ 'search_items' => sprintf( __( 'Search %1$s', 'knowledgebase' ), $plural ),
'not_found' => __( 'Not Found', 'knowledgebase' ),
- 'no_terms' => __( 'No sections', 'knowledgebase' ),
- 'items_list' => __( 'Sections list', 'knowledgebase' ),
- 'items_list_navigation' => __( 'Sections list navigation', 'knowledgebase' ),
+ /* translators: 1: Plural taxonomy name. */
+ 'no_terms' => sprintf( __( 'No %1$s found', 'knowledgebase' ), $plural ),
+ /* translators: 1: Plural taxonomy name. */
+ 'items_list' => sprintf( __( '%1$s list', 'knowledgebase' ), $plural ),
+ /* translators: 1: Plural taxonomy name. */
+ 'items_list_navigation' => sprintf( __( '%1$s list navigation', 'knowledgebase' ), $plural ),
+ /* translators: 1: Plural taxonomy name. */
+ 'back_to_items' => sprintf( __( 'Back to %1$s', 'knowledgebase' ), $plural ),
);
+ return $labels;
+ }
+
+ /**
+ * Register Knowledgebase Custom Taxonomies.
+ *
+ * @since 2.3.0
+ */
+ public static function register_taxonomies() {
+ // Get taxonomy slugs from options.
+ $catslug = \wzkb_get_option( 'category_slug', 'kb/section' );
+ $tagslug = \wzkb_get_option( 'tag_slug', 'kb/tags' );
+ $productslug = \wzkb_get_option( 'product_slug', 'kb/products' );
+
+ // Register products taxonomy first.
+ $product_args = self::get_taxonomy_base_args( $productslug, false );
+ $product_args['labels'] = self::get_taxonomy_labels( 'Product', 'Products' );
+
/**
- * Filter the labels of the custom categories.
+ * Filter the arguments of the products taxonomy.
+ *
+ * @since 3.0.0
+ *
+ * @param array $product_args Product arguments
+ */
+ $product_args = apply_filters( 'wzkb_product_args', $product_args );
+
+ register_taxonomy( 'wzkb_product', array( 'wz_knowledgebase' ), $product_args );
+
+ // Register categories (sections) taxonomy.
+ $cat_args = self::get_taxonomy_base_args( $catslug, true );
+ $cat_args['labels'] = self::get_taxonomy_labels( 'Section', 'Sections' );
+
+ /**
+ * Filter the arguments of the custom categories.
*
* @since 1.2.0
*
- * @param array $catlabels Category labels
+ * @param array $cat_args Category arguments
*/
- $args['labels'] = apply_filters( 'wzkb_cat_labels', $catlabels );
-
- register_taxonomy(
- 'wzkb_category',
- array( 'wz_knowledgebase' ),
- /**
- * Filter the arguments of the custom categories.
- *
- * @since 1.2.0
- *
- * @param array $catlabels Category labels
- */
- apply_filters( 'wzkb_cat_args', $args )
- );
+ $cat_args = apply_filters( 'wzkb_cat_args', $cat_args );
- // Now register tags for the Knowledge Base.
- $taglabels = array(
- 'name' => _x( 'Tags', 'Taxonomy General Name', 'knowledgebase' ),
- 'singular_name' => _x( 'Tag', 'Taxonomy Singular Name', 'knowledgebase' ),
- 'menu_name' => __( 'Tags', 'knowledgebase' ),
- );
+ register_taxonomy( 'wzkb_category', array( 'wz_knowledgebase' ), $cat_args );
+
+ // Register tags taxonomy.
+ $tag_args = self::get_taxonomy_base_args( $tagslug, false );
+ $tag_args['labels'] = self::get_taxonomy_labels( 'Tag', 'Tags' );
/**
- * Filter the labels of the custom tags.
+ * Filter the arguments of the custom tags.
*
* @since 1.2.0
*
- * @param array $taglabels Tags labels
+ * @param array $tag_args Tag arguments
*/
- $args['labels'] = apply_filters( 'wzkb_tag_labels', $taglabels );
-
- $args['hierarchical'] = false;
- $args['show_tagcloud'] = true;
- $args['rewrite']['slug'] = $tagslug;
-
- register_taxonomy(
- 'wzkb_tag',
- array( 'wz_knowledgebase' ),
- /**
- * Filter the arguments of the custom tags.
- *
- * @since 1.2.0
- *
- * @param array $args Tag arguments
- */
- apply_filters( 'wzkb_tag_args', $args )
- );
+ $tag_args = apply_filters( 'wzkb_tag_args', $tag_args );
+
+ register_taxonomy( 'wzkb_tag', array( 'wz_knowledgebase' ), $tag_args );
}
}
diff --git a/includes/class-main.php b/includes/class-main.php
index c534f45..9f7f674 100644
--- a/includes/class-main.php
+++ b/includes/class-main.php
@@ -7,7 +7,8 @@
namespace WebberZone\Knowledge_Base;
-use WebberZone\Knowledge_Base\Admin\Activator;
+use WebberZone\Knowledge_Base\Admin\Admin;
+use WebberZone\Knowledge_Base\Pro\Pro;
if ( ! defined( 'WPINC' ) ) {
exit;
@@ -31,99 +32,108 @@ final class Main {
*
* @since 2.3.0
*
- * @var object Admin.
+ * @var Admin|null Admin instance.
*/
- public $admin;
+ public ?Admin $admin = null;
+
+ /**
+ * Pro features class.
+ *
+ * @since 3.0.0
+ *
+ * @var Pro|null Pro instance.
+ */
+ public ?Pro $pro = null;
/**
* Shortcodes.
*
* @since 2.3.0
*
- * @var object Shortcodes.
+ * @var Frontend\Shortcodes Shortcodes handler.
*/
- public $shortcodes;
+ public Frontend\Shortcodes $shortcodes;
/**
* Styles.
*
* @since 2.3.0
*
- * @var object Styles.
+ * @var Frontend\Styles_Handler Styles handler.
*/
- public $styles;
+ public Frontend\Styles_Handler $styles;
/**
* Language Handler.
*
* @since 2.3.0
*
- * @var object Language Handler.
+ * @var Frontend\Language_Handler Language handler.
*/
- public $language;
+ public Frontend\Language_Handler $language;
/**
* Display.
*
* @since 2.3.0
*
- * @var object Display.
+ * @var Frontend\Display Display handler.
*/
- public $display;
+ public Frontend\Display $display;
/**
* Template Handler.
*
* @since 4.0.0
*
- * @var object Template Handler.
+ * @var Frontend\Template_Handler Template handler.
*/
- public $template_handler;
+ public Frontend\Template_Handler $template_handler;
/**
* CPT.
*
* @since 2.3.0
*
- * @var object CPT.
+ * @var CPT CPT handler.
*/
- public $cpt;
+ public CPT $cpt;
/**
* Feed.
*
* @since 2.3.0
*
- * @var object Feed.
+ * @var Frontend\Feed Feed handler.
*/
- public $feed;
+ public Frontend\Feed $feed;
/**
* Search.
*
* @since 2.3.0
*
- * @var object Search.
+ * @var Frontend\Search Search handler.
*/
- public $search;
+ public Frontend\Search $search;
/**
* Blocks.
*
* @since 2.3.0
*
- * @var object Blocks.
+ * @var Blocks\Blocks Blocks handler.
*/
- public $blocks;
+ public Blocks\Blocks $blocks;
/**
* Related articles.
*
* @since 2.3.0
*
- * @var object Related articles.
+ * @var Frontend\Related Related articles handler.
*/
- public $related_articles;
+ public Frontend\Related $related_articles;
/**
* Gets the instance of the class.
@@ -169,8 +179,13 @@ private function init() {
$this->hooks();
+ // Conditionally load Pro if available.
+ if ( class_exists( 'WebberZone\\Knowledge_Base\\Pro\\Pro' ) ) {
+ $this->pro = new Pro();
+ }
+
if ( is_admin() ) {
- $this->admin = new Admin\Admin();
+ $this->admin = new Admin();
}
}
diff --git a/includes/class-options-api.php b/includes/class-options-api.php
new file mode 100644
index 0000000..94177df
--- /dev/null
+++ b/includes/class-options-api.php
@@ -0,0 +1,312 @@
+cap->assign_terms ) ) {
+ wp_die();
+ }
+ }
+
+ $s = isset( $_REQUEST['q'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['q'] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+
+ $comma = _x( ',', 'tag delimiter' );
+ if ( ',' !== $comma ) {
+ $s = str_replace( $comma, ',', $s );
+ }
+ if ( false !== strpos( $s, ',' ) ) {
+ $s = explode( ',', $s );
+ $s = $s[ count( $s ) - 1 ];
+ }
+ $s = trim( $s );
+
+ /** This filter has been defined in /wp-admin/includes/ajax-actions.php */
+ $term_search_min_chars = (int) apply_filters( 'term_search_min_chars', 2, $tax, $s );
+
+ /*
+ * Require $term_search_min_chars chars for matching (default: 2)
+ * ensure it's a non-negative, non-zero integer.
+ */
+ if ( ( 0 === $term_search_min_chars ) || ( strlen( $s ) < $term_search_min_chars ) ) {
+ wp_die();
+ }
+
+ $results = get_terms(
+ array(
+ 'taxonomy' => $taxonomy,
+ 'name__like' => $s,
+ 'fields' => 'names',
+ 'hide_empty' => false,
+ )
+ );
+
+ echo wp_json_encode( $results );
+ wp_die();
+ }
+}
+
+// Initialize hooks.
+Options_API::init();
diff --git a/includes/frontend/class-display.php b/includes/frontend/class-display.php
index 08926ab..573c76b 100644
--- a/includes/frontend/class-display.php
+++ b/includes/frontend/class-display.php
@@ -38,6 +38,7 @@ public function __construct() {
* Optional. Array of parameters.
*
* @type int $category Create a knowledge base for this category.
+ * @type int $product Create a knowledge base for this product.
* @type bool $is_shortcode Is this created using the shortcode?
* @type bool $is_block Is this created using the block?
* @type string $extra_class Space separated list of classes for the wrapping `div`.
@@ -52,6 +53,7 @@ public function __construct() {
public static function get_knowledge_base( $args = array() ) {
$defaults = array(
'category' => 0,
+ 'product' => 0,
'is_shortcode' => false,
'is_block' => false,
'extra_class' => '',
@@ -70,42 +72,61 @@ public static function get_knowledge_base( $args = array() ) {
$args['columns'] = ( ! empty( absint( $args['columns'] ) ) ) ? absint( $args['columns'] ) : \wzkb_get_option( 'columns' );
// Set default classes.
- $classes = array();
- $classes[] = $args['extra_class'];
- $classes[] = $args['is_shortcode'] ? 'wzkb_shortcode' : '';
- $classes[] = $args['is_block'] ? 'wzkb_block' : '';
- $div_classes = implode( ' ', $classes );
-
- /**
- * Filter the classes added to the div wrapper of the Knowledge Base.
- *
- * @since 2.0.0
- *
- * @param string $div_classes String with the classes of the div wrapper.
- */
- $div_classes = apply_filters( 'wzkb_div_class', $div_classes );
+ $div_classes = self::build_wrapper_classes( $args );
$output = '';
- // Are we trying to display a category?
- $category = intval( $args['category'] );
+ $product = intval( $args['product'] );
+ $category = intval( $args['category'] );
+ $is_multi_product = \wzkb_get_option( 'multi_product' );
- // If $category = -1, then get the current term object and set the category to the term ID.
- if ( -1 === $category ) {
- $term = get_queried_object();
- if ( isset( $term->term_id ) ) {
- $category = $term->term_id;
+ // Harmonize: If product = -1, auto-detect current product term (like category does).
+ if ( -1 === $product ) {
+ $queried_object = get_queried_object();
+ if ( isset( $queried_object->term_id ) && isset( $queried_object->taxonomy ) && 'wzkb_product' === $queried_object->taxonomy ) {
+ $product = intval( $queried_object->term_id );
}
}
- $level = $category > 0 ? 1 : 0;
- $term_id = $category > 0 ? $category : 0;
- $nested_wrapper = isset( $args['nested_wrapper'] ) ? $args['nested_wrapper'] : true;
-
- $output .= self::get_knowledge_base_loop( $term_id, $level, $nested_wrapper, $args );
+ if ( $is_multi_product ) {
+ if ( $product > 0 ) {
+ // Product-specific view in multi-product mode.
+ $output .= self::render_product_sections( $product, $args );
+ } elseif ( 0 === $product && 0 === $category ) {
+ // Products archive view in multi-product mode.
+ $products = self::fetch_terms( 'wzkb_product' );
+ if ( ! empty( $products ) && ! is_wp_error( $products ) ) {
+ foreach ( $products as $product_term ) {
+ $output .= '
'; // End wzkb_section.
- $output .= '';
+ $output .= '';
+ // Display product title as clickable if clickable_section is enabled.
+ $output .= '
';
+ }
+ } else {
+ $output .= ''; + if ( $args['clickable_section'] ) { + // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_term_link is properly escaped below. + $output .= '' . esc_html( $product_term->name ) . ''; + } else { + $output .= esc_html( $product_term->name ); + } + $output .= '
'; + if ( $product_term->description ) { + $output .= '' . esc_html( $product_term->description ) . '
';
+ }
+ $output .= self::render_product_sections( $product_term->term_id, $args );
+ $output .= '' . esc_html__( 'No products found.', 'knowledgebase' ) . '
';
+ }
+ } else {
+ // Fallback to category view even in multi-product mode.
+ $output .= self::render_category_view( $category, $args );
+ }
+ } else {
+ // Single product mode (default): Simple category-based structure.
+ $output .= self::render_category_view( $category, $args );
+ }
- $output .= '