summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Häusler <msquare@notrademark.de>2015-12-29 17:57:16 +0100
committerPhilip Häusler <msquare@notrademark.de>2015-12-29 17:57:16 +0100
commitb479cdaef8c51e5230048bac82d00696c2a2b61a (patch)
tree0663d0a3b0ef9e4de9d76912b75b7bfcf82b1be5
parent522546795b04d946e34b07a44bdb7cd2a4a8cfac (diff)
fix room creation
-rw-r--r--includes/model/Room_model.php4
-rw-r--r--includes/pages/user_myshifts.php34
-rw-r--r--includes/view/ShiftEntry_view.php1
3 files changed, 24 insertions, 15 deletions
diff --git a/includes/model/Room_model.php b/includes/model/Room_model.php
index 2868916e..6d8a205e 100644
--- a/includes/model/Room_model.php
+++ b/includes/model/Room_model.php
@@ -22,8 +22,8 @@ function Room_create($name, $from_frab, $public) {
$result = sql_query("
INSERT INTO `Room` SET
`Name`='" . sql_escape($name) . "',
- `FromPentabarf`='" . sql_escape($from_frab ? 'Y' : 'N') . "',
- `show`='" . sql_escape($public ? 'Y' : 'N') . "',
+ `FromPentabarf`='" . sql_escape($from_frab ? 'Y' : '') . "',
+ `show`='" . sql_escape($public ? 'Y' : '') . "',
`Number`=0");
if ($result === false)
return false;
diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php
index 278a7134..7d2472aa 100644
--- a/includes/pages/user_myshifts.php
+++ b/includes/pages/user_myshifts.php
@@ -48,29 +48,37 @@ function user_myshifts() {
AND `UID`='" . sql_escape($shifts_user['UID']) . "' LIMIT 1");
if (count($shift) > 0) {
$shift = $shift[0];
+ $freeloaded = $shift['freeloaded'];
+ $freeload_comment = $shift['freeload_comment'];
if (isset($_REQUEST['submit'])) {
- $freeloaded = $shift['freeloaded'];
- $freeload_comment = $shift['freeload_comment'];
+ $ok = true;
if (in_array("user_shifts_admin", $privileges)) {
$freeloaded = isset($_REQUEST['freeloaded']);
$freeload_comment = strip_request_item_nl('freeload_comment');
+ if ($freeloaded && $freeload_comment == '') {
+ $ok = false;
+ error(_("Please enter a freeload comment!"));
+ }
}
$comment = strip_request_item_nl('comment');
$user_source = User($shift['UID']);
- $result = ShiftEntry_update(array(
- 'id' => $id,
- 'Comment' => $comment,
- 'freeloaded' => $freeloaded,
- 'freeload_comment' => $freeload_comment
- ));
- if ($result === false)
- engelsystem_error('Unable to update shift entr.');
- engelsystem_log("Updated " . User_Nick_render($user_source) . "'s shift " . $shift['name'] . " from " . date("Y-m-d H:i", $shift['start']) . " to " . date("Y-m-d H:i", $shift['end']) . " with comment " . $comment . ". Freeloaded: " . ($freeloaded ? "YES Comment: " . $freeload_comment : "NO"));
- success(_("Shift saved."));
- redirect(page_link_to('users') . '&action=view&user_id=' . $shifts_user['UID']);
+ if ($ok) {
+ $result = ShiftEntry_update(array(
+ 'id' => $id,
+ 'Comment' => $comment,
+ 'freeloaded' => $freeloaded,
+ 'freeload_comment' => $freeload_comment
+ ));
+ if ($result === false)
+ engelsystem_error('Unable to update shift entry.');
+
+ engelsystem_log("Updated " . User_Nick_render($user_source) . "'s shift " . $shift['name'] . " from " . date("Y-m-d H:i", $shift['start']) . " to " . date("Y-m-d H:i", $shift['end']) . " with comment " . $comment . ". Freeloaded: " . ($freeloaded ? "YES Comment: " . $freeload_comment : "NO"));
+ success(_("Shift saved."));
+ redirect(page_link_to('users') . '&action=view&user_id=' . $shifts_user['UID']);
+ }
}
return ShiftEntry_edit_view(User_Nick_render($shifts_user), date("Y-m-d H:i", $shift['start']) . ', ' . shift_length($shift), $shift['Name'], $shift['name'], $shift['angel_type'], $shift['Comment'], $shift['freeloaded'], $shift['freeload_comment'], in_array("user_shifts_admin", $privileges));
diff --git a/includes/view/ShiftEntry_view.php b/includes/view/ShiftEntry_view.php
index 6cb8ba00..9665e426 100644
--- a/includes/view/ShiftEntry_view.php
+++ b/includes/view/ShiftEntry_view.php
@@ -21,6 +21,7 @@ function ShiftEntry_edit_view($angel, $date, $location, $title, $type, $comment,
$freeload_form = array();
}
return page_with_title(_("Edit shift entry"), array(
+ msg(),
form(array(
form_info(_("Angel:"), $angel),
form_info(_("Date, Duration:"), $date),