make ampache work with remote.php

diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php
index 26cb2045549882e6dd630f2d36390d462950dfd2..0ab6543e070c85acae176931dd2fd961b6eeccb0 100755 (executable)
--- a/apps/media/appinfo/app.php
+++ b/apps/media/appinfo/app.php
@@ -32,3 +32,4 @@ OCP\App::register( array( 'order' => 3, 'id' => 'media', 'name' => 'Media' ));
 OCP\App::addNavigationEntry(array('id' => 'media_index', 'order' => 2, 'href' => OCP\Util::linkTo('media', 'index.php'), 'icon' => OCP\Util::imagePath('core', 'places/music.svg'), 'name' => $l->t('Music')));
 
 OC_Search::registerProvider('OC_MediaSearchProvider');
+OCP\CONFIG::setAppValue('core', 'remote_ampache', '/apps/media/remote.php');
\ No newline at end of file

diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php
index d658605611c41c4447812bdd865d494d9674426f..510aba3f7e78bec241709f7353b395f44d715595 100755 (executable)
--- a/apps/media/lib_ampache.php
+++ b/apps/media/lib_ampache.php
@@ -207,7 +207,7 @@ class OC_MEDIA_AMPACHE{
                echo("\t\t<title>$name</title>\n");
                echo("\t\t<artist id='$artist'>$artistName</artist>\n");
                echo("\t\t<album id='$album'>$albumName</album>\n");
-               $url=OCP\Util::linkToAbsolute('media', 'server/xml.server.php')."?action=play&song=$id&auth={$_GET['auth']}";
+               $url=OCP\Util::linkToAbsolute('remote.php', 'ampache/server/xml.server.php/')."?action=play&song=$id&auth={$_GET['auth']}";
                $url=self::fixXmlString($url);
                echo("\t\t<url>$url</url>\n");
                echo("\t\t<time>{$song['song_length']}</time>\n");

diff --git a/apps/media/remote.php b/apps/media/remote.php
new file mode 100644 (file)
index 0000000..8a88c2b
--- /dev/null
+++ b/apps/media/remote.php
@@ -0,0 +1,7 @@
+<?php
+if($path_info == '/ampache' || $path_info == '/ampache/'){
+       require_once(OC::$APPSROOT . '/apps/media/index.php');
+}else{
+       require_once(OC::$APPSROOT . '/apps/media/server/xml.server.php');
+}
+?>
\ No newline at end of file

diff --git a/apps/media/server/xml.server.php b/apps/media/server/xml.server.php
index 63f2a51dcb51dbc6562261fd460ac975d1f3b79a..6cb6c91ca06bdffdb317f2427f85ec985ca610d2 100755 (executable)
--- a/apps/media/server/xml.server.php
+++ b/apps/media/server/xml.server.php
@@ -21,8 +21,6 @@
 * 
 */
 
-require_once('../../inc.php');
-
 OCP\App::checkAppEnabled('media');
  require_once(OC::$APPSROOT . '/apps/media/lib_collection.php');
  require_once(OC::$APPSROOT . '/apps/media/lib_ampache.php');

diff --git a/lib/helper.php b/lib/helper.php
index 5422d88398d76974386df160fe0e7c94881ab00c..757f562bfed2189be83c52dece447f8d538a480b 100644 (file)
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -41,15 +41,15 @@ class OC_Helper {
                        $app .= '/';
                        // Check if the app is in the app folder
                        if( file_exists( OC::$APPSROOT . '/apps/'. $app.$file )){
-                               if(substr($file, -3) == 'php' || substr($file, -3) == 'css'){   
+                               //if(substr($file, -3) == 'php' || substr($file, -3) == 'css'){ 
                                        if(substr($app, -1, 1) == '/'){
                                                $app = substr($app, 0, strlen($app) - 1);
                                        }
                                        $urlLinkTo =  OC::$WEBROOT . '/?app=' . $app;
                                        $urlLinkTo .= ($file!='index.php')?'&getfile=' . urlencode($file):'';
-                               }else{
-                                       $urlLinkTo =  OC::$APPSWEBROOT . '/apps/' . $app . $file;
-                               }
+                               //}else{
+                               //      $urlLinkTo =  OC::$APPSWEBROOT . '/apps/' . $app . $file;
+                               //}
                        }
                        else{
                                $urlLinkTo =  OC::$WEBROOT . '/' . $app . $file;