[Astpp-commit] SF.net SVN: astpp: [2162] trunk/astpp-admin.cgi
Brought to you by:
darrenkw
From: <dar...@us...> - 2007-11-18 03:12:46
|
Revision: 2162 http://astpp.svn.sourceforge.net/astpp/?rev=2162&view=rev Author: darrenkw Date: 2007-11-17 19:12:44 -0800 (Sat, 17 Nov 2007) Log Message: ----------- Cleaned up the debugging in astpp-admin.cgi and added call hangup abilities. Modified Paths: -------------- trunk/astpp-admin.cgi Modified: trunk/astpp-admin.cgi =================================================================== --- trunk/astpp-admin.cgi 2007-11-18 00:26:27 UTC (rev 2161) +++ trunk/astpp-admin.cgi 2007-11-18 03:12:44 UTC (rev 2162) @@ -1200,7 +1200,7 @@ or dstchannel like '$row->{tech}\[$row->{path}\]%' ) "; my $sth4 = $cdr_db->prepare($sql4); - print STDERR " SQL: $sql4 \n " if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => " SQL: $sql4"); $sth4->execute(); my $ref4 = $sth4->fetchrow_hashref(); $sth4->finish; @@ -1337,7 +1337,7 @@ . $cdr_db->quote($sd) . " and calldate <= " . $cdr_db->quote($ed); - print STDERR " SQL: $tmp \n " if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => " SQL: $tmp"); } else { $tmp = @@ -1345,7 +1345,7 @@ . $cdr_db->quote($sd) . " and calldate <= " . $cdr_db->quote($ed); - print STDERR " SQL: $tmp \n " if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => " SQL: $tmp"); } if ( $params->{accountcode} && $params->{logintype} == 2 ) { $tmp .= @@ -1356,7 +1356,7 @@ "SELECT * FROM trunks WHERE name = " . $astpp_db->quote( $params->{trunk} ) . " LIMIT 1"; - print STDERR $tmpsql if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmpsql); $sql = $astpp_db->prepare($tmpsql); $sql->execute || return gettext("Something is wrong with the trunks database") @@ -1367,7 +1367,7 @@ " and (dstchannel like '$row->{tech}/$row->{path}\%'" . " or dstchannel like '$row->{tech}\[$row->{path}\]\%')"; } - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp); $sql = $cdr_db->prepare($tmp); $sql->execute; $results = $sql->rows; @@ -1492,7 +1492,7 @@ $accounts .= ","; } } - print STDERR $accounts if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $accounts); $template->param( customer_count => &count_accounts( $astpp_db, "WHERE type = 0 AND reseller = '$params->{username}'" @@ -1759,7 +1759,7 @@ . $astpp_db->quote($number) . ", " . $astpp_db->quote( $params->{prefix} ) . ", " . $astpp_db->quote( $params->{ipcontext} ) . ")"; - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp); if ( $astpp_db->do($tmp) ) { $status .= gettext("IP") . " '" @@ -2110,7 +2110,7 @@ "You have added $params->{count} calling cards in the amount of $params->{value} cents. \n\n"; } my $brandinfo = &get_cc_brand( $astpp_db, $params->{brand} ); - print STDERR "BRAND: $params->{brand}\n" if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "BRAND: $params->{brand}"); while ( $count < $params->{count} ) { my ( $number, $pin ) = &add_callingcard( $astpp_db, $config, $brandinfo, @@ -2384,7 +2384,7 @@ "DELETE FROM callingcardbrands WHERE name = " . $astpp_db->quote( $params->{name} ); } - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp); if ( $astpp_db->do($tmp) ) { $status .= gettext("Brand Deleted!"); } @@ -2431,7 +2431,7 @@ . $astpp_db->quote( $params->{min_length_minutes} ) . ", " . $astpp_db->quote( $params->{min_length_pennies} ) . ")"; } - print STDERR "sql" if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "sql"); if ( $astpp_db->do($sql) ) { $status .= gettext("Brand Added!"); } @@ -2571,7 +2571,7 @@ . " WHERE name =" . $astpp_db->quote( $params->{name} ); } - print STDERR "$sql" if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $sql); if ( $astpp_db->do($sql) ) { $status .= gettext("Brand Updated!"); } @@ -2726,7 +2726,7 @@ $tmp = "SELECT name FROM callingcardbrands WHERE status < 2 AND reseller IN (NULL,'')"; } - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp); $sql = $astpp_db->prepare($tmp); $sql->execute || return gettext( @@ -2748,7 +2748,7 @@ $tmp = "SELECT * FROM callingcardbrands WHERE status < 2 AND reseller IN (NULL,'') ORDER BY name limit $params->{limit} , $results_per_page"; } - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); $sql = $astpp_db->prepare($tmp); $sql->execute || return gettext( @@ -3038,7 +3038,7 @@ . $astpp_db->quote( $cardinfo->{cardnumber} ) . " AND brand " . $brandsql; - print STDERR $sql if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $sql); $astpp_db->do($sql) || print "$sql " . gettext("FAILED"); } @@ -3048,8 +3048,7 @@ if ( $params->{action} eq gettext("Refill") ) { $cardinfo = &get_callingcard( $astpp_db, $params->{cardnumber}, $config ); - print STDERR "CARDNUMBER: " . $cardinfo->{cardnumber} - if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "CARDNUMBER: " . $cardinfo->{cardnumber}); &update_balance( $cardinfo, $params->{pennies} * 100 ); $status .= "$params->{cardnumber} " . gettext("Refilled") . "<br>\n"; } @@ -3240,7 +3239,7 @@ "SELECT * FROM callingcards WHERE status < 2 AND brand $brandsql ORDER BY id LIMIT " . ( $pgr->get_first() - 1 ) . ", " . $pgr->get_entries_on_this_page(); - print STDERR $sql if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $sql); $sql = $astpp_db->prepare($sql); $sql->execute; @@ -3872,9 +3871,8 @@ sub default_callback { my (%stuff) = @_; foreach ( keys %stuff ) { - print STDERR "$_: " . $stuff{$_} . "\n"; + $ASTPP->debug( user=> $param->{username}, debug => "$_: " . $stuff{$_}); } - print STDERR "\n"; } sub build_statistics() { @@ -4584,7 +4582,7 @@ . $astpp_db->quote( $params->{desc} ) . ", " . $astpp_db->quote( $params->{charge} ) . ", " . $astpp_db->quote( $params->{sweep} ) . ", 1)"; - print STDERR "sql" if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $sql); if ( $astpp_db->do($sql) ) { $status .= gettext("Periodic Charge Added!"); } @@ -4715,7 +4713,7 @@ . $astpp_db->quote( $params->{sweep} ) . ", status = '1' WHERE id = " . $astpp_db->quote( $params->{chargeid} ); - print STDERR "sql" if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $sql); if ( $astpp_db->do($sql) ) { $status .= gettext("Periodic Charge Updated!"); } @@ -4729,7 +4727,7 @@ my $sql = "DELETE FROM charges WHERE id = " . $astpp_db->quote( $params->{chargeid} ); - print STDERR "sql" if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $sql); if ( $astpp_db->do($sql) ) { $status .= gettext("Periodic Charge Deleted!"); } @@ -4740,7 +4738,7 @@ $sql = "DELETE FROM charge_to_account WHERE charge_id = " . $astpp_db->quote( $params->{chargeid} ); - print STDERR $sql if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $sql); if ( $astpp_db->do($sql) ) { $status .= gettext("Periodic Charge Deleted!"); } @@ -4914,7 +4912,7 @@ $uploaded = upload('rateimport'); my ( @data, $record ); while ( my $record = <$uploaded> ) { - print STDERR $record if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $record ); chomp; push @data, $record; } @@ -4955,7 +4953,7 @@ . $astpp_db->quote( $columns[9] ) . "," . $astpp_db->quote( $columns[1] ) . ", 1," . $astpp_db->quote( $columns[10] ) . ")"; - print STDERR $tmp; # if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); if ( $astpp_db->do($tmp) ) { $status .= gettext("Pattern: ") . " '" . $pattern . "' " @@ -5044,7 +5042,7 @@ $uploaded = upload('rateimport'); my ( @data, $record ); while ( my $record = <$uploaded> ) { - print STDERR $record if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $record ); chomp; push @data, $record; } @@ -5076,7 +5074,7 @@ . " AND pricelist = " . $astpp_db->quote( $resellerdata->{pricelist} ) . " LIMIT 1"; - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp); $sql = $astpp_db->prepare($tmp); $sql->execute; while ( $row = $sql->fetchrow_hashref ) { @@ -5266,7 +5264,7 @@ . $astpp_db->quote( $columns[13] ) . "," . $astpp_db->quote( $columns[14] ) . "," . $astpp_db->quote( $columns[15] ) . ")"; - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp); if ( $astpp_db->do($tmp) ) { $status .= gettext("DID: ") . " '" @@ -5296,7 +5294,7 @@ gettext("The old pattern for") . " '" . $params->{number} . "' " . gettext("FAILED to remove!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } $tmp = "INSERT INTO routes (pattern,comment,pricelist,connectcost,includedseconds,cost) VALUES (" @@ -5586,7 +5584,7 @@ gettext("Pricelist: ") . $params->{name} . gettext(" Failed to Reactivate!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } } else { @@ -5624,7 +5622,7 @@ gettext("Pricelist: ") . $params->{name} . gettext(" Failed to Add!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } } $params->{action} = gettext("Information..."); @@ -5666,7 +5664,7 @@ gettext("Pricelist: ") . $params->{name} . gettext(" Failed to Update!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } } else { @@ -5705,7 +5703,7 @@ gettext("Pricelist: ") . $params->{name} . gettext(" Failed to Deactivate!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } } $params->{action} = gettext("Information..."); @@ -5773,7 +5771,7 @@ $tmp = "SELECT * FROM pricelists WHERE status < 2 AND reseller IS NULL"; } - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); $sql = $astpp_db->prepare($tmp); $sql->execute || return gettext("Something is wrong with the ASTPP database!") @@ -5795,7 +5793,7 @@ $tmp = "SELECT * FROM pricelists WHERE status < 2 AND reseller IS NULL ORDER BY name limit $params->{limit} , $results_per_page"; } - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); $sql = $astpp_db->prepare($tmp); $sql->execute || return gettext("Something is wrong with the ASTPP database!") @@ -6158,7 +6156,7 @@ gettext("DID") . " '" . $params->{number} . "' " . gettext("FAILED to create!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } $tmp = "DELETE FROM routes WHERE pattern = " @@ -6176,7 +6174,7 @@ gettext("The old pattern for") . " '" . $params->{number} . "' " . gettext("FAILED to remove!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } $tmp = "INSERT INTO routes (pattern,comment,pricelist,connectcost,includedseconds,cost) VALUES (" @@ -6200,7 +6198,7 @@ gettext("Pattern") . " '" . $params->{number} . "' " . gettext("FAILED to create!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } $params->{action} = gettext("Information..."); } @@ -6258,7 +6256,7 @@ gettext("DID") . " '" . $params->{number} . "' " . gettext("FAILED to update!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } $tmp = "UPDATE routes SET" @@ -6288,7 +6286,7 @@ gettext("Pattern") . " '" . $params->{number} . "' " . gettext("FAILED to create!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } $params->{action} = gettext("Information..."); } @@ -6307,7 +6305,7 @@ gettext("DID: ") . $params->{number} . gettext(" Failed to Deactivate!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } $params->{action} = gettext("Information..."); } @@ -6900,7 +6898,7 @@ . $astpp_db->quote($params->{username}) . " AND type = '1' AND note = " . $astpp_db->quote($params->{number}); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); $astpp_db->do($tmp); $tmp = "INSERT INTO reseller_pricing (reseller,type,note,monthlycost,prorate,setup,cost,inc,disconnectionfee,connectcost,includedseconds,status) VALUES (" @@ -6916,7 +6914,7 @@ . $astpp_db->quote( $params->{connectcost} ) . "," . $astpp_db->quote( $params->{included} ) . ", '1')"; - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); if ( $astpp_db->do($tmp) ) { $status .= gettext("DID.") . " '" @@ -6928,7 +6926,7 @@ gettext("DID") . " '" . $params->{number} . "' " . gettext("FAILED to create!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } $astpp_db->do("UPDATE dids SET dial_as = " . $astpp_db->quote($params->{dial_as})); $tmp = @@ -6936,7 +6934,7 @@ . $astpp_db->quote( "^" . $params->{number} . "\$" ) . " AND pricelist = " . $astpp_db->quote( $params->{username} ); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); if ( $astpp_db->do($tmp) ) { $status .= gettext("The old pattern for") . " '" @@ -6948,7 +6946,7 @@ gettext("The old pattern for") . " '" . $params->{number} . "' " . gettext("FAILED to remove!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } $tmp = "INSERT INTO routes (pattern,comment,pricelist,connectcost,includedseconds,cost) VALUES (" @@ -6961,7 +6959,7 @@ . $astpp_db->quote( $params->{connectcost} ) . "," . $astpp_db->quote( $params->{included} ) . "," . $astpp_db->quote( $params->{cost} ) . ")"; - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); if ( $astpp_db->do($tmp) ) { $status .= gettext("Pattern") . " '" @@ -6973,7 +6971,7 @@ gettext("Pattern") . " '" . $params->{number} . "' " . gettext("FAILED to create!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } $params->{action} = gettext("Information..."); } @@ -6983,7 +6981,7 @@ . $astpp_db->quote( $params->{number} ) . " AND type = '1' AND reseller = " . $astpp_db->quote( $params->{username} ); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); if ( $astpp_db->do($tmp) ) { $status .= gettext("DID: ") @@ -6995,7 +6993,7 @@ gettext("DID: ") . $params->{number} . gettext(" Failed to Deactivate!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } $params->{action} = gettext("Information..."); } @@ -7365,7 +7363,7 @@ "SELECT * FROM routes WHERE id = " . $astpp_db->quote( $params->{id} ); } - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); $sql = $astpp_db->prepare($tmp); $sql->execute; $record = $sql->fetchrow_hashref; @@ -7467,7 +7465,7 @@ . " AND pricelist = " . $astpp_db->quote( $resellerdata->{pricelist} ) . " LIMIT 1"; - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); $sql = $astpp_db->prepare($tmp); $sql->execute; while ( $row = $sql->fetchrow_hashref ) { @@ -7503,7 +7501,7 @@ . $astpp_db->quote( $params->{cost} ) . "," . $astpp_db->quote( $params->{inc} ) . "," . $astpp_db->quote($reseller) . ")"; - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); if ( $astpp_db->do($tmp) ) { $status .= gettext("Pattern") . " '" @@ -7515,7 +7513,7 @@ gettext("Pattern") . " '" . $params->{pattern} . "' " . gettext("FAILED to create!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp); } $params->{action} = gettext("Information..."); } @@ -7533,15 +7531,14 @@ . " AND pricelist = " . $astpp_db->quote( $resellerdata->{pricelist} ) . " LIMIT 1"; - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp); $sql = $astpp_db->prepare($tmp); $sql->execute; while ( $row = $sql->fetchrow_hashref ) { $routeinfo = $row; } $sql->finish; - print STDERR "Reseller Cost = $routeinfo->{cost}" - if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "Reseller Cost = $routeinfo->{cost}" ); if ( $routeinfo->{cost} > $params->{cost} ) { $status .= "<br><b>" . gettext("Pattern: ") @@ -7586,7 +7583,7 @@ gettext("Pattern") . " '" . $params->{id} . "' " . gettext("FAILED to saved!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } $params->{action} = gettext("Information..."); } @@ -7614,7 +7611,7 @@ gettext("Route: ") . $params->{id} . gettext(" Failed to Deactivate!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } $params->{action} = gettext("Information..."); } @@ -7737,7 +7734,7 @@ $tmp = "SELECT * FROM routes WHERE status < 2 AND reseller IN (NULL,'')"; } - print STDERR $tmp if ( $config->{debug} == 1 ); + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); $sql = $astpp_db->prepare($tmp); $sql->execute || return gettext("Something is wrong with the ASTPP database!") @@ -7865,7 +7862,7 @@ my $results = $astpp_db->prepare($sql); $results->execute; while ( my $counterinfo = $results->fetchrow_hashref ) { - print STDERR "COUNTER: " . $counterinfo->{id} if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "COUNTER: " . $counterinfo->{id} ); my (%row); $row{id} = $counterinfo->{id}; $row{package} = $counterinfo->{name}; @@ -7927,7 +7924,7 @@ gettext("Package: ") . $params->{name} . gettext(" Failed to Add!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } $params->{action} = gettext("Information..."); } @@ -7940,7 +7937,7 @@ . $astpp_db->quote( $params->{edit_includedseconds} ) . " WHERE id = " . $astpp_db->quote( $params->{id} ); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); if ( $astpp_db->do($tmp) ) { $status .= gettext("Package: ") @@ -7970,7 +7967,7 @@ gettext("Package: ") . $params->{id} . gettext(" Failed to Deactivate!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } $params->{action} = gettext("Information..."); } @@ -7999,7 +7996,7 @@ my $results = $astpp_db->prepare($sql); $results->execute; while ( my $packageinfo = $results->fetchrow_hashref ) { - print STDERR "PACKAGE: " . $packgeinfo->{id} if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "PACKAGE: " . $packgeinfo->{id} ); my (%row); $row{id} = $packageinfo->{id}; $row{name} = $packageinfo->{name}; @@ -8096,22 +8093,18 @@ -default => $record->{precedence} ) . "</td><td>"; my @resellers = &list_resellers($astpp_db); - print STDERR "RESELLER LIST: $record->{resellers}" - if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "RESELLER LIST: $record->{resellers}"); foreach my $reseller (@resellers) { my $reseller_enabled; -# my $regex_pattern = "m\/'" . $reseller . "'\/"; # This cryptic bit of code searches for $reseller surrounded by quotation marks. -# print STDERR "REGEX PATTERN: $regex_pattern" if $config->{debug} == 1; if ( $record->{resellers} =~ m/'$reseller'/ ) { $reseller_enabled = 1; } else { $reseller_enabled = 0; } - print STDERR "RESELLER_ENABLED: $reseller_enabled" - if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "RESELLER_ENABLED: $reseller_enabled"); $body .= checkbox( -name => "reseller-$reseller", -checked => $reseller_enabled, @@ -8144,7 +8137,7 @@ . $astpp_db->quote( $params->{precedence} ) . ", " . $astpp_db->quote($resellerlist) . ", " . $astpp_db->quote( $params->{provider} ) . ")"; - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); if ( $astpp_db->do($tmp) ) { $status .= gettext("Trunk: ") @@ -8186,7 +8179,7 @@ . $astpp_db->quote( $params->{maxchannels} ) . " WHERE name = " . $astpp_db->quote( $params->{name} ); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); if ( $astpp_db->do($tmp) ) { $status .= gettext("Trunk: ") @@ -8198,7 +8191,7 @@ gettext("Trunk: ") . $params->{name} . gettext(" Failed to Update!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } $params->{action} = gettext("Information..."); } @@ -8217,7 +8210,7 @@ gettext("Trunk: ") . $params->{name} . gettext(" Failed to Deactivate!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } $tmp = "DELETE FROM routes WHERE trunk = " @@ -8227,7 +8220,7 @@ } else { $status .= gettext("Related Routes Failed to Remove!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } $params->{action} = gettext("Information..."); } @@ -8292,21 +8285,16 @@ -size => 2 ) . "</td><td>"; my @resellers = &list_resellers($astpp_db); - print STDERR "RESELLER LIST: $record->{resellers}" - if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "RESELLER LIST: $record->{resellers}"); foreach my $reseller (@resellers) { my $reseller_enabled; - -# my $regex_pattern = "m\/'" . $reseller . "'\/"; # This cryptic bit of code searches for $reseller surrounded by quotation marks. -# print STDERR "REGEX PATTERN: $regex_pattern" if $config->{debug} == 1; if ( $record->{resellers} =~ m/'$reseller'/ ) { $reseller_enabled = 1; } else { $reseller_enabled = 0; } - print STDERR "RESELLER_ENABLED: $reseller_enabled" - if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "RESELLER_ENABLED: $reseller_enabled"); $body .= checkbox( -name => "reseller-$reseller", -checked => $reseller_enabled, @@ -8697,22 +8685,17 @@ -default => $record->{precedence} ) . "</td><td>"; my @resellers = &list_resellers($astpp_db); - print STDERR "RESELLER LIST: $record->{resellers}" - if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "RESELLER LIST: $record->{resellers}"); foreach my $reseller (@resellers) { my $reseller_enabled; - -# my $regex_pattern = "m\/'" . $reseller . "'\/"; # This cryptic bit of code searches for $reseller surrounded by quotation marks. -# print STDERR "REGEX PATTERN: $regex_pattern" if $config->{debug} == 1; if ( $record->{resellers} =~ m/'$reseller'/ ) { $reseller_enabled = 1; } else { $reseller_enabled = 0; } - print STDERR "RESELLER_ENABLED: $reseller_enabled" - if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "RESELLER_ENABLED: $reseller_enabled"); $body .= checkbox( -name => "reseller-$reseller", -checked => $reseller_enabled, @@ -8772,7 +8755,7 @@ gettext("Outbound Route: ") . " '" . $params->{pattern} . "' " . gettext("FAILED to create!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp); } $params->{action} = gettext("Information..."); } @@ -8820,7 +8803,7 @@ gettext("Outbound Route:") . " '" . $params->{id} . "' " . gettext("FAILED to saved!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } $params->{action} = gettext("Information..."); } @@ -8828,7 +8811,7 @@ my $tmp = "UPDATE outbound_routes SET status = 2 WHERE id = " . $astpp_db->quote( $params->{id} ); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); if ( $astpp_db->do($tmp) ) { $status .= gettext("Outbound Route: ") @@ -8840,7 +8823,7 @@ gettext("Outbound Route: ") . $params->{id} . gettext(" Failed to Deactivate!"); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); } $params->{action} = gettext("Information..."); } @@ -8923,21 +8906,16 @@ -size => 2 ) . "</td><td>"; my @resellers = &list_resellers($astpp_db); - print STDERR "RESELLER LIST: $record->{resellers}" - if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "RESELLER LIST: $record->{resellers}"); foreach my $reseller (@resellers) { my $reseller_enabled; - -# my $regex_pattern = "m\/'" . $reseller . "'\/"; # This cryptic bit of code searches for $reseller surrounded by quotation marks. -# print STDERR "REGEX PATTERN: $regex_pattern" if $config->{debug} == 1; if ( $record->{resellers} =~ m/'$reseller'/ ) { $reseller_enabled = 1; } else { $reseller_enabled = 0; } - print STDERR "RESELLER_ENABLED: $reseller_enabled" - if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "RESELLER_ENABLED: $reseller_enabled"); $body .= checkbox( -name => "reseller-$reseller", -checked => $reseller_enabled, @@ -9144,10 +9122,9 @@ else { $increment = $branddata->{inc}; } - print STDERR "$numdata->{connectcost}, $numdata->{cost}, " + $ASTPP->debug( user=> $param->{username}, debug => "$numdata->{connectcost}, $numdata->{cost}, " . $params->{length} * 60 - . ", $increment, $numdata->{includedseconds}" - if $config->{debug} == 1; + . ", $increment, $numdata->{includedseconds}"); my $cost = &calc_call_cost( $numdata->{connectcost}, $numdata->{cost}, $params->{length} * 60, $increment, @@ -9216,7 +9193,7 @@ "SELECT * FROM system WHERE reseller = " . $astpp_db->quote( $params->{username} ) . " ORDER BY name"; } - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp); my $sql = $astpp_db->prepare($tmp); $sql->execute; while ( my $record = $sql->fetchrow_hashref ) { @@ -9357,9 +9334,7 @@ . $rt_db->quote( $params->{rt_sip_cancallforward} ) . " WHERE id = " . $rt_db->quote( $params->{devicenumber} ); - if ( $config->{debug} == 1 ) { - print STDERR " $tmp \n" if $config->{debug} == 1; - } + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); if ( $rt_db->do($tmp) ) { $status .= gettext("Updated Device:") . " $params->{name}<br>"; } @@ -9733,7 +9708,7 @@ . int( rand() * 9000 + 1000 ); $sipid = substr( $sipid, 0, 5 ); $sipid = $name . $sipid; - print STDERR "SIPID: $sipid\n" if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "SIPID: $sipid" ); $sql = $rt_db->prepare( "SELECT COUNT(*) FROM $config->{rt_sip_table} WHERE name = " @@ -9821,9 +9796,7 @@ . $rt_db->quote( $params->{rt_codec_allow} ) . " WHERE name = " . $rt_db->quote( $params->{devicenumber} ); - if ( $config->{debug} == 1 ) { - print STDERR " $tmp \n" if $config->{debug} == 1; - } + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); if ( $rt_db->do($tmp) ) { $status .= gettext("Updated Device:") . " $params->{devicenumber}<br>"; @@ -10161,7 +10134,7 @@ . int( rand() * 9000 + 1000 ); $iaxid = substr( $iaxid, 0, 5 ); $iaxid = $name . $iaxid; - print STDERR "IAXID: $iaxid\n" if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "IAXID: $iaxid"); $sql = $rt_db->prepare( "SELECT COUNT(*) FROM $config->{rt_iax_table} WHERE name = " @@ -10234,9 +10207,7 @@ . $rt_db->quote( $params->{appdata} ) . " WHERE id = " . $rt_db->quote( $params->{id} ); - if ( $config->{debug} == 1 ) { - print STDERR " $tmp \n" if $config->{debug} == 1; - } + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); if ( $rt_db->do($tmp) ) { $status .= gettext("Updated Dialplan Entry:") . " $params->{id}<br>"; @@ -10507,7 +10478,7 @@ . $astpp_db->quote( $params->{osc_dbuser} ) . ", " . $astpp_db->quote( $params->{osc_dbhost} ) . ", " . $astpp_db->quote( $params->{osc_site} ) . ", 1)"; - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); if ( $astpp_db->do($tmp) ) { $status .= gettext("CallShop Added Successfully!"); } @@ -10555,7 +10526,7 @@ $tmp = "DELETE FROM callshops WHERE name = " . $astpp_db->quote( $params->{callshop} ); - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); if ( $astpp_db->do($tmp) ) { $status .= gettext("CallShop") @@ -10625,7 +10596,7 @@ . $astpp_db->quote( $params->{number} ) . " LIMIT 1" ); if ( $params->{SIP} ) { - print STDERR gettext("Adding SIP Device!") if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => gettext("Adding SIP Device!")); $config->{rt_sip_type} = "friend"; #$params->{devicetype}; $config->{ipaddr} = $params->{ipaddr}; if ( $config->{users_dids_rt} == 1 ) { @@ -10663,8 +10634,7 @@ } } if ( $params->{IAX2} ) { - print STDERR gettext("Adding IAX2 Device!") - if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => gettext("Adding IAX2 Device!")); $config->{rt_iax_type} = "friend"; #$params->{devicetype}; $config->{ipaddr} = $params->{ipaddr}; if ( $config->{users_dids_amp} == 1 ) { @@ -10715,7 +10685,7 @@ . $osc_db->quote( $params->{number} ) . ",''," . $osc_db->quote( $config->{emailadd} ) . ",''," . $osc_db->quote( $params->{accountpassword} ) . ",'')"; - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); $sql = $osc_db->prepare($tmp); $sql->execute; my $customerid = $sql->{'mysql_insertid'}; @@ -10723,7 +10693,7 @@ $tmp = "INSERT INTO customers_info (customers_info_id) VALUES (" . $osc_db->quote($customerid) . ")"; - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); $sql = $osc_db->prepare($tmp); $sql->execute; $sql->finish; @@ -10735,7 +10705,7 @@ . $osc_db->quote( $params->{number} ) . ",''," . "'Address','Postal Code','City','State'," . $osc_db->quote( $record->{countries_id} ) . ",'0')"; - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); $sql = $osc_db->prepare($tmp); $sql->execute; my $addressid = $sql->{'mysql_insertid'}; @@ -10786,7 +10756,7 @@ . $astpp_db->quote( $params->{booth_name} ) . " AND reseller = " . $astpp_db->quote( $params->{username} ); - print STDERR $sql if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $sql); if ( $astpp_db->do($sql) ) { $status .= gettext("Booth:") . " " @@ -10803,9 +10773,7 @@ #If this account doesn't exist we don't go through the rest if ( $accountinfo->{number} ) { if ( $config->{users_dids_rt} == 1 ) { - print STDERR - "NUMBER: $accountinfo->{number} CC: $accountinfo->{cc}" - if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "NUMBER: $accountinfo->{number} CC: $accountinfo->{cc}"); my @iax_devicelist = &list_iax_account_rt( $rt_db, $config, $accountinfo->{number}, @@ -10826,9 +10794,7 @@ } } if ( $config->{users_dids_amp} == 1 ) { - print STDERR - "NUMBER: $accountinfo->{number} CC: $accountinfo->{cc}" - if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "NUMBER: $accountinfo->{number} CC: $accountinfo->{cc}" ); my @iax_devicelist = &list_iax_account_amp( $freepbx_db, $config, $accountinfo->{number}, @@ -10874,11 +10840,15 @@ if ( $params->{action} eq gettext("Deactivate Booth") ) { $astpp_db->do( "UPDATE accounts SET status = 0 WHERE number = " . $astpp_db->quote( $params->{booth_name} ) ); + &hangup_call($astpp_db,$config,$params->{channel}); } elsif ( $params->{action} eq gettext("Restore Booth") ) { $astpp_db->do( "UPDATE accounts SET status = 1 WHERE number = " . $astpp_db->quote( $params->{booth_name} ) ); } + elsif ( $params->{action} eq gettext("Hangup Call") ) { + &hangup_call($astpp_db,$config,$params->{channel}); + } foreach my $name (@booth_list) { my ( %row, $balance, $tmp, $sql ); my $boothinfo = &get_account_including_closed( $astpp_db, $name ); @@ -10902,7 +10872,7 @@ . " WHERE accountcode = " . $rt_db->quote( $boothinfo->{cc} ) . " LIMIT 1"; - print STDERR $tmp; # if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); my $sql = $rt_db->prepare($tmp); $sql->execute; $sip_login = $sql->fetchrow_hashref; @@ -10913,7 +10883,7 @@ . " WHERE accountcode = " . $rt_db->quote( $boothinfo->{cc} ) . " LIMIT 1"; - print STDERR $tmp; # if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); $sql = $rt_db->prepare($tmp); $sql->execute; $iax2_login = $sql->fetchrow_hashref; @@ -10940,7 +10910,7 @@ . " ORDER BY id DESC LIMIT 1"; } if ( $tmp ne "" ) { - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); $sql = $astpp_db->prepare($tmp); $sql->execute; $booth_status = $sql->fetchrow_hashref; @@ -10949,10 +10919,11 @@ if ( $row{callstart} ne "" && $booth_status->{status} eq "Dial" || $booth_status->{status} eq "Answer" ) { + $row{channel} = $booth_status->{Channel}; $row{number} = $booth_status->{number}; my $tmp = "SELECT TIMEDIFF(NOW(),'$row{callstart}') AS length"; - print STDERR $tmp; + $ASTPP->debug( user=> $param->{username}, debug => $tmp); $sql = $astpp_db->prepare($tmp); $sql->execute; my $record = $sql->fetchrow_hashref; @@ -11006,11 +10977,9 @@ } push( @booths, \%row ); $sql->finish; - if ( $config->{debug} == 1 ) { - print STDERR $tmp; - print STDERR $record->{"COUNT(*)"}; - print STDERR $balance / 10000; - } + $ASTPP->debug( user=> $param->{username}, debug => $tmp); + $ASTPP->debug( user=> $param->{username}, debug => $record->{"COUNT(*)"}); + $ASTPP->debug( user=> $param->{username}, debug => $balance / 10000); } my $template = @@ -11052,9 +11021,9 @@ if ( $config->{externalbill} eq "oscommerce" ) { if ( $accountinfo->{posttoexternal} == 1 ) { - print STDERR gettext("Connecting to OSCommerce."); + $ASTPP->debug( user=> $param->{username}, debug => gettext("Connecting to OSCommerce.")); my $osc_db = &osc_connect_db( $config ); - print STDERR gettext("Generating Invoice"); + $ASTPP->debug( user=> $param->{username}, debug => gettext("Generating Invoice")); $invoiceno = &osc_charges( $astpp_db, $osc_db, $config, $params->{booth_name} ); @@ -11097,7 +11066,7 @@ . " WHERE accountcode = " . $rt_db->quote( $accountinfo->{cc} ) . " LIMIT 1"; - print STDERR $tmp; # if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); my $sql = $rt_db->prepare($tmp); $sql->execute; $sip_login = $sql->fetchrow_hashref; @@ -11108,7 +11077,7 @@ . " WHERE accountcode = " . $rt_db->quote( $accountinfo->{cc} ) . " LIMIT 1"; - print STDERR $tmp; # if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp ); $sql = $rt_db->prepare($tmp); $sql->execute; $iax2_login = $sql->fetchrow_hashref; @@ -11124,7 +11093,7 @@ . $astpp_db->quote( $params->{booth_name} ) . "and status = 0" . " ORDER BY callstart DESC"; - print STDERR $tmp if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $tmp); $sql = $astpp_db->prepare($tmp); $sql->execute; @@ -11158,7 +11127,7 @@ else { $record->{credit} = "-"; } - print STDERR $record->{id} if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => $record->{id}); $record->{profit} = ( $record->{debit} - $record->{cost} ); push( @cdrs, $record ); } @@ -11170,7 +11139,7 @@ my $balance = &accountbalance( $astpp_db, $params->{booth_name} ) / 10000; my $unrated = &count_unrated_cdrs_account( $cdr_db, $accountinfo->{number}, $accountinfo->{cc} ); - print STDERR $balance; + $ASTPP->debug( user=> $param->{username}, debug => $balance); $template->param( unrated_cdrs => $unrated ); $template->param( booths => $booths ); $template->param( balance => $balance ); @@ -11189,7 +11158,7 @@ die_on_bad_params => $config->{template_die_on_bad_params} ); foreach my $param ( param() ) { $params->{$param} = param($param); - print STDERR "$param $params->{$param}\n" if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "$param $params->{$param}" ); } if ( !$params->{mode} ) { $params->{mode} = gettext("Home"); @@ -11208,9 +11177,9 @@ if ( $loginstat == 1 ) { # In here we setup privileges for the different account levels - print STDERR "LOGIN TYPE = $params->{logintype}\n" if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "LOGIN TYPE = $params->{logintype}"); if ( $params->{logintype} == 0 ) { # User Login - Not allowed to do anything - print STDERR "ASTPP USER LOGIN - DISABLED\n" if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "ASTPP USER LOGIN - DISABLED"); @modes = (); } elsif ( $params->{logintype} == 1 ) { # Reseller Login @@ -11222,7 +11191,7 @@ if $config->{users_dids_amp} == 1; $rt_db = &rt_connect_db( $config, @output ) if $config->{users_dids_rt} == 1; - print STDERR "ASTPP RESELLER LOGIN\n" if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "ASTPP RESELLER LOGIN" ); @modes = ( gettext("Accounts"), gettext("Rates"), gettext("DIDs"), gettext("Logout"), @@ -11252,7 +11221,7 @@ $params->{logged_in_reseller} = $params->{username}; } elsif ( $params->{logintype} == 2 ) { - print STDERR "ASTPP ADMINISTRATOR LOGIN\n" if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "ASTPP ADMINISTRATOR LOGIN"); @modes = ( gettext("Accounts"), gettext("Rates"), gettext("DIDs"), gettext("Statistics"), @@ -11286,14 +11255,14 @@ } elsif ( $params->{logintype} == 3 ) { # Vendor Login - Vendors are only allowed to look at stuff that pertains to them. - print STDERR "ASTPP VENDOR LOGIN\n" if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "ASTPP VENDOR LOGIN" ); @modes = ( gettext("Trunk Statistics"), gettext("View CDRs"), gettext("Home"), gettext("Outbound Routes") ); } elsif ( $params->{logintype} == 4 ) { # Customer Service Login - print STDERR "ASTPP CUSTOMER SERVICE LOGIN\n" if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "ASTPP CUSTOMER SERVICE LOGIN" ); @modes = ( gettext("Accounts"), gettext("DIDs"), gettext("Statistics"), gettext("Home") @@ -11320,7 +11289,7 @@ if $config->{users_dids_rt} == 1; $osc_db = &osc_connect_db( $config, $config, @output ) if $config->{externalbill} eq "oscommerce"; - print STDERR "ASTPP CALLSHOP LOGIN\n" if $config->{debug} == 1; + $ASTPP->debug( user=> $param->{username}, debug => "ASTPP CALLSHOP LOGIN" ); @modes = ( gettext("Booths"), gettext("Home"), gettext("Routes"), gettext("Pricelists"), gettext("CallShop Reports") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |