Merge branch 'reject_sender_login_mismatch' into mdbox-format

Dominik

2015-04-25 afe87b044dc20ceb104b31213543c14b562facd7

 interface/web/themes/default/assets/javascripts/ispconfig.js

@@ -464,7 +464,7 @@
      });
   },

   loadOptionInto: function(elementid,pagename) {
   loadOptionInto: function(elementid,pagename,callback) {
      var pageContentObject2 = $.ajax({
         type: "GET",
         url: pagename,
@@ -481,6 +481,9 @@
               foo2.appendChild(document.createTextNode(elemente[i]));
               foo2.value=elemente[i];
               el.appendChild(foo2);
            }
            if (typeof(callback) != 'undefined') {
               callback(elementid,pagename);
            }
         },
         error: function() {
@@ -635,7 +638,11 @@
      
      var dir = $self.attr('data-ordered');
      
      act = act + '?orderby=' + column;
      var separator = '?';
      if(act.indexOf("?") >= 0){
         separator = '&';
      }
      act = act + separator + 'orderby=' + column;
      ISPConfig.submitForm(form, act);
      
      $(document).ajaxComplete(function() {