From 57c3715cc93fd81328bf9164c533e64d6faecdd7 Mon Sep 17 00:00:00 2001 From: mattf Date: Fri, 13 Feb 2009 00:15:21 +0000 Subject: [PATCH] fixed carrier modification bugs git-svn-id: svn://192.168.202.10@1056 3d104415-ff17-0410-8863-d5cf3c621b8a --- bin/ADMIN_keepalive_ALL.pl | 4 ++++ www/vicidial/admin.php | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/ADMIN_keepalive_ALL.pl b/bin/ADMIN_keepalive_ALL.pl index a8dedcea..37fa5b9f 100644 --- a/bin/ADMIN_keepalive_ALL.pl +++ b/bin/ADMIN_keepalive_ALL.pl @@ -878,8 +878,12 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r if ($DB) {print "reloading asterisk\n";} `echo reload > /root/asterisk_command_reload`; `screen -XS asterisk readbuf /root/asterisk_command_reload`; + + sleep(2); + `screen -XS asterisk paste .`; + sleep(10); } diff --git a/www/vicidial/admin.php b/www/vicidial/admin.php index 0ccd5ace..421e08a4 100644 --- a/www/vicidial/admin.php +++ b/www/vicidial/admin.php @@ -10339,7 +10339,7 @@ if ($ADD==431111111111) { echo ""; - if (strlen($template_name) < 1) + if ( (strlen($template_id) < 1) or (strlen($template_name) < 1) ) {echo "
CONF TEMPLATE NOT MODIFIED - Please go back and look at the data you entered\n";} else { @@ -10379,7 +10379,7 @@ if ($ADD==441111111111) { echo ""; - if ( (strlen($carrier_id) < 1) or (strlen($server_ip) < 7) or (strlen($protocol) < 1) or (strlen($dialplan_entry) < 1) ) + if ( (strlen($carrier_id) < 1) or (strlen($server_ip) < 7) or (strlen($protocol) < 1) ) {echo "
CARRIER NOT MODIFIED - Please go back and look at the data you entered\n";} else {