Thread: [Astpp-commit] SF.net SVN: astpp:[2228] trunk/web_interface/astpp-admin.cgi
Brought to you by:
darrenkw
Menu
▾
▴
astpp-commit
|
From: <dar...@us...> - 2009-02-01 00:34:16
|
Revision: 2228
http://astpp.svn.sourceforge.net/astpp/?rev=2228&view=rev
Author: darrenkw
Date: 2009-02-01 00:34:10 +0000 (Sun, 01 Feb 2009)
Log Message:
-----------
Fixed a small typo.
Modified Paths:
--------------
trunk/web_interface/astpp-admin.cgi
Modified: trunk/web_interface/astpp-admin.cgi
===================================================================
--- trunk/web_interface/astpp-admin.cgi 2009-01-31 23:20:21 UTC (rev 2227)
+++ trunk/web_interface/astpp-admin.cgi 2009-02-01 00:34:10 UTC (rev 2228)
@@ -8192,7 +8192,7 @@
while ( my $packageinfo = $results->fetchrow_hashref ) {
$ASTPP->debug(
user => $param->{username},
- debug => "PACKAGE: " . $packgeinfo->{id}
+ debug => "PACKAGE: " . $packageinfo->{id}
);
my (%row);
$row{id} = $packageinfo->{id};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dar...@us...> - 2009-02-01 00:59:04
|
Revision: 2229
http://astpp.svn.sourceforge.net/astpp/?rev=2229&view=rev
Author: darrenkw
Date: 2009-02-01 00:59:00 +0000 (Sun, 01 Feb 2009)
Log Message:
-----------
Have interface return all accounts in the list field if the type is not specified.
Modified Paths:
--------------
trunk/web_interface/astpp-admin.cgi
Modified: trunk/web_interface/astpp-admin.cgi
===================================================================
--- trunk/web_interface/astpp-admin.cgi 2009-02-01 00:34:10 UTC (rev 2228)
+++ trunk/web_interface/astpp-admin.cgi 2009-02-01 00:59:00 UTC (rev 2229)
@@ -2192,6 +2192,7 @@
filename => '/var/lib/astpp/templates/account-list.tpl',
die_on_bad_params => $config->{template_die_on_bad_params}
);
+ $params->{type} = -1 if !$params->{type}; # Default to listing all accounts;
my $yes = gettext("YES");
my $no = gettext("NO");
return gettext("Cannot view account until database is configured")
@@ -2380,6 +2381,7 @@
return gettext("Please configure 'Pricelists'") . "\n"
unless @pricelists;
if ( $params->{action} eq gettext("Generate Account") ) {
+
if ( $params->{logintype} == 1 || $params->{logintype} == 5 ) {
my $pricelistinfo =
&get_pricelist( $astpp_db, $params->{pricelist} );
@@ -2390,9 +2392,10 @@
$params->{count} = 1;
$params->{pennies} = 0;
$params->{number} = $params->{customnum};
+ if ($params->{number} > 0) {
$status .= &generate_accounts( $params, $config );
my $accountinfo = &get_account( $astpp_db, $params->{number} );
- ### Here we add support to add IAX and SIP devices at account creation.
+ ## Here we add support to add IAX and SIP devices at account creation.
if ( $params->{SIP} ) {
$config->{rt_sip_type} = $params->{devicetype};
$config->{ipaddr} = $params->{ipaddr};
@@ -2463,6 +2466,9 @@
}
}
### End of Device creation support
+ } else {
+ $status = "No account number entered!";
+ }
}
$template->param(
pricelist_menu => popup_menu(
@@ -2496,6 +2502,7 @@
accounttype_menu => popup_menu(
-name => "accounttype",
-values => \%types,
+ -labels => $types,
-default => 0
)
);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dar...@us...> - 2009-02-02 19:43:43
|
Revision: 2231
http://astpp.svn.sourceforge.net/astpp/?rev=2231&view=rev
Author: darrenkw
Date: 2009-02-02 19:43:38 +0000 (Mon, 02 Feb 2009)
Log Message:
-----------
Corrected code that checks to make sure an account number is entered.
Modified Paths:
--------------
trunk/web_interface/astpp-admin.cgi
Modified: trunk/web_interface/astpp-admin.cgi
===================================================================
--- trunk/web_interface/astpp-admin.cgi 2009-02-01 01:41:41 UTC (rev 2230)
+++ trunk/web_interface/astpp-admin.cgi 2009-02-02 19:43:38 UTC (rev 2231)
@@ -2392,7 +2392,7 @@
$params->{count} = 1;
$params->{pennies} = 0;
$params->{number} = $params->{customnum};
- if ($params->{number} > 0) {
+ if ($params->{number} ne "") {
$status .= &generate_accounts( $params, $config );
my $accountinfo = &get_account( $astpp_db, $params->{number} );
## Here we add support to add IAX and SIP devices at account creation.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dar...@us...> - 2009-10-06 03:41:22
|
Revision: 2278
http://astpp.svn.sourceforge.net/astpp/?rev=2278&view=rev
Author: darrenkw
Date: 2009-10-06 03:41:14 +0000 (Tue, 06 Oct 2009)
Log Message:
-----------
Moved to the new balance calculating code found in the perl module.
Modified Paths:
--------------
trunk/web_interface/astpp-admin.cgi
Modified: trunk/web_interface/astpp-admin.cgi
===================================================================
--- trunk/web_interface/astpp-admin.cgi 2009-10-06 03:40:09 UTC (rev 2277)
+++ trunk/web_interface/astpp-admin.cgi 2009-10-06 03:41:14 UTC (rev 2278)
@@ -1644,8 +1644,7 @@
&accounts_total_balance( $astpp_db, $params->{username} ) /
10000 );
$template->param(
- total_due => &accountbalance( $astpp_db, $params->{username} ) /
- 10000 );
+ total_due => $ASTPP->accountbalance( account => $params->{username} ) / 10000 );
$template->param(
calling_cards_in_use => &count_callingcards(
$astpp_db,
@@ -1934,9 +1933,8 @@
$accountinfo = &get_account( $astpp_db, $params->{numberlist} );
}
if ( $accountinfo->{number} ) {
+ $accountinfo->{balance} = $ASTPP->accountbalance( account => $accountinfo->{number} );
$accountinfo->{balance} =
- &accountbalance( $astpp_db, $accountinfo->{number} );
- $accountinfo->{balance} =
sprintf( "%.2f", $accountinfo->{balance} / 10000 );
$template->param( first_name => $accountinfo->{first_name} );
$template->param( middle_name => $accountinfo->{middle_name} );
@@ -2256,8 +2254,7 @@
my %row;
$accountcount++;
my $accountinfo = &get_account( $astpp_db, $account );
- my $balance = &accountbalance( $astpp_db, $account );
- $balance = $balance / 10000;
+ my $balance = $ASTPP->accountbalance( account => $account ) / 10000 ;
$balance = sprintf( "%." . $config->{decimalpoints} . "f", $balance );
$totalbalance = $totalbalance + $balance;
$row{cc} = $accountinfo->{cc};
@@ -11416,7 +11413,7 @@
foreach my $name (@booth_list) {
my ( %row, $balance, $tmp, $sql );
my $boothinfo = &get_account_including_closed( $astpp_db, $name );
- $balance = &accountbalance( $astpp_db, $name );
+ $balance = $ASTPP->accountbalance( account => $name );
$tmp =
"SELECT COUNT(*) FROM cdrs WHERE cardnum = "
. $astpp_db->quote($name)
@@ -11715,7 +11712,7 @@
);
$template->param( booth_name => $params->{booth_name} );
- my $balance = &accountbalance( $astpp_db, $params->{booth_name} ) / 10000;
+ my $balance = $ASTPP->accountbalance( account => $params->{booth_name} ) / 10000;
my $unrated =
&count_unrated_cdrs_account( $config, $cdr_db, $accountinfo->{number},
$accountinfo->{cc} );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dar...@us...> - 2009-10-08 05:07:19
|
Revision: 2286
http://astpp.svn.sourceforge.net/astpp/?rev=2286&view=rev
Author: darrenkw
Date: 2009-10-08 05:07:10 +0000 (Thu, 08 Oct 2009)
Log Message:
-----------
Make astpp-admin.cgi "strict" compliant
Modified Paths:
--------------
trunk/web_interface/astpp-admin.cgi
Modified: trunk/web_interface/astpp-admin.cgi
===================================================================
--- trunk/web_interface/astpp-admin.cgi 2009-10-06 05:28:39 UTC (rev 2285)
+++ trunk/web_interface/astpp-admin.cgi 2009-10-08 05:07:10 UTC (rev 2286)
@@ -52,6 +52,7 @@
use DateTime;
use DateTime::TimeZone;
use ASTPP;
+use strict;
; # We use DateTime::TimeZone to show users cdrs in their own timezones.
@@ -62,12 +63,13 @@
textdomain("astpp");
use vars qw(@output $astpp_db $params $config
$status $config $limit $accountinfo
- $freepbx_db $rt_db $openser_db $ASTPP);
+ $osc_db $freepbx_db $rt_db $fs_db $openser_db $ASTPP);
my $starttime = [gettimeofday];
$ASTPP = ASTPP->new;
$ASTPP->set_verbosity(4); #Tell ASTPP debugging how verbose we want to be.
#$ASTPP->set_asterisk_agi($AGI);
$ASTPP->set_pagination_script("astpp-admin.cgi");
+my %types;
my @Home = ( gettext("Home Page") );
my @Accounts = (
gettext("Create Account"), gettext("Process Payment"),
@@ -157,7 +159,7 @@
my @output = ("STDERR"); # "LOGFILE" );
my @language = all_language_codes;
@language = sort @language;
-#my @currency;
+my @currency;
my @deviceprotocol = ("SIP");
my @countries = all_country_names();
@countries = sort @countries;
@@ -759,7 +761,7 @@
. gettext("Start date:")
. "</td><td><input type=text name=start_year value=\"$start_year\" size=5><select name=start_month>";
- for ( $id = 0 ; $id < 12 ; $id++ ) {
+ for ( my $id = 0 ; $id < 12 ; $id++ ) {
if ( $id == ( $start_month - 1 ) ) {
$body .= "<option value=$id selected>$months[$id]";
}
@@ -779,7 +781,7 @@
"<tr><td>"
. gettext("End date:")
. "</td><td><input type=text name=end_year value=\"$end_year\" size=5><select name=end_month>";
- for ( $id = 0 ; $id < 12 ; $id++ ) {
+ for ( my $id = 0 ; $id < 12 ; $id++ ) {
if ( $id == ( $end_month - 1 ) ) {
$body .= "<option value=$id selected>$months[$id]";
}
@@ -851,7 +853,8 @@
sub build_list_box($$) {
my ( $in, $selected ) = @_;
my $body = "";
- undef %list;
+ my %list;
+# undef %list;
@list{@$in} = ();
my @out = sort keys %list; # remove sort if undesired
for ( my $i = 0 ; $i < @out ; $i++ ) {
@@ -868,7 +871,7 @@
sub build_report($$) {
return gettext("Cannot display reports until database is configured")
unless $astpp_db;
- $cdr_db = &cdr_connect_db( $config, $enh_config, @output );
+ $cdr_db = &cdr_connect_db( $config, @output );
return gettext("Cannot display reports until database is configured")
unless $cdr_db;
@@ -1103,7 +1106,7 @@
$price = $row1->{'price'};
$cost = $row1->{'cost'};
- $notes = "notes = " . $astpp_db->quote( $row1->{notes} );
+ my $notes = "notes = " . $astpp_db->quote( $row1->{notes} );
my $sql2 = $astpp_db->prepare(
"SELECT COUNT(*) AS completed FROM $table WHERE $notes AND disposition = 'ANSWERED'"
@@ -1168,7 +1171,7 @@
my ($body);
return gettext("Cannot display reports until database is configured")
unless $astpp_db;
- $cdr_db = &cdr_connect_db( $config, $enh_config, @output );
+ $cdr_db = &cdr_connect_db( $config, @output );
return gettext("Cannot display reports until database is configured")
unless $cdr_db;
@@ -1179,7 +1182,7 @@
my ($body);
return gettext("Cannot display reports until database is configured")
unless $astpp_db;
- $cdr_db = &cdr_connect_db( $config, $enh_config, @output );
+ $cdr_db = &cdr_connect_db( $config, @output );
return gettext("Cannot display reports until database is configured")
unless $cdr_db;
@@ -1193,7 +1196,7 @@
my ( $body, $id );
return gettext("Cannot display stats until database is configured")
unless $astpp_db;
- $cdr_db = &cdr_connect_db( $config, $enh_config, @output );
+ $cdr_db = &cdr_connect_db( $config, @output );
return gettext("Cannot display stats until database is configured")
unless $cdr_db;
@@ -1237,6 +1240,7 @@
. gettext("Congestion")
. "</td></tr>\n";
+ my $count = 0;
while ( my $row = $sth->fetchrow_hashref ) {
my $freeswitch_trunk;
if ( $row->{tech} eq "SIP" ) {
@@ -1483,7 +1487,7 @@
$tmp .= " limit $params->{limit} , $results_per_page";
$sql = $cdr_db->prepare($tmp);
$sql->execute;
-
+ my $count = 0;
while ( my $record = $sql->fetchrow_hashref ) {
$count++;
if ( $count % 2 == 0 ) {
@@ -1517,32 +1521,32 @@
\n";
}
$sql->finish;
- $filter{'start_month'} = $filter{'start_month'} - 1;
+ $filter->{'start_month'} = $filter->{'start_month'} - 1;
$string =
"&start_year="
- . $filter{'start_year'}
+ . $filter->{'start_year'}
. "&start_month="
- . $filter{'start_month'}
+ . $filter->{'start_month'}
. "&start_day="
- . $filter{'start_day'}
+ . $filter->{'start_day'}
. "&start_hour="
- . $filter{'start_hour'}
+ . $filter->{'start_hour'}
. "&start_minute="
- . $filter{'start_minute'}
+ . $filter->{'start_minute'}
. "&start_second="
- . $filter{'start_second'}
+ . $filter->{'start_second'}
. "&end_year="
- . $filter{'end_year'}
+ . $filter->{'end_year'}
. "&end_month="
- . $filter{'end_month'}
+ . $filter->{'end_month'}
. "&end_day="
- . $filter{'end_day'}
+ . $filter->{'end_day'}
. "&end_hour="
- . $filter{'end_hour'}
+ . $filter->{'end_hour'}
. "&end_minute="
- . $filter{'end_minute'}
+ . $filter->{'end_minute'}
. "&end_second="
- . $filter{'end_second'}
+ . $filter->{'end_second'}
. "&trunk="
. $params->{trunk};
for ( my $i = 0 ; $i <= $pagesrequired - 1 ; $i++ ) {
@@ -1606,6 +1610,7 @@
&list_accounts_selective( $astpp_db, $params->{username}, "-1" );
my $accounts;
my $tot_count = scalar @accountlist;
+ my $count = 0;
foreach (@accountlist) {
$count++;
$accounts .= "'" . $_ . "',";
@@ -1687,7 +1692,7 @@
my (
$total, $body, $status, $description,
$pricelists, $chargeid, $tmp, $number,
- $pagesrequired, $results_per_page, $results, $pageno
+ $pagesrequired, $results_per_page, $results, $pageno, $reseller
);
my $template = HTML::Template->new(
filename => '/var/lib/astpp/templates/account-info.tpl',
@@ -1695,7 +1700,7 @@
);
return gettext("Cannot view account until database is configured")
unless $astpp_db;
- @pricelists =
+ my @pricelists =
$ASTPP->list_pricelists( reseller => $params->{logged_in_reseller} );
return gettext("Cannot view account until pricelists configured")
unless @pricelists;
@@ -2229,7 +2234,7 @@
else {
$reseller = "";
}
- $types{-1} = gettext("All");
+ %types->{-1} = gettext("All");
$body =
start_form
. "<table class=\"default\"><tr class=\"header\"><td colspan=9>"
@@ -2514,6 +2519,7 @@
}
}
if ( $config->{openser} == 1 ) {
+ my $name = $params->{number}; # TEMPORARY PATCH
$status .=
&add_sip_user_openser( $openser_db, $config, $name,
$params->{accountpassword},
@@ -2527,7 +2533,7 @@
}
}
if ( $config->{users_dids_freeswitch} == 1 ) {
- my $failure;
+ my ($failure,$name);
($failure, $status, $name) = $ASTPP->fs_add_sip_user(
accountcode => $params->{number},
freeswitch_domain => $config->{freeswitch_domain},
@@ -2620,7 +2626,7 @@
accounttype_menu => popup_menu(
-name => "accounttype",
-values => \%types,
- -labels => $types,
+ -labels => %types,
-default => 0
)
);
@@ -3181,7 +3187,7 @@
}
sub build_update_card_status() {
- my ( @pricelists, $status, $body, $count, $sql );
+ my (@brands,$brandsql, @pricelists, $status, $body, $count, $sql );
return gettext("Database is NOT configured!") . "\n" unless $astpp_db;
if ( $params->{logintype} == 1 || $params->{logintype} == 5 ) {
@brands = &list_cc_brands_reseller( $astpp_db, $params->{username} );
@@ -3264,7 +3270,7 @@
}
sub build_reset_card_inuse() {
- my ( @pricelists, $status, $body, $count );
+ my ( @brands,$brandsql,@pricelists, $status, $body, $count );
return gettext("Database is NOT configured!") . "\n" unless $astpp_db;
if ( $params->{action} eq gettext("Reset") ) {
my $brandssql;
@@ -3317,7 +3323,7 @@
sub update_balance() {
my ( $cardinfo, $charge ) = @_;
- my (@brands);
+ my (@brands,$brandsql);
if ( $params->{logintype} == 1 || $params->{logintype} == 5 ) {
@brands = &list_cc_brands_reseller( $astpp_db, $params->{username} );
}
@@ -3393,7 +3399,7 @@
}
sub build_delete_cards() {
- my ( @pricelists, $status, $body, $count );
+ my ( @brands,$brandsql,@pricelists, $status, $body, $count );
return gettext("Database is NOT configured!") . "\n" unless $astpp_db;
if ( $params->{action} eq gettext("Delete") ) {
if ( $params->{logintype} == 1 || $params->{logintype} == 5 ) {
@@ -3448,7 +3454,7 @@
}
sub build_list_cards() {
- my ( @pricelists, $status, $body, $number, $inuse, $cardstat, $cardinfo,
+ my ($where,@brands,$brandsql, @pricelists, $status, $body, $number, $inuse, $cardstat, $cardinfo,
$count, $sql, $pageno, $results, $results_per_page, $pagesrequired );
if ( $params->{logintype} == 1 || $params->{logintype} == 5 ) {
@brands = &list_cc_brands_reseller( $astpp_db, $params->{username} );
@@ -3524,7 +3530,7 @@
"SELECT COUNT(*) FROM callingcards WHERE status < 2 and brand "
. $brandsql );
$sql->execute;
- $record = $sql->fetchrow_hashref;
+ my $record = $sql->fetchrow_hashref;
$total_entries = $record->{"COUNT(*)"};
$sql->finish;
$te_match = Digest::MD5::md5_hex("unique_cypher-$total_entries-$where");
@@ -3634,7 +3640,7 @@
}
sub build_view_card() {
- my ( @pricelists, $status, $body, $count, $inuse, $cardstat, $value,
+ my ( @brands, $brandsql, @pricelists, $status, $body, $count, $inuse, $cardstat, $value,
$used );
my $no = gettext("NO");
my $yes = gettext("YES");
@@ -3941,7 +3947,7 @@
$pattern =~ m/\)(\d+)\./;
my $pat = $1;
$mpls = $npls;
- if ( $config->{debug} ) { &pt("enter $pat"); }
+ if ( $config->{debug} ) { &pt($t0, "enter $pat"); }
my $highest = 0;
my $lowest = -1;
@@ -4029,35 +4035,34 @@
$td = tv_interval($t0);
print "\n$td\twhee ... got total $counter\n";
$sdp->finish();
- &mktb( $ztable,
+ &mktb($t0, $ztable,
"select * from $ltable where offer is not null order by pattern" );
- &mktb( $otable, "select pattern,comment,offer from $ztable" );
+ &mktb($t0, $otable, "select pattern,comment,offer from $ztable" );
return $body;
}
sub mktb {
- my $table = shift @_;
- my $select = shift @_;
- my $tt1 = $dbh->prepare("DROP TABLE IF EXISTS `$table`");
+ my ($t0, $table, $select) = @_;
+ my $tt1 = $astpp_db->prepare("DROP TABLE IF EXISTS `$table`");
$tt1->execute();
- $tt1 = $dbh->prepare("create table $table $select");
+ $tt1 = $astpp_db->prepare("create table $table $select");
$tt1->execute();
- $tt1 = $dbh->prepare("alter table $table ADD PRIMARY KEY ( `pattern` )");
+ $tt1 = $astpp_db->prepare("alter table $table ADD PRIMARY KEY ( `pattern` )");
$tt1->execute();
- $td = tv_interval($t0);
+ my $td = tv_interval($t0);
print "$td\tmade table $table\n";
}
sub pt {
- my $p = shift;
- $td = tv_interval($t0);
+ my ($t0,$p);
+ my $td = tv_interval($t0);
print "$p\t$td\n";
}
### End of Code from convergence.com.pk
sub build_list_errors() {
- my ( $results, $body, $status, $count, $pageno, $pagesrequired );
+ my ( @cdrlist, $results, $body, $status, $count, $pageno, $pagesrequired );
$cdr_db = &cdr_connect_db( $config, @output );
return gettext("Cannot list errors until database is configured!") . "\n"
unless $cdr_db;
@@ -4179,7 +4184,7 @@
foreach my $record (@sip_peers) {
$status .= "<br>" . $record;
- @info = split( " ", $record );
+ my @info = split( " ", $record );
if ( $info[0] !~ "^--END"
&& $info[0] !~ "^Name.*"
@@ -4241,7 +4246,7 @@
";
foreach my $record (@sip_users) {
$status .= "<br>" . $record;
- @info = split( " ", $record );
+ my @info = split( " ", $record );
if ( $info[0] !~ "^--END.*"
&& $info[0] !~ "^Username.*"
&& $info[0] !~ "^Response.*"
@@ -4299,7 +4304,7 @@
foreach my $record (@iax2_peers) {
$status .= "<br>" . $record;
- @info = split( " ", $record );
+ my @info = split( " ", $record );
if ( $info[0] !~ "^--END"
&& $info[0] !~ "^Name.*"
&& $info[0] !~ "^Response.*"
@@ -4350,7 +4355,7 @@
";
foreach my $record (@iax2_users) {
$status .= "<br>" . $record;
- @info = split( " ", $record );
+ my @info = split( " ", $record );
if ( $info[0] !~ "^--END"
&& $info[0] !~ "^Username.*"
&& $info[0] !~ "^Response.*"
@@ -4397,7 +4402,7 @@
";
foreach my $record (@show_channels) {
- @info = split( " ", $record );
+ my @info = split( " ", $record );
if ( $info[0] !~ "^--END"
&& $info[0] !~ "^Channel.*"
&& $info[0] !~ "^Privilege.*"
@@ -5161,7 +5166,7 @@
my $csv = Text::CSV->new();
my $prepend = "^";
my $append = ".*";
- $uploaded = upload('rateimport');
+ my $uploaded = upload('rateimport');
my ( @data, $record );
while ( my $record = <$uploaded> ) {
$ASTPP->debug( user => $param->{username}, debug => $record );
@@ -5170,7 +5175,7 @@
}
foreach my $temp (@data) {
if ( $csv->parse($temp) ) {
- @columns = $csv->fields();
+ my @columns = $csv->fields();
my $pattern =
$prepend . $columns[0] . $columns[2] . $columns[3] . $append;
if (
@@ -5310,8 +5315,8 @@
}
foreach my $temp (@data) {
if ( $csv->parse($temp) ) {
- my $tmp;
- @columns = $csv->fields();
+ my ($tmp,$valid);
+ my @columns = $csv->fields();
my $pattern =
$prepend . $columns[0] . $columns[1] . $columns[2] . $append;
$status .=
@@ -5331,7 +5336,8 @@
. $astpp_db->quote( $resellerdata->{pricelist} )
. " LIMIT 1";
$ASTPP->debug( user => $param->{username}, debug => $tmp );
- $sql = $astpp_db->prepare($tmp);
+ my $sql = $astpp_db->prepare($tmp);
+ my ($routeinfo,$row);
$sql->execute;
while ( $row = $sql->fetchrow_hashref ) {
$routeinfo = $row;
@@ -5476,7 +5482,7 @@
unless $astpp_db;
if ( $params->{action} eq gettext("Import...") ) {
my $csv = Text::CSV->new();
- $uploaded = upload('didimport');
+ my $uploaded = upload('didimport');
my ( @data, $record );
while ( my $record = <$uploaded> ) {
chomp;
@@ -5484,7 +5490,7 @@
}
foreach my $temp (@data) {
if ( $csv->parse($temp) ) {
- @columns = $csv->fields();
+ my @columns = $csv->fields();
if (
$astpp_db->do(
"DELETE FROM dids WHERE number = "
@@ -5643,7 +5649,7 @@
}
sub build_remove_account() {
- my ( $body, $tmp, $sql, $status, $number, @accountlist, @pricelists,
+ my ( $reseller, $body, $tmp, $sql, $status, $number, @accountlist, @pricelists,
$accountinfo );
my $template = HTML::Template->new(
filename => '/var/lib/astpp/templates/account-remove.tpl',
@@ -7272,6 +7278,7 @@
$params->{action} = gettext("Information...");
}
elsif ( $params->{action} eq gettext("Add...") ) {
+ my ($didinfo);
my $resellerinfo = &get_account( $astpp_db, $params->{username} );
if ( $resellerinfo->{reseller} ) {
$didinfo =
@@ -7620,7 +7627,7 @@
}
sub build_routes() {
- my ( @pricelists, $sql, $count, $tmp );
+ my ( $pageno, @pricelists, $sql, $count, $tmp );
return gettext("Database is NOT configured!") . "\n" unless $astpp_db;
@pricelists =
$ASTPP->list_pricelists( reseller => $params->{logged_in_reseller} );
@@ -7647,7 +7654,7 @@
$ASTPP->debug( user => $param->{username}, debug => $tmp );
$sql = $astpp_db->prepare($tmp);
$sql->execute;
- $record = $sql->fetchrow_hashref;
+ my $record = $sql->fetchrow_hashref;
$sql->finish;
$body =
start_form
@@ -7748,8 +7755,9 @@
. $astpp_db->quote( $resellerdata->{pricelist} )
. " LIMIT 1";
$ASTPP->debug( user => $param->{username}, debug => $tmp );
- $sql = $astpp_db->prepare($tmp);
+ my $sql = $astpp_db->prepare($tmp);
$sql->execute;
+ my ($row, $routeinfo);
while ( $row = $sql->fetchrow_hashref ) {
$routeinfo = $row;
}
@@ -7806,7 +7814,7 @@
if ( $pricelist->{reseller} ne $params->{username} ) {
$params->{pricelist} = $params->{username};
}
- $reseller = $params->{username};
+ my $reseller = $params->{username};
my $resellerdata = &get_account( $astpp_db, $reseller );
my $tmp =
"SELECT * FROM routes WHERE pattern = "
@@ -7815,8 +7823,9 @@
. $astpp_db->quote( $resellerdata->{pricelist} )
. " LIMIT 1";
$ASTPP->debug( user => $param->{username}, debug => $tmp );
- $sql = $astpp_db->prepare($tmp);
+ my $sql = $astpp_db->prepare($tmp);
$sql->execute;
+ my ($routeinfo, $row);
while ( $row = $sql->fetchrow_hashref ) {
$routeinfo = $row;
}
@@ -8171,7 +8180,7 @@
}
sub build_packages() {
- my ( $pagination, $sql, $record, $count, $tmp, $pageno, $pagesrequired );
+ my ( $sql_select, $sql_count, $pagination, $sql, $record, $count, $tmp, $pageno, $pagesrequired );
return gettext("Database is NOT configured!") . "\n" unless $astpp_db;
my $template = HTML::Template->new(
filename => '/var/lib/astpp/templates/packages-list.tpl',
@@ -8180,7 +8189,7 @@
if ( $params->{limit} < 1 ) { $params->{limit} = 0 }
my $results_per_page = $config->{results_per_page};
if ( $results_per_page eq "" ) { $results_per_page = 25; }
- @pricelists =
+ my @pricelists =
$ASTPP->list_pricelists( reseller => $params->{logged_in_reseller} );
$template->param(
pricelists => popup_menu(
@@ -8303,6 +8312,7 @@
);
my $results = $astpp_db->prepare($sql);
$results->execute;
+ my @package_list;
while ( my $packageinfo = $results->fetchrow_hashref ) {
$ASTPP->debug(
user => $param->{username},
@@ -9120,6 +9130,7 @@
$params->{action} = gettext("Information...");
}
elsif ( $params->{action} eq gettext("Save...") ) {
+ my @resellers = &list_resellers($astpp_db);
my $resellerlist;
foreach my $reseller (@resellers) {
my $resellerparam = "reseller-" . $reseller;
@@ -9469,12 +9480,12 @@
sub build_calc_charge() {
my ( $status, $body, $cost, $length, $increment );
- $template = HTML::Template->new(
+ my $template = HTML::Template->new(
filename => '/var/lib/astpp/templates/calc-charge.tpl',
die_on_bad_params => $config->{template_die_on_bad_params}
);
return gettext("Database is NOT configured!") . "\n" unless $astpp_db;
- @pricelists =
+ my @pricelists =
$ASTPP->list_pricelists( reseller => $params->{logged_in_reseller} );
$template->param(
pricelists => popup_menu(
@@ -9710,6 +9721,7 @@
$ASTPP->debug( user => $param->{username}, debug => "Adding User");
$params->{domain} = $config->{freeswitch_domain} if !$params->{domain};
$params->{context} = $config->{freeswitch_context} if !$params->{context};
+ my ($failure,$name);
($failure, $status, $name) = $ASTPP->fs_add_sip_user(
username => $params->{fs_username},
accountcode => $params->{accountcode},
@@ -11036,13 +11048,13 @@
$status .= gettext("CallShop Exists Already!");
}
}
- $sweep_menu = popup_menu( -name => "sweep", -values => \%sweeplist );
- $language_menu = popup_menu(
+ my $sweep_menu = popup_menu( -name => "sweep", -values => \%sweeplist );
+ my $language_menu = popup_menu(
-name => "language",
-values => \@language,
-default => $config->{default_language}
);
- $currency_menu = popup_menu(
+ my $currency_menu = popup_menu(
-name => "currency",
-values => \@currency
);
@@ -11097,7 +11109,7 @@
. gettext("removed successfully!") . "<br>";
}
}
- $callshop_list = popup_menu(
+ my $callshop_list = popup_menu(
-name => "callshop_list",
-values => \@callshops
);
@@ -11122,9 +11134,10 @@
-values => \@language,
-default => $config->{default_language}
);
- @pricelists =
+ my @pricelists =
$ASTPP->list_pricelists( reseller => $params->{logged_in_reseller} );
- $pricelists = popup_menu(
+
+ my $pricelists = popup_menu(
-name => "pricelist",
-values => \@pricelists
);
@@ -11172,6 +11185,7 @@
$status .= "<br>";
}
if ( $config->{openser} == 1 ) {
+ my $name = $params->{number}; # TEMPORARY PATCH
$status .=
&add_sip_user_openser( $openser_db, $config, $name,
$params->{accountpassword},
@@ -11228,12 +11242,12 @@
else {
my $reseller_info =
&get_account( $astpp_db, $params->{username} );
- $tmp =
+ my $tmp =
"SELECT countries_id FROM countries WHERE countries_name LIKE "
. $osc_db->quote( $reseller_info->{country} );
my $sql = $osc_db->prepare($tmp);
$sql->execute;
- $record = $sql->fetchrow_hashref;
+ my $record = $sql->fetchrow_hashref;
$tmp =
"INSERT INTO customers (customers_gender,customers_firstname,customers_lastname,"
. "customers_email_address,"
@@ -11391,7 +11405,7 @@
}
sub build_list_booths() {
- my (@booth_list);
+ my (@booth_list, $booth_status);
my @booths = ();
@booth_list =
&list_booths_callshop( $astpp_db, $params->{username}, $config );
@@ -11411,7 +11425,7 @@
&hangup_call( $astpp_db, $config, $params->{channel} );
}
foreach my $name (@booth_list) {
- my ( %row, $balance, $tmp, $sql );
+ my ( $sip_login, $iax2_login, %row, $balance, $tmp, $sql );
my $boothinfo = &get_account_including_closed( $astpp_db, $name );
$balance = $ASTPP->accountbalance( account => $name );
$tmp =
@@ -11420,7 +11434,7 @@
. " AND status = 0";
$sql = $astpp_db->prepare($tmp);
$sql->execute;
- $record = $sql->fetchrow_hashref;
+ my $record = $sql->fetchrow_hashref;
$row{name} = $name;
$row{balance} = sprintf( "%.2f", $balance / 10000 );
$row{call_count} = $record->{"COUNT(*)"};
@@ -11539,10 +11553,10 @@
push( @booths, \%row );
$sql->finish;
$ASTPP->debug( user => $param->{username}, debug => $tmp );
- $ASTPP->debug(
- user => $param->{username},
- debug => $record->{"COUNT(*)"}
- );
+# $ASTPP->debug(
+# user => $param->{username},
+# debug => $record->{"COUNT(*)"}
+# );
$ASTPP->debug( user => $param->{username}, debug => $balance / 10000 );
}
@@ -11558,7 +11572,7 @@
my ( $sql, @cdrs, $sip_login, $iax2_login );
# Prepare the booth list for the menu.
- @booth_list =
+ my @booth_list =
&list_booths_callshop( $astpp_db, $params->{username}, $config );
my $booths = popup_menu(
-name => "booth_list",
@@ -11661,7 +11675,7 @@
$config->{cdr_table},
\@chargelist ); # Bill as many calls as we can.
$status .= gettext("We rated as many CDRS as we could") . "<br>";
- $tmp =
+ my $tmp =
"SELECT uniqueid,callstart,callerid,callednum,disposition,billseconds,debit,credit,notes,cost FROM cdrs WHERE cardnum = "
. $astpp_db->quote( $params->{booth_name} )
. "and status = 0"
@@ -11907,7 +11921,7 @@
if $config->{users_dids_amp} == 1;
$rt_db = &rt_connect_db( $config, @output )
if $config->{users_dids_rt} == 1;
- $osc_db = &osc_connect_db( $config, $config, @output )
+ my $osc_db = &osc_connect_db( $config, $config, @output )
if $config->{externalbill} eq "oscommerce";
$ASTPP->debug(
user => $param->{username},
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dar...@us...> - 2009-10-14 01:32:14
|
Revision: 2290
http://astpp.svn.sourceforge.net/astpp/?rev=2290&view=rev
Author: darrenkw
Date: 2009-10-14 01:32:06 +0000 (Wed, 14 Oct 2009)
Log Message:
-----------
Fixed error preventing astpp-admin.cgi from running as "strict".
Modified Paths:
--------------
trunk/web_interface/astpp-admin.cgi
Modified: trunk/web_interface/astpp-admin.cgi
===================================================================
--- trunk/web_interface/astpp-admin.cgi 2009-10-14 01:31:18 UTC (rev 2289)
+++ trunk/web_interface/astpp-admin.cgi 2009-10-14 01:32:06 UTC (rev 2290)
@@ -11755,7 +11755,7 @@
foreach my $param ( param() ) {
$params->{$param} = param($param);
$ASTPP->debug(
- user => $param->{username},
+ user => $params->{username},
debug => "$param $params->{$param}"
);
$log_call .= "$param=$params->{$param},";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dar...@us...> - 2009-10-31 23:55:41
|
Revision: 2296
http://astpp.svn.sourceforge.net/astpp/?rev=2296&view=rev
Author: darrenkw
Date: 2009-10-31 23:55:34 +0000 (Sat, 31 Oct 2009)
Log Message:
-----------
Fixed the problem with editing taxes from the gui. This is now working.
Modified Paths:
--------------
trunk/web_interface/astpp-admin.cgi
Modified: trunk/web_interface/astpp-admin.cgi
===================================================================
--- trunk/web_interface/astpp-admin.cgi 2009-10-31 23:51:38 UTC (rev 2295)
+++ trunk/web_interface/astpp-admin.cgi 2009-10-31 23:55:34 UTC (rev 2296)
@@ -9607,7 +9607,7 @@
. " taxes_description = "
. $astpp_db->quote( $params->{taxes_description} ) . ","
. " last_modified = NOW() "
- . " WHERE id = "
+ . " WHERE taxes_id = "
. $astpp_db->quote( $params->{taxes_id} );
$ASTPP->debug( user => $param->{username}, debug => $tmp );
if ( $astpp_db->do($tmp) ) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X