Fixed user_authorization bug in agent code
git-svn-id: svn://192.168.202.10@2524 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
@@ -175,7 +175,7 @@ if (strlen($SSagent_debug_logging) > 1)
|
||||
}
|
||||
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',0,1,0);
|
||||
$auth_message = user_authorization($user,$pass,'',0,1,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
|
||||
|
||||
@@ -70,7 +70,7 @@ $VUselected_language = $SSdefault_language;
|
||||
###########################################
|
||||
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',0,0,0);
|
||||
$auth_message = user_authorization($user,$pass,'',0,0,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
|
||||
|
||||
@@ -168,7 +168,7 @@ $month_old = mktime(0, 0, 0, date("m"), date("d")-7, date("Y"));
|
||||
$past_month_date = date("Y-m-d H:i:s",$month_old);
|
||||
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',1,0,1);
|
||||
$auth_message = user_authorization($user,$pass,'',1,0,1,0);
|
||||
if (preg_match("/^GOOD/",$auth_message))
|
||||
{
|
||||
$auth=1;
|
||||
|
||||
@@ -127,7 +127,7 @@ if (strlen($SSagent_debug_logging) > 1)
|
||||
}
|
||||
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',0,1,0);
|
||||
$auth_message = user_authorization($user,$pass,'',0,1,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
|
||||
|
||||
@@ -110,7 +110,7 @@ $VUselected_language = $SSdefault_language;
|
||||
###########################################
|
||||
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',0,0,0);
|
||||
$auth_message = user_authorization($user,$pass,'',0,0,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
|
||||
|
||||
@@ -200,7 +200,7 @@ $random = (rand(1000000, 9999999) + 10000000);
|
||||
|
||||
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',0,$bcrypt,0);
|
||||
$auth_message = user_authorization($user,$pass,'',0,$bcrypt,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
|
||||
|
||||
@@ -119,7 +119,7 @@ if (preg_match("/$TD$dispo$TD/",$sale_status))
|
||||
}
|
||||
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',0,0,0);
|
||||
$auth_message = user_authorization($user,$pass,'',0,0,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
|
||||
|
||||
@@ -148,7 +148,7 @@ if ($match_found > 0)
|
||||
else
|
||||
{
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',0,0,0);
|
||||
$auth_message = user_authorization($user,$pass,'',0,0,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
|
||||
|
||||
@@ -233,7 +233,7 @@ if ($match_found > 0)
|
||||
else
|
||||
{
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',0,0,0);
|
||||
$auth_message = user_authorization($user,$pass,'',0,0,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
|
||||
|
||||
@@ -148,7 +148,7 @@ if ($match_found > 0)
|
||||
else
|
||||
{
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',0,0,0);
|
||||
$auth_message = user_authorization($user,$pass,'',0,0,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
|
||||
|
||||
@@ -122,7 +122,7 @@ if ($non_latin < 1)
|
||||
}
|
||||
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',0,1,0);
|
||||
$auth_message = user_authorization($user,$pass,'',0,1,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
|
||||
|
||||
@@ -127,7 +127,7 @@ if (strlen($SSagent_debug_logging) > 1)
|
||||
}
|
||||
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',0,1,0);
|
||||
$auth_message = user_authorization($user,$pass,'',0,1,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
|
||||
|
||||
@@ -310,7 +310,7 @@ if (strlen($meetme_enter_leave3way_filename) > 0)
|
||||
{$threeway_context = 'meetme-enter-leave3way';}
|
||||
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',0,1,0);
|
||||
$auth_message = user_authorization($user,$pass,'',0,1,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
|
||||
|
||||
@@ -116,7 +116,7 @@ if (strlen($SSagent_debug_logging) > 1)
|
||||
|
||||
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',0,1,0);
|
||||
$auth_message = user_authorization($user,$pass,'',0,1,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
|
||||
|
||||
@@ -360,7 +360,7 @@ else
|
||||
else
|
||||
{
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($VD_login,$VD_pass,'',1,0,0);
|
||||
$auth_message = user_authorization($VD_login,$VD_pass,'',1,0,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
|
||||
|
||||
@@ -151,7 +151,7 @@ if ( ($stage == 'login') or ($stage == 'logout') )
|
||||
{
|
||||
### see if user/pass exist for this user in vicidial_users table
|
||||
$valid_user=0;
|
||||
$auth_message = user_authorization($user,$pass,'',1,0,0);
|
||||
$auth_message = user_authorization($user,$pass,'',1,0,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$valid_user=1;}
|
||||
|
||||
|
||||
@@ -122,7 +122,7 @@ if ($SSallow_chats < 1)
|
||||
}
|
||||
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',0,0,0);
|
||||
$auth_message = user_authorization($user,$pass,'',0,0,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
|
||||
|
||||
@@ -939,7 +939,7 @@ if ($ACTION == 'LogiNCamPaigns')
|
||||
else
|
||||
{
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',0,1,0);
|
||||
$auth_message = user_authorization($user,$pass,'',0,1,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
|
||||
|
||||
@@ -157,7 +157,7 @@ if (!isset($ACTION)) {$ACTION="refresh";}
|
||||
if (!isset($query_date)) {$query_date = $NOW_DATE;}
|
||||
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',0,0,0);
|
||||
$auth_message = user_authorization($user,$pass,'',0,0,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
|
||||
|
||||
@@ -264,7 +264,7 @@ if (!isset($ACTION)) {$ACTION="refresh";}
|
||||
if (!isset($query_date)) {$query_date = $NOW_DATE;}
|
||||
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',0,$bcrypt,0);
|
||||
$auth_message = user_authorization($user,$pass,'',0,$bcrypt,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
|
||||
|
||||
@@ -304,7 +304,7 @@ if (!isset($ACTION)) {$ACTION="refresh";}
|
||||
if (!isset($query_date)) {$query_date = $NOW_DATE;}
|
||||
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',0,1,0);
|
||||
$auth_message = user_authorization($user,$pass,'',0,1,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
|
||||
|
||||
@@ -349,7 +349,7 @@ if (!isset($ACTION)) {$ACTION="refresh";}
|
||||
if (!isset($query_date)) {$query_date = $NOW_DATE;}
|
||||
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',0,0,0);
|
||||
$auth_message = user_authorization($user,$pass,'',0,0,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
|
||||
|
||||
@@ -318,7 +318,7 @@ if (!isset($ACTION)) {$ACTION="refresh";}
|
||||
if (!isset($query_date)) {$query_date = $NOW_DATE;}
|
||||
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',0,0,0);
|
||||
$auth_message = user_authorization($user,$pass,'',0,0,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
|
||||
|
||||
@@ -522,10 +522,11 @@
|
||||
# 160331-2129 - Fixed missing start and dispo call url variables, issue #938
|
||||
# 160414-0922 - Added default_phone_code system settings option
|
||||
# 160420-1342 - Fixed text link overlaps with other languages
|
||||
# 160428-1826 - Fixed user_authorization bug
|
||||
#
|
||||
|
||||
$version = '2.12-491c';
|
||||
$build = '160420-1342';
|
||||
$version = '2.12-492c';
|
||||
$build = '160428-1826';
|
||||
$mel=1; # Mysql Error Log enabled = 1
|
||||
$mysql_log_count=87;
|
||||
$one_mysql_log=0;
|
||||
@@ -829,7 +830,7 @@ if ($campaign_login_list > 0)
|
||||
$MGR_pass = preg_replace("/\'|\"|\\\\|;/","",$MGR_pass);
|
||||
|
||||
$MGR_auth=0;
|
||||
$auth_message = user_authorization($MGR_login,$MGR_pass,'MGR',0,0,0);
|
||||
$auth_message = user_authorization($MGR_login,$MGR_pass,'MGR',0,0,0,0);
|
||||
if (preg_match("/^GOOD/",$auth_message))
|
||||
{$MGR_auth=1;}
|
||||
|
||||
@@ -1175,7 +1176,7 @@ else
|
||||
else
|
||||
{
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($VD_login,$VD_pass,'',1,0,1);
|
||||
$auth_message = user_authorization($VD_login,$VD_pass,'',1,0,1,0);
|
||||
if (preg_match("/^GOOD/",$auth_message))
|
||||
{
|
||||
$auth=1;
|
||||
|
||||
@@ -105,7 +105,7 @@ if ($non_latin < 1)
|
||||
}
|
||||
|
||||
$auth=0;
|
||||
$auth_message = user_authorization($user,$pass,'',0,1,0);
|
||||
$auth_message = user_authorization($user,$pass,'',0,1,0,0);
|
||||
if ($auth_message == 'GOOD')
|
||||
{$auth=1;}
|
||||
if (strlen($SSagent_debug_logging) > 1)
|
||||
|
||||
@@ -28,6 +28,9 @@ th.thgraph {
|
||||
.grey_graph_cell {
|
||||
background-color:#ddd;
|
||||
}
|
||||
.selected_grey_graph_cell {
|
||||
background-color:#999;
|
||||
}
|
||||
.white_graph_cell {
|
||||
background-color:#FFF;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user