cvs: php4 /ext/standard info.c

hholzgra Thu Aug 8 16:19:33 2002 EDT Modified files: /php4/ext/standard info.c Log: reverting ' to \" to stop stupid discussions although i still do not believe the arguments are reasonable ... Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.190 php4/ext/standard/info.c:1.191 --- php4/ext/standard/info.c:1.190 Thu Aug 8 09:59:19 2002 +++ php4/ext/standard/info.c Thu Aug 8 16:19:33 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.190 2002/08/08 13:59:19 hholzgra Exp $ */ +/* $Id: info.c,v 1.191 2002/08/08 20:19:33 hholzgra Exp $ */ #include "php.h" #include "php_ini.h" @@ -46,7 +46,7 @@ ZEND_EXTERN_MODULE_GLOBALS(iconv) #endif -#define SECTION(name) PUTS("<h2 align='center'>" name "</h2>\n") +#define SECTION(name) PUTS("<h2 align=\"center\">" name "</h2>\n") PHPAPI extern char *php_ini_opened_path; @@ -57,10 +57,10 @@ int show_info_func = *((int *) arg); if (show_info_func && module->info_func) { - php_printf("<h2 align='center'><a name='module_%s'>%s</a></h2>\n", module->name, module->name); + php_printf("<h2 align=\"center\"><a name=\"module_%s\">%s</a></h2>\n", module->name, module->name); module->info_func(module TSRMLS_CC); } else if (!show_info_func && !module->info_func) { - php_printf("<tr valign='baseline' bgcolor='" PHP_CONTENTS_COLOR "'>"); + php_printf("<tr valign=\"baseline\" bgcolor=\"" PHP_CONTENTS_COLOR "\">"); php_printf("<td>"); php_printf("%s", module->name); php_printf("</td></tr>\n"); @@ -82,10 +82,10 @@ && (Z_TYPE_PP(data)==IS_ARRAY)) { zend_hash_internal_pointer_reset(Z_ARRVAL_PP(data)); while (zend_hash_get_current_data(Z_ARRVAL_PP(data), (void **) &tmp) == SUCCESS) { - PUTS("<tr valign='baseline' bgcolor='" PHP_CONTENTS_COLOR "'>"); - PUTS("<td bgcolor='" PHP_ENTRY_NAME_COLOR "'><b>"); + PUTS("<tr valign=\"baseline\" bgcolor=\"" PHP_CONTENTS_COLOR "\">"); + PUTS("<td bgcolor=\"" PHP_ENTRY_NAME_COLOR "\"><b>"); PUTS(name); - PUTS("['"); + PUTS("[\""); switch (zend_hash_get_current_key_ex(Z_ARRVAL_PP(data), &string_key, &string_len, &num_key, 0, NULL)) { case HASH_KEY_IS_STRING: zend_html_puts(string_key, string_len-1); @@ -94,7 +94,7 @@ php_printf("%ld", num_key); break; } - PUTS("']</b></td><td>"); + PUTS("\"]</b></td><td>"); if (Z_TYPE_PP(tmp) == IS_ARRAY) { PUTS("<pre>"); zend_print_zval_r(*tmp, 0); @@ -119,7 +119,7 @@ */ void php_info_print_style(void) { - php_printf("<style type='text/css'><!--\n"); + php_printf("<style type=\"text/css\"><!--\n"); php_printf("a { text-decoration: none; }\n"); php_printf("a:hover { text-decoration: underline; }\n"); php_printf("h1 { font-family: arial, helvetica, sans-serif; font-size: 18pt; font-weight: bold;}\n"); @@ -222,7 +222,7 @@ the_time = time(NULL); ta = php_localtime_r(&the_time, &tmbuf); - PUTS("<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n<html>\n"); + PUTS("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n<html>\n"); PUTS("<head>"); php_info_print_style(); if (SG(default_charset)) { @@ -237,7 +237,7 @@ charset = "US-ASCII"; } php_printf("<title>phpinfo()</title><meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\"></head>", charset); - PUTS("<body text='#000000' bgcolor='#f0f0ff' link='#0000ff' vlink='#ff00ff' alink='#0000ff'>"); + PUTS("<body text=\"#000000\" bgcolor=\"#f0f0ff\" link=\"#0000ff\" vlink=\"#ff00ff\" alink=\"#0000ff\">"); if (flag & PHP_INFO_GENERAL) { char *zend_version = get_zend_version(); @@ -247,14 +247,14 @@ php_info_print_box_start(1); if (expose_php) { - PUTS("<a href='http://www.php.net/'><img src='"); + PUTS("<a href=\"http://www.php.net/\"><img src=\""); if (SG(request_info).request_uri) { PUTS(SG(request_info).request_uri); } if ((ta->tm_mon==3) && (ta->tm_mday==1)) { - PUTS("?="PHP_EGG_LOGO_GUID"' border=0 align='right' alt='Thies!'></a>"); + PUTS("?="PHP_EGG_LOGO_GUID"\" border=0 align=\"right\" alt=\"Thies!\"></a>"); } else { - PUTS("?="PHP_LOGO_GUID"' border=0 align='right' alt='PHP Logo'></a>"); + PUTS("?="PHP_LOGO_GUID"\" border=0 align=\"right\" alt=\"PHP Logo\"></a>"); } } php_printf("<h1>PHP Version %s</h1>\n", PHP_VERSION); @@ -330,11 +330,11 @@ /* Zend Engine */ php_info_print_box_start(0); if (expose_php) { - PUTS("<a href='http://www.zend.com/'><img src='"); + PUTS("<a href=\"http://www.zend.com/\"><img src=\""); if (SG(request_info).request_uri) { PUTS(SG(request_info).request_uri); } - PUTS("?="ZEND_LOGO_GUID"' border='0' align='right' alt='Zend logo'></a>\n"); + PUTS("?="ZEND_LOGO_GUID"\" border=\"0\" align=\"right\" alt=\"Zend logo\"></a>\n"); } php_printf("This program makes use of the Zend Scripting Language Engine:<br />"); zend_html_puts(zend_version, strlen(zend_version)); @@ -344,11 +344,11 @@ if ((flag & PHP_INFO_CREDITS) && expose_php) { php_info_print_hr(); - PUTS("<h1 align='center'><a href='"); + PUTS("<h1 align=\"center\"><a href=\""); if (SG(request_info).request_uri) { PUTS(SG(request_info).request_uri); } - PUTS("?=PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000'>"); + PUTS("?=PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000\">"); PUTS("PHP 4 Credits"); PUTS("</a></h1>\n"); } @@ -357,7 +357,7 @@ if (flag & PHP_INFO_CONFIGURATION) { php_info_print_hr(); - PUTS("<h1 align='center'>Configuration</h1>\n"); + PUTS("<h1 align=\"center\">Configuration</h1>\n"); SECTION("PHP Core\n"); display_ini_entries(NULL); } @@ -449,7 +449,7 @@ PHPAPI void php_info_print_table_start() { - php_printf("<table border='0' cellpadding='3' cellspacing='1' width='600' bgcolor='#000000' align='center'>\n"); + php_printf("<table border=\"0\" cellpadding=\"3\" cellspacing=\"1\" width=\"600\" bgcolor=\"#000000\" align=\"center\">\n"); } PHPAPI void php_info_print_table_end() @@ -462,9 +462,9 @@ { php_info_print_table_start(); if (flag) { - php_printf("<tr valign='middle' bgcolor='" PHP_HEADER_COLOR "'><td align='left'>\n"); + php_printf("<tr valign=\"middle\" bgcolor=\"" PHP_HEADER_COLOR "\"><td align=\"left\">\n"); } else { - php_printf("<tr valign='top' bgcolor='" PHP_CONTENTS_COLOR "'><td align='left'>\n"); + php_printf("<tr valign=\"top\" bgcolor=\"" PHP_CONTENTS_COLOR "\"><td align=\"left\">\n"); } } @@ -476,12 +476,12 @@ PHPAPI void php_info_print_hr() { - php_printf("<hr noshade size='1' width='600'>\n"); + php_printf("<hr noshade size=\"1\" width=\"600\">\n"); } PHPAPI void php_info_print_table_colspan_header(int num_cols, char *header) { - php_printf("<tr bgcolor='" PHP_HEADER_COLOR "'><th colspan='%d'>%s</th></tr>\n", num_cols, header ); + php_printf("<tr bgcolor=\"" PHP_HEADER_COLOR "\"><th colspan=\"%d\">%s</th></tr>\n", num_cols, header ); } /* {{{ php_info_print_table_header @@ -494,7 +494,7 @@ va_start(row_elements, num_cols); - php_printf("<tr valign='middle' bgcolor='" PHP_HEADER_COLOR "'>"); + php_printf("<tr valign=\"middle\" bgcolor=\"" PHP_HEADER_COLOR "\">"); for (i=0; i<num_cols; i++) { row_element = va_arg(row_elements, char *); if (!row_element || !*row_element) { @@ -519,10 +519,10 @@ va_start(row_elements, num_cols); - php_printf("<tr valign='baseline' bgcolor='" PHP_CONTENTS_COLOR "'>"); + php_printf("<tr valign=\"baseline\" bgcolor=\"" PHP_CONTENTS_COLOR "\">"); for (i=0; i<num_cols; i++) { php_printf("<td %s>%s", - (i==0?"bgcolor='" PHP_ENTRY_NAME_COLOR "' ":"align='left'"), + (i==0?"bgcolor=\"" PHP_ENTRY_NAME_COLOR "\" ":"align=\"left\""), (i==0?"<b>":"")); row_element = va_arg(row_elements, char *);