diff --git a/agc_2-X/trunk/UPGRADE b/agc_2-X/trunk/UPGRADE index 5eadc7ef..c9435bf0 100644 --- a/agc_2-X/trunk/UPGRADE +++ b/agc_2-X/trunk/UPGRADE @@ -100,6 +100,8 @@ OTHER CHANGES: 18. Added ability to delete audio files from the audio store +19. Added logging of svn version information in database + diff --git a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql index f970aed3..c9159410 100644 --- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql @@ -132,7 +132,9 @@ external_server_ip VARCHAR(100) default '', custom_dialplan_entry TEXT, active_twin_server_ip VARCHAR(15) default '', user_group VARCHAR(20) default '---ALL---', -audio_store_purge TEXT +audio_store_purge TEXT, +svn_revision INT(9) default '0', +svn_info TEXT ); CREATE UNIQUE INDEX server_id on servers (server_id); @@ -1488,7 +1490,8 @@ svn_version VARCHAR(100) default '', call_menu_qualify_enabled ENUM('0','1') default '0', admin_list_counts ENUM('0','1') default '1', allow_voicemail_greeting ENUM('0','1') default '0', -audio_store_purge TEXT +audio_store_purge TEXT, +svn_revision INT(9) default '0' ); CREATE TABLE vicidial_campaigns_list_mix ( @@ -2913,4 +2916,4 @@ INSERT INTO vicidial_statuses (status,status_name,selectable,human_answered,cate INSERT INTO vicidial_statuses (status,status_name,selectable,human_answered,category,sale,dnc,customer_contact,not_interested,unworkable,scheduled_callback,completed) values('MAXCAL','Inbound Max Calls Drop','N','Y','UNDEFINED','N','N','N','N','N','N','N'); INSERT INTO vicidial_statuses (status,status_name,selectable,human_answered,category,sale,dnc,customer_contact,not_interested,unworkable,scheduled_callback,completed) values('LRERR','Outbound Local Channel Res Err','N','Y','UNDEFINED','N','N','N','N','N','N','N'); -UPDATE system_settings SET db_schema_version='1328',db_schema_update_date=NOW(); +UPDATE system_settings SET db_schema_version='1329',db_schema_update_date=NOW(); diff --git a/agc_2-X/trunk/extras/upgrade_2.6.sql b/agc_2-X/trunk/extras/upgrade_2.6.sql index 75c6eeba..050a5889 100644 --- a/agc_2-X/trunk/extras/upgrade_2.6.sql +++ b/agc_2-X/trunk/extras/upgrade_2.6.sql @@ -80,3 +80,10 @@ ALTER TABLE system_settings ADD audio_store_purge TEXT; ALTER TABLE servers ADD audio_store_purge TEXT; UPDATE system_settings SET db_schema_version='1328',db_schema_update_date=NOW() where db_schema_version < 1328; + +ALTER TABLE system_settings ADD svn_revision INT(9) default '0'; + +ALTER TABLE servers ADD svn_revision INT(9) default '0'; +ALTER TABLE servers ADD svn_info TEXT; + +UPDATE system_settings SET db_schema_version='1329',db_schema_update_date=NOW() where db_schema_version < 1329; diff --git a/agc_2-X/trunk/install.pl b/agc_2-X/trunk/install.pl index 69da5166..400ba166 100644 --- a/agc_2-X/trunk/install.pl +++ b/agc_2-X/trunk/install.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -# install.pl version 2.4 +# install.pl version 2.6 # # Copyright (C) 2012 Matt Florell LICENSE: AGPLv2 # @@ -26,6 +26,7 @@ # 110619-2153 - Added languages install and conf file specify options # 110812-1510 - Added tts sound directories creation # 120224-1614 - Added function to clear out web auth log files +# 121027-1750 - Added svn logging information # ############################################ @@ -2471,8 +2472,6 @@ if ($WEBONLY < 1) `chmod 0755 $PATHhome/*`; print "Copying extras files to $PATHhome ...\n"; -# `cp -f ./extras/GMT_USA_zip.txt $PATHhome/`; -# `cp -f ./extras/phone_codes_GMT.txt $PATHhome/`; `cp -f ./extras/MySQL_AST_CREATE_tables.sql $PATHhome/`; print "Copying agi-bin scripts to $PATHagi ...\n"; @@ -2539,11 +2538,13 @@ if ( ($PROMPTcopy_web_lang =~ /y/i) || ($CLIcopy_web_lang =~ /y/i) ) print "Copying web language translation files to $PATHweb...\n"; if (!-e "$PATHweb/agc_br/") {`mkdir -p $PATHweb/agc_br/`;} if (!-e "$PATHweb/agc_de/") {`mkdir -p $PATHweb/agc_de/`;} + if (!-e "$PATHweb/agc_dk/") {`mkdir -p $PATHweb/agc_dk/`;} if (!-e "$PATHweb/agc_el/") {`mkdir -p $PATHweb/agc_el/`;} if (!-e "$PATHweb/agc_en/") {`mkdir -p $PATHweb/agc_en/`;} if (!-e "$PATHweb/agc_es/") {`mkdir -p $PATHweb/agc_es/`;} if (!-e "$PATHweb/agc_fr/") {`mkdir -p $PATHweb/agc_fr/`;} if (!-e "$PATHweb/agc_it/") {`mkdir -p $PATHweb/agc_it/`;} + if (!-e "$PATHweb/agc_jp/") {`mkdir -p $PATHweb/agc_jp/`;} if (!-e "$PATHweb/agc_nl/") {`mkdir -p $PATHweb/agc_nl/`;} if (!-e "$PATHweb/agc_pl/") {`mkdir -p $PATHweb/agc_pl/`;} if (!-e "$PATHweb/agc_pt/") {`mkdir -p $PATHweb/agc_pt/`;} @@ -2566,11 +2567,13 @@ if ( ($PROMPTcopy_web_lang =~ /y/i) || ($CLIcopy_web_lang =~ /y/i) ) `chmod 0777 $PATHweb/`; `chmod -R 0755 $PATHweb/agc_br/`; `chmod -R 0755 $PATHweb/agc_de/`; + `chmod -R 0755 $PATHweb/agc_dk/`; `chmod -R 0755 $PATHweb/agc_el/`; `chmod -R 0755 $PATHweb/agc_en/`; `chmod -R 0755 $PATHweb/agc_es/`; `chmod -R 0755 $PATHweb/agc_fr/`; `chmod -R 0755 $PATHweb/agc_it/`; + `chmod -R 0755 $PATHweb/agc_jp/`; `chmod -R 0755 $PATHweb/agc_nl/`; `chmod -R 0755 $PATHweb/agc_pl/`; `chmod -R 0755 $PATHweb/agc_pt/`; @@ -2587,11 +2590,13 @@ if ( ($PROMPTcopy_web_lang =~ /y/i) || ($CLIcopy_web_lang =~ /y/i) ) `chmod -R 0755 $PATHweb/vicidial_it/`; `chmod 0777 $PATHweb/agc_br/`; `chmod 0777 $PATHweb/agc_de/`; + `chmod 0777 $PATHweb/agc_dk/`; `chmod 0777 $PATHweb/agc_el/`; `chmod 0777 $PATHweb/agc_en/`; `chmod 0777 $PATHweb/agc_es/`; `chmod 0777 $PATHweb/agc_fr/`; `chmod 0777 $PATHweb/agc_it/`; + `chmod 0777 $PATHweb/agc_jp/`; `chmod 0777 $PATHweb/agc_nl/`; `chmod 0777 $PATHweb/agc_pl/`; `chmod 0777 $PATHweb/agc_pt/`; @@ -2633,10 +2638,12 @@ if ($PATHconf !~ /\/etc\/astguiclient.conf/) `sed -i 's/$PATHconfDEFAULT/$PATHconfEREG/g' $PATHweb/agc_br/dbconnect.php `; `sed -i 's/$PATHconfDEFAULT/$PATHconfEREG/g' $PATHweb/agc_de/dbconnect.php `; + `sed -i 's/$PATHconfDEFAULT/$PATHconfEREG/g' $PATHweb/agc_dk/dbconnect.php `; `sed -i 's/$PATHconfDEFAULT/$PATHconfEREG/g' $PATHweb/agc_el/dbconnect.php `; `sed -i 's/$PATHconfDEFAULT/$PATHconfEREG/g' $PATHweb/agc_es/dbconnect.php `; `sed -i 's/$PATHconfDEFAULT/$PATHconfEREG/g' $PATHweb/agc_fr/dbconnect.php `; `sed -i 's/$PATHconfDEFAULT/$PATHconfEREG/g' $PATHweb/agc_it/dbconnect.php `; + `sed -i 's/$PATHconfDEFAULT/$PATHconfEREG/g' $PATHweb/agc_jp/dbconnect.php `; `sed -i 's/$PATHconfDEFAULT/$PATHconfEREG/g' $PATHweb/agc_nl/dbconnect.php `; `sed -i 's/$PATHconfDEFAULT/$PATHconfEREG/g' $PATHweb/agc_pl/dbconnect.php `; `sed -i 's/$PATHconfDEFAULT/$PATHconfEREG/g' $PATHweb/agc_pt/dbconnect.php `; @@ -2685,22 +2692,92 @@ if ( ($PROMPTcopy_conf_files =~ /y/i) || ($CLIcopy_conf_files =~ /y/i) ) } -### format the new server_ip dialstring for example to use with extensions.conf -$S='*'; -if( $VARserver_ip =~ m/(\S+)\.(\S+)\.(\S+)\.(\S+)/ ) - { - $a = leading_zero($1); - $b = leading_zero($2); - $c = leading_zero($3); - $d = leading_zero($4); - $VARremDIALstr = "$a$S$b$S$c$S$d"; - } +##### BEGIN attempt to connect to database, if successful then update code information in database ##### +use DBI; + +$dbhA = DBI->connect("DBI:mysql:$VARDB_database:$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass") + or warn "Couldn't connect to database: " . DBI->errstr; + +if ($dbhA) + { + print "Updating version information in the database...\n"; + + $svn_notes=''; + $svn_revision=0; + + ### find pwd binary to do the compression + $pwdbin = ''; + if ( -e ('/bin/pwd')) {$pwdbin = '/bin/pwd';} + else + { + if ( -e ('/usr/bin/pwd')) {$pwdbin = '/usr/bin/pwd';} + else + { + if ( -e ('/usr/local/bin/pwd')) {$pwdbin = '/usr/local/bin/pwd';} + else + { + print "Can't find pwd binary!\n"; + } + } + } + ### find svn binary to do the compression + $svnbin = ''; + if ( -e ('/bin/svn')) {$svnbin = '/bin/svn';} + else + { + if ( -e ('/usr/bin/svn')) {$svnbin = '/usr/bin/svn';} + else + { + if ( -e ('/usr/local/bin/svn')) {$svnbin = '/usr/local/bin/svn';} + else + { + print "Can't find svn binary!\n"; + } + } + } + + ### gather current path + if (length($pwdbin) > 4) + { + @pwd_output = `$pwdbin`; + chomp($pwd_output[0]); + $svn_notes .= "$pwd_output[0]\n"; + } + ### gather svn information + if (length($svnbin) > 4) + { + $svn_output_string=''; + $svn_output_string=''; + @svn_output = `$svnbin info`; + $s=0; + foreach(@svn_output) + { + $svn_output_string .= "$svn_output[$s]"; + if ($svn_output[$s] =~ /Revision: /) + { + $svn_revision = $svn_output[$s]; + $svn_revision =~ s/\D//gi; + } + $s++; + } + $svn_notes .= "$svn_output_string\n"; + } + + $stmtA = "UPDATE servers SET svn_revision='$svn_revision',svn_info='$svn_notes' where server_ip='$VARserver_ip';"; + if($DB){print STDERR "\n|$stmtA|\n";} + $affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:|$stmtA|\n"; + + $stmtA = "UPDATE system_settings SET svn_revision='$svn_revision';"; + if($DB){print STDERR "\n|$stmtA|\n";} + $affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:|$stmtA|\n"; + + print "Version information updated: $svn_revision|$VARserver_ip\n"; + } +##### END attempt to connect to database, if successful then update code information in database ##### + + + -# print "\nIMPORTANT NOTE!\n"; -# print "\nPlease remember to put these lines in your extensions.conf file:\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"; print "\nASTGUICLIENT VICIDIAL INSTALLATION FINISHED! ENJOY!\n"; diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index d8d33ac3..94aead6c 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -1819,7 +1819,7 @@ if ($download_max_system_stats_metric_name) { ############################################# ##### START SYSTEM_SETTINGS LOOKUP ##### -$stmt = "SELECT use_non_latin,enable_queuemetrics_logging,enable_vtiger_integration,qc_features_active,outbound_autodial_active,sounds_central_control_active,enable_second_webform,user_territories_active,custom_fields_enabled,admin_web_directory,webphone_url,first_login_trigger,hosted_settings,default_phone_registration_password,default_phone_login_password,default_server_password,test_campaign_calls,active_voicemail_server,voicemail_timezones,default_voicemail_timezone,default_local_gmt,campaign_cid_areacodes_enabled,pllb_grouping_limit,did_ra_extensions_enabled,expanded_list_stats,contacts_enabled,alt_log_server_ip,alt_log_dbname,alt_log_login,alt_log_pass,tables_use_alt_log_db,call_menu_qualify_enabled,admin_list_counts,allow_voicemail_greeting FROM system_settings;"; +$stmt = "SELECT use_non_latin,enable_queuemetrics_logging,enable_vtiger_integration,qc_features_active,outbound_autodial_active,sounds_central_control_active,enable_second_webform,user_territories_active,custom_fields_enabled,admin_web_directory,webphone_url,first_login_trigger,hosted_settings,default_phone_registration_password,default_phone_login_password,default_server_password,test_campaign_calls,active_voicemail_server,voicemail_timezones,default_voicemail_timezone,default_local_gmt,campaign_cid_areacodes_enabled,pllb_grouping_limit,did_ra_extensions_enabled,expanded_list_stats,contacts_enabled,alt_log_server_ip,alt_log_dbname,alt_log_login,alt_log_pass,tables_use_alt_log_db,call_menu_qualify_enabled,admin_list_counts,allow_voicemail_greeting,svn_revision FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); @@ -1860,6 +1860,7 @@ if ($qm_conf_ct > 0) $SScall_menu_qualify_enabled = $row[31]; $SSadmin_list_counts = $row[32]; $SSallow_voicemail_greeting = $row[33]; + $SSsvn_revision = $row[34]; } ##### END SETTINGS LOOKUP ##### ########################################### @@ -3152,12 +3153,13 @@ else # 121018-2321 - Added blank option to owner only dialing # 121019-0520 - Added voicemail greeting audio chooser options to phones and voicemail boxes # 121025-2339 - Added without-filter output to test filter function, added server option to test call +# 121027-2344 - Added servers versions page # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time -$admin_version = '2.6-378a'; -$build = '121025-2339'; +$admin_version = '2.6-379a'; +$build = '121027-2344'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -3777,6 +3779,7 @@ if ($ADD==999995) {$hh='reports'; echo "COPYRIGHT TRADEMARK LICENSE";} if ($ADD==999994) {$hh='reports'; echo "ADMIN UTILITIES";} if ($ADD==999993) {$hh='reports'; echo "SUMMARY STATS";} if ($ADD==999992) {$hh='reports'; echo "SYSTEM SUMMARY STATS";} +if ($ADD==999991) {$hh='reports'; echo "SERVERS VERSIONS";} if ( ($ADD>9) and ($ADD < 99998) ) @@ -29879,7 +29882,7 @@ if ($ADD==311111111111111) $ALLagent_count = $rowx[2]; } - $stmt="SELECT version,install_date,use_non_latin,webroot_writable,enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_url,queuemetrics_log_id,queuemetrics_eq_prepend,vicidial_agent_disable,allow_sipsak_messages,admin_home_url,enable_agc_xfer_log,db_schema_version,auto_user_add_value,timeclock_end_of_day,timeclock_last_reset_date,vdc_header_date_format,vdc_customer_date_format,vdc_header_phone_format,vdc_agent_api_active,qc_last_pull_time,enable_vtiger_integration,vtiger_server_ip,vtiger_dbname,vtiger_login,vtiger_pass,vtiger_url,qc_features_active,outbound_autodial_active,outbound_calls_per_second,enable_tts_integration,agentonly_callback_campaign_lock,sounds_central_control_active,sounds_web_server,sounds_web_directory,active_voicemail_server,auto_dial_limit,user_territories_active,allow_custom_dialplan,db_schema_update_date,enable_second_webform,default_webphone,default_external_server_ip,webphone_url,enable_agc_dispo_log,custom_dialplan_entry,queuemetrics_loginout,callcard_enabled,queuemetrics_callstatus,default_codecs,admin_web_directory,label_title,label_first_name,label_middle_initial,label_last_name,label_address1,label_address2,label_address3,label_city,label_state,label_province,label_postal_code,label_vendor_lead_code,label_gender,label_phone_number,label_phone_code,label_alt_phone,label_security_phrase,label_email,label_comments,custom_fields_enabled,slave_db_server,reports_use_slave_db,webphone_systemkey,first_login_trigger,default_phone_registration_password,default_phone_login_password,default_server_password,admin_modify_refresh,nocache_admin,generate_cross_server_exten,queuemetrics_addmember_enabled,queuemetrics_dispo_pause,label_hide_field_logs,queuemetrics_pe_phone_append,test_campaign_calls,agents_calls_reset,default_voicemail_timezone,default_local_gmt,noanswer_log,alt_log_server_ip,alt_log_dbname,alt_log_login,alt_log_pass,tables_use_alt_log_db,did_agent_log,campaign_cid_areacodes_enabled,pllb_grouping_limit,did_ra_extensions_enabled,expanded_list_stats,contacts_enabled,call_menu_qualify_enabled,admin_list_counts,allow_voicemail_greeting from system_settings;"; + $stmt="SELECT version,install_date,use_non_latin,webroot_writable,enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_url,queuemetrics_log_id,queuemetrics_eq_prepend,vicidial_agent_disable,allow_sipsak_messages,admin_home_url,enable_agc_xfer_log,db_schema_version,auto_user_add_value,timeclock_end_of_day,timeclock_last_reset_date,vdc_header_date_format,vdc_customer_date_format,vdc_header_phone_format,vdc_agent_api_active,qc_last_pull_time,enable_vtiger_integration,vtiger_server_ip,vtiger_dbname,vtiger_login,vtiger_pass,vtiger_url,qc_features_active,outbound_autodial_active,outbound_calls_per_second,enable_tts_integration,agentonly_callback_campaign_lock,sounds_central_control_active,sounds_web_server,sounds_web_directory,active_voicemail_server,auto_dial_limit,user_territories_active,allow_custom_dialplan,db_schema_update_date,enable_second_webform,default_webphone,default_external_server_ip,webphone_url,enable_agc_dispo_log,custom_dialplan_entry,queuemetrics_loginout,callcard_enabled,queuemetrics_callstatus,default_codecs,admin_web_directory,label_title,label_first_name,label_middle_initial,label_last_name,label_address1,label_address2,label_address3,label_city,label_state,label_province,label_postal_code,label_vendor_lead_code,label_gender,label_phone_number,label_phone_code,label_alt_phone,label_security_phrase,label_email,label_comments,custom_fields_enabled,slave_db_server,reports_use_slave_db,webphone_systemkey,first_login_trigger,default_phone_registration_password,default_phone_login_password,default_server_password,admin_modify_refresh,nocache_admin,generate_cross_server_exten,queuemetrics_addmember_enabled,queuemetrics_dispo_pause,label_hide_field_logs,queuemetrics_pe_phone_append,test_campaign_calls,agents_calls_reset,default_voicemail_timezone,default_local_gmt,noanswer_log,alt_log_server_ip,alt_log_dbname,alt_log_login,alt_log_pass,tables_use_alt_log_db,did_agent_log,campaign_cid_areacodes_enabled,pllb_grouping_limit,did_ra_extensions_enabled,expanded_list_stats,contacts_enabled,call_menu_qualify_enabled,admin_list_counts,allow_voicemail_greeting,svn_revision from system_settings;"; $rslt=mysql_query($stmt, $link); $row=mysql_fetch_row($rslt); $version = $row[0]; @@ -29990,12 +29993,14 @@ if ($ADD==311111111111111) $call_menu_qualify_enabled = $row[105]; $admin_list_counts = $row[106]; $allow_voicemail_greeting = $row[107]; + $svn_revision = $row[108]; echo "
MODIFY VICIDIAL SYSTEM SETTINGS
\n"; echo "\n"; echo "\n"; echo "
\n"; echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -32892,7 +32897,7 @@ if ($ADD==999999) if ($stage == 'TIME') { echo ""; - echo "\n"; + echo "\n"; } else { @@ -32929,6 +32934,8 @@ if ($ADD==999999) echo "\n"; if ($stage == 'TIME') { + $s_time=' '; + $s_ver=' '; $stmt="SELECT last_update from server_updater where server_ip='$server_ip[$o]';"; $rslt=mysql_query($stmt, $link); if ($DB) {echo "$stmt\n";} @@ -32936,8 +32943,18 @@ if ($ADD==999999) if ($servertime_to_print) { $row=mysql_fetch_row($rslt); - echo ""; + $s_time = $row[0]; } + $stmt="SELECT svn_revision from servers where server_ip='$server_ip[$o]';"; + $rslt=mysql_query($stmt, $link); + if ($DB) {echo "$stmt\n";} + $serverver_to_print = mysql_num_rows($rslt); + if ($serverver_to_print) + { + $row=mysql_fetch_row($rslt); + $s_ver = $row[0]; + } + echo ""; } else { @@ -32958,7 +32975,7 @@ if ($ADD==999999) if ($stage == 'TIME') { - echo ""; + echo ""; $stmt="SELECT NOW();"; $rslt=mysql_query($stmt, $link); @@ -32967,7 +32984,7 @@ if ($ADD==999999) if ($dbtime_to_print) { $row=mysql_fetch_row($rslt); - echo ""; + echo ""; } } echo "
Version: $version
SVN Version: $svn_revision
DB Schema Version: $db_schema_version
DB Schema Update Date: $db_schema_update_date
Auto User-add Value: $auto_user_add_value
SERVER -DESCRIPTIONIPACTLOADCHANDISKTIME
DESCRIPTIONIPACTLOADCHANDISKTIMEVER
$disk$row[0]$s_time$s_ver
  PHP Time   " . date("Y-m-d H:i:s") . "
  PHP Time   " . date("Y-m-d H:i:s") . "  
  DB Time   $row[0]
  DB Time   $row[0]  
\n"; @@ -33271,6 +33288,7 @@ if ($ADD==999994) echo "
    \n"; echo "
  • Welcome Languages Page\n"; echo "
  • Campaign Debug Page\n"; + echo "
  • Servers Versions\n"; echo "
  • Carrier Log Report\n"; echo "
  • Hangup Cause Report\n"; echo "
  • Bulk Phone Insert Page\n"; @@ -33484,7 +33502,112 @@ if ($ADD==999992) ##### END max system stats report ##### +###################### +# ADD=999991 display server version info +###################### +if ($ADD==999991) + { + echo "
    \n"; + echo ""; + echo "
    Administration: Server Version Information

    \n"; + + if ($LOGview_reports==1) + { + if ($reports_only_user < 1) + { + echo "
    \n";
+
+			echo "";
+			echo "\n";
+
+			$stmt="SELECT server_id,server_description,server_ip,active,sysload,channels_total,cpu_idle_percent,disk_usage from servers order by server_id;";
+			$rslt=mysql_query($stmt, $link);
+			if ($DB) {echo "$stmt\n";}
+			$servers_to_print = mysql_num_rows($rslt);
+			$i=0;
+			while ($i < $servers_to_print)
+				{
+				$row=mysql_fetch_row($rslt);
+				$server_id[$i] =			$row[0];
+				$server_description[$i] =	$row[1];
+				$server_ip[$i] =			$row[2];
+				$active[$i] =				$row[3];
+				$sysload[$i] =				$row[4];
+				$channels_total[$i] =		$row[5];
+				$cpu_idle_percent[$i] =		$row[6];
+				$disk_usage[$i] =			$row[7];
+				$i++;
+				}
+
+			$o=0;
+			while ($servers_to_print > $o)
+				{
+				$cpu = (100 - $cpu_idle_percent[$o]);
+				$disk = '';
+				$disk_ary = explode('|',$disk_usage[$o]);
+				$disk_ary_ct = count($disk_ary);
+				$k=0;
+				while ($k < $disk_ary_ct)
+					{
+					$disk_ary[$k] = preg_replace("/^\d* /","",$disk_ary[$k]);
+					if ($k<1) {$disk = "$disk_ary[$k]";}
+					else
+						{
+						if ($disk_ary[$k] > $disk) {$disk = "$disk_ary[$k]";}
+						}
+					$k++;
+					}
+				$disk = "$disk%";
+				echo "\n";
+				echo "\n";
+				echo "\n";
+				echo "\n";
+				echo "\n";
+				echo "\n";
+				echo "\n";
+				echo "\n";
+
+				$s_time=' ';
+				$s_ver=' ';
+				$s_info_print='no svn information';
+				$stmt="SELECT last_update from server_updater where server_ip='$server_ip[$o]';";
+				$rslt=mysql_query($stmt, $link);
+				if ($DB) {echo "$stmt\n";}
+				$servertime_to_print = mysql_num_rows($rslt);
+				if ($servertime_to_print)
+					{
+					$row=mysql_fetch_row($rslt);
+					$s_time = $row[0];
+					}
+				$stmt="SELECT svn_revision,svn_info from servers where server_ip='$server_ip[$o]';";
+				$rslt=mysql_query($stmt, $link);
+				if ($DB) {echo "$stmt\n";}
+				$serverver_to_print = mysql_num_rows($rslt);
+				if ($serverver_to_print)
+					{
+					$row=mysql_fetch_row($rslt);
+					$s_ver = $row[0];
+					$s_info = $row[1];
+					$s_info_print = preg_replace("/\n/",'
    ',$s_info);
+					}
+				if (strlen($s_info_print) < 1) {$s_info_print='no svn information';}
+				echo "";
+				echo "";
+
+				echo "\n";
+				$o++;
+				}
+			echo "
    SERVERDESCRIPTIONIPACTLOADCHANDISKTIMEVER
    $server_id[$o]$server_description[$o]$server_ip[$o]$active[$o]$sysload[$o] - $cpu%$channels_total[$o]$disk$s_time$s_ver
     $s_info_print
    \n";
+			}
+		}
+	else
+		{
+		echo "You do not have permission to view this page\n";
+		exit;
+		}
+	}
+##### END server version info #####
 
 
 echo "
\n";