← All changes
|
includes/abilities/settings/class-settings-key-map.php
+156
-19
2.5.0
→
2.10.0
View file →
| @@ -74,9 +74,9 @@ | ||
| 74 | 74 | 'enabled' => self::boolean( __( 'Whether site identity management is active.', 'thinkrank' ) ), |
| 75 | 75 | 'site_name' => self::string( __( 'Official name of the site, used in titles and schema.', 'thinkrank' ) ), |
| 76 | 76 | 'site_description' => self::string( __( 'Short description of the site.', 'thinkrank' ) ), |
| 77 | 77 | 'tagline' => self::string( __( 'Site tagline.', 'thinkrank' ) ), |
| 78 | - 'alternate_name' => self::string( __( 'Alternate or former name of the site, published as schema alternateName.', 'thinkrank' ) ), | |
| 78 | + 'alternate_name' => self::alternate_name(), | |
| 79 | 79 | 'identity_type' => self::string( __( 'What the site is, e.g. "blog", "business", "portfolio".', 'thinkrank' ) ), |
| 80 | 80 | 'represents' => self::string( __( 'Whether the site represents a "person" or an "organization".', 'thinkrank' ) ), |
| 81 | 81 | 'default_meta_description' => self::string( __( 'Meta description used where no more specific one is set.', 'thinkrank' ) ), |
| 82 | 82 | 'default_social_image' => self::string( __( 'URL of the fallback social sharing image.', 'thinkrank' ) ), |
| @@ -120,9 +120,22 @@ | ||
| 120 | 120 | |
| 121 | 121 | // Business / Local SEO. Feeds LocalBusiness schema. |
| 122 | 122 | 'local_seo_enabled' => self::boolean( __( 'Whether Local SEO output and LocalBusiness schema are enabled.', 'thinkrank' ) ), |
| 123 | 123 | 'business_name' => self::string( __( 'Registered business name.', 'thinkrank' ) ), |
| 124 | - 'business_type' => self::string( __( 'schema.org business type, e.g. "Restaurant", "Store".', 'thinkrank' ) ), | |
| 124 | + // Enumerated rather than free-form: the value goes straight into | |
| 125 | + // LocalBusiness schema, so an invented type is invalid structured | |
| 126 | + // data. ~150 schema.org subtypes are accepted (#623). | |
| 127 | + // | |
| 128 | + // '' is in the list because it is a real stored state ("not set"): | |
| 129 | + // the store holds it on every site that never opened Local SEO, and | |
| 130 | + // without it the READ ability failed its own output schema on those | |
| 131 | + // sites and there was no way to clear the value over MCP. It goes | |
| 132 | + // last so the root stays first, which read() falls back to. | |
| 133 | + 'business_type' => [ | |
| 134 | + 'type' => 'string', | |
| 135 | + 'enum' => array_merge( \ThinkRank\Config\Local_Business_Types_Config::get_types(), [ '' ] ), | |
| 136 | + 'description' => __( 'schema.org LocalBusiness type, e.g. "Restaurant", "HealthAndBeautyBusiness". "LocalBusiness" is the general-purpose default and is always valid. An empty string means not set, and is published as LocalBusiness.', 'thinkrank' ), | |
| 137 | + ], | |
| 125 | 138 | 'business_email' => self::string( __( 'Public contact email address.', 'thinkrank' ) ), |
| 126 | 139 | 'business_phone' => self::string( __( 'Public contact telephone number.', 'thinkrank' ) ), |
| 127 | 140 | 'business_address' => self::string( __( 'Street address.', 'thinkrank' ) ), |
| 128 | 141 | 'business_city' => self::string( __( 'City or locality.', 'thinkrank' ) ), |
| @@ -135,9 +148,20 @@ | ||
| 135 | 148 | 'business_hours' => self::business_hours(), |
| 136 | 149 | |
| 137 | 150 | // Indexing. |
| 138 | 151 | 'allow_search_engines' => self::boolean( __( 'Whether search engines are allowed to index the site.', 'thinkrank' ) ), |
| 152 | + 'query_protection' => self::boolean( __( 'Whether a URL whose content selector resolved to nothing (for example ?post_type=nosuchtype) answers 404 instead of serving the blog listing at 200.', 'thinkrank' ) ), | |
| 153 | + 'canonical_scheme' => [ | |
| 154 | + 'type' => 'string', | |
| 155 | + 'description' => __( 'Scheme for canonical URLs, og:url, schema @ids and sitemap entries. "automatic" follows WordPress; the other two override it, for a site behind a proxy that terminates TLS and leaves WordPress reporting the wrong scheme.', 'thinkrank' ), | |
| 156 | + 'enum' => \ThinkRank\SEO\Url_Scheme::MODES, | |
| 157 | + ], | |
| 139 | 158 | 'robots_txt_enabled' => self::boolean( __( 'Whether ThinkRank manages robots.txt. Its contents are set with thinkrank/update-robots-txt.', 'thinkrank' ) ), |
| 159 | + | |
| 160 | + // RSS feeds. | |
| 161 | + 'feed_excerpt_only' => self::boolean( __( 'Whether feed entries are shortened to an excerpt instead of carrying the full post.', 'thinkrank' ) ), | |
| 162 | + 'feed_source_link' => self::boolean( __( 'Whether each feed entry is signed with a link back to the original post and the site.', 'thinkrank' ) ), | |
| 163 | + 'feed_noindex' => self::boolean( __( 'Whether feeds are served with X-Robots-Tag: noindex. Leave off for a podcast feed, which needs to be indexable.', 'thinkrank' ) ), | |
| 140 | 164 | 'ai_crawler_rules' => self::ai_crawler_rules(), |
| 141 | 165 | ]; |
| 142 | 166 | } |
| 143 | 167 | |
| @@ -148,8 +172,13 @@ | ||
| 148 | 172 | */ |
| 149 | 173 | public static function sitemap(): array { |
| 150 | 174 | return [ |
| 151 | 175 | 'enabled' => self::boolean( __( 'Whether XML sitemap generation is active.', 'thinkrank' ) ), |
| 176 | + 'delivery_mode' => [ | |
| 177 | + 'type' => 'string', | |
| 178 | + 'enum' => \ThinkRank\SEO\Sitemap_Generator::DELIVERY_MODES, | |
| 179 | + 'description' => __( 'How the sitemap reaches crawlers. "auto" writes files when the WordPress root is writable and serves the sitemap from WordPress when it is not. "static" always writes files, and fails where that is not possible. "dynamic" always serves from WordPress and writes nothing.', 'thinkrank' ), | |
| 180 | + ], | |
| 152 | 181 | 'auto_generate' => self::boolean( __( 'Whether the sitemap regenerates automatically when content changes.', 'thinkrank' ) ), |
| 153 | 182 | 'use_sitemap_index' => self::boolean( __( 'Whether to publish a sitemap index that links per-type sitemaps, rather than one flat file.', 'thinkrank' ) ), |
| 154 | 183 | 'links_per_sitemap' => [ |
| 155 | 184 | 'type' => 'integer', |
| @@ -160,8 +189,14 @@ | ||
| 160 | 189 | 'custom_url_pattern' => self::string( __( 'Filename pattern for generated sitemaps, e.g. "sitemap-{type}.xml".', 'thinkrank' ) ), |
| 161 | 190 | 'enable_styling' => self::boolean( __( 'Whether an XSL stylesheet is attached so the sitemap is readable in a browser.', 'thinkrank' ) ), |
| 162 | 191 | 'ping_search_engines' => self::boolean( __( 'Whether search engines are notified after the sitemap is regenerated.', 'thinkrank' ) ), |
| 163 | 192 | |
| 193 | + // How the styled sitemap looks. All four need enable_styling on. | |
| 194 | + 'styling_logo' => self::boolean( __( 'Whether a logo is shown above the sitemap heading. Requires enable_styling.', 'thinkrank' ) ), | |
| 195 | + 'styling_logo_url' => self::string( __( 'URL of the sitemap logo image. Empty falls back to the site icon.', 'thinkrank' ) ), | |
| 196 | + 'styling_color_main' => self::string( __( 'Hex colour ("#rrggbb") for the sitemap header, links and table head. Empty keeps the stock palette.', 'thinkrank' ) ), | |
| 197 | + 'styling_color_accent' => self::string( __( 'Hex colour ("#rrggbb") for the header gradient end and link hovers. Empty keeps the stock palette.', 'thinkrank' ) ), | |
| 198 | + | |
| 164 | 199 | // What goes in. |
| 165 | 200 | 'include_posts' => self::boolean( __( 'Whether posts are included.', 'thinkrank' ) ), |
| 166 | 201 | 'include_pages' => self::boolean( __( 'Whether pages are included.', 'thinkrank' ) ), |
| 167 | 202 | 'include_categories' => self::boolean( __( 'Whether category archives are included.', 'thinkrank' ) ), |
| @@ -182,8 +217,17 @@ | ||
| 182 | 217 | * |
| 183 | 218 | * The store keeps everything as strings ("1"/""), so each value is coerced |
| 184 | 219 | * back to the type the schema advertises before it reaches an agent. |
| 185 | 220 | * |
| 221 | + * The same properties are the read ability's OUTPUT schema, which the | |
| 222 | + * Abilities API validates, and one value that fails it fails the whole | |
| 223 | + * call. So what comes out has to fit the schema for any stored value, not | |
| 224 | + * only for what today's save path writes: a business type imported before | |
| 225 | + * the list was enumerated, or a crawler rule whose crawler a filter has | |
| 226 | + * since removed, used to turn every get-site-identity-settings call into | |
| 227 | + * ability_invalid_output. Hence the recursion into objects, and the enum | |
| 228 | + * fallback in read_value(). | |
| 229 | + * | |
| 186 | 230 | * @param array<string, array<string, mixed>> $properties Schema properties for the category. |
| 187 | 231 | * @param array<string, mixed> $stored Settings as the manager returns them. |
| 188 | 232 | * @return array<string, mixed> Exposed settings, one entry per declared key. |
| 189 | 233 | */ |
| @@ -190,27 +234,86 @@ | ||
| 190 | 234 | public static function read( array $properties, array $stored ): array { |
| 191 | 235 | $out = []; |
| 192 | 236 | |
| 193 | 237 | foreach ( $properties as $key => $property ) { |
| 194 | - $value = $stored[ $key ] ?? null; | |
| 238 | + $out[ $key ] = self::read_value( $property, $stored[ $key ] ?? null ); | |
| 239 | + } | |
| 195 | 240 | |
| 196 | - switch ( $property['type'] ) { | |
| 197 | - case 'boolean': | |
| 198 | - $out[ $key ] = (bool) $value; | |
| 199 | - break; | |
| 200 | - case 'integer': | |
| 201 | - $out[ $key ] = (int) $value; | |
| 202 | - break; | |
| 203 | - case 'array': | |
| 204 | - case 'object': | |
| 205 | - $out[ $key ] = is_array( $value ) ? $value : []; | |
| 206 | - break; | |
| 207 | - default: | |
| 208 | - $out[ $key ] = (string) ( $value ?? '' ); | |
| 209 | - } | |
| 241 | + return $out; | |
| 242 | + } | |
| 243 | + | |
| 244 | + /** | |
| 245 | + * Coerce one stored value to the shape its property declares. | |
| 246 | + * | |
| 247 | + * An enumerated string that holds something outside its enum reads as the | |
| 248 | + * enum's FIRST entry. Every enum in this map is ordered so that entry is | |
| 249 | + * the value its manager falls back to for anything unrecognised | |
| 250 | + * (`automatic`, `auto`, `allow`, `LocalBusiness`), so the agent is told | |
| 251 | + * what the site actually does rather than a value it would be refused if | |
| 252 | + * it wrote it back. | |
| 253 | + * | |
| 254 | + * @since 2.10.0 | |
| 255 | + * | |
| 256 | + * @param array<string, mixed> $property Schema property. | |
| 257 | + * @param mixed $value Stored value, or null when absent. | |
| 258 | + * @return mixed | |
| 259 | + */ | |
| 260 | + private static function read_value( array $property, $value ) { | |
| 261 | + $type = $property['type'] ?? 'string'; | |
| 262 | + | |
| 263 | + // A union type ('string' or a list of them) keeps whichever shape | |
| 264 | + // it arrived in: casting to string would flatten a list, and | |
| 265 | + // casting to array would replace a name with [] (#692). | |
| 266 | + if ( is_array( $type ) ) { | |
| 267 | + return is_array( $value ) | |
| 268 | + ? array_values( array_map( 'strval', array_filter( $value, 'is_scalar' ) ) ) | |
| 269 | + : ( is_scalar( $value ) ? (string) $value : '' ); | |
| 210 | 270 | } |
| 211 | 271 | |
| 212 | - return $out; | |
| 272 | + switch ( $type ) { | |
| 273 | + case 'boolean': | |
| 274 | + return (bool) $value; | |
| 275 | + case 'integer': | |
| 276 | + return (int) $value; | |
| 277 | + case 'array': | |
| 278 | + if ( ! is_array( $value ) ) { | |
| 279 | + return []; | |
| 280 | + } | |
| 281 | + if ( isset( $property['items'] ) && is_array( $property['items'] ) ) { | |
| 282 | + $items = $property['items']; | |
| 283 | + return array_values( array_map( static fn( $item ) => self::read_value( $items, $item ), $value ) ); | |
| 284 | + } | |
| 285 | + return $value; | |
| 286 | + case 'object': | |
| 287 | + if ( ! is_array( $value ) ) { | |
| 288 | + return []; | |
| 289 | + } | |
| 290 | + if ( empty( $property['properties'] ) || ! is_array( $property['properties'] ) ) { | |
| 291 | + return $value; | |
| 292 | + } | |
| 293 | + | |
| 294 | + $declared = $property['properties']; | |
| 295 | + $closed = isset( $property['additionalProperties'] ) && false === $property['additionalProperties']; | |
| 296 | + $object = []; | |
| 297 | + | |
| 298 | + foreach ( $value as $name => $item ) { | |
| 299 | + if ( isset( $declared[ $name ] ) ) { | |
| 300 | + $object[ $name ] = self::read_value( $declared[ $name ], $item ); | |
| 301 | + } elseif ( ! $closed ) { | |
| 302 | + $object[ $name ] = $item; | |
| 303 | + } | |
| 304 | + } | |
| 305 | + | |
| 306 | + return $object; | |
| 307 | + default: | |
| 308 | + $string = is_scalar( $value ) ? (string) $value : ''; | |
| 309 | + | |
| 310 | + if ( ! empty( $property['enum'] ) && ! in_array( $string, $property['enum'], true ) ) { | |
| 311 | + return (string) reset( $property['enum'] ); | |
| 312 | + } | |
| 313 | + | |
| 314 | + return $string; | |
| 315 | + } | |
| 213 | 316 | } |
| 214 | 317 | |
| 215 | 318 | /** |
| 216 | 319 | * Coerce an incoming patch to the declared types, dropping unknown keys. |
| @@ -233,9 +336,21 @@ | ||
| 233 | 336 | } |
| 234 | 337 | |
| 235 | 338 | $value = $incoming[ $key ]; |
| 236 | 339 | |
| 237 | - switch ( $property['type'] ) { | |
| 340 | + $type = $property['type'] ?? 'string'; | |
| 341 | + | |
| 342 | + // A union type ('string' or a list of them) keeps whichever shape | |
| 343 | + // it arrived in: casting to string would flatten a list, and | |
| 344 | + // casting to array would replace a name with [] (#692). | |
| 345 | + if ( is_array( $type ) ) { | |
| 346 | + $out[ $key ] = is_array( $value ) | |
| 347 | + ? array_values( array_map( 'strval', $value ) ) | |
| 348 | + : (string) ( $value ?? '' ); | |
| 349 | + continue; | |
| 350 | + } | |
| 351 | + | |
| 352 | + switch ( $type ) { | |
| 238 | 353 | case 'boolean': |
| 239 | 354 | $out[ $key ] = (bool) $value; |
| 240 | 355 | break; |
| 241 | 356 | case 'integer': |
| @@ -346,8 +461,30 @@ | ||
| 346 | 461 | * |
| 347 | 462 | * @param string $description Translated text describing what the toggle does. |
| 348 | 463 | * @return array<string, mixed> |
| 349 | 464 | */ |
| 465 | + /** | |
| 466 | + * The site's alternate name, as one value or several. | |
| 467 | + * | |
| 468 | + * schema.org and Google both allow `alternateName` to carry a list, and the | |
| 469 | + * store already round-trips either shape, so the schema says so rather than | |
| 470 | + * forcing a caller to pick one name and drop the rest (#692). | |
| 471 | + * | |
| 472 | + * @since 2.7.0 | |
| 473 | + * @return array<string, mixed> | |
| 474 | + */ | |
| 475 | + private static function alternate_name(): array { | |
| 476 | + return [ | |
| 477 | + // A union rather than anyOf: read() and coerce() switch on `type`, | |
| 478 | + // and an entry without one is dropped as unrecognised. WordPress's | |
| 479 | + // schema validator accepts a type list, so this is both valid JSON | |
| 480 | + // Schema and legible to this file's own consumers. | |
| 481 | + 'type' => [ 'string', 'array' ], | |
| 482 | + 'items' => [ 'type' => 'string' ], | |
| 483 | + 'description' => __( 'Alternate or former name of the site, published as schema alternateName on the homepage WebSite node. Send a string for one name, or an array for several. Blank entries and duplicates are dropped, and a single surviving name is published as a string.', 'thinkrank' ), | |
| 484 | + ]; | |
| 485 | + } | |
| 486 | + | |
| 350 | 487 | private static function boolean( string $description ): array { |
| 351 | 488 | return [ |
| 352 | 489 | 'type' => 'boolean', |
| 353 | 490 | 'description' => $description, |