diff --git a/inc/admin.php b/inc/admin.php index 9541cb5..6daef1f 100644 --- a/inc/admin.php +++ b/inc/admin.php @@ -14,7 +14,7 @@ if (isset($ui['log']) && !in_array($ui['log'], $acceptParam['log']) || $_SESSION die('Tell me, Mr Anderson, what good is a phone call if you\'re unable to speak ?'); } -if (empty($ui['log'])) { +if (empty($ui['log']) && empty($ui['ac'])) { $ui['log'] = 'success'; } @@ -123,8 +123,16 @@ function keepThisThumb($hash, $log) { if (isset($ui['clear']) && (int)$ui['clear'] === 1) { clearLog($ui['log']); } -?> -
+if (isset($ui['ac']) && $ui['ac'] === 'delete' && isset($ui['thumb']) && !empty($ui['thumb'])) { + $imgUrl = pathForFile('m', $ui['thumb']); + if (file_exists($_SERVER['DOCUMENT_ROOT'].'/'.$imgUrl.'.png')) { + unlink($_SERVER['DOCUMENT_ROOT'].'/'.$imgUrl.'.png'); + } + if (file_exists($imgUrl.'_thumb.png')) { + unlink($_SERVER['DOCUMENT_ROOT'].'/'.$imgUrl.'_thumb.png'); + } +} +echo '
-
-'; +if ($ui['ac'] === 'delete') { + if (isset($ui['deleteUrl']) && testValidUrl($ui['deleteUrl']) !== true) { + unset($ui['deleteUrl']); + echo '
Not a valid url.
'; + } + echo ' +
+

+ '; + if (empty($ui['deleteUrl'])) { + echo ''; + } else { + echo ''; + } + echo '

+

+ + + +

+
'; + if (!empty($ui['deleteUrl'])) { + $ui['deleteUrl'] = trim(rawurldecode($ui['deleteUrl'])); + $ui['deleteUrl'] = rtrim($ui['deleteUrl'], '/'); + $hashUrl = sha1($GLOBALS['config']['salt'].$ui['deleteUrl']); + $imgUrl = pathForFile('m', $hashUrl); + echo '
+
+

+ +

+ Delete this thumb +
'; + } + +} +if (isset($ui['log']) && $ui['log'] === 'success') { $logs = parseSuccessLog(); if (!empty($logs)) { $nbThumb = 0; @@ -157,7 +203,7 @@ if ($ui['log'] === 'success') { } echo '

Clear success log

'; } -if ($ui['log'] === 'suspect' || $ui['log'] === 'retry' || $ui['log'] === 'other') { +if (isset($ui['log']) && ($ui['log'] === 'suspect' || $ui['log'] === 'retry' || $ui['log'] === 'other')) { if (isset($ui['hash']) && !empty($ui['hash'])) { $ui['hash'] = validHash($ui['hash']); if (isset($ui['root']) && (int)$ui['root'] === 1) { @@ -165,6 +211,9 @@ if ($ui['log'] === 'suspect' || $ui['log'] === 'retry' || $ui['log'] === 'other' } if (isset($ui['cache']) && (int)$ui['cache'] === 1) { $success['filePath'] = pathForFile($ui['s'], $ui['hash']).'.png'; + if (!file_exists($success['filePath'])) { + $success['filePath'] = 'data:image/png;base64,'.base64_encode(file_get_contents('bin/error.png')); + } } if (isset($ui['keep']) && (int)$ui['keep'] === 1) { keepThisThumb($ui['hash'], $ui['log']); @@ -176,7 +225,7 @@ if ($ui['log'] === 'suspect' || $ui['log'] === 'retry' || $ui['log'] === 'other' if (!empty($logs)) { echo ''; } else { @@ -184,10 +233,9 @@ if ($ui['log'] === 'suspect' || $ui['log'] === 'retry' || $ui['log'] === 'other' } } echo '
'; - if (!empty($success)) { echo '
'; - echo ''; + echo ''; echo '

'; echo 'Try with root domain / '; echo 'Keep this thumbshot'; diff --git a/index.php b/index.php index 5ed1790..6dd6b0d 100644 --- a/index.php +++ b/index.php @@ -181,7 +181,7 @@ function testValidUrl($url) { } return true; } else { - return array('msg' => 'Url are not valid.'); + return array('msg' => 'Not a valid url.'); } } diff --git a/style.css b/style.css index 1546d98..c88d123 100644 --- a/style.css +++ b/style.css @@ -22,7 +22,7 @@ a:visited { form, #result, #header, .message, .hMenu, #log { padding: 1em; text-align: center; - width: 50%; + width: 60%; margin: 1em auto; background-color: #ffffff; border-radius: 5px;