summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/search/result.php21
-rw-r--r--search/ajax/search.php42
2 files changed, 46 insertions, 17 deletions
diff --git a/lib/search/result.php b/lib/search/result.php
index 80a6b494c5e..cd78a5cf253 100644
--- a/lib/search/result.php
+++ b/lib/search/result.php
@@ -3,10 +3,10 @@
* a result of a search
*/
class OC_Search_Result{
- private $name;
- private $text;
- private $link;
- private $type;
+ public $name;
+ public $text;
+ public $link;
+ public $type;
/**
* create a new search result
@@ -21,17 +21,4 @@ class OC_Search_Result{
$this->link=$link;
$this->type=$type;
}
-
- public function __get($name){
- switch($name){
- case 'name':
- return $this->name;
- case 'text':
- return $this->text;
- case 'link':
- return $this->link;
- case 'type':
- return $this->type;
- }
- }
}
diff --git a/search/ajax/search.php b/search/ajax/search.php
new file mode 100644
index 00000000000..c65fbbc63fa
--- /dev/null
+++ b/search/ajax/search.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+* ownCloud
+*
+* @author Robin Appelman
+* @copyright 2010 Robin Appelman icewind1991@gmail.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+
+// Init owncloud
+require_once('../../lib/base.php');
+
+// Check if we are a user
+if( !OC_User::isLoggedIn()){
+ header( "Location: ".OC_Helper::linkTo( '', 'index.php' ));
+ exit();
+}
+
+$query=(isset($_GET['query']))?$_GET['query']:'';
+if($query){
+ $result=OC_Search::search($query);
+ echo json_encode($result);
+}else{
+ echo 'false';
+}
+
+?> \ No newline at end of file