[PHP-CVS] cvs: php4 /main logos.h
cmv Wed Apr 2 10:36:34 2003 EDT
Modified files:
/php4/main logos.h
Log:
fix logo (outline around letters)
Index: php4/main/logos.h
diff -u php4/main/logos.h:1.7 php4/main/logos.h:1.8
--- php4/main/logos.h:1.7 Wed Feb 19 03:40:18 2003
+++ php4/main/logos.h Wed Apr 2 10:36:34 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: logos.h,v 1.7 2003/02/19 08:40:18 sniper Exp $ */
+/* $Id: logos.h,v 1.8 2003/04/02 15:36:34 cmv Exp $ */
#define CONTEXT_TYPE_IMAGE_GIF Content-Type: image/gif
@@ -469,302 +469,394 @@
unsigned char php_logo[] = {
71, 73, 70, 56, 57, 97, 130, 0, 67, 0,
- 213, 255, 0, 0, 0, 0, 48, 47, 49, 2,
- 2, 3, 7, 7, 10, 152, 152, 203, 153, 153,
- 204, 150, 150, 200, 147, 147, 195, 3, 3, 4,
-91, 91, 105, 164, 164, 178, 69, 69, 73, 196,
- 196, 206, 141, 142, 189, 136, 137, 180, 152, 153,
- 187, 101, 103, 134, 126, 129, 172, 176, 178, 205,
-25, 26, 36, 49, 52, 73, 33, 35, 49, 69,
-73, 100, 82, 88, 127, 111, 119, 168, 201, 204,
- 221, 81, 95, 159, 85, 99, 163, 97, 105, 147,
-13, 14, 19, 162, 169, 205, 183, 189, 220, 88,
- 103, 165, 92, 106, 169, 90, 104, 165, 91, 105,
- 166, 95, 110, 172, 102, 115, 174, 93, 105, 158,
- 139, 150, 197, 148, 158, 202, 219, 221, 229, 192,
- 192, 192, 2, 2, 1, 3, 3, 2, 7, 7,
- 6, 15, 15, 14, 133, 133, 131, 152, 152, 151,
- 114, 113, 110, 5, 4, 3, 20, 19, 18, 31,
-30, 29, 39, 38, 37, 10, 9, 9, 25, 24,
-24, 61, 60, 60, 183, 183, 183, 81, 81, 81,
-12, 12, 12, 5, 5, 5, 1, 1, 1, 255,
- 255, 255, 0, 0, 0, 33, 249, 4, 1, 0,
- 0, 42, 0, 44, 0, 0, 0, 0, 130, 0,
-67, 0, 64, 6, 255, 64, 149, 112, 72, 44,
-26, 143, 200, 100, 146, 192, 108, 58, 159, 80,
- 130, 114, 74, 173, 90, 175, 70, 130, 225, 112,
-48, 72, 24, 169, 112, 42, 227, 105, 96, 66,
- 155, 52, 72, 36, 26, 185, 223, 240, 184, 124,
-78, 15, 185, 69, 38, 14, 100, 15, 73, 236,
-49, 14, 13, 92, 6, 88, 133, 72, 91, 13,
-15, 138, 24, 32, 32, 116, 143, 144, 112, 26,
-30, 48, 0, 150, 150, 59, 25, 140, 145, 156,
- 157, 111, 33, 33, 23, 11, 1, 1, 11, 128,
-13, 132, 134, 66, 4, 7, 17, 24, 24, 158,
-35, 27, 31, 9, 151, 150, 51, 9, 49, 186,
-49, 58, 56, 46, 182, 151, 60, 57, 40, 25,
-51, 192, 52, 58, 201, 201, 56, 52, 192, 150,
-45, 12, 17, 62, 49, 192, 59, 185, 187, 9,
- 190, 206, 0, 44, 48, 37, 142, 115, 33, 32,
-19, 0, 19, 16, 17, 168, 84, 91, 28, 28,
-38, 177, 27, 39, 57, 43, 192, 48, 30, 27,
- 114, 26, 31, 212, 244, 149, 182, 52, 41, 223,
-36, 125, 120, 1, 204, 6, 131, 15, 12, 16,
- 0, 123, 241, 65, 3, 190, 15, 253, 108, 197,
- 136, 0, 238, 17, 137, 11, 2, 120, 248, 137,
- 112, 128, 74, 43, 118, 109, 34, 129, 200, 176,
-96, 155, 73, 75, 60, 22, 228, 72, 129, 65,
-67, 132, 12, 60, 22, 54, 132, 3, 2, 67,
- 134, 22, 192, 98, 100, 240, 81, 235, 228, 54,
- 255, 22, 56, 20, 124, 32, 113, 175, 19, 9,
-13, 3, 0, 4, 216, 216, 17, 139, 1, 3,
-13, 34, 236, 105, 247, 102, 3, 10, 5, 206,
- 114, 156, 40, 26, 171, 235, 195, 28, 206, 94,
- 4, 244, 10, 39, 196, 197, 14, 0, 6, 80,
- 240, 3, 168, 169, 42, 117, 7, 26, 56, 136,
- 160, 135, 15, 132, 118, 33, 201, 234, 245, 100,
-54, 132, 137, 11, 22, 2, 212, 160, 65, 163,
- 194, 218, 11, 16, 48, 68, 112, 208, 229, 173,
- 227, 199, 66, 158, 110, 225, 210, 64, 174, 131,
- 203, 17, 50, 107, 222, 204, 153, 243, 229, 203,
- 149, 185, 116, 73, 5, 185, 180, 233, 44, 90,
-38, 115, 41, 224, 65, 130, 107, 6, 176, 25,
- 184, 158, 173, 64, 129, 34, 69, 152, 51, 191,
- 194, 192, 174, 119, 111, 197, 139, 67, 143, 38,
- 125, 186, 184, 138, 201, 15, 90, 203, 110, 80,
-34, 77, 222, 189, 179, 98, 184, 152, 62, 29,
-71, 10, 18, 21, 247, 134, 243, 203, 33, 129,
- 178, 4, 167, 26, 27, 223, 162, 121, 44, 29,
-16, 36, 82, 4, 160, 206, 190, 189, 139, 25,
-53, 116, 188, 200, 144, 161, 185, 172, 6, 57,
-88, 0, 107, 177, 195, 253, 141, 0, 242, 101,
-48, 84, 35, 210, 248, 226, 158, 123, 240, 201,
-39, 155, 56, 116, 92, 116, 131, 12, 230, 160,
-67, 156, 58, 116, 113, 208, 149, 6, 18, 68,
- 100, 137, 65,
[PHP-CVS] cvs: php4 /ext/standard basic_functions.c info.c info.h
cmv Wed Apr 2 11:51:40 2003 EDT
Modified files:
/php4/ext/standard basic_functions.c info.h info.c
Log:
fixes for logo guid functions
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.600
php4/ext/standard/basic_functions.c:1.601
--- php4/ext/standard/basic_functions.c:1.600 Tue Apr 1 05:02:29 2003
+++ php4/ext/standard/basic_functions.c Wed Apr 2 11:51:39 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.600 2003/04/01 10:02:29 sas Exp $ */
+/* $Id: basic_functions.c,v 1.601 2003/04/02 16:51:39 cmv Exp $ */
#include php.h
#include php_streams.h
@@ -312,6 +312,8 @@
PHP_FE(phpversion,
NULL)
PHP_FE(phpcredits,
NULL)
PHP_FE(php_logo_guid,
NULL)
+ PHP_FE(php_real_logo_guid,
NULL)
+ PHP_FE(php_egg_logo_guid,
NULL)
PHP_FE(zend_logo_guid,
NULL)
PHP_FE(php_sapi_name,
NULL)
PHP_FE(php_uname,
NULL)
Index: php4/ext/standard/info.h
diff -u php4/ext/standard/info.h:1.31 php4/ext/standard/info.h:1.32
--- php4/ext/standard/info.h:1.31 Tue Mar 25 03:07:12 2003
+++ php4/ext/standard/info.hWed Apr 2 11:51:39 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: info.h,v 1.31 2003/03/25 08:07:12 sebastian Exp $ */
+/* $Id: info.h,v 1.32 2003/04/02 16:51:39 cmv Exp $ */
#ifndef INFO_H
#define INFO_H
@@ -59,6 +59,7 @@
PHP_FUNCTION(phpinfo);
PHP_FUNCTION(phpcredits);
PHP_FUNCTION(php_logo_guid);
+PHP_FUNCTION(php_real_logo_guid);
PHP_FUNCTION(zend_logo_guid);
PHP_FUNCTION(php_egg_logo_guid);
PHP_FUNCTION(php_sapi_name);
@@ -77,6 +78,7 @@
PHPAPI void php_info_print_box_start(int bg);
PHPAPI void php_info_print_box_end(void);
PHPAPI void php_info_print_hr(void);
+PHPAPI char *php_logo_guid(void);
void register_phpinfo_constants(INIT_FUNC_ARGS);
Index: php4/ext/standard/info.c
diff -u php4/ext/standard/info.c:1.231 php4/ext/standard/info.c:1.232
--- php4/ext/standard/info.c:1.231 Tue Apr 1 06:04:38 2003
+++ php4/ext/standard/info.cWed Apr 2 11:51:40 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.231 2003/04/01 11:04:38 thies Exp $ */
+/* $Id: info.c,v 1.232 2003/04/02 16:51:40 cmv Exp $ */
#include php.h
#include php_ini.h
@@ -385,11 +385,6 @@
char **env, *tmp1, *tmp2;
char *php_uname;
int expose_php = INI_INT(expose_php);
- time_t the_time;
- struct tm *ta, tmbuf;
-
- the_time = time(NULL);
- ta = php_localtime_r(the_time, tmbuf);
if (!sapi_module.phpinfo_as_text) {
php_print_info_htmlhead(TSRMLS_C);
@@ -412,11 +407,9 @@
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\ alt=\Dog!\ //a);
- } else {
- PUTS(?=PHP_LOGO_GUID\ alt=\PHP Logo\ //a);
- }
+ PUTS(?=);
+ PUTS(php_logo_guid());
+ PUTS(\ alt=\PHP Logo\ //a);
}
if (!sapi_module.phpinfo_as_text) {
@@ -902,10 +895,48 @@
}
/* }}} */
+
+/* {{{ php_logo_guid
+ */
+PHPAPI char *php_logo_guid()
+{
+ char *logo_guid;
+
+ time_t the_time;
+ struct tm *ta, tmbuf;
+
+ the_time = time(NULL);
+ ta = php_localtime_r(the_time, tmbuf);
+
+ if ((ta-tm_mon==3) (ta-tm_mday==1)) {
+ logo_guid = PHP_EGG_LOGO_GUID;
+ } else {
+ logo_guid = PHP_LOGO_GUID;
+ }
+
+ return estrdup(logo_guid);
+
+}
+/* }}} */
+
/* {{{ proto string php_logo_guid(void)
Return the special ID used to request the PHP logo in phpinfo screens*/
PHP_FUNCTION(php_logo_guid)
{
+
+ if (ZEND_NUM_ARGS() != 0) {
+ WRONG_PARAM_COUNT;
+
[PHP-CVS] cvs: php4 /main logos.h
cmv Fri Nov 1 18:00:33 2002 EDT
Modified files:
/php4/main logos.h
Log:
ahem
Index: php4/main/logos.h
diff -u php4/main/logos.h:1.5 php4/main/logos.h:1.6
--- php4/main/logos.h:1.5 Wed Apr 19 19:18:15 2000
+++ php4/main/logos.h Fri Nov 1 18:00:32 2002
-748,312 +748,756
unsigned char php_egg_logo[] = {
71, 73, 70, 56, 57, 97, 130, 0, 67, 0,
- 213, 255, 0, 0, 0, 0, 152, 138, 142, 104,
-95, 105, 89, 86, 93, 160, 151, 174, 102, 101,
- 136, 164, 163, 205, 174, 173, 213, 102, 102, 153,
-99, 99, 149, 102, 102, 152, 96, 96, 143, 90,
-90, 134, 82, 82, 115, 87, 87, 121, 80, 80,
- 108, 74, 74, 100, 110, 110, 147, 95, 95, 127,
- 149, 149, 198, 118, 118, 157, 67, 67, 89, 144,
- 144, 191, 128, 128, 169, 137, 137, 180, 155, 155,
- 197, 186, 186, 227, 209, 209, 247, 242, 242, 254,
-64, 67, 65, 192, 192, 192, 32, 45, 25, 50,
-54, 36, 65, 63, 42, 75, 71, 53, 87, 79,
-61, 93, 85, 69, 231, 180, 110, 106, 92, 74,
- 207, 155, 100, 121, 101, 80, 181, 131, 89, 141,
- 110, 88, 158, 125, 103, 148, 118, 97, 169, 135,
- 112, 131, 112, 99, 180, 141, 117, 135, 101, 81,
- 191, 148, 124, 168, 126, 107, 201, 153, 130, 164,
- 116, 97, 191, 139, 119, 213, 155, 135, 220, 164,
- 146, 203, 142, 124, 180, 127, 112, 175, 118, 103,
- 191, 127, 114, 162, 102, 91, 255, 255, 255, 0,
- 0, 0, 0, 0, 0, 33, 249, 4, 1, 0,
- 0, 30, 0, 44, 0, 0, 0, 0, 130, 0,
-67, 0, 64, 6, 255, 64, 143, 112, 72, 44,
-26, 143, 72, 226, 100, 105, 105, 98, 158, 151,
-40, 133, 18, 137, 20, 36, 18, 135, 118, 203,
- 213, 74, 10, 133, 200, 52, 122, 121, 98, 154,
- 150, 229, 50, 201, 110, 187, 223, 202, 137, 5,
- 115, 137, 72, 30, 16, 72, 101, 15, 105, 48,
-24, 11, 9, 130, 10, 132, 10, 8, 135, 136,
- 137, 137, 11, 3, 34, 31, 31, 32, 32, 33,
- 147, 34, 149, 34, 35, 152, 153, 34, 33, 32,
- 143, 143, 29, 2, 133, 130, 9, 11, 127, 14,
-13, 13, 91, 88, 18, 17, 101, 105, 19, 112,
- 112, 114, 24, 17, 120, 123, 21, 14, 129, 132,
- 138, 188, 189, 190, 137, 21, 31, 33, 38, 48,
-44, 52, 58, 57, 59, 53, 56, 203, 56, 206,
- 206, 51, 207, 204, 53, 47, 57, 50, 44, 40,
-36, 35, 150, 33, 144, 191, 188, 132, 164, 12,
-14, 95, 96, 20, 103, 176, 111, 22, 20, 182,
-16, 12, 9, 134, 223, 242, 243, 138, 32, 36,
-48, 42, 52, 50, 57, 203, 205, 206, 54, 0,
- 111, 8, 20, 8, 112, 198, 140, 24, 212, 86,
- 184, 64, 97, 162, 33, 166, 77, 32, 36, 208,
- 251, 165, 32, 193, 31, 49, 231, 44, 176, 185,
- 3, 33, 87, 188, 137, 32, 229, 129, 24, 129,
-66, 5, 10, 23, 35, 62, 184, 112, 1, 163,
- 134, 141, 26, 57, 98, 210, 88, 209, 2, 69,
- 139, 24, 49, 94, 188, 136, 97, 16, 71, 181,
- 255, 28, 42, 26, 170, 184, 105, 99, 199, 142,
-25, 20, 66, 130, 43, 101, 134, 13, 173, 44,
- 126, 224, 41, 157, 170, 72, 129, 128, 124, 59,
- 152, 225, 115, 121, 3, 161, 209, 29, 52, 118,
- 228, 192, 97, 131, 160, 13, 28, 8, 173, 173,
- 208, 183, 130, 133, 10, 131, 48, 73, 124, 156,
-90, 145, 65, 134, 13, 26, 50, 104, 116, 51,
- 139, 2, 152, 43, 14, 222, 237, 162, 58, 113,
- 0, 10, 26, 47, 100, 208, 40, 113, 2, 6,
-15, 30, 58, 190, 234, 72, 81, 162, 68, 179,
- 131, 60, 11, 190, 88, 209, 150, 133, 11, 21,
- 109, 77, 74, 149, 23, 110, 65, 1, 13, 61,
-56, 108, 48, 160, 38, 22, 27, 38, 116, 168,
-84, 169, 82, 224, 15, 160, 65, 133, 168, 38,
- 0, 113, 162, 132, 138, 98, 156, 101, 200, 104,
- 177, 83, 231, 138, 202, 59, 115, 182, 88, 190,
- 188, 184, 206, 196, 161, 85, 184, 8, 76, 193,
- 192, 134, 235, 120, 89, 171, 73, 231, 186, 123,
- 119, 53, 104, 230, 152, 33, 67, 222, 204, 153,
- 240, 232, 211, 167, 201, 192, 190, 189, 28, 245,
- 175, 214, 120, 159, 79, 63, 142, 147, 11, 84,
-36, 52, 120, 192, 63, 143, 255, 10, 121, 240,
- 151, 138, 109, 128, 44, 96, 224, 129, 6, 98,
-49, 0, 39, 158, 52, 8, 130, 8, 29, 116,
-16, 32, 127, 15, 160, 194, 197, 23, 98, 184,
- 242, 74, 125, 243, 49, 81, 255, 7, 30, 122,
- 0, 232, 71, 32, 240, 204, 69, 88, 3, 143,
- 132, 80, 201, 8, 13, 161, 224, 34, 10, 197,
-12, 199, 28, 113, 45, 200, 208, 22, 75, 38,
- 144, 176, 201, 35, 32, 48, 224, 75, 56, 226,
- 156, 66, 14, 22,
[PHP-CVS] cvs: php4 /ext/standard info.c
cmv Wed Oct 9 10:39:40 2002 EDT
Modified files:
/php4/ext/standard info.c
Log:
no charsets, only basic entity escaping
Index: php4/ext/standard/info.c
diff -u php4/ext/standard/info.c:1.214 php4/ext/standard/info.c:1.215
--- php4/ext/standard/info.c:1.214 Sun Oct 6 13:04:10 2002
+++ php4/ext/standard/info.cWed Oct 9 10:39:39 2002
-18,7 +18,7
+--+
*/
-/* $Id: info.c,v 1.214 2002/10/06 17:04:10 rasmus Exp $ */
+/* $Id: info.c,v 1.215 2002/10/09 14:39:39 cmv Exp $ */
#include php.h
#include php_ini.h
-191,7 +191,7
PHPAPI char *php_info_html_esc(char *string TSRMLS_DC)
{
int new_len;
- return php_escape_html_entities(string, strlen(string), new_len, 1,
ENT_COMPAT, NULL TSRMLS_CC);
+ return php_escape_html_entities(string, strlen(string), new_len, 0,
+ENT_NOQUOTES, NULL TSRMLS_CC);
}
/* }}} */
-277,6 +277,9
*/
PHPAPI void php_print_info_htmlhead(TSRMLS_D)
{
+
+/*** none of this is needed now ***
+
const char *charset = NULL;
if (SG(default_charset)) {
-303,12 +306,17
charset = US-ASCII;
}
+*** none of that is needed now ***/
+
+
PUTS(!DOCTYPE html PUBLIC \-//W3C//DTD XHTML 1.0 Transitional//EN\
\DTD/xhtml1-transitional.dtd\\n);
PUTS(html);
PUTS(head\n);
php_info_print_style();
PUTS(titlephpinfo()/title);
+/*
php_printf(meta http-equiv=\Content-Type\ content=\text/html;
charset=%s\ /\n, charset);
+*/
PUTS(/head\n);
PUTS(bodycenter\n);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard css.c
cmv Tue Oct 8 15:42:23 2002 EDT
Modified files:
/php4/ext/standard css.c
Log:
don't define fonts ... use the browser defaults
Index: php4/ext/standard/css.c
diff -u php4/ext/standard/css.c:1.2 php4/ext/standard/css.c:1.3
--- php4/ext/standard/css.c:1.2 Thu Sep 26 13:54:53 2002
+++ php4/ext/standard/css.c Tue Oct 8 15:42:23 2002
-16,7 +16,7
+--+
*/
-/* $Id: css.c,v 1.2 2002/09/26 17:54:53 cmv Exp $ */
+/* $Id: css.c,v 1.3 2002/10/08 19:42:23 cmv Exp $ */
#include php.h
#include info.h
-29,15 +29,15
TSRMLS_FETCH();
PUTS(body {background-color: #ff; color: #00;}\n);
- PUTS(body, td, th, h1, h2 {font-family: arial, helvetica, sans-serif;}\n);
- PUTS(pre {margin: 0px; font-family: \andale mono\, \monotype.com\,
\courier new\, courier, monospace;}\n);
+ PUTS(body, td, th, h1, h2 {font-family: sans-serif;}\n);
+ PUTS(pre {margin: 0px; font-family: monospace;}\n);
PUTS(a:link {color: #99; text-decoration: none;}\n);
PUTS(a:hover {text-decoration: underline;}\n);
PUTS(table {border-collapse: collapse;}\n);
PUTS(td, th { border: 1px solid #00; font-size: 75%; vertical-align:
baseline;}\n);
PUTS(h1 {font-size: 150%;}\n);
- PUTS(.p {text-align: left;}\n);
PUTS(h2 {font-size: 125%;}\n);
+ PUTS(.p {text-align: left;}\n);
PUTS(.e {background-color: #ff; font-weight: bold;}\n);
PUTS(.h {background-color: #cc; font-weight: bold;}\n);
PUTS(.v {background-color: #cc;}\n);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / php.ini-dist
cmv Mon Oct 7 13:58:27 2002 EDT Modified files: /php4 php.ini-dist Log: Document session.save_path option in php.ini Index: php4/php.ini-dist diff -u php4/php.ini-dist:1.161 php4/php.ini-dist:1.162 --- php4/php.ini-dist:1.161 Thu Oct 3 02:52:23 2002 +++ php4/php.ini-dist Mon Oct 7 13:58:27 2002 -766,6 +766,15 ; Argument passed to save_handler. In the case of files, this is the path ; where data files are stored. Note: Windows users have to change this ; variable in order to use PHP's session functions. +; As of PHP 4.2.3, you can define the path as: +; session.save_path = N;/path +; where N is an integer. Instead of storing all the session files in +; /path, what this will do is create subdirectories N-levels deep, and +; store the session data in those directories. This is useful if you +; or your OS have problems with lots of files in one directory, and is +; a more efficient layout for servers that handle lots of sessions. +; (Note: see the section on garbage collection below if you choose to +; use subdirectories for session storage) session.save_path = /tmp ; Whether to use cookies. -807,6 +816,14 ; not. So, see session_set_save_handler() and write your own ; session handler with a different mechanism for cleaning up sessions. session.gc_maxlifetime = 1440 + +; NOTE: If you are using the subdirectory option for storing session files +; (see session.save_path above), then garbage collection does *not* +; happen automatically. You will need to do your own garbage +; collection through a shell script, cron entry, or some other method. +; For example, the following script would is the equivalent of +; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): +; cd /path/to/sessions; find -cmin +24 | xargs rm ; PHP 4.2 and less have an undocumented feature/bug that allows you to ; to initialize a session variable in the global scope, albeit register_globals -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard info.c
cmv Wed Oct 2 10:27:32 2002 EDT
Modified files:
/php4/ext/standard info.c
Log:
Fix for SRM module (and maybe others). Header rows are now not HTML
escaped, so make sure you do this yourself in the modules.
Index: php4/ext/standard/info.c
diff -u php4/ext/standard/info.c:1.209 php4/ext/standard/info.c:1.210
--- php4/ext/standard/info.c:1.209 Fri Sep 27 12:05:47 2002
+++ php4/ext/standard/info.cWed Oct 2 10:27:32 2002
-18,7 +18,7
+--+
*/
-/* $Id: info.c,v 1.209 2002/09/27 16:05:47 cmv Exp $ */
+/* $Id: info.c,v 1.210 2002/10/02 14:27:32 cmv Exp $ */
#include php.h
#include php_ini.h
-671,7 +671,7
}
if (PG(html_errors)) {
PUTS(th);
- PUTS(php_info_html_esc(row_element TSRMLS_CC));
+ PUTS(row_element);
PUTS(/th);
} else {
PUTS(row_element);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard css.c info.c /main php_ini.c /sapi/aolserver aolserver.c /sapi/apache php_apache.c
cmv Thu Sep 26 13:54:55 2002 EDT
Modified files:
/php4/ext/standard css.c info.c
/php4/main php_ini.c
/php4/sapi/aolserveraolserver.c
/php4/sapi/apache php_apache.c
Log:
fix phpinfo() output for better browser BC
Index: php4/ext/standard/css.c
diff -u php4/ext/standard/css.c:1.1 php4/ext/standard/css.c:1.2
--- php4/ext/standard/css.c:1.1 Thu Sep 19 17:57:24 2002
+++ php4/ext/standard/css.c Thu Sep 26 13:54:53 2002
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: css.c,v 1.1 2002/09/19 21:57:24 cmv Exp $ */
+/* $Id: css.c,v 1.2 2002/09/26 17:54:53 cmv Exp $ */
#include php.h
#include info.h
@@ -28,78 +28,22 @@
{
TSRMLS_FETCH();
- PUTS(body {);
- PUTS(background-color: #ff;);
- PUTS(color: #00;);
- PUTS(font-family: verdana, arial, helvetica, sans-serif;);
- PUTS(}\n);
- PUTS(pre {);
- PUTS(font-family: \andale mono\, \monotype.com\, \courier new\,
courier, monospace;);
- PUTS(}\n);
- PUTS(a[href] {);
- PUTS(color: #99;);
- PUTS(text-decoration: none;);
- PUTS(}\n);
- PUTS(a[href]:hover {);
- PUTS(text-decoration: underline;);
- PUTS(}\n);
- PUTS(table {);
- PUTS(border-collapse: collapse;);
- PUTS(width: 600px;);
- PUTS(font-size: 80%;);
- PUTS(}\n);
- PUTS(.centered {);
- PUTS(text-align: center;);
- PUTS(}\n);
- PUTS(.centered table {);
- PUTS(margin-left: auto;);
- PUTS(margin-right: auto;);
- PUTS(text-align: left;);
- PUTS(}\n);
- PUTS(td, th {);
- PUTS(vertical-align: baseline;);
- PUTS(padding: 3px;);
- PUTS(border: 1px solid #00;);
- PUTS(}\n);
- PUTS(h1 {);
- PUTS(text-align: center;);
- PUTS(font-size: 160%;);
- PUTS(}\n);
- PUTS(.phpver {);
- PUTS(text-align: left;);
- PUTS(}\n);
- PUTS(h2 {);
- PUTS(text-align: center;);
- PUTS(font-size: 130%;);
- PUTS(}\n);
- PUTS(.entry {);
- PUTS(background-color: #ff;);
- PUTS(font-weight: bold;);
- PUTS(}\n);
- PUTS(.header {);
- PUTS(background-color: #cc;);
- PUTS(font-weight: bold;);
- PUTS(margin-left: auto;);
- PUTS(margin-right: auto;);
- PUTS(}\n);
- PUTS(.value {);
- PUTS(background-color: #cc;);
- PUTS(margin-left: auto;);
- PUTS(margin-right: auto;);
- PUTS(}\n);
- PUTS(.infobox {);
- PUTS(background-color: #cc;);
- PUTS(}\n);
- PUTS(img {);
- PUTS(float: right;);
- PUTS(border: 0px;);
- PUTS(}\n);
- PUTS(hr {);
- PUTS(width: 600px;);
- PUTS(background-color: #cc;);
- PUTS(border: 0px;);
- PUTS(height: 1px;);
- PUTS(}\n);
+ PUTS(body {background-color: #ff; color: #00;}\n);
+ PUTS(body, td, th, h1, h2 {font-family: arial, helvetica, sans-serif;}\n);
+ PUTS(pre {margin: 0px; font-family: \andale mono\, \monotype.com\,
+\courier new\, courier, monospace;}\n);
+ PUTS(a:link {color: #99; text-decoration: none;}\n);
+ PUTS(a:hover {text-decoration: underline;}\n);
+ PUTS(table {border-collapse: collapse;}\n);
+ PUTS(td, th { border: 1px solid #00; font-size: 75%; vertical-align:
+baseline;}\n);
+ PUTS(h1 {font-size: 150%;}\n);
+ PUTS(.p {text-align: left;}\n);
+ PUTS(h2 {font-size: 125%;}\n);
+ PUTS(.e {background-color: #ff; font-weight: bold;}\n);
+ PUTS(.h {background-color: #cc; font-weight: bold;}\n);
+ PUTS(.v {background-color: #cc;}\n);
+ PUTS(i {color: #66;}\n);
+ PUTS(img {float: right; border: 0px;}\n);
+ PUTS(hr {width: 600px; align: center; background-color: #cc; border: 0px;
+height: 1px;}\n);
}
/* }}} */
Index: php4/ext/standard/info.c
diff -u php4/ext/standard/info.c:1.204 php4/ext/standard/info.c:1.205
--- php4/ext/standard/info.c:1.204 Thu Sep 19 17:57:24 2002
+++ php4/ext/standard/info.cThu Sep 26 13:54:53 2002
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.204 2002/09/19 21:57:24 cmv Exp $ */
+/* $Id: info.c,v 1.205 2002/09/26 17:54:53 cmv Exp $ */
#include php.h
#include php_ini.h
@@ -51,7 +51,7 @@
#endif
#define SECTION(name) if (PG(html_errors)) { \
- PUTS(h2 class=\section\
name /h2\n); \
+ PUTS(h2 name /h2\n); \
} else { \
php_info_print_table_start(); \
php_info_print_table_header(1,
name); \
@@ -68,7 +68,7 @@
[PHP-CVS] Re: cvs: php4 /ext/standard css.c info.c /main php_ini.c /sapi/aolserveraolserver.c /sapi/apache php_apache.c
Okay, so I've done some more tweaking and phpinfo()'s output should be
pretty much identical to the way it used to be in NS 4.x browsers, yet
still using some CSS to drop the file size down. Not as much as a pure
CSS solution, but better. Plus XHTML compliant.
I'll do the credits page shortly.
The only thing that isn't working now is the colouring of the highlight
colours on the info page. I'm 99% sure I didn't break it, but maybe
it's related to what's going on with the zend highlighting code
(someone's working on that now, right?).
Jani/Derrick/et al ... is this okay with you now?
- Colin
Colin Viebrock wrote:
cmv Thu Sep 26 13:54:55 2002 EDT
Modified files:
/php4/ext/standardcss.c info.c
/php4/mainphp_ini.c
/php4/sapi/aolserver aolserver.c
/php4/sapi/apache php_apache.c
Log:
fix phpinfo() output for better browser BC
Index: php4/ext/standard/css.c
diff -u php4/ext/standard/css.c:1.1 php4/ext/standard/css.c:1.2
--- php4/ext/standard/css.c:1.1 Thu Sep 19 17:57:24 2002
+++ php4/ext/standard/css.c Thu Sep 26 13:54:53 2002
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: css.c,v 1.1 2002/09/19 21:57:24 cmv Exp $ */
+/* $Id: css.c,v 1.2 2002/09/26 17:54:53 cmv Exp $ */
#include php.h
#include info.h
@@ -28,78 +28,22 @@
{
TSRMLS_FETCH();
- PUTS(body {);
- PUTS(background-color: #ff;);
- PUTS(color: #00;);
- PUTS(font-family: verdana, arial, helvetica, sans-serif;);
- PUTS(}\n);
- PUTS(pre {);
- PUTS(font-family: \andale mono\, \monotype.com\, \courier new\,
courier, monospace;);
- PUTS(}\n);
- PUTS(a[href] {);
- PUTS(color: #99;);
- PUTS(text-decoration: none;);
- PUTS(}\n);
- PUTS(a[href]:hover {);
- PUTS(text-decoration: underline;);
- PUTS(}\n);
- PUTS(table {);
- PUTS(border-collapse: collapse;);
- PUTS(width: 600px;);
- PUTS(font-size: 80%;);
- PUTS(}\n);
- PUTS(.centered {);
- PUTS(text-align: center;);
- PUTS(}\n);
- PUTS(.centered table {);
- PUTS(margin-left: auto;);
- PUTS(margin-right: auto;);
- PUTS(text-align: left;);
- PUTS(}\n);
- PUTS(td, th {);
- PUTS(vertical-align: baseline;);
- PUTS(padding: 3px;);
- PUTS(border: 1px solid #00;);
- PUTS(}\n);
- PUTS(h1 {);
- PUTS(text-align: center;);
- PUTS(font-size: 160%;);
- PUTS(}\n);
- PUTS(.phpver {);
- PUTS(text-align: left;);
- PUTS(}\n);
- PUTS(h2 {);
- PUTS(text-align: center;);
- PUTS(font-size: 130%;);
- PUTS(}\n);
- PUTS(.entry {);
- PUTS(background-color: #ff;);
- PUTS(font-weight: bold;);
- PUTS(}\n);
- PUTS(.header {);
- PUTS(background-color: #cc;);
- PUTS(font-weight: bold;);
- PUTS(margin-left: auto;);
- PUTS(margin-right: auto;);
- PUTS(}\n);
- PUTS(.value {);
- PUTS(background-color: #cc;);
- PUTS(margin-left: auto;);
- PUTS(margin-right: auto;);
- PUTS(}\n);
- PUTS(.infobox {);
- PUTS(background-color: #cc;);
- PUTS(}\n);
- PUTS(img {);
- PUTS(float: right;);
- PUTS(border: 0px;);
- PUTS(}\n);
- PUTS(hr {);
- PUTS(width: 600px;);
- PUTS(background-color: #cc;);
- PUTS(border: 0px;);
- PUTS(height: 1px;);
- PUTS(}\n);
+ PUTS(body {background-color: #ff; color: #00;}\n);
+ PUTS(body, td, th, h1, h2 {font-family: arial, helvetica, sans-serif;}\n);
+ PUTS(pre {margin: 0px; font-family: \andale mono\, \monotype.com\,
\courier new\, courier, monospace;}\n);
+ PUTS(a:link {color: #99; text-decoration: none;}\n);
+ PUTS(a:hover {text-decoration: underline;}\n);
+ PUTS(table {border-collapse: collapse;}\n);
+ PUTS(td, th { border: 1px solid #00; font-size: 75%; vertical-align:
baseline;}\n);
+ PUTS(h1 {font-size: 150%;}\n);
+ PUTS(.p {text-align: left;}\n);
+ PUTS(h2 {font-size: 125%;}\n);
+ PUTS(.e {background-color: #ff; font-weight: bold;}\n);
+ PUTS(.h {background-color: #cc; font-weight: bold;}\n);
+ PUTS(.v {background-color: #cc;}\n);
+ PUTS(i {color: #66;}\n);
+ PUTS(img {float: right; border: 0px;}\n);
+ PUTS(hr {width: 600px; align: center; background-color: #cc; border: 0px;
height: 1px;}\n);
}
/* }}} */
Index: php4/ext/standard/info.c
diff -u php4/ext/standard/info.c:1.204 php4/ext/standard/info.c:1.205
--- php4/ext/standard/info.c:1.204Thu Sep 19 17:57:24 2002
+++ php4/ext/standard/info.c Thu Sep 26 13:54:53 2002
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id
[PHP-CVS] cvs: php4 / NEWS
cmv Thu Sep 26 16:54:55 2002 EDT Modified files: /php4 NEWS Log: document changes Index: php4/NEWS diff -u php4/NEWS:1.1139 php4/NEWS:1.1140 --- php4/NEWS:1.1139Thu Sep 26 09:51:04 2002 +++ php4/NEWS Thu Sep 26 16:54:55 2002 -5,6 +5,8 - Added platform independent socket error constants for better error handling. - Fixed include(), require() and GD functions to work with remote files under win32. (Wez) +- Update output of phpinfo() to use more CSS to reduce the file size, do + proper HTML escaping, and make it XHTML compliant. (Colin) - Added php.ini option auto_detect_line_endings which enables PHP to detect Macintosh, Unix and Dos end-of-line characters in fgets() and file(). Fixes Bug #16521. (Wez) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
