' )
+ .attr( 'class', 'modName underlined' ).text arrAI[0]
+ div.append td
$( '#action_params' ).append div
fFetchActionParams div, arrAI[0]
opt.remove()
@@ -191,6 +207,7 @@ fOnLoad = () ->
# Store all selected action invokers
ap = {}
$( '> div', $( '#action_params' ) ).each () ->
+ modName = $( '.modName', this ).text()
id = $( this ).attr( 'id' ).substring 3
params = {}
$( 'tr', this ).each () ->
@@ -200,7 +217,7 @@ fOnLoad = () ->
throw new Error "'#{ key }' missing for '#{ id }'"
params[key] = val
encryptedParams = cryptico.encrypt JSON.stringify( params ), strPublicKey
- ap[id] = encryptedParams.cipher
+ ap[modName] = encryptedParams.cipher
acts = []
$( '#selected_actions .title' ).each () ->
acts.push $( this ).text()
@@ -224,23 +241,25 @@ fOnLoad = () ->
actions: acts
action_params: ap
obj.payload = JSON.stringify obj.payload
+ window.scrollTo 0, 0
$.post( '/usercommand', obj )
.done ( data ) ->
$( '#info' ).text data.message
$( '#info' ).attr 'class', 'success'
.fail ( err ) ->
- fDelayed = () ->
- if err.responseText is ''
- msg = 'No Response from Server!'
- else
- try
- oErr = JSON.parse err.responseText
- msg = oErr.message
- $( '#info' ).text 'Error in upload: ' + msg
- $( '#info' ).attr 'class', 'error'
- if err.status is 401
- window.location.href = 'forge?page=forge_rule'
- setTimeout fDelayed, 500
+ if err.status is 401
+ window.location.href = 'forge?page=forge_rule'
+ else
+ fDelayed = () ->
+ if err.responseText is ''
+ msg = 'No Response from Server!'
+ else
+ try
+ oErr = JSON.parse err.responseText
+ msg = oErr.message
+ $( '#info' ).text 'Error in upload: ' + msg
+ $( '#info' ).attr 'class', 'error'
+ setTimeout fDelayed, 500
catch err
$( '#info' ).text 'Error in upload: ' + err.message
$( '#info' ).attr 'class', 'error'
diff --git a/webpages/handlers/coffee/login.coffee b/webpages/handlers/coffee/login.coffee
index ecb7751..b3b9a2c 100644
--- a/webpages/handlers/coffee/login.coffee
+++ b/webpages/handlers/coffee/login.coffee
@@ -12,10 +12,11 @@ fOnLoad = () ->
data =
username: $( '#username' ).val()
password: hp.toString()
- $.post( '/login', data )
+ $.post( '/login', JSON.stringify( data ) )
.done ( data ) ->
window.location.href = document.URL
.fail ( err ) ->
alert 'Authentication not successful!'
window.addEventListener 'load', fOnLoad, true
+
diff --git a/webpages/handlers/js/edit_modules.js b/webpages/handlers/js/edit_modules.js
index e77f7fc..2789af4 100644
--- a/webpages/handlers/js/edit_modules.js
+++ b/webpages/handlers/js/edit_modules.js
@@ -19,23 +19,27 @@
fErrHandler = function(errMsg) {
return function(err) {
var fDelayed;
- $('#moduleName').html("
");
- $('#moduleLanguage').html("
");
- editor.setValue("");
- fDelayed = function() {
- var msg, oErr;
- if (err.responseText === '') {
- msg = 'No Response from Server!';
- } else {
- try {
- oErr = JSON.parse(err.responseText);
- msg = oErr.message;
- } catch (_error) {}
- }
- $('#info').text(errMsg + msg);
- return $('#info').attr('class', 'error');
- };
- return setTimeout(fDelayed, 500);
+ if (err.status === 401) {
+ return window.location.href = 'forge?page=edit_modules';
+ } else {
+ $('#moduleName').html("
");
+ $('#moduleLanguage').html("
");
+ editor.setValue("");
+ fDelayed = function() {
+ var msg, oErr;
+ if (err.responseText === '') {
+ msg = 'No Response from Server!';
+ } else {
+ try {
+ oErr = JSON.parse(err.responseText);
+ msg = oErr.message;
+ } catch (_error) {}
+ }
+ $('#info').text(errMsg + msg);
+ return $('#info').attr('class', 'error');
+ };
+ return setTimeout(fDelayed, 500);
+ }
};
};
fFetchModules = function() {
@@ -119,6 +123,7 @@
}
editor.setValue(oMod.data);
editor.gotoLine(1, 1);
+ editor.scrollToRow(1);
$('#moduleName').html("
" + oMod.id + " ");
return $('#moduleLanguage').html("
" + oMod.lang + " ");
}).fail(fErrHandler('Could not get module! '));
diff --git a/webpages/handlers/js/edit_rules.js b/webpages/handlers/js/edit_rules.js
index 889cd6b..fa989a8 100644
--- a/webpages/handlers/js/edit_rules.js
+++ b/webpages/handlers/js/edit_rules.js
@@ -9,21 +9,25 @@
fErrHandler = function(errMsg) {
return function(err) {
var fDelayed;
- $('#log_col').text("");
- fDelayed = function() {
- var msg, oErr;
- if (err.responseText === '') {
- msg = 'No Response from Server!';
- } else {
- try {
- oErr = JSON.parse(err.responseText);
- msg = oErr.message;
- } catch (_error) {}
- }
- $('#info').text(errMsg + msg);
- return $('#info').attr('class', 'error');
- };
- return setTimeout(fDelayed, 500);
+ if (err.status === 401) {
+ return window.location.href = 'forge?page=edit_rules';
+ } else {
+ $('#log_col').text("");
+ fDelayed = function() {
+ var msg, oErr;
+ if (err.responseText === '') {
+ msg = 'No Response from Server!';
+ } else {
+ try {
+ oErr = JSON.parse(err.responseText);
+ msg = oErr.message;
+ } catch (_error) {}
+ }
+ $('#info').text(errMsg + msg);
+ return $('#info').attr('class', 'error');
+ };
+ return setTimeout(fDelayed, 500);
+ }
};
};
fFetchRules = function() {
diff --git a/webpages/handlers/js/forge_action_invoker.js b/webpages/handlers/js/forge_action_invoker.js
index 199794a..8431461 100644
--- a/webpages/handlers/js/forge_action_invoker.js
+++ b/webpages/handlers/js/forge_action_invoker.js
@@ -77,28 +77,30 @@
}
};
obj.payload = JSON.stringify(obj.payload);
+ window.scrollTo(0, 0);
return $.post('/usercommand', obj).done(function(data) {
$('#info').text(data.message);
return $('#info').attr('class', 'success');
}).fail(function(err) {
var fDelayed;
- fDelayed = function() {
- var msg, oErr;
- if (err.responseText === '') {
- msg = 'No Response from Server!';
- } else {
- try {
- oErr = JSON.parse(err.responseText);
- msg = oErr.message;
- } catch (_error) {}
- }
- $('#info').text('Action Invoker not stored! ' + msg);
- $('#info').attr('class', 'error');
- if (err.status === 401) {
- return window.location.href = 'forge?page=forge_action_invoker';
- }
- };
- return setTimeout(fDelayed, 500);
+ if (err.status === 401) {
+ return window.location.href = 'forge?page=forge_action_invoker';
+ } else {
+ fDelayed = function() {
+ var msg, oErr;
+ if (err.responseText === '') {
+ msg = 'No Response from Server!';
+ } else {
+ try {
+ oErr = JSON.parse(err.responseText);
+ msg = oErr.message;
+ } catch (_error) {}
+ }
+ $('#info').text('Action Invoker not stored! ' + msg);
+ return $('#info').attr('class', 'error');
+ };
+ return setTimeout(fDelayed, 500);
+ }
});
}
});
diff --git a/webpages/handlers/js/forge_event.js b/webpages/handlers/js/forge_event.js
index 7f6670c..0da5363 100644
--- a/webpages/handlers/js/forge_event.js
+++ b/webpages/handlers/js/forge_event.js
@@ -17,22 +17,24 @@
try {
val = editor.getValue();
JSON.parse(val);
+ window.scrollTo(0, 0);
return $.post('/event', val).done(function(data) {
$('#info').text(data.message);
return $('#info').attr('class', 'success');
}).fail(function(err) {
var fDelayed;
- fDelayed = function() {
- if (err.responseText === '') {
- err.responseText = 'No Response from Server!';
- }
- $('#info').text('Error in upload: ' + err.responseText);
- $('#info').attr('class', 'error');
- if (err.status === 401) {
- return window.location.href = 'forge?page=forge_event';
- }
- };
- return setTimeout(fDelayed, 500);
+ if (err.status === 401) {
+ return window.location.href = 'forge?page=forge_event';
+ } else {
+ fDelayed = function() {
+ if (err.responseText === '') {
+ err.responseText = 'No Response from Server!';
+ }
+ $('#info').text('Error in upload: ' + err.responseText);
+ return $('#info').attr('class', 'error');
+ };
+ return setTimeout(fDelayed, 500);
+ }
});
} catch (_error) {
err = _error;
diff --git a/webpages/handlers/js/forge_event_poller.js b/webpages/handlers/js/forge_event_poller.js
index fb8c640..a7b1c50 100644
--- a/webpages/handlers/js/forge_event_poller.js
+++ b/webpages/handlers/js/forge_event_poller.js
@@ -76,28 +76,30 @@
}
};
obj.payload = JSON.stringify(obj.payload);
+ window.scrollTo(0, 0);
return $.post('/usercommand', obj).done(function(data) {
$('#info').text(data.message);
return $('#info').attr('class', 'success');
}).fail(function(err) {
var fDelayed;
- fDelayed = function() {
- var msg, oErr;
- if (err.responseText === '') {
- msg = 'No Response from Server!';
- } else {
- try {
- oErr = JSON.parse(err.responseText);
- msg = oErr.message;
- } catch (_error) {}
- }
- $('#info').text('Event Poller not stored! ' + msg);
- $('#info').attr('class', 'error');
- if (err.status === 401) {
- return window.location.href = 'forge?page=forge_event_poller';
- }
- };
- return setTimeout(fDelayed, 500);
+ if (err.status === 401) {
+ return window.location.href = 'forge?page=forge_event_poller';
+ } else {
+ fDelayed = function() {
+ var msg, oErr;
+ if (err.responseText === '') {
+ msg = 'No Response from Server!';
+ } else {
+ try {
+ oErr = JSON.parse(err.responseText);
+ msg = oErr.message;
+ } catch (_error) {}
+ }
+ $('#info').text('Event Poller not stored! ' + msg);
+ return $('#info').attr('class', 'error');
+ };
+ return setTimeout(fDelayed, 500);
+ }
});
}
});
diff --git a/webpages/handlers/js/forge_rule.js b/webpages/handlers/js/forge_rule.js
index 5b3bf9e..b26cb73 100644
--- a/webpages/handlers/js/forge_rule.js
+++ b/webpages/handlers/js/forge_rule.js
@@ -9,9 +9,13 @@
}).done(function(data) {
return strPublicKey = data.message;
}).fail(function(err) {
- console.log(err);
- $('#info').text('Error fetching public key, unable to send user-specific parameters securely');
- return $('#info').attr('class', 'error');
+ if (err.status === 401) {
+ return window.location.href = 'forge?page=forge_rule';
+ } else {
+ console.log(err);
+ $('#info').text('Error fetching public key, unable to send user-specific parameters securely');
+ return $('#info').attr('class', 'error');
+ }
});
fOnLoad = function() {
@@ -60,12 +64,16 @@
}
}).fail(function(err) {
var fDelayed;
- fDelayed = function() {
- console.log(err);
- $('#info').text('Error fetching event poller params');
- return $('#info').attr('class', 'error');
- };
- return setTimeout(fDelayed, 500);
+ if (err.status === 401) {
+ return window.location.href = 'forge?page=forge_rule';
+ } else {
+ fDelayed = function() {
+ console.log(err);
+ $('#info').text('Error fetching event poller params');
+ return $('#info').attr('class', 'error');
+ };
+ return setTimeout(fDelayed, 500);
+ }
});
}
};
@@ -100,12 +108,16 @@
return fFetchEventParams($('#select_event option:selected').text());
}).fail(function(err) {
var fDelayed;
- fDelayed = function() {
- console.log(err);
- $('#info').text('Error fetching event poller');
- return $('#info').attr('class', 'error');
- };
- return setTimeout(fDelayed, 500);
+ if (err.status === 401) {
+ return window.location.href = 'forge?page=forge_rule';
+ } else {
+ fDelayed = function() {
+ console.log(err);
+ $('#info').text('Error fetching event poller');
+ return $('#info').attr('class', 'error');
+ };
+ return setTimeout(fDelayed, 500);
+ }
});
$('#select_event').change(function() {
return fFetchEventParams($(this).val());
@@ -145,12 +157,16 @@
return _results;
}).fail(function(err) {
var fDelayed;
- console.log(err);
- fDelayed = function() {
- $('#info').text('Error fetching event poller');
- return $('#info').attr('class', 'error');
- };
- return setTimeout(fDelayed, 500);
+ if (err.status === 401) {
+ return window.location.href = 'forge?page=forge_rule';
+ } else {
+ console.log(err);
+ fDelayed = function() {
+ $('#info').text('Error fetching event poller');
+ return $('#info').attr('class', 'error');
+ };
+ return setTimeout(fDelayed, 500);
+ }
});
fFetchActionParams = function(div, name) {
obj = {
@@ -185,16 +201,20 @@
}
}).fail(function(err) {
var fDelayed;
- console.log(err);
- fDelayed = function() {
- $('#info').text('Error fetching action invoker params');
- return $('#info').attr('class', 'error');
- };
- return setTimeout(fDelayed, 500);
+ if (err.status === 401) {
+ return window.location.href = 'forge?page=forge_rule';
+ } else {
+ console.log(err);
+ fDelayed = function() {
+ $('#info').text('Error fetching action invoker params');
+ return $('#info').attr('class', 'error');
+ };
+ return setTimeout(fDelayed, 500);
+ }
});
};
$('#select_actions').on('change', function() {
- var arrAI, div, idAI, img, opt, table, tr;
+ var arrAI, div, idAI, img, opt, table, td, tr;
opt = $('option:selected', this);
arrAI = opt.val().split(' -> ');
idAI = opt.attr('id');
@@ -206,7 +226,9 @@
table.append(tr);
if ($('#ap_' + idAI).length === 0) {
div = $('
').attr('id', 'ap_' + idAI);
- div.append($('
')).attr('class', 'underlined').text(arrAI[0]);
+ td = $('
');
+ td.append($('
')).attr('class', 'modName underlined').text(arrAI[0]);
+ div.append(td);
$('#action_params').append(div);
fFetchActionParams(div, arrAI[0]);
}
@@ -247,7 +269,8 @@
}
ap = {};
$('> div', $('#action_params')).each(function() {
- var encryptedParams, id, params;
+ var encryptedParams, id, modName, params;
+ modName = $('.modName', this).text();
id = $(this).attr('id').substring(3);
params = {};
$('tr', this).each(function() {
@@ -260,7 +283,7 @@
return params[key] = val;
});
encryptedParams = cryptico.encrypt(JSON.stringify(params), strPublicKey);
- return ap[id] = encryptedParams.cipher;
+ return ap[modName] = encryptedParams.cipher;
});
acts = [];
$('#selected_actions .title').each(function() {
@@ -288,28 +311,30 @@
}
};
obj.payload = JSON.stringify(obj.payload);
+ window.scrollTo(0, 0);
return $.post('/usercommand', obj).done(function(data) {
$('#info').text(data.message);
return $('#info').attr('class', 'success');
}).fail(function(err) {
var fDelayed;
- fDelayed = function() {
- var msg, oErr;
- if (err.responseText === '') {
- msg = 'No Response from Server!';
- } else {
- try {
- oErr = JSON.parse(err.responseText);
- msg = oErr.message;
- } catch (_error) {}
- }
- $('#info').text('Error in upload: ' + msg);
- $('#info').attr('class', 'error');
- if (err.status === 401) {
- return window.location.href = 'forge?page=forge_rule';
- }
- };
- return setTimeout(fDelayed, 500);
+ if (err.status === 401) {
+ return window.location.href = 'forge?page=forge_rule';
+ } else {
+ fDelayed = function() {
+ var msg, oErr;
+ if (err.responseText === '') {
+ msg = 'No Response from Server!';
+ } else {
+ try {
+ oErr = JSON.parse(err.responseText);
+ msg = oErr.message;
+ } catch (_error) {}
+ }
+ $('#info').text('Error in upload: ' + msg);
+ return $('#info').attr('class', 'error');
+ };
+ return setTimeout(fDelayed, 500);
+ }
});
} catch (_error) {
err = _error;
diff --git a/webpages/handlers/js/login.js b/webpages/handlers/js/login.js
index 348fc68..d89ec88 100644
--- a/webpages/handlers/js/login.js
+++ b/webpages/handlers/js/login.js
@@ -17,7 +17,7 @@
username: $('#username').val(),
password: hp.toString()
};
- return $.post('/login', data).done(function(data) {
+ return $.post('/login', JSON.stringify(data)).done(function(data) {
return window.location.href = document.URL;
}).fail(function(err) {
return alert('Authentication not successful!');
diff --git a/webpages/handlers/templates/edit_modules.html b/webpages/handlers/templates/edit_modules.html
index c655f86..eb682f1 100644
--- a/webpages/handlers/templates/edit_modules.html
+++ b/webpages/handlers/templates/edit_modules.html
@@ -10,7 +10,7 @@
-
+
diff --git a/webpages/handlers/templates/forge_action_invoker.html b/webpages/handlers/templates/forge_action_invoker.html
index 2f31e59..f760807 100644
--- a/webpages/handlers/templates/forge_action_invoker.html
+++ b/webpages/handlers/templates/forge_action_invoker.html
@@ -46,7 +46,7 @@ Call the ProBinder service with the given parameters.
@param {String} args.method the required method identifier to be appended to the url
@param {function} [args.callback] the function to receive the request answer
###
-exports.call = ( args ) ->
+callService = ( args ) ->
if not args.service or not args.method
log 'ERROR in call function: Missing arguments!'
else
@@ -55,41 +55,6 @@ exports.call = ( args ) ->
url = urlService + args.service + '/' + args.method
needlereq 'post', url, args.data, credentials, args.callback
-###
-Calls the user's unread content service.
-
-@param {Object} [args] the optional object containing the callback function
-@param {function} [args.callback] refer to call function
-###
-exports.getUnreadContents = ( args ) ->
- if not args.callback
- args.callback = standardCallback 'getUnreadContents'
- exports.call
- service: '36'
- method: 'unreadcontent'
- callback: args.callback
-
-
-###
-Calls the content get service with the content id and the service id provided.
-
-@param {Object} args the object containing the service id and the content id,
- success and error callback methods
-@param {String} args.serviceid the service id that is able to process this content
-@param {String} args.contentid the content id
-@param {function} [args.callback] receives the needle answer from the "call" function
-###
-exports.getContent = ( args ) ->
- if not args.callback
- args.callback = standardCallback 'getContent'
- exports.call
- service: '2'
- method: 'get'
- data:
- id: args.contentid
- service: args.serviceid
- callback: args.callback
-
###
Does everything to post something in a binder
@@ -100,7 +65,7 @@ Does everything to post something in a binder
exports.newContent = ( args ) ->
if not args.callback
args.callback = standardCallback 'newContent'
- exports.call
+ callService
service: '27'
method: 'save'
data:
@@ -119,11 +84,11 @@ Does everything to post a file info in a binder tabe
exports.makeFileEntry = ( args ) ->
if not args.callback
args.callback = standardCallback 'makeFileEntry'
- exports.getContent
+ getContent
serviceid: args.service
contentid: args.id
callback: ( err, resp, body ) ->
- exports.call
+ callService
service: '27'
method: 'save'
data:
@@ -133,6 +98,26 @@ exports.makeFileEntry = ( args ) ->
find it here !'"
callback: args.callback
+###
+Calls the content get service with the content id and the service id provided.
+
+@param {Object} args the object containing the service id and the content id,
+ success and error callback methods
+@param {String} args.serviceid the service id that is able to process this content
+@param {String} args.contentid the content id
+@param {function} [args.callback] receives the needle answer from the "call" function
+###
+getContent = ( args ) ->
+ if not args.callback
+ args.callback = standardCallback 'getContent'
+ callService
+ service: '2'
+ method: 'get'
+ data:
+ id: args.contentid
+ service: args.serviceid
+ callback: args.callback
+
###
Sets the content as read.
@@ -142,7 +127,7 @@ Sets the content as read.
exports.setRead = ( args ) ->
if not args.callback
args.callback = standardCallback 'setRead'
- exports.call
+ callService
service: '2'
method: 'setread'
data:
diff --git a/webpages/handlers/templates/forge_event_poller.html b/webpages/handlers/templates/forge_event_poller.html
index 131fb2f..993aff1 100644
--- a/webpages/handlers/templates/forge_event_poller.html
+++ b/webpages/handlers/templates/forge_event_poller.html
@@ -24,13 +24,15 @@ exports.newMail = ( pushEvent ) ->
#
# Syntax: needle.request method, url, data, [options], callback
#
- needlereq 'get', url, null, null, ( err, resp, body ) ->
- if err
- log 'Error in EmailYak EM newMail: ' + err.message
- else
- if resp.statusCode is 200
- mails = JSON.parse( body ).Emails
- pushEvent mail for mail in mails
+ needlereq 'get', url, null, null, ( err, resp, body ) ->
+ if err
+ log 'Error in EmailYak EM newMail: ' + err.message
+ else
+ if resp.statusCode is 200
+ for mail in body.Emails
+ pushEvent
+ subject: mail.Subject
+ content: mail.TextBody
save
diff --git a/webpages/public/style.css b/webpages/public/style.css
index 5d86855..0849ad3 100644
--- a/webpages/public/style.css
+++ b/webpages/public/style.css
@@ -127,6 +127,7 @@ input[type=text]:focus {
#tableRules tr {
margin-bottom: 10px;
}
+
#log_col {
padding-left: 20px;
border-left: double #666;