diff options
7 files changed, 13 insertions, 6 deletions
diff --git a/modules-available/sysconfig/addconfig.inc.php b/modules-available/sysconfig/addconfig.inc.php index d9bed6f1..e804bbda 100644 --- a/modules-available/sysconfig/addconfig.inc.php +++ b/modules-available/sysconfig/addconfig.inc.php @@ -161,7 +161,9 @@ class AddConfig_Start extends AddConfig_Base $title = ''; } $dummy = 0; + $sort = []; foreach ($modGroups as &$mod) { + $sort[] = $mod['sortOrder']; if (!empty($mod['modules']) && $mod['unique']) { array_unshift($mod['modules'], array( 'moduleid' => 'x' . (++$dummy), @@ -169,6 +171,7 @@ class AddConfig_Start extends AddConfig_Base )); } } + array_multisort($sort, SORT_ASC | SORT_NUMERIC, $modGroups); unset($mod); Render::addDialog(Dictionary::translate("lang_configurationCompilation"), false, 'cfg-start', array( 'step' => 'AddConfig_Finish', diff --git a/modules-available/sysconfig/inc/configmodule/adauth.inc.php b/modules-available/sysconfig/inc/configmodule/adauth.inc.php index ed7b318d..5e68f48c 100644 --- a/modules-available/sysconfig/inc/configmodule/adauth.inc.php +++ b/modules-available/sysconfig/inc/configmodule/adauth.inc.php @@ -12,5 +12,6 @@ ConfigModule::registerModule( Dictionary::translateFileModule('sysconfig', 'config-module', 'adAuth_title'), // Title Dictionary::translateFileModule('sysconfig', 'config-module', 'adAuth_description'), // Description Dictionary::translateFileModule('sysconfig', 'config-module', 'group_authentication'), // Group - false // Only one per config? + false, // Only one per config? + 300 ); diff --git a/modules-available/sysconfig/inc/configmodule/branding.inc.php b/modules-available/sysconfig/inc/configmodule/branding.inc.php index fd11dade..8990dbec 100644 --- a/modules-available/sysconfig/inc/configmodule/branding.inc.php +++ b/modules-available/sysconfig/inc/configmodule/branding.inc.php @@ -5,7 +5,8 @@ ConfigModule::registerModule( Dictionary::translateFileModule('sysconfig', 'config-module', 'branding_title'), // Title Dictionary::translateFileModule('sysconfig', 'config-module', 'branding_description'), // Description Dictionary::translateFileModule('sysconfig', 'config-module', 'group_branding'), // Group - true // Only one per config? + true, // Only one per config? + 600 ); class ConfigModule_Branding extends ConfigModule diff --git a/modules-available/sysconfig/inc/configmodule/customodule.inc.php b/modules-available/sysconfig/inc/configmodule/customodule.inc.php index 336d794f..3c10bada 100644 --- a/modules-available/sysconfig/inc/configmodule/customodule.inc.php +++ b/modules-available/sysconfig/inc/configmodule/customodule.inc.php @@ -6,7 +6,7 @@ ConfigModule::registerModule( Dictionary::translateFileModule('sysconfig', 'config-module', 'custom_description'), // Description Dictionary::translateFileModule('sysconfig', 'config-module', 'group_generic'), // Group false, // Only one per config? - 100 // Sort order + 900 // Sort order ); class ConfigModule_CustomModule extends ConfigModule diff --git a/modules-available/sysconfig/inc/configmodule/ldapauth.inc.php b/modules-available/sysconfig/inc/configmodule/ldapauth.inc.php index e8df2877..7af4671e 100644 --- a/modules-available/sysconfig/inc/configmodule/ldapauth.inc.php +++ b/modules-available/sysconfig/inc/configmodule/ldapauth.inc.php @@ -19,5 +19,6 @@ ConfigModule::registerModule( Dictionary::translateFileModule('sysconfig', 'config-module', 'ldapAuth_title'), // Title Dictionary::translateFileModule('sysconfig', 'config-module', 'ldapAuth_description'), // Description Dictionary::translateFileModule('sysconfig', 'config-module', 'group_authentication'), // Group - false // Only one per config? + false, // Only one per config? + 300 ); diff --git a/modules-available/sysconfig/inc/configmodule/screensaver.inc.php b/modules-available/sysconfig/inc/configmodule/screensaver.inc.php index 88e0c968..4f2d0acc 100644 --- a/modules-available/sysconfig/inc/configmodule/screensaver.inc.php +++ b/modules-available/sysconfig/inc/configmodule/screensaver.inc.php @@ -6,7 +6,7 @@ ConfigModule::registerModule( Dictionary::translateFileModule('sysconfig', 'config-module', 'screensaver_description'), // Description Dictionary::translateFileModule('sysconfig', 'config-module', 'group_generic'), // Group true, // Only one per config? - 100 // Sort order + 700 // Sort order ); class ConfigModule_Screensaver extends ConfigModule diff --git a/modules-available/sysconfig/inc/configmodule/sshconfig.inc.php b/modules-available/sysconfig/inc/configmodule/sshconfig.inc.php index 61f69581..9975f789 100644 --- a/modules-available/sysconfig/inc/configmodule/sshconfig.inc.php +++ b/modules-available/sysconfig/inc/configmodule/sshconfig.inc.php @@ -5,7 +5,8 @@ ConfigModule::registerModule( Dictionary::translateFileModule('sysconfig', 'config-module', 'sshconfig_title'), // Title Dictionary::translateFileModule('sysconfig', 'config-module', 'sshconfig_description'), // Description Dictionary::translateFileModule('sysconfig', 'config-module', 'group_sshconfig'), // Group - false // Only one per config? + false, // Only one per config? + 500 ); class ConfigModule_SshConfig extends ConfigModule |