authpartner

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

Download Browse

+292 −456

Author

Suman Prasad (sumandigi) 2017-07-17 17:05

Committer

Suman Prasad (sumandigi) 2017-07-17 17:05

Hash 6ad52aeabb5c6f23faf4278ccce0e58c74412431

Parents

Reference git #authpartner/6ad52aeabb5c6f23faf4278ccce0e58c74412431

Modified Files

List

Side by side diff

Inline diff

M browse.php

+9 −3

--- 'a/browse.php'

+++ b/browse.php

@@ -3,7 +3,7 @@

$fileBrowse = $_FILES['fileUpload']['tmp_name'];

$filePath = $_POST['filePath'] . "/" . $_FILES['fileUpload']['name'];

$access_token = $_POST['accesstoken'];

-$fileContent = file_get_contents($fileBrowse);

+$fileContent = trim(file_get_contents($fileBrowse));

$finfo = new \finfo(FILEINFO_MIME_TYPE);

$mime = $finfo->buffer($fileContent);

$client_secret = $config['client_secret_upload'];

@@ -23,7 +23,13 @@ curl_setopt($ch, CURLOPT_TCP_NODELAY, 1)

curl_setopt($ch, CURLOPT_HTTPHEADER, $ur);

$output = curl_exec($ch);

curl_close($ch);

-header("Location: uploaddoc.php?code=".$_POST['code']."&state=".$_POST['state']); /* Redirect browser */

+$outputData = explode('�', $output);

+$data = (array) json_decode($outputData[1]);

