summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--admin/flag.php30
-rwxr-xr-xdocs/CHANGELOG1
-rw-r--r--lib/class/browse.class.php9
-rw-r--r--lib/class/flag.class.php34
-rw-r--r--lib/class/shoutbox.class.php4
-rw-r--r--lib/javascript-base.js3
-rw-r--r--modules/plugins/Lastfm.plugin.php20
-rw-r--r--shout.php5
-rw-r--r--templates/show_flagged.inc.php18
-rw-r--r--templates/show_index.inc.php23
-rw-r--r--templates/show_shoutbox.inc.php19
-rw-r--r--templates/sidebar_admin.inc.php6
-rw-r--r--themes/classic/templates/default.css23
-rw-r--r--themes/greysme/templates/default.css33
14 files changed, 134 insertions, 94 deletions
diff --git a/admin/flag.php b/admin/flag.php
index fc496615..e281dd6e 100644
--- a/admin/flag.php
+++ b/admin/flag.php
@@ -1,7 +1,7 @@
<?php
/*
- Copyright (c) 2001 - 2006 Ampache.org
+ Copyright (c) 2001 - 2007 Ampache.org
All rights reserved.
This program is free software; you can redistribute it and/or
@@ -19,24 +19,16 @@
*/
-/**
- * Flag Admin Document
- * This document handles the administrative aspects of
- * flagging.
- */
+require '../lib/init.php';
-require('../lib/init.php');
-
-if (!$GLOBALS['user']->has_access('100')) {
+if (!Access::check('interface','100')) {
access_denied();
exit();
}
-show_template('header');
-
-$action = scrub_in($_REQUEST['action']);
+show_header();
-switch ($action) {
+switch ($_REQUEST['action']) {
case 'edit_song':
$catalog = new Catalog();
$song = new Song($_REQUEST['song_id']);
@@ -299,14 +291,12 @@ switch ($action) {
} // end else
show_confirmation(_('Songs Enabled'),_('The requested song(s) have been enabled'),return_referer());
break;
- case 'show_flagged':
- $flag = new Flag();
- $flagged = $flag->get_flagged();
- show_box_top(_('Flagged Records'));
- require (conf('prefix') . '/templates/show_flagged.inc.php');
- show_box_bottom();
- break;
default:
+ case 'show_flagged':
+ $flagged = Flag::get_all();
+ Browse::set_type('flagged');
+ Browse::save_objects($flagged);
+ Browse::show_objects($flagged);
break;
} // end switch
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index f4b9fb9f..e5b36598 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,7 @@
--------------------------------------------------------------------------
v.3.4-Beta2
+ - Removed extra space on default Last.FM username/password
- Fixed LastFM plugin username and password checking to not even try
if there is no username or password
diff --git a/lib/class/browse.class.php b/lib/class/browse.class.php
index caaf79b5..2e65a783 100644
--- a/lib/class/browse.class.php
+++ b/lib/class/browse.class.php
@@ -139,6 +139,7 @@ class Browse {
case 'playlist':
case 'playlist_song':
case 'song':
+ case 'flagged':
case 'catalog':
case 'album':
case 'artist':
@@ -346,6 +347,9 @@ class Browse {
case 'playlist':
$sql = "SELECT `playlist`.`id` FROM `playlist` ";
break;
+ case 'flagged':
+ $sql = "SELECT `flagged`.`id` FROM `flagged` ";
+ break;
case 'playlist_song':
case 'song':
default:
@@ -662,6 +666,11 @@ class Browse {
require_once Config::get('prefix') . '/templates/show_catalogs.inc.php';
show_box_bottom();
break;
+ case 'flagged':
+ show_box_top(_('Flagged Records'),$class);
+ require_once Config::get('prefix') . '/templates/show_flagged.inc.php';
+ show_box_bottom();
+ break;
default:
// Rien a faire
break;
diff --git a/lib/class/flag.class.php b/lib/class/flag.class.php
index ed833c1b..56256a39 100644
--- a/lib/class/flag.class.php
+++ b/lib/class/flag.class.php
@@ -27,24 +27,24 @@
class Flag {
/* DB based variables */
- var $id;
- var $user;
- var $object_id;
- var $object_type;
- var $comment;
- var $flag;
- var $date;
- var $approved=0;
+ public $id;
+ public $user;
+ public $object_id;
+ public $object_type;
+ public $comment;
+ public $flag;
+ public $date;
+ public $approved=0;
/* Generated Values */
- var $name; // Blank
- var $title; // Blank
+ public $name; // Blank
+ public $title; // Blank
/**
* Constructor
* This takes a flagged.id and then pulls in the information for said flag entry
*/
- function Flag($flag_id=0) {
+ public function __construct($flag_id=0) {
$this->id = intval($flag_id);
@@ -125,24 +125,24 @@ class Flag {
* This returns an array of ids of flagged songs if no limit is passed
* it gets everything
*/
- function get_flagged($count=0) {
+ public static function get_all($count=0) {
if ($count) { $limit_clause = "LIMIT " . intval($count); }
- $sql = "SELECT id FROM flagged ORDER BY id $limit_clause";
- $db_results = mysql_query($sql, dbh());
+ $sql = "SELECT `id` FROM `flagged` $limit_clause";
+ $db_results = Dba::query($sql);
/* Default it to an array */
$results = array();
/* While the query */
- while ($r = mysql_fetch_assoc($db_results)) {
- $results[] = $r['id'];
+ while ($row = Dba::fetch_assoc($db_results)) {
+ $results[] = $row['id'];
}
return $results;
- } // get_flagged
+ } // get_all
/**
* get_approved
diff --git a/lib/class/shoutbox.class.php b/lib/class/shoutbox.class.php
index 3cea772b..98d14548 100644
--- a/lib/class/shoutbox.class.php
+++ b/lib/class/shoutbox.class.php
@@ -132,14 +132,14 @@ class shoutBox {
switch ($this->object_type) {
case 'album':
- $image_string = "<img height=\"75\" width=\"75\" src=\"" . Config::get('web_path') . "/image.php?id=" . $this->object_id . "&amp;thumb=1\" />";
+ $image_string = "<img class=\"shoutboximage\" height=\"75\" width=\"75\" src=\"" . Config::get('web_path') . "/image.php?id=" . $this->object_id . "&amp;thumb=1\" />";
break;
case 'artist':
break;
case 'song':
$song = new Song($this->object_id);
- $image_string = "<img height=\"75\" width=\"75\" src=\"" . Config::get('web_path') . "/image.php?id=" . $song->album . "&amp;thumb=1\" />";
+ $image_string = "<img class=\"shoutboximage\" height=\"75\" width=\"75\" src=\"" . Config::get('web_path') . "/image.php?id=" . $song->album . "&amp;thumb=1\" />";
break;
default:
// Rien a faire
diff --git a/lib/javascript-base.js b/lib/javascript-base.js
index a51f7323..b6000238 100644
--- a/lib/javascript-base.js
+++ b/lib/javascript-base.js
@@ -58,8 +58,7 @@ function reload_util(target) {
document.getElementById('util_iframe').contentWindow.location.reload(true);
}
else if (navigator.appName == 'Konqueror') {
- alert(document.getElementById('util_iframe').location.url);
- document.getElementById('util_iframe').location.url = document.getElementById('util_iframe').location.url
+ document.getElementById('util_iframe').contentDocument.location.reload(true);
}
else {
document.getElementById('util_iframe').src = document.getElementById('util_iframe').src;
diff --git a/modules/plugins/Lastfm.plugin.php b/modules/plugins/Lastfm.plugin.php
index 6e4b2ab4..10f51344 100644
--- a/modules/plugins/Lastfm.plugin.php
+++ b/modules/plugins/Lastfm.plugin.php
@@ -54,12 +54,12 @@ class AmpacheLastfm {
*/
public function install() {
- Preference::insert('lastfm_user','Last.FM Username',' ','25','string','plugins');
- Preference::insert('lastfm_pass','Last.FM Password',' ','25','string','plugins');
- Preference::insert('lastfm_port','Last.FM Submit Port',' ','25','string','internal');
- Preference::insert('lastfm_host','Last.FM Submit Host',' ','25','string','internal');
- Preference::insert('lastfm_url','Last.FM Submit URL',' ','25','string','internal');
- Preference::insert('lastfm_challenge','Last.FM Submit Challenge',' ','25','string','internal');
+ Preference::insert('lastfm_user','Last.FM Username','','25','string','plugins');
+ Preference::insert('lastfm_pass','Last.FM Password','','25','string','plugins');
+ Preference::insert('lastfm_port','Last.FM Submit Port','','25','string','internal');
+ Preference::insert('lastfm_host','Last.FM Submit Host','','25','string','internal');
+ Preference::insert('lastfm_url','Last.FM Submit URL','','25','string','internal');
+ Preference::insert('lastfm_challenge','Last.FM Submit Challenge','','25','string','internal');
} // install
@@ -172,15 +172,15 @@ class AmpacheLastfm {
*/
public function load($data,$user_id) {
- if (strlen($data['lastfm_user'])) {
- $this->username = $data['lastfm_user'];
+ if (strlen(trim($data['lastfm_user']))) {
+ $this->username = trim($data['lastfm_user']);
}
else {
debug_event('LastFM','No Username, not scrobbling','3');
return false;
}
- if (strlen($data['lastfm_pass'])) {
- $this->password = $data['lastfm_pass'];
+ if (strlen(trim($data['lastfm_pass']))) {
+ $this->password = trim($data['lastfm_pass']);
}
else {
debug_event('LastFM','No Password, not scrobbling','3');
diff --git a/shout.php b/shout.php
index ba7ba796..a3514612 100644
--- a/shout.php
+++ b/shout.php
@@ -32,7 +32,7 @@ switch ($_REQUEST['action']) {
}
$shout_id = shoutBox::create($_POST);
-
+ header("Location:" . Config::get('web_path'));
break;
case 'show_add_shout':
// Get our object first
@@ -41,6 +41,9 @@ switch ($_REQUEST['action']) {
// Now go ahead and display the page where we let them add a comment etc
require_once Config::get('prefix') . '/templates/show_add_shout.inc.php';
break;
+ case 'show_manage':
+
+ break;
default:
break;
diff --git a/templates/show_flagged.inc.php b/templates/show_flagged.inc.php
index e8eb0b72..39c93c0e 100644
--- a/templates/show_flagged.inc.php
+++ b/templates/show_flagged.inc.php
@@ -24,7 +24,6 @@ $web_path = Config::get('web_path');
<form id="songs" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/flag.php?action=reject_flags">
<table class="tabledata" cellpadding="0" cellspacing="0">
<colgroup>
- <col id="col_select" />
<col id="col_object" />
<col id="col_username" />
<col id="col_flag" />
@@ -33,7 +32,6 @@ $web_path = Config::get('web_path');
<col id="col_action" />
</colgroup>
<tr class="th-top">
- <th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo _('Select'); ?></a></th>
<th class="cel_object"><?php echo _('Object'); ?></th>
<th class="cel_username"><?php echo _('User'); ?></th>
<th class="cel_flag"><?php echo _('Flag'); ?></th>
@@ -43,9 +41,6 @@ $web_path = Config::get('web_path');
</tr>
<?php foreach ($flagged as $data) { $flag = new Flag($data); ?>
<tr class="<?php echo flip_class(); ?>">
- <td class="cel_select">
- <input type="checkbox" name="song[]" value="<?php echo $flag->id; ?>" id="song_<?php echo $flag->id; ?>" />
- </td>
<td class="cel_object"><a href="<?php echo Config::get('web_path'); ?>/admin/flag.php?action=show_edit_song&song=<?php echo $flag->object_id; ?>"><?php $flag->print_name(); ?></a></td>
<td class="cel_username"><?php echo scrub_out($flag->f_user_username); ?></td>
<td class="cel_flag"><?php $flag->print_flag(); ?></td>
@@ -69,7 +64,6 @@ $web_path = Config::get('web_path');
</tr>
<?php } ?>
<tr class="th-bottom">
- <th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo _('Select'); ?></a></th>
<th class="cel_object"><?php echo _('Object'); ?></th>
<th class="cel_username"><?php echo _('User'); ?></th>
<th class="cel_flag"><?php echo _('Flag'); ?></th>
@@ -78,16 +72,4 @@ $web_path = Config::get('web_path');
<th class="cel_action"><?php echo _('Action'); ?></th>
</tr>
</table>
-<div class="formValidation">
- <select name="update_action">
- <option value="reject"><?php echo _('Reject'); ?></option>
- <option value="approve"><?php echo _('Approve'); ?></option>
- </select>
- <input class="button" type="submit" value="<?php echo _('Update'); ?>" />
-</div>
</form>
-<div>
- <a class="button" href="<?php echo $web_path; ?>/admin/flag.php?action=show_flagged">
- <?php echo _('Show All'); ?>...
- </a>
-</div>
diff --git a/templates/show_index.inc.php b/templates/show_index.inc.php
index 5dbdf08b..50637547 100644
--- a/templates/show_index.inc.php
+++ b/templates/show_index.inc.php
@@ -28,17 +28,6 @@ if (isset($_REQUEST['xspf']) && isset ($_REQUEST['play_info'])){
<div id="now_playing">
<?php show_now_playing(); ?>
</div> <!-- Close Now Playing Div -->
-<!-- Sticky Objects, if sticky is enabled -->
-<?php if (Config::get('shoutbox')) { ?>
-<div id="shout_objects">
- <?php
- $shouts = shoutBox::get_top('5');
- if (count($shouts)) {
- require_once Config::get('prefix') . '/templates/show_shoutbox.inc.php';
- }
- ?>
-</div>
-<?php } ?>
<!-- Randomly selected albums of the moment -->
<div id="random_selection">
<?php
@@ -55,3 +44,15 @@ if (isset($_REQUEST['xspf']) && isset ($_REQUEST['play_info'])){
show_box_bottom();
?>
</div>
+<!-- Shoutbox Objects, if shoutbox is enabled -->
+<?php if (Config::get('shoutbox')) { ?>
+<div id="shout_objects">
+ <?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_shoutbox.inc.php b/templates/show_shoutbox.inc.php
index 8274f716..72da5ac1 100644
--- a/templates/show_shoutbox.inc.php
+++ b/templates/show_shoutbox.inc.php
@@ -20,7 +20,7 @@
*/
?>
<?php show_box_top(_('Shoutbox')); ?>
-<table class="tabledata" cellpadding="0" cellspacing="0">
+<div id="shoutbox">
<?php foreach ($shouts as $shout_id) {
$shout = new shoutBox($shout_id);
$object = shoutBox::get_object($shout->object_type,$shout->object_id);
@@ -28,17 +28,12 @@
$client = new User($shout->user);
$client->format();
?>
-<tr>
- <td class="cel_image">
- <?php echo $shout->get_image(); ?><br />
+<div class="shout">
<strong><?php echo ucfirst($shout->object_type); ?>:</strong> <?php echo $object->f_link; ?><br />
- </td>
- <td valign="top" class="cel_comment">
- <?php echo scrub_out($shout->text); ?>
- <br />
- <span class="information">- <?php echo $client->f_link; ?> <?php echo date("d/m/Y H:i",$shout->date); ?></span>
- </td>
-</tr>
+ <?php echo $shout->get_image(); ?><br />
+ <?php echo scrub_out($shout->text); ?><br />
+ <span class="information"><?php echo $client->f_link; ?> <?php echo date("d/m H:i",$shout->date); ?></span>
+</div>
<?php } ?>
-</table>
+</div>
<?php show_box_bottom(); ?>
diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php
index af1be577..843a1de3 100644
--- a/templates/sidebar_admin.inc.php
+++ b/templates/sidebar_admin.inc.php
@@ -23,7 +23,11 @@
<li id="sb_admin_ot_Duplicates"><a href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo _('Find Duplicates'); ?></a></li>
<li id="sb_admin_ot_Mail"><a href="<?php echo $web_path; ?>/admin/mail.php"><?php echo _('Mail Users'); ?></a></li>
<li id="sb_admin_ot_ClearNowPlaying"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo _('Clear Now Playing'); ?></a></li>
- <li id="sb_admin_ot_ClearCatStats"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_stats"><?php echo _('Clear Catalog Stats'); ?></a></li>
+ <li id="sb_admin_ot_ClearCatStats"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_stats"><?php echo _('Clear Stats'); ?></a></li>
+ <li id="sb_admin_ot_ManageFlagged"><a href="<?php echo $web_path; ?>/admin/flag.php"><?php echo _('Manage Flagged'); ?></a></li>
+ <?php if (Config::get('shoutbox')) { ?>
+ <li id="sb_admin_ot_ManageShoutbox"><a href="<?php echo $web_path; ?>/admin/shout.php?action=show_manage"><?php echo _('Manage Shoutbox'); ?></a></li>
+ <?php } ?>
</ul>
</li>
diff --git a/themes/classic/templates/default.css b/themes/classic/templates/default.css
index 96a67a40..52b62de1 100644
--- a/themes/classic/templates/default.css
+++ b/themes/classic/templates/default.css
@@ -583,6 +583,29 @@ a.button{padding:1px 3px;}
}
/************************************************/
+/* Shoutbox */
+/************************************************/
+
+#shoutbox {
+ font-size:0.8em;
+}
+
+#shoutbox div.shout {
+ float:left;
+ margin-right:5px;
+}
+
+#shoutbox span.information {
+ float:left;
+ clear:left;
+}
+
+img.shoutboximage {
+ float:left;
+ margin-right:3px;
+}
+
+/************************************************/
/* List Header */
/************************************************/
.list-header{margin:7px 0; padding:0 4em; text-align:center; font-size: 0.8em;position:relative;}
diff --git a/themes/greysme/templates/default.css b/themes/greysme/templates/default.css
index e6354e70..7802e9ac 100644
--- a/themes/greysme/templates/default.css
+++ b/themes/greysme/templates/default.css
@@ -638,6 +638,28 @@ background:#000;
float:left;
}
+/************************************************/
+/* Shoutbox */
+/************************************************/
+
+#shoutbox {
+ font-size:0.8em;
+}
+
+#shoutbox div.shout {
+ float:left;
+ margin-right:5px;
+}
+
+#shoutbox span.information {
+ float:left;
+ clear:left;
+}
+
+img.shoutboximage {
+ float:left;
+ margin-right:3px;
+}
/************************************************/
/* List Header */
@@ -706,6 +728,11 @@ background:#000;
margin:10px;
}
+#motd {
+ margin:0 auto 0 auto;
+ width: 437px;
+}
+
/************************************************/
/* Misc */
@@ -735,3 +762,9 @@ background:#000;
display: none;
}
+.information,.information a {
+ font-size: 0.9em;
+ font-style: italic;
+ color: #c0c0c0;
+}
+
generated by cgit (git 2.34.1) at 2025-08-13 11:51:47 +0000