diff --git a/.gitignore b/.gitignore
index a99c47fd..d62fbd8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ var/www/static/
!var/www/static/js/moduleTrending.js
!var/www/static/js/plot-graph.js
!var/www/static/js/trendingchart.js
+var/www/templates/header.html # auto-generated
# Local config
bin/packages/config.cfg
@@ -27,3 +28,4 @@ bin/packages/config.cfg
# installed files
nltk_data/
doc/all_modules.txt
+doc/module-data-flow.png # auto-generated
diff --git a/bin/LAUNCH.sh b/bin/LAUNCH.sh
index 38ee4e83..0c37e808 100755
--- a/bin/LAUNCH.sh
+++ b/bin/LAUNCH.sh
@@ -189,11 +189,11 @@ function launching_scripts {
helptext;
############### TESTS ###################
-isredis=`screen -ls | awk '/\.Redis\t/ {print strtonum($1)}'`
-islvldb=`screen -ls | awk '/\.LevelDB\t/ {print strtonum($1)}'`
-islogged=`screen -ls | awk '/\.Logging\t/ {print strtonum($1)}'`
-isqueued=`screen -ls | awk '/\.Queue\t/ {print strtonum($1)}'`
-isscripted=`screen -ls | awk '/\.Script\t/ {print strtonum($1)}'`
+isredis=`screen -ls | egrep '[0-9]+.Redis' | cut -d. -f1`
+islvldb=`screen -ls | egrep '[0-9]+.LevelDB' | cut -d. -f1`
+islogged=`screen -ls | egrep '[0-9]+.Logging' | cut -d. -f1`
+isqueued=`screen -ls | egrep '[0-9]+.Queue' | cut -d. -f1`
+isscripted=`screen -ls | egrep '[0-9]+.Script' | cut -d. -f1`
options=("Redis" "LevelDB" "Logs" "Queues" "Scripts" "Killall" "Shutdown" "Update-config")
diff --git a/doc/module-data-flow.png b/doc/module-data-flow.png
deleted file mode 100644
index 03fd7123..00000000
Binary files a/doc/module-data-flow.png and /dev/null differ
diff --git a/doc/presentation/workshop-sha2017.pdf b/doc/presentation/workshop-sha2017.pdf
new file mode 100644
index 00000000..ff402ce9
Binary files /dev/null and b/doc/presentation/workshop-sha2017.pdf differ
diff --git a/pip_packages_requirement.txt b/pip_packages_requirement.txt
index 8c6e956b..d6dd108d 100644
--- a/pip_packages_requirement.txt
+++ b/pip_packages_requirement.txt
@@ -45,7 +45,7 @@ pycountry
PySocks
#ASN lookup requirements
-#https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/adns-python/adns-python-1.2.1.tar.gz
+https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/adns-python/adns-python-1.2.1.tar.gz
https://github.com/trolldbois/python-cymru-services/archive/master.zip
https://github.com/saffsd/langid.py/archive/master.zip
diff --git a/var/www/modules/browsepastes/templates/important_paste_by_module.html b/var/www/modules/browsepastes/templates/important_paste_by_module.html
index 14048bbb..15fec49a 100644
--- a/var/www/modules/browsepastes/templates/important_paste_by_module.html
+++ b/var/www/modules/browsepastes/templates/important_paste_by_module.html
@@ -120,6 +120,10 @@ $("#myTable_"+moduleName).attr('data-numElem', "{{ all_path|length }}");
$(document).ready(function(){
$('[data-toggle="tooltip"]').tooltip();
+ $("[data-toggle='modal']").off('click.openmodal').on("click.openmodal", function (event) {
+ //get_html_and_update_modal(event);
+ get_html_and_update_modal(event, $(this));
+ });
search_table = $('#myTable_'+moduleName).DataTable({ "order": [[ 2, "desc" ]] });
@@ -182,6 +186,50 @@ $(document).ready(function(){
$("#load-more-button").hide();
}
+ function get_html_and_update_modal(event, truemodal) {
+ event.preventDefault();
+
+ var modal=truemodal;
+ var url = " {{ url_for('showsavedpastes.showpreviewpaste') }}?paste=" + modal.attr('data-path') + "&num=" + modal.attr('data-num');
+ last_clicked_paste = modal.attr('data-num');
+ $.get(url, function (data) {
+
+ // verify that the reveived data is really the current clicked paste. Otherwise, ignore it.
+ var received_num = parseInt(data.split("|num|")[1]);
+ if (received_num == last_clicked_paste && can_change_modal_content) {
+ can_change_modal_content = false;
+
+ // clear data by removing html, body, head tags. prevent dark modal background stack bug.
+ var cleared_data = data.split("")[1].split("")[0];
+ $("#mymodalbody").html(cleared_data);
+
+ var button = $('');
+ button.tooltip();
+ $("#mymodalbody").children(".panel-default").append(button);
+
+ $("#button_show_path").attr('href', $(modal).attr('data-url'));
+ $("#button_show_path").show('fast');
+ $("#loading-gif-modal").css("visibility", "hidden"); // Hide the loading GIF
+ if ($("[data-initsize]").attr('data-initsize') < char_to_display) { // All the content is displayed
+ nothing_to_display();
+ }
+ // On click, donwload all paste's content
+ $("#load-more-button").on("click", function (event) {
+ if (complete_paste == null) { //Donwload only once
+ $.get("{{ url_for('showsavedpastes.getmoredata') }}"+"?paste="+$(modal).attr('data-path'), function(data, status){
+ complete_paste = data;
+ update_preview();
+ });
+ } else {
+ update_preview();
+ }
+ });
+ } else if (can_change_modal_content) {
+ $("#mymodalbody").html("Ignoring previous not finished query of paste #" + received_num);
+ }
+ });
+ }
+
// Use to bind the button with the new displayed data
// (The bind do not happens if the dataTable is in tabs and the clicked data is in another page)
@@ -191,46 +239,7 @@ $(document).ready(function(){
$('[data-toggle="tooltip"]').tooltip();
// On click, get html content from url and update the corresponding modal
$("[data-toggle='modal']").off('click.openmodal').on("click.openmodal", function (event) {
- event.preventDefault();
- var modal=$(this);
- var url = " {{ url_for('showsavedpastes.showpreviewpaste') }}?paste=" + $(this).attr('data-path') + "&num=" + $(this).attr('data-num');
- last_clicked_paste = $(this).attr('data-num');
- $.get(url, function (data) {
-
- // verify that the reveived data is really the current clicked paste. Otherwise, ignore it.
- var received_num = parseInt(data.split("|num|")[1]);
- if (received_num == last_clicked_paste && can_change_modal_content) {
- can_change_modal_content = false;
-
- // clear data by removing html, body, head tags. prevent dark modal background stack bug.
- var cleared_data = data.split("")[1].split("")[0];
- $("#mymodalbody").html(cleared_data);
-
- var button = $('');
- button.tooltip();
- $("#mymodalbody").children(".panel-default").append(button);
-
- $("#button_show_path").attr('href', $(modal).attr('data-url'));
- $("#button_show_path").show('fast');
- $("#loading-gif-modal").css("visibility", "hidden"); // Hide the loading GIF
- if ($("[data-initsize]").attr('data-initsize') < char_to_display) { // All the content is displayed
- nothing_to_display();
- }
- // On click, donwload all paste's content
- $("#load-more-button").on("click", function (event) {
- if (complete_paste == null) { //Donwload only once
- $.get("{{ url_for('showsavedpastes.getmoredata') }}"+"?paste="+$(modal).attr('data-path'), function(data, status){
- complete_paste = data;
- update_preview();
- });
- } else {
- update_preview();
- }
- });
- } else if (can_change_modal_content) {
- $("#mymodalbody").html("Ignoring previous not finished query of paste #" + received_num);
- }
- });
+ get_html_and_update_modal(event, $(this));
});
} );
diff --git a/var/www/static/js/indexjavascript.js b/var/www/static/js/indexjavascript.js
index 63ff50a8..47013634 100644
--- a/var/www/static/js/indexjavascript.js
+++ b/var/www/static/js/indexjavascript.js
@@ -91,7 +91,7 @@ function update_values() {
return all_res;
}
- var updateInterval = 10000;
+ var updateInterval = 30*1000; //30s = 30*1000ms
var options_processed_pastes = {
series: { shadowSize: 0 ,
lines: { fill: true, fillColor: { colors: [ { opacity: 1 }, { opacity: 0.1 } ] }}
diff --git a/var/www/templates/header.html b/var/www/templates/header.html
deleted file mode 100644
index 1df983a0..00000000
--- a/var/www/templates/header.html
+++ /dev/null
@@ -1,32 +0,0 @@
-