}
# replace every character in $str with " "
-function tonbsp($matches) {
+function to_nbsp($matches) {
return str_repeat(' ', strlen($matches[0]) * 2);
}
# encode as html, make it display newlines and leading spaces
function enc_htmlbrtab($str) {
$str = enc_htmlbr($str);
- $str = preg_replace_callback("|^ *|m", tonbsp, $str);
+ $str = preg_replace_callback("|^ *|m", to_nbsp, $str);
return $str;
}
$task_id = format_int($_REQUEST['tasks_id']);;
$client_id = logged_in();
if(logged_in_as_contractor()) {
- $row = db_get_row('tasks', 'title,url,description,state,price', 'where id=%i', $task_id);
+ $row = db_get_row('tasks', 'title,url,description,state,price,client_id', 'where id=%i', $task_id);
} else {
- $row = db_get_row('tasks', 'title,url,description,state,price', 'where id=%i && client_id=%i', $task_id, $client_id);
+ $row = db_get_row('tasks', 'title,url,description,state,price,client_id', 'where id=%i && client_id=%i', $task_id, $client_id);
}
if($row) {
- list($title, $url, $description, $state, $price) = $row;
+ list($title, $url, $description, $state, $price, $owner_id) = $row;
tem_set('task_id', $task_id);
tem_set('title', $title);
tem_set('url', $url);
case TASK_NEEDS_CLARIFICATION:
case TASK_NEEDS_QUOTE:
case TASK_BUG:
+ tem_show('normal_edit_link');
+ break;
case TASK_NEEDS_GO_AHEAD:
+ tem_show('approve_price_link');
tem_show('normal_edit_link');
tem_show('price_row');
break;
tem_show('normal_edit_link');
tem_show('working_link');
tem_show('price_row');
+ break;
case TASK_WORKING:
tem_show('price_row');
tem_show('needs_testing_link');
break;
case TASK_NEEDS_TESTING:
+ if($owner_id == logged_in()) {
+ tem_show('finished_link');
+ }
+ # FALL THROUGH
case TASK_FINISHED:
tem_show('price_row');
tem_show('mark_paid_link'); # FIXME
if(isset($_REQUEST['tasks_approve_price_id'])) {
$id = $_REQUEST['tasks_approve_price_id'];
- $owner = db_get_value('tasks', 'client_id', 'where id=%i', $id);;
+ $owner = db_get_value('tasks', 'client_id', 'where id=%i', $id);
if(logged_in() != $owner) {
message("Error: can't approve a task entered by/for another client.");
return './';
message("Error: only Jason can say when he's done.");
return './';
}
- db_update('tasks', 'state', TASK_NEEDS_TESTING, 'where id=%i', $id);
+ db_update('tasks', 'state,finished_at', TASK_NEEDS_TESTING, date('Y-m-d'), 'where id=%i', $id);
message('Task awaits testing.');
return './';
}
}
}
- if("you're happy with the POSTed values") {
+ if("you're happy with the POSTed values") { # if you change this change the one above
if($edit_id) {
if(isset($_REQUEST['price']) && logged_in_as_contractor()) {
db_update('tasks', 'title,url,description,state,price', $title, $url, $description, $state, $price, 'where id=%i', $edit_id);
# new task
$paid = 0;
$client_id = logged_in();
+ if(logged_in_as_contractor() && $_REQUEST['client_id']) {
+ $client_id = format_int($_REQUEST['client_id']);
+ }
db_insert('tasks', 'client_id,title,url,description,state,paid', $client_id, $title, $url, $description, $state, $paid);
message('Task saved.');
}
tem_show('bug_msg');
} else {
tem_show('new_msg');
+ if(logged_in_as_contractor()) {
+ pulldown('client_id', db_get_rows('people', 'id,name', 'where id > 1'), PULLDOWN_2D);
+ tem_set('client_id', format_int($_REQUEST['client_id']));
+ tem_show('client_row');
+ }
}
# display instructions