diff options
Diffstat (limited to 'templates')
160 files changed, 3093 insertions, 3093 deletions
diff --git a/templates/base.css b/templates/base.css index 89f207c7..cecf6c9f 100644 --- a/templates/base.css +++ b/templates/base.css @@ -1,4 +1,4 @@ -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -27,16 +27,16 @@ *****************/ .tag_size1 { - font-size:.6em; + font-size:.6em; } .tag_size2 { - font-size:.8em; + font-size:.8em; } .tag_size3 { - font-size:1em; + font-size:1em; } .tag_size4 { - font-size:1.2em; + font-size:1.2em; } a.tag_size1, a.tag_size2, a.tag_size3, a.tag_size4 { text-decoration: none; } @@ -48,8 +48,8 @@ a.tag_size1, a.tag_size2, a.tag_size3, a.tag_size4 { text-decoration: none; } * Generic / Misc *****************/ .item_on { - color: #347C17; + color: #347C17; } .item_off { - color: #FF0000; + color: #FF0000; } diff --git a/templates/browse_content.inc.php b/templates/browse_content.inc.php index 2b5fb94a..f1f5ea5d 100644 --- a/templates/browse_content.inc.php +++ b/templates/browse_content.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) diff --git a/templates/browse_filters.inc.php b/templates/browse_filters.inc.php index 2e9bfe57..647fa7d7 100644 --- a/templates/browse_filters.inc.php +++ b/templates/browse_filters.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,71 +25,71 @@ session_start(); <li><h4><?php echo T_('Filters'); ?></h4> <div class="sb3"> <?php if (in_array('starts_with',$allowed_filters)) { ?> - <form id="multi_alpha_filter_form" method="post" action="javascript:void(0);"> - <label id="multi_alpha_filterLabel" for="multi_alpha_filter"><?php echo T_('Starts With'); ?></label> - <input type="text" id="multi_alpha_filter" name="multi_alpha_filter" value="<?php $browse->set_catalog($_SESSION['catalog']); echo scrub_out($browse->get_filter('starts_with'));?>" onKeyUp="delayRun(this, '400', 'ajaxState', '<?php echo Ajax::url('?page=browse&action=browse&browse_id=' . $browse->id . '&key=starts_with'); ?>', 'multi_alpha_filter');"> + <form id="multi_alpha_filter_form" method="post" action="javascript:void(0);"> + <label id="multi_alpha_filterLabel" for="multi_alpha_filter"><?php echo T_('Starts With'); ?></label> + <input type="text" id="multi_alpha_filter" name="multi_alpha_filter" value="<?php $browse->set_catalog($_SESSION['catalog']); echo scrub_out($browse->get_filter('starts_with'));?>" onKeyUp="delayRun(this, '400', 'ajaxState', '<?php echo Ajax::url('?page=browse&action=browse&browse_id=' . $browse->id . '&key=starts_with'); ?>', 'multi_alpha_filter');"> </form> <?php } // end if alpha_match ?> <?php if (in_array('minimum_count',$allowed_filters)) { ?> - <input id="mincountCB" type="checkbox" value="1" /> - <label id="mincountLabel" for="mincountCB"><?php echo T_('Minimum Count'); ?></label><br /> - <?php echo Ajax::observe('mincountCB', 'click', Ajax::action('?page=browse&action=browse&browse_id=' . $browse->id . '&key=min_count&value=1', '')); ?> + <input id="mincountCB" type="checkbox" value="1" /> + <label id="mincountLabel" for="mincountCB"><?php echo T_('Minimum Count'); ?></label><br /> + <?php echo Ajax::observe('mincountCB', 'click', Ajax::action('?page=browse&action=browse&browse_id=' . $browse->id . '&key=min_count&value=1', '')); ?> <?php } ?> <?php if (in_array('rated',$allowed_filters)) { ?> - <input id="ratedCB" type="checkbox" value="1" /> - <label id="ratedLabel" for="ratedCB"><?php echo T_('Rated'); ?></label><br /> - <?php echo Ajax::observe('ratedCB', 'click', Ajax::action('?page=browse&action=browse&browse_id=' . $browse->id . '&key=rated&value=1', '')); ?> + <input id="ratedCB" type="checkbox" value="1" /> + <label id="ratedLabel" for="ratedCB"><?php echo T_('Rated'); ?></label><br /> + <?php echo Ajax::observe('ratedCB', 'click', Ajax::action('?page=browse&action=browse&browse_id=' . $browse->id . '&key=rated&value=1', '')); ?> <?php } ?> <?php if (in_array('unplayed',$allowed_filters)) { ?> - <input id="unplayedCB" type="checkbox" <?php echo $string = $browse->get_filter('unplayed') ? 'checked="checked"' : ''; ?>/> - <label id="unplayedLabel" for="unplayedCB"><?php echo T_('Unplayed'); ?></label><br /> + <input id="unplayedCB" type="checkbox" <?php echo $string = $browse->get_filter('unplayed') ? 'checked="checked"' : ''; ?>/> + <label id="unplayedLabel" for="unplayedCB"><?php echo T_('Unplayed'); ?></label><br /> <?php } ?> <?php if (in_array('playlist_type',$allowed_filters)) { ?> - <input id="show_allplCB" type="checkbox" <?php echo $string = $browse->get_filter('playlist_type') ? 'checked="checked"' : ''; ?>/> - <label id="show_allplLabel" for="showallplCB"><?php echo T_('All Playlists'); ?></label><br /> - <?php echo Ajax::observe('show_allplCB','click',Ajax::action('?page=browse&action=browse&browse_id=' . $browse->id . '&key=playlist_type&value=1','')); ?> + <input id="show_allplCB" type="checkbox" <?php echo $string = $browse->get_filter('playlist_type') ? 'checked="checked"' : ''; ?>/> + <label id="show_allplLabel" for="showallplCB"><?php echo T_('All Playlists'); ?></label><br /> + <?php echo Ajax::observe('show_allplCB','click',Ajax::action('?page=browse&action=browse&browse_id=' . $browse->id . '&key=playlist_type&value=1','')); ?> <?php } // if playlist_type ?> <?php if (in_array('object_type',$allowed_filters)) { ?> - <?php $string = 'otype_' . $browse->get_filter('object_type'); ${$string} = 'selected="selected"'; ?> - <input id="typeSongRadio" type="radio" name="object_type" value="1" <?php echo $otype_song; ?>/> - <label id="typeSongLabel" for="typeSongRadio"><?php echo T_('Song Title'); ?></label><br /> - <?php echo Ajax::observe('typeSongRadio','click',Ajax::action('?page=tag&action=browse_type&browse_id=' . $browse->id . '&type=song','')); ?> - <input id="typeAlbumRadio" type="radio" name="object_type" value="1" /> - <label id="typeAlbumLabel" for="typeAlbumRadio"><?php echo T_('Albums'); ?></label><br /> - <?php echo Ajax::observe('typeAlbumRadio','click',Ajax::action('?page=tag&action=browse_type&browse_id=' . $browse->id . '&type=album','')); ?> - <input id="typeArtistRadio" type="radio" name="object_type" value="1" /> - <label id="typeArtistLabel" for="typeArtistRadio"><?php echo T_('Artist'); ?></label><br /> - <?php echo Ajax::observe('typeArtistRadio','click',Ajax::action('?page=tag&action=browse_type&browse_id=' . $browse->id . '&type=artist','')); ?> + <?php $string = 'otype_' . $browse->get_filter('object_type'); ${$string} = 'selected="selected"'; ?> + <input id="typeSongRadio" type="radio" name="object_type" value="1" <?php echo $otype_song; ?>/> + <label id="typeSongLabel" for="typeSongRadio"><?php echo T_('Song Title'); ?></label><br /> + <?php echo Ajax::observe('typeSongRadio','click',Ajax::action('?page=tag&action=browse_type&browse_id=' . $browse->id . '&type=song','')); ?> + <input id="typeAlbumRadio" type="radio" name="object_type" value="1" /> + <label id="typeAlbumLabel" for="typeAlbumRadio"><?php echo T_('Albums'); ?></label><br /> + <?php echo Ajax::observe('typeAlbumRadio','click',Ajax::action('?page=tag&action=browse_type&browse_id=' . $browse->id . '&type=album','')); ?> + <input id="typeArtistRadio" type="radio" name="object_type" value="1" /> + <label id="typeArtistLabel" for="typeArtistRadio"><?php echo T_('Artist'); ?></label><br /> + <?php echo Ajax::observe('typeArtistRadio','click',Ajax::action('?page=tag&action=browse_type&browse_id=' . $browse->id . '&type=artist','')); ?> <?php } ?> <?php if(in_array('catalog',$allowed_filters)) { ?> <form method="post" id="catalog_choice" action="javascript.void(0);"> - <label id="catalogLabel" for="catalog_select"><?php echo T_('Catalog'); ?></label><br /> - <select id="catalog_select" name="catalog_key"> - <option value="0">All</option> - <?php - $sql = 'SELECT `id`,`name` FROM `catalog`'; - $db_results = Dba::read($sql); - while( $data = Dba::fetch_assoc($db_results) ) { - $results[] = $data; - } - - foreach( $results as $entries ) { - echo '<option value="' . $entries['id'] . '" '; - if( $_SESSION['catalog'] == $entries['id'] ) { - echo ' selected="selected" '; - } - echo '>' . $entries['name'] . '</options>'; - } - ?> - - </select> + <label id="catalogLabel" for="catalog_select"><?php echo T_('Catalog'); ?></label><br /> + <select id="catalog_select" name="catalog_key"> + <option value="0">All</option> + <?php + $sql = 'SELECT `id`,`name` FROM `catalog`'; + $db_results = Dba::read($sql); + while( $data = Dba::fetch_assoc($db_results) ) { + $results[] = $data; + } + + foreach( $results as $entries ) { + echo '<option value="' . $entries['id'] . '" '; + if( $_SESSION['catalog'] == $entries['id'] ) { + echo ' selected="selected" '; + } + echo '>' . $entries['name'] . '</options>'; + } + ?> + + </select> <?php echo Ajax::observe('catalog_select', 'change', Ajax::action('?page=browse&action=browse&browse_id=' . $browse->id,'catalog_select', 'catalog_choice'), true); ?> </form> <?php } ?> <?php if (in_array('show_art',$allowed_filters)) { ?> - <?php echo T_('Toggle Artwork'); ?> <input id="show_artCB" type="checkbox" <?php echo Art::is_enabled() ? 'checked="checked"' : ''; ?>/> - <?php echo Ajax::observe('show_artCB','click',Ajax::action('?page=browse&action=show_art&browse_id=' . $browse->id, '')); ?> + <?php echo T_('Toggle Artwork'); ?> <input id="show_artCB" type="checkbox" <?php echo Art::is_enabled() ? 'checked="checked"' : ''; ?>/> + <?php echo Ajax::observe('show_artCB','click',Ajax::action('?page=browse&action=show_art&browse_id=' . $browse->id, '')); ?> <?php } // if show_art ?> </div> </li> diff --git a/templates/error_page.inc.php b/templates/error_page.inc.php index 62cd63f5..cc4734bb 100644 --- a/templates/error_page.inc.php +++ b/templates/error_page.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -22,8 +22,8 @@ ?> <!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; ?>" - dir="<?php echo $dir;?>"> + xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>" + dir="<?php echo $dir;?>"> <head> <meta http-equiv="refresh" content="10;URL=<?php echo($redirect_url);?>" /> @@ -36,20 +36,20 @@ <!-- rfc3514 implementation --> <div id="rfc3514" style="display: none;">0x0</div> <div id="maincontainer"> - <div id="header"> - <div id="headerlogo"> - <img src="<?php echo $web_path; echo Config::get('theme_path'); ?>/images/ampache.png" - title="<?php echo Config::get('site_title'); ?>" - alt="<?php echo Config::get('site_title'); ?>" /> - </div> - </div> - <div> </div> - <div id="errormsg"> - <?php echo (T_("The folowing error has occured, you will automaticly be redirected after 10 seconds.") ); ?> - <br /><br /> - <?php echo(T_("Error messages"));?>:<br /> - <?php Error::display('general'); ?> - </div> + <div id="header"> + <div id="headerlogo"> + <img src="<?php echo $web_path; echo Config::get('theme_path'); ?>/images/ampache.png" + title="<?php echo Config::get('site_title'); ?>" + alt="<?php echo Config::get('site_title'); ?>" /> + </div> + </div> + <div> </div> + <div id="errormsg"> + <?php echo (T_("The folowing error has occured, you will automaticly be redirected after 10 seconds.") ); ?> + <br /><br /> + <?php echo(T_("Error messages"));?>:<br /> + <?php Error::display('general'); ?> + </div> </div> </body> </html> diff --git a/templates/footer.inc.php b/templates/footer.inc.php index 846fca78..4176884f 100644 --- a/templates/footer.inc.php +++ b/templates/footer.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,9 +24,9 @@ </div> <!-- end id="content"--> </div> <!-- end id="maincontainer"--> <div id="footer"> - <a href="http://www.ampache.org/index.php">Ampache v.<?php echo Config::get('version'); ?></a><br /> - Copyright (c) 2001 - 2013 Ampache.org - <?php echo T_('Queries:'); ?><?php echo Dba::$stats['query']; ?> <?php echo T_('Cache Hits:'); ?><?php echo database_object::$cache_hit; ?> + <a href="http://www.ampache.org/index.php">Ampache v.<?php echo Config::get('version'); ?></a><br /> + Copyright (c) 2001 - 2013 Ampache.org + <?php echo T_('Queries:'); ?><?php echo Dba::$stats['query']; ?> <?php echo T_('Cache Hits:'); ?><?php echo database_object::$cache_hit; ?> </div> </body> </html> diff --git a/templates/header.inc.php b/templates/header.inc.php index a1deb402..803147c9 100644 --- a/templates/header.inc.php +++ b/templates/header.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -44,7 +44,7 @@ if (Config::get('use_rss')) { ?> <link rel="stylesheet" href="<?php echo $web_path . $theme_path; ?>/default.css" type="text/css" media="screen" /> <?php if (is_rtl(Config::get('lang')) - && is_file(Config::get('theme_path') . '/templates/rtl.css')) { + && is_file(Config::get('theme_path') . '/templates/rtl.css')) { ?> <link rel="stylesheet" href="<?php echo $web_path . $theme_path; ?>/rtl.css type="text/css" media="screen" /> <?php @@ -59,33 +59,33 @@ if (is_rtl(Config::get('lang')) <!-- rfc3514 implementation --> <div id="rfc3514" style="display:none;">0x0</div> <div id="maincontainer"> - <div id="header"><!-- This is the header --> - <h1 id="headerlogo"> - <a href="<?php echo Config::get('web_path'); ?>"> - <img src="<?php echo $web_path; ?><?php echo Config::get('theme_path'); ?>/images/ampache.png" title="<?php echo Config::get('site_title'); ?>" alt="<?php echo Config::get('site_title'); ?>" /> - </a> - </h1> - <div id="headerbox"> - <?php UI::show_box_top('','box box_headerbox'); ?> - <?php require_once Config::get('prefix') . '/templates/show_search_bar.inc.php'; ?> - <?php require_once Config::get('prefix') . '/templates/show_playtype_switch.inc.php'; ?> - <span id="loginInfo"><a href="<?php echo Config::get('web_path'); ?>/preferences.php?tab=account"><?php echo $GLOBALS['user']->fullname; ?></a> <a href="<?php echo Config::get('web_path'); ?>/logout.php">[<?php echo T_('Log out'); ?>]</a></span> - <?php UI::show_box_bottom(); ?> - </div> <!-- End headerbox --> - </div><!-- End header --> - <div id="sidebar"><!-- This is the sidebar --> - <?php require_once Config::get('prefix') . '/templates/sidebar.inc.php'; ?> - </div><!-- End sidebar --> - <div id="rightbar"><!-- This is the rightbar --> - <?php require_once Config::get('prefix') . '/templates/rightbar.inc.php'; ?> - </div><!-- End rightbar --> + <div id="header"><!-- This is the header --> + <h1 id="headerlogo"> + <a href="<?php echo Config::get('web_path'); ?>"> + <img src="<?php echo $web_path; ?><?php echo Config::get('theme_path'); ?>/images/ampache.png" title="<?php echo Config::get('site_title'); ?>" alt="<?php echo Config::get('site_title'); ?>" /> + </a> + </h1> + <div id="headerbox"> + <?php UI::show_box_top('','box box_headerbox'); ?> + <?php require_once Config::get('prefix') . '/templates/show_search_bar.inc.php'; ?> + <?php require_once Config::get('prefix') . '/templates/show_playtype_switch.inc.php'; ?> + <span id="loginInfo"><a href="<?php echo Config::get('web_path'); ?>/preferences.php?tab=account"><?php echo $GLOBALS['user']->fullname; ?></a> <a href="<?php echo Config::get('web_path'); ?>/logout.php">[<?php echo T_('Log out'); ?>]</a></span> + <?php UI::show_box_bottom(); ?> + </div> <!-- End headerbox --> + </div><!-- End header --> + <div id="sidebar"><!-- This is the sidebar --> + <?php require_once Config::get('prefix') . '/templates/sidebar.inc.php'; ?> + </div><!-- End sidebar --> + <div id="rightbar"><!-- This is the rightbar --> + <?php require_once Config::get('prefix') . '/templates/rightbar.inc.php'; ?> + </div><!-- End rightbar --> <!-- Tiny little iframe, used to cheat the system --> <div id="ajax-loading">Loading . . .</div> <iframe name="util_iframe" id="util_iframe" style="display:none;" src="<?php echo Config::get('web_path'); ?>/util.php"></iframe> <div id="content"> <?php if (Config::get('int_config_version') != Config::get('config_version') AND $GLOBALS['user']->has_access(100)) { ?> <div class="fatalerror"> - <?php echo T_('Error Config File Out of Date'); ?> - <a href="<?php echo Config::get('web_path'); ?>/admin/system.php?action=generate_config"><?php echo T_('Generate New Config'); ?></a> + <?php echo T_('Error Config File Out of Date'); ?> + <a href="<?php echo Config::get('web_path'); ?>/admin/system.php?action=generate_config"><?php echo T_('Generate New Config'); ?></a> </div> <?php } ?> diff --git a/templates/install.css b/templates/install.css index 359dd0bf..ddc4e0e7 100644 --- a/templates/install.css +++ b/templates/install.css @@ -1,4 +1,4 @@ -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -20,123 +20,123 @@ */ body { - font-family:Arial, Helvetica, sans-serif; - font-size: 1em; - margin: 0; - padding: 0; - text-align: center; - background: #FFFFFF url(../images/top_bg.jpg) repeat-x top left; + font-family:Arial, Helvetica, sans-serif; + font-size: 1em; + margin: 0; + padding: 0; + text-align: center; + background: #FFFFFF url(../images/top_bg.jpg) repeat-x top left; } h3 { - text-align:left; - border-bottom: 1px dotted #cccccc; - padding-left: 10px; + text-align:left; + border-bottom: 1px dotted #cccccc; + padding-left: 10px; } /* Header */ #header { - width: 90%; - min-height: 85px; - height: 85px; - margin: 0 auto; - padding: 0; - text-align: left; - font-size: smaller; - display: block; + width: 90%; + min-height: 85px; + height: 85px; + margin: 0 auto; + padding: 0; + text-align: left; + font-size: smaller; + display: block; } #header h1 { - margin: 0; - padding-top: 16px; - color: #000; - font-weight: bold; - font-size: large; + margin: 0; + padding-top: 16px; + color: #000; + font-weight: bold; + font-size: large; } #header p { - font-size: smaller; - color: #000; - margin: 0px; + font-size: smaller; + color: #000; + margin: 0px; } /* Content */ #text-box { - width: 90%; - min-height: 85px; - height: 85px; - display: block; - margin: 0 auto; - padding: 0; - text-align: left; - font-size: smaller; + width: 90%; + min-height: 85px; + height: 85px; + display: block; + margin: 0 auto; + padding: 0; + text-align: left; + font-size: smaller; } .error { - color: #ff0033; - font-weight: bold; + color: #ff0033; + font-weight: bold; } .notify { - border: 1px solid #cccccc; - background-color: #f4f4f4; - padding: 5px; - margin-top: 3px; + border: 1px solid #cccccc; + background-color: #f4f4f4; + padding: 5px; + margin-top: 3px; } .content { - border: 1px solid #cccccc; - padding: 5px; - margin-top: 3px; + border: 1px solid #cccccc; + padding: 5px; + margin-top: 3px; } /* Table style */ td{ - padding:5px; - /*background-color: #D9E0E8;*/ - font-size: smaller; + padding:5px; + /*background-color: #D9E0E8;*/ + font-size: smaller; } .align{ - text-align:right; + text-align:right; } /* Estilos para formas */ input, radio, select, textarea { - border: 1px solid #ddd; - background: #f2f2f2; - font: 11px verdana, sans-serif; - color: #443; - padding: 2px; - outline: none; + border: 1px solid #ddd; + background: #f2f2f2; + font: 11px verdana, sans-serif; + color: #443; + padding: 2px; + outline: none; } input:hover, textarea:hover, input:focus, textarea:focus{ - border: 1px solid #aaa; + border: 1px solid #aaa; } /* Extras */ .ok { - font-weight:bold; - color:#009900; - margin:10px 10px 10px 10px; + font-weight:bold; + color:#009900; + margin:10px 10px 10px 10px; } .notok { - font-weight:bold; - color:#FF3300; - margin:3px 3px 3px 3px; + font-weight:bold; + color:#FF3300; + margin:3px 3px 3px 3px; } /* Bottom */ #bottom { - border-top: 1px dotted #cccccc; - margin-top: 10px; - margin-bottom: 10px; - padding:5px; + border-top: 1px dotted #cccccc; + margin-top: 10px; + margin-bottom: 10px; + padding:5px; } #bottom p { - font-size:10px; + font-size:10px; } diff --git a/templates/install_header.inc.php b/templates/install_header.inc.php index c30417a7..8b5c6434 100644 --- a/templates/install_header.inc.php +++ b/templates/install_header.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -39,16 +39,16 @@ $prefix = realpath(dirname(__FILE__). "/../"); <p>For the love of Music</p> </div> <div id="text-box"> - <div class="notify"> - <h3><?php echo T_('Requirements'); ?></h3> - <p> - <?php echo T_('This page handles the installation of the Ampache database and the creation of the ampache.cfg.php file. Before you continue please make sure that you have the following prerequisites:'); ?> - </p> - <ul> - <li><?php echo T_('A MySQL server with a username and password that can create/modify databases'); ?></li> + <div class="notify"> + <h3><?php echo T_('Requirements'); ?></h3> + <p> + <?php echo T_('This page handles the installation of the Ampache database and the creation of the ampache.cfg.php file. Before you continue please make sure that you have the following prerequisites:'); ?> + </p> + <ul> + <li><?php echo T_('A MySQL server with a username and password that can create/modify databases'); ?></li> <li><?php echo sprintf(T_('Your webserver has read access to the files %s and %s'),$prefix . '/sql/ampache.sql',$prefix . '/config/ampache.cfg.php.dist'); ?></li> - </ul> - <p> + </ul> + <p> <?php echo sprintf(T_("Once you have ensured that the above requirements are met please fill out the information below. You will only be asked for the required config values. If you would like to make changes to your Ampache install at a later date simply edit %s"), $prefix . '/config/ampache.cfg.php'); ?> - </p> + </p> </div> diff --git a/templates/javascript_refresh.inc.php b/templates/javascript_refresh.inc.php index eacab776..aa28b3dc 100644 --- a/templates/javascript_refresh.inc.php +++ b/templates/javascript_refresh.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) diff --git a/templates/list_header.inc.php b/templates/list_header.inc.php index ee61d9ab..c162bafc 100644 --- a/templates/list_header.inc.php +++ b/templates/list_header.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -28,10 +28,10 @@ */ // Pull these variables out to allow shorthand (easier for lazy programmers) -$limit = $browse->get_offset(); -$start = $browse->get_start(); -$total = $browse->get_total(); -$uid = Config::get('list_header_uid'); +$limit = $browse->get_offset(); +$start = $browse->get_start(); +$total = $browse->get_total(); +$uid = Config::get('list_header_uid'); $sides = 5; // ++ the uid @@ -47,86 +47,86 @@ if ($prev_offset < 0) { $prev_offset = '0'; } /* Calculate how many pages total exist */ if ($limit > 0 && $total > $limit) { - $pages = ceil($total / $limit); + $pages = ceil($total / $limit); } else { - $pages = 0; + $pages = 0; } // are there enough items to even need this view? if ($pages > 1) { - /* Calculate current page and how many we have on each side */ - $page_data = array('up' => array(), 'down' => array()); + /* Calculate current page and how many we have on each side */ + $page_data = array('up' => array(), 'down' => array()); - // Can't divide by 0 - if ($start > 0) { - $current_page = floor($start / $limit); - } - else { - $current_page = 0; - } + // Can't divide by 0 + if ($start > 0) { + $current_page = floor($start / $limit); + } + else { + $current_page = 0; + } - // Create 10 pages in either direction - // Down first - $page = $current_page; - $i = 0; - while ($page > 0) { - if ($i == $sides) { $page_data['down'][1] = '...'; $page_data['down'][0] = '0'; break; } - $i++; - $page = $page - 1; - $page_data['down'][$page] = $page * $limit; - } // while page > 0 + // Create 10 pages in either direction + // Down first + $page = $current_page; + $i = 0; + while ($page > 0) { + if ($i == $sides) { $page_data['down'][1] = '...'; $page_data['down'][0] = '0'; break; } + $i++; + $page = $page - 1; + $page_data['down'][$page] = $page * $limit; + } // while page > 0 - // Then up - $page = $current_page + 1; - $i = 0; - while ($page <= $pages) { - if ($page * $limit > $total) { break; } - if ($i == $sides) { - $key = $pages - 1; - if (!$page_data['up'][$key]) { $page_data['up'][$key] = '...'; } - $page_data['up'][$pages] = ($pages - 1) * $limit; - break; - } - $i++; - $page = $page + 1; - $page_data['up'][$page] = ($page - 1) * $limit; - } // end while + // Then up + $page = $current_page + 1; + $i = 0; + while ($page <= $pages) { + if ($page * $limit > $total) { break; } + if ($i == $sides) { + $key = $pages - 1; + if (!$page_data['up'][$key]) { $page_data['up'][$key] = '...'; } + $page_data['up'][$pages] = ($pages - 1) * $limit; + break; + } + $i++; + $page = $page + 1; + $page_data['up'][$page] = ($page - 1) * $limit; + } // end while - // Sort these arrays of hotness - ksort($page_data['up']); - ksort($page_data['down']); + // Sort these arrays of hotness + ksort($page_data['up']); + ksort($page_data['down']); ?> <div class="list-header"> <?php echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $prev_offset, T_('Prev'),'browse_' . $uid . 'prev','','prev'); ?> - <?php echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $next_offset, T_('Next'),'browse_' . $uid . 'next','','next'); ?> - <?php - /* Echo everything below us */ - foreach ($page_data['down'] as $page => $offset) { - if ($offset === '...') { echo '... '; } - else { - // Hack Alert - $page++; - echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $offset,$page,'browse_' . $uid . 'page_' . $page,'','page-nb'); - } - } // end foreach down + <?php echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $next_offset, T_('Next'),'browse_' . $uid . 'next','','next'); ?> + <?php + /* Echo everything below us */ + foreach ($page_data['down'] as $page => $offset) { + if ($offset === '...') { echo '... '; } + else { + // Hack Alert + $page++; + echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $offset,$page,'browse_' . $uid . 'page_' . $page,'','page-nb'); + } + } // end foreach down - /* Echo current page */ - $current_page++; - ?> - <span class="page-nb selected"><?php echo $current_page; ?></span> - <?php + /* Echo current page */ + $current_page++; + ?> + <span class="page-nb selected"><?php echo $current_page; ?></span> + <?php - /* Echo everything above us */ - foreach ($page_data['up'] as $page=>$offset) { - if ($offset === '...') { echo '... '; } - else { - echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $offset,$page,'browse_' . $uid . 'page_' . $page,'','page-nb'); - } // end else - } // end foreach up - ?> + /* Echo everything above us */ + foreach ($page_data['up'] as $page=>$offset) { + if ($offset === '...') { echo '... '; } + else { + echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $offset,$page,'browse_' . $uid . 'page_' . $page,'','page-nb'); + } // end else + } // end foreach up + ?> </div> <?php } // if stuff diff --git a/templates/print.css b/templates/print.css index fbe17139..f677482d 100644 --- a/templates/print.css +++ b/templates/print.css @@ -91,9 +91,9 @@ BDO[DIR="rtl"] { direction: rtl; unicode-bidi: bidi-override } *[DIR="ltr"] { direction: ltr; unicode-bidi: embed } *[DIR="rtl"] { direction: rtl; unicode-bidi: embed } -@media print { +@media print { - h1 { page-break-before: always } + h1 { page-break-before: always } h1, h2, h3, h4, h5, h6 { page-break-after: avoid } ul, ol, dl { page-break-before: avoid } diff --git a/templates/rightbar.inc.php b/templates/rightbar.inc.php index cb979e52..1c3725d8 100644 --- a/templates/rightbar.inc.php +++ b/templates/rightbar.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -21,96 +21,96 @@ */ ?> <ul id="rb_action"> - <li> - <?php echo Ajax::button('?page=stream&action=basket','all', T_('Play'),'rightbar_play'); ?> - </li> - <li id="pl_add"> - <?php echo UI::get_icon('playlist_add', T_('Add to Playlist')); ?> - <ul id="pl_action_additems" class="submenu"> - <li> - <?php echo Ajax::text('?page=playlist&action=create', T_('Add to New Playlist'),'rb_create_playlist'); ?> - </li> - <?php - $playlists = Playlist::get_users($GLOBALS['user']->id); - Playlist::build_cache($playlists); - foreach ($playlists as $playlist_id) { - $playlist = new Playlist($playlist_id); - $playlist->format(); - ?> - <li> - <?php echo Ajax::text('?page=playlist&action=append&playlist_id=' . $playlist->id,$playlist->f_name,'rb_append_playlist_' . $playlist->id); ?> - </li> - <?php } ?> - </ul> - </li> + <li> + <?php echo Ajax::button('?page=stream&action=basket','all', T_('Play'),'rightbar_play'); ?> + </li> + <li id="pl_add"> + <?php echo UI::get_icon('playlist_add', T_('Add to Playlist')); ?> + <ul id="pl_action_additems" class="submenu"> + <li> + <?php echo Ajax::text('?page=playlist&action=create', T_('Add to New Playlist'),'rb_create_playlist'); ?> + </li> + <?php + $playlists = Playlist::get_users($GLOBALS['user']->id); + Playlist::build_cache($playlists); + foreach ($playlists as $playlist_id) { + $playlist = new Playlist($playlist_id); + $playlist->format(); + ?> + <li> + <?php echo Ajax::text('?page=playlist&action=append&playlist_id=' . $playlist->id,$playlist->f_name,'rb_append_playlist_' . $playlist->id); ?> + </li> + <?php } ?> + </ul> + </li> <?php if (Access::check_function('batch_download')) { ?> - <li> - <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=tmp_playlist&id=<?php echo $GLOBALS['user']->playlist->id; ?>"> - <?php echo UI::get_icon('batch_download', T_('Batch Download')); ?> + <li> + <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=tmp_playlist&id=<?php echo $GLOBALS['user']->playlist->id; ?>"> + <?php echo UI::get_icon('batch_download', T_('Batch Download')); ?> </a> - </li> + </li> <?php } ?> - <li> - <?php echo Ajax::button('?action=basket&type=clear_all','delete', T_('Clear Playlist'),'rb_clear_playlist'); ?> - </li> - <li id="rb_add"> - <?php echo UI::get_icon('add', T_('Add Dynamic Items')); ?> - <ul id="rb_action_additems" class="submenu"> - <li> - <?php echo Ajax::text('?action=basket&type=dynamic&random_type=default', T_('Pure Random'),'rb_add_pure_random'); ?> - </li> - <li> - <?php echo Ajax::text('?action=basket&type=dynamic&random_type=artist', T_('Related Artist'),'rb_add_related_artist'); ?> - </li> - <li> - <?php echo Ajax::text('?action=basket&type=dynamic&random_type=album', T_('Related Album'),'rb_add_related_album'); ?> - </li> - <li> - <?php echo Ajax::text('?action=basket&type=dynamic&random_type=tag', T_('Related Tag'),'rb_add_related_tag'); ?> - </li> - </ul> - </li> + <li> + <?php echo Ajax::button('?action=basket&type=clear_all','delete', T_('Clear Playlist'),'rb_clear_playlist'); ?> + </li> + <li id="rb_add"> + <?php echo UI::get_icon('add', T_('Add Dynamic Items')); ?> + <ul id="rb_action_additems" class="submenu"> + <li> + <?php echo Ajax::text('?action=basket&type=dynamic&random_type=default', T_('Pure Random'),'rb_add_pure_random'); ?> + </li> + <li> + <?php echo Ajax::text('?action=basket&type=dynamic&random_type=artist', T_('Related Artist'),'rb_add_related_artist'); ?> + </li> + <li> + <?php echo Ajax::text('?action=basket&type=dynamic&random_type=album', T_('Related Album'),'rb_add_related_album'); ?> + </li> + <li> + <?php echo Ajax::text('?action=basket&type=dynamic&random_type=tag', T_('Related Tag'),'rb_add_related_tag'); ?> + </li> + </ul> + </li> </ul> <?php if (Config::get('play_type') == 'localplay') { require_once Config::get('prefix') . '/templates/show_localplay_control.inc.php'; } ?> <ul id="rb_current_playlist"> <?php - $objects = array(); + $objects = array(); - //FIXME :: this is kludgy - if (!defined('NO_SONGS')) { - $objects = $GLOBALS['user']->playlist->get_items(); - } + //FIXME :: this is kludgy + if (!defined('NO_SONGS')) { + $objects = $GLOBALS['user']->playlist->get_items(); + } - // Limit the number of objects we show here - if (count($objects) > 100) { - $truncated = (count($objects) - 100); - $objects = array_slice($objects, 0, 100, true); - } + // Limit the number of objects we show here + if (count($objects) > 100) { + $truncated = (count($objects) - 100); + $objects = array_slice($objects, 0, 100, true); + } - $normal_array = array('radio','song','video','random'); + $normal_array = array('radio','song','video','random'); - foreach ($objects as $uid=>$object_data) { - $type = array_shift($object_data); - if (in_array($type,$normal_array)) { - $object = new $type(array_shift($object_data)); - $object->format(); - } - if ($type == 'random') { - $object->f_link = Random::get_type_name($type); - } + foreach ($objects as $uid=>$object_data) { + $type = array_shift($object_data); + if (in_array($type,$normal_array)) { + $object = new $type(array_shift($object_data)); + $object->format(); + } + if ($type == 'random') { + $object->f_link = Random::get_type_name($type); + } ?> <li class="<?php echo UI::flip_class(); ?>" > <?php echo $object->f_link; ?> - <?php echo Ajax::button('?action=current_playlist&type=delete&id=' . $uid,'delete', T_('Delete'),'rightbar_delete_' . $uid,'','delitem'); ?> + <?php echo Ajax::button('?action=current_playlist&type=delete&id=' . $uid,'delete', T_('Delete'),'rightbar_delete_' . $uid,'','delitem'); ?> </li> <?php } if (!count($objects)) { ?> - <li class="error"><?php echo T_('Not Enough Data'); ?></li> + <li class="error"><?php echo T_('Not Enough Data'); ?></li> <?php } ?> <?php if (isset($truncated)) { ?> - <li class="<?php echo UI::flip_class(); ?>"> - <?php echo $truncated . ' ' . T_('More'); ?>... - </li> + <li class="<?php echo UI::flip_class(); ?>"> + <?php echo $truncated . ' ' . T_('More'); ?>... + </li> <?php } ?> </ul> @@ -121,6 +121,6 @@ // We do this last because we want it to load, and we want to know if there is anything // to even pass if (count($objects)) { - Stream::run_playlist_method(); + Stream::run_playlist_method(); } ?> diff --git a/templates/show_access_list.inc.php b/templates/show_access_list.inc.php index 2973e01c..c724779b 100644 --- a/templates/show_access_list.inc.php +++ b/templates/show_access_list.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -23,21 +23,21 @@ <?php UI::show_box_top(T_('Access Control'), 'box box_access_control'); ?> <div id="information_actions" class="left-column"> <ul> - <li> - <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_add_current"><?php echo UI::get_icon('add_user', T_('Add Current Host')); ?></a> - <?php echo T_('Add Current Host'); ?> - </li> - <li> - <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_add_rpc"><?php echo UI::get_icon('cog', T_('Add API / RPC Host')); ?></a> - <?php echo T_('Add API / RPC Host'); ?> - </li> - <li> - <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_add_local"><?php echo UI::get_icon('home', T_('Add Local Network Definition')); ?></a> - <?php echo T_('Add Local Network Definition'); ?> - <li> - <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_add_advanced"><?php echo UI::get_icon('add_key', T_('Advanced Add')); ?></a> - <?php echo T_('Advanced Add'); ?> - </li> + <li> + <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_add_current"><?php echo UI::get_icon('add_user', T_('Add Current Host')); ?></a> + <?php echo T_('Add Current Host'); ?> + </li> + <li> + <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_add_rpc"><?php echo UI::get_icon('cog', T_('Add API / RPC Host')); ?></a> + <?php echo T_('Add API / RPC Host'); ?> + </li> + <li> + <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_add_local"><?php echo UI::get_icon('home', T_('Add Local Network Definition')); ?></a> + <?php echo T_('Add Local Network Definition'); ?> + <li> + <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_add_advanced"><?php echo UI::get_icon('add_key', T_('Advanced Add')); ?></a> + <?php echo T_('Advanced Add'); ?> + </li> </ul> </div> @@ -47,33 +47,33 @@ <?php if (count($list)) { ?> <table cellspacing="1" cellpadding="3" class="tabledata"> <tr class="table-data"> - <th><?php echo T_('Name'); ?></th> - <th><?php echo T_('Start Address'); ?></th> - <th><?php echo T_('End Address'); ?></th> - <th><?php echo T_('Level'); ?></th> - <th><?php echo T_('User'); ?></th> - <th><?php echo T_('Type'); ?></th> - <th><?php echo T_('Action'); ?></th> + <th><?php echo T_('Name'); ?></th> + <th><?php echo T_('Start Address'); ?></th> + <th><?php echo T_('End Address'); ?></th> + <th><?php echo T_('Level'); ?></th> + <th><?php echo T_('User'); ?></th> + <th><?php echo T_('Type'); ?></th> + <th><?php echo T_('Action'); ?></th> </tr> <?php - /* Start foreach List Item */ - foreach ($list as $access_id) { - $access = new Access($access_id); - $access->format(); + /* Start foreach List Item */ + foreach ($list as $access_id) { + $access = new Access($access_id); + $access->format(); ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td><?php echo scrub_out($access->name); ?></td> - <td><?php echo $access->f_start; ?></td> - <td><?php echo $access->f_end; ?></td> - <td><?php echo $access->f_level; ?></td> - <td><?php echo $access->f_user; ?></td> - <td><?php echo $access->f_type; ?></td> - <td> - <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_edit_record&access_id=<?php echo scrub_out($access->id); ?>"><?php echo UI::get_icon('edit', T_('Edit')); ?></a> - <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_delete_record&access_id=<?php echo scrub_out($access->id); ?>"><?php echo UI::get_icon('delete', T_('Delete')); ?></a> - </td> + <td><?php echo scrub_out($access->name); ?></td> + <td><?php echo $access->f_start; ?></td> + <td><?php echo $access->f_end; ?></td> + <td><?php echo $access->f_level; ?></td> + <td><?php echo $access->f_user; ?></td> + <td><?php echo $access->f_type; ?></td> + <td> + <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_edit_record&access_id=<?php echo scrub_out($access->id); ?>"><?php echo UI::get_icon('edit', T_('Edit')); ?></a> + <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_delete_record&access_id=<?php echo scrub_out($access->id); ?>"><?php echo UI::get_icon('delete', T_('Delete')); ?></a> + </td> </tr> - <?php } // end foreach ?> + <?php } // end foreach ?> </table> <?php } // end if count ?> <?php Ajax::end_container(); ?> diff --git a/templates/show_account.inc.php b/templates/show_account.inc.php index 84b8ecf4..0cf951f8 100644 --- a/templates/show_account.inc.php +++ b/templates/show_account.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -26,40 +26,40 @@ <form method="post" name="preferences" action="<?php echo Config::get('web_path'); ?>/preferences.php?action=update_user" enctype="multipart/form-data"> <table class="tabledata"> <tr> - <td><?php echo T_('Name'); ?>:</td> - <td> - <input type="text" name="fullname" size="27" value="<?php echo scrub_out($client->fullname); ?>" /> - </td> + <td><?php echo T_('Name'); ?>:</td> + <td> + <input type="text" name="fullname" size="27" value="<?php echo scrub_out($client->fullname); ?>" /> + </td> </tr> <tr> - <td><?php echo T_('E-mail'); ?>:</td> - <td> - <input type="text" name="email" size="27" value="<?php echo scrub_out($client->email); ?>" /> - </td> + <td><?php echo T_('E-mail'); ?>:</td> + <td> + <input type="text" name="email" size="27" value="<?php echo scrub_out($client->email); ?>" /> + </td> </tr> <tr> - <td><?php echo T_('New Password'); ?>:</td> - <td> - <?php Error::display('password'); ?> - <input type="password" name="password1" size="27" /> - </td> + <td><?php echo T_('New Password'); ?>:</td> + <td> + <?php Error::display('password'); ?> + <input type="password" name="password1" size="27" /> + </td> </tr> <tr> - <td><?php echo T_('Confirm Password'); ?>:</td> - <td> - <input type="password" name="password2" size="27" /> - </td> + <td><?php echo T_('Confirm Password'); ?>:</td> + <td> + <input type="password" name="password2" size="27" /> + </td> </tr> <tr> - <td><?php echo T_('Clear Stats'); ?>:</td> - <td> - <input type="checkbox" name="clear_stats" value="1" /> - </td> + <td><?php echo T_('Clear Stats'); ?>:</td> + <td> + <input type="checkbox" name="clear_stats" value="1" /> + </td> </tr> </table> <div class="formValidation"> - <input type="hidden" name="user_id" value="<?php echo scrub_out($client->id); ?>" /> - <?php echo Core::form_register('update_user'); ?> - <input type="hidden" name="tab" value="<?php echo scrub_out($_REQUEST['tab']); ?>" /> - <input class="button" type="submit" value="<?php echo T_('Update Account'); ?>" /> + <input type="hidden" name="user_id" value="<?php echo scrub_out($client->id); ?>" /> + <?php echo Core::form_register('update_user'); ?> + <input type="hidden" name="tab" value="<?php echo scrub_out($_REQUEST['tab']); ?>" /> + <input class="button" type="submit" value="<?php echo T_('Update Account'); ?>" /> </div> diff --git a/templates/show_add_access.inc.php b/templates/show_add_access.inc.php index 9e030ccc..b2d03531 100644 --- a/templates/show_add_access.inc.php +++ b/templates/show_add_access.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,85 +24,85 @@ <form name="update_access" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=add_host"> <table class="tabledata" cellpadding="5" cellspacing="0"> <tr> - <td><?php echo T_('Name'); ?>:</td> - <td colspan="3"> - <input type="text" name="name" value="<?php echo scrub_out($_REQUEST['name']); ?>" size="20" /> - </td> + <td><?php echo T_('Name'); ?>:</td> + <td colspan="3"> + <input type="text" name="name" value="<?php echo scrub_out($_REQUEST['name']); ?>" size="20" /> + </td> </tr> <tr> - <td><?php echo T_('Level'); ?>:</td> - <td colspan="3"> - <input name="level" type="radio" checked="checked" value="5" /> <?php echo T_('View'); ?> - <input name="level" type="radio" value="25" /> <?php echo T_('Read'); ?> - <input name="level" type="radio" value="50" /> <?php echo T_('Read/Write'); ?> - <input name="level" type="radio" value="75" /> <?php echo T_('All'); ?> - </td> + <td><?php echo T_('Level'); ?>:</td> + <td colspan="3"> + <input name="level" type="radio" checked="checked" value="5" /> <?php echo T_('View'); ?> + <input name="level" type="radio" value="25" /> <?php echo T_('Read'); ?> + <input name="level" type="radio" value="50" /> <?php echo T_('Read/Write'); ?> + <input name="level" type="radio" value="75" /> <?php echo T_('All'); ?> + </td> </tr> <tr> - <td><?php echo T_('User'); ?>:</td> - <td colspan="3"> - <?php show_user_select('user'); ?> - </td> + <td><?php echo T_('User'); ?>:</td> + <td colspan="3"> + <?php show_user_select('user'); ?> + </td> </tr> <tr> <td valign="top"><?php echo T_('ACL Type'); ?>:</td> <td colspan="3"> <?php if ($action == 'show_add_rpc') { ?> - <input type="hidden" name="type" value="rpc" /> - <select name="addtype"> - <option value="rpc"><?php echo T_('API/RPC'); ?></option> - <option selected="selected" value="stream"><?php printf(T_('%s + %s'), T_('API/RPC'), T_('Stream Access')); ?></option> - <option value="all"><?php printf(T_('%s + %s'), T_('API/RPC'), T_('All')); ?></option> + <input type="hidden" name="type" value="rpc" /> + <select name="addtype"> + <option value="rpc"><?php echo T_('API/RPC'); ?></option> + <option selected="selected" value="stream"><?php printf(T_('%s + %s'), T_('API/RPC'), T_('Stream Access')); ?></option> + <option value="all"><?php printf(T_('%s + %s'), T_('API/RPC'), T_('All')); ?></option> <?php } else if ($action == 'show_add_local') { ?> - <input type="hidden" name="type" value="local" /> - <select name="addtype"> - <option value="network"><?php echo T_('Local Network Definition'); ?></option> - <option value="stream"><?php printf(T_('%s + %s'), T_('Local Network Definition'), T_('Stream Access')); ?></option> - <option selected="selected" value="all"><?php printf(T_('%s + %s'), T_('Local Network Definition'), T_('All')); ?></option> + <input type="hidden" name="type" value="local" /> + <select name="addtype"> + <option value="network"><?php echo T_('Local Network Definition'); ?></option> + <option value="stream"><?php printf(T_('%s + %s'), T_('Local Network Definition'), T_('Stream Access')); ?></option> + <option selected="selected" value="all"><?php printf(T_('%s + %s'), T_('Local Network Definition'), T_('All')); ?></option> <?php } else { ?> - <select name="type"> - <option selected="selected" value="stream"><?php echo T_('Stream Access'); ?></option> - <option value="interface"><?php echo T_('Web Interface'); ?></option> - <option value="network"><?php echo T_('Local Network Definition'); ?></option> - <option value="rpc"><?php echo T_('API/RPC'); ?></option> + <select name="type"> + <option selected="selected" value="stream"><?php echo T_('Stream Access'); ?></option> + <option value="interface"><?php echo T_('Web Interface'); ?></option> + <option value="network"><?php echo T_('Local Network Definition'); ?></option> + <option value="rpc"><?php echo T_('API/RPC'); ?></option> <?php } ?> - </select> - </td> + </select> + </td> </tr> <tr> - <td colspan="4"><h3><?php echo T_('IPv4 or IPv6 Addresses'); ?></h3> - <span class="information">(255.255.255.255) / (ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff)</span> - </td> + <td colspan="4"><h3><?php echo T_('IPv4 or IPv6 Addresses'); ?></h3> + <span class="information">(255.255.255.255) / (ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff)</span> + </td> </tr> <tr> - <td><?php echo T_('Start'); ?>:</td> - <td> - <?php Error::display('start'); ?> - <input type="text" name="start" value="<?php - if($action == 'show_add_current') { - echo scrub_out($_SERVER['REMOTE_ADDR']); - } - else { - echo scrub_out($_REQUEST['start']); - } ?>" size="20" maxlength="15" /> - </td> - <td><?php echo T_('End'); ?>:</td> - <td> - <?php Error::display('end'); ?> - <input type="text" name="end" value="<?php - if($action == 'show_add_current') { - echo scrub_out($_SERVER['REMOTE_ADDR']); - } - else { - echo scrub_out($_REQUEST['end']); - } ?>" size="20" maxlength="15" /> - </td> + <td><?php echo T_('Start'); ?>:</td> + <td> + <?php Error::display('start'); ?> + <input type="text" name="start" value="<?php + if($action == 'show_add_current') { + echo scrub_out($_SERVER['REMOTE_ADDR']); + } + else { + echo scrub_out($_REQUEST['start']); + } ?>" size="20" maxlength="15" /> + </td> + <td><?php echo T_('End'); ?>:</td> + <td> + <?php Error::display('end'); ?> + <input type="text" name="end" value="<?php + if($action == 'show_add_current') { + echo scrub_out($_SERVER['REMOTE_ADDR']); + } + else { + echo scrub_out($_REQUEST['end']); + } ?>" size="20" maxlength="15" /> + </td> </tr> </table> <div class="formValidation"> - <?php echo Core::form_register('add_acl'); ?> - <input class="button" type="submit" value="<?php echo T_('Create ACL'); ?>" /> + <?php echo Core::form_register('add_acl'); ?> + <input class="button" type="submit" value="<?php echo T_('Create ACL'); ?>" /> </div> </form> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_add_catalog.inc.php b/templates/show_add_catalog.inc.php index 7a3049f7..28f01414 100644 --- a/templates/show_add_catalog.inc.php +++ b/templates/show_add_catalog.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -29,58 +29,58 @@ $default_sort = "%a/%A"; <form name="update_catalog" method="post" action="<?php echo Config::get('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data"> <table class="tabledata" cellpadding="0" cellspacing="0"> <tr> - <td><?php echo T_('Catalog Name'); ?>: </td> - <td><input size="60" type="text" name="name" value="<?php echo scrub_out($_POST['name']); ?>" /></td> - <td style="vertical-align:top; font-family: monospace;" rowspan="6" id="patterns_example"> - <strong><?php echo T_('Auto-inserted Fields'); ?>:</strong><br /> - <span class="format-specifier">%A</span> = <?php echo T_('album name'); ?><br /> - <span class="format-specifier">%a</span> = <?php echo T_('artist name'); ?><br /> - <span class="format-specifier">%c</span> = <?php echo T_('id3 comment'); ?><br /> - <span class="format-specifier">%T</span> = <?php echo T_('track number (padded with leading 0)'); ?><br /> - <span class="format-specifier">%t</span> = <?php echo T_('song title'); ?><br /> - <span class="format-specifier">%y</span> = <?php echo T_('year'); ?><br /> - <span class="format-specifier">%o</span> = <?php echo T_('other'); ?><br /> - </td> + <td><?php echo T_('Catalog Name'); ?>: </td> + <td><input size="60" type="text" name="name" value="<?php echo scrub_out($_POST['name']); ?>" /></td> + <td style="vertical-align:top; font-family: monospace;" rowspan="6" id="patterns_example"> + <strong><?php echo T_('Auto-inserted Fields'); ?>:</strong><br /> + <span class="format-specifier">%A</span> = <?php echo T_('album name'); ?><br /> + <span class="format-specifier">%a</span> = <?php echo T_('artist name'); ?><br /> + <span class="format-specifier">%c</span> = <?php echo T_('id3 comment'); ?><br /> + <span class="format-specifier">%T</span> = <?php echo T_('track number (padded with leading 0)'); ?><br /> + <span class="format-specifier">%t</span> = <?php echo T_('song title'); ?><br /> + <span class="format-specifier">%y</span> = <?php echo T_('year'); ?><br /> + <span class="format-specifier">%o</span> = <?php echo T_('other'); ?><br /> + </td> </tr> <tr> - <td><?php echo T_('Path'); ?>: </td> - <td><input size="60" type="text" name="path" value="<?php echo scrub_out($_POST['path']); ?>" /></td> + <td><?php echo T_('Path'); ?>: </td> + <td><input size="60" type="text" name="path" value="<?php echo scrub_out($_POST['path']); ?>" /></td> </tr> <tr> - <td><?php echo T_('Catalog Type'); ?>: </td> - <td> - <select name="type"> - <option value="local"><?php echo T_('Local'); ?></option> - <option value="remote"><?php echo T_('Remote'); ?></option> - </select> - </td> + <td><?php echo T_('Catalog Type'); ?>: </td> + <td> + <select name="type"> + <option value="local"><?php echo T_('Local'); ?></option> + <option value="remote"><?php echo T_('Remote'); ?></option> + </select> + </td> </tr> <tr> - <td><?php echo T_('Remote Catalog Username'); ?>: </td> - <td><input size="30" type="text" name="remote_username" value="<?php echo scrub_out($_POST['remote_username']); ?>" /><span class="error">*<?php echo T_('Required for Remote Catalogs'); ?></span></td> + <td><?php echo T_('Remote Catalog Username'); ?>: </td> + <td><input size="30" type="text" name="remote_username" value="<?php echo scrub_out($_POST['remote_username']); ?>" /><span class="error">*<?php echo T_('Required for Remote Catalogs'); ?></span></td> </tr> <tr> - <td><?php echo T_('Remote Catalog Password'); ?>: </td> - <td><input size="30" type="password" name="remote_password" value="" /><span class="error">*<?php echo T_('Required for Remote Catalogs'); ?></span></td> + <td><?php echo T_('Remote Catalog Password'); ?>: </td> + <td><input size="30" type="password" name="remote_password" value="" /><span class="error">*<?php echo T_('Required for Remote Catalogs'); ?></span></td> </tr> <tr> - <td><?php echo T_('Filename Pattern'); ?>: </td> - <td><input size="60" type="text" name="rename_pattern" value="<?php echo $default_rename; ?>" /></td> + <td><?php echo T_('Filename Pattern'); ?>: </td> + <td><input size="60" type="text" name="rename_pattern" value="<?php echo $default_rename; ?>" /></td> </tr> <tr> - <td><?php echo T_('Folder Pattern'); ?>:<br /><?php echo T_("(no leading or ending '/')"); ?></td> - <td valign="top"><input size="60" type="text" name="sort_pattern" value="<?php echo $default_sort; ?>" /></td> + <td><?php echo T_('Folder Pattern'); ?>:<br /><?php echo T_("(no leading or ending '/')"); ?></td> + <td valign="top"><input size="60" type="text" name="sort_pattern" value="<?php echo $default_sort; ?>" /></td> </tr> <tr> - <td valign="top"><?php echo T_('Gather Album Art'); ?>:</td> - <td><input type="checkbox" name="gather_art" value="1" /></td> + <td valign="top"><?php echo T_('Gather Album Art'); ?>:</td> + <td><input type="checkbox" name="gather_art" value="1" /></td> </tr> <tr> - <td valign="top"><?php echo T_('Build Playlists from m3u Files'); ?>:</td> - <td><input type="checkbox" name="parse_m3u" value="1" /></td> + <td valign="top"><?php echo T_('Build Playlists from m3u Files'); ?>:</td> + <td><input type="checkbox" name="parse_m3u" value="1" /></td> </tr> </table> <div class="formValidation"> diff --git a/templates/show_add_live_stream.inc.php b/templates/show_add_live_stream.inc.php index ef7402ed..37a0b8a3 100644 --- a/templates/show_add_live_stream.inc.php +++ b/templates/show_add_live_stream.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,48 +24,48 @@ <form name="radio" method="post" action="<?php echo Config::get('web_path'); ?>/radio.php?action=create"> <table> <tr> - <td><?php echo T_('Name'); ?></td> - <td> - <input type="text" name="name" size="20" value="<?php echo scrub_out($_REQUEST['name']); ?>" /> - <?php Error::display('name'); ?> - </td> + <td><?php echo T_('Name'); ?></td> + <td> + <input type="text" name="name" size="20" value="<?php echo scrub_out($_REQUEST['name']); ?>" /> + <?php Error::display('name'); ?> + </td> </tr> <tr> - <td><?php echo T_('Homepage'); ?></td> - <td> - <input type="text" name="site_url" value="<?php echo scrub_out($_REQUEST['site_url']); ?>" /> - <?php Error::display('site_url'); ?> - </td> + <td><?php echo T_('Homepage'); ?></td> + <td> + <input type="text" name="site_url" value="<?php echo scrub_out($_REQUEST['site_url']); ?>" /> + <?php Error::display('site_url'); ?> + </td> </tr> <tr> - <td><?php echo T_('Stream URL'); ?></td> - <td> - <input type="text" name="url" value="<?php echo scrub_out($_REQUEST['url']); ?>" /> - <?php Error::display('url'); ?> - </td> + <td><?php echo T_('Stream URL'); ?></td> + <td> + <input type="text" name="url" value="<?php echo scrub_out($_REQUEST['url']); ?>" /> + <?php Error::display('url'); ?> + </td> </tr> <tr> - <td><?php echo T_('Frequency'); ?></td> - <td> - <input type="text" name="frequency" value="<?php echo scrub_out($_REQUEST['frequency']); ?>" /> - </td> + <td><?php echo T_('Frequency'); ?></td> + <td> + <input type="text" name="frequency" value="<?php echo scrub_out($_REQUEST['frequency']); ?>" /> + </td> </tr> <tr> - <td><?php echo T_('Callsign'); ?></td> - <td> - <input type="text" name="call_sign" value="<?php echo scrub_out($_REQUEST['call_sign']); ?>" /> - </td> + <td><?php echo T_('Callsign'); ?></td> + <td> + <input type="text" name="call_sign" value="<?php echo scrub_out($_REQUEST['call_sign']); ?>" /> + </td> </tr> <tr> - <td><?php echo T_('Catalog'); ?></td> - <td> - <?php echo show_catalog_select('catalog',intval($_REQUEST['catalog'])); ?> - </td> + <td><?php echo T_('Catalog'); ?></td> + <td> + <?php echo show_catalog_select('catalog',intval($_REQUEST['catalog'])); ?> + </td> </tr> </table> <div class="formValidation"> - <?php echo Core::form_register('add_radio'); ?> - <input class="button" type="submit" value="<?php echo T_('Add'); ?>" /> + <?php echo Core::form_register('add_radio'); ?> + <input class="button" type="submit" value="<?php echo T_('Add'); ?>" /> </div> </form> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_add_playlist.inc.php b/templates/show_add_playlist.inc.php index 2a1239b4..9ad0f429 100644 --- a/templates/show_add_playlist.inc.php +++ b/templates/show_add_playlist.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,22 +24,22 @@ <form name="songs" method="post" action="<?php echo Config::get('web_path'); ?>/playlist.php"> <table> <tr> - <td><?php echo T_('Name'); ?>:</td> - <td><input type="text" name="playlist_name" size="20" /></td> + <td><?php echo T_('Name'); ?>:</td> + <td><input type="text" name="playlist_name" size="20" /></td> </tr> <tr> - <td><?php echo T_('Type'); ?>:</td> - <td> - <select name="type"> - <option value="private"> Private </option> - <option value="public"> Public </option> - </select> - </td> + <td><?php echo T_('Type'); ?>:</td> + <td> + <select name="type"> + <option value="private"> Private </option> + <option value="public"> Public </option> + </select> + </td> </tr> </table> <div class="formValidation"> - <input class="button" type="submit" value="<?php echo T_('Create'); ?>" /> - <input type="hidden" name="action" value="Create" /> + <input class="button" type="submit" value="<?php echo T_('Create'); ?>" /> + <input type="hidden" name="action" value="Create" /> </div> </form> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_add_shout.inc.php b/templates/show_add_shout.inc.php index 739b1571..65314084 100644 --- a/templates/show_add_shout.inc.php +++ b/templates/show_add_shout.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,23 +24,23 @@ <form method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/shout.php?action=add_shout"> <table class="tabledata" cellpadding="0" cellspacing="0"> <tr> - <td><strong><?php echo T_('Comment:'); ?></strong> + <td><strong><?php echo T_('Comment:'); ?></strong> </tr> <tr> - <td><textarea rows="5" cols="70" name="comment"></textarea></td> + <td><textarea rows="5" cols="70" name="comment"></textarea></td> </tr> <?php if (Access::check('interface','50')) { ?> <tr> - <td><input type="checkbox" name="sticky" /> <strong><?php echo T_('Make Sticky'); ?></strong></td> + <td><input type="checkbox" name="sticky" /> <strong><?php echo T_('Make Sticky'); ?></strong></td> </tr> <?php } ?> <tr> - <td> - <?php echo Core::form_register('add_shout'); ?> - <input type="hidden" name="object_id" value="<?php echo $object->id; ?>" /> - <input type="hidden" name="object_type" value="<?php echo strtolower(get_class($object)); ?>" /> - <input type="submit" value="<?php echo T_('Create'); ?>" /> - </td> + <td> + <?php echo Core::form_register('add_shout'); ?> + <input type="hidden" name="object_id" value="<?php echo $object->id; ?>" /> + <input type="hidden" name="object_type" value="<?php echo strtolower(get_class($object)); ?>" /> + <input type="submit" value="<?php echo T_('Create'); ?>" /> + </td> </tr> </table> </form> diff --git a/templates/show_add_user.inc.php b/templates/show_add_user.inc.php index d42988cd..56d6461f 100644 --- a/templates/show_add_user.inc.php +++ b/templates/show_add_user.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,64 +25,64 @@ <form name="add_user" enctype="multpart/form-data" method="post" action="<?php echo Config::get('web_path') . "/admin/users.php?action=add_user"; ?>"> <table class="tabledata" cellspacing="0" cellpadding="0"> <tr> - <td> - <?php echo T_('Username'); ?>: - </td> - <td> - <input type="text" name="username" size="30" maxlength="128" value="<?php echo scrub_out($_POST['username']); ?>" /> - <?php Error::display('username'); ?> - </td> + <td> + <?php echo T_('Username'); ?>: + </td> + <td> + <input type="text" name="username" size="30" maxlength="128" value="<?php echo scrub_out($_POST['username']); ?>" /> + <?php Error::display('username'); ?> + </td> </tr> <tr> - <td><?php echo T_('Full Name'); ?>:</td> - <td> - <input type="text" name="fullname" size="30" value="<?php echo scrub_out($_POST['fullname']); ?>" /> - </td> + <td><?php echo T_('Full Name'); ?>:</td> + <td> + <input type="text" name="fullname" size="30" value="<?php echo scrub_out($_POST['fullname']); ?>" /> + </td> </tr> <tr> - <td> - <?php echo T_('E-mail'); ?>: - </td> - <td> - <input type="text" name="email" size="30" value="<?php echo scrub_out($_POST['email']); ?>" /> - </td> + <td> + <?php echo T_('E-mail'); ?>: + </td> + <td> + <input type="text" name="email" size="30" value="<?php echo scrub_out($_POST['email']); ?>" /> + </td> </tr> <tr> - <td> - <?php echo T_('Password'); ?> : - </td> - <td> - <input type="password" name="password_1" size="30" value="" /> - <?php Error::display('password'); ?> - </td> + <td> + <?php echo T_('Password'); ?> : + </td> + <td> + <input type="password" name="password_1" size="30" value="" /> + <?php Error::display('password'); ?> + </td> </tr> <tr> - <td> - <?php echo T_('Confirm Password'); ?>: - </td> - <td> - <input type="password" name="password_2" size="30" value="" /> - </td> + <td> + <?php echo T_('Confirm Password'); ?>: + </td> + <td> + <input type="password" name="password_2" size="30" value="" /> + </td> </tr> <tr> - <td> - <?php echo T_('User Access Level'); ?>: - </td> + <td> + <?php echo T_('User Access Level'); ?>: + </td> <td> <?php $var_name = "on_" . $client->access; ${$var_name} = 'selected="selected"'; ?> <select name="access"> <option value="5" <?php echo $on_5; ?>><?php echo T_('Guest'); ?></option> <option value="25" <?php echo $on_25; ?>><?php echo T_('User'); ?></option> - <option value="50" <?php echo $on_50; ?>><?php echo T_('Content Manager'); ?></option> - <option value="75" <?php echo $on_75; ?>><?php echo T_('Catalog Manager'); ?></option> + <option value="50" <?php echo $on_50; ?>><?php echo T_('Content Manager'); ?></option> + <option value="75" <?php echo $on_75; ?>><?php echo T_('Catalog Manager'); ?></option> <option value="100" <?php echo $on_100; ?>><?php echo T_('Admin'); ?></option> </select> </td> </tr> </table> <div class="formValidation"> - <?php echo Core::form_register('add_user'); ?> - <input type="submit" value="<?php echo T_('Add User'); ?>" /> + <?php echo Core::form_register('add_user'); ?> + <input type="submit" value="<?php echo T_('Add User'); ?>" /> </div> </form> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_adds_catalog.inc.php b/templates/show_adds_catalog.inc.php index a1ddf4d9..7fb04e32 100644 --- a/templates/show_adds_catalog.inc.php +++ b/templates/show_adds_catalog.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) diff --git a/templates/show_admin_info.inc.php b/templates/show_admin_info.inc.php index 70189bb4..9fa6a71f 100644 --- a/templates/show_admin_info.inc.php +++ b/templates/show_admin_info.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -23,20 +23,20 @@ $web_path = Config::get('web_path'); /* Flagged Information Gathering */ -$flagged = Flag::get_recent(10); +$flagged = Flag::get_recent(10); /* Disabled Information Gathering */ $songs = Song::get_disabled(10); ?> <?php UI::show_box_top(T_('Last Ten Flagged Records')); ?> - <?php require Config::get('prefix') . '/templates/show_flagged.inc.php'; ?> + <?php require Config::get('prefix') . '/templates/show_flagged.inc.php'; ?> <?php UI::show_box_bottom(); ?> <?php UI::show_box_top(T_('Disabled Songs')); ?> - <!-- Show Last 10 Disabled Songs --> - <?php require Config::get('prefix') . '/templates/show_disabled_songs.inc.php'; ?> - <div> - <a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=show_disabled"><?php echo T_('Show All'); ?>...</a> - </div> + <!-- Show Last 10 Disabled Songs --> + <?php require Config::get('prefix') . '/templates/show_disabled_songs.inc.php'; ?> + <div> + <a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=show_disabled"><?php echo T_('Show All'); ?>...</a> + </div> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_admin_tools.inc.php b/templates/show_admin_tools.inc.php index 0df0be23..6bff2878 100644 --- a/templates/show_admin_tools.inc.php +++ b/templates/show_admin_tools.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -20,8 +20,8 @@ * */ -$web_path = Config::get('web_path'); -$catalogs = Catalog::get_catalogs(); +$web_path = Config::get('web_path'); +$catalogs = Catalog::get_catalogs(); ?> <?php UI::show_box_top(T_('Catalogs')); ?> @@ -31,48 +31,48 @@ $catalogs = Catalog::get_catalogs(); <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_name"><?php echo T_('Name'); ?></th> - <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_name"><?php echo T_('Name'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> <?php foreach ($catalogs as $catalog) { ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td class="cel_name"> - <a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_customize_catalog&catalog_id=<?php echo $catalog->id; ?>"> - <?php echo scrub_out($catalog->name); ?></a> - (<?php echo scrub_out($catalog->path); ?>) - </td> - <td class="cel_action"> - <a href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_catalog&catalogs[]=<?php echo $catalog->id; ?>"> - <?php echo T_('Add'); ?></a> | - <a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_catalog&catalogs[]=<?php echo $catalog->id; ?>"> - <?php echo T_('Verify'); ?></a> | - <a href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_catalog&catalogs[]=<?php echo $catalog->id; ?>"> - <?php echo T_('Clean'); ?></a> | - <a href="<?php echo $web_path; ?>/admin/catalog.php?action=full_service&catalogs[]=<?php echo $catalog->id; ?>"> - <?php echo T_('All'); ?></a> | - <a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_delete_catalog&catalog_id=<?php echo $catalog->id; ?>"> - <?php echo T_('Delete'); ?></a> - </td> + <td class="cel_name"> + <a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_customize_catalog&catalog_id=<?php echo $catalog->id; ?>"> + <?php echo scrub_out($catalog->name); ?></a> + (<?php echo scrub_out($catalog->path); ?>) + </td> + <td class="cel_action"> + <a href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_catalog&catalogs[]=<?php echo $catalog->id; ?>"> + <?php echo T_('Add'); ?></a> | + <a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_catalog&catalogs[]=<?php echo $catalog->id; ?>"> + <?php echo T_('Verify'); ?></a> | + <a href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_catalog&catalogs[]=<?php echo $catalog->id; ?>"> + <?php echo T_('Clean'); ?></a> | + <a href="<?php echo $web_path; ?>/admin/catalog.php?action=full_service&catalogs[]=<?php echo $catalog->id; ?>"> + <?php echo T_('All'); ?></a> | + <a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_delete_catalog&catalog_id=<?php echo $catalog->id; ?>"> + <?php echo T_('Delete'); ?></a> + </td> </tr> <!-- <tr class="<?php echo UI::flip_class(); ?>"> - <td colspan="2"> - <?php echo T_('Fast'); ?><input type="checkbox" name="fast" value="1" /> - <?php echo T_('Gather Art'); ?><input type="checkbox" name="gather_art" value="1" /> - </td> + <td colspan="2"> + <?php echo T_('Fast'); ?><input type="checkbox" name="fast" value="1" /> + <?php echo T_('Gather Art'); ?><input type="checkbox" name="gather_art" value="1" /> + </td> </tr> --> <?php } // end foreach ?> <?php if (!count($catalogs)) { ?> <tr> - <td colspan="2"> - <?php echo T_('No Catalogs Found'); ?> - </td> + <td colspan="2"> + <?php echo T_('No Catalogs Found'); ?> + </td> </tr> <?php } // end if no catalogs ?> <tr class="th-bottom"> - <th class="cel_name"><?php echo T_('Name'); ?></th> - <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_name"><?php echo T_('Name'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> </table> <div> @@ -88,12 +88,12 @@ $catalogs = Catalog::get_catalogs(); <?php UI::show_box_top(T_('Other Tools')); ?> <div> - <a class="button" href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo T_('Show Duplicate Songs'); ?></a> - <a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo T_('Clear Now Playing'); ?></a> - <a class="button" href="<?php echo $web_path; ?>/admin/system.php?action=generate_config"><?php echo T_('Generate New Config'); ?></a> - <a class="button" href="<?php echo $web_path; ?>/admin/preferences.php?action=show_set_preferences"><?php echo T_('Preferences Permissions'); ?></a> - <a class="button" href="<?php echo $web_path; ?>/admin/system.php?action=export&export=itunes"><?php echo T_('Export To Itunes DB'); ?></a> - <a class="button" href="<?php echo $web_path; ?>/admin/users.php?action=show_inactive&days=30"><?php echo T_('Show Inactive Users'); ?></a> -<!-- <a class="button" href="<?php echo $web_path; ?>/admin/system.php?action=check_version"><?php echo T_('Check for New Version'); ?></a>--> + <a class="button" href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo T_('Show Duplicate Songs'); ?></a> + <a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo T_('Clear Now Playing'); ?></a> + <a class="button" href="<?php echo $web_path; ?>/admin/system.php?action=generate_config"><?php echo T_('Generate New Config'); ?></a> + <a class="button" href="<?php echo $web_path; ?>/admin/preferences.php?action=show_set_preferences"><?php echo T_('Preferences Permissions'); ?></a> + <a class="button" href="<?php echo $web_path; ?>/admin/system.php?action=export&export=itunes"><?php echo T_('Export To Itunes DB'); ?></a> + <a class="button" href="<?php echo $web_path; ?>/admin/users.php?action=show_inactive&days=30"><?php echo T_('Show Inactive Users'); ?></a> +<!-- <a class="button" href="<?php echo $web_path; ?>/admin/system.php?action=check_version"><?php echo T_('Check for New Version'); ?></a>--> </div> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_album.inc.php b/templates/show_album.inc.php index 449203ba..b987bf5b 100644 --- a/templates/show_album.inc.php +++ b/templates/show_album.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,59 +25,59 @@ $web_path = Config::get('web_path'); // Title for this album $title = scrub_out($album->name) . ' (' . $album->year . ')'; if ($album->disk) { - $title .= "<span class=\"discnb disc" . $album->disk . "\">, " . T_('Disk') . " " . $album->disk . "</span>"; + $title .= "<span class=\"discnb disc" . $album->disk . "\">, " . T_('Disk') . " " . $album->disk . "</span>"; } $title .= ' - ' . $album->f_artist_link; ?> <?php UI::show_box_top($title,'info-box'); ?> <div class="album_art"> - <?php - if ($album->name != T_('Unknown (Orphaned)')) { + <?php + if ($album->name != T_('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(); - echo "<a target=\"_blank\" href=\"$aa_url\" onclick=\"popupWindow('$aa_url'); return false;\">"; - echo "<img src=\"" . $web_path . "/image.php?id=" . $album->id . "&thumb=2\" alt=\"".$name."\" title=\"".$name."\" height=\"128\" width=\"128\" />"; - echo "</a>\n"; - } - ?> + $aa_url = $web_path . "/image.php?id=" . $album->id . "&type=popup&sid=" . session_id(); + echo "<a target=\"_blank\" href=\"$aa_url\" onclick=\"popupWindow('$aa_url'); return false;\">"; + echo "<img src=\"" . $web_path . "/image.php?id=" . $album->id . "&thumb=2\" alt=\"".$name."\" title=\"".$name."\" height=\"128\" width=\"128\" />"; + echo "</a>\n"; + } + ?> </div> <div id="information_actions"> <div style="display:table-cell;" id="rating_<?php echo $album->id; ?>_album"> - <?php Rating::show($album->id,'album'); ?> + <?php Rating::show($album->id,'album'); ?> </div> <h3><?php echo T_('Actions'); ?>:</h3> <ul> - <li> - <?php echo Ajax::button('?action=basket&type=album&id=' . $album->id,'add', T_('Add'),'play_full_' . $album->id); ?> - <?php echo Ajax::text('?action=basket&type=album&id=' . $album->id, T_('Add Album'), 'play_full_text_' . $album->id); ?> - </li> - <li> - <?php echo Ajax::button('?action=basket&type=album_random&id=' . $album->id,'random', T_('Random'),'play_random_' . $album->id); ?> - <?php echo Ajax::text('?action=basket&type=album_random&id=' . $album->id, T_('Add Random from Album'), 'play_random_text_' . $album->id); ?> - </li> - <?php if (Access::check('interface','75')) { ?> - <li> - <a href="<?php echo $web_path; ?>/albums.php?action=clear_art&album_id=<?php echo $album->id; ?>"><?php echo UI::get_icon('delete', T_('Reset Album Art')); ?></a> - <a href="<?php echo $web_path; ?>/albums.php?action=clear_art&album_id=<?php echo $album->id; ?>"><?php echo T_('Reset Album Art'); ?></a> - </li> - <?php } ?> - <li> - <a href="<?php echo $web_path; ?>/albums.php?action=find_art&album_id=<?php echo $album->id; ?>"><?php echo UI::get_icon('view', T_('Find Album Art')); ?></a> - <a href="<?php echo $web_path; ?>/albums.php?action=find_art&album_id=<?php echo $album->id; ?>"><?php echo T_('Find Album Art'); ?></a> - </li> - <?php if ((Access::check('interface','50'))) { ?> - <li> - <a href="<?php echo $web_path; ?>/albums.php?action=update_from_tags&album_id=<?php echo $album->id; ?>"><?php echo UI::get_icon('cog', T_('Update from tags')); ?></a> - <a href="<?php echo $web_path; ?>/albums.php?action=update_from_tags&album_id=<?php echo $album->id; ?>"><?php echo T_('Update from tags'); ?></a> - </li> - <?php } ?> - <?php if (Access::check_function('batch_download')) { ?> - <li> - <a href="<?php echo $web_path; ?>/batch.php?action=album&id=<?php echo $album->id; ?>"><?php echo UI::get_icon('batch_download', T_('Download')); ?></a> - <a href="<?php echo $web_path; ?>/batch.php?action=album&id=<?php echo $album->id; ?>"><?php echo T_('Download'); ?></a> - </li> - <?php } ?> + <li> + <?php echo Ajax::button('?action=basket&type=album&id=' . $album->id,'add', T_('Add'),'play_full_' . $album->id); ?> + <?php echo Ajax::text('?action=basket&type=album&id=' . $album->id, T_('Add Album'), 'play_full_text_' . $album->id); ?> + </li> + <li> + <?php echo Ajax::button('?action=basket&type=album_random&id=' . $album->id,'random', T_('Random'),'play_random_' . $album->id); ?> + <?php echo Ajax::text('?action=basket&type=album_random&id=' . $album->id, T_('Add Random from Album'), 'play_random_text_' . $album->id); ?> + </li> + <?php if (Access::check('interface','75')) { ?> + <li> + <a href="<?php echo $web_path; ?>/albums.php?action=clear_art&album_id=<?php echo $album->id; ?>"><?php echo UI::get_icon('delete', T_('Reset Album Art')); ?></a> + <a href="<?php echo $web_path; ?>/albums.php?action=clear_art&album_id=<?php echo $album->id; ?>"><?php echo T_('Reset Album Art'); ?></a> + </li> + <?php } ?> + <li> + <a href="<?php echo $web_path; ?>/albums.php?action=find_art&album_id=<?php echo $album->id; ?>"><?php echo UI::get_icon('view', T_('Find Album Art')); ?></a> + <a href="<?php echo $web_path; ?>/albums.php?action=find_art&album_id=<?php echo $album->id; ?>"><?php echo T_('Find Album Art'); ?></a> + </li> + <?php if ((Access::check('interface','50'))) { ?> + <li> + <a href="<?php echo $web_path; ?>/albums.php?action=update_from_tags&album_id=<?php echo $album->id; ?>"><?php echo UI::get_icon('cog', T_('Update from tags')); ?></a> + <a href="<?php echo $web_path; ?>/albums.php?action=update_from_tags&album_id=<?php echo $album->id; ?>"><?php echo T_('Update from tags'); ?></a> + </li> + <?php } ?> + <?php if (Access::check_function('batch_download')) { ?> + <li> + <a href="<?php echo $web_path; ?>/batch.php?action=album&id=<?php echo $album->id; ?>"><?php echo UI::get_icon('batch_download', T_('Download')); ?></a> + <a href="<?php echo $web_path; ?>/batch.php?action=album&id=<?php echo $album->id; ?>"><?php echo T_('Download'); ?></a> + </li> + <?php } ?> </ul> </div> <?php UI::show_box_bottom(); ?> @@ -85,12 +85,12 @@ $title .= ' - ' . $album->f_artist_link; </div> <?php - $browse = new Browse(); - $browse->set_type('song'); - $browse->set_simple_browse(true); - $browse->set_filter('album', $album->id); - $browse->set_sort('track', 'ASC'); - $browse->get_objects(); - $browse->show_objects(); - $browse->store(); + $browse = new Browse(); + $browse->set_type('song'); + $browse->set_simple_browse(true); + $browse->set_filter('album', $album->id); + $browse->set_sort('track', 'ASC'); + $browse->get_objects(); + $browse->show_objects(); + $browse->store(); ?> diff --git a/templates/show_album_art.inc.php b/templates/show_album_art.inc.php index 838bf5fb..1ff7fefc 100644 --- a/templates/show_album_art.inc.php +++ b/templates/show_album_art.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -30,33 +30,33 @@ $i = 0; <tr> <?php while ($i <= $rows) { - $j=0; - while ($j < 4) { - $key = $i*4+$j; - $image_url = Config::get('web_path') . '/image.php?type=session&image_index=' . $key; - $dimensions = Core::image_dimensions(Art::get_from_source($_SESSION['form']['images'][$key], 'album')); - if (!isset($images[$key])) { echo "<td> </td>\n"; } - else { + $j=0; + while ($j < 4) { + $key = $i*4+$j; + $image_url = Config::get('web_path') . '/image.php?type=session&image_index=' . $key; + $dimensions = Core::image_dimensions(Art::get_from_source($_SESSION['form']['images'][$key], 'album')); + if (!isset($images[$key])) { echo "<td> </td>\n"; } + else { ?> - <td align="center"> - <a href="<?php echo $image_url; ?>" target="_blank"><img src="<?php echo $image_url; ?>" alt="<?php echo T_('Album Art'); ?>" border="0" height="175" width="175" /></a> - <br /> - <p align="center"> - <?php if (is_array($dimensions)) { ?> - [<?php echo intval($dimensions['width']); ?>x<?php echo intval($dimensions['height']); ?>] - <?php } else { ?> - <span class="error"><?php echo T_('Invalid'); ?></span> - <?php } ?> - [<a href="<?php echo Config::get('web_path'); ?>/albums.php?action=select_art&image=<?php echo $key; ?>&album_id=<?php echo intval($_REQUEST['album_id']); ?>"><?php echo T_('Select'); ?></a>] - </p> - </td> + <td align="center"> + <a href="<?php echo $image_url; ?>" target="_blank"><img src="<?php echo $image_url; ?>" alt="<?php echo T_('Album Art'); ?>" border="0" height="175" width="175" /></a> + <br /> + <p align="center"> + <?php if (is_array($dimensions)) { ?> + [<?php echo intval($dimensions['width']); ?>x<?php echo intval($dimensions['height']); ?>] + <?php } else { ?> + <span class="error"><?php echo T_('Invalid'); ?></span> + <?php } ?> + [<a href="<?php echo Config::get('web_path'); ?>/albums.php?action=select_art&image=<?php echo $key; ?>&album_id=<?php echo intval($_REQUEST['album_id']); ?>"><?php echo T_('Select'); ?></a>] + </p> + </td> <?php - } // end else - $j++; - } // end while cells - if($i < $rows) { echo "</tr>\n<tr>"; } + } // end else + $j++; + } // end while cells + if($i < $rows) { echo "</tr>\n<tr>"; } else { echo "</tr>"; } - $i++; + $i++; } // end while ?> </table> diff --git a/templates/show_album_row.inc.php b/templates/show_album_row.inc.php index db6ce30b..1d3782de 100644 --- a/templates/show_album_row.inc.php +++ b/templates/show_album_row.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -21,16 +21,16 @@ */ ?> <td class="cel_add"> - <?php echo Ajax::button('?action=basket&type=album&id=' . $album->id,'add', T_('Add'),'add_album_' . $album->id); ?> - <?php echo Ajax::button('?action=basket&type=album_random&id=' . $album->id,'random', T_('Random'),'random_album_' . $album->id); ?> + <?php echo Ajax::button('?action=basket&type=album&id=' . $album->id,'add', T_('Add'),'add_album_' . $album->id); ?> + <?php echo Ajax::button('?action=basket&type=album_random&id=' . $album->id,'random', T_('Random'),'random_album_' . $album->id); ?> </td> <?php if (Art::is_enabled()) { - $name = '[' . $album->f_artist . '] ' . scrub_out($album->full_name); + $name = '[' . $album->f_artist . '] ' . scrub_out($album->full_name); ?> <td class="cel_cover"> <a href="<?php echo Config::get('web_path'); ?>/albums.php?action=show&album=<?php echo $album->id; ?>"> - <img height="75" width="75" alt="<?php echo($name) ?>" title="<?php echo($name) ?>" src="<?php echo Config::get('web_path'); ?>/image.php?id=<?php echo $album->id; ?>&thumb=1" /> + <img height="75" width="75" alt="<?php echo($name) ?>" title="<?php echo($name) ?>" src="<?php echo Config::get('web_path'); ?>/image.php?id=<?php echo $album->id; ?>&thumb=1" /> </a> </td> <?php } ?> @@ -41,17 +41,17 @@ if (Art::is_enabled()) { <td class="cel_tags"><?php echo $album->f_tags; ?></td> <td class="cel_rating" id="rating_<?php echo $album->id; ?>_album"><?php Rating::show($album->id,'album'); ?></td> <td class="cel_action"> - <?php if (Config::get('sociable')) { ?> - <a href="<?php echo Config::get('web_path'); ?>/shout.php?action=show_add_shout&type=album&id=<?php echo $album->id; ?>"> - <?php echo UI::get_icon('comment', T_('Post Shout')); ?> - </a> - <?php } ?> - <?php if (Access::check_function('batch_download')) { ?> - <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=album&id=<?php echo $album->id; ?>"> - <?php echo UI::get_icon('batch_download', T_('Batch Download')); ?> - </a> - <?php } ?> - <?php if (Access::check('interface','50')) { ?> - <?php echo Ajax::button('?action=show_edit_object&type=album_row&id=' . $album->id,'edit', T_('Edit'),'edit_album_' . $album->id); ?> - <?php } ?> + <?php if (Config::get('sociable')) { ?> + <a href="<?php echo Config::get('web_path'); ?>/shout.php?action=show_add_shout&type=album&id=<?php echo $album->id; ?>"> + <?php echo UI::get_icon('comment', T_('Post Shout')); ?> + </a> + <?php } ?> + <?php if (Access::check_function('batch_download')) { ?> + <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=album&id=<?php echo $album->id; ?>"> + <?php echo UI::get_icon('batch_download', T_('Batch Download')); ?> + </a> + <?php } ?> + <?php if (Access::check('interface','50')) { ?> + <?php echo Ajax::button('?action=show_edit_object&type=album_row&id=' . $album->id,'edit', T_('Edit'),'edit_album_' . $album->id); ?> + <?php } ?> </td> diff --git a/templates/show_albums.inc.php b/templates/show_albums.inc.php index a9727634..41d5ccb0 100644 --- a/templates/show_albums.inc.php +++ b/templates/show_albums.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -38,48 +38,48 @@ $web_path = Config::get('web_path'); <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_add"><?php echo T_('Add'); ?></th> - <?php if (Art::is_enabled()) { ?> - <th class="cel_cover"><?php echo T_('Cover'); ?></th> - <?php } ?> - <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=name', T_('Album'),'album_sort_name'); ?></th> - <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=artist', T_('Artist'),'album_sort_artist'); ?></th> - <th class="cel_songs"><?php echo T_('Songs'); ?></th> - <th class="cel_year"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=year', T_('Year'),'album_sort_year'); ?></th> - <th class="cel_tags"><?php echo T_('Tags'); ?></th> - <th class="col_rating"><?php echo T_('Rating'); ?></th> - <th class="cel_action"><?php echo T_('Actions'); ?></th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <?php if (Art::is_enabled()) { ?> + <th class="cel_cover"><?php echo T_('Cover'); ?></th> + <?php } ?> + <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=name', T_('Album'),'album_sort_name'); ?></th> + <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=artist', T_('Artist'),'album_sort_artist'); ?></th> + <th class="cel_songs"><?php echo T_('Songs'); ?></th> + <th class="cel_year"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=year', T_('Year'),'album_sort_year'); ?></th> + <th class="cel_tags"><?php echo T_('Tags'); ?></th> + <th class="col_rating"><?php echo T_('Rating'); ?></th> + <th class="cel_action"><?php echo T_('Actions'); ?></th> </tr> <?php - if (Config::get('ratings')) { - Rating::build_cache('album',$object_ids); - } - /* Foreach through the albums */ - foreach ($object_ids as $album_id) { - $album = new Album($album_id); - $album->format(); + if (Config::get('ratings')) { + Rating::build_cache('album',$object_ids); + } + /* Foreach through the albums */ + foreach ($object_ids as $album_id) { + $album = new Album($album_id); + $album->format(); ?> <tr id="album_<?php echo $album->id; ?>" class="<?php echo UI::flip_class(); ?>"> - <?php require Config::get('prefix') . '/templates/show_album_row.inc.php'; ?> + <?php require Config::get('prefix') . '/templates/show_album_row.inc.php'; ?> </tr> <?php } //end foreach ($albums as $album) ?> <?php if (!count($object_ids)) { ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td colspan="7"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> + <td colspan="7"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_add"><?php echo T_('Add'); ?></th> - <?php if (Art::is_enabled()) { ?> - <th class="cel_cover"><?php echo T_('Cover'); ?></th> - <?php } ?> - <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=name', T_('Album'),'album_sort_name_bottom'); ?></th> - <th class="cel_artist"><?php echo T_('Artist'); ?></th> - <th class="cel_songs"><?php echo T_('Songs'); ?></th> - <th class="cel_year"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=year', T_('Year'),'album_sort_year_bottom'); ?></th> - <th class="cel_tags"><?php echo T_('Tags'); ?></th> - <th class="col_rating"><?php echo T_('Rating'); ?></th> - <th class="cel_action"><?php echo T_('Actions'); ?></th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <?php if (Art::is_enabled()) { ?> + <th class="cel_cover"><?php echo T_('Cover'); ?></th> + <?php } ?> + <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=name', T_('Album'),'album_sort_name_bottom'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_songs"><?php echo T_('Songs'); ?></th> + <th class="cel_year"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=year', T_('Year'),'album_sort_year_bottom'); ?></th> + <th class="cel_tags"><?php echo T_('Tags'); ?></th> + <th class="col_rating"><?php echo T_('Rating'); ?></th> + <th class="cel_action"><?php echo T_('Actions'); ?></th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/show_all_popular.inc.php b/templates/show_all_popular.inc.php index 8f1b4119..ea05b14b 100644 --- a/templates/show_all_popular.inc.php +++ b/templates/show_all_popular.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -22,27 +22,27 @@ ?> <table class="tabledata"> <tr> - <td valign="top" > - <?php show_info_box(T_('Most Popular Artists'), 'artist', $artists); ?> - </td> - <td valign="top"> - <?php show_info_box(T_('Most Popular Albums'), '', $albums); ?> - </td> - <td valign="top"> - <?php show_info_box(T_('Most Popular Genres'), '', $genres); ?> - </td> + <td valign="top" > + <?php show_info_box(T_('Most Popular Artists'), 'artist', $artists); ?> + </td> + <td valign="top"> + <?php show_info_box(T_('Most Popular Albums'), '', $albums); ?> + </td> + <td valign="top"> + <?php show_info_box(T_('Most Popular Genres'), '', $genres); ?> + </td> </tr> <tr><td colspan="2"> </td></tr> <tr> - <td valign="top"> - <?php show_info_box(T_('Most Popular Songs'), 'song', $songs); ?> - </td> - <td valign="top"> - <?php show_info_box(T_('Most Popular Live Streams'),'live_stream',$live_streams); ?> - </td> - <td valign="top"> - <?php show_info_box(T_('Most Popular Tags'),'tags',$tags); ?> - </td> + <td valign="top"> + <?php show_info_box(T_('Most Popular Songs'), 'song', $songs); ?> + </td> + <td valign="top"> + <?php show_info_box(T_('Most Popular Live Streams'),'live_stream',$live_streams); ?> + </td> + <td valign="top"> + <?php show_info_box(T_('Most Popular Tags'),'tags',$tags); ?> + </td> </tr> <tr><td colspan="2"> </td></tr> </table> diff --git a/templates/show_alphabet_form.inc.php b/templates/show_alphabet_form.inc.php index 0efcdc9b..e1d08658 100644 --- a/templates/show_alphabet_form.inc.php +++ b/templates/show_alphabet_form.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -21,7 +21,7 @@ */ ?> <form style="display:inline;" name="f" method="get" action="<?php echo Config::get('web_path') . "/$action"; ?>" enctype="multipart/form-data"> - <label for="match" accesskey="S"><?php echo $text; ?></label> - <input type="text" size="5" id="match" name="match" value="<?php echo $match; ?>" /> - <input type="hidden" name="action" value="<?php echo scrub_out($_REQUEST['action']); ?>"> + <label for="match" accesskey="S"><?php echo $text; ?></label> + <input type="text" size="5" id="match" name="match" value="<?php echo $match; ?>" /> + <input type="hidden" name="action" value="<?php echo scrub_out($_REQUEST['action']); ?>"> </form> diff --git a/templates/show_artist.inc.php b/templates/show_artist.inc.php index aa26d52d..7bf95c56 100644 --- a/templates/show_artist.inc.php +++ b/templates/show_artist.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -29,43 +29,43 @@ UI::show_box_top($artist->f_name, 'info-box'); if (Config::get('ratings')) { ?> <div id="rating_<?php echo intval($artist->id); ?>_artist" style="display:inline;"> - <?php show_rating($artist->id, 'artist'); ?> + <?php show_rating($artist->id, 'artist'); ?> </div> <?php } ?> <div id="information_actions"> <h3><?php echo T_('Actions'); ?>:</h3> <ul> <li> - <?php if ($object_type == 'album') { ?> - <a href="<?php echo $web_path; ?>/artists.php?action=show_all_songs&artist=<?php echo $artist->id; ?>"> - <?php echo UI::get_icon('view', T_("Show All Songs By %s")); ?> - <?php printf(T_("Show All Songs By %s"), $artist->f_name); ?></a> - <?php } else { ?> - <a href="<?php echo $web_path; ?>/artists.php?action=show&artist=<?php echo $artist->id; ?>"> - <?php echo UI::get_icon('view', T_("Show Albums By %s")); ?> - <?php printf(T_("Show Albums By %s"), $artist->f_name); ?></a> - <?php } ?> + <?php if ($object_type == 'album') { ?> + <a href="<?php echo $web_path; ?>/artists.php?action=show_all_songs&artist=<?php echo $artist->id; ?>"> + <?php echo UI::get_icon('view', T_("Show All Songs By %s")); ?> + <?php printf(T_("Show All Songs By %s"), $artist->f_name); ?></a> + <?php } else { ?> + <a href="<?php echo $web_path; ?>/artists.php?action=show&artist=<?php echo $artist->id; ?>"> + <?php echo UI::get_icon('view', T_("Show Albums By %s")); ?> + <?php printf(T_("Show Albums By %s"), $artist->f_name); ?></a> + <?php } ?> </li> <li> - <?php /* HINT: Artist Fullname */ ?> - <?php echo Ajax::button('?action=basket&type=artist&id=' . $artist->id,'add', T_('Add'),'add_' . $artist->id); ?> - <?php echo Ajax::text('?action=basket&type=artist&id=' . $artist->id,sprintf(T_('Add All Songs By %s'), $artist->f_name),'add_text_' . $artist->id); ?> + <?php /* HINT: Artist Fullname */ ?> + <?php echo Ajax::button('?action=basket&type=artist&id=' . $artist->id,'add', T_('Add'),'add_' . $artist->id); ?> + <?php echo Ajax::text('?action=basket&type=artist&id=' . $artist->id,sprintf(T_('Add All Songs By %s'), $artist->f_name),'add_text_' . $artist->id); ?> </li> <li> - <?php /* HINT: Artist Fullname */ ?> - <?php echo Ajax::button('?action=basket&type=artist_random&id=' . $artist->id,'random', T_('Random'),'random_' . $artist->id); ?> - <?php echo Ajax::text('?action=basket&type=artist_random&id=' . $artist->id, sprintf(T_('Add Random Songs By %s'), $artist->f_name),'random_text_' . $artist->id); ?> + <?php /* HINT: Artist Fullname */ ?> + <?php echo Ajax::button('?action=basket&type=artist_random&id=' . $artist->id,'random', T_('Random'),'random_' . $artist->id); ?> + <?php echo Ajax::text('?action=basket&type=artist_random&id=' . $artist->id, sprintf(T_('Add Random Songs By %s'), $artist->f_name),'random_text_' . $artist->id); ?> </li> <?php if (Access::check('interface','50')) { ?> <li> - <a href="<?php echo $web_path; ?>/artists.php?action=update_from_tags&artist=<?php echo $artist->id; ?>"><?php echo UI::get_icon('cog', T_('Update from tags')); ?></a> - <a href="<?php echo $web_path; ?>/artists.php?action=update_from_tags&artist=<?php echo $artist->id; ?>"><?php echo T_('Update from tags'); ?></a> + <a href="<?php echo $web_path; ?>/artists.php?action=update_from_tags&artist=<?php echo $artist->id; ?>"><?php echo UI::get_icon('cog', T_('Update from tags')); ?></a> + <a href="<?php echo $web_path; ?>/artists.php?action=update_from_tags&artist=<?php echo $artist->id; ?>"><?php echo T_('Update from tags'); ?></a> </li> <?php } ?> <?php if (Access::check_function('batch_download')) { ?> <li> - <a href="<?php echo $web_path; ?>/batch.php?action=artist&id=<?php echo $artist->id; ?>"><?php echo UI::get_icon('batch_download', T_('Download')); ?></a> - <a href="<?php echo $web_path; ?>/batch.php?action=artist&id=<?php echo $artist->id; ?>"><?php echo T_('Download'); ?></a> + <a href="<?php echo $web_path; ?>/batch.php?action=artist&id=<?php echo $artist->id; ?>"><?php echo UI::get_icon('batch_download', T_('Download')); ?></a> + <a href="<?php echo $web_path; ?>/batch.php?action=artist&id=<?php echo $artist->id; ?>"><?php echo T_('Download'); ?></a> </li> <?php } ?> <li> @@ -75,6 +75,6 @@ if (Config::get('ratings')) { </div> <?php UI::show_box_bottom(); ?> <?php - $browse->show_objects($object_ids); - $browse->store(); + $browse->show_objects($object_ids); + $browse->store(); ?> diff --git a/templates/show_artist_row.inc.php b/templates/show_artist_row.inc.php index f7612c1e..295d2e85 100644 --- a/templates/show_artist_row.inc.php +++ b/templates/show_artist_row.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -21,8 +21,8 @@ */ ?> <td class="cel_add"> - <?php echo Ajax::button('?action=basket&type=artist&id=' . $artist->id,'add', T_('Add'),'add_artist_' . $artist->id); ?> - <?php echo Ajax::button('?action=basket&type=artist_random&id=' . $artist->id,'random', T_('Random'),'random_artist_' . $artist->id); ?> + <?php echo Ajax::button('?action=basket&type=artist&id=' . $artist->id,'add', T_('Add'),'add_artist_' . $artist->id); ?> + <?php echo Ajax::button('?action=basket&type=artist_random&id=' . $artist->id,'random', T_('Random'),'random_artist_' . $artist->id); ?> </td> <td class="cel_artist"><?php echo $artist->f_name_link; ?></td> <td class="cel_songs"><?php echo $artist->songs; ?></td> @@ -32,11 +32,11 @@ <td class="cel_rating" id="rating_<?php echo $artist->id; ?>_artist"><?php Rating::show($artist->id,'artist'); ?></td> <td class="cel_action"> <?php if (Access::check_function('batch_download')) { ?> - <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=artist&id=<?php echo $artist->id; ?>"> - <?php echo UI::get_icon('batch_download','', T_('Batch Download')); ?> + <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=artist&id=<?php echo $artist->id; ?>"> + <?php echo UI::get_icon('batch_download','', T_('Batch Download')); ?> </a> <?php } ?> <?php if (Access::check('interface','50')) { ?> - <?php echo Ajax::button('?action=show_edit_object&type=artist_row&id=' . $artist->id,'edit', T_('Edit'),'edit_artist_' . $artist->id); ?> + <?php echo Ajax::button('?action=show_edit_object&type=artist_row&id=' . $artist->id,'edit', T_('Edit'),'edit_artist_' . $artist->id); ?> <?php } ?> </td> diff --git a/templates/show_artists.inc.php b/templates/show_artists.inc.php index 36d9b01e..0a3b664b 100644 --- a/templates/show_artists.inc.php +++ b/templates/show_artists.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -37,14 +37,14 @@ $web_path = Config::get('web_path'); <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_add"><?php echo T_('Add'); ?></th> - <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&type=artist&sort=name', T_('Artist'),'artist_sort_name'); ?></th> - <th class="cel_songs"><?php echo T_('Songs'); ?></th> - <th class="cel_albums"><?php echo T_('Albums'); ?></th> - <th class="cel_time"><?php echo T_('Time'); ?></th> - <th class="cel_tags"><?php echo T_('Tags'); ?></th> - <th class="cel_rating"> <?php echo T_('Rating'); ?> </th> - <th class="cel_action"> <?php echo T_('Action'); ?> </th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&type=artist&sort=name', T_('Artist'),'artist_sort_name'); ?></th> + <th class="cel_songs"><?php echo T_('Songs'); ?></th> + <th class="cel_albums"><?php echo T_('Albums'); ?></th> + <th class="cel_time"><?php echo T_('Time'); ?></th> + <th class="cel_tags"><?php echo T_('Tags'); ?></th> + <th class="cel_rating"> <?php echo T_('Rating'); ?> </th> + <th class="cel_action"> <?php echo T_('Action'); ?> </th> </tr> <?php // Cache the ratings we are going to use @@ -52,27 +52,27 @@ if (Config::get('ratings')) { Rating::build_cache('artist',$object_ids); } /* Foreach through every artist that has been passed to us */ foreach ($object_ids as $artist_id) { - $artist = new Artist($artist_id, $_SESSION['catalog']); - $artist->format(); + $artist = new Artist($artist_id, $_SESSION['catalog']); + $artist->format(); ?> <tr id="artist_<?php echo $artist->id; ?>" class="<?php echo UI::flip_class(); ?>"> - <?php require Config::get('prefix') . '/templates/show_artist_row.inc.php'; ?> + <?php require Config::get('prefix') . '/templates/show_artist_row.inc.php'; ?> </tr> <?php } //end foreach ($artists as $artist) ?> <?php if (!count($object_ids)) { ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td colspan="5"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> + <td colspan="5"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_add"><?php echo T_('Add'); ?></th> - <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&type=artist&sort=name', T_('Artist'),'artist_sort_name_bottom'); ?></th> - <th class="cel_songs"> <?php echo T_('Songs'); ?> </th> - <th class="cel_albums"> <?php echo T_('Albums'); ?> </th> - <th class="cel_time"> <?php echo T_('Time'); ?> </th> - <th class="cel_tags"><?php echo T_('Tags'); ?></th> - <th class="cel_rating"> <?php echo T_('Rating'); ?> </th> - <th class="cel_action"> <?php echo T_('Action'); ?> </th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&type=artist&sort=name', T_('Artist'),'artist_sort_name_bottom'); ?></th> + <th class="cel_songs"> <?php echo T_('Songs'); ?> </th> + <th class="cel_albums"> <?php echo T_('Albums'); ?> </th> + <th class="cel_time"> <?php echo T_('Time'); ?> </th> + <th class="cel_tags"><?php echo T_('Tags'); ?></th> + <th class="cel_rating"> <?php echo T_('Rating'); ?> </th> + <th class="cel_action"> <?php echo T_('Action'); ?> </th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/show_big_art.inc.php b/templates/show_big_art.inc.php index 08fdb72f..c969ff6c 100644 --- a/templates/show_big_art.inc.php +++ b/templates/show_big_art.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) diff --git a/templates/show_box_bottom.inc.php b/templates/show_box_bottom.inc.php index 503b55b6..badbbca9 100644 --- a/templates/show_box_bottom.inc.php +++ b/templates/show_box_bottom.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) diff --git a/templates/show_box_top.inc.php b/templates/show_box_top.inc.php index 184c9fd1..ba8c7db0 100644 --- a/templates/show_box_top.inc.php +++ b/templates/show_box_top.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -30,7 +30,7 @@ $class = $class ? $class : 'box'; <div class="box-right-top"></div> </div> <?php if ($title) { ?> - <h3 class="box-title"><?php echo $title; ?></h3> - <?php } ?> + <h3 class="box-title"><?php echo $title; ?></h3> + <?php } ?> <div class="box-content clearfix"> diff --git a/templates/show_catalog_row.inc.php b/templates/show_catalog_row.inc.php index 7aef9d27..189e9934 100644 --- a/templates/show_catalog_row.inc.php +++ b/templates/show_catalog_row.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -28,10 +28,10 @@ $web_path = Config::get('web_path'); <td class="cel_lastadd"><?php echo scrub_out($catalog->f_add); ?></td> <td class="cel_lastclean"><?php echo scrub_out($catalog->f_clean); ?></td> <td class="cel_action"> - <a href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_catalog&catalogs[]=<?php echo $catalog->id; ?>"><?php echo T_('Add'); ?></a> - | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_catalog&catalogs[]=<?php echo $catalog->id; ?>"><?php echo T_('Verify'); ?></a> + <a href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_catalog&catalogs[]=<?php echo $catalog->id; ?>"><?php echo T_('Add'); ?></a> + | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_catalog&catalogs[]=<?php echo $catalog->id; ?>"><?php echo T_('Verify'); ?></a> | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_catalog&catalogs[]=<?php echo $catalog->id; ?>"><?php echo T_('Clean'); ?></a> - | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=full_service&catalogs[]=<?php echo $catalog->id; ?>"><?php echo T_('Update'); ?></a> - | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art&catalogs[]=<?php echo $catalog->id; ?>"><?php echo T_('Gather Art'); ?></a> - | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_delete_catalog&catalog_id=<?php echo $catalog->id; ?>"><?php echo T_('Delete'); ?></a> + | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=full_service&catalogs[]=<?php echo $catalog->id; ?>"><?php echo T_('Update'); ?></a> + | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art&catalogs[]=<?php echo $catalog->id; ?>"><?php echo T_('Gather Art'); ?></a> + | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_delete_catalog&catalog_id=<?php echo $catalog->id; ?>"><?php echo T_('Delete'); ?></a> </td> diff --git a/templates/show_catalogs.inc.php b/templates/show_catalogs.inc.php index c9f8cedd..86ab877e 100644 --- a/templates/show_catalogs.inc.php +++ b/templates/show_catalogs.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -31,36 +31,36 @@ <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_catalog"><?php echo T_('Name'); ?></th> - <th class="cel_path"><?php echo T_('Path'); ?></th> - <th class="cel_lastverify"><?php echo T_('Last Verify'); ?></th> - <th class="cel_lastadd"><?php echo T_('Last Add'); ?></th> - <th class="cel_lastclean"><?php echo T_('Last Clean'); ?></th> - <th class="cel_action"><?php echo T_('Actions'); ?></th> + <th class="cel_catalog"><?php echo T_('Name'); ?></th> + <th class="cel_path"><?php echo T_('Path'); ?></th> + <th class="cel_lastverify"><?php echo T_('Last Verify'); ?></th> + <th class="cel_lastadd"><?php echo T_('Last Add'); ?></th> + <th class="cel_lastclean"><?php echo T_('Last Clean'); ?></th> + <th class="cel_action"><?php echo T_('Actions'); ?></th> </tr> <?php - foreach ($object_ids as $catalog_id) { - $catalog = new Catalog($catalog_id); - $catalog->format(); + foreach ($object_ids as $catalog_id) { + $catalog = new Catalog($catalog_id); + $catalog->format(); ?> <tr class="<?php echo UI::flip_class(); ?>" id="catalog_<?php echo $catalog->id; ?>"> - <?php require Config::get('prefix') . '/templates/show_catalog_row.inc.php'; ?> + <?php require Config::get('prefix') . '/templates/show_catalog_row.inc.php'; ?> </tr> <?php } ?> <tr class="<?php echo UI::flip_class(); ?>"> <td colspan="6"> <?php if (!count($object_ids)) { ?> - <span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span> + <span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span> <?php } ?> </td> </tr> <tr class="th-bottom"> - <th class="cel_catalog"><?php echo T_('Name'); ?></th> - <th class="cel_path"><?php echo T_('Path'); ?></th> - <th class="cel_lastverify"><?php echo T_('Last Verify'); ?></th> - <th class="cel_lastadd"><?php echo T_('Last Add'); ?></th> - <th class="cel_lastclean"><?php echo T_('Last Clean'); ?></th> - <th class="cel_action"><?php echo T_('Actions'); ?></th> + <th class="cel_catalog"><?php echo T_('Name'); ?></th> + <th class="cel_path"><?php echo T_('Path'); ?></th> + <th class="cel_lastverify"><?php echo T_('Last Verify'); ?></th> + <th class="cel_lastadd"><?php echo T_('Last Add'); ?></th> + <th class="cel_lastclean"><?php echo T_('Last Clean'); ?></th> + <th class="cel_action"><?php echo T_('Actions'); ?></th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/show_clean_catalog.inc.php b/templates/show_clean_catalog.inc.php index f3f26464..07fdf145 100644 --- a/templates/show_clean_catalog.inc.php +++ b/templates/show_clean_catalog.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) diff --git a/templates/show_confirmation.inc.php b/templates/show_confirmation.inc.php index b8b5dd23..94e0dd8f 100644 --- a/templates/show_confirmation.inc.php +++ b/templates/show_confirmation.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,14 +25,14 @@ $confirmation = Core::form_register($form_name); <?php UI::show_box_top(scrub_out($title), 'box box_confirmation'); ?> <?php echo $text; ?> <br /> - <form method="post" action="<?php echo $path; ?>" style="display:inline;"> - <input type="submit" value="<?php echo T_('Continue'); ?>" /> - <?php echo $confirmation; ?> - </form> + <form method="post" action="<?php echo $path; ?>" style="display:inline;"> + <input type="submit" value="<?php echo T_('Continue'); ?>" /> + <?php echo $confirmation; ?> + </form> <?php if ($cancel) { ?> - <form method="post" action="<?php echo Config::get('web_path') . '/' . return_referer(); ?>" style="display:inline;"> - <input type="submit" value="<?php echo T_('Cancel'); ?>" /> - <?php echo $confirmation; ?> - </form> + <form method="post" action="<?php echo Config::get('web_path') . '/' . return_referer(); ?>" style="display:inline;"> + <input type="submit" value="<?php echo T_('Cancel'); ?>" /> + <?php echo $confirmation; ?> + </form> <?php } ?> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_create_democratic.inc.php b/templates/show_create_democratic.inc.php index ec829416..8ec5396a 100644 --- a/templates/show_create_democratic.inc.php +++ b/templates/show_create_democratic.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,22 +24,22 @@ UI::show_box_top(T_('Configure Democratic Playlist')); ?> <form method="post" action="<?php echo Config::get('web_path'); ?>/democratic.php?action=create" enctype="multipart/form-data"> <table class="tabledata" cellspacing="0" cellpadding="0"> <tr> - <td><?php echo T_('Name'); ?></td> - <td><input type="text" name="name" value="<?php echo scrub_out($democratic->name); ?>" /></td> + <td><?php echo T_('Name'); ?></td> + <td><input type="text" name="name" value="<?php echo scrub_out($democratic->name); ?>" /></td> </tr> <tr> - <td><?php echo T_('Base Playlist'); ?></td> - <td><?php show_playlist_select('democratic',$democratic->base_playlist); ?></td> + <td><?php echo T_('Base Playlist'); ?></td> + <td><?php show_playlist_select('democratic',$democratic->base_playlist); ?></td> </tr> <tr> - <td><?php echo T_('Cooldown Time'); ?></td> - <td><input type="text" size="4" maxlength="6" name="cooldown" value="<?php echo $democratic->cooldown; ?>" /><?php echo T_('minutes'); ?></td> + <td><?php echo T_('Cooldown Time'); ?></td> + <td><input type="text" size="4" maxlength="6" name="cooldown" value="<?php echo $democratic->cooldown; ?>" /><?php echo T_('minutes'); ?></td> </tr> <!-- <tr> - <td><?php echo T_('Level'); ?></td> - <td> - <select name="level"> + <td><?php echo T_('Level'); ?></td> + <td> + <select name="level"> <option value="25"><?php echo T_('User'); ?></option> <option value="50"><?php echo T_('Content Manager'); ?></option> <option value="75"><?php echo T_('Catalog Manager'); ?></option> @@ -47,18 +47,18 @@ UI::show_box_top(T_('Configure Democratic Playlist')); ?> </select> <tr> - <td><?php echo T_('Make Default'); ?></td> - <td><input type="checkbox" name="make_default" value="1" /></td> + <td><?php echo T_('Make Default'); ?></td> + <td><input type="checkbox" name="make_default" value="1" /></td> </tr> --> <tr> - <td><?php echo T_('Force Democratic Play'); ?></td> - <td><input type="checkbox" value="1" name="force_democratic" /></td> + <td><?php echo T_('Force Democratic Play'); ?></td> + <td><input type="checkbox" value="1" name="force_democratic" /></td> </tr> </table> <div class="formValidation"> - <?php echo Core::form_register('create_democratic'); ?> - <input type="submit" value="<?php echo T_('Update'); ?>" /> + <?php echo Core::form_register('create_democratic'); ?> + <input type="submit" value="<?php echo T_('Update'); ?>" /> </div> </form> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_debug.inc.php b/templates/show_debug.inc.php index 369774eb..3669fb2a 100644 --- a/templates/show_debug.inc.php +++ b/templates/show_debug.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,12 +24,12 @@ <div id="information_actions"> <ul> <li> - <a href="<?php echo Config::get('web_path'); ?>/admin/system.php?action=generate_config"><?php echo UI::get_icon('cog', T_('Generate Configuration')); ?></a> - <?php echo T_('Generate Configuration'); ?> + <a href="<?php echo Config::get('web_path'); ?>/admin/system.php?action=generate_config"><?php echo UI::get_icon('cog', T_('Generate Configuration')); ?></a> + <?php echo T_('Generate Configuration'); ?> </li> <li> - <a href="<?php echo Config::get('web_path'); ?>/admin/system.php?action=reset_db_charset"><?php echo UI::get_icon('server_lightning', T_('Set Database Charset')); ?></a> - <?php echo T_('Set Database Charset'); ?> + <a href="<?php echo Config::get('web_path'); ?>/admin/system.php?action=reset_db_charset"><?php echo UI::get_icon('server_lightning', T_('Set Database Charset')); ?></a> + <?php echo T_('Set Database Charset'); ?> </li> </ul> </div> @@ -37,48 +37,48 @@ <?php UI::show_box_top(T_('PHP Settings'), 'box box_php_settings'); ?> <table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> - <col id="col_php_setting"> - <col id="col_php_value"> + <col id="col_php_setting"> + <col id="col_php_value"> </colgroup> <tr class="th-top"> - <th class="cel_php_setting"><?php echo T_('Setting'); ?></th> - <th class="cel_php_value"><?php echo T_('Value'); ?></th> + <th class="cel_php_setting"><?php echo T_('Setting'); ?></th> + <th class="cel_php_value"><?php echo T_('Value'); ?></th> </tr> <tr class="<?php echo UI::flip_class(); ?>"> - <td><?php echo T_('Memory Limit'); ?></td> - <td><?php echo ini_get('memory_limit'); ?></td> + <td><?php echo T_('Memory Limit'); ?></td> + <td><?php echo ini_get('memory_limit'); ?></td> </tr> <tr class="<?php echo UI::flip_class(); ?>"> - <td><?php echo T_('Maximum Execution Time'); ?></td> - <td><?php echo ini_get('max_execution_time'); ?></td> + <td><?php echo T_('Maximum Execution Time'); ?></td> + <td><?php echo ini_get('max_execution_time'); ?></td> </tr> <tr class="<?php echo UI::flip_class(); ?>"> - <td><?php echo T_('Override Execution Time'); ?></td> - <td><?php set_time_limit(0); echo ini_get('max_execution_time') ? T_('Failed') : T_('Succeeded'); ?></td> + <td><?php echo T_('Override Execution Time'); ?></td> + <td><?php set_time_limit(0); echo ini_get('max_execution_time') ? T_('Failed') : T_('Succeeded'); ?></td> </tr> <tr class="<?php echo UI::flip_class(); ?>"> - <td><?php echo T_('Safe Mode'); ?></td> - <td><?php echo print_bool(ini_get('safe_mode')); ?></td> + <td><?php echo T_('Safe Mode'); ?></td> + <td><?php echo print_bool(ini_get('safe_mode')); ?></td> </tr> <tr class="<?php echo UI::flip_class(); ?>"> - <td>Open Basedir</td> - <td><?php echo ini_get('open_basedir'); ?></td> + <td>Open Basedir</td> + <td><?php echo ini_get('open_basedir'); ?></td> </tr> <tr class="<?php echo UI::flip_class(); ?>"> - <td><?php echo T_('Zlib Support'); ?></td> - <td><?php echo print_bool(function_exists('gzcompress')); ?></td> + <td><?php echo T_('Zlib Support'); ?></td> + <td><?php echo print_bool(function_exists('gzcompress')); ?></td> </tr> <tr class="<?php echo UI::flip_class(); ?>"> - <td><?php echo T_('GD Support'); ?></td> - <td><?php echo print_bool(function_exists('ImageCreateFromString')); ?></td> + <td><?php echo T_('GD Support'); ?></td> + <td><?php echo print_bool(function_exists('ImageCreateFromString')); ?></td> </tr> <tr class="<?php echo UI::flip_class(); ?>"> - <td><?php echo T_('Iconv Support'); ?></td> - <td><?php echo print_bool(function_exists('iconv')); ?></td> + <td><?php echo T_('Iconv Support'); ?></td> + <td><?php echo print_bool(function_exists('iconv')); ?></td> </tr> <tr class="<?php echo UI::flip_class(); ?>"> - <td><?php echo T_('Gettext Support'); ?></td> - <td><?php echo print_bool(function_exists('bindtextdomain')); ?></td> + <td><?php echo T_('Gettext Support'); ?></td> + <td><?php echo print_bool(function_exists('bindtextdomain')); ?></td> </tr> </table> <?php UI::show_box_bottom(); ?> @@ -90,25 +90,25 @@ <col id="col_value"> </colgroup> <tr class="th-top"> - <th class="cel_configuration"><?php echo T_('Preference'); ?></th> - <th class="cel_value"><?php echo T_('Value'); ?></th> + <th class="cel_configuration"><?php echo T_('Preference'); ?></th> + <th class="cel_value"><?php echo T_('Value'); ?></th> </tr> <?php foreach ($configuration as $key=>$value) { - if ($key == 'database_password' || $key == 'mysql_password') { $value = '*********'; } - if (is_array($value)) { - $string = ''; - foreach ($value as $setting) { - $string .= $setting . '<br />'; - } - $value = $string; - } - if (Preference::is_boolean($key)) { - $value = print_bool($value); - } + if ($key == 'database_password' || $key == 'mysql_password') { $value = '*********'; } + if (is_array($value)) { + $string = ''; + foreach ($value as $setting) { + $string .= $setting . '<br />'; + } + $value = $string; + } + if (Preference::is_boolean($key)) { + $value = print_bool($value); + } ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td valign="top"><strong><?php echo $key; ?></strong></td> - <td><?php echo $value; ?></td> + <td valign="top"><strong><?php echo $key; ?></strong></td> + <td><?php echo $value; ?></td> </tr> <?php } ?> </table> diff --git a/templates/show_democratic.inc.php b/templates/show_democratic.inc.php index ed951c06..c3c8be18 100644 --- a/templates/show_democratic.inc.php +++ b/templates/show_democratic.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -27,22 +27,22 @@ UI::show_box_top($string , 'info-box'); <ul> <?php if ($democratic->is_enabled()) { ?> <li> - <?php echo T_('Cooldown'); ?>:<?php echo $democratic->f_cooldown; ?> + <?php echo T_('Cooldown'); ?>:<?php echo $democratic->f_cooldown; ?> </li> <?php } ?> <?php if (Access::check('interface','75')) { ?> <li> - <a href="<?php echo Config::get('web_path'); ?>/democratic.php?action=manage"><?php echo UI::get_icon('server_lightning', T_('Configure Democratic Playlist')); ?></a> - <?php echo T_('Configure Democratic Playlist'); ?> + <a href="<?php echo Config::get('web_path'); ?>/democratic.php?action=manage"><?php echo UI::get_icon('server_lightning', T_('Configure Democratic Playlist')); ?></a> + <?php echo T_('Configure Democratic Playlist'); ?> </li> <?php if ($democratic->is_enabled()) { ?> <li> - <?php echo Ajax::button('?page=democratic&action=send_playlist&democratic_id=' . scrub_out($democratic->id),'all', T_('Play'),'play_democratic'); ?> - <?php echo T_('Play Democratic Playlist'); ?> + <?php echo Ajax::button('?page=democratic&action=send_playlist&democratic_id=' . scrub_out($democratic->id),'all', T_('Play'),'play_democratic'); ?> + <?php echo T_('Play Democratic Playlist'); ?> </li> <li> - <?php echo Ajax::button('?page=democratic&action=clear_playlist&democratic_id=' . scrub_out($democratic->id),'delete', T_('Clear Playlist'),'clear_democratic'); ?> - <?php echo T_('Clear Playlist'); ?> + <?php echo Ajax::button('?page=democratic&action=clear_playlist&democratic_id=' . scrub_out($democratic->id),'delete', T_('Clear Playlist'),'clear_democratic'); ?> + <?php echo T_('Clear Playlist'); ?> </li> <?php } ?> <?php } ?> diff --git a/templates/show_democratic_playlist.inc.php b/templates/show_democratic_playlist.inc.php index 49dd889e..1ce5bda6 100644 --- a/templates/show_democratic_playlist.inc.php +++ b/templates/show_democratic_playlist.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -37,14 +37,14 @@ $web_path = Config::get('web_path'); </colgroup> <?php if (!count($object_ids)) { - $playlist = new Playlist($democratic->base_playlist); + $playlist = new Playlist($democratic->base_playlist); ?> <tr> <td> - <?php echo T_('Playing from base Playlist'); ?>: - <a href="<?php echo $web_path; ?>/playlist.php?action=show_playlist&playlist_id=<?php echo $playlist->id; ?>"> - <?php echo scrub_out($playlist->name); ?> - </a> + <?php echo T_('Playing from base Playlist'); ?>: + <a href="<?php echo $web_path; ?>/playlist.php?action=show_playlist&playlist_id=<?php echo $playlist->id; ?>"> + <?php echo scrub_out($playlist->name); ?> + </a> </td> </tr> <?php @@ -53,55 +53,55 @@ if (!count($object_ids)) { else { ?> <tr class="th-top"> - <th class="cel_action"><?php echo T_('Action'); ?></th> - <th class="cel_votes"><?php echo T_('Votes'); ?></th> - <th class="cel_title"><?php echo T_('Title'); ?></th> - <th class="cel_album"><?php echo T_('Album'); ?></th> - <th class="cel_artist"><?php echo T_('Artist'); ?></th> - <th class="cel_time"><?php echo T_('Time'); ?></th> - <?php if (Access::check('interface','100')) { ?> - <th class="cel_admin"><?php echo T_('Admin'); ?></th> - <?php } ?> + <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_votes"><?php echo T_('Votes'); ?></th> + <th class="cel_title"><?php echo T_('Title'); ?></th> + <th class="cel_album"><?php echo T_('Album'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_time"><?php echo T_('Time'); ?></th> + <?php if (Access::check('interface','100')) { ?> + <th class="cel_admin"><?php echo T_('Admin'); ?></th> + <?php } ?> </tr> <?php $democratic = Democratic::get_current_playlist(); $democratic->set_parent(); foreach($object_ids as $item) { - $media = new $item['object_type']($item['object_id']); - $media->format(); + $media = new $item['object_type']($item['object_id']); + $media->format(); ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td class="cel_action"> - <?php if ($democratic->has_vote($item['object_id'], $item['object_type'])) { ?> - <?php echo Ajax::button('?page=democratic&action=delete_vote&row_id=' . $item['id'],'delete', T_('Remove Vote'),'remove_vote_' . $item['id']); ?> - <?php } else { ?> - <?php echo Ajax::button('?page=democratic&action=add_vote&object_id=' . $media->id . '&type=' . scrub_out($item['object_type']),'tick', T_('Add Vote'),'remove_vote_' . $item['id']); ?> - <?php } ?> - </td> - <td class="cel_votes" ><?php echo scrub_out($democratic->get_vote($item['id'])); ?></td> - <td class="cel_title"><?php echo $media->f_link; ?></td> - <td class="cel_album"><?php echo $media->f_album_link; ?></td> - <td class="cel_artist"><?php echo $media->f_artist_link; ?></td> - <td class="cel_time"><?php echo $media->f_time; ?></td> - <?php if (Access::check('interface','100')) { ?> - <td class="cel_admin"> - <?php echo Ajax::button('?page=democratic&action=delete&row_id=' . $item['id'],'disable', T_('Delete'),'delete_row_' . $item['id']); ?> - </td> - <?php } ?> + <td class="cel_action"> + <?php if ($democratic->has_vote($item['object_id'], $item['object_type'])) { ?> + <?php echo Ajax::button('?page=democratic&action=delete_vote&row_id=' . $item['id'],'delete', T_('Remove Vote'),'remove_vote_' . $item['id']); ?> + <?php } else { ?> + <?php echo Ajax::button('?page=democratic&action=add_vote&object_id=' . $media->id . '&type=' . scrub_out($item['object_type']),'tick', T_('Add Vote'),'remove_vote_' . $item['id']); ?> + <?php } ?> + </td> + <td class="cel_votes" ><?php echo scrub_out($democratic->get_vote($item['id'])); ?></td> + <td class="cel_title"><?php echo $media->f_link; ?></td> + <td class="cel_album"><?php echo $media->f_album_link; ?></td> + <td class="cel_artist"><?php echo $media->f_artist_link; ?></td> + <td class="cel_time"><?php echo $media->f_time; ?></td> + <?php if (Access::check('interface','100')) { ?> + <td class="cel_admin"> + <?php echo Ajax::button('?page=democratic&action=delete&row_id=' . $item['id'],'disable', T_('Delete'),'delete_row_' . $item['id']); ?> + </td> + <?php } ?> </tr> <?php - } // end foreach + } // end foreach ?> <tr class="th-bottom"> - <th class="cel_action"><?php echo T_('Action'); ?></th> - <th class="cel_votes"><?php echo T_('Votes'); ?></th> - <th class="cel_title"><?php echo T_('Title'); ?></th> - <th class="cel_album"><?php echo T_('Album'); ?></th> - <th class="cel_artist"><?php echo T_('Artist'); ?></th> - <th class="cel_time"><?php echo T_('Time'); ?></th> - <?php if (Access::check('interface','100')) { ?> - <th class="cel_admin"><?php echo T_('Admin'); ?></th> - <?php } ?> + <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_votes"><?php echo T_('Votes'); ?></th> + <th class="cel_title"><?php echo T_('Title'); ?></th> + <th class="cel_album"><?php echo T_('Album'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_time"><?php echo T_('Time'); ?></th> + <?php if (Access::check('interface','100')) { ?> + <th class="cel_admin"><?php echo T_('Admin'); ?></th> + <?php } ?> </tr> <?php } // end else diff --git a/templates/show_denied.inc.php b/templates/show_denied.inc.php index d5a152b8..f86b1b45 100644 --- a/templates/show_denied.inc.php +++ b/templates/show_denied.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) diff --git a/templates/show_disabled_songs.inc.php b/templates/show_disabled_songs.inc.php index c651b19e..466c0e21 100644 --- a/templates/show_disabled_songs.inc.php +++ b/templates/show_disabled_songs.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -32,39 +32,39 @@ <col id="col_additiontime" /> </colgroup> <tr class="th-top"> - <th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo T_('Select'); ?></a></th> - <th class="cel_song"><?php echo T_('Title'); ?></th> - <th class="cel_album"><?php echo T_('Album'); ?></th> - <th class="cel_artist"><?php echo T_('Artist'); ?></th> - <th class="cel_filename"><?php echo T_('Filename'); ?></th> - <th class="cel_additiontime"><?php echo T_('Addition Time'); ?></th> + <th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo T_('Select'); ?></a></th> + <th class="cel_song"><?php echo T_('Title'); ?></th> + <th class="cel_album"><?php echo T_('Album'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_filename"><?php echo T_('Filename'); ?></th> + <th class="cel_additiontime"><?php echo T_('Addition Time'); ?></th> </tr> <?php foreach ($songs as $song) { ?> - <tr class="<?php echo UI::flip_class(); ?>"> - <td class="cel_select"><input type="checkbox" name="song[]" value="<?php echo $song->id; ?>" /></td> - <td class="cel_song"><?php echo $song->title; ?></td> - <td class="cel_album"><?php echo $song->get_album_name($song->album); ?></td> - <td class="cel_artist"><?php echo $song->get_artist_name($song->album); ?></td> - <td class="cel_filename"><?php echo $song->file; ?></td> - <td class="cel_additiontime"><?php echo date("h:i:s, m/d/y",$song->addition_time); ?></td> + <tr class="<?php echo UI::flip_class(); ?>"> + <td class="cel_select"><input type="checkbox" name="song[]" value="<?php echo $song->id; ?>" /></td> + <td class="cel_song"><?php echo $song->title; ?></td> + <td class="cel_album"><?php echo $song->get_album_name($song->album); ?></td> + <td class="cel_artist"><?php echo $song->get_artist_name($song->album); ?></td> + <td class="cel_filename"><?php echo $song->file; ?></td> + <td class="cel_additiontime"><?php echo date("h:i:s, m/d/y",$song->addition_time); ?></td> - </tr> + </tr> <?php } if (!count($songs)) { ?> - <tr class="<?php echo UI::flip_class(); ?>"> - <td colspan="7"><span class="error"><?php echo T_('No Records Found'); ?></span></td> - </tr> + <tr class="<?php echo UI::flip_class(); ?>"> + <td colspan="7"><span class="error"><?php echo T_('No Records Found'); ?></span></td> + </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo T_('Select'); ?></a></th> - <th class="cel_song"><?php echo T_('Title'); ?></th> - <th class="cel_album"><?php echo T_('Album'); ?></th> - <th class="cel_artist"><?php echo T_('Artist'); ?></th> - <th class="cel_filename"><?php echo T_('Filename'); ?></th> - <th class="cel_additiontime"><?php echo T_('Addition Time'); ?></th> + <th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo T_('Select'); ?></a></th> + <th class="cel_song"><?php echo T_('Title'); ?></th> + <th class="cel_album"><?php echo T_('Album'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_filename"><?php echo T_('Filename'); ?></th> + <th class="cel_additiontime"><?php echo T_('Addition Time'); ?></th> </tr> </table> <div class="formValidation"> - <input class="button" type="submit" value="<?php echo T_('Remove'); ?>" /> - <input type="hidden" name="action" value="remove_disabled" /> + <input class="button" type="submit" value="<?php echo T_('Remove'); ?>" /> + <input type="hidden" name="action" value="remove_disabled" /> </div> </form> diff --git a/templates/show_duplicate.inc.php b/templates/show_duplicate.inc.php index bc5435f2..85cd3379 100644 --- a/templates/show_duplicate.inc.php +++ b/templates/show_duplicate.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,18 +24,18 @@ <form name="duplicates" action="<?php echo Config::get('web_path'); ?>/admin/duplicates.php?action=find_duplicates" method="post" enctype="multipart/form-data" > <table cellspacing="0" cellpadding="3"> <tr> - <td valign="top"><strong><?php echo T_('Search Type'); ?>:</strong></td> + <td valign="top"><strong><?php echo T_('Search Type'); ?>:</strong></td> <td> - <?php - $name = 'check_' . scrub_in($_REQUEST['search_type']); - ${$name} = ' checked="checked" '; - ?> - <input type="radio" name="search_type" value="title"<?php echo $check_title; ?>/><?php echo T_('Title'); ?><br /> + <?php + $name = 'check_' . scrub_in($_REQUEST['search_type']); + ${$name} = ' checked="checked" '; + ?> + <input type="radio" name="search_type" value="title"<?php echo $check_title; ?>/><?php echo T_('Title'); ?><br /> <input type="radio" name="search_type" value="artist_title"<?php echo $check_artist_title; ?>/><?php echo T_('Artist and Title'); ?><br /> <input type="radio" name="search_type" value="artist_album_title"<?php echo $check_artist_album_title; ?>/><?php echo T_('Artist, Album and Title'); ?><br /> <?php if ($_REQUEST['search_disabled']) { $disabled_check = ' checked="checked"'; } ?> <input type="checkbox" name="search_disabled" value="1" <?php echo $disabled_check; ?>/><?php echo T_('Search Disabled Songs'); ?><br /> - </td> + </td> </tr> </table> <div class="formValidation"> diff --git a/templates/show_duplicates.inc.php b/templates/show_duplicates.inc.php index 6a62e19c..8bd9cbda 100644 --- a/templates/show_duplicates.inc.php +++ b/templates/show_duplicates.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -34,53 +34,53 @@ <col id="col_filename" /> </colgroup> <tr class="th-top"> - <th class="cel_disable"><?php echo T_('Disable'); ?></th> - <th class="cel_song"><?php echo T_('Song'); ?></th> - <th class="cel_artist"><?php echo T_('Artist'); ?></th> - <th class="cel_album"><?php echo T_('Album'); ?></th> - <th class="cel_length"><?php echo T_('Length'); ?></th> - <th class="cel_bitrate"><?php echo T_('Bitrate'); ?></th> - <th class="cel_size"><?php echo T_('Size'); ?></th> - <th class="cel_filename"><?php echo T_('Filename'); ?></th> + <th class="cel_disable"><?php echo T_('Disable'); ?></th> + <th class="cel_song"><?php echo T_('Song'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_album"><?php echo T_('Album'); ?></th> + <th class="cel_length"><?php echo T_('Length'); ?></th> + <th class="cel_bitrate"><?php echo T_('Bitrate'); ?></th> + <th class="cel_size"><?php echo T_('Size'); ?></th> + <th class="cel_filename"><?php echo T_('Filename'); ?></th> </tr> <?php - foreach ($duplicates as $item) { - // Gather the duplicates - $songs = Song::get_duplicate_info($item, $search_type); + foreach ($duplicates as $item) { + // Gather the duplicates + $songs = Song::get_duplicate_info($item, $search_type); - foreach ($songs as $key => $song_id) { - $song = new Song($song_id); - $song->format(); - $row_key = 'duplicate_' . $song_id; - $button_flip_state_id = 'button_flip_state_' . $song_id; - $current_class = ($key == '0') ? 'row-highlight' : UI::flip_class(); - $button = $song->enabled ? 'disable' : 'enable'; - ?> + foreach ($songs as $key => $song_id) { + $song = new Song($song_id); + $song->format(); + $row_key = 'duplicate_' . $song_id; + $button_flip_state_id = 'button_flip_state_' . $song_id; + $current_class = ($key == '0') ? 'row-highlight' : UI::flip_class(); + $button = $song->enabled ? 'disable' : 'enable'; + ?> <tr id="<?php echo $row_key; ?>" class="<?php echo $current_class; ?>"> - <td class="cel_disable" id="<?php echo($button_flip_state_id); ?>"> - <?php echo Ajax::button('?page=song&action=flip_state&song_id=' . $song_id,$button, T_(ucfirst($button)),'flip_state_' . $song_id); ?> - </td> - <td class="cel_song"><?php echo $song->f_link; ?></td> - <td class="cel_artist"><?php echo $song->f_artist_link; ?></td> - <td class="cel_album"><?php echo $song->f_album_link; ?></td> - <td class="cel_length"><?php echo $song->f_time; ?></td> - <td class="cel_bitrate"><?php echo $song->f_bitrate; ?></td> - <td class="cel_size"><?php echo $song->f_size; ?></td> - <td class="cel_filename"><?php echo scrub_out($song->file); ?></td> + <td class="cel_disable" id="<?php echo($button_flip_state_id); ?>"> + <?php echo Ajax::button('?page=song&action=flip_state&song_id=' . $song_id,$button, T_(ucfirst($button)),'flip_state_' . $song_id); ?> + </td> + <td class="cel_song"><?php echo $song->f_link; ?></td> + <td class="cel_artist"><?php echo $song->f_artist_link; ?></td> + <td class="cel_album"><?php echo $song->f_album_link; ?></td> + <td class="cel_length"><?php echo $song->f_time; ?></td> + <td class="cel_bitrate"><?php echo $song->f_bitrate; ?></td> + <td class="cel_size"><?php echo $song->f_size; ?></td> + <td class="cel_filename"><?php echo scrub_out($song->file); ?></td> </tr> <?php - } // end foreach ($dinfolist as $dinfo) - } // end foreach ($flags as $flag) + } // end foreach ($dinfolist as $dinfo) + } // end foreach ($flags as $flag) ?> <tr class="th-bottom"> - <th class="cel_disable"><?php echo T_('Disable'); ?></th> - <th class="cel_song"><?php echo T_('Song'); ?></th> - <th class="cel_artist"><?php echo T_('Artist'); ?></th> - <th class="cel_album"><?php echo T_('Album'); ?></th> - <th class="cel_length"><?php echo T_('Length'); ?></th> - <th class="cel_bitrate"><?php echo T_('Bitrate'); ?></th> - <th class="cel_size"><?php echo T_('Size'); ?></th> - <th class="cel_filename"><?php echo T_('Filename'); ?></th> + <th class="cel_disable"><?php echo T_('Disable'); ?></th> + <th class="cel_song"><?php echo T_('Song'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_album"><?php echo T_('Album'); ?></th> + <th class="cel_length"><?php echo T_('Length'); ?></th> + <th class="cel_bitrate"><?php echo T_('Bitrate'); ?></th> + <th class="cel_size"><?php echo T_('Size'); ?></th> + <th class="cel_filename"><?php echo T_('Filename'); ?></th> </tr> </table> </form> diff --git a/templates/show_dynamic.inc.php b/templates/show_dynamic.inc.php index 67173b97..65e411e7 100644 --- a/templates/show_dynamic.inc.php +++ b/templates/show_dynamic.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -23,66 +23,66 @@ <?php UI::show_box_top(T_('Advanced Random Rules')); ?> <table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> - <col id="col_field" /> - <col id="col_operator" /> - <col id="col_value" /> - <col id="col_method" /> + <col id="col_field" /> + <col id="col_operator" /> + <col id="col_value" /> + <col id="col_method" /> </colgroup> <tr class="th-top"> - <th class="col_field"><?php echo T_('Field'); ?></th> - <th class="col_operator"><?php echo T_('Operator'); ?></th> - <th class="col_value"><?php echo T_('Value'); ?></th> - <th class="col_method"><?php echo T_('Method'); ?></th> + <th class="col_field"><?php echo T_('Field'); ?></th> + <th class="col_operator"><?php echo T_('Operator'); ?></th> + <th class="col_value"><?php echo T_('Value'); ?></th> + <th class="col_method"><?php echo T_('Method'); ?></th> </tr> <tr> - <td valign="top"> - <select name="field"> - <?php - $fields = Song::get_fields(); - foreach ($fields as $key=>$value) { - $name = ucfirst(str_replace('_',' ',$key)); - ?> - <option value="<?php echo scrub_out($key); ?>"><?php echo scrub_out($name); ?></option> - <?php } ?> - </select> - </td> - <td> - <select name="operator"> - <option value="eq">=</option> - <option value="nq">!=</option> - <option value="gt">></option> - <option value="gte">>=</option> - <option value="lt"><</option> - <option value="lte"><=</option> - <option value="like"><?php echo T_('Like'); ?></option> - </select> - </td> - <td valign="top"> - <input type="text" name="value" /> - </td> - <td valign="top"> - <select name="method"> - <option value="OR"><?php echo T_('OR'); ?></option> - <option value="AND"><?php echo T_('AND'); ?></option> - </select> - </td> + <td valign="top"> + <select name="field"> + <?php + $fields = Song::get_fields(); + foreach ($fields as $key=>$value) { + $name = ucfirst(str_replace('_',' ',$key)); + ?> + <option value="<?php echo scrub_out($key); ?>"><?php echo scrub_out($name); ?></option> + <?php } ?> + </select> + </td> + <td> + <select name="operator"> + <option value="eq">=</option> + <option value="nq">!=</option> + <option value="gt">></option> + <option value="gte">>=</option> + <option value="lt"><</option> + <option value="lte"><=</option> + <option value="like"><?php echo T_('Like'); ?></option> + </select> + </td> + <td valign="top"> + <input type="text" name="value" /> + </td> + <td valign="top"> + <select name="method"> + <option value="OR"><?php echo T_('OR'); ?></option> + <option value="AND"><?php echo T_('AND'); ?></option> + </select> + </td> </tr> <tr> - <td> - <?php echo Ajax::button('?page=random&action=add_rule','add', T_('Add Rule'),'add_random_rule'); ?><?php echo T_('Add Rule'); ?> - </td> - <td> - <?php echo Ajax::button('?page=random&action=save_rules','download', T_('Save Rules As'),'save_random_rules'); ?><?php echo T_('Save Rules As'); ?> - </td> - <td colspan="2"> - <?php echo Ajax::button('?page=random&action=load_rules','cog', T_('Load Saved Rules'),'load_random_rules'); ?><?php echo T_('Load Saved Rules'); ?> - </td> + <td> + <?php echo Ajax::button('?page=random&action=add_rule','add', T_('Add Rule'),'add_random_rule'); ?><?php echo T_('Add Rule'); ?> + </td> + <td> + <?php echo Ajax::button('?page=random&action=save_rules','download', T_('Save Rules As'),'save_random_rules'); ?><?php echo T_('Save Rules As'); ?> + </td> + <td colspan="2"> + <?php echo Ajax::button('?page=random&action=load_rules','cog', T_('Load Saved Rules'),'load_random_rules'); ?><?php echo T_('Load Saved Rules'); ?> + </td> </tr> <tr> - <td colspan="4"> - <div id="rule_status"></div> - </td> + <td colspan="4"> + <div id="rule_status"></div> + </td> </tr> </table> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_edit_access.inc.php b/templates/show_edit_access.inc.php index 88cdae60..b9a2e6f3 100644 --- a/templates/show_edit_access.inc.php +++ b/templates/show_edit_access.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,14 +24,14 @@ <form name="edit_access" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=update_record&access_id=<?php echo intval($access->id); ?>"> <table class="table-data"> <tr> - <td><?php echo T_('Name'); ?>: </td> - <td colspan="3"><input type="text" name="name" value="<?php echo scrub_out($access->name); ?>" /></td> + <td><?php echo T_('Name'); ?>: </td> + <td colspan="3"><input type="text" name="name" value="<?php echo scrub_out($access->name); ?>" /></td> </tr> <tr> - <td><?php echo T_('ACL Type'); ?>: </td> + <td><?php echo T_('ACL Type'); ?>: </td> <td colspan="3"> <select name="type"> - <?php $name = 'sl_' . $access->type; ${$name} = ' selected="selected"'; ?> + <?php $name = 'sl_' . $access->type; ${$name} = ' selected="selected"'; ?> <option value="stream"<?php echo $sl_stream; ?>><?php echo T_('Stream Access'); ?></option> <option value="interface"<?php echo $sl_interface; ?>><?php echo T_('Web Interface'); ?></option> <option value="network"<?php echo $sl_network; ?>><?php echo T_('Local Network Definition'); ?></option> @@ -46,37 +46,37 @@ </td> </tr> <tr> - <td><?php echo T_('Start'); ?>:</td> - <td> - <?php Error::display('start'); ?> - <input type="text" name="start" value="<?php echo $access->f_start; ?>" size="20" /> - </td> - <td><?php echo T_('End'); ?>:</td> - <td> - <?php Error::display('end'); ?> - <input type="text" name="end" value="<?php echo $access->f_end; ?>" size="20" /> - </td> + <td><?php echo T_('Start'); ?>:</td> + <td> + <?php Error::display('start'); ?> + <input type="text" name="start" value="<?php echo $access->f_start; ?>" size="20" /> + </td> + <td><?php echo T_('End'); ?>:</td> + <td> + <?php Error::display('end'); ?> + <input type="text" name="end" value="<?php echo $access->f_end; ?>" size="20" /> + </td> </tr> <tr> - <td><?php echo T_('User'); ?>:</td> - <td colspan="3"> - <?php show_user_select('user',$access->user); ?> - </td> + <td><?php echo T_('User'); ?>:</td> + <td colspan="3"> + <?php show_user_select('user',$access->user); ?> + </td> </tr> <tr> - <td><?php echo T_('Level'); ?>:</td> - <td colspan="3"> - <?php $name = 'level_' . $access->level; ${$name} = 'checked="checked"'; ?> - <input type="radio" name="level" value="5" <?php echo $level_5; ?>><?php echo T_('View'); ?> - <input type="radio" name="level" value="25" <?php echo $level_25; ?>><?php echo T_('Read'); ?> - <input type="radio" name="level" value="50" <?php echo $level_50; ?>><?php echo T_('Read/Write'); ?> - <input type="radio" name="level" value="75" <?php echo $level_75; ?>><?php echo T_('All'); ?> - </td> + <td><?php echo T_('Level'); ?>:</td> + <td colspan="3"> + <?php $name = 'level_' . $access->level; ${$name} = 'checked="checked"'; ?> + <input type="radio" name="level" value="5" <?php echo $level_5; ?>><?php echo T_('View'); ?> + <input type="radio" name="level" value="25" <?php echo $level_25; ?>><?php echo T_('Read'); ?> + <input type="radio" name="level" value="50" <?php echo $level_50; ?>><?php echo T_('Read/Write'); ?> + <input type="radio" name="level" value="75" <?php echo $level_75; ?>><?php echo T_('All'); ?> + </td> </tr> </table> <div class="formValidation"> - <?php echo Core::form_register('edit_acl'); ?> - <input type="submit" value="<?php echo T_('Update'); ?>" /> + <?php echo Core::form_register('edit_acl'); ?> + <input type="submit" value="<?php echo T_('Update'); ?>" /> </div> </form> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_edit_album.inc.php b/templates/show_edit_album.inc.php index 6895bd1f..e1a40334 100644 --- a/templates/show_edit_album.inc.php +++ b/templates/show_edit_album.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,27 +25,27 @@ <form name="edit_album" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/flag.php?action=edit_album"> <table class="tabledata"> <tr class="<?php echo UI::flip_class(); ?>"> - <td><?php echo T_('Name'); ?></td> - <td> - <input type="text" name="name" value="<?php echo scrub_out($album->full_name); ?>"> - </td> + <td><?php echo T_('Name'); ?></td> + <td> + <input type="text" name="name" value="<?php echo scrub_out($album->full_name); ?>"> + </td> </tr> <tr class="<?php echo UI::flip_class(); ?>"> - <td><?php echo T_('Year'); ?></td> - <td> - <input type="text" name="year" value="<?php echo scrub_out($album->year); ?>"> - </td> + <td><?php echo T_('Year'); ?></td> + <td> + <input type="text" name="year" value="<?php echo scrub_out($album->year); ?>"> + </td> </tr> <tr class="<?php echo UI::flip_class(); ?>"> - <td> </td> - <td> - <input type="checkbox" name="flag" value="1" checked="checked" /> <?php echo T_('Flag for Retagging'); ?> - </td> + <td> </td> + <td> + <input type="checkbox" name="flag" value="1" checked="checked" /> <?php echo T_('Flag for Retagging'); ?> + </td> </tr> </table> <div class="formValidation"> - <input type="hidden" name="album_id" value="<?php echo $album->id; ?>" /> - <input type="submit" value="<?php echo T_('Update Album'); ?>" /> + <input type="hidden" name="album_id" value="<?php echo $album->id; ?>" /> + <input type="submit" value="<?php echo T_('Update Album'); ?>" /> </div> </form> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_edit_album_row.inc.php b/templates/show_edit_album_row.inc.php index e0330e22..3ea037d8 100644 --- a/templates/show_edit_album_row.inc.php +++ b/templates/show_edit_album_row.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,28 +25,28 @@ <table class="inline-edit" cellpadding="3" cellspacing="0"> <tr> <td> - <input type="text" name="name" value="<?php echo scrub_out($album->full_name); ?>" /> + <input type="text" name="name" value="<?php echo scrub_out($album->full_name); ?>" /> </td> <td> - <?php - if ($album->artist_count == '1') { - show_artist_select('artist',$album->artist_id); - } - else { - echo T_('Various'); - } - ?> + <?php + if ($album->artist_count == '1') { + show_artist_select('artist',$album->artist_id); + } + else { + echo T_('Various'); + } + ?> </td> <td> - <input type="text" name="year" value="<?php echo scrub_out($album->year); ?>" /> + <input type="text" name="year" value="<?php echo scrub_out($album->year); ?>" /> </td> <td> - <input type="text" name="disk" value="<?php echo scrub_out($album->disk); ?>" /> + <input type="text" name="disk" value="<?php echo scrub_out($album->disk); ?>" /> </td> <td> - <input type="hidden" name="id" value="<?php echo $album->id; ?>" /> - <input type="hidden" name="type" value="album_row" /> - <?php echo Ajax::button('?action=edit_object&id=' . $album->id . '&type=album_row','download', T_('Save Changes'),'save_album_' . $album->id,'edit_album_' . $album->id); ?> + <input type="hidden" name="id" value="<?php echo $album->id; ?>" /> + <input type="hidden" name="type" value="album_row" /> + <?php echo Ajax::button('?action=edit_object&id=' . $album->id . '&type=album_row','download', T_('Save Changes'),'save_album_' . $album->id,'edit_album_' . $album->id); ?> </td> </tr> </table> diff --git a/templates/show_edit_artist.inc.php b/templates/show_edit_artist.inc.php index 14bb89fe..5fc2f383 100644 --- a/templates/show_edit_artist.inc.php +++ b/templates/show_edit_artist.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,21 +25,21 @@ <form name="edit_artist" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/flag.php?action=edit_artist"> <table class="tabledata"> <tr class="<?php echo UI::flip_class(); ?>"> - <td><?php echo T_('Name'); ?></td> - <td> - <input type="text" name="name" value="<?php echo scrub_out($artist->name); ?>"> - </td> + <td><?php echo T_('Name'); ?></td> + <td> + <input type="text" name="name" value="<?php echo scrub_out($artist->name); ?>"> + </td> </tr> <tr class="<?php echo UI::flip_class(); ?>"> - <td> </td> - <td> - <input type="checkbox" name="flag" value="1" checked="checked" /> <?php echo T_('Flag for Retagging'); ?> - </td> + <td> </td> + <td> + <input type="checkbox" name="flag" value="1" checked="checked" /> <?php echo T_('Flag for Retagging'); ?> + </td> </tr> </table> <div class="formValidation"> - <input type="hidden" name="artist_id" value="<?php echo $artist->id; ?>" /> - <input type="submit" value="<?php echo T_('Update Artist'); ?>" /> + <input type="hidden" name="artist_id" value="<?php echo $artist->id; ?>" /> + <input type="submit" value="<?php echo T_('Update Artist'); ?>" /> </div> </form> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_edit_artist_row.inc.php b/templates/show_edit_artist_row.inc.php index 97424f91..2c52d59f 100644 --- a/templates/show_edit_artist_row.inc.php +++ b/templates/show_edit_artist_row.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,12 +25,12 @@ <table class="inline-edit" cellpadding="3" cellspacing="0"> <tr> <td> - <input type="text" name="name" value="<?php echo scrub_out($artist->f_full_name); ?>" /> + <input type="text" name="name" value="<?php echo scrub_out($artist->f_full_name); ?>" /> </td> <td> - <input type="hidden" name="id" value="<?php echo $artist->id; ?>" /> - <input type="hidden" name="type" value="artist_row" /> - <?php echo Ajax::button('?action=edit_object&id=' . $artist->id . '&type=artist_row','download', T_('Save Changes'),'save_artist_' . $artist->id,'edit_artist_' . $artist->id); ?> + <input type="hidden" name="id" value="<?php echo $artist->id; ?>" /> + <input type="hidden" name="type" value="artist_row" /> + <?php echo Ajax::button('?action=edit_object&id=' . $artist->id . '&type=artist_row','download', T_('Save Changes'),'save_artist_' . $artist->id,'edit_artist_' . $artist->id); ?> </tr> </table> diff --git a/templates/show_edit_catalog.inc.php b/templates/show_edit_catalog.inc.php index c7d5752e..7a6e6b85 100644 --- a/templates/show_edit_catalog.inc.php +++ b/templates/show_edit_catalog.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,22 +25,22 @@ UI::show_box_top(sprintf(T_('Settings for %s') , $catalog->name . ' (' . $catalo <form method="post" action="<?php echo Config::get('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data"> <table cellspacing="0" cellpadding="0"> <tr> - <td><?php echo T_('Name'); ?>:</td> - <td><input size="60" type="text" name="name" value="<?php echo scrub_out($catalog->name); ?>"></input></td> - <td style="vertical-align:top; font-family: monospace;" rowspan="5"> - <strong><?php echo T_('Auto-inserted Fields'); ?>:</strong><br /> - <span class="format-specifier">%A</span>= <?php echo T_('album name'); ?><br /> - <span class="format-specifier">%a</span>= <?php echo T_('artist name'); ?><br /> - <span class="format-specifier">%c</span>= <?php echo T_('id3 comment'); ?><br /> - <span class="format-specifier">%T</span>= <?php echo T_('track number (padded with leading 0)'); ?><br /> - <span class="format-specifier">%t</span>= <?php echo T_('song title'); ?><br /> - <span class="format-specifier">%y</span>= <?php echo T_('year'); ?><br /> - <span class="format-specifier">%o</span>= <?php echo T_('other'); ?><br /> - </td> + <td><?php echo T_('Name'); ?>:</td> + <td><input size="60" type="text" name="name" value="<?php echo scrub_out($catalog->name); ?>"></input></td> + <td style="vertical-align:top; font-family: monospace;" rowspan="5"> + <strong><?php echo T_('Auto-inserted Fields'); ?>:</strong><br /> + <span class="format-specifier">%A</span>= <?php echo T_('album name'); ?><br /> + <span class="format-specifier">%a</span>= <?php echo T_('artist name'); ?><br /> + <span class="format-specifier">%c</span>= <?php echo T_('id3 comment'); ?><br /> + <span class="format-specifier">%T</span>= <?php echo T_('track number (padded with leading 0)'); ?><br /> + <span class="format-specifier">%t</span>= <?php echo T_('song title'); ?><br /> + <span class="format-specifier">%y</span>= <?php echo T_('year'); ?><br /> + <span class="format-specifier">%o</span>= <?php echo T_('other'); ?><br /> + </td> </tr> <tr> - <td><?php echo T_('Catalog Type'); ?></td> - <td><?php echo scrub_out(ucfirst($catalog->catalog_type)); ?></td> + <td><?php echo T_('Catalog Type'); ?></td> + <td><?php echo scrub_out(ucfirst($catalog->catalog_type)); ?></td> </tr> <tr> <td><?php echo T_('Remote Catalog Username'); ?>: </td> @@ -51,24 +51,24 @@ UI::show_box_top(sprintf(T_('Settings for %s') , $catalog->name . ' (' . $catalo <td><input size="30" type="password" name="remote_password" value="" /><span class="error">*<?php echo T_('Required for Remote Catalogs'); ?></span></td> </tr> <tr> - <td><?php echo T_('Filename pattern'); ?>:</td> - <td> - <input size="60" type="text" name="rename_pattern" value="<?php echo scrub_out($catalog->rename_pattern); ?>" /> - </td> + <td><?php echo T_('Filename pattern'); ?>:</td> + <td> + <input size="60" type="text" name="rename_pattern" value="<?php echo scrub_out($catalog->rename_pattern); ?>" /> + </td> </tr> <tr> - <td> - <?php echo T_('Folder Pattern'); ?>:<br /><?php echo T_('(no leading or ending \'/\')'); ?> - </td> - <td> - <input size="60" type="text" name="sort_pattern" value="<?php echo scrub_out($catalog->sort_pattern);?>" /> - </td> + <td> + <?php echo T_('Folder Pattern'); ?>:<br /><?php echo T_('(no leading or ending \'/\')'); ?> + </td> + <td> + <input size="60" type="text" name="sort_pattern" value="<?php echo scrub_out($catalog->sort_pattern);?>" /> + </td> </tr> </table> <div class="formValidation"> - <input type="hidden" name="catalog_id" value="<?php echo scrub_out($catalog->id); ?>" /> - <input type="hidden" name="action" value="update_catalog_settings" /> - <input class="button" type="submit" value="<?php echo T_('Save Catalog Settings'); ?>" /> + <input type="hidden" name="catalog_id" value="<?php echo scrub_out($catalog->id); ?>" /> + <input type="hidden" name="action" value="update_catalog_settings" /> + <input class="button" type="submit" value="<?php echo T_('Save Catalog Settings'); ?>" /> </div> </form> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_edit_live_stream_row.inc.php b/templates/show_edit_live_stream_row.inc.php index 51e076c9..d44e5605 100644 --- a/templates/show_edit_live_stream_row.inc.php +++ b/templates/show_edit_live_stream_row.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,33 +24,33 @@ <form method="post" id="edit_live_stream_<?php echo $radio->id; ?>"> <table class="inline-edit" cellpadding="3" cellspacing="0"> <tr> - <th><?php echo T_('Name'); ?></th> - <th><?php echo T_('Stream URL'); ?></th> - <th><?php echo T_('Homepage'); ?></th> - <th><?php echo T_('Callsign'); ?></th> - <th><?php echo T_('Frequency'); ?></th> - <th> </th> + <th><?php echo T_('Name'); ?></th> + <th><?php echo T_('Stream URL'); ?></th> + <th><?php echo T_('Homepage'); ?></th> + <th><?php echo T_('Callsign'); ?></th> + <th><?php echo T_('Frequency'); ?></th> + <th> </th> </tr> <tr> <td> - <input type="text" name="name" value="<?php echo scrub_out($radio->name); ?>" size="9" /> + <input type="text" name="name" value="<?php echo scrub_out($radio->name); ?>" size="9" /> </td> <td> - <input type="text" name="url" value="<?php echo scrub_out($radio->url); ?>" size ="12" /> + <input type="text" name="url" value="<?php echo scrub_out($radio->url); ?>" size ="12" /> </td> <td> - <input type="text" name="site_url" value="<?php echo scrub_out($radio->site_url); ?>" size="9" /> + <input type="text" name="site_url" value="<?php echo scrub_out($radio->site_url); ?>" size="9" /> </td> <td> - <input type="text" name="call_sign" value="<?php echo scrub_out($radio->call_sign); ?>" size="6" /> + <input type="text" name="call_sign" value="<?php echo scrub_out($radio->call_sign); ?>" size="6" /> </td> <td> - <input type="text" name="frequency" value="<?php echo scrub_out($radio->frequency); ?>" size="6" /> + <input type="text" name="frequency" value="<?php echo scrub_out($radio->frequency); ?>" size="6" /> </td> <td> - <input type="hidden" name="id" value="<?php echo $radio->id; ?>" /> - <input type="hidden" name="type" value="live_stream_row" /> - <?php echo Ajax::button('?action=edit_object&id=' . $radio->id . '&type=live_stream_row','download', T_('Save Changes'),'save_live_stream_' . $radio->id,'edit_live_stream_' . $radio->id); ?> + <input type="hidden" name="id" value="<?php echo $radio->id; ?>" /> + <input type="hidden" name="type" value="live_stream_row" /> + <?php echo Ajax::button('?action=edit_object&id=' . $radio->id . '&type=live_stream_row','download', T_('Save Changes'),'save_live_stream_' . $radio->id,'edit_live_stream_' . $radio->id); ?> </td> </tr> </table> diff --git a/templates/show_edit_playlist_row.inc.php b/templates/show_edit_playlist_row.inc.php index 9728f05a..0c587efe 100644 --- a/templates/show_edit_playlist_row.inc.php +++ b/templates/show_edit_playlist_row.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,20 +24,20 @@ <form method="post" id="edit_playlist_<?php echo $playlist->id; ?>" action="javascript:void(0);"> <table cellpadding="0" cellspacing="0"> <tr> - <td> - <input type="text" name="name" size="25" value="<?php echo scrub_out($playlist->name); ?>" /> - </td> - <td> - <?php $name = 'select_' . $playlist->type; ${$name} = ' selected="selected"'; ?> - <select name="pl_type"> - <option value="public"<?php echo $select_public; ?>><?php echo T_('Public'); ?></option> - <option value="private"<?php echo $select_private; ?>><?php echo T_('Private'); ?></option> - </select> - <td> - <input type="hidden" name="id" value="<?php echo $playlist->id; ?>" /> - <input type="hidden" name="type" value="playlist_row" /> - <?php echo Ajax::button('?action=edit_object&id=' . $playlist->id . '&type=playlist_row','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> - </td> + <td> + <input type="text" name="name" size="25" value="<?php echo scrub_out($playlist->name); ?>" /> + </td> + <td> + <?php $name = 'select_' . $playlist->type; ${$name} = ' selected="selected"'; ?> + <select name="pl_type"> + <option value="public"<?php echo $select_public; ?>><?php echo T_('Public'); ?></option> + <option value="private"<?php echo $select_private; ?>><?php echo T_('Private'); ?></option> + </select> + <td> + <input type="hidden" name="id" value="<?php echo $playlist->id; ?>" /> + <input type="hidden" name="type" value="playlist_row" /> + <?php echo Ajax::button('?action=edit_object&id=' . $playlist->id . '&type=playlist_row','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> + </td> </tr> </table> </form> diff --git a/templates/show_edit_playlist_song_row.inc.php b/templates/show_edit_playlist_song_row.inc.php index f5efe593..edaba2a0 100644 --- a/templates/show_edit_playlist_song_row.inc.php +++ b/templates/show_edit_playlist_song_row.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,7 +25,7 @@ <table class="inline-edit" cellpadding="3" cellspacing="0"> <tr> <td> - <input type="text" name="track" size="3" maxlength="4" value="<?php echo intval($track['track']); ?>" /> + <input type="text" name="track" size="3" maxlength="4" value="<?php echo intval($track['track']); ?>" /> </td> <td class="cel_song"><?php echo $song->f_link; ?></td> <td class="cel_artist"><?php echo $song->f_artist_link; ?></td> @@ -34,9 +34,9 @@ <td class="cel_track"><?php echo $song->f_track; ?></td> <td class="cel_time"><?php echo $song->f_time; ?></td> <td> - <input type="hidden" name="id" value="<?php echo $song->id; ?>" /> - <input type="hidden" name="type" value="song" /> - <?php echo Ajax::button('?page=playlist&action=save_track&playlist_id=' . $playlist->id . '&track_id=' . $track['id'],'download', T_('Save Changes'),'save_track_' . $track['id'],'edit_track_' . $track['id']); ?> + <input type="hidden" name="id" value="<?php echo $song->id; ?>" /> + <input type="hidden" name="type" value="song" /> + <?php echo Ajax::button('?page=playlist&action=save_track&playlist_id=' . $playlist->id . '&track_id=' . $track['id'],'download', T_('Save Changes'),'save_track_' . $track['id'],'edit_track_' . $track['id']); ?> </td> </tr> </table> diff --git a/templates/show_edit_playlist_title.inc.php b/templates/show_edit_playlist_title.inc.php index 475a882e..07707c11 100644 --- a/templates/show_edit_playlist_title.inc.php +++ b/templates/show_edit_playlist_title.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -23,20 +23,20 @@ <form method="post" id="edit_playlist_<?php echo $playlist->id; ?>" action="javascript:void(0);"> <table cellpadding="0" cellspacing="0"> <tr> - <td> - <input type="text" name="name" size="25" value="<?php echo scrub_out($playlist->name); ?>" /> - </td> - <td> - <?php $name = 'select_' . $playlist->type; ${$name} = ' selected="selected"'; ?> - <select name="pl_type"> - <option value="public"<?php echo $select_public; ?>><?php echo T_('Public'); ?></option> - <option value="private"<?php echo $select_private; ?>><?php echo T_('Private'); ?></option> - </select> - <td> - <input type="hidden" name="id" value="<?php echo $playlist->id; ?>" /> - <input type="hidden" name="type" value="playlist_title" /> - <?php echo Ajax::button('?action=edit_object&id=' . $playlist->id . '&type=playlist_title','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> - </td> + <td> + <input type="text" name="name" size="25" value="<?php echo scrub_out($playlist->name); ?>" /> + </td> + <td> + <?php $name = 'select_' . $playlist->type; ${$name} = ' selected="selected"'; ?> + <select name="pl_type"> + <option value="public"<?php echo $select_public; ?>><?php echo T_('Public'); ?></option> + <option value="private"<?php echo $select_private; ?>><?php echo T_('Private'); ?></option> + </select> + <td> + <input type="hidden" name="id" value="<?php echo $playlist->id; ?>" /> + <input type="hidden" name="type" value="playlist_title" /> + <?php echo Ajax::button('?action=edit_object&id=' . $playlist->id . '&type=playlist_title','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> + </td> </tr> </table> </form> diff --git a/templates/show_edit_shout.inc.php b/templates/show_edit_shout.inc.php index c20fee9b..eb4b376d 100644 --- a/templates/show_edit_shout.inc.php +++ b/templates/show_edit_shout.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,21 +25,21 @@ <input type="hidden" name="shout_id" value="<?php echo $shout->id; ?>" /> <table class="tabledata" cellpadding="0" cellspacing="0"> <tr> - <td><strong><?php /* HINT: Client link, Object link */ printf(T_('Created by: %s for %s'), $client->f_link, $object->f_link); ?></strong> + <td><strong><?php /* HINT: Client link, Object link */ printf(T_('Created by: %s for %s'), $client->f_link, $object->f_link); ?></strong> <tr> <tr> - <td><strong><?php echo T_('Comment:'); ?></strong> + <td><strong><?php echo T_('Comment:'); ?></strong> </tr> <tr> - <td><textarea rows="5" cols="70" name="comment"><?php echo $shout->text; ?></textarea></td> + <td><textarea rows="5" cols="70" name="comment"><?php echo $shout->text; ?></textarea></td> </tr> <tr> - <td><input type="checkbox" name="sticky" <?php if ($shout->sticky == "1") { echo "checked"; } ?>/> <strong><?php echo T_('Make Sticky'); ?></strong></td> + <td><input type="checkbox" name="sticky" <?php if ($shout->sticky == "1") { echo "checked"; } ?>/> <strong><?php echo T_('Make Sticky'); ?></strong></td> </tr> <tr> - <td> - <input type="submit" value="<?php echo T_('Update'); ?>" /> - </td> + <td> + <input type="submit" value="<?php echo T_('Update'); ?>" /> + </td> </tr> </table> </form> diff --git a/templates/show_edit_smartplaylist_row.inc.php b/templates/show_edit_smartplaylist_row.inc.php index 08feb912..d366182a 100644 --- a/templates/show_edit_smartplaylist_row.inc.php +++ b/templates/show_edit_smartplaylist_row.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,20 +24,20 @@ <form method="post" id="edit_playlist_<?php echo $playlist->id; ?>" action="javascript:void(0);"> <table cellpadding="0" cellspacing="0"> <tr> - <td> - <input type="text" name="name" size="25" value="<?php echo scrub_out($playlist->name); ?>" /> - </td> - <td> - <?php $name = 'select_' . $playlist->type; ${$name} = ' selected="selected"'; ?> - <select name="pl_type"> - <option value="public"<?php echo $select_public; ?>><?php echo T_('Public'); ?></option> - <option value="private"<?php echo $select_private; ?>><?php echo T_('Private'); ?></option> - </select> - <td> - <input type="hidden" name="id" value="<?php echo $playlist->id; ?>" /> - <input type="hidden" name="type" value="smartplaylist_row" /> - <?php echo Ajax::button('?action=edit_object&id=' . $playlist->id . '&type=smartplaylist_row','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> - </td> + <td> + <input type="text" name="name" size="25" value="<?php echo scrub_out($playlist->name); ?>" /> + </td> + <td> + <?php $name = 'select_' . $playlist->type; ${$name} = ' selected="selected"'; ?> + <select name="pl_type"> + <option value="public"<?php echo $select_public; ?>><?php echo T_('Public'); ?></option> + <option value="private"<?php echo $select_private; ?>><?php echo T_('Private'); ?></option> + </select> + <td> + <input type="hidden" name="id" value="<?php echo $playlist->id; ?>" /> + <input type="hidden" name="type" value="smartplaylist_row" /> + <?php echo Ajax::button('?action=edit_object&id=' . $playlist->id . '&type=smartplaylist_row','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> + </td> </tr> </table> </form> diff --git a/templates/show_edit_smartplaylist_title.inc.php b/templates/show_edit_smartplaylist_title.inc.php index f036235d..b7432eb0 100644 --- a/templates/show_edit_smartplaylist_title.inc.php +++ b/templates/show_edit_smartplaylist_title.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -23,20 +23,20 @@ <form method="post" id="edit_playlist_<?php echo $playlist->id; ?>" action="javascript:void(0);"> <table cellpadding="0" cellspacing="0"> <tr> - <td> - <input type="text" name="name" size="25" value="<?php echo scrub_out($playlist->name); ?>" /> - </td> - <td> - <?php $name = 'select_' . $playlist->type; ${$name} = ' selected="selected"'; ?> - <select name="pl_type"> - <option value="public"<?php echo $select_public; ?>><?php echo T_('Public'); ?></option> - <option value="private"<?php echo $select_private; ?>><?php echo T_('Private'); ?></option> - </select> - <td> - <input type="hidden" name="id" value="<?php echo $playlist->id; ?>" /> - <input type="hidden" name="type" value="smartplaylist_title" /> - <?php echo Ajax::button('?action=edit_object&id=' . $playlist->id . '&type=smartplaylist_title','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> - </td> + <td> + <input type="text" name="name" size="25" value="<?php echo scrub_out($playlist->name); ?>" /> + </td> + <td> + <?php $name = 'select_' . $playlist->type; ${$name} = ' selected="selected"'; ?> + <select name="pl_type"> + <option value="public"<?php echo $select_public; ?>><?php echo T_('Public'); ?></option> + <option value="private"<?php echo $select_private; ?>><?php echo T_('Private'); ?></option> + </select> + <td> + <input type="hidden" name="id" value="<?php echo $playlist->id; ?>" /> + <input type="hidden" name="type" value="smartplaylist_title" /> + <?php echo Ajax::button('?action=edit_object&id=' . $playlist->id . '&type=smartplaylist_title','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> + </td> </tr> </table> </form> diff --git a/templates/show_edit_song.inc.php b/templates/show_edit_song.inc.php index 95c427cc..d6793963 100644 --- a/templates/show_edit_song.inc.php +++ b/templates/show_edit_song.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,60 +25,60 @@ <form name="edit_song" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/flag.php"> <table> <tr class="<?php echo UI::flip_class(); ?>"> - <td><?php echo T_('File'); ?>:</td> - <td><?php echo scrub_out($song->file); ?></td> + <td><?php echo T_('File'); ?>:</td> + <td><?php echo scrub_out($song->file); ?></td> </tr> <tr class="<?php echo UI::flip_class(); ?>"> - <td><?php echo T_('Title'); ?></td> - <td> - <input type="text" name="title" value="<?php echo scrub_out($song->title); ?>" size="45" /> - </td> + <td><?php echo T_('Title'); ?></td> + <td> + <input type="text" name="title" value="<?php echo scrub_out($song->title); ?>" size="45" /> + </td> </tr> <tr class="<?php echo UI::flip_class(); ?>"> - <td><?php echo T_('Album'); ?></td> - <td> - <?php show_album_select('album',$song->album); ?> - <br /><?php echo T_('OR'); ?><br /> - <input type="text" name="album_string" value="<?php echo scrub_out($song->get_album_name()); ?>" /> - </td> + <td><?php echo T_('Album'); ?></td> + <td> + <?php show_album_select('album',$song->album); ?> + <br /><?php echo T_('OR'); ?><br /> + <input type="text" name="album_string" value="<?php echo scrub_out($song->get_album_name()); ?>" /> + </td> </tr> <tr class="<?php echo UI::flip_class(); ?>"> - <td><?php echo T_('Artist'); ?></td> - <td> - <?php show_artist_select('artist',$song->artist); ?> - <br /><?php echo T_('OR'); ?><br /> - <input type="text" name="artist_string" value="<?php echo scrub_out($song->get_artist_name()); ?>" /> - </td> + <td><?php echo T_('Artist'); ?></td> + <td> + <?php show_artist_select('artist',$song->artist); ?> + <br /><?php echo T_('OR'); ?><br /> + <input type="text" name="artist_string" value="<?php echo scrub_out($song->get_artist_name()); ?>" /> + </td> </tr> <tr class="<?php echo UI::flip_class(); ?>"> - <td><?php echo T_('Track'); ?></td> - <td> - <input type="text" name="track" value="<?php echo scrub_out($song->track); ?>" size="3" /> - </td> + <td><?php echo T_('Track'); ?></td> + <td> + <input type="text" name="track" value="<?php echo scrub_out($song->track); ?>" size="3" /> + </td> </tr> <tr class="<?php echo UI::flip_class(); ?>"> - <td><?php echo T_('Year'); ?></td> - <td> - <input type="text" name="year" value="<?php echo scrub_out($song->year); ?>" size="5" /> - </td> + <td><?php echo T_('Year'); ?></td> + <td> + <input type="text" name="year" value="<?php echo scrub_out($song->year); ?>" size="5" /> + </td> </tr> <tr class="<?php echo UI::flip_class(); ?>"> - <td><?php echo T_('Comment'); ?></td> - <td> - <input type="text" name="comment" value="<?php echo scrub_out($song->comment); ?>" size="45" /> - </td> + <td><?php echo T_('Comment'); ?></td> + <td> + <input type="text" name="comment" value="<?php echo scrub_out($song->comment); ?>" size="45" /> + </td> </tr> <tr class="<?php echo UI::flip_class(); ?>"> - <td> </td> - <td> - <input type="checkbox" name="flag" value="1" checked="checked" /> <?php echo T_('Flag for Retagging'); ?> - </td> + <td> </td> + <td> + <input type="checkbox" name="flag" value="1" checked="checked" /> <?php echo T_('Flag for Retagging'); ?> + </td> </tr> </table> <div class="formValidation"> - <input type="hidden" name="song_id" value="<?php echo $song->id; ?>" /> - <input type="hidden" name="action" value="edit_song" /> - <input type="submit" value="<?php echo T_('Update Song'); ?>" /> + <input type="hidden" name="song_id" value="<?php echo $song->id; ?>" /> + <input type="hidden" name="action" value="edit_song" /> + <input type="submit" value="<?php echo T_('Update Song'); ?>" /> </div> </form> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_edit_song_row.inc.php b/templates/show_edit_song_row.inc.php index 90535c31..d3a87ab1 100644 --- a/templates/show_edit_song_row.inc.php +++ b/templates/show_edit_song_row.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,25 +25,25 @@ <table class="inline-edit" cellpadding="3" cellspacing="0"> <tr> <td> - <input type="text" name="title" value="<?php echo scrub_out($song->title); ?>" /> + <input type="text" name="title" value="<?php echo scrub_out($song->title); ?>" /> </td> <td> - <?php show_artist_select('artist',$song->artist,true,$song->id); ?> - <div id="artist_select_song_<?php echo $song->id ?>"></div> + <?php show_artist_select('artist',$song->artist,true,$song->id); ?> + <div id="artist_select_song_<?php echo $song->id ?>"></div> <?php echo Ajax::observe('artist_select_'.$song->id,'change','check_inline_song_edit("artist", '.$song->id.')'); ?> </td> <td> - <?php show_album_select('album',$song->album,true,$song->id); ?> - <div id="album_select_song_<?php echo $song->id ?>"></div> + <?php show_album_select('album',$song->album,true,$song->id); ?> + <div id="album_select_song_<?php echo $song->id ?>"></div> <?php echo Ajax::observe('album_select_'.$song->id,'change','check_inline_song_edit("album", '.$song->id.')'); ?> </td> <td> - <input type="text" name="track" size="3" value="<?php echo scrub_out($song->track); ?>" /> + <input type="text" name="track" size="3" value="<?php echo scrub_out($song->track); ?>" /> </td> <td> - <input type="hidden" name="id" value="<?php echo $song->id; ?>" /> - <input type="hidden" name="type" value="song_row" /> - <?php echo Ajax::button('?action=edit_object&id=' . $song->id . '&type=song_row','download', T_('Save Changes'),'save_song_' . $song->id,'edit_song_' . $song->id); ?> + <input type="hidden" name="id" value="<?php echo $song->id; ?>" /> + <input type="hidden" name="type" value="song_row" /> + <?php echo Ajax::button('?action=edit_object&id=' . $song->id . '&type=song_row','download', T_('Save Changes'),'save_song_' . $song->id,'edit_song_' . $song->id); ?> </td> </tr> </table> diff --git a/templates/show_edit_user.inc.php b/templates/show_edit_user.inc.php index 76dfb198..d6cb9942 100644 --- a/templates/show_edit_user.inc.php +++ b/templates/show_edit_user.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,53 +25,53 @@ <form name="update_user" enctype="multipart/form-data" method="post" action="<?php echo Config::get('web_path') . "/admin/users.php"; ?>"> <table class="tabledata" cellspacing="0" cellpadding="0"> <tr> - <th colspan="2"><?php echo T_('User Properties'); ?></th> + <th colspan="2"><?php echo T_('User Properties'); ?></th> </tr> <tr> - <td> - <?php echo T_('Username'); ?>: - </td> - <td> - <input type="text" name="username" size="30" maxlength="128" value="<?php echo scrub_out($client->username); ?>" /> - <?php Error::display('username'); ?> - </td> + <td> + <?php echo T_('Username'); ?>: + </td> + <td> + <input type="text" name="username" size="30" maxlength="128" value="<?php echo scrub_out($client->username); ?>" /> + <?php Error::display('username'); ?> + </td> </tr> <tr> - <td><?php echo T_('Full Name'); ?>:</td> - <td> - <input type="text" name="fullname" size="30" value="<?php echo scrub_out($client->fullname); ?>" /> - </td> + <td><?php echo T_('Full Name'); ?>:</td> + <td> + <input type="text" name="fullname" size="30" value="<?php echo scrub_out($client->fullname); ?>" /> + </td> </tr> <tr> - <td> - <?php echo T_('E-mail'); ?>: - </td> - <td> - <input type="text" name="email" size="30" value="<?php echo scrub_out($client->email); ?>" /> - </td> + <td> + <?php echo T_('E-mail'); ?>: + </td> + <td> + <input type="text" name="email" size="30" value="<?php echo scrub_out($client->email); ?>" /> + </td> </tr> <tr> - <td> - <?php echo T_('Password'); ?> : - </td> - <td> - <input type="password" name="password_1" size="30" value="" /> - <?php Error::display('password'); ?> - </td> + <td> + <?php echo T_('Password'); ?> : + </td> + <td> + <input type="password" name="password_1" size="30" value="" /> + <?php Error::display('password'); ?> + </td> </tr> <tr> - <td> - <?php echo T_('Confirm Password'); ?>: - </td> - <td> - <input type="password" name="password_2" size="30" value="" /> - </td> + <td> + <?php echo T_('Confirm Password'); ?>: + </td> + <td> + <input type="password" name="password_2" size="30" value="" /> + </td> </tr> <tr> - <td> - <?php echo T_('User Access Level'); ?>: - </td> - <td> + <td> + <?php echo T_('User Access Level'); ?>: + </td> + <td> <?php $var_name = "on_" . $client->access; ${$var_name} = 'selected="selected"'; ?> <select name="access"> <option value="5" <?php echo $on_5; ?>><?php echo T_('Guest'); ?></option> @@ -80,41 +80,41 @@ <option value="75" <?php echo $on_75; ?>><?php echo T_('Catalog Manager'); ?></option> <option value="100" <?php echo $on_100; ?>><?php echo T_('Admin'); ?></option> </select> - </td> + </td> </tr> <tr> - <th colspan="2"><?php echo T_('Other Options'); ?></th> + <th colspan="2"><?php echo T_('Other Options'); ?></th> </tr> <tr> - <td><?php echo T_('Config Preset'); ?></td> - <td> - <select name="preset"> - <option value=""></option> - <option value="democratic"><?php echo T_('Democratic'); ?></option> - <option value="localplay"><?php echo T_('Localplay'); ?></option> - <option value="flash"><?php echo T_('Flash'); ?></option> - <option value="stream"><?php echo T_('Stream'); ?></option> - </select> - </td> + <td><?php echo T_('Config Preset'); ?></td> + <td> + <select name="preset"> + <option value=""></option> + <option value="democratic"><?php echo T_('Democratic'); ?></option> + <option value="localplay"><?php echo T_('Localplay'); ?></option> + <option value="flash"><?php echo T_('Flash'); ?></option> + <option value="stream"><?php echo T_('Stream'); ?></option> + </select> + </td> </tr> <tr> - <td><?php echo T_('Prevent Preset Override'); ?></td> - <td> - <input type="checkbox" value="1" name="prevent_override" /><span class="information"> <?php echo T_('This Affects all non-Admin accounts'); ?></span> - </td> + <td><?php echo T_('Prevent Preset Override'); ?></td> + <td> + <input type="checkbox" value="1" name="prevent_override" /><span class="information"> <?php echo T_('This Affects all non-Admin accounts'); ?></span> + </td> </tr> <tr> - <td><?php echo T_('Clear Stats'); ?></td> - <td> - <input type="checkbox" value="1" name="reset_stats" /> - </td> + <td><?php echo T_('Clear Stats'); ?></td> + <td> + <input type="checkbox" value="1" name="reset_stats" /> + </td> </tr> </table> <div class="formValidation"> - <input type="hidden" name="action" value="update_user" /> - <input type="submit" value="<?php echo T_('Update User'); ?>" /> - <?php echo Core::form_register('edit_user'); ?> - <input type="hidden" name="user_id" value="<?php echo $client->id; ?>" /> + <input type="hidden" name="action" value="update_user" /> + <input type="submit" value="<?php echo T_('Update User'); ?>" /> + <?php echo Core::form_register('edit_user'); ?> + <input type="hidden" name="user_id" value="<?php echo $client->id; ?>" /> </div> </form> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_export.inc.php b/templates/show_export.inc.php index 96151492..e7cd949e 100644 --- a/templates/show_export.inc.php +++ b/templates/show_export.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -29,32 +29,32 @@ UI::show_box_top(T_('Export Catalog'), 'box box_export'); ?> <form name="duplicates" action="<?php echo Config::get('web_path'); ?>/admin/export.php?action=export" method="post" enctype="multipart/form-data" > <table class="tableform" cellspacing="0" cellpadding="3"> <tr> - <td valign="top"><strong><?php echo T_('Catalog'); ?>:</strong></td> - <td> - <select id="export_catalog" name="export_catalog"> - <option value=""><?php echo T_('All'); ?></option> + <td valign="top"><strong><?php echo T_('Catalog'); ?>:</strong></td> + <td> + <select id="export_catalog" name="export_catalog"> + <option value=""><?php echo T_('All'); ?></option> <?php - $catalog_ids = Catalog::get_catalogs(); - foreach ($catalog_ids as $catalog_id) { - $catalog = new Catalog($catalog_id); - $current_name = 'catalog_' . $catalog->id; + $catalog_ids = Catalog::get_catalogs(); + foreach ($catalog_ids as $catalog_id) { + $catalog = new Catalog($catalog_id); + $current_name = 'catalog_' . $catalog->id; ?> - <option value="<?php echo $catalog->id; ?>"<?php echo ${$current_name}; ?>><?php echo scrub_out($catalog->name); ?></option> + <option value="<?php echo $catalog->id; ?>"<?php echo ${$current_name}; ?>><?php echo scrub_out($catalog->name); ?></option> <?php - } + } ?> - </select> - </td> + </select> + </td> </tr> <tr> - <td valign="top"><strong><?php echo T_('Format'); ?>:</strong></td> - <td> - <select id="export_format" name="export_format"> - <option value="csv" <?php echo $export_csv; ?>>CSV</option> - <option value="itunes" <?php echo $export_itunes; ?>>iTunes</option> - </select> - </td> + <td valign="top"><strong><?php echo T_('Format'); ?>:</strong></td> + <td> + <select id="export_format" name="export_format"> + <option value="csv" <?php echo $export_csv; ?>>CSV</option> + <option value="itunes" <?php echo $export_itunes; ?>>iTunes</option> + </select> + </td> </tr> </table> <div class="formValidation"> diff --git a/templates/show_flag_row.inc.php b/templates/show_flag_row.inc.php index cbeef4f8..36eff612 100644 --- a/templates/show_flag_row.inc.php +++ b/templates/show_flag_row.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -21,16 +21,16 @@ */ ?> <tr id="flagged_<?php echo $flag->id; ?>" class="<?php echo UI::flip_class(); ?>"> - <td class="cel_object"><?php echo $flag->f_name; ?></td> - <td class="cel_username"><?php echo $flag->f_user; ?></td> - <td class="cel_flag"><?php $flag->print_flag(); ?></td> - <td class="cel_comment"><?php echo scrub_out($flag->comment); ?></td> - <td class="cel_status"><?php $flag->print_status(); ?></td> - <td class="cel_action"> - <?php if ($flag->approved) { ?> - <?php echo Ajax::button('?page=flag&action=reject&flag_id=' . $flag->id,'disable', T_('Reject'),'reject_flag_' . $flag->id); ?> - <?php } else { ?> - <?php echo Ajax::button('?page=flag&action=accept&flag_id=' . $flag->id,'enable', T_('Enable'),'enable_flag_' . $flag->id); ?> - <?php } ?> - </td> + <td class="cel_object"><?php echo $flag->f_name; ?></td> + <td class="cel_username"><?php echo $flag->f_user; ?></td> + <td class="cel_flag"><?php $flag->print_flag(); ?></td> + <td class="cel_comment"><?php echo scrub_out($flag->comment); ?></td> + <td class="cel_status"><?php $flag->print_status(); ?></td> + <td class="cel_action"> + <?php if ($flag->approved) { ?> + <?php echo Ajax::button('?page=flag&action=reject&flag_id=' . $flag->id,'disable', T_('Reject'),'reject_flag_' . $flag->id); ?> + <?php } else { ?> + <?php echo Ajax::button('?page=flag&action=accept&flag_id=' . $flag->id,'enable', T_('Enable'),'enable_flag_' . $flag->id); ?> + <?php } ?> + </td> </tr> diff --git a/templates/show_flagged.inc.php b/templates/show_flagged.inc.php index ed51f277..db239205 100644 --- a/templates/show_flagged.inc.php +++ b/templates/show_flagged.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -32,30 +32,30 @@ $web_path = Config::get('web_path'); <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_object"><?php echo T_('Object'); ?></th> - <th class="cel_username"><?php echo T_('User'); ?></th> - <th class="cel_flag"><?php echo T_('Flag'); ?></th> - <th class="cel_comment"><?php echo T_('Comment'); ?></th> - <th class="cel_status"><?php echo T_('Status'); ?></th> - <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_object"><?php echo T_('Object'); ?></th> + <th class="cel_username"><?php echo T_('User'); ?></th> + <th class="cel_flag"><?php echo T_('Flag'); ?></th> + <th class="cel_comment"><?php echo T_('Comment'); ?></th> + <th class="cel_status"><?php echo T_('Status'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> <?php foreach ($object_ids as $flag_id) { - $flag = new Flag($flag_id); - $flag->format(); - require Config::get('prefix') . '/templates/show_flag_row.inc.php'; + $flag = new Flag($flag_id); + $flag->format(); + require Config::get('prefix') . '/templates/show_flag_row.inc.php'; ?> <?php } if (!count($object_ids)) { ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td colspan="7" class="error"><?php echo T_('No Records Found'); ?></td> + <td colspan="7" class="error"><?php echo T_('No Records Found'); ?></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_object"><?php echo T_('Object'); ?></th> - <th class="cel_username"><?php echo T_('User'); ?></th> - <th class="cel_flag"><?php echo T_('Flag'); ?></th> - <th class="cel_comment"><?php echo T_('Comment'); ?></th> - <th class="cel_status"><?php echo T_('Status'); ?></th> - <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_object"><?php echo T_('Object'); ?></th> + <th class="cel_username"><?php echo T_('User'); ?></th> + <th class="cel_flag"><?php echo T_('Flag'); ?></th> + <th class="cel_comment"><?php echo T_('Comment'); ?></th> + <th class="cel_status"><?php echo T_('Status'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> </table> diff --git a/templates/show_gather_art.inc.php b/templates/show_gather_art.inc.php index 9f17c90e..56598316 100644 --- a/templates/show_gather_art.inc.php +++ b/templates/show_gather_art.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) diff --git a/templates/show_get_albumart.inc.php b/templates/show_get_albumart.inc.php index 0995e740..c90a0938 100644 --- a/templates/show_get_albumart.inc.php +++ b/templates/show_get_albumart.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,43 +24,43 @@ <form enctype="multipart/form-data" name="coverart" method="post" action="<?php echo Config::get('web_path'); ?>/albums.php?action=find_art&album_id=<?php echo $album->id; ?>&artist_name=<?php echo urlencode($_REQUEST['artist_name']);?>&album_name=<?php echo urlencode($_REQUEST['album_name']); ?>&cover=<?php echo urlencode($_REQUEST['cover']); ?>" style="Display:inline;"> <table> <tr> - <td> - <?php echo T_('Artist'); ?> - </td> - <td> - <input type="text" size="20" id="artist_name" name="artist_name" value="<?php echo scrub_out(unhtmlentities($artistname)); ?>" /> - </td> + <td> + <?php echo T_('Artist'); ?> + </td> + <td> + <input type="text" size="20" id="artist_name" name="artist_name" value="<?php echo scrub_out(unhtmlentities($artistname)); ?>" /> + </td> </tr> <tr> - <td> - <?php echo T_('Album'); ?> - </td> - <td> - <input type="text" size="20" id="album_name" name="album_name" value="<?php echo scrub_out(unhtmlentities($albumname)); ?>" /> - </td> + <td> + <?php echo T_('Album'); ?> + </td> + <td> + <input type="text" size="20" id="album_name" name="album_name" value="<?php echo scrub_out(unhtmlentities($albumname)); ?>" /> + </td> </tr> <tr> - <td> - <?php echo T_('Direct URL to Image'); ?> - </td> - <td> - <input type="text" size="40" id="cover" name="cover" value="" /> - </td> + <td> + <?php echo T_('Direct URL to Image'); ?> + </td> + <td> + <input type="text" size="40" id="cover" name="cover" value="" /> + </td> </tr> <tr> - <td> - <?php echo T_('Local Image'); ?> - </td> - <td> - <input type="file" size="40" id="file" name="file" value="" /> - </td> + <td> + <?php echo T_('Local Image'); ?> + </td> + <td> + <input type="file" size="40" id="file" name="file" value="" /> + </td> </tr> </table> <div class="formValidation"> - <input type="hidden" name="action" value="find_art" /> - <input type="hidden" name="album_id" value="<?php echo $album->id; ?>" /> + <input type="hidden" name="action" value="find_art" /> + <input type="hidden" name="album_id" value="<?php echo $album->id; ?>" /> <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo Config::get('max_upload_size'); ?>" /> - <input type="submit" value="<?php echo T_('Get Art'); ?>" /> + <input type="submit" value="<?php echo T_('Get Art'); ?>" /> </div> </form> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_import_playlist.inc.php b/templates/show_import_playlist.inc.php index a767d41a..436f71c1 100644 --- a/templates/show_import_playlist.inc.php +++ b/templates/show_import_playlist.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,25 +25,25 @@ <table cellpadding="0" cellspacing="0"> <tr> <td> - <?php echo T_('Filename'); ?>: - </td> - <td><input type="file" name="filename" value="<?php echo scrub_out($_REQUEST['filename']); ?>" size="45" /></td> + <?php echo T_('Filename'); ?>: + </td> + <td><input type="file" name="filename" value="<?php echo scrub_out($_REQUEST['filename']); ?>" size="45" /></td> </tr> <tr> - <td> - <?php echo T_('Playlist Type'); ?> - </td> - <td> - <select name="playlist_type"> - <option value="m3u">M3U</option> -<!-- <option name="pls">PLS</option> --> - </select> - </td> + <td> + <?php echo T_('Playlist Type'); ?> + </td> + <td> + <select name="playlist_type"> + <option value="m3u">M3U</option> +<!-- <option name="pls">PLS</option> --> + </select> + </td> </tr> </table> <div class="formValidation"> - <input type="hidden" name="action" value="import_playlist" /> - <input type="submit" value="<?php echo T_('Import Playlist'); ?>" /> + <input type="hidden" name="action" value="import_playlist" /> + <input type="submit" value="<?php echo T_('Import Playlist'); ?>" /> </div> </form> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_index.inc.php b/templates/show_index.inc.php index 7c12cbf4..7c4db26e 100644 --- a/templates/show_index.inc.php +++ b/templates/show_index.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -26,28 +26,28 @@ <!-- Randomly selected albums of the moment --> <?php if (Art::is_enabled()) { - echo Ajax::observe('window','load',Ajax::action('?page=index&action=random_albums','random_albums')); + echo Ajax::observe('window','load',Ajax::action('?page=index&action=random_albums','random_albums')); ?> <div id="random_selection"> - <?php UI::show_box_top(T_('Albums of the Moment')); echo T_('Loading...'); UI::show_box_bottom(); ?> + <?php UI::show_box_top(T_('Albums of the Moment')); echo T_('Loading...'); UI::show_box_bottom(); ?> </div> <?php } ?> <!-- Recently Played --> <div id="recently_played"> <?php $data = Song::get_recently_played(); - Song::build_cache(array_keys($data)); + Song::build_cache(array_keys($data)); require_once Config::get('prefix') . '/templates/show_recently_played.inc.php'; ?> </div> <!-- Shoutbox Objects, if shoutbox is enabled --> <?php if (Config::get('sociable')) { ?> <div id="shout_objects"> - <?php - $shouts = Shoutbox::get_top('5'); - if (count($shouts)) { - require_once Config::get('prefix') . '/templates/show_shoutbox.inc.php'; - } - ?> + <?php + $shouts = Shoutbox::get_top('5'); + if (count($shouts)) { + require_once Config::get('prefix') . '/templates/show_shoutbox.inc.php'; + } + ?> </div> <?php } ?> diff --git a/templates/show_install.inc.php b/templates/show_install.inc.php index ea2f86a9..7350f431 100644 --- a/templates/show_install.inc.php +++ b/templates/show_install.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -23,66 +23,66 @@ $prefix = realpath(dirname(__FILE__). "/../"); require $prefix . '/templates/install_header.inc.php'; ?> - <div class="content"> - <strong><?php echo T_('Step 1 - Create the Ampache database'); ?></strong><br /> - <dl> - <dd><?php echo T_('This step creates and inserts the Ampache database, so please provide a MySQL account with database creation rights. This step may take some time on slower computers.'); ?></dd> - </dl> - <?php echo T_('Step 2 - Create ampache.cfg.php'); ?><br /> - <?php echo T_('Step 3 - Set up the initial account'); ?><br /> - <br /> - <?php Error::display('general'); ?> - <br /> - <span class="header2"><?php echo T_('Insert Ampache Database'); ?></span> - <form method="post" action="<?php echo WEB_PATH . "?action=create_db&htmllang=$htmllang&charset=$charset"; ?>" enctype="multipart/form-data" > + <div class="content"> + <strong><?php echo T_('Step 1 - Create the Ampache database'); ?></strong><br /> + <dl> + <dd><?php echo T_('This step creates and inserts the Ampache database, so please provide a MySQL account with database creation rights. This step may take some time on slower computers.'); ?></dd> + </dl> + <?php echo T_('Step 2 - Create ampache.cfg.php'); ?><br /> + <?php echo T_('Step 3 - Set up the initial account'); ?><br /> + <br /> + <?php Error::display('general'); ?> + <br /> + <span class="header2"><?php echo T_('Insert Ampache Database'); ?></span> + <form method="post" action="<?php echo WEB_PATH . "?action=create_db&htmllang=$htmllang&charset=$charset"; ?>" enctype="multipart/form-data" > <table> <tr> - <td class="align"><?php echo T_("Desired Database Name"); ?></td> - <td><input type="text" name="local_db" value="ampache" /></td> + <td class="align"><?php echo T_("Desired Database Name"); ?></td> + <td><input type="text" name="local_db" value="ampache" /></td> </tr> <tr> - <td class="align"><?php echo T_("MySQL Hostname"); ?></td> - <td><input type="text" name="local_host" value="localhost" /></td> + <td class="align"><?php echo T_("MySQL Hostname"); ?></td> + <td><input type="text" name="local_host" value="localhost" /></td> </tr> <tr> - <td class="align"><?php echo T_("MySQL Administrative Username"); ?></td> - <td><input type="text" name="local_username" value="root" /></td> + <td class="align"><?php echo T_("MySQL Administrative Username"); ?></td> + <td><input type="text" name="local_username" value="root" /></td> </tr> <tr> - <td class="align"><?php echo T_("MySQL Administrative Password"); ?></td> - <td><input type="password" name="local_pass" /></td> + <td class="align"><?php echo T_("MySQL Administrative Password"); ?></td> + <td><input type="password" name="local_pass" /></td> </tr> <tr> - <td class="align"><?php echo T_("Create Database User for New Database"); ?>? </td> - <td><input type="checkbox" value="create_db_user" name="db_user" onclick="flipField('db_username');flipField('db_password');" /></td> + <td class="align"><?php echo T_("Create Database User for New Database"); ?>? </td> + <td><input type="checkbox" value="create_db_user" name="db_user" onclick="flipField('db_username');flipField('db_password');" /></td> </tr> <tr> - <td class="align"><?php echo T_("Ampache Database Username"); ?></td> - <td><input type="text" id="db_username" name="db_username" value="ampache" /></td> + <td class="align"><?php echo T_("Ampache Database Username"); ?></td> + <td><input type="text" id="db_username" name="db_username" value="ampache" /></td> </tr> <tr> - <td class="align"><?php echo T_("Ampache Database User Password"); ?></td> - <td><input type="password" id="db_password" name="db_password" value="" /></td> + <td class="align"><?php echo T_("Ampache Database User Password"); ?></td> + <td><input type="password" id="db_password" name="db_password" value="" /></td> </tr> <tr> - <td class="align"><?php echo T_('Overwrite Existing'); ?></td> - <td><input type="checkbox" name="overwrite_db" value="1" /></td> + <td class="align"><?php echo T_('Overwrite Existing'); ?></td> + <td><input type="checkbox" name="overwrite_db" value="1" /></td> </tr> <tr> - <td class="align"><?php echo T_('Use Existing Database'); ?></td> - <td><input type="checkbox" name="existing_db" value="1" /></td> + <td class="align"><?php echo T_('Use Existing Database'); ?></td> + <td><input type="checkbox" name="existing_db" value="1" /></td> </tr> <tr> - <td> </td> - <td><input type="submit" value="<?php echo T_("Insert Database"); ?>" /></td> + <td> </td> + <td><input type="submit" value="<?php echo T_("Insert Database"); ?>" /></td> </tr> </table> </form> <script type="text/javascript">flipField('db_username');flipField('db_password');</script> - </div> - <div id="bottom"> - <p><strong>Ampache Installation.</strong><br /> - Pour l'Amour de la Musique</p> + </div> + <div id="bottom"> + <p><strong>Ampache Installation.</strong><br /> + Pour l'Amour de la Musique</p> </div> </div> diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php index 86c5b770..e3a0a0d1 100644 --- a/templates/show_install_account.inc.php +++ b/templates/show_install_account.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -23,40 +23,40 @@ $prefix = realpath(dirname(__FILE__). "/../"); require $prefix . '/templates/install_header.inc.php'; ?> - <div class="content"> - <?php echo T_('Step 1 - Create the Ampache database'); ?><br /> - <?php echo T_('Step 2 - Create ampache.cfg.php'); ?><br /> - <strong><?php echo T_('Step 3 - Set up the initial account'); ?></strong><br /> - <dl> - <dd><?php echo T_('This step creates your initial Ampache admin account. Once your admin account has been created you will be redirected to the login page.'); ?></dd> - </dl> - <?php Error::display('general'); ?> - <br /> - <span class="header2"><?php echo T_('Create Admin Account'); ?></span> - <form method="post" action="<?php echo WEB_PATH . "?action=create_account&htmllang=$htmllang&charset=$charset"; ?>" enctype="multipart/form-data" > + <div class="content"> + <?php echo T_('Step 1 - Create the Ampache database'); ?><br /> + <?php echo T_('Step 2 - Create ampache.cfg.php'); ?><br /> + <strong><?php echo T_('Step 3 - Set up the initial account'); ?></strong><br /> + <dl> + <dd><?php echo T_('This step creates your initial Ampache admin account. Once your admin account has been created you will be redirected to the login page.'); ?></dd> + </dl> + <?php Error::display('general'); ?> + <br /> + <span class="header2"><?php echo T_('Create Admin Account'); ?></span> + <form method="post" action="<?php echo WEB_PATH . "?action=create_account&htmllang=$htmllang&charset=$charset"; ?>" enctype="multipart/form-data" > <table> <tr> - <td class="align"><?php echo T_('Username'); ?></td> - <td><input type="text" name="local_username" value="admin" /></td> + <td class="align"><?php echo T_('Username'); ?></td> + <td><input type="text" name="local_username" value="admin" /></td> </tr> <tr> - <td class="align"><?php echo T_('Password'); ?></td> - <td><input type="password" name="local_pass" value="" /></td> + <td class="align"><?php echo T_('Password'); ?></td> + <td><input type="password" name="local_pass" value="" /></td> </tr> <tr> - <td class="align"><?php echo T_('Confirm Password'); ?></td> - <td><input type="password" name="local_pass2" value="" /></td> + <td class="align"><?php echo T_('Confirm Password'); ?></td> + <td><input type="password" name="local_pass2" value="" /></td> </tr> <tr> - <td> </td> - <td><input type="submit" value="<?php echo T_('Create Account'); ?>" /></td> + <td> </td> + <td><input type="submit" value="<?php echo T_('Create Account'); ?>" /></td> </tr> - </table> - </form> - </div> - <div id="bottom"> - <p><strong>Ampache Installation.</strong><br /> - For the love of Music.</p> + </table> + </form> + </div> + <div id="bottom"> + <p><strong>Ampache Installation.</strong><br /> + For the love of Music.</p> </div> </div> diff --git a/templates/show_install_check.inc.php b/templates/show_install_check.inc.php index 9cd719a8..88ce8c62 100644 --- a/templates/show_install_check.inc.php +++ b/templates/show_install_check.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -27,13 +27,13 @@ <td><?php echo sprintf(T_("%s is readable"),"ampache.cfg.php.dist"); ?></td> <td> <?php - if (!is_readable($prefix . '/config/ampache.cfg.php.dist')) { - echo debug_result('',false); - Error::add('install',sprintf(T_("%s is readable"),"ampache.cfg.php.dist")); - } - else { - echo debug_result('',true); - } + if (!is_readable($prefix . '/config/ampache.cfg.php.dist')) { + echo debug_result('',false); + Error::add('install',sprintf(T_("%s is readable"),"ampache.cfg.php.dist")); + } + else { + echo debug_result('',true); + } ?> </td> </tr> @@ -41,13 +41,13 @@ <td><?php echo sprintf(T_('%s is readable'), 'ampache.sql'); ?></td> <td> <?php - if (!is_readable($prefix . '/sql/ampache.sql')) { - echo debug_result('', false); - Error::add('install', sprintf(T_('%s is readable'), 'ampache.sql')); - } - else { - echo debug_result('', true); - } + if (!is_readable($prefix . '/sql/ampache.sql')) { + echo debug_result('', false); + Error::add('install', sprintf(T_('%s is readable'), 'ampache.sql')); + } + else { + echo debug_result('', true); + } ?> </td> </tr> @@ -55,73 +55,73 @@ <td><?php echo T_('PHP Version'); ?>:</td> <td> <?php - if(!check_php_ver()) { - if (function_exists('hash_algos')) { $algos = hash_algos(); } - if (strtoupper(substr(PHP_OS,0,3)) == 'WIN') { - $version_string = phpversion() . " < PHP 5.3 "; - } - else { - $version_string = phpversion() . " "; - } - $string = $version_string . T_('Hash Function Exists') . " " . print_bool(function_exists('hash_algos')) . " " . T_('SHA256 Support') . " " . print_bool(in_array('sha256',$algos)); - echo debug_result($string,false); - Error::add('install', T_('PHP Version')); - } - else { - echo debug_result(phpversion(),true); - } + if(!check_php_ver()) { + if (function_exists('hash_algos')) { $algos = hash_algos(); } + if (strtoupper(substr(PHP_OS,0,3)) == 'WIN') { + $version_string = phpversion() . " < PHP 5.3 "; + } + else { + $version_string = phpversion() . " "; + } + $string = $version_string . T_('Hash Function Exists') . " " . print_bool(function_exists('hash_algos')) . " " . T_('SHA256 Support') . " " . print_bool(in_array('sha256',$algos)); + echo debug_result($string,false); + Error::add('install', T_('PHP Version')); + } + else { + echo debug_result(phpversion(),true); + } ?> </td> </tr><tr> <td><?php echo T_('PHP MySQL Support'); ?>:</td> <td> <?php - if (!check_php_mysql()) { - echo debug_result('',false); - Error::add('install', T_('PHP MySQL Support')); - } - else { - echo debug_result(Dba::get_client_info(), true); - } + if (!check_php_mysql()) { + echo debug_result('',false); + Error::add('install', T_('PHP MySQL Support')); + } + else { + echo debug_result(Dba::get_client_info(), true); + } ?> </td> </tr><tr> <td><?php echo T_('PHP Session Support'); ?>:</td> <td> <?php - if (!check_php_session()) { - echo debug_result('',false); - Error::add('install', T_('PHP Session Support')); - } - else { - echo debug_result('',true); - } + if (!check_php_session()) { + echo debug_result('',false); + Error::add('install', T_('PHP Session Support')); + } + else { + echo debug_result('',true); + } ?> </td> </tr><tr> <td><?php echo T_('PHP iconv Support'); ?>:</td> <td> <?php - if (!UI::check_iconv()) { - echo debug_result('',false); - Error::add('install', T_('PHP iconv Support')); - } - else { - echo debug_result('',true); - } + if (!UI::check_iconv()) { + echo debug_result('',false); + Error::add('install', T_('PHP iconv Support')); + } + else { + echo debug_result('',true); + } ?> </td> </tr><tr> <td><?php echo T_('PHP PCRE Support'); ?>:</td> <td> <?php - if (!check_php_pcre()) { - echo debug_result('',false); - Error::add('install', T_('PHP PCRE Support')); - } - else { - echo debug_result('',true); - } + if (!check_php_pcre()) { + echo debug_result('',false); + Error::add('install', T_('PHP PCRE Support')); + } + else { + echo debug_result('',true); + } ?> </td> </tr><tr> @@ -130,48 +130,48 @@ <td><?php echo T_('PHP gettext Support'); ?>:</td> <td> <?php - if (!check_gettext()) { - echo debug_result(T_('gettext emulation will be used'), false); - } - else { - echo debug_result('',true); - } + if (!check_gettext()) { + echo debug_result(T_('gettext emulation will be used'), false); + } + else { + echo debug_result('',true); + } ?> </td> </tr><tr> <td><?php echo T_('PHP mbstring Support'); ?>:</td> <td> <?php - if (!check_mbstring()) { - echo debug_result(T_('Multibyte character encodings may not be autodetected correctly'), false); - } - else { - echo debug_result('',true); - } + if (!check_mbstring()) { + echo debug_result(T_('Multibyte character encodings may not be autodetected correctly'), false); + } + else { + echo debug_result('',true); + } ?> </td> </tr><tr> <td><?php echo T_('PHP Safe Mode'); ?>:</td> <td> <?php - if (!check_safemode()) { - echo debug_result(T_('Safe mode enabled'), false); - } - else { - echo debug_result(T_('Safe mode not enabled'), true); - } + if (!check_safemode()) { + echo debug_result(T_('Safe mode enabled'), false); + } + else { + echo debug_result(T_('Safe mode not enabled'), true); + } ?> </td> </tr><tr> <td><?php echo T_('PHP Memory Limit'); ?>:</td> <td> <?php - if (!check_php_memory()) { - echo debug_result(T_('Memory limit less than recommended size') . ' ' . ini_get('memory_limit'), false); - } - else { - echo debug_result(ini_get('memory_limit'),true); - } + if (!check_php_memory()) { + echo debug_result(T_('Memory limit less than recommended size') . ' ' . ini_get('memory_limit'), false); + } + else { + echo debug_result(ini_get('memory_limit'),true); + } ?> </td> @@ -179,24 +179,24 @@ <td><?php echo T_('PHP Execution Time Limit'); ?>:</td> <td> <?php - if (!check_php_timelimit()) { - echo debug_result(sprintf(T_('Execution time limit is %s seconds, which is less than recommended'), ini_get('max_execution_time')), false); - } - else { - echo debug_result(ini_get('max_execution_time') . ' ' . T_('seconds'),true); - } + if (!check_php_timelimit()) { + echo debug_result(sprintf(T_('Execution time limit is %s seconds, which is less than recommended'), ini_get('max_execution_time')), false); + } + else { + echo debug_result(ini_get('max_execution_time') . ' ' . T_('seconds'),true); + } ?> </td> </tr><tr> <td><?php echo T_('ampache.cfg.php is writable'); ?></td> <td> <?php - if (!check_config_writable()) { - echo debug_result('', false); - } - else { - echo debug_result('', true); - } + if (!check_config_writable()) { + echo debug_result('', false); + } + else { + echo debug_result('', true); + } ?> </td> </tr> diff --git a/templates/show_install_config.inc.php b/templates/show_install_config.inc.php index 703ef890..bae4d3ba 100644 --- a/templates/show_install_config.inc.php +++ b/templates/show_install_config.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -23,62 +23,62 @@ $prefix = realpath(dirname(__FILE__). "/../"); require $prefix . '/templates/install_header.inc.php'; ?> - <div class="content"> - <?php echo T_('Step 1 - Create the Ampache database'); ?><br /> - <strong><?php echo T_('Step 2 - Create ampache.cfg.php'); ?></strong><br /> - <dl> - <dd><?php printf(T_('This step takes the basic config values and generates the config file. If your config/ directory is writable, you can select "write" to have Ampache write the config file directly to the correct location. If you select "download" it will prompt you to download the config file, and you can then manually place the config file in %s'), $prefix . '/config'); ?></dd> - </dl> - <?php echo T_('Step 3 - Set up the initial account'); ?><br /> - <?php Error::display('general'); ?> - <br /> + <div class="content"> + <?php echo T_('Step 1 - Create the Ampache database'); ?><br /> + <strong><?php echo T_('Step 2 - Create ampache.cfg.php'); ?></strong><br /> + <dl> + <dd><?php printf(T_('This step takes the basic config values and generates the config file. If your config/ directory is writable, you can select "write" to have Ampache write the config file directly to the correct location. If you select "download" it will prompt you to download the config file, and you can then manually place the config file in %s'), $prefix . '/config'); ?></dd> + </dl> + <?php echo T_('Step 3 - Set up the initial account'); ?><br /> + <?php Error::display('general'); ?> + <br /> <span class="header2"><?php echo T_('Generate Config File'); ?></span> <?php Error::display('config'); ?> <form method="post" action="<?php echo WEB_PATH . "?action=create_config"; ?>" enctype="multipart/form-data" > <table> <tr> - <td class="align"><?php echo T_('Web Path'); ?></td> - <td class="align"><input type="text" name="web_path" value="<?php echo $web_path; ?>" /></td> + <td class="align"><?php echo T_('Web Path'); ?></td> + <td class="align"><input type="text" name="web_path" value="<?php echo $web_path; ?>" /></td> </tr> <tr> - <td class="align"><?php echo T_('Database Name'); ?></td> - <td class="align"><input type="text" name="local_db" value="<?php echo scrub_out($_REQUEST['local_db']); ?>" /></td> + <td class="align"><?php echo T_('Database Name'); ?></td> + <td class="align"><input type="text" name="local_db" value="<?php echo scrub_out($_REQUEST['local_db']); ?>" /></td> </tr> <tr> - <td class="align"><?php echo T_('MySQL Hostname'); ?></td> - <td class="align"><input type="text" name="local_host" value="<?php echo scrub_out($_REQUEST['local_host']); ?>" /></td> + <td class="align"><?php echo T_('MySQL Hostname'); ?></td> + <td class="align"><input type="text" name="local_host" value="<?php echo scrub_out($_REQUEST['local_host']); ?>" /></td> </tr> <tr> - <td class="align"><?php echo T_('MySQL Username'); ?></td> - <td class="align"><input type="text" name="local_username" value="<?php echo scrub_out($_REQUEST['local_username']); ?>" /></td> + <td class="align"><?php echo T_('MySQL Username'); ?></td> + <td class="align"><input type="text" name="local_username" value="<?php echo scrub_out($_REQUEST['local_username']); ?>" /></td> </tr> <tr> - <td class="align"><?php echo T_('MySQL Password'); ?></td> - <td class="align"><input type="password" name="local_pass" value="" /></td> + <td class="align"><?php echo T_('MySQL Password'); ?></td> + <td class="align"><input type="password" name="local_pass" value="" /></td> </tr> <tr> - <td> </td> - <td> - <input type="submit" name="download" value="<?php echo T_('Download'); ?>" /> - <input type="submit" name="write" value="<?php echo T_('Write'); ?>" <?php if (!check_config_writable()) { echo "disabled "; } ?>/> - <input type="hidden" name="htmllang" value="<?php echo $htmllang; ?>" /> - <input type="hidden" name="charset" value="<?php echo $charset; ?>" /> - </td> + <td> </td> + <td> + <input type="submit" name="download" value="<?php echo T_('Download'); ?>" /> + <input type="submit" name="write" value="<?php echo T_('Write'); ?>" <?php if (!check_config_writable()) { echo "disabled "; } ?>/> + <input type="hidden" name="htmllang" value="<?php echo $htmllang; ?>" /> + <input type="hidden" name="charset" value="<?php echo $charset; ?>" /> + </td> </tr> - </table> - </form> - <br /> - <table> + </table> + </form> + <br /> + <table> <tr> <td class="align"><?php echo T_('ampache.cfg.php exists?'); ?></td> <td>[ <?php if (!is_readable($configfile)) { - echo debug_result('',false); + echo debug_result('',false); } else { - echo debug_result('',true); + echo debug_result('',true); } ?> ] @@ -92,32 +92,32 @@ require $prefix . '/templates/install_header.inc.php'; <?php $results = @parse_ini_file($configfile); if (!check_config_values($results)) { - echo debug_result('',false); + echo debug_result('',false); } else { - echo debug_result('',true); + echo debug_result('',true); } ?> ] </td> </tr> <tr> - <td> </td> - <td> - <?php $check_url = WEB_PATH . "?action=show_create_config&htmllang=$htmllang&charset=$charset&local_db=" . $_REQUEST['local_db'] . "&local_host=" . $_REQUEST['local_host']; ?> - <a href="<?php echo $check_url; ?>">[<?php echo T_('Recheck Config'); ?>]</a> - </td> - </tr> - </table> - <br /> - <form method="post" action="<?php echo WEB_PATH . "?action=show_create_account&htmllang=$htmllang&charset=$charset"; ?>" enctype="multipart/form-data"> - <input type="submit" value="<?php echo T_('Continue to Step 3'); ?>" /> - </form> - </div> - <div id="bottom"> - <p><strong>Ampache Installation.</strong><br /> - For the love of Music.</p> - </div> + <td> </td> + <td> + <?php $check_url = WEB_PATH . "?action=show_create_config&htmllang=$htmllang&charset=$charset&local_db=" . $_REQUEST['local_db'] . "&local_host=" . $_REQUEST['local_host']; ?> + <a href="<?php echo $check_url; ?>">[<?php echo T_('Recheck Config'); ?>]</a> + </td> + </tr> + </table> + <br /> + <form method="post" action="<?php echo WEB_PATH . "?action=show_create_account&htmllang=$htmllang&charset=$charset"; ?>" enctype="multipart/form-data"> + <input type="submit" value="<?php echo T_('Continue to Step 3'); ?>" /> + </form> + </div> + <div id="bottom"> + <p><strong>Ampache Installation.</strong><br /> + For the love of Music.</p> + </div> </div> </body> diff --git a/templates/show_install_lang.inc.php b/templates/show_install_lang.inc.php index b90b6712..63e3290e 100644 --- a/templates/show_install_lang.inc.php +++ b/templates/show_install_lang.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,16 +25,16 @@ require $prefix . '/templates/install_header.inc.php'; ?> <?php require_once 'templates/show_install_check.inc.php'; ?> <?php if (Error::occurred()) { ?> - <div class="content"> - <span class="fatalerror"><?php echo T_('Minimum requirements not met. Unable to install Ampache.'); ?></span> - </div> + <div class="content"> + <span class="fatalerror"><?php echo T_('Minimum requirements not met. Unable to install Ampache.'); ?></span> + </div> <?php } ?> <div class="content"> - <strong><?php echo T_('Choose Installation Language'); ?></strong> - <p> - <?php Error::display('general'); ?> - </p> + <strong><?php echo T_('Choose Installation Language'); ?></strong> + <p> + <?php Error::display('general'); ?> + </p> <form method="post" action="<?php echo WEB_PATH . "?action=init"; ?>" enctype="multipart/form-data" > <?php @@ -45,20 +45,20 @@ ${$var_name} = "selected=\"selected\""; echo "<select name=\"htmllang\">\n"; foreach ($languages as $lang=>$name) { - $var_name = $lang . "_lang"; + $var_name = $lang . "_lang"; - echo "\t<option value=\"$lang\" " . ${$var_name} . ">$name</option>\n"; + echo "\t<option value=\"$lang\" " . ${$var_name} . ">$name</option>\n"; } // end foreach echo "</select>\n"; ?> <input type="submit" value="<?php echo T_('Start configuration'); ?>" /> - </form> - </div> - <div id="bottom"> - <p><strong>Ampache Installation.</strong><br /> - For the love of Music.</p> + </form> + </div> + <div id="bottom"> + <p><strong>Ampache Installation.</strong><br /> + For the love of Music.</p> </div> </div> diff --git a/templates/show_ip_history.inc.php b/templates/show_ip_history.inc.php index da4fb607..f1adbe6d 100644 --- a/templates/show_ip_history.inc.php +++ b/templates/show_ip_history.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,11 +25,11 @@ <ul> <li> <?php if (isset($_REQUEST['all'])){ ?> - <a href="<?php echo Config::get('web_path')?>/admin/users.php?action=show_ip_history&user_id=<?php echo $working_user->id?>"><?php echo UI::get_icon('disable'); ?></a> - <?php echo T_('Show Unique'); ?> + <a href="<?php echo Config::get('web_path')?>/admin/users.php?action=show_ip_history&user_id=<?php echo $working_user->id?>"><?php echo UI::get_icon('disable'); ?></a> + <?php echo T_('Show Unique'); ?> <?php }else{ ?> - <a href="<?php echo Config::get('web_path')?>/admin/users.php?action=show_ip_history&user_id=<?php echo $working_user->id?>&all"><?php echo UI::get_icon('add'); ?></a> - <?php echo T_('Show All'); ?> + <a href="<?php echo Config::get('web_path')?>/admin/users.php?action=show_ip_history&user_id=<?php echo $working_user->id?>&all"><?php echo UI::get_icon('add'); ?></a> + <?php echo T_('Show All'); ?> <?php }?> </li> </ul> @@ -43,21 +43,21 @@ </colgroup> <tr class="th-top"> <th class="cel_date"><?php echo T_('Date'); ?></th> - <th class="cel_ipaddress"><?php echo T_('IP Address'); ?></th> + <th class="cel_ipaddress"><?php echo T_('IP Address'); ?></th> </tr> <?php foreach ($history as $data) { ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td class="cel_date"> - <?php echo date("d/m/Y H\hi",$data['date']); ?> - </td> - <td class="cel_ipaddress"> - <?php echo inet_ntop($data['ip']); ?> - </td> + <td class="cel_date"> + <?php echo date("d/m/Y H\hi",$data['date']); ?> + </td> + <td class="cel_ipaddress"> + <?php echo inet_ntop($data['ip']); ?> + </td> </tr> <?php } ?> <tr class="th-bottom"> <th class="cel_date"><?php echo T_('Date'); ?></th> - <th class="cel_ipaddress"><?php echo T_('IP Address'); ?></th> + <th class="cel_ipaddress"><?php echo T_('IP Address'); ?></th> </tr> </table> diff --git a/templates/show_live_stream.inc.php b/templates/show_live_stream.inc.php index 4cf52c27..47d2bcde 100644 --- a/templates/show_live_stream.inc.php +++ b/templates/show_live_stream.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,7 +24,7 @@ <div id="information_actions"> <ul> <li> - <a href="<?php echo Config::get('web_path'); ?>/radio.php?action=show_create"><?php echo UI::get_icon('add', T_('Add')); ?></a> <?php echo T_('Add Radio Station'); ?> + <a href="<?php echo Config::get('web_path'); ?>/radio.php?action=show_create"><?php echo UI::get_icon('add', T_('Add')); ?></a> <?php echo T_('Add Radio Station'); ?> </li> </ul> </div> diff --git a/templates/show_live_stream_row.inc.php b/templates/show_live_stream_row.inc.php index 620d7366..033f05a6 100644 --- a/templates/show_live_stream_row.inc.php +++ b/templates/show_live_stream_row.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -21,17 +21,17 @@ */ ?> <td class="cel_add"> - <?php echo Ajax::button('?action=basket&type=live_stream&id=' . $radio->id,'add', T_('Add'),'add_radio_' . $radio->id); ?> + <?php echo Ajax::button('?action=basket&type=live_stream&id=' . $radio->id,'add', T_('Add'),'add_radio_' . $radio->id); ?> </td> <td class="cel_streamname"><?php echo $radio->f_name_link; ?></td> <td class="cel_callsign"><?php echo $radio->f_callsign; ?></td> <td class="cel_frequency"><?php echo $radio->f_frequency; ?></td> <td class="cel_tag"><?php echo $radio->f_tag; ?></td> <td class="cel_action"> - <?php if (Access::check('interface','50')) { ?> - <?php echo Ajax::button('?action=show_edit_object&type=live_stream_row&id=' . $radio->id,'edit', T_('Edit'),'edit_radio_' . $radio->id); ?> - <?php } ?> - <?php if (Access::check('interface','75')) { ?> - <?php echo Ajax::button('?page=browse&action=delete_object&type=live_stream&id=' . $radio->id,'delete', T_('Delete'),'delete_radio_' . $radio->id); ?> - <?php } ?> + <?php if (Access::check('interface','50')) { ?> + <?php echo Ajax::button('?action=show_edit_object&type=live_stream_row&id=' . $radio->id,'edit', T_('Edit'),'edit_radio_' . $radio->id); ?> + <?php } ?> + <?php if (Access::check('interface','75')) { ?> + <?php echo Ajax::button('?page=browse&action=delete_object&type=live_stream&id=' . $radio->id,'delete', T_('Delete'),'delete_radio_' . $radio->id); ?> + <?php } ?> </td> diff --git a/templates/show_live_streams.inc.php b/templates/show_live_streams.inc.php index e03b4d13..1cc782f0 100644 --- a/templates/show_live_streams.inc.php +++ b/templates/show_live_streams.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -34,34 +34,34 @@ $web_path = Config::get('web_path'); <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_add"><?php echo T_('Add'); ?></th> - <th class="cel_streamname"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name', T_('Name'),'live_stream_sort_name'); ?></th> - <th class="cel_callsign"><?php echo Ajax::text('?page=browse&action=set_sort&sort=call_sign', T_('Callsign'),'live_stream_call_sign'); ?></th> - <th class="cel_frequency"><?php echo Ajax::text('?page=browse&action=set_sort&sort=frequency', T_('Frequency'),'live_stream_frequency'); ?></th> - <th class="cel_genre"><?php echo T_('Tag'); ?></th> - <th class="cel_action"><?php echo T_('Action'); ?> </th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_streamname"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name', T_('Name'),'live_stream_sort_name'); ?></th> + <th class="cel_callsign"><?php echo Ajax::text('?page=browse&action=set_sort&sort=call_sign', T_('Callsign'),'live_stream_call_sign'); ?></th> + <th class="cel_frequency"><?php echo Ajax::text('?page=browse&action=set_sort&sort=frequency', T_('Frequency'),'live_stream_frequency'); ?></th> + <th class="cel_genre"><?php echo T_('Tag'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?> </th> </tr> <?php foreach ($object_ids as $radio_id) { - $radio = new Radio($radio_id); - $radio->format(); + $radio = new Radio($radio_id); + $radio->format(); ?> <tr id="live_stream_<?php echo $radio->id; ?>" class="<?php echo UI::flip_class(); ?>"> - <?php require Config::get('prefix') . '/templates/show_live_stream_row.inc.php'; ?> + <?php require Config::get('prefix') . '/templates/show_live_stream_row.inc.php'; ?> </tr> <?php } //end foreach ($artists as $artist) ?> <?php if (!count($object_ids)) { ?> <tr> - <td colspan="6"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> + <td colspan="6"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_add"><?php echo T_('Add'); ?></th> - <th class="cel_streamname"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name', T_('Name'),'live_stream_sort_name_bottom'); ?></th> - <th class="cel_callsign"><?php echo Ajax::text('?page=browse&action=set_sort&sort=call_sign', T_('Callsign'),'live_stream_call_sign_bottom'); ?></th> - <th class="cel_frequency"><?php echo Ajax::text('?page=browse&action=set_sort&sort=frequency', T_('Frequency'),'live_stream_frequency_bottom'); ?></th> - <th class="cel_genre"><?php echo T_('Tag'); ?></th> - <th class="cel_action"><?php echo T_('Action'); ?> </th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_streamname"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name', T_('Name'),'live_stream_sort_name_bottom'); ?></th> + <th class="cel_callsign"><?php echo Ajax::text('?page=browse&action=set_sort&sort=call_sign', T_('Callsign'),'live_stream_call_sign_bottom'); ?></th> + <th class="cel_frequency"><?php echo Ajax::text('?page=browse&action=set_sort&sort=frequency', T_('Frequency'),'live_stream_frequency_bottom'); ?></th> + <th class="cel_genre"><?php echo T_('Tag'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?> </th> </tr> </table> <?php require Config::Get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/show_localplay_add_instance.inc.php b/templates/show_localplay_add_instance.inc.php index ec92c41f..d980c8e8 100644 --- a/templates/show_localplay_add_instance.inc.php +++ b/templates/show_localplay_add_instance.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,13 +25,13 @@ <table cellpadding="3" cellspacing="0" class="tabledata"> <?php foreach ($fields as $key=>$field) { ?> <tr> - <td><?php echo $field['description']; ?></td> - <td><input type="text" name="<?php echo $key; ?>" /></td> + <td><?php echo $field['description']; ?></td> + <td><input type="text" name="<?php echo $key; ?>" /></td> </tr> <?php } ?> </table> - <div class="formValidation"> - <input type="submit" value="<?php echo T_('Add Instance'); ?>" /> + <div class="formValidation"> + <input type="submit" value="<?php echo T_('Add Instance'); ?>" /> </div> </form> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_localplay_control.inc.php b/templates/show_localplay_control.inc.php index 5c3b099e..5ca4a43f 100644 --- a/templates/show_localplay_control.inc.php +++ b/templates/show_localplay_control.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) diff --git a/templates/show_localplay_controllers.inc.php b/templates/show_localplay_controllers.inc.php index 809b42e7..ec1a0565 100644 --- a/templates/show_localplay_controllers.inc.php +++ b/templates/show_localplay_controllers.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -31,41 +31,41 @@ $web_path = Config::get('web_path'); <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_name"><?php echo T_('Name'); ?></th> - <th class="cel_description"><?php echo T_('Description'); ?></th> - <th class="cel_version"><?php echo T_('Version'); ?></th> - <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_name"><?php echo T_('Name'); ?></th> + <th class="cel_description"><?php echo T_('Description'); ?></th> + <th class="cel_version"><?php echo T_('Version'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> <?php foreach ($controllers as $controller) { - $localplay = new Localplay($controller); - if (!$localplay->player_loaded()) { continue; } - $localplay->format(); - if (Localplay::is_enabled($controller)) { - $action = 'confirm_uninstall_localplay'; - $action_txt = T_('Disable'); - } - else { - $action = 'install_localplay'; - $action_txt = T_('Activate'); - } + $localplay = new Localplay($controller); + if (!$localplay->player_loaded()) { continue; } + $localplay->format(); + if (Localplay::is_enabled($controller)) { + $action = 'confirm_uninstall_localplay'; + $action_txt = T_('Disable'); + } + else { + $action = 'install_localplay'; + $action_txt = T_('Activate'); + } ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td class="cel_name"><?php echo scrub_out($localplay->f_name); ?></td> - <td class="cel_description"><?php echo scrub_out($localplay->f_description); ?></td> - <td class="cel_version"><?php echo scrub_out($localplay->f_version); ?></td> - <td class="cel_action"><a href="<?php echo $web_path; ?>/admin/modules.php?action=<?php echo $action; ?>&type=<?php echo urlencode($controller); ?>"><?php echo $action_txt; ?></a></td> + <td class="cel_name"><?php echo scrub_out($localplay->f_name); ?></td> + <td class="cel_description"><?php echo scrub_out($localplay->f_description); ?></td> + <td class="cel_version"><?php echo scrub_out($localplay->f_version); ?></td> + <td class="cel_action"><a href="<?php echo $web_path; ?>/admin/modules.php?action=<?php echo $action; ?>&type=<?php echo urlencode($controller); ?>"><?php echo $action_txt; ?></a></td> </tr> <?php } if (!count($controllers)) { ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td colspan="4"><span class="error"><?php echo T_('No Records Found'); ?></span></td> + <td colspan="4"><span class="error"><?php echo T_('No Records Found'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_name"><?php echo T_('Name'); ?></th> - <th class="cel_description"><?php echo T_('Description'); ?></th> - <th class="cel_version"><?php echo T_('Version'); ?></th> - <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_name"><?php echo T_('Name'); ?></th> + <th class="cel_description"><?php echo T_('Description'); ?></th> + <th class="cel_version"><?php echo T_('Version'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> </table> <br /> diff --git a/templates/show_localplay_edit_instance.inc.php b/templates/show_localplay_edit_instance.inc.php index 9d9484ce..1bd14364 100644 --- a/templates/show_localplay_edit_instance.inc.php +++ b/templates/show_localplay_edit_instance.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,13 +25,13 @@ <table cellpadding="3" cellspacing="0" class="tabledata"> <?php foreach ($fields as $key=>$field) { ?> <tr> - <td><?php echo $field['description']; ?></td> - <td><input type="text" name="<?php echo $key; ?>" value="<?php echo scrub_out($instance[$key]); ?>" /></td> + <td><?php echo $field['description']; ?></td> + <td><input type="text" name="<?php echo $key; ?>" value="<?php echo scrub_out($instance[$key]); ?>" /></td> </tr> <?php } ?> </table> - <div class="formValidation"> - <input type="submit" value="<?php echo T_('Update Instance'); ?>" /> + <div class="formValidation"> + <input type="submit" value="<?php echo T_('Update Instance'); ?>" /> </div> </form> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_localplay_instances.inc.php b/templates/show_localplay_instances.inc.php index 755744b7..6972479f 100644 --- a/templates/show_localplay_instances.inc.php +++ b/templates/show_localplay_instances.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -23,22 +23,22 @@ <?php UI::show_box_top(T_('Show Localplay Instances'), 'box box_localplay_instances'); ?> <table cellpadding="3" cellspacing="0" class="tabledata"> <tr> - <?php foreach ($fields as $key=>$field) { ?> - <th><?php echo $field['description']; ?></th> - <?php } ?> - <th><?php echo T_('Action'); ?></th> + <?php foreach ($fields as $key=>$field) { ?> + <th><?php echo $field['description']; ?></th> + <?php } ?> + <th><?php echo T_('Action'); ?></th> </tr> <?php foreach ($instances as $uid=>$name) { - $instance = $localplay->get_instance($uid); + $instance = $localplay->get_instance($uid); ?> <tr class="<?php echo UI::flip_class(); ?>" id="localplay_instance_<?php echo $uid; ?>"> - <?php foreach ($fields as $key=>$field) { ?> - <td><?php echo $instance[$key]; ?></td> - <?php } ?> - <td> - <a href="<?php echo Config::get('web_path'); ?>/localplay.php?action=edit_instance&instance=<?php echo $uid; ?>"><?php echo UI::get_icon('edit', T_('Edit Instance')); ?></a> - <?php echo Ajax::button('?page=localplay&action=delete_instance&instance=' . $uid,'delete', T_('Delete'),'delete_instance_' . $uid); ?> - </td> + <?php foreach ($fields as $key=>$field) { ?> + <td><?php echo $instance[$key]; ?></td> + <?php } ?> + <td> + <a href="<?php echo Config::get('web_path'); ?>/localplay.php?action=edit_instance&instance=<?php echo $uid; ?>"><?php echo UI::get_icon('edit', T_('Edit Instance')); ?></a> + <?php echo Ajax::button('?page=localplay&action=delete_instance&instance=' . $uid,'delete', T_('Delete'),'delete_instance_' . $uid); ?> + </td> </tr> <?php } ?> </table> diff --git a/templates/show_localplay_playlist.inc.php b/templates/show_localplay_playlist.inc.php index 0f5b2633..8a1781b0 100644 --- a/templates/show_localplay_playlist.inc.php +++ b/templates/show_localplay_playlist.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -32,35 +32,35 @@ $status = $localplay->status(); <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_track"><?php echo T_('Track'); ?></th> - <th class="cel_name"><?php echo T_('Name'); ?></th> - <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_track"><?php echo T_('Track'); ?></th> + <th class="cel_name"><?php echo T_('Name'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> <?php foreach ($object_ids as $object) { - $class = ' class="cel_name"'; - if ($status['track'] == $object['track']) { $class=' class="cel_name lp_current"'; } + $class = ' class="cel_name"'; + if ($status['track'] == $object['track']) { $class=' class="cel_name lp_current"'; } ?> <tr class="<?php echo UI::flip_class(); ?>" id="localplay_playlist_<?php echo $object['id']; ?>"> - <td class="cel_track"> - <?php echo scrub_out($object['track']); ?> - </td> - <td<?php echo $class; ?>> - <?php echo $localplay->format_name($object['name'],$object['id']); ?> - </td> - <td class="cel_action"> - <?php echo Ajax::button('?page=localplay&action=delete_track&id=' . intval($object['id']),'delete', T_('Delete'),'localplay_delete_' . intval($object['id'])); ?> - </td> + <td class="cel_track"> + <?php echo scrub_out($object['track']); ?> + </td> + <td<?php echo $class; ?>> + <?php echo $localplay->format_name($object['name'],$object['id']); ?> + </td> + <td class="cel_action"> + <?php echo Ajax::button('?page=localplay&action=delete_track&id=' . intval($object['id']),'delete', T_('Delete'),'localplay_delete_' . intval($object['id'])); ?> + </td> </tr> <?php } if (!count($object_ids)) { ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td colspan="3"><span class="error"><?php echo T_('No Records Found'); ?></span></td> + <td colspan="3"><span class="error"><?php echo T_('No Records Found'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_track"><?php echo T_('Track'); ?></th> - <th class="cel_name"><?php echo T_('Name'); ?></th> - <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_track"><?php echo T_('Track'); ?></th> + <th class="cel_name"><?php echo T_('Name'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/show_localplay_status.inc.php b/templates/show_localplay_status.inc.php index 87f25283..00fa065f 100644 --- a/templates/show_localplay_status.inc.php +++ b/templates/show_localplay_status.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -35,17 +35,17 @@ $now_playing = $status['track_title'] ? $status['track_title'] . ' - ' . $status <?php echo T_('Volume'); ?>:<?php echo $status['volume']; ?>% </li> <li> - <?php echo print_bool($status['repeat']); ?> | - <?php echo Ajax::text('?page=localplay&action=repeat&value=' . invert_bool($status['repeat']), print_bool(invert_bool($status['repeat'])), 'localplay_repeat'); ?> - <?php echo T_('Repeat'); ?> + <?php echo print_bool($status['repeat']); ?> | + <?php echo Ajax::text('?page=localplay&action=repeat&value=' . invert_bool($status['repeat']), print_bool(invert_bool($status['repeat'])), 'localplay_repeat'); ?> + <?php echo T_('Repeat'); ?> </li> <li> - <?php echo print_bool($status['random']); ?> | - <?php echo Ajax::text('?page=localplay&action=random&value=' . invert_bool($status['random']), print_bool(invert_bool($status['random'])), 'localplay_random'); ?> - <?php echo T_('Random'); ?> + <?php echo print_bool($status['random']); ?> | + <?php echo Ajax::text('?page=localplay&action=random&value=' . invert_bool($status['random']), print_bool(invert_bool($status['random'])), 'localplay_random'); ?> + <?php echo T_('Random'); ?> </li> <li> - <?php echo Ajax::button('?page=localplay&action=command&command=delete_all','delete', T_('Clear Playlist'),'localplay_clear_all'); ?><?php echo T_('Clear Playlist'); ?> + <?php echo Ajax::button('?page=localplay&action=command&command=delete_all','delete', T_('Clear Playlist'),'localplay_clear_all'); ?><?php echo T_('Clear Playlist'); ?> </li> </ul> </div> diff --git a/templates/show_login_form.inc.php b/templates/show_login_form.inc.php index a972fc34..c2e73677 100644 --- a/templates/show_login_form.inc.php +++ b/templates/show_login_form.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,7 +24,7 @@ * if so disable the checkbox */ if (Config::get('session_length') >= Config::get('remember_length')) { - $remember_disabled = 'disabled="disabled"'; + $remember_disabled = 'disabled="disabled"'; } $htmllang = str_replace("_","-",Config::get('lang')); is_rtl(Config::get('lang')) ? $dir = 'rtl' : $dir = 'ltr'; @@ -45,54 +45,54 @@ function focus(){ document.login.username.focus(); } <body id="loginPage" onload="focus();"> <div id="maincontainer"> - <div id="header"><!-- This is the header --> - <h1 id="headerlogo"> - <a href="<?php echo Config::get('web_path'); ?>"> - <img src="<?php echo Config::get('web_path'); ?><?php echo Config::get('theme_path'); ?>/images/ampache.png" title="<?php echo Config::get('site_title'); ?>" alt="<?php echo Config::get('site_title'); ?>" /> - </a> + <div id="header"><!-- This is the header --> + <h1 id="headerlogo"> + <a href="<?php echo Config::get('web_path'); ?>"> + <img src="<?php echo Config::get('web_path'); ?><?php echo Config::get('theme_path'); ?>/images/ampache.png" title="<?php echo Config::get('site_title'); ?>" alt="<?php echo Config::get('site_title'); ?>" /> + </a> </h1> </div> - <div id="loginbox"> - <h2><?php echo scrub_out(Config::get('site_title')); ?></h2> - <form name="login" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/login.php"> + <div id="loginbox"> + <h2><?php echo scrub_out(Config::get('site_title')); ?></h2> + <form name="login" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/login.php"> - <div class="loginfield" id="usernamefield"> + <div class="loginfield" id="usernamefield"> <label for="username"><?php echo T_('Username'); ?>:</label> - <input class="text_input" type="text" id="username" name="username" value="<?php echo scrub_out($_REQUEST['username']); ?>" /> + <input class="text_input" type="text" id="username" name="username" value="<?php echo scrub_out($_REQUEST['username']); ?>" /> </div> - <div class="loginfield" id="passwordfield"> + <div class="loginfield" id="passwordfield"> <label for="password"><?php echo T_('Password'); ?>:</label> - <input class="text_input" type="password" id="password" name="password" value="" /> + <input class="text_input" type="password" id="password" name="password" value="" /> </div> - <div class="loginfield" id="remembermefield"><label for="rememberme"> + <div class="loginfield" id="remembermefield"><label for="rememberme"> <?php echo T_('Remember Me'); ?> </label><input type="checkbox" id="rememberme" name="rememberme" <?php echo $remember_disabled; ?> /> </div> - <?php echo Config::get('login_message'); ?> - <?php Error::display('general'); ?> + <?php echo Config::get('login_message'); ?> + <?php Error::display('general'); ?> - <div class="formValidation"> - <a class="button" id="lostpasswordbutton" href="<?php echo Config::get('web_path'); ?>/lostpassword.php"><?php echo T_('Lost password'); ?></a> - <input class="button" id="loginbutton" type="submit" value="<?php echo T_('Login'); ?>" /> - <input type="hidden" name="referrer" value="<?php echo scrub_out($_SERVER['HTTP_REFERRER']); ?>" /> - <input type="hidden" name="action" value="login" /> + <div class="formValidation"> + <a class="button" id="lostpasswordbutton" href="<?php echo Config::get('web_path'); ?>/lostpassword.php"><?php echo T_('Lost password'); ?></a> + <input class="button" id="loginbutton" type="submit" value="<?php echo T_('Login'); ?>" /> + <input type="hidden" name="referrer" value="<?php echo scrub_out($_SERVER['HTTP_REFERRER']); ?>" /> + <input type="hidden" name="action" value="login" /> - <?php if (Config::get('allow_public_registration')) { ?> - <a class="button" id="registerbutton" href="<?php echo Config::get('web_path'); ?>/register.php"><?php echo T_('Register'); ?></a> - <?php } // end if allow_public_registration ?> + <?php if (Config::get('allow_public_registration')) { ?> + <a class="button" id="registerbutton" href="<?php echo Config::get('web_path'); ?>/register.php"><?php echo T_('Register'); ?></a> + <?php } // end if allow_public_registration ?> </div> - </form> + </form> <?php if (@is_readable(Config::get('prefix') . '/config/motd.php')) { ?> - </div> - <div id="motd"> - <?php + </div> + <div id="motd"> + <?php UI::show_box_top(T_('Message of the Day')); require_once Config::get('prefix') . '/config/motd.php'; UI::show_box_bottom(); - ?> + ?> <?php } UI::show_footer(); diff --git a/templates/show_lostpassword_form.inc.php b/templates/show_lostpassword_form.inc.php index 4abc4461..240b5f78 100644 --- a/templates/show_lostpassword_form.inc.php +++ b/templates/show_lostpassword_form.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,7 +24,7 @@ * if so disable the checkbox */ if (Config::get('session_length') >= Config::get('remember_length')) { - $remember_disabled = 'disabled="disabled"'; + $remember_disabled = 'disabled="disabled"'; } $htmllang = str_replace("_","-",Config::get('lang')); is_rtl(Config::get('lang')) ? $dir = 'rtl' : $dir = 'ltr'; @@ -32,19 +32,19 @@ is_rtl(Config::get('lang')) ? $dir = 'rtl' : $dir = 'ltr'; ?> <!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; ?>" - dir="<?php echo $dir; ?>"> + xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>" + dir="<?php echo $dir; ?>"> <head> <meta http-equiv="Content-Type" - content="text/html; charset=<?php echo Config::get('site_charset'); ?>" /> + content="text/html; charset=<?php echo Config::get('site_charset'); ?>" /> <link rel="shortcut icon" - href="<?php echo Config::get('web_path'); ?>/favicon.ico" /> + href="<?php echo Config::get('web_path'); ?>/favicon.ico" /> <link rel="stylesheet" - href="<?php echo Config::get('web_path'); ?>/templates/print.css" - type="text/css" media="print" /> + href="<?php echo Config::get('web_path'); ?>/templates/print.css" + type="text/css" media="print" /> <link rel="stylesheet" - href="<?php echo Config::get('web_path'); ?><?php echo Config::get('theme_path'); ?>/templates/default.css" - type="text/css" media="screen" /> + href="<?php echo Config::get('web_path'); ?><?php echo Config::get('theme_path'); ?>/templates/default.css" + type="text/css" media="screen" /> <title><?php echo scrub_out(Config::get('site_title')); ?></title> <script type="text/javascript" language="javascript"> function focus(){ document.login.username.focus(); } @@ -53,23 +53,23 @@ function focus(){ document.login.username.focus(); } <body id="loginPage" onload="focus();"> <div id="maincontainer"> - <div id="header"><!-- This is the header --> - <h1 id="headerlogo"><a - href="<?php echo Config::get('web_path'); ?>/login.php"> <img - src="<?php echo Config::get('web_path'); ?><?php echo Config::get('theme_path'); ?>/images/ampache.png" - title="<?php echo Config::get('site_title'); ?>" - alt="<?php echo Config::get('site_title'); ?>" /> </a></h1> - </div> - <div id="loginbox"> - <h2><?php echo scrub_out(Config::get('site_title')); ?></h2> - <form name="login" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/lostpassword.php"> + <div id="header"><!-- This is the header --> + <h1 id="headerlogo"><a + href="<?php echo Config::get('web_path'); ?>/login.php"> <img + src="<?php echo Config::get('web_path'); ?><?php echo Config::get('theme_path'); ?>/images/ampache.png" + title="<?php echo Config::get('site_title'); ?>" + alt="<?php echo Config::get('site_title'); ?>" /> </a></h1> + </div> + <div id="loginbox"> + <h2><?php echo scrub_out(Config::get('site_title')); ?></h2> + <form name="login" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/lostpassword.php"> - <div class="loginfield" id="email"><label for="email"><?php echo T_('Email'); ?>:</label> - <input type="hidden" id="action" name="action" value="send" /> - <input class="text_input" type="text" id="email" name="email" /></div> - <input class="button" id="lostpasswordbutton" type="submit" - value="<?php echo T_('Submit'); ?>" /></form> - </div> + <div class="loginfield" id="email"><label for="email"><?php echo T_('Email'); ?>:</label> + <input type="hidden" id="action" name="action" value="send" /> + <input class="text_input" type="text" id="email" name="email" /></div> + <input class="button" id="lostpasswordbutton" type="submit" + value="<?php echo T_('Submit'); ?>" /></form> + </div> </div> <div id="footer"><a href="http://www.ampache.org/index.php">Ampache v.<?php echo Config::get('version'); ?></a><br /> Copyright (c) 2001 - 2009 Ampache.org <?php echo T_('Queries:'); ?><?php echo Dba::$stats['query']; ?> diff --git a/templates/show_lyrics.inc.php b/templates/show_lyrics.inc.php index 7c6573db..3b5ef5ba 100644 --- a/templates/show_lyrics.inc.php +++ b/templates/show_lyrics.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -35,17 +35,17 @@ UI::show_box_top(sprintf(T_('%s Lyrics'), $song->title), 'box box_lyrics'); ?> <table class="tabledata" cellspacing="0" cellpadding="0"> <tr> - <td> - <?php - if($return == "Sorry Lyrics, Not found") { - echo T_("Sorry Lyrics Not Found."); - } - else { - echo $link; - echo "<pre>" . $return . "</pre>"; - } - ?> - </td> + <td> + <?php + if($return == "Sorry Lyrics, Not found") { + echo T_("Sorry Lyrics Not Found."); + } + else { + echo $link; + echo "<pre>" . $return . "</pre>"; + } + ?> + </td> </tr> </table> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_lyrics_song.inc.php b/templates/show_lyrics_song.inc.php index eb99a1cf..ee038e0c 100644 --- a/templates/show_lyrics_song.inc.php +++ b/templates/show_lyrics_song.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -40,24 +40,24 @@ $artist = scrub_out(UI::truncate($song->f_artist_full)); <div class="np_group"> <div class="np_cell cel_song"> - <label><?php echo T_('Song'); ?></label> - <a title="<?php echo scrub_out($song->title); ?>" href="<?php echo $web_path; ?>/stream.php?action=single_song&song_id=<?php echo $song->id; ?>"> + <label><?php echo T_('Song'); ?></label> + <a title="<?php echo scrub_out($song->title); ?>" href="<?php echo $web_path; ?>/stream.php?action=single_song&song_id=<?php echo $song->id; ?>"> <?php echo $title; ?> - </a> + </a> </div> <div class="np_cell cel_album"> - <label><?php echo T_('Album'); ?></label> - <a title="<?php echo scrub_out($song->f_album_full); ?>" href="<?php echo $web_path; ?>/albums.php?action=show&album=<?php echo $song->album; ?>"> - <?php echo $album; ?> - </a> + <label><?php echo T_('Album'); ?></label> + <a title="<?php echo scrub_out($song->f_album_full); ?>" href="<?php echo $web_path; ?>/albums.php?action=show&album=<?php echo $song->album; ?>"> + <?php echo $album; ?> + </a> </div> <div class="np_cell cel_artist"> - <label><?php echo T_('Artist'); ?></label> - <a title="<?php echo scrub_out($song->f_artist_full); ?>" href="<?php echo $web_path; ?>/artists.php?action=show&artist=<?php echo $song->artist; ?>"> - <?php echo $artist; ?> - </a> + <label><?php echo T_('Artist'); ?></label> + <a title="<?php echo scrub_out($song->f_artist_full); ?>" href="<?php echo $web_path; ?>/artists.php?action=show&artist=<?php echo $song->artist; ?>"> + <?php echo $artist; ?> + </a> </div> </div> diff --git a/templates/show_mail_users.inc.php b/templates/show_mail_users.inc.php index 91af8eb0..68fee0fe 100644 --- a/templates/show_mail_users.inc.php +++ b/templates/show_mail_users.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -31,66 +31,66 @@ <option value="all" title="Mail Everyone"><?php echo T_('All'); ?></option> <option value="users" title="Mail Users"><?php echo T_('User'); ?></option> <option value="admins" title="Mail Admins"><?php echo T_('Admin'); ?></option> - <option value="inactive" title="Mail Inactive Users"><?php echo T_('Inactive Users'); ?> </option> + <option value="inactive" title="Mail Inactive Users"><?php echo T_('Inactive Users'); ?> </option> </select> </td> </tr> <!-- <tr> <td colspan="2"> - <table> - <tr> - <td><?php echo T_('Catalog Statistics'); ?>:</td> - <td> - <input type="checkbox" name="cat_stats" value="yes" /> - </td> - <td><?php echo T_('Most Popular Albums'); ?>:</td> - <td> - <input type="checkbox" name="pop_albums" value="yes" /> - </td> - </tr> + <table> + <tr> + <td><?php echo T_('Catalog Statistics'); ?>:</td> + <td> + <input type="checkbox" name="cat_stats" value="yes" /> + </td> + <td><?php echo T_('Most Popular Albums'); ?>:</td> + <td> + <input type="checkbox" name="pop_albums" value="yes" /> + </td> + </tr> - <tr> - <td><?php echo T_('Latest Artist Additions'); ?>:</td> - <td> - <input type="checkbox" name="new_artists" value="yes" /> - </td> - <td><?php echo T_('Most Popular Artists'); ?>:</td> - <td> - <input type="checkbox" name="pop_artists" value="yes" /> - </td> - </tr> + <tr> + <td><?php echo T_('Latest Artist Additions'); ?>:</td> + <td> + <input type="checkbox" name="new_artists" value="yes" /> + </td> + <td><?php echo T_('Most Popular Artists'); ?>:</td> + <td> + <input type="checkbox" name="pop_artists" value="yes" /> + </td> + </tr> - <tr> - <td><?php echo T_('Latest Album Additions'); ?>:</td> - <td> - <input type="checkbox" name="new_albums" value="yes" /> - </td> - <td><?php echo T_('Most Popular Songs'); ?>:</td> - <td> - <input type="checkbox" name="pop_songs" value="yes" /> - </td> - </tr> - <tr> - <td><?php echo T_('Flagged Songs'); ?>:</td> - <td> - <input type="checkbox" name="flagged" value="yes" /> - </td> - <td><?php echo T_('Disabled Songs'); ?>:</td> - <td> - <input type="checkbox" name="disabled" value="yes" /> - </td> + <tr> + <td><?php echo T_('Latest Album Additions'); ?>:</td> + <td> + <input type="checkbox" name="new_albums" value="yes" /> + </td> + <td><?php echo T_('Most Popular Songs'); ?>:</td> + <td> + <input type="checkbox" name="pop_songs" value="yes" /> + </td> + </tr> + <tr> + <td><?php echo T_('Flagged Songs'); ?>:</td> + <td> + <input type="checkbox" name="flagged" value="yes" /> + </td> + <td><?php echo T_('Disabled Songs'); ?>:</td> + <td> + <input type="checkbox" name="disabled" value="yes" /> + </td> - </tr> + </tr> - <tr> - <td colspan = "2"><?php echo T_('Most Popular Threshold in days'); ?>:</td> - <td> - <input type="text" name="threshold" size="3" value="<?php echo Config::get('popular_threshold'); ?>" /> - </td> - </tr> + <tr> + <td colspan = "2"><?php echo T_('Most Popular Threshold in days'); ?>:</td> + <td> + <input type="text" name="threshold" size="3" value="<?php echo Config::get('popular_threshold'); ?>" /> + </td> + </tr> - </table> + </table> </td> </tr> --> @@ -99,7 +99,7 @@ <td> <select name="from"> <option value="self" title="Self"><?php echo T_('Yourself'); ?></option> - <option value="system" title="System"><?php echo T_('Ampache'); ?></option> + <option value="system" title="System"><?php echo T_('Ampache'); ?></option> </select> </td> </tr> diff --git a/templates/show_manage_catalogs.inc.php b/templates/show_manage_catalogs.inc.php index c26d0778..47b541a7 100644 --- a/templates/show_manage_catalogs.inc.php +++ b/templates/show_manage_catalogs.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -26,20 +26,20 @@ <tr> <td> <ul> - <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=gather_album_art"><?php echo T_('Gather All Art'); ?></a></li> - <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=add_to_all_catalogs"><?php echo T_('Add to All'); ?></a> </li> - <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=update_all_catalogs"><?php echo T_('Verify All'); ?></a></li> - <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=clean_all_catalogs"><?php echo T_('Clean All'); ?></a></li> - <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=full_service"><?php echo T_('Update All'); ?></a></li> - <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=clear_stats"><?php echo T_('Clear Stats'); ?></a></li> + <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=gather_album_art"><?php echo T_('Gather All Art'); ?></a></li> + <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=add_to_all_catalogs"><?php echo T_('Add to All'); ?></a> </li> + <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=update_all_catalogs"><?php echo T_('Verify All'); ?></a></li> + <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=clean_all_catalogs"><?php echo T_('Clean All'); ?></a></li> + <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=full_service"><?php echo T_('Update All'); ?></a></li> + <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=clear_stats"><?php echo T_('Clear Stats'); ?></a></li> </ul> </td> <td> - <form method="post" action="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=update_from"> - <?php /* HINT: /data/myNewMusic */ ?><?php printf (T_('Add From %s'), '<span class="information">/data/myNewMusic</span>'); ?><br /> - <input type="text" name="add_path" value="/" /><br /> - <?php /* HINT: /data/myUpdatedMusic */ ?><?php printf (T_('Update From %s'), '<span class="information">/data/myUpdatedMusic</span>'); ?><br /> - <input type="text" name="update_path" value="/" /><br /> + <form method="post" action="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=update_from"> + <?php /* HINT: /data/myNewMusic */ ?><?php printf (T_('Add From %s'), '<span class="information">/data/myNewMusic</span>'); ?><br /> + <input type="text" name="add_path" value="/" /><br /> + <?php /* HINT: /data/myUpdatedMusic */ ?><?php printf (T_('Update From %s'), '<span class="information">/data/myUpdatedMusic</span>'); ?><br /> + <input type="text" name="update_path" value="/" /><br /> <input type="submit" value="<?php echo T_('Update'); ?>" /> </form> </td> @@ -48,12 +48,12 @@ </div> <?php UI::show_box_bottom(); ?> <?php - $catalog_ids = Catalog::get_catalogs(); - $browse = new Browse(); - $browse->set_type('catalog'); - $browse->set_static_content(true); - $browse->save_objects($catalog_ids); - $browse->show_objects($catalog_ids); - $browse->store(); + $catalog_ids = Catalog::get_catalogs(); + $browse = new Browse(); + $browse->set_type('catalog'); + $browse->set_static_content(true); + $browse->save_objects($catalog_ids); + $browse->show_objects($catalog_ids); + $browse->store(); ?> diff --git a/templates/show_manage_democratic.inc.php b/templates/show_manage_democratic.inc.php index 0134c9f3..505e22de 100644 --- a/templates/show_manage_democratic.inc.php +++ b/templates/show_manage_democratic.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -23,45 +23,45 @@ UI::show_box_top(T_('Manage Democratic Playlists')); ?> <table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> - <col id="col_number" /> - <col id="col_base_playlist" /> - <col id="col_vote_count" /> - <col id="col_cooldown" /> - <col id="col_level" /> - <col id="col_default" /> - <col id="col_action" /> + <col id="col_number" /> + <col id="col_base_playlist" /> + <col id="col_vote_count" /> + <col id="col_cooldown" /> + <col id="col_level" /> + <col id="col_default" /> + <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_number"><?php echo T_('Playlist'); ?></th> - <th class="cel_base_playlist"><?php echo T_('Base Playlist'); ?></th> - <th class="cel_cooldown"><?php echo T_('Cooldown'); ?></th> - <th class="cel_level"><?php echo T_('Level'); ?></th> - <th class="cel_default"><?php echo T_('Default'); ?></th> - <th class="cel_vote_count"><?php echo T_('Songs'); ?></th> - <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_number"><?php echo T_('Playlist'); ?></th> + <th class="cel_base_playlist"><?php echo T_('Base Playlist'); ?></th> + <th class="cel_cooldown"><?php echo T_('Cooldown'); ?></th> + <th class="cel_level"><?php echo T_('Level'); ?></th> + <th class="cel_default"><?php echo T_('Default'); ?></th> + <th class="cel_vote_count"><?php echo T_('Songs'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> <?php - foreach ($playlists as $democratic_id) { - $democratic = new Democratic($democratic_id); - $democratic->format(); - $playlist = new Playlist($democratic->base_playlist); - $playlist->format(); + foreach ($playlists as $democratic_id) { + $democratic = new Democratic($democratic_id); + $democratic->format(); + $playlist = new Playlist($democratic->base_playlist); + $playlist->format(); ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td><?php echo scrub_out($democratic->name); ?></td> - <td><?php echo $playlist->f_link; ?></td> - <td><?php echo $democratic->f_cooldown; ?></td> - <td><?php echo $democratic->f_level; ?></td> - <td><?php echo $democratic->f_primary; ?></td> - <td><?php echo $democratic->count_items(); ?></td> - <td> - <?php echo Ajax::button('?page=democratic&action=send_playlist&democratic_id=' . $democratic->id,'all', T_('Play'),'play_democratic'); ?> - <a href="<?php echo Config::get('web_path'); ?>/democratic.php?action=delete&democratic_id=<?php echo scrub_out($democratic->id); ?>"><?php echo UI::get_icon('delete', T_('Delete')); ?></a> - </td> + <td><?php echo scrub_out($democratic->name); ?></td> + <td><?php echo $playlist->f_link; ?></td> + <td><?php echo $democratic->f_cooldown; ?></td> + <td><?php echo $democratic->f_level; ?></td> + <td><?php echo $democratic->f_primary; ?></td> + <td><?php echo $democratic->count_items(); ?></td> + <td> + <?php echo Ajax::button('?page=democratic&action=send_playlist&democratic_id=' . $democratic->id,'all', T_('Play'),'play_democratic'); ?> + <a href="<?php echo Config::get('web_path'); ?>/democratic.php?action=delete&democratic_id=<?php echo scrub_out($democratic->id); ?>"><?php echo UI::get_icon('delete', T_('Delete')); ?></a> + </td> </tr> <?php } if (!count($playlists)) { ?> <tr> - <td colspan="7"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> + <td colspan="7"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> </tr> <?php } ?> </table> diff --git a/templates/show_manage_shoutbox.inc.php b/templates/show_manage_shoutbox.inc.php index 3e19bd4d..9c23c54c 100644 --- a/templates/show_manage_shoutbox.inc.php +++ b/templates/show_manage_shoutbox.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -32,35 +32,35 @@ $web_path = Config::get('web_path'); <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_object"><?php echo T_('Object'); ?></th> - <th class="cel_username"><?php echo T_('User'); ?></th> - <th class="cel_flag"><?php echo T_('Sticky'); ?></th> - <th class="cel_comment"><?php echo T_('Comment'); ?></th> - <th class="cel_date"><?php echo T_('Date Added'); ?></th> - <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_object"><?php echo T_('Object'); ?></th> + <th class="cel_username"><?php echo T_('User'); ?></th> + <th class="cel_flag"><?php echo T_('Sticky'); ?></th> + <th class="cel_comment"><?php echo T_('Comment'); ?></th> + <th class="cel_date"><?php echo T_('Date Added'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> <?php foreach ($object_ids as $shout_id) { - $shout = new Shoutbox($shout_id); - $shout->format(); + $shout = new Shoutbox($shout_id); + $shout->format(); $object = Shoutbox::get_object($shout->object_type,$shout->object_id); $object->format(); $client = new User($shout->user); $client->format(); - require Config::get('prefix') . '/templates/show_shout_row.inc.php'; + require Config::get('prefix') . '/templates/show_shout_row.inc.php'; ?> <?php } if (!count($object_ids)) { ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td colspan="7" class="error"><?php echo T_('No Records Found'); ?></td> + <td colspan="7" class="error"><?php echo T_('No Records Found'); ?></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_object"><?php echo T_('Object'); ?></th> - <th class="cel_username"><?php echo T_('User'); ?></th> - <th class="cel_sticky"><?php echo T_('Sticky'); ?></th> - <th class="cel_comment"><?php echo T_('Comment'); ?></th> - <th class="cel_date"><?php echo T_('Date Added'); ?></th> - <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_object"><?php echo T_('Object'); ?></th> + <th class="cel_username"><?php echo T_('User'); ?></th> + <th class="cel_sticky"><?php echo T_('Sticky'); ?></th> + <th class="cel_comment"><?php echo T_('Comment'); ?></th> + <th class="cel_date"><?php echo T_('Date Added'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> </table> diff --git a/templates/show_newest.inc.php b/templates/show_newest.inc.php index 8a28bb12..62f49d96 100644 --- a/templates/show_newest.inc.php +++ b/templates/show_newest.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) diff --git a/templates/show_now_playing.inc.php b/templates/show_now_playing.inc.php index c56aea60..d61a5a7c 100644 --- a/templates/show_now_playing.inc.php +++ b/templates/show_now_playing.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -33,13 +33,13 @@ $link = Config::get('use_rss') ? ' ' . Ampache_RSS::get_display('nowplaying') : <?php UI::show_box_top(T_('Now Playing') . $link); ?> <?php foreach ($results as $item) { - $media = $item['media']; - $np_user = $item['client']; - $agent = $item['agent']; + $media = $item['media']; + $np_user = $item['client']; + $agent = $item['agent']; - /* If we've gotten a non-song object just skip this row */ - if (!is_object($media)) { continue; } - if (!$np_user->fullname) { $np_user->fullname = "Ampache User"; } + /* If we've gotten a non-song object just skip this row */ + if (!is_object($media)) { continue; } + if (!$np_user->fullname) { $np_user->fullname = "Ampache User"; } ?> <div class="np_row"> <?php require Config::get('prefix') . '/templates/show_now_playing_row.inc.php'; ?> diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php index 30553a8d..adbe0f24 100644 --- a/templates/show_now_playing_row.inc.php +++ b/templates/show_now_playing_row.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -23,7 +23,7 @@ <div class="np_group" id="np_group_1"> <div class="np_cell cel_username"> <label><?php echo T_('Username'); ?></label> - <a title="<?php echo scrub_out($agent); ?>" href="<?php echo $web_path; ?>/stats.php?action=show_user&user_id=<?php echo $np_user->id; ?>"> + <a title="<?php echo scrub_out($agent); ?>" href="<?php echo $web_path; ?>/stats.php?action=show_user&user_id=<?php echo $np_user->id; ?>"> <?php echo scrub_out($np_user->fullname); ?> </a> </div> @@ -37,28 +37,28 @@ <?php if (Config::get('show_lyrics')) {?> <div class="np_cell cel_lyrics"> - <label> </label> - <a title="<?php echo scrub_out($media->title); ?>" href="<?php echo $web_path; ?>/song.php?action=show_lyrics&song_id=<?php echo $media->id; ?>"> + <label> </label> + <a title="<?php echo scrub_out($media->title); ?>" href="<?php echo $web_path; ?>/song.php?action=show_lyrics&song_id=<?php echo $media->id; ?>"> <?php echo T_('Show Lyrics');?> - </a> + </a> </div> <?php } ?> </div> <div class="np_group" id="np_group_2"> <div class="np_cell cel_song"> - <label><?php echo T_('Song'); ?></label> - <?php echo $media->f_link; ?> + <label><?php echo T_('Song'); ?></label> + <?php echo $media->f_link; ?> </div> <div class="np_cell cel_album"> - <label><?php echo T_('Album'); ?></label> - <?php echo $media->f_album_link; ?> + <label><?php echo T_('Album'); ?></label> + <?php echo $media->f_album_link; ?> </div> <div class="np_cell cel_artist"> - <label><?php echo T_('Artist'); ?></label> - <?php echo $media->f_artist_link; ?> + <label><?php echo T_('Artist'); ?></label> + <?php echo $media->f_artist_link; ?> </div> </div> @@ -75,37 +75,37 @@ <?php if (Config::get('show_similar')) { ?> <div class="np_group"> <?php if ($artists = Recommendation::get_artists_like($media->artist, 3, false)) { ?> - <div class="np_cel cel_similar"> - <label><?php echo T_('Similar Artists'); ?></label> - <?php foreach ($artists as $a) { ?> - <div class="np_cel cel_similar_artist"> - <?php - if (is_null($a['id'])) { - echo scrub_out(UI::truncate($a['name']), Config::get('ellipse_threshold_artist')); - } - else { - $artist = new Artist($a['id']); - $artist->format(); - echo $artist->f_name_link; - } - ?> - </div> - <?php } // end foreach ?> - </div> + <div class="np_cel cel_similar"> + <label><?php echo T_('Similar Artists'); ?></label> + <?php foreach ($artists as $a) { ?> + <div class="np_cel cel_similar_artist"> + <?php + if (is_null($a['id'])) { + echo scrub_out(UI::truncate($a['name']), Config::get('ellipse_threshold_artist')); + } + else { + $artist = new Artist($a['id']); + $artist->format(); + echo $artist->f_name_link; + } + ?> + </div> + <?php } // end foreach ?> + </div> <?php } // end show similar artists ?> <?php if ($songs = Recommendation::get_songs_like($media->id, 3)) { ?> - <div class="np_cel cel_similar"> - <label><?php echo T_('Similar Songs'); ?></label> - <?php foreach ($songs as $s) { ?> - <div class="np_cel cel_similar_song"> - <?php - $song = new Song($s['id']); - $song->format(); - echo $song->f_link; - ?> - </div> - <?php } // end foreach ?> - </div> + <div class="np_cel cel_similar"> + <label><?php echo T_('Similar Songs'); ?></label> + <?php foreach ($songs as $s) { ?> + <div class="np_cel cel_similar_song"> + <?php + $song = new Song($s['id']); + $song->format(); + echo $song->f_link; + ?> + </div> + <?php } // end foreach ?> + </div> <?php } // end show similar songs ?> </div> <?php } // end show similar things ?> diff --git a/templates/show_object_rating.inc.php b/templates/show_object_rating.inc.php index 14b5c578..97eb2b98 100644 --- a/templates/show_object_rating.inc.php +++ b/templates/show_object_rating.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -26,8 +26,8 @@ $base_url = '?action=set_rating&rating_type=' . $rating->type . '&object_id=' . $othering = false; $rate = $rating->get_user_rating(); if (!$rate) { - $rate = $rating->get_average_rating(); - $othering = true; + $rate = $rating->get_average_rating(); + $othering = true; } ?> @@ -42,7 +42,7 @@ if (!$rate) { echo '<li class="current-rating" style="width:' . $width . '%" >'; echo T_('Current rating: '); if ($rate <= 0) { - echo T_('not rated yet') . "</li>\n"; + echo T_('not rated yet') . "</li>\n"; } else printf(T_('%s of 5'), $rate); echo "</li>\n"; @@ -50,11 +50,11 @@ if (!$rate) { { ?> <li> - <?php echo Ajax::text($base_url . '&rating=' . $i, '', 'rating' . $i . '_' . $rating->id, '', 'star' . $i); ?> + <?php echo Ajax::text($base_url . '&rating=' . $i, '', 'rating' . $i . '_' . $rating->id, '', 'star' . $i); ?> </li> <?php } ?> </ul> - <?php echo Ajax::text($base_url . '&rating=-1', '', 'rating0_' . $rating->id, '', 'star0'); ?> + <?php echo Ajax::text($base_url . '&rating=-1', '', 'rating0_' . $rating->id, '', 'star0'); ?> </div> diff --git a/templates/show_object_row.inc.php b/templates/show_object_row.inc.php index cca75f07..34765de4 100644 --- a/templates/show_object_row.inc.php +++ b/templates/show_object_row.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -27,5 +27,5 @@ ?> <?php foreach ($headers as $key=>$header) { ?> - <td><?php echo $object->$key; ?></td> + <td><?php echo $object->$key; ?></td> <?php } ?> diff --git a/templates/show_objects.inc.php b/templates/show_objects.inc.php index f3d2c04c..ad122d3d 100644 --- a/templates/show_objects.inc.php +++ b/templates/show_objects.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -28,22 +28,22 @@ <table class="tabledata" cellspacing="0"> <tr> <?php foreach ($headers as $header) { ?> - <th class="th-top"><?php echo $header; ?></th> + <th class="th-top"><?php echo $header; ?></th> <?php } ?> </tr> <?php - foreach ($objects as $object) { - $object->format(); + foreach ($objects as $object) { + $object->format(); ?> <tr id="object_row_<?php echo $object->id; ?>" class="<?php echo UI::flip_class(); ?>"> - <?php require Config::get('prefix') . '/templates/show_object_row.inc.php'; ?> + <?php require Config::get('prefix') . '/templates/show_object_row.inc.php'; ?> </tr> <?php } ?> <?php if (!count($objects)) { ?> <tr> - <td colspan="<?php echo count($headers); ?>"> - <span class="error"><?php echo T_('Not Enough Data'); ?></span> - </td> + <td colspan="<?php echo count($headers); ?>"> + <span class="error"><?php echo T_('Not Enough Data'); ?></span> + </td> </tr> <?php } ?> </table> diff --git a/templates/show_playlist.inc.php b/templates/show_playlist.inc.php index 6e426d12..a5875019 100644 --- a/templates/show_playlist.inc.php +++ b/templates/show_playlist.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -32,48 +32,48 @@ require Config::get('prefix') . '/templates/show_playlist_title.inc.php'; $title = ob_get_contents(); ob_end_clean(); UI::show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . - '</div>', 'info-box'); + '</div>', 'info-box'); ?> <div id="information_actions"> <ul> - <li> - <a href="<?php echo Config::get('web_path'); ?>/playlist.php?action=normalize_tracks&playlist_id=<?php echo $playlist->id; ?>"><?php echo UI::get_icon('statistics', T_('Normalize Tracks')); ?></a> - <?php echo T_('Normalize Tracks'); ?> - </li> + <li> + <a href="<?php echo Config::get('web_path'); ?>/playlist.php?action=normalize_tracks&playlist_id=<?php echo $playlist->id; ?>"><?php echo UI::get_icon('statistics', T_('Normalize Tracks')); ?></a> + <?php echo T_('Normalize Tracks'); ?> + </li> <?php if (Access::check_function('batch_download')) { ?> - <li> - <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=playlist&id=<?php echo $playlist->id; ?>"><?php echo UI::get_icon('batch_download', T_('Batch Download')); ?></a> - <?php echo T_('Batch Download'); ?> - </li> + <li> + <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=playlist&id=<?php echo $playlist->id; ?>"><?php echo UI::get_icon('batch_download', T_('Batch Download')); ?></a> + <?php echo T_('Batch Download'); ?> + </li> <?php } ?> - <li> - <?php echo Ajax::button('?action=basket&type=playlist&id=' . $playlist->id,'add', T_('Add All'),'play_playlist'); ?> - <?php echo T_('Add All'); ?> - </li> - <li> - <?php echo Ajax::button('?action=basket&type=playlist_random&id=' . $playlist->id,'random', T_('Add Random'),'play_playlist_random'); ?> - <?php echo T_('Add Random'); ?> - </li> - <?php if ($playlist->has_access()) { ?> - <li> - <?php echo Ajax::button('?action=show_edit_object&type=playlist_title&id=' . $playlist->id,'edit', T_('Edit'),'edit_playlist_' . $playlist->id); ?> - <?php echo T_('Edit'); ?> - </li> - <li> - <a href="<?php echo Config::get('web_path'); ?>/playlist.php?action=delete_playlist&playlist_id=<?php echo $playlist->id; ?>"> - <?php echo UI::get_icon('delete'); ?> - </a> - <?php echo T_('Delete'); ?> - </li> - <?php } ?> + <li> + <?php echo Ajax::button('?action=basket&type=playlist&id=' . $playlist->id,'add', T_('Add All'),'play_playlist'); ?> + <?php echo T_('Add All'); ?> + </li> + <li> + <?php echo Ajax::button('?action=basket&type=playlist_random&id=' . $playlist->id,'random', T_('Add Random'),'play_playlist_random'); ?> + <?php echo T_('Add Random'); ?> + </li> + <?php if ($playlist->has_access()) { ?> + <li> + <?php echo Ajax::button('?action=show_edit_object&type=playlist_title&id=' . $playlist->id,'edit', T_('Edit'),'edit_playlist_' . $playlist->id); ?> + <?php echo T_('Edit'); ?> + </li> + <li> + <a href="<?php echo Config::get('web_path'); ?>/playlist.php?action=delete_playlist&playlist_id=<?php echo $playlist->id; ?>"> + <?php echo UI::get_icon('delete'); ?> + </a> + <?php echo T_('Delete'); ?> + </li> + <?php } ?> </ul> </div> <?php UI::show_box_bottom(); ?> <?php - $browse = new Browse(); - $browse->set_type('playlist_song'); - $browse->add_supplemental_object('playlist', $playlist->id); - $browse->set_static_content(true); - $browse->show_objects($object_ids); - $browse->store(); + $browse = new Browse(); + $browse->set_type('playlist_song'); + $browse->add_supplemental_object('playlist', $playlist->id); + $browse->set_static_content(true); + $browse->show_objects($object_ids); + $browse->store(); ?> diff --git a/templates/show_playlist_row.inc.php b/templates/show_playlist_row.inc.php index 5737c0c2..d0c02b61 100644 --- a/templates/show_playlist_row.inc.php +++ b/templates/show_playlist_row.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -21,8 +21,8 @@ */ ?> <td class="cel_add"> - <?php echo Ajax::button('?action=basket&type=playlist&id=' . $playlist->id,'add', T_('Add'),'add_playlist_' . $playlist->id); ?> - <?php echo Ajax::button('?action=basket&type=playlist_random&id=' . $playlist->id,'random', T_('Random'),'random_playlist_' . $playlist->id); ?> + <?php echo Ajax::button('?action=basket&type=playlist&id=' . $playlist->id,'add', T_('Add'),'add_playlist_' . $playlist->id); ?> + <?php echo Ajax::button('?action=basket&type=playlist_random&id=' . $playlist->id,'random', T_('Random'),'random_playlist_' . $playlist->id); ?> </td> <td class="cel_playlist"><?php echo $playlist->f_link; ?></td> <td class="cel_type"><?php echo $playlist->f_type; ?></td> @@ -34,8 +34,8 @@ <?php echo UI::get_icon('batch_download', T_('Batch Download')); ?> </a> <?php } ?> - <?php if ($playlist->has_access()) { ?> - <?php echo Ajax::button('?action=show_edit_object&type=playlist_row&id=' . $playlist->id,'edit', T_('Edit'),'edit_playlist_' . $playlist->id); ?> - <?php echo Ajax::button('?page=browse&action=delete_object&type=playlist&id=' . $playlist->id,'delete', T_('Delete'),'delete_playlist_' . $playlist->id); ?> - <?php } ?> + <?php if ($playlist->has_access()) { ?> + <?php echo Ajax::button('?action=show_edit_object&type=playlist_row&id=' . $playlist->id,'edit', T_('Edit'),'edit_playlist_' . $playlist->id); ?> + <?php echo Ajax::button('?page=browse&action=delete_object&type=playlist&id=' . $playlist->id,'delete', T_('Delete'),'delete_playlist_' . $playlist->id); ?> + <?php } ?> </td> diff --git a/templates/show_playlist_song_row.inc.php b/templates/show_playlist_song_row.inc.php index 69f7f950..231ef9bb 100644 --- a/templates/show_playlist_song_row.inc.php +++ b/templates/show_playlist_song_row.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -32,13 +32,13 @@ <td class="cel_rating" id="rating_<?php echo $song->id; ?>_song"><?php Rating::show($song->id,'song'); ?></td> <?php } ?> <td class="cel_action"> - <?php if (Config::get('download')) { ?> - <a href="<?php echo Config::get('web_path'); ?>/stream.php?action=download&song_id=<?php echo $song->id; ?>"> - <?php echo UI::get_icon('download', T_('Download')); ?> - </a> - <?php } ?> - <?php if ($playlist->has_access()) { ?> - <?php echo Ajax::button('?page=playlist&action=edit_track&playlist_id=' . $playlist->id . '&track_id=' . $object['track_id'],'edit', T_('Edit'),'track_edit_' . $object['track_id']); ?> - <?php echo Ajax::button('?page=playlist&action=delete_track&playlist_id=' . $playlist->id . '&track_id=' . $object['track_id'],'delete', T_('Delete'),'track_del_' . $object['track_id']); ?> - <?php } ?> + <?php if (Config::get('download')) { ?> + <a href="<?php echo Config::get('web_path'); ?>/stream.php?action=download&song_id=<?php echo $song->id; ?>"> + <?php echo UI::get_icon('download', T_('Download')); ?> + </a> + <?php } ?> + <?php if ($playlist->has_access()) { ?> + <?php echo Ajax::button('?page=playlist&action=edit_track&playlist_id=' . $playlist->id . '&track_id=' . $object['track_id'],'edit', T_('Edit'),'track_edit_' . $object['track_id']); ?> + <?php echo Ajax::button('?page=playlist&action=delete_track&playlist_id=' . $playlist->id . '&track_id=' . $object['track_id'],'delete', T_('Delete'),'track_del_' . $object['track_id']); ?> + <?php } ?> </td> diff --git a/templates/show_playlist_songs.inc.php b/templates/show_playlist_songs.inc.php index 01257804..8d7fa0e8 100644 --- a/templates/show_playlist_songs.inc.php +++ b/templates/show_playlist_songs.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -37,44 +37,44 @@ $web_path = Config::get('web_path'); <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_add"> </th> - <th class="cel_track"><?php echo T_('Track'); ?></th> - <th class="cel_song"><?php echo T_('Song Title'); ?></th> - <th class="cel_artist"><?php echo T_('Artist'); ?></th> - <th class="cel_album"><?php echo T_('Album'); ?></th> - <th class="cel_genre"><?php echo T_('Genre'); ?></th> - <th class="cel_track"><?php echo T_('Track'); ?></th> - <th class="cel_time"><?php echo T_('Time'); ?></th> + <th class="cel_add"> </th> + <th class="cel_track"><?php echo T_('Track'); ?></th> + <th class="cel_song"><?php echo T_('Song Title'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_album"><?php echo T_('Album'); ?></th> + <th class="cel_genre"><?php echo T_('Genre'); ?></th> + <th class="cel_track"><?php echo T_('Track'); ?></th> + <th class="cel_time"><?php echo T_('Time'); ?></th> <?php if (Config::get('ratings')) { Rating::build_cache('song', array_map(create_function('$i', 'return $i[\'object_id\'];'), $object_ids)); ?> <th class="cel_rating"><?php echo T_('Rating'); ?></th> <?php } ?> - <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> <?php - foreach ($object_ids as $object) { - $song = new Song($object['object_id']); - $song->format(); - $playlist_track = $object['track']; + foreach ($object_ids as $object) { + $song = new Song($object['object_id']); + $song->format(); + $playlist_track = $object['track']; ?> <tr class="<?php echo UI::flip_class(); ?>" id="track_<?php echo $object['track_id']; ?>"> - <?php require Config::get('prefix') . '/templates/show_playlist_song_row.inc.php'; ?> + <?php require Config::get('prefix') . '/templates/show_playlist_song_row.inc.php'; ?> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_add"> </th> - <th class="cel_track"><?php echo T_('Track'); ?></th> - <th class="cel_song"><?php echo T_('Song Title'); ?></th> - <th class="cel_artist"><?php echo T_('Artist'); ?></th> - <th class="cel_album"><?php echo T_('Album'); ?></th> - <th class="cel_genre"><?php echo T_('Genre'); ?></th> - <th class="cel_track"><?php echo T_('Track'); ?></th> - <th class="cel_time"><?php echo T_('Time'); ?></th> + <th class="cel_add"> </th> + <th class="cel_track"><?php echo T_('Track'); ?></th> + <th class="cel_song"><?php echo T_('Song Title'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_album"><?php echo T_('Album'); ?></th> + <th class="cel_genre"><?php echo T_('Genre'); ?></th> + <th class="cel_track"><?php echo T_('Track'); ?></th> + <th class="cel_time"><?php echo T_('Time'); ?></th> <?php if (Config::get('ratings')) { ?> <th class="cel_rating"><?php echo T_('Rating'); ?></th> <?php } ?> - <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/show_playlist_title.inc.php b/templates/show_playlist_title.inc.php index c4d89164..96d063d2 100644 --- a/templates/show_playlist_title.inc.php +++ b/templates/show_playlist_title.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) diff --git a/templates/show_playlists.inc.php b/templates/show_playlists.inc.php index 98cd9e16..64704b83 100644 --- a/templates/show_playlists.inc.php +++ b/templates/show_playlists.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -32,34 +32,34 @@ </colgroup> <tr class="th-top"> <th class="cel_add"><?php echo T_('Add'); ?></th> - <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=name', T_('Playlist Name'),'playlist_sort_name'); ?></th> - <th class="cel_type"> </th> - <th class="cel_songs"><?php echo T_('# Songs'); ?></th> - <th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=user', T_('Owner'),'playlist_sort_owner'); ?></th> - <th class="cel_action"><?php echo T_('Actions'); ?></th> + <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=name', T_('Playlist Name'),'playlist_sort_name'); ?></th> + <th class="cel_type"> </th> + <th class="cel_songs"><?php echo T_('# Songs'); ?></th> + <th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=user', T_('Owner'),'playlist_sort_owner'); ?></th> + <th class="cel_action"><?php echo T_('Actions'); ?></th> </tr> <?php foreach ($object_ids as $playlist_id) { - $playlist = new Playlist($playlist_id); - $playlist->format(); - $count = $playlist->get_song_count(); + $playlist = new Playlist($playlist_id); + $playlist->format(); + $count = $playlist->get_song_count(); ?> <tr class="<?php echo UI::flip_class(); ?>" id="playlist_row_<?php echo $playlist->id; ?>"> - <?php require Config::get('prefix') . '/templates/show_playlist_row.inc.php'; ?> + <?php require Config::get('prefix') . '/templates/show_playlist_row.inc.php'; ?> </tr> <?php } // end foreach ($playlists as $playlist) ?> <?php if (!count($object_ids)) { ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td colspan="6"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> + <td colspan="6"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> <th class="cel_add"><?php echo T_('Add'); ?></th> - <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=name', T_('Playlist Name'),'playlist_sort_name_bottom'); ?></th> - <th class="cel_type"> </th> - <th class="cel_songs"><?php echo T_('# Songs'); ?></th> - <th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=user', T_('Owner'),'playlist_sort_owner_bottom'); ?></th> - <th class="cel_action"><?php echo T_('Actions'); ?></th> + <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=name', T_('Playlist Name'),'playlist_sort_name_bottom'); ?></th> + <th class="cel_type"> </th> + <th class="cel_songs"><?php echo T_('# Songs'); ?></th> + <th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=user', T_('Owner'),'playlist_sort_owner_bottom'); ?></th> + <th class="cel_action"><?php echo T_('Actions'); ?></th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php' ?> diff --git a/templates/show_playtype_switch.inc.php b/templates/show_playtype_switch.inc.php index 66308682..e2bf8f11 100644 --- a/templates/show_playtype_switch.inc.php +++ b/templates/show_playtype_switch.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -29,14 +29,14 @@ if (Preference::has_access('play_type')) { ?> <form method="post" id="play_type_form" action="javascript.void(0);"> <select id="play_type_select" name="type"> - <?php if (Config::get('allow_stream_playback')) { ?> - <option value="stream" <?php echo $is_stream; ?>><?php echo T_('Stream'); ?></option> - <?php } if (Config::get('allow_localplay_playback')) { ?> - <option value="localplay" <?php echo $is_localplay; ?>><?php echo T_('Localplay'); ?></option> - <?php } if (Config::get('allow_democratic_playback')) { ?> - <option value="democratic" <?php echo $is_democratic; ?>><?php echo T_('Democratic'); ?></option> - <?php } ?> - <option value="xspf_player" <?php echo $is_xspf_player; ?>><?php echo T_('Flash Player'); ?></option> + <?php if (Config::get('allow_stream_playback')) { ?> + <option value="stream" <?php echo $is_stream; ?>><?php echo T_('Stream'); ?></option> + <?php } if (Config::get('allow_localplay_playback')) { ?> + <option value="localplay" <?php echo $is_localplay; ?>><?php echo T_('Localplay'); ?></option> + <?php } if (Config::get('allow_democratic_playback')) { ?> + <option value="democratic" <?php echo $is_democratic; ?>><?php echo T_('Democratic'); ?></option> + <?php } ?> + <option value="xspf_player" <?php echo $is_xspf_player; ?>><?php echo T_('Flash Player'); ?></option> </select> <?php echo Ajax::observe('play_type_select','change',Ajax::action('?page=stream&action=set_play_type','play_type_select','play_type_form'),'1'); ?> </form> diff --git a/templates/show_plugins.inc.php b/templates/show_plugins.inc.php index 96d3f3ad..bf583371 100644 --- a/templates/show_plugins.inc.php +++ b/templates/show_plugins.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -31,16 +31,16 @@ $web_path = Config::get('web_path'); <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_name"><?php echo T_('Name'); ?></th> - <th class="cel_description"><?php echo T_('Description'); ?></th> - <th class="cel_version"><?php echo T_('Version'); ?></th> - <th class="cel_iversion"><?php echo T_('Installed Version'); ?></th> - <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_name"><?php echo T_('Name'); ?></th> + <th class="cel_description"><?php echo T_('Description'); ?></th> + <th class="cel_version"><?php echo T_('Version'); ?></th> + <th class="cel_iversion"><?php echo T_('Installed Version'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> <?php foreach ($plugins as $plugin_name) { - $plugin = new Plugin($plugin_name); - $installed_version = Plugin::get_plugin_version($plugin->_plugin->name); + $plugin = new Plugin($plugin_name); + $installed_version = Plugin::get_plugin_version($plugin->_plugin->name); if (! $installed_version) { $action = "<a href=\"" . $web_path . "/admin/modules.php?action=install_plugin&plugin=" . scrub_out($plugin_name) . "\">" . T_('Activate') . "</a>"; @@ -48,30 +48,30 @@ foreach ($plugins as $plugin_name) { else { $action = "<a href=\"" . $web_path . "/admin/modules.php?action=confirm_uninstall_plugin&plugin=" . scrub_out($plugin_name) . "\">" . T_('Deactivate') . "</a>"; - if ($installed_version < $plugin->_plugin->version) { - $action .= ' <a href="' . $web_path . - '/admin/modules.php?action=upgrade_plugin&plugin=' . - scrub_out($plugin_name) . '">' . T_('Upgrade') . '</a>'; - } + if ($installed_version < $plugin->_plugin->version) { + $action .= ' <a href="' . $web_path . + '/admin/modules.php?action=upgrade_plugin&plugin=' . + scrub_out($plugin_name) . '">' . T_('Upgrade') . '</a>'; + } } ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td class="cel_name"><?php echo scrub_out($plugin->_plugin->name); ?></td> - <td class="cel_description"><?php echo scrub_out($plugin->_plugin->description); ?></td> - <td class="cel_version"><?php echo scrub_out($plugin->_plugin->version); ?></td> - <td class="cel_iversion"><?php echo scrub_out($installed_version); ?></td> - <td class="cel_action"><?php echo $action; ?></td> + <td class="cel_name"><?php echo scrub_out($plugin->_plugin->name); ?></td> + <td class="cel_description"><?php echo scrub_out($plugin->_plugin->description); ?></td> + <td class="cel_version"><?php echo scrub_out($plugin->_plugin->version); ?></td> + <td class="cel_iversion"><?php echo scrub_out($installed_version); ?></td> + <td class="cel_action"><?php echo $action; ?></td> </tr> <?php } if (!count($plugins)) { ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td colspan="4"><span class="error"><?php echo T_('No Records Found'); ?></span></td> + <td colspan="4"><span class="error"><?php echo T_('No Records Found'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_name"><?php echo T_('Name'); ?></th> - <th class="cel_description"><?php echo T_('Description'); ?></th> - <th class="cel_version"><?php echo T_('Version'); ?></th> - <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_name"><?php echo T_('Name'); ?></th> + <th class="cel_description"><?php echo T_('Description'); ?></th> + <th class="cel_version"><?php echo T_('Version'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> </table> <br /> diff --git a/templates/show_popular.inc.php b/templates/show_popular.inc.php index e6c0b3b7..87e0f7f3 100644 --- a/templates/show_popular.inc.php +++ b/templates/show_popular.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) diff --git a/templates/show_preference_admin.inc.php b/templates/show_preference_admin.inc.php index 69e72bef..72a72baa 100644 --- a/templates/show_preference_admin.inc.php +++ b/templates/show_preference_admin.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -29,32 +29,32 @@ UI::show_box_top(T_('Preference Administration')); <col id="col_level" /> </colgroup> <tr class="th-top"> - <th class="cel_preference"><?php echo T_('Preference'); ?></th> - <th class="cel_level"><?php echo T_('Level'); ?></th> + <th class="cel_preference"><?php echo T_('Preference'); ?></th> + <th class="cel_level"><?php echo T_('Level'); ?></th> </tr> <?php foreach ($preferences as $preference) { - unset($is_25,$is_5,$is_100); + unset($is_25,$is_5,$is_100); ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td class="cel_preference"><?php echo scrub_out(T_($preference['description'])); ?></td> - <td class="cel_level"> - <?php $level_name = "is_" . $preference['level']; ${$level_name} = 'selected="selected"'; ?> - <select name="prefs[<?php echo scrub_out($preference['name']); ?>]"> - <option value="5" <?php echo $is_5; ?>><?php echo T_('Guest'); ?></option> - <option value="25" <?php echo $is_25; ?>><?php echo T_('User'); ?></option> - <option value="100" <?php echo $is_100; ?>><?php echo T_('Admin'); ?></option> - </select> - </td> + <td class="cel_preference"><?php echo scrub_out(T_($preference['description'])); ?></td> + <td class="cel_level"> + <?php $level_name = "is_" . $preference['level']; ${$level_name} = 'selected="selected"'; ?> + <select name="prefs[<?php echo scrub_out($preference['name']); ?>]"> + <option value="5" <?php echo $is_5; ?>><?php echo T_('Guest'); ?></option> + <option value="25" <?php echo $is_25; ?>><?php echo T_('User'); ?></option> + <option value="100" <?php echo $is_100; ?>><?php echo T_('Admin'); ?></option> + </select> + </td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_preference"><?php echo T_('Preference'); ?></th> - <th class="cel_level"><?php echo T_('Level'); ?></th> + <th class="cel_preference"><?php echo T_('Preference'); ?></th> + <th class="cel_level"><?php echo T_('Level'); ?></th> </tr> </table> <div class="formValidation"> - <input type="hidden" name="action" value="set_preferences" /> - <input type="submit" value="<?php echo T_('Update'); ?>" /> + <input type="hidden" name="action" value="set_preferences" /> + <input type="submit" value="<?php echo T_('Update'); ?>" /> </div> </form> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_preference_box.inc.php b/templates/show_preference_box.inc.php index bc604910..00d034ac 100644 --- a/templates/show_preference_box.inc.php +++ b/templates/show_preference_box.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,7 +24,7 @@ * Apply to All button on this page */ if ((Access::check('interface','100') OR !Config::get('use_auth')) AND $_REQUEST['action'] == 'admin') { - $is_admin = true; + $is_admin = true; } ?> <h4><?php echo T_($preferences['title']); ?></h4> @@ -32,47 +32,47 @@ if ((Access::check('interface','100') OR !Config::get('use_auth')) AND $_REQUEST <colgroup> <col id="col_preference" /> <col id="col_value" /> - <?php if ($is_admin) { ?> + <?php if ($is_admin) { ?> <col id="col_applytoall" /> <col id="col_level" /> - <?php } ?> + <?php } ?> </colgroup> <tr class="th-top"> - <th class="cel_preference"><?php echo T_('Preference'); ?></th> - <th class="cel_value"><?php echo T_('Value'); ?></th> - <?php if ($is_admin) { ?> - <th class="cel_applytoall"><?php echo T_('Apply to All'); ?></th> - <th class="cel_level"><?php echo T_('Access Level'); ?></th> - <?php } ?> + <th class="cel_preference"><?php echo T_('Preference'); ?></th> + <th class="cel_value"><?php echo T_('Value'); ?></th> + <?php if ($is_admin) { ?> + <th class="cel_applytoall"><?php echo T_('Apply to All'); ?></th> + <th class="cel_level"><?php echo T_('Access Level'); ?></th> + <?php } ?> </tr> <?php foreach ($preferences['prefs'] as $pref) { ?> - <tr class="<?php echo UI::flip_class(); ?>"> - <td class="cel_preference"><?php echo T_($pref['description']); ?></td> - <td class="cel_value"> - <?php create_preference_input($pref['name'], $pref['value']); ?> - </td> - <?php if ($is_admin) { ?> - <td class="cel_applytoall"><input type="checkbox" name="check_<?php echo $pref['name']; ?>" value="1" /></td> - <td class="cel_level"> - <?php $name = 'on_' . $pref['level']; ${$name} = 'selected="selected"'; ?> - <select name="level_<?php echo $pref['name']; ?>"> - <option value="5" <?php echo $on_5; ?>><?php echo T_('Guest'); ?></option> - <option value="25" <?php echo $on_25; ?>><?php echo T_('User'); ?></option> - <option value="50" <?php echo $on_50; ?>><?php echo T_('Content Manager'); ?></option> - <option value="75" <?php echo $on_75; ?>><?php echo T_('Catalog Manager'); ?></option> - <option value="100" <?php echo $on_100; ?>><?php echo T_('Admin'); ?></option> - </select> - <?php unset(${$name}); ?> - </td> - <?php } ?> - </tr> + <tr class="<?php echo UI::flip_class(); ?>"> + <td class="cel_preference"><?php echo T_($pref['description']); ?></td> + <td class="cel_value"> + <?php create_preference_input($pref['name'], $pref['value']); ?> + </td> + <?php if ($is_admin) { ?> + <td class="cel_applytoall"><input type="checkbox" name="check_<?php echo $pref['name']; ?>" value="1" /></td> + <td class="cel_level"> + <?php $name = 'on_' . $pref['level']; ${$name} = 'selected="selected"'; ?> + <select name="level_<?php echo $pref['name']; ?>"> + <option value="5" <?php echo $on_5; ?>><?php echo T_('Guest'); ?></option> + <option value="25" <?php echo $on_25; ?>><?php echo T_('User'); ?></option> + <option value="50" <?php echo $on_50; ?>><?php echo T_('Content Manager'); ?></option> + <option value="75" <?php echo $on_75; ?>><?php echo T_('Catalog Manager'); ?></option> + <option value="100" <?php echo $on_100; ?>><?php echo T_('Admin'); ?></option> + </select> + <?php unset(${$name}); ?> + </td> + <?php } ?> + </tr> <?php } // End foreach ($preferences['prefs'] as $pref) ?> <tr class="th-bottom"> - <th class="cel_preference"><?php echo T_('Preference'); ?></th> - <th class="cel_value"><?php echo T_('Value'); ?></th> - <?php if ($is_admin) { ?> - <th class="cel_applytoall"><?php echo T_('Apply to All'); ?></th> - <th class="cel_level"><?php echo T_('Access Level'); ?></th> - <?php } ?> + <th class="cel_preference"><?php echo T_('Preference'); ?></th> + <th class="cel_value"><?php echo T_('Value'); ?></th> + <?php if ($is_admin) { ?> + <th class="cel_applytoall"><?php echo T_('Apply to All'); ?></th> + <th class="cel_level"><?php echo T_('Access Level'); ?></th> + <?php } ?> </tr> </table> diff --git a/templates/show_preferences.inc.php b/templates/show_preferences.inc.php index 4e9cc556..8f040b34 100644 --- a/templates/show_preferences.inc.php +++ b/templates/show_preferences.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -32,20 +32,20 @@ <form method="post" name="preferences" action="<?php echo Config::get('web_path'); ?>/preferences.php?action=update_preferences" enctype="multipart/form-data"> <?php show_preference_box($preferences[$_REQUEST['tab']]); ?> <div class="formValidation"> - <input class="button" type="submit" value="<?php echo T_('Update Preferences'); ?>" /> - <?php echo Core::form_register('update_preference'); ?> - <input type="hidden" name="tab" value="<?php echo scrub_out($_REQUEST['tab']); ?>" /> - <input type="hidden" name="method" value="<?php echo scrub_out($_REQUEST['action']); ?>" /> - <?php if (Access::check('interface','100')) { ?> - <input type="hidden" name="user_id" value="<?php echo scrub_out($_REQUEST['user_id']); ?>" /> - <?php } ?> + <input class="button" type="submit" value="<?php echo T_('Update Preferences'); ?>" /> + <?php echo Core::form_register('update_preference'); ?> + <input type="hidden" name="tab" value="<?php echo scrub_out($_REQUEST['tab']); ?>" /> + <input type="hidden" name="method" value="<?php echo scrub_out($_REQUEST['action']); ?>" /> + <?php if (Access::check('interface','100')) { ?> + <input type="hidden" name="user_id" value="<?php echo scrub_out($_REQUEST['user_id']); ?>" /> + <?php } ?> </div> <?php } // end if not account if ($_REQUEST['tab'] == 'account') { - $client = $GLOBALS['user']; - require Config::get('prefix') . '/templates/show_account.inc.php'; - } + $client = $GLOBALS['user']; + require Config::get('prefix') . '/templates/show_account.inc.php'; + } ?> </form> diff --git a/templates/show_random.inc.php b/templates/show_random.inc.php index 07df7a72..538888c7 100644 --- a/templates/show_random.inc.php +++ b/templates/show_random.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,9 +24,9 @@ <form id="random" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/random.php?action=get_advanced&type=<?php echo $_REQUEST['type'] ? scrub_out($_REQUEST['type']) : 'song'; ?>"> <table class="tabledata" cellpadding="3" cellspacing="0"> <tr id="search_location"> - <td><?php if ($_REQUEST['type'] != 'song') { ?><a href="<?php echo Config::get('web_path'); ?>/random.php?action=advanced&type=song"><?php echo T_('Songs'); ?></a><?php } else { echo T_('Songs'); } ?></td> - <td><?php if ($_REQUEST['type'] != 'album') { ?><a href="<?php echo Config::get('web_path'); ?>/random.php?action=advanced&type=album"><?php echo T_('Albums'); ?></a><?php } else { echo T_('Albums'); } ?></td> - <td><?php if ($_REQUEST['type'] != 'artist') { ?><a href="<?php echo Config::get('web_path'); ?>/random.php?action=advanced&type=artist"><?php echo T_('Artists'); ?></a><?php } else { echo T_('Artists'); } ?></td> + <td><?php if ($_REQUEST['type'] != 'song') { ?><a href="<?php echo Config::get('web_path'); ?>/random.php?action=advanced&type=song"><?php echo T_('Songs'); ?></a><?php } else { echo T_('Songs'); } ?></td> + <td><?php if ($_REQUEST['type'] != 'album') { ?><a href="<?php echo Config::get('web_path'); ?>/random.php?action=advanced&type=album"><?php echo T_('Albums'); ?></a><?php } else { echo T_('Albums'); } ?></td> + <td><?php if ($_REQUEST['type'] != 'artist') { ?><a href="<?php echo Config::get('web_path'); ?>/random.php?action=advanced&type=artist"><?php echo T_('Artists'); ?></a><?php } else { echo T_('Artists'); } ?></td> </tr> <tr id="search_blank_line"><td> </td></tr> </table> @@ -34,20 +34,20 @@ <tr id="search_item_count"> <td><?php echo T_('Item count'); ?></td> <td> - <select name="random"> + <select name="random"> <?php - foreach(array(1, 5, 10, 20, 30, 50, 100, 500, 1000) as $i) { - echo "\t\t\t" . '<option value="' . $i . '" ' . - ($_POST['random'] == $i - ? 'selected="selected"' : '') . '>' . - $i . "</option>\n"; - } - echo "\t\t\t" . '<option value="-1" ' . - ($_POST['random'] == '-1' - ? 'selected="selected"' : '') . '>' . - T_('All') . "</option>\n"; + foreach(array(1, 5, 10, 20, 30, 50, 100, 500, 1000) as $i) { + echo "\t\t\t" . '<option value="' . $i . '" ' . + ($_POST['random'] == $i + ? 'selected="selected"' : '') . '>' . + $i . "</option>\n"; + } + echo "\t\t\t" . '<option value="-1" ' . + ($_POST['random'] == '-1' + ? 'selected="selected"' : '') . '>' . + T_('All') . "</option>\n"; ?> - </select> + </select> </td> </tr> <tr id="search_length"> @@ -56,22 +56,22 @@ <?php $name = 'length_' . intval($_POST['length']); ${$name} = ' selected="selected"'; ?> <select name="length"> <?php - echo "\t\t\t" . '<option value="0" ' . - ($_POST['length'] == 0 - ? 'selected="selected"' : '') . '>' . - T_('Unlimited') . "</option>\n"; - foreach(array(15, 30, 60, 120, 240, 480, 960) as $i) { - echo "\t\t\t" . '<option value="' . $i . '" ' . - ($_POST['length'] == $i - ? 'selected="selected"' : '') . '>'; - if ($i < 60) { - printf(T_ngettext('%d minute', '%d minutes', $i), $i); - } - else { - printf(T_ngettext('%d hour', '%d hours', $i / 60), $i / 60); - } - echo "</option>\n"; - } + echo "\t\t\t" . '<option value="0" ' . + ($_POST['length'] == 0 + ? 'selected="selected"' : '') . '>' . + T_('Unlimited') . "</option>\n"; + foreach(array(15, 30, 60, 120, 240, 480, 960) as $i) { + echo "\t\t\t" . '<option value="' . $i . '" ' . + ($_POST['length'] == $i + ? 'selected="selected"' : '') . '>'; + if ($i < 60) { + printf(T_ngettext('%d minute', '%d minutes', $i), $i); + } + else { + printf(T_ngettext('%d hour', '%d hours', $i / 60), $i / 60); + } + echo "</option>\n"; + } ?> </select> </td> @@ -81,16 +81,16 @@ <td> <select name="size_limit"> <?php - echo "\t\t\t" . '<option value="0" ' . - ($_POST['size_limit'] == 0 - ? 'selected="selected"' : '') . '>' . - T_('Unlimited') . "</option>\n"; - foreach(array(64, 128, 256, 512, 1024) as $i) { - echo "\t\t\t" . '<option value="' . $i . '"' . - ($_POST['size_limit'] == $i - ? 'selected="selected"' : '') . '>' . - UI::format_bytes($i * 1048576) . "</option>\n"; - } + echo "\t\t\t" . '<option value="0" ' . + ($_POST['size_limit'] == 0 + ? 'selected="selected"' : '') . '>' . + T_('Unlimited') . "</option>\n"; + foreach(array(64, 128, 256, 512, 1024) as $i) { + echo "\t\t\t" . '<option value="' . $i . '"' . + ($_POST['size_limit'] == $i + ? 'selected="selected"' : '') . '>' . + UI::format_bytes($i * 1048576) . "</option>\n"; + } ?> </select> </td> @@ -106,13 +106,13 @@ <?php UI::show_box_bottom(); ?> <div id="browse"> <?php - if (is_array($object_ids)) { - $browse = new Browse(); - $browse->set_type('song'); - $browse->save_objects($object_ids); - $browse->show_objects(); - $browse->store(); - echo Ajax::observe('window','load',Ajax::action('?action=refresh_rightbar','playlist_refresh_load')); - } + if (is_array($object_ids)) { + $browse = new Browse(); + $browse->set_type('song'); + $browse->save_objects($object_ids); + $browse->show_objects(); + $browse->store(); + echo Ajax::observe('window','load',Ajax::action('?action=refresh_rightbar','playlist_refresh_load')); + } ?> </div> diff --git a/templates/show_random_albums.inc.php b/templates/show_random_albums.inc.php index 08a9ae52..16e55071 100644 --- a/templates/show_random_albums.inc.php +++ b/templates/show_random_albums.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,12 +25,12 @@ $button = Ajax::button('?page=index&action=random_albums','random', T_('Refresh' ?> <?php UI::show_box_top(T_('Albums of the Moment') . ' ' . $button, 'box box_random_albums'); ?> - <?php - if ($albums) { - foreach ($albums as $album_id) { - $album = new Album($album_id); - $album->format(); - $name = '[' . $album->f_artist . '] ' . scrub_out($album->full_name); + <?php + if ($albums) { + foreach ($albums as $album_id) { + $album = new Album($album_id); + $album->format(); + $name = '[' . $album->f_artist . '] ' . scrub_out($album->full_name); ?> <div class="random_album"> <a href="<?php echo $web_path; ?>/albums.php?action=show&album=<?php echo $album_id; ?>"> @@ -47,10 +47,10 @@ $button = Ajax::button('?page=index&action=random_albums','random', T_('Refresh' echo "</div>"; } ?> - <span class="play_album"><?php echo Ajax::button('?action=basket&type=album&id=' . $album->id,'add', T_('Play Album'),'play_full_' . $album->id); ?></span> + <span class="play_album"><?php echo Ajax::button('?action=basket&type=album&id=' . $album->id,'add', T_('Play Album'),'play_full_' . $album->id); ?></span> </div> - <?php } // end foreach ?> - <?php } // end if albums ?> + <?php } // end foreach ?> + <?php } // end if albums ?> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_recently_played.inc.php b/templates/show_recently_played.inc.php index da8fb6d7..39877f45 100644 --- a/templates/show_recently_played.inc.php +++ b/templates/show_recently_played.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -33,82 +33,82 @@ UI::show_box_top(T_('Recently Played') . $link, 'box box_recently_played'); <col id="col_lastplayed" /> </colgroup> <tr class="th-top"> - <th class="cel_add"><?php echo T_('Add'); ?></th> - <th class="cel_song"><?php echo T_('Song'); ?></th> - <th class="cel_album"><?php echo T_('Album'); ?></th> - <th class="cel_artist"><?php echo T_('Artist'); ?></th> - <th class="cel_username"><?php echo T_('Username'); ?></th> - <th class="cel_lastplayed"><?php echo T_('Last Played'); ?></th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_song"><?php echo T_('Song'); ?></th> + <th class="cel_album"><?php echo T_('Album'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_username"><?php echo T_('Username'); ?></th> + <th class="cel_lastplayed"><?php echo T_('Last Played'); ?></th> </tr> <?php foreach ($data as $row) { - $row_user = new User($row['user']); - $song = new Song($row['object_id']); - $interval = intval(time() - $row['date']); + $row_user = new User($row['user']); + $song = new Song($row['object_id']); + $interval = intval(time() - $row['date']); - if ($interval < 60) { - $unit = 'seconds'; - } - else if ($interval < 3600) { - $interval = floor($interval / 60); - $unit = 'minutes'; - } - else if ($interval < 86400) { - $interval = floor($interval / 3600); - $unit = 'hours'; - } - else if ($interval < 604800) { - $interval = floor($interval / 86400); - $unit = 'days'; - } - else if ($interval < 2592000) { - $interval = floor($interval / 604800); - $unit = 'weeks'; - } - else if ($interval < 31556926) { - $interval = floor($interval / 2592000); - $unit = 'months'; - } - else if ($interval < 631138519) { - $interval = floor($interval / 31556926); - $unit = 'years'; - } - else { - $interval = floor($interval / 315569260); - $unit = 'decades'; - } + if ($interval < 60) { + $unit = 'seconds'; + } + else if ($interval < 3600) { + $interval = floor($interval / 60); + $unit = 'minutes'; + } + else if ($interval < 86400) { + $interval = floor($interval / 3600); + $unit = 'hours'; + } + else if ($interval < 604800) { + $interval = floor($interval / 86400); + $unit = 'days'; + } + else if ($interval < 2592000) { + $interval = floor($interval / 604800); + $unit = 'weeks'; + } + else if ($interval < 31556926) { + $interval = floor($interval / 2592000); + $unit = 'months'; + } + else if ($interval < 631138519) { + $interval = floor($interval / 31556926); + $unit = 'years'; + } + else { + $interval = floor($interval / 315569260); + $unit = 'decades'; + } - // I wonder how smart gettext is? - $time_string = sprintf(T_ngettext('%d ' . rtrim($unit, 's') . ' ago', '%d ' . $unit . ' ago', $interval), $interval); + // I wonder how smart gettext is? + $time_string = sprintf(T_ngettext('%d ' . rtrim($unit, 's') . ' ago', '%d ' . $unit . ' ago', $interval), $interval); - $song->format(); + $song->format(); ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td class="cel_add"> + <td class="cel_add"> <?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add', T_('Add'),'add_' . $song->id); ?> - </td> - <td class="cel_song"><?php echo $song->f_link; ?></td> - <td class="cel_album"><?php echo $song->f_album_link; ?></td> - <td class="cel_artist"><?php echo $song->f_artist_link; ?></td> - <td class="cel_username"> - <a href="<?php echo Config::get('web_path'); ?>/stats.php?action=show_user&user_id=<?php echo scrub_out($row_user->id); ?>"> - <?php echo scrub_out($row_user->fullname); ?> - </a> - </td> - <td class="cel_lastplayed"><?php echo $time_string; ?></td> + </td> + <td class="cel_song"><?php echo $song->f_link; ?></td> + <td class="cel_album"><?php echo $song->f_album_link; ?></td> + <td class="cel_artist"><?php echo $song->f_artist_link; ?></td> + <td class="cel_username"> + <a href="<?php echo Config::get('web_path'); ?>/stats.php?action=show_user&user_id=<?php echo scrub_out($row_user->id); ?>"> + <?php echo scrub_out($row_user->fullname); ?> + </a> + </td> + <td class="cel_lastplayed"><?php echo $time_string; ?></td> </tr> <?php } ?> <?php if (!count($data)) { ?> <tr> - <td colspan="6"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> + <td colspan="6"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_add"><?php echo T_('Add'); ?></th> - <th class="cel_username"><?php echo T_('Username'); ?></th> - <th class="cel_song"><?php echo T_('Song'); ?></th> - <th class="cel_album"><?php echo T_('Album'); ?></th> - <th class="cel_artist"><?php echo T_('Artist'); ?></th> - <th class="cel_lastplayed"><?php echo T_('Last Played'); ?></th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_username"><?php echo T_('Username'); ?></th> + <th class="cel_song"><?php echo T_('Song'); ?></th> + <th class="cel_album"><?php echo T_('Album'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_lastplayed"><?php echo T_('Last Played'); ?></th> </tr> </table> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_recommended_artists.inc.php b/templates/show_recommended_artists.inc.php index c48e394f..bc232caa 100644 --- a/templates/show_recommended_artists.inc.php +++ b/templates/show_recommended_artists.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -32,14 +32,14 @@ <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_add"><?php echo T_('Add'); ?></th> - <th class="cel_artist"><?php echo T_('Artist'); ?></th> - <th class="cel_songs"><?php echo T_('Songs'); ?></th> - <th class="cel_albums"><?php echo T_('Albums'); ?></th> - <th class="cel_time"><?php echo T_('Time'); ?></th> - <th class="cel_tags"><?php echo T_('Tags'); ?></th> - <th class="cel_rating"> <?php echo T_('Rating'); ?> </th> - <th class="cel_action"> <?php echo T_('Action'); ?> </th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_songs"><?php echo T_('Songs'); ?></th> + <th class="cel_albums"><?php echo T_('Albums'); ?></th> + <th class="cel_time"><?php echo T_('Time'); ?></th> + <th class="cel_tags"><?php echo T_('Tags'); ?></th> + <th class="cel_rating"> <?php echo T_('Rating'); ?> </th> + <th class="cel_action"> <?php echo T_('Action'); ?> </th> </tr> <?php // Cache the ratings we are going to use @@ -47,26 +47,26 @@ if (Config::get('ratings')) { Rating::build_cache('artist',$object_ids); } /* Foreach through every artist that has been passed to us */ foreach ($object_ids as $artist_id) { - $artist = new Artist($artist_id); - $artist->format(); + $artist = new Artist($artist_id); + $artist->format(); ?> <tr id="artist_<?php echo $artist->id; ?>" class="<?php echo UI::flip_class(); ?>"> - <?php require Config::get('prefix') . '/templates/show_artist_row.inc.php'; ?> + <?php require Config::get('prefix') . '/templates/show_artist_row.inc.php'; ?> </tr> <?php } //end foreach ($artists as $artist) ?> <?php if (!count($object_ids)) { ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td colspan="5"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> + <td colspan="5"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_add"><?php echo T_('Add'); ?></th> - <th class="cel_artist"><?php echo T_('Artist'); ?></th> - <th class="cel_songs"> <?php echo T_('Songs'); ?> </th> - <th class="cel_albums"> <?php echo T_('Albums'); ?> </th> - <th class="cel_time"> <?php echo T_('Time'); ?> </th> - <th class="cel_tags"><?php echo T_('Tags'); ?></th> - <th class="cel_rating"> <?php echo T_('Rating'); ?> </th> - <th class="cel_action"> <?php echo T_('Action'); ?> </th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_songs"> <?php echo T_('Songs'); ?> </th> + <th class="cel_albums"> <?php echo T_('Albums'); ?> </th> + <th class="cel_time"> <?php echo T_('Time'); ?> </th> + <th class="cel_tags"><?php echo T_('Tags'); ?></th> + <th class="cel_rating"> <?php echo T_('Rating'); ?> </th> + <th class="cel_action"> <?php echo T_('Action'); ?> </th> </tr> </table> diff --git a/templates/show_registration_confirmation.inc.php b/templates/show_registration_confirmation.inc.php index 71b932e1..02ab339e 100644 --- a/templates/show_registration_confirmation.inc.php +++ b/templates/show_registration_confirmation.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) diff --git a/templates/show_rename_artist.inc.php b/templates/show_rename_artist.inc.php index 1c0d16dc..9bb124fd 100644 --- a/templates/show_rename_artist.inc.php +++ b/templates/show_rename_artist.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -23,18 +23,18 @@ <script type='text/javascript'> function insert() { - document.getElementById('artist_name').value = '<?php echo $artist->name; ?>'; + document.getElementById('artist_name').value = '<?php echo $artist->name; ?>'; } </script> <?php /* HINT: Artist Name */ UI::show_box_top(sprintf(T_('Rename %s'), $artist->name)); ?> <form name="rename_artist" method="post" action="<?php echo Config::get('web_path'); ?>/artists.php?action=rename&artist=<?php echo $artist->id; ?>" style="Display:inline;"> <?php show_artist_pulldown($artist->id, "artist_id", 4); ?> - <br /> - <?php echo T_('OR'); ?><br /> - <input type="text" name="artist_name" size="30" value="<?php echo scrub_out($_REQUEST['artist_name']); ?>" id="artist_name" /> - <a href="javascript:insert()">[<?php echo T_('Insert current'); ?>]</a><br /> - <?php $GLOBALS['error']->print_error('artist_name'); ?> - <input type="checkbox" name="update_id3" value="yes" /> <?php echo T_('Update id3 tags') ?><br /> - <input type="submit" value="<?php echo T_('Rename'); ?>" /><br /> + <br /> + <?php echo T_('OR'); ?><br /> + <input type="text" name="artist_name" size="30" value="<?php echo scrub_out($_REQUEST['artist_name']); ?>" id="artist_name" /> + <a href="javascript:insert()">[<?php echo T_('Insert current'); ?>]</a><br /> + <?php $GLOBALS['error']->print_error('artist_name'); ?> + <input type="checkbox" name="update_id3" value="yes" /> <?php echo T_('Update id3 tags') ?><br /> + <input type="submit" value="<?php echo T_('Rename'); ?>" /><br /> </form> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_rules.inc.php b/templates/show_rules.inc.php index 93754da4..bca327d9 100644 --- a/templates/show_rules.inc.php +++ b/templates/show_rules.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -21,10 +21,10 @@ */ if ($playlist) { - $logic_operator = $playlist->logic_operator; + $logic_operator = $playlist->logic_operator; } else { - $logic_operator = $_REQUEST['operator']; + $logic_operator = $_REQUEST['operator']; } $logic_operator = strtolower($logic_operator); ?> @@ -34,8 +34,8 @@ $logic_operator = strtolower($logic_operator); <?php UI::show_box_top(T_('Rules') . "...", 'box box_rules'); ?> <table class="tabledata" cellpadding="3" cellspacing="0"> <tbody id="searchtable"> - <tr id="rules_operator"> - <td><?php echo T_('Match'); ?></td> + <tr id="rules_operator"> + <td><?php echo T_('Match'); ?></td> <td> <select name="operator"> <option value="and" <?php if($logic_operator == 'and') echo 'selected="selected"'?>><?php echo T_('all rules'); ?></option> @@ -43,32 +43,32 @@ $logic_operator = strtolower($logic_operator); </select> </td> </tr> - <tr id="rules_addrowbutton"> - <td> - <a id="addrowbutton" href="javascript:void(0)"> - <?php echo UI::get_icon('add'); ?> - <?php echo T_('Add Another Rule'); ?> - </a> - <script type="text/javascript">Event.observe('addrowbutton', 'click', SearchRow.add);</script> - </td> - </tr> + <tr id="rules_addrowbutton"> + <td> + <a id="addrowbutton" href="javascript:void(0)"> + <?php echo UI::get_icon('add'); ?> + <?php echo T_('Add Another Rule'); ?> + </a> + <script type="text/javascript">Event.observe('addrowbutton', 'click', SearchRow.add);</script> + </td> + </tr> </tbody> </table> <?php UI::show_box_bottom(); ?> <?php if ($playlist) { - $out = $playlist->to_js(); + $out = $playlist->to_js(); } else { - $mysearch = new Search($_REQUEST['type']); - $mysearch->parse_rules(Search::clean_request($_REQUEST)); - $out = $mysearch->to_js(); + $mysearch = new Search($_REQUEST['type']); + $mysearch->parse_rules(Search::clean_request($_REQUEST)); + $out = $mysearch->to_js(); } if ($out) { - echo $out; + echo $out; } else { - echo '<script type="text/javascript">SearchRow.add();</script>'; + echo '<script type="text/javascript">SearchRow.add();</script>'; } ?> diff --git a/templates/show_run_add_catalog.inc.php b/templates/show_run_add_catalog.inc.php index 4456bcb0..38462449 100644 --- a/templates/show_run_add_catalog.inc.php +++ b/templates/show_run_add_catalog.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) diff --git a/templates/show_search.inc.php b/templates/show_search.inc.php index 636d5eb8..605c3791 100644 --- a/templates/show_search.inc.php +++ b/templates/show_search.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,17 +24,17 @@ UI::show_box_top(T_('Search Ampache') . "...", 'box box_advanced_search'); ?> <form id="search" name="search" method="post" action="<?php echo Config::get('web_path'); ?>/search.php?type=<?php echo $_REQUEST['type'] ? scrub_out($_REQUEST['type']) : 'song'; ?>" enctype="multipart/form-data" style="Display:inline"> <table class="tabledata" cellpadding="3" cellspacing="0"> - <tr id="search_location"> - <td><?php if ($_REQUEST['type'] != 'song') { ?><a href="<?php echo Config::get('web_path'); ?>/search.php?type=song"><?php echo T_('Songs'); ?></a><?php } else { echo T_('Songs'); } ?></td> - <td><?php if ($_REQUEST['type'] != 'album') { ?><a href="<?php echo Config::get('web_path'); ?>/search.php?type=album"><?php echo T_('Albums'); ?></a><?php } else { echo T_('Albums'); } ?></td> - <td><?php if ($_REQUEST['type'] != 'artist') { ?><a href="<?php echo Config::get('web_path'); ?>/search.php?type=artist"><?php echo T_('Artists'); ?></a><?php } else { echo T_('Artists'); } ?></td> - <td><?php if ($_REQUEST['type'] != 'video') { ?><a href="<?php echo Config::get('web_path'); ?>/search.php?type=video"><?php echo T_('Videos'); ?></a><?php } else { echo T_('Videos'); } ?></td> - </tr> - <tr id="search_blank_line"><td> </td></tr> + <tr id="search_location"> + <td><?php if ($_REQUEST['type'] != 'song') { ?><a href="<?php echo Config::get('web_path'); ?>/search.php?type=song"><?php echo T_('Songs'); ?></a><?php } else { echo T_('Songs'); } ?></td> + <td><?php if ($_REQUEST['type'] != 'album') { ?><a href="<?php echo Config::get('web_path'); ?>/search.php?type=album"><?php echo T_('Albums'); ?></a><?php } else { echo T_('Albums'); } ?></td> + <td><?php if ($_REQUEST['type'] != 'artist') { ?><a href="<?php echo Config::get('web_path'); ?>/search.php?type=artist"><?php echo T_('Artists'); ?></a><?php } else { echo T_('Artists'); } ?></td> + <td><?php if ($_REQUEST['type'] != 'video') { ?><a href="<?php echo Config::get('web_path'); ?>/search.php?type=video"><?php echo T_('Videos'); ?></a><?php } else { echo T_('Videos'); } ?></td> + </tr> + <tr id="search_blank_line"><td> </td></tr> </table> <table class="tabledata" cellpadding="3" cellspacing="0"> - <tr id="search_max_results"> - <td><?php echo T_('Maximum Results'); ?></td> + <tr id="search_max_results"> + <td><?php echo T_('Maximum Results'); ?></td> <td> <select name="limit"> <option value="0"><?php echo T_('Unlimited'); ?></option> @@ -44,17 +44,17 @@ UI::show_box_top(T_('Search Ampache') . "...", 'box box_advanced_search'); <option value="500" <?php if($_REQUEST['limit']=="500") echo "selected=\"selected\""?>>500</option> </select> </td> - </tr> + </tr> </table> <?php require Config::get('prefix') . '/templates/show_rules.inc.php'; ?> <div class="formValidation"> - <input class="button" type="submit" value="<?php echo T_('Search'); ?>" /> + <input class="button" type="submit" value="<?php echo T_('Search'); ?>" /> <?php if ($_REQUEST['type'] == 'song' || ! $_REQUEST['type']) { ?> - <input id="savesearchbutton" class="button" type="submit" value="<?php echo T_('Save as Smart Playlist'); ?>" onClick="$('hiddenaction').setValue('save_as_smartplaylist');" /> + <input id="savesearchbutton" class="button" type="submit" value="<?php echo T_('Save as Smart Playlist'); ?>" onClick="$('hiddenaction').setValue('save_as_smartplaylist');" /> <?php } ?> - <input type="hidden" id="hiddenaction" name="action" value="search" /> + <input type="hidden" id="hiddenaction" name="action" value="search" /> </div> </form> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_search_bar.inc.php b/templates/show_search_bar.inc.php index 865e9d5c..2fa82fa4 100644 --- a/templates/show_search_bar.inc.php +++ b/templates/show_search_bar.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,17 +24,17 @@ <form name="search" method="post" action="<?php echo $web_path; ?>/search.php?type=song" enctype="multipart/form-data" style="Display:inline"> <input type="text" name="rule_1_input" id="searchString"/> <input type="hidden" name="action" value="search" /> - <input type="hidden" name="rule_1_operator" value="0" /> + <input type="hidden" name="rule_1_operator" value="0" /> <input type="hidden" name="object_type" value="song" /> - <select name="rule_1"> - <option value="anywhere"><?php echo T_('Anywhere')?></option> - <option value="title"><?php echo T_('Title')?></option> - <option value="album"><?php echo T_('Album')?></option> - <option value="artist"><?php echo T_('Artist')?></option> - <option value="tag"><?php echo T_('Tag')?></option> - </select> + <select name="rule_1"> + <option value="anywhere"><?php echo T_('Anywhere')?></option> + <option value="title"><?php echo T_('Title')?></option> + <option value="album"><?php echo T_('Album')?></option> + <option value="artist"><?php echo T_('Artist')?></option> + <option value="tag"><?php echo T_('Tag')?></option> + </select> <input class="button" type="submit" value="<?php echo T_('Search'); ?>" id="searchBtn" /> - <a href="<?php echo $web_path; ?>/search.php?type=song" class="button" id="advSearchBtn"><?php echo T_('Advanced Search'); ?></a> + <a href="<?php echo $web_path; ?>/search.php?type=song" class="button" id="advSearchBtn"><?php echo T_('Advanced Search'); ?></a> </form> </div> diff --git a/templates/show_search_descriptor.inc.php b/templates/show_search_descriptor.inc.php index 2f570937..45f1be45 100644 --- a/templates/show_search_descriptor.inc.php +++ b/templates/show_search_descriptor.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -25,15 +25,15 @@ require_once '../lib/init.php'; echo '<?xml version="1.0" encoding="UTF-8"?>' . "\n"; ?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> - <ShortName>Ampache</ShortName> - <Description><?php echo scrub_out(Config::get('site_title')); ?></Description> - <Url type="text/html" - method="get" - template="<?php echo Config::get('web_path'); ?>/search.php"> - <Param name="s_all" value="{searchTerms}"/> - <Param name="action" value="search"/> - </Url> - <Image height="16" width="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAABkZGRVLi4urywsLK8rKyuvKysrrywsLK9ERESQAAAABwAAAAcxMTGQLS0trysrK68rKyuvLS0tryMjI69KSkpVNDQ0uLS0tP+5ubn/uLi4/7i4uP+7u7v/VVVV/0hISBcQEBAXb29v/8HBwf+4uLj/uLi4/76+vv+UlJT/Q0NDuC4uLq+/v7//vr6+/729vf+9vb3/wMDA/1ZWVvg+Pj4WAAAAFnR0dPjIyMj/vb29/729vf/Dw8P/mZmZ/0BAQK8wMDCvv7+//7+/v/++vr7/vr6+/8HBwf9WVlb4Pz8/FgAAABZ1dXX4ycnJ/76+vv++vr7/xMTE/5mZmf9AQECvMDAwr8DAwP/BwcH/wMDA/8DAwP/ExMT/V1dX+D8/PxYAAAAWdXV1+MvLy//AwMD/wMDA/8bGxv+bm5v/Pz8/rzExMa/Dw8P/xMTE/8PDw//Dw8P/x8fH/1hYWPg/Pz8WAAAAFnd3d/jOzs7/w8PD/8PDw//Jycn/nZ2d/z8/P68xMTGvxsbG/8fHx//Gxsb/xsbG/8rKyv9YWFj4Pz8/FgAAABZ4eHj40dHR/8bGxv/Gxsb/zc3N/5+fn/8/Pz+vMjIyr8nJyf/Kysr/ycnJ/8nJyf/Nzc3/Wlpa+D8/PxYAAAAWenp6+NTU1P/Jycn/ycnJ/9DQ0P+ioqL/Pz8/rzIyMq/Ly8v/zc3N/8vLy//Ly8v/z8/P/1tbW/hCQkITAAAAE3x8fPjX19f/y8vL/8vLy//S0tL/pKSk/z8/P68zMzOvzs7O/9DQ0P/Ozs7/zs7O/9TU1P9TU1P4GBgYHwAAAB97e3v42tra/87Ozv/Ozs7/1dXV/6ampv9AQECvNDQ0r9HR0f/T09P/0dHR/9HR0f/X19f/WFhY/h4eHukhISHpjIyM/tra2v/R0dH/0dHR/9jY2P+pqan/QEBArzQ0NK/T09P/1dXV/9PT0//T09P/1NTU/9HR0f/Nzc3/zc3N/9PT0//U1NT/09PT/9PT0//a2tr/q6ur/0BAQK82Njaw1tbW/9jY2P/W1tb/1tbW/93d3f99fX39Pz8/ukVFRbqcnJz93t7e/9bW1v/W1tb/3d3d/62trf9AQECwKioqst7e3v/g4OD/3d3d/93d3f/j4+P/h4eH/kVFRd9ISEjfpqam/uXl5f/d3d3/3d3d/+Xl5f+3t7f/SEhItFJSUlR+fn7zu7u7/7y8vP+7u7v/u7u7/729vf+9vb3/vb29/729vf+7u7v/u7u7/729vf+9vb3/Wlpa1UlJSTuNjY0TR0dHgUZGRq9HR0evRkZGr0VFRa9JSUmvTU1Nr01NTa9ISEivRUVFr0ZGRq9HR0evTk5Orw8PD1UAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAA==</Image> - <OutputEncoding>UTF-8</OutputEncoding> - <InputEncoding>UTF-8</InputEncoding> + <ShortName>Ampache</ShortName> + <Description><?php echo scrub_out(Config::get('site_title')); ?></Description> + <Url type="text/html" + method="get" + template="<?php echo Config::get('web_path'); ?>/search.php"> + <Param name="s_all" value="{searchTerms}"/> + <Param name="action" value="search"/> + </Url> + <Image height="16" width="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAABkZGRVLi4urywsLK8rKyuvKysrrywsLK9ERESQAAAABwAAAAcxMTGQLS0trysrK68rKyuvLS0tryMjI69KSkpVNDQ0uLS0tP+5ubn/uLi4/7i4uP+7u7v/VVVV/0hISBcQEBAXb29v/8HBwf+4uLj/uLi4/76+vv+UlJT/Q0NDuC4uLq+/v7//vr6+/729vf+9vb3/wMDA/1ZWVvg+Pj4WAAAAFnR0dPjIyMj/vb29/729vf/Dw8P/mZmZ/0BAQK8wMDCvv7+//7+/v/++vr7/vr6+/8HBwf9WVlb4Pz8/FgAAABZ1dXX4ycnJ/76+vv++vr7/xMTE/5mZmf9AQECvMDAwr8DAwP/BwcH/wMDA/8DAwP/ExMT/V1dX+D8/PxYAAAAWdXV1+MvLy//AwMD/wMDA/8bGxv+bm5v/Pz8/rzExMa/Dw8P/xMTE/8PDw//Dw8P/x8fH/1hYWPg/Pz8WAAAAFnd3d/jOzs7/w8PD/8PDw//Jycn/nZ2d/z8/P68xMTGvxsbG/8fHx//Gxsb/xsbG/8rKyv9YWFj4Pz8/FgAAABZ4eHj40dHR/8bGxv/Gxsb/zc3N/5+fn/8/Pz+vMjIyr8nJyf/Kysr/ycnJ/8nJyf/Nzc3/Wlpa+D8/PxYAAAAWenp6+NTU1P/Jycn/ycnJ/9DQ0P+ioqL/Pz8/rzIyMq/Ly8v/zc3N/8vLy//Ly8v/z8/P/1tbW/hCQkITAAAAE3x8fPjX19f/y8vL/8vLy//S0tL/pKSk/z8/P68zMzOvzs7O/9DQ0P/Ozs7/zs7O/9TU1P9TU1P4GBgYHwAAAB97e3v42tra/87Ozv/Ozs7/1dXV/6ampv9AQECvNDQ0r9HR0f/T09P/0dHR/9HR0f/X19f/WFhY/h4eHukhISHpjIyM/tra2v/R0dH/0dHR/9jY2P+pqan/QEBArzQ0NK/T09P/1dXV/9PT0//T09P/1NTU/9HR0f/Nzc3/zc3N/9PT0//U1NT/09PT/9PT0//a2tr/q6ur/0BAQK82Njaw1tbW/9jY2P/W1tb/1tbW/93d3f99fX39Pz8/ukVFRbqcnJz93t7e/9bW1v/W1tb/3d3d/62trf9AQECwKioqst7e3v/g4OD/3d3d/93d3f/j4+P/h4eH/kVFRd9ISEjfpqam/uXl5f/d3d3/3d3d/+Xl5f+3t7f/SEhItFJSUlR+fn7zu7u7/7y8vP+7u7v/u7u7/729vf+9vb3/vb29/729vf+7u7v/u7u7/729vf+9vb3/Wlpa1UlJSTuNjY0TR0dHgUZGRq9HR0evRkZGr0VFRa9JSUmvTU1Nr01NTa9ISEivRUVFr0ZGRq9HR0evTk5Orw8PD1UAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAA==</Image> + <OutputEncoding>UTF-8</OutputEncoding> + <InputEncoding>UTF-8</InputEncoding> </OpenSearchDescription> diff --git a/templates/show_search_options.inc.php b/templates/show_search_options.inc.php index aa6974db..fccc4ffa 100644 --- a/templates/show_search_options.inc.php +++ b/templates/show_search_options.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,15 +24,15 @@ <div id="information_actions"> <ul> <li> - <?php echo Ajax::button('?action=basket&type=browse_set&browse_id=' . $browse->id,'add', T_('Add Search Results'),'add_search_results'); ?> - <?php echo T_('Add Search Results'); ?> + <?php echo Ajax::button('?action=basket&type=browse_set&browse_id=' . $browse->id,'add', T_('Add Search Results'),'add_search_results'); ?> + <?php echo T_('Add Search Results'); ?> </li> - <?php if (Access::check_function('batch_download')) { ?> + <?php if (Access::check_function('batch_download')) { ?> <li> - <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=browse&type=<?php echo scrub_out($_REQUEST['type']); ?>&browse_id=<?php echo $browse->id; ?>"><?php echo UI::get_icon('batch_download', T_('Batch Download')); ?></a> - <?php echo T_('Batch Download'); ?> + <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=browse&type=<?php echo scrub_out($_REQUEST['type']); ?>&browse_id=<?php echo $browse->id; ?>"><?php echo UI::get_icon('batch_download', T_('Batch Download')); ?></a> + <?php echo T_('Batch Download'); ?> </li> - <?php } ?> + <?php } ?> </ul> </div> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_shout_row.inc.php b/templates/show_shout_row.inc.php index 355983e8..199ac885 100644 --- a/templates/show_shout_row.inc.php +++ b/templates/show_shout_row.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -21,12 +21,12 @@ */ ?> <tr id="flagged_<?php echo $shout->id; ?>" class="<?php echo UI::flip_class(); ?>"> - <td class="cel_object"><?php echo $object->f_link; ?></td> - <td class="cel_username"><?php echo $client->f_link; ?></td> - <td class="cel_sticky"><?php echo $shout->sticky; ?></td> - <td class="cel_comment"><?php echo scrub_out($shout->text); ?></td> - <td class="cel_date"><?php echo $shout->date; ?></td> - <td class="cel_action"> + <td class="cel_object"><?php echo $object->f_link; ?></td> + <td class="cel_username"><?php echo $client->f_link; ?></td> + <td class="cel_sticky"><?php echo $shout->sticky; ?></td> + <td class="cel_comment"><?php echo scrub_out($shout->text); ?></td> + <td class="cel_date"><?php echo $shout->date; ?></td> + <td class="cel_action"> <a href="<?php echo $web_path; ?>/admin/shout.php?action=show_edit&shout_id=<?php echo $shout->id; ?>"> <?php echo UI::get_icon('edit', T_('Edit')); ?> @@ -35,5 +35,5 @@ <a href="<?php echo $web_path; ?>/admin/shout.php?action=delete&shout_id=<?php echo $shout->id; ?>"> <?php echo UI::get_icon('delete', T_('Delete')); ?> </a> - </td> + </td> </tr> diff --git a/templates/show_shoutbox.inc.php b/templates/show_shoutbox.inc.php index 55d25e85..d8978be2 100644 --- a/templates/show_shoutbox.inc.php +++ b/templates/show_shoutbox.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,18 +24,18 @@ <div id="shoutbox"> <?php foreach ($shouts as $shout_id) { - $shout = new Shoutbox($shout_id); - $object = Shoutbox::get_object($shout->object_type,$shout->object_id); - $object->format(); - $client = new User($shout->user); - $client->format(); + $shout = new Shoutbox($shout_id); + $object = Shoutbox::get_object($shout->object_type,$shout->object_id); + $object->format(); + $client = new User($shout->user); + $client->format(); ?> <div class="shout <?php echo UI::flip_class(); ?>"> - <?php echo $shout->get_image(); ?> - <?php echo Ajax::button('?action=basket&type=' . $shout->object_type .'&id=' . $shout->object_id,'add', T_('Add'),'add_' . $shout->object_type . '_' . $shout->object_id); ?> - <?php echo $object->f_link; ?> - <span class="information"><?php echo $client->f_link; ?> <?php echo date("d/m H:i",$shout->date); ?></span> - <span class="shouttext"><?php echo scrub_out($shout->text); ?></span> + <?php echo $shout->get_image(); ?> + <?php echo Ajax::button('?action=basket&type=' . $shout->object_type .'&id=' . $shout->object_id,'add', T_('Add'),'add_' . $shout->object_type . '_' . $shout->object_id); ?> + <?php echo $object->f_link; ?> + <span class="information"><?php echo $client->f_link; ?> <?php echo date("d/m H:i",$shout->date); ?></span> + <span class="shouttext"><?php echo scrub_out($shout->text); ?></span> </div> <?php } ?> </div> diff --git a/templates/show_smartplaylist.inc.php b/templates/show_smartplaylist.inc.php index b2c4062c..23684182 100644 --- a/templates/show_smartplaylist.inc.php +++ b/templates/show_smartplaylist.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -31,27 +31,27 @@ UI::show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . <div id="information_actions"> <ul> <?php if (Access::check_function('batch_download')) { ?> - <li> - <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=search&id=<?php echo $playlist->id; ?>"><?php echo UI::get_icon('batch_download', T_('Batch Download')); ?></a> - <?php echo T_('Batch Download'); ?> - </li> + <li> + <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=search&id=<?php echo $playlist->id; ?>"><?php echo UI::get_icon('batch_download', T_('Batch Download')); ?></a> + <?php echo T_('Batch Download'); ?> + </li> <?php } ?> - <li> - <?php echo Ajax::button('?action=basket&type=smartplaylist&id=' . $playlist->id,'add', T_('Add All'),'play_playlist'); ?> - <?php echo T_('Add All'); ?> - </li> - <?php if ($playlist->has_access()) { ?> - <li> - <?php echo Ajax::button('?action=show_edit_object&type=smartplaylist_title&id=' . $playlist->id,'edit', T_('Edit'),'edit_playlist_' . $playlist->id); ?> - <?php echo T_('Edit'); ?> - </li> - <li> - <a href="<?php echo Config::get('web_path'); ?>/smartplaylist.php?action=delete_playlist&playlist_id=<?php echo $playlist->id; ?>"> - <?php echo UI::get_icon('delete'); ?> - </a> - <?php echo T_('Delete'); ?> - </li> - <?php } ?> + <li> + <?php echo Ajax::button('?action=basket&type=smartplaylist&id=' . $playlist->id,'add', T_('Add All'),'play_playlist'); ?> + <?php echo T_('Add All'); ?> + </li> + <?php if ($playlist->has_access()) { ?> + <li> + <?php echo Ajax::button('?action=show_edit_object&type=smartplaylist_title&id=' . $playlist->id,'edit', T_('Edit'),'edit_playlist_' . $playlist->id); ?> + <?php echo T_('Edit'); ?> + </li> + <li> + <a href="<?php echo Config::get('web_path'); ?>/smartplaylist.php?action=delete_playlist&playlist_id=<?php echo $playlist->id; ?>"> + <?php echo UI::get_icon('delete'); ?> + </a> + <?php echo T_('Delete'); ?> + </li> + <?php } ?> </ul> </div> @@ -60,7 +60,7 @@ UI::show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . <?php require Config::get('prefix') . '/templates/show_rules.inc.php'; ?> <div class="formValidation"> - <input class="button" type="submit" value="<?php echo T_('Save Changes'); ?>" /> + <input class="button" type="submit" value="<?php echo T_('Save Changes'); ?>" /> </div> </form> diff --git a/templates/show_smartplaylist_row.inc.php b/templates/show_smartplaylist_row.inc.php index 77da914c..e6ef39e2 100644 --- a/templates/show_smartplaylist_row.inc.php +++ b/templates/show_smartplaylist_row.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -21,7 +21,7 @@ */ ?> <td class="cel_add"> - <?php echo Ajax::button('?action=basket&type=smartplaylist&id=' . $playlist->id,'add', T_('Add'),'add_playlist_' . $playlist->id); ?> + <?php echo Ajax::button('?action=basket&type=smartplaylist&id=' . $playlist->id,'add', T_('Add'),'add_playlist_' . $playlist->id); ?> </td> <td class="cel_playlist"><?php echo $playlist->f_link; ?></td> <td class="cel_type"><?php echo $playlist->f_type; ?></td> @@ -32,8 +32,8 @@ <?php echo UI::get_icon('batch_download', T_('Batch Download')); ?> </a> <?php } ?> - <?php if ($playlist->has_access()) { ?> - <?php echo Ajax::button('?action=show_edit_object&type=smartplaylist_row&id=' . $playlist->id,'edit', T_('Edit'),'edit_playlist_' . $playlist->id); ?> - <?php echo Ajax::button('?page=browse&action=delete_object&type=smartplaylist&id=' . $playlist->id,'delete', T_('Delete'),'delete_playlist_' . $playlist->id); ?> - <?php } ?> + <?php if ($playlist->has_access()) { ?> + <?php echo Ajax::button('?action=show_edit_object&type=smartplaylist_row&id=' . $playlist->id,'edit', T_('Edit'),'edit_playlist_' . $playlist->id); ?> + <?php echo Ajax::button('?page=browse&action=delete_object&type=smartplaylist&id=' . $playlist->id,'delete', T_('Delete'),'delete_playlist_' . $playlist->id); ?> + <?php } ?> </td> diff --git a/templates/show_smartplaylist_title.inc.php b/templates/show_smartplaylist_title.inc.php index ed20653d..806f27fe 100644 --- a/templates/show_smartplaylist_title.inc.php +++ b/templates/show_smartplaylist_title.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) diff --git a/templates/show_smartplaylists.inc.php b/templates/show_smartplaylists.inc.php index 80493aac..456c6302 100644 --- a/templates/show_smartplaylists.inc.php +++ b/templates/show_smartplaylists.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -32,31 +32,31 @@ </colgroup> <tr class="th-top"> <th class="cel_add"><?php echo T_('Add'); ?></th> - <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&type=smartplaylist&sort=name', T_('Playlist Name'),'playlist_sort_name'); ?></th> - <th class="cel_type"> </th> - <th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&type=smartplaylist&sort=user', T_('Owner'),'playlist_sort_owner'); ?></th> - <th class="cel_action"><?php echo T_('Actions'); ?></th> + <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&type=smartplaylist&sort=name', T_('Playlist Name'),'playlist_sort_name'); ?></th> + <th class="cel_type"> </th> + <th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&type=smartplaylist&sort=user', T_('Owner'),'playlist_sort_owner'); ?></th> + <th class="cel_action"><?php echo T_('Actions'); ?></th> </tr> <?php foreach ($object_ids as $playlist_id) { - $playlist = new Search('song', $playlist_id); - $playlist->format(); + $playlist = new Search('song', $playlist_id); + $playlist->format(); ?> <tr class="<?php echo UI::flip_class(); ?>" id="playlist_row_<?php echo $playlist->id; ?>"> - <?php require Config::get('prefix') . '/templates/show_smartplaylist_row.inc.php'; ?> + <?php require Config::get('prefix') . '/templates/show_smartplaylist_row.inc.php'; ?> </tr> <?php } // end foreach ($playlists as $playlist) ?> <?php if (!count($object_ids)) { ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td colspan="6"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> + <td colspan="6"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> <th class="cel_add"><?php echo T_('Add'); ?></th> - <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=name', T_('Playlist Name'),'playlist_sort_name_bottom'); ?></th> - <th class="cel_type"> </th> - <th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=user', T_('Owner'),'playlist_sort_owner_bottom'); ?></th> - <th class="cel_action"><?php echo T_('Actions'); ?></th> + <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=name', T_('Playlist Name'),'playlist_sort_name_bottom'); ?></th> + <th class="cel_type"> </th> + <th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=user', T_('Owner'),'playlist_sort_owner_bottom'); ?></th> + <th class="cel_action"><?php echo T_('Actions'); ?></th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php' ?> diff --git a/templates/show_song.inc.php b/templates/show_song.inc.php index e3b2a279..c6289af6 100644 --- a/templates/show_song.inc.php +++ b/templates/show_song.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -30,18 +30,18 @@ $button_flip_state_id = 'button_flip_state_' . $song->id; <dd><div id="rating_<?php echo $song->id; ?>_song"><?php Rating::show($song->id,'song'); ?></div></dd> <?php } ?> <dt class="<?php echo $rowparity; ?>"><?php echo T_('Action'); ?></dt> - <dd class="<?php echo UI::flip_class(); ?>"> - <?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add', T_('Add'),'add_song_' . $song->id); ?> - <?php if (Access::check_function('download')) { ?> - <a href="<?php echo Song::play_url($song->id); ?>"><?php echo UI::get_icon('link', T_('Link')); ?></a> - <a href="<?php echo Config::get('web_path'); ?>/stream.php?action=download&song_id=<?php echo $song->id; ?>"><?php echo UI::get_icon('download', T_('Download')); ?></a> - <?php } ?> - <?php if (Access::check('interface','75')) { ?> - <span id="<?php echo($button_flip_state_id); ?>"> - <?php echo Ajax::button('?page=song&action=flip_state&song_id=' . $song->id,$icon, T_(ucfirst($icon)),'flip_song_' . $song->id); ?> - </span> - <?php } ?> - </dd> + <dd class="<?php echo UI::flip_class(); ?>"> + <?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add', T_('Add'),'add_song_' . $song->id); ?> + <?php if (Access::check_function('download')) { ?> + <a href="<?php echo Song::play_url($song->id); ?>"><?php echo UI::get_icon('link', T_('Link')); ?></a> + <a href="<?php echo Config::get('web_path'); ?>/stream.php?action=download&song_id=<?php echo $song->id; ?>"><?php echo UI::get_icon('download', T_('Download')); ?></a> + <?php } ?> + <?php if (Access::check('interface','75')) { ?> + <span id="<?php echo($button_flip_state_id); ?>"> + <?php echo Ajax::button('?page=song&action=flip_state&song_id=' . $song->id,$icon, T_(ucfirst($icon)),'flip_song_' . $song->id); ?> + </span> + <?php } ?> + </dd> <?php $songprops[gettext_noop('Title')] = scrub_out($song->title); $songprops[gettext_noop('Artist')] = $song->f_artist_link; diff --git a/templates/show_song_row.inc.php b/templates/show_song_row.inc.php index 9eea7f6c..96e2b8a4 100644 --- a/templates/show_song_row.inc.php +++ b/templates/show_song_row.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -21,7 +21,7 @@ */ ?> <td class="cel_add"> - <?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add', T_('Add'),'add_' . $song->id); ?> + <?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add', T_('Add'),'add_' . $song->id); ?> </td> <td class="cel_song"><?php echo $song->f_link; ?></a></td> <td class="cel_artist"><?php echo $song->f_artist_link; ?></td> @@ -33,23 +33,23 @@ <td class="cel_rating" id="rating_<?php echo $song->id; ?>_song"><?php Rating::show($song->id,'song'); ?></td> <?php } ?> <td class="cel_action"> - <a href="<?php echo $song->link; ?>"><?php echo UI::get_icon('preferences', T_('Song Information')); ?></a> - <?php if (Config::get('shoutbox')) { ?> + <a href="<?php echo $song->link; ?>"><?php echo UI::get_icon('preferences', T_('Song Information')); ?></a> + <?php if (Config::get('shoutbox')) { ?> <a href="<?php echo Config::get('web_path'); ?>/shout.php?action=show_add_shout&type=song&id=<?php echo $song->id; ?>"> <?php echo UI::get_icon('comment', T_('Post Shout')); ?> </a> - <?php } ?> - <?php if (Access::check_function('download')) { ?> - <a href="<?php echo Config::get('web_path'); ?>/stream.php?action=download&song_id=<?php echo $song->id; ?>"> - <?php echo UI::get_icon('download', T_('Download')); ?> - </a> - <?php } ?> - <?php if (Access::check('interface','75')) { ?> - <?php echo Ajax::button('?action=show_edit_object&type=song_row&id=' . $song->id,'edit', T_('Edit'),'edit_song_' . $song->id); ?> - <?php $icon = $song->enabled ? 'disable' : 'enable'; ?> - <?php $button_flip_state_id = 'button_flip_state_' . $song_id; ?> - <span id="<?php echo($button_flip_state_id); ?>"> - <?php echo Ajax::button('?page=song&action=flip_state&song_id=' . $song->id,$icon, T_(ucfirst($icon)),'flip_song_' . $song->id); ?> - </span> - <?php } ?> + <?php } ?> + <?php if (Access::check_function('download')) { ?> + <a href="<?php echo Config::get('web_path'); ?>/stream.php?action=download&song_id=<?php echo $song->id; ?>"> + <?php echo UI::get_icon('download', T_('Download')); ?> + </a> + <?php } ?> + <?php if (Access::check('interface','75')) { ?> + <?php echo Ajax::button('?action=show_edit_object&type=song_row&id=' . $song->id,'edit', T_('Edit'),'edit_song_' . $song->id); ?> + <?php $icon = $song->enabled ? 'disable' : 'enable'; ?> + <?php $button_flip_state_id = 'button_flip_state_' . $song_id; ?> + <span id="<?php echo($button_flip_state_id); ?>"> + <?php echo Ajax::button('?page=song&action=flip_state&song_id=' . $song->id,$icon, T_(ucfirst($icon)),'flip_song_' . $song->id); ?> + </span> + <?php } ?> </td> diff --git a/templates/show_songs.inc.php b/templates/show_songs.inc.php index 09b009e4..527cc076 100644 --- a/templates/show_songs.inc.php +++ b/templates/show_songs.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -35,46 +35,46 @@ $web_path = Config::get('web_path'); <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_add"><?php echo T_('Add'); ?></th> - <th class="cel_song"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=title', T_('Song Title'), 'sort_song_title'); ?></th> - <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=artist', T_('Artist'), 'sort_song_artist'); ?></th> - <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=album', T_('Album'), 'sort_song_album'); ?></th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_song"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=title', T_('Song Title'), 'sort_song_title'); ?></th> + <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=artist', T_('Artist'), 'sort_song_artist'); ?></th> + <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=album', T_('Album'), 'sort_song_album'); ?></th> <th class="cel_tags"><?php echo T_('Tags'); ?></th> - <th class="cel_track"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=track', T_('Track'), 'sort_song_track'); ?></th> - <th class="cel_time"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=time', T_('Time'), 'sort_song_time'); ?></th> + <th class="cel_track"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=track', T_('Track'), 'sort_song_track'); ?></th> + <th class="cel_time"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=time', T_('Time'), 'sort_song_time'); ?></th> <?php if (Config::get('ratings')) { - Rating::build_cache('song', $object_ids); + Rating::build_cache('song', $object_ids); ?> - <th class="cel_rating"><?php echo T_('Rating'); ?></th> + <th class="cel_rating"><?php echo T_('Rating'); ?></th> <?php } ?> - <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> <?php - foreach ($object_ids as $song_id) { - $song = new Song($song_id); - $song->format(); + foreach ($object_ids as $song_id) { + $song = new Song($song_id); + $song->format(); ?> <tr class="<?php echo UI::flip_class(); ?>" id="song_<?php echo $song->id; ?>"> - <?php require Config::get('prefix') . '/templates/show_song_row.inc.php'; ?> + <?php require Config::get('prefix') . '/templates/show_song_row.inc.php'; ?> </tr> <?php } ?> <?php if (!count($object_ids)) { ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td colspan="9"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> + <td colspan="9"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_add"><?php echo T_('Add'); ?></th> - <th class="cel_song"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=title', T_('Song Title'),'sort_song_title_bottom'); ?></th> - <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=artist', T_('Artist'),'sort_song_artist_bottom'); ?></th> - <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=album', T_('Album'),'sort_song_album_bottom'); ?></th> - <th class="cel_tags"><?php echo T_('Tags'); ?></th> - <th class="cel_track"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=track', T_('Track'),'sort_song_track_bottom'); ?></th> - <th class="cel_time"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=time', T_('Time'),'sort_song_time_bottom'); ?></th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_song"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=title', T_('Song Title'),'sort_song_title_bottom'); ?></th> + <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=artist', T_('Artist'),'sort_song_artist_bottom'); ?></th> + <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=album', T_('Album'),'sort_song_album_bottom'); ?></th> + <th class="cel_tags"><?php echo T_('Tags'); ?></th> + <th class="cel_track"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=track', T_('Track'),'sort_song_track_bottom'); ?></th> + <th class="cel_time"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=time', T_('Time'),'sort_song_time_bottom'); ?></th> <?php if (Config::get('ratings')) { ?> - <th class="cel_rating"><?php echo T_('Rating'); ?></th> + <th class="cel_rating"><?php echo T_('Rating'); ?></th> <?php } ?> - <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/show_stats.inc.php b/templates/show_stats.inc.php index 61f62409..3e75b571 100644 --- a/templates/show_stats.inc.php +++ b/templates/show_stats.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -32,7 +32,7 @@ $catalogs = Catalog::get_catalogs(); <th><?php echo T_('Albums'); ?></th> <th><?php echo T_('Artists'); ?></th> <th><?php echo T_('Songs'); ?></th> - <th><?php echo T_('Videos'); ?></th> + <th><?php echo T_('Videos'); ?></th> <th><?php echo T_('Tags'); ?></th> <th><?php echo T_('Catalog Size'); ?></th> <th><?php echo T_('Catalog Time'); ?></th> @@ -43,7 +43,7 @@ $catalogs = Catalog::get_catalogs(); <td><?php echo $stats['albums']; ?></td> <td><?php echo $stats['artists']; ?></td> <td><?php echo $stats['songs']; ?></td> - <td><?php echo $stats['videos']; ?></td> + <td><?php echo $stats['videos']; ?></td> <td><?php echo $stats['tags']; ?></td> <td><?php echo $stats['formatted_size']; ?></td> <td><?php echo $stats['time_text']; ?></td> @@ -67,24 +67,24 @@ $catalogs = Catalog::get_catalogs(); <th class="cel_lastverify"><?php echo T_('Last Verify'); ?></th> <th class="cel_lastadd"><?php echo T_('Last Add'); ?></th> <th class="cel_lastclean"><?php echo T_('Last Clean'); ?></th> - <th class="cel_songs"><?php echo T_('Songs'); ?></th> - <th class="cel_video"><?php echo T_('Videos'); ?></th> - <th class="cel_total"><?php echo T_('Catalog Size'); ?></th> + <th class="cel_songs"><?php echo T_('Songs'); ?></th> + <th class="cel_video"><?php echo T_('Videos'); ?></th> + <th class="cel_total"><?php echo T_('Catalog Size'); ?></th> </tr> <?php foreach ($catalogs as $catalog_id) { - $catalog = new Catalog($catalog_id); - $catalog->format(); - $stats = Catalog::get_stats($catalog_id); + $catalog = new Catalog($catalog_id); + $catalog->format(); + $stats = Catalog::get_stats($catalog_id); ?> <tr> - <td class="cel_catalog"><?php echo $catalog->name; ?></td> - <td class="cel_path"><?php echo scrub_out($catalog->f_path); ?></td> - <td class="cel_lastverify"><?php echo scrub_out($catalog->f_update); ?></td> - <td class="cel_lastadd"><?php echo scrub_out($catalog->f_add); ?></td> - <td class="cel_lastclean"><?php echo scrub_out($catalog->f_clean); ?></td> - <td class="cel_songs"><?php echo scrub_out($stats['songs']); ?></td> - <td class="cel_video"><?php echo scrub_out($stats['videos']); ?></td> - <td class="cel_total"><?php echo scrub_out($stats['formatted_size']); ?></td> + <td class="cel_catalog"><?php echo $catalog->name; ?></td> + <td class="cel_path"><?php echo scrub_out($catalog->f_path); ?></td> + <td class="cel_lastverify"><?php echo scrub_out($catalog->f_update); ?></td> + <td class="cel_lastadd"><?php echo scrub_out($catalog->f_add); ?></td> + <td class="cel_lastclean"><?php echo scrub_out($catalog->f_clean); ?></td> + <td class="cel_songs"><?php echo scrub_out($stats['songs']); ?></td> + <td class="cel_video"><?php echo scrub_out($stats['videos']); ?></td> + <td class="cel_total"><?php echo scrub_out($stats['formatted_size']); ?></td> </tr> <?php } ?> diff --git a/templates/show_stats_newest.inc.php b/templates/show_stats_newest.inc.php index 564369ef..62263fa9 100644 --- a/templates/show_stats_newest.inc.php +++ b/templates/show_stats_newest.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) diff --git a/templates/show_stats_popular.inc.php b/templates/show_stats_popular.inc.php index 79a9be85..9c20b6a1 100644 --- a/templates/show_stats_popular.inc.php +++ b/templates/show_stats_popular.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) diff --git a/templates/show_tagcloud.inc.php b/templates/show_tagcloud.inc.php index fd13d23e..d0f1df4e 100644 --- a/templates/show_tagcloud.inc.php +++ b/templates/show_tagcloud.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,8 +24,8 @@ $web_path = Config::get('web_path'); ?> <?php Ajax::start_container('tag_filter'); ?> <?php foreach ($object_ids as $data) { - $tag = new Tag($data['id']); - $tag->format(); + $tag = new Tag($data['id']); + $tag->format(); ?> <span id="click_<?php echo intval($tag->id); ?>" class="<?php echo $tag->f_class; ?>"><?php echo $tag->name; ?></span> <?php echo Ajax::observe('click_' . intval($tag->id),'click',Ajax::action('?page=tag&action=add_filter&browse_id=' . $browse2->id . '&tag_id=' . intval($tag->id),'')); ?> diff --git a/templates/show_test.inc.php b/templates/show_test.inc.php index c9453a2c..17fedb6f 100644 --- a/templates/show_test.inc.php +++ b/templates/show_test.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -35,212 +35,212 @@ <div> <table align="center" cellpadding="3" cellspacing="0"> <tr> - <td><font size="+1"><?php echo T_('CHECK'); ?></font></td> - <td> - <font size="+1"><?php echo T_('STATUS'); ?></font> - </td> - <td><font size="+1"><?php echo T_('DESCRIPTION'); ?></font></td> + <td><font size="+1"><?php echo T_('CHECK'); ?></font></td> + <td> + <font size="+1"><?php echo T_('STATUS'); ?></font> + </td> + <td><font size="+1"><?php echo T_('DESCRIPTION'); ?></font></td> </tr> <tr> - <td valign="top"><?php echo T_('PHP version'); ?></td> - <td valign="top">[ - <?php - if (!check_php_ver()) { - echo debug_result('',false); - if (function_exists('hash_algos')) { $algos = hash_algos(); } - $string = "<strong>" . phpversion() . " " . T_('Hash Function Exists') . " " . print_bool(function_exists('hash_algos')) . " " . T_('SHA256 Support') . " " . print_bool(in_array('sha256',$algos)) . "</strong>"; - } - else { - echo debug_result('',true); - } - ?> - ] - </td> - <td> - <?php echo T_('This tests whether you are running at least the minimum version of PHP required by Ampache.'); ?> - <?php echo $string; ?> - </td> + <td valign="top"><?php echo T_('PHP version'); ?></td> + <td valign="top">[ + <?php + if (!check_php_ver()) { + echo debug_result('',false); + if (function_exists('hash_algos')) { $algos = hash_algos(); } + $string = "<strong>" . phpversion() . " " . T_('Hash Function Exists') . " " . print_bool(function_exists('hash_algos')) . " " . T_('SHA256 Support') . " " . print_bool(in_array('sha256',$algos)) . "</strong>"; + } + else { + echo debug_result('',true); + } + ?> + ] + </td> + <td> + <?php echo T_('This tests whether you are running at least the minimum version of PHP required by Ampache.'); ?> + <?php echo $string; ?> + </td> </tr> <tr> <td valign="top"><?php echo T_('PHP MySQL extension'); ?></td> <td valign="top">[ <?php if (!check_php_mysql()) { - echo debug_result('',false); + echo debug_result('',false); } else { - echo debug_result('',true); + echo debug_result('',true); } ?> ] </td> <td> - <?php echo T_('This tests whether you have the mysql extension enabled. This extension is required by Ampache.'); ?> + <?php echo T_('This tests whether you have the mysql extension enabled. This extension is required by Ampache.'); ?> </td> </tr> <tr> - <td valign="top"><?php echo T_('PHP session extension'); ?></td> - <td valign="top">[ - <?php - if (!check_php_session()) { - echo debug_result('',false); - } - else { - echo debug_result('',true); - } - ?> - ] - </td> - <td> - <?php echo T_('This tests whether you have the session extension enabled. This extension is required by Ampache.'); ?> - </td> + <td valign="top"><?php echo T_('PHP session extension'); ?></td> + <td valign="top">[ + <?php + if (!check_php_session()) { + echo debug_result('',false); + } + else { + echo debug_result('',true); + } + ?> + ] + </td> + <td> + <?php echo T_('This tests whether you have the session extension enabled. This extension is required by Ampache.'); ?> + </td> </tr> <tr> - <td valign="top"><?php echo T_('PHP iconv extension'); ?></td> - <td valign="top">[ - <?php - if (!UI::check_iconv()) { - echo debug_result('',false); - } - else { - echo debug_result('',true); - } - ?>] - </td> - <td> - <?php echo T_('This tests whether you have the iconv extension enabled. This extension is required by Ampache.'); ?> - </td> + <td valign="top"><?php echo T_('PHP iconv extension'); ?></td> + <td valign="top">[ + <?php + if (!UI::check_iconv()) { + echo debug_result('',false); + } + else { + echo debug_result('',true); + } + ?>] + </td> + <td> + <?php echo T_('This tests whether you have the iconv extension enabled. This extension is required by Ampache.'); ?> + </td> </tr> <tr> - <td valign="top"><?php echo T_('PHP safe mode disabled'); ?></td> - <td valign="top">[ - <?php - if (!check_safemode()) { - echo debug_result('',false); - } - else { - echo debug_result('',true); - } - ?>] - </td> - <td> - <?php echo T_('This test makes sure that PHP is not running in safe mode. Some features of Ampache will not work correctly in safe mode.'); ?> - </td> + <td valign="top"><?php echo T_('PHP safe mode disabled'); ?></td> + <td valign="top">[ + <?php + if (!check_safemode()) { + echo debug_result('',false); + } + else { + echo debug_result('',true); + } + ?>] + </td> + <td> + <?php echo T_('This test makes sure that PHP is not running in safe mode. Some features of Ampache will not work correctly in safe mode.'); ?> + </td> </tr> <tr> - <td valign="top"><?php echo T_('PHP memory limit override'); ?></td> - <td valign="top">[ - <?php echo debug_result('', check_override_memory()); ?>] - </td> - <td> - <?php echo T_('This tests whether Ampache can override the memory limit. This is not strictly necessary, but may result in a better experience.'); ?> - </td> + <td valign="top"><?php echo T_('PHP memory limit override'); ?></td> + <td valign="top">[ + <?php echo debug_result('', check_override_memory()); ?>] + </td> + <td> + <?php echo T_('This tests whether Ampache can override the memory limit. This is not strictly necessary, but may result in a better experience.'); ?> + </td> </tr> <tr> - <td valign="top"><?php echo T_('PHP execution time override'); ?></td> - <td valign="top">[ - <?php echo debug_result('', check_override_exec_time()); ?>] - </td> - <td> - <?php echo T_('This tests whether Ampache can override the limit on maximum execution time. This is not strictly necessary, but may result in a better experience.'); ?> - </td> -</tr> + <td valign="top"><?php echo T_('PHP execution time override'); ?></td> + <td valign="top">[ + <?php echo debug_result('', check_override_exec_time()); ?>] + </td> + <td> + <?php echo T_('This tests whether Ampache can override the limit on maximum execution time. This is not strictly necessary, but may result in a better experience.'); ?> + </td> +</tr> <tr> - <td valign="top"><?php echo T_('Configuration file readability'); ?></td> - <td valign="top">[ - <?php - if (!is_readable($configfile)) { - echo debug_result('',false); - } - else { - echo debug_result('',true); - } - ?> - ] - </td> - <td width="350px"> - <?php echo T_('This test attempts to read config/ampache.cfg.php. If this fails the file either is not in the correct location or is not currently readable.'); ?> - </td> + <td valign="top"><?php echo T_('Configuration file readability'); ?></td> + <td valign="top">[ + <?php + if (!is_readable($configfile)) { + echo debug_result('',false); + } + else { + echo debug_result('',true); + } + ?> + ] + </td> + <td width="350px"> + <?php echo T_('This test attempts to read config/ampache.cfg.php. If this fails the file either is not in the correct location or is not currently readable.'); ?> + </td> </tr> <tr> - <td valign="top"> - <?php echo T_('Configuration file validity'); ?> - </td> - <td valign="top">[ - <?php - $results = @parse_ini_file($configfile); - Config::set_by_array($results); - if (!check_config_values($results)) { - echo debug_result('',false); - } - else { - echo debug_result('',true); - } - ?> - ] - </td> - <td> - <?php echo T_("This test makes sure that you have set all of the required configuration variables and that we are able to completely parse your config file."); ?> - </td> + <td valign="top"> + <?php echo T_('Configuration file validity'); ?> + </td> + <td valign="top">[ + <?php + $results = @parse_ini_file($configfile); + Config::set_by_array($results); + if (!check_config_values($results)) { + echo debug_result('',false); + } + else { + echo debug_result('',true); + } + ?> + ] + </td> + <td> + <?php echo T_("This test makes sure that you have set all of the required configuration variables and that we are able to completely parse your config file."); ?> + </td> </tr> <tr> - <td valign="top"><?php echo T_("Database connection"); ?></td> - <td valign="top">[ - <?php - if (!Dba::check_database()) { - echo debug_result('',false); - } - else { - echo debug_result('',true); - } - ?> - ] - </td> - <td> - <?php echo T_('This attempts to connect to your database using the values read from your configuration file.'); ?> - </td> + <td valign="top"><?php echo T_("Database connection"); ?></td> + <td valign="top">[ + <?php + if (!Dba::check_database()) { + echo debug_result('',false); + } + else { + echo debug_result('',true); + } + ?> + ] + </td> + <td> + <?php echo T_('This attempts to connect to your database using the values read from your configuration file.'); ?> + </td> </tr> <tr> - <td valign="top"><?php echo T_('Database tables'); ?></td> - <td valign="top">[ - <?php - $db_inserted = Dba::check_database_inserted(); - if (!$db_inserted) { - echo debug_result('',false); - } - else { - echo debug_result('',true); - } - ?> - ] - </td> - <td> - <?php echo T_('This checks a few key tables to make sure that you have successfully inserted the Ampache database and that the user has access to the database'); ?> - </td> + <td valign="top"><?php echo T_('Database tables'); ?></td> + <td valign="top">[ + <?php + $db_inserted = Dba::check_database_inserted(); + if (!$db_inserted) { + echo debug_result('',false); + } + else { + echo debug_result('',true); + } + ?> + ] + </td> + <td> + <?php echo T_('This checks a few key tables to make sure that you have successfully inserted the Ampache database and that the user has access to the database'); ?> + </td> </tr> <tr> - <td valign="top"><?php echo T_('Web path'); ?></td> - <td valign="top">[ - <?php - if ($results['force_ssl']) { - $http_type = 'https://'; - } + <td valign="top"><?php echo T_('Web path'); ?></td> + <td valign="top">[ + <?php + if ($results['force_ssl']) { + $http_type = 'https://'; + } - $results['web_path'] = $http_type . $_SERVER['HTTP_HOST'] . Config::get('web_path'); - if (check_config_values($results)) { - echo " <img src=\"" . $results['web_path'] ."/images/icon_enable.png\" /> "; - } - else { - echo debug_result('',false); - } + $results['web_path'] = $http_type . $_SERVER['HTTP_HOST'] . Config::get('web_path'); + if (check_config_values($results)) { + echo " <img src=\"" . $results['web_path'] ."/images/icon_enable.png\" /> "; + } + else { + echo debug_result('',false); + } - ?> - ] - </td> - <td> - <?php echo T_('This test makes sure that your web_path variable is set correctly and that we are able to get to the index page. If you do not see a check mark here then your web_path is not set correctly.'); ?> - </td> + ?> + ] + </td> + <td> + <?php echo T_('This test makes sure that your web_path variable is set correctly and that we are able to get to the index page. If you do not see a check mark here then your web_path is not set correctly.'); ?> + </td> </tr> </table> </div> diff --git a/templates/show_test_config.inc.php b/templates/show_test_config.inc.php index e53ac723..3664ff9d 100644 --- a/templates/show_test_config.inc.php +++ b/templates/show_test_config.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -28,10 +28,10 @@ <link rel="stylesheet" href="templates/install.css" type="text/css" media="screen" /> <style type="text/css"> body { - text-align:left; + text-align:left; } #content { - padding-left: 10px; + padding-left: 10px; } </style> </head> diff --git a/templates/show_update_items.inc.php b/templates/show_update_items.inc.php index e482c1d2..75ca924f 100644 --- a/templates/show_update_items.inc.php +++ b/templates/show_update_items.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) diff --git a/templates/show_user.inc.php b/templates/show_user.inc.php index e62b1810..adf5d670 100644 --- a/templates/show_user.inc.php +++ b/templates/show_user.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -27,38 +27,38 @@ $client->format(); <?php UI::show_box_top($client->fullname); ?> <table cellspacing="0"> <tr> - <td valign="top"> - <strong><?php echo T_('Full Name'); ?>:</strong> <?php echo $client->fullname; ?><br /> - <strong><?php echo T_('Create Date'); ?>:</strong> <?php echo $create_date; ?><br /> - <strong><?php echo T_('Last Seen'); ?>:</strong> <?php echo $last_seen; ?><br /> - <strong><?php echo T_('Activity'); ?>:</strong> <?php echo $client->f_useage; ?><br /> - <?php if ($client->is_logged_in() AND $client->is_online()) { ?> - <i style="color:green;"><?php echo T_('User is Online Now'); ?></i> - <?php } else { ?> - <i style="color:red;"><?php echo T_('User is Offline Now'); ?></i> - <?php } ?> + <td valign="top"> + <strong><?php echo T_('Full Name'); ?>:</strong> <?php echo $client->fullname; ?><br /> + <strong><?php echo T_('Create Date'); ?>:</strong> <?php echo $create_date; ?><br /> + <strong><?php echo T_('Last Seen'); ?>:</strong> <?php echo $last_seen; ?><br /> + <strong><?php echo T_('Activity'); ?>:</strong> <?php echo $client->f_useage; ?><br /> + <?php if ($client->is_logged_in() AND $client->is_online()) { ?> + <i style="color:green;"><?php echo T_('User is Online Now'); ?></i> + <?php } else { ?> + <i style="color:red;"><?php echo T_('User is Offline Now'); ?></i> + <?php } ?> - </td> - <td valign="top"> - <h2><?php echo T_('Active Playlist'); ?></h2> - <div style="padding-left:10px;"> - <?php - $tmp_playlist = new Tmp_Playlist(Tmp_Playlist::get_from_userid($client->id)); - $object_ids = $tmp_playlist->get_items(); - foreach ($object_ids as $object_data) { - $type = array_shift($object_data); - $object = new $type(array_shift($object_data)); - $object->format(); - ?> - <?php echo $object->f_link; ?><br /> - <?php } ?> - </div> - </td> + </td> + <td valign="top"> + <h2><?php echo T_('Active Playlist'); ?></h2> + <div style="padding-left:10px;"> + <?php + $tmp_playlist = new Tmp_Playlist(Tmp_Playlist::get_from_userid($client->id)); + $object_ids = $tmp_playlist->get_items(); + foreach ($object_ids as $object_data) { + $type = array_shift($object_data); + $object = new $type(array_shift($object_data)); + $object->format(); + ?> + <?php echo $object->f_link; ?><br /> + <?php } ?> + </div> + </td> </tr> </table> <?php UI::show_box_bottom(); ?> <?php - $data = Song::get_recently_played($client->id); - require Config::get('prefix') . '/templates/show_recently_played.inc.php'; + $data = Song::get_recently_played($client->id); + require Config::get('prefix') . '/templates/show_recently_played.inc.php'; ?> diff --git a/templates/show_user_activate.inc.php b/templates/show_user_activate.inc.php index 5c23304c..c1b80733 100644 --- a/templates/show_user_activate.inc.php +++ b/templates/show_user_activate.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -44,13 +44,13 @@ $web_path = Config::get('web_path'); <div id="maincontainer"> <?php if ($validation == User::get_validation($username) AND strlen($validation)) { - User::activate_user($username); + User::activate_user($username); ?> <h3><?php echo T_('User Activated'); ?></h3> <p> - <?php - /* HINT: Start A tag, End A tag */ - printf(T_('This User ID is activated and can be used %sLogin%s'), '<a href="' . Config::get('web_path'). '/login.php">', '</a>'); ?> + <?php + /* HINT: Start A tag, End A tag */ + printf(T_('This User ID is activated and can be used %sLogin%s'), '<a href="' . Config::get('web_path'). '/login.php">', '</a>'); ?> </p> <?php } else { ?> <h3><?php echo T_('Validation Failed'); ?></h3> diff --git a/templates/show_user_preferences.inc.php b/templates/show_user_preferences.inc.php index 9bb5448f..719d7a42 100644 --- a/templates/show_user_preferences.inc.php +++ b/templates/show_user_preferences.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -30,12 +30,12 @@ <form method="post" name="preferences" action="<?php echo Config::get('web_path'); ?>/preferences.php?action=admin_update_preferences" enctype="multipart/form-data"> <table class="tabledata" cellspacing="0"> <colgroup> - <col id="col_preference" /> - <col id="col_value" /> + <col id="col_preference" /> + <col id="col_value" /> </colgroup> <tr class="th-top"> - <th class="col_preference"><?php echo T_('Preference'); ?></th> - <th class="col_value"><?php echo T_('Value'); ?></th> + <th class="col_preference"><?php echo T_('Preference'); ?></th> + <th class="col_value"><?php echo T_('Value'); ?></th> </tr> <?php foreach ($preferences as $pref) { ?> <tr class="<?php echo UI::flip_class(); ?>"> @@ -46,14 +46,14 @@ </tr> <?php } // End foreach ($preferences['prefs'] as $pref) ?> <tr> - <td> - <div class="formValidation"> - <input class="button" type="submit" value="<?php echo T_('Update Preferences'); ?>" /> - <?php echo Core::form_register('update_preference'); ?> - <input type="hidden" name="user_id" value="<?php echo scrub_out($_REQUEST['user_id']); ?>" /> - </div> - </td> - <td> </td> + <td> + <div class="formValidation"> + <input class="button" type="submit" value="<?php echo T_('Update Preferences'); ?>" /> + <?php echo Core::form_register('update_preference'); ?> + <input type="hidden" name="user_id" value="<?php echo scrub_out($_REQUEST['user_id']); ?>" /> + </div> + </td> + <td> </td> </tr> </table> </form> diff --git a/templates/show_user_recommendations.inc.php b/templates/show_user_recommendations.inc.php index a979b9be..28509ad2 100644 --- a/templates/show_user_recommendations.inc.php +++ b/templates/show_user_recommendations.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -23,39 +23,39 @@ <?php UI::show_box_top(sprintf('%s Recommendations'), $working_user->fullname); ?> <table class="tabledata"> <tr> - <td valign="top"> - <?php - if (count($recommended_artists)) { - $items = $working_user->format_recommendations($recommended_artists,'artist'); - show_info_box(T_('Recommended Artists'),'artist',$items); - } - else { - echo "<span class=\"error\">" . T_('Not Enough Data') . "</span>"; - } - ?> - </td> - <td valign="top"> - <?php - if (count($recommended_albums)) { - $items = $working_user->format_recommendations($recommended_albums,'album'); - show_info_box(T_('Recommended Albums'),'album',$items); - } - else { - echo "<span class=\"error\">" . T_('Not Enough Data') . "</span>"; - } - ?> - </td> - <td valign="top"> - <?php - if (count($recommended_songs)) { - $items = $working_user->format_recommendations($recommended_songs,'song'); - show_info_box(T_('Recommended Songs'),'song',$items); - } - else { - echo "<span class=\"error\">" . T_('Not Enough Data') . "</span>"; - } - ?> - </td> + <td valign="top"> + <?php + if (count($recommended_artists)) { + $items = $working_user->format_recommendations($recommended_artists,'artist'); + show_info_box(T_('Recommended Artists'),'artist',$items); + } + else { + echo "<span class=\"error\">" . T_('Not Enough Data') . "</span>"; + } + ?> + </td> + <td valign="top"> + <?php + if (count($recommended_albums)) { + $items = $working_user->format_recommendations($recommended_albums,'album'); + show_info_box(T_('Recommended Albums'),'album',$items); + } + else { + echo "<span class=\"error\">" . T_('Not Enough Data') . "</span>"; + } + ?> + </td> + <td valign="top"> + <?php + if (count($recommended_songs)) { + $items = $working_user->format_recommendations($recommended_songs,'song'); + show_info_box(T_('Recommended Songs'),'song',$items); + } + else { + echo "<span class=\"error\">" . T_('Not Enough Data') . "</span>"; + } + ?> + </td> </tr> </table> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_user_registration.inc.php b/templates/show_user_registration.inc.php index be9e269e..c0d9284a 100644 --- a/templates/show_user_registration.inc.php +++ b/templates/show_user_registration.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -56,43 +56,43 @@ if (Config::get('user_agreement')) { ?> <h3><?php echo T_('User Agreement'); ?></h3> <div class="registrationAgreement"> <div class="agreementContent"> - <?php Registration::show_agreement(); ?> + <?php Registration::show_agreement(); ?> </div> <div class="agreementCheckbox"> - <input type='checkbox' name='accept_agreement' /> <?php echo T_('I Accept'); ?> - <?php Error::display('user_agreement'); ?> - </div> + <input type='checkbox' name='accept_agreement' /> <?php echo T_('I Accept'); ?> + <?php Error::display('user_agreement'); ?> + </div> </div> <?php } // end if user_agreement ?> <h3><?php echo T_('User Information'); ?></h3> <div class="registerfield require"> <label for="username"><?php echo T_('Username'); ?>: <span class="asterix">*</span></label> <input type='text' name='username' id='username' value='<?php echo scrub_out($username); ?>' /> - <?php Error::display('username'); ?> - <?php Error::display('duplicate_user'); ?> + <?php Error::display('username'); ?> + <?php Error::display('duplicate_user'); ?> </div> <div class="registerfield require"> - <label for="fullname"><?php echo T_('Full Name'); ?>: <span class="asterix">*</span></label> + <label for="fullname"><?php echo T_('Full Name'); ?>: <span class="asterix">*</span></label> <input type='text' name='fullname' id='fullname' value='<?php echo scrub_out($fullname); ?>' /> - <?php Error::display('fullname'); ?> + <?php Error::display('fullname'); ?> </div> <div class="registerfield require"> <label for="email"><?php echo T_('E-mail'); ?>: <span class="asterix">*</span></label> - <input type='text' name='email' id='email' value='<?php echo scrub_out($email); ?>' /> - <?php Error::display('email'); ?> + <input type='text' name='email' id='email' value='<?php echo scrub_out($email); ?>' /> + <?php Error::display('email'); ?> </div> <div class="registerfield require"> - <label for="password"><?php echo T_('Password'); ?>: <span class="asterix">*</span></label> - <input type='password' name='password_1' id='password_1' /> - <?php Error::display('password'); ?> + <label for="password"><?php echo T_('Password'); ?>: <span class="asterix">*</span></label> + <input type='password' name='password_1' id='password_1' /> + <?php Error::display('password'); ?> </div> <div class="registerfield require"> - <label for="confirm_passord"><?php echo T_('Confirm Password'); ?>: <span class="asterix">*</span></label> - <input type='password' name='password_2' id='password_2' /> + <label for="confirm_passord"><?php echo T_('Confirm Password'); ?>: <span class="asterix">*</span></label> + <input type='password' name='password_2' id='password_2' /> </div> <div class="registerInformation"> @@ -100,13 +100,13 @@ if (Config::get('user_agreement')) { ?> </div> <?php if (Config::get('captcha_public_reg')) { ?> - <?php echo captcha::form("→ "); ?> - <?php Error::display('captcha'); ?> + <?php echo captcha::form("→ "); ?> + <?php Error::display('captcha'); ?> <?php } ?> <div class="registerButtons"> - <input type="hidden" name="action" value="add_user" /> - <input type='submit' name='submit_registration' id='submit_registration' value='<?php echo T_('Register User'); ?>' /> + <input type="hidden" name="action" value="add_user" /> + <input type='submit' name='submit_registration' id='submit_registration' value='<?php echo T_('Register User'); ?>' /> </div> </form> <?php diff --git a/templates/show_user_row.inc.php b/templates/show_user_row.inc.php index b24cf776..3ec821bd 100644 --- a/templates/show_user_row.inc.php +++ b/templates/show_user_row.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -20,41 +20,41 @@ * */ ?> - <td class="cel_username"> - <a href="<?php echo $web_path; ?>/stats.php?action=show_user&user_id=<?php echo $client->id; ?>"> - <?php echo $client->fullname; ?> (<?php echo $client->username; ?>) - </a> - </td> + <td class="cel_username"> + <a href="<?php echo $web_path; ?>/stats.php?action=show_user&user_id=<?php echo $client->id; ?>"> + <?php echo $client->fullname; ?> (<?php echo $client->username; ?>) + </a> + </td> <td class="cel_lastseen"><?php echo $last_seen; ?></td> <td class="cel_registrationdate"><?php echo $create_date; ?></td> <td class="cel_activity"><?php echo $client->f_useage; ?></td> - <?php if (Config::get('track_user_ip')) { ?> - <td class="cel_lastip"> - <a href="<?php echo $web_path; ?>/admin/users.php?action=show_ip_history&user_id=<?php echo $client->id; ?>"> - <?php echo $client->ip_history; ?> - </a> - </td> - <?php } ?> - <td class="cel_action"> - <a href="<?php echo $web_path; ?>/admin/users.php?action=show_edit&user_id=<?php echo $client->id; ?>"><?php echo UI::get_icon('edit', T_('Edit')); ?></a> - <a href="<?php echo $web_path; ?>/admin/users.php?action=show_preferences&user_id=<?php echo $client->id; ?>"><?php echo UI::get_icon('preferences', T_('Preferences')); ?></a> - <?php - //FIXME: Fix this for the extra permission levels - if ($client->disabled == '1') { - echo "<a href=\"".$web_path."/admin/users.php?action=enable&user_id=$client->id\">" . UI::get_icon('enable', T_('Enable')) . "</a>"; - } - else { - echo "<a href=\"".$web_path."/admin/users.php?action=disable&user_id=$client->id\">" . UI::get_icon('disable', T_('Disable')) ."</a>"; - } - ?> - <a href="<?php echo $web_path; ?>/admin/users.php?action=delete&user_id=<?php echo $client->id; ?>"><?php echo UI::get_icon('delete', T_('Delete')); ?></a> - </td> + <?php if (Config::get('track_user_ip')) { ?> + <td class="cel_lastip"> + <a href="<?php echo $web_path; ?>/admin/users.php?action=show_ip_history&user_id=<?php echo $client->id; ?>"> + <?php echo $client->ip_history; ?> + </a> + </td> + <?php } ?> + <td class="cel_action"> + <a href="<?php echo $web_path; ?>/admin/users.php?action=show_edit&user_id=<?php echo $client->id; ?>"><?php echo UI::get_icon('edit', T_('Edit')); ?></a> + <a href="<?php echo $web_path; ?>/admin/users.php?action=show_preferences&user_id=<?php echo $client->id; ?>"><?php echo UI::get_icon('preferences', T_('Preferences')); ?></a> + <?php + //FIXME: Fix this for the extra permission levels + if ($client->disabled == '1') { + echo "<a href=\"".$web_path."/admin/users.php?action=enable&user_id=$client->id\">" . UI::get_icon('enable', T_('Enable')) . "</a>"; + } + else { + echo "<a href=\"".$web_path."/admin/users.php?action=disable&user_id=$client->id\">" . UI::get_icon('disable', T_('Disable')) ."</a>"; + } + ?> + <a href="<?php echo $web_path; ?>/admin/users.php?action=delete&user_id=<?php echo $client->id; ?>"><?php echo UI::get_icon('delete', T_('Delete')); ?></a> + </td> <?php - if (($client->is_logged_in()) AND ($client->is_online())) { - echo "<td class=\"cel_online user_online\"> </td>"; - } elseif ($client->disabled == 1) { - echo "<td class=\"cel_online user_disabled\"> </td>"; - } else { - echo "<td class=\"cel_online user_offline\"> </td>"; - } + if (($client->is_logged_in()) AND ($client->is_online())) { + echo "<td class=\"cel_online user_online\"> </td>"; + } elseif ($client->disabled == 1) { + echo "<td class=\"cel_online user_disabled\"> </td>"; + } else { + echo "<td class=\"cel_online user_offline\"> </td>"; + } ?> diff --git a/templates/show_user_stats.inc.php b/templates/show_user_stats.inc.php index 5bfdadaf..bac817c5 100644 --- a/templates/show_user_stats.inc.php +++ b/templates/show_user_stats.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -23,45 +23,45 @@ <?php UI::show_box_top(sprintf('%s Favorites'), $working_user->fullname); ?> <table class="tabledata"> <tr> - <td valign="top"> - <?php - if (count($favorite_artists)) { - $items = $working_user->format_favorites($favorite_artists); - $title = '<a href="' . Config::get('web_path') . '/stream.php?action=play_favorite&type=artist">' . - UI::get_icon('all', T_('Favorite Artists')) . '</a> ' . T_('Favorite Artists'); - show_info_box($title,'artist',$items); - } - else { - echo "<span class=\"error\">" . T_('Not Enough Data') . "</span>"; - } - ?> - </td> - <td valign="top"> - <?php - if (count($favorite_albums)) { - $items = $working_user->format_favorites($favorite_albums); + <td valign="top"> + <?php + if (count($favorite_artists)) { + $items = $working_user->format_favorites($favorite_artists); + $title = '<a href="' . Config::get('web_path') . '/stream.php?action=play_favorite&type=artist">' . + UI::get_icon('all', T_('Favorite Artists')) . '</a> ' . T_('Favorite Artists'); + show_info_box($title,'artist',$items); + } + else { + echo "<span class=\"error\">" . T_('Not Enough Data') . "</span>"; + } + ?> + </td> + <td valign="top"> + <?php + if (count($favorite_albums)) { + $items = $working_user->format_favorites($favorite_albums); $title = '<a href="' . Config::get('web_path') . '/stream.php?action=play_favorite&type=album">' . UI::get_icon('all', T_('Favorite Albums')) . '</a> ' . T_('Favorite Albums'); - show_info_box($title,'album',$items); - } - else { - echo "<span class=\"error\">" . T_('Not Enough Data') . "</span>"; - } - ?> - </td> - <td valign="top"> - <?php - if (count($favorite_songs)) { - $items = $working_user->format_favorites($favorite_songs); + show_info_box($title,'album',$items); + } + else { + echo "<span class=\"error\">" . T_('Not Enough Data') . "</span>"; + } + ?> + </td> + <td valign="top"> + <?php + if (count($favorite_songs)) { + $items = $working_user->format_favorites($favorite_songs); $title = '<a href="' . Config::get('web_path') . '/stream.php?action=play_favorite&type=song">' . UI::get_icon('all', T_('Favorite Songs')) . '</a> ' . T_('Favorite Songs'); - show_info_box($title,'your_song',$items); - } - else { - echo "<span class=\"error\">" . T_('Not Enough Data') . "</span>"; - } - ?> - </td> + show_info_box($title,'your_song',$items); + } + else { + echo "<span class=\"error\">" . T_('Not Enough Data') . "</span>"; + } + ?> + </td> </tr> </table> <?php UI::show_box_bottom(); ?> diff --git a/templates/show_users.inc.php b/templates/show_users.inc.php index ba3d7b84..55ede6fd 100644 --- a/templates/show_users.inc.php +++ b/templates/show_users.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -30,9 +30,9 @@ $web_path = Config::get('web_path'); <col id="col_lastseen" /> <col id="col_registrationdate" /> <col id="col_activity" /> - <?php if (Config::get('track_user_ip')) { ?> + <?php if (Config::get('track_user_ip')) { ?> <col id="col_lastip" /> - <?php } ?> + <?php } ?> <col id="col_action" /> <col id="col_online" /> </colgroup> @@ -41,32 +41,32 @@ $web_path = Config::get('web_path'); <th class="cel_lastseen"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=last_seen', T_('Last Seen'),'users_sort_lastseen'); ?></th> <th class="cel_registrationdate"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=create_date', T_('Registration Date'),'users_sort_createdate'); ?></th> <th class="cel_activity"><?php echo T_('Activity'); ?></th> - <?php if (Config::get('track_user_ip')) { ?> + <?php if (Config::get('track_user_ip')) { ?> <th class="cel_lastip"><?php echo T_('Last Ip'); ?></th> - <?php } ?> - <th class="cel_action"><?php echo T_('Action'); ?></th> + <?php } ?> + <th class="cel_action"><?php echo T_('Action'); ?></th> <th class="cel_online"><?php echo T_('On-line'); ?></th> </tr> <?php foreach ($object_ids as $user_id) { - $client = new User($user_id); - $client->format(); - $last_seen = $client->last_seen ? date("m\/d\/Y - H:i",$client->last_seen) : T_('Never'); - $create_date = $client->create_date ? date("m\/d\/Y - H:i",$client->create_date) : T_('Unknown'); + $client = new User($user_id); + $client->format(); + $last_seen = $client->last_seen ? date("m\/d\/Y - H:i",$client->last_seen) : T_('Never'); + $create_date = $client->create_date ? date("m\/d\/Y - H:i",$client->create_date) : T_('Unknown'); ?> <tr class="<?php echo UI::flip_class(); ?>" align="center" id="admin_user_<?php echo $client->id; ?>"> - <?php require Config::get('prefix') . '/templates/show_user_row.inc.php'; ?> + <?php require Config::get('prefix') . '/templates/show_user_row.inc.php'; ?> </tr> <?php } //end foreach users ?> <tr class="th-bottom"> - <th class="cel_username"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=fullname', T_('Fullname'),'users_sort_fullname1'); ?>( <?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=username', T_('Username'),'users_sort_username1');?>)</th> + <th class="cel_username"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=fullname', T_('Fullname'),'users_sort_fullname1'); ?>( <?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=username', T_('Username'),'users_sort_username1');?>)</th> <th class="cel_lastseen"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=last_seen', T_('Last Seen'),'users_sort_lastseen1'); ?></th> <th class="cel_registrationdate"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=create_date', T_('Registration Date'),'users_sort_createdate1'); ?></th> <th class="cel_activity"><?php echo T_('Activity'); ?></th> - <?php if (Config::get('track_user_ip')) { ?> + <?php if (Config::get('track_user_ip')) { ?> <th class="cel_lastip"><?php echo T_('Last Ip'); ?></th> - <?php } ?> - <th class="cel_action"><?php echo T_('Action'); ?></th> + <?php } ?> + <th class="cel_action"><?php echo T_('Action'); ?></th> <th class="cel_online"><?php echo T_('On-line'); ?></th> </tr> </table> diff --git a/templates/show_verify_catalog.inc.php b/templates/show_verify_catalog.inc.php index b913a4cf..fc41e534 100644 --- a/templates/show_verify_catalog.inc.php +++ b/templates/show_verify_catalog.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) diff --git a/templates/show_video_row.inc.php b/templates/show_video_row.inc.php index 0bb528b0..3ded1e63 100644 --- a/templates/show_video_row.inc.php +++ b/templates/show_video_row.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -21,7 +21,7 @@ */ ?> <td class="cel_add"> - <?php echo Ajax::button('?action=basket&type=video&id=' . $video->id,'add', T_('Add'),'add_video_' . $video->id); ?> + <?php echo Ajax::button('?action=basket&type=video&id=' . $video->id,'add', T_('Add'),'add_video_' . $video->id); ?> </td> <td class="cel_title"><?php echo $video->f_title; ?></td> <td class="cel_codec"><?php echo $video->f_codec; ?></td> @@ -30,6 +30,6 @@ <td class="cel_tags"><?php $video->f_tags; ?></td> <td class="cel_action"> <?php if (Access::check_function('download')) { ?> - <a href="<?php echo Config::get('web_path'); ?>/stream.php?action=download&type=video&oid=<?php echo $video->id; ?>"><?php echo UI::get_icon('download', T_('Download')); ?></a> + <a href="<?php echo Config::get('web_path'); ?>/stream.php?action=download&type=video&oid=<?php echo $video->id; ?>"><?php echo UI::get_icon('download', T_('Download')); ?></a> <?php } ?> </td> diff --git a/templates/show_videos.inc.php b/templates/show_videos.inc.php index 256fe682..7b4f6c75 100644 --- a/templates/show_videos.inc.php +++ b/templates/show_videos.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -34,37 +34,37 @@ $web_path = Config::get('web_path'); <col id="col-action" /> </colgroup> <tr class="th-top"> - <th class="cel_add"><?php echo T_('Add'); ?></th> - <th class="cel_title"><?php echo Ajax::text('?page=browse&action=set_sort&type=video&sort=title', T_('Title'),'sort_video_title'); ?></th> - <th class="cel_codec"><?php echo Ajax::text('?page=browse&action=set_sort&type=video&sort=codec', T_('Codec'),'sort_video_codec'); ?></th> - <th class="cel_resolution"><?php echo Ajax::text('?page=browse&action=set_sort&type=video&sort=resolution', T_('Resolution'),'sort_video_rez'); ?></th> - <th class="cel_length"><?php echo Ajax::text('?page=browse&action=set_sort&type=video&sort=length', T_('Time'),'sort_video_length'); ?></th> - <th class="cel_tags"><?php echo T_('Tags'); ?></th> - <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_title"><?php echo Ajax::text('?page=browse&action=set_sort&type=video&sort=title', T_('Title'),'sort_video_title'); ?></th> + <th class="cel_codec"><?php echo Ajax::text('?page=browse&action=set_sort&type=video&sort=codec', T_('Codec'),'sort_video_codec'); ?></th> + <th class="cel_resolution"><?php echo Ajax::text('?page=browse&action=set_sort&type=video&sort=resolution', T_('Resolution'),'sort_video_rez'); ?></th> + <th class="cel_length"><?php echo Ajax::text('?page=browse&action=set_sort&type=video&sort=length', T_('Time'),'sort_video_length'); ?></th> + <th class="cel_tags"><?php echo T_('Tags'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> <?php /* Foreach through every artist that has been passed to us */ foreach ($object_ids as $video_id) { - $video = new Video($video_id); - $video->format(); + $video = new Video($video_id); + $video->format(); ?> <tr id="video_<?php echo $video->id; ?>" class="<?php echo UI::flip_class(); ?>"> - <?php require Config::get('prefix') . '/templates/show_video_row.inc.php'; ?> + <?php require Config::get('prefix') . '/templates/show_video_row.inc.php'; ?> </tr> <?php } //end foreach ?> <?php if (!count($object_ids)) { ?> <tr class="<?php echo UI::flip_class(); ?>"> - <td colspan="7"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> + <td colspan="7"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_add"><?php echo T_('Add'); ?></th> <th class="cel_title"><?php echo T_('Title'); ?></th> - <th class="cel_codec"><?php echo T_('Codec'); ?></th> - <th class="cel_resolution"><?php echo T_('Resolution'); ?></th> - <th class="cel_length"><?php echo Ajax::text('?page=browse&action=set_sort&type=video&sort=length', T_('Time'),'sort_video_length_bottom'); ?></th> - <th class="cel_tags"><?php echo T_('Tags'); ?></th> - <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_codec"><?php echo T_('Codec'); ?></th> + <th class="cel_resolution"><?php echo T_('Resolution'); ?></th> + <th class="cel_length"><?php echo Ajax::text('?page=browse&action=set_sort&type=video&sort=length', T_('Time'),'sort_video_length_bottom'); ?></th> + <th class="cel_tags"><?php echo T_('Tags'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/show_xspf_player.inc.php b/templates/show_xspf_player.inc.php index b668dbcb..5cfb52d1 100644 --- a/templates/show_xspf_player.inc.php +++ b/templates/show_xspf_player.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -58,17 +58,17 @@ if (file_exists(Config::get('prefix')."/modules/flash/xspf_jukebox.swf")) { $player_url = sprintf("%s/modules/flash/xspf_jukebox.swf?autoplay=true&repeat_playlist=true&crossFade=false&shuffle=false&skin_url=%s/modules/flash/Original/&playlist_url=%s",Config::get('web_path'),Config::get('web_path'),$play_url); ?> <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0" width="400" height="170" id="xspf_player" align="middle"> - <param name="pluginspage" value="http://www.macromedia.com/go/getflashplayer" /> - <param name="allowScriptAccess" value="sameDomain" /> - <param name="movie" value="<?php echo $player_url; ?>" /> - <param name="quality" value="high" /> - <param name="bgcolor" value="#ffffff" /> - <param name="type" value="application/x-shockwave-flash" /> - <param name="width" value="400" /> - <param name="height" value="170" /> - <param name="name" value="xspf_player" /> - <param name="align" value="middle" /> - <embed src="<?php echo $player_url; ?>" quality="high" bgcolor="#ffffff" width="400" height="170" name="xspf_player" align="middle" allowScriptAccess="sameDomain" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" /> + <param name="pluginspage" value="http://www.macromedia.com/go/getflashplayer" /> + <param name="allowScriptAccess" value="sameDomain" /> + <param name="movie" value="<?php echo $player_url; ?>" /> + <param name="quality" value="high" /> + <param name="bgcolor" value="#ffffff" /> + <param name="type" value="application/x-shockwave-flash" /> + <param name="width" value="400" /> + <param name="height" value="170" /> + <param name="name" value="xspf_player" /> + <param name="align" value="middle" /> + <embed src="<?php echo $player_url; ?>" quality="high" bgcolor="#ffffff" width="400" height="170" name="xspf_player" align="middle" allowScriptAccess="sameDomain" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" /> </object> <?php } else { ?> <p style="color:#ffffff;">Debian Policy requires the removal of the XSPF Flash Player, please see /usr/share/doc/ampache/README.Debian.gz for details and a work around.</p> diff --git a/templates/sidebar.inc.php b/templates/sidebar.inc.php index 664ec3ed..ba2670ab 100644 --- a/templates/sidebar.inc.php +++ b/templates/sidebar.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -37,29 +37,29 @@ $web_path = Config::get('web_path'); ?> <ul id="sidebar-tabs"> <?php - foreach ($sidebar_items as $item) { - if (Access::check('interface',$item['access'])) { - $li_params = "id='sb_tab_" . $item['id'] . "' class='sb1" . ${'sidebar_'.$item['id'] } . "'"; - ?><li <?php echo $li_params; ?>> - <?php + foreach ($sidebar_items as $item) { + if (Access::check('interface',$item['access'])) { + $li_params = "id='sb_tab_" . $item['id'] . "' class='sb1" . ${'sidebar_'.$item['id'] } . "'"; + ?><li <?php echo $li_params; ?>> + <?php // Button echo Ajax::button("?page=index&action=sidebar&button=".$item['id'],$item['icon'],$item['title'],'sidebar_'.$item['id']); - // Include subnav if it's the selected one - // so that it's generated inside its parent li - if ($item['id']==$_SESSION['state']['sidebar_tab']) { - ?><div id="sidebar-page"><?php - require_once Config::get('prefix') . '/templates/sidebar_' . $_SESSION['state']['sidebar_tab'] . '.inc.php'; - ?></div><?php + // Include subnav if it's the selected one + // so that it's generated inside its parent li + if ($item['id']==$_SESSION['state']['sidebar_tab']) { + ?><div id="sidebar-page"><?php + require_once Config::get('prefix') . '/templates/sidebar_' . $_SESSION['state']['sidebar_tab'] . '.inc.php'; + ?></div><?php } ?></li><?php } - } + } ?> <li id="sb_tab_logout" class="sb1"> - <a href="<?php echo Config::get('web_path'); ?>/logout.php" id="sidebar_logout" > - <?php echo UI::get_icon('logout', T_('Logout')); ?> - </a> + <a href="<?php echo Config::get('web_path'); ?>/logout.php" id="sidebar_logout" > + <?php echo UI::get_icon('logout', T_('Logout')); ?> + </a> </li> </ul> diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php index 86ae75c3..4363c37c 100644 --- a/templates/sidebar_admin.inc.php +++ b/templates/sidebar_admin.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -54,7 +54,7 @@ <li><h4><?php echo T_('Server Config'); ?></h4> <ul class="sb3" id="sb_preferences_sc"> <?php - $catagories = Preference::get_catagories(); + $catagories = Preference::get_catagories(); foreach ($catagories as $name) { $f_name = ucfirst($name); ?> diff --git a/templates/sidebar_home.inc.php b/templates/sidebar_home.inc.php index 13637416..96398134 100644 --- a/templates/sidebar_home.inc.php +++ b/templates/sidebar_home.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -23,11 +23,11 @@ <ul class="sb2" id="sb_home"> <li><h4><?php echo T_('Browse'); ?></h4> <?php - // Build the selected dealie - if (isset($_REQUEST['action'])) { - $text = scrub_in($_REQUEST['action']) . '_ac'; - ${$text} = ' selected="selected"'; - } + // Build the selected dealie + 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 T_('Song Titles'); ?></a></li> diff --git a/templates/sidebar_localplay.inc.php b/templates/sidebar_localplay.inc.php index 287528f1..46e2675e 100644 --- a/templates/sidebar_localplay.inc.php +++ b/templates/sidebar_localplay.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -24,47 +24,47 @@ <ul class="sb2" id="sb_localplay"> <?php if ($server_allow = Config::get('allow_localplay_playback') AND $controller = Config::get('localplay_controller') AND $access_check = Access::check('localplay','5')) { ?> <?php - // Little bit of work to be done here - $localplay = new Localplay(Config::get('localplay_controller')); - $current_instance = $localplay->current_instance(); - $class = $current_instance ? '' : ' class="active_instance"'; + // Little bit of work to be done here + $localplay = new Localplay(Config::get('localplay_controller')); + $current_instance = $localplay->current_instance(); + $class = $current_instance ? '' : ' class="active_instance"'; ?> <?php if (Access::check('localplay','25')) { ?> <li><h4><?php echo T_('Localplay'); ?></h4> <ul class="sb3" id="sb_localplay_info"> <?php if (Access::check('localplay','75')) { ?> - <li id="sb_localplay_info_add_instance"><a href="<?php echo $web_path; ?>/localplay.php?action=show_add_instance"><?php echo T_('Add Instance'); ?></a></li> - <li id="sb_localplay_info_show_instances"><a href="<?php echo $web_path; ?>/localplay.php?action=show_instances"><?php echo T_('Show instances'); ?></a></li> + <li id="sb_localplay_info_add_instance"><a href="<?php echo $web_path; ?>/localplay.php?action=show_add_instance"><?php echo T_('Add Instance'); ?></a></li> + <li id="sb_localplay_info_show_instances"><a href="<?php echo $web_path; ?>/localplay.php?action=show_instances"><?php echo T_('Show instances'); ?></a></li> <?php } ?> - <li id="sb_localplay_info_show"><a href="<?php echo $web_path; ?>/localplay.php?action=show_playlist"><?php echo T_('Show Playlist'); ?></a></li> + <li id="sb_localplay_info_show"><a href="<?php echo $web_path; ?>/localplay.php?action=show_playlist"><?php echo T_('Show Playlist'); ?></a></li> </ul> </li> <?php } ?> <li><h4><?php echo T_('Active Instance'); ?></h4> <ul class="sb3" id="sb_localplay_instances"> - <li id="sb_localplay_instances_none"<?php echo $class; ?>><?php echo Ajax::text('?page=localplay&action=set_instance&instance=0', T_('None'),'localplay_instance_none'); ?></li> - <?php - // Requires a little work.. :( - $instances = $localplay->get_instances(); - foreach ($instances as $uid=>$name) { - $name = scrub_out($name); - $class = ''; - if ($uid == $current_instance) { - $class = ' class="active_instance"'; - } - ?> - <li id="sb_localplay_instances_<?php echo $uid; ?>"<?php echo $class; ?>><?php echo Ajax::text('?page=localplay&action=set_instance&instance=' . $uid,$name,'localplay_instance_' . $uid); ?></li> - <?php } ?> + <li id="sb_localplay_instances_none"<?php echo $class; ?>><?php echo Ajax::text('?page=localplay&action=set_instance&instance=0', T_('None'),'localplay_instance_none'); ?></li> + <?php + // Requires a little work.. :( + $instances = $localplay->get_instances(); + foreach ($instances as $uid=>$name) { + $name = scrub_out($name); + $class = ''; + if ($uid == $current_instance) { + $class = ' class="active_instance"'; + } + ?> + <li id="sb_localplay_instances_<?php echo $uid; ?>"<?php echo $class; ?>><?php echo Ajax::text('?page=localplay&action=set_instance&instance=' . $uid,$name,'localplay_instance_' . $uid); ?></li> + <?php } ?> </ul> </li> <?php } else { ?> <li><h4><?php echo T_('Localplay Disabled'); ?></h4></li> <?php if (!$server_allow) { ?> - <li><?php echo T_('Allow Localplay set to False'); ?></li> + <li><?php echo T_('Allow Localplay set to False'); ?></li> <?php } elseif (!$controller) { ?> - <li><?php echo T_('Localplay Controller Not Defined'); ?></li> + <li><?php echo T_('Localplay Controller Not Defined'); ?></li> <?php } elseif (!$access_check) { ?> - <li><?php echo T_('Access Denied'); ?></li> + <li><?php echo T_('Access Denied'); ?></li> <?php } ?> <?php } ?> </ul> diff --git a/templates/sidebar_modules.inc.php b/templates/sidebar_modules.inc.php index 36697794..675871cd 100644 --- a/templates/sidebar_modules.inc.php +++ b/templates/sidebar_modules.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) diff --git a/templates/sidebar_preferences.inc.php b/templates/sidebar_preferences.inc.php index e90a6ff2..897e4876 100644 --- a/templates/sidebar_preferences.inc.php +++ b/templates/sidebar_preferences.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -30,9 +30,9 @@ $catagories = Preference::get_catagories(); <li><h4><?php echo T_('Preferences'); ?></h4> <ul class="sb3" id="sb_preferences_sections"> <?php - foreach ($catagories as $name) { - if ($name == 'system') { continue; } - $f_name = ucfirst($name); + foreach ($catagories as $name) { + if ($name == 'system') { continue; } + $f_name = ucfirst($name); ?> <li id="sb_preferences_sections_<?php echo $f_name; ?>"><a href="<?php echo $web_path; ?>/preferences.php?tab=<?php echo $name; ?>"><?php echo T_($f_name); ?></a></li> <?php } ?> diff --git a/templates/subnavbar.inc.php b/templates/subnavbar.inc.php index 83ac34a4..f52d99c9 100644 --- a/templates/subnavbar.inc.php +++ b/templates/subnavbar.inc.php @@ -1,5 +1,5 @@ <?php -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -28,12 +28,12 @@ ?> <ul class="subnavside"> <?php - foreach ($items as $item) { - if ($item['url'] == $item['active']) { - $li_class = "class=\"activesubmenu\""; - } - $li_id = "id=\"" . $item['cssclass'] . "\""; - ?> - <li <?php echo $li_class; echo $li_id; ?>><a href="<?php echo Config::get('web_path') . "/" . $item['url']; ?>"><?php echo $item['title']; ?></a></li> - <?php unset($li_id); } // END foreach ($items as $item) ?> + foreach ($items as $item) { + if ($item['url'] == $item['active']) { + $li_class = "class=\"activesubmenu\""; + } + $li_id = "id=\"" . $item['cssclass'] . "\""; + ?> + <li <?php echo $li_class; echo $li_id; ?>><a href="<?php echo Config::get('web_path') . "/" . $item['url']; ?>"><?php echo $item['title']; ?></a></li> + <?php unset($li_id); } // END foreach ($items as $item) ?> </ul> |