diff -Naurp ASTPP-master/3rdparty_integration/astpp-auto-admin.cgi ASTPP-master.share/3rdparty_integration/astpp-auto-admin.cgi
--- ASTPP-master/3rdparty_integration/astpp-auto-admin.cgi 2013-04-08 07:08:30.000000000 -0400
+++ ASTPP-master.share/3rdparty_integration/astpp-auto-admin.cgi 2013-05-14 10:11:33.183164476 -0400
@@ -107,7 +107,7 @@ use ASTPP;
# use strict;
use vars qw($config $astpp_db $agile_db $params @output
$ASTPP $fs_db $cdr_db $rt_db $freepbx_db $status);
-require "/usr/local/astpp/astpp-common.pl";
+require "/usr/share/astpp/astpp-common.pl";
$ENV{LANGUAGE} = "en"; # de, es, br - whatever
print STDERR "Interface language is set to: $ENV{LANGUAGE}\n";
bindtextdomain( "ASTPP", "/var/locale" );
@@ -546,4 +546,4 @@ else {
print "Function '$params->{function}' is INVALID\n";
print STDERR "Function '$params->{function}' is INVALID\n";
exit(0);
-}
\ Pas de fin de ligne à la fin du fichier
+}
diff -Naurp ASTPP-master/freeswitch/astpp-callingcards.pl ASTPP-master.share/freeswitch/astpp-callingcards.pl
--- ASTPP-master/freeswitch/astpp-callingcards.pl 2013-04-08 07:08:30.000000000 -0400
+++ ASTPP-master.share/freeswitch/astpp-callingcards.pl 2013-05-14 10:16:12.125677215 -0400
@@ -21,7 +21,7 @@ use vars qw(@output $verbosity $config $
$stats{start_time} = [gettimeofday];
$cc = 0;
$verbosity = 0;
-require "/usr/local/astpp/astpp-common.pl";
+require "/usr/share/astpp/astpp-common.pl";
$ASTPP = ASTPP->new;
$ASTPP->set_verbosity($verbosity)
diff -Naurp ASTPP-master/freeswitch/astpp-fs-cdr-xml.pl ASTPP-master.share/freeswitch/astpp-fs-cdr-xml.pl
--- ASTPP-master/freeswitch/astpp-fs-cdr-xml.pl 2013-04-08 07:08:30.000000000 -0400
+++ ASTPP-master.share/freeswitch/astpp-fs-cdr-xml.pl 2013-05-14 10:12:35.904380353 -0400
@@ -26,10 +26,10 @@ use XML::LibXML;
use vars
qw($cdr_db $params $ASTPP @output $config $freeswitch_db $astpp_db $verbosity );
use Locale::gettext_pp qw(:locale_h);
-require "/usr/local/astpp/astpp-common.pl";
+require "/usr/share/astpp/astpp-common.pl";
$ENV{LANGUAGE} = "en"; # de, es, br - whatever
print STDERR "Interface language is set to: " . $ENV{LANGUAGE} . "\n";
-bindtextdomain( "astpp", "/usr/local/share/locale" );
+bindtextdomain( "astpp", "/usr/share/locale" );
textdomain("astpp");
$verbosity = 2;
@output = ("STDERR");
diff -Naurp ASTPP-master/freeswitch/astpp-fs-xml.pl ASTPP-master.share/freeswitch/astpp-fs-xml.pl
--- ASTPP-master/freeswitch/astpp-fs-xml.pl 2013-04-08 07:08:30.000000000 -0400
+++ ASTPP-master.share/freeswitch/astpp-fs-xml.pl 2013-05-14 10:15:38.879092855 -0400
@@ -26,10 +26,10 @@ use strict;
use vars
qw($void_xml $cdr_db $params $ASTPP @output $config $freeswitch_db $astpp_db $verbosity );
use Locale::gettext_pp qw(:locale_h);
-require "/usr/local/astpp/astpp-common.pl";
+require "/usr/share/astpp/astpp-common.pl";
$ENV{LANGUAGE} = "en"; # de, es, br - whatever
# print STDERR "Interface language is set to: " . $ENV{LANGUAGE} . "\n";
-bindtextdomain( "astpp", "/usr/local/share/locale" );
+bindtextdomain( "astpp", "/usr/share/locale" );
textdomain("astpp");
# $verbosity = 1;
@output = ("STDERR");
@@ -672,4 +672,4 @@ sub process_callingcard_cdr() {
}
}
}
-exit(0);
\ Pas de fin de ligne à la fin du fichier
+exit(0);
diff -Naurp ASTPP-master/freeswitch/contrib/wasim/cdrload.pl ASTPP-master.share/freeswitch/contrib/wasim/cdrload.pl
--- ASTPP-master/freeswitch/contrib/wasim/cdrload.pl 2013-04-08 07:08:30.000000000 -0400
+++ ASTPP-master.share/freeswitch/contrib/wasim/cdrload.pl 2013-05-14 10:14:56.328624809 -0400
@@ -12,7 +12,7 @@ use strict;
use DBI();
use ASTPP;
use lib './lib', '../lib';
-require "/usr/local/astpp/astpp-common.pl";
+require "/usr/share/astpp/astpp-common.pl";
use vars qw($config $astpp_db $osc_db $agile_db $cdr_db
@output @cardlist $config $params $ASTPP);
@@ -32,7 +32,7 @@ my @cc = ("killall", "-HUP", "freeswitc
system(@cc) == 0
or die "$0: system @cc failed: $?";
-my @LS = `ls -1t /usr/local/freeswitch/log/cdr-csv/Master.csv.*`;
+my @LS = `ls -1t /var/log/freeswitch/cdr-csv/Master.csv.*`;
foreach my $line (@LS) {
chop($line);
$ASTPP->debug( debug => $line);
@@ -42,7 +42,7 @@ foreach my $line (@LS) {
or die "$0: Couldn't prepare statement $stm: " . $cdr_db->errstr;;
$ul->execute();
$ul->finish;
- system("cat $line >> /usr/local/freeswitch/log/cdr-csv/FULL_Master.csv");
+ system("cat $line >> /var/log/freeswitch/cdr-csv/FULL_Master.csv");
unlink $line;
}
diff -Naurp ASTPP-master/INSTALL ASTPP-master.share/INSTALL
--- ASTPP-master/INSTALL 2013-04-08 07:08:30.000000000 -0400
+++ ASTPP-master.share/INSTALL 2013-05-14 10:18:11.265187766 -0400
@@ -117,78 +117,78 @@
# Run @ Hourly
# Update calling cards and expire them and mark them as being empty.
-@hourly /usr/local/astpp/astpp-update-balance.pl
+@hourly /usr/share/astpp/astpp-update-balance.pl
# Run @ Daily
# Check which dids have been assigned but have not been billed yet.
# Update account balance if any chage is any periodic charge applied
-@daily /usr/local/astpp/astpp-update-balance.pl sweep=0
+@daily /usr/share/astpp/astpp-update-balance.pl sweep=0
# Run @ Weekly
# Update account balance if any chage is any periodic charge applied
-0 0 * * 0 /usr/local/astpp/astpp-update-balance.pl sweep=1
+0 0 * * 0 /usr/share/astpp/astpp-update-balance.pl sweep=1
# Run @ Monthly
# Process for DID Montly billing
# Update account balance if any chage is any periodic charge applied
-0 0 1 * * /usr/local/astpp/astpp-update-balance.pl sweep=2
+0 0 1 * * /usr/share/astpp/astpp-update-balance.pl sweep=2
# Run @ quarterly
# Update account balance if any chage is any periodic charge applied
-0 0 1 1,4,7,10 * /usr/local/astpp/astpp-update-balance.pl sweep=3
+0 0 1 1,4,7,10 * /usr/share/astpp/astpp-update-balance.pl sweep=3
# Run @ semi-quarterly
# Update account balance if any chage is any periodic charge applied
-0 0 * 1,7 * /usr/local/astpp/astpp-update-balance.pl sweep=4
+0 0 * 1,7 * /usr/share/astpp/astpp-update-balance.pl sweep=4
# Run @ annually
# Update account balance if any chage is any periodic charge applied
-0 0 * 1 * /usr/local/astpp/astpp-update-balance.pl sweep=5
+0 0 * 1 * /usr/share/astpp/astpp-update-balance.pl sweep=5
# Run @ Daily
# Generate Invoice Daily
-@daily /usr/local/astpp/astpp-generate-invoices.pl sweep=0
+@daily /usr/share/astpp/astpp-generate-invoices.pl sweep=0
# Run @ Weekly
# Generate Invoice Weekly
-0 0 * * 0 /usr/local/astpp/astpp-generate-invoices.pl sweep=1
+0 0 * * 0 /usr/share/astpp/astpp-generate-invoices.pl sweep=1
# Run @ Monthly
# Generate Invoice Monthly
-0 0 1 * * /usr/local/astpp/astpp-generate-invoices.pl sweep=2
+0 0 1 * * /usr/share/astpp/astpp-generate-invoices.pl sweep=2
# Run @ quarterly
# Generate Invoice quarterly
-0 0 1 1,4,7,10 * /usr/local/astpp/astpp-generate-invoices.pl sweep=3
+0 0 1 1,4,7,10 * /usr/share/astpp/astpp-generate-invoices.pl sweep=3
# Run @ semi-quarterly
# Generate Invoice semi-quarterly
-0 0 * 1,7 * /usr/local/astpp/astpp-generate-invoices.pl sweep=4
+0 0 * 1,7 * /usr/share/astpp/astpp-generate-invoices.pl sweep=4
# Run @ annually
# Generate Invoice annually
-0 0 * 1 * /usr/local/astpp/astpp-generate-invoices.pl sweep=5
+0 0 * 1 * /usr/share/astpp/astpp-generate-invoices.pl sweep=5
# Run @ Hourly
# Update currency rate
-@hourly /usr/local/astpp/astpp-currency-update.pl
+@hourly /usr/share/astpp/astpp-currency-update.pl
# Run @ Daily
# Low balance notification
-@daily /usr/local/astpp/astpp-low-balance.pl minbalance=5
+@daily /usr/share/astpp/astpp-low-balance.pl minbalance=5
# Run @ Daily
# Update calling card charges & status
-@daily /usr/local/astpp/astpp-callingcards-daily.pl
+@daily /usr/share/astpp/astpp-callingcards-daily.pl
# Run @ Daily
# (Optional) To do bulk rating of calls
-@daily /usr/local/astpp/astpp-rate-engine.pl runtype=sweep
+@daily /usr/share/astpp/astpp-rate-engine.pl runtype=sweep
Manually install the script to rotate the cdrs.
cp <ASTPP SOURCE DIR>/freeswitch/contrib/wasim/cdrload.pl /usr/local/astpp
Then add the following line to crontab,
-* * * * * /usr/local/astpp/cdrload.pl
+* * * * * /usr/share/astpp/cdrload.pl
=========== Additional Configuration ============
@@ -215,4 +215,4 @@ Please email us at info@astpp.org for su
ASTPP Forums :
http://astpp.org/index.php/forum/index
-Refer astpp.org for more information.
\ Pas de fin de ligne à la fin du fichier
+Refer astpp.org for more information.
diff -Naurp ASTPP-master/modules/ASTPP/lib/ASTPP.pm ASTPP-master.share/modules/ASTPP/lib/ASTPP.pm
--- ASTPP-master/modules/ASTPP/lib/ASTPP.pm 2013-04-08 07:08:30.000000000 -0400
+++ ASTPP-master.share/modules/ASTPP/lib/ASTPP.pm 2013-05-14 10:20:42.511296930 -0400
@@ -7,7 +7,7 @@ use DBI;
use Data::Paginate;
use Locale::gettext_pp qw(:locale_h);
-bindtextdomain( "astpp", "/usr/local/share/locale" );
+bindtextdomain( "astpp", "/usr/share/locale" );
textdomain("astpp");
require Exporter;
diff -Naurp ASTPP-master/web_interface/astpp/application/config/autoload.php ASTPP-master.share/web_interface/astpp/application/config/autoload.php
--- ASTPP-master/web_interface/astpp/application/config/autoload.php 2013-04-08 07:08:30.000000000 -0400
+++ ASTPP-master.share/web_interface/astpp/application/config/autoload.php 2013-05-14 10:21:33.380660975 -0400
@@ -33,7 +33,7 @@
| -------------------------------------------------------------------
| Prototype:
|
-| $autoload['packages'] = array(APPPATH.'third_party', '/usr/local/shared');
+| $autoload['packages'] = array(APPPATH.'third_party', '/usr/shared');
|
*/
@@ -113,4 +113,4 @@ $autoload['model'] = array('common_model
/* End of file autoload.php */
-/* Location: ./application/config/autoload.php */
\ Pas de fin de ligne à la fin du fichier
+/* Location: ./application/config/autoload.php */
diff -Naurp ASTPP-master/web_interface/astpp-wraper.cgi ASTPP-master.share/web_interface/astpp-wraper.cgi
--- ASTPP-master/web_interface/astpp-wraper.cgi 2013-04-08 07:08:30.000000000 -0400
+++ ASTPP-master.share/web_interface/astpp-wraper.cgi 2013-05-14 10:22:05.088264576 -0400
@@ -54,10 +54,10 @@ use ASTPP;
use JSON;
# use strict;
; # We use DateTime::TimeZone to show users cdrs in their own timezones.
-require "/usr/local/astpp/astpp-common.pl";
+require "/usr/share/astpp/astpp-common.pl";
$ENV{LANGUAGE} = "en"; # de, es, br - whatever
# print STDERR "Interface language is set to: " . $ENV{LANGUAGE} . "\n";
-bindtextdomain( "astpp", "/usr/local/share/locale" );
+bindtextdomain( "astpp", "/usr/share/locale" );
textdomain("astpp");
use vars qw(@output $astpp_db $params $config
$status $config $limit $accountinfo
