check if logged in before sign up

includes/controller/shift_entries_controller.php

@@ -11,6 +11,10 @@ function shift_entries_controller()
 {
     global $user;
     
+    if(!isset($user)) {
+        redirect(page_link_to('login'));
+    }
+
     $action = strip_request_item('action');
     if ($action == null) {
         redirect(user_link($user));

includes/model/AngelType_model.php

@@ -126,7 +126,7 @@ function AngelType_create($angeltype)
             $angeltype['contact_name'],
             $angeltype['contact_dect'],
             $angeltype['contact_email'],
-            $angeltype['show_on_dashboard']
+            (int)$angeltype['show_on_dashboard']
         ]
     );
 

includes/pages/user_shifts.php

@@ -248,12 +248,7 @@ function view_user_shifts()
                     . _('Description of the jobs.')
                     . '</a>',
                 'shifts_table'  => msg() . $shiftCalendarRenderer->render(),
-                'ical_text'     => '<h2>' . _('iCal export') . '</h2><p>' . sprintf(
+                'ical_text'     => ical_hint(),
-                        _('Export of shown shifts. <a href="%s">iCal format</a> or <a href="%s">JSON format</a> available (please keep secret, otherwise <a href="%s">reset the api key</a>).'),
-                        page_link_to('ical', ['key' => $user['api_key']]),
-                        page_link_to('shifts_json_export', ['key' => $user['api_key']]),
-                        page_link_to('user_myshifts', ['reset' => 1])
-                    ) . '</p>',
                 'filter'        => _('Filter'),
                 'set_yesterday' => _('Yesterday'),
                 'set_today'     => _('Today'),
@@ -271,6 +266,22 @@ function view_user_shifts()
     ]);
 }
 
+/**
+ * Returns a hint for the user how the ical feature works.
+ */
+function ical_hint() {
+    global $user;
+
+    return heading(
+        _('iCal export'), 2) 
+        . '<p>' . sprintf(
+            _('Export of shown shifts. <a href="%s">iCal format</a> or <a href="%s">JSON format</a> available (please keep secret, otherwise <a href="%s">reset the api key</a>).'),
+            page_link_to('ical', ['key' => $user['api_key']]),
+            page_link_to('shifts_json_export', ['key' => $user['api_key']]),
+            page_link_to('user_myshifts', ['reset' => 1])
+        ) . '</p>';
+}
+
 /**
  * @param array $array
  * @return array

includes/view/User_view.php

@@ -518,7 +518,8 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
                 _('Go to the <a href="%s">shifts table</a> to sign yourself up for some shifts.'),
                 page_link_to('user_shifts')
             ), true)
-                : ''
+                : '',
+            ical_hint()
         ]
     );
 }