← All changes | includes/cookiecategorizer.php +11 -12 1.1.1 → 1.2.3 View file →

		@@ -13,9 +13,9 @@
13	13	*
14	14	* @param array $found_cookies The array of cookies from the Scanner class.
15	15	* @return array The enriched list of cookies.
16	16	*/
17		- static function categorize_cookies(array $found_cookies, array $categorized_cookies) {
	17	+ static function categorize_cookies($found_cookies, $categorized_cookies) {
18	18	if (empty($found_cookies)) {
19	19	return [];
20	20	}
21	21
		@@ -34,9 +34,9 @@
34	34	return self::match_and_enrich_cookies($found_cookies, $db_candidates, $categorized_cookies);
35	35	}
36	36
37	37
38		- static function generate_query_prefixes(array $cookie_names): array {
	38	+ static function generate_query_prefixes($cookie_names){
39	39	$prefixes = [];
40	40	foreach ($cookie_names as $name) {
41	41
42	42	$parts = explode('_', $name, 2);
		@@ -53,9 +53,9 @@
53	53	return array_unique($prefixes);
54	54	}
55	55
56	56
57		- static function fetch_candidates_from_db(array $prefixes): array {
	57	+ static function fetch_candidates_from_db($prefixes){
58	58
59	59	if (empty($prefixes)) {
60	60	return [];
61	61	}
		@@ -69,11 +69,10 @@
69	69	return $cookies_info;
70	70	}
71	71
72	72
73		- static function match_and_enrich_cookies(array $found_cookies, array $db_candidates, array $old_categorized_cookies): array {
	73	+ static function match_and_enrich_cookies($found_cookies, $db_candidates, $old_categorized_cookies){
74	74	$categorized_cookies = [];
75		- $old_categorized_cookies = [];
76	75	$remove_cookies = [];
77	76
78	77	foreach ($found_cookies as $scanned_name => $cookie_data) {
79	78	$best_match = null;
		@@ -101,17 +100,17 @@
101	100	}
102	101	}
103	102
104	103	if (!empty($best_match)) {
105		-
106		- if(!empty($old_categorized_cookies) && array_key_exists($best_match['cookie_name'], $old_categorized_cookies)){
107		- $remove_cookies[] = $scanned_name;
108		- continue;
	104	+
	105	+ $cookie_name = $best_match['cookie_name'];
	106	+
	107	+ if(!empty($old_categorized_cookies) && array_key_exists($cookie_name, $old_categorized_cookies)){
	108	+ $remove_cookies[] = $old_categorized_cookies[$cookie_name];
109	109	}
110	110
111		- $cookie_name = $best_match['cookie_name'];
112		- $categorized_cookies[$cookie_name]['cookie_name'] = $cookie_name;
113		- $categorized_cookies[$cookie_name]['raw_name'] = $scanned_name;
	111	+ $categorized_cookies[$cookie_name]['cookie_name'] = $cookie_name;
	112	+ $categorized_cookies[$cookie_name]['raw_name'] = $scanned_name;
114	113	$categorized_cookies[$cookie_name]['category'] = $best_match['category'];
115	114	$categorized_cookies[$cookie_name]['description'] = $best_match['description'];
116	115	$categorized_cookies[$cookie_name]['patterns'] = $best_match['patterns'];
117	116