authpartner

Clone or download

error handling in doc.php and uploaddoc.php page

Modified Files

M doc.php
+9 −10
--- 'a/doc.php'
+++ b/doc.php
@@ -21,6 +21,9 @@ curl_setopt($vh, CURLOPT_RETURNTRANSFER,
$result = curl_exec($vh);
curl_close($vh);
$notgettingdata = explode('¿', $result);
+if(!$notgettingdata[1]){
+header("Location: index.php");
+}
$getToken = json_decode($notgettingdata[1]);
if (isset($getToken->access_token)) {
@@ -66,6 +69,9 @@ $resFile = curl_exec($vhf);
curl_close($vhf);
$resFileNew = explode('¿', $resFile);
$uriRes = json_decode($resFileNew[1]);
+if(isset($uriRes->error)){
+ header("Location: index.php");
+}
$uriDir = array();
$uriFiles = array();
foreach ($uriRes->items as $uriI) {
@@ -75,16 +81,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);
@@ -276,6 +273,8 @@ function uriData(id, parent) {
<td>" + result.items[i].uri + "</td>" + dwnldTd + "</tr>";
$("#folderPath").html(uriDataHtml);
});
+ $(".footer").show();
+ $("#trheading").show();
if((result.items).length==0){
$(".footer").hide();
$("#trheading").hide();
M index.php
+6 −1
--- 'a/index.php'
+++ b/index.php
@@ -52,4 +52,9 @@
</div>
</div><!-- ./ container end
<!-- /.row -->
-<?php include 'footer.php' ?>
\ No newline at end of file
+<?php include 'footer.php' ?>
+<script>
+ $("#alert").fadeTo(2000, 500).slideUp(500, function () {
+ $("#alert").slideUp(5000);
+ });
+</script>
\ No newline at end of file
M uploaddoc.php
+6 −10
--- 'a/uploaddoc.php'
+++ b/uploaddoc.php
@@ -72,6 +72,9 @@ $resFile = curl_exec($vhf);
curl_close($vhf);
$resFileNew = explode('¿', $resFile);
$uriRes = json_decode($resFileNew[1]);
+if(isset($uriRes->error)){
+ header("Location: index.php");
+}
$uriDir = array();
$uriFiles = array();
foreach ($uriRes->items as $uriI) {
@@ -81,16 +84,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);
@@ -263,6 +257,8 @@ function uriData(id, parent) {
<td>" + result.items[i].uri + "</td>" + dwnldTd + "</tr>";
$("#folderPath").html(uriDataHtml);
});
+ $(".footer").show();
+ $("#trheading").show();
if((result.items).length==0){
$(".footer").hide();
$("#trheading").hide();
M uri.php
+0 −2
--- 'a/uri.php'
+++ b/uri.php
@@ -21,7 +21,6 @@ $resFileNew = explode('¿', $uriResissued
$uriRes = json_decode($resFileNew[1]);
$uriDir = array();
$uriFiles = array();
-
foreach ($uriRes->items as $uriI) {
if ($uriI->type == "dir") {
$uriDir[] = (array) $uriI;
@@ -29,7 +28,6 @@ foreach ($uriRes->items as $uriI) {
$uriFiles[] = (array) $uriI;
}
}
-
$uriItems = array_merge($uriDir, $uriFiles);
$uriItemsArray['items'] = $uriItems;
$dataDirectory['directory'] = $uriRes->directory;