Projects/nettsiden
Projects/nettsiden
8
2
Fork 0
Code Issues15 Pull Requests Activity

Compare commits

...

8 Commits
the-format ... main

Author SHA1 Message Date
h7x4
20bab54235
dist/simplesamlphp-authsources: set entityID for service provider 2025-03-19 01:34:39 +01:00
h7x4
c3d8ce017d
shell.nix: find rootlevel in shell hook 2025-03-18 21:25:41 +01:00
h7x4
02cfe9feaa
pvv_mysql.sql: format 2025-03-18 21:18:24 +01:00
h7x4
4d4ec78ea3
pvv_sqlite.sql: format 2025-03-18 21:17:36 +01:00
h7x4
a74ea31356
.envrc: init 2025-03-18 21:15:59 +01:00
h7x4
0653672a17
shell.nix: add sql formatter 2025-03-18 21:15:59 +01:00
h7x4
8a1ff1a265
dist/pvv.sql -> dist/pvv_sqlite.sql 2025-03-18 21:10:48 +01:00
h7x4
c1802e7cf2
treewide: strict comparisons 2025-03-12 01:09:08 +01:00
14 changed files with 126 additions and 121 deletions

1
.envrc Normal file

@ -0,0 +1 @@
use flake

1
.php-cs-fixer.php

@ -51,7 +51,6 @@ return (new PhpCsFixer\Config())
// TODO: fix these
'psr_autoloading' => false,
'strict_comparison' => false,
])
->setFinder($finder)
->setIndent(" ")

50
dist/pvv.sql vendored

@ -1,50 +0,0 @@
CREATE TABLE "events" (
"id" INTEGER PRIMARY KEY AUTOINCREMENT,
"name" TEXT,
"start" TEXT,
"stop" TEXT,
"organiser" TEXT,
"location" TEXT,
"description" TEXT
);
CREATE TABLE "projects" (
"id" INTEGER PRIMARY KEY AUTOINCREMENT,
"name" TEXT,
"description" TEXT,
"active" BOOLEAN
);
CREATE TABLE "projectmembers" (
"projectid" INTEGER,
"name" TEXT,
"uname" TEXT,
"mail" TEXT,
"role" TEXT,
"lead" BOOLEAN DEFAULT 0,
"owner" BOOLEAN DEFAULT 0
);
CREATE TABLE "users" (
"uname" TEXT,
"groups" INT DEFAULT 0
);
CREATE TABLE "motd" (
"id" INTEGER PRIMARY KEY AUTOINCREMENT,
"title" TEXT,
"content" TEXT
);
INSERT INTO motd (title, content)
VALUES ('MOTD ./dev.sh', 'du kan endre motd i admin panelet');
CREATE TABLE "door" (
"time" INTEGER PRIMARY KEY,
"open" BOOLEAN
);
INSERT INTO door (time, open)
VALUES (0, FALSE);
INSERT INTO users (uname, groups)
VALUES ('min_test_bruker', 1);

60
dist/pvv_mysql.sql vendored

