Browse Source

Change search to use routing

remotes/origin/stable5
Bart Visscher 14 years ago
parent
commit
ed7accd237
  1. 2
      core/js/js.js
  2. 3
      core/routes.php
  3. 8
      search/ajax/search.php

2
core/js/js.js

@ -113,7 +113,7 @@ var OC={
} }
link+=file; link+=file;
}else{ }else{
if ((app == 'settings' || app == 'core') && type == 'ajax') {
if ((app == 'settings' || app == 'core' || app == 'search') && type == 'ajax') {
link+='/index.php/'; link+='/index.php/';
} }
else { else {

3
core/routes.php

@ -9,6 +9,9 @@
require_once 'settings/routes.php'; require_once 'settings/routes.php';
// Core ajax actions // Core ajax actions
// Search
$this->create('search_ajax_search', '/search/ajax/search.php')
->actionInclude('search/ajax/search.php');
// AppConfig // AppConfig
$this->create('core_ajax_appconfig', '/core/ajax/appconfig.php') $this->create('core_ajax_appconfig', '/core/ajax/appconfig.php')
->actionInclude('core/ajax/appconfig.php'); ->actionInclude('core/ajax/appconfig.php');

8
search/ajax/search.php

@ -21,17 +21,15 @@
* *
*/ */
// Init owncloud
require_once '../../lib/base.php';
// Check if we are a user // Check if we are a user
OC_JSON::checkLoggedIn(); OC_JSON::checkLoggedIn();
OC_App::loadApps();
$query=(isset($_GET['query']))?$_GET['query']:''; $query=(isset($_GET['query']))?$_GET['query']:'';
if($query) { if($query) {
$result=OC_Search::search($query); $result=OC_Search::search($query);
OC_JSON::encodedPrint($result); OC_JSON::encodedPrint($result);
}else{
}
else {
echo 'false'; echo 'false';
} }
Loading…
Cancel
Save