Skip to content

merge #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AdaSC97 wants to merge 2 commits into
base: devAda
Choose a base branch
from
Open

merge #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d58f0f
Se agrgaron configuraciones al .htaccess
adasuarez14 Feb 12, 2020
52a93b1
Se hicieron cambios a última hora
adasuarez14 Feb 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Options All -Indexes

RewriteEngine On

RewriteRule ^([a-zA-Z0-9/]+$) index.php?pagina=$1


10 changes: 6 additions & 4 deletions controladores/formularios.controlador.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function ctrIngreso(){
if ( window.history.replaceState ) {
window.history.replaceState( null, null, window.location.href );
}
window.location = "index.php?pagina=inicio"
window.location = "inicio"

</script>';
}else{
Expand Down Expand Up @@ -118,7 +118,7 @@ static public function ctrActualizarRegistro(){

$compararToken = md5($usuario["nombre"]."+".$usuario["email"]);

if($compararToken == $_POST["tokenUsuario"]){
if($compararToken == $_POST["tokenUsuario"] && $_POST["idUsuario"] == $usuario["id"]){

if(isset($_POST["actualizarPassword"]) != ""){

Expand All @@ -131,9 +131,11 @@ static public function ctrActualizarRegistro(){
}else{
$password = $_POST["passwordActual"];
}

$tabla = "registros";
$actualizarToken = md5($_POST["actualizarNombre"]."+".$_POST["actualizarPassword"]);
$datos = array(
"id" => $_POST["idUsuario"],
"token" => $_POST["tokenUsuario"],
"nombre" => $_POST["actualizarNombre"],
"email" => $_POST["actualizarEmail"],
Expand Down Expand Up @@ -175,7 +177,7 @@ public function ctrEliminarRegistro(){
if ( window.history.replaceState ) {
window.history.replaceState( null, null, window.location.href );
}
window.location = "index.php?pagina=inicio"
window.location = "inicio"

</script>';

Expand Down
5 changes: 3 additions & 2 deletions modelos/formularios.modelo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,14 @@ static public function mdlActualizarRegristro($tabla, $datos){

#prepare previene inyeccioes SQL

$stmt = Conexion::conectar()->prepare("UPDATE registros SET nombre = :nombre, email = :email,
password = :password WHERE token = :token");
$stmt = Conexion::conectar()->prepare("UPDATE registros SET token = :token, nombre = :nombre, email = :email,
password = :password WHERE id = :id");

$stmt->bindParam(":nombre", $datos["nombre"], PDO::PARAM_STR);
$stmt->bindParam(":email", $datos["email"], PDO::PARAM_STR);
$stmt->bindParam(":password", $datos["password"], PDO::PARAM_STR);
$stmt->bindParam(":token", $datos["token"], PDO::PARAM_STR);
$stmt->bindParam(":id", $datos["id"], PDO::PARAM_INT);

if($stmt->execute()){
return "ok";
Expand Down
1 change: 1 addition & 0 deletions vistas/paginas/editar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
<input type="password" class="form-control" placeholder="Escriba su contraseña" id="pwd" name="actualizarPassword">
<input type="hidden" name = "passwordActual" value ="<?php echo $usuario["password"]; ?>">
<input type="hidden" name = "tokenUsuario" value ="<?php echo $usuario["token"]; ?>">
<input type="hidden" name = "idUsuario" value ="<?php echo $usuario["id"]; ?>">
</div>
</div>

Expand Down