From 1bdd0c949bca2f68da0ab3f47efbec10a7e51702 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sun, 28 Oct 2012 18:52:18 +0100
Subject: [PATCH] Move and fix app setting navigation detect
---
{core => settings}/ajax/navigationdetect.php | 4 ----
settings/js/apps.js | 4 ++--
settings/routes.php | 2 ++
3 files changed, 4 insertions(+), 6 deletions(-)
rename {core => settings}/ajax/navigationdetect.php (85%)
diff --git a/core/ajax/navigationdetect.php b/settings/ajax/navigationdetect.php
similarity index 85%
rename from core/ajax/navigationdetect.php
rename to settings/ajax/navigationdetect.php
index c7d0bd38dbc..93acb50dc20 100644
--- a/core/ajax/navigationdetect.php
+++ b/settings/ajax/navigationdetect.php
@@ -1,9 +1,5 @@
<?php
-$RUNTIME_NOAPPS = true;
-
-require_once '../../lib/base.php';
-
OC_Util::checkAdminUser();
OCP\JSON::callCheck();
diff --git a/settings/js/apps.js b/settings/js/apps.js
index e45abf9b3dd..c4c36b4bb12 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -91,7 +91,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
return app;
},
removeNavigation: function(appid){
- $.getJSON(OC.filePath('core','ajax','navigationdetect.php'), {app: appid}).done(function(response){
+ $.getJSON(OC.filePath('settings', 'ajax', 'navigationdetect.php'), {app: appid}).done(function(response){
if(response.status === 'success'){
var navIds=response.nav_ids;
for(var i=0; i< navIds.length; i++){
@@ -101,7 +101,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
});
},
addNavigation: function(appid){
- $.getJSON(OC.filePath('core','ajax','navigationdetect.php'), {app: appid}).done(function(response){
+ $.getJSON(OC.filePath('settings', 'ajax', 'navigationdetect.php'), {app: appid}).done(function(response){
if(response.status === 'success'){
var navEntries=response.nav_entries;
for(var i=0; i< navEntries.length; i++){
diff --git a/settings/routes.php b/settings/routes.php
index 4f4f83e4542..64f4650eb8c 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -51,6 +51,8 @@ $this->create('settings_ajax_enableapp', '/settings/ajax/enableapp.php')
->actionInclude('settings/ajax/enableapp.php');
$this->create('settings_ajax_disableapp', '/settings/ajax/disableapp.php')
->actionInclude('settings/ajax/disableapp.php');
+$this->create('settings_ajax_navigationdetect', '/settings/ajax/navigationdetect.php')
+ ->actionInclude('settings/ajax/navigationdetect.php');
// admin
$this->create('settings_ajax_getlog', '/settings/ajax/getlog.php')
->actionInclude('settings/ajax/getlog.php');
--
GitLab