From 2b296af10ae414a9b917f4f5c2ea95ceaf8f9b7f Mon Sep 17 00:00:00 2001 From: tbrehm Date: Thu, 18 Oct 2012 15:50:18 +0000 Subject: [PATCH] Removed theme version files from some themes and renamed theme version file to ispconfig_version --- interface/web/admin/form/users.tform.php | 2 +- interface/web/client/form/client.tform.php | 2 +- interface/web/client/form/reseller.tform.php | 2 +- .../web/themes/default-304/{ISPC_VERSION => ispconfig_version} | 0 interface/web/themes/default_64_navimg/ISPC_VERSION | 1 - interface/web/themes/default_combobox/ISPC_VERSION | 1 - interface/web/themes/default_no_navimg/ISPC_VERSION | 1 - interface/web/tools/form/interface_settings.tform.php | 2 +- 8 files changed, 4 insertions(+), 7 deletions(-) rename interface/web/themes/default-304/{ISPC_VERSION => ispconfig_version} (100%) delete mode 100644 interface/web/themes/default_64_navimg/ISPC_VERSION delete mode 100644 interface/web/themes/default_combobox/ISPC_VERSION delete mode 100644 interface/web/themes/default_no_navimg/ISPC_VERSION diff --git a/interface/web/admin/form/users.tform.php b/interface/web/admin/form/users.tform.php index 96ed417d09..dc445d58e3 100644 --- a/interface/web/admin/form/users.tform.php +++ b/interface/web/admin/form/users.tform.php @@ -100,7 +100,7 @@ $handle = @opendir(ISPC_THEMES_PATH); while ($file = @readdir ($handle)) { if (substr($file, 0, 1) != '.') { if(@is_dir(ISPC_THEMES_PATH."/$file")) { - if($file == 'default' || (@file_exists(ISPC_THEMES_PATH."/$file/ISPC_VERSION") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ISPC_VERSION")) == ISPC_APP_VERSION)) { + if(!file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") || (@file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ispconfig_version")) == ISPC_APP_VERSION)) { $themes_list[$file] = $file; } } diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php index 8d4023908a..ad95413cd4 100644 --- a/interface/web/client/form/client.tform.php +++ b/interface/web/client/form/client.tform.php @@ -73,7 +73,7 @@ $handle = @opendir(ISPC_THEMES_PATH); while ($file = @readdir ($handle)) { if (substr($file, 0, 1) != '.') { if(@is_dir(ISPC_THEMES_PATH."/$file")) { - if($file == 'default' || (@file_exists(ISPC_THEMES_PATH."/$file/ISPC_VERSION") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ISPC_VERSION")) == ISPC_APP_VERSION)) { + if(!file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") || (@file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ispconfig_version")) == ISPC_APP_VERSION)) { $themes_list[$file] = $file; } } diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php index 1669e36bfc..6163c7293a 100644 --- a/interface/web/client/form/reseller.tform.php +++ b/interface/web/client/form/reseller.tform.php @@ -61,7 +61,7 @@ $handle = @opendir(ISPC_THEMES_PATH); while ($file = @readdir ($handle)) { if (substr($file, 0, 1) != '.') { if(@is_dir(ISPC_THEMES_PATH."/$file")) { - if($file == 'default' || (@file_exists(ISPC_THEMES_PATH."/$file/ISPC_VERSION") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ISPC_VERSION")) == ISPC_APP_VERSION)) { + if(!file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") || (@file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ispconfig_version")) == ISPC_APP_VERSION)) { $themes_list[$file] = $file; } } diff --git a/interface/web/themes/default-304/ISPC_VERSION b/interface/web/themes/default-304/ispconfig_version similarity index 100% rename from interface/web/themes/default-304/ISPC_VERSION rename to interface/web/themes/default-304/ispconfig_version diff --git a/interface/web/themes/default_64_navimg/ISPC_VERSION b/interface/web/themes/default_64_navimg/ISPC_VERSION deleted file mode 100644 index bb19ac367e..0000000000 --- a/interface/web/themes/default_64_navimg/ISPC_VERSION +++ /dev/null @@ -1 +0,0 @@ -3.0.4.6 \ No newline at end of file diff --git a/interface/web/themes/default_combobox/ISPC_VERSION b/interface/web/themes/default_combobox/ISPC_VERSION deleted file mode 100644 index bb19ac367e..0000000000 --- a/interface/web/themes/default_combobox/ISPC_VERSION +++ /dev/null @@ -1 +0,0 @@ -3.0.4.6 \ No newline at end of file diff --git a/interface/web/themes/default_no_navimg/ISPC_VERSION b/interface/web/themes/default_no_navimg/ISPC_VERSION deleted file mode 100644 index bb19ac367e..0000000000 --- a/interface/web/themes/default_no_navimg/ISPC_VERSION +++ /dev/null @@ -1 +0,0 @@ -3.0.4.6 \ No newline at end of file diff --git a/interface/web/tools/form/interface_settings.tform.php b/interface/web/tools/form/interface_settings.tform.php index e992c33217..49ed62d167 100644 --- a/interface/web/tools/form/interface_settings.tform.php +++ b/interface/web/tools/form/interface_settings.tform.php @@ -113,7 +113,7 @@ $handle = @opendir(ISPC_THEMES_PATH); while ($file = @readdir ($handle)) { if (substr($file, 0, 1) != '.') { if(@is_dir(ISPC_THEMES_PATH."/$file")) { - if($file == 'default' || (@file_exists(ISPC_THEMES_PATH."/$file/ISPC_VERSION") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ISPC_VERSION")) == ISPC_APP_VERSION)) { + if(!file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") || (@file_exists(ISPC_THEMES_PATH."/$file/ispconfig_version") && trim(@file_get_contents(ISPC_THEMES_PATH."/$file/ispconfig_version")) == ISPC_APP_VERSION)) { $themes_list[$file] = $file; } } -- GitLab