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

diff --git a/httemplate/elements/phonenumber.html b/httemplate/elements/phonenumber.html
index 1330ca109..60414a644 100644
--- a/httemplate/elements/phonenumber.html
+++ b/httemplate/elements/phonenumber.html
@@ -1,23 +1,40 @@
-<%
-  my( $number, %opt ) = @_;
-  my $conf = new FS::Conf;
-  ( my $snumber = $number ) =~ s/\D//g;
-%>
-<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">
-function OLiframeContent(src, width, height, name) {
-  return ('<iframe src="'+src+'" width="'+width+'" height="'+height+'"'
-   +(name?' name="'+name+'" id="'+name+'"':'')+' scrolling="auto">'
-   +'<div>[iframe not supported]</div></iframe>');
-}
-</SCRIPT>
-<% if ( length($number) ) { %>
-  <%= $number %>
-  <% if ( $opt{'callable'} && $conf->config('vonage-username') ) { %>
-      <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>
-  <% } %>
-<% } else { %>
+<% include('/elements/init_overlib.html') %>
+
+% if ( length($number) ) { 
+
+    <% $number %>
+
+%   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>