fixed bug in vicidial.php and manager_send.php that could cause shared sessions

git-svn-id: svn://192.168.202.10@956 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2008-10-02 23:09:18 +00:00
parent 6c95dd9605
commit 85945f643d
2 changed files with 7 additions and 6 deletions
+3 -3
View File
@@ -784,7 +784,7 @@ if ($ACTION=="RedirectXtraNeW")
$row=''; $rowx='';
$channel_liveX=1;
$channel_liveY=1;
if ( (strlen($channel)<3) or (strlen($queryCID)<15) or (strlen($ext_context)<1) or (strlen($ext_priority)<1) or (strlen($session_id)<3) or ( ( (strlen($extrachannel)<3) or (strlen($exten)<1) ) and ($exten != "NEXTAVAILABLE") ) )
if ( (strlen($channel)<3) or (strlen($queryCID)<15) or (strlen($ext_context)<1) or (strlen($ext_priority)<1) or (strlen($session_id)<3) or ( ( (strlen($extrachannel)<3) or (strlen($exten)<1) ) and (!ereg("NEXTAVAILABLE",$exten)) ) )
{
$channel_liveX=0;
$channel_liveY=0;
@@ -809,7 +809,7 @@ if ($ACTION=="RedirectXtraNeW")
}
else
{
if ($exten == "NEXTAVAILABLE")
if (ereg("NEXTAVAILABLE",$exten))
{
$stmt="SELECT count(*) FROM vicidial_conferences where server_ip='$server_ip' and ((extension='') or (extension is null)) and conf_exten != '$session_id';";
if ($format=='debug') {echo "\n<!-- $stmt -->";}
@@ -996,7 +996,7 @@ if ($ACTION=="RedirectXtra")
}
else
{
if ($exten == "NEXTAVAILABLE")
if (ereg("NEXTAVAILABLE",$exten))
{
$stmt="SELECT conf_exten FROM conferences where server_ip='$server_ip' and ((extension='') or (extension is null)) limit 1;";
if ($format=='debug') {echo "\n<!-- $stmt -->";}
+4 -3
View File
@@ -190,10 +190,11 @@
# 80831-0548 - Added Extended alt-dial-phone display information for non-manual calls
# 80909-1717 - Added support for campaign-specific DNC lists
# 80915-1754 - Rewrote leave-3way functions for external calling
# 81002-1908 - Fixed double-login bug in some conditions
#
$version = '2.0.5-168';
$build = '80915-1754';
$version = '2.0.5-169';
$build = '81002-1908';
require("dbconnect.php");
@@ -1318,7 +1319,7 @@ else
if ($format=='debug') {echo "\n<!-- $stmt -->";}
$rslt=mysql_query($stmt, $link);
$stmt="SELECT conf_exten from vicidial_conferences where server_ip='$server_ip' and extension='$user';";
$stmt="SELECT conf_exten from vicidial_conferences where server_ip='$server_ip' and ( (extension='$SIP_user') or (extension='$user') );";
if ($format=='debug') {echo "\n<!-- $stmt -->";}
$rslt=mysql_query($stmt, $link);
$row=mysql_fetch_row($rslt);