Completely removing personalMenu

5 files changed, 2 insertions, 39 deletions

diff --git a/help/appinfo/app.php b/help/appinfo/app.php
index 184f4d345be..661b554f417 100644
--- 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 0a54ddb9cf4..dafbd05cf33 100644
--- 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 b08733e04d9..5db3e047fd7 100644
--- 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
@@ -182,28 +181,6 @@ class OC_APP{
 	}
 
 	/**
-	 * @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
 	 * @returns true/false
@@ -267,18 +244,6 @@ class OC_APP{
 	}
 
 	/**
-	 * @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 fcf6334b956..0e1c268efaa 100644
--- 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 a7813893036..5f78b83dc23 100644
--- 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" ));
 
 ?>