From 1f0bc1713fa19d4a0fec70cc8936687d86a919b0 Mon Sep 17 00:00:00 2001
From: scambra <sergio@entrecables.com>
Date: Mon, 29 Oct 2012 14:50:03 +0100
Subject: fix settings routes

---
 settings/routes.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'settings')

diff --git a/settings/routes.php b/settings/routes.php
index 4f4f83e4542..0aabe4becfe 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -24,13 +24,13 @@ $this->create('settings_admin', '/settings/admin')
 $this->create('settings_ajax_userlist', '/settings/ajax/userlist')
 	->actionInclude('settings/ajax/userlist.php');
 $this->create('settings_ajax_createuser', '/settings/ajax/createuser.php')
-	->actionInclude('settings_ajax_createuser');
+	->actionInclude('settings/ajax/createuser.php');
 $this->create('settings_ajax_removeuser', '/settings/ajax/removeuser.php')
 	->actionInclude('settings/ajax/removeuser.php');
 $this->create('settings_ajax_setquota', '/settings/ajax/setquota.php')
 	->actionInclude('settings/ajax/setquota.php');
 $this->create('settings_ajax_creategroup', '/settings/ajax/creategroup.php')
-	->actionInclude('settings_ajax_creategroup');
+	->actionInclude('settings/ajax/creategroup.php');
 $this->create('settings_ajax_togglegroups', '/settings/ajax/togglegroups.php')
 	->actionInclude('settings/ajax/togglegroups.php');
 $this->create('settings_ajax_togglesubadmins', '/settings/ajax/togglesubadmins.php')
-- 
cgit v1.2.3


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: Move and fix app setting navigation detect

---
 core/ajax/navigationdetect.php     | 22 ----------------------
 settings/ajax/navigationdetect.php | 18 ++++++++++++++++++
 settings/js/apps.js                |  4 ++--
 settings/routes.php                |  2 ++
 4 files changed, 22 insertions(+), 24 deletions(-)
 delete mode 100644 core/ajax/navigationdetect.php
 create mode 100644 settings/ajax/navigationdetect.php

(limited to 'settings')

diff --git a/core/ajax/navigationdetect.php b/core/ajax/navigationdetect.php
deleted file mode 100644
index c7d0bd38dbc..00000000000
--- a/core/ajax/navigationdetect.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-$RUNTIME_NOAPPS = true;
-
-require_once '../../lib/base.php';
-
-OC_Util::checkAdminUser();
-OCP\JSON::callCheck();
-
-$app = $_GET['app'];
-
-//load the one app and see what it adds to the navigation
-OC_App::loadApp($app);
-
-$navigation = OC_App::getNavigation();
-
-$navIds = array();
-foreach ($navigation as $nav) {
-	$navIds[] = $nav['id'];
-}
-
-OCP\JSON::success(array('nav_ids' => array_values($navIds), 'nav_entries' => $navigation));
diff --git a/settings/ajax/navigationdetect.php b/settings/ajax/navigationdetect.php
new file mode 100644
index 00000000000..93acb50dc20
--- /dev/null
+++ b/settings/ajax/navigationdetect.php
@@ -0,0 +1,18 @@
+<?php
+
+OC_Util::checkAdminUser();
+OCP\JSON::callCheck();
+
+$app = $_GET['app'];
+
+//load the one app and see what it adds to the navigation
+OC_App::loadApp($app);
+
+$navigation = OC_App::getNavigation();
+
+$navIds = array();
+foreach ($navigation as $nav) {
+	$navIds[] = $nav['id'];
+}
+
+OCP\JSON::success(array('nav_ids' => array_values($navIds), 'nav_entries' => $navigation));
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');
-- 
cgit v1.2.3