yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-03 17:59:21 +02:00
Code Issues Releases Wiki Activity

1) bug fix: in createDIDL sometimes comes single item, not array. But array is expected. And method crashes.

Browse source 
Fix: detect if single item is come and convert it to array

2) fix bug with "<?xml..." parse error when php option - short tags - is set

3) upnp broadcast sending page
added button for automatically periodical page refresh for sending broadcast packets without cron, for development purposes

4) Plugins class optimization, method get_plugins
make static cache for optimization when multiple call
This commit is contained in:
SeregaPru 2014-09-12 09:46:30 +04:00
parent fd1d06d055
commit e75a38a007
4 changed files with 43 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/class/plugin.class.php
View file

@ -73,7 +73,12 @@ class Plugin
*/ */
public static function get_plugins($type='') public static function get_plugins($type='')
{ {
$results = array(); // make static cache for optimization when multiple call
static $plugins_list;
if (!is_null($plugins_list))
return $plugins_list;
$plugins_list = array();
// Open up the plugin dir // Open up the plugin dir
$handle = opendir(AmpConfig::get('prefix') . '/modules/plugins'); $handle = opendir(AmpConfig::get('prefix') . '/modules/plugins');
@ -104,13 +109,13 @@ class Plugin
} }
} }
// It's a plugin record it // It's a plugin record it
$results[$plugin_name] = $plugin_name; $plugins_list[$plugin_name] = $plugin_name;
} // end while } // end while
// Little stupid but hey // Little stupid but hey
ksort($results); ksort($plugins_list);
return $results; return $plugins_list;
} // get_plugins } // get_plugins

11
lib/class/upnp_api.class.php
View file

@ -172,8 +172,19 @@ class Upnp_Api
return $xmlDoc; return $xmlDoc;
} }
# sometimes here comes only one single item, not an array. Convert it to array. (TODO - UGLY)
if ( (count($prmItems) > 0) && (!is_array($prmItems[0])) ) {
$prmItems = array($prmItems);
}
# Add each item in $prmItems array to $ndDIDL: # Add each item in $prmItems array to $ndDIDL:
foreach ($prmItems as $item) { foreach ($prmItems as $item) {
if (!is_array($item)) {
debug_event('upnp_class', 'item is not array', 2);
debug_event('upnp_class', $item, '5');
continue;
}
if ($item['upnp:class'] == 'object.container') { if ($item['upnp:class'] == 'object.container') {
$ndItem = $xmlDoc->createElement('container'); $ndItem = $xmlDoc->createElement('container');
} else { } else {

5
upnp/MediaServerServiceDesc.php
View file

@ -8,9 +8,10 @@ if (!AmpConfig::get('upnp_backend')) {
} }
header ("Content-Type:text/xml"); header ("Content-Type:text/xml");
$web_path = AmpConfig::get('raw_web_path'); $web_path = AmpConfig::get('local_web_path');
echo '<?xml version="1.0" encoding="UTF-8"?>';
?> ?>
<?xml version="1.0" encoding="UTF-8"?>
<root xmlns="urn:schemas-upnp-org:device-1-0"> <root xmlns="urn:schemas-upnp-org:device-1-0">
<specVersion> <specVersion>
<major>1</major> <major>1</major>

31
upnp/index.php
View file

@ -1,7 +1,25 @@
<?php
define('NO_SESSION','1');
require_once '../lib/init.php';
if (!AmpConfig::get('upnp_backend')) {
echo "Disabled.";
exit;
}
if (($_GET['btnSend']) || ($_GET['btnSendAuto'])) {
Upnp_Api::sddpSend($msIP);
}
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!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"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<?php
if ($_GET['btnSendAuto']) {
echo '<meta http-equiv="refresh" content="10">';
}
?>
<title>Ampache UPnP</title> <title>Ampache UPnP</title>
<style type="text/css" media="screen"> <style type="text/css" media="screen">
body { body {
@ -16,15 +34,6 @@ body {
</head> </head>
<body> <body>
<?php
define('NO_SESSION','1');
require_once '../lib/init.php';
if (!AmpConfig::get('upnp_backend')) {
echo "Disabled.";
exit;
}
?>
<form method="get" action=""> <form method="get" action="">
<label>Ampache UPnP backend enabled. <label>Ampache UPnP backend enabled.
</label> </label>
@ -32,11 +41,11 @@ if (!AmpConfig::get('upnp_backend')) {
<br /> <br />
<br /> <br />
<input type="submit" name="btnSend" id="id-btnSend" value="Send SSDP broadcast" /> <input type="submit" name="btnSend" id="id-btnSend" value="Send SSDP broadcast" />
<input type="submit" name="btnSendAuto" id="id-btnSendAuto" value="Send SSDP broadcast every 10 sec" />
</form> </form>
<br /> <br />
<?php <?php
if ($_GET['btnSend']) { if (($_GET['btnSend']) || ($_GET['btnSendAuto'])) {
Upnp_Api::sddpSend($msIP);
echo 'SSDP sent at '.date('H:i:s').'.'; echo 'SSDP sent at '.date('H:i:s').'.';
} }
?> ?>