diff --git a/scripts/uptimecheckernew.py b/scripts/uptimecheckernew.py index 07e96d2..62c3a3a 100644 --- a/scripts/uptimecheckernew.py +++ b/scripts/uptimecheckernew.py @@ -43,6 +43,7 @@ def main(): instancepath=rootpath+'www/participants/'+instance+'/' csvfiles2check=['verified.csv','unverified.csv','webring-participants.csv'] + csvfiles2sortcat=['verified.csv','unverified.csv'] #for csvfile in glob.glob("/srv/darknet-onion-webring/www/links/*.csv"): for csvfilename in csvfiles2check: @@ -97,6 +98,9 @@ def main(): df.at[i,"Score"] = df.at[i,"Score"] - 1 df2 = df.sort_values(by=["Score"], ascending=False) + #sort by category if you are verified/unverified.csv + if csvfilename in csvfiles2sortcat: + df2 = df.sort_values(by=["Category"], ascending=False) #print(df2) df2.to_csv(csvfile, index=False) diff --git a/www/header.php b/www/header.php index f09ee5f..ea0a328 100644 --- a/www/header.php +++ b/www/header.php @@ -7,12 +7,14 @@ \n\n"; //begin html table formatting if (($handle = fopen($csvfile, "r")) !== FALSE) { + $oldcatname=""; while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) { $num = count($data); //echo "

" . $data[1] . "

"; @@ -20,30 +22,44 @@ if (($handle = fopen($csvfile, "r")) !== FALSE) { $row++; //echo $row; - if ( $row == "2") { - echo ""; + echo ""; }else{ - for ($c=0; $c < $num; $c++) { - echo ""; // beging html table row + if (str_contains($data[3], $query) or str_contains($data[2], $query)) { + $resultcount++; + for ($c=0; $c < $num; $c++) { // iterate over each row + echo ""; // begin html table row for that Category // if the row is the first one (name url status score) only display (Name Status Score): // display the contents of a csv row if ( $c == "1" ){ - echo " \n"; // display the score and close the third cell + + if ($oldcatname != $data[1]){ + echo ""; // skip a row if new category + echo ""; // skip a row if new category + echo "'; // display the category as its the first row with this new category + $oldcatname=$data[1]; + }else{ + echo "'; // category is already displayed so skip it (empty cell in category column) + } + + echo " \n"; // display the score and close the third cell } //if ($c == 2){ //} } + } } echo ""; // end html table row } echo "\n
Name Score
Category Name Score
" . ''; // display the link - echo $data[2] . ""; // display the link title and close the a href and first cell, open the second cell - echo $data[7] . ""; // display the status and close the second cell, open the third cell - echo $data[6] . "

" . $data[1] . '|

" . '

" ; // begin the table cell + echo ' '; // display the link + echo $data[2] . " "; // display the link title and close the a href and first cell, open the second cell + echo $data[7] . " "; // display the status and close the second cell, open the third cell + echo $data[6] . "
"; fclose($handle); } +echo "

" . $resultcount . " Result(s) found.

