projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configurable payment date for auto CHEK/CARD, RT10813
[freeside.git]
/
httemplate
/
edit
/
svc_acct.cgi
diff --git
a/httemplate/edit/svc_acct.cgi
b/httemplate/edit/svc_acct.cgi
index
2eb4a8b
..
e6cd7d8
100755
(executable)
--- a/
httemplate/edit/svc_acct.cgi
+++ b/
httemplate/edit/svc_acct.cgi
@@
-1,11
+1,11
@@
-<
% include('/elements/header.html', "$action $svc account") %
>
+<
& /elements/header.html, mt("$action [_1] account",$svc) &
>
-<
% include('/elements/error.html') %
>
+<
& /elements/error.html &
>
% if ( $cust_main ) {
% if ( $cust_main ) {
- <
% include( '/elements/small_custview.html'
, $cust_main, '', 1,
- popurl(2) . "view/cust_main.cgi"
) %
>
+ <
& /elements/small_custview.html
, $cust_main, '', 1,
+ popurl(2) . "view/cust_main.cgi"
&
>
<BR>
% }
<BR>
% }
@@
-27,17
+27,24
@@
function randomPass() {
<INPUT TYPE="hidden" NAME="pkgnum" VALUE="<% $pkgnum %>">
<INPUT TYPE="hidden" NAME="svcpart" VALUE="<% $svcpart %>">
<INPUT TYPE="hidden" NAME="pkgnum" VALUE="<% $pkgnum %>">
<INPUT TYPE="hidden" NAME="svcpart" VALUE="<% $svcpart %>">
-Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
+% if ( $svcnum ) {
+% my $svclabel = emt("Service #[_1]",$svcnum);
+% $svclabel =~ s/$svcnum/<B>$svcnum<\/B>/;
+<% $svclabel %>
+% } else {
+<% mt("Service # (NEW)") |h %>
+% }
+<BR>
<% ntable("#cccccc",2) %>
<TR>
<% ntable("#cccccc",2) %>
<TR>
- <TD ALIGN="right">
Service
</TD>
+ <TD ALIGN="right">
<% mt('Service') |h %>
</TD>
<TD BGCOLOR="#eeeeee"><% $part_svc->svc %></TD>
</TR>
<TR>
<TD BGCOLOR="#eeeeee"><% $part_svc->svc %></TD>
</TR>
<TR>
- <TD ALIGN="right">
Username
</TD>
+ <TD ALIGN="right">
<% mt('Username') |h %>
</TD>
<TD>
<INPUT TYPE="text" NAME="username" VALUE="<% $username %>" SIZE=<% $ulen2 %> MAXLENGTH=<% $ulen %>>
</TD>
<TD>
<INPUT TYPE="text" NAME="username" VALUE="<% $username %>" SIZE=<% $ulen2 %> MAXLENGTH=<% $ulen %>>
</TD>
@@
-45,10
+52,10
@@
Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
%if ( $part_svc->part_svc_column('_password')->columnflag ne 'F' ) {
<TR>
%if ( $part_svc->part_svc_column('_password')->columnflag ne 'F' ) {
<TR>
- <TD ALIGN="right">
Password
</TD>
+ <TD ALIGN="right">
<% mt('Password') |h %>
</TD>
<TD>
<INPUT TYPE="text" NAME="clear_password" VALUE="<% $password %>" SIZE=<% $pmax2 %> MAXLENGTH=<% $pmax %>>
<TD>
<INPUT TYPE="text" NAME="clear_password" VALUE="<% $password %>" SIZE=<% $pmax2 %> MAXLENGTH=<% $pmax %>>
- <INPUT TYPE="button" VALUE="
Generate
" onclick="randomPass();">
+ <INPUT TYPE="button" VALUE="
<% mt('Generate') |h %>
" onclick="randomPass();">
</TD>
</TR>
%}else{
</TD>
</TR>
%}else{
@@
-59,19
+66,16
@@
Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
%my $sec_phrase = $svc_acct->sec_phrase;
%if ( $conf->exists('security_phrase')
% && $part_svc->part_svc_column('sec_phrase')->columnflag ne 'F' ) {
%my $sec_phrase = $svc_acct->sec_phrase;
%if ( $conf->exists('security_phrase')
% && $part_svc->part_svc_column('sec_phrase')->columnflag ne 'F' ) {
-%
-
<TR>
<TR>
- <TD ALIGN="right">
Security phrase
</TD>
+ <TD ALIGN="right">
<% mt('Security phrase') |h %>
</TD>
<TD>
<INPUT TYPE="text" NAME="sec_phrase" VALUE="<% $sec_phrase %>" SIZE=32>
<TD>
<INPUT TYPE="text" NAME="sec_phrase" VALUE="<% $sec_phrase %>" SIZE=32>
- (
for forgotten passwords
)
+ (
<% mt('for forgotten passwords') |h %>
)
</TD>
</TD>
% } else {
</TD>
</TD>
% } else {
-
<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="<% $sec_phrase %>">
% }
%
<INPUT TYPE="hidden" NAME="sec_phrase" VALUE="<% $sec_phrase %>">
% }
%
@@
-80,7
+84,6
@@
Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
%if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
%
%if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
%
-
<INPUT TYPE="hidden" NAME="domsvc" VALUE="<% $domsvc %>">
% } else {
%
<INPUT TYPE="hidden" NAME="domsvc" VALUE="<% $domsvc %>">
% } else {
%
@@
-100,11
+103,9
@@
Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
% 'pkgnum' => $pkgnum,
% )
% );
% 'pkgnum' => $pkgnum,
% )
% );
-%
-
<TR>
<TR>
- <TD ALIGN="right">
Domain
</TD>
+ <TD ALIGN="right">
<% mt('Domain') |h %>
</TD>
<TD>
<SELECT NAME="domsvc" SIZE=1>
% foreach my $svcnum (
<TD>
<SELECT NAME="domsvc" SIZE=1>
% foreach my $svcnum (
@@
-114,7
+115,6
@@
Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
% my $svc_domain = $svc_domain{$svcnum};
%
% my $svc_domain = $svc_domain{$svcnum};
%
-
<OPTION VALUE="<% $svcnum %>" <% $svcnum == $domsvc ? ' SELECTED' : '' %>><% $svc_domain{$svcnum} %>
% }
<OPTION VALUE="<% $svcnum %>" <% $svcnum == $domsvc ? ' SELECTED' : '' %>><% $svc_domain{$svcnum} %>
% }
@@
-127,7
+127,7
@@
Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
% if ( $communigate ) {
<TR>
% if ( $communigate ) {
<TR>
- <TD ALIGN="right">
Aliases
</TD>
+ <TD ALIGN="right">
<% mt('Aliases') |h %>
</TD>
<TD><INPUT TYPE="text" NAME="cgp_aliases" VALUE="<% $svc_acct->cgp_aliases %>"></TD>
</TR>
<TD><INPUT TYPE="text" NAME="cgp_aliases" VALUE="<% $svc_acct->cgp_aliases %>"></TD>
</TR>
@@
-136,25
+136,22
@@
Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
% }
% }
-<
% include('/elements/tr-select-svc_pbx.html'
,
+<
& /elements/tr-select-svc_pbx.html
,
'curr_value' => $svc_acct->pbxsvc,
'part_svc' => $part_svc,
'cust_pkg' => $cust_pkg,
'curr_value' => $svc_acct->pbxsvc,
'part_svc' => $part_svc,
'cust_pkg' => $cust_pkg,
- )
-%>
+&>
%#pop
%my $popnum = $svc_acct->popnum || 0;
%if ( $part_svc->part_svc_column('popnum')->columnflag eq 'F' ) {
%
%#pop
%my $popnum = $svc_acct->popnum || 0;
%if ( $part_svc->part_svc_column('popnum')->columnflag eq 'F' ) {
%
-
<INPUT TYPE="hidden" NAME="popnum" VALUE="<% $popnum %>">
% } else {
<INPUT TYPE="hidden" NAME="popnum" VALUE="<% $popnum %>">
% } else {
-
<TR>
<TR>
- <TD ALIGN="right">
Access number
</TD>
+ <TD ALIGN="right">
<% mt('Access number') |h %>
</TD>
<TD><% FS::svc_acct_pop::popselector($popnum) %></TD>
</TR>
% }
<TD><% FS::svc_acct_pop::popselector($popnum) %></TD>
</TR>
% }
@@
-167,7
+164,6
@@
Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
%
% if ( length($svc_acct->$xid()) ) {
%
% if ( length($svc_acct->$xid()) ) {
-
<TR>
<TD ALIGN="right"><% uc($xid) %></TD>
<TD BGCOLOR="#eeeeee"><% $svc_acct->$xid() %></TD>
<TR>
<TD ALIGN="right"><% uc($xid) %></TD>
<TD BGCOLOR="#eeeeee"><% $svc_acct->$xid() %></TD>
@@
-175,11
+171,9
@@
Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
</TD>
</TR>
% }
</TD>
</TR>
% }
-
<INPUT TYPE="hidden" NAME="<% $xid %>" VALUE="<% $svc_acct->$xid() %>">
% } else {
<INPUT TYPE="hidden" NAME="<% $xid %>" VALUE="<% $svc_acct->$xid() %>">
% } else {
-
<TR>
<TD ALIGN="right"><% uc($xid) %></TD>
<TR>
<TD ALIGN="right"><% uc($xid) %></TD>
@@
-195,13
+189,12
@@
Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
% && ! $svc_acct->finger ) {
%
% && ! $svc_acct->finger ) {
%
-
<INPUT TYPE="hidden" NAME="finger" VALUE="">
% } else {
<TR>
<INPUT TYPE="hidden" NAME="finger" VALUE="">
% } else {
<TR>
- <TD ALIGN="right">
Real Name
</TD>
+ <TD ALIGN="right">
<% mt('Real Name') |h %>
</TD>
<TD>
<INPUT TYPE="text" NAME="finger" VALUE="<% $svc_acct->finger %>">
</TD>
<TD>
<INPUT TYPE="text" NAME="finger" VALUE="<% $svc_acct->finger %>">
</TD>
@@
-219,7
+212,7
@@
Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
<TR>
<TR>
- <TD ALIGN="right">
Home directory
</TD>
+ <TD ALIGN="right">
<% mt('Home directory') |h %>
</TD>
<TD><INPUT TYPE="text" NAME="dir" VALUE="<% $svc_acct->dir %>"></TD>
</TR>
% }
<TD><INPUT TYPE="text" NAME="dir" VALUE="<% $svc_acct->dir %>"></TD>
</TR>
% }
@@
-231,13
+224,12
@@
Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
% ) {
%
% ) {
%
-
<INPUT TYPE="hidden" NAME="shell" VALUE="<% $shell %>">
% } else {
<TR>
<INPUT TYPE="hidden" NAME="shell" VALUE="<% $shell %>">
% } else {
<TR>
- <TD ALIGN="right">
Shell
</TD>
+ <TD ALIGN="right">
<% mt('Shell') |h %>
</TD>
<TD>
<SELECT NAME="shell" SIZE=1>
%
<TD>
<SELECT NAME="shell" SIZE=1>
%
@@
-245,7
+237,6
@@
Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
% foreach $etc_shell (@shells) {
%
% foreach $etc_shell (@shells) {
%
-
<OPTION<% $etc_shell eq $shell ? ' SELECTED' : '' %>><% $etc_shell %>
% }
<OPTION<% $etc_shell eq $shell ? ' SELECTED' : '' %>><% $etc_shell %>
% }
@@
-255,18
+246,17
@@
Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
</TR>
% }
</TR>
% }
-<
% include('svc_acct/communigate.html'
,
+<
& svc_acct/communigate.html
,
'svc_acct' => $svc_acct,
'part_svc' => $part_svc,
'communigate' => $communigate,
'svc_acct' => $svc_acct,
'part_svc' => $part_svc,
'communigate' => $communigate,
- )
-%>
+&>
% if ( $part_svc->part_svc_column('slipip')->columnflag =~ /^[FA]$/ ) {
<INPUT TYPE="hidden" NAME="slipip" VALUE="<% $svc_acct->slipip %>">
% } else {
<TR>
% if ( $part_svc->part_svc_column('slipip')->columnflag =~ /^[FA]$/ ) {
<INPUT TYPE="hidden" NAME="slipip" VALUE="<% $svc_acct->slipip %>">
% } else {
<TR>
- <TD ALIGN="right">
IP
</TD>
+ <TD ALIGN="right">
<% mt('IP') |h %>
</TD>
<TD><INPUT TYPE="text" NAME="slipip" VALUE="<% $svc_acct->slipip %>"></TD>
</TR>
% }
<TD><INPUT TYPE="text" NAME="slipip" VALUE="<% $svc_acct->slipip %>"></TD>
</TR>
% }
@@
-280,12
+270,12
@@
Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
% my $tf = $uf . "_threshold";
% if ( $curuser->access_right('Edit usage') ) {
<TR>
% my $tf = $uf . "_threshold";
% if ( $curuser->access_right('Edit usage') ) {
<TR>
- <TD ALIGN="right"><%
$label{$uf} %> remaining
</TD>
- <TD><INPUT TYPE="text" NAME="<% $uf %>" VALUE="<% $svc_acct->$uf %>">(
blank disables
)</TD>
+ <TD ALIGN="right"><%
mt("[_1] remaining",$label{$uf}) |h %>
</TD>
+ <TD><INPUT TYPE="text" NAME="<% $uf %>" VALUE="<% $svc_acct->$uf %>">(
<% mt('blank disables') |h %>
)</TD>
</TR>
<TR>
</TR>
<TR>
- <TD ALIGN="right"><%
$label{$uf} %> threshold
</TD>
- <TD><INPUT TYPE="text" NAME="<% $tf %>" VALUE="<% $svc_acct->$tf %>">(
blank disables
)</TD>
+ <TD ALIGN="right"><%
mt("[_1] threshold",$label{$uf}) |h %>
</TD>
+ <TD><INPUT TYPE="text" NAME="<% $tf %>" VALUE="<% $svc_acct->$tf %>">(
<% mt('blank disables') |h %>
)</TD>
</TR>
% }else{
<INPUT TYPE="hidden" NAME="<% $uf %>" VALUE="<% $svc_acct->$uf %>">
</TR>
% }else{
<INPUT TYPE="hidden" NAME="<% $uf %>" VALUE="<% $svc_acct->$uf %>">
@@
-299,11
+289,9
@@
Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
%
% if ( $part_svc->part_svc_column($r)->columnflag =~ /^[FA]$/ ) {
%
% if ( $part_svc->part_svc_column($r)->columnflag =~ /^[FA]$/ ) {
-
<INPUT TYPE="hidden" NAME="<% $r %>" VALUE="<% $svc_acct->getfield($r) %>">
% } else {
<INPUT TYPE="hidden" NAME="<% $r %>" VALUE="<% $svc_acct->getfield($r) %>">
% } else {
-
<TR>
<TD ALIGN="right"><% $FS::raddb::attrib{$a} %></TD>
<TD><INPUT TYPE="text" NAME="<% $r %>" VALUE="<% $svc_acct->getfield($r) %>"></TD>
<TR>
<TD ALIGN="right"><% $FS::raddb::attrib{$a} %></TD>
<TD><INPUT TYPE="text" NAME="<% $r %>" VALUE="<% $svc_acct->getfield($r) %>"></TD>
@@
-312,37
+300,31
@@
Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
% }
% }
-
<TR>
<TR>
- <TD ALIGN="right">
RADIUS groups
</TD>
+ <TD ALIGN="right">
<% mt('RADIUS groups') |h %>
</TD>
% if ( $part_svc->part_svc_column('usergroup')->columnflag eq 'F' ) {
% if ( $part_svc->part_svc_column('usergroup')->columnflag eq 'F' ) {
-
<TD BGCOLOR="#eeeeee"><% join('<BR>', @groups) %></TD>
% } else {
<TD BGCOLOR="#eeeeee"><% join('<BR>', @groups) %></TD>
% } else {
-
<TD><% FS::svc_acct::radius_usergroup_selector( \@groups ) %></TD>
% }
<TD><% FS::svc_acct::radius_usergroup_selector( \@groups ) %></TD>
% }
-
</TR>
% foreach my $field ($svc_acct->virtual_fields) {
% # If the flag is X, it won't even show up in $svc_acct->virtual_fields.
% if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) {
</TR>
% foreach my $field ($svc_acct->virtual_fields) {
% # If the flag is X, it won't even show up in $svc_acct->virtual_fields.
% if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) {
-
<% $svc_acct->pvf($field)->widget('HTML', 'edit', $svc_acct->getfield($field)) %>
% }
% }
<% $svc_acct->pvf($field)->widget('HTML', 'edit', $svc_acct->getfield($field)) %>
% }
% }
-
</TABLE>
<BR>
% if ( $captcha_url ) {
<IMG SRC="<% $captcha_url %>"><BR>
</TABLE>
<BR>
% if ( $captcha_url ) {
<IMG SRC="<% $captcha_url %>"><BR>
-
Enter the word shown above:
<INPUT TYPE="text" NAME="captcha_response"><BR>
+
<% mt('Enter the word shown above:') |h %>
<INPUT TYPE="text" NAME="captcha_response"><BR>
<BR>
% }
<BR>
% }
@@
-350,7
+332,7
@@
Enter the word shown above: <INPUT TYPE="text" NAME="captcha_response"><BR>
</FORM>
</FORM>
-<
% include('/elements/footer.html') %
>
+<
& /elements/footer.html &
>
<%init>
<%init>
@@
-494,7
+476,15
@@
sub max {
my $captcha_url;
my ($export_google) = $part_svc->part_export('acct_google');
if ( $export_google ) {
my $captcha_url;
my ($export_google) = $part_svc->part_export('acct_google');
if ( $export_google ) {
- $captcha_url = $export_google->captcha_url || '';
+ my $error = $export_google->auth_error;
+ if ( $error ) {
+ if ( $error->{'captcha_url'} ) {
+ $captcha_url = $error->{'captcha_url'};
+ }
+ else {
+ $cgi->param('error', $error->{'message'});
+ }
+ } #if $error
}
</%init>
}
</%init>