Merge pull request #135 from mokaddem/bugfixes

Bugfixes and slides

.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

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")
 

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

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,19 +186,12 @@ $(document).ready(function(){
        $("#load-more-button").hide();
    }
 
-
-   // 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)
-
-   search_table.on( 'draw.dt', function () {
-       // Bind tooltip each time we draw a new page
-       $('[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) {
+   function get_html_and_update_modal(event, truemodal) {
        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');
+
+       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. 
@@ -231,6 +228,18 @@ $(document).ready(function(){
                $("#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)
+
+   search_table.on( 'draw.dt', function () {
+       // Bind tooltip each time we draw a new page
+       $('[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) {
+           get_html_and_update_modal(event, $(this));
        });
    } );
 

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 } ] }}

var/www/templates/header.html

@@ -1,32 +0,0 @@
-<div class="navbar-header">
-    <ul class="nav navbar-nav">
-	<li id='page-index'><a href="{{ url_for('dashboard.index') }}"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a></li>
-
-	<li id='page-trendingchart'><a href="{{ url_for('trendings.trending') }}"><i class="glyphicon glyphicon-stats"></i> Trending charts</a></li>
-
-	<li id='page-modulestats'><a href="{{ url_for('trendingmodules.moduletrending') }}"><i class="glyphicon glyphicon-stats"></i> Modules statistics</a></li>
-
-	<li id='page-browse'><a href="{{ url_for('browsepastes.browseImportantPaste') }}"><i class="fa fa-search-plus "></i> Browse important pastes</a></li>
-
-	<li id='page-sentiment'><a class="dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-heart"></i> Sentiment Analysis
-    <span class="caret"></span></a>
-    <ul class="dropdown-menu">
-      <li><a href="{{ url_for('sentiments.sentiment_analysis_trending') }}"><i class="fa fa-bar-chart-o"> </i> Sentiment trending</a></li>
-      <li><a href="{{ url_for('sentiments.sentiment_analysis_plot_tool') }}"><i class="fa fa-wrench"> </i> Sentiment plot Tool</a></li>
-    </ul>
-</li>
-
-        <li id='page-termsfrequency'><a class="dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-eye"></i> Terms frequency
-    <span class="caret"></span></a>
-    <ul class="dropdown-menu">
-      <li><a href="{{ url_for('terms.terms_management') }}"><i class="fa fa-gear "> </i> Terms managements</a></li>
-      <li><a href="{{ url_for('terms.credentials_tracker') }}"><i class="glyphicon glyphicon-screenshot"> </i> Credentials seeker</a></li>
-      <li><a href="{{ url_for('terms.terms_plot_top') }}"><i class="glyphicon glyphicon-fire"> </i> Terms plot top</a></li>
-      <li><a href="{{ url_for('terms.terms_plot_tool') }}"><i class="fa fa-wrench"> </i> Terms plot tool</a></li>
-    </ul>
-</li>
-
-	<li id='page-myNewModule'><a href="{{ url_for('myNewModule.myNewModule_page') }}"><i class="glyphicon glyphicon-new-window"></i> myNewModule </a></li>
-
-    </ul>
-</div>