diff --git a/config/config.php b/config/config.php
deleted file mode 100644
index c53a8f7..0000000
--- a/config/config.php
+++ /dev/null
@@ -1,10 +0,0 @@
-load();
if ($_ENV['TEST'] === false) {
throw new Exception("Environment variables not loaded");
+} else if ($_ENV['APP_ENV'] === 'local') {
+ error_reporting(E_ALL);
+ ini_set('display_errors', 1);
+} else {
+ error_reporting(0);
+ ini_set('display_errors', 0);
+ ini_set('log_errors', 1);
}
session_start();
define('DOC_ROOT', dirname(__DIR__));
-require DOC_ROOT . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'config.php';
-
spl_autoload_register(function ($class) {
$file = str_replace("\\", DIRECTORY_SEPARATOR, $class);
$path = DOC_ROOT . DIRECTORY_SEPARATOR . "src" . DIRECTORY_SEPARATOR . "php" . DIRECTORY_SEPARATOR . $file . ".php";
diff --git a/db/create_db.sql b/db/create_db.sql
index 6f6988f..20988e5 100644
--- a/db/create_db.sql
+++ b/db/create_db.sql
@@ -1,3 +1,4 @@
+DROP TABLE IF EXISTS api_tokens;
DROP TABLE IF EXISTS rating;
DROP TABLE IF EXISTS tokens;
DROP TABLE IF EXISTS playlist;
diff --git a/public/acceptFriend.php b/public/acceptFriend.php
index 616595e..07b2ba4 100644
--- a/public/acceptFriend.php
+++ b/public/acceptFriend.php
@@ -1,79 +1,61 @@
getConnection();
- echo 'empezamos conexion';
$stmt = $db->prepare("INSERT INTO friends (USER_NAME, FRIEND_NAME) VALUES (:username, :friend)");
$stmt->bindParam(':username', $username);
$stmt->bindParam(':friend', $friend);
$result1 = $stmt->execute();
- echo 'paso 1';
-
$stmt = $db->prepare("INSERT INTO friends (USER_NAME, FRIEND_NAME) VALUES (:friend, :username)");
$stmt->bindParam(':username', $username);
$stmt->bindParam(':friend', $friend);
$result2 = $stmt->execute();
- echo 'paso 2';
-
$stmt = $db->prepare("DELETE FROM requests WHERE REQUEST_USER = :friend AND REQUESTED_USER = :username");
$stmt->bindParam(':username', $username);
$stmt->bindParam(':friend', $friend);
$result3 = $stmt->execute();
- echo 'paso 3';
-
$result = $result1 && $result2 && $result3; // Ambas consultas deben ser exitosas
header("Location: ./usuario.php?mensaje=Ahora sois amigos :)");
exit();
- } elseif($rechazar != null) {
- echo 'empezamos conexion rechazar';
- // Código para rechazar la solicitud de amistad
+ } elseif ($rechazar != null) {
$db = DbConnection::getInstance()->getConnection();
-
- echo "DELETE FROM requests WHERE REQUEST_USER = " . $username . " AND REQUESTED_USER = " . $friend . "";
-
+
$stmt = $db->prepare("DELETE FROM requests WHERE REQUEST_USER = :friend AND REQUESTED_USER = :username");
$stmt->bindParam(':username', $username);
$stmt->bindParam(':friend', $friend);
$result4 = $stmt->execute();
- //header("Location: ./usuario.php?mensaje=Solicitud rechazada");
- header("Location: ./usuario.php?mensaje=DELETE FROM requests WHERE REQUEST_USER = " . $username . " AND REQUESTED_USER = " . $friend);
+ header("Location: ./usuario.php?mensaje=Solicitud rechazada");
exit();
-
+
}
-
- echo 'El usuario introducido no existe o ya ha sido añadido';
-
+
+
if ($result) {
-
header("Location: ./usuario.php?mensaje=Ahora sois amigos :)");
exit();
} else {
-
- echo "Error: " . $stmt->errorInfo()[2];
+ header("Location: ./usuario.php?mensaje=Hubo un problema, vuelve a intentarlo :(");
+ exit();
}
}
\ No newline at end of file
diff --git a/public/anadirPlaylist.php b/public/anadirPlaylist.php
index c09edf3..4465f6b 100644
--- a/public/anadirPlaylist.php
+++ b/public/anadirPlaylist.php
@@ -5,28 +5,23 @@
$url = $_POST['urlPlaylist'];
$username = $_POST['username'];
- // Extract the URL between src=" and "
- //preg_match('/src="([^"]*)"/', $url, $matches);
- //$url = $matches[1] ?? '';
-
- echo 'Esta playlist ya ha sido añadida por otro usuario.';
-
- try{
+ try {
$db = DbConnection::getInstance()->getConnection();
$stmt = $db->prepare("INSERT INTO playlist VALUES (?, ?)");
$result = $stmt->execute([$url, $username]);
-
+
if ($result) {
// Redirect to index.php on success
- header("Location: ./index.php?playlist=".$url."&mensaje=Playlist añadida correctamente");
+ header("Location: ./index.php?mensaje=Playlist añadida correctamente");
exit();
} else {
// Echo error message on failure
- header("Location: ./index.php?playlist=".$url."&error=Esta playlist ya ha sido añadida por otro usuario");
- echo "Error: " . $stmt->errorInfo()[2];
+ header("Location: ./index.php?playlist=" . $url . "&mensaje=Esta playlist ya ha sido añadida por otro usuario :(");
+ exit();
}
- }catch(error){
- echo "Error: " . $error;
+ } catch (Exception $error) {
+ header("Location: ./index.php?playlist=" . $url . "&mensaje=Esta playlist ya ha sido añadida por otro usuario :(");
+ exit();
}
header("Location: ./index.php?playlist=".$url."&error=Esta playlist ya ha sido añadida por otro usuario");
diff --git a/public/cambiarPsswd.php b/public/cambiarPsswd.php
index 4575e58..f9d86a9 100644
--- a/public/cambiarPsswd.php
+++ b/public/cambiarPsswd.php
@@ -37,149 +37,152 @@
-
-
-
- Cambiar Contraseña
-
-
-
-
-
-
-
-
-