Connection to statistics server FAILED!
"; - echo "$errno: $errstr"; -} else { - if ($postparams == "") { - fputs ($idx, "GET $statpath HTTP/1.0\r\n"); - } else { - $len = strlen($postparams); - fputs ($idx, "POST $statpath HTTP/1.0\r\n"); - fputs ($idx, "Content-Length: $len\r\n"); - } - if ($languages != "") { - fputs ($idx, "Accept-Language: $languages\r\n"); - } - if ($useragent != "") { - fputs ($idx, "User-Agent: $useragent\r\n"); - } - if ($remoteaddr != "") { - fputs ($idx, "X-Relayed-For: $remoteaddr\r\n"); - } - if ($xforwardedfor != "") { - fputs ($idx, "X-Forwarded-For: $xforwardedfor\r\n"); - } - if ($cookies != "") { - fputs ($idx, "Cookie: $cookies\r\n"); - } - - fputs ($idx, "\r\n"); - - if ($postparams != "") { - fputs ($idx, $postparams); - } - - while (!feof($idx)) { - $buf = fgets($idx, $MAXLEN); - if ($httpbody) { - do_transform($buf); - } else if ($buf == "" || $buf == "\n") { - $httpbody = true; - } else { - $buf = eregi_replace("Location: ", "Location: $scriptname?statpath=", $buf); - header($buf); - } - } - fclose($idx); -} - - -########### old regex experiments -// echo eregi_replace("href=\"(\/.*\/)*\"/", "relay.php?statpath=", $buf); -// echo eregi_replace("href=\"(http\:\/\/{0,0})", "relay.php?statpath=", $buf); -// $buf = eregi_replace("href=\"", "href=\"relay.php?statpath=", $buf); -// $buf = eregi_replace("(href=\")([^\"]*)(\")", "href=\"$scriptname.php?path=$statpath{transform_remote_url(\\2)}\"", $buf); -// $buf = eregi_replace("(href=\"){1,}", "href=\"$scriptname?statpath=$statpath", $buf); -// $buf = eregi_replace("(href=\")[[:alpha:]]*[^\ ]*http\:\/\/", "href=\"http://", $buf); -// echo $buf; -// echo pregi_replace("href=\"(^http)", "href=\"relay.php?statpath=", $buf); -// for ($i = 0; $i < strlen($buf); $i++) { -// if (!strncasecmp($buf[$i], "href=\"", 6) && !(!strncasecmp($buf[$i], "href=\"http://", 13)) { -// echo "href=\"$scriptname?statpath=$statpath/"; -// $i = $i + 5; -// } else { -// echo $buf[i]; -// } -// } -// echo eregi_replace("(href\=\")(http\:\/\/){,0}", "href=\"$scriptname?statpath=", $buf); -// echo $buf; - +
Connection to statistics server FAILED!
"; + echo "$errno: $errstr"; +} else { + if ($postparams == "") { + fputs ($idx, "GET $statpath HTTP/1.0\r\n"); + } else { + $len = strlen($postparams); + fputs ($idx, "POST $statpath HTTP/1.0\r\n"); + fputs ($idx, "Content-Length: $len\r\n"); + } + if ($languages != "") { + fputs ($idx, "Accept-Language: $languages\r\n"); + } + if ($useragent != "") { + fputs ($idx, "User-Agent: $useragent\r\n"); + } + if ($remoteaddr != "") { + fputs ($idx, "X-Relayed-For: $remoteaddr\r\n"); + } + if ($xforwardedfor != "") { + fputs ($idx, "X-Forwarded-For: $xforwardedfor\r\n"); + } + if ($cookies != "") { + fputs ($idx, "Cookie: $cookies\r\n"); + } + + fputs ($idx, "\r\n"); + + if ($postparams != "") { + fputs ($idx, $postparams); + } + + while (!feof($idx)) { + $buf = fgets($idx, $MAXLEN); + if ($httpbody) { + do_transform($buf); + } else if ($buf == "" || $buf == "\n") { + $httpbody = true; + } else { + $buf = eregi_replace("Location: ", "Location: $scriptname?statpath=", $buf); + header($buf); + } + } + fclose($idx); +} + + +########### old regex experiments +// echo eregi_replace("href=\"(\/.*\/)*\"/", "relay.php?statpath=", $buf); +// echo eregi_replace("href=\"(http\:\/\/{0,0})", "relay.php?statpath=", $buf); +// $buf = eregi_replace("href=\"", "href=\"relay.php?statpath=", $buf); +// $buf = eregi_replace("(href=\")([^\"]*)(\")", "href=\"$scriptname.php?path=$statpath{transform_remote_url(\\2)}\"", $buf); +// $buf = eregi_replace("(href=\"){1,}", "href=\"$scriptname?statpath=$statpath", $buf); +// $buf = eregi_replace("(href=\")[[:alpha:]]*[^\ ]*http\:\/\/", "href=\"http://", $buf); +// echo $buf; +// echo pregi_replace("href=\"(^http)", "href=\"relay.php?statpath=", $buf); +// for ($i = 0; $i < strlen($buf); $i++) { +// if (!strncasecmp($buf[$i], "href=\"", 6) && !(!strncasecmp($buf[$i], "href=\"http://", 13)) { +// echo "href=\"$scriptname?statpath=$statpath/"; +// $i = $i + 5; +// } else { +// echo $buf[i]; +// } +// } +// echo eregi_replace("(href\=\")(http\:\/\/){,0}", "href=\"$scriptname?statpath=", $buf); +// echo $buf; + ?> \ No newline at end of file diff --git a/core/generic_linked_list.c b/core/generic_linked_list.c index f28e1cc..e256a9f 100644 --- a/core/generic_linked_list.c +++ b/core/generic_linked_list.c @@ -94,6 +94,7 @@ static void llist_delete(struct llist_header *head, void *key) else p = head->root; head->size--; + break; } else { last = p; p = p->next; diff --git a/core/templates_stats_commands.c b/core/templates_stats_commands.c index 22c9316..d1dbb99 100644 --- a/core/templates_stats_commands.c +++ b/core/templates_stats_commands.c @@ -982,9 +982,9 @@ static void template_send_onchanlist(int idx, struct template_content *h_tpc) if (!chan) return; for (m = schan_members_getfirst(&chan->members); m ; m = schan_members_getnext(&chan->members)) { - glob_statsmember = m; /*FIXME: heap-use-after-free */ + glob_statsmember = m; - glob_user = m->user; + glob_user = m->user; /* FIXME: heap-use-after-free - free() in tclchan.c:init_channel() - see https://github.com/eggheads/eggdrop/pull/1550 */ if (m->stats) glob_locstats = m->stats; else @@ -997,7 +997,7 @@ static void template_send_usermode(int idx, struct template_content *h_tpc) { if (glob_statsmember && glob_statsmember->eggmember) { #ifndef NO_EGG - if (chan_hasop(glob_statsmember->eggmember)) + if (chan_hasop(glob_statsmember->eggmember)) /* FIXME: heap-use-after-free - free() in tclchan.c:init_channel() - see https://github.com/eggheads/eggdrop/pull/1550 */ dprintf(idx, "@"); if (chan_hasvoice(glob_statsmember->eggmember)) dprintf(idx, "+"); diff --git a/stats.c b/stats.c index fd078cf..5421ebd 100644 --- a/stats.c +++ b/stats.c @@ -31,7 +31,7 @@ #define MAKING_STATS #define MODULE_NAME "stats" -#define MODULE_VERSION "1.10" +#define MODULE_VERSION "1.11" #ifndef NO_EGG #include "../module.h" #include "../irc.mod/irc.h" @@ -446,7 +446,7 @@ char *stats_start(Function * global_funcs) chanlangs = NULL; slang_glob_init(); - module_register(MODULE_NAME, stats_table, 1, 10); + module_register(MODULE_NAME, stats_table, 1, 11); if (!(irc_funcs = module_depend(MODULE_NAME, "irc", 1, 0))) return "You need the irc module to use the stats module."; if (!(server_funcs = module_depend(MODULE_NAME, "server", 1, 0))) diff --git a/templates/stats/classic/404.tpl b/templates/stats/classic/404.tpl index e64e66b..699512e 100644 --- a/templates/stats/classic/404.tpl +++ b/templates/stats/classic/404.tpl @@ -1,9 +1,9 @@ - -
Not Found
The requested URL was not found on this server. --
- -Stats.Mod/HTTPd Server at Port - + +
Not Found
The requested URL was not found on this server. ++
+ +Stats.Mod/HTTPd Server at Port + diff --git a/templates/stats/classic/chan.tpl b/templates/stats/classic/chan.tpl index f1667f6..e54acd7 100644 --- a/templates/stats/classic/chan.tpl +++ b/templates/stats/classic/chan.tpl @@ -1,28 +1,28 @@ - - - -
| - | - |
| + | + |
- - -
| - | 0:00 - 6:00 | -6:00 - 12:00 | -12:00 - 17:00 | -18:00 - 24:00 | -||||||||||||||||||||
| - - |
-
-  " width="10" alt="blue">
-  " width="10" alt="green">
-
- |
-
-|||||||||||||||||||||||
| - - | - - - - | - -|||||||||||||||||||||||
| - - | - - - - | - -|||||||||||||||||||||||
+ + +
| + | 0:00 - 6:00 | +6:00 - 12:00 | +12:00 - 17:00 | +18:00 - 24:00 | +||||||||||||||||||||
| + + |
+
+ " width="10" alt="blue">
+ " width="10" alt="green">
+
+ |
+
+|||||||||||||||||||||||
| + + | + + + + | + +|||||||||||||||||||||||
| + + | + + + + | + +|||||||||||||||||||||||
- - - -
-  words --?> |
-
-
|---|
-
- -
|
- - % - |
-
-
| " alt=""> |
-
-
| - /"> - | - -
- - -
-
| - | - | - | - |
- -
- -