From e24fdeeebefc227a04da22df1565b3d305775c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20M=C3=A9ndez?= <45081533+FerMdez@users.noreply.github.com> Date: Thu, 8 Apr 2021 09:20:13 +0200 Subject: [PATCH] Delete login directory --- login/includes/form.php | 238 ------------------------- login/includes/formLogin.php | 104 ----------- login/includes/user_dao.php | 83 --------- login/includes/user_dto.php | 37 ---- login/includes/users_dto_interface.php | 14 -- login/index.php | 51 ------ login/login_register.php | 96 ---------- login/register.php | 1 - login/validate.php | 57 ------ 9 files changed, 681 deletions(-) delete mode 100644 login/includes/form.php delete mode 100644 login/includes/formLogin.php delete mode 100644 login/includes/user_dao.php delete mode 100644 login/includes/user_dto.php delete mode 100644 login/includes/users_dto_interface.php delete mode 100644 login/index.php delete mode 100644 login/login_register.php delete mode 100644 login/register.php delete mode 100644 login/validate.php diff --git a/login/includes/form.php b/login/includes/form.php deleted file mode 100644 index 28e615f..0000000 --- a/login/includes/form.php +++ /dev/null @@ -1,238 +0,0 @@ -formId = $formId; - - $opcionesPorDefecto = array( 'ajax' => false, 'action' => null, 'class' => null, 'enctype' => null ); - $opciones = array_merge($opcionesPorDefecto, $opciones); - - $this->ajax = $opciones['ajax']; - $this->action = $opciones['action']; - $this->classAtt = $opciones['class']; - $this->enctype = $opciones['enctype']; - - if ( !$this->action ) { - $this->action = $_SERVER['PHP_SELF']; - } - } - - public function gestiona() { - - if ( ! $this->formularioEnviado($_POST) ) { - echo $this->generaFormulario(); - } else { - // Valida el token CSRF si es necesario (hay un token en la sesión asociada al formulario) - $tokenRecibido = isset($_POST['CSRFToken']) ? $_POST['CSRFToken'] : FALSE; - - if ( ($errores = $this->csrfguard_ValidateToken($this->formId, $tokenRecibido)) !== TRUE ) { - if ( ! $this->ajax ) { - echo $this->generaFormulario($errores, $_POST); - } else { - echo $this->generaHtmlErrores($errores); - } - } else { - $result = $this->procesaFormulario($_POST); - if ( is_array($result) ) { - // Error al procesar el formulario, volvemos a mostrarlo - if ( ! $this->ajax ) { - echo $this->generaFormulario($result, $_POST); - } else { - echo $this->generaHtmlErrores($result); - } - } else { - if ( ! $this->ajax ) { - header('Location: '.$result); - } else { - echo $result; - } - } - } - } - } - - /** - * Devuelve un string con el HTML necesario para presentar los campos del formulario. Es necesario asegurarse que como parte del envío se envía un parámetro con nombre (i.e. utilizado como valor del atributo name del botón de envío del formulario). - */ - protected function generaCamposFormulario ($datos) { - return ''; - } - - /** - * Procesa los datos del formulario. - */ - protected function procesaFormulario($datos) { - - } - - /** - * Función que verifica si el usuario ha enviado el formulario. Comprueba si existe el parámetro $formId en $params. - * - * @param array $params Array que contiene los datos recibidos en el envío formulario. - * - * @return boolean Devuelve TRUE si $formId existe como clave en $params - */ - private function formularioEnviado(&$params) { - return isset($params['action']) && $params['action'] == $this->formId; - } - - /** - * Función que genera el HTML necesario para el formulario. - * - * - * @param array $errores (opcional) Array con los mensajes de error de validación y/o procesamiento del formulario. - * - * @param array $datos (opcional) Array con los valores por defecto de los campos del formulario. - */ - private function generaFormulario($errores = array(), &$datos = array()) { - - $html= $this->generaListaErrores($errores); - - $html .= '
classAtt ) { - $html .= ' class="'.$this->classAtt.'"'; - } - if ( $this->enctype ) { - $html .= ' enctype="'.$this->enctype.'"'; - } - $html .=' >'; - - // Se genera el token CSRF si el usuario no solicita explícitamente lo contrario. - if ( ! $this->classAtt || strpos($this->classAtt, 'nocsrf') === false ) { - $tokenValue = $this->csrfguard_GenerateToken($this->formId); - $html .= ''; - } - - $html .= ''; - - $html .= $this->generaCamposFormulario($datos); - $html .= '
'; - return $html; - } - - private function generaListaErrores($errores) { - $html=''; - $numErrores = count($errores); - if ( $numErrores == 1 ) { - $html .= ""; - } else if ( $numErrores > 1 ) { - $html .= ""; - } - return $html; - } - - private function csrfguard_GenerateToken($formId) { - if ( ! isset($_SESSION) ) { - throw new Exception('La sesión del usuario no está definida.'); - } - - if ( function_exists('hash_algos') && in_array('sha512', hash_algos()) ) { - $token = hash('sha512', mt_rand(0, mt_getrandmax())); - } else { - $token=' '; - for ($i=0;$i<128;++$i) { - $r=mt_rand(0,35); - if ($r<26){ - $c=chr(ord('a')+$r); - } else{ - $c=chr(ord('0')+$r-26); - } - $token.=$c; - } - } - - $_SESSION[$formId.'_'.self::CSRF_PARAM]=$token; - - return $token; - } - - private function csrfguard_ValidateToken($formId, $tokenRecibido) { - if ( ! isset($_SESSION) ) { - throw new Exception('La sesión del usuario no está definida.'); - } - - $result = TRUE; - - if ( isset($_SESSION[$formId.'_'.self::CSRF_PARAM]) ) { - if ( $_SESSION[$formId.'_'.self::CSRF_PARAM] !== $tokenRecibido ) { - $result = array(); - $result[] = 'Has enviado el formulario dos veces'; - } - $_SESSION[$formId.'_'.self::CSRF_PARAM] = ' '; - unset($_SESSION[$formId.'_'.self::CSRF_PARAM]); - } else { - $result = array(); - $result[] = 'Formulario no válido'; - } - return $result; - } -} - -/* -class Formulario { - - private $formId; - private $action; - private $classAtt; - private $enctype; - - public function __construct($formId, $opciones = array() ) { - $this->formId = $formId; - $opcionesPorDefecto = array( 'ajax' => false, 'action' => null, 'class' => null, - 'enctype' => null ); - $opciones = array_merge($opcionesPorDefecto, $opciones); - - $this->ajax = $opciones['ajax']; - $this->action = $opciones['action']; - $this->classAtt = $opciones['class']; - $this->enctype = $opciones['enctype']; - - if (!$this->action) { - $app = Aplicacion::getSingleton(); - $this->action = htmlspecialchars($_SERVER['REQUEST_URI']); - $this->action = $app->resuelve($this->action); - } - } -} -*/ -?> \ No newline at end of file diff --git a/login/includes/formLogin.php b/login/includes/formLogin.php deleted file mode 100644 index 95f435d..0000000 --- a/login/includes/formLogin.php +++ /dev/null @@ -1,104 +0,0 @@ -reply = array(); - } - - //Methods: - - //Returns validation response: - public function getReply() { - - if(isset($_SESSION["login"])){ - $name = strtoupper($_SESSION['nombre']); - $this->reply = "

Bienvenido {$_SESSION['nombre']}


-

{$name}, has iniciado sesión correctamente.

-

Usa los botones para navegar

- - \n"; - } - else if(!isset($_SESSION["login"])){ - $this->reply = "

ERROR


". - "

El usuario o contraseña no son válidos.

-

Vuelve a intetarlo o regístrate si no lo habías hecho previamente.

- -
\n"; - } - - return $this->reply; - } - - //Process form: - public function processesForm($name, $pass) { - $login = true; - $name = $this->test_input($name); - $pass = $this->test_input($pass); - - $username = isset($name) ? $name : null ; - if (!$username) { - $login = false; - } - - /* - $email = isset($mail) ? $mail : null ; - if (!$email || !mb_ereg_match(self::HTML5_EMAIL_REGEXP, $email)) { - $login = false; - } - */ - - $password = isset($pass) ? $pass : null ; - if (!$password || mb_strlen($password) < 4) { - $login = false; - } - - if ($login) { - $bd = new UserDAO('complucine'); - if($bd){ - $selectUser = $bd->selectUser($username); - $selectUser->data_seek(0); - while ($fila = $selectUser->fetch_assoc()) { - if($username === $fila['username'] && $bd->verifyPass($password, $fila['passwd'])){ - $this->user = $bd->loadUser($fila['id'], $fila['username'], $fila['email'], $fila['passwd'], $fila['rol']); - } - } - - try{ - if ($this->user) { - $_SESSION['user'] = $this->user; - $_SESSION["nombre"] = $this->user->getName(); - $_SESSION["login"] = $login; - $_SESSION["rol"] = $this->user->getRol(); - } - } - catch (Exception $e){ - $_SESSION["login"] = $login; - } - - mysqli_free_result($selectUser); - //$selectUser->free(); - } - - } - - } - - protected function test_input($input){ - return htmlspecialchars(trim(strip_tags($input))); - } - - -} -?> \ No newline at end of file diff --git a/login/includes/user_dao.php b/login/includes/user_dao.php deleted file mode 100644 index ab2af61..0000000 --- a/login/includes/user_dao.php +++ /dev/null @@ -1,83 +0,0 @@ -encryptPass($password); - - $sql = sprintf( "INSERT INTO users( id, username, email, passwd, rol) - VALUES ( '%s', '%s', '%s', '%s', '%s')", - $id, $username, $email, $password, $rol ); - - return $sql; - } - - //Returns a query to check if the user name exists. - public function selectUser($username){ - $username = $this->mysqli->real_escape_string($username); - - $sql = sprintf( "SELECT * FROM users WHERE username = '%s'", $username ); - $resul = mysqli_query($this->mysqli, $sql) or die ('Error into query database'); - - return $resul; - } - - //Returns a query to check if the user pass matches. - public function selectPass($username, $password){ - $username = $this->mysqli->real_escape_string($username); - $password = $this->mysqli->real_escape_string($password); - $password = $this->encryptPass($password); - - $sql = sprintf( "SELECT * FROM users WHERE username = '%s' AND passwd = '%s'", $username, $password); - $resul = mysqli_query($this->mysqli, $sql) or die ('Error into query database'); - - //return $this->mysqli->query($sql); - return $resul; - } - - //Returns a query to get the user's data. - public function userData($id){ - $sql = sprintf( "SELECT * FROM users WHERE id = '%d'", $id ); - $resul = mysqli_query($this->mysqli, $sql) or die ('Error into query database'); - - return $resul; - } - - //Create a new User Data Transfer Object. - public function loadUser($id, $username, $email, $password, $rol){ - return new UserDTO($id, $username, $email, $password, $rol); - } - - } - -?> \ No newline at end of file diff --git a/login/includes/user_dto.php b/login/includes/user_dto.php deleted file mode 100644 index 4e882f3..0000000 --- a/login/includes/user_dto.php +++ /dev/null @@ -1,37 +0,0 @@ -_id = $id; - $this->_username = $username; - $this->_email = $email; - $this->_password = $password; - $this->_rol = $rol; - } - - //Methods: - - //Getters && Setters: - public function setId($id){ $this->_id = $id; } - public function getId(){ return $this->_id; } - public function setName($username){ $this->_username = $username; } - public function getName(){ return $this->_username; } - public function setEmail($email){ $this->_email = $email; } - public function getEmail(){ return $this->_email; } - public function setPass($passwd){ $this->_password = $passwd; } - public function getPass(){ return $this->_password; } - public function setRol($rol){ $this->_rol = $rol; } - public function getRol(){ return $this->_rol; } - - } -?> \ No newline at end of file diff --git a/login/includes/users_dto_interface.php b/login/includes/users_dto_interface.php deleted file mode 100644 index 6bfc7aa..0000000 --- a/login/includes/users_dto_interface.php +++ /dev/null @@ -1,14 +0,0 @@ - \ No newline at end of file diff --git a/login/index.php b/login/index.php deleted file mode 100644 index 680ac7e..0000000 --- a/login/index.php +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - print_head(); - ?> - - - print_header(); - ?> - - -
-
-

Acceso

-
-
- - -
-
- -
-
- - - print_footer(); - ?> - - - - diff --git a/login/login_register.php b/login/login_register.php deleted file mode 100644 index 37782ff..0000000 --- a/login/login_register.php +++ /dev/null @@ -1,96 +0,0 @@ - -
-

Registro

-
-
-
- Datos personales -
- -
-
- -
-
- -
-
- -
-
-
- - -
-
- - -
-
-
-
-
-
-

¿Ya estás registrado?

-
-

Si dispones de una cuenta de usuario, no es necesario que rellenes este formulario nuevamente

-

Haz click en el botón para iniciar sesión.

-
- -
-
-
'."\n"; - - $login = ' -
-
-

¿No tienes una cuenta?

-
-

Para crear una cuenta de usuario es necesario haber rellenado el formulario de registro previamente

-

Haz click en el botón para registrate.

-
- -
-
-
-
-

Iniciar Sesión

-
-
-
- Datos personales -
- -
- -
- -
-
-
- - -
-
-
-
'."\n"; -?> \ No newline at end of file diff --git a/login/register.php b/login/register.php deleted file mode 100644 index 8b13789..0000000 --- a/login/register.php +++ /dev/null @@ -1 +0,0 @@ - diff --git a/login/validate.php b/login/validate.php deleted file mode 100644 index 43f09a6..0000000 --- a/login/validate.php +++ /dev/null @@ -1,57 +0,0 @@ -processesForm($_POST["name"], $_POST["pass"]); - $reply = $login->getReply(); -?> - - - - - print_head(); - ?> - - - print_header(); - ?> - - -
-
-
- - -
-
-
-
-
- -
-
-
-
-
- - - print_footer(); - ?> - - - -