summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/class/access.class.php2
-rw-r--r--lib/class/catalog.class.php2
-rw-r--r--lib/class/genre.class.php2
-rw-r--r--lib/class/playlist.class.php2
-rw-r--r--lib/class/song.class.php9
-rw-r--r--lib/class/view.class.php2
-rw-r--r--login.php2
-rw-r--r--modules/libglue/auth.php2
-rw-r--r--modules/libglue/dbh.php2
-rw-r--r--modules/libglue/session.php2
-rw-r--r--templates/menu.inc3
-rw-r--r--templates/show_genres.inc.php2
-rw-r--r--templates/show_login_form.inc6
-rw-r--r--templates/show_now_playing.inc2
-rw-r--r--templates/show_play_selected.inc.php2
-rw-r--r--templates/show_songs.inc2
-rw-r--r--templates/tool_box.inc2
17 files changed, 24 insertions, 22 deletions
diff --git a/lib/class/access.class.php b/lib/class/access.class.php
index 6e6afbf2..85fc3a81 100644
--- a/lib/class/access.class.php
+++ b/lib/class/access.class.php
@@ -1,4 +1,4 @@
-<?
+<?php
/*
This program is free software; you can redistribute it and/or
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index 72cdc560..3d9718aa 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -1,4 +1,4 @@
-<?
+<?php
/*
This program is free software; you can redistribute it and/or
diff --git a/lib/class/genre.class.php b/lib/class/genre.class.php
index 63f15531..dd664c5b 100644
--- a/lib/class/genre.class.php
+++ b/lib/class/genre.class.php
@@ -1,4 +1,4 @@
-<?
+<?php
/*
Copyright 2001 - 2005 Ampache.org
diff --git a/lib/class/playlist.class.php b/lib/class/playlist.class.php
index b42ca188..68188d25 100644
--- a/lib/class/playlist.class.php
+++ b/lib/class/playlist.class.php
@@ -1,4 +1,4 @@
-<?
+<?php
/*
Copyright (c) 2001 - 2005 Ampache.org
diff --git a/lib/class/song.class.php b/lib/class/song.class.php
index b104a4e2..5363bc43 100644
--- a/lib/class/song.class.php
+++ b/lib/class/song.class.php
@@ -1,4 +1,4 @@
-<?
+<?php
/*
Copyright (c) 2004 Ampache.org
@@ -680,7 +680,6 @@ class Song {
@discussion returns true if the $song->type streams ok, false if it must be transcoded to stream
*/
function native_stream() {
- $return = true;
switch ($this->type) {
//TODO: fill out these cases once we have it working for m4a
@@ -688,10 +687,12 @@ class Song {
$return = false;
break;
default:
+ $return = true;
break;
} // end switch
return $return;
+
} // end native_stream
/*!
@@ -699,7 +700,9 @@ class Song {
@discussion test if the song type streams natively and if not returns a transcoding command from the config
*/
function stream_cmd() {
- $return = NULL;
+
+ $return = 'downsample_cmd';
+
if (!$this->native_stream()) {
switch ($this->type) {
case "m4a":
diff --git a/lib/class/view.class.php b/lib/class/view.class.php
index 7d9bf79f..112148ad 100644
--- a/lib/class/view.class.php
+++ b/lib/class/view.class.php
@@ -1,4 +1,4 @@
-<?
+<?php
/*
Copyright (c) 2004 Ampache.org
diff --git a/login.php b/login.php
index 04a0d5e8..e7b56a69 100644
--- a/login.php
+++ b/login.php
@@ -105,7 +105,7 @@ function focus(){ document.login.username.focus(); }
</head>
<body bgcolor="<?php echo conf('bg_color1'); ?>" onload="focus();">
-<?
+<?php
require(conf('prefix') . "/templates/show_login_form.inc");
diff --git a/modules/libglue/auth.php b/modules/libglue/auth.php
index 0ef41e8c..1cd55418 100644
--- a/modules/libglue/auth.php
+++ b/modules/libglue/auth.php
@@ -1,4 +1,4 @@
-<?
+<?php
/* ------------------- CVS INFO ----------------------
*
* $Source: /data/cvsroot/ampache/libglue/auth.php,v $
diff --git a/modules/libglue/dbh.php b/modules/libglue/dbh.php
index 71d04b9c..ca00d0a1 100644
--- a/modules/libglue/dbh.php
+++ b/modules/libglue/dbh.php
@@ -1,4 +1,4 @@
-<?
+<?php
/*
* ---------------------------- CVS INFO --------------------------------
*
diff --git a/modules/libglue/session.php b/modules/libglue/session.php
index aef10c60..b0534844 100644
--- a/modules/libglue/session.php
+++ b/modules/libglue/session.php
@@ -1,4 +1,4 @@
-<?
+<?php
/* ------------------- CVS INFO ----------------------
*
* $Source: /data/cvsroot/ampache/libglue/session.php,v $
diff --git a/templates/menu.inc b/templates/menu.inc
index bd084e2f..4573725c 100644
--- a/templates/menu.inc
+++ b/templates/menu.inc
@@ -47,7 +47,7 @@ if ($GLOBALS['user']->prefs['upload']) {
?>
<ul id="mainmenu">
-<?
+<?php
foreach ( array_keys($items) as $item ) {
if ( _($high) == $item ) {
print("\t\t<li class=\"active\"><a class=\"active\" href=\"$items[$item]\">$item</a></li>\n");
@@ -85,6 +85,5 @@ if ($GLOBALS['user']->prefs['upload']) {
print("\t\t<li><a href=\"".conf('web_path')."/logout.php\">" . _("Logout") . "</a> </li>\n");
} // else no user
?>
-
</ul>
<br />
diff --git a/templates/show_genres.inc.php b/templates/show_genres.inc.php
index a263e630..dffcd01b 100644
--- a/templates/show_genres.inc.php
+++ b/templates/show_genres.inc.php
@@ -53,7 +53,7 @@ $total_items = $view->total_items;
Download
</td>
</tr>
-<? } // end foreach genres ?>
+<?php } // end foreach genres ?>
<tr class="even" align="center">
<td colspan="5">
<?php if ($view->offset_limit) { require (conf('prefix') . "/templates/list_header.inc"); } ?>
diff --git a/templates/show_login_form.inc b/templates/show_login_form.inc
index 769f9f19..42939fd8 100644
--- a/templates/show_login_form.inc
+++ b/templates/show_login_form.inc
@@ -75,9 +75,9 @@ if (preg_match($subject,$_SERVER['HTTP_HOST'])) {
All Rights Reserved, Copyright &copy; 2005<br />
</font>
</p>
-<? } ?>
-<?php if (isset($auth['error'])) { ?>
+<?php } ?>
+<?php if (isset($auth['error'])) { ?>
<p align="center">
<font color="red"><?php echo trim($auth['error']); ?></font>
</p>
-<?php } ?>
+<?php } ?>
diff --git a/templates/show_now_playing.inc b/templates/show_now_playing.inc
index 17671db3..d4df9dc2 100644
--- a/templates/show_now_playing.inc
+++ b/templates/show_now_playing.inc
@@ -74,4 +74,4 @@
} // while we're getting songs
?>
</table>
-<? } ?>
+<?php } ?>
diff --git a/templates/show_play_selected.inc.php b/templates/show_play_selected.inc.php
index b89e7d47..1f7ac16c 100644
--- a/templates/show_play_selected.inc.php
+++ b/templates/show_play_selected.inc.php
@@ -50,7 +50,7 @@ function ToBatch(action)
<?php if (batch_ok()) { ?>
&nbsp;&nbsp;
<input class="button" type="button" name="super_action" value="<?php echo _("Download Selected"); ?>" onclick="return ToBatch('download_selected');" />
- <? } ?>
+ <?php } ?>
<!--
<input class="button" type="button" name="super_action" value="<?php echo _("Flag Selected"); ?>" />
<input class="button" type="button" name="super_action" value="<?php echo _("Edit Selected"); ?>" />
diff --git a/templates/show_songs.inc b/templates/show_songs.inc
index d4ef5fd5..2f006009 100644
--- a/templates/show_songs.inc
+++ b/templates/show_songs.inc
@@ -120,7 +120,7 @@ show_clear();
<?php } ?>
</td>
</tr>
- <?
+ <?php
}// foreach loop
//
diff --git a/templates/tool_box.inc b/templates/tool_box.inc
index f1ec0ecf..1433a4c8 100644
--- a/templates/tool_box.inc
+++ b/templates/tool_box.inc
@@ -33,7 +33,7 @@
</tr>
<tr>
<td class="even">
- <?
+ <?php
foreach (array_keys($items) as $item) {
print("\t\t\t&gt;&gt; <a href=\"$items[$item]\"> $item</a><br />\n");
}
generated by cgit (git 2.34.1) at 2025-08-13 13:31:50 +0000