From: <be...@us...> - 2013-06-16 19:39:33
|
Revision: 11703 http://sourceforge.net/p/xoops/svn/11703 Author: beckmi Date: 2013-06-16 19:39:27 +0000 (Sun, 16 Jun 2013) Log Message: ----------- Replacing Tabs with spaces Modified Paths: -------------- XoopsCore/branches/2.6.x/2.6.0/extras/login.php XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php XoopsCore/branches/2.6.x/2.6.0/htdocs/class/captcha/recaptcha/recaptchalib.php XoopsCore/branches/2.6.x/2.6.0/htdocs/class/snoopy.php XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/language/english.php XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tinymce.php XoopsCore/branches/2.6.x/2.6.0/htdocs/include/mimetypes.inc.php XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/block.php XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/_countries.php XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/_user.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/2dbarcodes.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/barcodes.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/config/tcpdf_config.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/config/tcpdf_config_alt.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/almohanad.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/arialunicid0.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/hysmyeongjostdmedium.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/kozgopromedium.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/kozminproregular.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/msungstdlight.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/stsongstdlight.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/makeallttffonts.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/makefont.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/zarbold.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/htmlcolors.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/qrcode.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/tcpdf.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/unicode_data.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/language/english/main.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/class/ProtectorMysqlDatabase.class.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/class/protector.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/filters_disabled/postcommon_post_deny_by_rbl.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/filters_disabled/postcommon_register_insert_js_check.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/include/precheck_functions.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/language/russian/admin.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/language/russian/modinfo.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/xoops_version.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/import/news.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/import/smartsection.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/main.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/thumb.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/bindings/tcpdf/qrcode.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/phpqrcode.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrconst.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrlib.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrmask.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrspec.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/qrtools.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/phpqrcode/tools/merge.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpThumb.config.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpThumb.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpthumb.bmp.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpthumb.class.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpthumb.filters.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpthumb.functions.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpthumb.gif.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpthumb.ico.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/thumbs/phpthumb.unsharp.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/_preferences.php XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/locale/en_US/_main.php XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/Smarty.class.php XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/plugins/function.html_select_date.php XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/compiler.foreachq.php XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/compiler.includeq.php XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/compiler.xoAppUrl.php XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/compiler.xoImgUrl.php XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/function.xoMemberInfo.php XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/function.xoPageNav.php XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/function.xoops_link.php XoopsCore/branches/2.6.x/2.6.0/upgrade/cnt-2.2.x-to-2.3.0/index.php Modified: XoopsCore/branches/2.6.x/2.6.0/extras/login.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/extras/login.php 2013-06-16 18:29:38 UTC (rev 11702) +++ XoopsCore/branches/2.6.x/2.6.0/extras/login.php 2013-06-16 19:39:27 UTC (rev 11703) @@ -97,11 +97,11 @@ </table> </form> </div> - '; + '; } echo ' </body> </html> '; -?> \ No newline at end of file +?> Modified: XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php 2013-06-16 18:29:38 UTC (rev 11702) +++ XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php 2013-06-16 19:39:27 UTC (rev 11703) @@ -120,8 +120,8 @@ } if ($verif) { echo '<button class="ui-corner-all tooltip" onclick="filemanager_confirm_delete_directory(\'' . $path_file . '\')" title="' . _AM_SYSTEM_FILEMANAGER_DELDIR . '"> - <img src="' . system_AdminIcons('folder_delete.png') . '" alt="' . _AM_SYSTEM_FILEMANAGER_DELDIR . '" /> - </button>'; + <img src="' . system_AdminIcons('folder_delete.png') . '" alt="' . _AM_SYSTEM_FILEMANAGER_DELDIR . '" /> + </button>'; } echo '<button class="ui-corner-all tooltip" onclick="filemanager_add_file(\'' . $path_file . '\')" title="' . _AM_SYSTEM_FILEMANAGER_ADDFILE . '"> <img src="' . system_AdminIcons('add.png') . '" alt="' . _AM_SYSTEM_FILEMANAGER_ADDFILE . '" /> @@ -473,4 +473,4 @@ //$xoops->redirect("admin.php?fct=tplsets", 2, _AM_SYSTEM_TEMPLATES_RESTORE_ERROR_FILE_EXISTS); } break; -} \ No newline at end of file +} Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/captcha/recaptcha/recaptchalib.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/captcha/recaptcha/recaptchalib.php 2013-06-16 18:29:38 UTC (rev 11702) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/captcha/recaptcha/recaptchalib.php 2013-06-16 19:39:27 UTC (rev 11703) @@ -123,11 +123,11 @@ } return '<script type="text/javascript" src="' . $server . '/challenge?k=' . $pubkey . $errorpart . '"></script> - <noscript> - <iframe src="' . $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/> - <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea> - <input type="hidden" name="recaptcha_response_field" value="manual_challenge"/> - </noscript>'; + <noscript> + <iframe src="' . $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/> + <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea> + <input type="hidden" name="recaptcha_response_field" value="manual_challenge"/> + </noscript>'; } @@ -300,4 +300,4 @@ $url = recaptcha_mailhide_url($pubkey, $privkey, $email); return htmlentities($emailparts[0]) . "<a href='" . htmlentities($url) . "' onclick=\"window.open('" . htmlentities($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities($emailparts [1]); -} \ No newline at end of file +} Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/snoopy.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/snoopy.php 2013-06-16 18:29:38 UTC (rev 11702) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/snoopy.php 2013-06-16 19:39:27 UTC (rev 11703) @@ -31,1220 +31,1220 @@ class Snoopy { - /**** Public variables ****/ + /**** Public variables ****/ - /* user definable vars */ + /* user definable vars */ - var $host = "www.php.net"; // host name we are connecting to - var $port = 80; // port we are connecting to - var $proxy_host = ""; // proxy host to use - var $proxy_port = ""; // proxy port to use - var $proxy_user = ""; // proxy user to use - var $proxy_pass = ""; // proxy password to use + var $host = "www.php.net"; // host name we are connecting to + var $port = 80; // port we are connecting to + var $proxy_host = ""; // proxy host to use + var $proxy_port = ""; // proxy port to use + var $proxy_user = ""; // proxy user to use + var $proxy_pass = ""; // proxy password to use - var $agent = "Snoopy v1.2.4"; // agent we masquerade as - var $referer = ""; // referer info to pass - var $cookies = array(); // array of cookies to pass - // $cookies["username"]="joe"; - var $rawheaders = array(); // array of raw headers to send - // $rawheaders["Content-type"]="text/html"; + var $agent = "Snoopy v1.2.4"; // agent we masquerade as + var $referer = ""; // referer info to pass + var $cookies = array(); // array of cookies to pass + // $cookies["username"]="joe"; + var $rawheaders = array(); // array of raw headers to send + // $rawheaders["Content-type"]="text/html"; - var $maxredirs = 5; // http redirection depth maximum. 0 = disallow - var $lastredirectaddr = ""; // contains address of last redirected address - var $offsiteok = true; // allows redirection off-site - var $maxframes = 0; // frame content depth maximum. 0 = disallow - var $expandlinks = true; // expand links to fully qualified URLs. - // this only applies to fetchlinks() - // submitlinks(), and submittext() - var $passcookies = true; // pass set cookies back through redirects - // NOTE: this currently does not respect - // dates, domains or paths. + var $maxredirs = 5; // http redirection depth maximum. 0 = disallow + var $lastredirectaddr = ""; // contains address of last redirected address + var $offsiteok = true; // allows redirection off-site + var $maxframes = 0; // frame content depth maximum. 0 = disallow + var $expandlinks = true; // expand links to fully qualified URLs. + // this only applies to fetchlinks() + // submitlinks(), and submittext() + var $passcookies = true; // pass set cookies back through redirects + // NOTE: this currently does not respect + // dates, domains or paths. - var $user = ""; // user for http authentication - var $pass = ""; // password for http authentication + var $user = ""; // user for http authentication + var $pass = ""; // password for http authentication - // http accept types - var $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*"; + // http accept types + var $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*"; - var $results = ""; // where the content is put + var $results = ""; // where the content is put - var $error = ""; // error messages sent here - var $response_code = ""; // response code returned from server - var $headers = array(); // headers returned from server sent here - var $maxlength = 500000; // max return data length (body) - var $read_timeout = 0; // timeout on read operations, in seconds - // supported only since PHP 4 Beta 4 - // set to 0 to disallow timeouts - var $timed_out = false; // if a read operation timed out - var $status = 0; // http request status + var $error = ""; // error messages sent here + var $response_code = ""; // response code returned from server + var $headers = array(); // headers returned from server sent here + var $maxlength = 500000; // max return data length (body) + var $read_timeout = 0; // timeout on read operations, in seconds + // supported only since PHP 4 Beta 4 + // set to 0 to disallow timeouts + var $timed_out = false; // if a read operation timed out + var $status = 0; // http request status - var $temp_dir = "/tmp"; // temporary directory that the webserver - // has permission to write to. - // under Windows, this should be C:\temp + var $temp_dir = "/tmp"; // temporary directory that the webserver + // has permission to write to. + // under Windows, this should be C:\temp - var $curl_path = "/usr/local/bin/curl"; - // Snoopy will use cURL for fetching - // SSL content if a full system path to - // the cURL binary is supplied here. - // set to false if you do not have - // cURL installed. See http://curl.haxx.se - // for details on installing cURL. - // Snoopy does *not* use the cURL - // library functions built into php, - // as these functions are not stable - // as of this Snoopy release. + var $curl_path = "/usr/local/bin/curl"; + // Snoopy will use cURL for fetching + // SSL content if a full system path to + // the cURL binary is supplied here. + // set to false if you do not have + // cURL installed. See http://curl.haxx.se + // for details on installing cURL. + // Snoopy does *not* use the cURL + // library functions built into php, + // as these functions are not stable + // as of this Snoopy release. - /**** Private variables ****/ + /**** Private variables ****/ - var $_maxlinelen = 4096; // max line length (headers) + var $_maxlinelen = 4096; // max line length (headers) - var $_httpmethod = "GET"; // default http request method - var $_httpversion = "HTTP/1.0"; // default http request version - var $_submit_method = "POST"; // default submit method - var $_submit_type = "application/x-www-form-urlencoded"; // default submit type - var $_mime_boundary = ""; // MIME boundary for multipart/form-data submit type - var $_redirectaddr = false; // will be set if page fetched is a redirect - var $_redirectdepth = 0; // increments on an http redirect - var $_frameurls = array(); // frame src urls - var $_framedepth = 0; // increments on frame depth + var $_httpmethod = "GET"; // default http request method + var $_httpversion = "HTTP/1.0"; // default http request version + var $_submit_method = "POST"; // default submit method + var $_submit_type = "application/x-www-form-urlencoded"; // default submit type + var $_mime_boundary = ""; // MIME boundary for multipart/form-data submit type + var $_redirectaddr = false; // will be set if page fetched is a redirect + var $_redirectdepth = 0; // increments on an http redirect + var $_frameurls = array(); // frame src urls + var $_framedepth = 0; // increments on frame depth - var $_isproxy = false; // set if using a proxy server - var $_fp_timeout = 30; // timeout for socket connection + var $_isproxy = false; // set if using a proxy server + var $_fp_timeout = 30; // timeout for socket connection /*======================================================================*\ - Function: fetch - Purpose: fetch the contents of a web page - (and possibly other protocols in the - future like ftp, nntp, gopher, etc.) - Input: $URI the location of the page to fetch - Output: $this->results the output text from the fetch + Function: fetch + Purpose: fetch the contents of a web page + (and possibly other protocols in the + future like ftp, nntp, gopher, etc.) + Input: $URI the location of the page to fetch + Output: $this->results the output text from the fetch \*======================================================================*/ - function fetch($URI) - { + function fetch($URI) + { - //preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS); - $URI_PARTS = parse_url($URI); - if (!empty($URI_PARTS["user"])) - $this->user = $URI_PARTS["user"]; - if (!empty($URI_PARTS["pass"])) - $this->pass = $URI_PARTS["pass"]; - if (empty($URI_PARTS["query"])) - $URI_PARTS["query"] = ''; - if (empty($URI_PARTS["path"])) - $URI_PARTS["path"] = ''; + //preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS); + $URI_PARTS = parse_url($URI); + if (!empty($URI_PARTS["user"])) + $this->user = $URI_PARTS["user"]; + if (!empty($URI_PARTS["pass"])) + $this->pass = $URI_PARTS["pass"]; + if (empty($URI_PARTS["query"])) + $URI_PARTS["query"] = ''; + if (empty($URI_PARTS["path"])) + $URI_PARTS["path"] = ''; - switch(strtolower($URI_PARTS["scheme"])) - { - case "http": - $this->host = $URI_PARTS["host"]; - if(!empty($URI_PARTS["port"])) - $this->port = $URI_PARTS["port"]; - if($this->_connect($fp)) - { - if($this->_isproxy) - { - // using proxy, send entire URI - $this->_httprequest($URI,$fp,$URI,$this->_httpmethod); - } - else - { - $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : ""); - // no proxy, send only the path - $this->_httprequest($path, $fp, $URI, $this->_httpmethod); - } + switch(strtolower($URI_PARTS["scheme"])) + { + case "http": + $this->host = $URI_PARTS["host"]; + if(!empty($URI_PARTS["port"])) + $this->port = $URI_PARTS["port"]; + if($this->_connect($fp)) + { + if($this->_isproxy) + { + // using proxy, send entire URI + $this->_httprequest($URI,$fp,$URI,$this->_httpmethod); + } + else + { + $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : ""); + // no proxy, send only the path + $this->_httprequest($path, $fp, $URI, $this->_httpmethod); + } - $this->_disconnect($fp); + $this->_disconnect($fp); - if($this->_redirectaddr) - { - /* url was redirected, check if we've hit the max depth */ - if($this->maxredirs > $this->_redirectdepth) - { - // only follow redirect if it's on this site, or offsiteok is true - if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok) - { - /* follow the redirect */ - $this->_redirectdepth++; - $this->lastredirectaddr=$this->_redirectaddr; - $this->fetch($this->_redirectaddr); - } - } - } + if($this->_redirectaddr) + { + /* url was redirected, check if we've hit the max depth */ + if($this->maxredirs > $this->_redirectdepth) + { + // only follow redirect if it's on this site, or offsiteok is true + if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok) + { + /* follow the redirect */ + $this->_redirectdepth++; + $this->lastredirectaddr=$this->_redirectaddr; + $this->fetch($this->_redirectaddr); + } + } + } - if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0) - { - $frameurls = $this->_frameurls; - $this->_frameurls = array(); + if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0) + { + $frameurls = $this->_frameurls; + $this->_frameurls = array(); - while(list(,$frameurl) = each($frameurls)) - { - if($this->_framedepth < $this->maxframes) - { - $this->fetch($frameurl); - $this->_framedepth++; - } - else - break; - } - } - } - else - { - return false; - } - return true; - break; - case "https": - if(!$this->curl_path) - return false; - if(function_exists("is_executable")) - if (!is_executable($this->curl_path)) - return false; - $this->host = $URI_PARTS["host"]; - if(!empty($URI_PARTS["port"])) - $this->port = $URI_PARTS["port"]; - if($this->_isproxy) - { - // using proxy, send entire URI - $this->_httpsrequest($URI,$URI,$this->_httpmethod); - } - else - { - $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : ""); - // no proxy, send only the path - $this->_httpsrequest($path, $URI, $this->_httpmethod); - } + while(list(,$frameurl) = each($frameurls)) + { + if($this->_framedepth < $this->maxframes) + { + $this->fetch($frameurl); + $this->_framedepth++; + } + else + break; + } + } + } + else + { + return false; + } + return true; + break; + case "https": + if(!$this->curl_path) + return false; + if(function_exists("is_executable")) + if (!is_executable($this->curl_path)) + return false; + $this->host = $URI_PARTS["host"]; + if(!empty($URI_PARTS["port"])) + $this->port = $URI_PARTS["port"]; + if($this->_isproxy) + { + // using proxy, send entire URI + $this->_httpsrequest($URI,$URI,$this->_httpmethod); + } + else + { + $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : ""); + // no proxy, send only the path + $this->_httpsrequest($path, $URI, $this->_httpmethod); + } - if($this->_redirectaddr) - { - /* url was redirected, check if we've hit the max depth */ - if($this->maxredirs > $this->_redirectdepth) - { - // only follow redirect if it's on this site, or offsiteok is true - if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok) - { - /* follow the redirect */ - $this->_redirectdepth++; - $this->lastredirectaddr=$this->_redirectaddr; - $this->fetch($this->_redirectaddr); - } - } - } + if($this->_redirectaddr) + { + /* url was redirected, check if we've hit the max depth */ + if($this->maxredirs > $this->_redirectdepth) + { + // only follow redirect if it's on this site, or offsiteok is true + if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok) + { + /* follow the redirect */ + $this->_redirectdepth++; + $this->lastredirectaddr=$this->_redirectaddr; + $this->fetch($this->_redirectaddr); + } + } + } - if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0) - { - $frameurls = $this->_frameurls; - $this->_frameurls = array(); + if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0) + { + $frameurls = $this->_frameurls; + $this->_frameurls = array(); - while(list(,$frameurl) = each($frameurls)) - { - if($this->_framedepth < $this->maxframes) - { - $this->fetch($frameurl); - $this->_framedepth++; - } - else - break; - } - } - return true; - break; - default: - // not a valid protocol - $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n'; - return false; - break; - } - return true; - } + while(list(,$frameurl) = each($frameurls)) + { + if($this->_framedepth < $this->maxframes) + { + $this->fetch($frameurl); + $this->_framedepth++; + } + else + break; + } + } + return true; + break; + default: + // not a valid protocol + $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n'; + return false; + break; + } + return true; + } /*======================================================================*\ - Function: submit - Purpose: submit an http form - Input: $URI the location to post the data - $formvars the formvars to use. - format: $formvars["var"] = "val"; - $formfiles an array of files to submit - format: $formfiles["var"] = "/dir/filename.ext"; - Output: $this->results the text output from the post + Function: submit + Purpose: submit an http form + Input: $URI the location to post the data + $formvars the formvars to use. + format: $formvars["var"] = "val"; + $formfiles an array of files to submit + format: $formfiles["var"] = "/dir/filename.ext"; + Output: $this->results the text output from the post \*======================================================================*/ - function submit($URI, $formvars="", $formfiles="") - { - unset($postdata); + function submit($URI, $formvars="", $formfiles="") + { + unset($postdata); - $postdata = $this->_prepare_post_body($formvars, $formfiles); + $postdata = $this->_prepare_post_body($formvars, $formfiles); - $URI_PARTS = parse_url($URI); - if (!empty($URI_PARTS["user"])) - $this->user = $URI_PARTS["user"]; - if (!empty($URI_PARTS["pass"])) - $this->pass = $URI_PARTS["pass"]; - if (empty($URI_PARTS["query"])) - $URI_PARTS["query"] = ''; - if (empty($URI_PARTS["path"])) - $URI_PARTS["path"] = ''; + $URI_PARTS = parse_url($URI); + if (!empty($URI_PARTS["user"])) + $this->user = $URI_PARTS["user"]; + if (!empty($URI_PARTS["pass"])) + $this->pass = $URI_PARTS["pass"]; + if (empty($URI_PARTS["query"])) + $URI_PARTS["query"] = ''; + if (empty($URI_PARTS["path"])) + $URI_PARTS["path"] = ''; - switch(strtolower($URI_PARTS["scheme"])) - { - case "http": - $this->host = $URI_PARTS["host"]; - if(!empty($URI_PARTS["port"])) - $this->port = $URI_PARTS["port"]; - if($this->_connect($fp)) - { - if($this->_isproxy) - { - // using proxy, send entire URI - $this->_httprequest($URI,$fp,$URI,$this->_submit_method,$this->_submit_type,$postdata); - } - else - { - $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : ""); - // no proxy, send only the path - $this->_httprequest($path, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata); - } + switch(strtolower($URI_PARTS["scheme"])) + { + case "http": + $this->host = $URI_PARTS["host"]; + if(!empty($URI_PARTS["port"])) + $this->port = $URI_PARTS["port"]; + if($this->_connect($fp)) + { + if($this->_isproxy) + { + // using proxy, send entire URI + $this->_httprequest($URI,$fp,$URI,$this->_submit_method,$this->_submit_type,$postdata); + } + else + { + $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : ""); + // no proxy, send only the path + $this->_httprequest($path, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata); + } - $this->_disconnect($fp); + $this->_disconnect($fp); - if($this->_redirectaddr) - { - /* url was redirected, check if we've hit the max depth */ - if($this->maxredirs > $this->_redirectdepth) - { - if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr)) - $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]); + if($this->_redirectaddr) + { + /* url was redirected, check if we've hit the max depth */ + if($this->maxredirs > $this->_redirectdepth) + { + if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr)) + $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]); - // only follow redirect if it's on this site, or offsiteok is true - if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok) - { - /* follow the redirect */ - $this->_redirectdepth++; - $this->lastredirectaddr=$this->_redirectaddr; - if( strpos( $this->_redirectaddr, "?" ) > 0 ) - $this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get - else - $this->submit($this->_redirectaddr,$formvars, $formfiles); - } - } - } + // only follow redirect if it's on this site, or offsiteok is true + if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok) + { + /* follow the redirect */ + $this->_redirectdepth++; + $this->lastredirectaddr=$this->_redirectaddr; + if( strpos( $this->_redirectaddr, "?" ) > 0 ) + $this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get + else + $this->submit($this->_redirectaddr,$formvars, $formfiles); + } + } + } - if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0) - { - $frameurls = $this->_frameurls; - $this->_frameurls = array(); + if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0) + { + $frameurls = $this->_frameurls; + $this->_frameurls = array(); - while(list(,$frameurl) = each($frameurls)) - { - if($this->_framedepth < $this->maxframes) - { - $this->fetch($frameurl); - $this->_framedepth++; - } - else - break; - } - } + while(list(,$frameurl) = each($frameurls)) + { + if($this->_framedepth < $this->maxframes) + { + $this->fetch($frameurl); + $this->_framedepth++; + } + else + break; + } + } - } - else - { - return false; - } - return true; - break; - case "https": - if(!$this->curl_path) - return false; - if(function_exists("is_executable")) - if (!is_executable($this->curl_path)) - return false; - $this->host = $URI_PARTS["host"]; - if(!empty($URI_PARTS["port"])) - $this->port = $URI_PARTS["port"]; - if($this->_isproxy) - { - // using proxy, send entire URI - $this->_httpsrequest($URI, $URI, $this->_submit_method, $this->_submit_type, $postdata); - } - else - { - $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : ""); - // no proxy, send only the path - $this->_httpsrequest($path, $URI, $this->_submit_method, $this->_submit_type, $postdata); - } + } + else + { + return false; + } + return true; + break; + case "https": + if(!$this->curl_path) + return false; + if(function_exists("is_executable")) + if (!is_executable($this->curl_path)) + return false; + $this->host = $URI_PARTS["host"]; + if(!empty($URI_PARTS["port"])) + $this->port = $URI_PARTS["port"]; + if($this->_isproxy) + { + // using proxy, send entire URI + $this->_httpsrequest($URI, $URI, $this->_submit_method, $this->_submit_type, $postdata); + } + else + { + $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : ""); + // no proxy, send only the path + $this->_httpsrequest($path, $URI, $this->_submit_method, $this->_submit_type, $postdata); + } - if($this->_redirectaddr) - { - /* url was redirected, check if we've hit the max depth */ - if($this->maxredirs > $this->_redirectdepth) - { - if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr)) - $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]); + if($this->_redirectaddr) + { + /* url was redirected, check if we've hit the max depth */ + if($this->maxredirs > $this->_redirectdepth) + { + if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr)) + $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]); - // only follow redirect if it's on this site, or offsiteok is true - if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok) - { - /* follow the redirect */ - $this->_redirectdepth++; - $this->lastredirectaddr=$this->_redirectaddr; - if( strpos( $this->_redirectaddr, "?" ) > 0 ) - $this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get - else - $this->submit($this->_redirectaddr,$formvars, $formfiles); - } - } - } + // only follow redirect if it's on this site, or offsiteok is true + if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok) + { + /* follow the redirect */ + $this->_redirectdepth++; + $this->lastredirectaddr=$this->_redirectaddr; + if( strpos( $this->_redirectaddr, "?" ) > 0 ) + $this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get + else + $this->submit($this->_redirectaddr,$formvars, $formfiles); + } + } + } - if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0) - { - $frameurls = $this->_frameurls; - $this->_frameurls = array(); + if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0) + { + $frameurls = $this->_frameurls; + $this->_frameurls = array(); - while(list(,$frameurl) = each($frameurls)) - { - if($this->_framedepth < $this->maxframes) - { - $this->fetch($frameurl); - $this->_framedepth++; - } - else - break; - } - } - return true; - break; + while(list(,$frameurl) = each($frameurls)) + { + if($this->_framedepth < $this->maxframes) + { + $this->fetch($frameurl); + $this->_framedepth++; + } + else + break; + } + } + return true; + break; - default: - // not a valid protocol - $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n'; - return false; - break; - } - return true; - } + default: + // not a valid protocol + $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n'; + return false; + break; + } + return true; + } /*======================================================================*\ - Function: fetchlinks - Purpose: fetch the links from a web page - Input: $URI where you are fetching from - Output: $this->results an array of the URLs + Function: fetchlinks + Purpose: fetch the links from a web page + Input: $URI where you are fetching from + Output: $this->results an array of the URLs \*======================================================================*/ - function fetchlinks($URI) - { - if ($this->fetch($URI)) - { - if($this->lastredirectaddr) - $URI = $this->lastredirectaddr; - if(is_array($this->results)) - { - for($x=0;$x<count($this->results);$x++) - $this->results[$x] = $this->_striplinks($this->results[$x]); - } - else - $this->results = $this->_striplinks($this->results); + function fetchlinks($URI) + { + if ($this->fetch($URI)) + { + if($this->lastredirectaddr) + $URI = $this->lastredirectaddr; + if(is_array($this->results)) + { + for($x=0;$x<count($this->results);$x++) + $this->results[$x] = $this->_striplinks($this->results[$x]); + } + else + $this->results = $this->_striplinks($this->results); - if($this->expandlinks) - $this->results = $this->_expandlinks($this->results, $URI); - return true; - } - else - return false; - } + if($this->expandlinks) + $this->results = $this->_expandlinks($this->results, $URI); + return true; + } + else + return false; + } /*======================================================================*\ - Function: fetchform - Purpose: fetch the form elements from a web page - Input: $URI where you are fetching from - Output: $this->results the resulting html form + Function: fetchform + Purpose: fetch the form elements from a web page + Input: $URI where you are fetching from + Output: $this->results the resulting html form \*======================================================================*/ - function fetchform($URI) - { + function fetchform($URI) + { - if ($this->fetch($URI)) - { + if ($this->fetch($URI)) + { - if(is_array($this->results)) - { - for($x=0;$x<count($this->results);$x++) - $this->results[$x] = $this->_stripform($this->results[$x]); - } - else - $this->results = $this->_stripform($this->results); + if(is_array($this->results)) + { + for($x=0;$x<count($this->results);$x++) + $this->results[$x] = $this->_stripform($this->results[$x]); + } + else + $this->results = $this->_stripform($this->results); - return true; - } - else - return false; - } + return true; + } + else + return false; + } /*======================================================================*\ - Function: fetchtext - Purpose: fetch the text from a web page, stripping the links - Input: $URI where you are fetching from - Output: $this->results the text from the web page + Function: fetchtext + Purpose: fetch the text from a web page, stripping the links + Input: $URI where you are fetching from + Output: $this->results the text from the web page \*======================================================================*/ - function fetchtext($URI) - { - if($this->fetch($URI)) - { - if(is_array($this->results)) - { - for($x=0;$x<count($this->results);$x++) - $this->results[$x] = $this->_striptext($this->results[$x]); - } - else - $this->results = $this->_striptext($this->results); - return true; - } - else - return false; - } + function fetchtext($URI) + { + if($this->fetch($URI)) + { + if(is_array($this->results)) + { + for($x=0;$x<count($this->results);$x++) + $this->results[$x] = $this->_striptext($this->results[$x]); + } + else + $this->results = $this->_striptext($this->results); + return true; + } + else + return false; + } /*======================================================================*\ - Function: submitlinks - Purpose: grab links from a form submission - Input: $URI where you are submitting from - Output: $this->results an array of the links from the post + Function: submitlinks + Purpose: grab links from a form submission + Input: $URI where you are submitting from + Output: $this->results an array of the links from the post \*======================================================================*/ - function submitlinks($URI, $formvars="", $formfiles="") - { - if($this->submit($URI,$formvars, $formfiles)) - { - if($this->lastredirectaddr) - $URI = $this->lastredirectaddr; - if(is_array($this->results)) - { - for($x=0;$x<count($this->results);$x++) - { - $this->results[$x] = $this->_striplinks($this->results[$x]); - if($this->expandlinks) - $this->results[$x] = $this->_expandlinks($this->results[$x],$URI); - } - } - else - { - $this->results = $this->_striplinks($this->results); - if($this->expandlinks) - $this->results = $this->_expandlinks($this->results,$URI); - } - return true; - } - else - return false; - } + function submitlinks($URI, $formvars="", $formfiles="") + { + if($this->submit($URI,$formvars, $formfiles)) + { + if($this->lastredirectaddr) + $URI = $this->lastredirectaddr; + if(is_array($this->results)) + { + for($x=0;$x<count($this->results);$x++) + { + $this->results[$x] = $this->_striplinks($this->results[$x]); + if($this->expandlinks) + $this->results[$x] = $this->_expandlinks($this->results[$x],$URI); + } + } + else + { + $this->results = $this->_striplinks($this->results); + if($this->expandlinks) + $this->results = $this->_expandlinks($this->results,$URI); + } + return true; + } + else + return false; + } /*======================================================================*\ - Function: submittext - Purpose: grab text from a form submission - Input: $URI where you are submitting from - Output: $this->results the text from the web page + Function: submittext + Purpose: grab text from a form submission + Input: $URI where you are submitting from + Output: $this->results the text from the web page \*======================================================================*/ - function submittext($URI, $formvars = "", $formfiles = "") - { - if($this->submit($URI,$formvars, $formfiles)) - { - if($this->lastredirectaddr) - $URI = $this->lastredirectaddr; - if(is_array($this->results)) - { - for($x=0;$x<count($this->results);$x++) - { - $this->results[$x] = $this->_striptext($this->results[$x]); - if($this->expandlinks) - $this->results[$x] = $this->_expandlinks($this->results[$x],$URI); - } - } - else - { - $this->results = $this->_striptext($this->results); - if($this->expandlinks) - $this->results = $this->_expandlinks($this->results,$URI); - } - return true; - } - else - return false; - } + function submittext($URI, $formvars = "", $formfiles = "") + { + if($this->submit($URI,$formvars, $formfiles)) + { + if($this->lastredirectaddr) + $URI = $this->lastredirectaddr; + if(is_array($this->results)) + { + for($x=0;$x<count($this->results);$x++) + { + $this->results[$x] = $this->_striptext($this->results[$x]); + if($this->expandlinks) + $this->results[$x] = $this->_expandlinks($this->results[$x],$URI); + } + } + else + { + $this->results = $this->_striptext($this->results); + if($this->expandlinks) + $this->results = $this->_expandlinks($this->results,$URI); + } + return true; + } + else + return false; + } /*======================================================================*\ - Function: set_submit_multipart - Purpose: Set the form submission content type to - multipart/form-data + Function: set_submit_multipart + Purpose: Set the form submission content type to + multipart/form-data \*======================================================================*/ - function set_submit_multipart() - { - $this->_submit_type = "multipart/form-data"; - } + function set_submit_multipart() + { + $this->_submit_type = "multipart/form-data"; + } /*======================================================================*\ - Function: set_submit_normal - Purpose: Set the form submission content type to - application/x-www-form-urlencoded + Function: set_submit_normal + Purpose: Set the form submission content type to + application/x-www-form-urlencoded \*======================================================================*/ - function set_submit_normal() - { - $this->_submit_type = "application/x-www-form-urlencoded"; - } + function set_submit_normal() + { + $this->_submit_type = "application/x-www-form-urlencoded"; + } /*======================================================================*\ - Private functions + Private functions \*======================================================================*/ /*======================================================================*\ - Function: _striplinks - Purpose: strip the hyperlinks from an html document - Input: $document document to strip. - Output: $match an array of the links + Function: _striplinks + Purpose: strip the hyperlinks from an html document + Input: $document document to strip. + Output: $match an array of the links \*======================================================================*/ - function _striplinks($document) - { - preg_match_all("'<\s*a\s.*?href\s*=\s* # find <a href= - ([\"\'])? # find single or double quote - (?(1) (.*?)\\1 | ([^\s\>]+)) # if quote found, match up to next matching - # quote, otherwise match up to next space - 'isx",$document,$links); + function _striplinks($document) + { + preg_match_all("'<\s*a\s.*?href\s*=\s* # find <a href= + ([\"\'])? # find single or double quote + (?(1) (.*?)\\1 | ([^\s\>]+)) # if quote found, match up to next matching + # quote, otherwise match up to next space + 'isx",$document,$links); - // catenate the non-empty matches from the conditional subpattern + // catenate the non-empty matches from the conditional subpattern - while(list($key,$val) = each($links[2])) - { - if(!empty($val)) - $match[] = $val; - } + while(list($key,$val) = each($links[2])) + { + if(!empty($val)) + $match[] = $val; + } - while(list($key,$val) = each($links[3])) - { - if(!empty($val)) - $match[] = $val; - } + while(list($key,$val) = each($links[3])) + { + if(!empty($val)) + $match[] = $val; + } - // return the links - return $match; - } + // return the links + return $match; + } /*======================================================================*\ - Function: _stripform - Purpose: strip the form elements from an html document - Input: $document document to strip. - Output: $match an array of the links + Function: _stripform + Purpose: strip the form elements from an html document + Input: $document document to strip. + Output: $match an array of the links \*======================================================================*/ - function _stripform($document) - { - preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements); + function _stripform($document) + { + preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements); - // catenate the matches - $match = implode("\r\n",$elements[0]); + // catenate the matches + $match = implode("\r\n",$elements[0]); - // return the links - return $match; - } + // return the links + return $match; + } /*======================================================================*\ - Function: _striptext - Purpose: strip the text from an html document - Input: $document document to strip. - Output: $text the resulting text + Function: _striptext + Purpose: strip the text from an html document + Input: $document document to strip. + Output: $text the resulting text \*======================================================================*/ - function _striptext($document) - { + function _striptext($document) + { - // I didn't use preg eval (//e) since that is only available in PHP 4.0. - // so, list your entities one by one here. I included some of the - // more common ones. + // I didn't use preg eval (//e) since that is only available in PHP 4.0. + // so, list your entities one by one here. I included some of the + // more common ones. - $search = array("'<script[^>]*?>.*?</script>'si", // strip out javascript - "'<[\/\!]*?[^<>]*?>'si", // strip out html tags - "'([\r\n])[\s]+'", // strip out white space - "'&(quot|#34|#034|#x22);'i", // replace html entities - "'&(amp|#38|#038|#x26);'i", // added hexadecimal values - "'&(lt|#60|#060|#x3c);'i", - "'&(gt|#62|#062|#x3e);'i", - "'&(nbsp|#160|#xa0);'i", - "'&(iexcl|#161);'i", - "'&(cent|#162);'i", - "'&(pound|#163);'i", - "'&(copy|#169);'i", - "'&(reg|#174);'i", - "'&(deg|#176);'i", - "'&(#39|#039|#x27);'", - "'&(euro|#8364);'i", // europe - "'&a(uml|UML);'", // german - "'&o(uml|UML);'", - "'&u(uml|UML);'", - "'&A(uml|UML);'", - "'&O(uml|UML);'", - "'&U(uml|UML);'", - "'ß'i", - ); - $replace = array( "", - "", - "\\1", - "\"", - "&", - "<", - ">", - " ", - chr(161), - chr(162), - chr(163), - chr(169), - chr(174), - chr(176), - chr(39), - chr(128), - "\xE4", - "\xF6", - "\xFC", - "\xC4", - "\xD6", - "\xDC", - "\xDF", - ); + $search = array("'<script[^>]*?>.*?</script>'si", // strip out javascript + "'<[\/\!]*?[^<>]*?>'si", // strip out html tags + "'([\r\n])[\s]+'", // strip out white space + "'&(quot|#34|#034|#x22);'i", // replace html entities + "'&(amp|#38|#038|#x26);'i", // added hexadecimal values + "'&(lt|#60|#060|#x3c);'i", + "'&(gt|#62|#062|#x3e);'i", + "'&(nbsp|#160|#xa0);'i", + "'&(iexcl|#161);'i", + "'&(cent|#162);'i", + "'&(pound|#163);'i", + "'&(copy|#169);'i", + "'&(reg|#174);'i", + "'&(deg|#176);'i", + "'&(#39|#039|#x27);'", + "'&(euro|#8364);'i", // europe + "'&a(uml|UML);'", // german + "'&o(uml|UML);'", + "'&u(uml|UML);'", + "'&A(uml|UML);'", + "'&O(uml|UML);'", + "'&U(uml|UML);'", + "'ß'i", + ); + $replace = array( "", + "", + "\\1", + "\"", + "&", + "<", + ">", + " ", + chr(161), + chr(162), + chr(163), + chr(169), + chr(174), + chr(176), + chr(39), + chr(128), + "\xE4", + "\xF6", + "\xFC", + "\xC4", + "\xD6", + "\xDC", + "\xDF", + ); - $text = preg_replace($search,$replace,$document); + $text = preg_replace($search,$replace,$document); - return $text; - } + return $text; + } /*======================================================================*\ - Function: _expandlinks - Purpose: expand each link into a fully qualified URL - Input: $links the links to qualify - $URI the full URI to get the base from - Output: $expandedLinks the expanded links + Function: _expandlinks + Purpose: expand each link into a fully qualified URL + Input: $links the links to qualify + $URI the full URI to get the base from + Output: $expandedLinks the expanded links \*======================================================================*/ - function _expandlinks($links,$URI) - { + function _expandlinks($links,$URI) + { - preg_match("/^[^\?]+/",$URI,$match); + preg_match("/^[^\?]+/",$URI,$... [truncated message content] |