|
 |
ba7b08 |
--- rrdtool-1.4.7/php4/rrdtool.c.orig 2013-03-22 14:54:18.520877577 +0100
|
|
|
ba7b08 |
+++ rrdtool-1.4.7/php4/rrdtool.c 2013-03-22 14:59:23.056303502 +0100
|
|
|
ba7b08 |
@@ -20,13 +20,11 @@
|
|
|
ba7b08 |
|
|
|
ba7b08 |
/* PHP Includes */
|
|
|
ba7b08 |
#include "php.h"
|
|
|
ba7b08 |
-#include "php_logos.h"
|
|
|
ba7b08 |
#include "ext/standard/info.h"
|
|
|
ba7b08 |
#include "SAPI.h"
|
|
|
ba7b08 |
|
|
|
ba7b08 |
/* rrdtool includes */
|
|
|
ba7b08 |
#include "php_rrdtool.h"
|
|
|
ba7b08 |
-#include "rrdtool_logo.h"
|
|
|
ba7b08 |
#include <rrd.h>
|
|
|
ba7b08 |
|
|
|
ba7b08 |
#ifdef HAVE_CONFIG_H
|
|
|
ba7b08 |
@@ -48,7 +46,6 @@
|
|
|
ba7b08 |
PHP_FE(rrd_last, NULL)
|
|
|
ba7b08 |
PHP_FE(rrd_create, NULL)
|
|
|
ba7b08 |
PHP_FE(rrdtool_info, NULL)
|
|
|
ba7b08 |
- PHP_FE(rrdtool_logo_guid, NULL)
|
|
|
ba7b08 |
{NULL, NULL, NULL}
|
|
|
ba7b08 |
};
|
|
|
ba7b08 |
|
|
|
ba7b08 |
@@ -83,8 +80,6 @@
|
|
|
ba7b08 |
/* {{{ PHP_MINIT_FUNCTION */
|
|
|
ba7b08 |
PHP_MINIT_FUNCTION(rrdtool)
|
|
|
ba7b08 |
{
|
|
|
ba7b08 |
- php_register_info_logo(RRDTOOL_LOGO_GUID , "image/gif", rrdtool_logo , sizeof(rrdtool_logo));
|
|
|
ba7b08 |
-
|
|
|
ba7b08 |
return SUCCESS;
|
|
|
ba7b08 |
}
|
|
|
ba7b08 |
/* }}} */
|
|
|
ba7b08 |
@@ -92,8 +87,6 @@
|
|
|
ba7b08 |
/* {{{ PHP_MSHUTDOWN_FUNCTION */
|
|
|
ba7b08 |
PHP_MSHUTDOWN_FUNCTION(rrdtool)
|
|
|
ba7b08 |
{
|
|
|
ba7b08 |
- php_unregister_info_logo(RRDTOOL_LOGO_GUID);
|
|
|
ba7b08 |
-
|
|
|
ba7b08 |
return SUCCESS;
|
|
|
ba7b08 |
}
|
|
|
ba7b08 |
/* }}} */
|
|
|
ba7b08 |
@@ -102,11 +95,6 @@
|
|
|
ba7b08 |
PHP_MINFO_FUNCTION(rrdtool)
|
|
|
ba7b08 |
{
|
|
|
ba7b08 |
php_info_print_box_start(1);
|
|
|
ba7b08 |
- PUTS("
|
|
|
ba7b08 |
- if (SG(request_info).request_uri) {
|
|
|
ba7b08 |
- PUTS(SG(request_info).request_uri);
|
|
|
ba7b08 |
- }
|
|
|
ba7b08 |
- PUTS("?="RRDTOOL_LOGO_GUID"\" alt=\"ClamAV logo\" />\n");
|
|
|
ba7b08 |
php_printf("rrdtool Version %s\n", PHP_RRD_VERSION_STRING);
|
|
|
ba7b08 |
php_info_print_box_end();
|
|
|
ba7b08 |
php_info_print_table_start();
|
|
|
ba7b08 |
@@ -548,11 +536,6 @@
|
|
|
ba7b08 |
PUTS("<body>\n");
|
|
|
ba7b08 |
|
|
|
ba7b08 |
php_info_print_box_start(1);
|
|
|
ba7b08 |
- PUTS("
|
|
|
ba7b08 |
- if (SG(request_info).request_uri) {
|
|
|
ba7b08 |
- PUTS(SG(request_info).request_uri);
|
|
|
ba7b08 |
- }
|
|
|
ba7b08 |
- PUTS("?="RRDTOOL_LOGO_GUID"\" alt=\"ClamAV logo\" />\n");
|
|
|
ba7b08 |
php_printf("rrdtool Version %s\n", PHP_RRD_VERSION_STRING);
|
|
|
ba7b08 |
php_info_print_box_end();
|
|
|
ba7b08 |
php_info_print_table_start();
|
|
|
ba7b08 |
@@ -590,16 +573,6 @@
|
|
|
ba7b08 |
}
|
|
|
ba7b08 |
/* }}} */
|
|
|
ba7b08 |
|
|
|
ba7b08 |
-PHP_FUNCTION(rrdtool_logo_guid)
|
|
|
ba7b08 |
-{
|
|
|
ba7b08 |
- if (ZEND_NUM_ARGS() != 0) {
|
|
|
ba7b08 |
- WRONG_PARAM_COUNT;
|
|
|
ba7b08 |
- }
|
|
|
ba7b08 |
-
|
|
|
ba7b08 |
- RETURN_STRINGL(RRDTOOL_LOGO_GUID, sizeof(RRDTOOL_LOGO_GUID)-1, 1);
|
|
|
ba7b08 |
-}
|
|
|
ba7b08 |
-/* }}} */
|
|
|
ba7b08 |
-
|
|
|
ba7b08 |
#endif /* HAVE_RRDTOOL */
|
|
|
ba7b08 |
|
|
|
ba7b08 |
/*
|