From f83fa48e5c7a2cf9d50873e58615dbb4c27d402c Mon Sep 17 00:00:00 2001 From: Chris Slamar Date: Wed, 15 Dec 2010 12:35:08 -0600 Subject: [PATCH] Switched mysql functions to Dba --- lib/class/.dba.class.php.swp | Bin 0 -> 16384 bytes modules/twitter/index.html | 11 -------- modules/twitter/killsession.php | 7 ++--- modules/twitter/twitter_error.php | 1 - modules/twitter/twitter_update.php | 13 ++++----- modules/twitter/twitter_works.php | 41 ++++++++++++++--------------- 6 files changed, 29 insertions(+), 44 deletions(-) create mode 100644 lib/class/.dba.class.php.swp delete mode 100644 modules/twitter/index.html delete mode 100644 modules/twitter/twitter_error.php diff --git a/lib/class/.dba.class.php.swp b/lib/class/.dba.class.php.swp new file mode 100644 index 0000000000000000000000000000000000000000..c79260872e8afcb72a68700ac87a8dcc9733b704 GIT binary patch literal 16384 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 literal 0 HcmV?d00001 diff --git a/modules/twitter/index.html b/modules/twitter/index.html deleted file mode 100644 index 46ff1aa3..00000000 --- a/modules/twitter/index.html +++ /dev/null @@ -1,11 +0,0 @@ - - - Twitter - - - - -
- kill Session - - diff --git a/modules/twitter/killsession.php b/modules/twitter/killsession.php index a75eacf8..67a7dbbd 100644 --- a/modules/twitter/killsession.php +++ b/modules/twitter/killsession.php @@ -1,7 +1,8 @@ -back diff --git a/modules/twitter/twitter_error.php b/modules/twitter/twitter_error.php deleted file mode 100644 index d2d98d6b..00000000 --- a/modules/twitter/twitter_error.php +++ /dev/null @@ -1 +0,0 @@ -it no work diff --git a/modules/twitter/twitter_update.php b/modules/twitter/twitter_update.php index 0587f4e5..3251d9fb 100644 --- a/modules/twitter/twitter_update.php +++ b/modules/twitter/twitter_update.php @@ -5,24 +5,21 @@ 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"; 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']; debug_event("Twitter", "Song from DB is: " . $return, "5"); $selectquery = "SELECT * FROM twitter_users WHERE username = '" . $_SESSION['twitterusername'] . "' AND ampache_id = " . $_SESSION['userdata']['uid']; debug_event("Twitter", "Select query: " . $selectquery, "6"); - $selectrun = mysql_query($selectquery) or die( mysql_error() ); - $result = mysql_fetch_array($selectrun) or die( mysql_error() ); - - mysql_close($link); + $selectrun = Dba::read($selectquery); + $result = Dba::fetch_assoc($selectrun); $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'); diff --git a/modules/twitter/twitter_works.php b/modules/twitter/twitter_works.php index ce886d73..4f94742e 100644 --- a/modules/twitter/twitter_works.php +++ b/modules/twitter/twitter_works.php @@ -51,43 +51,44 @@ header('Location: ' . Config::get('web_path')); } else { - $link = mysql_connect(Config::get('database_hostname'), Config::get('database_username') , Config::get('database_password') ); - mysql_select_db( Config::get('database_name') , $link); - - // 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); + // Let's find the user by its twitterid and ampacheid + $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"); - echo "
ampache_id: {$_SESSION['userdata']['uid']}"; - echo "
oauth_uid: {$user_info->id}"; - echo "
oauth_token: {$access_token['oauth_token']}"; - echo "
oauth_secret: {$access_token['oauth_token_secret']}"; - echo "
username: {$user_info->screen_name}
"; + $idselectrun = Dba::read($idselectquery); + $result = Dba::fetch_assoc($idselectrun); + + debug_event("Twitter", "ampache_id: {$_SESSION['userdata']['uid']}"); + 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(empty($result)){ 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}')"; - debug_event("Twitter", "Insert query: " . $insert_query, "5"); - $insert_run = mysql_query($insert_query) or die( mysql_error() ); + debug_event("Twitter", "Insert query: " . $insert_query, "6"); + $insert_run = Dba::write($insert_query); $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"); - $select_run = mysql_query( $select_query ) or die( mysql_error() ); - $result = mysql_fetch_array($select_run); + debug_event("Twitter", "Select query: {$query}", "6"); + $select_run = Dba::read( $select_query ); + $result = Dba::fetch_assoc($select_run); } else { 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']}"; 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 . "'"; 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']; @@ -97,8 +98,6 @@ $_SESSION['oauth_token'] = $result['oauth_token']; $_SESSION['oauth_secret'] = $result['oauth_secret']; - mysql_close($link); - header('Location: ' . Config::get('web_path') . '/modules/twitter/twitter_update.php'); } ?>