← All changes
|
includes/admin/projects/open_project/wppm_get_project_tasks.php
+71
-34
1.0.3
→
6.0.6
View file →
| @@ -2,34 +2,43 @@ | ||
| 2 | 2 | if ( ! defined( 'ABSPATH' ) ) { |
| 3 | 3 | exit; // Exit if accessed directly |
| 4 | 4 | } |
| 5 | 5 | global $current_user,$wpdb,$wppmfunction; |
| 6 | -$project_id = isset($_POST['id']) ? intval(sanitize_text_field($_POST['id'])) : 0 ; | |
| 7 | -if($current_user->has_cap('manage_options')){ | |
| 8 | - $query = ( "SELECT * FROM {$wpdb->prefix}wppm_task where project=$project_id"); | |
| 9 | - $tasks = $wpdb->get_results($query); | |
| 6 | +$project_id = isset($_POST['id']) ? intval(sanitize_text_field(wp_unslash($_POST['id']))) : 0 ; | |
| 7 | +$project_id = (int)($project_id); | |
| 8 | +$cu_id = (int)($current_user->ID); | |
| 9 | +$appearance_settings = get_option("wppm-ap-task-list"); | |
| 10 | +$wppm_task_time = get_option('wppm_task_time'); | |
| 11 | +$wppm_current_user_capability = get_user_meta( $current_user->ID, 'wppm_capability', true ); | |
| 12 | +if($current_user->has_cap('manage_options') || $wppm_current_user_capability=='wppm_admin'){ | |
| 13 | + $query = $wpdb->prepare( | |
| 14 | + "SELECT * FROM {$wpdb->prefix}wppm_task WHERE project = %d AND (parent_task_id = 0 OR parent_task_id IS NULL)", | |
| 15 | + $project_id | |
| 16 | + ); | |
| 10 | 17 | } else{ |
| 11 | -$query = ( "SELECT Task.* | |
| 12 | - FROM {$wpdb->prefix}wppm_task AS Task | |
| 13 | - Left join {$wpdb->prefix}wppm_project proj ON Task.project = proj.id | |
| 14 | - Left join {$wpdb->prefix}wppm_project_users proj_users ON Task.project = proj_users.proj_id | |
| 15 | - where Task.project = $project_id AND ((FIND_IN_SET('$current_user->ID',Task.users)>0) OR (Task.created_by= '$current_user->ID') OR (proj_users.user_id = '$current_user->ID' AND proj_users.role_id = 1 ))Group by Task.id"); | |
| 16 | - $tasks = $wpdb->get_results($query); | |
| 18 | + $query = $wpdb->prepare( "SELECT Task.* FROM {$wpdb->prefix}wppm_task AS Task | |
| 19 | + LEFT JOIN {$wpdb->prefix}wppm_project proj ON Task.project = proj.id | |
| 20 | + LEFT JOIN {$wpdb->prefix}wppm_project_users proj_users ON Task.project = proj_users.proj_id | |
| 21 | + LEFT JOIN {$wpdb->prefix}wppm_project_meta proj_meta ON Task.project = proj_meta.project_id | |
| 22 | + WHERE Task.project = %d AND (Task.parent_task_id = 0 OR Task.parent_task_id IS NULL) AND (FIND_IN_SET(%d, Task.users) > 0 OR Task.created_by = %d OR ( proj_users.user_id = %d AND proj_users.role_id = 1 AND FIND_IN_SET(%d, proj.users) > 0 ) OR ( proj_meta.meta_key = 'public_project' AND proj_meta.meta_value = 1 ) OR proj.created_by = %d ) GROUP BY Task.id", | |
| 23 | + $project_id,$cu_id, $cu_id,$cu_id,$cu_id, $cu_id ); | |
| 17 | 24 | } |
| 25 | +$query = apply_filters('wppm_get_project_tasks_query',$query,$project_id); | |
| 26 | +$tasks = $wpdb->get_results($query); | |
| 18 | 27 | ob_start(); |
| 19 | 28 | ?> |
| 20 | -<form> | |
| 29 | +<form id="wppm_get_project_tasks_frm" name="wppm_get_project_tasks_frm"> | |
| 21 | 30 | <div class="table-responsive"> |
| 22 | 31 | <table id="tbl_project_tasks" class="table table-striped table-bordered" cellspacing="0" width="100%"> |
| 23 | 32 | <thead> |
| 24 | 33 | <tr> |
| 25 | - <th class="wppm_table_header"><?php echo esc_html_e('Task id','taskbuilder');?> </th> | |
| 26 | - <th class="wppm_table_header"><?php echo esc_html_e('Task Name','taskbuilder');?> </th> | |
| 27 | - <th class="wppm_table_header"><?php echo esc_html_e('Task Status','taskbuilder');?> </th> | |
| 28 | - <th class="wppm_table_header"><?php echo esc_html_e('Task Priority','taskbuilder');?> </th> | |
| 29 | - <th class="wppm_table_header"><?php echo esc_html_e('Assign To','taskbuilder');?> </th> | |
| 30 | - <th class="wppm_table_header"><?php echo esc_html_e('Start Date','taskbuilder');?> </th> | |
| 31 | - <th class="wppm_table_header"><?php echo esc_html_e('End Date','taskbuilder');?> </th> | |
| 34 | + <th class="wppm_table_header" style="background-color:<?php echo esc_attr($appearance_settings['list-header-background-color'])?>;color:<?php echo esc_attr($appearance_settings['list-header-text-color'])?>"><?php echo esc_html_e('Task id','taskbuilder');?> </th> | |
| 35 | + <th class="wppm_table_header" style="background-color:<?php echo esc_attr($appearance_settings['list-header-background-color'])?>;color:<?php echo esc_attr($appearance_settings['list-header-text-color'])?>" <?php echo esc_attr($appearance_settings['list-header-text-color'])?>><?php echo esc_html_e('Task Name','taskbuilder');?> </th> | |
| 36 | + <th class="wppm_table_header" style="background-color:<?php echo esc_attr($appearance_settings['list-header-background-color'])?>;color:<?php echo esc_attr($appearance_settings['list-header-text-color'])?>"><?php echo esc_html_e('Task Status','taskbuilder');?> </th> | |
| 37 | + <th class="wppm_table_header" style="background-color:<?php echo esc_attr($appearance_settings['list-header-background-color'])?>;color:<?php echo esc_attr($appearance_settings['list-header-text-color'])?>"><?php echo esc_html_e('Task Priority','taskbuilder');?> </th> | |
| 38 | + <th class="wppm_table_header" style="background-color:<?php echo esc_attr($appearance_settings['list-header-background-color'])?>;color:<?php echo esc_attr($appearance_settings['list-header-text-color'])?>"><?php echo esc_html_e('Assign To','taskbuilder');?> </th> | |
| 39 | + <th class="wppm_table_header" style="background-color:<?php echo esc_attr($appearance_settings['list-header-background-color'])?>;color:<?php echo esc_attr($appearance_settings['list-header-text-color'])?>"><?php echo esc_html_e('Start Date','taskbuilder');?> </th> | |
| 40 | + <th class="wppm_table_header" style="background-color:<?php echo esc_attr($appearance_settings['list-header-background-color'])?>;color:<?php echo esc_attr($appearance_settings['list-header-text-color'])?>"><?php echo esc_html_e('End Date','taskbuilder');?> </th> | |
| 32 | 41 | </tr> |
| 33 | 42 | </thead> |
| 34 | 43 | <tbody> |
| 35 | 44 | <?php |
| @@ -34,32 +43,41 @@ | ||
| 34 | 43 | <tbody> |
| 35 | 44 | <?php |
| 36 | 45 | if(!empty($tasks)){ |
| 37 | 46 | foreach ($tasks as $task) { |
| 38 | - $status = $wpdb->get_row( "SELECT * FROM {$wpdb->prefix}wppm_task_statuses where id = $task->status" ); | |
| 47 | + $status = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->prefix}wppm_task_statuses WHERE id = %d", (int) $task->status ) ); | |
| 39 | 48 | $users = array(); |
| 40 | 49 | if($task->users != null){ |
| 41 | 50 | $users = explode(",",$task->users); |
| 42 | 51 | } |
| 43 | 52 | if(!empty($task->priority)){ |
| 44 | - $priority = $wpdb->get_row( "SELECT * FROM {$wpdb->prefix}wppm_task_priorities where id = $task->priority" ); | |
| 53 | + $priority = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->prefix}wppm_task_priorities WHERE id = %d", (int) $task->priority)); | |
| 45 | 54 | } |
| 46 | 55 | if(!empty($task->project)){ |
| 47 | - $project = $wpdb->get_row( "SELECT * FROM {$wpdb->prefix}wppm_project where id = $task->project" ); | |
| 56 | + $project = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->prefix}wppm_project WHERE id = %d",(int) $task->project)); | |
| 48 | 57 | } |
| 58 | + if($wppm_task_time == 1){ | |
| 59 | + $task_start_date = $task->start_date; | |
| 60 | + $task_end_date = $task->end_date; | |
| 61 | + } elseif($wppm_task_time == 0){ | |
| 62 | + $tsDate = new DateTime($task->start_date); | |
| 63 | + $teDate = new DateTime($task->end_date); | |
| 64 | + $task_start_date = $tsDate->format('Y-m-d'); | |
| 65 | + $task_end_date = $teDate->format('Y-m-d'); | |
| 66 | + } | |
| 49 | 67 | ?> |
| 50 | 68 | <tr onclick= "wppm_open_project_tasks(<?php echo esc_attr($task->id) ?>,<?php echo esc_attr($task->project) ?>)" > |
| 51 | 69 | <td> |
| 52 | - <?php echo esc_html_e($task->id,'taskbuilder') ?> | |
| 70 | + <?php echo esc_html($task->id); ?> | |
| 53 | 71 | </td> |
| 54 | 72 | <td> |
| 55 | - <?php echo esc_html_e($task->task_name,'taskbuilder') ?> | |
| 73 | + <?php echo esc_html($task->task_name); ?> | |
| 56 | 74 | </td> |
| 57 | 75 | <td> |
| 58 | - <span class="wppm_td_task_status" style="background-color:<?php echo (isset($status->bg_color))? esc_attr($status->bg_color):"";?>; color: <?php echo (isset($status->color))? esc_attr($status->color):""; ?>"><?php echo (isset($status->name))? esc_html_e($status->name,'taskbuilder'):"" ?></span> | |
| 76 | + <span class="wppm_td_task_status" style="background-color:<?php echo (isset($status->bg_color))? esc_attr($status->bg_color):"";?>; color: <?php echo (isset($status->color))? esc_attr($status->color):""; ?>"><?php echo (isset($status->name))? esc_html($status->name):"" ?></span> | |
| 59 | 77 | </td> |
| 60 | 78 | <td> |
| 61 | - <span class ="wppm_td_task_priority" style="background-color:<?php echo (isset($priority->bg_color))? esc_attr($priority->bg_color):"";?>; color: <?php echo (isset($priority->color))? esc_attr($priority->color):""; ?>"><?php echo (isset($priority->name))? esc_html_e($priority->name,'taskbuilder'):"" ?></span> | |
| 79 | + <span class ="wppm_td_task_priority" style="background-color:<?php echo (isset($priority->bg_color))? esc_attr($priority->bg_color):"";?>; color: <?php echo (isset($priority->color))? esc_attr($priority->color):""; ?>"><?php echo (isset($priority->name))? esc_html($priority->name):"" ?></span> | |
| 62 | 80 | </td> |
| 63 | 81 | <td> |
| 64 | 82 | <?php |
| 65 | 83 | $i=0; |
| @@ -66,16 +84,19 @@ | ||
| 66 | 84 | if(!empty($users)){ |
| 67 | 85 | foreach($users as $user){ |
| 68 | 86 | $i++; |
| 69 | 87 | if( $i <= 4 ){ |
| 70 | - $userdata = get_userdata( $user ); ?> | |
| 71 | - <a href="#" title="<?php echo esc_attr($userdata->display_name) ?>"> | |
| 72 | - <?php echo (get_avatar($userdata->ID, 25, "mysteryman"))?> | |
| 73 | - </a> <?php | |
| 88 | + $userdata = get_userdata( $user ); | |
| 89 | + if($userdata){ | |
| 90 | + ?> | |
| 91 | + <a href="#" title="<?php echo esc_attr($userdata->display_name) ?>"> | |
| 92 | + <?php echo (get_avatar($userdata->ID, 25, "mysteryman"))?> | |
| 93 | + </a> <?php | |
| 94 | + } | |
| 74 | 95 | } |
| 75 | 96 | } |
| 76 | 97 | } else { |
| 77 | - _e('None','taskbuilder'); | |
| 98 | + esc_html_e('None','taskbuilder'); | |
| 78 | 99 | } |
| 79 | 100 | if($i > 4){ |
| 80 | 101 | ?> |
| 81 | 102 | <a href="#" class="wppm_avatar"> |
| @@ -83,12 +104,12 @@ | ||
| 83 | 104 | </a> |
| 84 | 105 | <?php } ?> |
| 85 | 106 | </td> |
| 86 | 107 | <td> |
| 87 | - <?php echo (isset($task->start_date))? esc_html_e($task->start_date,'taskbuilder'):""?> | |
| 108 | + <?php echo (isset($task_start_date))? esc_html($task_start_date):""?> | |
| 88 | 109 | </td> |
| 89 | 110 | <td> |
| 90 | - <?php echo (isset($task->end_date))? esc_html_e($task->end_date,'taskbuilder'):""?> | |
| 111 | + <?php echo (isset($task_end_date))? esc_html($task_end_date):""?> | |
| 91 | 112 | </td> |
| 92 | 113 | </tr> |
| 93 | 114 | <?php } |
| 94 | 115 | } |
| @@ -96,8 +117,24 @@ | ||
| 96 | 117 | </tbody> |
| 97 | 118 | </table> |
| 98 | 119 | </div> |
| 99 | 120 | </form> |
| 121 | +<style> | |
| 122 | + #tbl_project_tasks tr:nth-child(even){ | |
| 123 | + background-color:<?php echo esc_attr($appearance_settings['list-item-even-background-color'])?>; | |
| 124 | + color:<?php echo esc_attr($appearance_settings['list-item-even-text-color'])?>; | |
| 125 | + } | |
| 126 | + #tbl_project_tasks tr:nth-child(odd){ | |
| 127 | + background-color:<?php echo esc_attr($appearance_settings['list-item-odd-background-color'])?>; | |
| 128 | + color:<?php echo esc_attr($appearance_settings['list-item-odd-text-color'])?>; | |
| 129 | + } | |
| 130 | + #tbl_project_tasks tr:hover{ | |
| 131 | + background-color:<?php echo esc_attr($appearance_settings['list-item-hover-background-color'])?>; | |
| 132 | + } | |
| 133 | + #tbl_project_tasks tr:hover td{ | |
| 134 | + color: <?php echo esc_attr($appearance_settings['list-item-hover-text-color'])?>; | |
| 135 | + } | |
| 136 | +</style> | |
| 100 | 137 | <script type="text/javascript"> |
| 101 | 138 | jQuery(document).ready(function() { |
| 102 | 139 | var table = jQuery('#tbl_project_tasks').DataTable({ |
| 103 | 140 | "aLengthMenu": [[4, 8, 12, -1], [4, 8, 12, "All"]], |
| @@ -112,9 +149,9 @@ | ||
| 112 | 149 | $body = ob_get_clean(); |
| 113 | 150 | ob_start(); |
| 114 | 151 | ?> |
| 115 | 152 | <div class="col-md-3" style="text-align: right;"> |
| 116 | - <button type="button" class="btn wppm_popup_close" onclick="wppm_modal_close();"><?php echo esc_html_e('Close','taskbuilder');?></button> | |
| 153 | + <button type="button" class="btn <?php echo (isset($project_id))?'wppm_popup_close':'wppm_task_popup_close'?>" onclick="<?php echo (isset($project_id))?'wppm_modal_close();':'wppm_task_modal_close();'?>"><?php echo esc_html_e('Close','taskbuilder');?></button> | |
| 117 | 154 | </div><?php |
| 118 | 155 | |
| 119 | 156 | $footer = ob_get_clean(); |
| 120 | 157 | |
| @@ -122,5 +159,5 @@ | ||
| 122 | 159 | 'body' => $body, |
| 123 | 160 | 'footer' => $footer |
| 124 | 161 | ); |
| 125 | 162 | |
| 126 | -echo json_encode($response); | |
| 163 | +echo wp_json_encode($response); | |