diff options
| author | Jan Lehnardt <jan@php.net> | 2002-08-28 22:31:51 +0000 |
|---|---|---|
| committer | Jan Lehnardt <jan@php.net> | 2002-08-28 22:31:51 +0000 |
| commit | 667661769318fa7af88464b080e44a55f22cbfa1 (patch) | |
| tree | 24e3233e1c4bee2e474740519ee240c508973c51 /main/php_ini.c | |
| parent | 89651dabde60af81e155d4ebf4df51afecf8592a (diff) | |
| download | php-git-667661769318fa7af88464b080e44a55f22cbfa1.tar.gz | |
- add phpinfo() support for CLI.
@phpinfo() support for CLI (jan)
Diffstat (limited to 'main/php_ini.c')
| -rw-r--r-- | main/php_ini.c | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index 715f30e596..5f468608ae 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -62,16 +62,16 @@ static void php_ini_displayer_cb(zend_ini_entry *ini_entry, int type) display_string_length = ini_entry->orig_value_length; esc_html=1; } else { - display_string = "<i>no value</i>"; - display_string_length = sizeof("<i>no value</i>")-1; + display_string = (PG(html_errors))?"<i>no value</i>":"no value"; + display_string_length = sizeof((PG(html_errors))?"<i>no value</i>":"no value")-1; } } else if (ini_entry->value && ini_entry->value[0]) { display_string = ini_entry->value; display_string_length = ini_entry->value_length; esc_html=1; } else { - display_string = "<i>no value</i>"; - display_string_length = sizeof("<i>no value</i>")-1; + display_string = (PG(html_errors))?"<i>no value</i>":"no value"; + display_string_length = sizeof((PG(html_errors))?"<i>no value</i>":"no value")-1; } if(esc_html) { php_html_puts(display_string, display_string_length TSRMLS_CC); @@ -89,15 +89,23 @@ static int php_ini_displayer(zend_ini_entry *ini_entry, int module_number TSRMLS if (ini_entry->module_number != module_number) { return 0; } - - PUTS("<tr valign=\"baseline\" bgcolor=\"" PHP_CONTENTS_COLOR "\">"); - PUTS("<td bgcolor=\"" PHP_ENTRY_NAME_COLOR "\"><b>"); - PHPWRITE(ini_entry->name, ini_entry->name_length-1); - PUTS("</b><br /></td><td align=\"center\">"); - php_ini_displayer_cb(ini_entry, ZEND_INI_DISPLAY_ACTIVE); - PUTS("</td><td align=\"center\">"); - php_ini_displayer_cb(ini_entry, ZEND_INI_DISPLAY_ORIG); - PUTS("</td></tr>\n"); + if (PG(html_errors)) { + PUTS("<tr valign=\"baseline\" bgcolor=\"" PHP_CONTENTS_COLOR "\">"); + PUTS("<td bgcolor=\"" PHP_ENTRY_NAME_COLOR "\"><b>"); + PHPWRITE(ini_entry->name, ini_entry->name_length-1); + PUTS("</b><br /></td><td align=\"center\">"); + php_ini_displayer_cb(ini_entry, ZEND_INI_DISPLAY_ACTIVE); + PUTS("</td><td align=\"center\">"); + php_ini_displayer_cb(ini_entry, ZEND_INI_DISPLAY_ORIG); + PUTS("</td></tr>\n"); + } else { + PHPWRITE(ini_entry->name, ini_entry->name_length-1); + PUTS(" => "); + php_ini_displayer_cb(ini_entry, ZEND_INI_DISPLAY_ACTIVE); + PUTS(" => "); + php_ini_displayer_cb(ini_entry, ZEND_INI_DISPLAY_ORIG); + PUTS("\n"); + } return 0; } /* }}} */ |