Completely removing personalMenu

diff --git a/help/appinfo/app.php b/help/appinfo/app.php
index 184f4d345bed388844d04ee413875557a10ec3ef..661b554f417130f422ffadd3b88b61e66269e358 100644 (file)
--- a/help/appinfo/app.php
+++ b/help/appinfo/app.php
@@ -1,6 +1,5 @@
 <?php
 
 OC_APP::register( array( "id" => "help", "name" => "Help" ));
-OC_APP::addPersonalMenuEntry( array( "order" => 2, "href" => OC_HELPER::linkTo( "help", "index.php" ), "name" => "Help" ));
 
 ?>

diff --git a/help/index.php b/help/index.php
index 0a54ddb9cf44a896af9715afe666112eb0917168..dafbd05cf333be72368e12cff888b47e7e29d2a6 100644 (file)
--- a/help/index.php
+++ b/help/index.php
@@ -7,6 +7,7 @@ if( !OC_USER::isLoggedIn()){
     exit();
 }
 
+OC_APP::setActiveNavigationEntry( "help" );
 $settings = array();
 
 // Do the work ...

diff --git a/lib/app.php b/lib/app.php
index b08733e04d924ecf540881ec4fc50057870f3dee..5db3e047fd79a2de868840264e0b2736efc0ee72 100644 (file)
--- a/lib/app.php
+++ b/lib/app.php
@@ -34,7 +34,6 @@ class OC_APP{
        static private $settingspages = array();
        static private $navigation = array();
        static private $subnavigation = array();
-       static private $personalmenu = array();
 
        /**
         * @brief loads all apps
@@ -181,28 +180,6 @@ class OC_APP{
                return self::$activeapp;
        }
 
-       /**
-        * @brief adds an entry to the personal menu
-        * @param $data array containing the data
-        * @returns true/false
-        *
-        * This function adds a new entry to the personal menu visible to users
-        * only. $data is an associative array.
-        * The following keys are required:
-        *   - id: unique id for this entry ("logout")
-        *   - href: link to the page
-        *   - name: Human readable name ("Logout")
-        *
-        * The following keys are optional:
-        *   - order: integer, that influences the position of your application in
-        *     the personal menu. Lower values come first.
-        */
-       public static function addPersonalMenuEntry( $data ){
-               // TODO: write function
-               OC_APP::$personalmenu[] = $data;
-               return true;
-       }
-
        /**
         * @brief registers an admin page
         * @param $data array containing the data
@@ -266,18 +243,6 @@ class OC_APP{
                return OC_APP::$navigation;
        }
 
-       /**
-        * @brief Returns the personal menu
-        * @returns associative array
-        *
-        * This function returns an array containing all personal menu entries
-        * added. The entries are sorted by the key "order" ascending.
-        */
-       public static function getPersonalMenu(){
-               // TODO: write function
-               return OC_APP::$personalmenu;
-       }
-
        /**
         * @brief Returns the admin pages
         * @returns associative array

diff --git a/lib/template.php b/lib/template.php
index fcf6334b956b4f448cd79e785c94608363db394b..0e1c268efaa4c1010d5aeed212beaf84f074b828 100644 (file)
--- a/lib/template.php
+++ b/lib/template.php
@@ -191,9 +191,8 @@ class OC_TEMPLATE{
                                $page = new OC_TEMPLATE( "core", "layout.user" );
                                // Add menu data
 
-                               // Add navigation entry and personal menu
+                               // Add navigation entry
                                $page->assign( "navigation", OC_APP::getNavigation());
-                               $page->assign( "personalmenu", OC_APP::getPersonalMenu());
                        }
                        elseif( $this->renderas == "admin" )
                        {

diff --git a/settings/appinfo/app.php b/settings/appinfo/app.php
index a781389303685788c17ff5c2b5e88905df8c6896..5f78b83dc23a7d282cdef0cce99472ed9a674c7a 100644 (file)
--- a/settings/appinfo/app.php
+++ b/settings/appinfo/app.php
@@ -1,6 +1,5 @@
 <?php
 
 OC_APP::register( array( "id" => "settings", "name" => "Settings" ));
-OC_APP::addPersonalMenuEntry( array( "order" => 1, "href" => OC_HELPER::linkTo( "settings", "index.php" ), "name" => "Settings" ));
 
 ?>