mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-26 16:48:49 +01:00
"fix for bug #1643: %t in phone numbers (telephony intergration) does not work"
This commit is contained in:
parent
46eee6b895
commit
32eb1bafa6
@ -100,7 +100,7 @@ class url_widget
|
|||||||
$cell['size'] .= '|[^<]+ ?<'.self::EMAIL_PREG.'>';
|
$cell['size'] .= '|[^<]+ ?<'.self::EMAIL_PREG.'>';
|
||||||
}
|
}
|
||||||
$cell['size'] .= ')$/i';
|
$cell['size'] .= ')$/i';
|
||||||
}
|
}
|
||||||
#_debug_array($cell);
|
#_debug_array($cell);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -119,7 +119,7 @@ class url_widget
|
|||||||
}
|
}
|
||||||
elseif (strpos($email=$value,'@') !== false)
|
elseif (strpos($email=$value,'@') !== false)
|
||||||
{
|
{
|
||||||
if (strpos($email=$value,'&') !== false)
|
if (strpos($email=$value,'&') !== false)
|
||||||
{
|
{
|
||||||
list($email,$addoptions) = explode('&',$value,2);
|
list($email,$addoptions) = explode('&',$value,2);
|
||||||
$rfc822 = $value = $email;
|
$rfc822 = $value = $email;
|
||||||
@ -226,7 +226,7 @@ class url_widget
|
|||||||
if (!$number || !$GLOBALS['egw_info']['server']['call_link']) return false;
|
if (!$number || !$GLOBALS['egw_info']['server']['call_link']) return false;
|
||||||
|
|
||||||
static $userphone;
|
static $userphone;
|
||||||
if (is_null($userphone) && strpos($GLOBALS['egw_info']['server']['call_link'],'%u') !== false)
|
if (is_null($userphone) && strpos($GLOBALS['egw_info']['server']['call_link'],'%t') !== false)
|
||||||
{
|
{
|
||||||
$user = $GLOBALS['egw']->contacts->read('account:'.$GLOBALS['egw_info']['user']['account_id']);
|
$user = $GLOBALS['egw']->contacts->read('account:'.$GLOBALS['egw_info']['user']['account_id']);
|
||||||
$userphone = is_array($user) ? ($user['tel_work'] ? $user['tel_work'] : $user['tel_home']) : false;
|
$userphone = is_array($user) ? ($user['tel_work'] ? $user['tel_work'] : $user['tel_home']) : false;
|
||||||
|
Loading…
Reference in New Issue
Block a user