From a4f8fa460052ef4bb393ae0654f2a86e5b938f90 Mon Sep 17 00:00:00 2001
From: steve-lad <72376554+steve-lad@users.noreply.github.com>
Date: Wed, 14 Jul 2021 17:16:27 +0200
Subject: [PATCH] Impliment retrieving firmware from Provision_sccp

WIP - need to handle exceptions etc
---
 assets/js/sccp_manager.js         |  2 +-
 sccpManTraits/ajaxHelper.php      |  6 ++----
 sccpManTraits/helperFunctions.php | 35 +++++++++++++++++++++----------
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/assets/js/sccp_manager.js b/assets/js/sccp_manager.js
index ecf3ce6..6e7e7f9 100644
--- a/assets/js/sccp_manager.js
+++ b/assets/js/sccp_manager.js
@@ -516,7 +516,7 @@ $(document).ready(function () {
         if ($(this).data('id') === 'get_ext_files') {
             var dev_cmd = 'get_ext_files';
             var dev_fld = ["device"];
-            datas = 'enabled=0' + 'type=firmware' + 'name=' + '&';
+            datas = 'enabled=0' + '&' + 'type=firmware' + '&' + 'name=' + '&';
 
             for (var i = 0; i < dev_fld.length; i++) {
                 datas = datas + dev_fld[i] + '=' + $('#ext_' + dev_fld[i]).val() + '&';
diff --git a/sccpManTraits/ajaxHelper.php b/sccpManTraits/ajaxHelper.php
index b9b20d9..67c5775 100644
--- a/sccpManTraits/ajaxHelper.php
+++ b/sccpManTraits/ajaxHelper.php
@@ -384,12 +384,10 @@ trait ajaxHelper {
             case 'validateMac':
                 break;
             case 'get_ext_files':
-                dbug('request is ', $_REQUEST);
-                return true;
+                $result = $this->getFilesFromProvisioner($request['type'],$request['name'],$request['device']);
+                return $result;
                 break;
-
         }
-
     }
 
     function handleSubmit($request, $validateonly = false) {
diff --git a/sccpManTraits/helperFunctions.php b/sccpManTraits/helperFunctions.php
index 69950e7..6f4e4f1 100644
--- a/sccpManTraits/helperFunctions.php
+++ b/sccpManTraits/helperFunctions.php
@@ -272,21 +272,34 @@ trait helperfunctions {
     }
 
     public function getFilesFromProvisioner($type = "",$name = "",$device = "") {
-
+        $filesToGet = array();
         $provisionerUrl = "https://github.com/dkgroot/provision_sccp/raw/master/";
+        if (!$tftpBootXml = simplexml_load_file("{$this->sccppath['tftp_path']}/masterFilesStructure.xml")) {
+            $this->getFileListFromProvisioner();
+            $tftpBootXml = simplexml_load_file("{$this->sccppath['tftp_path']}/masterFilesStructure.xml");
+        }
+        switch ($type) {
+            case 'firmware':
+                if (!is_dir("{$this->sccppath['tftp_path']}/firmware/{$device}")) {
+                    mkdir("{$this->sccppath['tftp_path']}/firmware/{$device}", 0755);
+                }
+                $firmwareDir = $tftpBootXml->xpath("//Directory[@name='firmware']");
+                $result = $firmwareDir[0]->xpath("//Directory[@name={$device}]");
+                $filesToGet = (array)$result[0]->FileName;
+                foreach ($filesToGet as $srcFile) {
+                    file_put_contents("{$this->sccppath['tftp_path']}/firmware/{$device}/{$srcFile}",
+                        file_get_contents("{$provisionerUrl}" . (string)$result[0]->DirectoryPath . $srcFile));
+                }
+            return "thanks for trying Diederik :-)";
+            break;
 
-        // Get master tftpboot directory structure
-        $xmlData = simplexml_load_file("{$provisionerUrl}tools/tftpbootFiles.xml");
-        // Ringtones
-        $ringDir = 'tftpboot/ringtones/';
-        $ringList = 'ringlist.xml';
-        //$xmlData = simplexml_load_file("{$provisionerUrl}{$ringDir}{$ringList}");
-        //preg_match_all("|>([0-9a-z]+.xml)</a></span>|U", $availableFiles, $out);
-        foreach ($xmlData as $child) {
-            $fileToSave = str_replace("\\","/",(string)$child->FileName);
-            file_put_contents("{$this->sccppath['tftp_path']}/{$fileToSave}",file_get_contents("{$provisionerUrl}{$fileToSave}"));
+          default:
+              return false;
+              break;
         }
     }
+    file_get_contents(https://github.com/dkgroot/provision_sccp/raw/master/tftpboot/firmware/7911/SCCP11.9-4-2SR3-1S.loads): failed to open stream: HTTP request failed! HTTP/1.1 404 Not Found
+    File:/var/www/html/admin/modules/sccp_manager/sccpManTraits/helperFunctions.php:291
 
     public function initVarfromXml() {
         if ((array) $this->xml_data) {