@ -1,47 +1,45 @@
CREATE TABLE events (
`id` INTEGER PRIMARY KEY AUTO_INCREMENT,
`name` TEXT,
`start` TEXT,
`stop` TEXT,
`organiser` TEXT,
`location` TEXT,
`description` TEXT
`id` INTEGER PRIMARY KEY AUTO_INCREMENT,
`name` TEXT,
`start` TEXT,
`stop` TEXT,
`organiser` TEXT,
`location` TEXT,
`description` TEXT
);
CREATE TABLE projects (
`id` INTEGER PRIMARY KEY AUTO_INCREMENT,
`name` TEXT,
`description` TEXT,
`active` BOOLEAN
CREATE TABLE projects (
`id` INTEGER PRIMARY KEY AUTO_INCREMENT,
`name` TEXT,
`description` TEXT,
`active` BOOLEAN
);
CREATE TABLE projectmembers (
`projectid` INTEGER,
`name` TEXT,
`uname` TEXT,
`mail` TEXT,
`role` TEXT,
`lead` BOOLEAN DEFAULT 0,
`owner` BOOLEAN DEFAULT 0
`projectid` INTEGER,
`name` TEXT,
`uname` TEXT,
`mail` TEXT,
`role` TEXT,
`lead` BOOLEAN DEFAULT 0,
`owner` BOOLEAN DEFAULT 0
);
CREATE TABLE users (
`uname` TEXT,
`groups` INT DEFAULT 0
);
CREATE TABLE users (`uname` TEXT, `groups` INT DEFAULT 0);
CREATE TABLE motd (
`id` INTEGER PRIMARY KEY AUTO_INCREMENT,
`title` TEXT,
`content` TEXT
`id` INTEGER PRIMARY KEY AUTO_INCREMENT,
`title` TEXT,
`content` TEXT
);
/*
INSERT INTO motd (title, content)
VALUES ("MOTD ./dev.sh", "du kan endre motd i admin panelet");
*/
CREATE TABLE door (`time` INTEGER PRIMARY KEY, `open` BOOLEAN);
CREATE TABLE door (
`time` INTEGER PRIMARY KEY,
`open` BOOLEAN
);
INSERT INTO door(time, open) VALUES (0, FALSE);
INSERT INTO
door (time, open)
VALUES
(0, FALSE);

54
dist/pvv_sqlite.sql vendored Normal file

@ -0,0 +1,54 @@
CREATE TABLE "events" (
"id" INTEGER PRIMARY KEY AUTOINCREMENT,
"name" TEXT,
"start" TEXT,
"stop" TEXT,
"organiser" TEXT,
"location" TEXT,
"description" TEXT
);
CREATE TABLE "projects" (
"id" INTEGER PRIMARY KEY AUTOINCREMENT,
"name" TEXT,
"description" TEXT,
"active" BOOLEAN
);
CREATE TABLE "projectmembers" (
"projectid" INTEGER,
"name" TEXT,
"uname" TEXT,
"mail" TEXT,
"role" TEXT,
"lead" BOOLEAN DEFAULT 0,
"owner" BOOLEAN DEFAULT 0
);
CREATE TABLE "users" ("uname" TEXT, "groups" INT DEFAULT 0);
CREATE TABLE "motd" (
"id" INTEGER PRIMARY KEY AUTOINCREMENT,
"title" TEXT,
"content" TEXT
);
INSERT INTO
motd (title, content)
VALUES
(
'MOTD ./dev.sh',
'du kan endre motd i admin panelet'
);
CREATE TABLE "door" ("time" INTEGER PRIMARY KEY, "open" BOOLEAN);
INSERT INTO
door (time, open)
VALUES
(0, FALSE);
INSERT INTO
users (uname, groups)
VALUES
('min_test_bruker', 1);

1
dist/simplesamlphp-authsources.php vendored

@ -6,6 +6,7 @@ $config = [
/* This is the name of this authentication source, and will be used to access it later. */
'default-sp' => [
'saml:SP',
'entityID' => 'https://www.pvv.ntnu.no/simplesaml/',
'idp' => 'https://idp.pvv.ntnu.no/',
],
];

2
inc/navbar.php

@ -18,7 +18,7 @@ function navbar($depth, $active = null) {
];
foreach ($menuItems as $caption => $link) {
$isActive = $active === $link;
if (substr($link, 0, 4) != 'http') {
if (substr($link, 0, 4) !== 'http') {
$link = rtrim(str_repeat('../', $depth) . $link, '/') . '/';
}

20
nix/shell.nix

@ -1,4 +1,4 @@
{ pkgs }:
{ pkgs, lib }:
let
phpEnv = pkgs.php84.buildEnv {
extensions = { enabled, all }: enabled ++ (with all; [ iconv mbstring pdo_mysql pdo_sqlite ]);
@ -11,20 +11,21 @@ pkgs.mkShellNoCC {
php84Packages.php-parallel-lint
php84Packages.php-cs-fixer
sqlite-interactive
sql-formatter
];
# Prepare dev environment with sqlite and config files
shellHook = ''
alias runDev='php -S localhost:1080 -d error_reporting=E_ALL -d display_errors=1 -t www/'
# Prepare dev environment with sqlite and config files
test -e pvv.sqlite || sqlite3 pvv.sqlite < dist/pvv.sql
test -e config.php || cp -v dist/config.local.php config.php
declare -a PROJECT_ROOT="$("${lib.getExe pkgs.git}" rev-parse --show-toplevel)"
mkdir -p "$PROJECT_ROOT/www/galleri/bilder/slideshow"
test -e "$PROJECT_ROOT/pvv.sqlite" || sqlite3 "$PROJECT_ROOT/pvv.sqlite" < "$PROJECT_ROOT/dist/pvv_sqlite.sql"
test -e "$PROJECT_ROOT/config.php" || cp -v "$PROJECT_ROOT/dist/config.local.php" "$PROJECT_ROOT/config.php"
if [ ! -d www/galleri/bilder/slideshow ] ; then
mkdir -p www/galleri/bilder/slideshow
fi
if [ ! -d vendor ] ; then
if [ ! -d "$PROJECT_ROOT/vendor" ] ; then
pushd "$PROJECT_ROOT"
composer install || exit $?
cp dist/simplesamlphp-authsources.php vendor/simplesamlphp/simplesamlphp/config/authsources.php
@ -34,6 +35,7 @@ pkgs.mkShellNoCC {
cp dist/config.local.php config.php
ln -s ../vendor/simplesamlphp/simplesamlphp/public/ www/simplesaml
popd "$PROJECT_ROOT"
fi
'';
}

2
src/pvv/admin/usermanager.php

@ -98,7 +98,7 @@ class UserManager {
$statement->execute();
$row = $statement->fetch();
if ($row == false) {
if ($row === false) {
return 0;
}

8
src/pvv/side/social/animekveldactivity.php

@ -8,11 +8,11 @@ use pvv\side\Activity;
class AnimekveldActivity implements Activity {
public function nextDate(\DateTimeImmutable $date) {
if ($date->format('H') > 20 || $date->format('H') == 19 && $date->format('i') > 30) {
if (intval($date->format('H')) > 20 || intval($date->format('H')) === 19 && intval($date->format('i')) > 30) {
return $this->nextDate($date->add(new \DateInterval('P1D'))->setTime(19, 30, 0));
}
$date = $date->setTime(19, 30, 0);
if ($date->format('N') != 5) {
if (intval($date->format('N')) !== 5) {
return $this->nextDate($date->add(new \DateInterval('P1D')));
}
@ -20,11 +20,11 @@ class AnimekveldActivity implements Activity {
}
public function prevDate(\DateTimeImmutable $date) {
if ($date->format('H') < 19 || $date->format('H') == 20 && $date->format('i') < 30) {
if (intval($date->format('H')) < 19 || intval($date->format('H')) === 20 && intval($date->format('i')) < 30) {
return $this->prevDate($date->sub(new \DateInterval('P1D'))->setTime(19, 30, 0));
}
$date = $date->setTime(19, 30, 0);
if ($date->format('N') != 5) {
if (intval($date->format('N')) !== 5) {
return $this->prevDate($date->sub(new \DateInterval('P1D')));
}

12
src/pvv/side/social/brettspillactivity.php

@ -8,14 +8,14 @@ use pvv\side\Activity;
class BrettspillActivity implements Activity {
public function nextDate(\DateTimeImmutable $date) {
if ($date->format('H') > 17 || $date->format('H') == 16 && $date->format('i') > 15) {
if (intval($date->format('H')) > 17 || intval($date->format('H')) === 16 && intval($date->format('i')) > 15) {
return $this->nextDate($date->add(new \DateInterval('P1D'))->setTime(16, 15, 0));
}
$date = $date->setTime(16, 15, 0);
if ($date->format('N') != 7) {
if (intval($date->format('N')) !== 7) {
return $this->nextDate($date->add(new \DateInterval('P1D')));
}
if ($date->format('W') % 2 - 1) {
if (intval($date->format('W')) % 2 - 1) {
return $this->nextDate($date->add(new \DateInterval('P7D')));
}
@ -23,14 +23,14 @@ class BrettspillActivity implements Activity {
}
public function prevDate(\DateTimeImmutable $date) {
if ($date->format('H') < 16 || $date->format('H') == 17 && $date->format('i') < 15) {
if (intval($date->format('H')) < 16 || intval($date->format('H')) === 17 && intval($date->format('i')) < 15) {
return $this->prevDate($date->sub(new \DateInterval('P1D'))->setTime(16, 15, 0));
}
$date = $date->setTime(16, 15, 0);
if ($date->format('N') != 7) {
if (intval($date->format('N')) !== 7) {
return $this->prevDate($date->sub(new \DateInterval('P1D')));
}
if ($date->format('W') % 2 - 1) {
if (intval($date->format('W')) % 2 - 1) {
return $this->prevDate($date->sub(new \DateInterval('P7D')));
}

12
src/pvv/side/social/driftkveldactivity.php

@ -8,14 +8,14 @@ use pvv\side\Activity;
class DriftkveldActivity implements Activity {
public function nextDate(\DateTimeImmutable $date) {
if ($date->format('H') > 18 || $date->format('H') == 17 && $date->format('i') > 30) {
if (intval($date->format('H')) > 18 || intval($date->format('H')) === 17 && intval($date->format('i')) > 30) {
return $this->nextDate($date->add(new \DateInterval('P1D'))->setTime(18, 15, 0));
}
$date = $date->setTime(18, 15, 0);
if ($date->format('N') != 6) {
if (intval($date->format('N')) !== 6) {
return $this->nextDate($date->add(new \DateInterval('P1D')));
}
if ($date->format('W') % 2 - 1) {
if (intval($date->format('W')) % 2 - 1) {
return $this->nextDate($date->add(new \DateInterval('P7D')));
}
@ -23,14 +23,14 @@ class DriftkveldActivity implements Activity {
}
public function prevDate(\DateTimeImmutable $date) {
if ($date->format('H') < 17 || $date->format('H') == 18 && $date->format('i') < 30) {
if (intval($date->format('H')) < 17 || intval($date->format('H')) === 18 && intval($date->format('i')) < 30) {
return $this->prevDate($date->sub(new \DateInterval('P1D'))->setTime(18, 15, 0));
}
$date = $date->setTime(18, 15, 0);
if ($date->format('N') != 6) {
if (intval($date->format('N')) !== 6) {
return $this->prevDate($date->sub(new \DateInterval('P1D')));
}
if ($date->format('W') % 2 - 1) {
if (intval($date->format('W')) % 2 - 1) {
return $this->prevDate($date->sub(new \DateInterval('P7D')));
}

12
src/pvv/side/social/hackekveldactivity.php

@ -8,14 +8,14 @@ use pvv\side\Activity;
class HackekveldActivity implements Activity {
public function nextDate(\DateTimeImmutable $date) {
if ($date->format('H') > 18 || $date->format('H') == 17 && $date->format('i') > 30) {
if (intval($date->format('H')) > 18 || intval($date->format('H')) === 17 && intval($date->format('i')) > 30) {
return $this->nextDate($date->add(new \DateInterval('P1D'))->setTime(18, 15, 0));
}
$date = $date->setTime(16, 15, 0);
if ($date->format('N') != 6) {
if (intval($date->format('N')) !== 6) {
return $this->nextDate($date->add(new \DateInterval('P1D')));
}
if ($date->format('W') % 2) {
if (intval($date->format('W')) % 2) {
return $this->nextDate($date->add(new \DateInterval('P7D')));
}
@ -23,14 +23,14 @@ class HackekveldActivity implements Activity {
}
public function prevDate(\DateTimeImmutable $date) {
if ($date->format('H') < 17 || $date->format('H') == 18 && $date->format('i') < 30) {
if (intval($date->format('H')) < 17 || intval($date->format('H')) === 18 && intval($date->format('i')) < 30) {
return $this->prevDate($date->sub(new \DateInterval('P1D'))->setTime(18, 15, 0));
}
$date = $date->setTime(18, 15, 0);
if ($date->format('N') != 6) {
if (intval($date->format('N')) !== 6) {
return $this->prevDate($date->sub(new \DateInterval('P1D')));
}
if ($date->format('W') % 2) {
if (intval($date->format('W')) % 2) {
return $this->prevDate($date->sub(new \DateInterval('P7D')));
}

12
src/pvv/side/social/nerdepitsaactivity.php

@ -8,14 +8,14 @@ use pvv\side\Activity;
class NerdepitsaActivity implements Activity {
public function nextDate(\DateTimeImmutable $date) {
if ($date->format('H') > 19) {
if (intval($date->format('H')) > 19) {
return $this->nextDate($date->add(new \DateInterval('P1D'))->setTime(19, 0, 0));
}
$date = $date->setTime(19, 0, 0);
if ($date->format('N') != 5) {
if (intval($date->format('N')) !== 5) {
return $this->nextDate($date->add(new \DateInterval('P1D')));
}
if ($date->format('W') % 2) {
if (intval($date->format('W')) % 2) {
return $this->nextDate($date->add(new \DateInterval('P7D')));
}
@ -23,14 +23,14 @@ class NerdepitsaActivity implements Activity {
}
public function prevDate(\DateTimeImmutable $date) {
if ($date->format('H') < 19) {
if (intval($date->format('H')) < 19) {
return $this->prevDate($date->sub(new \DateInterval('P1D'))->setTime(19, 0, 0));
}
$date = $date->setTime(19, 0, 0);
if ($date->format('N') != 5) {
if (intval($date->format('N')) !== 5) {
return $this->prevDate($date->sub(new \DateInterval('P1D')));
}
if ($date->format('W') % 2) {
if (intval($date->format('W')) % 2) {
return $this->prevDate($date->sub(new \DateInterval('P7D')));
}