diff options
| author | Jan-Philipp Litza <janphilipp@litza.de> | 2012-12-26 16:10:59 +0100 |
|---|---|---|
| committer | Jan-Philipp Litza <janphilipp@litza.de> | 2012-12-26 16:10:59 +0100 |
| commit | 7344a08a2f55f421f511edd2e14058d39a6ba3b3 (patch) | |
| tree | 97770adcdc04ee28aa05d003e2c5389525b68903 /includes | |
| parent | 0dabaa505e4463498665a1eb6ab95979578beab3 (diff) | |
| parent | 26dafba606e4831ac2fc89b4d002c28bd527b2ab (diff) | |
Merge branch 'master' into dev
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/pages/user_myshifts.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php index 390b3b01..2d1981fa 100644 --- a/includes/pages/user_myshifts.php +++ b/includes/pages/user_myshifts.php @@ -56,7 +56,7 @@ function user_myshifts() { $shift = sql_select("SELECT * FROM `ShiftEntry` WHERE `id`=" . sql_escape($id) . " AND `UID`=" . sql_escape($shifts_user['UID']) . " LIMIT 1"); if (count($shift) > 0) { $shift = $shift[0]; - if (($shift['start'] - time() < $LETZTES_AUSTRAGEN * 60) || in_array('user_shifts_admin', $privileges)) { + if (($shift['start'] - time() < $LETZTES_AUSTRAGEN * 3600) || in_array('user_shifts_admin', $privileges)) { sql_query("DELETE FROM `ShiftEntry` WHERE `id`=" . sql_escape($id) . " LIMIT 1"); $msg .= success(Get_Text("pub_myshifts_signed_off"), true); } else @@ -79,7 +79,7 @@ function user_myshifts() { $html .= '<td>' . $shift['Comment'] . '</td>'; $html .= '<td>'; $html .= '<a href="' . page_link_to('user_myshifts') . '&edit=' . $shift['id'] . '">' . Get_Text('edit') . '</a>'; - if ($shift['start'] - time() > $LETZTES_AUSTRAGEN * 60) + if ($shift['start'] - time() > $LETZTES_AUSTRAGEN * 3600) $html .= ' | <a href="' . page_link_to('user_myshifts') . '&cancel=' . $shift['id'] . '">' . Get_Text('sign_off') . '</a>'; $html .= '</td>'; $html .= '</tr>'; |