[Librefm-commits] [1634] convert nixtape/{invite, register, track}.php to adodb

[Clint Adams]

Revision: 1634
          http://svn.sv.gnu.org/viewvc/?view=rev&root=librefm&revision=1634
Author:   clint
Date:     2009-05-15 17:25:54 +0000 (Fri, 15 May 2009)
Log Message:
-----------
convert nixtape/{invite,register,track}.php to adodb

Modified Paths:
--------------
    trunk/nixtape/invite.php
    trunk/nixtape/register.php
    trunk/nixtape/track.php

Modified: trunk/nixtape/invite.php
===================================================================
--- trunk/nixtape/invite.php    2009-05-15 17:20:45 UTC (rev 1633)
+++ trunk/nixtape/invite.php    2009-05-15 17:25:54 UTC (rev 1634)
@@ -19,7 +19,7 @@
 
 */
 
-require_once('database.php');
+require_once('database2.php');
 require_once('templating.php');
 require_once('utils/EmailAddressValidator.php');
 
@@ -47,9 +47,9 @@
 
        if(empty($errors)) {
                $code = md5(md5($username) . time());
-               $mdb2->query('INSERT INTO Invitations (inviter, code) VALUES ('
-                       . $mdb2->quote($username, 'text') . ', '
-                       . $mdb2->quote($code, 'text') . ')');
+               $adodb->Execute('INSERT INTO Invitations (inviter, code) VALUES 
('
+                       . $adodb->qstr($username) . ', '
+                       . $adodb->qstr($code) . ')');
 
                $url = $base_url . '/register.php?authcode=' . $code;
         $headers = 'From: Libre.fm Invitations <address@hidden>';

Modified: trunk/nixtape/register.php
===================================================================
--- trunk/nixtape/register.php  2009-05-15 17:20:45 UTC (rev 1633)
+++ trunk/nixtape/register.php  2009-05-15 17:25:54 UTC (rev 1634)
@@ -30,8 +30,8 @@
 // Moving to open alpha
 /*$authcode = $_GET["authcode"];
 
-$res = $mdb2->query("SELECT inviter FROM Invitations WHERE code = " . 
$mdb2->quote($authcode, "text"));
-if(!$res->numRows()) {
+$res = $adodb->GetRow('SELECT inviter FROM Invitations WHERE code = ' . 
$adodb->qstr($authcode));
+if(!$res) {
        $invalid_authcode = true;
 } else {
        $invalid_authcode = false;
@@ -152,9 +152,9 @@
                sendEmail($content, $email);
 
                // Remove auth code and set their username as the invitee
-               //$mdb2->query("UPDATE Invitations SET code = NULL, invitee = " 
. $mdb2->quote($username, "text") . " WHERE code = " . $mdb2->quote($authcode, 
"text"));
-               //$removesql = "DELETE FROM Invitation_Request WHERE email=" . 
$mdb2->quote($email, 'text');
-               //$mdb2->exec($removesql);
+               //$adodb->Execute("UPDATE Invitations SET code = NULL, invitee 
= " . $adodb->qstr($username) . " WHERE code = " . $adodb->qstr($authcode));
+               //$removesql = "DELETE FROM Invitation_Request WHERE email=" . 
$adodb->qstr($email);
+               //$adodb->Execute($removesql);
                $smarty->assign('registered', true);
        } else {
                $smarty->assign('username', $username);

Modified: trunk/nixtape/track.php
===================================================================
--- trunk/nixtape/track.php     2009-05-15 17:20:45 UTC (rev 1633)
+++ trunk/nixtape/track.php     2009-05-15 17:25:54 UTC (rev 1634)
@@ -19,7 +19,7 @@
 
 */
 
-require_once('database.php');
+require_once('database2.php');
 require_once('templating.php');
 require_once('data/sanitize.php');
 require_once('data/Server.php');
@@ -40,12 +40,13 @@
         $smarty->assign('tagcloud', $aTagCloud);
 }
 
-$res = $mdb2->query('SELECT * FROM Track WHERE lower(artist_name) = ' . 
$mdb2->quote(mb_strtolower($track->artist_name, 'UTF-8'), 'text') . ' AND 
lower(name) = ' . $mdb2->quote(mb_strtolower($track->name, 'UTF-8'), 'text'));
+$adodb->SetFetchMode(ADODB_FETCH_ASSOC);
+$res = $adodb->GetAll('SELECT * FROM Track WHERE lower(artist_name) = ' . 
$adodb->qstr(mb_strtolower($track->artist_name, 'UTF-8')) . ' AND lower(name) = 
' . $adodb->qstr(mb_strtolower($track->name, 'UTF-8')));
 
 $aOtheralbums = array();
 $i = 0;
 
-while (($row = $res->fetchRow(MDB2_FETCHMODE_ASSOC))) {
+foreach($res as &$row) {
        $trow = sanitize($row);
        if ($trow['album']) {
                $aOtherAlbums[$i++] = new Album($trow['album'], 
$trow['artist']);