diff options
| author | Paul 'flowerysong' Arthur <flowerysong00@yahoo.com> | 2010-06-13 08:11:09 +0000 |
|---|---|---|
| committer | Paul 'flowerysong' Arthur <flowerysong00@yahoo.com> | 2010-06-13 08:11:09 +0000 |
| commit | 4b5756ba9d8ee9e83c1ba4624b461b4746e49e82 (patch) | |
| tree | 2e46772da9d25197fd847b273ca1f9b882ad3e34 /templates | |
| parent | 93f4a26ab07207e1f9a8e716a82c5d8812d5344c (diff) | |
| download | ampache-4b5756ba9d8ee9e83c1ba4624b461b4746e49e82.tar.gz ampache-4b5756ba9d8ee9e83c1ba4624b461b4746e49e82.tar.bz2 ampache-4b5756ba9d8ee9e83c1ba4624b461b4746e49e82.zip | |
Miscellaneous cleanup.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/footer.inc.php | 2 | ||||
| -rw-r--r-- | templates/rightbar.inc.php | 4 | ||||
| -rw-r--r-- | templates/show_album.inc.php | 7 | ||||
| -rw-r--r-- | templates/show_install.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_install_account.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_install_config.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_install_lang.inc.php | 2 | ||||
| -rw-r--r-- | templates/sidebar_home.inc.php | 6 |
8 files changed, 15 insertions, 12 deletions
diff --git a/templates/footer.inc.php b/templates/footer.inc.php index 8a0ac738..1c051cd3 100644 --- a/templates/footer.inc.php +++ b/templates/footer.inc.php @@ -22,7 +22,7 @@ */ ?> <div style="clear:both;"></div> -<?php if ($_SESSION['userdata']['password'] == 'old') {?> +<?php if (isset($_SESSION['userdata']['password'])) {?> <span class="fatalerror"><?php echo _('Using Old Password Encryption, Please Reset your Password'); ?></span> <?php } ?> </div> <!-- end id="content"--> diff --git a/templates/rightbar.inc.php b/templates/rightbar.inc.php index 55fcf26f..51f8d978 100644 --- a/templates/rightbar.inc.php +++ b/templates/rightbar.inc.php @@ -79,7 +79,7 @@ $objects = array(); //FIXME :: this is kludgy - if (NO_SONGS != '1') { + if (!defined('NO_SONGS')) { $objects = $GLOBALS['user']->playlist->get_items(); } @@ -108,7 +108,7 @@ <?php } if (!count($objects)) { ?> <li class="error"><?php echo _('Not Enough Data'); ?></li> <?php } ?> -<?php if ($truncated) { ?> +<?php if (isset($truncated)) { ?> <li class="<?php echo flip_class(); ?>"> <?php echo $truncated . ' ' . _('More'); ?>... </li> diff --git a/templates/show_album.inc.php b/templates/show_album.inc.php index 928ffbb3..3c49a3d1 100644 --- a/templates/show_album.inc.php +++ b/templates/show_album.inc.php @@ -24,15 +24,16 @@ $web_path = Config::get('web_path'); $ajax_url = Config::get('ajax_url'); // Title for this album +$title = scrub_out($album->name) . ' (' . $album->year . ')'; if ($album->disk) { - $disk = "<span class=\"discnb disc" .$album->disk. "\">, " . _('Disk') . " " . $album->disk . "</span>"; + $title .= "<span class=\"discnb disc" . $album->disk . "\">, " . _('Disk') . " " . $album->disk . "</span>"; } -$title = scrub_out($album->name) . ' (' . $album->year . ')' . $disk .' - ' . $album->f_artist_link; +$title .= ' - ' . $album->f_artist_link; ?> <?php show_box_top($title,'info-box'); ?> <div class="album_art"> <?php - if ($album_name != _('Unknown (Orphaned)')) { + if ($album->name != _('Unknown (Orphaned)')) { $name = '[' . $album->f_artist . '] ' . scrub_out($album->full_name); $aa_url = $web_path . "/image.php?id=" . $album->id . "&type=popup&sid=" . session_id(); diff --git a/templates/show_install.inc.php b/templates/show_install.inc.php index 250219f3..963267cc 100644 --- a/templates/show_install.inc.php +++ b/templates/show_install.inc.php @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -if (INSTALL != '1') { exit; } +if (!defined('INSTALL')) { exit; } $prefix = realpath(dirname(__FILE__). "/../"); $dir = is_rtl($htmllang) ? 'rtl' : 'ltr'; ?> diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php index ef1a9676..826c88bd 100644 --- a/templates/show_install_account.inc.php +++ b/templates/show_install_account.inc.php @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -if (INSTALL != '1') { exit; } +if (!defined('INSTALL')) { exit; } $prefix = realpath(dirname(__FILE__). "/../"); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> diff --git a/templates/show_install_config.inc.php b/templates/show_install_config.inc.php index ba4dd9af..bbf38e34 100644 --- a/templates/show_install_config.inc.php +++ b/templates/show_install_config.inc.php @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -if (INSTALL != '1') { exit; } +if (!defined('INSTALL')) { exit; } $prefix = realpath(dirname(__FILE__). "/../"); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> diff --git a/templates/show_install_lang.inc.php b/templates/show_install_lang.inc.php index 581af634..803c41ac 100644 --- a/templates/show_install_lang.inc.php +++ b/templates/show_install_lang.inc.php @@ -21,7 +21,7 @@ */ $prefix = realpath(dirname(__FILE__). "/../"); ?> -<?php if (INSTALL != '1') { exit; } ?> +<?php if (!defined('INSTALL')) { exit; } ?> <?php $results = 0; ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>"> diff --git a/templates/sidebar_home.inc.php b/templates/sidebar_home.inc.php index 3593fb50..b4fd1ec8 100644 --- a/templates/sidebar_home.inc.php +++ b/templates/sidebar_home.inc.php @@ -25,8 +25,10 @@ $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path'); <li><h4><?php echo _('Browse'); ?></h4> <?php // Build the selected dealie - $text = scrub_in($_REQUEST['action']) . '_ac'; - ${$text} = ' selected="selected"'; + if (isset($_REQUEST['action'])) { + $text = scrub_in($_REQUEST['action']) . '_ac'; + ${$text} = ' selected="selected"'; + } ?> <ul class="sb3" id="sb_browse_bb"> <li id="sb_browse_bb_SongTitle"><a href="<?php echo $web_path; ?>/browse.php?action=song"><?php echo _('Song Titles'); ?></a></li> |