Ajax_demo: Modified js code to follow closure, Moved Ajax check funct…

…ion to vital_funcs.inc.php
sdaityari · Jun 9, 2013 · b44d6b6 · anvk · Jun 10, 2013 · anvk
1 parent 8bf5208
commit b44d6b6
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 70 deletions.
diff --git a/include/lib/ajax.inc.php b/include/lib/ajax.inc.php
diff --git a/include/lib/vital_funcs.inc.php b/include/lib/vital_funcs.inc.php
@@ -1119,4 +1119,22 @@ function debug($var, $title='') {
 	echo $str;
 	echo '</pre>';
 }
+
+/**
+ * This function is used to check if an AJAX request is present.
+ * @access  public
+ * @author  Shaumik Daityari
+ */
+function check_ajax_request(){
+    //Uncomment the following line for debugging
+    //print strtolower($_SERVER['HTTP_X_REQUESTED_WITH']);
+    $ajax_request = 'xmlhttprequest';
+    if( !empty($_SERVER['HTTP_X_REQUESTED_WITH']) &&
+        strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == $ajax_request ) {
+
+        return True;
+    }
+    return False;
+}
+
 ?>
diff --git a/jscripts/ajax/AjaxRequest.js b/jscripts/ajax/AjaxRequest.js
diff --git a/jscripts/ajax/FileStorageComments.js b/jscripts/ajax/FileStorageComments.js
@@ -3,38 +3,47 @@
  * @copyright Copyright © 2013, ATutor, All rights reserved.
  */
 
-var deleteMessage = "Are you sure you want to delete this comment?";
-var deleteTitle = "Delete Comment";
-var deleteUrl = "mods/_standard/file_storage/ajax/delete_comment.php";
+var ATutor = ATutor || {};
 
-var responseMessage;
-var parameters;
-
-var deleteComment = function (ot, oid, file_id, id) {
+(function() {
     "use strict";
-    if (confirm (deleteMessage)) {
-
+
+    ATutor.fileStorage = ATutor.fileStorage || {};
+
+    var deleteMessage = "Are you sure you want to delete this comment?",
+        deleteTitle = "Delete Comment",
+        deleteUrl = "mods/_standard/file_storage/ajax/delete_comment.php";
+
+    ATutor.fileStorage.deleteComment = function (ot, oid, file_id, id) {
+        if (!confirm (deleteMessage)) {
+            return;
+        }
         var parameters = {
             'ot' : ot,
             'oid': oid,
             'file_id': file_id,
             'id': id,
             'submit_yes': true
-        }
+        };
 
-        ajaxRequest(deleteUrl, parameters, commentOnDelete);
-
-    }
-};
-
-var commentOnDelete = function (responseMessage, parameters) {
-    if (responseMessage === 'ACTION_COMPLETED_SUCCESSFULLY') {
-        $('#comment' + parameters.id).fadeOut();
-    } else if (responseMessage === 'ACCESS_DENIED') {
-        alert ('Access denied');
-    } else {
-        alert ('Action not completed. Unknown Error Occurred.');
-    }
-}
-
+        $.ajax({
+            type: "POST",
+            url: deleteUrl,
+            data: parameters,
+            success: function(message) {
+                commentOnDelete(message, parameters);
+            }
+        });
+    };
+
+    var commentOnDelete = function (responseMessage, parameters) {
+        if (responseMessage === 'ACTION_COMPLETED_SUCCESSFULLY') {
+            $('#comment' + parameters.id).fadeOut();
+        } else if (responseMessage === 'ACCESS_DENIED') {
+            alert ('Access denied');
+        } else {
+            alert ('Action not completed. Unknown Error Occurred.');
+        }
+    };
 
+})();
diff --git a/mods/_standard/file_storage/ajax/delete_comment.php b/mods/_standard/file_storage/ajax/delete_comment.php
@@ -15,7 +15,11 @@
 define('AT_INCLUDE_PATH', '../../../../include/');
 require(AT_INCLUDE_PATH.'vitals.inc.php');
 require(AT_INCLUDE_PATH.'../mods/_standard/file_storage/file_storage.inc.php');
-require(AT_INCLUDE_PATH.'lib/ajax.inc.php');
+include_once(AT_INCLUDE_PATH . 'lib/vital_funcs.inc.php');
+
+if (!check_ajax_request()) {
+    exit;
+}
 
 $owner_type = abs($_REQUEST['ot']);
 $owner_id   = abs($_REQUEST['oid']);

diff --git a/mods/_standard/file_storage/comments.php b/mods/_standard/file_storage/comments.php
@@ -162,9 +162,8 @@
 					<p><?php echo nl2br(htmlspecialchars($row['comment'])); ?></p>
 						<?php if ($row['member_id'] == $_SESSION['member_id'] || $current_file['member_id'] == $_SESSION['member_id']): ?>
 							<div style="text-align:right; font-size: smaller">
-								<a href="<?php echo url_rewrite('mods/_standard/file_storage/comments.php'.$owner_arg_prefix.'id='.$id.SEP.'comment_id='.$row['comment_id'].'#c'.$row['comment_id']); ?>"><?php echo _AT('edit'); ?></a> | <a href="javascript:null();" onclick="deleteComment('<?php echo $owner_type; ?>', '<?php echo $owner_id; ?>', '<?php echo $id; ?>', '<?php echo $row['comment_id']; ?>');"><?php echo _AT('delete'); ?></a>
+								<a href="<?php echo url_rewrite('mods/_standard/file_storage/comments.php'.$owner_arg_prefix.'id='.$id.SEP.'comment_id='.$row['comment_id'].'#c'.$row['comment_id']); ?>"><?php echo _AT('edit'); ?></a> | <a href="javascript:null();" onclick="ATutor.fileStorage.deleteComment('<?php echo $owner_type; ?>', '<?php echo $owner_id; ?>', '<?php echo $id; ?>', '<?php echo $row['comment_id']; ?>');"><?php echo _AT('delete'); ?></a>
 
-<!--<a href="mods/_standard/file_storage/delete_comment.php<?php echo $owner_arg_prefix . 'file_id='.$id.SEP; ?>id=<?php echo $row['comment_id']; ?>"><?php echo _AT('delete'); ?></a>-->
 							</div>
 						<?php endif; ?>
 				</div>
@@ -196,6 +195,5 @@
 </div>
 </form>
 <?php endif; ?>
-<script type="text/javascript" src="<?php echo AT_BASE_HREF; ?>jscripts/ajax/AjaxRequest.js"></script>
 <script type="text/javascript" src="<?php echo AT_BASE_HREF; ?>jscripts/ajax/FileStorageComments.js"></script>
 <?php require(AT_INCLUDE_PATH.'footer.inc.php'); ?>