iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed "default_theme" config to "theme"

This commit is contained in:
Igor Scheller 2017-03-02 08:11:52 +01:00
parent 781f830678
commit 68da2a4eb8
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/config.default.php
View File

@ -27,7 +27,7 @@ return [
'contact_email' => 'mailto:ticket@c3heaven.de', 'contact_email' => 'mailto:ticket@c3heaven.de',
// Default theme of the start page, 1=style1.css // Default theme of the start page, 1=style1.css
'default_theme' => 1, 'theme' => 1,
// Number of News shown on one site // Number of News shown on one site
'display_news' => 6, 'display_news' => 6,
@ -56,7 +56,10 @@ return [
// local timezone // local timezone
'timezone' => 'Europe/Berlin', 'timezone' => 'Europe/Berlin',
// multiply 'night shifts' and freeloaded shifts (start or end between 2 and 6 exclusive) by 2 // weigh every shift the same
//'shift_sum_formula' => 'SUM(`end` - `start`)',
// Multiply 'night shifts' and freeloaded shifts (start or end between 2 and 6 exclusive) by 2
'shift_sum_formula' => ' 'shift_sum_formula' => '
SUM( SUM(
(1 + (1 +
@ -70,10 +73,8 @@ return [
* (1 - 3 * `ShiftEntry`.`freeloaded`) * (1 - 3 * `ShiftEntry`.`freeloaded`)
) )
', ',
// weigh every shift the same
//'shift_sum_formula' => 'SUM(`end` - `start`)',
// voucher calculation // Voucher calculation
'voucher_settings' => [ 'voucher_settings' => [
'initial_vouchers' => 2, 'initial_vouchers' => 2,
'shifts_per_voucher' => 1, 'shifts_per_voucher' => 1,

2
includes/pages/guest_login.php
View File

@ -209,7 +209,7 @@ function guest_register()
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW(), ?, NULL, ?) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW(), ?, NULL, ?)
', ',
[ [
config('default_theme'), config('theme'),
$nick, $nick,
$preName, $preName,
$lastName, $lastName,

2
public/index.php
View File

@ -169,7 +169,7 @@ if (
$event_config = EventConfig(); $event_config = EventConfig();
echo template_render(__DIR__ . '/../templates/layout.html', [ echo template_render(__DIR__ . '/../templates/layout.html', [
'theme' => isset($user) ? $user['color'] : config('default_theme'), 'theme' => isset($user) ? $user['color'] : config('theme'),
'title' => $title, 'title' => $title,
'atom_link' => ($page == 'news' || $page == 'user_meetings') 'atom_link' => ($page == 'news' || $page == 'user_meetings')
? ' <link href="' . page_link_to('atom') . (($page == 'user_meetings') ? '&meetings=1' : '') ? ' <link href="' . page_link_to('atom') . (($page == 'user_meetings') ? '&meetings=1' : '')