Commit f0445429 authored by clint's avatar clint

rename nixtape/database2.php to nixtape/database.php

parent 836d112a
......@@ -19,7 +19,7 @@
*/
require_once('../database2.php');
require_once('../database.php');
require_once('../api/ArtistXML.php');
require_once('../api/UserXML.php');
......
......@@ -19,7 +19,7 @@
*/
require_once('auth.php');
require_once('database2.php');
require_once('database.php');
require_once('templating.php');
require_once('config.php');
......
......@@ -20,7 +20,7 @@
*/
require('../../config.php');
require_once($install_path . '/database2.php');
require_once($install_path . '/database.php');
require_once($install_path . '/templating.php');
require_once($install_path . '/data/sanitize.php');
......
......@@ -18,7 +18,7 @@
*/
require_once($install_path . '/database2.php');
require_once($install_path . '/database.php');
require_once($install_path . '/data/User.php');
require_once('xml.php');
......
......@@ -19,7 +19,7 @@
*/
require_once('../../database2.php');
require_once('../../database.php');
?>
<html>
......
......@@ -19,7 +19,7 @@
*/
require_once('database2.php');
require_once('database.php');
require_once('data/User.php');
session_start();
if(isset($_COOKIE['session_id'])) {
......
......@@ -19,7 +19,7 @@
*/
require_once($install_path . '/database2.php');
require_once($install_path . '/database.php');
require_once($install_path . '/data/Artist.php');
require_once($install_path . '/data/Track.php');
require_once($install_path . "/utils/resolve-external.php");
......
......@@ -20,7 +20,7 @@
*/
require_once($install_path . '/database2.php');
require_once($install_path . '/database.php');
require_once($install_path . '/data/sanitize.php');
require_once($install_path . '/data/Album.php');
require_once($install_path . '/data/Track.php');
......
......@@ -19,7 +19,7 @@
*/
require_once($install_path . '/database2.php');
require_once($install_path . '/database.php');
require_once($install_path . '/data/sanitize.php');
require_once($install_path . '/utils/human-time.php');
require_once($install_path . '/data/Server.php');
......
......@@ -19,7 +19,7 @@
*/
require_once($install_path . '/database2.php');
require_once($install_path . '/database.php');
require_once($install_path . '/data/Artist.php');
// require_once($install_path . '/data/Group.php');
require_once($install_path . '/data/Track.php');
......
......@@ -18,7 +18,7 @@
*/
require_once($install_path . '/database2.php');
require_once($install_path . '/database.php');
require_once($install_path . '/data/Server.php');
class Statistic {
......
......@@ -18,7 +18,7 @@
*/
require_once($install_path . '/database2.php');
require_once($install_path . '/database.php');
require_once($install_path . '/data/Server.php');
require_once($install_path . '/config.php'); // Should already be required though.
......
......@@ -20,7 +20,7 @@
*/
require_once($install_path . '/database2.php');
require_once($install_path . '/database.php');
require_once($install_path . '/data/Artist.php');
require_once($install_path . '/data/Album.php');
require_once($install_path . '/data/Server.php');
......
......@@ -19,7 +19,7 @@
*/
require_once($install_path . '/database2.php');
require_once($install_path . '/database.php');
require_once($install_path . '/data/sanitize.php');
require_once($install_path . '/utils/human-time.php');
require_once($install_path . '/data/Server.php');
......
......@@ -25,23 +25,14 @@ if(!file_exists(dirname(__FILE__) . '/config.php')) {
}
require_once('config.php');
require_once('MDB2.php');
$mdb2 =& MDB2::connect($connect_string);
if (PEAR::isError($mdb2)) {
die($mdb2->getMessage());
require_once('adodb/adodb-exceptions.inc.php');
require_once('adodb/adodb.inc.php');
try {
$adodb =& NewADOConnection($connect_string);
} catch (exception $e) {
var_dump($e);
adodb_backtrace($e->gettrace());
}
function reportError($text, $data) {
// make a fresh connection
$mdbe = MDB2::connect($connect_string);
if (PEAR::isError($mdbe)) {
die($mdbe->getMessage());
}
$mdbe->exec('INSERT INTO Error (msg, data, time) VALUES ('
. $mdbe->quote($text, 'text') . ', '
. $mdbe->quote($data, 'text') . ', '
. time() . ')');
}
?>
<?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/>.
*/
if(!file_exists(dirname(__FILE__) . '/config.php')) {
die('Please run the <a href=\'install.php\'>Install</a> script to configure your installation');
}
require_once('config.php');
require_once('adodb/adodb-exceptions.inc.php');
require_once('adodb/adodb.inc.php');
try {
$adodb =& NewADOConnection($adodb_connect_string);
} catch (exception $e) {
var_dump($e);
adodb_backtrace($e->gettrace());
}
?>
......@@ -19,7 +19,7 @@
*/
require_once('database2.php');
require_once('database.php');
require_once('templating.php');
require_once('utils/EmailAddressValidator.php');
......
......@@ -19,7 +19,7 @@
*/
require_once('database2.php');
require_once('database.php');
require_once('templating.php');
require_once('data/sanitize.php');
require_once('data/Server.php');
......
......@@ -20,7 +20,7 @@
*/
require_once('database2.php');
require_once('database.php');
require_once('templating.php');
require_once($install_path . '/data/User.php');
......
......@@ -18,7 +18,7 @@
*/
require_once('../database2.php');
require_once('../database.php');
require_once('radio-utils.php');
if(!isset($_GET['session']) || !isset($_GET['url'])) {
......
......@@ -18,7 +18,7 @@
*/
require_once('../database2.php');
require_once('../database.php');
if(!isset($_GET['username']) || !isset($_GET['passwordmd5'])) {
die("BADAUTH\n");
......
......@@ -18,7 +18,7 @@
*/
require_once('../database2.php');
require_once('../database.php');
require_once('../templating.php');
require_once('../data/Track.php');
require_once('radio-utils.php');
......
......@@ -19,7 +19,7 @@
*/
require_once('database2.php');
require_once('database.php');
require_once('templating.php');
require_once('utils/EmailAddressValidator.php');
......
......@@ -19,7 +19,7 @@
*/
require_once('database2.php');
require_once('database.php');
require_once('templating.php');
require_once('utils/EmailAddressValidator.php');
......
......@@ -21,7 +21,7 @@
// TODO: Check if the request has expired before changing.
require_once('database2.php');
require_once('database.php');
require_once('templating.php');
require_once('utils/EmailAddressValidator.php');
......
......@@ -19,7 +19,7 @@
*/
require_once('database2.php');
require_once('database.php');
require_once('templating.php');
require_once('data/sanitize.php');
require_once('data/Server.php');
......
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