Merge remote-tracking branch 'ispc/master'

Marius Cramer

2014-04-30 8edabf647814a012307bbf68628e4656ecf89eff

 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,14 +88,18 @@
    }
}

function onAfterContentLoad() {
function onAfterContentLoad(url, data) {
    if(!data) data = '';
    else data = '&' + data;
<?php
if($server_config_array['misc']['use_combobox'] == 'y'){
?>
    $('#pageContent').find("select").combobox();
    $('#pageContent').find("select:not(.chosen-select)").combobox();
    $('.chosen-select').chosen({no_results_text: "<?php echo $wb['globalsearch_noresults_text_txt']; ?>", width: '300px'});
<?php
}
?>
    callHook('onAfterContentLoad', {'url': url, 'data': data });
}

function loadContentRefresh(pagename) {
@@ -96,7 +115,7 @@
                                 success: function(data, textStatus, jqXHR) {
                                                hideLoadIndicator();
                                    jQuery('#pageContent').html(jqXHR.responseText);
                                                onAfterContentLoad();
                                                onAfterContentLoad(pagename, "refresh="+document.getElementById('refreshinterval').value);
                                                pageFormChanged = false;
                                 },
                                 error: function() {
@@ -175,7 +194,7 @@
                                       document.location.href = 'index.php';
                                    } else {
                                       jQuery('#pageContent').html(jqXHR.responseText);
                                                    onAfterContentLoad();
                                                    onAfterContentLoad('content.php', jQuery('#'+formname).serialize());
                                                    pageFormChanged = false;
                                    }
                                    loadMenus();
@@ -213,7 +232,7 @@
                                       //window.setTimeout('loadContent(redirect)', 1000);
                                    } else {
                                       jQuery('#pageContent').html(jqXHR.responseText);
                                                    onAfterContentLoad();
                                                    onAfterContentLoad(target, jQuery('#'+formname).serialize());
                                                    pageFormChanged = false;
                                    }
                                                hideLoadIndicator();
@@ -252,7 +271,7 @@
                                       //window.setTimeout('loadContent(redirect)', 1000);
                                    } else {
                                       jQuery('#pageContent').html(jqXHR.responseText);
                                                    onAfterContentLoad();
                                                    onAfterContentLoad(target, jQuery('#'+formname).serialize());
                                                    pageFormChanged = false;
                                    }
                                                hideLoadIndicator();
@@ -330,7 +349,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 +376,7 @@
                                       loadContent(parts[1]);
                                    } else {
                                       jQuery('#pageContent').html(jqXHR.responseText);
                                                    onAfterContentLoad();
                                                    onAfterContentLoad('content.php', "s_mod=login&s_pg=index");
                                                    pageFormChanged = false;
                                    }
                                                hideLoadIndicator();
@@ -522,8 +541,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();
@@ -743,12 +767,19 @@
   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);
   jQuery('#'+repeatPasswordFieldID).val(pword);
   newPWField.attr('id', passwordFieldID).val(pword).trigger('keyup');
}