Projects/nettsiden
Projects
/
nettsiden
8
2
Fork 0
Code Issues 15 Pull Requests 2 Activity

Replace deprecated functions to support php 8.3 #68

Merged
felixalb merged 1 commits from php83-fixes-fr-fr into master 2024-08-17 20:45:08 +02:00
Conversation 0 Commits 1 Files Changed 6 +24 -23
6 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8a82e2795c - Show all commits

4
src/pvv/side/agenda.php
View File

@ -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) {

1
src/pvv/side/dbactivity.php
View File

@ -5,6 +5,7 @@ use \DateTimeImmutable;
use \PDO;
class DBActivity implements Activity {
private $pdo;
public function __construct(PDO $pdo) {
$this->pdo = $pdo;

4
src/pvv/side/event.php
View File

@ -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 */

7
src/pvv/side/simpleevent.php
View File

@ -5,7 +5,7 @@ class SimpleEvent extends Event {
private $id, $name, $descr, $start, $end, $org, $loc;
public function __construct($id, $name,\DateTimeImmutable $start,\DateTimeImmutable $end,$org, $loc, $descr, $isDBEvent = false){
public function __construct($id, $name,\DateTimeImmutable $start,\DateTimeImmutable $end,$org, $loc, $descr, $_isDBEvent = false){
$this->id = $id;
$this->name = $name;
$this->start = $start;
@ -13,7 +13,6 @@ class SimpleEvent extends Event {
$this->org = $org;
$this->loc = $loc;
$this->descr = explode("\n", $descr);
$this->isDBEvent = $isDBEvent;
}
public function getID(){
@ -52,10 +51,6 @@ class SimpleEvent extends Event {
return $this->descr;
}
public function isDBEvent() {
return $this->isDBEvent;
}
public function getColor() {
return "#3b7";
}

6
www/css/landing.css
View File

@ -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,

23
www/index.php
View File

@ -77,18 +77,17 @@ $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>';
} else {
echo '<span class="date">' . strftime('%e. %b', $event->getStart()->getTimestamp()) . '</span>';
}
} else {
echo '<span class="time">' . $event->getStart()->format('H:i') . '</span>';
}
?>
<?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="time">' . $event->getStart()->format('D') . '</span>';
} else {
echo '<span class="time">' . $event->getStart()->format('j. F') . '</span>';
}
} else {
echo '<span class="time">' . $event->getStart()->format('H:i') . '</span>';
}
?>
</li>
<?php } ?>
</ul>