From 64d667b91a0f9c140383b8f74ea470fb8bd1da5e Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Thu, 17 Jul 2014 13:54:07 +0200
Subject: more redundancy removed / varname checks

---
 ex_imp.c | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/ex_imp.c b/ex_imp.c
index e1b93fc..15bad3d 100644
--- a/ex_imp.c
+++ b/ex_imp.c
@@ -74,29 +74,7 @@ static int php_valid_var_name(char *var_name, int len) /* {{{ */
 		}
 	}
 
-	if (var_name[0] == 'H') {
-		if ((strcmp(var_name, "HTTP_GET_VARS")==0)||
-		    (strcmp(var_name, "HTTP_POST_VARS")==0)||
-		    (strcmp(var_name, "HTTP_POST_FILES")==0)||
-		    (strcmp(var_name, "HTTP_ENV_VARS")==0)||
-		    (strcmp(var_name, "HTTP_SERVER_VARS")==0)||
-		    (strcmp(var_name, "HTTP_SESSION_VARS")==0)||
-		    (strcmp(var_name, "HTTP_COOKIE_VARS")==0)||
-		    (strcmp(var_name, "HTTP_RAW_POST_DATA")==0)) {
-		    return 0;
-		}
-	} else if (var_name[0] == '_') {
-		if ((strcmp(var_name, "_COOKIE")==0)||
-		    (strcmp(var_name, "_ENV")==0)||
-		    (strcmp(var_name, "_FILES")==0)||
-		    (strcmp(var_name, "_GET")==0)||
-		    (strcmp(var_name, "_POST")==0)||
-		    (strcmp(var_name, "_REQUEST")==0)||
-		    (strcmp(var_name, "_SESSION")==0)||
-		    (strcmp(var_name, "_SERVER")==0)) {
-		    return 0;
-		}
-	} else if (strcmp(var_name, "GLOBALS")==0) {
+	if (php_varname_check(var_name, len, 0 TSRMLS_CC) == FAILURE) {
 		return 0;
 	}
 	
-- 
cgit v1.3