Commit 4e34c946 authored by clint's avatar clint

make sure that the transition functions get included

parent 0b96e539
......@@ -20,6 +20,7 @@
*/
require_once('database.php'); // include the database connection string
require_once('temp-utils.php');
function usernameFromSID($session_id)
{
......@@ -243,30 +244,4 @@ function validateMBID ($input) {
}
function username_to_uniqueid($username) {
global $adodb;
$adodb->SetFetchMode(ADODB_FETCH_ASSOC);
try {
$uniqueid = GetOne('SELECT uniqueid from Users where lower(username) = lower('.$adodb->qstr($username).')');
} catch (exception $e) {
return null;
}
return $uniqueid;
}
function uniqueid_to_username($uniqueid) {
global $adodb;
$adodb->SetFetchMode(ADODB_FETCH_ASSOC);
try {
$username = GetOne('SELECT username from Users where uniqueid) = '.($uniqueid));
} catch (exception $e) {
return null;
}
return $username;
}
?>
<?php
/* Libre.fm -- a free network service for sharing your music listening habits
Copyright (C) 2009 Free Software Foundation, Inc
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
require_once('database.php'); // include the database connection string
// these functions should be short-lived while things go through a transition
function username_to_uniqueid($username) {
global $adodb;
$adodb->SetFetchMode(ADODB_FETCH_ASSOC);
try {
$uniqueid = GetOne('SELECT uniqueid from Users where lower(username) = lower('.$adodb->qstr($username).')');
} catch (exception $e) {
return null;
}
return $uniqueid;
}
function uniqueid_to_username($uniqueid) {
global $adodb;
$adodb->SetFetchMode(ADODB_FETCH_ASSOC);
try {
$username = GetOne('SELECT username from Users where uniqueid) = '.($uniqueid));
} catch (exception $e) {
return null;
}
return $username;
}
?>
......@@ -21,6 +21,8 @@
require_once('database.php');
require_once('data/User.php');
require_once('temp-utils.php');
session_start();
if(isset($_COOKIE['session_id'])) {
$err = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment