gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-29 04:57:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2024-01-26 12:54:59 +01:00
commit 2009e59629
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.htaccess
View File

@ -6,7 +6,7 @@ Header set X-Content-Type-Options: "nosniff"
</IfModule> </IfModule>
RewriteEngine On RewriteEngine On
RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last] RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
#RewriteRule "^favicon\.ico$" "-" [L] #RewriteRule "^favicon\.ico$" "-" [L]
#RewriteRule "^(favicon\.ico)$" %{HTTP_HOST}/views/bootstrap/images/favicon.svg [L,NC] #RewriteRule "^(favicon\.ico)$" %{HTTP_HOST}/views/bootstrap/images/favicon.svg [L,NC]
RewriteRule "^(favicon\.ico)" /views/bootstrap/images/favicon.svg [L,NC] RewriteRule "^(favicon\.ico)" /views/bootstrap/images/favicon.svg [L,NC]

2
views/bootstrap/class.Charts.php
View File

@ -266,7 +266,7 @@ $(document).ready( function() {
break; break;
case 'sizeperuser': case 'sizeperuser':
foreach($data as $item) { foreach($data as $item) {
echo "<tr><td>".htmlspecialchars($item['key'])."</td><td>".SeedDMS_Core_File::format_filesize($item['total'])."</td></tr>"; echo "<tr><td>".htmlspecialchars($item['key'])."</td><td>".SeedDMS_Core_File::format_filesize((int) $item['total'])."</td></tr>";
$total += $item['total']; $total += $item['total'];
} }
echo "<tr><th></th><th>".SeedDMS_Core_File::format_filesize($total)."<th></tr>"; echo "<tr><th></th><th>".SeedDMS_Core_File::format_filesize($total)."<th></tr>";