diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/admin.php | 4 | ||||
| -rw-r--r-- | modules/init.php | 7 | ||||
| -rw-r--r-- | modules/lib.php | 26 |
3 files changed, 18 insertions, 19 deletions
diff --git a/modules/admin.php b/modules/admin.php index 5ce7bf6d..7385d9fd 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -56,7 +56,7 @@ function show_manage_users () { @function show_user_form @discussion shows the user form */ -function show_user_form ($id, $username, $fullname, $email, $access, $type, $error) { +function show_user_form ($username, $fullname, $email, $access, $type, $error) { require(conf('prefix').'/templates/userform.inc'); @@ -238,7 +238,7 @@ function delete_user ($username) { $db_result = mysql_query($sql, dbh()); // also delete playlists for user - $sql = "DELETE FROM playlist WHERE owner='$username'"; + $sql = "DELETE FROM playlist WHERE username='$username'"; $db_result = mysql_query($sql, dbh()); delete_user_stats('all'); diff --git a/modules/init.php b/modules/init.php index 9699e96e..a98b9045 100644 --- a/modules/init.php +++ b/modules/init.php @@ -83,7 +83,7 @@ if (!$results['conf']['allow_stream_playback']) { } $results['conf']['web_path'] = $http_type . $_SERVER['HTTP_HOST'] . $results['conf']['web_path']; -$results['conf']['version'] = '3.3.2-Alpha1 (Build 002)'; +$results['conf']['version'] = '3.3.2-Alpha1 (Build 003)'; $results['conf']['catalog_file_pattern']= 'mp3|mpc|m4p|m4a|mp4|aac|ogg|rm|wma|asf|flac|spx'; $results['libglue']['local_table'] = 'session'; $results['libglue']['local_sid'] = 'id'; @@ -96,7 +96,8 @@ $results['libglue']['mysql_usercol'] = 'username'; $results['libglue']['mysql_passwdcol'] = 'password'; $results['libglue']['local_dbh_name'] = 'local_dbh'; $results['libglue']['auth_methods'] = 'mysql'; -$results['libglue']['mysql_fields'] = 'id,username,fullname,email,access,offset_limit'; +$results['libglue']['user_username'] = 'username'; +$results['libglue']['mysql_fields'] = 'username,fullname,email,access,offset_limit'; $results['libglue']['mysql_host'] = $results['libglue']['local_host']; $results['libglue']['mysql_db'] = $results['libglue']['local_db']; $results['libglue']['mysql_username'] = $results['libglue']['local_username']; @@ -259,14 +260,12 @@ if (!conf('use_auth')) { if (!check_session()) { make_local_session_only($auth); } $user = new User(0); $user->fullname = $auth['info']['fullname']; - $user->id = $auth['info']['id']; $user->offset_limit = $auth['info']['offset_limit']; $user->username = $auth['info']['username']; $user->access = $auth['info']['access']; $_SESSION['userdata']['access'] = $auth['info']['access']; $_SESSION['userdata']['username'] = $auth['info']['username']; $_SESSION['userdata']['offset_limit'] = $auth['info']['offset_limit']; - $_SESSION['userdata']['id'] = $auth['info']['id']; $user->set_preferences(); get_preferences(); set_theme(); diff --git a/modules/lib.php b/modules/lib.php index 6ba1d956..2d8adef8 100644 --- a/modules/lib.php +++ b/modules/lib.php @@ -483,7 +483,7 @@ function get_flagged() { $sql = "SELECT flagged.id, user.username, type, song, date, comment" . " FROM flagged, user" . - " WHERE flagged.user = user.id" . + " WHERE flagged.user = user.username" . " ORDER BY date"; $db_result = mysql_query($sql, $dbh); @@ -679,7 +679,7 @@ function show_songs ($song_ids, $playlist_id=0, $album=0) { // Get info about playlist owner if (isset($playlist_id) && $playlist_id != 0) { - $sql = "SELECT owner FROM playlist WHERE id = '$playlist_id'"; + $sql = "SELECT user FROM playlist WHERE id = '$playlist_id'"; $db_result = mysql_query($sql, $dbh); if ($r = mysql_fetch_array($db_result)) { $pluser = get_user_byid($r[0]); @@ -923,25 +923,25 @@ function show_playlists ($type = 'all') { return true; } elseif ($type == 'public') { - $sql = "SELECT id,name,owner,date ". + $sql = "SELECT id,name,user,date ". " FROM playlist ". " WHERE type='public'". " ORDER BY name"; } elseif ($type == 'private') { - $sql = "SELECT id,name,owner,date ". + $sql = "SELECT id,name,user,date ". " FROM playlist ". " WHERE type='private'" . - " AND owner = '$user->id'" . + " AND user = '$user->username'" . " AND name <> 'Temporary'". " ORDER BY name"; } elseif ($type == 'adminprivate') { if ( $user->access === 'admin' ) { - $sql = "SELECT id,name,owner,date ". + $sql = "SELECT id,name,user,date ". " FROM playlist ". " WHERE type='private'" . - " AND owner != '$user->id'" . + " AND username != '$user->username'" . " AND name <> 'Temporary'". " ORDER BY name"; } @@ -977,7 +977,7 @@ ECHO; while ( $r = mysql_fetch_array($db_result) ) { $plname = $r['name']; $plid = $r['id']; - $pluser = get_user_byid($r['owner']); + $pluser = new User($r['user']); $plfullname = $pluser->fullname; $plowner = $pluser->username; @@ -994,7 +994,7 @@ ECHO; echo " <td>$plfullname</td>\n"; echo " <td><a href=\"$web_path/playlist.php?playlist_id=$plid&action=view_list\">" . _("View") . "</a></td>\n"; - if ($user->id == $pluser->id || $user->access === 'admin') { + if ($user->username == $pluser->username || $user->has_access(100)) { echo " <td><a href=\"$web_path/playlist.php?playlist_id=$plid&action=edit\">" . _("Edit") . "</a></td>\n"; echo " <td><a href=\"$web_path/playlist.php?playlist_id=$plid&action=delete_playlist\">" . _("Delete") . "</a></td>\n"; } @@ -1157,7 +1157,7 @@ function check_playlist_access ($playlist_id, $username) { $sql = "SELECT playlist.id FROM playlist, user" . " WHERE playlist.id = '$playlist_id'" . - " AND playlist.owner = user.id" . + " AND playlist.user = user.username" . " AND user.username = '$username'"; $db_result = mysql_query($sql, $dbh); @@ -1187,9 +1187,9 @@ function show_playlist_dropdown ($playlist_id=0) { global $settings; $dbh = dbh(); - $userid = scrub_in($_SESSION['userdata']['id']); + $userid = scrub_in($_SESSION['userdata']['username']); $sql = "SELECT * FROM playlist" . - " WHERE owner = '$userid'" . + " WHERE user = '$userid'" . " AND name <> 'Temporary'" . " ORDER BY name"; $db_result = @mysql_query($sql, $dbh); @@ -1216,7 +1216,7 @@ ECHO; function show_playlist_access_error ($playlist, $username) { $plname = $playlist->name; - $pluser = new User($playlist->owner); + $pluser = new User($playlist->user); $plowner = $pluser->username; print <<<ECHO |