diff options
| -rw-r--r-- | lib/private/app.php | 37 | ||||
| -rw-r--r-- | settings/routes.php | 2 | ||||
| -rw-r--r-- | settings/settings.php | 19 |
3 files changed, 10 insertions, 48 deletions
diff --git a/lib/private/app.php b/lib/private/app.php index a92ddd40e6f..f41cb82c36b 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -35,13 +35,11 @@ use OC\App\Platform; */ class OC_App { static private $appVersion = []; - static private $settingsForms = array(); static private $adminForms = array(); static private $personalForms = array(); static private $appInfo = array(); static private $appTypes = array(); static private $loadedApps = array(); - static private $checkedApps = array(); static private $altLogin = array(); /** @@ -320,6 +318,7 @@ class OC_App { /** * This function set an app as disabled in appconfig. * @param string $app app + * @throws Exception */ public static function disable($app) { if($app === 'files') { @@ -431,18 +430,6 @@ class OC_App { "icon" => OC_Helper::imagePath("settings", "personal.svg") ); - // if there are some settings forms - if (!empty(self::$settingsForms)) { - // settings menu - $settings[] = array( - "id" => "settings", - "order" => 1000, - "href" => OC_Helper::linkToRoute("settings_settings"), - "name" => $l->t("Settings"), - "icon" => OC_Helper::imagePath("settings", "settings.svg") - ); - } - //SubAdmins are also allowed to access user management if (OC_SubAdmin::isSubAdmin(OC_User::getUser())) { // admin users menu @@ -455,7 +442,6 @@ class OC_App { ); } - // if the user is an admin if (OC_User::isAdminUser(OC_User::getUser())) { // admin settings @@ -696,14 +682,12 @@ class OC_App { } /** - * get the forms for either settings, admin or personal + * @param string $type + * @return array */ public static function getForms($type) { $forms = array(); switch ($type) { - case 'settings': - $source = self::$settingsForms; - break; case 'admin': $source = self::$adminForms; break; @@ -720,13 +704,6 @@ class OC_App { } /** - * register a settings form to be shown - */ - public static function registerSettings($app, $page) { - self::$settingsForms[] = $app . '/' . $page . '.php'; - } - - /** * register an admin form to be shown * * @param string $app @@ -743,10 +720,16 @@ class OC_App { self::$personalForms[] = $app . '/' . $page . '.php'; } - public static function registerLogIn($entry) { + /** + * @param array $entry + */ + public static function registerLogIn(array $entry) { self::$altLogin[] = $entry; } + /** + * @return array + */ public static function getAlternativeLogIns() { return self::$altLogin; } diff --git a/settings/routes.php b/settings/routes.php index 150746665d3..942d9b0fb28 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -37,8 +37,6 @@ $this->create('settings_help', '/settings/help') ->actionInclude('settings/help.php'); $this->create('settings_personal', '/settings/personal') ->actionInclude('settings/personal.php'); -$this->create('settings_settings', '/settings') - ->actionInclude('settings/settings.php'); $this->create('settings_users', '/settings/users') ->actionInclude('settings/users.php'); $this->create('settings_apps', '/settings/apps') diff --git a/settings/settings.php b/settings/settings.php deleted file mode 100644 index c08732fcf66..00000000000 --- a/settings/settings.php +++ /dev/null @@ -1,19 +0,0 @@ -<?php -/** - * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com> - * This file is licensed under the Affero General Public License version 3 or later. - * See the COPYING-README file. - */ - -OC_Util::checkLoggedIn(); - -OC_Util::addStyle( 'settings', 'settings' ); -OC_App::setActiveNavigationEntry( 'settings' ); - -$tmpl = new OC_Template( 'settings', 'settings', 'user'); -$forms=OC_App::getForms('settings'); -$tmpl->assign('forms', array()); -foreach($forms as $form) { - $tmpl->append('forms', $form); -} -$tmpl->printPage(); |