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

try to prevent hint duplication

This commit is contained in:
Philip Häusler 2014-12-06 21:40:16 +01:00
parent 30c8b48996
commit 8261933bec
4 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/pages/admin_news.php
View File

@ -5,7 +5,7 @@ function admin_news() {
if (! isset($_GET["action"])) {
redirect(page_link_to("news"));
} else {
$html = '<div class="col-md-12"><h1>' . _("Edit news entry") . '</h1>';
$html = '<div class="col-md-12"><h1>' . _("Edit news entry") . '</h1>' . msg();
if (isset($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id']))
$id = $_REQUEST['id'];
else

1
includes/pages/admin_user.php
View File

@ -264,6 +264,7 @@ function admin_user() {
}
}
} else {
msg();
redirect(page_link_to('users'));
}

46
public/index.php
View File

@ -90,32 +90,30 @@ if (! isset($_REQUEST['p']))
if (isset($_REQUEST['p']) && preg_match("/^[a-z0-9_]*$/i", $_REQUEST['p']) && (in_array($_REQUEST['p'], $free_pages) || in_array($_REQUEST['p'], $privileges))) {
$p = $_REQUEST['p'];
if (isset($user)) {
$hints = "";
if (User_is_freeloader($user))
error(sprintf(_("You freeloaded at least %s shifts. Shift signup is locked. Please go to heavens desk to be unlocked again."), $max_freeloadable_shifts));
// Hinweis für Engel, die noch nicht angekommen sind
if ($user['Gekommen'] == 0)
error(_("You are not marked as arrived. Please go to heaven's desk, get your angel badge and/or tell them that you arrived already."));
if ($enable_tshirt_size && $user['Size'] == "")
error(_("You need to specify a tshirt size in your settings!"));
if ($user['DECT'] == "")
error(_("You need to specify a DECT phone number in your settings! If you don't have a DECT phone, just enter \"-\"."));
// Erzengel Hinweis für unbeantwortete Fragen
if ($p != "admin_questions")
admin_new_questions();
user_angeltypes_unconfirmed_hint();
}
$title = $p;
$content = "";
if (isset($user)) {
if (User_is_freeloader($user))
error(sprintf(_("You freeloaded at least %s shifts. Shift signup is locked. Please go to heavens desk to be unlocked again."), $max_freeloadable_shifts));
// Hinweis für Engel, die noch nicht angekommen sind
if ($user['Gekommen'] == 0)
error(_("You are not marked as arrived. Please go to heaven's desk, get your angel badge and/or tell them that you arrived already."));
if ($enable_tshirt_size && $user['Size'] == "")
error(_("You need to specify a tshirt size in your settings!"));
if ($user['DECT'] == "")
error(_("You need to specify a DECT phone number in your settings! If you don't have a DECT phone, just enter \"-\"."));
// Erzengel Hinweis für unbeantwortete Fragen
if ($p != "admin_questions")
admin_new_questions();
user_angeltypes_unconfirmed_hint();
}
if ($p == "api") {
require_once realpath(__DIR__ . '/../includes/controller/api.php');
error("Api disabled temporily.");
@ -240,7 +238,7 @@ echo template_render('../templates/layout.html', array(
'title' => $title,
'atom_link' => ($p == 'news' || $p == 'user_meetings') ? '<link href="' . page_link_to('atom') . (($p == 'user_meetings') ? '&amp;meetings=1' : '') . '&amp;key=' . $user['api_key'] . '" type="application/atom+xml" rel="alternate" title="Atom Feed">' : '',
'menu' => make_menu(),
'content' => $content,
'content' => msg() . $content,
'header_toolbar' => header_toolbar(),
'faq_url' => $faq_url,
'locale' => $_SESSION['locale']

2
templates/user_shifts.html
View File

@ -12,7 +12,7 @@
}
}
</script>
<form class="form-inline" action="#shifts" method="get">
<form class="form-inline" action="" method="get">
<input type="hidden" name="p" value="user_shifts">
<div class="row">
<div class="col-md-6">