+if (isset($data['size'])) {

+ $message = "File Uploaded Successfully";

+} else {

+ $message = "File Not Uploaded Successfully";

+header("Location: uploaddoc.php?code=".$_POST['code']."&state=".$_POST['state']."&message=".$message); /* Redirect browser */

exit();

\ No newline at end of file

M doc.php

+46 −34

--- 'a/doc.php'

+++ b/doc.php

@@ -1,5 +1,9 @@

<?php

include 'config.php';

+if(isset($_GET['error_description'])){

+ header("Location: index.php?message=".$_GET['error_description']);

+ exit;

$code = $_GET['code'];

$state = $_GET['state'];

$url = $config['access_token_download'];

@@ -21,11 +25,14 @@ curl_setopt($vh, CURLOPT_RETURNTRANSFER,

$result = curl_exec($vh);

curl_close($vh);

$notgettingdata = explode('�', $result);

+if(!$notgettingdata[1]){

+header("Location: index.php?message=THIS IS ERROR");

$getToken = json_decode($notgettingdata[1]);

if (isset($getToken->access_token)) {

$access_token = $getToken->access_token;

}

+$file = "xml/hashKey.xml";

if (isset($access_token)) {

$doc = new DOMDocument('1.0');

$doc->formatOutput = true;

@@ -42,12 +49,12 @@ if (isset($access_token)) {

$title = $root->appendChild($title);

$text = $doc->createTextNode($access_token);

$text = $title->appendChild($text);

- $doc->save("xml/hashKey.xml");

+ $doc->save($file);

}

-if (file_exists("xml/hashKey.xml")) {

- $xml = (array) simplexml_load_file("xml/hashKey.xml") or die("Error: Cannot create object");

+if (file_exists($file)) {

+ $xml = (array) simplexml_load_file($file) or die("Error: Cannot create object");

} else {

- echo "xml/hashKey.xml file doesnot exists";

+ echo $file. " file doesnot exists";

}

$access_token = $xml['access_token'];

@@ -66,6 +73,10 @@ $resFile = curl_exec($vhf);

curl_close($vhf);

$resFileNew = explode('�', $resFile);

$uriRes = json_decode($resFileNew[1]);

+if(isset($uriRes->error) || !$resFileNew){

+ header("Location: index.php?message=".$uriRes->error_description);

+ exit;

$uriDir = array();

$uriFiles = array();

foreach ($uriRes->items as $uriI) {

@@ -75,17 +86,9 @@ foreach ($uriRes->items as $uriI) {

$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;

+$item = "items";

+$uriItems = array_merge($uriDir, $uriFiles);

+$uriItemsArray[$item] = $uriItems;

$dataDirectory['directory'] = $uriRes->directory;

$dataF = array_merge($dataDirectory, $uriItemsArray);

@@ -129,7 +132,7 @@ include 'header.php';

- <tr>

+ <tr id="trheading">

@@ -142,10 +145,10 @@ include 'header.php';

</thead>

<?php

- foreach ((array) ($dataF['items']) as $api_detail) {

+ foreach ((array) ($dataF[$item]) as $api_detail) {

if (isset($api_detail['id'])) {

- $api_detail['id'] = $api_detail['id'];

- $api_detail['parent'] = $api_detail['parent'];

+ $api_id = $api_detail['id'];

+ $api_parent = $api_detail['parent'];

} else {

$api_detail['id'] = "";

}

@@ -153,23 +156,23 @@ include 'header.php';

<tr>

<?php

if (($api_detail['type']) == "dir") {

- echo '<td onclick="uriData(' . $api_detail['id'] . ',' . $api_detail['parent'] . ')">';

+ echo '<td onclick="uriData(' . $api_id . ',' . $api_parent . ')">';

echo '<img src="images/folder.svg"></img>';

- echo($api_detail['name']);

+ echo $api_detail['name'];

echo "</td>";

}

if ($api_detail['type'] == "file") {

echo "<td>";

echo '<img src="images/file.svg"></img>';

- echo($api_detail['name']);

+ echo $api_detail['name'];

echo "</td>";

}

- <td><?php echo($api_detail['size']); ?></td>

- <td><?php echo($api_detail['date']); ?></td>

+ <td><?php echo $api_detail['size']; ?></td>

+ <td><?php echo date("d-m-Y", strtotime($api_detail['date'])); ?></td>

<?php if ($api_detail['type'] == "file") { ?>

<td>

- <i onclick="download('<?php echo($api_detail['uri'] . ',' . $api_detail['name']); ?>')" class="fa fa-download"> </i>

+ <i onclick="download('<?php echo $api_detail['uri'] . ',' . $api_detail['name']; ?>')" class="fa fa-download"> </i>

</td>

<?php }else{

echo "<td></td>";

@@ -182,7 +185,7 @@ include 'header.php';

</table>

<a class="btn btn-default" style="float: right; margin-left: 10px; border-radius:5px;" href="payment.php">Complete Payment</a>

- <a class="btn btn-default" style="float: right; border-radius:5px;" href="index.php">Cancel</a>

+ <a class="btn btn-default" style="float: right; border-radius:5px;" href="tokan.php">Cancel</a>

</div>

@@ -209,14 +212,14 @@ include 'header.php';

<?php

echo '<img src="images/issuedfile.png"></img>';

- echo($issued_detail['name']);

+ echo $issued_detail['name'];

</td>

- <td><?php echo($issued_detail['uri']); ?></td>

- <td><?php echo($issued_detail['date']); ?></td>

+ <td><?php echo$issued_detail['uri']; ?></td>

+ <td><?php echo$issued_detail['date']; ?></td>

<td>

- <i onclick="download('<?php echo($issued_detail['uri'] . ',' . $issued_detail['name']); ?>')" class="fa fa-download"> </i>

+ <i onclick="download('<?php echo $issued_detail['uri'] . ',' . $issued_detail['name']; ?>')" class="fa fa-download"> </i>

</td>

<?php } ?>

</tr>

@@ -226,7 +229,7 @@ include 'header.php';

</table>

<a class="btn btn-default" style="float: right; margin-left: 10px; border-radius:5px;" href="payment.php">Complete Payment</a>

- <a class="btn btn-default" style="float: right; border-radius:5px;" href="index.php">Cancel</a>

+ <a class="btn btn-default" style="float: right; border-radius:5px;" href="tokan.php">Cancel</a>

</div>

@@ -270,15 +273,24 @@ function uriData(id, parent) {

onclickFnc = "onclick='uriData(" + result.items[i].id + "," + result.items[i].parent + ")'";

dwnldTd = "<td></td>";

}

- uriDataHtml += "<tr><td " + onclickFnc + ">" + fileOrFolder + result.items[i].name + "</td><td>" + result.items[i].size + "</td><td>" + result.items[i].date + "</td>\n\

+ var date = new Date(result.items[i].date);

+ var dateformate = date.getDate()+'-'+(date.getMonth()+1) + '-' + date.getFullYear();

+ uriDataHtml += "<tr><td " + onclickFnc + ">" + fileOrFolder + result.items[i].name + "</td><td>" + result.items[i].size + "</td><td>" + dateformate + "</td>\n\

<td>" + result.items[i].uri + "</td>" + dwnldTd + "</tr>";

$("#folderPath").html(uriDataHtml);

});

+ $(".footer").show();

+ $("#trheading").show();

+ if((result.items).length==0){

+ $(".footer").hide();

+ $("#trheading").hide();

+ $("#folderPath").html("<tr><th colspan='4' style='text-align: center;'><h4>No document uploaded yet</h4></br><p>Upload some of your own documents or certificates!</p></th></tr>");

+ }

$("#parent").html("<span onclick=uriData(" + parent + ",null) >" + result.directory + "</span>");

$(".se-pre-con").hide();

}, "json")

.fail(function () {

- $("#folderPath").html("No document available in this folder");

+ $("#folderPath").html("some error found!");

$(".se-pre-con").hide();

});

}

M download.php

+0 −1

--- 'a/download.php'

+++ b/download.php

@@ -18,5 +18,4 @@ $binarydata = base64_encode($urFile);

$arr = array($mime,$binarydata);

echo json_encode($arr);

M header.php

+31 −7

--- 'a/header.php'

+++ b/header.php

@@ -1,5 +1,6 @@

<!DOCTYPE html>

<?php include 'config.php'; ?>

+<?php $code = "code_download"; ?>

<head>

@@ -40,7 +41,7 @@

.dropdown{

margin:6px 16px;

color:#fff !important;

- cursor: pointer; cursor: hand;

+ cursor: pointer; cursor: hand;

}

.dropdown-submenu {

@@ -52,7 +53,7 @@

.dropdown-menu>li{

margin-left: -15px;

- cursor: pointer; cursor: hand;

+ cursor: pointer; cursor: hand;

}

</style>

</head>

@@ -73,7 +74,7 @@

- <li><a href="/digibank/index.php"><i class="fa fa-home fa-2x" aria-hidden="true"></i></a></li>

+ <li><a href= "<?php echo $config['dlsc_path']; ?>"><i class="fa fa-home fa-2x" aria-hidden="true"></i></a></li>

<li>

<div class="dropdown-toggle" data-toggle="dropdown">AADHAAR

@@ -107,7 +108,6 @@

<li><a tabindex="-1" >Basic Banking Course</a></li><hr>

<li><a tabindex="-1" >Life Certificate (LIC)</a></li><hr>

<li><a tabindex="-1" >Pin Pad Device Payment Service</a></li>

</ul>

</div>

</li>

@@ -115,10 +115,34 @@

<div class="dropdown-toggle" data-toggle="dropdown">DIGILOCKER</div>

- <li><a tabindex="-1" href="https://digilocker.gov.in/public/register">Open Digilocker Account</a>

+ <li>

+ <span><form action = "<?php echo $config[$code] ?>" method = "GET" role="form">