Various: Replace deprecated functions to support php 8.3
This commit is contained in:
parent
4ee8b73044
commit
b756ba0271
|
@ -6,6 +6,8 @@ use \DateInterval;
|
|||
|
||||
class Agenda {
|
||||
|
||||
private $activities;
|
||||
|
||||
const TODAY = 0;
|
||||
const TOMORROW = 1;
|
||||
const THIS_WEEK = 2;
|
||||
|
@ -18,7 +20,7 @@ class Agenda {
|
|||
}
|
||||
|
||||
public static function getFormattedDate($date) {
|
||||
return trim(strftime('%A %e. %b %H.%M', $date->getTimeStamp()));
|
||||
return $date->format("l j. M H.i");
|
||||
}
|
||||
|
||||
public function getEventsBetween(DateTimeImmutable $from, DateTimeImmutable $to) {
|
||||
|
|
|
@ -5,6 +5,7 @@ use \DateTimeImmutable;
|
|||
use \PDO;
|
||||
|
||||
class DBActivity implements Activity {
|
||||
private $pdo;
|
||||
|
||||
public function __construct(PDO $pdo) {
|
||||
$this->pdo = $pdo;
|
||||
|
|
|
@ -24,7 +24,7 @@ abstract class Event {
|
|||
return 'i morgen';
|
||||
}
|
||||
if (Agenda::isThisWeek($this->getStart()) || $this->getStart()->sub(new DateInterval('P4D'))->getTimestamp() < time()) {
|
||||
return strftime('%A', $this->getStart()->getTimestamp());
|
||||
return $this->getStart()->format("l");
|
||||
}
|
||||
if (Agenda::isNextWeek($this->getStart())) {
|
||||
return 'neste uke';
|
||||
|
@ -32,7 +32,7 @@ abstract class Event {
|
|||
if (Agenda::isThisMonth($this->getStart())) {
|
||||
return 'denne måneden';
|
||||
}
|
||||
return trim(strftime('%e. %B', $this->getStart()->getTimestamp()));
|
||||
return $this->getStart()->format("j. F");
|
||||
}
|
||||
|
||||
public abstract function getStop(); /* : DateTimeImmutable */
|
||||
|
|
|
@ -3,7 +3,7 @@ namespace pvv\side;
|
|||
|
||||
class SimpleEvent extends Event {
|
||||
|
||||
private $id, $name, $descr, $start, $end, $org, $loc;
|
||||
private $id, $name, $descr, $start, $end, $org, $loc, $isDBEvent;
|
||||
|
||||
public function __construct($id, $name,\DateTimeImmutable $start,\DateTimeImmutable $end,$org, $loc, $descr, $isDBEvent = false){
|
||||
$this->id = $id;
|
||||
|
@ -52,9 +52,9 @@ class SimpleEvent extends Event {
|
|||
return $this->descr;
|
||||
}
|
||||
|
||||
public function isDBEvent() {
|
||||
return $this->isDBEvent;
|
||||
}
|
||||
/* public function getIsDBEvent() { */
|
||||
/* return $this->isDBEvent; */
|
||||
/* } */
|
||||
|
||||
public function getColor() {
|
||||
return "#3b7";
|
||||
|
|
|
@ -72,6 +72,7 @@ img.float-right {
|
|||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
.calendar-events ul .date {
|
||||
color: rgba(0, 0, 0, 0.5);
|
||||
font-size: 0.8em;
|
||||
|
@ -87,11 +88,14 @@ img.float-right {
|
|||
padding: 0;
|
||||
}
|
||||
|
||||
.calendar-events a,
|
||||
.calendar-events a {
|
||||
color: rgba(0,0,0, 0.85);
|
||||
}
|
||||
|
||||
.calendar-events ul .time {
|
||||
color: rgba(0, 0, 0, 0.5);
|
||||
float: right;
|
||||
margin-left: 0.2em;
|
||||
}
|
||||
|
||||
.calendar-events ul .icon,
|
||||
|
|
|
@ -77,13 +77,12 @@ $doorTime = date("H:i", $doorEntry->time);
|
|||
<?php } else { ?>
|
||||
<strong><?= $event->getName(); ?></strong>
|
||||
<?php } ?>
|
||||
<?php /* <a class="icon subscribe">+</a> */ ?>
|
||||
<?php if ($period !== \pvv\side\Agenda::TODAY) {
|
||||
echo '<span class="time">' . $event->getStart()->format('H:i') . ' </span>';
|
||||
if (\pvv\side\Agenda::isThisWeek($event->getStart()) || $event->getStart()->sub(new DateInterval('P3D'))->getTimestamp() < time()) {
|
||||
echo '<span class="date">' . strftime('%a', $event->getStart()->getTimestamp()) . '</span>';
|
||||
echo '<span class="time">' . $event->getStart()->format('D') . '</span>';
|
||||
} else {
|
||||
echo '<span class="date">' . strftime('%e. %b', $event->getStart()->getTimestamp()) . '</span>';
|
||||
echo '<span class="time">' . $event->getStart()->format('j. F') . '</span>';
|
||||
}
|
||||
} else {
|
||||
echo '<span class="time">' . $event->getStart()->format('H:i') . '</span>';
|
||||
|
|
Loading…
Reference in New Issue