Changeset 873 for trunk/Modules/SpeedTest/download.php

Timestamp:

Apr 6, 2020, 11:17:40 PM (5 years ago)

Author:

chronos

Message:

• Modified: Improved code format.

File:

• trunk/Modules/SpeedTest/download.php (modified) (17 diffs)

trunk/Modules/SpeedTest/download.php

@@ -19 +19 @@
 $disallow = $config->{'general'}->{'disallow'};
 $allow = $config->{'general'}->{'allow'};
-if( $allow && (! preg_match("/$allow/",$remote_addr)) ) {
+if ( $allow && (! preg_match("/$allow/",$remote_addr)) ) {
     include("unallowed.html");
     exit;
-} elseif( $disallow && preg_match("/$disallow/", $remote_addr) ) {
+} elseif ( $disallow && preg_match("/$disallow/", $remote_addr) ) {
     include("unallowed.html");
     exit;
@@ -33 +33 @@
 ## on initial results
 $config_auto_size = $config->{'general'}->{'auto_size'};
-if($config_auto_size) {
+if ($config_auto_size) {
     ## We're using the auto_size functionality
-    if( isset($_GET['auto_size']) && $_GET['auto_size']) {
+    if ( isset($_GET['auto_size']) && $_GET['auto_size']) {
         ## Intial test is done.  Set down/upload sizes to the same as
         ## our initial measured speeds.   That way the test should take
@@ -55 +55 @@
 
 ## Make sure sizes are below our configured limits
-if($down_kbytes > $config->{'download'}->{'max_kbytes'}) {
+if ($down_kbytes > $config->{'download'}->{'max_kbytes'}) {
     $down_kbytes = $config->{'download'}->{'max_kbytes'};
 }
-if($up_kbytes > $config->{'upload'}->{'max_kbytes'}) {
+if ($up_kbytes > $config->{'upload'}->{'max_kbytes'}) {
     $up_kbytes = $config->{'upload'}->{'max_kbytes'};
 }
 
-if($config->{'upload'}->{'skip_upload'}) {
+if ($config->{'upload'}->{'skip_upload'}) {
     $up_kbytes = 0;
 }
@@ -92 +92 @@
 
 <?php
-if(file_exists("header.html")) {
+if (file_exists("header.html")) {
     ## Include "header.html" for a custom header, if the file exists
     include("header.html");
@@ -103 +103 @@
 
 <?php
-if( ($config_auto_size) && (! isset($_GET['auto_size'])) ) {
+if ( ($config_auto_size) && (! isset($_GET['auto_size'])) ) {
     ## auto_size is performing the initial, small test
     print "<div>Calculating appropriate file sizes for testing</div>\n";
@@ -137 +137 @@
 </div>
 
-<?php if(file_exists("footer.html")) { include("footer.html"); } ?>
+<?php if (file_exists("footer.html")) { include("footer.html"); } ?>
 
 <?php /* Begin JavaScript functions that we'll need */ ?>
@@ -144 +144 @@
 function StartUpload() {
     uploadDiv = document.getElementById('upload_message');
-    if(uploadDiv) {
+    if (uploadDiv) {
         uploadDiv.style.visibility='visible';
         uploadDiv.style.display='block';
-        <?php if($pretty_version) { ?>
+        <?php if ($pretty_version) { ?>
         setInterval("IncrementUploadBar()",200);
         <?php } ?>
@@ -158 +158 @@
 function IncrementDownloadBar() {
     download_barElement = document.getElementById('download_bar');
-    if(download_barElement) {
+    if (download_barElement) {
         download_bar_current_width += <?php echo $download_progress_bar_increment; ?>;
-        if(download_bar_current_width <= <?php echo $progress_bar_width; ?>) {
+        if (download_bar_current_width <= <?php echo $progress_bar_width; ?>) {
             download_barElement.style.width = download_bar_current_width +"px";
         }
@@ -176 +176 @@
 function IncrementUploadBar() {
     upload_barElement = document.getElementById('upload_bar');
-    if(upload_barElement) {
+    if (upload_barElement) {
         upload_bar_current_width += <?php echo $upload_progress_bar_increment; ?>;
-        if(upload_bar_current_width < <?php echo $progress_bar_width; ?>) {
+        if (upload_bar_current_width < <?php echo $progress_bar_width; ?>) {
             upload_barElement.style.width = upload_bar_current_width +"px";
         }
@@ -186 +186 @@
 function CompleteDownloadBar() {
     download_barElement = document.getElementById('download_bar');
-    if(download_barElement) {
+    if (download_barElement) {
         download_barElement.style.width = "100%";
     }
@@ -209 +209 @@
 <?php
 
-if($pretty_version) {
+if ($pretty_version) {
 print "
 //-->
@@ -225 +225 @@
     $extra_down_kbytes = $down_kbytes - $up_kbytes;
     $total_kbytes = 0;
-    while($total_kbytes <= $extra_down_kbytes) {
-        if($pretty_version) {
+    while ($total_kbytes <= $extra_down_kbytes) {
+        if ($pretty_version) {
         print "
 <script language=\"javascript\">
@@ -240 +240 @@
         $total_kbytes += $each_chunk;
     }
-    if(!$pretty_version) {
+    if (!$pretty_version) {
         print "dataElement.value=\"$data\";";
         print "CompleteDownloadBar();\n";
@@ -254 +254 @@
     ## Now, download the remaining bytes ($up_kbytes)  and save it into a
     ## form variable that we will post back to test the upload speed
-    while($total_kbytes <= $down_kbytes) {
-        if($pretty_version) {
+    while ($total_kbytes <= $down_kbytes) {
+        if ($pretty_version) {
         print "
 <script language=\"javascript\">
@@ -270 +270 @@
     }
 
-    if(!$pretty_version) {
+    if (!$pretty_version) {
         #print "\";";
     } else {
@@ -288 +288 @@
       downloadtime = (endtime - starttime)/1000;
   }
-    <?php if(! $config->{'upload'}->{'skip_upload'}){ ?> StartUpload(); <?php } ?>
+    <?php if (! $config->{'upload'}->{'skip_upload'}){ ?> StartUpload(); <?php } ?>
 
   down_size = <?php echo $total_kbytes; ?>;
@@ -297 +297 @@
 
 <?php
-if($config_auto_size && (! isset($_GET['auto_size'])) ) {
+if ($config_auto_size && (! isset($_GET['auto_size'])) ) {
     $params_auto_size = "&auto_size=1";
 } else {
     $params_auto_size = "";
 }
-if($config->{'upload'}->{'skip_upload'} && (! $params_auto_size)) {
+if ($config->{'upload'}->{'skip_upload'} && (! $params_auto_size)) {
     $next_url = $config->{'general'}->{'base_url'}."results.php";
 } else {