Develop

.gitignore

@@ -5,3 +5,8 @@
 *devserver*
 *sublime*
 *~
+
+# PhpStorm
+.idea/
+*.iml
+/vendor/

.travis.yml

@@ -0,0 +1,16 @@
+language: php
+
+php:
+  - 5.3
+
+env:
+  - DB=mysql
+
+before_script:
+  - composer self-update --no-interaction
+  - composer install --dev --prefer-source --no-interaction
+
+# omitting "script:" will default to phpunit
+# use the $DB env variable to determine the phpunit.xml to use
+script: vendor/bin/phpunit
+

AGI/a2billing.php

@@ -9,7 +9,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <[email protected]>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -39,7 +39,10 @@
 
 error_reporting(E_ALL ^ (E_NOTICE | E_WARNING));
 
+require_once __DIR__ . '/../vendor/autoload.php';
+
 include(dirname(__FILE__) . "/lib/Class.Table.php");
+include(dirname(__FILE__) . "/lib/Class.Connection.php");
 include(dirname(__FILE__) . "/lib/Class.A2Billing.php");
 include(dirname(__FILE__) . "/lib/Class.RateEngine.php");
 include(dirname(__FILE__) . "/lib/phpagi/phpagi.php");
@@ -49,7 +52,7 @@
 
 $charge_callback = 0;
 $G_startime = time();
-$agi_version = "A2Billing - v2.0.3";
+$agi_version = "A2Billing - v2.2.0";
 
 if ($argc > 1 && ($argv[1] == '--version' || $argv[1] == '-v')) {
     echo "$agi_version\n";
@@ -120,11 +123,7 @@
 $A2B->CC_TESTING = isset($A2B->agiconfig['debugshell']) && $A2B->agiconfig['debugshell'];
 //$A2B->CC_TESTING = true;
 
-define("DB_TYPE", isset($A2B->config["database"]['dbtype']) ? $A2B->config["database"]['dbtype'] : null);
-define("SMTP_SERVER", isset($A2B->config['global']['smtp_server']) ? $A2B->config['global']['smtp_server'] : null);
-define("SMTP_HOST", isset($A2B->config['global']['smtp_host']) ? $A2B->config['global']['smtp_host'] : null);
-define("SMTP_USERNAME", isset($A2B->config['global']['smtp_username']) ? $A2B->config['global']['smtp_username'] : null);
-define("SMTP_PASSWORD", isset($A2B->config['global']['smtp_password']) ? $A2B->config['global']['smtp_password'] : null);
+include(dirname(__FILE__) . "/lib/common.defines.php");
 
 // Print header
 $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "AGI Request:\n" . print_r($agi->request, true));
@@ -198,6 +197,7 @@
             if (($A2B->agiconfig['answer_call'] == 1) && ($stat_channel["result"] != $status_channel) && ($A2B->CC_TESTING != 1)) {
                 if ($A2B->set_inuse == 1) $A2B->callingcard_acct_start_inuse($agi, 0);
                 $A2B->write_log("[STOP - EXIT]", 0);
+                $RateEngine->hangup($agi, $A2B);
                 exit();
             }
 
@@ -227,7 +227,7 @@
                         if ($try > 3) {
                             if ($A2B->set_inuse == 1)
                                 $A2B->callingcard_acct_start_inuse($agi, 0);
-                            $agi->hangup();
+                            $RateEngine->hangup($agi, $A2B);
                             exit();
                         }
                     } while ($return);
@@ -316,7 +316,7 @@
                                 $agi->stream_file('prepaid-final', '#');
                                 if ($A2B->set_inuse == 1)
                                     $A2B->callingcard_acct_start_inuse($agi, 0);
-                                $agi->hangup();
+                                $RateEngine->hangup($agi, $A2B);
                                 exit();
                             }
                             $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[TRY : $try]");
@@ -371,7 +371,7 @@
                                 $agi->stream_file('prepaid-final', '#');
                                 if ($A2B->set_inuse == 1)
                                     $A2B->callingcard_acct_start_inuse($agi, 0);
-                                $agi->hangup();
+                                $RateEngine->hangup($agi, $A2B);
                                 exit();
                             }
                         }
@@ -415,14 +415,14 @@
                 }
             }
 
