PonyMirrors/ponepaste
1
0
Fork 0
mirror of https://github.com/Neetpone/ponepaste.git synced 2025-03-12 06:30:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(pastes): make expiry 1h work and make expiry display work

Browse source
This commit is contained in:
Floorb 2023-08-29 03:32:49 -04:00
parent 6ff64c0652
commit 33a3107844
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
includes/Models/Paste.php
View file

@ -56,14 +56,13 @@ class Paste extends Model {
return '<b>View Once</b>'; return '<b>View Once</b>';
} }
var_dump($expiry); $dateTime = new DateTime();
$dateTime = new DateTime($expiry);
$dateTime->setTimestamp($expiry); $dateTime->setTimestamp($expiry);
$ret = $dateTime->format('Y-m-d H:i:s'); $ret = $dateTime->format('Y-m-d H:i:s');
if ($dateTime->diff(new DateTime())->days < 1) { if ($dateTime->diff(new DateTime())->days < 1) {
$ret = "<b>$ret</b>"; $ret = "<b>$ret</b>";
} }
return $ret; return $ret;
} }

2
public/index.php
View file

@ -37,7 +37,7 @@ function calculatePasteExpiry(string $expiry) : ?string {
return 'SELF'; return 'SELF';
} }
$valid_expiries = ['0Y0M0DT0H10M', '1H', '1D', '1W', '2W', '1M']; $valid_expiries = ['0Y0M0DT0H10M', 'T1H', '1D', '1W', '2W', '1M'];
return in_array($expiry, $valid_expiries) return in_array($expiry, $valid_expiries)
? (new DateTime())->add(new DateInterval("P{$expiry}"))->format('U') ? (new DateTime())->add(new DateInterval("P{$expiry}"))->format('U')

2
theme/bulma/main.php
View file

@ -92,7 +92,7 @@
<select name="paste_expire_date" id="paste_expire_date"> <select name="paste_expire_date" id="paste_expire_date">
<?= optionsForSelect( <?= optionsForSelect(
['Never', 'View Once', '10 minutes', '1 hour', '1 day', '1 week', '2 weeks', '1 month'], ['Never', 'View Once', '10 minutes', '1 hour', '1 day', '1 week', '2 weeks', '1 month'],
['N', 'self', '0Y0M0DT0H10M', '1H', '1D', '1W', '2W', '1M'], ['N', 'self', '0Y0M0DT0H10M', 'T1H', '1D', '1W', '2W', '1M'],
$post_expire $post_expire
); ?> ); ?>
</select> </select>

2
theme/bulma/view.php
View file

@ -268,7 +268,7 @@
<option value="N" selected="selected">Never</option> <option value="N" selected="selected">Never</option>
<option value="self">View Once</option> <option value="self">View Once</option>
<option value="0Y0M0DT0H10M">10 Minutes</option> <option value="0Y0M0DT0H10M">10 Minutes</option>
<option value="1H">1 Hour</option> <option value="T1H">1 Hour</option>
<option value="1D">1 Day</option> <option value="1D">1 Day</option>
<option value="1W">1 Week</option> <option value="1W">1 Week</option>
<option value="2W">2 Weeks</option> <option value="2W">2 Weeks</option>