Updated error handling, added error contexts. Fixed fullscreen button

[situare] / src / situareservice / situarecommon.h

diff --git a/src/situareservice/situarecommon.h b/src/situareservice/situarecommon.h
index e60257b..a341f9d 100644 (file)
--- a/src/situareservice/situarecommon.h
+++ b/src/situareservice/situarecommon.h
@@ -32,10 +32,14 @@ const QString API_KEY = "4197c64da2fb6b927236feaea32d7d81";
 const QString SITUARE_TEST_URL = "http://emmerichgn.facebook.joyent.us/";
 const QString TEST_API_KEY = "cf77865a5070f2c2ba3b52cbf3371579";
 
+// Situare JSON callback data
+const QString NORMAL_SIZE_PROFILE_IMAGE = "pic";
+
 // Situare PHP scripts
 const QString UPDATE_LOCATION = "updateLocation.php";
 const QString REVERSE_GEO = "reversegeo.php";
-const QString GET_LOCATIONS = "getLocations.php";
+const QString GET_LOCATIONS =
+        QString("getLocations.php?extra_user_data=%1").arg(NORMAL_SIZE_PROFILE_IMAGE);
 
 // Cookies
 const QString COOKIE = "Cookie";
@@ -65,8 +69,9 @@ const QString PUBLISH = "publish";
 const QString PUBLISH_TRUE = "true";
 const QString PUBLISH_FALSE = "false";
 const QString DATA = "data";
+const QString JSON_FORMAT = "&format=json";
 
-// Situare error messages
+// Situare server error messages
 const QString ERROR_LAT = "Wrong lat value: . Latitude must be between -90 and 90!";
 const QString ERROR_LON = "Wrong lon value: . Longitude must be between -180 and 180!";
 const QString ERROR_SESSION = "<br />\n<b>Fatal error</b>:"; // starts with