diff --git a/agc_2-X/trunk/bin/ADMIN_audio_store_sync.pl b/agc_2-X/trunk/bin/ADMIN_audio_store_sync.pl index d8675ac6..6609b05f 100644 --- a/agc_2-X/trunk/bin/ADMIN_audio_store_sync.pl +++ b/agc_2-X/trunk/bin/ADMIN_audio_store_sync.pl @@ -232,7 +232,7 @@ else } -$URL = "http://$sounds_web_server/vicidial/audio_store.php?action=LIST"; +$URL = "http://$sounds_web_server/vicidial/audio_store.php?action=LIST&audio_server_ip=$VARserver_ip"; $URL =~ s/&/\\&/gi; if ($DB) @@ -357,7 +357,7 @@ if ($upload > 0) if ( ($found_file < 1) || ($force_upload > 0) ) { - $curloptions = "-s 'http://$sounds_web_server/vicidial/audio_store.php?action=AUTOUPLOAD' -F \"audiofile=\@$PATHsounds/$soundname\""; + $curloptions = "-s 'http://$sounds_web_server/vicidial/audio_store.php?action=AUTOUPLOAD&audio_server_ip=$VARserver_ip' -F \"audiofile=\@$PATHsounds/$soundname\""; `$curlbin $curloptions`; $event_string = "UPLOADING: $soundname $soundsize"; if ($DB > 0) {print " $event_string\n|$curlbin $curloptions|\n";} diff --git a/agc_2-X/trunk/www/vicidial/audio_store.php b/agc_2-X/trunk/www/vicidial/audio_store.php index 5ad6e5b8..4f8941ea 100644 --- a/agc_2-X/trunk/www/vicidial/audio_store.php +++ b/agc_2-X/trunk/www/vicidial/audio_store.php @@ -30,6 +30,8 @@ if (isset($_GET["overwrite"])) {$overwrite=$_GET["overwrite"];} elseif (isset($_POST["overwrite"])) {$overwrite=$_POST["overwrite"];} if (isset($_GET["action"])) {$action=$_GET["action"];} elseif (isset($_POST["action"])) {$action=$_POST["action"];} +if (isset($_GET["audio_server_ip"])) {$audio_server_ip=$_GET["audio_server_ip"];} + elseif (isset($_POST["audio_server_ip"])) {$audio_server_ip=$_POST["audio_server_ip"];} if (isset($_GET["SUBMIT"])) {$SUBMIT=$_GET["SUBMIT"];} elseif (isset($_POST["SUBMIT"])) {$SUBMIT=$_POST["SUBMIT"];} if (isset($_GET["audiofile_name"])) {$audiofile_name=$_GET["audiofile_name"];} @@ -108,8 +110,14 @@ while ($sv_conf_ct > $i) } $user_set=0; +$formIPvalid=0; +if (strlen($audio_server_ip) > 6) + { + if (preg_match("/\|$audio_server_ip\|/", $server_ips)) + {$formIPvalid=1;} + } $ip = getenv("REMOTE_ADDR"); -if (!preg_match("/\|$ip\|/", $server_ips)) +if ( (!preg_match("/\|$ip\|/", $server_ips)) and ($formIPvalid < 1) ) { $user_set=1; $PHP_AUTH_USER=$_SERVER['PHP_AUTH_USER']; @@ -127,7 +135,7 @@ if (!preg_match("/\|$ip\|/", $server_ips)) { Header("WWW-Authenticate: Basic realm=\"VICI-PROJECTS\""); Header("HTTP/1.0 401 Unauthorized"); - echo "Invalid Username/Password: |$PHP_AUTH_USER|$PHP_AUTH_PW|\n"; + echo "Invalid Username/Password: |$PHP_AUTH_USER|$PHP_AUTH_PW|$ip|\n"; exit; } }