--- a/json/priv.php	Mon Sep 21 14:55:10 2009 +0000
+++ b/json/priv.php	Thu Sep 24 16:43:44 2009 +0000
@@ -4,18 +4,22 @@
 {
   require("db_credentials.php");
 
-  $db=mysql_connect($db_host,$db_name,$db_passwd) or die ("MySQL error");
-  mysql_select_db($db_database,$db) or die ("MySQL error");
+  $db = @mysql_connect($db_host, $db_name,$db_passwd) or die ("MySQL error");
+  @mysql_select_db($db_database, $db) or die ("MySQL error");
 
-  $username=$_SESSION["user"];
+  $username = $_SESSION["user"];
   
-  $result=mysql_query("select id from users where login='$username'",$db);
-  $data=@mysql_fetch_assoc($result);
-  $id=$data["id"];
+  $result = mysql_query("select id from users where login='$username'", $db);
+  if ($result !== FALSE) {
+    $data = @mysql_fetch_assoc($result);
+    $id = $data["id"];
 
-  $result=mysql_query("select markers.*,users.login from markers left join users on markers.ownerid=users.id where public=0 and ownerid=$id",$db);
-  while ($data=@mysql_fetch_assoc($result))
-    $res[]=$data;
-  echo json_encode($res);
+    $result = mysql_query("select markers.*,users.login from markers left join users on markers.ownerid=users.id where public=0 and ownerid=$id", $db);
+    if ($result !== FALSE) {
+      while ($data = @mysql_fetch_assoc($result))
+        $res[] = $data;
+    }
+    echo json_encode($res);
+  }
 }
 ?>

--- a/json/pub.php	Mon Sep 21 14:55:10 2009 +0000
+++ b/json/pub.php	Thu Sep 24 16:43:44 2009 +0000
@@ -1,10 +1,17 @@
 <?php
 require("db_credentials.php");
 
-$db=mysql_connect($db_host,$db_name,$db_passwd) or die ("MySQL error");
-mysql_select_db($db_database,$db) or die ("MySQL error");
-$result=mysql_query("select markers.*,users.login from markers left join users on markers.ownerid=users.id where public=1",$db);
-while ($data=@mysql_fetch_assoc($result))
-  $res[]=$data;
-echo json_encode($res);
-?>
+$db = @mysql_connect($db_host,$db_name,$db_passwd) or die ("MySQL error");
+@mysql_select_db($db_database,$db) or die ("MySQL error");
+
+$result = mysql_query(
+  "SELECT markers.*,users.login FROM markers ".
+  "LEFT JOIN users ON markers.ownerid=users.id WHERE public=1", $db);
+
+if (result !== FALSE) {
+  while ($data = @mysql_fetch_assoc($result))
+    $res[] = $data;
+
+  echo json_encode($res);
+}
+?>
\ No newline at end of file