diff --git a/agc_2-X/trunk/bin/ADMIN_update_server_ip.pl b/agc_2-X/trunk/bin/ADMIN_update_server_ip.pl index f867be74..8ebab0d6 100644 --- a/agc_2-X/trunk/bin/ADMIN_update_server_ip.pl +++ b/agc_2-X/trunk/bin/ADMIN_update_server_ip.pl @@ -438,10 +438,7 @@ if( $VARserver_ip =~ m/(\S+)\.(\S+)\.(\S+)\.(\S+)/ ) print "\nSERVER IP ADDRESS CHANGE FOR VICIDIAL FINISHED!\n"; print "\nPlease remember to change your extensions.conf entries for the new IP address:\n"; -print "exten => _$VARremDIALstr*8600XXX,1,Goto(default,${EXTEN:16},1)\n"; -print "exten => _$VARremDIALstr*8600XXX*.,1,Goto(default,${EXTEN:16},1)\n"; -print "exten => _$VARremDIALstr*78600XXX,1,Goto(default,${EXTEN:16},1)\n"; -print "exten => _$VARremDIALstr*78600XXX*.,1,Goto(default,${EXTEN:16},1)\n"; +print "exten => _$VARremDIALstr*.,1,Goto(default,${EXTEN:16},1)\n"; print "exten => _8600XXX*.,1,AGI(agi-VDADfixCXFER.agi)\n"; print "exten => _78600XXX*.,1,AGI(agi-VDADfixCXFER.agi)\n"; diff --git a/agc_2-X/trunk/install.pl b/agc_2-X/trunk/install.pl index 29e0c3bd..49d5ce6e 100644 --- a/agc_2-X/trunk/install.pl +++ b/agc_2-X/trunk/install.pl @@ -2216,10 +2216,7 @@ if( $VARserver_ip =~ m/(\S+)\.(\S+)\.(\S+)\.(\S+)/ ) print "\nIMPORTANT NOTE!\n"; print "\nPlease remember to put these lines in your extensions.conf file:\n"; -print "exten => _$VARremDIALstr*8600XXX,1,Goto(default,\${EXTEN:16},1)\n"; -print "exten => _$VARremDIALstr*8600XXX*.,1,Goto(default,\${EXTEN:16},1)\n"; -print "exten => _$VARremDIALstr*78600XXX,1,Goto(default,\${EXTEN:16},1)\n"; -print "exten => _$VARremDIALstr*78600XXX*.,1,Goto(default,\${EXTEN:16},1)\n"; +print "exten => _$VARremDIALstr*.,1,Goto(default,\${EXTEN:16},1)\n"; print "exten => _8600XXX*.,1,AGI(agi-VDADfixCXFER.agi)\n"; print "exten => _78600XXX*.,1,AGI(agi-VDADfixCXFER.agi)\n"; diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index fc227b75..8552937a 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -14772,7 +14772,7 @@ echo "MODIFY\n"; else {$bgcolor='bgcolor="#9BB9FB"';} echo "$row[0]$row[1]$row[2]"; - echo "MODIFY\n"; + echo "MODIFY\n"; $o++; } diff --git a/agc_2-X/trunk/www/vicidial/user_stats.php b/agc_2-X/trunk/www/vicidial/user_stats.php index c93c0a08..c5b9072f 100644 --- a/agc_2-X/trunk/www/vicidial/user_stats.php +++ b/agc_2-X/trunk/www/vicidial/user_stats.php @@ -22,16 +22,18 @@ $PHP_AUTH_USER=$_SERVER['PHP_AUTH_USER']; $PHP_AUTH_PW=$_SERVER['PHP_AUTH_PW']; $PHP_SELF=$_SERVER['PHP_SELF']; if (isset($_GET["begin_date"])) {$begin_date=$_GET["begin_date"];} - elseif (isset($_POST["begin_date"])) {$begin_date=$_POST["begin_date"];} + elseif (isset($_POST["begin_date"])) {$begin_date=$_POST["begin_date"];} if (isset($_GET["end_date"])) {$end_date=$_GET["end_date"];} elseif (isset($_POST["end_date"])) {$end_date=$_POST["end_date"];} -if (isset($_GET["user"])) {$user=$_GET["user"];} - elseif (isset($_POST["user"])) {$user=$_POST["user"];} +if (isset($_GET["user"])) {$user=$_GET["user"];} + elseif (isset($_POST["user"])) {$user=$_POST["user"];} if (isset($_GET["campaign"])) {$campaign=$_GET["campaign"];} elseif (isset($_POST["campaign"])) {$campaign=$_POST["campaign"];} -if (isset($_GET["submit"])) {$submit=$_GET["submit"];} +if (isset($_GET["DB"])) {$DB=$_GET["DB"];} + elseif (isset($_POST["DB"])) {$DB=$_POST["DB"];} +if (isset($_GET["submit"])) {$submit=$_GET["submit"];} elseif (isset($_POST["submit"])) {$submit=$_POST["submit"];} -if (isset($_GET["SUBMIT"])) {$SUBMIT=$_GET["SUBMIT"];} +if (isset($_GET["SUBMIT"])) {$SUBMIT=$_GET["SUBMIT"];} elseif (isset($_POST["SUBMIT"])) {$SUBMIT=$_POST["SUBMIT"];} $PHP_AUTH_USER = ereg_replace("[^0-9a-zA-Z]","",$PHP_AUTH_USER); @@ -109,6 +111,7 @@ echo "\n"; echo "\n"; +echo "\n"; echo " to \n"; echo "  \n"; echo "\n"; @@ -274,8 +277,8 @@ echo "\n"; $SQday_ARY = explode('-',$begin_date); $EQday_ARY = explode('-',$end_date); -$SQepoch = mktime(0, 0, 0, $EQday_ARY[1], $EQday_ARY[2], $EQday_ARY[0]); -$EQepoch = mktime(23, 59, 59, $SQday_ARY[1], $SQday_ARY[2], $SQday_ARY[0]); +$SQepoch = mktime(0, 0, 0, $SQday_ARY[1], $SQday_ARY[2], $SQday_ARY[0]); +$EQepoch = mktime(23, 59, 59, $EQday_ARY[1], $EQday_ARY[2], $EQday_ARY[0]); echo "

\n"; @@ -286,6 +289,7 @@ echo "\n"; echo "\n"; $stmt="SELECT event,event_epoch,user_group,login_sec,ip_address from vicidial_timeclock_log where user='" . mysql_real_escape_string($user) . "' and event_epoch >= '$SQepoch' and event_epoch <= '$EQepoch';"; + if ($DB>0) {echo "|$stmt|";} $rslt=mysql_query($stmt, $link); $events_to_print = mysql_num_rows($rslt);
EVENT DATE IP ADDRESS GROUPHOURS:MINUTES