From 8eec1a97bad088ca7e3fd9a314e0e2ef5a85bd63 Mon Sep 17 00:00:00 2001 From: Alejandro Rosales Date: Mon, 4 Sep 2023 16:15:44 +0000 Subject: [PATCH] User restore session --- action/action_asistencias.php | 6 +- action/action_asistencias_excel.php | 4 +- action/action_auditoria.php | 20 +++++-- action/action_grupo.php | 4 +- action/action_horario_create.php | 4 +- action/one_row.xlsx | Bin 12798 -> 0 bytes action/reposicion_autoriza.php | 5 +- action/reposicion_delete.php | 5 +- action/reposicion_insert.php | 7 +-- action/reposicion_select.php | 7 +-- action/reposicion_update.php | 7 +-- alta_de_horario.php | 5 +- avisos_crear.php | 8 +-- avisos_editar.php | 7 +-- base.php | 8 +-- carreras.php | 8 +-- class/c_login.php | 19 ++++++- consultar_horario.php | 4 +- consultar_horario_old.php | 7 +-- días_festivos.php | 8 +-- editar_horario.php | 7 +-- excel_horario.php | 8 +-- facultades.php | 8 +-- horario_profesor.php | 4 +- import/html_header.php | 8 +-- justificar_asistencias.php | 5 +- main.php | 5 +- materias.php | 7 +-- permisos.php | 8 +-- profesores.php | 7 +-- reporte_de_asistencias.php | 4 +- reposiciones.php | 4 +- reposiciones_autorizar.php | 5 +- reposiciones_crear.php | 5 +- roles.php | 8 +-- usuarios.php | 7 +-- vista_profesor.php | 82 +++++++++++++++++----------- 37 files changed, 130 insertions(+), 195 deletions(-) delete mode 100644 action/one_row.xlsx diff --git a/action/action_asistencias.php b/action/action_asistencias.php index 9a7a464..3e5297b 100644 --- a/action/action_asistencias.php +++ b/action/action_asistencias.php @@ -3,11 +3,7 @@ $ruta = "../"; require_once "../class/c_login.php"; // check if the session is started -if (!isset($_SESSION['user'])) - die(json_encode(['error' => 'No se ha iniciado sesión'])); - -$user = unserialize($_SESSION['user']); - +$user = Login::get_user(); extract($_POST); $initial_date = DateTime::createFromFormat('d/m/Y', $fecha_inicial); diff --git a/action/action_asistencias_excel.php b/action/action_asistencias_excel.php index 222597d..de67c84 100644 --- a/action/action_asistencias_excel.php +++ b/action/action_asistencias_excel.php @@ -3,10 +3,8 @@ $ruta = "../"; require_once "../vendor/autoload.php"; require_once "../class/c_login.php"; -if (!isset($_SESSION['user'])) - die(json_encode(['error' => 'No se ha iniciado sesión'])); +$user = Login::get_user(); -$user = unserialize($_SESSION['user']); $user->print_to_log('Genera excel de asistencias'); use PhpOffice\PhpSpreadsheet\Spreadsheet; diff --git a/action/action_auditoria.php b/action/action_auditoria.php index c4f2571..f051d3f 100644 --- a/action/action_auditoria.php +++ b/action/action_auditoria.php @@ -18,7 +18,7 @@ $user = unserialize($_SESSION['user']); try { if ($_SERVER['REQUEST_METHOD'] === 'GET') { $baseDate = $_GET['fecha'] ?? $_GET['fecha_fin'] ?? null; - + $params = [ ':periodo_id' => $user->periodo_id, ':facultad_id' => $user->facultad['facultad_id'], @@ -27,13 +27,21 @@ try { ]; $data = $db->query( "WITH horarios AS ( - SELECT *, + SELECT + horario_id, + horario_fecha_inicio, + horario_fecha_fin, + horario_grupo, + horario_hora, + periodo_fecha_inicio, + periodo_fecha_fin, + salon, materia_nombre as materia, carrera_nombre as carrera, facultad_nombre as facultad, nivel_nombre as nivel, horario_hora + duracion_interval as horario_fin - FROM horario + FROM horario left JOIN materia USING (materia_id) JOIN carrera USING (carrera_id) JOIN nivel USING (nivel_id) @@ -52,7 +60,11 @@ try { SELECT * FROM ESTADO_SUPERVISOR WHERE (estado_color, estado_icon) = ('dark', 'ing-cancelar') ) SELECT - usuario.*, registro.*, profesor.*, horarios.*, fechas.*, + usuario.usuario_nombre, + registro.registro_id, registro.registro_fecha, registro.registro_retardo, registro.registro_justificada, comentario, registro_fecha_supervisor justificacion, registro_fecha_justificacion, + profesor.profesor_id, profesor_nombre, profesor_clave, profesor_correo, + horarios.*, + registro_fecha_ideal, COALESCE(estado_supervisor.estado_supervisor_id, sin_registro.estado_supervisor_id) as estado_supervisor_id, COALESCE(estado_supervisor.nombre, sin_registro.nombre) as nombre, COALESCE(estado_supervisor.estado_color, sin_registro.estado_color) as estado_color, diff --git a/action/action_grupo.php b/action/action_grupo.php index 9bf3f89..257a4aa 100644 --- a/action/action_grupo.php +++ b/action/action_grupo.php @@ -3,10 +3,8 @@ $ruta = "../"; require_once "../class/c_login.php"; // check if the session is started -if (!isset($_SESSION['user'])) - die(json_encode(['error' => 'No se ha iniciado sesión'])); +$user = Login::get_user(); -$user = unserialize($_SESSION['user']); $ruta = "../"; require_once("../include/bd_pdo.php"); extract($_POST); diff --git a/action/action_horario_create.php b/action/action_horario_create.php index ce7ede2..1dbaaee 100644 --- a/action/action_horario_create.php +++ b/action/action_horario_create.php @@ -3,10 +3,8 @@ $ruta = "../"; require_once "../class/c_login.php"; // check if the session is started -if (!isset($_SESSION['user'])) - die(json_encode(['error' => 'No se ha iniciado sesión'])); +$user = Login::get_user(); -$user = unserialize($_SESSION['user']); $ruta = "../"; require_once "../include/bd_pdo.php"; diff --git a/action/one_row.xlsx b/action/one_row.xlsx deleted file mode 100644 index 20c90d0e5215c6e21ff332c3467aa12acc85ace9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12798 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 AjsO4v diff --git a/action/reposicion_autoriza.php b/action/reposicion_autoriza.php index 7f8a80c..d74f68c 100644 --- a/action/reposicion_autoriza.php +++ b/action/reposicion_autoriza.php @@ -7,10 +7,7 @@ $ruta = "../"; require_once "../class/c_login.php"; // check if the session is started -if (!isset($_SESSION['user'])) - die('No se ha iniciado sesión'); - -$user = unserialize($_SESSION['user']); +$user = Login::get_user(); $pag = "../reposiciones_autorizar.php"; diff --git a/action/reposicion_delete.php b/action/reposicion_delete.php index 5ba0429..04637e1 100644 --- a/action/reposicion_delete.php +++ b/action/reposicion_delete.php @@ -7,10 +7,7 @@ $ruta = "../"; require_once "../class/c_login.php"; // check if the session is started -if (!isset($_SESSION['user'])) - die('No se ha iniciado sesión'); - -$user = unserialize($_SESSION['user']); +$user = Login::get_user(); //--- Objeto para validar usuario. El id de usuario lo lee desde sesión if(!isset($_POST["id"], $_POST["prof"])){ diff --git a/action/reposicion_insert.php b/action/reposicion_insert.php index 828f773..851abfe 100644 --- a/action/reposicion_insert.php +++ b/action/reposicion_insert.php @@ -7,12 +7,7 @@ $ruta = "../"; require_once "../class/c_login.php"; // check if the session is started -if (!isset($_SESSION['user'])) - die('No se ha iniciado sesión'); - -$user = unserialize($_SESSION['user']); - - +$user = Login::get_user(); $fecha_falta = trim(htmlspecialchars($_POST["fecha_falta"], ENT_QUOTES, "UTF-8"));//limpia texto $fecha = trim(htmlspecialchars($_POST["fecha_inicial"], ENT_QUOTES, "UTF-8"));//limpia texto $fecha_cambio = trim(htmlspecialchars($_POST["fecha_cambio"], ENT_QUOTES, "UTF-8"));//limpia texto diff --git a/action/reposicion_select.php b/action/reposicion_select.php index 846736c..a4d2bfd 100644 --- a/action/reposicion_select.php +++ b/action/reposicion_select.php @@ -7,12 +7,7 @@ $ruta = "../"; require_once "../class/c_login.php"; // check if the session is started -if (!isset($_SESSION['user'])) - die('No se ha iniciado sesión'); - -$user = unserialize($_SESSION['user']); - - +$user = Login::get_user(); //--- Objeto para validar usuario. El id de usuario lo lee desde sesión /*if(!$objSesion->tieneAcceso()){ $return["error"] = "Error! No tienes permisos para realizar esta acción."; diff --git a/action/reposicion_update.php b/action/reposicion_update.php index 3a13d2a..5f692fe 100644 --- a/action/reposicion_update.php +++ b/action/reposicion_update.php @@ -8,12 +8,7 @@ $ruta = "../"; require_once "../class/c_login.php"; // check if the session is started -if (!isset($_SESSION['user'])) - die('No se ha iniciado sesión'); - -$user = unserialize($_SESSION['user']); - - +$user = Login::get_user(); /*if(!isset($_POST["id"]) || !isset($_POST["fecha_falta"]) || !isset($_POST["fecha_inicial"]) || !isset($_POST["hora_ini"]) || !isset($_POST["min_ini"]) || !isset($_POST["materia"]) || !isset($_POST["grupo"])){ header("Location: ".$pag."?error=0"); exit(); diff --git a/alta_de_horario.php b/alta_de_horario.php index 5e1e4ec..2e43495 100644 --- a/alta_de_horario.php +++ b/alta_de_horario.php @@ -1,9 +1,6 @@ access(); if (in_array($user->acceso, ['r', 'n'])) die(header('Location: main.php?error=1')); diff --git a/avisos_crear.php b/avisos_crear.php index 06cdb39..4dce33c 100644 --- a/avisos_crear.php +++ b/avisos_crear.php @@ -2,12 +2,8 @@ require_once 'class/c_login.php'; require_once 'include/bd_pdo.php'; -if(!isset($_SESSION['user'])){ - header('Location: index.php'); - exit; -} -else - $user = unserialize($_SESSION['user']); +$user = Login::get_user(); + $user->access('Avisos'); if($user->acceso == null){ header('Location: main.php?error=1'); diff --git a/avisos_editar.php b/avisos_editar.php index 1f03503..f13613f 100644 --- a/avisos_editar.php +++ b/avisos_editar.php @@ -2,11 +2,8 @@ require_once 'class/c_login.php'; require_once 'include/bd_pdo.php'; -if (!isset($_SESSION['user'])) { - header('Location: index.php'); - exit; -} else - $user = unserialize($_SESSION['user']); +$user = Login::get_user(); + $user->access('Avisos'); if ($user->acceso == null) { header('Location: main.php?error=1'); diff --git a/base.php b/base.php index fb6b90a..67ae1db 100644 --- a/base.php +++ b/base.php @@ -2,12 +2,8 @@ require_once 'class/c_login.php'; require_once 'include/bd_pdo.php'; -if(!isset($_SESSION['user'])){ - header('Location: index.php'); - exit; -} -else - $user = unserialize($_SESSION['user']); +$user = Login::get_user(); + $user->access('usuarios'); if($user->acceso == null){ header('Location: main.php?error=1'); diff --git a/carreras.php b/carreras.php index 3463104..6eec3a7 100644 --- a/carreras.php +++ b/carreras.php @@ -2,12 +2,8 @@ require_once 'class/c_login.php'; require_once 'include/bd_pdo.php'; -if (!isset($_SESSION['user'])){ - header('Location: index.php'); - exit; -} -else - $user = unserialize($_SESSION['user']); +$user = Login::get_user(); + $user->access('facultades'); if($user->acceso == null){ header('Location: main.php?error=1'); diff --git a/class/c_login.php b/class/c_login.php index 7d68e34..f3e365e 100644 --- a/class/c_login.php +++ b/class/c_login.php @@ -152,4 +152,21 @@ class Login session_start(); session_destroy(); } -} + + private static function is_logged(): bool + { + return isset($_SESSION["user"]); + } + + // get the user from the session (if not ) + + public static function get_user(): Login + { + if (Login::is_logged()) { + $user = unserialize($_SESSION["user"]); + return $user; + } + header("Location: /"); + exit(); + } +} \ No newline at end of file diff --git a/consultar_horario.php b/consultar_horario.php index 91a8e7c..7b8dbb6 100644 --- a/consultar_horario.php +++ b/consultar_horario.php @@ -1,9 +1,7 @@ access(); if (in_array($user->acceso, ['n'])) die(header('Location: main.php?error=1')); diff --git a/consultar_horario_old.php b/consultar_horario_old.php index 9dde6f9..00aaae9 100644 --- a/consultar_horario_old.php +++ b/consultar_horario_old.php @@ -1,12 +1,7 @@ access(); -if (in_array($user->acceso, ['n'])) - die(header('Location: main.php?error=1')); $user->print_to_log('Consultar horario'); diff --git a/días_festivos.php b/días_festivos.php index 9c04f00..393c982 100644 --- a/días_festivos.php +++ b/días_festivos.php @@ -2,12 +2,8 @@ require_once 'class/c_login.php'; require_once 'include/bd_pdo.php'; -if(!isset($_SESSION['user'])){ - header('Location: index.php'); - exit; -} -else - $user = unserialize($_SESSION['user']); +$user = Login::get_user(); + $user->access(); if($user->acceso == null){ header('Location: main.php?error=1'); diff --git a/editar_horario.php b/editar_horario.php index f5e9180..3a9d5a7 100644 --- a/editar_horario.php +++ b/editar_horario.php @@ -1,11 +1,8 @@ admin) header('Location: main.php?error=1'); diff --git a/excel_horario.php b/excel_horario.php index dc3f616..53f3840 100644 --- a/excel_horario.php +++ b/excel_horario.php @@ -1,12 +1,6 @@ access('excel_horario'); if (in_array($user->acceso, ['r', 'n'])) { diff --git a/facultades.php b/facultades.php index cceab52..09ae7b4 100644 --- a/facultades.php +++ b/facultades.php @@ -2,12 +2,8 @@ require_once 'class/c_login.php'; require_once 'include/bd_pdo.php'; -if (!isset($_SESSION['user'])){ - header('Location: index.php'); - exit; -} -else - $user = unserialize($_SESSION['user']); +$user = Login::get_user(); + $user->access(); if($user->acceso == null){ header('Location: main.php?error=1'); diff --git a/horario_profesor.php b/horario_profesor.php index 8b653b1..3458b23 100644 --- a/horario_profesor.php +++ b/horario_profesor.php @@ -1,9 +1,7 @@ access(); if (in_array($user->acceso, ['n'])) die(header('Location: main.php?error=1')); diff --git a/import/html_header.php b/import/html_header.php index 4f093c0..22fda38 100644 --- a/import/html_header.php +++ b/import/html_header.php @@ -6,14 +6,8 @@ require_once 'class/c_login.php'; $ruta = "../"; require_once 'include/bd_pdo.php'; -if (!isset($_SESSION['user'])) { - if (isset($redirect)) - $_SESSION['ruta'] = $redirect; +$user = Login::get_user(); - header('Location: index.php'); -} - -$user = unserialize($_SESSION['user']); $user->access(); $pagina = substr(basename($_SERVER['PHP_SELF']), 0, -4); if ($pagina != "main" && !$user->acceso) { diff --git a/justificar_asistencias.php b/justificar_asistencias.php index 0b07c65..409d216 100644 --- a/justificar_asistencias.php +++ b/justificar_asistencias.php @@ -4,10 +4,7 @@ ini_set("display_errors", 1); require_once 'class/c_login.php'; -if (!isset($_SESSION['user'])) - die(header('Location: index.php')); - -$user = unserialize($_SESSION['user']); +$user = Login::get_user(); $user->access(); if (in_array($user->acceso, ['r', 'n'])) { diff --git a/main.php b/main.php index efc214a..e660ae8 100644 --- a/main.php +++ b/main.php @@ -1,9 +1,6 @@ diff --git a/materias.php b/materias.php index 1283d59..f190536 100644 --- a/materias.php +++ b/materias.php @@ -2,11 +2,8 @@ require_once 'class/c_login.php'; require_once 'include/bd_pdo.php'; -if (!isset($_SESSION['user'])) { - header('Location: index.php'); - exit; -} else - $user = unserialize($_SESSION['user']); +$user = Login::get_user(); + $user->access(); if ($user->acceso == null) { // die($access); diff --git a/permisos.php b/permisos.php index 628121d..c05f9ed 100644 --- a/permisos.php +++ b/permisos.php @@ -2,12 +2,8 @@ require_once 'class/c_login.php'; require_once 'include/bd_pdo.php'; -if (!isset($_SESSION['user'])){ - header('Location: index.php'); - exit; -} -else - $user = unserialize($_SESSION['user']); +$user = Login::get_user(); + $user->access(); if($user->acceso == null){ header('Location: main.php?error=1'); diff --git a/profesores.php b/profesores.php index e3c1378..f38d8ea 100644 --- a/profesores.php +++ b/profesores.php @@ -2,11 +2,8 @@ require_once 'class/c_login.php'; require_once 'include/bd_pdo.php'; -if (!isset($_SESSION['user'])) { - header('Location: index.php'); - exit; -} else - $user = unserialize($_SESSION['user']); +$user = Login::get_user(); + $user->access(); if ($user->acceso == null) { header('Location: main.php?error=1'); diff --git a/reporte_de_asistencias.php b/reporte_de_asistencias.php index 05885de..2df319a 100644 --- a/reporte_de_asistencias.php +++ b/reporte_de_asistencias.php @@ -4,10 +4,8 @@ ini_set("display_errors", 1); require_once 'class/c_login.php'; -if (!isset($_SESSION['user'])) - die(header('Location: index.php')); +$user = Login::get_user(); -$user = unserialize($_SESSION['user']); $user->access('reporte_de_asistencias'); if (in_array($user->acceso, ['n'])) die(header('Location: main.php?error=1')); diff --git a/reposiciones.php b/reposiciones.php index 6f274ec..d41dd36 100644 --- a/reposiciones.php +++ b/reposiciones.php @@ -1,10 +1,8 @@ access(); if (in_array($user->acceso, ['n'])) die(header('Location: main.php?error=1')); diff --git a/reposiciones_autorizar.php b/reposiciones_autorizar.php index 5a2a93e..0de0219 100644 --- a/reposiciones_autorizar.php +++ b/reposiciones_autorizar.php @@ -1,11 +1,8 @@ access(); //if (!$user->admin && in_array($user->acceso, ['n'])) diff --git a/reposiciones_crear.php b/reposiciones_crear.php index 740e535..36c214e 100644 --- a/reposiciones_crear.php +++ b/reposiciones_crear.php @@ -1,11 +1,8 @@ profesor); print_r($user->acceso);//null sin permisos, w o r diff --git a/roles.php b/roles.php index b450f0a..e82adb8 100644 --- a/roles.php +++ b/roles.php @@ -2,12 +2,8 @@ require_once 'class/c_login.php'; require_once 'include/bd_pdo.php'; -if (!isset($_SESSION['user'])){ - header('Location: index.php'); - exit; -} -else - $user = unserialize($_SESSION['user']); +$user = Login::get_user(); + $user->access(); if($user->acceso == null){ header('Location: main.php?error=1'); diff --git a/usuarios.php b/usuarios.php index 7e109ec..9530af6 100644 --- a/usuarios.php +++ b/usuarios.php @@ -1,11 +1,8 @@ access(); if ($user->acceso == null) { diff --git a/vista_profesor.php b/vista_profesor.php index 0083dfa..aa83a5e 100644 --- a/vista_profesor.php +++ b/vista_profesor.php @@ -3,18 +3,16 @@ require_once 'class/c_login.php'; -if (!isset($_SESSION['user'])) - die(header('Location: index.php')); +$user = Login::get_user(); -$user = unserialize($_SESSION['user']); $user->access('reporte_de_asistencias'); -if ( $user->acceso == null ) +if ($user->acceso == null) die(header('Location: main.php?error=1')); $user->print_to_log('Consultar: Reporte de asistencias de profesor'); - + #$required_post = ['id', 'fecha_inicial', 'fecha_final', 'periodo']; #if (array_diff($required_post, array_keys($_POST))) #header('Location: s.php'); @@ -46,7 +44,7 @@ $reporte = queryAll("SELECT * FROM fs_asistencia_profesorreporte(:carrera, :peri ":id" => $id, ":initial_date" => $fecha_inicial->format("Y-m-d"), ":final_date" => $fecha_final->format("Y-m-d"), - ":materia" => empty($materia) ? null : $materia + ":materia" => empty($materia) ? null : $materia ) ); @@ -55,7 +53,8 @@ $profesor = query( array(":id" => $id) ); -$asistencias = query("SELECT total, asistencias, retardos, justificaciones FROM fs_asistencia_reporte(:carrera, :periodo, :clave, :nombre, :facultad, :initial_date, :final_date)", +$asistencias = query( + "SELECT total, asistencias, retardos, justificaciones FROM fs_asistencia_reporte(:carrera, :periodo, :clave, :nombre, :facultad, :initial_date, :final_date)", array( ":carrera" => empty($carrera) ? null : $carrera, ":periodo" => $user->periodo_id, @@ -92,15 +91,20 @@ $retardos = query("SELECT FS_HAS_RETARDO(:facultad) AS retardo", array(":faculta
-

