Renamed configuration directive: LeftFrameTableLevel => NavigationTreeTableLevel

ChangeLog

@@ -58,6 +58,7 @@ VerboseMultiSubmit, ReplaceHelpImg
 + Renamed configuration directive: LeftFrameDBTree => NavigationTreeEnableGrouping
 + Renamed configuration directive: LeftFrameDBSeparator => NavigationTreeDbSeparator
 + Renamed configuration directive: LeftFrameTableSeparator => NavigationTreeTableSeparator
++ Renamed configuration directive: LeftFrameTableLevel => NavigationTreeTableLevel
 
 3.5.4.0 (not yet released)
 - bug #3570212 [edit] uuid_short() is a no-arguments function

Documentation.html

@@ -1545,7 +1545,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         table name or multiple times after another without any other
         characters in between.</dd>
 
-    <dt id="cfg_LeftFrameTableLevel">$cfg['LeftFrameTableLevel'] string</dt>
+    <dt id="cfg_NavigationTreeTableLevel">$cfg['NavigationTreeTableLevel'] string</dt>
     <dd>Defines how many sublevels should be displayed when splitting
         up tables by the above separator.</dd>
 

libraries/Util.class.php

@@ -807,7 +807,7 @@ class PMA_Util
                 $parts_cnt = count($parts) - 1;
 
                 while (($i < $parts_cnt)
-                    && ($i < $GLOBALS['cfg']['LeftFrameTableLevel'])
+                    && ($i < $GLOBALS['cfg']['NavigationTreeTableLevel'])
                 ) {
                     $group_name = $parts[$i] . $sep;
                     $group_name_full .= $group_name;

libraries/config.default.php

@@ -816,9 +816,9 @@ $cfg['NavigationTreeTableSeparator'] = '__';
  * How many sublevels should be displayed when splitting up tables
  * by the above Separator
  *
- * @global integer $cfg['LeftFrameTableLevel']
+ * @global integer $cfg['NavigationTreeTableLevel']
  */
-$cfg['LeftFrameTableLevel'] = 1;
+$cfg['NavigationTreeTableLevel'] = 1;
 
 /**
  * display table comment as tooltip in left frame

libraries/config.values.php

@@ -206,7 +206,6 @@ $cfg_db['_validators'] = array(
     'Import/ldi_terminated' => array(array('validate_by_regex', '/^.$/')),
     'Import/skip_queries' => 'validate_non_negative_number',
     'InsertRows' => 'validate_positive_number',
-    'LeftFrameTableLevel' => 'validate_positive_number',
     'LeftRecentTable' => 'validate_non_negative_number',
     'LimitChars' => 'validate_positive_number',
     'LoginCookieValidity' => 'validate_positive_number',
@@ -217,6 +216,7 @@ $cfg_db['_validators'] = array(
     'MaxRows' => 'validate_positive_number',
     'MaxTableList' => 'validate_positive_number',
     'MemoryLimit' => array(array('validate_by_regex', '/^\d+(?:[kmg])?$/i')),
+    'NavigationTreeTableLevel' => 'validate_positive_number',
     'QueryHistoryMax' => 'validate_positive_number',
     'QueryWindowWidth' => 'validate_positive_number',
     'QueryWindowHeight' => 'validate_positive_number',

libraries/config/messages.inc.php

@@ -275,7 +275,6 @@ $strConfigLeftDisplayServers_desc = __('Display server choice at the top of the
 $strConfigLeftDisplayServers_name = __('Display servers selection');
 $strConfigLeftDisplayTableFilterMinimum_name = __('Minimum number of tables to display the table filter box');
 $strConfigLeftDisplayDatabaseFilterMinimum_name = __('Minimum number of databases to display the database filter box');
-$strConfigLeftFrameTableLevel_name = __('Maximum table tree depth');
 $strConfigLeftLogoLink_desc = __('URL where logo in the navigation frame will point to');
 $strConfigLeftLogoLink_name = __('Logo link URL');
 $strConfigLeftLogoLinkWindow_desc = __('Open the linked page in the main window ([kbd]main[/kbd]) or in a new one ([kbd]new[/kbd])');
@@ -318,6 +317,7 @@ $strConfigNavigationTreeDbSeparator_desc = __('String that separates databases i
 $strConfigNavigationTreeDbSeparator_name = __('Database tree separator');
 $strConfigNavigationTreeTableSeparator_desc = __('String that separates tables into different tree levels');
 $strConfigNavigationTreeTableSeparator_name = __('Table tree separator');
+$strConfigNavigationTreeTableLevel_name = __('Maximum table tree depth');
 $strConfigRowActionLinks_desc = __('These are Edit, Copy and Delete links');
 $strConfigRowActionLinks_name = __('Where to show the table row links');
 $strConfigNaturalOrder_desc = __('Use natural order for sorting table and database names');

libraries/config/setup.forms.php

@@ -178,7 +178,7 @@ $forms['Left_frame']['Left_tables'] = array(
     'LeftDisplayTableFilterMinimum',
     'LeftDefaultTabTable',
     'NavigationTreeTableSeparator',
-    'LeftFrameTableLevel',
+    'NavigationTreeTableLevel',
     'ShowTooltip');
 $forms['Main_frame']['Startup'] = array(
     'ShowCreateDb',

libraries/config/user_preferences.forms.php

@@ -92,7 +92,7 @@ $forms['Left_frame']['Left_tables'] = array(
     'LeftDisplayTableFilterMinimum',
     'LeftDefaultTabTable',
     'NavigationTreeTableSeparator',
-    'LeftFrameTableLevel',
+    'NavigationTreeTableLevel',
     'ShowTooltip');
 $forms['Main_frame']['Startup'] = array(
     'ShowCreateDb',

libraries/navigation/Nodes/Node_Table_Container.class.php

@@ -29,7 +29,7 @@ class Node_Table_Container extends Node
         );
         if ($GLOBALS['cfg']['NavigationTreeEnableGrouping']) {
             $this->separator       = $GLOBALS['cfg']['NavigationTreeTableSeparator'];
-            $this->separator_depth = (int)($GLOBALS['cfg']['LeftFrameTableLevel']);
+            $this->separator_depth = (int)($GLOBALS['cfg']['NavigationTreeTableLevel']);
         }
         $this->real_name       = 'tables';