From: indresh singh bhadoria Date: Wed, 05 Jul 2017 17:52:56 +0530 Subject: error handling in doc.php and uploaddoc.php page --- error handling in doc.php and uploaddoc.php page --- --- '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) { " + result.items[i].uri + "" + dwnldTd + ""; $("#folderPath").html(uriDataHtml); }); + $(".footer").show(); + $("#trheading").show(); if((result.items).length==0){ $(".footer").hide(); $("#trheading").hide(); --- 'a/index.php' +++ b/index.php @@ -52,4 +52,9 @@ - \ No newline at end of file + + \ No newline at end of file --- '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) { " + result.items[i].uri + "" + dwnldTd + ""; $("#folderPath").html(uriDataHtml); }); + $(".footer").show(); + $("#trheading").show(); if((result.items).length==0){ $(".footer").hide(); $("#trheading").hide(); --- '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;