diff --git a/agc_2-X/trunk/www/agc/vdc_db_query.php b/agc_2-X/trunk/www/agc/vdc_db_query.php index e690cc3c..782a0e1d 100644 --- a/agc_2-X/trunk/www/agc/vdc_db_query.php +++ b/agc_2-X/trunk/www/agc/vdc_db_query.php @@ -13,7 +13,7 @@ # - $pass # optional variables: # - $format - ('text','debug') -# - $ACTION - ('regCLOSER','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCALL','manDiaLlogCALL','userLOGout','updateDISPO','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit') +# - $ACTION - ('regCLOSER','manDiaLnextCALL','manDiaLskip','manDiaLonly','manDiaLlookCALL','manDiaLlogCALL','userLOGout','updateDISPO','VDADpause','VDADready','VDADcheckINCOMING','UpdatEFavoritEs','CalLBacKLisT','CalLBacKCounT','PauseCodeSubmit','LogiNCamPaigns') # - $stage - ('start','finish','lookup','new') # - $closer_choice - ('CL_TESTCAMP_L CL_OUT123_L -') # - $conf_exten - ('8600011',...) @@ -135,10 +135,11 @@ # 71029-1855 - removed campaign_id naming restrictions for CLOSER-type campaigns # 71030-2047 - added hopper priority for auto alt dial entries # 71116-1011 - added calls_today count updating of the vicidial_live_agents upon INCALL +# 71120-1520 - added LogiNCamPaigns to show only allowed campaigns for agents upon login # -$version = '2.0.4-62'; -$build = '71116-1011'; +$version = '2.0.4-63'; +$build = '71120-1520'; require("dbconnect.php"); @@ -294,40 +295,46 @@ if (!isset($query_date)) {$query_date = $NOW_DATE;} $MT[0]=''; $agents='@agents'; -$stmt="SELECT count(*) from vicidial_users where user='$user' and pass='$pass' and user_level > 0;"; -if ($DB) {echo "|$stmt|\n";} -$rslt=mysql_query($stmt, $link); -$row=mysql_fetch_row($rslt); -$auth=$row[0]; - -if( (strlen($user)<2) or (strlen($pass)<2) or ($auth==0)) -{ -echo "Invalid Username/Password: |$user|$pass|\n"; -exit; -} -else -{ - -if( (strlen($server_ip)<6) or (!isset($server_ip)) or ( (strlen($session_name)<12) or (!isset($session_name)) ) ) +if ($ACTION == 'LogiNCamPaigns') { - echo "Invalid server_ip: |$server_ip| or Invalid session_name: |$session_name|\n"; - exit; + $skip_user_validation=1; } else { - $stmt="SELECT count(*) from web_client_sessions where session_name='$session_name' and server_ip='$server_ip';"; + $stmt="SELECT count(*) from vicidial_users where user='$user' and pass='$pass' and user_level > 0;"; if ($DB) {echo "|$stmt|\n";} $rslt=mysql_query($stmt, $link); $row=mysql_fetch_row($rslt); - $SNauth=$row[0]; - if($SNauth==0) + $auth=$row[0]; + + if( (strlen($user)<2) or (strlen($pass)<2) or ($auth==0)) + { + echo "Invalid Username/Password: |$user|$pass|\n"; + exit; + } + else + { + if( (strlen($server_ip)<6) or (!isset($server_ip)) or ( (strlen($session_name)<12) or (!isset($session_name)) ) ) { - echo "Invalid session_name: |$session_name|$server_ip|\n"; + echo "Invalid server_ip: |$server_ip| or Invalid session_name: |$session_name|\n"; exit; } - else + else { - # do nothing for now + $stmt="SELECT count(*) from web_client_sessions where session_name='$session_name' and server_ip='$server_ip';"; + if ($DB) {echo "|$stmt|\n";} + $rslt=mysql_query($stmt, $link); + $row=mysql_fetch_row($rslt); + $SNauth=$row[0]; + if($SNauth==0) + { + echo "Invalid session_name: |$session_name|$server_ip|\n"; + exit; + } + else + { + # do nothing for now + } } } } @@ -344,6 +351,63 @@ echo " } + +################################################################################ +### LogiNCamPaigns - generates an HTML SELECT list of allowed campaigns for a +### specific agent on the login screen +################################################################################ +if ($ACTION == 'LogiNCamPaigns') +{ + if ( (strlen($user)<1) ) + { + echo "\n"; + exit; + } + else + { + echo "\n"; + exit; + } +} + + + ################################################################################ ### regCLOSER - update the vicidial_live_agents table to reflect the closer ### inbound choices made upon login diff --git a/agc_2-X/trunk/www/agc/vicidial.php b/agc_2-X/trunk/www/agc/vicidial.php index 248eb31b..b534f46a 100644 --- a/agc_2-X/trunk/www/agc/vicidial.php +++ b/agc_2-X/trunk/www/agc/vicidial.php @@ -166,10 +166,11 @@ # 71029-1848 - Changed CLOSER-type campaign to not use campaign_id restrictions # 71101-1204 - Fixed bug in callback calendar with DST # 71116-0957 - Added campaign_weight and calls_today to the vla table insertion +# 71120-1719 - Added XMLHTPRequest lookup of allowable campaigns for agents during login # -$version = '2.0.4-137'; -$build = '71116-0957'; +$version = '2.0.4-138'; +$build = '71120-1719'; require("dbconnect.php"); @@ -249,6 +250,7 @@ $clientDST = '1'; # set to 1 to check for DST on server for agent time $no_delete_sessions = '0'; # set to 1 to not delete sessions at logout $volumecontrol_active = '1'; # set to 1 to allow agents to alter volume of channels $PreseT_DiaL_LinKs = '1'; # set to 1 to show a DIAL link for Dial Presets +$LogiNAJAX = '1'; # set to 1 to do lookups $TEST_all_statuses = '0'; # TEST variable allows all statuses in dispo screen @@ -284,10 +286,31 @@ echo "\n"; if ($campaign_login_list > 0) { -$camp_form_code = "\n"; $camp_form_code .= "\n"; -$stmt="SELECT campaign_id,campaign_name from vicidial_campaigns where active='Y' order by campaign_id"; +$LOGallowed_campaignsSQL=''; +if ($relogin == 'YES') +{ + $stmt="SELECT user_group from vicidial_users where user='$VD_login' and pass='$VD_pass'"; + if ($non_latin > 0) {$rslt=mysql_query("SET NAMES 'UTF8'");} + $rslt=mysql_query($stmt, $link); + $row=mysql_fetch_row($rslt); + $VU_user_group=$row[0]; + + $stmt="SELECT allowed_campaigns from vicidial_user_groups where user_group='$VU_user_group';"; + if ($non_latin > 0) {$rslt=mysql_query("SET NAMES 'UTF8'");} + $rslt=mysql_query($stmt, $link); + $row=mysql_fetch_row($rslt); + if ( (!eregi("ALL-CAMPAIGNS",$row[0])) ) + { + $LOGallowed_campaignsSQL = eregi_replace(' -','',$row[0]); + $LOGallowed_campaignsSQL = eregi_replace(' ',"','",$LOGallowed_campaignsSQL); + $LOGallowed_campaignsSQL = "and campaign_id IN('$LOGallowed_campaignsSQL')"; + } +} + +$stmt="SELECT campaign_id,campaign_name from vicidial_campaigns where active='Y' $LOGallowed_campaignsSQL order by campaign_id"; if ($non_latin > 0) {$rslt=mysql_query("SET NAMES 'UTF8'");} $rslt=mysql_query($stmt, $link); $camps_to_print = mysql_num_rows($rslt); @@ -319,6 +342,62 @@ $camp_form_code = " 0) +{ +?> + + + +\n"; echo "\n"; echo "\n"; echo "
\n"; -echo "
\n"; +echo "\n"; echo "\n"; echo "