-            $A2B->dnid = $agi->request['agi_dnid'];
-            $A2B->extension = $agi->request['agi_extension'];
+            $A2B->dnid = $A2B->orig_dnid;
+            $A2B->extension = $A2B->orig_ext;
 
             if ($A2B->agiconfig['ivr_voucher'] == 1) {
                 $res_dtmf = $agi->get_data('prepaid-refill_card_with_voucher', 5000, 1);
                 $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "RES REFILL CARD VOUCHER DTMF : " . $res_dtmf["result"]);
                 $A2B->ivr_voucher = $res_dtmf["result"];
-                if ((isset($A2B->ivr_voucher)) && ($A2B->ivr_voucher == $A2B->agiconfig['ivr_voucher_prefixe'])) {
+                if ((isset($A2B->ivr_voucher)) && ($A2B->ivr_voucher == $A2B->agiconfig['ivr_voucher_prefix'])) {
                     $vou_res = $A2B->refill_card_with_voucher($agi, $i);
                 }
             }
@@ -579,16 +579,18 @@
 
                     $A2B->debug(INFO, $agi, __FILE__, __LINE__, "[ CALL OF THE SYSTEM - [DID=" . $A2B->destination . "]");
 
-                    $QUERY = "SELECT cc_did.id, cc_did_destination.id, billingtype, tariff, destination, voip_call, username, useralias, connection_charge, selling_rate, did, ".
-                            " aleg_carrier_connect_charge, aleg_carrier_cost_min, aleg_retail_connect_charge, aleg_retail_cost_min, ".
+                    $QUERY = "SELECT cc_did.id, cc_did_destination.id, billingtype, tariff, destination, voip_call, username, useralias, connection_charge, ".
+                            " selling_rate, did, aleg_carrier_connect_charge, aleg_carrier_cost_min, aleg_retail_connect_charge, aleg_retail_cost_min, ".
                             " aleg_carrier_initblock, aleg_carrier_increment, aleg_retail_initblock, aleg_retail_increment, ".
                             " aleg_timeinterval, ".
                             " aleg_carrier_connect_charge_offp, aleg_carrier_cost_min_offp, aleg_retail_connect_charge_offp, aleg_retail_cost_min_offp, ".
                             " aleg_carrier_initblock_offp, aleg_carrier_increment_offp, aleg_retail_initblock_offp, aleg_retail_increment_offp, ".
                             " cc_card.id ".
                             " FROM cc_did, cc_did_destination, cc_card ".
