diff --git a/agc_2-X/trunk/UPGRADE b/agc_2-X/trunk/UPGRADE index 35f83f6e..0e8ba78f 100644 --- a/agc_2-X/trunk/UPGRADE +++ b/agc_2-X/trunk/UPGRADE @@ -54,6 +54,11 @@ NOTE: Upgrading from 1.1.12-3 to 2.0.1 is at the bottom time and pause codes time by agent across selected campaigns and/or user groups. Also reformatted Reports screen in Administration +13. Removed the ViciDial recording extensions from the general dialplan since + they are now auto-generated and placed in the extensions-vicidial.conf + file(8309 and 8310). Also, phone dial-out contexts are definable now + allowing you to lock out agent phone in a call center from dialing out. + diff --git a/agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl b/agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl index 5380c229..fd9cd640 100644 --- a/agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl +++ b/agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl @@ -22,6 +22,7 @@ # 90506-1155 - Added Call Menu functionality # 90513-0449 - Added audio store sync functionality # 90519-1018 - Added upload file trigger for prompt recording if defined as voicemail server and voicemail/prompt recording extensions auto-generated +# 90529-0652 - Added phone_context and fixed calledid and voicemail for phones entries # $DB=0; # Debug flag @@ -569,7 +570,7 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r $Lext .= "exten => _$VARremDIALstr*.,1,Goto(default,\${EXTEN:16},1)\n"; ##### Get the server_id for this server's server_ip ##### - $stmtA = "SELECT server_id FROM servers where server_ip='$server_ip';"; + $stmtA = "SELECT server_id,vicidial_recording_limit FROM servers where server_ip='$server_ip';"; # print "$stmtA\n"; $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; @@ -577,7 +578,8 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r if ($sthArows > 0) { @aryA = $sthA->fetchrow_array; - $server_id = "$aryA[0]"; + $server_id = "$aryA[0]"; + $vicidial_recording_limit = (60 * $aryA[1]); $i++; } $sthA->finish(); @@ -662,6 +664,28 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r $Vext .= "exten => 8168,1,Dial(\${TRUNK$voicemail_server_id}/\${EXTEN},99,oT)\n"; } + $Vext .= "\n"; + $Vext .= "; this is used for recording conference calls, the client app sends the filename\n"; + $Vext .= "; value as a callerID recordings go to /var/spool/asterisk/monitor (WAV)\n"; + $Vext .= "; Recording is limited to 1 hour, to make longer, just change the server\n"; + $Vext .= "; setting ViciDial Recording Limit\n"; + $Vext .= "; this is the WAV verison, default\n"; + $Vext .= "exten => 8309,1,Answer\n"; + if ($asterisk_version =~ /^1.2/) + {$Vext .= "exten => 8309,2,Monitor(wav,\${CALLERIDNAME})\n";} + else + {$Vext .= "exten => 8309,2,Monitor(wav,\${CALLERID(name)})\n";} + $Vext .= "exten => 8309,3,Wait,3600\n"; + $Vext .= "exten => 8309,4,Hangup\n"; + $Vext .= "; this is the GSM verison\n"; + $Vext .= "exten => 8310,1,Answer\n"; + if ($asterisk_version =~ /^1.2/) + {$Vext .= "exten => 8310,2,Monitor(gsm,\${CALLERIDNAME})\n";} + else + {$Vext .= "exten => 8310,2,Monitor(gsm,\${CALLERID(name)})\n";} + $Vext .= "exten => 8310,3,Wait,3600\n"; + $Vext .= "exten => 8310,4,Hangup\n"; + ##### Get the IAX carriers for this server_ip ##### $stmtA = "SELECT carrier_id,carrier_name,registration_string,template_id,account_entry,globals_string,dialplan_entry FROM vicidial_server_carriers where server_ip='$server_ip' and active='Y' and protocol='IAX2' order by carrier_id;"; @@ -767,10 +791,12 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r $i++; } + $Pext .= "\n"; + $Pext .= "; Phones direct dial extensions:\n"; ##### Get the IAX phone entries ##### - $stmtA = "SELECT extension,dialplan_number,voicemail_id,pass,template_id,conf_override,email,template_id,conf_override FROM phones where server_ip='$server_ip' and protocol='IAX2' and active='Y' order by extension;"; + $stmtA = "SELECT extension,dialplan_number,voicemail_id,pass,template_id,conf_override,email,template_id,conf_override,outbound_cid,fullname,phone_context FROM phones where server_ip='$server_ip' and protocol='IAX2' and active='Y' order by extension;"; # print "$stmtA\n"; $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; @@ -788,6 +814,9 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r $email[$i] = "$aryA[6]"; $template_id[$i] = "$aryA[7]"; $conf_override[$i] ="$aryA[8]"; + $outbound_cid[$i] = "$aryA[9]"; + $fullname[$i] = "$aryA[10]"; + $phone_context[$i] ="$aryA[11]"; $i++; } $sthA->finish(); @@ -811,6 +840,7 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r $Piax .= "\n\[$extension[$i]\]\n"; $Piax .= "username=$extension[$i]\n"; $Piax .= "secret=$pass[$i]\n"; + $Piax .= "callerid=\"$fullname[$i]\" <$outbound_cid[$i]>\n"; $Piax .= "mailbox=$voicemail[$i]\n"; $Piax .= "$template_contents[$i]\n"; @@ -829,14 +859,16 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r $Piax .= "\n\[$extension[$i]\]\n"; $Piax .= "username=$extension[$i]\n"; $Piax .= "secret=$pass[$i]\n"; + $Piax .= "callerid=\"$fullname[$i]\" <$outbound_cid[$i]>\n"; $Piax .= "mailbox=$voicemail[$i]\n"; - $Piax .= "context=default\n"; + $Piax .= "context=$phone_context[$i]\n"; $Piax .= "type=friend\n"; $Piax .= "auth=md5\n"; $Piax .= "host=dynamic\n"; } $Pext .= "exten => $dialplan[$i],1,Dial(IAX2/$extension[$i])\n"; - $Pext .= "exten => $dialplan[$i],2,Voicemail,u$voicemail[$i]\n"; + $Pext .= "exten => $dialplan[$i],2,Voicemail($voicemail[$i]|u)\n"; + $Pext .= "exten => $dialplan[$i],3,Hangup\n"; $vm .= "$voicemail[$i] => $voicemail[$i],$extension[$i] Mailbox,$email[$i]\n"; @@ -845,7 +877,7 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r ##### Get the SIP phone entries ##### - $stmtA = "SELECT extension,dialplan_number,voicemail_id,pass,template_id,conf_override,email,template_id,conf_override FROM phones where server_ip='$server_ip' and protocol='SIP' and active='Y' order by extension;"; + $stmtA = "SELECT extension,dialplan_number,voicemail_id,pass,template_id,conf_override,email,template_id,conf_override,outbound_cid,fullname,phone_context FROM phones where server_ip='$server_ip' and protocol='SIP' and active='Y' order by extension;"; # print "$stmtA\n"; $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; @@ -863,6 +895,9 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r $email[$i] = "$aryA[6]"; $template_id[$i] = "$aryA[7]"; $conf_override[$i] ="$aryA[8]"; + $outbound_cid[$i] = "$aryA[9]"; + $fullname[$i] = "$aryA[10]"; + $phone_context[$i] ="$aryA[11]"; $i++; } $sthA->finish(); @@ -886,6 +921,7 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r $Psip .= "\n\[$extension[$i]\]\n"; $Psip .= "username=$extension[$i]\n"; $Psip .= "secret=$pass[$i]\n"; + $Psip .= "callerid=\"$fullname[$i]\" <$outbound_cid[$i]>\n"; $Psip .= "mailbox=$voicemail[$i]\n"; $Psip .= "$template_contents[$i]\n"; @@ -904,13 +940,15 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r $Psip .= "\n\[$extension[$i]\]\n"; $Psip .= "username=$extension[$i]\n"; $Psip .= "secret=$pass[$i]\n"; + $Psip .= "callerid=\"$fullname[$i]\" <$outbound_cid[$i]>\n"; $Psip .= "mailbox=$voicemail[$i]\n"; - $Psip .= "context=default\n"; + $Psip .= "context=$phone_context[$i]\n"; $Psip .= "type=friend\n"; $Psip .= "host=dynamic\n"; } $Pext .= "exten => $dialplan[$i],1,Dial(SIP/$extension[$i])\n"; - $Pext .= "exten => $dialplan[$i],2,Voicemail,u$voicemail[$i]\n"; + $Pext .= "exten => $dialplan[$i],2,Voicemail($voicemail[$i]|u)\n"; + $Pext .= "exten => $dialplan[$i],3,Hangup\n"; $vm .= "$voicemail[$i] => $voicemail[$i],$extension[$i] Mailbox,$email[$i]\n"; diff --git a/agc_2-X/trunk/docs/conf_examples/extensions.conf.sample b/agc_2-X/trunk/docs/conf_examples/extensions.conf.sample index 8641e3ca..34da5ea7 100644 --- a/agc_2-X/trunk/docs/conf_examples/extensions.conf.sample +++ b/agc_2-X/trunk/docs/conf_examples/extensions.conf.sample @@ -341,22 +341,6 @@ exten => 8307,1,Answer exten => 8307,2,Playback(vm-goodbye) exten => 8307,3,Hangup -; this is used for recording conference calls, the client app sends the filename -; value as a callerID recordings go to /var/spool/asterisk/monitor (WAV) -; Recording is limited to 1 hour, to make longer, just change the Wait,3600 -exten => 8309,1,Answer -exten => 8309,2,Monitor(wav,${CALLERIDNAME}) -exten => 8309,3,Wait,3600 -exten => 8309,4,Hangup - -; this is used for recording conference calls, the client app sends the filename -; value as a callerID recordings go to /var/spool/asterisk/monitor (GSM) -; Recording is limited to 1 hour, to make longer, just change the Wait,3600 -exten => 8310,1,Answer -exten => 8310,2,Monitor(gsm,${CALLERIDNAME}) -exten => 8310,3,Wait,3600 -exten => 8310,4,Hangup - ; this is used for playing a message to an answering machine forwarded from AMD in VICIDIAL ; replace conf with the message file you want to leave exten => 8320,1,WaitForSilence(2000,2) ; AMD got machine. leave message after recording diff --git a/agc_2-X/trunk/docs/conf_examples/extensions.conf.sample-1.4 b/agc_2-X/trunk/docs/conf_examples/extensions.conf.sample-1.4 index 86c54911..bb4e8b12 100644 --- a/agc_2-X/trunk/docs/conf_examples/extensions.conf.sample-1.4 +++ b/agc_2-X/trunk/docs/conf_examples/extensions.conf.sample-1.4 @@ -341,22 +341,6 @@ exten => 8307,1,Answer exten => 8307,2,Playback(vm-goodbye) exten => 8307,3,Hangup -; this is used for recording conference calls, the client app sends the filename -; value as a callerID recordings go to /var/spool/asterisk/monitor (WAV) -; Recording is limited to 1 hour, to make longer, just change the Wait,3600 -exten => 8309,1,Answer -exten => 8309,2,Monitor(wav,${CALLERID(name)}) -exten => 8309,3,Wait,3600 -exten => 8309,4,Hangup - -; this is used for recording conference calls, the client app sends the filename -; value as a callerID recordings go to /var/spool/asterisk/monitor (GSM) -; Recording is limited to 1 hour, to make longer, just change the Wait,3600 -exten => 8310,1,Answer -exten => 8310,2,Monitor(gsm,${CALLERID(name)}) -exten => 8310,3,Wait,3600 -exten => 8310,4,Hangup - ; this is used for playing a message to an answering machine forwarded from AMD in VICIDIAL ; replace conf with the message file you want to leave exten => 8320,1,WaitForSilence(2000,2) ; AMD got machine. leave message after recording diff --git a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql index 1159f9ba..d3768c22 100644 --- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql @@ -69,6 +69,7 @@ enable_sipsak_messages ENUM('0','1') default '0', email VARCHAR(100), template_id VARCHAR(15) NOT NULL, conf_override TEXT, +phone_context VARCHAR(20) default 'default', index (server_ip) ); @@ -105,7 +106,8 @@ sysload INT(6) NOT NULL default '0', channels_total SMALLINT(4) UNSIGNED NOT NULL default '0', cpu_idle_percent SMALLINT(3) UNSIGNED NOT NULL default '0', disk_usage VARCHAR(255) default '1', -sounds_update ENUM('Y','N') default 'N' +sounds_update ENUM('Y','N') default 'N', +vicidial_recording_limit MEDIUMINT(8) default '60' ); CREATE UNIQUE INDEX server_id on servers (server_id); @@ -1615,7 +1617,7 @@ CREATE INDEX phone_number on vicidial_closer_log (phone_number); CREATE INDEX date_user on vicidial_closer_log (call_date,user); CREATE INDEX comment_a on live_inbound_log (comment_a); -UPDATE system_settings SET db_schema_version='1144'; +UPDATE system_settings SET db_schema_version='1145'; GRANT RELOAD ON *.* TO cron@'%'; GRANT RELOAD ON *.* TO cron@localhost; diff --git a/agc_2-X/trunk/extras/upgrade_2.2.0.sql b/agc_2-X/trunk/extras/upgrade_2.2.0.sql index c37318c3..c1b38019 100644 --- a/agc_2-X/trunk/extras/upgrade_2.2.0.sql +++ b/agc_2-X/trunk/extras/upgrade_2.2.0.sql @@ -116,3 +116,9 @@ ALTER TABLE vicidial_user_territories ADD level ENUM('TOP_AGENT','STANDARD_AGENT ALTER TABLE system_settings ADD user_territories_active ENUM('0','1') default '0'; UPDATE system_settings SET db_schema_version='1144'; + +ALTER TABLE servers ADD vicidial_recording_limit MEDIUMINT(8) default '60'; + +ALTER TABLE phones ADD phone_context VARCHAR(20) default 'default'; + +UPDATE system_settings SET db_schema_version='1145'; diff --git a/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.2.0.txt b/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.2.0.txt index 64844a25..1b7f5f3a 100644 --- a/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.2.0.txt +++ b/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.2.0.txt @@ -152,6 +152,11 @@ Vtiger Change Territory Owner|| Had to add user territory|| Vtiger Territory Owner Changed|| Records Changed|| +ViciDial Recording Limit|| +This field is where you set the maximum number of minutes that a call recording initiated by ViciDial can be. Default is 60 minutes|| +This is the dial plan context that the agent applications, like ViciDial, primarily use. It is assumed that all numbers dialed by the client apps are using this context so it is a good idea to make sure this is the most wide context possible. verify with extensions.conf file before changing. default is default|| +Phone Context|| +This is the dial plan context that this phone will use to dial out. If you are running a call center and you do not want your agents to be able to dial out outside of the ViciDial applicaiton for example, then you would set this field to a dialplan context that does not exist, something like agent-nodial. default is default|| add-file: user_territories.php diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index 57292731..906c33da 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -1026,6 +1026,10 @@ if (isset($_GET["auto_dial_limit"])) {$auto_dial_limit=$_GET["auto_dial_limit" elseif (isset($_POST["auto_dial_limit"])) {$auto_dial_limit=$_POST["auto_dial_limit"];} if (isset($_GET["user_territories_active"])) {$user_territories_active=$_GET["user_territories_active"];} elseif (isset($_POST["user_territories_active"])) {$user_territories_active=$_POST["user_territories_active"];} +if (isset($_GET["vicidial_recording_limit"])) {$vicidial_recording_limit=$_GET["vicidial_recording_limit"];} + elseif (isset($_POST["vicidial_recording_limit"])) {$vicidial_recording_limit=$_POST["vicidial_recording_limit"];} +if (isset($_GET["phone_context"])) {$phone_context=$_GET["phone_context"];} + elseif (isset($_POST["phone_context"])) {$phone_context=$_POST["phone_context"];} if (isset($script_id)) {$script_id= strtoupper($script_id);} if (isset($lead_filter_id)) {$lead_filter_id = strtoupper($lead_filter_id);} @@ -1218,6 +1222,7 @@ if ($non_latin < 1) $agentonly_callback_campaign_lock = ereg_replace("[^0-9]","",$agentonly_callback_campaign_lock); $sounds_central_control_active = ereg_replace("[^0-9]","",$sounds_central_control_active); $user_territories_active = ereg_replace("[^0-9]","",$user_territories_active); + $vicidial_recording_limit = ereg_replace("[^0-9]","",$vicidial_recording_limit); ### DIGITS and COLONS $shift_length = ereg_replace("[^\:0-9]","",$shift_length); @@ -1451,6 +1456,7 @@ if ($non_latin < 1) $menu_prompt = ereg_replace("[^-_0-9a-zA-Z]","",$menu_prompt); $menu_timeout_prompt = ereg_replace("[^-_0-9a-zA-Z]","",$menu_timeout_prompt); $menu_invalid_prompt = ereg_replace("[^-_0-9a-zA-Z]","",$menu_invalid_prompt); + $phone_context = ereg_replace("[^-_0-9a-zA-Z]","",$phone_context); ### ALPHA-NUMERIC and underscore and dash and comma $logins_list = ereg_replace("[^-\,\_0-9a-zA-Z]","",$logins_list); @@ -1776,11 +1782,12 @@ else # 90521-0029 - Added user territories enable option # 90522-0506 - Security fix for logins when using non-latin setting # 90524-2307 - Chaned Reports screen layout +# 90528-2055 - Added ViciDial recording limit field in servers and phone_context to phones # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time -$admin_version = '2.2.0-187'; -$build = '90524-2307'; +$admin_version = '2.2.0-188'; +$build = '90528-2055'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -4625,7 +4632,12 @@ if ($SSoutbound_autodial_active > 0)

