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

Sort themes, use only one code for browsing directory with themes (RFE #1184251).

Browse Source
This commit is contained in:
Michal Čihař
2005-06-24 12:35:22 +00:00
parent c6f540be72
commit 6c8ec18ba9
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -11,6 +11,8 @@ $Source$
* config.inc.php, libraries/common.lib.php, * config.inc.php, libraries/common.lib.php,
libraries/config_import.lib.php, libraries/display_export.lib.php: libraries/config_import.lib.php, libraries/display_export.lib.php:
Configurable file name templates (RFE #1226941). Configurable file name templates (RFE #1226941).
* themes.php, libraries/select_theme.lib.php: Sort themes, use only one
code for browsing directory with themes (RFE #1184251).
2005-06-24 Marc Delisle <lem9@users.sourceforge.net> 2005-06-24 Marc Delisle <lem9@users.sourceforge.net>
* db_operations.php: problem renaming a db * db_operations.php: problem renaming a db

2
libraries/select_theme.lib.php
View File

@@ -77,6 +77,8 @@ if ($PMA_ThemeAvailable == TRUE) { // themeManager is available
closedir($handleThemes); closedir($handleThemes);
} // end themeManger } // end themeManger
asort($available_themes_choices);
if (isset($set_theme)) { // if user submit a theme if (isset($set_theme)) { // if user submit a theme
setcookie('pma_theme', $set_theme, time() + 60*60*24*30, $GLOBALS['cookie_path'], '', $GLOBALS['is_https']); setcookie('pma_theme', $set_theme, time() + 60*60*24*30, $GLOBALS['cookie_path'], '', $GLOBALS['is_https']);
} else { // else check if user have a theme cookie } else { // else check if user have a theme cookie

7
themes.php
View File

@@ -84,9 +84,7 @@ echo "<?xml version=\"1.0\" encoding=\"" . $GLOBALS['charset'] . "\"?".">";
<td><img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>" width="1" height="1" border="0" alt="" /></td> <td><img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>" width="1" height="1" border="0" alt="" /></td>
</tr> </tr>
<?php <?php
if ($handleThemes = opendir($path_to_themes)) { // open themes foreach ($available_themes_choices AS $PMA_Theme) {
while (false !== ($PMA_Theme = readdir($handleThemes))) { // get screens
if ($PMA_Theme != "." && $PMA_Theme != "..") {
$screen_directory = $path_to_themes . $PMA_Theme; $screen_directory = $path_to_themes . $PMA_Theme;
// check for theme requires/name // check for theme requires/name
@@ -142,9 +140,6 @@ if ($handleThemes = opendir($path_to_themes)) { // open themes
</tr> </tr>
<?php <?php
} // end 'screen output' } // end 'screen output'
} // end 'check theme'
} // end 'get screens'
closedir($handleThemes);
} // end 'open themes' } // end 'open themes'
?> ?>
</table> </table>