-                            " WHERE id_cc_did=cc_did.id AND cc_card.status=1 AND cc_card.id=id_cc_card and cc_did_destination.activated=1 AND cc_did.activated=1 AND did='" . $A2B->destination . "' ".
-                            " AND cc_did.startingdate <= CURRENT_TIMESTAMP AND (cc_did.expirationdate > CURRENT_TIMESTAMP OR cc_did.expirationdate IS NULL ".
+                            " WHERE id_cc_did=cc_did.id AND cc_card.status=1 AND cc_card.id=id_cc_card and cc_did_destination.activated=1 ".
+                            " AND cc_did.activated=1 AND did='" . $A2B->destination . "' ".
+                            " AND cc_did.startingdate <= CURRENT_TIMESTAMP ".
+                            " AND (cc_did.expirationdate > CURRENT_TIMESTAMP OR cc_did.expirationdate IS NULL ".
                             " AND cc_did_destination.validated = 1 ";
                     if ($A2B->config["database"]['dbtype'] == "mysql") {
                         $QUERY .= " OR cc_did.expirationdate = '0000-00-00 00:00:00'";
@@ -628,22 +630,22 @@
     $RateEngine->Reinit();
     $A2B->Reinit();
 
-    $mydnid = $agi->request['agi_extension'];
-    if ($A2B->CC_TESTING) $mydnid = '11111111';
+    $mydnid = $A2B->orig_ext;
 
     if (strlen($mydnid) > 0) {
         $A2B->debug(INFO, $agi, __FILE__, __LINE__, "[DID CALL - [CallerID=" . $A2B->CallerID . "]:[DID=" . $mydnid . "]");
 
-        $QUERY = "SELECT cc_did.id, cc_did_destination.id, billingtype, tariff, destination, voip_call, username, useralias, connection_charge, selling_rate, did, ".
-                    " aleg_carrier_connect_charge, aleg_carrier_cost_min, aleg_retail_connect_charge, aleg_retail_cost_min, ".
-                    " aleg_carrier_initblock, aleg_carrier_increment, aleg_retail_initblock, aleg_retail_increment, ".
-                    " aleg_timeinterval, ".
-                    " aleg_carrier_connect_charge_offp, aleg_carrier_cost_min_offp, aleg_retail_connect_charge_offp, aleg_retail_cost_min_offp, ".
-                    " aleg_carrier_initblock_offp, aleg_carrier_increment_offp, aleg_retail_initblock_offp, aleg_retail_increment_offp ".
-                    " FROM cc_did, cc_did_destination, cc_card ".
-                    " WHERE id_cc_did=cc_did.id and cc_card.status=1 and cc_card.id=id_cc_card and cc_did_destination.activated=1 and cc_did.activated=1 and did='$mydnid' ".
-                    " AND cc_did.startingdate<= CURRENT_TIMESTAMP AND (cc_did.expirationdate > CURRENT_TIMESTAMP OR cc_did.expirationdate IS NULL ".
-                    " AND cc_did_destination.validated=1";
+        $QUERY = "SELECT cc_did.id, cc_did_destination.id, billingtype, tariff, destination, voip_call, username, useralias, connection_charge, ".
+            " selling_rate, did, aleg_carrier_connect_charge, aleg_carrier_cost_min, aleg_retail_connect_charge, aleg_retail_cost_min, ".
+            " aleg_carrier_initblock, aleg_carrier_increment, aleg_retail_initblock, aleg_retail_increment, ".
+            " aleg_timeinterval, ".
+            " aleg_carrier_connect_charge_offp, aleg_carrier_cost_min_offp, aleg_retail_connect_charge_offp, aleg_retail_cost_min_offp, ".
+            " aleg_carrier_initblock_offp, aleg_carrier_increment_offp, aleg_retail_initblock_offp, aleg_retail_increment_offp ".
+            " FROM cc_did, cc_did_destination, cc_card ".
+            " WHERE id_cc_did=cc_did.id AND cc_card.status=1 AND cc_card.id=id_cc_card AND cc_did_destination.activated=1 ".
+            " AND cc_did.activated=1 AND did='$mydnid' ".
+            " AND cc_did.startingdate<= CURRENT_TIMESTAMP AND (cc_did.expirationdate > CURRENT_TIMESTAMP OR cc_did.expirationdate IS NULL ".
+            " AND cc_did_destination.validated=1";
         if ($A2B->config["database"]['dbtype'] != "postgres") {
             // MYSQL
             $QUERY .= " OR cc_did.expirationdate = '0000-00-00 00:00:00'";
@@ -699,7 +701,7 @@
     // SAY GOODBYE
     if ($A2B->agiconfig['say_goodbye'] == 1) $agi->stream_file('prepaid-final', '#');
 
-    $agi->hangup();
+    $RateEngine->hangup($agi, $A2B);
     if ($A2B->set_inuse == 1) $A2B->callingcard_acct_start_inuse($agi, 0);
     $A2B->write_log("[STOP - EXIT]", 0);
     exit();
@@ -715,7 +717,7 @@
 
     if ($A2B->agiconfig['answer_call'] == 1 && $mode == 'cid-callback') {
         $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, '[HANGUP CLI CALLBACK TRIGGER]');
-        $agi->hangup();
+        $RateEngine->hangup($agi, $A2B);
     } elseif ($mode == 'cid-prompt-callback') {
         $agi->answer();
     } else {
@@ -792,7 +794,7 @@
                                     if ($subtry >= 3) {
                                         if ($A2B->set_inuse == 1)
                                             $A2B->callingcard_acct_start_inuse($agi, 0);
-                                        $agi->hangup();
+                                        $RateEngine->hangup($agi, $A2B);
                                         exit();
                                     }
                                 } while ($res_dtmf["result"] != '1' && $res_dtmf["result"] != '2');
@@ -813,7 +815,7 @@
                         if (strlen($outbound_destination) <= 0) {
                             if ($A2B->set_inuse == 1)
                                 $A2B->callingcard_acct_start_inuse($agi, 0);
-                            $agi->hangup();
+                            $RateEngine->hangup($agi, $A2B);
                             exit();
                         }
 
@@ -841,7 +843,10 @@
                     $addparameter   = $RateEngine->ratecard_obj[0][42 + $usetrunk_failover];
 
                     $destination = $A2B->destination;
-                    if (strncmp($destination, $removeprefix, strlen($removeprefix)) == 0) $destination= substr($destination, strlen($removeprefix));
+
+                    // applying prefix rule(s)
+                    $destination = $A2B->removePrefix($removeprefix, $destination);
+                    $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[UPDATED DESTINATION: $destination]");
 
                     $pos_dialingnumber = strpos($ipaddress, '%dialingnumber%');
 
@@ -935,7 +940,7 @@
     // END
     if ($A2B->agiconfig['answer_call'] == 1) {
         $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, '[HANGUP ALL CALLBACK TRIGGER]');
-        $agi->hangup();
+        $RateEngine->hangup($agi, $A2B);
     } else {
         $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, '[ALL CALLBACK TRIGGER RINGING]');
     }