"; echo ""; @@ -364,7 +443,7 @@ if ($user_login_first == 1) echo "
\n"; echo "\n"; echo "
\n"; - echo "\n"; + echo "\n"; echo "\n"; #echo "\n"; #echo "\n"; @@ -379,8 +458,9 @@ if ($user_login_first == 1) echo "User Password: "; echo "\n"; echo "Campaign: "; - echo "$camp_form_code\n"; - echo "\n"; + echo "$camp_form_code\n"; + echo "   \n"; + echo "\n"; echo "
VERSION: $version       BUILD: $build\n"; echo "\n"; echo "\n\n"; @@ -406,7 +486,7 @@ if ($user_login_first == 1) echo "\n"; echo "\n"; echo "
\n"; - echo "
\n"; + echo "\n"; echo "\n"; echo "


"; echo ""; @@ -422,8 +502,9 @@ if ($user_login_first == 1) echo ""; echo "\n"; echo ""; - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo "
User Password:
Campaign: $camp_form_code
$camp_form_code
  \n"; + echo "

VERSION: $version       BUILD: $build
\n"; echo "\n\n"; @@ -443,7 +524,7 @@ echo "\n"; echo "\n"; echo "\n"; echo "
\n"; -echo "
\n"; +echo "\n"; echo "\n"; echo "


