Business/TaskFloor
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use PHP date() instead of SQL NOW()

Browse Source
This commit is contained in:
Skylar Ittner 2017-05-22 02:58:12 -06:00
parent ddb744a262
commit 36d0dfb7ea
6 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
action.php
View File

@ -39,7 +39,7 @@ switch ($VARS['action']) {
if (is_empty($msg)) { if (is_empty($msg)) {
die(); die();
} }
$database->insert('messages', ['messagetext' => $msg, '#messagedate' => 'NOW()', 'from' => $_SESSION['uid'], 'to' => $to]); $database->insert('messages', ['messagetext' => $msg, 'messagedate' => date("Y-m-d H:i:s"), 'from' => $_SESSION['uid'], 'to' => $to]);
break; break;
case "delmsg": case "delmsg":
header('HTTP/1.0 204 No Content'); header('HTTP/1.0 204 No Content');
@ -62,7 +62,7 @@ switch ($VARS['action']) {
die('You are not assigned to this task!'); die('You are not assigned to this task!');
} }
header('HTTP/1.0 204 No Content'); header('HTTP/1.0 204 No Content');
$database->update('assigned_tasks', ['#starttime' => 'NOW()', 'statusid' => 1], ["AND" => ['taskid' => $VARS['taskid'], 'userid' => $_SESSION['uid']]]); $database->update('assigned_tasks', ['starttime' => date("Y-m-d H:i:s"), 'statusid' => 1], ["AND" => ['taskid' => $VARS['taskid'], 'userid' => $_SESSION['uid']]]);
break; break;
case "resume": case "resume":
if (!$database->has('assigned_tasks', ["AND" => ['taskid' => $VARS['taskid'], 'userid' => $_SESSION['uid'], 'starttime[!]' => null]])) { if (!$database->has('assigned_tasks', ["AND" => ['taskid' => $VARS['taskid'], 'userid' => $_SESSION['uid'], 'starttime[!]' => null]])) {
@ -76,7 +76,7 @@ switch ($VARS['action']) {
if (!$database->has('assigned_tasks', ["AND" => ['taskid' => $VARS['taskid'], 'userid' => $_SESSION['uid']]])) { if (!$database->has('assigned_tasks', ["AND" => ['taskid' => $VARS['taskid'], 'userid' => $_SESSION['uid']]])) {
die('You are not assigned to this task!'); die('You are not assigned to this task!');
} }
$database->update('assigned_tasks', ['#endtime' => 'NOW()', 'statusid' => 2], ["AND" => ['taskid' => $VARS['taskid'], 'userid' => $_SESSION['uid']]]); $database->update('assigned_tasks', ['endtime' => date("Y-m-d H:i:s"), 'statusid' => 2], ["AND" => ['taskid' => $VARS['taskid'], 'userid' => $_SESSION['uid']]]);
break; break;
case "pause": case "pause":
if (!$database->has('assigned_tasks', ["AND" => ['taskid' => $VARS['taskid'], 'userid' => $_SESSION['uid']]])) { if (!$database->has('assigned_tasks', ["AND" => ['taskid' => $VARS['taskid'], 'userid' => $_SESSION['uid']]])) {

BIN
database.mwb
View File

Binary file not shown.

2
lib/getmsgs.php
View File

@ -46,7 +46,7 @@ if (count($messages) > 0) {
} }
?> ?>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body message-content">
<?php echo strip_tags($msg['text']); ?> <?php echo strip_tags($msg['text']); ?>
</div> </div>
<div class="panel-footer"> <div class="panel-footer">

2
lib/gettaskman.php
View File

@ -87,7 +87,7 @@ if (count($tasks) > 0) {
?> ?>
</h3> </h3>
</div> </div>
<div class='panel-body'> <div class='panel-body task-description'>
<?php echo $task['desc'] ?> <?php echo $task['desc'] ?>
</div> </div>
<div class='panel-footer'> <div class='panel-footer'>

2
lib/gettasks.php
View File

@ -42,7 +42,7 @@ if (count($tasks) > 0) {
?> ?>
</h3> </h3>
</div> </div>
<div class='panel-body'> <div class='panel-body task-description'>
<?php echo $task['taskdesc'] ?> <?php echo $task['taskdesc'] ?>
</div> </div>
<div class='panel-footer'> <div class='panel-footer'>

9
static/css/app.css
View File

@ -12,4 +12,13 @@
.footer { .footer {
margin-top: 10em; margin-top: 10em;
text-align: center; text-align: center;
}
.message-content {
overflow-wrap: break-word;
}
.task-description {
/* Using !important in case a "smart" guy messes with inline CSS, to make his life harder */
overflow-wrap: break-word !important;
} }