From 06ccc05f6e490a99fcc8e43af5496727c18056ae Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Sat, 28 Aug 2010 12:27:06 +0000 Subject: [PATCH] sort included JS files --- lam/templates/config/conflogin.php | 5 +++++ lam/templates/config/confmain.php | 5 +++++ lam/templates/config/confmodules.php | 5 +++++ lam/templates/config/conftypes.php | 5 +++++ lam/templates/config/mainlogin.php | 5 +++++ lam/templates/config/mainmanage.php | 5 +++++ lam/templates/config/moduleSettings.php | 5 +++++ lam/templates/config/profmanage.php | 5 +++++ lam/templates/login.php | 9 +++++++-- lam/templates/main_header.php | 5 +++++ 10 files changed, 52 insertions(+), 2 deletions(-) diff --git a/lam/templates/config/conflogin.php b/lam/templates/config/conflogin.php index a08fb1d8..38e4a1ec 100644 --- a/lam/templates/config/conflogin.php +++ b/lam/templates/config/conflogin.php @@ -70,8 +70,13 @@ echo $_SESSION['header']; // include all JavaScript files $jsDirName = dirname(__FILE__) . '/../lib'; $jsDir = dir($jsDirName); + $jsFiles = array(); while ($jsEntry = $jsDir->read()) { if (substr($jsEntry, strlen($jsEntry) - 3, 3) != '.js') continue; + $jsFiles[] = $jsEntry; + } + sort($jsFiles); + foreach ($jsFiles as $jsEntry) { echo "\n"; } // set focus on password field diff --git a/lam/templates/config/confmain.php b/lam/templates/config/confmain.php index 0b9affb5..3c72d504 100644 --- a/lam/templates/config/confmain.php +++ b/lam/templates/config/confmain.php @@ -135,8 +135,13 @@ echo ("\n"); // include all JavaScript files $jsDirName = dirname(__FILE__) . '/../lib'; $jsDir = dir($jsDirName); +$jsFiles = array(); while ($jsEntry = $jsDir->read()) { if (substr($jsEntry, strlen($jsEntry) - 3, 3) != '.js') continue; + $jsFiles[] = $jsEntry; +} +sort($jsFiles); +foreach ($jsFiles as $jsEntry) { echo "\n"; } ?> diff --git a/lam/templates/config/confmodules.php b/lam/templates/config/confmodules.php index e8b64476..d6e05f60 100644 --- a/lam/templates/config/confmodules.php +++ b/lam/templates/config/confmodules.php @@ -112,8 +112,13 @@ echo "\n"; // include all JavaScript files $jsDirName = dirname(__FILE__) . '/../lib'; $jsDir = dir($jsDirName); +$jsFiles = array(); while ($jsEntry = $jsDir->read()) { if (substr($jsEntry, strlen($jsEntry) - 3, 3) != '.js') continue; + $jsFiles[] = $jsEntry; +} +sort($jsFiles); +foreach ($jsFiles as $jsEntry) { echo "\n"; } diff --git a/lam/templates/config/conftypes.php b/lam/templates/config/conftypes.php index ac91ab71..26b95f3f 100644 --- a/lam/templates/config/conftypes.php +++ b/lam/templates/config/conftypes.php @@ -130,8 +130,13 @@ echo "\n"; // include all JavaScript files $jsDirName = dirname(__FILE__) . '/../lib'; $jsDir = dir($jsDirName); +$jsFiles = array(); while ($jsEntry = $jsDir->read()) { if (substr($jsEntry, strlen($jsEntry) - 3, 3) != '.js') continue; + $jsFiles[] = $jsEntry; +} +sort($jsFiles); +foreach ($jsFiles as $jsEntry) { echo "\n"; } diff --git a/lam/templates/config/mainlogin.php b/lam/templates/config/mainlogin.php index 6428b909..32044d07 100644 --- a/lam/templates/config/mainlogin.php +++ b/lam/templates/config/mainlogin.php @@ -87,8 +87,13 @@ echo $_SESSION['header']; // include all JavaScript files $jsDirName = dirname(__FILE__) . '/../lib'; $jsDir = dir($jsDirName); + $jsFiles = array(); while ($jsEntry = $jsDir->read()) { if (substr($jsEntry, strlen($jsEntry) - 3, 3) != '.js') continue; + $jsFiles[] = $jsEntry; + } + sort($jsFiles); + foreach ($jsFiles as $jsEntry) { echo "\n"; } ?> diff --git a/lam/templates/config/mainmanage.php b/lam/templates/config/mainmanage.php index 425a7171..fe49a78a 100644 --- a/lam/templates/config/mainmanage.php +++ b/lam/templates/config/mainmanage.php @@ -154,8 +154,13 @@ echo $_SESSION['header']; // include all JavaScript files $jsDirName = dirname(__FILE__) . '/../lib'; $jsDir = dir($jsDirName); +$jsFiles = array(); while ($jsEntry = $jsDir->read()) { if (substr($jsEntry, strlen($jsEntry) - 3, 3) != '.js') continue; + $jsFiles[] = $jsEntry; +} +sort($jsFiles); +foreach ($jsFiles as $jsEntry) { echo "\n"; } diff --git a/lam/templates/config/moduleSettings.php b/lam/templates/config/moduleSettings.php index 4754a998..4997079e 100644 --- a/lam/templates/config/moduleSettings.php +++ b/lam/templates/config/moduleSettings.php @@ -111,8 +111,13 @@ echo "\n"; // include all JavaScript files $jsDirName = dirname(__FILE__) . '/../lib'; $jsDir = dir($jsDirName); +$jsFiles = array(); while ($jsEntry = $jsDir->read()) { if (substr($jsEntry, strlen($jsEntry) - 3, 3) != '.js') continue; + $jsFiles[] = $jsEntry; +} +sort($jsFiles); +foreach ($jsFiles as $jsEntry) { echo "\n"; } diff --git a/lam/templates/config/profmanage.php b/lam/templates/config/profmanage.php index 78148b98..e48f309c 100644 --- a/lam/templates/config/profmanage.php +++ b/lam/templates/config/profmanage.php @@ -72,8 +72,13 @@ echo $_SESSION['header']; // include all JavaScript files $jsDirName = dirname(__FILE__) . '/../lib'; $jsDir = dir($jsDirName); +$jsFiles = array(); while ($jsEntry = $jsDir->read()) { if (substr($jsEntry, strlen($jsEntry) - 3, 3) != '.js') continue; + $jsFiles[] = $jsEntry; +} +sort($jsFiles); +foreach ($jsFiles as $jsEntry) { echo "\n"; } diff --git a/lam/templates/login.php b/lam/templates/login.php index 29d92f76..5576adc1 100644 --- a/lam/templates/login.php +++ b/lam/templates/login.php @@ -149,7 +149,7 @@ function display_LoginPage($config_object) { echo $_SESSION["header"]; ?> - LDAP Account Manager -Login- + LDAP Account Manager @@ -158,11 +158,16 @@ function display_LoginPage($config_object) { // include all JavaScript files $jsDirName = dirname(__FILE__) . '/lib'; $jsDir = dir($jsDirName); + $jsFiles = array(); while ($jsEntry = $jsDir->read()) { if (substr($jsEntry, strlen($jsEntry) - 3, 3) != '.js') continue; + $jsFiles[] = $jsEntry; + } + sort($jsFiles); + foreach ($jsFiles as $jsEntry) { echo "\n"; } - + // set focus on password field echo "