extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-23 22:01:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

added popup size for phone integration and better sanitizing of phone numbers

Browse Source
This commit is contained in:
Ralf Becker 2008-06-11 07:18:29 +00:00
parent c350dddc9b
commit 2b6f25b7f3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etemplate/inc/class.url_widget.inc.php
View File

@ -165,7 +165,7 @@ class url_widget
$link = $GLOBALS['egw_info']['server']['webserver_url'].'/redirect.php?go='.$link; $link = $GLOBALS['egw_info']['server']['webserver_url'].'/redirect.php?go='.$link;
if ($link[0] == '/') $link = ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$link; if ($link[0] == '/') $link = ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$link;
} }
$cell['size'] = ','.$link.',,,_blank'; $cell['size'] = ','.$link.',,,calling,'.$GLOBALS['egw_info']['server']['call_popup'];
} }
break; break;
} }
@ -186,6 +186,7 @@ class url_widget
if($GLOBALS['egw_info']['user']['apps']['felamimail']) if($GLOBALS['egw_info']['user']['apps']['felamimail'])
{ {
//return 'felamimail.uicompose.compose&preset[to]='.($rfc822 ? $rfc822 : $email);
return 'felamimail.uicompose.compose&send_to='.base64_encode($rfc822 ? $rfc822 : $email); return 'felamimail.uicompose.compose&send_to='.base64_encode($rfc822 ? $rfc822 : $email);
} }
if($GLOBALS['egw_info']['user']['apps']['email']) if($GLOBALS['egw_info']['user']['apps']['email'])
@ -213,7 +214,7 @@ class url_widget
$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;
} }
$number = str_replace(array(' ','(',')','/','-'),'',$number); // remove number formatting chars messing up the links $number = preg_replace('/[^0-9+]+/','',$number); // remove number formatting chars messing up the links
return str_replace(array('%1','%u','%t'),array(urlencode($number),$GLOBALS['egw_info']['user']['account_lid'],$userphone), return str_replace(array('%1','%u','%t'),array(urlencode($number),$GLOBALS['egw_info']['user']['account_lid'],$userphone),
$GLOBALS['egw_info']['server']['call_link']); $GLOBALS['egw_info']['server']['call_link']);