[Librefm-commits] [1643] rename nixtape/database2.php to nixtape/databas

librefm-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Librefm-commits] [1643] rename nixtape/database2.php to nixtape/databas

From:	Clint Adams
Subject:	[Librefm-commits] [1643] rename nixtape/database2.php to nixtape/database.php
Date:	Fri, 15 May 2009 23:17:40 +0000
Revision: 1643
          http://svn.sv.gnu.org/viewvc/?view=rev&root=librefm&revision=1643
Author:   clint
Date:     2009-05-15 23:17:39 +0000 (Fri, 15 May 2009)
Log Message:
-----------
rename nixtape/database2.php to nixtape/database.php

Modified Paths:
--------------
    trunk/nixtape/2.0/index.php
    trunk/nixtape/admin/report/mbid-mismatch.php
    trunk/nixtape/admin.php
    trunk/nixtape/api/UserXML.php
    trunk/nixtape/api/auth/index.php
    trunk/nixtape/auth.php
    trunk/nixtape/data/Album.php
    trunk/nixtape/data/Artist.php
    trunk/nixtape/data/Group.php
    trunk/nixtape/data/Server.php
    trunk/nixtape/data/Statistic.php
    trunk/nixtape/data/TagCloud.php
    trunk/nixtape/data/Track.php
    trunk/nixtape/data/User.php
    trunk/nixtape/database.php
    trunk/nixtape/invite.php
    trunk/nixtape/location.php
    trunk/nixtape/login.php
    trunk/nixtape/radio/adjust.php
    trunk/nixtape/radio/handshake.php
    trunk/nixtape/radio/xspf.php
    trunk/nixtape/register.php
    trunk/nixtape/request.php
    trunk/nixtape/reset.php
    trunk/nixtape/track.php

Removed Paths:
-------------
    trunk/nixtape/database2.php

Modified: trunk/nixtape/2.0/index.php
===================================================================
--- trunk/nixtape/2.0/index.php 2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/2.0/index.php 2009-05-15 23:17:39 UTC (rev 1643)
@@ -19,7 +19,7 @@
 
 */
 
-require_once('../database2.php');
+require_once('../database.php');
 require_once('../api/ArtistXML.php');
 require_once('../api/UserXML.php');
 

Modified: trunk/nixtape/admin/report/mbid-mismatch.php
===================================================================
--- trunk/nixtape/admin/report/mbid-mismatch.php        2009-05-15 20:18:13 UTC 
(rev 1642)
+++ trunk/nixtape/admin/report/mbid-mismatch.php        2009-05-15 23:17:39 UTC 
(rev 1643)
@@ -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');
 

Modified: trunk/nixtape/admin.php
===================================================================
--- trunk/nixtape/admin.php     2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/admin.php     2009-05-15 23:17:39 UTC (rev 1643)
@@ -19,7 +19,7 @@
 
 */
 require_once('auth.php');
-require_once('database2.php');
+require_once('database.php');
 require_once('templating.php');
 require_once('config.php');
 

Modified: trunk/nixtape/api/UserXML.php
===================================================================
--- trunk/nixtape/api/UserXML.php       2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/api/UserXML.php       2009-05-15 23:17:39 UTC (rev 1643)
@@ -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');
 

Modified: trunk/nixtape/api/auth/index.php
===================================================================
--- trunk/nixtape/api/auth/index.php    2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/api/auth/index.php    2009-05-15 23:17:39 UTC (rev 1643)
@@ -19,7 +19,7 @@
 
  */
 
-require_once('../../database2.php');
+require_once('../../database.php');
 ?>
 
 <html>

Modified: trunk/nixtape/auth.php
===================================================================
--- trunk/nixtape/auth.php      2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/auth.php      2009-05-15 23:17:39 UTC (rev 1643)
@@ -19,7 +19,7 @@
 
 */
 
-require_once('database2.php');
+require_once('database.php');
 require_once('data/User.php');
 session_start();
 if(isset($_COOKIE['session_id'])) {

Modified: trunk/nixtape/data/Album.php
===================================================================
--- trunk/nixtape/data/Album.php        2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/data/Album.php        2009-05-15 23:17:39 UTC (rev 1643)
@@ -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");

Modified: trunk/nixtape/data/Artist.php
===================================================================
--- trunk/nixtape/data/Artist.php       2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/data/Artist.php       2009-05-15 23:17:39 UTC (rev 1643)
@@ -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');

Modified: trunk/nixtape/data/Group.php
===================================================================
--- trunk/nixtape/data/Group.php        2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/data/Group.php        2009-05-15 23:17:39 UTC (rev 1643)
@@ -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');

Modified: trunk/nixtape/data/Server.php
===================================================================
--- trunk/nixtape/data/Server.php       2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/data/Server.php       2009-05-15 23:17:39 UTC (rev 1643)
@@ -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');

Modified: trunk/nixtape/data/Statistic.php
===================================================================
--- trunk/nixtape/data/Statistic.php    2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/data/Statistic.php    2009-05-15 23:17:39 UTC (rev 1643)
@@ -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 {

Modified: trunk/nixtape/data/TagCloud.php
===================================================================
--- trunk/nixtape/data/TagCloud.php     2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/data/TagCloud.php     2009-05-15 23:17:39 UTC (rev 1643)
@@ -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.
 

Modified: trunk/nixtape/data/Track.php
===================================================================
--- trunk/nixtape/data/Track.php        2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/data/Track.php        2009-05-15 23:17:39 UTC (rev 1643)
@@ -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');

Modified: trunk/nixtape/data/User.php
===================================================================
--- trunk/nixtape/data/User.php 2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/data/User.php 2009-05-15 23:17:39 UTC (rev 1643)
@@ -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');

Modified: trunk/nixtape/database.php
===================================================================
--- trunk/nixtape/database.php  2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/database.php  2009-05-15 23:17:39 UTC (rev 1643)
@@ -25,23 +25,14 @@
 }
 
 require_once('config.php');
-require_once('MDB2.php');
+require_once('adodb/adodb-exceptions.inc.php');
+require_once('adodb/adodb.inc.php');
 
-$mdb2 =& MDB2::connect($connect_string);
-if (PEAR::isError($mdb2)) {
-       die($mdb2->getMessage());
+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() . ')');
-}
 ?>