"; } diff --git a/www/participants/webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion/unverified.csv b/www/participants/webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion/unverified.csv index 341e47f..3933f56 100644 --- a/www/participants/webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion/unverified.csv +++ b/www/participants/webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion/unverified.csv @@ -1,6 +1,18 @@ Instance,Category,Name,URL,Sensitive,Description,Status,Score -webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion,Hackliberty,Hackliberty Gitea,http://vkp7367tcjpqdwwckigrdrvmwvispvbpg5rlsr2chjxvppfg7hipagyd.onion,,,, -webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion,Communities,Hackliberty main website,http://kj3wvs3wyfhm3uhhuqxlrhhcp6dneuau4mmvptlor27ghmrqx63fqnid.onion/,,,, -webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion,Forums,Hackliberty Forum,http://yw7nc56v4nsudvwewhmhhwltxpncedfuc43qbubj4nmwhdhwtiu4o6yd.onion/,,,, -uptime.nowherejezfoltodf4jiyl6r56jnzintap5vyjlia7fkirfsnfizflqd.onion,Infos and Links,Tor Taxi,http://tortaxi2dev6xjwbaydqzldruga77rrnth7yn2oqzjfmiuwn5h6vsk2a4syd.onion/,✔️,List of links to go to popular darknet places,✔️,0.0 uptime.nowherejezfoltodf4jiyl6r56jnzintap5vyjlia7fkirfsnfizflqd.onion,Infos and Links,Tor Taxi,http://tortaxi2dev6xjwbaydqzla77rrnth7yn2oqzjfmiuwn5h6vsk2a4syd.onion/,,List of links to go to popular darknet places,✔️,100.0 +uptime.nowherejezfoltodf4jiyl6r56jnzintap5vyjlia7fkirfsnfizflqd.onion,Infos and Links,Tor Taxi,http://tortaxi2dev6xjwbaydqzla77rrnth7yn2oqzjfmiuwn5h6vsk2a4syd.onion/,,List of links to go to popular darknet places,✔️,100.0 +uptime.nowherejezfoltodf4jiyl6r56jnzintap5vyjlia7fkirfsnfizflqd.onion,Infos and Links,Tor Taxi,http://tortaxi2dev6xjwbaydqzla77rrnth7yn2oqzjfmiuwn5h6vsk2a4syd.onion/,,List of links to go to popular darknet places,✔️,100.0 +uptime.nowherejezfoltodf4jiyl6r56jnzintap5vyjlia7fkirfsnfizflqd.onion,Infos and Links,Tor Taxi,http://tortaxi2dev6xjwbaydqzldruga77rrnth7yn2oqzjfmiuwn5h6vsk2a4syd.onion/,✔️,List of links to go to popular darknet places,❌,0.0 +uptime.nowherejezfoltodf4jiyl6r56jnzintap5vyjlia7fkirfsnfizflqd.onion,Infos and Links,Tor Taxi,http://tortaxi2dev6xjwbaydqzla77rrnth7yn2oqzjfmiuwn5h6vsk2a4syd.onion/,,List of links to go to popular darknet places,✔️,100.0 +webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion,Hackliberty,Hackliberty Gitea,http://vkp7367tcjpqdwwckigrdrvmwvispvbpg5rlsr2chjxvppfg7hipagyd.onion,,,✔️,100.0 +webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion,Hackliberty,Hackliberty Gitea,http://vkp7367tcjpqdwwckigrdrvmwvispvbpg5rlsr2chjxvppfg7hipagyd.onion,,,✔️,100.0 +webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion,Hackliberty,Hackliberty Gitea,http://vkp7367tcjpqdwwckigrdrvmwvispvbpg5rlsr2chjxvppfg7hipagyd.onion,,,✔️,100.0 +webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion,Hackliberty,Hackliberty Gitea,http://vkp7367tcjpqdwwckigrdrvmwvispvbpg5rlsr2chjxvppfg7hipagyd.onion,,,✔️,100.0 +webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion,Forums,Hackliberty Forum,http://yw7nc56v4nsudvwewhmhhwltxpncedfuc43qbubj4nmwhdhwtiu4o6yd.onion/,,,✔️,100.0 +webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion,Forums,Hackliberty Forum,http://yw7nc56v4nsudvwewhmhhwltxpncedfuc43qbubj4nmwhdhwtiu4o6yd.onion/,,,✔️,100.0 +webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion,Forums,Hackliberty Forum,http://yw7nc56v4nsudvwewhmhhwltxpncedfuc43qbubj4nmwhdhwtiu4o6yd.onion/,,,✔️,100.0 +webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion,Forums,Hackliberty Forum,http://yw7nc56v4nsudvwewhmhhwltxpncedfuc43qbubj4nmwhdhwtiu4o6yd.onion/,,,✔️,100.0 +webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion,Communities,Hackliberty main website,http://kj3wvs3wyfhm3uhhuqxlrhhcp6dneuau4mmvptlor27ghmrqx63fqnid.onion/,,,✔️,100.0 +webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion,Communities,Hackliberty main website,http://kj3wvs3wyfhm3uhhuqxlrhhcp6dneuau4mmvptlor27ghmrqx63fqnid.onion/,,,✔️,100.0 +webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion,Communities,Hackliberty main website,http://kj3wvs3wyfhm3uhhuqxlrhhcp6dneuau4mmvptlor27ghmrqx63fqnid.onion/,,,✔️,100.0 +webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion,Communities,Hackliberty main website,http://kj3wvs3wyfhm3uhhuqxlrhhcp6dneuau4mmvptlor27ghmrqx63fqnid.onion/,,,✔️,100.0 diff --git a/www/participants/webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion/webring-participants.csv b/www/participants/webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion/webring-participants.csv index 77dde22..043a1ce 100644 --- a/www/participants/webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion/webring-participants.csv +++ b/www/participants/webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion/webring-participants.csv @@ -1,3 +1,3 @@ Name,URL,Description,Trusted,Status,Score -,webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion,,,, +,webring.nowhevi57f4lxxd6db43miewcsgtovakbh6v5f52ci7csc2yjzy5rnid.onion,,,✔️,100.0 Nowhere,http://uptime.nowherejezfoltodf4jiyl6r56jnzintap5vyjlia7fkirfsnfizflqd.onion,Darknet Webring Onion Participant,,✔️,100.0 diff --git a/www/search.php b/www/search.php index f31ed6f..b6569e2 100644 --- a/www/search.php +++ b/www/search.php @@ -35,7 +35,7 @@ require("header.php"); // there needs to be regex checking, only allow [a-zA-Z0-9.:/] $query=preg_replace("/[^a-zA-Z0-9:\/.\ ]/", "", $query); - echo "Search results for " . $query . " :"; + echo "

Search results for " . $query . " :

"; echo nl2br("\n"); echo "

" . "Instance name: " . $_SERVER['SERVER_NAME'] . "

"; $instance= $_SERVER['SERVER_NAME']; @@ -45,8 +45,12 @@ require("header.php"); //echo $verifiedcsvpath; //echo nl2br("\n"); //echo $unverifiedcsvpath; + echo "

Verified Links:

"; echo nl2br("\n"); - DisplayCSVNEW($unverifiedcsvpath); + DisplayCSVNEW($verifiedcsvpath,$query); + echo "

Unverified Links:

"; + echo nl2br("\n"); + DisplayCSVNEW($unverifiedcsvpath,$query); // display the results of verified.csv // only display the results of verified.csv that matches with the search term // display the results of unverified.csv @@ -54,6 +58,6 @@ require("header.php"); } else{ // if query length is less than minimum or more than maximum - echo "Error: Query must be between ".$min_length . " and ".$max_length . " characters."; + echo "

Error: Query must be between ".$min_length . " and ".$max_length . " characters.

"; } ?>