Nextcloud links with index.php #41

Author: kimbtech

VERSION

@@ -1,3 +1,3 @@
-2.8.0
+2.8.1
 2.8
 2

php/classes/Config.php

@@ -77,7 +77,7 @@ class Config {
 	/**
 	 * The system's version.
 	 */
-	const VERSION = 'v2.8.0';
+	const VERSION = 'v2.8.1';
 
 	/**
 	 * The real domain which should be used.

php/classes/PodcastLoader.php

@@ -34,17 +34,21 @@ private static function loadRedis(){
 	 * Nextcloud share loader
 	 */
 	private static function loadFromNextcloud( string $url ) : array {
-		$server = substr( $url, 0, strrpos( $url , '/s/' )+1 );
-		$share = substr( $url, strlen($server)+2 );
-		$share = preg_replace( '/[^0-9A-Za-z]/', '', $share );
+		// "<server base path> / <possibly index.php> /s/ <token>"
+		if(preg_match('/^(https?\:\/\/.*)(?<!index\.php)(\/index\.php)?\/s\/([0-9A-Za-z]+)/', $url, $matches) !== 1){
+			return array();
+		}
+		$server = $matches[1]; // the base path to nextcloud
+		$useindex = !empty($matches[2]); // used index.php to access files?
+		$share = $matches[3]; // the token/ name of share
 
 		$cont = stream_context_create( array(
 			"http" => array(
 				'method' => "PROPFIND",
 				"header" => "Authorization: Basic " . base64_encode($share . ':')
 			)
 		));
-		$data = file_get_contents( $server . 'public.php/webdav/', false, $cont );
+		$data = file_get_contents( $server . '/public.php/webdav/', false, $cont );
 		$data = explode( '<d:href>', $data );
 
 		$poddata = array(
@@ -63,7 +67,7 @@ private static function loadFromNextcloud( string $url ) : array {
 				$poddata['episodes'][$eid] = array(
 					'title' => $fina,
 					'desc'  => '',
-					'url' => $server . 's/'. $share .'/download?path=%2F&files=' . rawurlencode( $fina ) 
+					'url' => $server . ($useindex ? '/index.php' : '') . '/s/'. $share .'/download?path=%2F&files=' . rawurlencode( $fina ) 
 				);
 				$eid++;
 			}