Deleted: trunk/nixtape/database2.php
===================================================================
--- trunk/nixtape/database2.php 2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/database2.php 2009-05-15 23:17:39 UTC (rev 1643)
@@ -1,38 +0,0 @@
-<?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());
-}
-
-?>

Modified: trunk/nixtape/invite.php
===================================================================
--- trunk/nixtape/invite.php    2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/invite.php    2009-05-15 23:17:39 UTC (rev 1643)
@@ -19,7 +19,7 @@
 
 */
 
-require_once('database2.php');
+require_once('database.php');
 require_once('templating.php');
 require_once('utils/EmailAddressValidator.php');
 

Modified: trunk/nixtape/location.php
===================================================================
--- trunk/nixtape/location.php  2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/location.php  2009-05-15 23:17:39 UTC (rev 1643)
@@ -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');

Modified: trunk/nixtape/login.php
===================================================================
--- trunk/nixtape/login.php     2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/login.php     2009-05-15 23:17:39 UTC (rev 1643)
@@ -20,7 +20,7 @@
 */
 
 
-require_once('database2.php');
+require_once('database.php');
 require_once('templating.php');
 require_once($install_path . '/data/User.php');
 

Modified: trunk/nixtape/radio/adjust.php
===================================================================
--- trunk/nixtape/radio/adjust.php      2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/radio/adjust.php      2009-05-15 23:17:39 UTC (rev 1643)
@@ -18,7 +18,7 @@
 
 */
 
-require_once('../database2.php');
+require_once('../database.php');
 require_once('radio-utils.php');
 
 if(!isset($_GET['session']) || !isset($_GET['url'])) {

Modified: trunk/nixtape/radio/handshake.php
===================================================================
--- trunk/nixtape/radio/handshake.php   2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/radio/handshake.php   2009-05-15 23:17:39 UTC (rev 1643)
@@ -18,7 +18,7 @@
 
 */
 
-require_once('../database2.php');
+require_once('../database.php');
 
 if(!isset($_GET['username']) || !isset($_GET['passwordmd5'])) {
        die("BADAUTH\n");

Modified: trunk/nixtape/radio/xspf.php
===================================================================
--- trunk/nixtape/radio/xspf.php        2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/radio/xspf.php        2009-05-15 23:17:39 UTC (rev 1643)
@@ -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');

Modified: trunk/nixtape/register.php
===================================================================
--- trunk/nixtape/register.php  2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/register.php  2009-05-15 23:17:39 UTC (rev 1643)
@@ -19,7 +19,7 @@
 
 */
 
-require_once('database2.php');
+require_once('database.php');
 require_once('templating.php');
 require_once('utils/EmailAddressValidator.php');
 

Modified: trunk/nixtape/request.php
===================================================================
--- trunk/nixtape/request.php   2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/request.php   2009-05-15 23:17:39 UTC (rev 1643)
@@ -19,7 +19,7 @@
 
  */
 
-require_once('database2.php');
+require_once('database.php');
 require_once('templating.php');
 require_once('utils/EmailAddressValidator.php');
 

Modified: trunk/nixtape/reset.php
===================================================================
--- trunk/nixtape/reset.php     2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/reset.php     2009-05-15 23:17:39 UTC (rev 1643)
@@ -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');
 

Modified: trunk/nixtape/track.php
===================================================================
--- trunk/nixtape/track.php     2009-05-15 20:18:13 UTC (rev 1642)
+++ trunk/nixtape/track.php     2009-05-15 23:17:39 UTC (rev 1643)
@@ -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');
[Prev in Thread]
Current Thread
[Next in Thread]
[Librefm-commits] [1643] rename nixtape/database2.php to nixtape/database.php, Clint Adams <=
Prev by Date: [Librefm-commits] [1642] Fix wrong parameter count in call to substr
Next by Date: [Librefm-commits] [1644] added licenses to these two
Previous by thread: [Librefm-commits] [1642] Fix wrong parameter count in call to substr
Next by thread: [Librefm-commits] [1644] added licenses to these two
Index(es):
- Date
- Thread