diff --git a/SimpleX/__pycache__/regex_simplexlinks.cpython-311.pyc b/SimpleX/__pycache__/regex_simplexlinks.cpython-311.pyc new file mode 100644 index 0000000..1fe6ae3 Binary files /dev/null and b/SimpleX/__pycache__/regex_simplexlinks.cpython-311.pyc differ diff --git a/SimpleX/__pycache__/utils.cpython-311.pyc b/SimpleX/__pycache__/utils.cpython-311.pyc new file mode 100644 index 0000000..965119d Binary files /dev/null and b/SimpleX/__pycache__/utils.cpython-311.pyc differ diff --git a/SimpleX/__pycache__/utils.cpython-313.pyc b/SimpleX/__pycache__/utils.cpython-313.pyc new file mode 100644 index 0000000..d46565c Binary files /dev/null and b/SimpleX/__pycache__/utils.cpython-313.pyc differ diff --git a/scripts/lantern.py b/scripts/lantern.py index a4d973d..43e5c8c 100644 --- a/scripts/lantern.py +++ b/scripts/lantern.py @@ -229,28 +229,8 @@ Maintenance: newrow=[instance,category,name,url,sensi,desc,'YES','100'] print_colors(f"[+] NEWROW= {newrow}") # (rest is automatic: status, score, instance is = '' because it is your own instance) - # delete existing entries in verified.csv - vdf_same_url_filter = vdf["URL"] == url # check for same url - vdf_same_url_filter_count = vdf_same_url_filter.sum() # total url matches - if vdf_same_url_filter_count > 0: - print(f"Found {vdf_same_url_filter_count} row(s) with the same url in verified.csv") - for index, row in vdf[vdf_same_url_filter].iterrows(): - print_colors(f"[+] ROW[{index}]= {list(row)}") - vdf = vdf[~vdf_same_url_filter].reset_index(drop=True) # keep only entries that do not match filter - print(f"Deleted {vdf_same_url_filter_count} row(s) with the same url in verified.csv") - if desc == '': # if the description is empty = it means that it goes in unverified.csv, so save modified verified.csv file now - vdf.to_csv(verifiedcsvfile, index=False) - # delete existing entries in unverified.csv - uvdf_same_url_filter = uvdf["URL"] == url # check for same url - uvdf_same_url_filter_count = uvdf_same_url_filter.sum() # total url matches - if uvdf_same_url_filter_count > 0: - print(f"Found {uvdf_same_url_filter_count} row(s) with the same url in unverified.csv") - for index, row in uvdf[uvdf_same_url_filter].iterrows(): - print_colors(f"[+] ROW[{index}]= {list(row)}") - uvdf = uvdf[~uvdf_same_url_filter].reset_index(drop=True) # keep only entries that do not match filter - print(f"Deleted {uvdf_same_url_filter_count} row(s) with the same url in unverified.csv") - if desc != '': # if the description isnt empty = it means that it goes in verified.csv, so save modified unverified.csv file now - uvdf.to_csv(unverifiedcsvfile, index=False) + # TODO check if the entry doesnt already exist in verified.csv and in unverified.csv + # if it doesnt exist, add it into unverified.csv if desc == '': # if the description is empty = it means that it goes in unverified.csv print("Adding new row in unverified.csv since description is empty") uvdf.loc[-1] = newrow # adding a row @@ -1458,4 +1438,3 @@ Maintenance: if __name__ == '__main__': main() - diff --git a/www/header.php b/www/header.php index 52b819b..0e360fb 100644 --- a/www/header.php +++ b/www/header.php @@ -173,53 +173,11 @@ if (($handle = fopen($csvfile, "r")) !== FALSE) { if (strtolower($oldcatname) != strtolower($data[1])){ if( str_contains(strtolower($data[1]),'monero' )){ - echo '' . '' . $data[1] . ' | '; // display the category as its the first row with this new category + echo '' . $data[1] . ' | '; // display the category as its the first row with this new category $oldcatname=$data[1]; }elseif( str_contains(strtolower($data[1]),'simplex' )){ - echo '' . '' . $data[1] . ' | '; // display the category as its the first row with this new category + echo '' . $data[1] . ' | '; // display the category as its the first row with this new category $oldcatname=$data[1]; - - }elseif (str_contains(strtolower($data[1]), 'sms')){ - echo '' . '' . $data[1] . ' | '; // display the category as its the first row with this new category - $oldcatname=$data[1]; - - }elseif (str_contains(strtolower($data[1]), 'games')){ - echo '' . '' . $data[1] . ' | '; // display the category as its the first row with this new category - $oldcatname=$data[1]; - }elseif (str_contains(strtolower($data[1]), 'vps')){ - echo '' . '' . $data[1] . ' | '; // display the category as its the first row with this new category - $oldcatname=$data[1]; - - }elseif (str_contains(strtolower($data[1]), 'torproject')){ - echo '' . '' . $data[1] . ' | '; - $oldcatname=$data[1]; - }elseif (str_contains(strtolower($data[1]), 'privacy front-ends')){ - echo '' . '' . $data[1] . ' | '; - $oldcatname=$data[1]; - }elseif (str_contains(strtolower($data[1]), 'vpns')){ - echo '' . '' . $data[1] . ' | '; - $oldcatname=$data[1]; - }elseif (str_contains(strtolower($data[1]), 'fediverse')){ - echo '' . '' . $data[1] . ' | '; - $oldcatname=$data[1]; - }elseif (str_contains(strtolower($data[1]), 'torrents')){ - echo '' . '' . $data[1] . ' | '; - $oldcatname=$data[1]; - }elseif (str_contains(strtolower($data[1]), 'forums')){ - echo '' . '' . $data[1] . ' | '; - $oldcatname=$data[1]; - }elseif (str_contains(strtolower($data[1]), 'mail')){ - echo '' . '' . $data[1] . ' | '; - $oldcatname=$data[1]; - }elseif (str_contains(strtolower($data[1]), 'radio')){ - echo '' . '' . $data[1] . ' | '; - $oldcatname=$data[1]; - }elseif (str_contains(strtolower($data[1]), 'search engine')){ - echo '' . '' . $data[1] . ' | '; - $oldcatname=$data[1]; - }elseif (str_contains(strtolower($data[1]), 'exchanges')){ - echo '' . '' . $data[1] . ' | '; - $oldcatname=$data[1]; }else{ echo '' . $data[1] . ' | '; // display the category as its the first row with this new category $oldcatname=$data[1]; diff --git a/www/img/clawsmail.png b/www/img/clawsmail.png deleted file mode 100644 index dcb0127..0000000 Binary files a/www/img/clawsmail.png and /dev/null differ diff --git a/www/img/dread.png b/www/img/dread.png deleted file mode 100644 index fe253ea..0000000 Binary files a/www/img/dread.png and /dev/null differ diff --git a/www/img/games.ico b/www/img/games.ico deleted file mode 100644 index f0a883e..0000000 Binary files a/www/img/games.ico and /dev/null differ diff --git a/www/img/haveno.png b/www/img/haveno.png deleted file mode 100644 index c031b77..0000000 Binary files a/www/img/haveno.png and /dev/null differ diff --git a/www/img/linux.ico b/www/img/linux.ico deleted file mode 100644 index 582561a..0000000 Binary files a/www/img/linux.ico and /dev/null differ diff --git a/www/img/monero.png b/www/img/monero.png deleted file mode 100644 index ea0d863..0000000 Binary files a/www/img/monero.png and /dev/null differ diff --git a/www/img/opensource.ico b/www/img/opensource.ico deleted file mode 100644 index 1808bfd..0000000 Binary files a/www/img/opensource.ico and /dev/null differ diff --git a/www/img/openvpn.ico b/www/img/openvpn.ico deleted file mode 100644 index 5df666f..0000000 Binary files a/www/img/openvpn.ico and /dev/null differ diff --git a/www/img/radio.ico b/www/img/radio.ico deleted file mode 100644 index 792a95c..0000000 Binary files a/www/img/radio.ico and /dev/null differ diff --git a/www/img/searxng.svg b/www/img/searxng.svg deleted file mode 100644 index f3ff8e3..0000000 --- a/www/img/searxng.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/www/img/simplex.png b/www/img/simplex.png deleted file mode 100644 index a1cf370..0000000 Binary files a/www/img/simplex.png and /dev/null differ diff --git a/www/img/sms.ico b/www/img/sms.ico deleted file mode 100644 index 15ff283..0000000 Binary files a/www/img/sms.ico and /dev/null differ diff --git a/www/img/tor.png b/www/img/tor.png deleted file mode 100644 index 5832de5..0000000 Binary files a/www/img/tor.png and /dev/null differ diff --git a/www/img/tor_browser.ico b/www/img/tor_browser.ico deleted file mode 100644 index 98293b7..0000000 Binary files a/www/img/tor_browser.ico and /dev/null differ diff --git a/www/img/torrents.ico b/www/img/torrents.ico deleted file mode 100644 index b7a5463..0000000 Binary files a/www/img/torrents.ico and /dev/null differ diff --git a/www/img/xmpp.ico b/www/img/xmpp.ico deleted file mode 100644 index a56a17d..0000000 Binary files a/www/img/xmpp.ico and /dev/null differ diff --git a/www/style.css b/www/style.css index aff42a3..6c57a03 100644 --- a/www/style.css +++ b/www/style.css @@ -9,10 +9,6 @@ font-family: 'Source Code Pro', monospace; } - -.caticon{ - height: 13px; -} .width-class{ width: 100%; object-fit: contain;