Improve logic for catching expired credentials.
This commit is contained in:
		
							parent
							
								
									c175362563
								
							
						
					
					
						commit
						29010d4c66
					
				
							
								
								
									
										24
									
								
								js/books.js
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								js/books.js
									
									
									
									
									
								
							| 
						 | 
				
			
			@ -70,7 +70,10 @@ function getContents() {
 | 
			
		|||
      data     : data,
 | 
			
		||||
      dataType : 'json',
 | 
			
		||||
      success  : function(data, stat, jqo) {
 | 
			
		||||
                    if ( data.validated == false ) redirectToLogin();
 | 
			
		||||
                    if ( data.validated == false ) {
 | 
			
		||||
                       redirectToLogin();
 | 
			
		||||
                       return;
 | 
			
		||||
                    }
 | 
			
		||||
                    admin = data.admin;
 | 
			
		||||
                    if ( admin ) $("#parsebooks").removeClass("hide");
 | 
			
		||||
                    if ( data.kindlemail != kindlemail ) {
 | 
			
		||||
| 
						 | 
				
			
			@ -120,7 +123,10 @@ function setPath(newpath) {
 | 
			
		|||
      data: {newpath: newpath},
 | 
			
		||||
      dataType: 'json',
 | 
			
		||||
      success: function(data, stat, jqo) {
 | 
			
		||||
         if ( data.validated == false ) redirectToLogin();
 | 
			
		||||
			if ( data.validated == false ) {
 | 
			
		||||
            redirectToLogin();
 | 
			
		||||
            return;
 | 
			
		||||
         }
 | 
			
		||||
         if ( data.changed == true ) {
 | 
			
		||||
            $("#search").val("");
 | 
			
		||||
            getContents();
 | 
			
		||||
| 
						 | 
				
			
			@ -135,7 +141,10 @@ function setKindleMail(email) {
 | 
			
		|||
      data: {kindlemail: email},
 | 
			
		||||
      dataType: 'json',
 | 
			
		||||
      success: function(data, stat, jqo) {
 | 
			
		||||
         if ( data.validated == false ) redirectToLogin();
 | 
			
		||||
         if ( data.validated == false ) {
 | 
			
		||||
            redirectToLogin();
 | 
			
		||||
            return;
 | 
			
		||||
         }
 | 
			
		||||
         if ( data.success == false ) {
 | 
			
		||||
            var myToast = $.toast({
 | 
			
		||||
               text : "<h3><strong>Error: Invalid Email Address</strong></h3>",
 | 
			
		||||
| 
						 | 
				
			
			@ -180,6 +189,10 @@ function parseBooks() {
 | 
			
		|||
      url      : 'scripts/parsebooks.php',
 | 
			
		||||
      dataType : 'json',
 | 
			
		||||
      success  : function(data, stat, jqo) {
 | 
			
		||||
                    if ( data.validated == false ) {
 | 
			
		||||
						     redirectToLogin();
 | 
			
		||||
                       return;
 | 
			
		||||
                    }
 | 
			
		||||
                    if ( (data.new != 0) || (data.purged != 0) ) getContents();
 | 
			
		||||
                    myToast.reset();
 | 
			
		||||
                    var message = "";
 | 
			
		||||
| 
						 | 
				
			
			@ -216,7 +229,10 @@ function sendToKindle(fileid, filename) {
 | 
			
		|||
      data     : {fileid: fileid},
 | 
			
		||||
      dataType : 'json',
 | 
			
		||||
      success  : function(data, stat, jqo) {
 | 
			
		||||
                    if ( data.validated == false ) redirectToLogin();
 | 
			
		||||
                    if ( data.validated == false ) {
 | 
			
		||||
                       redirectToLogin();
 | 
			
		||||
                       return;
 | 
			
		||||
                    }
 | 
			
		||||
                    myToast.reset();
 | 
			
		||||
                    var message = "";
 | 
			
		||||
                    message = "<h3><strong>Sent File:</strong> " + data.filename + "</h3>";
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -3,14 +3,28 @@
 | 
			
		|||
require dirname(__FILE__) . "/../variables.php";
 | 
			
		||||
require dirname(__FILE__) . "/../header.php";
 | 
			
		||||
 | 
			
		||||
function sendResponse($data) {
 | 
			
		||||
   header('Content-Type: application/json');
 | 
			
		||||
   echo json_encode($data);
 | 
			
		||||
   exit();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
$dbbooks = array();
 | 
			
		||||
$parsedbooks = array();
 | 
			
		||||
$data = array();
 | 
			
		||||
 | 
			
		||||
$cli = ( php_sapi_name() != "cli" ) ? false : true;
 | 
			
		||||
 | 
			
		||||
if ( !$cli ) {
 | 
			
		||||
   $validated = require_login(NOREDIRECT);
 | 
			
		||||
   if ( !$validated || !$_SESSION['admin'] ) exit();
 | 
			
		||||
   if ( !$validated ) {
 | 
			
		||||
      $data["validated"] = false;
 | 
			
		||||
      $data["admin"] = false;
 | 
			
		||||
      $data["new"] = $count_new;
 | 
			
		||||
      $data["purged"] = $count_purged;
 | 
			
		||||
      $data["total"] = $count_total;
 | 
			
		||||
      sendResponse($data);
 | 
			
		||||
   }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
$count_total = 0;
 | 
			
		||||
| 
						 | 
				
			
			@ -66,13 +80,10 @@ if ( $cli ) {
 | 
			
		|||
   echo "Purged Books: {$count_purged}\n";
 | 
			
		||||
   echo "Total Books: {$count_total}\n";
 | 
			
		||||
} else {
 | 
			
		||||
   $data = array();
 | 
			
		||||
   $data["new"] = $count_new;
 | 
			
		||||
   $data["purged"] = $count_purged;
 | 
			
		||||
   $data["total"] = $count_total;
 | 
			
		||||
   header('Content-Type: application/json');
 | 
			
		||||
   echo json_encode($data);
 | 
			
		||||
   exit();
 | 
			
		||||
   sendResponse($data);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// vim: set sw=3 ts=3:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue
	
	Block a user