diff --git a/public_html/entreaulas/aulario.php b/public_html/entreaulas/aulario.php index a4cc4e2..6cf9e72 100644 --- a/public_html/entreaulas/aulario.php +++ b/public_html/entreaulas/aulario.php @@ -16,7 +16,7 @@ $aulario = json_decode(file_get_contents("/DATA/entreaulas/Centros/$centro_id/Au
- +
Panel Diario diff --git a/public_html/entreaulas/paneldiario.php b/public_html/entreaulas/paneldiario.php index c0a5f85..07067be 100755 --- a/public_html/entreaulas/paneldiario.php +++ b/public_html/entreaulas/paneldiario.php @@ -156,11 +156,26 @@ switch ($_GET["action"]) { $aulario_id = $_GET["aulario"] ?? ""; $centro_id = $_SESSION["auth_data"]["entreaulas"]["centro"] ?? ""; + $source_aulario_id = $aulario_id; + $is_shared = false; + if ($aulario_id !== "" && $centro_id !== "") { + $aulario_path = "/DATA/entreaulas/Centros/$centro_id/Aularios/$aulario_id.json"; + $aulario = file_exists($aulario_path) ? json_decode(file_get_contents($aulario_path), true) : null; + if ($aulario && !empty($aulario["shared_comedor_from"])) { + $shared_from = $aulario["shared_comedor_from"]; + $shared_aulario_path = "/DATA/entreaulas/Centros/$centro_id/Aularios/$shared_from.json"; + if (file_exists($shared_aulario_path)) { + $source_aulario_id = $shared_from; + $is_shared = true; + } + } + } + $dateParam = $_GET["date"] ?? date("Y-m-d"); $dateObj = DateTime::createFromFormat("Y-m-d", $dateParam) ?: new DateTime(); $date = $dateObj->format("Y-m-d"); - $menuTypesPath = "/DATA/entreaulas/Centros/$centro_id/Aularios/$aulario_id/Comedor-MenuTypes.json"; + $menuTypesPath = "/DATA/entreaulas/Centros/$centro_id/Aularios/$source_aulario_id/Comedor-MenuTypes.json"; $defaultMenuTypes = [ ["id" => "basal", "label" => "Menú basal", "color" => "#0d6efd"], ["id" => "vegetariano", "label" => "Menú vegetariano", "color" => "#198754"], @@ -184,7 +199,7 @@ switch ($_GET["action"]) { $ym = $dateObj->format("Y-m"); $day = $dateObj->format("d"); - $dataPath = "/DATA/entreaulas/Centros/$centro_id/Aularios/$aulario_id/Comedor/$ym/$day/_datos.json"; + $dataPath = "/DATA/entreaulas/Centros/$centro_id/Aularios/$source_aulario_id/Comedor/$ym/$day/_datos.json"; $menuData = [ "date" => $date, @@ -208,19 +223,11 @@ switch ($_GET["action"]) { ?>
@@ -259,18 +266,23 @@ switch ($_GET["action"]) {
Menú no disponible
- $plateLabel): + $plateLabel): + $loop ++; $plate = $menuItem["plates"][$plateKey] ?? ["name" => "", "pictogram" => "", "photo" => ""]; - $pictSrc = image_src_simple($plate["pictogram"] ?? "", $centro_id, $aulario_id, $date); + $pictSrc = image_src_simple($plate["pictogram"] ?? "", $centro_id, $source_aulario_id, $date); ?>
<?= htmlspecialchars($plateLabel) ?> -
—
+
+ +
- +
@@ -296,10 +308,11 @@ switch ($_GET["action"]) { .menu-lines { display: grid; gap: 8px; + grid-template-columns: repeat(auto-fit, minmax(220px, 1fr)); } .menu-line { display: grid; - grid-template-columns: 100px 2fr; + grid-template-columns: 100px 1fr; align-items: center; gap: 8px; background: #fff; @@ -325,7 +338,8 @@ switch ($_GET["action"]) { .menu-line-img.placeholder { background: #f1f1f1; border-style: dashed; - color: #777; + color: #333; + font-size: 5rem; } .menu-line-name { font-size: 1.1rem; diff --git a/public_html/entreaulas/pdf_secure_viewer.php b/public_html/entreaulas/pdf_secure_viewer.php new file mode 100644 index 0000000..c5dd766 --- /dev/null +++ b/public_html/entreaulas/pdf_secure_viewer.php @@ -0,0 +1,286 @@ + + + + + + + PDF Seguro + + + +
+ Este PDF se muestra en modo seguro. No se permite la descarga, impresión o copia del contenido. +
+
+ + + + 100% +
+
+ Cargando PDF... +
+ + + + diff --git a/public_html/entreaulas/proyectos.php b/public_html/entreaulas/proyectos.php index f38f8c2..516117e 100644 --- a/public_html/entreaulas/proyectos.php +++ b/public_html/entreaulas/proyectos.php @@ -64,6 +64,36 @@ function sanitize_html($html) return $clean; } +function build_videocall_url($platform, $room, $custom_url, &$error) +{ + $platform = strtolower(trim((string)$platform)); + if ($platform === "jitsi") { + $room = trim((string)$room); + if ($room === "") { + $error = "El nombre de la sala es obligatorio para la videollamada."; + return ["", ""]; + } + $safe_room = preg_replace("/[^a-zA-Z0-9_-]/", "-", $room); + return ["https://meet.jit.si/" . $safe_room, $safe_room]; + } + if ($platform === "google_meet") { + $room = trim((string)$room); + if ($room === "") { + $error = "El código de Google Meet es obligatorio para la videollamada."; + return ["", ""]; + } + $safe_room = preg_replace("/[^a-zA-Z0-9-]/", "", $room); + return ["https://meet.google.com/" . $safe_room, $safe_room]; + } + + $custom_url = trim((string)$custom_url); + if ($custom_url === "" || filter_var($custom_url, FILTER_VALIDATE_URL) === false) { + $error = "La URL de videollamada no es válida."; + return ["", ""]; + } + return [$custom_url, ""]; +} + function generate_id($name) { return strtolower(preg_replace("/[^a-zA-Z0-9]/", "_", $name)) . "_" . substr(md5(uniqid()), 0, 8); @@ -125,6 +155,54 @@ function save_file_metadata($file_path, $data) file_put_contents($meta_file, json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE)); } +function parse_size_to_bytes($size) +{ + $size = trim((string)$size); + if ($size === "") { + return 0; + } + $last = strtolower(substr($size, -1)); + $num = (float)$size; + if (in_array($last, ["g", "m", "k"], true)) { + $num = (float)substr($size, 0, -1); + switch ($last) { + case "g": + $num *= 1024; + case "m": + $num *= 1024; + case "k": + $num *= 1024; + } + } + return (int)$num; +} + +function format_bytes($bytes) +{ + $bytes = (int)$bytes; + if ($bytes >= 1024 * 1024 * 1024) { + return round($bytes / (1024 * 1024 * 1024), 1) . "GB"; + } + if ($bytes >= 1024 * 1024) { + return round($bytes / (1024 * 1024), 1) . "MB"; + } + if ($bytes >= 1024) { + return round($bytes / 1024, 1) . "KB"; + } + return $bytes . "B"; +} + +$app_max_upload_bytes = 500 * 1024 * 1024; +$upload_limit = parse_size_to_bytes(ini_get("upload_max_filesize")); +$post_limit = parse_size_to_bytes(ini_get("post_max_size")); +$max_upload_bytes = $app_max_upload_bytes; +foreach ([$upload_limit, $post_limit] as $limit) { + if ($limit > 0 && $limit < $max_upload_bytes) { + $max_upload_bytes = $limit; + } +} +$max_upload_label = format_bytes($max_upload_bytes); + function load_project($proyectos_dir, $project_id) { $project_dir = find_project_path($proyectos_dir, $project_id); @@ -174,7 +252,7 @@ function get_project_breadcrumb($proyectos_dir, $project_id) return $breadcrumb; } -function list_projects($proyectos_dir, $parent_id = null) +function list_projects($proyectos_dir, $parent_id = null, $owner_aulario = null) { $projects = []; if (!is_dir($proyectos_dir)) { @@ -201,6 +279,11 @@ function list_projects($proyectos_dir, $parent_id = null) } $data = json_decode(file_get_contents($meta_file), true); if ($data) { + if ($parent_id === null && $owner_aulario !== null) { + if (($data["owner_aulario"] ?? null) !== $owner_aulario) { + continue; + } + } $projects[] = $data; } } @@ -294,7 +377,8 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") { "items" => [], "subprojects" => [], "parent_id" => $parent_id !== "" ? $parent_id : null, - "level" => $level + "level" => $level, + "owner_aulario" => $aulario_id ]; $project_data["_project_dir"] = $project_dir; @@ -358,7 +442,7 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") { $target_config["linked_projects"][] = [ "source_aulario" => $aulario_id, "project_id" => $project_id, - "permission" => "read_only" + "permission" => "request_edit" ]; $message = "Proyecto compartido correctamente."; } @@ -370,7 +454,7 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") { } if ($action === "delete_project") { - if (in_array("entreaulas:proyectos:borrar", $_SESSION["auth_data"]["permissions"] ?? []) === false) { + if (in_array("entreaulas:proyectos:delete", $_SESSION["auth_data"]["permissions"] ?? []) === false) { $error = "No tienes permisos para borrar proyectos."; } else { $project_id = $_POST["project_id"] ?? ""; @@ -425,6 +509,9 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") { $item_name = trim($_POST["item_name"] ?? ""); $item_url = trim($_POST["item_url"] ?? ""); $item_content = sanitize_html($_POST["item_content"] ?? ""); + $videocall_platform = $_POST["videocall_platform"] ?? "jitsi"; + $videocall_room = trim($_POST["videocall_room"] ?? ""); + $videocall_url = trim($_POST["videocall_url"] ?? ""); $source_aulario_param = $_POST["source_aulario"] ?? ""; // Determine which directory to use and permission level @@ -473,19 +560,36 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") { "id" => $change_id, "type" => "add_item", "requested_by_aulario" => $aulario_id, + "requested_by_persona_name" => ($_SESSION["auth_data"]["display_name"] ?? "Desconocido"), "requested_at" => time(), "status" => "pending", "item_type" => $item_type, "item_name" => $item_name, - "item_url" => $item_url + "item_url" => $item_url, + "item_content" => $item_content ]; - // Handle file upload for pending changes - if ($item_type === "file" && isset($_FILES["item_file"]) && $_FILES["item_file"]["error"] === UPLOAD_ERR_OK) { - $ext = strtolower(pathinfo($_FILES["item_file"]["name"], PATHINFO_EXTENSION)); - $allowed_extensions = ["pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx", "jpg", "jpeg", "png", "gif", "webp", "txt", "zip", "mp4", "mp3"]; + if ($item_type === "videocall") { + $vc_error = ""; + [$vc_url, $vc_room] = build_videocall_url($videocall_platform, $videocall_room, $videocall_url, $vc_error); + if ($vc_error !== "") { + $error = $vc_error; + } else { + $change_data["item_url"] = $vc_url; + $change_data["item_platform"] = $videocall_platform; + $change_data["item_room"] = $vc_room; + } + } - if (in_array($ext, $allowed_extensions, true)) { + // Handle file upload for pending changes + if (($item_type === "file" || $item_type === "pdf_secure") && isset($_FILES["item_file"]) && $_FILES["item_file"]["error"] === UPLOAD_ERR_OK) { + if ($_FILES["item_file"]["size"] > $max_upload_bytes) { + $error = "El archivo es demasiado grande. Tamaño máximo: $max_upload_label."; + } + $ext = strtolower(pathinfo($_FILES["item_file"]["name"], PATHINFO_EXTENSION)); + $allowed_extensions = $item_type === "pdf_secure" ? ["pdf"] : ["pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx", "jpg", "jpeg", "png", "gif", "webp", "txt", "zip", "mp4", "mp3"]; + + if (empty($error) && in_array($ext, $allowed_extensions, true)) { $safe_name = safe_filename($_FILES["item_file"]["name"]); $temp_file_path = "$pending_dir/{$change_id}_$safe_name"; @@ -527,16 +631,26 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") { $item["url"] = $item_url; } elseif ($item_type === "notepad") { $item["content"] = $item_content; - } elseif ($item_type === "file" && isset($_FILES["item_file"]) && $_FILES["item_file"]["error"] === UPLOAD_ERR_OK) { + } elseif ($item_type === "videocall") { + $vc_error = ""; + [$vc_url, $vc_room] = build_videocall_url($videocall_platform, $videocall_room, $videocall_url, $vc_error); + if ($vc_error !== "") { + $error = $vc_error; + $can_add_item = false; + } else { + $item["url"] = $vc_url; + $item["platform"] = $videocall_platform; + $item["room"] = $vc_room; + } + } elseif (($item_type === "file" || $item_type === "pdf_secure") && isset($_FILES["item_file"]) && $_FILES["item_file"]["error"] === UPLOAD_ERR_OK) { // Handle file upload with validation if (!is_dir($project_dir)) { mkdir($project_dir, 0755, true); } // Validate file size (max 500MB as configured in PHP) - $max_size = 500 * 1024 * 1024; // 500MB - if ($_FILES["item_file"]["size"] > $max_size) { - $error = "El archivo es demasiado grande. Tamaño máximo: 500MB."; + if ($_FILES["item_file"]["size"] > $max_upload_bytes) { + $error = "El archivo es demasiado grande. Tamaño máximo: $max_upload_label."; $can_add_item = false; } @@ -544,10 +658,10 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") { if ($can_add_item) { $original_name = $_FILES["item_file"]["name"]; $ext = strtolower(pathinfo($original_name, PATHINFO_EXTENSION)); - $allowed_extensions = ["pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx", "jpg", "jpeg", "png", "gif", "webp", "txt", "zip", "mp4", "mp3"]; + $allowed_extensions = $item_type === "pdf_secure" ? ["pdf"] : ["pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx", "jpg", "jpeg", "png", "gif", "webp", "txt", "zip", "mp4", "mp3"]; if (!in_array($ext, $allowed_extensions, true)) { - $error = "Tipo de archivo no permitido. Extensiones permitidas: " . implode(", ", $allowed_extensions); + $error = $item_type === "pdf_secure" ? "El PDF seguro solo permite archivos PDF." : "Tipo de archivo no permitido. Extensiones permitidas: " . implode(", ", $allowed_extensions); $can_add_item = false; } } @@ -582,11 +696,11 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") { $project["items"][] = $item; $project["updated_at"] = time(); - if ($item_type === "file" && isset($item["filename"])) { + if (in_array($item_type, ["file", "pdf_secure"], true) && isset($item["filename"])) { $file_meta = [ "id" => $item_id, "name" => $item_name, - "type" => "file", + "type" => $item_type, "original_name" => $item["original_name"] ?? $item["filename"], "created_at" => $item["created_at"] ]; @@ -636,7 +750,7 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") { if ($item["id"] !== $item_id) { $new_items[] = $item; } else { - if ($item["type"] === "file" && isset($item["filename"])) { + if (in_array($item["type"], ["file", "pdf_secure"], true) && isset($item["filename"])) { $file_path = "$project_dir/" . $item["filename"]; if (file_exists($file_path)) { unlink($file_path); @@ -652,6 +766,71 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") { $project["updated_at"] = time(); save_project($proyectos_dir, $project_id, $project); $message = "Cambio aprobado y aplicado."; + } elseif (($change_data["type"] ?? "") === "edit_item") { + $item_id = $change_data["item_id"] ?? ""; + if ($item_id !== "" && isset($project["items"])) { + foreach ($project["items"] as &$item) { + if ($item["id"] !== $item_id) { + continue; + } + + $item["name"] = $change_data["item_name"] ?? $item["name"]; + if (($item["type"] ?? "") === "link") { + $item["url"] = $change_data["item_url"] ?? $item["url"] ?? ""; + } elseif (($item["type"] ?? "") === "notepad") { + $item["content"] = sanitize_html($change_data["item_content"] ?? ""); + } elseif (($item["type"] ?? "") === "videocall") { + $item["url"] = $change_data["item_url"] ?? ""; + $item["platform"] = $change_data["item_platform"] ?? "jitsi"; + $item["room"] = $change_data["item_room"] ?? ""; + } + + if (in_array(($item["type"] ?? ""), ["file", "pdf_secure"], true) && !empty($change_data["pending_filename"])) { + $pending_file = "$pending_dir/" . $change_data["pending_filename"]; + $target_file = "$project_dir/" . $change_data["pending_filename"]; + if (file_exists($pending_file)) { + if (!is_dir($project_dir)) { + mkdir($project_dir, 0755, true); + } + rename($pending_file, $target_file); + if (!empty($item["filename"])) { + $old_path = "$project_dir/" . $item["filename"]; + if (file_exists($old_path)) { + unlink($old_path); + if (file_exists($old_path . ".eadat")) { + unlink($old_path . ".eadat"); + } + } + } + $item["filename"] = $change_data["pending_filename"]; + $item["original_name"] = $change_data["original_filename"] ?? $change_data["pending_filename"]; + + $file_meta = [ + "id" => $item_id, + "name" => $item["name"], + "type" => $item["type"], + "original_name" => $item["original_name"], + "created_at" => $item["created_at"] ?? time() + ]; + save_file_metadata($target_file, $file_meta); + } + } + + if (in_array(($item["type"] ?? ""), ["file", "pdf_secure"], true) && !empty($item["filename"])) { + $file_path = "$project_dir/" . $item["filename"]; + if (file_exists($file_path . ".eadat")) { + $file_meta = json_decode(file_get_contents($file_path . ".eadat"), true) ?: []; + $file_meta["name"] = $item["name"]; + save_file_metadata($file_path, $file_meta); + } + } + break; + } + unset($item); + } + $project["updated_at"] = time(); + save_project($proyectos_dir, $project_id, $project); + $message = "Cambio aprobado y aplicado."; } else { // Apply add_item change $item_id = generate_id($change_data["item_name"]); @@ -666,7 +845,11 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") { $item["url"] = $change_data["item_url"]; } elseif ($change_data["item_type"] === "notepad") { $item["content"] = sanitize_html($change_data["item_content"] ?? ""); - } elseif ($change_data["item_type"] === "file" && !empty($change_data["pending_filename"])) { + } elseif ($change_data["item_type"] === "videocall") { + $item["url"] = $change_data["item_url"] ?? ""; + $item["platform"] = $change_data["item_platform"] ?? "jitsi"; + $item["room"] = $change_data["item_room"] ?? ""; + } elseif (in_array($change_data["item_type"], ["file", "pdf_secure"], true) && !empty($change_data["pending_filename"])) { // Move file from pending to project directory $pending_file = "$pending_dir/" . $change_data["pending_filename"]; $target_file = "$project_dir/" . $change_data["pending_filename"]; @@ -682,7 +865,7 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") { $file_meta = [ "id" => $item_id, "name" => $change_data["item_name"], - "type" => "file", + "type" => $change_data["item_type"], "original_name" => $item["original_name"], "created_at" => $item["created_at"] ]; @@ -774,6 +957,7 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") { "id" => $change_id, "type" => "delete_item", "requested_by_aulario" => $aulario_id, + "requested_by_persona_name" => ($_SESSION["auth_data"]["display_name"] ?? "Desconocido"), "requested_at" => time(), "status" => "pending", "item_id" => $item_id, @@ -800,7 +984,7 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") { $new_items[] = $item; } else { // Delete file if it's a file type - if ($item["type"] === "file" && isset($item["filename"])) { + if (in_array($item["type"], ["file", "pdf_secure"], true) && isset($item["filename"])) { $file_path = $project_dir ? "$project_dir/" . $item["filename"] : null; if ($file_path && file_exists($file_path)) { unlink($file_path); @@ -831,17 +1015,26 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") { $item_name = trim($_POST["item_name"] ?? ""); $item_url = trim($_POST["item_url"] ?? ""); $item_content = sanitize_html($_POST["item_content"] ?? ""); + $videocall_platform = $_POST["edit_videocall_platform"] ?? "jitsi"; + $videocall_room = trim($_POST["edit_videocall_room"] ?? ""); + $videocall_url = trim($_POST["edit_videocall_url"] ?? ""); $source_aulario_param = $_POST["source_aulario"] ?? ""; $working_dir = $proyectos_dir; + $permission = "full_edit"; + $needs_approval = false; if (!empty($source_aulario_param)) { $linked_projects = $aulario["linked_projects"] ?? []; foreach ($linked_projects as $link) { if (($link["source_aulario"] ?? "") === $source_aulario_param && ($link["project_id"] ?? "") === $project_id && - (($link["permission"] ?? "read_only") === "full_edit") + (($link["permission"] ?? "read_only") === "full_edit" || ($link["permission"] ?? "read_only") === "request_edit") ) { $working_dir = $proyectos_dir; + $permission = $link["permission"] ?? "read_only"; + if ($permission === "request_edit") { + $needs_approval = true; + } break; } } @@ -851,6 +1044,92 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") { $project_dir = find_project_path($working_dir, $project_id); $project = load_project($working_dir, $project_id); if ($project && isset($project["items"])) { + if ($needs_approval) { + $project_dir = find_project_path($proyectos_dir, $project_id); + if (!$project_dir) { + $error = "Proyecto no encontrado."; + } + } + + if ($needs_approval && empty($error)) { + $pending_dir = "$project_dir/pending_changes"; + if (!is_dir($pending_dir)) { + mkdir($pending_dir, 0755, true); + } + + $target_item = null; + foreach ($project["items"] as $existing_item) { + if ($existing_item["id"] === $item_id) { + $target_item = $existing_item; + break; + } + } + + if (!$target_item) { + $error = "Elemento no encontrado."; + } else { + $change_id = uniqid("change_"); + $change_data = [ + "id" => $change_id, + "type" => "edit_item", + "requested_by_aulario" => $aulario_id, + "requested_by_persona_name" => ($_SESSION["auth_data"]["display_name"] ?? "Desconocido"), + "requested_at" => time(), + "status" => "pending", + "item_id" => $item_id, + "item_name" => $item_name, + "item_type" => $target_item["type"] ?? "", + "item_url" => $item_url, + "item_content" => $item_content + ]; + + if (($target_item["type"] ?? "") === "videocall") { + $vc_error = ""; + [$vc_url, $vc_room] = build_videocall_url($videocall_platform, $videocall_room, $videocall_url, $vc_error); + if ($vc_error !== "") { + $error = $vc_error; + } else { + $change_data["item_url"] = $vc_url; + $change_data["item_platform"] = $videocall_platform; + $change_data["item_room"] = $vc_room; + } + } + + if (in_array(($target_item["type"] ?? ""), ["file", "pdf_secure"], true) && isset($_FILES["edit_item_file"]) && $_FILES["edit_item_file"]["error"] === UPLOAD_ERR_OK) { + if ($_FILES["edit_item_file"]["size"] > $max_upload_bytes) { + $error = "El archivo es demasiado grande. Tamaño máximo: $max_upload_label."; + } + + $ext = strtolower(pathinfo($_FILES["edit_item_file"]["name"], PATHINFO_EXTENSION)); + $allowed_extensions = ($target_item["type"] ?? "") === "pdf_secure" ? ["pdf"] : ["pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx", "jpg", "jpeg", "png", "gif", "webp", "txt", "zip", "mp4", "mp3"]; + + if (empty($error) && in_array($ext, $allowed_extensions, true)) { + $safe_name = safe_filename($_FILES["edit_item_file"]["name"]); + $temp_file_path = "$pending_dir/{$change_id}_$safe_name"; + + if (move_uploaded_file($_FILES["edit_item_file"]["tmp_name"], $temp_file_path)) { + $change_data["pending_filename"] = basename($temp_file_path); + $change_data["original_filename"] = $_FILES["edit_item_file"]["name"]; + } + } + } + + if (empty($error)) { + $change_file = "$pending_dir/$change_id.json"; + file_put_contents($change_file, json_encode($change_data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE)); + + $message = "Solicitud de cambio enviada. El aulario origen debe aprobarla."; + $redirect_params = "aulario=" . urlencode($aulario_id) . "&project=" . urlencode($project_id); + if (!empty($source_aulario_param)) { + $redirect_params .= "&source=" . urlencode($source_aulario_param); + } + header("Location: /entreaulas/proyectos.php?" . $redirect_params); + exit; + } + } + } + + $can_save = true; foreach ($project["items"] as &$item) { if ($item["id"] === $item_id) { $item["name"] = $item_name; @@ -858,8 +1137,84 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") { $item["url"] = $item_url; } elseif ($item["type"] === "notepad") { $item["content"] = $item_content; + } elseif ($item["type"] === "videocall") { + $vc_error = ""; + [$vc_url, $vc_room] = build_videocall_url($videocall_platform, $videocall_room, $videocall_url, $vc_error); + if ($vc_error !== "") { + $error = $vc_error; + $can_save = false; + break; + } + $item["url"] = $vc_url; + $item["platform"] = $videocall_platform; + $item["room"] = $vc_room; } - if ($item["type"] === "file" && $project_dir && isset($item["filename"])) { + if (in_array($item["type"], ["file", "pdf_secure"], true) && isset($_FILES["edit_item_file"]) && $_FILES["edit_item_file"]["error"] === UPLOAD_ERR_OK) { + if (!$project_dir) { + $error = "No se pudo acceder al directorio del proyecto."; + $can_save = false; + break; + } + + if ($_FILES["edit_item_file"]["size"] > $max_upload_bytes) { + $error = "El archivo es demasiado grande. Tamaño máximo: $max_upload_label."; + $can_save = false; + break; + } + + $original_name = $_FILES["edit_item_file"]["name"]; + $ext = strtolower(pathinfo($original_name, PATHINFO_EXTENSION)); + $allowed_extensions = $item["type"] === "pdf_secure" ? ["pdf"] : ["pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx", "jpg", "jpeg", "png", "gif", "webp", "txt", "zip", "mp4", "mp3"]; + + if (!in_array($ext, $allowed_extensions, true)) { + $error = $item["type"] === "pdf_secure" ? "El PDF seguro solo permite archivos PDF." : "Tipo de archivo no permitido. Extensiones permitidas: " . implode(", ", $allowed_extensions); + $can_save = false; + break; + } + + if (!is_dir($project_dir)) { + mkdir($project_dir, 0755, true); + } + + $safe_name = safe_filename($original_name); + $target_path = "$project_dir/$safe_name"; + $counter = 1; + $basename = pathinfo($safe_name, PATHINFO_FILENAME); + while (file_exists($target_path)) { + $safe_name = safe_filename($basename . "_" . $counter . "." . $ext); + $target_path = "$project_dir/$safe_name"; + $counter++; + } + + if (!move_uploaded_file($_FILES["edit_item_file"]["tmp_name"], $target_path)) { + $error = "No se pudo subir el archivo."; + $can_save = false; + break; + } + + if (isset($item["filename"])) { + $old_path = "$project_dir/" . $item["filename"]; + if (file_exists($old_path)) { + unlink($old_path); + if (file_exists($old_path . ".eadat")) { + unlink($old_path . ".eadat"); + } + } + } + + $item["filename"] = $safe_name; + $item["original_name"] = $original_name; + + $file_meta = [ + "id" => $item_id, + "name" => $item_name, + "type" => $item["type"], + "original_name" => $original_name, + "created_at" => $item["created_at"] ?? time() + ]; + save_file_metadata($target_path, $file_meta); + } + if (in_array($item["type"], ["file", "pdf_secure"], true) && $project_dir && isset($item["filename"])) { $file_path = "$project_dir/" . $item["filename"]; if (file_exists($file_path . ".eadat")) { $file_meta = json_decode(file_get_contents($file_path . ".eadat"), true) ?: []; @@ -872,8 +1227,10 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") { } } unset($item); - save_project($working_dir, $project_id, $project); - $message = "Elemento actualizado correctamente."; + if ($can_save) { + save_project($working_dir, $project_id, $project); + $message = "Elemento actualizado correctamente."; + } } else { $error = "Proyecto no encontrado."; } @@ -922,7 +1279,7 @@ $view = $current_project ? "project" : "list"; + +
+ Este proyecto está compartido con solicitud de permiso. Los cambios se registrarán y deberán ser aprobados por el propietario. +
+

@@ -1175,7 +1537,7 @@ $view = $current_project ? "project" : "list";
  • - + file-plus @@ -1185,7 +1547,7 @@ $view = $current_project ? "project" : "list";
  • - + folder-plus @@ -1349,7 +1711,7 @@ $view = $current_project ? "project" : "list"; ?>
    -
    +
    @@ -1357,6 +1719,16 @@ $view = $current_project ? "project" : "list"; web + + + file-pdf + + + + + video + + notebook @@ -1374,6 +1746,10 @@ $view = $current_project ? "project" : "list"; Enlace + + PDF Seguro + + Videollamada Cuaderno @@ -1389,6 +1765,16 @@ $view = $current_project ? "project" : "list"; " target="_blank" class="btn btn-primary"> Abrir + + + + " target="_blank" class="btn btn-primary"> + Abrir +
    "> @@ -1520,6 +1940,40 @@ $view = $current_project ? "project" : "list"; } ?> + + + + +
    @@ -1648,6 +2126,27 @@ $view = $current_project ? "project" : "list";
    + + +
    @@ -152,6 +158,12 @@ switch ($_GET['action'] ?? '') { Docente
    +
    + > + +