"; echo ""; @@ -454,7 +535,8 @@ echo ""; echo "\n"; echo ""; echo "\n"; -echo "\n"; +echo "\n"; echo "\n"; echo "
Phone Login:
Phone Password:
  \n"; +echo "

VERSION: $version       BUILD: $build
\n"; echo "\n\n"; @@ -518,7 +600,7 @@ $VDloginDISPLAY=0; $row=mysql_fetch_row($rslt); $LOGallowed_campaigns =$row[0]; - if ( (!eregi("$VD_campaign",$LOGallowed_campaigns)) and (!eregi("ALL-CAMPAIGNS",$LOGallowed_campaigns)) ) + if ( (!eregi(" $VD_campaign ",$LOGallowed_campaigns)) and (!eregi("ALL-CAMPAIGNS",$LOGallowed_campaigns)) ) { echo "VICIDIAL web client: VICIDIAL Campaign Login\n"; echo "\n"; @@ -533,8 +615,9 @@ $VDloginDISPLAY=0; echo "\n"; echo "Login: \n
"; echo "Password:
\n"; - echo "Campaign: $camp_form_code
\n"; - echo "\n"; + echo "Campaign: $camp_form_code
\n"; + echo "   \n"; + echo "\n"; echo "\n\n"; echo "\n\n"; echo "\n\n"; @@ -758,7 +841,7 @@ $VDloginDISPLAY=0; echo "\n"; echo "\n"; echo "
\n"; - echo "
\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -773,8 +856,9 @@ $VDloginDISPLAY=0; echo "User Password: "; echo "\n"; echo "Campaign: "; - echo "$camp_form_code\n"; - echo "\n"; + echo "$camp_form_code\n"; + echo "   \n"; + echo "\n"; echo "
VERSION: $version       BUILD: $build\n"; echo "\n"; echo "\n\n"; @@ -798,7 +882,7 @@ if (!$authphone) echo "\n"; echo "\n"; echo "
\n"; - echo "
\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -1199,8 +1283,9 @@ else echo "\n"; echo "Login: \n
"; echo "Password:
\n"; - echo "Campaign: $camp_form_code
\n"; - echo "\n"; + echo "Campaign: $camp_form_code
\n"; + echo "   \n"; + echo "\n"; echo "
\n\n"; echo "\n\n"; echo "\n\n"; @@ -1221,8 +1306,9 @@ else echo "\n"; echo "Login: \n
"; echo "Password:
\n"; - echo "Campaign: $camp_form_code
\n"; - echo "\n"; + echo "Campaign: $camp_form_code
\n"; + echo "   \n"; + echo "\n"; echo "\n\n"; echo "\n\n"; echo "\n\n"; diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index d2113805..98f57358 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -1556,9 +1556,9 @@ if ( ( (strlen($ADD)>4) && ($ADD < 99998) ) or ($ADD==3) or (($ADD>20) and ($ADD $stmt="SELECT user_group from vicidial_users where user='$user';"; $rslt=mysql_query($stmt, $link); $row=mysql_fetch_row($rslt); - $user_group = $row[0]; + $Ruser_group = $row[0]; - $stmt="SELECT allowed_campaigns from vicidial_user_groups where user_group='$user_group';"; + $stmt="SELECT allowed_campaigns from vicidial_user_groups where user_group='$Ruser_group';"; $rslt=mysql_query($stmt, $link); $row=mysql_fetch_row($rslt); $allowed_campaigns = $row[0]; @@ -5894,7 +5894,7 @@ if ($ADD==4) if ($WeBRooTWritablE > 0) { $fp = fopen ("./admin_changes_log.txt", "a"); - fwrite ($fp, "$date|MODIFY USER INFO |$PHP_AUTH_USER|$ip|pass='$pass',full_name='$full_name',user_level='$user_level',user_group='$user_group',phone_login='$phone_login',phone_pass='$phone_pass' where user='$user'|\n"); + fwrite ($fp, "$date|MODIFY USER INFO |$PHP_AUTH_USER|$ip|$stmt|\n"); fclose($fp); } }