summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--usr/local/www/javascript/diag_backup/diag_backup.js11
-rwxr-xr-xusr/local/www/progress.php102
-rwxr-xr-xusr/local/www/system_firmware.php5
-rw-r--r--usr/local/www/upload_progress.php172
4 files changed, 0 insertions, 290 deletions
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 @@
-<?php
-
-/* $Id$ */
-
-include("guiconfig.inc");
-
-$g['theme'] = get_current_theme();
-
-$url = 'progress.php?UPLOAD_IDENTIFIER='. $_GET["UPLOAD_IDENTIFIER"] .'&e=1';
-
-function nice_value($x) {
- if ($x < 100) return $x;
- if ($x < 10000) return sprintf("%.2fKB", $x/1000);
- if ($x < 900000) return sprintf("%dKB", $x/1000);
- return sprintf("%.2fMB", $x/1000/1000);
-}
-
-$X = upload_progress_meter_get_info( $_GET["UPLOAD_IDENTIFIER"] );
-if (!$X) {
-
- if ( array_key_exists( "e", $_GET ) ) {
- echo "<HTML><BODY onLoad='window.close();'>" . gettext("Invalid Meter ID") . "! {$_GET["UPLOAD_IDENTIFIER"]}";
- echo ('</BODY></HTML>');
- }else{
- echo ('<HTML><meta HTTP-EQUIV="Refresh" CONTENT="1; url='. $url .'"><BODY></BODY></HTML>');
- }
- 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 ('<HTML><BODY onLoad="window.close()"> ' . gettext("UPLOAD completed") . '!</BODY></HTML>');
- exit;
- }
-}
-
-?>
-
-<HTML>
-<HEAD>
-
-<meta HTTP-EQUIV="Refresh" CONTENT="1; url=<?=$url?>">
-
-<TITLE><?=gettext("Uploading Files... Please wait..."); ?></TITLE>
-
-<style type='text/css'> td {font-size: 10pt }</style>
-
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-
-<table height="100%" width="100%" cellPadding="4" cellSpacing="4" style="border:1px solid #990000;">
-<tr><td>
-
- <font face="arial"><b><center><?=gettext("Uploading files...");?></b></center>
-
- <br>
-
- <table width="100%" height="15" colspacing="0" cellpadding="0" cellspacing="0" border="0" align="top" nowrap>
- <td width="5" height="15" background="./themes/<?= $g['theme']; ?>/images/misc/bar_left.gif" align="top"></td>
- <td>
- <table WIDTH="100%" height="15" colspacing="0" cellpadding="0" cellspacing="0" border="0" align="top" nowrap>
- <td background="./themes/<?= $g['theme']; ?>/images/misc/bar_gray.gif"><?php echo("<img src='./themes/".$g['theme']."/images/misc/bar_blue.gif' height='15' WIDTH='$meter%'>");?></td>
- </table>
-
- </td>
- <td width="5" height="15" background="./themes/<?= $g['theme']; ?>/images/misc/bar_right.gif" align="top"></td>
- </table>
-
- <br>
-
- <TABLE WIDTH="100%">
- <tr>
- <td align="right"><font face="arial"><b><?=gettext("Time Remaining:");?></td><td><font face="arial"><?=$eta?></td>
- <td align="right"><font face="arial"><b><?=gettext("Speed:");?></td><td><font face="arial"><font face="arial"><?=$speed?><?=gettext("KB/sec");?></td>
- </tr>
-
- <tr>
- <td align="right"><font face="arial"><b><?=gettext("Uploaded:");?></td><td><font face="arial"><?=$upl?></td>
- <td align="right"><font face="arial"><b><?=gettext("File Size:");?></td><td><font face="arial"><?=$total?></td>
- </tr>
-
- <tr>
- <td align="right"><font face="arial"><b><?=gettext("Completed:");?></td><td><font face="arial"><?=$meter?>%</td>
- <td align="right"><font face="arial"><b></td><td><font face="arial"></td>
- </tr>
-
-</td></tr>
-</table>
-
-</BODY>
-</HTML>
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"))
}
}
?>
- <?php
- /*
- <input name="Submit" type="submit" class="formbtn" value="Upgrade firmware" onClick="window.open('upload_progress.php?upload_id=<?=$upload_id?>','UploadMeter','width=370,height=115', true); return true;">
- */
- ?>
<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Upgrade firmware");?>">
<?php endif; else: ?>
<strong><?=gettext("You must reboot the system before you can upgrade the firmware.");?></strong>
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 @@
-<?php
-/* $Id$ */
-/*
- upload_progress.php
- Copyright (C) 2008 Scott Ullrich <sullrich@gmail.com>
- 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
- <html>
- <meta http-equiv="Refresh" CONTENT="1; url=upload_progress.php?uploadid={$id}">
- <body>
- <?php printf(gettext("Could not locate progress %s. Trying again..."),$id);?>
- </body>
- </html>
-EOF;
- exit;
-}
-
-if ($info['bytes_uploaded'] >= $info['bytes_total']) {
- echo <<<EOF1
- <html>
- <body onLoad="window.close();">
- &nbsp;<p>
- &nbsp;<p>
- <center>
- <b>
- <?=gettext("UPLOAD completed!");?>
- </b>
- </center>
- </body>
- </html>
-EOF1;
- exit;
-}
-
-?>
-
-<html>
-<head>
- <meta http-equiv="Refresh" content="1; url=<?=$url?>">
- <title><?=gettext("Uploading Files"); ?>... <?=gettext("Please wait"); ?> ...</title>
- <style type='text/css'>
- td {font-size: 10pt }
- </style>
-</head>
-<body bgcolor="#FFFFFF">
- <table height="100%" width="100%" cellPadding="4" cellSpacing="4" style="border:1px solid #990000;">
- <tr>
- <td>
- <font face="arial"><b><center><?=gettext("Uploading file");?>...</b></center>
- <br>
- <table width="100%" height="15" colspacing="0" cellpadding="0" cellspacing="0" border="0" align="top" nowrap>
- <tr>
- <td width="5" height="15" background="./themes/<?= $g['theme']; ?>/images/misc/bar_left.gif" align="top">
- </td>
- <td>
- <table WIDTH="100%" height="15" colspacing="0" cellpadding="0" cellspacing="0" border="0" align="top" nowrap>
- <tr>
- <td background="./themes/<?= $g['theme']; ?>/images/misc/bar_gray.gif">
- <?php
- $meter = sprintf("%.2f", $info['bytes_uploaded'] / $info['bytes_total'] * 100);
- echo "<img src='./themes/{$g['theme']}/images/misc/bar_blue.gif' height='15' WIDTH='{$meter}%'>";
- ?>
- </td>
- </tr>
- </table>
- </td>
- <td width="5" height="15" background="./themes/<?= $g['theme']; ?>/images/misc/bar_right.gif" align="top">
- </td>
- </tr>
- </table>
- <br>
- <table width="100%">
- <tr>
- <td align="right">
- <font face="arial">
- <b>
- <?=gettext("Uploaded");?>:
- </td>
- <td>
- <font face="arial">
- <b>
- <?=$info['bytes_uploaded']?>
- </td>
- <td align="right">
- <font face="arial">
- <b>
- <?=gettext("File Size");?>:
- </td>
- <td>
- <font face="arial">
- <b>
- <?=$info['bytes_total']?>
- </td>
- </tr>
- <tr>
- <td align="right">
- <font face="arial">
- <b>
- <?=gettext("Completed");?>:
- </td>
- <td>
- <font face="arial">
- <b>
- <?=$info['bytes_total']-$info['bytes_uploaded']?>%
- </td>
- <td align="right">
- <font face="arial">
- <b>
- <?=gettext("Estimated");?>:
- </td>
- <td>
- <font face="arial">
- <b>
- <?=$info['est_sec']?>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
-</body>
-</html>
OpenPOWER on IntegriCloud