Changeset 4042

Timestamp:

07/25/2006 07:01:52 PM (19 years ago)

Author:

ryan

Message:

Admin AJAX tweaks from mdawaffe. fixes #2969

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (3 diffs)
• wp-admin/list-manipulation-js.php (modified) (9 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -13 +13 @@
 function get_out_now() { exit; }
 add_action( 'shutdown', 'get_out_now', -1 );
-
-function wp_clean_ajax_input( $i ) {
-    global $wpdb;
-    $i = is_array($i) ? array_map('wp_clean_ajax_input', $i) : $wpdb->escape( rawurldecode(stripslashes($i)) );
-    return $i;
-}
 
 function wp_ajax_echo_meta( $pid, $mid, $key, $value ) {
@@ -36 +30 @@
 }
 
-$_POST = wp_clean_ajax_input( $_POST );
 $id = (int) $_POST['id'];
 switch ( $_POST['action'] ) :
@@ -225 +218 @@
     break;
 default :
+    do_action( 'wp_ajax_' . $_POST['action'] );
     die('0');
     break;

trunk/wp-admin/list-manipulation-js.php

@@ -2 +2 @@
 require_once('admin.php');
 header('Content-type: text/javascript; charset=' . get_settings('blog_charset'), true);
+$handler =  get_settings( 'siteurl' ) . '/wp-admin/admin-ajax.php';
 ?>
 addLoadEvent(function(){theList=new listMan();});
@@ -28 +29 @@
     WPAjax.prototype.init=function(f,r){
         this.encVar('cookie', document.cookie);
-        this.requestFile=f;this.getResponseElement(r);this.method='POST';
+        this.requestFile=f?f:'<?php echo $handler; ?>';this.getResponseElement(r);this.method='POST';
         this.onLoading=function(){this.myResponseElement.innerHTML="<?php _e('Sending Data...'); ?>";};
         this.onLoaded=function(){this.myResponseElement.innerHTML="<?php _e('Data Sent...'); ?>";};
@@ -35 +36 @@
 
 function listMan(theListId){
-    this.theList=null;
-    this.ajaxRespEl=null;
+    this.theList=null;this.theListId=theListId;
+    this.ajaxRespEl=null;this.ajaxHandler='<?php echo $handler; ?>';
     this.inputData='';this.clearInputs=new Array();this.showLink=1;
     this.topAdder=0;this.alt='alternate';this.recolorPos;this.reg_color='#FFFFFF';this.alt_color='#F1F1F1';
@@ -45 +46 @@
     this.ajaxAdder=function(what,where,update){//for TR, server must wrap TR in TABLE TBODY. this.makeEl cleans it
         if(self.aTrap)return;self.aTrap=1;setTimeout('aTrap=0',300);
-        this.ajaxAdd=new WPAjax('admin-ajax.php',this.ajaxRespEl?this.ajaxRespEl:'ajax-response');
+        this.ajaxAdd=new WPAjax(this.ajaxHandler,this.ajaxRespEl?this.ajaxRespEl:'ajax-response');
         if(this.ajaxAdd.failed)return true;
         this.grabInputs(where);
@@ -54 +55 @@
             if(tempObj.topAdder)tempObj.recolorPos=0;
             if(newItems){for (c=0;c<newItems.length;c++){
-                var id=parseInt(getNodeValue(newItems[c],'id'),10);
+                var id=getNodeValue(newItems[c],'id');
                 var exists=document.getElementById(what+'-'+id);
                 if(exists)tempObj.replaceListItem(exists.id,getNodeValue(newItems[c],'newitem'),newItems.length,update);
@@ -72 +73 @@
     this.ajaxDelete=function(what,id){
         if(self.aTrap)return;self.aTrap=1;setTimeout('aTrap=0',300);
-        this.ajaxDel=new WPAjax('admin-ajax.php',this.ajaxRespEl?this.ajaxRespEl:'ajax-response');
+        this.ajaxDel=new WPAjax(this.ajaxHandler,this.ajaxRespEl?this.ajaxRespEl:'ajax-response');
         if(this.ajaxDel.failed)return true;
         var tempObj=this;
@@ -81 +82 @@
     this.ajaxDimmer=function(what,id,dimClass){
         if(self.aTrap)return;self.aTrap=1;setTimeout('aTrap=0',300);
-        this.ajaxDim=new WPAjax('admin-ajax.php',this.ajaxRespEl?this.ajaxRespEl:'ajax-response');
+        this.ajaxDim=new WPAjax(this.ajaxHandler,this.ajaxRespEl?this.ajaxRespEl:'ajax-response');
         if(this.ajaxDim.failed)return true;
         var tempObj=this;
@@ -138 +139 @@
         if(this.theList)return;
         listItems=new Array();
-        if(theListId){this.theList=document.getElementById(theListId);if(!this.theList)return false;}
-        else{this.theList=document.getElementById('the-list');if(this.theList)theListId='the-list';}
+        if(this.theListId){this.theList=document.getElementById(this.theListId);if(!this.theList)return false;}
+        else{this.theList=document.getElementById('the-list');if(this.theList)this.theListId='the-list';}
         if(this.theList){
             var items=this.theList.getElementsByTagName('tr');listType='table';
@@ -156 +157 @@
     this.getListItems();
 }
-//No submit unless eval(code) returns true.
-function killSubmit(code,e){if(!e){if(window.event)e=window.event;else return;}var t=e.target?e.target:e.srcElement;if(('text'==t.type&&e.keyCode==13)||('submit'==t.type&&'click'==e.type)){if(!eval(code)){e.returnValue=false;e.cancelBubble=true;return false;}}}
-//Pretty func from ALA http://www.alistapart.com/articles/gettingstartedwithajax
-function getNodeValue(tree,el){return tree.getElementsByTagName(el)[0].firstChild.nodeValue;}
+//No submit unless code returns true.
+function killSubmit ( code, e ) {
+    e = e ? e : window.event;
+    if ( !e ) return;
+    var t = e.target ? e.target : e.srcElement;
+    if ( ( 'text' == t.type && e.keyCode == 13 ) || ( 'submit' == t.type && 'click' == e.type ) ) {
+        if ( ( 'string' == typeof code && !eval(code) ) || 'function' == typeof code && !code() ) {
+            if ( !eval(code) ) { e.returnValue = false; e.cancelBubble = true; return false; }
+        }
+    }
+}
+//Pretty func adapted from ALA http://www.alistapart.com/articles/gettingstartedwithajax
+function getNodeValue(tree,el){try { var r = tree.getElementsByTagName(el)[0].firstChild.nodeValue; } catch(err) { var r = null; } return r; }
 //Generic but lame JS closure
 function encloseFunc(f){var a=arguments[1];return function(){return f(a);}}

trunk/wp-includes/script-loader.php

@@ -20 +20 @@
         if ( is_admin() ) {
             $this->add( 'dbx-admin-key', '/wp-admin/dbx-admin-key-js.php', array('dbx'), '3651' );
-            $this->add( 'listman', '/wp-admin/list-manipulation-js.php', array('sack', 'fat'), '3850' ); // Make changeset # the correct one
+            $this->add( 'listman', '/wp-admin/list-manipulation-js.php', array('sack', 'fat'), '4042' ); // Make changeset # the correct one
             $this->add( 'ajaxcat', '/wp-admin/cat-js.php', array('listman'), '3684' );
             $this->add( 'admin-categories', '/wp-admin/categories.js', array('listman'), '3684' );