Update

Author: Daniel Neto

Diff for: install/checkConfiguration.php

@@ -97,16 +97,28 @@
 $content = "<?php
 \$global['disableAdvancedConfigurations'] = 0;
 \$global['videoStorageLimitMinutes'] = 0;
-//\$global['webSiteRootURL'] = '{$_POST['webSiteRootURL']}';
-// get the subdirectory, if exists
 
-\$DOCUMENT_ROOT = str_replace('/',DIRECTORY_SEPARATOR,\$_SERVER[\"DOCUMENT_ROOT\"]);
-\$subDir = str_replace(array(\$DOCUMENT_ROOT, 'configuration.php'), array('',''), __FILE__);
-\$global['webSiteRootURL'] = \"http\".(!empty(\$_SERVER['HTTPS'])?\"s\":\"\").\"://\".\$_SERVER['SERVER_NAME'].\$subDir;
-\$global['webSiteRootURL'] = str_replace('\\\','/',\$global['webSiteRootURL']);
+// Get the HTTP/HTTPS scheme
+\$scheme = 'http' . (!empty(\$_SERVER['HTTPS']) && \$_SERVER['HTTPS'] !== 'off' ? 's' : '');
 
-\$global['systemRootPath'] = '{$_POST['systemRootPath']}';
+// Get the server name
+\$serverName = \$_SERVER['SERVER_NAME'];
+
+// Get the server port
+\$serverPort = \$_SERVER['SERVER_PORT'];
+
+// Check if the port is a standard port (80 for HTTP, 443 for HTTPS) to decide whether to include it in the URL
+\$includePort = \$serverPort !== '80' && \$serverPort !== '443';
 
+// Get the subdirectory, if exists
+\$DOCUMENT_ROOT = str_replace('/', DIRECTORY_SEPARATOR, \$_SERVER['DOCUMENT_ROOT']);
+\$subDir = str_replace(array(\$DOCUMENT_ROOT, 'configuration.php'), array('', ''), __FILE__);
+\$subDir = str_replace('\\\','/', \$subDir); // Ensure forward slashes
+
+// Construct the webSiteRootURL with or without port
+\$global['webSiteRootURL'] = \$scheme . '://' . \$serverName . (\$includePort ? ':' . \$serverPort : '') . \$subDir;
+
+\$global['systemRootPath'] = '{$_POST['systemRootPath']}';
 
 \$mysqlHost = '{$_POST['databaseHost']}';
 \$mysqlPort = '{$_POST['databasePort']}';

Diff for: objects/include_config.php

@@ -15,7 +15,8 @@
 $offset = sprintf('%+d:%02d', $hrs*$sgn, $mins);
 $global['mysqli']->query("SET time_zone='$offset';");
 
-header('Set-Cookie: cross-site-cookie=name; SameSite=None; Secure');
+header('Set-Cookie: cross-site-cookie=name; SameSite=Lax; Secure');
+
 session_start();
 
 require_once $global['systemRootPath'] . 'objects/Object.php';

Diff for: view/css/style.css

@@ -136,6 +136,10 @@ div.clearfix {
     text-overflow: ellipsis;
 }
 
+.ellipsis .clearfix{
+    margin: 2px;
+}
+
 .margin-top-15 {
     margin-top: 15px;
 }

Diff for: view/index.php

@@ -34,6 +34,7 @@
     ),
 );
 
+//var_dump(__LINE__, "{$global['webSiteRootURL']}view/getBestEncoder.php",  $serverPort !== '80' && $serverPort !== '443');exit;
 $bestEncoder = json_decode(url_get_contents("{$global['webSiteRootURL']}view/getBestEncoder.php", stream_context_create($arrContextOptions)));
 
 if (empty($bestEncoder)) {
@@ -205,14 +206,23 @@
                                     <div data-target="#l<?php echo $value['id']; ?>" data-toggle="tab">
                                         <div class="ellipsis">
                                             <span class="account-type"><?php echo $value['name']; ?></span>
-                                            <span id="recommended<?php echo $value['id']; ?>" class="label label-success recommended" style="display: none;"><i class="fa fa-check"></i> Recommended</span><br />
-                                            <span id="label<?php echo $value['id']; ?>" class="label label-danger">Offline</span> <span class="account-amount" id="queuesize<?php echo $value['id']; ?>">Queue Size 0 </span> / <span class="account-amount" id="concurrent<?php echo $value['id']; ?>">Concurrent 1 </span> <br />
-                                            <a href="<?php echo $value['siteURL']; ?>" class="account-link"><?php
-                                                                                                            $parts = parse_url($value['siteURL']);
-                                                                                                            echo $parts["host"];
-                                                                                                            ?></a><br>
-                                            <span id="ping<?php echo $value['id']; ?>" class="label label-default">Searching Ping ...</span>
-                                            <span id="maxfilesize<?php echo $value['id']; ?>" class="label label-default">Max File Size 0Mb</span>
+                                            <div class="clearfix"></div>
+                                            <span id="recommended<?php echo $value['id']; ?>" class="label label-success recommended" style="display: none;">
+                                                <i class="fa fa-check"></i> Recommended
+                                            </span>
+                                            <span id="label<?php echo $value['id']; ?>" class="label label-danger">Offline</span>
+                                                <div class="clearfix hidden-xs"></div>
+                                                <span class="account-amount" id="queuesize<?php echo $value['id']; ?>">Queue Size 0 </span> / <span class="account-amount" id="concurrent<?php echo $value['id']; ?>">Concurrent 1 </span>
+                                                <div class="clearfix"></div>
+                                                <a href="<?php echo $value['siteURL']; ?>" class="account-link">
+                                                    <?php
+                                                    $parts = parse_url($value['siteURL']);
+                                                    echo $parts["host"];
+                                                    ?>
+                                                </a>
+                                                <div class="clearfix  hidden-xs"></div>
+                                                <span id="ping<?php echo $value['id']; ?>" class="label label-default">Searching Ping ...</span>
+                                                <span id="maxfilesize<?php echo $value['id']; ?>" class="label label-default">Max File Size 0Mb</span>
                                         </div>
 
                                     </div>
@@ -233,8 +243,7 @@
                                                         ?>" id="l<?php echo $value['id']; ?>"><!--style="padding-left: 60px; padding-right:100px"-->
                                     <div class="row">
                                         <div class="col-sm-12">
-                                            <canvas id="canvas<?php echo $value['id']; ?>" rowId="<?php echo $value['id']; ?>" 
-                                            siteURL="<?php echo $value['siteURL']; ?>" class="ping" height="30"></canvas>
+                                            <canvas id="canvas<?php echo $value['id']; ?>" rowId="<?php echo $value['id']; ?>" siteURL="<?php echo $value['siteURL']; ?>" class="ping" height="30"></canvas>
                                         </div>
                                         <div class="col-sm-12" style="min-height: 70vh;">
                                             <iframe src="<?php echo $value['siteURL']; ?>?noNavbar=1&webSiteRootURL=<?php echo urlencode($_SESSION["login"]->streamer); ?>&user=<?php echo $_SESSION["login"]->user; ?>&pass=<?php echo $_SESSION["login"]->pass; ?>" frameborder="0" style="overflow:hidden;height:100vh;width:100%;" height="100%" width="100%"></iframe>