[Phpfreechat-svn] SF.net SVN: phpfreechat: [1134] trunk/src
Status: Beta
Brought to you by:
kerphi
|
From: <gpi...@us...> - 2007-08-20 19:36:11
|
Revision: 1134
http://phpfreechat.svn.sourceforge.net/phpfreechat/?rev=1134&view=rev
Author: gpinzone
Date: 2007-08-20 12:36:14 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
Needed to change function name to resolve conflict with phpBB.
Modified Paths:
--------------
trunk/src/pfccontainer.class.php
trunk/src/urlprocessing.php
Modified: trunk/src/pfccontainer.class.php
===================================================================
--- trunk/src/pfccontainer.class.php 2007-08-20 17:41:46 UTC (rev 1133)
+++ trunk/src/pfccontainer.class.php 2007-08-20 19:36:14 UTC (rev 1134)
@@ -383,7 +383,7 @@
$msgid = $this->_requestMsgId($chan);
// convert URLs to html
- $param = make_clickable($param);
+ $param = make_hyperlink($param);
// format message
$data = "\n";
Modified: trunk/src/urlprocessing.php
===================================================================
--- trunk/src/urlprocessing.php 2007-08-20 17:41:46 UTC (rev 1133)
+++ trunk/src/urlprocessing.php 2007-08-20 19:36:14 UTC (rev 1134)
@@ -13,7 +13,7 @@
* Notes: the email one might get annoying - it's easy to make it more restrictive, though.. maybe
* have it require something like xx...@yy... or such. We'll see.
*/
-function make_clickable($text)
+function make_hyperlink($text)
{
$text = preg_replace('#(script|about|applet|activex|chrome):#is', "\\1:", $text);
@@ -50,7 +50,7 @@
* - Does not distinguish between "www.xxxx.yyyy" and "http://aaaa.bbbb" type URLs.
*
*/
-function undo_make_clickable($text)
+function undo_make_hyperlink($text)
{
$text = preg_replace("#<!-- BBCode auto-link start --><a href=\"(.*?)\" target=\"_blank\">.*?</a><!-- BBCode auto-link end -->#i", "\\1", $text);
$text = preg_replace("#<!-- BBcode auto-mailto start --><a href=\"mailto:(.*?)\">.*?</a><!-- BBCode auto-mailto end -->#i", "\\1", $text);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|