\n";
- echo "";
-
- $stmt="SELECT admin_log_id,event_date,user,ip_address,event_section,event_type,record_id,event_code from vicidial_admin_log where event_section='$category' and record_id='$stage' order by event_date desc limit 10000;";
- $rslt=mysql_query($stmt, $link);
- $logs_to_print = mysql_num_rows($rslt);
-
- echo " ADMIN CHANGE LOG: Section Records - $category - $stage\n";
- echo "\n";
- echo "";
- echo "| ID | ";
- echo "DATE TIME | ";
- echo "USER | \n";
- echo "IP | \n";
- echo "SECTION | \n";
- echo "TYPE | \n";
- echo "RECORD ID | \n";
- echo "DESCRIPTION | \n";
- echo "GOTO | \n";
- echo " \n";
-
- $logs_printed = '';
- $o=0;
- while ($logs_to_print > $o)
+ if ($LOGuser_level >= 9)
{
- $row=mysql_fetch_row($rslt);
+ echo "\n";
+ echo "";
- if (eregi("USER|AGENT",$row[4])) {$record_link = "ADD=3&user=$row[6]";}
- if (eregi('CAMPAIGN',$row[4])) {$record_link = "ADD=31&campaign_id=$row[6]";}
- if (eregi('LIST',$row[4])) {$record_link = "ADD=311&list_id=$row[6]";}
- if (eregi('SCRIPT',$row[4])) {$record_link = "ADD=3111111&script_id=$row[6]";}
- if (eregi('FILTER',$row[4])) {$record_link = "ADD=31111111&lead_filter_id=$row[6]";}
- if (eregi('INGROUP',$row[4])) {$record_link = "ADD=3111&group_id=$row[6]";}
- if (eregi('DID',$row[4])) {$record_link = "ADD=3311&did_id=$row[6]";}
- if (eregi('USERGROUP',$row[4])) {$record_link = "ADD=311111&user_group=$row[6]";}
- if (eregi('REMOTEAGENT',$row[4])) {$record_link = "ADD=31111&remote_agent_id=$row[6]";}
- if (eregi('PHONE',$row[4])) {$record_link = "ADD=10000000000";}
- if (eregi('CALLTIME',$row[4])) {$record_link = "ADD=311111111&call_time_id=$row[6]";}
- if (eregi('SHIFT',$row[4])) {$record_link = "ADD=331111111&shift_id=$row[6]";}
- if (eregi('CONFTEMPLATE',$row[4])) {$record_link = "ADD=331111111111&template_id=$row[6]";}
- if (eregi('CARRIER',$row[4])) {$record_link = "ADD=341111111111&carrier_id=$row[6]";}
- if (eregi('SERVER',$row[4])) {$record_link = "ADD=311111111111&server_id=$row[6]";}
- if (eregi('CONFERENCE',$row[4])) {$record_link = "ADD=1000000000000";}
- if (eregi('SYSTEM',$row[4])) {$record_link = "ADD=311111111111111";}
- if (eregi('CATEGOR',$row[4])) {$record_link = "ADD=331111111111111";}
- if (eregi('GROUPALIAS',$row[4])) {$record_link = "ADD=33111111111&group_alias_id=$row[6]";}
+ $stmt="SELECT admin_log_id,event_date,user,ip_address,event_section,event_type,record_id,event_code from vicidial_admin_log where event_section='$category' and record_id='$stage' order by event_date desc limit 10000;";
+ $rslt=mysql_query($stmt, $link);
+ $logs_to_print = mysql_num_rows($rslt);
- if (eregi("1$|3$|5$|7$|9$", $o))
- {$bgcolor='bgcolor="#B9CBFD"';}
- else
- {$bgcolor='bgcolor="#9BB9FB"';}
- echo "| $row[0] | ";
- echo " $row[1] | ";
- echo " $row[2] | ";
- echo " $row[3] | ";
- echo " $row[4] | ";
- echo " $row[5] | ";
- echo " $row[6] | ";
- echo " $row[7] | ";
- echo " GOTO | ";
- echo " \n";
- $logs_printed .= "'$row[0]',";
- $o++;
+ echo " ADMIN CHANGE LOG: Section Records - $category - $stage\n";
+ echo "\n";
+ echo "";
+ echo "| ID | ";
+ echo "DATE TIME | ";
+ echo "USER | \n";
+ echo "IP | \n";
+ echo "SECTION | \n";
+ echo "TYPE | \n";
+ echo "RECORD ID | \n";
+ echo "DESCRIPTION | \n";
+ echo "GOTO | \n";
+ echo " \n";
+
+ $logs_printed = '';
+ $o=0;
+ while ($logs_to_print > $o)
+ {
+ $row=mysql_fetch_row($rslt);
+
+ if (eregi("USER|AGENT",$row[4])) {$record_link = "ADD=3&user=$row[6]";}
+ if (eregi('CAMPAIGN',$row[4])) {$record_link = "ADD=31&campaign_id=$row[6]";}
+ if (eregi('LIST',$row[4])) {$record_link = "ADD=311&list_id=$row[6]";}
+ if (eregi('SCRIPT',$row[4])) {$record_link = "ADD=3111111&script_id=$row[6]";}
+ if (eregi('FILTER',$row[4])) {$record_link = "ADD=31111111&lead_filter_id=$row[6]";}
+ if (eregi('INGROUP',$row[4])) {$record_link = "ADD=3111&group_id=$row[6]";}
+ if (eregi('DID',$row[4])) {$record_link = "ADD=3311&did_id=$row[6]";}
+ if (eregi('USERGROUP',$row[4])) {$record_link = "ADD=311111&user_group=$row[6]";}
+ if (eregi('REMOTEAGENT',$row[4])) {$record_link = "ADD=31111&remote_agent_id=$row[6]";}
+ if (eregi('PHONE',$row[4])) {$record_link = "ADD=10000000000";}
+ if (eregi('CALLTIME',$row[4])) {$record_link = "ADD=311111111&call_time_id=$row[6]";}
+ if (eregi('SHIFT',$row[4])) {$record_link = "ADD=331111111&shift_id=$row[6]";}
+ if (eregi('CONFTEMPLATE',$row[4])) {$record_link = "ADD=331111111111&template_id=$row[6]";}
+ if (eregi('CARRIER',$row[4])) {$record_link = "ADD=341111111111&carrier_id=$row[6]";}
+ if (eregi('SERVER',$row[4])) {$record_link = "ADD=311111111111&server_id=$row[6]";}
+ if (eregi('CONFERENCE',$row[4])) {$record_link = "ADD=1000000000000";}
+ if (eregi('SYSTEM',$row[4])) {$record_link = "ADD=311111111111111";}
+ if (eregi('CATEGOR',$row[4])) {$record_link = "ADD=331111111111111";}
+ if (eregi('GROUPALIAS',$row[4])) {$record_link = "ADD=33111111111&group_alias_id=$row[6]";}
+
+ if (eregi("1$|3$|5$|7$|9$", $o))
+ {$bgcolor='bgcolor="#B9CBFD"';}
+ else
+ {$bgcolor='bgcolor="#9BB9FB"';}
+ echo "| $row[0] | ";
+ echo " $row[1] | ";
+ echo " $row[2] | ";
+ echo " $row[3] | ";
+ echo " $row[4] | ";
+ echo " $row[5] | ";
+ echo " $row[6] | ";
+ echo " $row[7] | ";
+ echo " GOTO | ";
+ echo " \n";
+ $logs_printed .= "'$row[0]',";
+ $o++;
+ }
+ echo "
\n";
+ echo "\n";
+ echo "\n";
+ }
+ else
+ {
+ echo "You do not have permission to view this page\n";
+ exit;
}
- echo " |
\n";
- echo "\n";
- echo "\n";
}
@@ -24464,53 +24472,61 @@ if ($ADD==720000000000000)
if ($ADD==730000000000000)
{
- echo "\n";
- echo "";
-
- $stmt="SELECT admin_log_id,event_date,val.user,ip_address,event_section,event_type,record_id,event_code,event_notes,event_sql,full_name from vicidial_admin_log val, vicidial_users vu where admin_log_id='$stage' and val.user=vu.user;";
- $rslt=mysql_query($stmt, $link);
- $logs_to_print = mysql_num_rows($rslt);
-
- if ($logs_to_print > 0)
+ if ($LOGuser_level >= 9)
{
- $row=mysql_fetch_row($rslt);
- echo " ADMIN CHANGE LOG: Record Detail - $stage
\n";
- echo "\n";
- echo "";
- echo "| ID: | ";
- echo "$row[0] | ";
- echo " \n";
- echo "| DATE TIME: | ";
- echo "$row[1] | ";
- echo " \n";
- echo "| USER: | ";
- echo "$row[2] - $row[10] | ";
- echo " \n";
- echo "| IP: | ";
- echo "$row[3] | ";
- echo " \n";
- echo "| SECTION: | ";
- echo "$row[4] | ";
- echo " \n";
- echo "| TYPE: | ";
- echo "$row[5] | ";
- echo " \n";
- echo "| RECORD ID: | ";
- echo "$row[6] | ";
- echo " \n";
- echo "| DESCRIPTION: | ";
- echo "$row[7] | ";
- echo " \n";
- echo "| NOTES: | ";
- echo "$row[8] | ";
- echo " \n";
- $row[9] = eregi_replace("',","' ,",$row[9]);
- echo "| SQL: | ";
- echo "$row[9] | ";
- echo " \n";
- echo "
\n";
- echo "\n";
- echo "\n";
+ echo "\n";
+ echo "";
+
+ $stmt="SELECT admin_log_id,event_date,val.user,ip_address,event_section,event_type,record_id,event_code,event_notes,event_sql,full_name from vicidial_admin_log val, vicidial_users vu where admin_log_id='$stage' and val.user=vu.user;";
+ $rslt=mysql_query($stmt, $link);
+ $logs_to_print = mysql_num_rows($rslt);
+
+ if ($logs_to_print > 0)
+ {
+ $row=mysql_fetch_row($rslt);
+ echo " ADMIN CHANGE LOG: Record Detail - $stage
\n";
+ echo "\n";
+ echo "";
+ echo "| ID: | ";
+ echo "$row[0] | ";
+ echo " \n";
+ echo "| DATE TIME: | ";
+ echo "$row[1] | ";
+ echo " \n";
+ echo "| USER: | ";
+ echo "$row[2] - $row[10] | ";
+ echo " \n";
+ echo "| IP: | ";
+ echo "$row[3] | ";
+ echo " \n";
+ echo "| SECTION: | ";
+ echo "$row[4] | ";
+ echo " \n";
+ echo "| TYPE: | ";
+ echo "$row[5] | ";
+ echo " \n";
+ echo "| RECORD ID: | ";
+ echo "$row[6] | ";
+ echo " \n";
+ echo "| DESCRIPTION: | ";
+ echo "$row[7] | ";
+ echo " \n";
+ echo "| NOTES: | ";
+ echo "$row[8] | ";
+ echo " \n";
+ $row[9] = eregi_replace("',","' ,",$row[9]);
+ echo "| SQL: | ";
+ echo "$row[9] | ";
+ echo " \n";
+ echo "
\n";
+ echo "\n";
+ echo "\n";
+ }
+ }
+ else
+ {
+ echo "You do not have permission to view this page\n";
+ exit;
}
}
diff --git a/agc_2-X/branches/agc_2.2.0/www/vicidial/audio_store.php b/agc_2-X/branches/agc_2.2.0/www/vicidial/audio_store.php
index 4f8941ea..f3e0624e 100644
--- a/agc_2-X/branches/agc_2.2.0/www/vicidial/audio_store.php
+++ b/agc_2-X/branches/agc_2.2.0/www/vicidial/audio_store.php
@@ -1,17 +1,18 @@
LICENSE: AGPLv2
+# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2
#
# Central Audio Storage script
#
# CHANGES
# 90511-1325 - First build
# 90618-0640 - Fix for users going through proxy or tunnel
+# 100401-1037 - remove spaces and special characters from filenames, admin log uploads
#
-$version = '2.2.0-2';
-$build = '90618-0640';
+$version = '2.2.0-3';
+$build = '100401-1037';
$MT[0]='';
@@ -191,8 +192,12 @@ if ($action == "LIST")
# curl 'http://10.0.0.4/vicidial/audio_store.php?action=AUTOUPLOAD' -F "audiofile=@/var/lib/asterisk/sounds/beep.gsm"
if ($action == "AUTOUPLOAD")
{
- if ($audiofile)
+ if ($audiofile)
{
+ $AF_path = preg_replace("/ /",'\ ',$AF_path);
+ $AF_path = preg_replace("/@/",'\@',$AF_path);
+ $audiofile_name = preg_replace("/ /",'',$audiofile_name);
+ $audiofile_name = preg_replace("/@/",'',$audiofile_name);
copy($AF_path, "$WeBServeRRooT/$sounds_web_directory/$audiofile_name");
chmod("$WeBServeRRooT/$sounds_web_directory/$audiofile_name", 0766);
@@ -277,6 +282,10 @@ if ($action == "MANUALUPLOAD")
{
if ($audiofile)
{
+ $AF_path = preg_replace("/ /",'\ ',$AF_path);
+ $AF_path = preg_replace("/@/",'\@',$AF_path);
+ $audiofile_name = preg_replace("/ /",'',$audiofile_name);
+ $audiofile_name = preg_replace("/@/",'',$audiofile_name);
copy($AF_path, "$WeBServeRRooT/$sounds_web_directory/$audiofile_name");
chmod("$WeBServeRRooT/$sounds_web_directory/$audiofile_name", 0766);
@@ -284,6 +293,14 @@ if ($action == "MANUALUPLOAD")
$stmt="UPDATE servers SET sounds_update='Y';";
$rslt=mysql_query($stmt, $link);
+
+ ### LOG INSERTION Admin Log Table ###
+ $SQL_log = "$stmt|";
+ $SQL_log = ereg_replace(';','',$SQL_log);
+ $SQL_log = addslashes($SQL_log);
+ $stmt="INSERT INTO vicidial_admin_log set event_date=NOW(), user='$PHP_AUTH_USER', ip_address='$ip', event_section='AUDIOSTORE', event_type='LOAD', record_id='manualupload', event_code='$audiofile_name " . filesize("$WeBServeRRooT/$sounds_web_directory/$audiofile_name") . "', event_sql=\"$SQL_log\", event_notes='$audiofile_name $AF_path $AF_orig';";
+ if ($DB) {echo "|$stmt|\n";}
+ $rslt=mysql_query($stmt, $link);
}
else
{
@@ -309,8 +326,18 @@ if ($action == "MANUALUPLOAD")
| | Audio Store- VERSION: BUILD: |
|
-We STRONGLY recommend uploading only 16bit 8k PCM WAV audio files(.wav)
-
-audio file list
+We STRONGLY recommend uploading only 16bit 8k PCM WAV audio files(.wav)
+
All spaces will be stripped from uploaded audio file names
+audio file list
+
+
+
+
\n";
+
+echo "
Click here to see a log of the uploads to the audio store\n";
+
+?>
|
diff --git a/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt b/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt
index 614121dd..98285c69 100644
--- a/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt
+++ b/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt
@@ -87,6 +87,7 @@ If set to something other than NONE or empty this will override the External Ext
Click here to see agents logged in to this inbound group||
Agent Choose Blended||
This option if set to 1 allows the user to choose if the agent has their campaign set to blended or not, and if not then the default blended setting will be used. Default is 1 for enabled||
+Click here to see a log of the uploads to the audio store||
AST_VICIDIAL_ingrouplist.php
diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php
index f055cc1c..44658ade 100644
--- a/agc_2-X/trunk/www/vicidial/admin.php
+++ b/agc_2-X/trunk/www/vicidial/admin.php
@@ -23156,7 +23156,7 @@ if ($ADD==311111111111111)
echo "\n";
if ($LOGuser_level >= 9)
{
- echo "
Click here to see Admin chages to the system settings\n";
+ echo "
Click here to see Admin chages to the system settings\n";
}
}
else
@@ -25098,73 +25098,81 @@ if ($ADD==710000000000000)
if ($ADD==720000000000000)
{
- echo "\n";
- echo "";
-
- $stmt="SELECT admin_log_id,event_date,user,ip_address,event_section,event_type,record_id,event_code from vicidial_admin_log where event_section='$category' and record_id='$stage' order by event_date desc limit 10000;";
- $rslt=mysql_query($stmt, $link);
- $logs_to_print = mysql_num_rows($rslt);
-
- echo " ADMIN CHANGE LOG: Section Records - $category - $stage\n";
- echo "\n";
- echo "";
- echo "| ID | ";
- echo "DATE TIME | ";
- echo "USER | \n";
- echo "IP | \n";
- echo "SECTION | \n";
- echo "TYPE | \n";
- echo "RECORD ID | \n";
- echo "DESCRIPTION | \n";
- echo "GOTO | \n";
- echo " \n";
-
- $logs_printed = '';
- $o=0;
- while ($logs_to_print > $o)
+ if ($LOGuser_level >= 9)
{
- $row=mysql_fetch_row($rslt);
+ echo "\n";
+ echo "";
- if (eregi("USER|AGENT",$row[4])) {$record_link = "ADD=3&user=$row[6]";}
- if (eregi('CAMPAIGN',$row[4])) {$record_link = "ADD=31&campaign_id=$row[6]";}
- if (eregi('LIST',$row[4])) {$record_link = "ADD=311&list_id=$row[6]";}
- if (eregi('SCRIPT',$row[4])) {$record_link = "ADD=3111111&script_id=$row[6]";}
- if (eregi('FILTER',$row[4])) {$record_link = "ADD=31111111&lead_filter_id=$row[6]";}
- if (eregi('INGROUP',$row[4])) {$record_link = "ADD=3111&group_id=$row[6]";}
- if (eregi('DID',$row[4])) {$record_link = "ADD=3311&did_id=$row[6]";}
- if (eregi('USERGROUP',$row[4])) {$record_link = "ADD=311111&user_group=$row[6]";}
- if (eregi('REMOTEAGENT',$row[4])) {$record_link = "ADD=31111&remote_agent_id=$row[6]";}
- if (eregi('PHONE',$row[4])) {$record_link = "ADD=10000000000";}
- if (eregi('CALLTIME',$row[4])) {$record_link = "ADD=311111111&call_time_id=$row[6]";}
- if (eregi('SHIFT',$row[4])) {$record_link = "ADD=331111111&shift_id=$row[6]";}
- if (eregi('CONFTEMPLATE',$row[4])) {$record_link = "ADD=331111111111&template_id=$row[6]";}
- if (eregi('CARRIER',$row[4])) {$record_link = "ADD=341111111111&carrier_id=$row[6]";}
- if (eregi('SERVER',$row[4])) {$record_link = "ADD=311111111111&server_id=$row[6]";}
- if (eregi('CONFERENCE',$row[4])) {$record_link = "ADD=1000000000000";}
- if (eregi('SYSTEM',$row[4])) {$record_link = "ADD=311111111111111";}
- if (eregi('CATEGOR',$row[4])) {$record_link = "ADD=331111111111111";}
- if (eregi('GROUPALIAS',$row[4])) {$record_link = "ADD=33111111111&group_alias_id=$row[6]";}
+ $stmt="SELECT admin_log_id,event_date,user,ip_address,event_section,event_type,record_id,event_code from vicidial_admin_log where event_section='$category' and record_id='$stage' order by event_date desc limit 10000;";
+ $rslt=mysql_query($stmt, $link);
+ $logs_to_print = mysql_num_rows($rslt);
- if (eregi("1$|3$|5$|7$|9$", $o))
- {$bgcolor='bgcolor="#B9CBFD"';}
- else
- {$bgcolor='bgcolor="#9BB9FB"';}
- echo "| $row[0] | ";
- echo " $row[1] | ";
- echo " $row[2] | ";
- echo " $row[3] | ";
- echo " $row[4] | ";
- echo " $row[5] | ";
- echo " $row[6] | ";
- echo " $row[7] | ";
- echo " GOTO | ";
- echo " \n";
- $logs_printed .= "'$row[0]',";
- $o++;
+ echo " ADMIN CHANGE LOG: Section Records - $category - $stage\n";
+ echo "\n";
+ echo "";
+ echo "| ID | ";
+ echo "DATE TIME | ";
+ echo "USER | \n";
+ echo "IP | \n";
+ echo "SECTION | \n";
+ echo "TYPE | \n";
+ echo "RECORD ID | \n";
+ echo "DESCRIPTION | \n";
+ echo "GOTO | \n";
+ echo " \n";
+
+ $logs_printed = '';
+ $o=0;
+ while ($logs_to_print > $o)
+ {
+ $row=mysql_fetch_row($rslt);
+
+ if (eregi("USER|AGENT",$row[4])) {$record_link = "ADD=3&user=$row[6]";}
+ if (eregi('CAMPAIGN',$row[4])) {$record_link = "ADD=31&campaign_id=$row[6]";}
+ if (eregi('LIST',$row[4])) {$record_link = "ADD=311&list_id=$row[6]";}
+ if (eregi('SCRIPT',$row[4])) {$record_link = "ADD=3111111&script_id=$row[6]";}
+ if (eregi('FILTER',$row[4])) {$record_link = "ADD=31111111&lead_filter_id=$row[6]";}
+ if (eregi('INGROUP',$row[4])) {$record_link = "ADD=3111&group_id=$row[6]";}
+ if (eregi('DID',$row[4])) {$record_link = "ADD=3311&did_id=$row[6]";}
+ if (eregi('USERGROUP',$row[4])) {$record_link = "ADD=311111&user_group=$row[6]";}
+ if (eregi('REMOTEAGENT',$row[4])) {$record_link = "ADD=31111&remote_agent_id=$row[6]";}
+ if (eregi('PHONE',$row[4])) {$record_link = "ADD=10000000000";}
+ if (eregi('CALLTIME',$row[4])) {$record_link = "ADD=311111111&call_time_id=$row[6]";}
+ if (eregi('SHIFT',$row[4])) {$record_link = "ADD=331111111&shift_id=$row[6]";}
+ if (eregi('CONFTEMPLATE',$row[4])) {$record_link = "ADD=331111111111&template_id=$row[6]";}
+ if (eregi('CARRIER',$row[4])) {$record_link = "ADD=341111111111&carrier_id=$row[6]";}
+ if (eregi('SERVER',$row[4])) {$record_link = "ADD=311111111111&server_id=$row[6]";}
+ if (eregi('CONFERENCE',$row[4])) {$record_link = "ADD=1000000000000";}
+ if (eregi('SYSTEM',$row[4])) {$record_link = "ADD=311111111111111";}
+ if (eregi('CATEGOR',$row[4])) {$record_link = "ADD=331111111111111";}
+ if (eregi('GROUPALIAS',$row[4])) {$record_link = "ADD=33111111111&group_alias_id=$row[6]";}
+
+ if (eregi("1$|3$|5$|7$|9$", $o))
+ {$bgcolor='bgcolor="#B9CBFD"';}
+ else
+ {$bgcolor='bgcolor="#9BB9FB"';}
+ echo "| $row[0] | ";
+ echo " $row[1] | ";
+ echo " $row[2] | ";
+ echo " $row[3] | ";
+ echo " $row[4] | ";
+ echo " $row[5] | ";
+ echo " $row[6] | ";
+ echo " $row[7] | ";
+ echo " GOTO | ";
+ echo " \n";
+ $logs_printed .= "'$row[0]',";
+ $o++;
+ }
+ echo "
\n";
+ echo "\n";
+ echo "\n";
+ }
+ else
+ {
+ echo "You do not have permission to view this page\n";
+ exit;
}
- echo " |
\n";
- echo "\n";
- echo "\n";
}
@@ -25174,53 +25182,61 @@ if ($ADD==720000000000000)
if ($ADD==730000000000000)
{
- echo "\n";
- echo "";
-
- $stmt="SELECT admin_log_id,event_date,val.user,ip_address,event_section,event_type,record_id,event_code,event_notes,event_sql,full_name from vicidial_admin_log val, vicidial_users vu where admin_log_id='$stage' and val.user=vu.user;";
- $rslt=mysql_query($stmt, $link);
- $logs_to_print = mysql_num_rows($rslt);
-
- if ($logs_to_print > 0)
+ if ($LOGuser_level >= 9)
{
- $row=mysql_fetch_row($rslt);
- echo " ADMIN CHANGE LOG: Record Detail - $stage
\n";
- echo "\n";
- echo "";
- echo "| ID: | ";
- echo "$row[0] | ";
- echo " \n";
- echo "| DATE TIME: | ";
- echo "$row[1] | ";
- echo " \n";
- echo "| USER: | ";
- echo "$row[2] - $row[10] | ";
- echo " \n";
- echo "| IP: | ";
- echo "$row[3] | ";
- echo " \n";
- echo "| SECTION: | ";
- echo "$row[4] | ";
- echo " \n";
- echo "| TYPE: | ";
- echo "$row[5] | ";
- echo " \n";
- echo "| RECORD ID: | ";
- echo "$row[6] | ";
- echo " \n";
- echo "| DESCRIPTION: | ";
- echo "$row[7] | ";
- echo " \n";
- echo "| NOTES: | ";
- echo "$row[8] | ";
- echo " \n";
- $row[9] = eregi_replace("',","' ,",$row[9]);
- echo "| SQL: | ";
- echo "$row[9] | ";
- echo " \n";
- echo "
\n";
- echo "\n";
- echo "\n";
+ echo "\n";
+ echo "";
+
+ $stmt="SELECT admin_log_id,event_date,val.user,ip_address,event_section,event_type,record_id,event_code,event_notes,event_sql,full_name from vicidial_admin_log val, vicidial_users vu where admin_log_id='$stage' and val.user=vu.user;";
+ $rslt=mysql_query($stmt, $link);
+ $logs_to_print = mysql_num_rows($rslt);
+
+ if ($logs_to_print > 0)
+ {
+ $row=mysql_fetch_row($rslt);
+ echo " ADMIN CHANGE LOG: Record Detail - $stage
\n";
+ echo "\n";
+ echo "";
+ echo "| ID: | ";
+ echo "$row[0] | ";
+ echo " \n";
+ echo "| DATE TIME: | ";
+ echo "$row[1] | ";
+ echo " \n";
+ echo "| USER: | ";
+ echo "$row[2] - $row[10] | ";
+ echo " \n";
+ echo "| IP: | ";
+ echo "$row[3] | ";
+ echo " \n";
+ echo "| SECTION: | ";
+ echo "$row[4] | ";
+ echo " \n";
+ echo "| TYPE: | ";
+ echo "$row[5] | ";
+ echo " \n";
+ echo "| RECORD ID: | ";
+ echo "$row[6] | ";
+ echo " \n";
+ echo "| DESCRIPTION: | ";
+ echo "$row[7] | ";
+ echo " \n";
+ echo "| NOTES: | ";
+ echo "$row[8] | ";
+ echo " \n";
+ $row[9] = eregi_replace("',","' ,",$row[9]);
+ echo "| SQL: | ";
+ echo "$row[9] | ";
+ echo " \n";
+ echo "
\n";
+ echo "\n";
+ echo "\n";
+ }
+ }
+ else
+ {
+ echo "You do not have permission to view this page\n";
+ exit;
}
}
diff --git a/agc_2-X/trunk/www/vicidial/audio_store.php b/agc_2-X/trunk/www/vicidial/audio_store.php
index 4f8941ea..f3e0624e 100644
--- a/agc_2-X/trunk/www/vicidial/audio_store.php
+++ b/agc_2-X/trunk/www/vicidial/audio_store.php
@@ -1,17 +1,18 @@
LICENSE: AGPLv2
+# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2
#
# Central Audio Storage script
#
# CHANGES
# 90511-1325 - First build
# 90618-0640 - Fix for users going through proxy or tunnel
+# 100401-1037 - remove spaces and special characters from filenames, admin log uploads
#
-$version = '2.2.0-2';
-$build = '90618-0640';
+$version = '2.2.0-3';
+$build = '100401-1037';
$MT[0]='';
@@ -191,8 +192,12 @@ if ($action == "LIST")
# curl 'http://10.0.0.4/vicidial/audio_store.php?action=AUTOUPLOAD' -F "audiofile=@/var/lib/asterisk/sounds/beep.gsm"
if ($action == "AUTOUPLOAD")
{
- if ($audiofile)
+ if ($audiofile)
{
+ $AF_path = preg_replace("/ /",'\ ',$AF_path);
+ $AF_path = preg_replace("/@/",'\@',$AF_path);
+ $audiofile_name = preg_replace("/ /",'',$audiofile_name);
+ $audiofile_name = preg_replace("/@/",'',$audiofile_name);
copy($AF_path, "$WeBServeRRooT/$sounds_web_directory/$audiofile_name");
chmod("$WeBServeRRooT/$sounds_web_directory/$audiofile_name", 0766);
@@ -277,6 +282,10 @@ if ($action == "MANUALUPLOAD")
{
if ($audiofile)
{
+ $AF_path = preg_replace("/ /",'\ ',$AF_path);
+ $AF_path = preg_replace("/@/",'\@',$AF_path);
+ $audiofile_name = preg_replace("/ /",'',$audiofile_name);
+ $audiofile_name = preg_replace("/@/",'',$audiofile_name);
copy($AF_path, "$WeBServeRRooT/$sounds_web_directory/$audiofile_name");
chmod("$WeBServeRRooT/$sounds_web_directory/$audiofile_name", 0766);
@@ -284,6 +293,14 @@ if ($action == "MANUALUPLOAD")
$stmt="UPDATE servers SET sounds_update='Y';";
$rslt=mysql_query($stmt, $link);
+
+ ### LOG INSERTION Admin Log Table ###
+ $SQL_log = "$stmt|";
+ $SQL_log = ereg_replace(';','',$SQL_log);
+ $SQL_log = addslashes($SQL_log);
+ $stmt="INSERT INTO vicidial_admin_log set event_date=NOW(), user='$PHP_AUTH_USER', ip_address='$ip', event_section='AUDIOSTORE', event_type='LOAD', record_id='manualupload', event_code='$audiofile_name " . filesize("$WeBServeRRooT/$sounds_web_directory/$audiofile_name") . "', event_sql=\"$SQL_log\", event_notes='$audiofile_name $AF_path $AF_orig';";
+ if ($DB) {echo "|$stmt|\n";}
+ $rslt=mysql_query($stmt, $link);
}
else
{
@@ -309,8 +326,18 @@ if ($action == "MANUALUPLOAD")
| | Audio Store- VERSION: BUILD: |
|
-We STRONGLY recommend uploading only 16bit 8k PCM WAV audio files(.wav)
-
-audio file list
+We STRONGLY recommend uploading only 16bit 8k PCM WAV audio files(.wav)
+
All spaces will be stripped from uploaded audio file names
+audio file list
+
+
+
+
\n";
+
+echo "
Click here to see a log of the uploads to the audio store\n";
+
+?>
|
|
|