From: vyshane <vyshane>
Date: Mon, 29 Jan 2007 07:58:47 +0000 (+0000)
Subject: Merged from 1.7.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=15c331b2e87dc61a752570028af06eb7f5c860f5;p=moodle.git

Merged from 1.7.
---

diff --git a/lib/ajax/ajaxcourse.js b/lib/ajax/ajaxcourse.js
index 0ac2176672..e5c1ccacf1 100644
--- a/lib/ajax/ajaxcourse.js
+++ b/lib/ajax/ajaxcourse.js
@@ -244,6 +244,12 @@ function php_portal_class() {
     //flag for week fomat
     this.isWeek = false;
 
+    //client browser
+    this.clientIsIE = null;
+
+    //session key
+    this.sesskey = null;
+
     //strings    
     this.strings = [];
 
diff --git a/lib/ajax/ajaxlib.php b/lib/ajax/ajaxlib.php
index e910176f24..ae7fa31695 100644
--- a/lib/ajax/ajaxlib.php
+++ b/lib/ajax/ajaxlib.php
@@ -115,6 +115,12 @@ class jsportal {
         $output .= "<script type=\"text/javascript\">\n";
         $output .= " 	main.portal.id = ".$courseid.";\n";
         $output .= "    main.portal.blocks = new Array(".$blocksoutput.");\n";
+        $output .= "    main.portal.sesskey = \"".$USER->sesskey."\";\n";
+        if (check_browser_version('MSIE')) {
+            $output .= "    main.portal.clientIsIE = true;\n";
+        } else {
+            $output .= "    main.portal.clientIsIE = false;\n";
+        }
         $output .= "    main.portal.strings['wwwroot']='".$CFG->wwwroot."';\n";
         $output .= "    main.portal.strings['pixpath']='".$CFG->pixpath."';\n";
         $output .= "    main.portal.strings['move']='".get_string('move')."';\n";
diff --git a/lib/ajax/section_classes.js b/lib/ajax/section_classes.js
index 5848217ca9..3ecbc0280c 100755
--- a/lib/ajax/section_classes.js
+++ b/lib/ajax/section_classes.js
@@ -766,22 +766,23 @@ resource_class.prototype.toggle_groupmode = function() {
 
 
 resource_class.prototype.delete_button = function() {
-    /*
-    if (this.debug) {
-		YAHOO.log("Deleting "+this.getEl().id+" from parent "+this.parentObj.getEl().id);
-	}
-    if (!confirm(main.getString('deletecheck', main.getString(this.is)+" "+this.id))) {
-        return false;
+
+    if (!main.portal.clientIsIE) {
+        if (this.debug) {
+    		YAHOO.log("Deleting "+this.getEl().id+" from parent "+this.parentObj.getEl().id);
+    	}
+        if (!confirm(main.getString('deletecheck', main.getString(this.is)+" "+this.id))) {
+            return false;
+        }
+        this.parentObj.remove_resource(this);
+        main.connect('DELETE', 'class=resource&id='+this.id);
+    } else {
+        // Not currently doing deletion by ajax because of unsolved problem in
+        // resource_class.remove_resource()
+        self.location = main.portal.strings['wwwroot']+"/course/mod.php?delete="
+                        +this.id+"&sesskey="+main.portal.sesskey+
+                        "&sr=" + this.parentObj.sectionId;
     }
-    this.parentObj.remove_resource(this);
-    main.connect('DELETE', 'class=resource&id='+this.id);
-    */
-
-    // Not currently doing deletion by ajax because of unsolved problem in
-    // resource_class.remove_resource()
-    self.location = main.portal.strings['wwwroot']+"/course/mod.php?delete="
-                    +this.id+"&sesskey="+main.portal.strings['sesskey']+
-                    "&sr=" + this.parentObj.sectionId;
 }