diff --git a/phoneClients/ios/GpsTracker.xcodeproj/project.pbxproj b/phoneClients/ios/GpsTracker.xcodeproj/project.pbxproj index 36c49f6..e11b88c 100644 --- a/phoneClients/ios/GpsTracker.xcodeproj/project.pbxproj +++ b/phoneClients/ios/GpsTracker.xcodeproj/project.pbxproj @@ -164,7 +164,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = WS; - LastUpgradeCheck = 0500; + LastUpgradeCheck = 0510; ORGANIZATIONNAME = "Nick Fox"; TargetAttributes = { 888470461874EB9400867228 = { @@ -285,7 +285,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -325,7 +324,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; diff --git a/servers/php/dbconnect.php b/servers/php/dbconnect.php index fd9c8e0..3a23fe5 100644 --- a/servers/php/dbconnect.php +++ b/servers/php/dbconnect.php @@ -3,13 +3,13 @@ $dbhost = 'localhost'; $dbuser = 'gpstracker_user'; $dbpass = 'gpstracker'; -$dbname = 'gpstracker2'; +$dbname = 'gpstracker'; $mysqli = new mysqli($dbhost, $dbuser, $dbpass, $dbname); if (mysqli_connect_errno()) { - echo "Connection failed: " . mysqli_connect_error(); - exit(); + echo "Connection failed: " . mysqli_connect_error(); + exit(); } ?> \ No newline at end of file diff --git a/servers/php/deleteroute.php b/servers/php/deleteroute.php index af0cf0c..bc195e1 100644 --- a/servers/php/deleteroute.php +++ b/servers/php/deleteroute.php @@ -1,15 +1,15 @@ multi_query($query)) { - die('$mysqli->multi_query: ' . $mysqli->error); - } + // execute query + if (!$mysqli->multi_query($query)) { + die('$mysqli->multi_query: ' . $mysqli->error); + } - $mysqli->close(); + $mysqli->close(); ?> diff --git a/servers/php/displaymap.php b/servers/php/displaymap.php index 33c3b58..01d3a23 100644 --- a/servers/php/displaymap.php +++ b/servers/php/displaymap.php @@ -2,15 +2,29 @@