From: Testelocker Server <testelocker@jhpolice.gov.in>
Date: Fri, 23 Jun 2017 13:40:32 +0530
Subject: Merge branch 'develop' of https://openforge.gov.in/plugins/git/digitallocker/development_auth_partner_sm_app into develop
---
Merge branch 'develop' of https://openforge.gov.in/plugins/git/digitallocker/development_auth_partner_sm_app into develop
---


--- 'a/doc.php'
+++ b/doc.php
@@ -65,8 +65,30 @@ curl_setopt($vhf, CURLOPT_RETURNTRANSFER
 $resFile = curl_exec($vhf);
 curl_close($vhf);
 $resFileNew = explode('¿', $resFile);
-$dataF = json_decode($resFileNew[1], TRUE);
-
+//$dataF = json_decode($resFileNew[1], TRUE);
+$uriRes = json_decode($resFileNew[1]);
+$uriDir = array();
+$uriFiles = array();
+foreach ($uriRes->items as $uriI) {
+    if ($uriI->type == "dir") {
+        $uriDir[] = (array) $uriI;
+    } else {
+        $uriFiles[] = (array) $uriI;
+    }
+}
+if ($uriDir == NULL || $uriFiles == NULL) {
+    $x = array_merge($uriDir, $uriFiles);
+    foreach ($x as $y) {
+        if ($y != NULL) {
+            $uriItems[] = $y;
+        }
+    }
+} else {
+    $uriItems = array_merge($uriDir, $uriFiles);
+}
+$uriItemsArray['items'] = $uriItems;
+$dataDirectory['directory'] = $uriRes->directory;
+$dataF = json_encode(array_merge($dataDirectory, $uriItemsArray));
 
 $headers = array(
     'Authorization: Bearer ' . $access_token

--- 'a/uploaddoc.php'
+++ b/uploaddoc.php
@@ -65,8 +65,30 @@ curl_setopt($vhf, CURLOPT_RETURNTRANSFER
 $resFile = curl_exec($vhf);
 curl_close($vhf);
 $resFileNew = explode('¿', $resFile);
-$dataF = json_decode($resFileNew[1], TRUE);
-
+//$dataF = json_decode($resFileNew[1], TRUE);
+$uriRes = json_decode($resFileNew[1]);
+$uriDir = array();
+$uriFiles = array();
+foreach ($uriRes->items as $uriI) {
+    if ($uriI->type == "dir") {
+        $uriDir[] = (array) $uriI;
+    } else {
+        $uriFiles[] = (array) $uriI;
+    }
+}
+if ($uriDir == NULL || $uriFiles == NULL) {
+    $x = array_merge($uriDir, $uriFiles);
+    foreach ($x as $y) {
+        if ($y != NULL) {
+            $uriItems[] = $y;
+        }
+    }
+} else {
+    $uriItems = array_merge($uriDir, $uriFiles);
+}
+$uriItemsArray['items'] = $uriItems;
+$dataDirectory['directory'] = $uriRes->directory;
+$dataF = json_encode(array_merge($dataDirectory, $uriItemsArray));
 include 'header.php';
 ?>
 <style>