Removed Logo GUIDs and replaced with Data URIs and div hidden with JS

- removed php_logo_guid()
- removed php_egg_logo_guid()
- removed php_real_logo_guid()
- removed zend_logo_guid()
- removed logo GUID handling
- removed logo GUIDs from source
- added logo data URIs instead for phpinfo()
- added credits to phpinfo() page, but hidden by default

1 files changed, 27 insertions, 29 deletions

diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 876c57a34d..05c2cdabc3 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -1944,40 +1944,38 @@ static int php_cli_server_request_shutdown(php_cli_server *server, php_cli_serve
 static int php_cli_server_dispatch_router(php_cli_server *server, php_cli_server_client *client TSRMLS_DC) /* {{{ */
 {
 	int decline = 0;
-	if (!php_handle_special_queries(TSRMLS_C)) {
-		zend_file_handle zfd;
-		char *old_cwd;
-
-		ALLOCA_FLAG(use_heap)
-		old_cwd = do_alloca(MAXPATHLEN, use_heap);
-		old_cwd[0] = '\0';
-		php_ignore_value(VCWD_GETCWD(old_cwd, MAXPATHLEN - 1));
-
-		zfd.type = ZEND_HANDLE_FILENAME;
-		zfd.filename = server->router;
-		zfd.handle.fp = NULL;
-		zfd.free_filename = 0;
-		zfd.opened_path = NULL;
-
-		zend_try {
-			zval *retval = NULL;
-			if (SUCCESS == zend_execute_scripts(ZEND_REQUIRE TSRMLS_CC, &retval, 1, &zfd)) {
-				if (retval) {
-					decline = Z_TYPE_P(retval) == IS_BOOL && !Z_LVAL_P(retval);
-					zval_ptr_dtor(&retval);
-				}
-			} else {
-				decline = 1;
+	zend_file_handle zfd;
+	char *old_cwd;
+
+	ALLOCA_FLAG(use_heap)
+	old_cwd = do_alloca(MAXPATHLEN, use_heap);
+	old_cwd[0] = '\0';
+	php_ignore_value(VCWD_GETCWD(old_cwd, MAXPATHLEN - 1));
+
+	zfd.type = ZEND_HANDLE_FILENAME;
+	zfd.filename = server->router;
+	zfd.handle.fp = NULL;
+	zfd.free_filename = 0;
+	zfd.opened_path = NULL;
+
+	zend_try {
+		zval *retval = NULL;
+		if (SUCCESS == zend_execute_scripts(ZEND_REQUIRE TSRMLS_CC, &retval, 1, &zfd)) {
+			if (retval) {
+				decline = Z_TYPE_P(retval) == IS_BOOL && !Z_LVAL_P(retval);
+				zval_ptr_dtor(&retval);
 			}
-		} zend_end_try();
-
-		if (old_cwd[0] != '\0') {
-			php_ignore_value(VCWD_CHDIR(old_cwd));
+		} else {
+			decline = 1;
 		}
+	} zend_end_try();
 
-		free_alloca(old_cwd, use_heap);
+	if (old_cwd[0] != '\0') {
+		php_ignore_value(VCWD_CHDIR(old_cwd));
 	}
 
+	free_alloca(old_cwd, use_heap);
+
 	return decline;
 }
 /* }}} */