← All changes | Core/Admin/Logtivity_Options.php +47 -14 3.3.8 → 3.3.10 View file →

		@@ -154,9 +154,9 @@
154	154	* @return bool
155	155	*/
156	156	public function shouldLogLatestResponse(): bool
157	157	{
158		- return $this->getOption('logtivity_enable_debug_mode') || $this->shouldCheckInWithApi();
	158	+ return $this->shouldCheckInWithApi();
159	159	}
160	160
161	161	/**
162	162	* @return bool
		@@ -162,15 +162,13 @@
162	162	* @return bool
163	163	*/
164	164	public function shouldCheckInWithApi(): bool
165	165	{
166		- if ($this->getOption('logtivity_enable_debug_mode') == false) {
167		- $lastCheckin = get_option('logtivity_last_settings_check_in_at');
168		- $lastCheckin = $lastCheckin['date'] ?? null;
	166	+ $lastCheckin = get_option('logtivity_last_settings_check_in_at');
	167	+ $lastCheckin = $lastCheckin['date'] ?? null;
169	168
170		- if ($lastCheckin) {
171		- return time() - strtotime($lastCheckin) > $this->checkinDelay;
172		- }
	169	+ if ($lastCheckin) {
	170	+ return time() - strtotime($lastCheckin) > $this->checkinDelay;
173	171	}
174	172
175	173	return true;
176	174	}
		@@ -224,10 +222,22 @@
224	222	* @return void
225	223	*/
226	224	public function update(array $data = [], bool $checkApiKey = true): void
227	225	{
228		- $settings = array_intersect_key($data ?: $_POST, $this->settings);
	226	+ if (!$data) {
	227	+ if (!current_user_can(Logtivity::ACCESS_SETTINGS)) {
	228	+ return;
	229	+ }
	230	+
	231	+ check_ajax_referer('logtivity_update_settings', 'logtivity_update_settings');
	232	+
	233	+ $data = wp_unslash($_POST);
	234	+ }
	235	+
	236	+ $settings = array_intersect_key($data, $this->settings);
229	237	foreach ($settings as $key => $value) {
	238	+ $value = $this->sanitizeSetting($key, $value);
	239	+
230	240	if ($this->validateSetting($key, $value)) {
231	241	update_option($key, $value);
232	242	}
233	243	}
		@@ -232,14 +242,32 @@
232	242	}
233	243	}
234	244
235	245	if ($checkApiKey) {
236		- $this->checkApiKey($data['logtivity_site_api_key']
237		- ?? sanitize_text_field($_POST['logtivity_site_api_key'] ?? null));
	246	+ $this->checkApiKey($settings['logtivity_site_api_key'] ?? null);
238	247	}
239	248	}
240	249
241	250	/**
	251	+ * Sanitize setting values before saving.
	252	+ *
	253	+ * @param string $key
	254	+ * @param mixed $value
	255	+ *
	256	+ * @return mixed
	257	+ */
	258	+ protected function sanitizeSetting(string $key, $value)
	259	+ {
	260	+ $setting = $this->settings[$key] ?? null;
	261	+
	262	+ if (($setting['rule'] ?? null) === 'is_string' && is_scalar($value)) {
	263	+ return sanitize_textarea_field((string)$value);
	264	+ }
	265	+
	266	+ return $value;
	267	+ }
	268	+
	269	+ /**
242	270	* Validate that the passed parameters are in the correct format
243	271	*
244	272	* @param string $key
245	273	* @param mixed $value
		@@ -250,15 +278,20 @@
250	278	{
251	279	$setting = $this->settings[$key] ?? null;
252	280
253	281	if ($setting) {
254		- $method = $setting['rule'] ?? null;
	282	+ switch ($setting['rule'] ?? null) {
	283	+ case 'is_bool':
	284	+ return is_bool($value) || in_array($value, [0, 1, '0', '1', ''], true);
255	285
256		- if ($method == 'is_bool') {
257		- return $method((bool)$value);
	286	+ case 'is_array':
	287	+ return is_array($value);
	288	+
	289	+ case 'is_string':
	290	+ return is_string($value);
258	291	}
259	292
260		- return $method($value);
	293	+ return false;
261	294	}
262	295
263	296	return true;
264	297	}