nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better theme version check (bug #1023029).

Browse Source
This commit is contained in:
Michal Čihař
2004-09-14 14:21:31 +00:00
parent 3b9fad6607
commit 4e37b29113
7 changed files with 53 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2004-09-14 Michal Čihař <michal@cihar.com>
* themes.php, libraries/common.lib.php, libraries/defines.lib.php,
libraries/select_theme.lib.php, themes/darkblue_orange/info.inc.php,
themes/original/info.inc.php: Better theme version check (bug #1023029).
2004-09-13 Garvin Hicking <me@supergarv.de> 2004-09-13 Garvin Hicking <me@supergarv.de>
* browse_foreigners.php: bug #1027204 - paging did not * browse_foreigners.php: bug #1027204 - paging did not
work in foreigner browsing window. work in foreigner browsing window.

7
libraries/common.lib.php
View File

@@ -327,13 +327,16 @@ if (!isset($_COOKIE['pma_theme']) || empty($_COOKIE['pma_theme'])){
} }
// check for theme requires/name // check for theme requires/name
unset($theme_name, $theme_version); unset($theme_name, $theme_generation, $theme_version);
@include($cfg['ThemePath'] . '/' . $GLOBALS['theme'] . '/info.inc.php'); @include($cfg['ThemePath'] . '/' . $GLOBALS['theme'] . '/info.inc.php');
// did it set correctly? // did it set correctly?
if (!isset($theme_name, $theme_version)) if (!isset($theme_name, $theme_generation, $theme_version))
$GLOBALS['theme'] = 'original'; // invalid theme $GLOBALS['theme'] = 'original'; // invalid theme
if ($theme_generation != PMA_THEME_GENERATION)
$GLOBALS['theme'] = 'original'; // different generation
if ($theme_version < PMA_THEME_VERSION) if ($theme_version < PMA_THEME_VERSION)
$GLOBALS['theme'] = 'original'; // too old version $GLOBALS['theme'] = 'original'; // too old version

5
libraries/defines.lib.php
View File

@@ -7,6 +7,7 @@
* Overview: * Overview:
* PMA_VERSION (string) - phpMyAdmin version string * PMA_VERSION (string) - phpMyAdmin version string
* PMA_THEME_VERSION (int) - phpMyAdmin theme version integer * PMA_THEME_VERSION (int) - phpMyAdmin theme version integer
* PMA_THEME_GENERATION (int) - phpMyAdmin theme generation integer
* PMA_PHP_INT_VERSION (int) - eg: 30017 instead of 3.0.17 or * PMA_PHP_INT_VERSION (int) - eg: 30017 instead of 3.0.17 or
* 40006 instead of 4.0.6RC3 * 40006 instead of 4.0.6RC3
* PMA_IS_WINDOWS (bool) - mark if phpMyAdmin running on windows * PMA_IS_WINDOWS (bool) - mark if phpMyAdmin running on windows
@@ -26,6 +27,10 @@ if (!defined('PMA_THEME_VERSION')) {
define('PMA_THEME_VERSION', 1); define('PMA_THEME_VERSION', 1);
} }
if (!defined('PMA_THEME_GENERATION')) {
define('PMA_THEME_GENERATION', 1);
}
// php version // php version
if (!defined('PMA_PHP_INT_VERSION')) { if (!defined('PMA_PHP_INT_VERSION')) {
if (!preg_match('@([0-9]{1,2}).([0-9]{1,2}).([0-9]{1,2})@', phpversion(), $match)) { if (!preg_match('@([0-9]{1,2}).([0-9]{1,2}).([0-9]{1,2})@', phpversion(), $match)) {

7
libraries/select_theme.lib.php
View File

@@ -55,13 +55,16 @@ if ($PMA_ThemeAvailable == TRUE) { // themeManager is available
if ($PMA_Theme != "." && $PMA_Theme != ".." && $PMA_Theme != 'CVS') { // file check if ($PMA_Theme != "." && $PMA_Theme != ".." && $PMA_Theme != 'CVS') { // file check
if (@is_dir($cfg['ThemePath'].'/'.$PMA_Theme)) { // check the theme if (@is_dir($cfg['ThemePath'].'/'.$PMA_Theme)) { // check the theme
// check for theme requires/name // check for theme requires/name
unset($theme_name, $theme_version); unset($theme_name, $theme_generation, $theme_version);
@include($cfg['ThemePath'] . '/' . $PMA_Theme . '/info.inc.php'); @include($cfg['ThemePath'] . '/' . $PMA_Theme . '/info.inc.php');
// did it set correctly? // did it set correctly?
if (!isset($theme_name, $theme_version)) if (!isset($theme_name, $theme_version, $theme_generation))
continue; // invalid theme continue; // invalid theme
if ($theme_generation != PMA_THEME_GENERATION)
continue; // different generation
if ($theme_version < PMA_THEME_VERSION) if ($theme_version < PMA_THEME_VERSION)
continue; // too old version continue; // too old version

7
themes.php
View File

@@ -90,13 +90,16 @@ if ($handleThemes = opendir($path_to_themes)) { // open themes
$screen_directory = $path_to_themes . $PMA_Theme; $screen_directory = $path_to_themes . $PMA_Theme;
// check for theme requires/name // check for theme requires/name
unset($theme_name, $theme_version); unset($theme_name, $theme_generation, $theme_version);
@include($path_to_themes . $PMA_Theme . '/info.inc.php'); @include($path_to_themes . $PMA_Theme . '/info.inc.php');
// did it set correctly? // did it set correctly?
if (!isset($theme_name, $theme_version)) if (!isset($theme_name, $theme_generation, $theme_version))
continue; // invalid theme continue; // invalid theme
if ($theme_generation != PMA_THEME_GENERATION)
continue; // different generation
if ($theme_version < PMA_THEME_VERSION) if ($theme_version < PMA_THEME_VERSION)
continue; // too old version continue; // too old version

1
themes/darkblue_orange/info.inc.php
View File

@@ -3,4 +3,5 @@
/* Theme information */ /* Theme information */
$theme_name = 'Darkblue/orange'; $theme_name = 'Darkblue/orange';
$theme_version = 1; $theme_version = 1;
$theme_generation = 1;
?> ?>

1
themes/original/info.inc.php
View File

@@ -3,4 +3,5 @@
/* Theme information */ /* Theme information */
$theme_name = 'Original'; $theme_name = 'Original';
$theme_version = 1; $theme_version = 1;
$theme_generation = 1;
?> ?>