1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-05 02:39:47 +02:00

updates, ajax kind of broken right now its late

This commit is contained in:
Karl 'vollmerk' Vollmer 2006-10-09 09:00:47 +00:00
parent 78590d7d51
commit f79a2489c1
10 changed files with 138 additions and 403 deletions

View file

@ -4,7 +4,10 @@
--------------------------------------------------------------------------
v.3.3.3-Alpha1
- Fixed display of disabled localplay methods, Preferences wil
- Tweaked Kajax, now accepts an array of elements to replace
from a passed xml document. allows for multiple targets
on a single ajax request
- Fixed display of disabled localplay methods, Preferences will
now only display active ones.
- Fixed MPD Controller to attempt to find files based on filename
if they were added outside of ampache

View file

@ -40,12 +40,17 @@ $action = scrub_in($_REQUEST['action']);
if (conf('refresh_limit') > 5) {
$ajax_url = conf('web_path') . '/server/ajax.server.php?action=reloadnp&user_id=' . $GLOBALS['user']->id .
'&sessid=' . session_id();
$ajax_object = 'nowplaying';
$ajax_object = 'np_refresh';
require_once(conf('prefix') . '/templates/javascript_refresh.inc.php');
}
?>
<div id="nowplaying">
<script language="javascript" type="text/javascript">
<!--
var np_refresh = new Array(1);
np_refresh[0] = "np_data";
-->
</script>
<div id="np_data">
<?php show_now_playing(); ?>
</div> <!-- Close Now Playing Div -->

View file

