$body = eregi_replace ("([a-z]|[0-9]|_|\.|-)+\@([a-z]|[0-9]|_|-)+(\.([a-z]|[0-9]|_|-)+)*", "<a href=\"../src/compose.php?send_to=\\0\">\\0</a>", $body);
}
*/
- $body = eregi_replace ("([a-z]|[0-9]|_|\.|-)+\@([a-z]|[0-9]|_|-)+(\.([a-z]|[0-9]|_|-)+)*", "<a href=\"../src/compose.php?send_to=\\0\">\\0</a>", $body);
+ $body = eregi_replace ("([a-z]|[0-9]|_|\.|-)+\@([a-z]|[0-9]|_|-)+(\.([a-z]|[A-Z])|[a-z]|[0-9]|_|-)+", "<a href=\"../src/compose.php?send_to=\\0\">\\0</a>", $body);
return $body;
}
#Possible ways a URL could finish.
$poss_ends=array(" ", "\n", "\r", "<", ">", ".\r", ".\n", ". ", " ", ")", "(",
- """, "<", ">", ".<");
+ """, "<", ">", ".<", "]", "[", "{", "}", "--");
$done=False;
while (!$done) {
#Look for when a URL starts
"ftp://",
"telnet://");
for($i = 0; $i < sizeof($url_tokens); $i++) {
- if($where = strpos(strtolower($body), $url_tokens[$i], $start))
+ if($where = strpos(strtolower("^^".$body), $url_tokens[$i], $start))
break;
}
//$where = strpos(strtolower($body),"http://",$start);
if ($where) {
+ $where = $where - 2; // because we added the ^^ at the begining
# Find the end of that URL
reset($poss_ends); $end=0;
while (list($key, $val) = each($poss_ends)) {