Sync menu/tree processing with other projects, variable/function naming

lib/config_default.php

@@ -32,6 +32,16 @@ class Config {
 		$this->custom = new stdClass;
 		$this->default = new stdClass;
 
+		/*
+		 * What to do after entry creation :
+		 * 2 : display the creation form again
+		 * 1 : display the new created entry
+		 * 0 : display the choice between 1 and 2
+		 */
+		$this->default->appearance['action_after_creation'] = array(
+			'desc'=>'Display the new created entry',
+			'default'=>1);
+
 		## Appearance Attributes
 		/** Anonymous implies read only
 		 * Set to true if you want LDAP data to be displayed read-only (without input fields)
@@ -59,14 +69,14 @@ class Config {
 			'desc'=>'Show the control as icons or text',
 			'default'=>false);
 
-		$this->default->appearance['date'] = array(
-			'desc'=>'Date format whenever dates are shown',
-			'default'=>'%A %e %B %Y');
-
 		$this->default->appearance['custom_templates_only'] = array(
 			'desc'=>'Only display the custom templates.',
 			'default'=>false);
 
+		$this->default->appearance['date'] = array(
+			'desc'=>'Date format whenever dates are shown',
+			'default'=>'%A %e %B %Y');
+
 		$this->default->appearance['date_attrs'] = array(
 			'desc'=>'Array of attributes that should show a jscalendar',
 			'default'=>array('shadowExpire'=>'%es','shadowLastChange'=>'%es'));
@@ -95,26 +105,6 @@ class Config {
 			'desc'=>'Hide the features that may provide sensitive debugging information to the browser',
 			'default'=>true);
 
-		$this->default->appearance['rdn_all_attrs'] = array(
-			'desc'=>'Whether to show all attributes in the RDN chooser, or just the required ones',
-			'default'=>true);
-
-		$this->default->appearance['readonly_attrs'] = array(
-			'desc'=>'Mark these attributes as readonly',
-			'default'=>array());
-
-		$this->default->appearance['readonly_attrs_exempt'] = array(
-			'desc'=>'Group DN, where membership will exempt the users from readonly attrs',
-			'default'=>null);
-
-		$this->default->appearance['remoteurls'] = array(
-			'desc'=>'Whether to include renders for remote URLs',
-			'default'=>true);
-
-		$this->default->appearance['timezone'] = array(
-			'desc'=>'Define our timezone, if not defined in php.ini',
-			'default'=>null);
-
 		/** Language
 		 * The language setting. If you set this to 'auto', phpLDAPadmin will
 		 * attempt to determine your language automatically. Otherwise, set
@@ -157,14 +147,30 @@ class Config {
 			'desc'=>'Obfuscate the display of passwords',
 			'default'=>true);
 
-		$this->default->appearance['show_clear_password'] = array(
-			'desc'=>'Whether to show clear passwords if we dont obfuscate them',
-			'default'=>false);
-
 		$this->default->appearance['page_title'] = array(
 			'desc'=>'Change the page title to this text',
 			'default'=>'');
 
+		$this->default->appearance['rdn_all_attrs'] = array(
+			'desc'=>'Whether to show all attributes in the RDN chooser, or just the required ones',
+			'default'=>true);
+
+		$this->default->appearance['readonly_attrs'] = array(
+			'desc'=>'Mark these attributes as readonly',
+			'default'=>array());
+
+		$this->default->appearance['readonly_attrs_exempt'] = array(
+			'desc'=>'Group DN, where membership will exempt the users from readonly attrs',
+			'default'=>null);
+
+		$this->default->appearance['remoteurls'] = array(
+			'desc'=>'Whether to include renders for remote URLs',
+			'default'=>true);
+
+		$this->default->appearance['show_clear_password'] = array(
+			'desc'=>'Whether to show clear passwords if we dont obfuscate them',
+			'default'=>false);
+
 		$this->default->appearance['show_hints'] = array(
 			'desc'=>'Show helpful hints',
 			'default'=>true);
@@ -173,16 +179,6 @@ class Config {
 			'desc'=>'Show a additional create link on the top of the list if there are more than 10 entries',
 			'default'=>true);
 
-		/*
-		 * What to do after entry creation :
-		 * 2 : display the creation form again
-		 * 1 : display the new created entry
-		 * 0 : display the choice between 1 and 2
-		 */
-		$this->default->appearance['action_after_creation'] = array(
-			'desc'=>'Display the new created entry',
-			'default'=>1);
-
 		$this->default->appearance['show_schema_link'] = array(
 			'desc'=>'Show the schema link for each attribute',
 			'default'=>true);
@@ -199,6 +195,14 @@ class Config {
 			'desc'=>'Which theme to use',
 			'default'=>'default');
 
+		$this->default->appearance['timezone'] = array(
+			'desc'=>'Define our timezone, if not defined in php.ini',
+			'default'=>null);
+
+		$this->default->appearance['tree'] = array(
+			'desc'=>'Class name which inherits from Tree class and implements the draw() method',
+			'default'=>'AJAXTree');
+
 		/** Tree display
 		 * An array of format strings used to display enties in the 
 		 * tree viewer (left-hand side). The first format string that 
@@ -247,10 +251,6 @@ class Config {
 			'desc'=>'LDAP search filter for the tree entries',
 			'default'=>'(objectClass=*)');
 
-		$this->default->appearance['tree'] = array(
-			'desc'=>'Class name which inherits from Tree class and implements the draw() method',
-			'default'=>'AJAXTree');
-
 		## Caching
 		$this->default->cache['schema'] = array(
 			'desc'=>'Cache Schema Activity',
@@ -483,6 +483,21 @@ class Config {
 			'desc'=>'Time in seconds for the life of cookies',
 			'default'=>0);
 
+		/**
+		 * Session Menu
+		 */
+		$this->default->menu['session'] = array(
+			'desc'=>'Menu items when logged in.',
+			'default'=>array(
+				'schema'=>true,
+				'search'=>true,
+				'refresh'=>true,
+				'server_info'=>true,
+				'monitor'=>true,
+				'import'=>true,
+				'export'=>true
+			));
+
 		## Password Generation
 		$this->default->password['length'] = array(
 			'desc'=>'Length of autogenerated password',