@@ -985,7 +990,10 @@
                     $addparameter   = $RateEngine->ratecard_obj[0][42 + $usetrunk_failover];
 
                     $destination = $A2B->destination;
-                    if (strncmp($destination, $removeprefix, strlen($removeprefix)) == 0) $destination= substr($destination, strlen($removeprefix));
+
+                    // applying prefix rule(s)
+                    $destination = $A2B->removePrefix($removeprefix, $destination);
+                    $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[UPDATED DESTINATION: $destination]");
 
                     $pos_dialingnumber = strpos($ipaddress, '%dialingnumber%');
 
@@ -1248,7 +1256,7 @@
 
     if ($error_settings) {
         $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[CALLBACK : Error settings accountcode and phonenumber_member]");
-        $agi->hangup();
+        $RateEngine->hangup($agi, $A2B);
         $A2B->write_log("[STOP - EXIT]", 0);
         exit();
     }
@@ -1329,7 +1337,10 @@
                         $addparameter   = $RateEngine->ratecard_obj[0][42 + $usetrunk_failover];
 
                         $destination = $A2B->destination;
-                        if (strncmp($destination, $removeprefix, strlen($removeprefix)) == 0) $destination= substr($destination, strlen($removeprefix));
+
+                        // applying prefix rule(s)
+                        $destination = $A2B->removePrefix($removeprefix, $destination);
+                        $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[UPDATED DESTINATION: $destination]");
 
                         $pos_dialingnumber = strpos($ipaddress, '%dialingnumber%');
 
@@ -1458,7 +1469,7 @@
 
     if ($error_settings) {
         $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[CALLBACK : Error settings accountcode]");
-        $agi->hangup();
+        $RateEngine->hangup($agi, $A2B);
         $A2B->write_log("[STOP - EXIT]", 0);
         exit();
     }
@@ -1585,9 +1596,9 @@
 }// END if ($charge_callback)
 
 if ($mode != 'cid-callback' && $mode != 'all-callback') {
-    $agi->hangup();
+    $RateEngine->hangup($agi, $A2B);
 } elseif ($A2B->agiconfig['answer_call'] == 1) {
-    $agi->hangup();
+    $RateEngine->hangup($agi, $A2B);
 }
 
 // SEND MAIL REMINDER WHEN CREDIT IS TOO LOW

AGI/a2billing_monitoring.php

@@ -39,6 +39,8 @@
 
 error_reporting(E_ALL ^ (E_NOTICE | E_WARNING));
 
+require_once __DIR__ . '/../vendor/autoload.php';
+
 include_once(dirname(__FILE__) . "/lib/Class.Table.php");
 include(dirname(__FILE__) . "/lib/Class.A2Billing.php");
 include(dirname(__FILE__) . "/lib/Class.RateEngine.php");

AUTHORS

@@ -1,11 +1,11 @@
 
-A2Billing (c) AGPL 2003-2012
+A2Billing (c) AGPL 2003-2015
 
 A2Billing is free software written by Areski Belaid <[email protected]>
 
 with contributions from :
 
-	Rachid Belaid <[email protected]>
+	Rachid Belaid <[email protected]>
 	Panos Christeas <[email protected]>
 	Steve Dommett <[email protected]>
 	Alberto Escudero-Pascual <[email protected]>
@@ -23,7 +23,7 @@ The following third party software is included with the distribution:
 
 	* phpagi 2.14 Copyright 2003, 2004, 2005 Matthew Asham and David Eder
 	* smarty 2.6.26 Copyright 2001-2005 New Digital Group, Inc
-	* jgraph 1.27 Copyright 2001, 2002, 2003, 2004 Johan Persson Aditus Consulting
+	* jgraph 3.5.0 Copyright 2001, 2002, 2003, 2004 Johan Persson Aditus Consulting
 	* adodb 4.991 Copyright (c) 2000, 2001, 2002, 2003, 2004 John Lim
 	* famfamfam.com Icons from Mark James
 	* phpconfig (C) 2003 Dave Packham and Rob Birkinshaw