From 2b310d436790d99ba45d6e1d91b054ae800667f1 Mon Sep 17 00:00:00 2001
From: Terrtia <or1994@hotmail.fr>
Date: Fri, 1 Jun 2018 11:26:45 +0200
Subject: [PATCH] clean

---
 var/www/modules/Flask_config.py                   |  2 ++
 var/www/modules/Tags/Flask_Tags.py                |  8 +-------
 var/www/modules/Tags/templates/Tags.html          |  2 --
 var/www/modules/Tags/templates/galaxies.html      |  1 -
 .../modules/Tags/templates/tag_galaxy_info.html   |  3 ---
 var/www/modules/Tags/templates/tagged.html        | 11 -----------
 var/www/modules/Tags/templates/taxonomies.html    |  8 --------
 .../modules/browsepastes/Flask_browsepastes.py    | 14 +-------------
 .../templates/important_paste_by_module.html      |  1 -
 var/www/modules/search/Flask_search.py            | 15 +--------------
 var/www/modules/showpaste/Flask_showpaste.py      |  9 +--------
 .../showpaste/templates/show_saved_paste.html     |  4 +---
 var/www/update_thirdparty.sh                      |  2 +-
 13 files changed, 8 insertions(+), 72 deletions(-)

diff --git a/var/www/modules/Flask_config.py b/var/www/modules/Flask_config.py
index 41745f21..26edccfa 100644
--- a/var/www/modules/Flask_config.py
+++ b/var/www/modules/Flask_config.py
@@ -82,3 +82,5 @@ max_preview_char = int(cfg.get("Flask", "max_preview_char")) # Maximum number of
 max_preview_modal = int(cfg.get("Flask", "max_preview_modal")) # Maximum number of character to display in the modal
 
 DiffMaxLineLength =  int(cfg.get("Flask", "DiffMaxLineLength"))#Use to display the estimated percentage instead of a raw value
+
+bootstrap_label = ['primary', 'success', 'danger', 'warning', 'info']
diff --git a/var/www/modules/Tags/Flask_Tags.py b/var/www/modules/Tags/Flask_Tags.py
index 701f7c46..95560ad6 100644
--- a/var/www/modules/Tags/Flask_Tags.py
+++ b/var/www/modules/Tags/Flask_Tags.py
@@ -24,6 +24,7 @@ r_serv_tags = Flask_config.r_serv_tags
 r_serv_metadata = Flask_config.r_serv_metadata
 max_preview_char = Flask_config.max_preview_char
 max_preview_modal = Flask_config.max_preview_modal
+bootstrap_label = Flask_config.bootstrap_label
 
 Tags = Blueprint('Tags', __name__, template_folder='templates')
 
@@ -204,13 +205,6 @@ def get_tagged_paste():
     #TODO FIXME
     currentSelectYear = int(datetime.now().year)
 
-    bootstrap_label = []
-    bootstrap_label.append('primary')
-    bootstrap_label.append('success')
-    bootstrap_label.append('danger')
-    bootstrap_label.append('warning')
-    bootstrap_label.append('info')
-
     all_content = []
     paste_date = []
     paste_linenum = []
