ben/handbrake-cluster-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bugs with time calculation and URL redirects

Browse Source 
Fixed incorrect time calculations present on the job status page.
Fixed strict bug with URL redirections accessing the wrong _SERVER var.
This commit is contained in:
Ben Roberts
2010-08-30 21:26:43 +01:00
parent df34b9718a
commit 30adbc7e47
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/RippingCluster/Main.class.php
View File

@@ -115,7 +115,7 @@ class RippingCluster_Main {
public function absoluteUrl($relative_url) { public function absoluteUrl($relative_url) {
$secure = isset($_SERVER['secure']); $secure = isset($_SERVER['secure']);
$port = $_SERVER['HTTP_PORT']; $port = $_SERVER['SERVER_PORT'];
return 'http' . ($secure ? 's' : '') . '://' return 'http' . ($secure ? 's' : '') . '://'
. $_SERVER['HTTP_HOST'] . (($port == 80 || ($secure && $port == 443)) ? '' : ':' . $port) . $_SERVER['HTTP_HOST'] . (($port == 80 || ($secure && $port == 443)) ? '' : ':' . $port)
. '/' . $this->base_uri . $relative_url; . '/' . $this->base_uri . $relative_url;
@@ -187,7 +187,7 @@ class RippingCluster_Main {
} }
$labels = array('seconds', 'minutes', 'hours', 'days', 'weeks', 'months', 'years'); $labels = array('seconds', 'minutes', 'hours', 'days', 'weeks', 'months', 'years');
$limits = array(60, 3600, 86400, 604800, 2592000, 31556926, PHP_INT_MAX); $limits = array(1, 60, 3600, 86400, 604800, 2592000, 31556926, PHP_INT_MAX);
$working_time = $time; $working_time = $time;