From: Development-DLA Date: Mon, 17 Jul 2017 17:05:00 +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/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 --- 'a/doc.php' +++ b/doc.php @@ -1,5 +1,9 @@ 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';
- + @@ -142,10 +145,10 @@ include 'header.php'; '; + echo '"; } if ($api_detail['type'] == "file") { echo ""; } ?> - - + + "; @@ -182,7 +185,7 @@ include 'header.php';
Name Size Date
'; echo ''; - echo($api_detail['name']); + echo $api_detail['name']; echo ""; echo ''; - echo($api_detail['name']); + echo $api_detail['name']; echo " - +
Complete Payment - Cancel + Cancel
@@ -209,14 +212,14 @@ include 'header.php'; '; - echo($issued_detail['name']); + echo $issued_detail['name']; ?> - - + + - + @@ -226,7 +229,7 @@ include 'header.php';
Complete Payment - Cancel + Cancel
@@ -270,15 +273,24 @@ function uriData(id, parent) { onclickFnc = "onclick='uriData(" + result.items[i].id + "," + result.items[i].parent + ")'"; dwnldTd = ""; } - uriDataHtml += "" + fileOrFolder + result.items[i].name + "" + result.items[i].size + "" + result.items[i].date + "\n\ + var date = new Date(result.items[i].date); + var dateformate = date.getDate()+'-'+(date.getMonth()+1) + '-' + date.getFullYear(); + uriDataHtml += "" + fileOrFolder + result.items[i].name + "" + result.items[i].size + "" + dateformate + "\n\ " + result.items[i].uri + "" + dwnldTd + ""; $("#folderPath").html(uriDataHtml); }); + $(".footer").show(); + $("#trheading").show(); + if((result.items).length==0){ + $(".footer").hide(); + $("#trheading").hide(); + $("#folderPath").html("

No document uploaded yet


Upload some of your own documents or certificates!

"); + } $("#parent").html("" + result.directory + ""); $(".se-pre-con").hide(); }, "json") .fail(function () { - $("#folderPath").html("No document available in this folder"); + $("#folderPath").html("some error found!"); $(".se-pre-con").hide(); }); } --- 'a/download.php' +++ b/download.php @@ -18,5 +18,4 @@ $binarydata = base64_encode($urFile); $arr = array($mime,$binarydata); echo json_encode($arr); - ?> --- 'a/header.php' +++ b/header.php @@ -1,5 +1,6 @@ + @@ -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; } @@ -73,7 +74,7 @@ @@ -115,10 +115,34 @@
DIGILOCKER
- Pay + Pay
-
--- /dev/null +++ b/tokan.php @@ -0,0 +1,25 @@ +formatOutput = true; + $root = $doc->createElement('maincontent'); + $root = $doc->appendChild($root); + $title = $doc->createElement('code'); + $title = $root->appendChild($title); + $enclosure = $doc->createAttribute('num'); + $enclosure->value = ""; + $title->appendChild($enclosure); + $title = $doc->createElement('access_token'); + $title = $root->appendChild($title); + $text = $doc->createTextNode(""); + $text = $title->appendChild($text); + $doc->save($file); + $doc->save("xml/hashhKey.xml"); +if (file_exists($file)) { + $xml = (array) simplexml_load_file($file) || die("Error: Cannot create object"); +} else { + echo $file. " file doesnot exists"; +} +header("Location: index.php"); +?> + --- 'a/uploaddoc.php' +++ b/uploaddoc.php @@ -1,5 +1,9 @@ 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/hashhkey.xml"); + $doc->save($file); } -if (file_exists("xml/hashhkey.xml")) { - $xml = (array) simplexml_load_file("xml/hashhkey.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/hashhkey.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,16 +86,7 @@ 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); -} +$uriItems = array_merge($uriDir, $uriFiles); $uriItemsArray['items'] = $uriItems; $dataDirectory['directory'] = $uriRes->directory; $dataF = array_merge($dataDirectory, $uriItemsArray); @@ -114,6 +116,20 @@ include 'header.php';
+ " . $_GET[$msg] . "
"; + } + ?> +
+
+
+
@@ -143,55 +159,55 @@ include 'header.php';
- - - - - - - - - - - - - '; - echo ''; - echo($api_detail['name']); - } - if ($api_detail['type'] == "file") { - echo " + '; + echo ''; + echo $api_detail['name']; + } + if ($api_detail['type'] == "file") { + echo ""; + ?> + + + + + + + +
NameSizeDate
"; - echo ''; - echo($api_detail['name']); + + + + + + + + + + + "; ?> - - - - - - - -
NameSizeDate
-
- Complete Payment - Cancel +
"; + echo ''; + echo $api_detail['name']; + } + echo "
+
+ Complete Payment + Cancel +
-
@@ -211,7 +227,7 @@ $(document).on('change', "#fileUpload", }); $("#filePath").val(""); function uriData(id, parent) { - + $("#folderPath").empty(); $("#fileUpload").val(""); $("#filePath").val(""); @@ -230,27 +246,39 @@ function uriData(id, parent) { $.each(result.items, function (i, l) { if (result.items[i].type == "file") { console.log(result.items); - fileOrFolder = ''; + fileOrFolder = ''; onclickFnc = "onclick='thisIsNotAFolder()'"; dwnldTd = ""; } else { - fileOrFolder = ''; + fileOrFolder = ''; onclickFnc = "onclick='uriData(" + result.items[i].id + "," + result.items[i].parent + ")'"; dwnldTd = ""; } - uriDataHtml += "" + fileOrFolder + result.items[i].name + "" + result.items[i].size + "" + result.items[i].date + "\n\ + var date = new Date(result.items[i].date); + var dateformate = date.getDate()+'-'+(date.getMonth()+1) + '-' + date.getFullYear(); + uriDataHtml += "" + fileOrFolder + result.items[i].name + "" + result.items[i].size + "" + dateformate + "\n\ " + result.items[i].uri + "" + dwnldTd + ""; $("#folderPath").html(uriDataHtml); }); + $(".footer").show(); + $("#trheading").show(); + if((result.items).length==0){ + $(".footer").hide(); + $("#trheading").hide(); + $("#folderPath").html("

No document uploaded yet


Upload some of your own documents or certificates!

"); + } $("#filePath").val(result.directory); $("#parent").html("" + result.directory + ""); $(".se-pre-con").hide(); }, "json") .fail(function () { - $("#folderPath").html("No document available in this folder"); + $("#folderPath").html("some error found!"); $(".se-pre-con").hide(); }); } $(".se-pre-con").fadeOut("slow"); + \ No newline at end of file --- 'a/uri.php' +++ b/uri.php @@ -1,4 +1,5 @@ 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); -} +$uriItems = array_merge($uriDir, $uriFiles); $uriItemsArray['items'] = $uriItems; $dataDirectory['directory'] = $uriRes->directory; $dataF = json_encode(array_merge($dataDirectory, $uriItemsArray));