From d9bcf68e395d6156645a7974b1a992aa6e6c00aa Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 08:57:25 -0400
Subject: [PATCH] Added missing empty directories from svn import
---
interface/web/js/scrigo.js.php | 421 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 377 insertions(+), 44 deletions(-)
diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php
index ecfcf83..418b26b 100644
--- a/interface/web/js/scrigo.js.php
+++ b/interface/web/js/scrigo.js.php
@@ -1,10 +1,23 @@
<?php
session_start();
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 = '';
+var tabChangeDiscardTxt = '';
+var tabChangeWarning = false;
+var tabChangeDiscard = false;
+var requestsRunning = 0;
+var indicatorPaddingH = -1;
+var indicatorPaddingW = -1;
+var indicatorCompleted = false;
redirect = '';
function reportError(request) {
@@ -15,6 +28,61 @@
/*alert(request);*/
}
+function resetFormChanged() {
+ pageFormChanged = false;
+}
+
+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) {
+ indicator = jQuery('<div id="ajaxloader" style="display: none;"></div>');
+ indicator.appendTo('body');
+ }
+ 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() {
+ // check if loader should be hidden immediately
+ indicatorCompleted = true;
+ if(requestsRunning < 1) $(this).fadeOut('fast', function() { $(this).hide();});
+ });
+ }
+<?php
+}
+?>
+}
+
+function hideLoadIndicator() {
+ document.body.style.cursor = '';
+
+ requestsRunning -= 1;
+ if(requestsRunning < 1) {
+ requestsRunning = 0; // just for the case...
+ if(indicatorCompleted == true) jQuery('#ajaxloader').fadeOut('fast', function() { jQuery('#ajaxloader').hide(); } );
+ }
+}
+
+function onAfterContentLoad() {
+<?php
+if($server_config_array['misc']['use_combobox'] == 'y'){
+?>
+ $('#pageContent').find("select").combobox();
+<?php
+}
+?>
+}
+
function loadContentRefresh(pagename) {
if(document.getElementById('refreshinterval').value > 0) {
@@ -22,36 +90,51 @@
url: pagename,
data: "refresh="+document.getElementById('refreshinterval').value,
dataType: "html",
+ beforeSend: function() {
+ showLoadIndicator();
+ },
success: function(data, textStatus, jqXHR) {
+ hideLoadIndicator();
jQuery('#pageContent').html(jqXHR.responseText);
+ onAfterContentLoad();
+ pageFormChanged = false;
},
error: function() {
+ hideLoadIndicator();
reportError('Ajax Request was not successful.'+pagename);
- },
+ }
});
setTimeout( "loadContentRefresh('"+pagename+"&refresh="+document.getElementById('refreshinterval').value+"')", document.getElementById('refreshinterval').value*1000 );
}
}
-function capp(module) {
+function capp(module, redirect) {
var submitFormObj = jQuery.ajax({ type: "GET",
url: "capp.php",
- data: "mod="+module,
+ data: "mod="+module+((redirect != undefined) ? '&redirect='+redirect : ''),
dataType: "html",
+ beforeSend: function() {
+ showLoadIndicator();
+ },
success: function(data, textStatus, jqXHR) {
if(jqXHR.responseText != '') {
if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
var parts = jqXHR.responseText.split(':');
loadContent(parts[1]);
+ } else if (jqXHR.responseText.indexOf('URL_REDIRECT:') > -1) {
+ var newUrl= jqXHR.responseText.substr(jqXHR.responseText.indexOf('URL_REDIRECT:') + "URL_REDIRECT:".length);
+ document.location.href = newUrl;
} else {
- alert(jqXHR.responseText);
+ //alert(jqXHR.responseText);
}
}
loadMenus();
+ hideLoadIndicator();
},
error: function() {
+ hideLoadIndicator();
reportError('Ajax Request was not successful.'+module);
- },
+ }
});
}
@@ -67,11 +150,19 @@
if(passwordObj.value == ''){
passwordObj.focus();
return;
- }
+ }
+
+ $('#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",
+ beforeSend: function() {
+ showLoadIndicator();
+ },
success: function(data, textStatus, jqXHR) {
if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
var parts = jqXHR.responseText.split(':');
@@ -84,12 +175,16 @@
document.location.href = 'index.php';
} else {
jQuery('#pageContent').html(jqXHR.responseText);
+ onAfterContentLoad();
+ pageFormChanged = false;
}
loadMenus();
+ hideLoadIndicator();
},
error: function() {
+ hideLoadIndicator();
reportError('Ajax Request was not successful.110');
- },
+ }
});
/*
if(redirect != '') {
@@ -101,11 +196,14 @@
}
-function submitForm(formname,target) {
+function submitForm(formname,target) {
var submitFormObj = jQuery.ajax({ type: "POST",
url: target,
data: jQuery('#'+formname).serialize(),
dataType: "html",
+ beforeSend: function() {
+ showLoadIndicator();
+ },
success: function(data, textStatus, jqXHR) {
if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
var parts = jqXHR.responseText.split(':');
@@ -115,12 +213,16 @@
//window.setTimeout('loadContent(redirect)', 1000);
} else {
jQuery('#pageContent').html(jqXHR.responseText);
+ onAfterContentLoad();
+ pageFormChanged = false;
}
+ hideLoadIndicator();
},
error: function(jqXHR, textStatus, errorThrown) {
+ hideLoadIndicator();
var parts = jqXHR.responseText.split(':');
reportError('Ajax Request was not successful. 111');
- },
+ }
});
/*
if(redirect != '') {
@@ -128,6 +230,40 @@
redirect = '';
}
*/
+}
+
+function submitFormConfirm(formname,target,confirmation) {
+ var successMessage = arguments[3];
+ if(window.confirm(confirmation)) {
+ var submitFormObj = jQuery.ajax({ type: "POST",
+ url: target,
+ data: jQuery('#'+formname).serialize(),
+ dataType: "html",
+ beforeSend: function() {
+ showLoadIndicator();
+ },
+ success: function(data, textStatus, jqXHR) {
+ if(successMessage) alert(successMessage);
+ if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
+ var parts = jqXHR.responseText.split(':');
+ //alert(parts[1]);
+ loadContent(parts[1]);
+ //redirect = parts[1];
+ //window.setTimeout('loadContent(redirect)', 1000);
+ } else {
+ jQuery('#pageContent').html(jqXHR.responseText);
+ onAfterContentLoad();
+ pageFormChanged = false;
+ }
+ hideLoadIndicator();
+ },
+ error: function(jqXHR, textStatus, errorThrown) {
+ hideLoadIndicator();
+ var parts = jqXHR.responseText.split(':');
+ reportError('Ajax Request was not successful. 111');
+ }
+ });
+ }
}
function submitUploadForm(formname,target) {
@@ -172,9 +308,14 @@
}
function loadContent(pagename) {
+ var params = arguments[1];
var pageContentObject2 = jQuery.ajax({ type: "GET",
url: pagename,
+ data: (params ? params : null),
dataType: "html",
+ beforeSend: function() {
+ showLoadIndicator();
+ },
success: function(data, textStatus, jqXHR) {
if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
var parts = jqXHR.responseText.split(':');
@@ -187,13 +328,17 @@
//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();
+ pageFormChanged = false;
}
-
+ hideLoadIndicator();
},
error: function() {
+ hideLoadIndicator();
reportError('Ajax Request was not successful. 113');
- },
+ }
});
}
@@ -203,17 +348,24 @@
url: "content.php",
data: "s_mod=login&s_pg=index",
dataType: "html",
+ beforeSend: function() {
+ showLoadIndicator();
+ },
success: function(data, textStatus, jqXHR) {
if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
var parts = jqXHR.responseText.split(":");
loadContent(parts[1]);
} else {
jQuery('#pageContent').html(jqXHR.responseText);
+ onAfterContentLoad();
+ pageFormChanged = false;
}
+ hideLoadIndicator();
},
error: function() {
+ hideLoadIndicator();
reportError('Ajax Request was not successful. 114');
- },
+ }
});
loadMenus();
@@ -224,7 +376,7 @@
function setFocus() {
try {
- document.pageForm.username.focus();
+ jQuery('form#pageForm').find('input[name="username"]').focus();
} catch (e) {
}
}
@@ -235,35 +387,75 @@
url: "nav.php",
data: "nav=side",
dataType: "html",
+ beforeSend: function() {
+ showLoadIndicator();
+ },
success: function(data, textStatus, jqXHR) {
+ hideLoadIndicator();
jQuery('#sideNav').html(jqXHR.responseText);
},
error: function() {
+ hideLoadIndicator();
reportError('Ajax Request was not successful. 115');
- },
+ }
});
var topNavObject = jQuery.ajax({ type: "GET",
url: "nav.php",
data: "nav=top",
dataType: "html",
+ beforeSend: function() {
+ showLoadIndicator();
+ },
success: function(data, textStatus, jqXHR) {
+ hideLoadIndicator();
jQuery('#topNav').html(jqXHR.responseText);
},
error: function(o) {
+ hideLoadIndicator();
reportError('Ajax Request was not successful. 116');
- },
+ }
});
}
-function changeTab(tab,target) {
+function changeTab(tab,target,force) {
//document.forms[0].next_tab.value = tab;
document.pageForm.next_tab.value = tab;
- submitForm('pageForm',target);
+
+ var idel = jQuery('form#pageForm').find('[name="id"]');
+ var id = null;
+ if(idel.length > 0) id = idel.val();
+ if(tabChangeDiscard == 'y' && !force) {
+ if((idel.length < 1 || id) && (pageFormChanged == false || window.confirm(tabChangeDiscardTxt))) {
+ var next_tab = tab;
+ if(id) loadContent(target, {'next_tab': next_tab, 'id': id});
+ else loadContent(target, {'next_tab': next_tab});
+ } else {
+ return false;
+ }
+ } else {
+ if(id && tabChangeWarning == 'y' && pageFormChanged == true) {
+ if(window.confirm(tabChangeWarningTxt)) {
+ submitForm('pageForm', target);
+ } else {
+ var next_tab = tab;
+ if(id) loadContent(target, {'next_tab': next_tab, 'id': id});
+ else loadContent(target, {'next_tab': next_tab});
+ }
+ } else {
+ submitForm('pageForm',target);
+ }
+ }
}
function del_record(link,confirmation) {
+ if(window.confirm(confirmation)) {
+ loadContent(link);
+ }
+}
+
+function confirm_action(link,confirmation) {
if(window.confirm(confirmation)) {
loadContent(link);
}
@@ -273,12 +465,17 @@
var pageContentObject2 = jQuery.ajax({ type: "GET",
url: pagename,
dataType: "html",
+ beforeSend: function() {
+// showLoadIndicator();
+ },
success: function(data, textStatus, jqXHR) {
+// hideLoadIndicator();
jQuery('#'+elementid).html(jqXHR.responseText);
},
error: function() {
+// hideLoadIndicator();
reportError('Ajax Request was not successful. 118');
- },
+ }
});
}
@@ -286,7 +483,11 @@
var pageContentObject2 = jQuery.ajax({ type: "GET",
url: pagename,
dataType: "html",
+ beforeSend: function() {
+// showLoadIndicator();
+ },
success: function(data, textStatus, jqXHR) {
+// hideLoadIndicator();
var teste = jqXHR.responseText;
var elemente = teste.split('#');
el=document.getElementById(elementid);
@@ -300,8 +501,9 @@
}
},
error: function() {
+// hideLoadIndicator();
reportError('Ajax Request was not successful. 119');
- },
+ }
});
}
@@ -314,7 +516,7 @@
},
error: function() {
reportError('Session expired. Please login again.');
- },
+ }
});
//setTimeout( keepalive, 1000000 );
}
@@ -440,40 +642,65 @@
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');
@@ -491,3 +718,109 @@
}
return rv;
}
+
+function password(minLength, special){
+ var iteration = 0;
+ var password = "";
+ var randomNumber;
+ minLength = minLength || 10;
+ var maxLength = minLength + 5;
+ var length = getRandomInt(minLength, maxLength);
+ if(special == undefined){
+ var special = false;
+ }
+ 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);
+ }
+ return password;
+}
+
+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);
+ jQuery('#'+repeatPasswordFieldID).val(pword);
+ newPWField.attr('id', passwordFieldID).val(pword).trigger('keyup');
+}
+
+var funcDisableClick = function(e) { e.preventDefault(); return false; };
+
+function checkPassMatch(pwField1,pwField2){
+ var rpass = jQuery('#'+pwField2).val();
+ var npass = jQuery('#'+pwField1).val();
+ if(npass!= rpass) {
+ jQuery('#confirmpasswordOK').hide();
+ jQuery('#confirmpasswordError').show();
+ jQuery('button.positive').attr('disabled','disabled');
+ jQuery('.tabbox_tabs ul li a').each(function() {
+ var $this = $(this);
+ $this.data('saved_onclick', $this.attr('onclick'));
+ $this.removeAttr('onclick');
+ $this.click(funcDisableClick);
+ });
+ return false;
+ } else {
+ jQuery('#confirmpasswordError').hide();
+ jQuery('#confirmpasswordOK').show();
+ jQuery('button.positive').removeAttr('disabled');
+ jQuery('.tabbox_tabs ul li a').each(function() {
+ var $this = $(this);
+ $this.unbind('click', funcDisableClick);
+ if($this.data('saved_onclick') && !$this.attr('onclick')) $this.attr('onclick', $this.data('saved_onclick'));
+ });
+ }
+}
+
+function getRandomInt(min, max){
+ return Math.floor(Math.random() * (max - min + 1)) + min;
+}
+
+jQuery('.addPlaceholder').live("click", function(){
+ var placeholderText = jQuery(this).text();
+ var template = jQuery(this).siblings(':input');
+ template.insertAtCaret(placeholderText);
+});
+
+jQuery('.addPlaceholderContent').live("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) {
+ if (document.selection) {
+ //For browsers like Internet Explorer
+ this.focus();
+ sel = document.selection.createRange();
+ sel.text = myValue;
+ this.focus();
+ } else if (this.selectionStart || this.selectionStart == '0') {
+ //For browsers like Firefox and Webkit based
+ var startPos = this.selectionStart;
+ var endPos = this.selectionEnd;
+ var scrollTop = this.scrollTop;
+ this.value = this.value.substring(0, startPos)+myValue+this.value.substring(endPos,this.value.length);
+ this.focus();
+ this.selectionStart = startPos + myValue.length;
+ this.selectionEnd = startPos + myValue.length;
+ this.scrollTop = scrollTop;
+ } else {
+ this.value += myValue;
+ this.focus();
+ }
+ })
+ }
+});
+
--
Gitblit v1.9.1