more twig work

Author: nunoplopes

auth.php

@@ -37,7 +37,10 @@ function create_session($user) {
 
 if (isset($_GET['key']) &&
     password_verify('4X6EM' . $_GET['key'] . 'fgOGi', SUDO_HASH)) {
-  $user = db_fetch_or_add_user('ist00000', 'Sudo', ROLE_SUDO, '', '', true);
+  $user = db_fetch_or_add_user(
+    'ist00000', 'Sudo', ROLE_SUDO, '[email protected]',
+    'https://api.dicebear.com/9.x/notionists-neutral/svg?seed=Jameson&lips=variant17',
+    true);
   create_session($user);
 }
 

composer.json

@@ -10,7 +10,7 @@
     "symfony/http-client": "*",
     "symfony/http-foundation": "*",
     "symfony/mailer": "*",
-    "symfony/mailgun-mailer": "*",
+    "symfony/messenger": "*",
     "symfony/translation": "*",
     "symfony/twig-bridge": "*",
     "twig/twig": "*"

cron.php

@@ -228,8 +228,8 @@ function run_repository() {
       continue;
 
     $group_repo = $group->getRepository();
-    if (!$group_repo || !($is_valid = $group_repo->isValid())) {
-      if (!$is_valid) {
+    if (!$group_repo || !$group_repo->isValid()) {
+      if ($group_repo) {
         email_group($group,
                     "PIC1: repository no longer exists",
                     "Repository no longer exists: " . $group_repo . "\n\n".

email.php

@@ -2,37 +2,61 @@
 // Copyright (c) 2022-present Instituto Superior Técnico.
 // Distributed under the MIT license that can be found in the LICENSE file.
 
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Mailer\Event\MessageEvent;
 use Symfony\Component\Mailer\Mailer;
 use Symfony\Component\Mailer\Transport;
+use Symfony\Component\Messenger\MessageBus;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Email;
 
+class MailLoggerSubscriber implements EventSubscriberInterface
+{
+  public static function getSubscribedEvents() {
+      return [ MessageEvent::class => 'onMessage' ];
+  }
+
+  public function onMessage(MessageEvent $event): void {
+    $message = $event->getMessage();
+    $to = array_map(function($x) { return $x->toString(); }, $message->getTo());
+    error_log(
+      "Sent email to: " . implode(', ', $to) .
+      "\nSubject: " . $message->getSubject() .
+      "\n\n" . $message->getTextBody());
+  }
+}
+
 function send_email($dsts, $subject, $msg) {
   $email = (new Email())
     ->from(new Address(EMAIL_FROM_ADDR, 'PIC1'))
     ->subject($subject);
 
-  if (IN_PRODUCTION) {
-    if (!is_array($dsts))
-      $dsts = [$dsts];
+  if (!is_array($dsts))
+    $dsts = [$dsts];
 
-    $has_email = false;
-    foreach ($dsts as $dst) {
-      if ($dst) {
-        $email->addTo($dst);
-        $has_email = true;
-      }
+  $has_email = false;
+  foreach ($dsts as $dst) {
+    if ($dst) {
+      $email->addTo($dst);
+      $has_email = true;
     }
-    if (!$has_email)
-      return;
-  } else {
-    $email->to(DEBUG_EMAIL_DST);
-    $msg = "PIC1 DEBUG MODE\nTo: " . implode(', ', $dsts) . "\n\n$msg";
   }
+  if (!$has_email)
+    return;
   $email->text($msg);
 
+  if (IN_PRODUCTION) {
+    $dispatcher = null;
+    $bus = null;
+  } else {
+    $dispatcher = new EventDispatcher();
+    $dispatcher->addSubscriber(new MailLoggerSubscriber());
+    $bus = new MessageBus();
+  }
+
   $transport = Transport::fromDsn(MAILER_DSN);
-  $mailer = new Mailer($transport);
+  $mailer = new Mailer($transport, $bus, $dispatcher);
   $mailer->send($email);
 }
 

fenix.php

@@ -131,6 +131,8 @@ function get_groups($course) {
       foreach ($group->members as $m) {
         $students[$m->username] = $m->name;
       }
+      if (!$students)
+        continue;
       assert(empty($groups[$group->groupNumber]));
       $groups[$group->groupNumber] = [trim($group->shift), $students];
     }

index.php

@@ -24,10 +24,14 @@
 $form = null;
 $select_form = null;
 $embed_file = null;
+$info_message = null;
 $success_message = null;
 $table = null;
+$lists = null;
 $deadline = null;
 $info_box = null;
+$monospace = null;
+$refresh_url = null;
 
 $request = \Symfony\Component\HttpFoundation\Request::createFromGlobals();
 
@@ -42,11 +46,13 @@
   } else {
     terminate(print_r($e, true));
   }
+} catch (ValidationException $ex) {
+  terminate('Failed to validate all fields: ' . $ex->getMessage());
 }
 
 function terminate($error_message = null) {
-  global $page, $deadline, $table, $info_box, $form, $select_form, $embed_file,
-         $success_message;
+  global $page, $deadline, $table, $lists, $info_box, $form, $select_form,
+         $embed_file, $info_message, $success_message, $monospace, $refresh_url;
 
   $appvar = new \ReflectionClass('\Symfony\Bridge\Twig\AppVariable');
   $loader = new \Twig\Loader\FilesystemLoader([
@@ -108,11 +114,15 @@ function terminate($error_message = null) {
     'role'            => get_role_string(),
     'photo'           => $user->getPhoto(),
     'embed_file'      => $embed_file,
+    'info_message'    => $info_message,
     'success_message' => $error_message ? '' : $success_message,
     'error_message'   => $error_message,
     'table'           => $table,
+    'lists'           => $lists,
     'info_box'        => $info_box,
+    'monospace'       => $monospace,
     'deadline'        => $deadline ? $deadline->format('c') : null,
+    'refresh_url'     => $refresh_url,
   ];
 
   if ($form)

logout.php

@@ -14,4 +14,4 @@
 
 setcookie('sessid', '', 1);
 
-echo "<p>Logged out!</p>\n";
+header('Location: https://fenix.tecnico.ulisboa.pt/logout', true, 302);

pages/bugs.php

@@ -2,35 +2,16 @@
 // Copyright (c) 2022-present Instituto Superior Técnico.
 // Distributed under the MIT license that can be found in the LICENSE file.
 
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Symfony\Component\Form\Extension\Core\Type\UrlType;
+
 $user = get_user();
 $group = $user->getGroup();
 $year = $group ? $group->year : get_current_year();
-$deadline = db_fetch_deadline($year);
-
-if (isset($_POST['issue_url'])) {
-  if ($user->role == ROLE_STUDENT && !$deadline->isBugSelectionActive())
-    die('Deadline expired');
-
-  if (!$group)
-    die("Student's group not found");
-
-  try {
-    if ($bug = db_fetch_bug_user($year, $user)) {
-      $bug->description = trim($_POST['description'] ?? '');
-      $bug->set_issue_url($_POST['issue_url'] ?? '');
-      $bug->set_repro_url($_POST['repro_url'] ?? '');
-    } else {
-      $bug = SelectedBug::factory($group, $user, $_POST['description'],
-                                  $_POST['issue_url'], $_POST['repro_url']);
-      db_save($bug);
-    }
-  } catch (ValidationException $ex) {
-    echo "<p style=\"color: red\">Failed to validate all fields: ",
-         nl2br(htmlspecialchars($ex->getMessage())), "</p>\n";
-  }
-}
-
-mk_box_left_begin();
+$deadlines = db_fetch_deadline($year);
+$deadline = $deadlines->bug_selection;
 
 if (auth_at_least(ROLE_TA)) {
   $groups = filter_by(['group', 'year', 'shift', 'own_shifts', 'repo']);
@@ -44,69 +25,64 @@
     $video = $bug->getVideoHTML();
     if ($video) {
       $video = <<<HTML
-<button onclick="toggleVideo(this)">Show Video</button>
-<div style="display: none">$video</div>
+<button class="btn btn-primary" onclick="toggleVideo(this)">Show Video</button>
+<div style="display: none; margin-top: 10px">$video</div>
 HTML;
     }
     $repo = $group->getRepository();
     $table[] = [
-      'id' => $bug->id,
-      'Group' => '<a href="' . link_group($group) . "\">$group</a>",
-      'Project' => "<a href=\"$repo\">{$repo->name()}</a>",
-      'Student' => $bug->user->shortName(),
-      'Issue' => '<a href="' . $bug->issue_url . '">link</a>',
-      'Desciption' => nl2br(htmlspecialchars($bug->description)),
-      'Video' => $video,
+      'id'          => $bug->id,
+      'Group'       => dolink_group($group, $group),
+      'Project'     => $repo ? dolink_ext($repo, $repo->name()) : '',
+      'Student'     => $bug->user->shortName(),
+      'Issue'       => dolink_ext($bug->issue_url, 'link'),
+      'Description' => $bug->description,
+      'Video'       => ['html' => $video],
     ];
   }
 }
 
-echo <<<HTML
-<script>
-function toggleVideo(button) {
-  let videoContainer = button.nextElementSibling;
-  if (videoContainer.style.display === "none" ) {
-    videoContainer.style.display = "block";
-    button.textContent = "Hide Video";
+if ($user->role == ROLE_STUDENT && $deadlines->isBugSelectionActive()) {
+  if ($bug = db_fetch_bug_user($year, $user)) {
+    $issue_url = $bug->issue_url;
+    $repro_url = $bug->repro_url;
+    $description = $bug->description;
   } else {
-    videoContainer.style.display = "none";
-    button.textContent = "Show Video";
+    $issue_url = $repro_url = $description = null;
   }
-}
-</script>
-HTML;
 
-if ($bug = db_fetch_bug_user($year, $user)) {
-  $issue_url = $bug->issue_url;
-  $repro_url = $bug->repro_url;
-  $description = format_text($bug->description);
-} else {
-  $issue_url = $repro_url = $description = '';
-}
-
-if ($user->role == ROLE_STUDENT && $deadline->isBugSelectionActive()) {
-  echo <<<EOF
-<p>&nbsp;</p>
-<p>Submit/edit bug proposal:</p>
-<form action="index.php?page=bugs" method="post">
-
-<label for="issue_url">Issue URL:</label>
-<input type="text" id="issue_url" name="issue_url" value="$issue_url" size="50">
-
-<br>
-<label for="repro_url">URL of video reproducing the issue:</label>
-<input type="text" id="repro_url" name="repro_url" value="$repro_url" size="50">
-
-<br>
-<label for="description">Description:</label>
-<textarea id="description" name="description" rows="5" cols="60">
-$description
-</textarea>
-
-<p><input type="submit"></p>
-</form>
+  $form = $formFactory->createBuilder(FormType::class)
+    ->add('issue_url', UrlType::class, [
+      'label' => 'Issue URL',
+      'data' => $issue_url,
+    ])
+    ->add('repro_url', UrlType::class, [
+      'label' => 'URL of video reproducing the issue',
+      'data' => $repro_url,
+    ])
+    ->add('description', TextareaType::class, [
+      'label'    => 'Description',
+      'data'     => $description,
+    ])
+    ->add('submit', SubmitType::class)
+    ->getForm();
+
+  $form->handleRequest($request);
+
+  if ($form->isSubmitted() && $form->isValid()) {
+    if (!$group)
+      terminate("Student is not in a group");
 
-EOF;
+    if ($bug = db_fetch_bug_user($year, $user)) {
+      $bug->description = $form->get('description')->getData();
+      $bug->set_issue_url($form->get('issue_url')->getData());
+      $bug->set_repro_url($form->get('repro_url')->getData());
+    } else {
+      $bug = SelectedBug::factory(
+        $group, $user, $form->get('description')->getData(),
+        $form->get('issue_url')->getData(),
+        $form->get('repro_url')->getData());
+      db_save($bug);
+    }
+  }
 }
-
-$deadline = $deadline->bug_selection;

pages/changerole.php

@@ -2,35 +2,34 @@
 // Copyright (c) 2022-present Instituto Superior Técnico.
 // Distributed under the MIT license that can be found in the LICENSE file.
 
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+
 auth_require_at_least(ROLE_PROF);
 
-html_header("Change Users' Role");
+$form = $formFactory->createBuilder(FormType::class)
+->add('username', TextType::class, [
+  'label' => 'Username',
+])
+->add('role', ChoiceType::class, [
+  'label'   => 'Role',
+  'choices' => array_flip(get_all_roles(auth_at_least(ROLE_SUDO))),
+])
+->add('submit', SubmitType::class)
+->getForm();
+
+$form->handleRequest($request);
 
-if (isset($_POST['username']) && isset($_POST['newrole'])) {
-  $role = (int)$_POST['newrole'];
+if ($form->isSubmitted() && $form->isValid()) {
+  $role = (int)$form->get('role')->getData();
   if (!validate_role($role, auth_at_least(ROLE_SUDO)))
     die('Unknown role');
-
-  $user = db_fetch_user($_POST['username']);
+  $user = db_fetch_user($form->get('username')->getData());
   if (!$user)
     die('Unknown user');
   $user->role = $role;
   db_flush();
-  echo "<p>Changed role successfully!</p>\n";
-}
-
-echo <<<EOF
-<form action="index.php?page=changerole" method="post">
-<label for="username">Username:</label>
-<input type="text" id="username" name="username"><br>
-<label for="newrole">New role:</label>
-<select id="newrole" name="newrole">
-EOF;
-foreach (get_all_roles(auth_at_least(ROLE_SUDO)) as $id => $name) {
-  echo "<option value=\"$id\">$name</option>\n";
+  $success_message = 'Changed role successfully!';
 }
-echo <<<EOF
-</select>
-<input type="submit">
-</form>
-EOF;