Changeset 1639 for branches/multiuser/api.php

Timestamp:

11/24/06 16:23:35 (2 years ago)

Author:

mdodoo

Message:

Attempted sync with trunk through "diff -r." Ignored the internationalized langugage files because i was afraid of messing something up.

It is 10:30 am. I should get some sleep.

Files:

• branches/multiuser/api.php (modified) (4 diffs)

branches/multiuser/api.php

@@ -52 +52 @@
         rss_require('extlib/JSON.php');
         $json = new Services_JSON();
-        $query = sanitize(@$_REQUEST['q'], RSS_SANITIZER_WORDS);
+        $query = preg_replace('#[^a-z0-9\s]#','',@$_REQUEST['q']);
         if ($query) {
             $res = osSearch($query);
         } else {
-            $res = array($query,array());
+            $res = array($query,array(),array(),array());
         }
-        header('Content-Type: application/json');
+        header('Content-Type: text/plain');
         die ($json->encode($res));
         break;
@@ -80 +80 @@
            ." c.id, c.title, c.url, c.siteurl, f.name "
            ." from ".getTable("channels")." c "
-           . " inner join " . getTable("folders")." f on f.id = c.parent";
+           ." inner join " . getTable("folders")." f "
+           ."  on f.id = c.parent";
 
     if (hidePrivate()) {
@@ -149 +150 @@
            ." unix_timestamp(ifnull(i.pubdate, i.added)) as idate ,i.id as iid"
            ." from ".getTable('item')." i "
-           . " inner join ".getTable('channels') ." c "
-           ." on i.cid=c.id where i.unread & ". RSS_MODE_UNREAD_STATE ." and c.id=$cid";
+            ." inner join " .getTable('channels') ." c "
+            ."  on c.id = i.cid "
+            ." where i.unread & ". RSS_MODE_UNREAD_STATE ." and c.id=$cid";
 
     if ($date) {
@@ -216 +218 @@
         }
     }
-    return array($q,$results);
+    return array($q,$results,array(),array());
 }
 ?>