| @@ -384,8 +384,10 @@ | ||
| 384 | 384 | $default_options['specific_ids'] = ''; |
| 385 | 385 | |
| 386 | 386 | $default_options['triggers_immediate_eot'] = 'reversals'; |
| 387 | 387 | $default_options['membership_eot_behavior'] = 'demote'; |
| 388 | + $default_options['eot_demotion_to_role'] = 'subscriber'; | |
| 389 | + $default_options['eot_demotion_from'] = 'all'; //260916.2137 Missing options must preserve legacy behavior until a fresh activation explicitly stores the new Level-only default. | |
| 388 | 390 | $default_options['eot_time_ext_behavior'] = 'extend'; |
| 389 | 391 | $default_options['auto_eot_system_enabled'] = '1'; |
| 390 | 392 | $default_options['auto_eot_system_runtime_mode'] = 'auto'; |
| 391 | 393 | $default_options['auto_eot_system_runtime_custom'] = '30'; |
| @@ -691,8 +693,15 @@ | ||
| 691 | 693 | else if($key === 'triggers_immediate_eot' && (!is_string($value) || !preg_match('/^(?:none|refunds|reversals|refunds,reversals|refunds,partial_refunds,reversals)$/', $value))) |
| 692 | 694 | $value = $default_options[$key]; |
| 693 | 695 | |
| 694 | 696 | else if($key === 'membership_eot_behavior' && (!is_string($value) || !preg_match('/^(?:demote|delete)$/', $value))) |
| 697 | + $value = $default_options[$key]; | |
| 698 | + | |
| 699 | + //260916.2306 Keep bootstrap validation side-effect free; role existence is checked later when the EOT demotion role is resolved, after s2Member is fully loaded. | |
| 700 | + else if($key === 'eot_demotion_to_role' && (!is_string($value) || !$value || in_array($value, array('administrator', 'editor', 'author', 'contributor', 's2member_pending_deletion'), TRUE))) | |
| 701 | + $value = $default_options[$key]; | |
| 702 | + | |
| 703 | + else if($key === 'eot_demotion_from' && (!is_string($value) || !preg_match('/^(?:s2member_level|all)$/', $value))) | |
| 695 | 704 | $value = $default_options[$key]; |
| 696 | 705 | |
| 697 | 706 | else if($key === 'eot_time_ext_behavior' && (!is_string($value) || !preg_match('/^(?:extend|reset)$/', $value))) |
| 698 | 707 | $value = $default_options[$key]; |