summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-09-29 23:02:54 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-09-29 23:02:54 +0000
commit603d2a9ba4e7e3a0adb7eaecaae874039e71fefa (patch)
treece33ef778bec772736bf778bfc1df8c8f7690b50
parent338520b8c91291d431b525e033f3b29c79095300 (diff)
downloadampache-603d2a9ba4e7e3a0adb7eaecaae874039e71fefa.tar.gz
ampache-603d2a9ba4e7e3a0adb7eaecaae874039e71fefa.tar.bz2
ampache-603d2a9ba4e7e3a0adb7eaecaae874039e71fefa.zip
fixed style.inc references
-rw-r--r--activate.php5
-rw-r--r--register.php6
-rw-r--r--tv.php3
3 files changed, 10 insertions, 4 deletions
diff --git a/activate.php b/activate.php
index 5942994b..d635982e 100644
--- a/activate.php
+++ b/activate.php
@@ -23,13 +23,16 @@
$no_session = true;
require_once('lib/init.php');
+$web_path = conf('web_path');
+
/* Keep them out if they shouldn't be here */
if(!conf('allow_public_registration') || conf('demo_mode')) {
access_denied();
}
?>
<html><head>
-<?php show_template('style'); ?>
+<link rel="stylesheet" href="<?php echo $web_path; ?>/templates/default.css" type="text/css" />
+<link rel="stylesheet" href="<?php echo $web_path; ?><?php echo conf('theme_path'); ?>/templates/default.css" type="text/css" />
<head><body>
<?php
diff --git a/register.php b/register.php
index df3fa5cf..63119f3e 100644
--- a/register.php
+++ b/register.php
@@ -30,6 +30,7 @@
$no_session = true;
require_once ('lib/init.php');
+$web_path = conf('web_path');
/* Check Perms */
if (!conf('allow_public_registration') || conf('demo_mode')) {
@@ -161,7 +162,10 @@ switch ($action) {
'Please check your e-mail for further information';
send_confirmation($username, $fullname, $email, $pass1, $validation);
- show_template('style');
+ ?>
+ <link rel="stylesheet" href="<?php echo $web_path; ?>/templates/default.css" type="text/css" />
+ <link rel="stylesheet" href="<?php echo $web_path; ?><?php echo conf('theme_path'); ?>/templates/default.css" type="text/css" />
+ <?php
show_confirmation(_('Registration Complete'),$message,'/login.php');
break;
case 'show_add_user':
diff --git a/tv.php b/tv.php
index b67261d2..68cb6443 100644
--- a/tv.php
+++ b/tv.php
@@ -25,13 +25,12 @@
@discussion BIG now playing and (soon) on deck
*/
require_once('lib/init.php');
-show_template('style');
+
if (conf('refresh_interval')) {
echo '<script language="JavaScript" type="text/javascript"> var mpd_elapsed = '.$myMpd->current_track_position." </script>\n";
echo '<script language="JavaScript" type="text/javascript"> var mpd_song_length = '.$myMpd->current_track_length." </script>\n";
echo '<script language="JavaScript" type="text/javascript"> var mpd_state = "'.$myMpd->state.'" </script>';
- show_template('javascript_refresh');
}
?>