+

+ +

-

Clave:

+

Clave: + +

- @@ -128,7 +132,7 @@ $retardos = query("SELECT FS_HAS_RETARDO(:facultad) AS retardo", array(":faculta
+ ?>
@@ -136,7 +140,8 @@ $retardos = query("SELECT FS_HAS_RETARDO(:facultad) AS retardo", array(":faculta Retardo | - Sin registro | Justificada + Sin registro | Justificada
@@ -181,34 +186,47 @@ $retardos = query("SELECT FS_HAS_RETARDO(:facultad) AS retardo", array(":faculta $hora = date("H:i", strtotime($row['hora'])); $hora_checado = is_null($row["hora_checado"]) ? '-' : date("H:i:s", strtotime($row["hora_checado"])); $horario = $db->getOne("fget_horario({$row['id']})"); - ?> + ?> "> - - + + + + + + "> - | + + | + + - - - + + - + + + + + - + Justificada" ?> - -
No hay registros para mostrar
-
@@ -252,8 +270,10 @@ $retardos = query("SELECT FS_HAS_RETARDO(:facultad) AS retardo", array(":faculta
- - + +
@@ -296,24 +316,24 @@ $retardos = query("SELECT FS_HAS_RETARDO(:facultad) AS retardo", array(":faculta clone.appendTo("#message"); // remove after 4 seconds - setTimeout(function() { + setTimeout(function () { clone.alert("close"); }, 4000); } - $(document).ready(function() { + $(document).ready(function () { $("#reporte").hide(); - $("#reporte").click(function(e) { + $("#reporte").click(function (e) { $("#form_reporte").submit(); }); var periodo_inicio = ''; var periodo_fin = ''; var previous_date; - $('#initial_date_src').focus(function() { + $('#initial_date_src').focus(function () { previous_date = $(this).val(); - }).change(function() { + }).change(function () { // console.log("Periodo inicio: ", periodo_inicio); // console.log("this < Periodo inicio: ", $(this).val() < periodo_inicio); if ($(this).val() > $('#final_date_src').val()) { @@ -330,9 +350,9 @@ $retardos = query("SELECT FS_HAS_RETARDO(:facultad) AS retardo", array(":faculta } }); - $('#final_date_src').focus(function() { + $('#final_date_src').focus(function () { previous_date = $(this).val(); - }).change(function() { + }).change(function () { console.log("Periodo fin: ", periodo_fin); console.log("this > Periodo fin: ", $(this).val() > periodo_fin); if ($(this).val() < $('#initial_date_src').val()) {