FIlebrowser package moved to vendor direcroty

25 files changed, 31 insertions, 8 deletions

diff --git a/src/etc/inc/priv.defs.inc b/src/etc/inc/priv.defs.inc
index ee89f5f..11f466e 100644
--- a/src/etc/inc/priv.defs.inc
+++ b/src/etc/inc/priv.defs.inc
@@ -259,7 +259,7 @@ $priv_list['page-diagnostics-edit']['descr'] = gettext("Allow access to the 'Dia
 $priv_list['page-diagnostics-edit']['match'] = array();
 $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*";
+$priv_list['page-diagnostics-edit']['match'][] = "vendor/filebrowser/browser.php*";
 
 $priv_list['page-diagnostics-command'] = array();
 $priv_list['page-diagnostics-command']['name'] = gettext("WebCfg - Diagnostics: Command");
diff --git a/src/etc/pfSense.obsoletedfiles b/src/etc/pfSense.obsoletedfiles
index fe4d27a..655ea6f 100644
--- a/src/etc/pfSense.obsoletedfiles
+++ b/src/etc/pfSense.obsoletedfiles
@@ -791,6 +791,29 @@
 /usr/local/www/dtree.js
 /usr/local/www/easyrule.inc
 /usr/local/www/exec_raw.php
+/usr/local/www/filebrowser/browser.js
+/usr/local/www/filebrowser/browser.php
+/usr/local/www/filebrowser/images
+/usr/local/www/filebrowser/images/file_code.gif
+/usr/local/www/filebrowser/images/file_database.gif
+/usr/local/www/filebrowser/images/file_doc.gif
+/usr/local/www/filebrowser/images/file_flash.gif
+/usr/local/www/filebrowser/images/file_generic.gif
+/usr/local/www/filebrowser/images/file_image.gif
+/usr/local/www/filebrowser/images/file_js.gif
+/usr/local/www/filebrowser/images/file_pdf.gif
+/usr/local/www/filebrowser/images/file_php.gif
+/usr/local/www/filebrowser/images/file_ppt.gif
+/usr/local/www/filebrowser/images/file_system.gif
+/usr/local/www/filebrowser/images/file_xls.gif
+/usr/local/www/filebrowser/images/file_zip.gif
+/usr/local/www/filebrowser/images/folder_generic.gif
+/usr/local/www/filebrowser/images/icon_cancel.gif
+/usr/local/www/filebrowser/images/icon_contract.gif
+/usr/local/www/filebrowser/images/icon_expand.gif
+/usr/local/www/filebrowser/images/icon_home.gif
+/usr/local/www/filebrowser/images/icon_left.gif
+/usr/local/www/filebrowser/images/icon_magnifier.gif
 /usr/local/www/filter_log.inc
 /usr/local/www/filterparser.php
 /usr/local/www/firewall_nat_server.php
diff --git a/src/usr/local/www/diag_edit.php b/src/usr/local/www/diag_edit.php
index c520805..51b71c4 100644
--- a/src/usr/local/www/diag_edit.php
+++ b/src/usr/local/www/diag_edit.php
@@ -59,7 +59,7 @@
 ##|*DESCR=Allow access to the 'Diagnostics: Edit File' page.
 ##|*MATCH=diag_edit.php*
 ##|*MATCH=browser.php*
-##|*MATCH=filebrowser/browser.php*
+##|*MATCH=vendor/filebrowser/browser.php*
 ##|-PRIV
 
 $pgtitle = array(gettext("Diagnostics"), gettext("Edit File"));
@@ -430,4 +430,4 @@ var Base64 = {
 
 <?php include("foot.inc");
 
-outputJavaScriptFileInline("filebrowser/browser.js");
+outputJavaScriptFileInline("vendor/filebrowser/browser.js");
diff --git a/src/usr/local/www/filebrowser/browser.js b/src/usr/local/www/vendor/filebrowser/browser.js
index 6e75272..564d49d 100644
--- a/src/usr/local/www/filebrowser/browser.js
+++ b/src/usr/local/www/vendor/filebrowser/browser.js
@@ -17,7 +17,7 @@ function fbBrowse(path) {
 	}
 
 	$.ajax(
-		"/filebrowser/browser.php?path=" + encodeURI(path ? path : "/"),
+		"/vendor/filebrowser/browser.php?path=" + encodeURI(path ? path : "/"),
 		{ type: "get", complete: fbComplete }
 	);
 
diff --git a/src/usr/local/www/filebrowser/browser.php b/src/usr/local/www/vendor/filebrowser/browser.php
index c048187..54ab942 100644
--- a/src/usr/local/www/filebrowser/browser.php
+++ b/src/usr/local/www/vendor/filebrowser/browser.php
@@ -46,11 +46,11 @@ if (is_file($path)) {
 <table width="100%">
 	<tr>
 		<td class="fbHome text-left" width="25px">
-			<img onClick="$('#fbTarget').val('<?=$realDir?>'); fbBrowse('/');" src="/filebrowser/images/icon_home.gif" alt="Home" title="Home" />
+			<img onClick="$('#fbTarget').val('<?=$realDir?>'); fbBrowse('/');" src="/vendor/filebrowser/images/icon_home.gif" alt="Home" title="Home" />
 		</td>
 		<td><b><?=$path;?></b></td>
 		<td class="fbClose text-right">
-			<img onClick="$('#fbBrowser').fadeOut();" border="0" src="/filebrowser/images/icon_cancel.gif" alt="Close" title="Close" />
+			<img onClick="$('#fbBrowser').fadeOut();" border="0" src="/vendor/filebrowser/images/icon_cancel.gif" alt="Close" title="Close" />
 		</td>
 	</tr>
 	<tr>
@@ -83,7 +83,7 @@ foreach ($dirs as $dir):
 		<td></td>
 		<td class="fbDir vexpl text-left" id="<?=$realDir;?>">
 			<div onClick="$('#fbTarget').val('<?=$realDir?>'); fbBrowse('<?=$realDir?>');">
-				<img src="/filebrowser/images/folder_generic.gif" />
+				<img src="/vendor/filebrowser/images/folder_generic.gif" />
 				&nbsp;<?=$dir;?>
 			</div>
 		</td>
@@ -150,7 +150,7 @@ foreach ($files as $file):
 		<td class="fbFile vexpl text-left" id="<?=$fqpn;?>">
 			<?php $filename = str_replace("//","/", "{$path}/{$file}"); ?>
 			<div onClick="$('#fbTarget').val('<?=$filename?>'); loadFile(); $('#fbBrowser').fadeOut();">
-				<img src="/filebrowser/images/file_<?=$type;?>.gif" alt="" title="">
+				<img src="/vendor/filebrowser/images/file_<?=$type;?>.gif" alt="" title="">
 				&nbsp;<?=$file;?>
 			</div>
 		</td>
diff --git a/src/usr/local/www/filebrowser/images/file_code.gif b/src/usr/local/www/vendor/filebrowser/images/file_code.gif
index f06a205..f06a205 100644
--- a/src/usr/local/www/filebrowser/images/file_code.gif
+++ b/src/usr/local/www/vendor/filebrowser/images/file_code.gif
diff --git a/src/usr/local/www/filebrowser/images/file_database.gif b/src/usr/local/www/vendor/filebrowser/images/file_database.gif
index d479c91..d479c91 100644
--- a/src/usr/local/www/filebrowser/images/file_database.gif
+++ b/src/usr/local/www/vendor/filebrowser/images/file_database.gif
diff --git a/src/usr/local/www/filebrowser/images/file_doc.gif b/src/usr/local/www/vendor/filebrowser/images/file_doc.gif
index 222c31b..222c31b 100644
--- a/src/usr/local/www/filebrowser/images/file_doc.gif
+++ b/src/usr/local/www/vendor/filebrowser/images/file_doc.gif
diff --git a/src/usr/local/www/filebrowser/images/file_flash.gif b/src/usr/local/www/vendor/filebrowser/images/file_flash.gif
index e565c37..e565c37 100644
--- a/src/usr/local/www/filebrowser/images/file_flash.gif
+++ b/src/usr/local/www/vendor/filebrowser/images/file_flash.gif
diff --git a/src/usr/local/www/filebrowser/images/file_generic.gif b/src/usr/local/www/vendor/filebrowser/images/file_generic.gif
index 5f39482..5f39482 100644
--- a/src/usr/local/www/filebrowser/images/file_generic.gif
+++ b/src/usr/local/www/vendor/filebrowser/images/file_generic.gif
diff --git a/src/usr/local/www/filebrowser/images/file_image.gif b/src/usr/local/www/vendor/filebrowser/images/file_image.gif
index 4960683..4960683 100644
--- a/src/usr/local/www/filebrowser/images/file_image.gif
+++ b/src/usr/local/www/vendor/filebrowser/images/file_image.gif
diff --git a/src/usr/local/www/filebrowser/images/file_js.gif b/src/usr/local/www/vendor/filebrowser/images/file_js.gif
index 9b6601f..9b6601f 100644
--- a/src/usr/local/www/filebrowser/images/file_js.gif
+++ b/src/usr/local/www/vendor/filebrowser/images/file_js.gif
diff --git a/src/usr/local/www/filebrowser/images/file_pdf.gif b/src/usr/local/www/vendor/filebrowser/images/file_pdf.gif
index b01bb23..b01bb23 100644
--- a/src/usr/local/www/filebrowser/images/file_pdf.gif
+++ b/src/usr/local/www/vendor/filebrowser/images/file_pdf.gif
diff --git a/src/usr/local/www/filebrowser/images/file_php.gif b/src/usr/local/www/vendor/filebrowser/images/file_php.gif
index ab7f459..ab7f459 100644
--- a/src/usr/local/www/filebrowser/images/file_php.gif
+++ b/src/usr/local/www/vendor/filebrowser/images/file_php.gif
diff --git a/src/usr/local/www/filebrowser/images/file_ppt.gif b/src/usr/local/www/vendor/filebrowser/images/file_ppt.gif
index 0383c98..0383c98 100644
--- a/src/usr/local/www/filebrowser/images/file_ppt.gif
+++ b/src/usr/local/www/vendor/filebrowser/images/file_ppt.gif
diff --git a/src/usr/local/www/filebrowser/images/file_system.gif b/src/usr/local/www/vendor/filebrowser/images/file_system.gif
index f1997c7..f1997c7 100644
--- a/src/usr/local/www/filebrowser/images/file_system.gif
+++ b/src/usr/local/www/vendor/filebrowser/images/file_system.gif
diff --git a/src/usr/local/www/filebrowser/images/file_xls.gif b/src/usr/local/www/vendor/filebrowser/images/file_xls.gif
index d004013..d004013 100644
--- a/src/usr/local/www/filebrowser/images/file_xls.gif
+++ b/src/usr/local/www/vendor/filebrowser/images/file_xls.gif
diff --git a/src/usr/local/www/filebrowser/images/file_zip.gif b/src/usr/local/www/vendor/filebrowser/images/file_zip.gif
index ec98255..ec98255 100644
--- a/src/usr/local/www/filebrowser/images/file_zip.gif
+++ b/src/usr/local/www/vendor/filebrowser/images/file_zip.gif
diff --git a/src/usr/local/www/filebrowser/images/folder_generic.gif b/src/usr/local/www/vendor/filebrowser/images/folder_generic.gif
index 45b191d..45b191d 100644
--- a/src/usr/local/www/filebrowser/images/folder_generic.gif
+++ b/src/usr/local/www/vendor/filebrowser/images/folder_generic.gif
diff --git a/src/usr/local/www/filebrowser/images/icon_cancel.gif b/src/usr/local/www/vendor/filebrowser/images/icon_cancel.gif
index 246a819..246a819 100644
--- a/src/usr/local/www/filebrowser/images/icon_cancel.gif
+++ b/src/usr/local/www/vendor/filebrowser/images/icon_cancel.gif
diff --git a/src/usr/local/www/filebrowser/images/icon_contract.gif b/src/usr/local/www/vendor/filebrowser/images/icon_contract.gif
index cf82159..cf82159 100644
--- a/src/usr/local/www/filebrowser/images/icon_contract.gif
+++ b/src/usr/local/www/vendor/filebrowser/images/icon_contract.gif
diff --git a/src/usr/local/www/filebrowser/images/icon_expand.gif b/src/usr/local/www/vendor/filebrowser/images/icon_expand.gif
index 06c0c68..06c0c68 100644
--- a/src/usr/local/www/filebrowser/images/icon_expand.gif
+++ b/src/usr/local/www/vendor/filebrowser/images/icon_expand.gif
diff --git a/src/usr/local/www/filebrowser/images/icon_home.gif b/src/usr/local/www/vendor/filebrowser/images/icon_home.gif
index f888434..f888434 100644
--- a/src/usr/local/www/filebrowser/images/icon_home.gif
+++ b/src/usr/local/www/vendor/filebrowser/images/icon_home.gif
diff --git a/src/usr/local/www/filebrowser/images/icon_left.gif b/src/usr/local/www/vendor/filebrowser/images/icon_left.gif
index 0d1137c..0d1137c 100644
--- a/src/usr/local/www/filebrowser/images/icon_left.gif
+++ b/src/usr/local/www/vendor/filebrowser/images/icon_left.gif
diff --git a/src/usr/local/www/filebrowser/images/icon_magnifier.gif b/src/usr/local/www/vendor/filebrowser/images/icon_magnifier.gif
index e96e548..e96e548 100644
--- a/src/usr/local/www/filebrowser/images/icon_magnifier.gif
+++ b/src/usr/local/www/vendor/filebrowser/images/icon_magnifier.gif