diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2005-12-25 22:56:14 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2005-12-25 22:56:14 +0000 |
| commit | a792f82334ab87cdcaf9cb8c9a87b9bc16812045 (patch) | |
| tree | eb641ae91799147503d28d10f24928d0acb4220a | |
| parent | 27158141ee1a14b7d23ae8997d2c41b49fc904d9 (diff) | |
| download | ampache-a792f82334ab87cdcaf9cb8c9a87b9bc16812045.tar.gz ampache-a792f82334ab87cdcaf9cb8c9a87b9bc16812045.tar.bz2 ampache-a792f82334ab87cdcaf9cb8c9a87b9bc16812045.zip | |
fixed user preferences..
| -rw-r--r-- | index.php | 5 | ||||
| -rw-r--r-- | lib/class/user.class.php | 2 | ||||
| -rw-r--r-- | modules/init.php | 1 |
3 files changed, 2 insertions, 6 deletions
@@ -35,12 +35,8 @@ show_template('header'); if (conf('refresh_limit') > 0) { show_template('javascript_refresh'); } $action = scrub_in($_REQUEST['action']); - ?> -<p style="font-size: 8pt; font-weight: bold;"> - <?php echo _("Welcome to"); ?> <a href="http://www.ampache.org/index.php">Ampache v.<?php echo conf('version'); ?></a> -</p> <!-- Big Daddy Table --> <table style="padding-left:5px;padding-right:5px;padding-top:5px;padding-bottom:5px;" > <tr> @@ -48,7 +44,6 @@ $action = scrub_in($_REQUEST['action']); <?php show_now_playing(); ?> </td> </tr> -<!-- <tr><td colspan="2"> </td></tr> --> <tr> <td valign="top"> <!-- Left table --> diff --git a/lib/class/user.class.php b/lib/class/user.class.php index 0b0459a7..332b2c3e 100644 --- a/lib/class/user.class.php +++ b/lib/class/user.class.php @@ -121,7 +121,7 @@ class User { function set_preferences() { $sql = "SELECT preferences.name,user_preference.value FROM preferences,user_preference WHERE user_preference.user='$this->username' " . - "AND user_preference.preference=preferences.id AND preferences.type='user'"; + "AND user_preference.preference=preferences.id AND preferences.type != 'system'"; $db_results = mysql_query($sql, dbh()); while ($r = mysql_fetch_object($db_results)) { diff --git a/modules/init.php b/modules/init.php index 5b2f983a..198eb010 100644 --- a/modules/init.php +++ b/modules/init.php @@ -256,6 +256,7 @@ if (!isset($no_session) AND conf('use_auth')) { init_preferences(); set_theme(); $user = new User($_SESSION['userdata']['username']); + $user->set_preferences(); $user->update_last_seen(); } if (!conf('use_auth')) { |