fix(cli): resolves #336

Author: bmarshall511

core/class-utilities.php

@@ -264,23 +264,18 @@ public static function refresh_htaccess() {
 	 * @param string $value Setting value.
 	 */
 	public static function update_setting( $key, $value ) {
-		$settings     = \ZeroSpam\Core\Settings::get_settings();
-		$new_settings = array();
-
-		if ( ! isset( $settings[ $key ] ) ) {
+		$settings = \ZeroSpam\Core\Settings::get_settings();
+		if ( empty( $settings[ $key ] ) ) {
 			self::log( $key . ' is not a valid setting key.' );
 			return false;
 		}
 
-		foreach ( $settings as $k => $array ) {
-			if ( $key === $k ) {
-				$new_settings[ $k ] = $value;
-			} else {
-				$new_settings[ $k ] = isset( $array['value'] ) ? $array['value'] : false;
-			}
-		}
+		$module          = $settings[ $key ]['module'];
+		$module_settings = get_option( "zero-spam-$module" );
+
+		$module_settings[ $key ] = $value;
 
-		update_option( 'wpzerospam', $new_settings, true );
+		update_option( "zero-spam-$module", $module_settings, true );
 
 		return true;
 	}

includes/class-cli.php

@@ -17,17 +17,20 @@ public function autoconfigure() {
 	 * Outputs settings
 	 */
 	public function settings() {
-		$zerospam_settings = \ZeroSpam\Core\Settings::get_settings();
-		$settings          = array();
+		$modules  = \ZeroSpam\Core\Settings::get_settings_by_module();
+		$settings = array();
 
-		foreach ( $zerospam_settings as $key => $setting ) {
-			$settings[] = array(
-				'setting' => $key,
-				'value'   => isset( $setting['value'] ) ? $setting['value'] : false,
-			);
+		foreach ( $modules as $module => $module_settings ) {
+			foreach ( $module_settings as $key => $setting ) {
+				$settings[] = array(
+					'module'  => $module,
+					'setting' => $key,
+					'value'   => isset( $setting['value'] ) ? $setting['value'] : false,
+				);
+			}
 		}
 
-		$fields = array( 'setting', 'value' );
+		$fields = array( 'module', 'setting', 'value' );
 		WP_CLI\Utils\format_items( 'table', $settings, $fields );
 	}