From 77cc4a99b15f4639b56c29a1207dc04b459c5d54 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 19 Dec 2014 12:18:11 -0500
Subject: [PATCH] - re-added jquery ui
---
interface/web/js/scrigo.js.php | 310 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 207 insertions(+), 103 deletions(-)
diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php
index 4b89998..6768f8f 100644
--- a/interface/web/js/scrigo.js.php
+++ b/interface/web/js/scrigo.js.php
@@ -1,12 +1,12 @@
<?php
- session_start();
- include('../../lib/config.inc.php');
- require_once('../../lib/app.inc.php');
- $lang = (isset($_SESSION['s']['language']) && $_SESSION['s']['language'] != '')?$_SESSION['s']['language']:'en';
- include_once(ISPC_ROOT_PATH.'/web/strengthmeter/lib/lang/'.$lang.'_strengthmeter.lng');
-
- $app->uses('ini_parser,getconf');
- $server_config_array = $app->getconf->get_global_config();
+include '../../lib/config.inc.php';
+header('Content-Type: text/javascript; charset=utf-8'); // the config file sets the content type header so we have to override it here!
+require_once '../../lib/app.inc.php';
+$lang = (isset($_SESSION['s']['language']) && $_SESSION['s']['language'] != '')?$_SESSION['s']['language']:'en';
+include_once ISPC_ROOT_PATH.'/web/strengthmeter/lib/lang/'.$lang.'_strengthmeter.lng';
+
+$app->uses('ini_parser,getconf');
+$server_config_array = $app->getconf->get_global_config();
?>
var pageFormChanged = false;
var tabChangeWarningTxt = '';
@@ -17,14 +17,29 @@
var indicatorPaddingH = -1;
var indicatorPaddingW = -1;
var indicatorCompleted = false;
+var registeredHooks = new Array();
redirect = '';
function reportError(request) {
- /* Error reporting is disabled by default as some browsers like safari
- sometimes throw errors when a ajax request is delayed even if the
+ /* Error reporting is disabled by default as some browsers like safari
+ sometimes throw errors when a ajax request is delayed even if the
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() {
@@ -32,11 +47,13 @@
}
function showLoadIndicator() {
+ document.body.style.cursor = 'wait';
+
<?php
if($server_config_array['misc']['use_loadindicator'] == 'y'){
?>
requestsRunning += 1;
-
+
if(requestsRunning < 2) {
var indicator = jQuery('#ajaxloader');
if(indicator.length < 1) {
@@ -46,7 +63,7 @@
var parent = jQuery('#content');
if(parent.length < 1) return;
indicatorCompleted = false;
-
+
var atx = parent.offset().left + 150; //((parent.outerWidth(true) - indicator.outerWidth(true)) / 2);
var aty = parent.offset().top + 150;
indicator.css( {'left': atx, 'top': aty } ).fadeIn('fast', function() {
@@ -61,6 +78,8 @@
}
function hideLoadIndicator() {
+ document.body.style.cursor = '';
+
requestsRunning -= 1;
if(requestsRunning < 1) {
requestsRunning = 0; // just for the case...
@@ -68,20 +87,33 @@
}
}
-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({
+ select: function (event, ui) {
+ if (jQuery(".panel #Filter").length > 0) {
+ jQuery(".panel #Filter").trigger('click');
+ }
+ }
+ });
+ /* TODO: find a better way! */
+ //$('.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) {
-
+
if(document.getElementById('refreshinterval').value > 0) {
- var pageContentObject2 = jQuery.ajax({ type: "GET",
+ var pageContentObject2 = jQuery.ajax({ type: "GET",
url: pagename,
data: "refresh="+document.getElementById('refreshinterval').value,
dataType: "html",
@@ -91,7 +123,7 @@
success: function(data, textStatus, jqXHR) {
hideLoadIndicator();
jQuery('#pageContent').html(jqXHR.responseText);
- onAfterContentLoad();
+ onAfterContentLoad(pagename, "refresh="+document.getElementById('refreshinterval').value);
pageFormChanged = false;
},
error: function() {
@@ -99,13 +131,13 @@
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 );
}
}
function capp(module, redirect) {
- var submitFormObj = jQuery.ajax({ type: "GET",
- url: "capp.php",
+ var submitFormObj = jQuery.ajax({ type: "GET",
+ url: "capp.php",
data: "mod="+module+((redirect != undefined) ? '&redirect='+redirect : ''),
dataType: "html",
beforeSend: function() {
@@ -145,8 +177,13 @@
if(passwordObj.value == ''){
passwordObj.focus();
return;
- }
- var submitFormObj = jQuery.ajax({ type: "POST",
+ }
+
+ $('#dummy_username').val(userNameObj.value);
+ $('#dummy_passwort').val(passwordObj.value);
+ $('#dummy_login_form').submit();
+
+ var submitFormObj = jQuery.ajax({ type: "POST",
url: "content.php",
data: jQuery('#'+formname).serialize(),
dataType: "html",
@@ -165,7 +202,7 @@
document.location.href = 'index.php';
} else {
jQuery('#pageContent').html(jqXHR.responseText);
- onAfterContentLoad();
+ onAfterContentLoad('content.php', jQuery('#'+formname).serialize());
pageFormChanged = false;
}
loadMenus();
@@ -183,11 +220,11 @@
}
document.getElementById('footer').innerHTML = 'Powered by <a href="http://www.ispconfig.org" target="_blank">ISPConfig</a>';
*/
-
+
}
function submitForm(formname,target) {
- var submitFormObj = jQuery.ajax({ type: "POST",
+ var submitFormObj = jQuery.ajax({ type: "POST",
url: target,
data: jQuery('#'+formname).serialize(),
dataType: "html",
@@ -203,7 +240,7 @@
//window.setTimeout('loadContent(redirect)', 1000);
} else {
jQuery('#pageContent').html(jqXHR.responseText);
- onAfterContentLoad();
+ onAfterContentLoad(target, jQuery('#'+formname).serialize());
pageFormChanged = false;
}
hideLoadIndicator();
@@ -225,7 +262,7 @@
function submitFormConfirm(formname,target,confirmation) {
var successMessage = arguments[3];
if(window.confirm(confirmation)) {
- var submitFormObj = jQuery.ajax({ type: "POST",
+ var submitFormObj = jQuery.ajax({ type: "POST",
url: target,
data: jQuery('#'+formname).serialize(),
dataType: "html",
@@ -242,7 +279,7 @@
//window.setTimeout('loadContent(redirect)', 1000);
} else {
jQuery('#pageContent').html(jqXHR.responseText);
- onAfterContentLoad();
+ onAfterContentLoad(target, jQuery('#'+formname).serialize());
pageFormChanged = false;
}
hideLoadIndicator();
@@ -256,10 +293,10 @@
}
}
-function submitUploadForm(formname,target) {
+function submitUploadForm(formname,target) {
var handleResponse = function(loadedFrame) {
var response, responseStr = loadedFrame.contentWindow.document.body.innerHTML;
-
+
try {
response = JSON.parse(responseStr);
} catch(e) {
@@ -275,9 +312,9 @@
msg = msg+'<div id="errorMsg">'+errormsg+'</div>';
}
return msg;
-
+
};
-
+
var frame_id = 'ajaxUploader-iframe-' + Math.round(new Date().getTime() / 1000);
jQuery('body').after('<iframe width="0" height="0" style="display:none;" name="'+frame_id+'" id="'+frame_id+'"/>');
jQuery('input[type="file"]').closest("form").attr({target: frame_id, action: target}).submit();
@@ -299,7 +336,7 @@
function loadContent(pagename) {
var params = arguments[1];
- var pageContentObject2 = jQuery.ajax({ type: "GET",
+ var pageContentObject2 = jQuery.ajax({ type: "GET",
url: pagename,
data: (params ? params : null),
dataType: "html",
@@ -318,9 +355,9 @@
//var reponse = jQuery(jqXHR.responseText);
//var reponseScript = reponse.filter("script");
//jQuery.each(reponseScript, function(idx, val) { eval(val.text); } );
-
+
jQuery('#pageContent').html(jqXHR.responseText);
- onAfterContentLoad();
+ onAfterContentLoad(pagename, (params ? params : null));
pageFormChanged = false;
}
hideLoadIndicator();
@@ -334,7 +371,7 @@
function loadInitContent() {
- var pageContentObject = jQuery.ajax({ type: "GET",
+ var pageContentObject = jQuery.ajax({ type: "GET",
url: "content.php",
data: "s_mod=login&s_pg=index",
dataType: "html",
@@ -347,7 +384,7 @@
loadContent(parts[1]);
} else {
jQuery('#pageContent').html(jqXHR.responseText);
- onAfterContentLoad();
+ onAfterContentLoad('content.php', "s_mod=login&s_pg=index");
pageFormChanged = false;
}
hideLoadIndicator();
@@ -357,7 +394,7 @@
reportError('Ajax Request was not successful. 114');
}
});
-
+
loadMenus();
keepalive();
setTimeout("setFocus()",1000);
@@ -373,7 +410,7 @@
function loadMenus() {
- var sideNavObject = jQuery.ajax({ type: "GET",
+ var sideNavObject = jQuery.ajax({ type: "GET",
url: "nav.php",
data: "nav=side",
dataType: "html",
@@ -382,15 +419,15 @@
},
success: function(data, textStatus, jqXHR) {
hideLoadIndicator();
- jQuery('#sideNav').html(jqXHR.responseText);
+ jQuery('#sidebar').html(jqXHR.responseText);
},
error: function() {
hideLoadIndicator();
reportError('Ajax Request was not successful. 115');
}
});
-
- var topNavObject = jQuery.ajax({ type: "GET",
+
+ var topNavObject = jQuery.ajax({ type: "GET",
url: "nav.php",
data: "nav=top",
dataType: "html",
@@ -399,7 +436,7 @@
},
success: function(data, textStatus, jqXHR) {
hideLoadIndicator();
- jQuery('#topNav').html(jqXHR.responseText);
+ jQuery('#topnav-container').html(jqXHR.responseText);
},
error: function(o) {
hideLoadIndicator();
@@ -410,9 +447,11 @@
}
function changeTab(tab,target,force) {
+ if(requestsRunning > 0) return false;
+
//document.forms[0].next_tab.value = tab;
document.pageForm.next_tab.value = tab;
-
+
var idel = jQuery('form#pageForm').find('[name="id"]');
var id = null;
if(idel.length > 0) id = idel.val();
@@ -438,7 +477,7 @@
}
}
}
-
+
function del_record(link,confirmation) {
if(window.confirm(confirmation)) {
loadContent(link);
@@ -452,7 +491,7 @@
}
function loadContentInto(elementid,pagename) {
- var pageContentObject2 = jQuery.ajax({ type: "GET",
+ var pageContentObject2 = jQuery.ajax({ type: "GET",
url: pagename,
dataType: "html",
beforeSend: function() {
@@ -470,7 +509,7 @@
}
function loadOptionInto(elementid,pagename) {
- var pageContentObject2 = jQuery.ajax({ type: "GET",
+ var pageContentObject2 = jQuery.ajax({ type: "GET",
url: pagename,
dataType: "html",
beforeSend: function() {
@@ -498,7 +537,7 @@
}
function keepalive() {
- var pageContentObject3 = jQuery.ajax({ type: "GET",
+ var pageContentObject3 = jQuery.ajax({ type: "GET",
url: "keepalive.php",
dataType: "html",
success: function(data, textStatus, jqXHR) {
@@ -512,8 +551,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();
@@ -546,6 +590,8 @@
pass_message['color'] = "green";
pass_messages[5] = pass_message;
+var special_chars = "`~!@#$%^&*()_+|\=-[]}{';:/?.>,<\" ";
+
function pass_check(password) {
var length = password.length;
var points = 0;
@@ -553,25 +599,34 @@
pass_result(0);
return;
}
-
+
if (length < 5) {
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) {
@@ -632,45 +687,70 @@
return false;
}
+var new_tpl_add_id = 0;
function addAdditionalTemplate(){
- var tpl_add = document.getElementById('template_additional').value;
-
- var tpl_list = document.getElementById('template_additional_list').innerHTML;
- var addTemplate = document.getElementById('tpl_add_select').value.split('|',2);
- var addTplId = addTemplate[0];
- var addTplText = addTemplate[1];
+ var tpl_add = jQuery('#template_additional').val();
+ var addTemplate = jQuery('#tpl_add_select').val().split('|',2);
+ var addTplId = addTemplate[0];
+ var addTplText = addTemplate[1];
if(addTplId > 0) {
- var newVal = tpl_add + '/' + addTplId + '/';
- newVal = newVal.replace('//', '/');
- var newList = tpl_list + '<br>' + addTplText;
- newList = newList.replace('<br><br>', '<br>');
- document.getElementById('template_additional').value = newVal;
- document.getElementById('template_additional_list').innerHTML = newList;
- alert('additional template ' + addTplText + ' added to customer');
+ var newVal = tpl_add.split('/');
+ new_tpl_add_id += 1;
+ var delbtn = jQuery('<a href="#"></a>').attr('class', 'button icons16 icoDelete').click(function(e) {
+ e.preventDefault();
+ delAdditionalTemplate($(this).parent().attr('rel'));
+ });
+ newVal[newVal.length] = 'n' + new_tpl_add_id + ':' + addTplId;
+ jQuery('<li>' + addTplText + '</li>').attr('rel', 'n' + new_tpl_add_id).append(delbtn).appendTo('#template_additional_list ul');
+ jQuery('#template_additional').val(newVal.join('/'));
+ alert('additional template ' + addTplText + ' added to customer');
} else {
- alert('no additional template selcted');
+ alert('no additional template selcted');
}
}
-function delAdditionalTemplate(){
- var tpl_add = document.getElementById('template_additional').value;
- if(tpl_add != '') {
- var tpl_list = document.getElementById('template_additional_list').innerHTML;
+function delAdditionalTemplate(tpl_id){
+ var tpl_add = jQuery('#template_additional').val();
+ if(tpl_id) {
+ // new style
+ var $el = jQuery('#template_additional_list ul').find('li[rel="' + tpl_id + '"]').eq(0); // only the first
+ var addTplText = $el.text();
+ $el.remove();
+
+ var oldVal = tpl_add.split('/');
+ var newVal = new Array();
+ for(var i = 0; i < oldVal.length; i++) {
+ var tmp = oldVal[i].split(':', 2);
+ if(tmp.length == 2 && tmp[0] == tpl_id) continue;
+ newVal[newVal.length] = oldVal[i];
+ }
+ jQuery('#template_additional').val(newVal.join('/'));
+ alert('additional template ' + addTplText + ' deleted from customer');
+ } else if(tpl_add != '') {
+ // old style
var addTemplate = document.getElementById('tpl_add_select').value.split('|',2);
var addTplId = addTemplate[0];
var addTplText = addTemplate[1];
+
+ jQuery('#template_additional_list ul').find('li:not([rel])').each(function() {
+ var text = jQuery(this).text();
+ if(text == addTplText) {
+ jQuery(this).remove();
+ return false;
+ }
+ return this;
+ });
+
var newVal = tpl_add;
- newVal = newVal.replace(addTplId, '');
+ var repl = new RegExp('(^|\/)' + addTplId + '(\/|$)');
+ newVal = newVal.replace(repl, '');
newVal = newVal.replace('//', '/');
- var newList = tpl_list.replace(addTplText, '');
- newList = newList.replace('<br><br>', '<br>');
- document.getElementById('template_additional').value = newVal;
- document.getElementById('template_additional_list').innerHTML = newList;
+ jQuery('#template_additional').val(newVal);
alert('additional template ' + addTplText + ' deleted from customer');
} else {
alert('no additional template selcted');
}
-
+
}
function getInternetExplorerVersion() {
@@ -684,38 +764,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; };
@@ -750,18 +855,18 @@
return Math.floor(Math.random() * (max - min + 1)) + min;
}
-jQuery('.addPlaceholder').live("click", function(){
+jQuery('.addPlaceholder').on("click", function(){
var placeholderText = jQuery(this).text();
var template = jQuery(this).siblings(':input');
template.insertAtCaret(placeholderText);
});
-jQuery('.addPlaceholderContent').live("click", function(){
+jQuery('.addPlaceholderContent').on("click", function(){
var placeholderContentText = jQuery(this).find('.addPlaceholderContent').text();
var template2 = jQuery(this).siblings(':input');
template2.insertAtCaret(placeholderContentText);
});
-
+
jQuery.fn.extend({
insertAtCaret: function(myValue){
return this.each(function(i) {
@@ -788,4 +893,3 @@
})
}
});
-
--
Gitblit v1.9.1