Skip to content

Fix bugs #60

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
DavidVentura wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix bugs #60

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
bded15c
Fix bugs
DavidVentura Oct 1, 2015
1600b59
The point of a prepared statement is to prepare it once. Also, if the…
DavidVentura Oct 1, 2015
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@ $RECYCLE.BIN/
Network Trash Folder
Temporary Items
.apdisk

INSTALL.php
config.php
4 changes: 2 additions & 2 deletions .htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Options All -Indexes
DirectoryIndex api.php
Options ALL -Indexes
DirectoryIndex api.php
25 changes: 20 additions & 5 deletions api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,23 @@ function hash_equals($a, $b) {
}
}

$itemName = $_POST['item'];
$itemCount = $_POST['count'];
$jsonData = $_POST['jsonArray'];
$function = $_POST['function'];
if(isset($_POST['item']))
$itemName = $_POST['item'];

if(isset($_POST['count']))
$itemCount = $_POST['count'];

if(isset($_POST['jsonArray']))
$jsonData = $_POST['jsonArray'];

if(!isset($_POST['function']))
die("No function");

if(!isset($_POST['auth']))
die("No auth");

$auth = $_POST['auth'];
$function = $_POST['function'];

include('config.php');

Expand Down Expand Up @@ -44,10 +56,13 @@ function hash_equals($a, $b) {


include $dbConnector;

/* WHAT?
if (!hash_equals($authKey, crypt($auth, $authKey))){
die (json_encode(array('type' => API_ERROR_403, 'content' => 'Authentication failed.')));
}
*/
if($auth!==$authKey)
die (json_encode(array('type' => API_ERROR_403, 'content' => 'Authentication failed.')));

$db = NEW DataBase($dbConfig);

Expand Down
28 changes: 0 additions & 28 deletions config.php
View file
Open in desktop

This file was deleted.

25 changes: 13 additions & 12 deletions mysql_connector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
include('CONSTANTS.php');
include_once('CONSTANTS.php');
class DataBase
{
var $server, $username, $password, $database;
Expand Down Expand Up @@ -78,26 +78,27 @@ function saveMultiple($jsonData)
return $result;
}

function deleteMultiple($jsonData)
{
if(empty($jsonData)) {
die(json_encode(array('type' => API_ERROR_MISSING_PARAMETER, 'content' => 'parameter missing for deleteMultiple')));
}
function deleteMultiple($jsonData) {
if(empty($jsonData))
die(json_encode(array('type' => API_ERROR_MISSING_PARAMETER, 'content' => 'parameter missing for deleteMultiple')));
//iterate over all items in json array
$array = json_decode( $jsonData, true );
if(count($array) ==0)
die(json_encode(array('type' => API_ERROR_MISSING_PARAMETER, 'content' => 'parameter missing for deleteMultiple')));

//connect to db
$handler = new mysqli($this->server, $this->username, $this->password, $this->database);

//check if connection successful
if ($handler->connect_error) {
die(json_encode(array('type' => API_ERROR_DATABASE_CONNECT, 'content' => $handler->connect_error)));
}
//iterate over all items in json array
$array = json_decode( $jsonData, true );

//prepare query
$stmt = $handler->prepare("DELETE from ShoppingList WHERE item = ?");
$stmt->bind_param('s', $item['itemTitle']);
foreach($array as $item)
{
//prepare query
$stmt = $handler->prepare("DELETE from ShoppingList WHERE item = ?");
$stmt->bind_param('s', $item['itemTitle']);

//execute query and check if successful
if (!$stmt->execute()){
$result = json_encode(array('type' => API_SUCCESS_DELETE, 'content' => ' Multiple items deleted'));
Expand Down