Renamed exec.php and edit.php

6 files changed, 11 insertions, 11 deletions

diff --git a/src/etc/inc/priv.defs.inc b/src/etc/inc/priv.defs.inc
index 9adaa06..750bfe7 100644
--- a/src/etc/inc/priv.defs.inc
+++ b/src/etc/inc/priv.defs.inc
@@ -257,7 +257,7 @@ $priv_list['page-diagnostics-edit'] = array();
 $priv_list['page-diagnostics-edit']['name'] = gettext("WebCfg - Diagnostics: Edit File");
 $priv_list['page-diagnostics-edit']['descr'] = gettext("Allow access to the 'Diagnostics: Edit File' page.");
 $priv_list['page-diagnostics-edit']['match'] = array();
-$priv_list['page-diagnostics-edit']['match'][] = "edit.php*";
+$priv_list['page-diagnostics-edit']['match'][] = "diag_edit.php*";
 $priv_list['page-diagnostics-edit']['match'][] = "browser.php*";
 $priv_list['page-diagnostics-edit']['match'][] = "filebrowser/browser.php*";
 
@@ -265,7 +265,7 @@ $priv_list['page-diagnostics-command'] = array();
 $priv_list['page-diagnostics-command']['name'] = gettext("WebCfg - Diagnostics: Command");
 $priv_list['page-diagnostics-command']['descr'] = gettext("Allow access to the 'Diagnostics: Command' page.");
 $priv_list['page-diagnostics-command']['match'] = array();
-$priv_list['page-diagnostics-command']['match'][] = "exec.php*";
+$priv_list['page-diagnostics-command']['match'][] = "diag_command.php*";
 
 $priv_list['page-firewall-aliases'] = array();
 $priv_list['page-firewall-aliases']['name'] = gettext("WebCfg - Firewall: Aliases");
diff --git a/src/usr/local/www/exec.php b/src/usr/local/www/diag_command.php
index eaacce2..df5e3a7 100644
--- a/src/usr/local/www/exec.php
+++ b/src/usr/local/www/diag_command.php
@@ -1,6 +1,6 @@
 <?php
 /*
-	exec.php
+	diag_command.php
 */
 /* ====================================================================
  *	Copyright (c)  2004-2015  Electric Sheep Fencing, LLC. All rights reserved.
@@ -64,7 +64,7 @@
 ##|*IDENT=page-diagnostics-command
 ##|*NAME=Diagnostics: Command
 ##|*DESCR=Allow access to the 'Diagnostics: Command' page.
-##|*MATCH=exec.php*
+##|*MATCH=diag_command.php*
 ##|-PRIV
 
 $allowautocomplete = true;
@@ -240,7 +240,7 @@ if (!isBlank($_POST['txtCommand'])):?>
 	</div>
 <?php endif; ?>
 
-<form action="exec.php" method="post" enctype="multipart/form-data" name="frmExecPlus" onsubmit="return frmExecPlus_onSubmit( this );">
+<form action="diag_command.php" method="post" enctype="multipart/form-data" name="frmExecPlus" onsubmit="return frmExecPlus_onSubmit( this );">
 	<div class="panel panel-default">
 		<div class="panel-heading"><h2 class="panel-title"><?=gettext('Execute Shell Command')?></h2></div>
 		<div class="panel-body">
diff --git a/src/usr/local/www/edit.php b/src/usr/local/www/diag_edit.php
index 6b78a83..6b78a83 100644
--- a/src/usr/local/www/edit.php
+++ b/src/usr/local/www/diag_edit.php
diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc
index 7684285..967191a 100644
--- a/src/usr/local/www/head.inc
+++ b/src/usr/local/www/head.inc
@@ -330,9 +330,9 @@ $diagnostics_menu = array();
 $diagnostics_menu[] = array(gettext("ARP Table"), "/diag_arp.php");
 $diagnostics_menu[] = array(gettext("Authentication"), "/diag_authentication.php");
 $diagnostics_menu[] = array(htmlspecialchars(gettext("Backup & Restore")), "/diag_backup.php");
-$diagnostics_menu[] = array(gettext("Command Prompt"), "/exec.php");
+$diagnostics_menu[] = array(gettext("Command Prompt"), "/diag_comand.php");
 $diagnostics_menu[] = array(gettext("DNS Lookup"), "/diag_dns.php");
-$diagnostics_menu[] = array(gettext("Edit File"), "/edit.php");
+$diagnostics_menu[] = array(gettext("Edit File"), "/diag_edit.php");
 $diagnostics_menu[] = array(gettext("Factory Defaults"), "/diag_defaults.php");
 
 if (file_exists("/var/run/gmirror_active")) {
@@ -487,7 +487,7 @@ if (($pagename === "index.php") && ($numColumns > 2)) {
 			</a>
 		</li>
 	<?php endif?>
-	
+
 	<?php if ($system_logs_filter_form_hidden): ?>
 		<li>
 			<a onclick="$('#filter-form').toggle(360)" title="<?=gettext("Log filter")?>">
diff --git a/src/usr/local/www/help.php b/src/usr/local/www/help.php
index 723f060..f0674af 100644
--- a/src/usr/local/www/help.php
+++ b/src/usr/local/www/help.php
@@ -122,8 +122,8 @@ $helppages = array(
 	'diag_system_activity.php' => 'https://doc.pfsense.org/index.php/System_Activity',
 	'diag_traceroute.php' => 'https://doc.pfsense.org/index.php/Traceroute',
 	'easyrule.php' => 'https://doc.pfsense.org/index.php/Easy_Rule',
-	'edit.php' => 'https://doc.pfsense.org/index.php/Edit_File',
-	'exec.php' => 'https://doc.pfsense.org/index.php/Execute_Command',
+	'diag_edit.php' => 'https://doc.pfsense.org/index.php/Edit_File',
+	'diag_command.php' => 'https://doc.pfsense.org/index.php/Execute_Command',
 	'firewall_nat_1to1.php' => 'https://doc.pfsense.org/index.php/1:1_NAT',
 	'firewall_nat_1to1_edit.php' => 'https://doc.pfsense.org/index.php/1:1_NAT',
 	'diag_halt.php' => 'https://doc.pfsense.org/index.php/Halt_System',
diff --git a/src/usr/local/www/status.php b/src/usr/local/www/status.php
index bac5b59..5c7e885 100755
--- a/src/usr/local/www/status.php
+++ b/src/usr/local/www/status.php
@@ -287,7 +287,7 @@ print_info_box(gettext("Make sure all sensitive information is removed! (Passwor
 			   "information from this page in public places (like mailing lists).") . '<br />' .
 		gettext("Common password fields in config.xml have been automatically redacted.") . '<br />' .
 		gettext("When the page has finished loading, the output will be stored in {$output_file}. It may be downloaded via scp or ") .
-		"<a href=\"/exec.php?dlPath={$output_file}\">" . gettext("Diagnostics > Command Prompt.") . '</a>');
+		"<a href=\"/diag_command.php?dlPath={$output_file}\">" . gettext("Diagnostics > Command Prompt.") . '</a>');
 
 listCmds();
 execCmds();