Merge branch 'work-3.0.5.4p3' of git.ispconfig.org:pixcept/ispconfig3-mods ...

Till Brehm

2014-08-14 1bcc716dfaf8dcea2b036b0e96302fef4fcc98ad

 interface/web/js/scrigo.js.php

@@ -18,6 +18,7 @@
var indicatorPaddingH = -1;
var indicatorPaddingW = -1;
var indicatorCompleted = false;
var registeredHooks = new Array();
redirect = '';

function reportError(request) {
@@ -26,6 +27,20 @@
      ajax request worked. */

   /*alert(request);*/
}

function registerHook(name, callback) {
    if(!registeredHooks[name]) registeredHooks[name] = new Array();
    var newindex = registeredHooks[name].length;
    registeredHooks[name][newindex] = callback;
}

function callHook(name, params) {
    if(!registeredHooks[name]) return;
    for(var i = 0; i < registeredHooks[name].length; i++) {
        var callback = registeredHooks[name][i];
        callback(name, params);
    }
}

function resetFormChanged() {
@@ -73,7 +88,9 @@
    }
}

function onAfterContentLoad() {
function onAfterContentLoad(url, data) {
    if(!data) data = '';
    else data = '&' + data;
<?php
if($server_config_array['misc']['use_combobox'] == 'y'){
?>
@@ -81,6 +98,7 @@
<?php
}
?>
    callHook('onAfterContentLoad', {'url': url, 'data': data });
}

function loadContentRefresh(pagename) {
@@ -96,7 +114,7 @@
                                 success: function(data, textStatus, jqXHR) {
                                                hideLoadIndicator();
                                    jQuery('#pageContent').html(jqXHR.responseText);
                                                onAfterContentLoad();
                                                onAfterContentLoad(pagename, "refresh="+document.getElementById('refreshinterval').value);
                                                pageFormChanged = false;
                                 },
                                 error: function() {
@@ -104,7 +122,7 @@
                                    reportError('Ajax Request was not successful.'+pagename);
                                 }
                              });
     setTimeout( "loadContentRefresh('"+pagename+"&refresh="+document.getElementById('refreshinterval').value+"')", document.getElementById('refreshinterval').value*1000 );
     setTimeout( "loadContentRefresh('"+pagename+"&refresh="+document.getElementById('refreshinterval').value+"')", document.getElementById('refreshinterval').value*1000*60 );
  }
}

@@ -175,7 +193,7 @@
                                       document.location.href = 'index.php';
                                    } else {
                                       jQuery('#pageContent').html(jqXHR.responseText);
                                                    onAfterContentLoad();
                                                    onAfterContentLoad('content.php', jQuery('#'+formname).serialize());
                                                    pageFormChanged = false;
                                    }
                                    loadMenus();
@@ -213,7 +231,7 @@
                                       //window.setTimeout('loadContent(redirect)', 1000);
                                    } else {
                                       jQuery('#pageContent').html(jqXHR.responseText);
                                                    onAfterContentLoad();
                                                    onAfterContentLoad(target, jQuery('#'+formname).serialize());
                                                    pageFormChanged = false;
                                    }
                                                hideLoadIndicator();
@@ -252,7 +270,7 @@
                                       //window.setTimeout('loadContent(redirect)', 1000);
                                    } else {
                                       jQuery('#pageContent').html(jqXHR.responseText);
                                                    onAfterContentLoad();
                                                    onAfterContentLoad(target, jQuery('#'+formname).serialize());
                                                    pageFormChanged = false;
                                    }
                                                hideLoadIndicator();
@@ -330,7 +348,7 @@
                                       //jQuery.each(reponseScript, function(idx, val) { eval(val.text); } );

                                       jQuery('#pageContent').html(jqXHR.responseText);
                                                    onAfterContentLoad();
                                                    onAfterContentLoad(pagename, (params ? params : null));
                                                    pageFormChanged = false;
                                    }
                                                hideLoadIndicator();
@@ -357,7 +375,7 @@
                                       loadContent(parts[1]);
                                    } else {
                                       jQuery('#pageContent').html(jqXHR.responseText);
                                                    onAfterContentLoad();
                                                    onAfterContentLoad('content.php', "s_mod=login&s_pg=index");
                                                    pageFormChanged = false;
                                    }
                                                hideLoadIndicator();
@@ -420,6 +438,8 @@
}

function changeTab(tab,target,force) {
   if(requestsRunning > 0) return false;
	
   //document.forms[0].next_tab.value = tab;
   document.pageForm.next_tab.value = tab;

@@ -522,8 +542,13 @@
}