-Exten Context - This is the dial plan context that this phone primarily uses. It is assumed that all numbers dialed by the client apps are using this context so it is a good idea to make sure this is the most wide context possible. verify with extensions.conf file before changing. +Exten Context - This is the dial plan context that the agent applications, like ViciDial, primarily use. It is assumed that all numbers dialed by the client apps are using this context so it is a good idea to make sure this is the most wide context possible. verify with extensions.conf file before changing. default is default. + +
+ +
+Phone Context - This is the dial plan context that this phone will use to dial out. If you are running a call center and you do not want your agents to be able to dial out outside of the ViciDial applicaiton for example, then you would set this field to a dialplan context that does not exist, something like agent-nodial. default is default.
@@ -5012,6 +5024,10 @@ if ($SSoutbound_autodial_active > 0)
Sounds Update - If you want to force a check of the sound files on this server, and the central audio store is enabled as a system setting, then this field will allow the sounds updater to run at the next top of the minute. Any time an audio file is uploaded from the web interface this is automatically set to Y for all servers that have Asterisk active. Default is N. +
+ +
+ViciDial Recording Limit - This field is where you set the maximum number of minutes that a call recording initiated by ViciDial can be. Default is 60 minutes. @@ -11265,7 +11281,7 @@ if ($ADD==41111111111) { echo "
PHONE MODIFIED: $extension\n"; - $stmt="UPDATE phones set extension='$extension', dialplan_number='$dialplan_number', voicemail_id='$voicemail_id', phone_ip='$phone_ip', computer_ip='$computer_ip', server_ip='$server_ip', login='$login', pass='$pass', status='$status', active='$active', phone_type='$phone_type', fullname='$fullname', company='$company', picture='$picture', protocol='$protocol', local_gmt='$local_gmt', ASTmgrUSERNAME='$ASTmgrUSERNAME', ASTmgrSECRET='$ASTmgrSECRET', login_user='$login_user', login_pass='$login_pass', login_campaign='$login_campaign', park_on_extension='$park_on_extension', conf_on_extension='$conf_on_extension', VICIDIAL_park_on_extension='$VICIDIAL_park_on_extension', VICIDIAL_park_on_filename='$VICIDIAL_park_on_filename', monitor_prefix='$monitor_prefix', recording_exten='$recording_exten', voicemail_exten='$voicemail_exten', voicemail_dump_exten='$voicemail_dump_exten', ext_context='$ext_context', dtmf_send_extension='$dtmf_send_extension', call_out_number_group='$call_out_number_group', client_browser='$client_browser', install_directory='$install_directory', local_web_callerID_URL='" . mysql_real_escape_string($local_web_callerID_URL) . "', VICIDIAL_web_URL='" . mysql_real_escape_string($VICIDIAL_web_URL) . "', AGI_call_logging_enabled='$AGI_call_logging_enabled', user_switching_enabled='$user_switching_enabled', conferencing_enabled='$conferencing_enabled', admin_hangup_enabled='$admin_hangup_enabled', admin_hijack_enabled='$admin_hijack_enabled', admin_monitor_enabled='$admin_monitor_enabled', call_parking_enabled='$call_parking_enabled', updater_check_enabled='$updater_check_enabled', AFLogging_enabled='$AFLogging_enabled', QUEUE_ACTION_enabled='$QUEUE_ACTION_enabled', CallerID_popup_enabled='$CallerID_popup_enabled', voicemail_button_enabled='$voicemail_button_enabled', enable_fast_refresh='$enable_fast_refresh', fast_refresh_rate='$fast_refresh_rate', enable_persistant_mysql='$enable_persistant_mysql', auto_dial_next_number='$auto_dial_next_number', VDstop_rec_after_each_call='$VDstop_rec_after_each_call', DBX_server='$DBX_server', DBX_database='$DBX_database', DBX_user='$DBX_user', DBX_pass='$DBX_pass', DBX_port='$DBX_port', DBY_server='$DBY_server', DBY_database='$DBY_database', DBY_user='$DBY_user', DBY_pass='$DBY_pass', DBY_port='$DBY_port', outbound_cid='$outbound_cid', enable_sipsak_messages='$enable_sipsak_messages', email='$email', template_id='$template_id', conf_override='$conf_override' where extension='$old_extension' and server_ip='$old_server_ip';"; + $stmt="UPDATE phones set extension='$extension', dialplan_number='$dialplan_number', voicemail_id='$voicemail_id', phone_ip='$phone_ip', computer_ip='$computer_ip', server_ip='$server_ip', login='$login', pass='$pass', status='$status', active='$active', phone_type='$phone_type', fullname='$fullname', company='$company', picture='$picture', protocol='$protocol', local_gmt='$local_gmt', ASTmgrUSERNAME='$ASTmgrUSERNAME', ASTmgrSECRET='$ASTmgrSECRET', login_user='$login_user', login_pass='$login_pass', login_campaign='$login_campaign', park_on_extension='$park_on_extension', conf_on_extension='$conf_on_extension', VICIDIAL_park_on_extension='$VICIDIAL_park_on_extension', VICIDIAL_park_on_filename='$VICIDIAL_park_on_filename', monitor_prefix='$monitor_prefix', recording_exten='$recording_exten', voicemail_exten='$voicemail_exten', voicemail_dump_exten='$voicemail_dump_exten', ext_context='$ext_context', dtmf_send_extension='$dtmf_send_extension', call_out_number_group='$call_out_number_group', client_browser='$client_browser', install_directory='$install_directory', local_web_callerID_URL='" . mysql_real_escape_string($local_web_callerID_URL) . "', VICIDIAL_web_URL='" . mysql_real_escape_string($VICIDIAL_web_URL) . "', AGI_call_logging_enabled='$AGI_call_logging_enabled', user_switching_enabled='$user_switching_enabled', conferencing_enabled='$conferencing_enabled', admin_hangup_enabled='$admin_hangup_enabled', admin_hijack_enabled='$admin_hijack_enabled', admin_monitor_enabled='$admin_monitor_enabled', call_parking_enabled='$call_parking_enabled', updater_check_enabled='$updater_check_enabled', AFLogging_enabled='$AFLogging_enabled', QUEUE_ACTION_enabled='$QUEUE_ACTION_enabled', CallerID_popup_enabled='$CallerID_popup_enabled', voicemail_button_enabled='$voicemail_button_enabled', enable_fast_refresh='$enable_fast_refresh', fast_refresh_rate='$fast_refresh_rate', enable_persistant_mysql='$enable_persistant_mysql', auto_dial_next_number='$auto_dial_next_number', VDstop_rec_after_each_call='$VDstop_rec_after_each_call', DBX_server='$DBX_server', DBX_database='$DBX_database', DBX_user='$DBX_user', DBX_pass='$DBX_pass', DBX_port='$DBX_port', DBY_server='$DBY_server', DBY_database='$DBY_database', DBY_user='$DBY_user', DBY_pass='$DBY_pass', DBY_port='$DBY_port', outbound_cid='$outbound_cid', enable_sipsak_messages='$enable_sipsak_messages', email='$email', template_id='$template_id', conf_override='$conf_override',phone_context='$phone_context' where extension='$old_extension' and server_ip='$old_server_ip';"; $rslt=mysql_query($stmt, $link); $stmtA="UPDATE servers SET rebuild_conf_files='Y' where generate_vicidial_conf='Y' and active_asterisk_server='Y' and server_ip='$server_ip';"; @@ -11400,7 +11416,7 @@ if ($ADD==411111111111) { echo "
SERVER MODIFIED: $server_ip\n"; - $stmt="UPDATE servers set server_id='$server_id',server_description='$server_description',server_ip='$server_ip',active='$active',asterisk_version='$asterisk_version', max_vicidial_trunks='$max_vicidial_trunks', telnet_host='$telnet_host', telnet_port='$telnet_port', ASTmgrUSERNAME='$ASTmgrUSERNAME', ASTmgrSECRET='$ASTmgrSECRET', ASTmgrUSERNAMEupdate='$ASTmgrUSERNAMEupdate', ASTmgrUSERNAMElisten='$ASTmgrUSERNAMElisten', ASTmgrUSERNAMEsend='$ASTmgrUSERNAMEsend', local_gmt='$local_gmt', voicemail_dump_exten='$voicemail_dump_exten', answer_transfer_agent='$answer_transfer_agent', ext_context='$ext_context', sys_perf_log='$sys_perf_log', vd_server_logs='$vd_server_logs', agi_output='$agi_output', vicidial_balance_active='$vicidial_balance_active',balance_trunks_offlimits='$balance_trunks_offlimits',recording_web_link='$recording_web_link',alt_server_ip='$alt_server_ip',active_asterisk_server='$active_asterisk_server',generate_vicidial_conf='$generate_vicidial_conf',rebuild_conf_files='$rebuild_conf_files',outbound_calls_per_second='$outbound_calls_per_second',sounds_update='$sounds_update' where server_id='$old_server_id';"; + $stmt="UPDATE servers set server_id='$server_id',server_description='$server_description',server_ip='$server_ip',active='$active',asterisk_version='$asterisk_version', max_vicidial_trunks='$max_vicidial_trunks', telnet_host='$telnet_host', telnet_port='$telnet_port', ASTmgrUSERNAME='$ASTmgrUSERNAME', ASTmgrSECRET='$ASTmgrSECRET', ASTmgrUSERNAMEupdate='$ASTmgrUSERNAMEupdate', ASTmgrUSERNAMElisten='$ASTmgrUSERNAMElisten', ASTmgrUSERNAMEsend='$ASTmgrUSERNAMEsend', local_gmt='$local_gmt', voicemail_dump_exten='$voicemail_dump_exten', answer_transfer_agent='$answer_transfer_agent', ext_context='$ext_context', sys_perf_log='$sys_perf_log', vd_server_logs='$vd_server_logs', agi_output='$agi_output', vicidial_balance_active='$vicidial_balance_active',balance_trunks_offlimits='$balance_trunks_offlimits',recording_web_link='$recording_web_link',alt_server_ip='$alt_server_ip',active_asterisk_server='$active_asterisk_server',generate_vicidial_conf='$generate_vicidial_conf',rebuild_conf_files='$rebuild_conf_files',outbound_calls_per_second='$outbound_calls_per_second',sounds_update='$sounds_update',vicidial_recording_limit='$vicidial_recording_limit' where server_id='$old_server_id';"; $rslt=mysql_query($stmt, $link); $stmtA="UPDATE servers SET rebuild_conf_files='Y' where generate_vicidial_conf='Y' and active_asterisk_server='Y';"; @@ -18284,6 +18300,7 @@ if ($ADD==31111111111) echo "VMailMain Exten: $NWB#phones-voicemail_exten$NWE\n"; echo "VMailDump Exten: $NWB#phones-voicemail_dump_exten$NWE\n"; echo "Exten Context: $NWB#phones-ext_context$NWE\n"; + echo "Phone Context: $NWB#phones-phone_context$NWE\n"; echo "DTMFSend Channel: $NWB#phones-dtmf_send_extension$NWE\n"; echo "Outbound Call Group: $NWB#phones-call_out_number_group$NWE\n"; echo "Browser Location: $NWB#phones-client_browser$NWE\n"; @@ -18482,7 +18499,7 @@ if ($ADD==311111111111) echo "\n"; echo "\n"; echo "\n"; + echo "\n"; echo "\n"; diff --git a/agc_2-X/trunk/www/vicidial/admin_header.php b/agc_2-X/trunk/www/vicidial/admin_header.php index 07d14a79..00f14a44 100644 --- a/agc_2-X/trunk/www/vicidial/admin_header.php +++ b/agc_2-X/trunk/www/vicidial/admin_header.php @@ -256,11 +256,11 @@ function submit_mix(vcl_id,entries) if (mod_priority_field.value==h) { list_mix_container = list_mix_container + mod_list_id_field.value + "|" + j + "|" + mod_percent_field.value + "|" + mod_statuses_field.value + "|:"; - j++ + j++; } i++; } - h++ + h++; } mod_list_mix_container_field.value = list_mix_container; var form_to_submit = document.getElementById("" + vcl_id);
\n"; echo ""; - $stmt="SELECT server_id,server_description,server_ip,active,asterisk_version,max_vicidial_trunks,telnet_host,telnet_port,ASTmgrUSERNAME,ASTmgrSECRET,ASTmgrUSERNAMEupdate,ASTmgrUSERNAMElisten,ASTmgrUSERNAMEsend,local_gmt,voicemail_dump_exten,answer_transfer_agent,ext_context,sys_perf_log,vd_server_logs,agi_output,vicidial_balance_active,balance_trunks_offlimits,recording_web_link,alt_server_ip,active_asterisk_server,generate_vicidial_conf,rebuild_conf_files,outbound_calls_per_second,sysload,channels_total,cpu_idle_percent,disk_usage,sounds_update from servers where server_id='$server_id' or server_ip='$server_ip';"; + $stmt="SELECT server_id,server_description,server_ip,active,asterisk_version,max_vicidial_trunks,telnet_host,telnet_port,ASTmgrUSERNAME,ASTmgrSECRET,ASTmgrUSERNAMEupdate,ASTmgrUSERNAMElisten,ASTmgrUSERNAMEsend,local_gmt,voicemail_dump_exten,answer_transfer_agent,ext_context,sys_perf_log,vd_server_logs,agi_output,vicidial_balance_active,balance_trunks_offlimits,recording_web_link,alt_server_ip,active_asterisk_server,generate_vicidial_conf,rebuild_conf_files,outbound_calls_per_second,sysload,channels_total,cpu_idle_percent,disk_usage,sounds_update,vicidial_recording_limit from servers where server_id='$server_id' or server_ip='$server_ip';"; $rslt=mysql_query($stmt, $link); $row=mysql_fetch_row($rslt); $server_id = $row[0]; @@ -18518,6 +18535,7 @@ if ($ADD==311111111111) $cpu_idle_percent = $row[30]; $disk_usage = $row[31]; $sounds_update = $row[32]; + $vicidial_recording_limit = $row[33]; $cpu = (100 - $cpu_idle_percent); $disk_usage = preg_replace("/ /"," - ",$disk_usage); @@ -18562,6 +18580,7 @@ if ($ADD==311111111111) echo "
Generate conf files: $NWB#servers-generate_vicidial_conf$NWE
Rebuild conf files: $NWB#servers-rebuild_conf_files$NWE
Sounds Update: $NWB#servers-sounds_update$NWE
ViciDial Recording Limit: $NWB#servers-vicidial_recording_limit$NWE