Commit 7fe9a33b authored by Mike Sheldon's avatar Mike Sheldon

Merge branch 'merge62'

parents fa2bb855 19b5d6cb
......@@ -2,8 +2,6 @@ Options +FollowSymLinks -MultiViews
RewriteEngine on
RewriteRule ^user/([^/]+)/?$ user-profile.php?user=$1 [NC,QSA]
RewriteRule ^user/([^/]+)/journal/?$ user-journal.php?user=$1 [NC,QSA]
RewriteRule ^user/([^/]+)/groups/?$ user-groups.php?user=$1 [NC,QSA]
RewriteRule ^user/([^/]+)/recent-tracks/?$ user-recent-tracks.php?user=$1 [NC,QSA]
RewriteRule ^user/([^/]+)/stats/?$ user-stats.php?user=$1 [NC,QSA]
RewriteRule ^user/([^/]+)/station/?$ user-station.php?user=$1 [NC,QSA]
......@@ -20,12 +18,8 @@ RewriteRule ^artist/([^/]+)/album/([^/]+)/?$ album.php?artist=$1&album=$2 [
RewriteRule ^artist/([^/]+)/?$ artist.php?artist=$1 [NC,QSA]
RewriteRule ^artist/([^/]+)/manage/?$ artist-manage.php?artist=$1 [NC,QSA]
RewriteRule ^artist/([^/]+)/tag/?$ artist-tag.php?artist=$1 [NC,QSA]
RewriteRule ^group/new$ edit_group.php?group=new [NC,QSA]
RewriteRule ^group/([^/]+)/?$ group.php?group=$1 [NC,QSA]
RewriteRule ^group/?$ group.php [NC,QSA]
RewriteRule ^country/([^/]+)/?$ location.php?country=$1 [NC,QSA]
RewriteRule ^logout login.php?action=logout [NC,QSA]
RewriteRule ^listen listen.php [NC,QSA]
RewriteRule ^music popular.php [NC,QSA]
RewriteRule ^users users.php [NC,QSA]
RewriteRule ^tag/([^/]+)/?$ tag.php?tag=$1 [NC,QSA]
......@@ -58,4 +58,3 @@ if (isset($this_user) && $this_user->manages($artist->name)) {
}
$smarty->assign('pagetitle', $artist->name . ' : ' . $album->name);
$smarty->assign('headerfile', 'album-header.tpl');
......@@ -97,8 +97,14 @@ if (!isset($_REQUEST['api_key']) || !(isset($_REQUEST['cb']) || isset($_REQUEST[
// Web app auth step 2.2
if(isset($_POST['cb'])) {
$redirect_url = $_POST['cb'];
header('Location:' . $redirect_url . '&token=' . $_POST['token']);
$callback_url = $_POST['cb'];
if (preg_match("/\?/", $callback_url)) {
$redirect_url = $callback_url . '&token=' . $_POST['token'];
} else {
$redirect_url = $callback_url . '?token=' . $_POST['token'];
}
header('Location:' . $redirect_url);
// Desktop app auth step 2.2
} else {
......
......@@ -49,4 +49,3 @@ if (isset($this_user) && $this_user->manages($artist->name)) {
}
$smarty->assign('pagetitle', $artist->name);
$smarty->assign('headerfile', 'artist-header.tpl');
{include file='header.tpl'}
{include file='header.tpl' subheader='album-header.tpl'}
<div about="{$id}" typeof="mo:Record" class="haudio">
<div{if $album->image != false} rel="foaf:depiction"{/if}>
......
{include file='header.tpl'}
{include file='header.tpl' subheader='artist-header.tpl'}
<div about="{$id}" typeof="mo:MusicArtist">
......
{include file='header.tpl'}
{include file='header.tpl' subheader='artist-header.tpl'}
{if $flattr_uid}
{include file='flattr.tpl'}
......
......@@ -42,10 +42,10 @@
<div id="main-container">
<div id="main" class="wrapper clearfix">
<article>
<header>
{if isset($headerfile)}
{include file="$headerfile"}
<article>
<header>
{if isset($subheader)}
{include file="$subheader"}
{/if}
{if isset($pageheading)}
<h1 id="page-title" class="asset-name">{$pageheading}</h1>
......
{include file='header.tpl'}
{include file='header.tpl' subheader='track-header.tpl'}
<div about="{$track->id|escape:'html':'UTF-8'}" typeof="mo:Track" class="haudio">
{if !empty($tagcloud)}
......
{include file='header.tpl'}
{include file='header.tpl' subheader='track-header.tpl'}
{if $flattr_uid}
{include file='flattr.tpl'}
{/if}
......
{include file='header.tpl'}
{include file='header.tpl' subheader='user-header.tpl'}
<center><h3><a href='{$base_url}/user-edit.php'>{t}Edit your profile{/t}</a> | {t}Connections to other services{/t}</h3></center>
......
{include file='header.tpl'}
{include file='header.tpl' subheader='user-header.tpl'}
<center><h3>Edit your profile | <a href='{$base_url}/user-connections.php'>Connections to other services</a></h3></center>
......
{include file='header.tpl'}
{include file='header.tpl' subheader='user-header.tpl'}
{if $me->bio}
<div id='bio'>
......
{include file='header.tpl'}
{include file='header.tpl' subheader='user-header.tpl'}
<div about="[_:seq1]" typeof="rdf:Seq" rev="rss:items">
<h3 typeof="rss:channel" property="rss:title" rel="rss:link" resource="#latest_plays" id="latest_plays" content="{$me->name|escape:'html':'UTF-8'}'s Latest Plays">{t plays=$scrobbles|@count}Latest %1 Plays:{/t}</h3>
......
{include file='header.tpl'}
{include file='header.tpl' subheader='user-header.tpl'}
<center>
<h4>
......
{include file='header.tpl'}
{include file='header.tpl' subheader='user-header.tpl'}
<script type="text/javascript" src="{$base_url}/js/stats/user.js"></script>
<script type="text/javascript" src="{$base_url}/js/jquery.jqplot.min.js"></script>
<script type="text/javascript" src="{$base_url}/js/plugins/jqplot.barRenderer.min.js"></script>
......
......@@ -64,4 +64,3 @@ if (isset($this_user) && $this_user->manages($artist->name)) {
}
$smarty->assign('pagetitle', $track->artist_name . ' : ' . $track->name);
$smarty->assign('headerfile', 'track-header.tpl');
......@@ -106,5 +106,4 @@ $submenu = user_menu($this_user, 'Edit');
$smarty->assign('submenu', $submenu);
$smarty->assign('me', $this_user);
$smarty->assign('headerfile', 'maxiprofile.tpl');
$smarty->display('user-connections.tpl');
......@@ -180,7 +180,6 @@ if (isset($this_user->name)) {
$submenu = user_menu($this_user, 'Edit');
$smarty->assign('submenu', $submenu);
$smarty->assign('me', $this_user);
$smarty->assign('headerfile', 'maxiprofile.tpl');
$smarty->assign('errors', $errors);
$smarty->display('user-edit.tpl');
......
......@@ -89,7 +89,6 @@ if (isset($user->name)) {
$submenu = user_menu($user, 'Overview');
$smarty->assign('submenu', $submenu);
$smarty->assign('headerfile', 'maxiprofile.tpl');
$smarty->display('user-profile.tpl');
} else {
......
......@@ -57,7 +57,6 @@ try {
$smarty->assign('isme', ($this_user->name == $user->name));
$smarty->assign('me', $user);
$smarty->assign('profile', true);
$smarty->assign('pagetitle', $user->name . '\'s recent tracks');
$smarty->assign('extra_head_links', array(
......@@ -77,6 +76,5 @@ $smarty->assign('extra_head_links', array(
$submenu = user_menu($user, 'Recent Tracks');
$smarty->assign('submenu', $submenu);
$smarty->assign('headerfile', 'maxiprofile.tpl');
$smarty->display('user-recent-tracks.tpl');
......@@ -59,7 +59,6 @@ if (isset($user->name)) {
$submenu = user_menu($user, 'Radio Stations');
$smarty->assign('submenu', $submenu);
$smarty->assign('type', $type);
$smarty->assign('headerfile', 'maxiprofile.tpl');
$smarty->display('user-station.tpl');
} else {
......
......@@ -109,7 +109,6 @@ if (isset($user->name)) {
$submenu = user_menu($user, 'Stats');
$smarty->assign('submenu', $submenu);
$smarty->assign('headerfile', 'maxiprofile.tpl');
$smarty->assign('stats', true);
$smarty->display('user-stats.tpl');
......
This directory hold files no longer used
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