From b543320e1f5f125f55e259c4818867f2aa11887a Mon Sep 17 00:00:00 2001 From: Daniel Winzen Date: Sat, 7 Nov 2020 18:02:58 +0100 Subject: [PATCH] Mobile friendly layout --- common_config.php | 8 ++++---- www/admin.php | 42 ++++++++++++++++++++++-------------------- www/onions.php | 46 +++++++++++++++++++++++----------------------- www/test.php | 4 ++-- 4 files changed, 51 insertions(+), 49 deletions(-) diff --git a/common_config.php b/common_config.php index ea46085..3263617 100644 --- a/common_config.php +++ b/common_config.php @@ -67,7 +67,7 @@ if($language!=='en'){ function print_langs(){ global $I, $L; - echo "$I[language]: "; + echo "'; } function blacklist_scams(string $address, string $content){ @@ -122,7 +122,7 @@ function send_headers(array $styles = []){ foreach($styles as $style) { $style_hashes .= " 'sha256-".base64_encode(hash('sha256', $style, true))."'"; } - header("Content-Security-Policy: base-uri 'self'; default-src 'none'; form-action 'self'; frame-ancestors 'none'; img-src data:; style-src $style_hashes"); + header("Content-Security-Policy: base-uri 'self'; default-src 'none'; form-action 'self'; frame-ancestors 'none'; img-src data: 'self'; style-src $style_hashes"); header('X-Content-Type-Options: nosniff'); header('X-Frame-Options: deny'); header('X-XSS-Protection: 1; mode=block'); diff --git a/www/admin.php b/www/admin.php index 0866625..3abfd74 100644 --- a/www/admin.php +++ b/www/admin.php @@ -1,6 +1,8 @@ PDO::ERRMODE_WARNING, PDO::ATTR_PERSISTENT=>PERSISTENT]); @@ -53,13 +55,13 @@ if(!isset($_POST['pass']) || $_POST['pass']!==ADMINPASS){ } echo '" required autofocus>

'; } else { - echo ''; + echo '
Select
Address
Description
Category
Status
'; $stmt=$db->query('SELECT address, description, category, approved, locked FROM ' . PREFIX . "onions WHERE address!='';"); while($onion = $stmt->fetch(PDO::FETCH_ASSOC)){ - echo '
'; - echo ""; + echo '
'.$onion['address'].'.onion
'; + echo "
$onion[description]
{$categories[$onion['category']]}
Approved: $onion[approved]
Locked: $onion[locked]
"; } - echo '
SelectAddressDescriptionCategoryStatus
'.$onion['address'].'.onion$onion[description]{$categories[$onion['category']]}Approved: $onion[approved]
Locked: $onion[locked]
'; + echo ''; } echo "

'; echo ''; - echo ''; - echo ""; - echo ""; - echo ""; - echo ""; - echo ''; - echo ""; - echo ""; - echo ""; - echo ""; - echo ''; - echo ""; + echo '
'; + echo "
"; + echo "
"; + echo "
"; + echo "
"; + echo '
'; + echo "
"; + echo "
"; + echo "
"; + echo "
"; + echo '
'; + echo "
"; if(REQUIRE_APPROVAL) { - echo "
"; - echo ""; + echo "
"; + echo "
"; } - echo '
'; + echo ''; echo '
'; if(!empty($_POST['addr'])){ diff --git a/www/onions.php b/www/onions.php index 045172f..3f2d9aa 100644 --- a/www/onions.php +++ b/www/onions.php @@ -42,11 +42,11 @@ if(!isset($_REQUEST['format'])){ function send_html(){ global $I, $categories, $db, $language; $numrows = 0; - $style = '.red{color:red} .green{color:green} .up td+td+td{background-color:#aaff88} .down td+td+td{background-color:#ff4444}'; - $style .= '.promo{outline:medium solid #FFD700} .list{display: inline-block; padding: 0; margin: 0} .list li{display:inline}'; - $style .= '.active{font-weight:bold} .down td+td+td+td+td,.up td+td+td+td+td{background-color:unset} #maintable td{word-break:break-all}'; - $style .= '#maintable td+td+td{word-break:unset} #maintable tr td:first-child{min-width:16em} .software-link{text-align:center;font-size:small}'; - $style .= '#maintable ,#maintable th,#maintable td{border: 1px solid black} #edit-search td{vertical-align:top}'; + $style = '.row{display:flex;flex-wrap:wrap}.headerrow{font-weight:bold}.col{display:flex;flex:1;padding:3px 3px;flex-direction:column}'; + $style .= '.red{color:red}.green{color:green}.up .col:nth-child(0n+3),.up .col:nth-child(0n+4){background-color:#aaff88}.down .col:nth-child(0n+3),.down .col:nth-child(0n+4){background-color:#ff4444}'; + $style .= '.promo{outline:medium solid #FFD700}.list{padding:0;}.list li{display:inline-block;padding:0.35em}.pagination{font-size:1.2em}'; + $style .= '.active{font-weight:bold}#maintable .col{word-break:break-all;min-width:5em}#maintable,#maintable .col{border: 1px solid black}#edit-search .col{vertical-align:top}'; + $style .= '#maintable .col:nth-child:(0n+3){word-break:unset}#maintable .col:last-child{max-width:5em}.software-link{text-align:center;font-size:small}'; send_headers([$style]); asort($categories); //sql for special categories @@ -76,8 +76,6 @@ function send_html(){ echo ''; echo ''; echo "

$I[title]

"; - print_langs(); - echo "
$I[format]: Text JSON"; if(!isset($db)){ echo "

$I[error]: $I[nodb]

"; echo ''; @@ -85,7 +83,7 @@ function send_html(){ } echo '

I\'m not responsible for any content of websites linked here. 99% of darkweb sites selling anything are scams. Be careful and use your brain. Every week I get 2-5 E-Mails from people that were desperate to make money and fell for scammers, don\'t be one of them!

'; //update onions description form - echo ""; + echo ""; //search from - echo ""; - echo '
"; + echo "
"; echo ""; echo ""; echo "

'; send_captcha(); - echo "
"; + echo "
"; echo ""; echo ""; echo "

"; - echo "

'; + echo ""; + echo ''; + echo ""; + print_langs(); //List special categories echo "

'; + echo ''; //List normal categories echo "

'; + echo ''; if($_SERVER['REQUEST_METHOD']==='POST' && !empty($_REQUEST['addr'])){ if(!preg_match('~(^(https?://)?([a-z0-9]*\.)?([a-z2-7]{16}|[a-z2-7]{56})(\.onion(/.*)?)?$)~i', trim($_REQUEST['addr']), $addr)){ echo "

$I[invalonion]

"; @@ -333,7 +333,7 @@ function get_table(PDOStatement $stmt, int &$numrows = 0, bool $promoted = false $admin_approval = PREFIX . 'onions.approved = 1 AND'; } ob_start(); - echo ""; + echo "
$I[link]
$I[description]
$I[lasttested]
$I[lastup]
$I[timeadded]
$I[actions]
"; if($promoted){//print promoted links at the top $time=time(); $promo=$db->prepare('SELECT address, lasttest, lastup, timeadded, description, locked, special FROM ' . PREFIX . "onions WHERE $admin_approval special>? AND address!='' AND id NOT IN (SELECT onion_id FROM " . PREFIX . 'phishing) AND timediff<604800 ORDER BY address;'); @@ -355,7 +355,7 @@ function get_table(PDOStatement $stmt, int &$numrows = 0, bool $promoted = false $lasttest=date('Y-m-d H:i:s', $link['lasttest']); } $timeadded=date('Y-m-d H:i:s', $link['timeadded']); - echo "
"; + echo "
$link[address].onion
$link[description]
$lasttest
$lastup
$timeadded
"; } } while($link=$stmt->fetch(PDO::FETCH_ASSOC)){ @@ -384,10 +384,10 @@ function get_table(PDOStatement $stmt, int &$numrows = 0, bool $promoted = false }else{ $edit=""; } - echo ""; + echo "
$link[address].onion
$link[description]
$lasttest
$lastup
$timeadded
$edit
"; ++$numrows; } - echo '
$I[link]$I[description]$I[lasttested]$I[lastup]$I[timeadded]$I[actions]
$link[address].onion$link[description]$lasttest$lastup$timeadded
$link[address].onion$link[description]$lasttest$lastup$timeadded$edit
'; + echo ''; return ob_get_clean(); } @@ -397,7 +397,7 @@ function print_phishing_table(){ if(REQUIRE_APPROVAL){ $admin_approval = 'approved = 1 AND'; } - echo ""; + echo "
$I[link]
$I[cloneof]
$I[lastup]
"; $stmt=$db->query('SELECT address, original, lasttest, lastup FROM ' . PREFIX . 'onions, ' . PREFIX . 'phishing WHERE ' . "$admin_approval " . PREFIX . "onions.id=onion_id AND address!='' AND timediff<604800 ORDER BY address;"); while($link=$stmt->fetch(PDO::FETCH_ASSOC)){ if($link['lastup']===$link['lasttest']){ @@ -415,9 +415,9 @@ function print_phishing_table(){ }else{ $orig=$I['unknown']; } - echo "
"; + echo "
$link[address].onion
$orig
$lastup
"; } - echo '
$I[link]$I[cloneof]$I[lastup]
$link[address].onion$orig$lastup
'; + echo ''; } function send_text(){ @@ -461,7 +461,7 @@ function send_json(){ function get_pagination(int $category, int $pages) : string { global $I, $language; ob_start(); - echo ""; return ob_get_clean(); } diff --git a/www/test.php b/www/test.php index 53160d3..25fe343 100644 --- a/www/test.php +++ b/www/test.php @@ -1,6 +1,6 @@ '; echo "$I[testtitle]"; @@ -11,7 +11,7 @@ echo ''; echo ''; echo ''; -echo '

Online-Test

'; +echo "

$I[testtitle]

"; print_langs(); echo "

$I[testdesc]

"; echo "
";