ViciDial/agc_2-X
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix for load-balance phone login as well as more server validation added

Browse Source 
git-svn-id: svn://192.168.202.10@838 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2008-04-17 00:15:42 +00:00
parent c256d218fd
commit 6bfdded998
1 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/agc/vicidial.php
+31 -11
View File
@@ -247,6 +247,8 @@ $FILE_TIME = date("Ymd-His");
$CIDdate = date("ymdHis"); $CIDdate = date("ymdHis");
$month_old = mktime(11, 0, 0, date("m"), date("d")-2, date("Y")); $month_old = mktime(11, 0, 0, date("m"), date("d")-2, date("Y"));
$past_month_date = date("Y-m-d H:i:s",$month_old); $past_month_date = date("Y-m-d H:i:s",$month_old);
$minutes_old = mktime(date("H"), date("i")-2, date("s"), date("m"), date("d"), date("Y"));
$past_minutes_date = date("Y-m-d H:i:s",$minutes_old);
$random = (rand(1000000, 9999999) + 10000000); $random = (rand(1000000, 9999999) + 10000000);
@@ -1011,36 +1013,54 @@ else
if ($pa > 0) if ($pa > 0)
{ {
$pb=0; $pb=0;
$pb_login='';
$pb_server_ip='';
$pb_count=0;
$pb_log='';
while($pb < $phones_auto_ct) while($pb < $phones_auto_ct)
{ {
$pb_login=''; ### find the server_ip of each phone_login
$pb_server_ip='';
$pb_count=0;
$pb_log='';
$stmtx="SELECT server_ip from phones where login = '$phones_auto[$pb]';"; $stmtx="SELECT server_ip from phones where login = '$phones_auto[$pb]';";
if ($DB) {echo "|$stmtx|\n";} if ($DB) {echo "|$stmtx|\n";}
if ($non_latin > 0) {$rslt=mysql_query("SET NAMES 'UTF8'");} if ($non_latin > 0) {$rslt=mysql_query("SET NAMES 'UTF8'");}
$rslt=mysql_query($stmtx, $link); $rslt=mysql_query($stmtx, $link);
$rowx=mysql_fetch_row($rslt); $rowx=mysql_fetch_row($rslt);
### get number of agents logged in to each server
$stmt="SELECT count(*) from vicidial_live_agents where server_ip = '$rowx[0]';"; $stmt="SELECT count(*) from vicidial_live_agents where server_ip = '$rowx[0]';";
if ($DB) {echo "|$stmt|\n";} if ($DB) {echo "|$stmt|\n";}
if ($non_latin > 0) {$rslt=mysql_query("SET NAMES 'UTF8'");} if ($non_latin > 0) {$rslt=mysql_query("SET NAMES 'UTF8'");}
$rslt=mysql_query($stmt, $link); $rslt=mysql_query($stmt, $link);
$row=mysql_fetch_row($rslt); $row=mysql_fetch_row($rslt);
$pb_log .= "$phones_auto[$pb]|$rowx[0]|$row[0]|"; ### find out whether the server is set to active
$stmt="SELECT count(*) from servers where server_ip = '$rowx[0]' and active='Y';";
if ($DB) {echo "|$stmt|\n";}
if ($non_latin > 0) {$rslt=mysql_query("SET NAMES 'UTF8'");}
$rslt=mysql_query($stmt, $link);
$rowy=mysql_fetch_row($rslt);
if ($pb_count >= $row[0]) ### find out whether the server_updater is running
$stmt="SELECT count(*) from server_updater where server_ip = '$rowx[0]' and last_update > '$past_minutes_date';";
if ($DB) {echo "|$stmt|\n";}
if ($non_latin > 0) {$rslt=mysql_query("SET NAMES 'UTF8'");}
$rslt=mysql_query($stmt, $link);
$rowz=mysql_fetch_row($rslt);
$pb_log .= "$phones_auto[$pb]|$rowx[0]|$row[0]|$rowy[0]|$rowz[0]| ";
if ( ($rowy[0] > 0) && ($rowz[0] > 0) )
{ {
$pb_count=$row[0]; if ( ($pb_count >= $row[0]) || (strlen($pb_server_ip) < 4) )
$pb_server_ip=$rowx[0]; {
$phone_login=$phones_auto[$pb]; $pb_count=$row[0];
$pb_server_ip=$rowx[0];
$phone_login=$phones_auto[$pb];
}
} }
$pb++; $pb++;
} }
echo "<!-- Phones balance selection: $phone_login|$pb_server_ip| |$pb_log -->\n"; echo "<!-- Phones balance selection: $phone_login|$pb_server_ip|$past_minutes_date| |$pb_log -->\n";
} }
echo "<title>VICIDIAL web client</title>\n"; echo "<title>VICIDIAL web client</title>\n";
$stmt="SELECT * from phones where login='$phone_login' and pass='$phone_pass' and active = 'Y';"; $stmt="SELECT * from phones where login='$phone_login' and pass='$phone_pass' and active = 'Y';";