diff --git a/website/config.php b/website/config.php index d8188fb..f2d5889 100644 --- a/website/config.php +++ b/website/config.php @@ -3,10 +3,9 @@ $servername = "localhost:3306"; $username = "database"; $password = "13cAv?i52"; $dbname = "schoolkantine"; -$port = 3306; // Specify the port // Create connection -$conn = new mysqli($servername, $username, $password, $dbname, $port); +$conn = new mysqli($servername, $username, $password, $dbname); // Check connection if ($conn->connect_error) { diff --git a/website/database.inc.php b/website/database.inc.php deleted file mode 100644 index e478ac3..0000000 --- a/website/database.inc.php +++ /dev/null @@ -1,114 +0,0 @@ - PDO::ERRMODE_EXCEPTION, // give error in case of issue - PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC, // get row indexed by column name - PDO::ATTR_EMULATE_PREPARES => false, - ]; - try { - $pdo = new PDO($conn, $dbuser, $dbpass, $options); // create connection - return $pdo; - } catch (\PDOException $e) { - throw new \PDOException($e->getMessage(), (int)$e->getCode()); - } - } - - // Function to execute a query that does not return data - public static function executeQuery($p_sSql, $p_aData = "") { - // execute query on Mysql server (INSERT, UPDATE, DELETE, etc.) - // $p_sSQL contains MySQL query string with parameters '?' - // $p_aData contains array with query parameters - $pdo = Database::dbConnect(); - $stmt = $pdo->prepare($p_sSql); // prepare the query - if (is_array($p_aData)) { // add the data - return $stmt->execute($p_aData); // execute the query - } else { - return $stmt->execute(); // execute when no parameters - } - } - - // Get Data: Modified to handle fetching posts with user details - public static function getData($p_sSql, $p_aData = "", $print = false) { - // execute query on Mysql server - // $p_sSQL contains MySql query string with parameter ?'s - // $p_aData contains array with query parameters - $pdo = Database::dbConnect(); - $stmt = $pdo->prepare($p_sSql); // prepare the query - - if (is_array($p_aData)) { // add the data - $stmt->execute($p_aData); // execute the query - } else { - $stmt->execute(); // execute when no parameters - } - - // Fetch the results - database::$numrows = $stmt->rowCount(); - $result = $stmt->fetchAll(); // get result - database::$result = $result; // set class var - database::$currentrow = 0; // set current row - if ($print === true) { print_r($result); } - return $result; // database query result - } - - public static function getNumrows() { - return database::$numrows; - } - - public static function nextRow() { - if (database::$currentrow < database::getNumRows() - 1) { - database::$currentrow++; - } - echo "n:" . database::$currentrow; - $row = array(); - array_push($row, database::$result[database::$currentrow]); - return $row; - } - - public static function previousRow() { - if (database::$currentrow > 0) { - database::$currentrow--; - } - echo "p:" . database::$currentrow; - $row = array(); - array_push($row, database::$result[database::$currentrow]); - return $row; - } - - public static function currentRow() { - $rownr = database::$currentrow; - $row = array(); - array_push($row, database::$result[database::$currentrow]); - return $row; - } - - public static function jsonParse($p_aValue) { - if (is_array($p_aValue)) { - return json_encode($p_aValue); - } - if (is_string($p_aValue)) { - return json_decode($p_aValue); - } - } -} -?> \ No newline at end of file