|
|
|
@ -1,12 +1,12 @@
|
|
|
|
|
<?php
|
|
|
|
|
/*******************************************************************************
|
|
|
|
|
* Title: Help Desk Software HESK
|
|
|
|
|
* Version: 2.6.0 beta 1 from 30th December 2014
|
|
|
|
|
* Version: 2.6.0 from 22nd February 2015
|
|
|
|
|
* Author: Klemen Stirn
|
|
|
|
|
* Website: http://www.hesk.com
|
|
|
|
|
********************************************************************************
|
|
|
|
|
* COPYRIGHT AND TRADEMARK NOTICE
|
|
|
|
|
* Copyright 2005-2013 Klemen Stirn. All Rights Reserved.
|
|
|
|
|
* Copyright 2005-2015 Klemen Stirn. All Rights Reserved.
|
|
|
|
|
* HESK is a registered trademark of Klemen Stirn.
|
|
|
|
|
|
|
|
|
|
* The HESK may be used and modified free of charge by anyone
|
|
|
|
@ -104,6 +104,16 @@ function hesk_isBannedIP($ip)
|
|
|
|
|
|
|
|
|
|
$ip = ip2long($ip) or $ip = 0;
|
|
|
|
|
|
|
|
|
|
// We need positive value of IP
|
|
|
|
|
if ($ip < 0)
|
|
|
|
|
{
|
|
|
|
|
$ip += 4294967296;
|
|
|
|
|
}
|
|
|
|
|
elseif ($ip > 4294967296)
|
|
|
|
|
{
|
|
|
|
|
$ip = 4294967296;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$res = hesk_dbQuery("SELECT `id` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."banned_ips` WHERE {$ip} BETWEEN `ip_from` AND `ip_to` LIMIT 1");
|
|
|
|
|
|
|
|
|
|
return ( hesk_dbNumRows($res) == 1 ) ? hesk_dbResult($res) : false;
|
|
|
|
@ -1273,7 +1283,7 @@ function hesk_makeURL($text, $class = '')
|
|
|
|
|
|
|
|
|
|
// matches an email address
|
|
|
|
|
$text = preg_replace_callback(
|
|
|
|
|
'#(^|[\n\t (>.])(([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*(?:[\w\!\#$\%\'\*\+\-\/\=\?\^\`{\|\}\~]|&)+@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,63})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?))#i',
|
|
|
|
|
'/(^|[\n\t (>])(' . '(?:(?:(?:[^@,"\[\]\x5c\x00-\x20\x7f-\xff\.]|\x5c(?=[@,"\[\]\x5c\x00-\x20\x7f-\xff]))(?:[^@,"\[\]\x5c\x00-\x20\x7f-\xff\.]|(?<=\x5c)[@,"\[\]\x5c\x00-\x20\x7f-\xff]|\x5c(?=[@,"\[\]\x5c\x00-\x20\x7f-\xff])|\.(?=[^\.])){1,62}(?:[^@,"\[\]\x5c\x00-\x20\x7f-\xff\.]|(?<=\x5c)[@,"\[\]\x5c\x00-\x20\x7f-\xff])|[^@,"\[\]\x5c\x00-\x20\x7f-\xff\.]{1,2})|"(?:[^"]|(?<=\x5c)"){1,62}")@(?:(?!.{64})(?:[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9]\.?|[a-zA-Z0-9]\.?)+\.(?:xn--[a-zA-Z0-9]+|[a-zA-Z]{2,6})|\[(?:[0-1]?\d?\d|2[0-4]\d|25[0-5])(?:\.(?:[0-1]?\d?\d|2[0-4]\d|25[0-5])){3}\])' . ')/iu',
|
|
|
|
|
create_function(
|
|
|
|
|
"\$matches",
|
|
|
|
|
"return make_clickable_callback(MAGIC_URL_EMAIL, \$matches[1], \$matches[2], '', '$class');"
|
|
|
|
|