@ -534,7 +534,7 @@ class Localplay {
* of the current player state
*/
function get_user_state($state) {
switch ($state) {
case 'play':
return _('Now Playing');
@ -552,6 +552,29 @@ class Localplay {
} // get_user_state
/**
* get_user_playing
* This attempts to return a nice user friendly
* currently playing string
*/
function get_user_playing() {
$status = $this->status();
/* Format the track name */
$track_name = $status['track_artist'] . ' - ' . $status['track_album'] . ' - ' . $status['track_title'];
/* This is a cheezball fix for when we were unable to find a
* artist/album (or one wasn't provided)
*/
$track_name = ltrim(ltrim($track_name,' - '),' - ');
$track_name = "[" . $status['track'] . "] - " . $track_name;
return $track_name;
} // get_user_playing
} //end localplay class
?>

View file

@ -1334,5 +1334,29 @@ function get_user_icon($name) {
} // show_icon
/**
* xml_from_array
* This takes a one dimensional array and
* creates a XML document form it for use
* primarly by the ajax mojo
*/
function xml_from_array($array) {
$escape_array = array ('<','&');
$replace_array = array('&lt;','&amp;');
$string = "<root>\n";
foreach ($array as $key=>$value) {
/* We need to escape the value */
$value = str_replace($escape_array,$replace_array,$value);
$string .= "\t<$key>$value</$key>\n";
}
$string .= "</root>\n";
return $string;
} // xml_from_array
?>

View file

@ -25,7 +25,8 @@
http_request.open('GET', url, true);
http_request.send(null);
}
// uid is an array of uids that need to be replaced
function ajaxPut(url,uid) {
if (window.ActiveXObject) { // IE
try {
@ -52,7 +53,10 @@
function getContents(http_request,uid) {
if (http_request.readyState == 4) {
data = http_request.responseText;
document.getElementById(uid).innerHTML = data;
data = http_request.responseXML;
for(i=0;i<uid.length;i++) {
var new_txt = data.getElementsByTagName(uid[i])[0].firstChild.nodeValue;
document.getElementById(uid[i]).innerHTML = new_txt;
}
}
}

View file

@ -1,373 +0,0 @@
<?php
/*
SAJAX PHP BACKEND
-----------------
Contributed and copyighted by Thomas Lackner and ModernMethod
(http://www.modernmethod.com/).
Licence: GNU/GPL
*/
if (!isset($SAJAX_INCLUDED)) {
/*
* GLOBALS AND DEFAULTS
*
*/
$GLOBALS['sajax_version'] = '0.12';
$GLOBALS['sajax_debug_mode'] = 0;
$GLOBALS['sajax_export_list'] = array();
$GLOBALS['sajax_request_type'] = 'GET';
$GLOBALS['sajax_remote_uri'] = '';
$GLOBALS['sajax_failure_redirect'] = '';
/*
* CODE
*
*/
//
// Initialize the Sajax library.
//
function sajax_init() {
}
//
// Helper function to return the script's own URI.
//
function sajax_get_my_uri() {
return $_SERVER["REQUEST_URI"];
}
$sajax_remote_uri = sajax_get_my_uri();
//
// Helper function to return an eval()-usable representation
// of an object in JavaScript.
//
function sajax_get_js_repr($value) {
$type = gettype($value);
if ($type == "boolean") {
return ($value) ? "Boolean(true)" : "Boolean(false)";
}
elseif ($type == "integer") {
return "parseInt($value)";
}
elseif ($type == "double") {
return "parseFloat($value)";
}
elseif ($type == "array" || $type == "object" ) {
//
// XXX Arrays with non-numeric indices are not
// permitted according to ECMAScript, yet everyone
// uses them.. We'll use an object.
//
$s = "{ ";
if ($type == "object") {
$value = get_object_vars($value);
}
foreach ($value as $k=>$v) {
$esc_key = sajax_esc($k);
if (is_numeric($k))
$s .= "$k: " . sajax_get_js_repr($v) . ", ";
else
$s .= "\"$esc_key\": " . sajax_get_js_repr($v) . ", ";
}
if (count($value))
$s = substr($s, 0, -2);
return $s . " }";
}
else {
$esc_val = sajax_esc($value);
$s = "'$esc_val'";
return $s;
}
}
function sajax_handle_client_request() {
global $sajax_export_list;
$mode = "";
if (! empty($_GET["rs"]))
$mode = "get";
if (!empty($_POST["rs"]))
$mode = "post";
if (empty($mode))
return;
$target = "";
if ($mode == "get") {
// Bust cache in the head
header ("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past
header ("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
// always modified
header ("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
header ("Pragma: no-cache"); // HTTP/1.0
$func_name = $_GET["rs"];
if (! empty($_GET["rsargs"]))
$args = $_GET["rsargs"];
else
$args = array();
}
else {
$func_name = $_POST["rs"];
if (! empty($_POST["rsargs"]))
$args = $_POST["rsargs"];
else
$args = array();
}
if (! in_array($func_name, $sajax_export_list))
echo "-:$func_name not callable";
else {
echo "+:";
$result = call_user_func_array($func_name, $args);
echo "var res = " . trim(sajax_get_js_repr($result)) . "; res;";
}
exit;
}
function sajax_get_common_js() {
global $sajax_debug_mode;
global $sajax_request_type;
global $sajax_remote_uri;
global $sajax_failure_redirect;
$t = strtoupper($sajax_request_type);
if ($t != "" && $t != "GET" && $t != "POST")
return "// Invalid type: $t.. \n\n";
ob_start();
?>
// remote scripting library
// (c) copyright 2005 modernmethod, inc
var sajax_debug_mode = <?php echo $sajax_debug_mode ? "true" : "false"; ?>;
var sajax_request_type = "<?php echo $t; ?>";
var sajax_target_id = "";
var sajax_failure_redirect = "<?php echo $sajax_failure_redirect; ?>";
function sajax_debug(text) {
if (sajax_debug_mode)
alert(text);
}
function sajax_init_object() {
sajax_debug("sajax_init_object() called..")
var A;
var msxmlhttp = new Array(
'Msxml2.XMLHTTP.5.0',
'Msxml2.XMLHTTP.4.0',
'Msxml2.XMLHTTP.3.0',
'Msxml2.XMLHTTP',
'Microsoft.XMLHTTP');
for (var i = 0; i < msxmlhttp.length; i++) {
try {
A = new ActiveXObject(msxmlhttp[i]);
} catch (e) {
A = null;
}
}
if(!A && typeof XMLHttpRequest != "undefined")
A = new XMLHttpRequest();
if (!A)
sajax_debug("Could not create connection object.");
return A;
}
var sajax_requests = new Array();
function sajax_cancel() {
for (var i = 0; i < sajax_requests.length; i++)
sajax_requests[i].abort();
}
function sajax_do_call(func_name, args) {
var i, x, n;
var uri;
var post_data;
var target_id;
sajax_debug("in sajax_do_call().." + sajax_request_type + "/" + sajax_target_id);
target_id = sajax_target_id;
if (typeof(sajax_request_type) == "undefined" || sajax_request_type == "")
sajax_request_type = "GET";
uri = "<?php echo $sajax_remote_uri; ?>";
if (sajax_request_type == "GET") {
if (uri.indexOf("?") == -1)
uri += "?rs=" + escape(func_name);
else
uri += "&rs=" + escape(func_name);
uri += "&rst=" + escape(sajax_target_id);
uri += "&rsrnd=" + new Date().getTime();
for (i = 0; i < args.length-1; i++)
uri += "&rsargs[]=" + escape(args[i]);
post_data = null;
}
else if (sajax_request_type == "POST") {
post_data = "rs=" + escape(func_name);
post_data += "&rst=" + escape(sajax_target_id);
post_data += "&rsrnd=" + new Date().getTime();
for (i = 0; i < args.length-1; i++)
post_data = post_data + "&rsargs[]=" + escape(args[i]);
}
else {
alert("Illegal request type: " + sajax_request_type);
}
x = sajax_init_object();
if (x == null) {
if (sajax_failure_redirect != "") {
location.href = sajax_failure_redirect;
return false;
} else {
sajax_debug("NULL sajax object for user agent:\n" + navigator.userAgent);
return false;
}
} else {
x.open(sajax_request_type, uri, true);
// window.open(uri);
sajax_requests[sajax_requests.length] = x;
if (sajax_request_type == "POST") {
x.setRequestHeader("Method", "POST " + uri + " HTTP/1.1");
x.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
}
x.onreadystatechange = function() {
if (x.readyState != 4)
return;
sajax_debug("received " + x.responseText);
var status;
var data;
var txt = x.responseText.replace(/^\s*|\s*$/g,"");
status = txt.charAt(0);
data = txt.substring(2);
if (status == "") {
// let's just assume this is a pre-response bailout and let it slide for now
} else if (status == "-")
alert("Error: " + data);
else {
if (target_id != "")
document.getElementById(target_id).innerHTML = eval(data);
else {
try {
var callback;
var extra_data = false;
if (typeof args[args.length-1] == "object") {
callback = args[args.length-1].callback;
extra_data = args[args.length-1].extra_data;
} else {
callback = args[args.length-1];
}
callback(eval(data), extra_data);
} catch (e) {
sajax_debug("Caught error " + e + ": Could not eval " + data );
}
}
}
}
}
sajax_debug(func_name + " uri = " + uri + "/post = " + post_data);
x.send(post_data);
sajax_debug(func_name + " waiting..");
delete x;
return true;
}
<?php
$html = ob_get_contents();
ob_end_clean();
return $html;
}
function sajax_show_common_js() {
echo sajax_get_common_js();
}
// javascript escape a value
function sajax_esc($val)
{
$val = str_replace("\\", "\\\\", $val);
$val = str_replace("\r", "\\r", $val);
$val = str_replace("\n", "\\n", $val);
$val = str_replace("'", "\\'", $val);
return str_replace('"', '\\"', $val);
}
function sajax_get_one_stub($func_name) {
ob_start();
?>
// wrapper for <?php echo $func_name; ?>
function x_<?php echo $func_name; ?>() {
sajax_do_call("<?php echo $func_name; ?>",
x_<?php echo $func_name; ?>.arguments);
}
<?php
$html = ob_get_contents();
ob_end_clean();
return $html;
}
function sajax_show_one_stub($func_name) {
echo sajax_get_one_stub($func_name);
}
function sajax_export() {
global $sajax_export_list;
$n = func_num_args();
for ($i = 0; $i < $n; $i++) {
$sajax_export_list[] = func_get_arg($i);
}
}
$sajax_js_has_been_shown = 0;
function sajax_get_javascript()
{
global $sajax_js_has_been_shown;
global $sajax_export_list;
$html = "";
if (! $sajax_js_has_been_shown) {
$html .= sajax_get_common_js();
$sajax_js_has_been_shown = 1;
}
foreach ($sajax_export_list as $func) {
$html .= sajax_get_one_stub($func);
}
return $html;
}
function sajax_show_javascript()
{
echo sajax_get_javascript();
}
$SAJAX_INCLUDED = 1;
}
?>

View file

@ -33,6 +33,9 @@ if (!session_exists($_REQUEST['sessid'])) { exit(); }
$GLOBALS['user'] = new User($_REQUEST['user_id']);
$action = scrub_in($_REQUEST['action']);
/* Set the correct headers */
header("Content-type: application/xhtml+xml");
switch ($action) {
case 'localplay':
init_preferences();
@ -40,7 +43,32 @@ switch ($action) {
$localplay->connect();
$function = scrub_in($_GET['cmd']);
$value = scrub_in($_GET['value']);
/* Return information based on function */
switch($function) {
case 'play':
case 'stop':
case 'pause':
$results['lp_state'] = $localplay->get_user_state($function);
$results['lp_playing'] = $localplay->get_user_playing();
break;
case 'next':
case 'prev':
$results['lp_state'] = $localplay->get_user_state('play');
$results['lp_playing'] = $localplay->get_user_playing();
break;
case 'volume_up':
case 'volume_down':
case 'volume_mute':
$status = $localplay->status();
$results['lp_volume'] = $status['volume'];
break;
default:
$results = array();
break;
} // end switch on cmd
$localplay->$function($value);
$xml_doc = xml_from_array($results);
echo $xml_doc;
break;
case 'change_play_type':
init_preferences();
@ -54,11 +82,20 @@ switch ($action) {
$ajax_url = conf('web_path') . '/server/ajax.server.php';
$required_info = "&user_id=" . $GLOBALS['user']->id . "&sessid=" . session_id();
${$_GET['type']} = 'id="pt_active"';
ob_start();
require_once(conf('prefix') . '/templates/show_localplay_switch.inc.php');
$results['play_type'] = ob_get_contents();
ob_end_clean();
$xml_doc = xml_from_array($results);
echo $xml_doc;
break;
case 'reloadnp':
ob_start();
show_now_playing();
$results['np_data'] = ob_get_contents();
ob_end_clean();
$xml_doc = xml_from_array($results);
echo $xml_doc;
break;
default:
echo "Default Action";

View file

@ -23,29 +23,36 @@
$web_path = conf('web_path');
$localplay = init_localplay();
$required_info = "&amp;user_id=" . $GLOBALS['user']->id . "&amp;sessid=" . session_id();
$required_info = "&user_id=" . $GLOBALS['user']->id . "&sessid=" . session_id();
$ajax_url = $web_path . '/server/ajax.server.php';
?>
<script language="javascript" type="text/javascript">
<!--
var lp_control = new Array(2);
lp_control[0] = "lp_state";
lp_control[1] = "lp_playing";
-->
</script>
<div class="localplaycontrol" style="display:table-cell;cursor:pointer;padding:2px;">
<?php if ($localplay->has_function('prev')) { ?>
<span class="prev_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=prev<?php echo $required_info; ?>','localplay_state');return true;">
<span class="prev_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&cmd=prev<?php echo $required_info; ?>',lp_control);return true;">
<img src="<?php echo $web_path; ?>/images/localplay/prev.gif" alt="prev" />
</span>
<?php } ?>
<span class="stop_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=stop<?php echo $required_info; ?>','localplay_state');return true;">
<span class="stop_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&cmd=stop<?php echo $required_info; ?>',lp_control);return true;">
<img src="<?php echo $web_path; ?>/images/localplay/stop.gif" alt="stop" />
</span>
<?php if ($localplay->has_function('pause')) { ?>
<span class="pause_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=pause<?php echo $required_info; ?>','localplay_state');return true;">
<span class="pause_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&cmd=pause<?php echo $required_info; ?>',lp_control);return true;">
<img src="<?php echo $web_path; ?>/images/localplay/pause.gif" alt="pause" />
</span>
<?php } ?>
<span class="play_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=play<?php echo $required_info; ?>','localplay_state');return true;">
<span class="play_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&cmd=play<?php echo $required_info; ?>',lp_control);return true;">
<img src="<?php echo $web_path; ?>/images/localplay/play.gif" alt="play" />
</span>
<?php if ($localplay->has_function('next')) { ?>
<span class="next_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=next<?php echo $required_info; ?>','localplay_state');return true;">
<span class="next_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&cmd=next<?php echo $required_info; ?>',lp_control);return true;">
<img src="<?php echo $web_path; ?>/images/localplay/next.gif" alt="next" />
</span>
<?php } ?>

View file

@ -23,40 +23,39 @@
$web_path = conf('web_path');
$localplay = init_localplay();
$required_info = "&amp;user_id=" . $GLOBALS['user']->id . "&amp;sessid=" . session_id();
$required_info = "&user_id=" . $GLOBALS['user']->id . "&sessid=" . session_id();
$ajax_url = $web_path . '/server/ajax.server.php';
$status = $localplay->status();
/* Format the track name */
$track_name = $status['track_artist'] . ' - ' . $status['track_album'] . ' - ' . $status['track_title'];
/* This is a cheezball fix for when we were unable to find a
* artist/album (or one wasn't provided)
*/
$track_name = ltrim(ltrim($track_name,' - '));
?>
<strong><?php echo $localplay->get_user_state($status['state']) ?></strong><br />
&nbsp;&nbsp;<?php echo '[' . $status['track'] . '] - ' . $track_name . '<br />'; ?>
<span style="font-weight:bold;" id="lp_state"><?php echo $localplay->get_user_state($status['state']) ?></span><br />
&nbsp;&nbsp;<span id="lp_playing"><?php echo $localplay->get_user_playing(); ?></span><br />
<div align="center"><?php require (conf('prefix') . '/templates/show_localplay_control.inc.php'); ?></div>
<div align="center">
<script type="text/javascript" language="javascript">
<!--
var lp_v = new Array(1);
lp_v[0] = "lp_volume";
-->
</script>
<?php if ($localplay->has_function('volume_up')) { ?>
<span class="up_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=volume_up<?php echo $required_info; ?>','localplay_state');return true;">
<span class="up_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&cmd=volume_up<?php echo $required_info; ?>','lp_v');return true;">
<img src="<?php echo $web_path; ?>/images/localplay/volup.gif" alt="volume up" />
</span>
<?php } ?>
<?php if ($localplay->has_function('volume_down')) { ?>
<span class="down_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=volume_down<?php echo $required_info; ?>','localplay_state');return true;">
<span class="down_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&cmd=volume_down<?php echo $required_info; ?>','lp_v');return true;">
<img src="<?php echo $web_path; ?>/images/localplay/voldn.gif" alt="volume down" />
</span>
<?php } ?>
<?php if ($localplay->has_function('volume_mute')) { ?>
<span class="mute_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=volume_mute<?php echo $required_info; ?>','localplay_state');return true;">
<span class="mute_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&cmd=volume_mute<?php echo $required_info; ?>','lp_v');return true;">
<img src="<?php echo $web_path; ?>/images/localplay/volmute.gif" alt="volume mute" />
</span>
<?php } ?>
<br />
<?php echo _('Volume') . ":" . $status['volume']; ?>
<?php echo _('Volume'); ?>:<span id="lp_volume"><?php echo $status['volume']; ?></span>
</div>
<br />
<?php if ($localplay->has_function('repeat')) { ?>

View file

@ -184,9 +184,15 @@ $web_path = conf('web_path');
<br />
<?php $type = conf('play_type'); ${$type} = 'id="pt_active"'; ?>
<?php
$required_info = "&amp;user_id=" . $GLOBALS['user']->id . "&amp;sessid=" . session_id();
$required_info = "&user_id=" . $GLOBALS['user']->id . "&sessid=" . session_id();
$ajax_url = $web_path . '/server/ajax.server.php';
?>
<script type="text/javascript" language="javascript">
<!--
var lp_switch = new Array(2);
lp_switch[0] = "play_type";
-->
</script>
<span class="text-action" style="cursor:pointer;" id="play_type">
<?php require_once(conf('prefix') . '/templates/show_localplay_switch.inc.php'); ?>
</span>