From 65ce97d21d2bfe0b7d0162b096019bf789bceae6 Mon Sep 17 00:00:00 2001 From: Ermal Date: Sat, 5 Jan 2013 13:34:25 +0000 Subject: Remove diag_backup.js progress.php upload_progress.php since they are not used since long time --- .../www/javascript/diag_backup/diag_backup.js | 11 -- usr/local/www/progress.php | 102 ------------ usr/local/www/system_firmware.php | 5 - usr/local/www/upload_progress.php | 172 --------------------- 4 files changed, 290 deletions(-) delete mode 100644 usr/local/www/javascript/diag_backup/diag_backup.js delete mode 100755 usr/local/www/progress.php delete mode 100644 usr/local/www/upload_progress.php (limited to 'usr') diff --git a/usr/local/www/javascript/diag_backup/diag_backup.js b/usr/local/www/javascript/diag_backup/diag_backup.js deleted file mode 100644 index d9ca4f6..0000000 --- a/usr/local/www/javascript/diag_backup/diag_backup.js +++ /dev/null @@ -1,11 +0,0 @@ - -function check_upload_status(id) { - - if (document.getElementById("restore").value == 'Restore configuration') { - window.open('progress.php?conffile=' + id,'UploadMeter','width=370,height=115', true); - return true; - } else { - return false; - } - -} \ No newline at end of file diff --git a/usr/local/www/progress.php b/usr/local/www/progress.php deleted file mode 100755 index f222215..0000000 --- a/usr/local/www/progress.php +++ /dev/null @@ -1,102 +0,0 @@ -" . gettext("Invalid Meter ID") . "! {$_GET["UPLOAD_IDENTIFIER"]}"; - echo (''); - }else{ - echo (''); - } - exit; - -} else { - - $meter = sprintf("%.2f", $X['bytes_uploaded'] / $X['bytes_total'] * 100); - - $sp = $X['speed_last']; - if ($sp < 10000) $speed = sprintf("%.2f", $sp / 1000); - else $speed = sprintf("%d", $sp / 1000); - - $eta = sprintf("%02d:%02d", $X['est_sec'] / 60, $X['est_sec'] % 60 ); - - $upl = nice_value($X['bytes_uploaded']); - $total = nice_value($X['bytes_total']); - - if ($X['bytes_total'] > 1 && $X['bytes_uploaded'] >= $X['bytes_total'] && $X['est_sec'] == 0) { - echo (' ' . gettext("UPLOAD completed") . '!'); - exit; - } -} - -?> - - - - - - -<?=gettext("Uploading Files... Please wait..."); ?> - - - - - - - -
- -
- -
- - - - - -
- - -
");?>
- -
- -
- - - - - - - - - - - - - - - - - - -
%
- - - diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php index ddb42d2..e5ecb2e 100755 --- a/usr/local/www/system_firmware.php +++ b/usr/local/www/system_firmware.php @@ -290,11 +290,6 @@ if(stristr($_FILES['ulfile']['name'],"nanobsd")) } } ?> - ','UploadMeter','width=370,height=115', true); return true;"> - */ - ?> "> diff --git a/usr/local/www/upload_progress.php b/usr/local/www/upload_progress.php deleted file mode 100644 index 812f7b7..0000000 --- a/usr/local/www/upload_progress.php +++ /dev/null @@ -1,172 +0,0 @@ - - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ - -/* DISABLE_PHP_LINT_CHECKING */ - -##|+PRIV -##|*IDENT=page-upload_progress -##|*NAME=System: Firmware: Manual Update page (progress bar) -##|*DESCR=Allow access to the 'System: Firmware: Manual Update: Progress bar' page. -##|*MATCH=upload_progress* -##|-PRIV - -include("guiconfig.inc"); - -if (!session_id()) - session_start(); - -// sanitize the ID value -$id = $_SESSION['uploadid']; -if (!$id) { - echo gettext("Sorry, we could not find an uploadid code."); - exit; -} -session_commit(); - -// retrieve the upload data from APC -$info = uploadprogress_get_info($id); - -// false is returned if the data isn't found -if (!$info) { - echo << - - - - - -EOF; - exit; -} - -if ($info['bytes_uploaded'] >= $info['bytes_total']) { - echo << - -  

-  

-

- - - -
- - -EOF1; - exit; -} - -?> - - - - - <?=gettext("Uploading Files"); ?>... <?=gettext("Please wait"); ?> ... - - - - - - - -
-
...
-
- - - - - - -
- - - - - -
- "; - ?> -
- 		-
-
- - - - - - - - - - - - - -
- - - : - - - - - - - - : - - - - -
- - - : - - - - % - - - - : - - - - -
-
- - -- cgit v1.1