diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index 9a232852..90f930ce 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -3585,12 +3585,13 @@ else # 150806-1348 - Added Admin -> Settings Containers # 150903-1457 - Added options for encrypt hosted features # 150909-0158 - Added Report Page Servers Summary and Admin Utilities Page options for User Group Allowed Reports +# 150909-1418 - Added $active_only_default_campaigns options.php option for Campaigns Listings # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 9 to access this page the first time -$admin_version = '2.12-507a'; -$build = '150909-0158'; +$admin_version = '2.12-508a'; +$build = '150909-1418'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -31831,6 +31832,21 @@ if ($ADD==10) echo "
\n"; echo ""; + if (file_exists('options.php')) + {require('options.php');} + + echo "
"._QXZ("CAMPAIGN LISTINGS").":\n"; + if ( (preg_match('/display_active/',$status)) or ( (!preg_match('/display_all/',$status)) and ($active_only_default_campaigns > 0) ) ) + { + $SQLstatus = 'Y'; + echo "   "._QXZ("show all campaigns")."\n"; + } + else + { + $SQLstatus = ''; + echo "   "._QXZ("show only active campaigns")."\n"; + } + $camp_group_SQL = $LOGadmin_viewable_groupsSQL; if (strlen($whereLOGallowed_campaignsSQL) < 6) {$camp_group_SQL = $whereLOGadmin_viewable_groupsSQL;} @@ -31838,7 +31854,6 @@ if ($ADD==10) $rslt=mysql_to_mysqli($stmt, $link); $campaigns_to_print = mysqli_num_rows($rslt); - echo "
"._QXZ("CAMPAIGN LISTINGS").":\n"; echo "
\n"; echo ""; echo ""; @@ -31854,26 +31869,32 @@ if ($ADD==10) } echo "\n"; - $o=0; + $o=0; $p=0; while ($campaigns_to_print > $o) { $row=mysqli_fetch_row($rslt); - if (preg_match('/1$|3$|5$|7$|9$/i', $o)) - {$bgcolor='bgcolor="#B9CBFD"';} + if ( ($SQLstatus!='') and ($row[2]=='N') ) + {$skip_display=1;} else - {$bgcolor='bgcolor="#9BB9FB"';} - echo ""; - echo ""; - echo ""; - echo ""; - if ($SSoutbound_autodial_active > 0) { - echo ""; - echo ""; - echo ""; - echo ""; + if (preg_match('/1$|3$|5$|7$|9$/i', $p)) + {$bgcolor='bgcolor="#B9CBFD"';} + else + {$bgcolor='bgcolor="#9BB9FB"';} + echo ""; + echo ""; + echo ""; + echo ""; + if ($SSoutbound_autodial_active > 0) + { + echo ""; + echo ""; + echo ""; + echo ""; + } + echo "\n"; + $p++; } - echo "\n"; $o++; } diff --git a/agc_2-X/trunk/www/vicidial/call_report_export_carrier.php b/agc_2-X/trunk/www/vicidial/call_report_export_carrier.php index 512188d5..ba5898a9 100644 --- a/agc_2-X/trunk/www/vicidial/call_report_export_carrier.php +++ b/agc_2-X/trunk/www/vicidial/call_report_export_carrier.php @@ -553,10 +553,11 @@ if ($run_export > 0) } # Carrier/dial log - for ($q=$carrier_log_offset; $q LICENSE: AGPLv2 +# Copyright (C) 2015 Matt Florell LICENSE: AGPLv2 # # rename this file to options.php for the settings here to go into effect # @@ -17,6 +17,7 @@ # 140124-1003 - Removed extra newline at end of file # 140624-1422 - Added droppedOFtotal options.php option # 150619-0135 - Added DROPANSWERpercent_adjustment options.php option for AST_VDADstats.php +# 150909-1417 - Added $active_only_default_campaigns option for admin.php # # used by the realtime_report.php script @@ -84,4 +85,7 @@ $atdr_login_logout_user_link = 0; # alternate calculation of 'Percent of DROP Calls taken out of Answers' in AST_VDADstats.php $DROPANSWERpercent_adjustment = 0; + +# Display only active campaigns by default in admin.php Campaigns Listings page +$active_only_default_campaigns = 0; ?>
"._QXZ("CAMPAIGN ID").""._QXZ("MODIFY")."
$row[0]   $row[1]   $row[2]   $row[7]   $row[3]   $row[4]   $row[5]   $row[6]
$row[0]   $row[1]   $row[2]   $row[7]   $row[3]   $row[4]   $row[5]   $row[6]"._QXZ("MODIFY")."
"._QXZ("MODIFY")."