Add filename parameter to file pre-uplaod.

Author: GhaziTriki

src/Parameters/CreateMeetingParameters.php

@@ -525,9 +525,13 @@ public function getPresentations()
      *
      * @return CreateMeetingParameters
      */
-    public function addPresentation($nameOrUrl, $content = null)
+    public function addPresentation($nameOrUrl, $content = null, $filname = null)
     {
-        $this->presentations[$nameOrUrl] = !$content ?: base64_encode($content);
+        if (!$filname) {
+            $this->presentations[$nameOrUrl] = !$content ?: base64_encode($content);
+        } else {
+            $this->presentations[$nameOrUrl] = $filname;
+        }
 
         return $this;
     }
@@ -542,8 +546,12 @@ public function getPresentationsAsXML()
             $module->addAttribute('name', 'presentation');
 
             foreach ($this->presentations as $nameOrUrl => $content) {
-                if ($this->presentations[$nameOrUrl] === true) {
-                    $module->addChild('document')->addAttribute('url', $nameOrUrl);
+                if (strpos($nameOrUrl, 'http') === 0) {
+                    $presentation = $module->addChild('document');
+                    $presentation->addAttribute('url', $nameOrUrl);
+                    if (is_string($content)) {
+                        $presentation->addAttribute('filename', $content);
+                    }
                 } else {
                     $document = $module->addChild('document');
                     $document->addAttribute('name', $nameOrUrl);

tests/BigBlueButtonTest.php

@@ -107,6 +107,20 @@ public function testCreateMeetingWithDocumentUrl()
         $this->assertEquals('SUCCESS', $result->getReturnCode());
     }
 
+    /**
+     * Test create meeting with a document URL and filename
+     */
+    public function testCreateMeetingWithDocumentUrlAndFileName()
+    {
+        $params = $this->getCreateMock($this->generateCreateParams());
+        $params->addPresentation('https://placeholdit.imgix.net/~text?txtsize=96&bg=30406B&txtclr=ffffff&txt=BigBlueButton&w=800&h=600', null, 'placeholder.png');
+
+        $result = $this->bbb->createMeeting($params);
+
+        $this->assertCount(1, $params->getPresentations());
+        $this->assertEquals('SUCCESS', $result->getReturnCode());
+    }
+
     /**
      * Test create meeting with a document URL
      */

tests/Parameters/CreateMeetingParametersTest.php

@@ -58,4 +58,28 @@ public function testCreateMeetingParameters()
         $this->assertEquals($newName, $createMeetingParams->getMeetingName());
         $this->assertEquals($newId, $createMeetingParams->getMeetingId());
     }
+
+    public function testGetPresentationsAsXMLWithUrl()
+    {
+        $params              = $this->generateCreateParams();
+        $createMeetingParams = $this->getCreateMock($params);
+        $createMeetingParams->addPresentation('http://test-install.blindsidenetworks.com/default.pdf');
+        $this->assertXmlStringEqualsXmlFile(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'fixtures' . DIRECTORY_SEPARATOR . 'presentation_with_url.xml', $createMeetingParams->getPresentationsAsXML());
+    }
+
+    public function testGetPresentationsAsXMLWithUrlAndFilename()
+    {
+        $params              = $this->generateCreateParams();
+        $createMeetingParams = $this->getCreateMock($params);
+        $createMeetingParams->addPresentation('http://test-install.blindsidenetworks.com/default.pdf', null, 'presentation.pdf');
+        $this->assertXmlStringEqualsXmlFile(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'fixtures' . DIRECTORY_SEPARATOR . 'presentation_with_filename.xml', $createMeetingParams->getPresentationsAsXML());
+    }
+
+    public function testGetPresentationsAsXMLWithFile()
+    {
+        $params              = $this->generateCreateParams();
+        $createMeetingParams = $this->getCreateMock($params);
+        $createMeetingParams->addPresentation('bbb_logo.png', file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'fixtures' . DIRECTORY_SEPARATOR . 'bbb_logo.png'));
+        $this->assertXmlStringEqualsXmlFile(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'fixtures' . DIRECTORY_SEPARATOR . 'presentation_with_embedded_file.xml', $createMeetingParams->getPresentationsAsXML());
+    }
 }

tests/fixtures/presentation_with_embedded_file.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<modules>
+    <module name="presentation">
+        <document url="http://test-install.blindsidenetworks.com/default.pdf" filename="presentation.pdf"/>
+    </module>
+</modules>

tests/fixtures/presentation_with_filename.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<modules>
+    <module name="presentation">
+        <document url="http://test-install.blindsidenetworks.com/default.pdf"/>
+    </module>
+</modules>