just try to extract a function name from sql comments in anon mode

mihasya · May 24, 2012 · 1966506 · 1966506
1 parent 4aeec16
commit 1966506
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 24 deletions.
diff --git a/dashboard.php b/dashboard.php
@@ -84,18 +84,9 @@
 	$rows = array();
 	while ($row = mysql_fetch_assoc($result)) {
 		if ($conf['anon']) {
-			if (preg_match('@/\*.*\*/@', $row['sample'], $matches)) {
-				if (preg_match('@ 127.0.0.1 \*/@', $matches[0])) {
-					$extra = $matches[0];
-				} elseif (preg_match('@ \d+\.\d+\.\d+\.\d+ @', $matches[0])) {
-					$extra = preg_replace('@\d+\.\d+\.\d+\.\d+@', 'External_IP', $matches[0]);
-				} elseif (preg_match('@ \S+ \*/@', $matches[0])) {
-					$extra = preg_replace('@ \S+ \*/@', ' User */', $matches[0]);
-				}		
-				else {
-					$extra = $matches[0];
-				}
-				$row['sample'] = $extra . ' ' . $row['fingerprint'];
+			if (preg_match('@/\* (\S+)(::\S+)?.*\*/@', $row['sample'], $matches)) {
+				$c = ($matches[2]) ? $matches[1] . $matches[2] : $matches[1];
+				$row['sample'] = '/* ' . $c . ' */ ' . $row['fingerprint'];
 			} else {
 				$row['sample'] = $row['fingerprint'];
 			}

diff --git a/more.php b/more.php
@@ -33,18 +33,9 @@
 	$rows = array();
 	while ($row = mysql_fetch_assoc($result)) {
 		if ($conf['anon']) {
-			if (preg_match('@/\*.*\*/@', $row['sample'], $matches)) {
-				if (preg_match('@ 127.0.0.1 \*/@', $matches[0])) {
-					$extra = $matches[0];
-				} elseif (preg_match('@ \d+\.\d+\.\d+\.\d+ @', $matches[0])) {
-					$extra = preg_replace('@\d+\.\d+\.\d+\.\d+@', 'External_IP', $matches[0]);
-				} elseif (preg_match('@ \S+ \*/@', $matches[0])) {
-					$extra = preg_replace('@ \S+ \*/@', ' User */', $matches[0]);
-				}		
-				else {
-					$extra = $matches[0];
-				}
-				$row['sample'] = $extra . ' ' . $row['fingerprint'];
+			if (preg_match('@/\* (\S+)(::\S+)?.*\*/@', $row['sample'], $matches)) {
+				$c = ($matches[2]) ? $matches[1] . $matches[2] : $matches[1];
+				$row['sample'] = '/* ' . $c . ' */ ' . $row['fingerprint'];
 			} else {
 				$row['sample'] = $row['fingerprint'];
 			}