var pass_minimum_length = 5;
<?php
$min_password_length = 5;
if(isset($server_config_array['misc']['min_password_length'])) {
   $min_password_length = $app->functions->intval($server_config_array['misc']['min_password_length']);
}
?>
var pass_minimum_length = <?php echo $min_password_length; ?>;
var pass_messages = new Array();

var pass_message = new Array();
@@ -556,6 +581,8 @@
pass_message['color'] = "green";
pass_messages[5] = pass_message;

var special_chars = "`~!@#$%^&*()_+|\=-[]}{';:/?.>,<\" ";

function pass_check(password) {
   var length = password.length;
   var points = 0;
@@ -568,20 +595,29 @@
      pass_result(1);
      return;
   }

	
   var different = 0;
	
   if (pass_contains(password, "abcdefghijklnmopqrstuvwxyz")) {
      different += 1;
   }
	
   if (pass_contains(password, "ABCDEFGHIJKLNMOPQRSTUVWXYZ")) {
      points += 1;
      different += 1;
   }

   if (pass_contains(password, "0123456789")) {
      points += 1;
      different += 1;
   }

   if (pass_contains(password, "`~!@#$%^&*()_+|\=-[]}{';:/?.>,<\" ")) {
   if (pass_contains(password, special_chars)) {
      points += 1;
      different += 1;
   }

   if (points == 0) {
   if (points == 0 || different < 3) {
      if (length >= 5 && length <=6) {
         pass_result(1);
      } else if (length >= 7 && length <=8) {
@@ -719,38 +755,63 @@
    return rv;
}

function password(minLength, special){
   var iteration = 0;
   var password = "";
   var randomNumber;
function password(minLength, special, num_special){
   minLength = minLength || 10;
   if(minLength < 8) minLength = 8;
   var maxLength = minLength + 5;
   var length = getRandomInt(minLength, maxLength);
   if(special == undefined){
      var special = false;
	
   var alphachars = "abcdefghijklmnopqrstuvwxyz";
   var upperchars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
    var numchars = "1234567890";
    var specialchars = "!@#_";
	
   if(num_special == undefined) num_special = 0;
   if(special != undefined && special == true) {
      num_special = Math.floor(Math.random() * (length / 4)) + 1;
   }
   while(iteration < length){
      randomNumber = (Math.floor((Math.random() * 100)) % 94) + 33;
      if(!special){
         if ((randomNumber >=33) && (randomNumber <=47)) { continue; }
         if ((randomNumber >=58) && (randomNumber <=64)) { continue; }
         if ((randomNumber >=91) && (randomNumber <=96)) { continue; }
         if ((randomNumber >=123) && (randomNumber <=126)) { continue; }
      }
      iteration++;
      password += String.fromCharCode(randomNumber);
   var numericlen = getRandomInt(1, 2);
   var alphalen = length - num_special - numericlen;
   var upperlen = Math.floor(alphalen / 2);
   alphalen = alphalen - upperlen;
   var password = "";
	
   for(i = 0; i < alphalen; i++) {
      password += alphachars.charAt(Math.floor(Math.random() * alphachars.length));
   }
	
   for(i = 0; i < upperlen; i++) {
      password += upperchars.charAt(Math.floor(Math.random() * upperchars.length));
   }
	
   for(i = 0; i < num_special; i++) {
      password += specialchars.charAt(Math.floor(Math.random() * specialchars.length));
   }
	
   for(i = 0; i < numericlen; i++) {
      password += numchars.charAt(Math.floor(Math.random() * numchars.length));
   }
	
   password = password.split('').sort(function() { return 0.5 - Math.random(); }).join('');
	
   return password;
}

<?php
$min_password_length = 10;
if(isset($server_config_array['misc']['min_password_length'])) {
   $min_password_length = $app->functions->intval($server_config_array['misc']['min_password_length']);
}
?>

function generatePassword(passwordFieldID, repeatPasswordFieldID){
   var oldPWField = jQuery('#'+passwordFieldID);
   var newPWField = oldPWField.clone();
   newPWField.attr('type', 'text').attr('id', 'tmp'+passwordFieldID).insertBefore(oldPWField);
   oldPWField.remove();
   var pword = password(10, false);
   var pword = password(<?php echo $min_password_length; ?>, false, 1);
   jQuery('#'+repeatPasswordFieldID).val(pword);
   newPWField.attr('id', passwordFieldID).val(pword).trigger('keyup');
   newPWField.attr('id', passwordFieldID).val(pword).trigger('keyup').select();
}

var funcDisableClick = function(e) { e.preventDefault(); return false; };