more twig work

Author: nunoplopes

index.php

@@ -14,7 +14,6 @@
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 
 $page = $_REQUEST['page'] ?? '';
-$file = "pages/$page.php";
 
 use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationExtension;
 use Symfony\Component\Form\Forms;
@@ -33,16 +32,15 @@
 $request = \Symfony\Component\HttpFoundation\Request::createFromGlobals();
 
 try {
+  $file = "pages/$page.php";
   if (ctype_alpha($page) && file_exists($file)) {
     require $file;
-  } else {
-    require 'pages/main.php';
   }
 } catch (PDOException $e) {
   if (IN_PRODUCTION) {
-    echo "<p>Error while accessing the DB</p>";
+    terminate('Error while accessing the DB');
   } else {
-    echo "<pre>", htmlspecialchars(print_r($e, true)), "</pre>";
+    terminate(print_r($e, true));
   }
 }
 
@@ -86,7 +84,7 @@ function terminate($error_message = null) {
     ['phpinfo', 'PHP Info', ROLE_PROF],
   ];
   $navbar = [];
-  $title = '';
+  $title = 'Welcome';
 
   foreach ($pages as $p) {
     if ($p[0] === $page)
@@ -147,6 +145,7 @@ function filter_by($filters) {
                           ? db_fetch_shift_id($selected_shift) : null;
 
   if (in_array('year', $filters)) {
+    $years = [];
     foreach (db_get_group_years() as $year) {
       $years[$year['year']] = $year['year'];
     }

pages/editpatch.php

@@ -30,7 +30,7 @@
   }
 }
 
-handle_form($patch, [], $readonly, ['group', 'status', 'type'], null, false);
+handle_form($patch, [], $readonly, ['group', 'status', 'type']);
 
 if (auth_at_least(ROLE_PROF)) {
   $link = dolink('rmpatch', 'Delete', ['id' => $patch->id]);

pages/main.php

@@ -3,5 +3,5 @@
 // Distributed under the MIT license that can be found in the LICENSE file.
 
 auth_require_at_least(ROLE_PROF);
-
 phpinfo();
+exit();

pages/phpinfo.php

@@ -6,19 +6,13 @@
 handle_form($user, [], [], ['repository_user']);
 
 if ($u = $user->getRepoUser()) {
-  echo "<p>User data:</p><ul>";
-  $data = [
-    "Username" => '<a style="color: white" href="' . $u->profileURL() . '">' .
-                  $u->username() . '</a>',
+  $info_box['title'] = 'User data';
+  $info_box['rows'] = [
+    "Username" => dolink_ext($u->profileURL(), $u->username()),
     "Platform" => $u->platform(),
     "Name"     => $u->name(),
     "Email"    => $u->email(),
     "Company"  => $u->company(),
     "Location" => $u->location(),
   ];
-  foreach ($data as $k => $v) {
-    if ($v)
-      echo "<li><b>$k</b>: $v</li>";
-  }
-  echo '</ul>';
 }

pages/profile.php

@@ -4,8 +4,6 @@
 
 auth_require_at_least(ROLE_PROF);
 
-html_header('Shifts');
-
 $year = get_current_year();
 $shifts = db_fetch_shifts($year);
 $profs = db_get_all_profs(true);
@@ -24,19 +22,9 @@
   echo "<p>Saved!</p>";
 }
 
-$url = htmlspecialchars($_SERVER['REQUEST_URI']);
-
-echo <<<EOF
-<form action="$url" method="post">
-<input type="hidden" name="submit" value="1">
-<table>
-<tr><td>Shift</td>
-EOF;
-
 foreach ($profs as $prof) {
   echo "<td>{$prof->shortName()}</td>";
 }
-echo "</tr>\n";
 
 foreach ($shifts as $shift) {
   echo "<tr><td>", htmlspecialchars($shift->name), "</td>";
@@ -47,7 +35,4 @@
     echo "<td><input type=\"radio\" name=\"shift_$shift->id\" value=\"",
          htmlspecialchars($prof->id), "\"$selected></td>";
   }
-  echo "</tr>\n";
 }
-
-echo "</table><p><input type=\"submit\"></p></form>\n";

pages/shifts.php

@@ -47,7 +47,7 @@ function format_text($text) {
 }
 
 function handle_form(&$obj, $hide_fields, $readonly, $only_fields = null,
-                     $extra_buttons = null, $flush_db = true) {
+                     $extra_buttons = null) {
   global $form, $formFactory, $request, $success_message;
   $form = $formFactory->createBuilder(FormType::class);
 
@@ -56,6 +56,11 @@ function handle_form(&$obj, $hide_fields, $readonly, $only_fields = null,
 
   $not_all_readonly = false;
 
+  // get_object_vars doesn't trigger lazy loading; force it here
+  if (method_exists($obj, '__isInitialized') && !$obj->__isInitialized()) {
+    $obj->__load();
+  }
+
   foreach (get_object_vars($obj) as $name => $orig_value) {
     if (in_array($name, $hide_fields) ||
         ($only_fields && !in_array($name, $only_fields)))
@@ -202,10 +207,7 @@ function handle_form(&$obj, $hide_fields, $readonly, $only_fields = null,
         $str .= "\n$print_name: " . $error->getMessage();
       }
       terminate($str);
-    } else {
-      if ($flush_db)
-        db_flush();
-      $success_message = 'Database updated!';
     }
+    $success_message = 'Database updated!';
   }
 }