yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-04 10:19:25 +02:00
Code Issues Releases Wiki Activity

Switched mysql functions to Dba

Browse source
This commit is contained in:
Chris Slamar 2010-12-15 12:35:08 -06:00
parent c405965ccb
commit f83fa48e5c
6 changed files with 29 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
lib/class/.dba.class.php.swp Normal file
View file

Binary file not shown.

11
modules/twitter/index.html
View file

@ -1,11 +0,0 @@
<html>
<head>
<title>Twitter</title>
</head>
<body>
<a href="twitter_login.php"><img src="Twitter-Icon.png" width="16" height="16"></a>
<br>
<a href="killsession.php">kill Session</a>
</body>
</html>

7
modules/twitter/killsession.php
View file

@ -1,7 +1,8 @@
<?php <?php
require_once '../../lib/init.php';
session_start(); session_start();
session_destroy();
$_SESSION['twitterusername'] = false;
header('Location: ' . Config::get('web_path') );
?> ?>
<a href="index.html">back</a>

1
modules/twitter/twitter_error.php
View file

@ -1 +0,0 @@
it no work

13
modules/twitter/twitter_update.php
View file

@ -5,24 +5,21 @@
if(!empty($_SESSION['twitterusername'])) { if(!empty($_SESSION['twitterusername'])) {
$link = mysql_connect( Config::get('database_hostname'), Config::get('database_username'), Config::get('database_password') ) or die( mysql_error() );;
mysql_select_db( Config::get('database_name') , $link) or die("Couldnt connect " . mysql_error() );
$nowplayingQuery = "SELECT song.title,artist.name FROM song,now_playing,artist WHERE song.id = now_playing.object_id AND artist.id = song.artist"; $nowplayingQuery = "SELECT song.title,artist.name FROM song,now_playing,artist WHERE song.id = now_playing.object_id AND artist.id = song.artist";
debug_event("Twitter", "Now Playing query: " . $nowplayingQuery, "6"); debug_event("Twitter", "Now Playing query: " . $nowplayingQuery, "6");
$nowplayingRun = mysql_query($nowplayingQuery) or die( mysql_error);
$nowplayingResults = mysql_fetch_array($nowplayingRun) or die( mysql_error() ); $nowplayingRun = Dba::read($nowplayingQuery);
$nowplayingResults = Dba::fetch_assoc($nowplayingRun);
$return = $nowplayingResults['title'] . " by " . $nowplayingResults['name']; $return = $nowplayingResults['title'] . " by " . $nowplayingResults['name'];
debug_event("Twitter", "Song from DB is: " . $return, "5"); debug_event("Twitter", "Song from DB is: " . $return, "5");
$selectquery = "SELECT * FROM twitter_users WHERE username = '" . $_SESSION['twitterusername'] . "' AND ampache_id = " . $_SESSION['userdata']['uid']; $selectquery = "SELECT * FROM twitter_users WHERE username = '" . $_SESSION['twitterusername'] . "' AND ampache_id = " . $_SESSION['userdata']['uid'];
debug_event("Twitter", "Select query: " . $selectquery, "6"); debug_event("Twitter", "Select query: " . $selectquery, "6");
$selectrun = mysql_query($selectquery) or die( mysql_error() );
$result = mysql_fetch_array($selectrun) or die( mysql_error() ); $selectrun = Dba::read($selectquery);
$result = Dba::fetch_assoc($selectrun);
mysql_close($link);
$twitteroauth = new TwitterOAuth( Config::get('twitter_consumer_key'), Config::get('twitter_consumer_secret'), $result['oauth_token'], $result['oauth_secret']); $twitteroauth = new TwitterOAuth( Config::get('twitter_consumer_key'), Config::get('twitter_consumer_secret'), $result['oauth_token'], $result['oauth_secret']);
$user_info = $twitteroauth->get('account/verify'); $user_info = $twitteroauth->get('account/verify');

41
modules/twitter/twitter_works.php
View file

@ -51,43 +51,44 @@
header('Location: ' . Config::get('web_path')); header('Location: ' . Config::get('web_path'));
} else { } else {
$link = mysql_connect(Config::get('database_hostname'), Config::get('database_username') , Config::get('database_password') ); // Let's find the user by its twitterid and ampacheid
mysql_select_db( Config::get('database_name') , $link); $idselectquery = "SELECT * FROM twitter_users WHERE oauth_provider = 'twitter' AND oauth_uid = ". $user_info->id . " AND ampache_id = " . $_SESSION['userdata']['uid'];
debug_event("Twitter", "Id query: " . $idselectquery, "6");
// Let's find the user by its ID
$query = mysql_query("SELECT * FROM twitter_users WHERE oauth_provider = 'twitter' AND oauth_uid = ". $user_info->id . " AND ampache_id = " . $_SESSION['userdata']['uid']) or die( mysql_error() );
$result = mysql_fetch_array($query);
echo "<br>ampache_id: {$_SESSION['userdata']['uid']}"; $idselectrun = Dba::read($idselectquery);
echo "<br>oauth_uid: {$user_info->id}"; $result = Dba::fetch_assoc($idselectrun);
echo "<br>oauth_token: {$access_token['oauth_token']}";
echo "<br>oauth_secret: {$access_token['oauth_token_secret']}"; debug_event("Twitter", "ampache_id: {$_SESSION['userdata']['uid']}");
echo "<br>username: {$user_info->screen_name} <br>"; debug_event("Twitter", "oauth_uid: {$user_info->id}", "5");
debug_event("Twitter", "oauth_token: {$access_token['oauth_token']}", "5");
debug_event("Twitter", "oauth_secret: {$access_token['oauth_token_secret']}", "5");
debug_event("Twitter", "username: {$user_info->screen_name}", "5");
// If not, let's add it to the database // If not, let's add it to the database
if(empty($result)){ if(empty($result)){
debug_event("Twitter", "First time user. Add them to the DB.", "5"); debug_event("Twitter", "First time user. Add them to the DB.", "5");
$insert_query ="INSERT INTO twitter_users (ampache_id, oauth_provider, oauth_uid, oauth_token, oauth_secret, username) VALUES ( '{$_SESSION['userdata']['uid']}', 'twitter', '{$user_info->id}', '{$access_token['oauth_token']}', '{$access_token['oauth_token_secret']}', '{$user_info->screen_name}')"; $insert_query ="INSERT INTO twitter_users (ampache_id, oauth_provider, oauth_uid, oauth_token, oauth_secret, username) VALUES ( '{$_SESSION['userdata']['uid']}', 'twitter', '{$user_info->id}', '{$access_token['oauth_token']}', '{$access_token['oauth_token_secret']}', '{$user_info->screen_name}')";
debug_event("Twitter", "Insert query: " . $insert_query, "5"); debug_event("Twitter", "Insert query: " . $insert_query, "6");
$insert_run = mysql_query($insert_query) or die( mysql_error() ); $insert_run = Dba::write($insert_query);
$select_query = "SELECT * FROM twitter_users WHERE username = '" . $user_info->screen_name . "' AND ampache_id = " . $_SESSION['userdata']['uid']; $select_query = "SELECT * FROM twitter_users WHERE username = '" . $user_info->screen_name . "' AND ampache_id = " . $_SESSION['userdata']['uid'];
debug_event("Twitter", "Select query: {$query}", "5"); debug_event("Twitter", "Select query: {$query}", "6");
$select_run = mysql_query( $select_query ) or die( mysql_error() ); $select_run = Dba::read( $select_query );
$result = mysql_fetch_array($select_run); $result = Dba::fetch_assoc($select_run);
} else { } else {
debug_event("Twitter", "Update the DB to hold current tokens", "5"); debug_event("Twitter", "Update the DB to hold current tokens", "5");
$update_query = "UPDATE twitter_users SET oauth_token = '{$access_token['oauth_token']}', oauth_secret = '{$access_token['oauth_token_secret']}' WHERE oauth_provider = 'twitter' AND oauth_uid = {$user_info->id} AND ampache_id = {$_SESSION['userdata']['uid']}"; $update_query = "UPDATE twitter_users SET oauth_token = '{$access_token['oauth_token']}', oauth_secret = '{$access_token['oauth_token_secret']}' WHERE oauth_provider = 'twitter' AND oauth_uid = {$user_info->id} AND ampache_id = {$_SESSION['userdata']['uid']}";
debug_event("Twitter", "update query: " . $update_query, "6"); debug_event("Twitter", "update query: " . $update_query, "6");
$update_run = mysql_query($update_query) or die( mysql_error);
$update_run = Dba::write($update_query);
$select_query = "SELECT * FROM twitter_users WHERE username = '" . $user_info->screen_name . "'"; $select_query = "SELECT * FROM twitter_users WHERE username = '" . $user_info->screen_name . "'";
debug_event("Twitter", "select query: " . $select_query, "6"); debug_event("Twitter", "select query: " . $select_query, "6");
$select_run = mysql_query($select_query) or die( mysql_error() );
$result = mysql_fetch_array($select_run); $select_run = Dba::read($select_query);
$result = Dba::fetch_assoc($select_run);
} }
$_SESSION['id'] = $result['id']; $_SESSION['id'] = $result['id'];
@ -97,8 +98,6 @@
$_SESSION['oauth_token'] = $result['oauth_token']; $_SESSION['oauth_token'] = $result['oauth_token'];
$_SESSION['oauth_secret'] = $result['oauth_secret']; $_SESSION['oauth_secret'] = $result['oauth_secret'];
mysql_close($link);
header('Location: ' . Config::get('web_path') . '/modules/twitter/twitter_update.php'); header('Location: ' . Config::get('web_path') . '/modules/twitter/twitter_update.php');
} }
?> ?>