Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

authpartner

Clone or download

Merge branch 'develop' of https://openforge.gov.in/plugins/git/digitallocker/development_auth_partner_sm_app into develop

Download Browse
+49 −6
Testelocker Server 2017-06-27 11:20
Testelocker Server 2017-06-27 11:20
e507e93c8350dbf573e3c14b0b027ef7aabfea54
git #authpartner/e507e93c8350dbf573e3c14b0b027ef7aabfea54

Modified Files

List
Side by side diff
M css/styles.css
+2 −1
--- 'a/css/styles.css'
+++ b/css/styles.css
@@ -1724,7 +1724,8 @@ body.opened-nav-animate.opened-nav .main
#footer-copyright {
padding: 30px 0 0 0 ;
color: #ffffff;
- text-align: center; }
+ text-align: center;
+ }
#footer-copyright .container .social-nav,
#footer-copyright .container .footer-copyright {
margin-bottom: 10px; }
M doc.php
+24 −3
--- 'a/doc.php'
+++ b/doc.php
@@ -65,8 +65,29 @@ curl_setopt($vhf, CURLOPT_RETURNTRANSFER
$resFile = curl_exec($vhf);
curl_close($vhf);
$resFileNew = explode('¿', $resFile);
-$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 = array_merge($dataDirectory, $uriItemsArray);
$headers = array(
'Authorization: Bearer ' . $access_token
@@ -170,7 +191,7 @@ include 'header.php';
<div id="issueddocument" class="tab-pane">
<section class="content">
<div class="row">
- <div class="col-md-12" style="height:315px;">
+ <div class="col-md-12">
<div class="box box-body col-sm-12">
<div class="table-responsive">
<table class="table">
M uploaddoc.php
+23 −2
--- 'a/uploaddoc.php'
+++ b/uploaddoc.php
@@ -65,8 +65,29 @@ curl_setopt($vhf, CURLOPT_RETURNTRANSFER
$resFile = curl_exec($vhf);
curl_close($vhf);
$resFileNew = explode('¿', $resFile);
-$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 = array_merge($dataDirectory, $uriItemsArray);
include 'header.php';
?>
<style>