X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fphonenumber.html;h=60414a644781e7b65c3b3bcbfc19170a089330a4;hb=d6ed8d790ea01fad5bcb42ea3fcb58cf8c5aac2c;hp=0e730ebcc55d70d90d32503a59a1f7723f3c595d;hpb=3ce7691203a7737406bf2d4442f7fd84b81f847e;p=freeside.git

diff --git a/httemplate/elements/phonenumber.html b/httemplate/elements/phonenumber.html
index 0e730ebcc..60414a644 100644
--- a/httemplate/elements/phonenumber.html
+++ b/httemplate/elements/phonenumber.html
@@ -1,22 +1,40 @@
-%
-%  my( $number, %opt ) = @_;
-%  my $conf = new FS::Conf;
-%  ( my $snumber = $number ) =~ s/\D//g;
-%
+<% include('/elements/init_overlib.html') %>
 
-<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_draggable.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/iframecontentmws.js"></SCRIPT>
 % if ( length($number) ) { 
 
-  <% $number %>
-% if ( $opt{'callable'} && $conf->config('vonage-username') ) { 
+    <% $number %>
 
-      <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('https://secure.click2callu.com/tpcc/makecall?username=<% $conf->config('vonage-username') %>&password=<% $conf->config('vonage-password') %>&fromnumber=<% $conf->config('vonage-fromnumber')%>&tonumber=1<% $snumber %>', 240, 64, 'call_popup'), CAPTION, 'Initiating call', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE, WIDTH, 240, HEIGHT, 64 ); return false;" TITLE="Call this number"><IMG SRC="<%$fsurl%>images/red_telephone_mimooh_01.png" BORDER=0 ALT="Call this number"></A>
-% } 
+%   if ( $opt{'callable'} && $curuser->option('vonage-username') ) { 
+
+      <% include('/elements/popup_link.html',
+           'action'      =>
+             'https://secure.click2callu.com/tpcc/makecall'.
+             '?username='. uri_escape($curuser->option('vonage-username')).
+             '&password='. uri_escape($curuser->option('vonage-password')).
+             "&fromnumber=$vonage_number".
+             "&tonumber=$snumber",
+           'width'       => 240,
+           'height'      => 64,
+           'actionlabel' => 'Initiating call',
+           'label'       => qq!<IMG SRC="${fsurl}images/red_telephone_mimooh_01.png" BORDER=0 ALT="Call this number">!,
+         )
+      %>
+
+%   } 
+%
 % } else { 
 
   &nbsp;
+
 % } 
+<%init>
+
+my( $number, %opt ) = @_;
+( my $snumber = $number ) =~ s/\D//g;
+
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+( my $vonage_number = $curuser->option('vonage-fromnumber') ) =~ s/\D//g;
+$vonage_number =~ /^1/ or $vonage_number = "1$vonage_number";
 
+</%init>