diff --git a/var/www/modules/Tags/templates/Tags.html b/var/www/modules/Tags/templates/Tags.html
index 8c9fad2a..f3cf1a44 100644
--- a/var/www/modules/Tags/templates/Tags.html
+++ b/var/www/modules/Tags/templates/Tags.html
@@ -77,8 +77,6 @@
 
 										$.getJSON('/Tags/get_all_tags',
 				              function(data) {
-				                 //console.log(data)
-				                 //for(var i=0;i<data.length;i++) jsonData.push({id:i,name:data[i]});
 
 				                ltags = $('#ltags').tagSuggest({
 				                  data: data,
diff --git a/var/www/modules/Tags/templates/galaxies.html b/var/www/modules/Tags/templates/galaxies.html
index 68a0ee82..5013c356 100644
--- a/var/www/modules/Tags/templates/galaxies.html
+++ b/var/www/modules/Tags/templates/galaxies.html
@@ -111,7 +111,6 @@ $(document).ready(function(){
 			{
 				"aLengthMenu": [[5, 10, 15, 20, -1], [5, 10, 15, 20, "All"]],
 				"iDisplayLength": 15,
-				//"order": [[ 1, "asc" ]]
 			}
 		);
 
diff --git a/var/www/modules/Tags/templates/tag_galaxy_info.html b/var/www/modules/Tags/templates/tag_galaxy_info.html
index 24aa86cc..a1544fcd 100644
--- a/var/www/modules/Tags/templates/tag_galaxy_info.html
+++ b/var/www/modules/Tags/templates/tag_galaxy_info.html
@@ -100,13 +100,10 @@
 <script>
 $(document).ready(function(){
 
-		//search_table = $('#myTable_').DataTable({ "order": [[ 2, "desc" ]] });
-
 		$('#myTable_').DataTable(
 			{
 				"aLengthMenu": [[5, 10, 15, 20, -1], [5, 10, 15, 20, "All"]],
 				"iDisplayLength": 15,
-				//"order": [[ 1, "asc" ]]
 			}
 		);
 
diff --git a/var/www/modules/Tags/templates/tagged.html b/var/www/modules/Tags/templates/tagged.html
index 1fe47c4f..284323fd 100644
--- a/var/www/modules/Tags/templates/tagged.html
+++ b/var/www/modules/Tags/templates/tagged.html
@@ -159,7 +159,6 @@ $(document).ready(function(){
     search_table = $('#myTable_').DataTable({ "order": [[ 2, "desc" ]] });
     $('[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));
     });
 
@@ -169,18 +168,10 @@ $(document).ready(function(){
     $("#nbr_entry").hide();
     $("#loading_gif_browse").hide();
 
-    /*$('#myTable_').DataTable(
-      {
-        "aLengthMenu": [[5, 10, 25, -1], [5, 10, 25, "All"]],
-        "iDisplayLength": 10
-      }
-    );*/
-
     $.getJSON('/Tags/get_all_tags',
       function(data) {
         activePage = "page-Tags"
         $("#"+activePage).addClass("active");
-        //var valueData = ["infoleak:automatic-detection=\"bitcoin-address\"","infoleak:automatic-detection=\"aws-key\"",'misp-galaxy:botnet="Marina Botnet"'];
         var valueData = [
           {% for tag in list_tag %}
             '{{tag|safe}}',
@@ -195,8 +186,6 @@ $(document).ready(function(){
           name: 'ltags',
           });
 
-        //ltags.setValue(["{{ tags }}"]);
-        //ltags.setValue([{id:"infoleak:automatic-detection='bitcoin-address'",name:"infoleak:automatic-detection='bitcoin-address'"}}]);
       });
 
 });
diff --git a/var/www/modules/Tags/templates/taxonomies.html b/var/www/modules/Tags/templates/taxonomies.html
index 6ac9a3e6..74feda6f 100644
--- a/var/www/modules/Tags/templates/taxonomies.html
+++ b/var/www/modules/Tags/templates/taxonomies.html
@@ -97,19 +97,11 @@
 
 <script>
 $(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_').DataTable({ "order": [[ 2, "desc" ]] });*/
 
 		$('#myTable_').DataTable(
 			{
 				"aLengthMenu": [[5, 10, 15, 20, -1], [5, 10, 15, 20, "All"]],
 				"iDisplayLength": 15,
-				//"order": [[ 1, "asc" ]]
 			}
 		);
 
diff --git a/var/www/modules/browsepastes/Flask_browsepastes.py b/var/www/modules/browsepastes/Flask_browsepastes.py
index d5f098b9..2a73d9b8 100644
--- a/var/www/modules/browsepastes/Flask_browsepastes.py
+++ b/var/www/modules/browsepastes/Flask_browsepastes.py
@@ -21,6 +21,7 @@ cfg = Flask_config.cfg
 max_preview_char = Flask_config.max_preview_char
 max_preview_modal = Flask_config.max_preview_modal
 r_serv_metadata = Flask_config.r_serv_metadata
+bootstrap_label = Flask_config.bootstrap_label
 
 #init all lvlDB servers
 curYear = datetime.now().year
@@ -58,12 +59,6 @@ def event_stream_getImportantPasteByModule(module_name, year):
     index = 0
     all_pastes_list = getPastebyType(r_serv_db[year], module_name)
     paste_tags = []
-    bootstrap_label = []
-    bootstrap_label.append('primary')
-    bootstrap_label.append('success')
-    bootstrap_label.append('danger')
-    bootstrap_label.append('warning')
-    bootstrap_label.append('info')
 
     for path in all_pastes_list:
         index += 1
@@ -128,13 +123,6 @@ def importantPasteByModule():
     paste_tags = []
     allPastes = getPastebyType(r_serv_db[currentSelectYear], module_name)
 
-    bootstrap_label = []
-    bootstrap_label.append('primary')
-    bootstrap_label.append('success')
-    bootstrap_label.append('danger')
-    bootstrap_label.append('warning')
-    bootstrap_label.append('info')
-
     for path in allPastes[0:10]:
         all_path.append(path)
         paste = Paste.Paste(path)
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 41923391..2c86531c 100644
--- a/var/www/modules/browsepastes/templates/important_paste_by_module.html
+++ b/var/www/modules/browsepastes/templates/important_paste_by_module.html
@@ -137,7 +137,6 @@ $("#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));
     });
 
diff --git a/var/www/modules/search/Flask_search.py b/var/www/modules/search/Flask_search.py
index 82040d17..818e3e61 100644
--- a/var/www/modules/search/Flask_search.py
+++ b/var/www/modules/search/Flask_search.py
@@ -25,6 +25,7 @@ r_serv_pasteName = Flask_config.r_serv_pasteName
 r_serv_metadata = Flask_config.r_serv_metadata
 max_preview_char = Flask_config.max_preview_char
 max_preview_modal = Flask_config.max_preview_modal
+bootstrap_label = Flask_config.bootstrap_label
 
 
 baseindexpath = os.path.join(os.environ['AIL_HOME'], cfg.get("Indexer", "path"))
@@ -158,13 +159,6 @@ def search():
         results = searcher.search(query)
         num_res = len(results)
 
-    bootstrap_label = []
-    bootstrap_label.append('primary')
-    bootstrap_label.append('success')
-    bootstrap_label.append('danger')
-    bootstrap_label.append('warning')
-    bootstrap_label.append('info')
-
     index_min = 1
     index_max = len(get_index_list())
     return render_template("search.html", r=r, c=c,
@@ -198,13 +192,6 @@ def get_more_search_result():
     size_array = []
     list_tags = []
 
-    bootstrap_label = []
-    bootstrap_label.append('primary')
-    bootstrap_label.append('success')
-    bootstrap_label.append('danger')
-    bootstrap_label.append('warning')
-    bootstrap_label.append('info')
-
     schema = Schema(title=TEXT(stored=True), path=ID(stored=True), content=TEXT)
 
     ix = index.open_dir(selected_index)
diff --git a/var/www/modules/showpaste/Flask_showpaste.py b/var/www/modules/showpaste/Flask_showpaste.py
index a728ce7e..c54c9f19 100644
--- a/var/www/modules/showpaste/Flask_showpaste.py
+++ b/var/www/modules/showpaste/Flask_showpaste.py
@@ -23,6 +23,7 @@ r_serv_tags = Flask_config.r_serv_tags
 max_preview_char = Flask_config.max_preview_char
 max_preview_modal = Flask_config.max_preview_modal
 DiffMaxLineLength = Flask_config.DiffMaxLineLength
+bootstrap_label = Flask_config.bootstrap_label
 
 showsavedpastes = Blueprint('showsavedpastes', __name__, template_folder='templates')
 
@@ -97,14 +98,6 @@ def showpaste(content_range):
     if content_range != 0:
        p_content = p_content[0:content_range]
 
-    #tag color
-    bootstrap_label = []
-    bootstrap_label.append('primary')
-    bootstrap_label.append('success')
-    bootstrap_label.append('danger')
-    bootstrap_label.append('warning')
-    bootstrap_label.append('info')
-
     #active taxonomies
     active_taxonomies = r_serv_tags.smembers('active_taxonomies')
 
diff --git a/var/www/modules/showpaste/templates/show_saved_paste.html b/var/www/modules/showpaste/templates/show_saved_paste.html
index 75d57b96..d72f1cbd 100644
--- a/var/www/modules/showpaste/templates/show_saved_paste.html
+++ b/var/www/modules/showpaste/templates/show_saved_paste.html
@@ -218,7 +218,6 @@
 
             ltags = $('#ltags').tagSuggest({
               data: data,
-              //sortOrder: 'name',
               maxDropHeight: 200,
               name: 'ltags'
             });
@@ -229,7 +228,6 @@
 
             ltagsgalaxies = $('#ltagsgalaxies').tagSuggest({
               data: data,
-              //sortOrder: 'name',
               maxDropHeight: 200,
               name: 'ltagsgalaxies'
             });
@@ -241,7 +239,7 @@
 
 <script>
     jQuery("#all-tags-taxonomies").click(function(e){
-      //change input tags list /Tags/get_tags_taxonomie?taxonomie=infoleak
+      //change input tags list
       $.getJSON('/Tags/get_all_tags_taxonomies',
         function(data) {
           ltags.setData(data)
diff --git a/var/www/update_thirdparty.sh b/var/www/update_thirdparty.sh
index 8f032651..676529b3 100755
--- a/var/www/update_thirdparty.sh
+++ b/var/www/update_thirdparty.sh
@@ -69,4 +69,4 @@ popd
 source ./../../AILENV/bin/activate
 #Update MISP Taxonomies and Galaxies
 python3 -m pip install git+https://github.com/MISP/PyTaxonomies
-python3 -m pip install --upgrade git+https://github.com/MISP/PyMISPGalaxies
+python3 -m pip install git+https://github.com/MISP/PyMISPGalaxies