← All changes | includes/replace_task_macro.php +4 -21 5.0.3 → 3.0.6 View file →

		@@ -6,13 +6,10 @@
6	6	global $current_user, $wppmfunction,$wpdb;
7	7	$current_user_data = get_userdata($current_user->ID);
8	8	$task_id = intval(sanitize_text_field($task_id));
9	9	$wppm_task_data = $wppmfunction->get_task($task_id);
10		-$task_creator = $wppm_task_data['created_by'];
11		-$task_creator_data = get_userdata($task_creator);
12		-$task_creator_name = $task_creator_data->display_name;
13		-$orderby_sql = esc_sql(sanitize_sql_orderby( "id DESC" ));
14		-$wppm_task_comment = $wpdb->get_row("SELECT * FROM {$wpdb->prefix}wppm_task_comment where task_id='".esc_sql($task_id)."' ORDER BY $orderby_sql LIMIT 1;");
	10	+$orderby_sql = sanitize_sql_orderby( "id DESC" );
	11	+$wppm_task_comment = $wpdb->get_row("SELECT * FROM {$wpdb->prefix}wppm_task_comment where task_id='".$task_id."' ORDER BY $orderby_sql LIMIT 1;");
15	12	$wppm_project_data = $wppmfunction->get_project($wppm_task_data['project']);
16	13	$auth_id = sanitize_text_field($wppm_task_data['task_auth_code']);
17	14	$attachments = array();
18	15	if(!empty($wppm_task_comment)){
		@@ -20,10 +17,8 @@
20	17	}
21	18	preg_match_all("/{[^}]*}/" ,$str,$matches);
22	19	$matches = array_unique($matches[0]);
23	20	$flag =false;
24		-$page_setting = get_option( 'wppm-page-settings' );
25		-$view = $page_setting['task-url-page'];
26	21	foreach($matches as $match){
27	22	switch($match){
28	23	// Task ID
29	24	case '{task_id}':
		@@ -28,12 +23,8 @@
28	23	// Task ID
29	24	case '{task_id}':
30	25	$str = preg_replace('/{task_id}/', $task_id, $str);
31	26	break;
32		- // Task Creator Name
33		- case '{task_creator_name}':
34		- $str = preg_replace('/{task_creator_name}/', $task_creator_name, $str);
35		- break;
36	27	//Current User Name
37	28	case '{user_name}':
38	29	$str = preg_replace('/{user_name}/', sanitize_text_field($current_user_data->display_name), $str);
39	30	break;
		@@ -92,17 +83,13 @@
92	83	$str = preg_replace('/{last_comment_user_name}/', $this->get_last_comment_user_name($task_id), $str);
93	84	break;
94	85	//Project status
95	86	case '{project_status}';
96		- $str = preg_replace('/{project_status}/', $this->get_new_project_status_name(sanitize_text_field($wppm_project_data['status'])), $str);
	87	+ $str = preg_replace('/{project_status}/', $this->get_new_project_status_name((sanitize_text_field($wppm_project_data['status'])), $str));
97	88	break;
98	89	// Project Category
99	90	case '{project_category}';
100		- if(!empty($wppm_project_data['cat_id'])){
101		- $str = preg_replace('/{project_category}/', $this->get_project_category_name(sanitize_text_field($wppm_project_data['cat_id'])), $str);
102		- }else{
103		- $str = "";
104		- }
	91	+ $str = preg_replace('/{project_category}/', $this->get_project_category_name((sanitize_text_field($wppm_project_data['cat_id'])), $str));
105	92	break;
106	93	// Project Name
107	94	case '{project_name}':
108	95	$str = preg_replace('/{project_name}/', (sanitize_text_field($wppm_project_data['project_name'])), $str);
		@@ -127,12 +114,8 @@
127	114	//Last comment body
128	115	case '{comment_body}':
129	116	$flag= true;
130	117	$str = preg_replace('/{comment_body}/', $this->get_last_comment_body($task_id), $str);
131		- break;
132		- case '{task_url}':
133		- $task_url = '<a class="wppm_link" href="' . $this->get_task_url($task_id,$view) . '" target="_blank">' . $this->get_task_url($task_id,$view) . '</a>';
134		- $str = preg_replace('/{task_url}/', $task_url, $str);
135	118	break;
136	119
137	120	}
138	121	}