Fix folder share gallery view link
This commit is contained in:
@@ -4,7 +4,8 @@
|
||||
require_once __DIR__ . '/../../config/config.php';
|
||||
require_once PROJECT_ROOT . '/src/models/FolderModel.php';
|
||||
|
||||
class FolderController {
|
||||
class FolderController
|
||||
{
|
||||
/**
|
||||
* @OA\Post(
|
||||
* path="/api/folder/createFolder.php",
|
||||
@@ -45,7 +46,8 @@ class FolderController {
|
||||
*
|
||||
* @return void Outputs a JSON response.
|
||||
*/
|
||||
public function createFolder(): void {
|
||||
public function createFolder(): void
|
||||
{
|
||||
header('Content-Type: application/json');
|
||||
|
||||
// Ensure user is authenticated.
|
||||
@@ -145,7 +147,8 @@ class FolderController {
|
||||
*
|
||||
* @return void Outputs a JSON response.
|
||||
*/
|
||||
public function deleteFolder(): void {
|
||||
public function deleteFolder(): void
|
||||
{
|
||||
header('Content-Type: application/json');
|
||||
|
||||
// Ensure user is authenticated.
|
||||
@@ -238,7 +241,8 @@ class FolderController {
|
||||
*
|
||||
* @return void Outputs a JSON response.
|
||||
*/
|
||||
public function renameFolder(): void {
|
||||
public function renameFolder(): void
|
||||
{
|
||||
header('Content-Type: application/json');
|
||||
|
||||
// Ensure user is authenticated.
|
||||
@@ -329,7 +333,8 @@ class FolderController {
|
||||
*
|
||||
* @return void Outputs JSON response.
|
||||
*/
|
||||
public function getFolderList(): void {
|
||||
public function getFolderList(): void
|
||||
{
|
||||
header('Content-Type: application/json');
|
||||
|
||||
// Ensure user is authenticated.
|
||||
@@ -396,7 +401,8 @@ class FolderController {
|
||||
*
|
||||
* @return void Outputs HTML content.
|
||||
*/
|
||||
public function shareFolder(): void {
|
||||
public function shareFolder(): void
|
||||
{
|
||||
// Retrieve GET parameters.
|
||||
$token = filter_input(INPUT_GET, 'token', FILTER_SANITIZE_STRING);
|
||||
$providedPass = filter_input(INPUT_GET, 'pass', FILTER_SANITIZE_STRING);
|
||||
@@ -421,18 +427,48 @@ class FolderController {
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>Enter Password</title>
|
||||
<style>
|
||||
body { font-family: Arial, sans-serif; padding: 20px; background-color: #f7f7f7; }
|
||||
.container { max-width: 400px; margin: 80px auto; background: #fff; padding: 20px; border-radius: 4px; box-shadow: 0 2px 8px rgba(0,0,0,0.1); }
|
||||
input[type="password"], button { width: 100%; padding: 10px; margin: 10px 0; font-size: 1rem; }
|
||||
button { background-color: #007BFF; border: none; color: #fff; cursor: pointer; }
|
||||
button:hover { background-color: #0056b3; }
|
||||
body {
|
||||
font-family: Arial, sans-serif;
|
||||
padding: 20px;
|
||||
background-color: #f7f7f7;
|
||||
}
|
||||
|
||||
.container {
|
||||
max-width: 400px;
|
||||
margin: 80px auto;
|
||||
background: #fff;
|
||||
padding: 20px;
|
||||
border-radius: 4px;
|
||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
input[type="password"],
|
||||
button {
|
||||
width: 100%;
|
||||
padding: 10px;
|
||||
margin: 10px 0;
|
||||
font-size: 1rem;
|
||||
}
|
||||
|
||||
button {
|
||||
background-color: #007BFF;
|
||||
border: none;
|
||||
color: #fff;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
button:hover {
|
||||
background-color: #0056b3;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div class="container">
|
||||
<h2>Folder Protected</h2>
|
||||
@@ -445,6 +481,7 @@ class FolderController {
|
||||
</form>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
<?php
|
||||
exit;
|
||||
@@ -464,7 +501,8 @@ class FolderController {
|
||||
$currentPage = $data['currentPage'];
|
||||
$totalPages = $data['totalPages'];
|
||||
|
||||
function formatBytes($bytes) {
|
||||
function formatBytes($bytes)
|
||||
{
|
||||
if ($bytes < 1024) {
|
||||
return $bytes . " B";
|
||||
} elseif ($bytes < 1024 * 1024) {
|
||||
@@ -481,33 +519,129 @@ class FolderController {
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Shared Folder: <?php echo htmlspecialchars($folderName, ENT_QUOTES, 'UTF-8'); ?></title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<style>
|
||||
body { background: #f2f2f2; font-family: Arial, sans-serif; padding: 20px; color: #333; }
|
||||
.header { text-align: center; margin-bottom: 30px; }
|
||||
.container { max-width: 800px; margin: 0 auto; background: #fff; border-radius: 4px; padding: 20px; box-shadow: 0 2px 12px rgba(0,0,0,0.1); }
|
||||
table { width: 100%; border-collapse: collapse; margin-top: 20px; }
|
||||
th, td { padding: 12px; border-bottom: 1px solid #ddd; text-align: left; }
|
||||
th { background: #007BFF; color: #fff; }
|
||||
.pagination { text-align: center; margin-top: 20px; }
|
||||
.pagination a, .pagination span { margin: 0 5px; padding: 8px 12px; background: #007BFF; color: #fff; border-radius: 4px; text-decoration: none; }
|
||||
.pagination span.current { background: #0056b3; }
|
||||
body {
|
||||
background: #f2f2f2;
|
||||
font-family: Arial, sans-serif;
|
||||
padding: 20px;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.header {
|
||||
text-align: center;
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
|
||||
.container {
|
||||
max-width: 800px;
|
||||
margin: 0 auto;
|
||||
background: #fff;
|
||||
border-radius: 4px;
|
||||
padding: 20px;
|
||||
box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
th,
|
||||
td {
|
||||
padding: 12px;
|
||||
border-bottom: 1px solid #ddd;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
th {
|
||||
background: #007BFF;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.pagination {
|
||||
text-align: center;
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.pagination a,
|
||||
.pagination span {
|
||||
margin: 0 5px;
|
||||
padding: 8px 12px;
|
||||
background: #007BFF;
|
||||
color: #fff;
|
||||
border-radius: 4px;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.pagination span.current {
|
||||
background: #0056b3;
|
||||
}
|
||||
|
||||
/* Gallery view styles if needed */
|
||||
.shared-gallery-container { display: grid; grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); gap: 10px; padding: 10px 0; }
|
||||
.shared-gallery-card { border: 1px solid #ccc; padding: 5px; text-align: center; }
|
||||
.shared-gallery-card img { max-width: 100%; display: block; margin: 0 auto; }
|
||||
.shared-gallery-container {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
|
||||
gap: 10px;
|
||||
padding: 10px 0;
|
||||
}
|
||||
|
||||
.shared-gallery-card {
|
||||
border: 1px solid #ccc;
|
||||
padding: 5px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.shared-gallery-card img {
|
||||
max-width: 100%;
|
||||
display: block;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
/* Upload container */
|
||||
.upload-container { margin-top: 30px; text-align: center; }
|
||||
.upload-container h3 { font-size: 1.4rem; margin-bottom: 10px; }
|
||||
.upload-container form { display: inline-block; margin-top: 10px; }
|
||||
.upload-container button { background-color: #28a745; border: none; color: #fff; padding: 10px 20px; font-size: 1rem; border-radius: 4px; cursor: pointer; }
|
||||
.upload-container button:hover { background-color: #218838; }
|
||||
.footer { text-align: center; margin-top: 40px; font-size: 0.9rem; color: #777; }
|
||||
.upload-container {
|
||||
margin-top: 30px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.upload-container h3 {
|
||||
font-size: 1.4rem;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.upload-container form {
|
||||
display: inline-block;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.upload-container button {
|
||||
background-color: #28a745;
|
||||
border: none;
|
||||
color: #fff;
|
||||
padding: 10px 20px;
|
||||
font-size: 1rem;
|
||||
border-radius: 4px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.upload-container button:hover {
|
||||
background-color: #218838;
|
||||
}
|
||||
|
||||
.footer {
|
||||
text-align: center;
|
||||
margin-top: 40px;
|
||||
font-size: 0.9rem;
|
||||
color: #777;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div class="header">
|
||||
<h1>Shared Folder: <?php echo htmlspecialchars($folderName, ENT_QUOTES, 'UTF-8'); ?></h1>
|
||||
@@ -602,37 +736,50 @@ class FolderController {
|
||||
// (Optional) JavaScript for toggling view modes (list/gallery).
|
||||
var viewMode = 'list';
|
||||
window.imageCache = window.imageCache || {};
|
||||
|
||||
var filesData = <?php echo json_encode($files); ?>;
|
||||
|
||||
function cacheImage(imgElem, key) {
|
||||
window.imageCache[key] = imgElem.src;
|
||||
}
|
||||
// Use the shared‑folder relative path (from your model), not realFolderPath
|
||||
// $data['folder'] should be something like "eafwef/testfolder2/test/new folder two"
|
||||
var rawRelPath = "<?php echo addslashes($data['folder']); ?>";
|
||||
// Split into segments, encode each segment, then re-join
|
||||
var folderSegments = rawRelPath
|
||||
.split('/')
|
||||
.map(encodeURIComponent)
|
||||
.join('/');
|
||||
|
||||
function renderGalleryView() {
|
||||
var galleryContainer = document.getElementById("galleryViewContainer");
|
||||
var html = '<div class="shared-gallery-container">';
|
||||
filesData.forEach(function(file) {
|
||||
var fileUrl = window.location.origin
|
||||
+ "/uploads/<?php echo rawurlencode($folderName); ?>/"
|
||||
+ encodeURIComponent(file);
|
||||
// Encode the filename too
|
||||
var fileName = encodeURIComponent(file);
|
||||
var fileUrl = window.location.origin +
|
||||
'/uploads/' +
|
||||
folderSegments +
|
||||
'/' +
|
||||
fileName +
|
||||
'?t=' +
|
||||
Date.now();
|
||||
|
||||
var ext = file.split('.').pop().toLowerCase();
|
||||
var thumbnail = "";
|
||||
var thumbnail;
|
||||
if (['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'svg', 'ico'].indexOf(ext) >= 0) {
|
||||
var cacheKey = fileUrl;
|
||||
if (window.imageCache[cacheKey]) {
|
||||
thumbnail = '<img src="'+window.imageCache[cacheKey]+'" alt="'+file+'">';
|
||||
} else {
|
||||
var imageUrl = fileUrl + '?t=' + new Date().getTime();
|
||||
thumbnail = '<img src="'+imageUrl+'" onload="cacheImage(this, \''+cacheKey+'\')" alt="'+file+'">';
|
||||
}
|
||||
thumbnail = '<img src="' + fileUrl + '" alt="' + file + '">';
|
||||
} else {
|
||||
thumbnail = '<span class="material-icons">insert_drive_file</span>';
|
||||
}
|
||||
html += '<div class="shared-gallery-card">';
|
||||
html += '<div class="gallery-preview" onclick="window.location.href=\''+fileUrl+'\'" style="cursor:pointer;">'+ thumbnail +'</div>';
|
||||
html += '<div class="gallery-info"><span class="gallery-file-name">'+file+'</span></div>';
|
||||
html += '</div>';
|
||||
|
||||
html +=
|
||||
'<div class="shared-gallery-card">' +
|
||||
'<div class="gallery-preview" ' +
|
||||
'onclick="window.location.href=\'' + fileUrl + '\'" ' +
|
||||
'style="cursor:pointer;">' +
|
||||
thumbnail +
|
||||
'</div>' +
|
||||
'<div class="gallery-info">' +
|
||||
'<span class="gallery-file-name">' + file + '</span>' +
|
||||
'</div>' +
|
||||
'</div>';
|
||||
});
|
||||
html += '</div>';
|
||||
galleryContainer.innerHTML = html;
|
||||
@@ -654,6 +801,7 @@ class FolderController {
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
<?php
|
||||
exit;
|
||||
@@ -703,7 +851,8 @@ class FolderController {
|
||||
*
|
||||
* @return void Outputs a JSON response.
|
||||
*/
|
||||
public function createShareFolderLink(): void {
|
||||
public function createShareFolderLink(): void
|
||||
{
|
||||
header('Content-Type: application/json');
|
||||
|
||||
// Ensure user is authenticated.
|
||||
@@ -785,7 +934,8 @@ class FolderController {
|
||||
*
|
||||
* @return void Outputs the file with proper headers.
|
||||
*/
|
||||
public function downloadSharedFile(): void {
|
||||
public function downloadSharedFile(): void
|
||||
{
|
||||
// Retrieve and sanitize GET parameters.
|
||||
$token = filter_input(INPUT_GET, 'token', FILTER_SANITIZE_STRING);
|
||||
$file = filter_input(INPUT_GET, 'file', FILTER_SANITIZE_STRING);
|
||||
@@ -863,7 +1013,8 @@ class FolderController {
|
||||
*
|
||||
* @return void Redirects upon successful upload or outputs JSON errors.
|
||||
*/
|
||||
public function uploadToSharedFolder(): void {
|
||||
public function uploadToSharedFolder(): void
|
||||
{
|
||||
// Ensure request is POST.
|
||||
if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
|
||||
http_response_code(405);
|
||||
|
||||
Reference in New Issue
Block a user