We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 5dd37670 authored by clint's avatar clint

whitespace

parent ec30847e
...@@ -67,12 +67,12 @@ $request= ...@@ -67,12 +67,12 @@ $request=
$aws_xml = simplexml_load_file($request) or die("xml response not loading"); $aws_xml = simplexml_load_file($request) or die("xml response not loading");
$image = $aws_xml->Items->Item->MediumImage->URL; $image = $aws_xml->Items->Item->MediumImage->URL;
if (!$image) { $image = "/i/qm50.png"; $license="librefm";} if (!$image) { $image = "/i/qm50.png"; $license="librefm";}
if ($image) { if ($image) {
if ($license == "") { $license = "amazon"; } if ($license == "") { $license = "amazon"; }
$license = $adodb->qstr($license); $license = $adodb->qstr($license);
...@@ -80,7 +80,7 @@ $image = $aws_xml->Items->Item->MediumImage->URL; ...@@ -80,7 +80,7 @@ $image = $aws_xml->Items->Item->MediumImage->URL;
$album = $adodb->qstr($album); $album = $adodb->qstr($album);
$artist = $adodb->qstr($artist); $artist = $adodb->qstr($artist);
$sql = ("UPDATE Album SET image = " $sql = ("UPDATE Album SET image = "
. ($image) . ", " . ($image) . ", "
......
...@@ -166,7 +166,7 @@ if (isset($_POST['install'])) { ...@@ -166,7 +166,7 @@ if (isset($_POST['install'])) {
streamurl VARCHAR(255), streamurl VARCHAR(255),
otherid VARCHAR(16))"); otherid VARCHAR(16))");
} }
$adodb->Execute("CREATE TABLE Scrobbles( $adodb->Execute("CREATE TABLE Scrobbles(
username VARCHAR(64) REFERENCES Users(username), username VARCHAR(64) REFERENCES Users(username),
track VARCHAR(255), track VARCHAR(255),
...@@ -226,7 +226,7 @@ if (isset($_POST['install'])) { ...@@ -226,7 +226,7 @@ if (isset($_POST['install'])) {
username VARCHAR(64), username VARCHAR(64),
email VARCHAR(255), email VARCHAR(255),
code VARCHAR(32), code VARCHAR(32),
expires INTEGER, expires INTEGER,
PRIMARY KEY(username))"); PRIMARY KEY(username))");
$adodb->Execute("CREATE TABLE Radio_Sessions( $adodb->Execute("CREATE TABLE Radio_Sessions(
...@@ -235,11 +235,11 @@ if (isset($_POST['install'])) { ...@@ -235,11 +235,11 @@ if (isset($_POST['install'])) {
url VARCHAR(255), url VARCHAR(255),
expires INTEGER NOT NULL DEFAULT 0, expires INTEGER NOT NULL DEFAULT 0,
PRIMARY KEY(username,session))"); PRIMARY KEY(username,session))");
//Table for delete profile requests //Table for delete profile requests
$adodb->Execute("CREATE TABLE Delete_Request ( $adodb->Execute("CREATE TABLE Delete_Request (
code VARCHAR(300), code VARCHAR(300),
expires INTEGER, expires INTEGER,
username VARCHAR(64) REFERENCES Users(username), username VARCHAR(64) REFERENCES Users(username),
PRIMARY KEY(code)"); PRIMARY KEY(code)");
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
require_once('database.php'); // include the database connection string require_once('database.php'); // include the database connection string
function usernameFromSID($session_id) function usernameFromSID($session_id)
{ {
//derive the username from a session ID //derive the username from a session ID
...@@ -198,7 +198,7 @@ function NoSpamTracks ($track) { ...@@ -198,7 +198,7 @@ function NoSpamTracks ($track) {
$track = str_replace(' (PREVIEW: buy it at www.magnatune.com)', "", $track); $track = str_replace(' (PREVIEW: buy it at www.magnatune.com)', "", $track);
return $track; return $track;
} }
function getAlbumArt($artist, $album) { function getAlbumArt($artist, $album) {
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
function human_timestamp ($unix_timestamp, $now = null) { function human_timestamp ($unix_timestamp, $now = null) {
if (is_null($now)) { if (is_null($now)) {
$now = time(); $now = time();
} }
$diff = $now - $unix_timestamp; $diff = $now - $unix_timestamp;
# ugly! # ugly!
......
<?php <?php
/* Libre.fm -- a free network service for sharing your music listening habits /* Libre.fm -- a free network service for sharing your music listening habits
......
...@@ -34,7 +34,7 @@ class ArtistXML { ...@@ -34,7 +34,7 @@ class ArtistXML {
*/ */
public static function getInfo($artistName, $api_key=false, $mbid=false, $lang='en') { public static function getInfo($artistName, $api_key=false, $mbid=false, $lang='en') {
// We assume $api_key is valid and set at this point // We assume $api_key is valid and set at this point
if (!isset($artistName) && !isset($mbid)) { if (!isset($artistName) && !isset($mbid)) {
echo XML::error('failed', '7', 'Invalid resource specified'); echo XML::error('failed', '7', 'Invalid resource specified');
return; return;
...@@ -42,7 +42,7 @@ class ArtistXML { ...@@ -42,7 +42,7 @@ class ArtistXML {
$artist = new Artist($artistName, $mbid); $artist = new Artist($artistName, $mbid);
if (PEAR::isError($artist)) { if (PEAR::isError($artist)) {
return(XML::error('failed', '7', 'Invalid resource specified')); return(XML::error('failed', '7', 'Invalid resource specified'));
} }
...@@ -86,7 +86,7 @@ class ArtistXML { ...@@ -86,7 +86,7 @@ class ArtistXML {
$track->addChild('listeners', $tracks[$i]->getListenerCount()); $track->addChild('listeners', $tracks[$i]->getListenerCount());
} }
return($xml); return($xml);
} }
} }
......
...@@ -28,11 +28,11 @@ require_once('config.php'); ...@@ -28,11 +28,11 @@ require_once('config.php');
require_once('adodb/adodb-exceptions.inc.php'); require_once('adodb/adodb-exceptions.inc.php');
require_once('adodb/adodb.inc.php'); require_once('adodb/adodb.inc.php');
try { try {
$adodb =& NewADOConnection($adodb_connect_string); $adodb =& NewADOConnection($adodb_connect_string);
} catch (exception $e) { } catch (exception $e) {
var_dump($e); var_dump($e);
adodb_backtrace($e->gettrace()); adodb_backtrace($e->gettrace());
} }
?> ?>
...@@ -72,7 +72,7 @@ if(isset($group->name)) { ...@@ -72,7 +72,7 @@ if(isset($group->name)) {
if (!PEAR::isError ($aUserTagCloud)) { if (!PEAR::isError ($aUserTagCloud)) {
$smarty->assign('group_tagcloud',$aUserTagCloud); $smarty->assign('group_tagcloud',$aUserTagCloud);
} }
$smarty->assign('userlist', $group->getUsers()); $smarty->assign('userlist', $group->getUsers());
$smarty->assign('ismember', $group->memberCheck($this_user)); $smarty->assign('ismember', $group->memberCheck($this_user));
...@@ -90,7 +90,7 @@ if(isset($group->name)) { ...@@ -90,7 +90,7 @@ if(isset($group->name)) {
'href' => $base_url.'/rdf.php?fmt=xml&page='.urlencode(str_replace($base_url, '', $_SERVER['REQUEST_URI'])) 'href' => $base_url.'/rdf.php?fmt=xml&page='.urlencode(str_replace($base_url, '', $_SERVER['REQUEST_URI']))
) )
)); ));
$smarty->assign('profile', true); $smarty->assign('profile', true);
$smarty->display('group.tpl'); $smarty->display('group.tpl');
......
...@@ -61,7 +61,7 @@ if (isset($_POST['install'])) { ...@@ -61,7 +61,7 @@ if (isset($_POST['install'])) {
if(!$result) { if(!$result) {
$print_config = str_replace('<', '&lt;', $config); $print_config = str_replace('<', '&lt;', $config);
die('Unable to write to file \'<i>config.php</i>\'. Please create this file and copy the following in to it: <br /><pre>' . $print_config . '</pre>'); die('Unable to write to file \'<i>config.php</i>\'. Please create this file and copy the following in to it: <br /><pre>' . $print_config . '</pre>');
} }
die('Configuration completed successfully!'); die('Configuration completed successfully!');
} }
...@@ -106,7 +106,7 @@ if (isset($_POST['install'])) { ...@@ -106,7 +106,7 @@ if (isset($_POST['install'])) {
<br /> <br />
<h2>General</h2> <h2>General</h2>
Default Theme: <select name="default_theme"> Default Theme: <select name="default_theme">
<?php <?php
$dir = opendir('themes'); $dir = opendir('themes');
while($theme = readdir($dir)) { while($theme = readdir($dir)) {
if(is_dir('themes/' . $theme) && $theme[0] != '.') { if(is_dir('themes/' . $theme) && $theme[0] != '.') {
......
...@@ -31,20 +31,20 @@ elseif ( strtolower(substr($mdb2->phptype, 0, 5)) == 'mssql' ) ...@@ -31,20 +31,20 @@ elseif ( strtolower(substr($mdb2->phptype, 0, 5)) == 'mssql' )
$random = 'NEWID'; // I don't think we try to support MSSQL, but here's how it's done theoretically anyway $random = 'NEWID'; // I don't think we try to support MSSQL, but here's how it's done theoretically anyway
else else
$random = 'RANDOM'; // postgresql, sqlite, possibly others $random = 'RANDOM'; // postgresql, sqlite, possibly others
if ($_REQUEST['country']) if ($_REQUEST['country'])
{ {
$q = sprintf('SELECT u.* FROM Users u INNER JOIN Places p ON u.location_uri=p.location_uri AND p.country=%s ORDER BY %s() LIMIT 100', $q = sprintf('SELECT u.* FROM Users u INNER JOIN Places p ON u.location_uri=p.location_uri AND p.country=%s ORDER BY %s() LIMIT 100',
$mdb2->quote(strtoupper($_REQUEST['country']), 'text'), $mdb2->quote(strtoupper($_REQUEST['country']), 'text'),
$random); $random);
$res = $mdb2->query($q); $res = $mdb2->query($q);
while ( $row = $res->fetchRow(MDB2_FETCHMODE_ASSOC) ) while ( $row = $res->fetchRow(MDB2_FETCHMODE_ASSOC) )
{ {
$userlist[] = new User($row['username'], $row); $userlist[] = new User($row['username'], $row);
} }
$smarty->assign('country', strtoupper($_REQUEST['country'])); $smarty->assign('country', strtoupper($_REQUEST['country']));
$res = $mdb2->query(sprintf('SELECT * FROM Countries WHERE country=%s LIMIT 1', $res = $mdb2->query(sprintf('SELECT * FROM Countries WHERE country=%s LIMIT 1',
$mdb2->quote(strtoupper($_REQUEST['country']), 'text'))); $mdb2->quote(strtoupper($_REQUEST['country']), 'text')));
...@@ -52,9 +52,9 @@ if ($_REQUEST['country']) ...@@ -52,9 +52,9 @@ if ($_REQUEST['country'])
{ {
$smarty->assign('country_info', $row); $smarty->assign('country_info', $row);
} }
$smarty->assign('userlist', $userlist); $smarty->assign('userlist', $userlist);
$smarty->assign('extra_head_links', array( $smarty->assign('extra_head_links', array(
array( array(
'rel' => 'meta', 'rel' => 'meta',
...@@ -63,7 +63,7 @@ if ($_REQUEST['country']) ...@@ -63,7 +63,7 @@ if ($_REQUEST['country'])
'href' => $base_url.'/rdf.php?fmt=xml&page='.urlencode(str_replace($base_url, '', $_SERVER['REQUEST_URI'])) 'href' => $base_url.'/rdf.php?fmt=xml&page='.urlencode(str_replace($base_url, '', $_SERVER['REQUEST_URI']))
) )
)); ));
$smarty->display('location-country.tpl'); $smarty->display('location-country.tpl');
} }
......
...@@ -63,7 +63,7 @@ switch ($fmt) ...@@ -63,7 +63,7 @@ switch ($fmt)
case 'json' : case 'json' :
if ($_GET['callback']) if ($_GET['callback'])
{ header('Content-Type: text/javascript'); } { header('Content-Type: text/javascript'); }
else else
{ header('Content-Type: application/json'); } { header('Content-Type: application/json'); }
$ser = ARC2::getRDFJSONSerializer($conf); $ser = ARC2::getRDFJSONSerializer($conf);
break; break;
...@@ -80,4 +80,4 @@ print $ser->getSerializedIndex($index); ...@@ -80,4 +80,4 @@ print $ser->getSerializedIndex($index);
if ($_GET['callback']) { if ($_GET['callback']) {
print ');'; print ');';
} }
...@@ -44,10 +44,10 @@ if (isset($_GET['code'])) { ...@@ -44,10 +44,10 @@ if (isset($_GET['code'])) {
} }
$row = $res->fetchRow(MDB2_FETCHMODE_ASSOC); $row = $res->fetchRow(MDB2_FETCHMODE_ASSOC);
$password = ''; $password = '';
$chars = 'abcdefghijklmnopqrstuvwxyz0123456789'; $chars = 'abcdefghijklmnopqrstuvwxyz0123456789';
for ($i = 0; $i < 8; $i++) { for ($i = 0; $i < 8; $i++) {
$password .= substr($chars, mt_rand(0, strlen($chars)-1), 1); $password .= substr($chars, mt_rand(0, strlen($chars)-1), 1);
} }
...@@ -70,14 +70,14 @@ else if (isset($_POST['user'])) { ...@@ -70,14 +70,14 @@ else if (isset($_POST['user'])) {
$username = $_POST['user']; $username = $_POST['user'];
$res = $mdb2->query('SELECT * FROM Users WHERE username="' $res = $mdb2->query('SELECT * FROM Users WHERE username="'
. $mdb2->quote($username, 'text')); . $mdb2->quote($username, 'text'));
if (PEAR::isError($res) || $res->numRows() == 0) { if (PEAR::isError($res) || $res->numRows() == 0) {
$errors .= "User not found.\n"; $errors .= "User not found.\n";
$smarty->assign('errors', $errors); $smarty->assign('errors', $errors);
$smarty->display('error.tpl'); $smarty->display('error.tpl');
die(); die();
} }
$row = $res->fetchRow(MDB2_FETCHMODE_ASSOC); $row = $res->fetchRow(MDB2_FETCHMODE_ASSOC);
$code = md5($username . $row['email'] . time()); $code = md5($username . $row['email'] . time());
$sql = 'INSERT INTO Recovery_Request (username, email, code, expires) VALUES(' $sql = 'INSERT INTO Recovery_Request (username, email, code, expires) VALUES('
...@@ -95,12 +95,12 @@ else if (isset($_POST['user'])) { ...@@ -95,12 +95,12 @@ else if (isset($_POST['user'])) {
} }
$url = $base_url . '/reset.php?code=' . $code; $url = $base_url . '/reset.php?code=' . $code;
$content = "Hi!\n\nSomeone from the IP-address " . $_SERVER['REMOTE_ADDR'] . " entered your username " $content = "Hi!\n\nSomeone from the IP-address " . $_SERVER['REMOTE_ADDR'] . " entered your username "
. "in the password reset form at libre.fm. To change you password, please visit\n\n" . "in the password reset form at libre.fm. To change you password, please visit\n\n"
. $url . "\n\n- The Libre.fm Team"; . $url . "\n\n- The Libre.fm Team";
sendEmail($content, $row['email']); sendEmail($content, $row['email']);
$smarty->assign('sent', true); $smarty->assign('sent', true);
} }
$smarty->display('reset.tpl'); $smarty->display('reset.tpl');
?> ?>
...@@ -39,7 +39,7 @@ if($_GET['lang']) { ...@@ -39,7 +39,7 @@ if($_GET['lang']) {
$lcomponents = preg_split('/-/', $languages[$i]); $lcomponents = preg_split('/-/', $languages[$i]);
$languages[$i] = $lcomponents[0] . '_' . strtoupper($lcomponents[1]); $languages[$i] = $lcomponents[0] . '_' . strtoupper($lcomponents[1]);
} }
$languages[$i] = $languages[$i] . '.UTF-8'; $languages[$i] = $languages[$i] . '.UTF-8';
} }
} }
...@@ -59,7 +59,7 @@ $smarty->assign('lang_selector_array', array(($current_lang) => 1)); ...@@ -59,7 +59,7 @@ $smarty->assign('lang_selector_array', array(($current_lang) => 1));
$smarty->assign('base_url', $base_url); $smarty->assign('base_url', $base_url);
$smarty->assign('this_page', $_SERVER['REQUEST_URI']); $smarty->assign('this_page', $_SERVER['REQUEST_URI']);
$smarty->assign('this_page_absolute', $smarty->assign('this_page_absolute',
(empty($_SERVER['HTTPS']) ? 'http://' : 'http://') (empty($_SERVER['HTTPS']) ? 'http://' : 'http://')
.(empty($_SERVER['HOST']) ? $_SERVER['SERVER_NAME'] : $_SERVER['HOST']) .(empty($_SERVER['HOST']) ? $_SERVER['SERVER_NAME'] : $_SERVER['HOST'])
.(($_SERVER['SERVER_PORT']==80) ? '' : (':'.$_SERVER['SERVER_PORT'])) .(($_SERVER['SERVER_PORT']==80) ? '' : (':'.$_SERVER['SERVER_PORT']))
. $_SERVER['REQUEST_URI']); . $_SERVER['REQUEST_URI']);
......
...@@ -113,10 +113,10 @@ if ($_POST['submit']) ...@@ -113,10 +113,10 @@ if ($_POST['submit'])
$this_user->avatar_uri = $_POST['avatar_uri']; $this_user->avatar_uri = $_POST['avatar_uri'];
$this_user->laconica_profile = $_POST['laconica_profile']; $this_user->laconica_profile = $_POST['laconica_profile'];
$this_user->journal_rss = $_POST['journal_rss']; $this_user->journal_rss = $_POST['journal_rss'];
if (!empty( $_POST['password_1'] )) if (!empty( $_POST['password_1'] ))
$user->password = md5($_POST['password_1']); $user->password = md5($_POST['password_1']);
$this_user->save(); $this_user->save();
header('Location: ' . $this_user->getURL()); header('Location: ' . $this_user->getURL());
...@@ -140,10 +140,10 @@ if(isset($this_user->name)) ...@@ -140,10 +140,10 @@ if(isset($this_user->name))
# Stuff which cannot be changed *here* # Stuff which cannot be changed *here*
$smarty->assign('userlevel', $this_user->userlevel); $smarty->assign('userlevel', $this_user->userlevel);
# Stuff which cannot be changed *yet* # Stuff which cannot be changed *yet*
$smarty->assign('email', $this_user->email); $smarty->assign('email', $this_user->email);
if ($_POST['submit']) if ($_POST['submit'])
{ {
$smarty->assign('id', $_POST['id']); $smarty->assign('id', $_POST['id']);
......
...@@ -46,7 +46,7 @@ if(isset($user->name)) { ...@@ -46,7 +46,7 @@ if(isset($user->name)) {
$smarty->assign('isme', ($_SESSION['user']->name == $user->name)); $smarty->assign('isme', ($_SESSION['user']->name == $user->name));
$smarty->assign('me', $user); $smarty->assign('me', $user);
$smarty->assign('profile', true); $smarty->assign('profile', true);
$smarty->assign('groups', Group::groupList($user)); $smarty->assign('groups', Group::groupList($user));
$smarty->assign('extra_head_links', array( $smarty->assign('extra_head_links', array(
...@@ -57,7 +57,7 @@ if(isset($user->name)) { ...@@ -57,7 +57,7 @@ if(isset($user->name)) {
'href' => $base_url.'/rdf.php?fmt=xml&page='.urlencode(str_replace($base_url, '', $user->getURL('groups'))) 'href' => $base_url.'/rdf.php?fmt=xml&page='.urlencode(str_replace($base_url, '', $user->getURL('groups')))
) )
)); ));
$smarty->display('user-groups.tpl'); $smarty->display('user-groups.tpl');
} else { } else {
$smarty->assign('error', 'User not found'); $smarty->assign('error', 'User not found');
......
...@@ -90,4 +90,4 @@ $smarty->assign('extra_head_links', array( ...@@ -90,4 +90,4 @@ $smarty->assign('extra_head_links', array(
) )
)); ));
$smarty->display('user-journal.tpl'); $smarty->display('user-journal.tpl');
...@@ -53,7 +53,7 @@ if(isset($user->name)) { ...@@ -53,7 +53,7 @@ if(isset($user->name)) {
$smarty->assign('me', $user); $smarty->assign('me', $user);
$smarty->assign('sidebar', true); $smarty->assign('sidebar', true);
$smarty->assign('sidebartemplate', 'profile-sidebar.tpl'); $smarty->assign('sidebartemplate', 'profile-sidebar.tpl');
$smarty->assign('extra_head_links', array( $smarty->assign('extra_head_links', array(
array( array(
'rel'=>'alternate', 'rel'=>'alternate',
...@@ -74,7 +74,7 @@ if(isset($user->name)) { ...@@ -74,7 +74,7 @@ if(isset($user->name)) {
'href' => $base_url.'/rdf.php?fmt=xml&page='.urlencode(str_replace($base_url, '', $user->getURL())) 'href' => $base_url.'/rdf.php?fmt=xml&page='.urlencode(str_replace($base_url, '', $user->getURL()))
) )
)); ));
$smarty->display('user-profile.tpl'); $smarty->display('user-profile.tpl');
} else { } else {
$smarty->assign('error', 'User not found'); $smarty->assign('error', 'User not found');
......
...@@ -53,7 +53,7 @@ if(isset($user->name)) { ...@@ -53,7 +53,7 @@ if(isset($user->name)) {
$smarty->assign('isme', ($this_user->name == $user->name)); $smarty->assign('isme', ($this_user->name == $user->name));
$smarty->assign('me', $user); $smarty->assign('me', $user);
$smarty->assign('profile', true); $smarty->assign('profile', true);
$smarty->assign('extra_head_links', array( $smarty->assign('extra_head_links', array(
array( array(
'rel'=>'alternate', 'rel'=>'alternate',
......
...@@ -40,20 +40,20 @@ if(isset($user->name)) { ...@@ -40,20 +40,20 @@ if(isset($user->name)) {
# if (!PEAR::isError ($aUserTagCloud)) { # if (!PEAR::isError ($aUserTagCloud)) {
# $smarty->assign('user_tagcloud',$aUserTagCloud); # $smarty->assign('user_tagcloud',$aUserTagCloud);
# } # }
$smarty->assign('stat_barwidth', 320); $smarty->assign('stat_barwidth', 320);
$aUserPlayStat = Statistic::GeneratePlayStats('Scrobbles', 'artist', 40, $user->name, 300); $aUserPlayStat = Statistic::GeneratePlayStats('Scrobbles', 'artist', 40, $user->name, 300);
if (!PEAR::isError ($aUserPlayStat)) { if (!PEAR::isError ($aUserPlayStat)) {
$smarty->assign('user_playstats',$aUserPlayStat); $smarty->assign('user_playstats',$aUserPlayStat);
} }
$aUserDayStat = Statistic::generatePlayByDays('Scrobbles', 40, $user->name, 300); $aUserDayStat = Statistic::generatePlayByDays('Scrobbles', 40, $user->name, 300);
if (!PEAR::isError ($aUserDayStat)) { if (!PEAR::isError ($aUserDayStat)) {
$smarty->assign('user_daystats',$aUserDayStat); $smarty->assign('user_daystats',$aUserDayStat);
} }
$smarty->assign('toptracks', $user->getTopTracks(40)); $smarty->assign('toptracks', $user->getTopTracks(40));
$smarty->assign('me', $user); $smarty->assign('me', $user);
$smarty->assign('geo', Server::getLocationDetails($user->location_uri)); $smarty->assign('geo', Server::getLocationDetails($user->location_uri));
$smarty->assign('isme', ($this_user->name == $user->name)); $smarty->assign('isme', ($this_user->name == $user->name));
...@@ -66,7 +66,7 @@ if(isset($user->name)) { ...@@ -66,7 +66,7 @@ if(isset($user->name)) {
'href' => $base_url.'/rdf.php?fmt=xml&page='.urlencode(str_replace($base_url, '', $user->getURL())) 'href' => $base_url.'/rdf.php?fmt=xml&page='.urlencode(str_replace($base_url, '', $user->getURL()))
) )
)); ));
$smarty->assign('stats', true); $smarty->assign('stats', true);
$smarty->display('user-stats.tpl'); $smarty->display('user-stats.tpl');
} else { } else {
......
...@@ -15,7 +15,7 @@ class ARC2_DcExtractor extends ARC2_RDFExtractor { ...@@ -15,7 +15,7 @@ class ARC2_DcExtractor extends ARC2_RDFExtractor {
function __construct($a = '', &$caller) { function __construct($a = '', &$caller) {
parent::__construct($a, $caller); parent::__construct($a, $caller);
} }
function ARC2_DcExtractor($a = '', &$caller) { function ARC2_DcExtractor($a = '', &$caller) {
$this->__construct($a, $caller); $this->__construct($a, $caller);
} }
...@@ -26,7 +26,7 @@ class ARC2_DcExtractor extends ARC2_RDFExtractor { ...@@ -26,7 +26,7 @@ class ARC2_DcExtractor extends ARC2_RDFExtractor {
} }
/* */ /* */
function extractRDF() { function extractRDF() {
$t_vals = array(); $t_vals = array();