Changeset 1561404
- Timestamp:
- 12/24/2016 04:26:56 PM (9 years ago)
- Location:
- key4ce-osticket-bridge
- Files:
-
- 9 edited
-
branches/1.4/admin/db-settings.php (modified) (1 diff)
-
branches/1.4/admin/ost-postreplymail.php (modified) (4 diffs)
-
branches/1.4/admin/ost-ticketview.php (modified) (2 diffs)
-
tags/1.4.0/admin/db-settings.php (modified) (1 diff)
-
tags/1.4.0/admin/ost-postreplymail.php (modified) (4 diffs)
-
tags/1.4.0/admin/ost-ticketview.php (modified) (2 diffs)
-
trunk/admin/db-settings.php (modified) (1 diff)
-
trunk/admin/ost-postreplymail.php (modified) (4 diffs)
-
trunk/admin/ost-ticketview.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
key4ce-osticket-bridge/branches/1.4/admin/db-settings.php
r1557142 r1561404 396 396 $thread_entry.type as thread_type, 397 397 $thread_entry.body, 398 $thread_entry.title, 398 399 $thread_entry.poster 399 400 FROM $thread_table -
key4ce-osticket-bridge/branches/1.4/admin/ost-postreplymail.php
r1557711 r1561404 11 11 $thread_id = $ost_wpdb->get_var("SELECT id from $thread_table WHERE `object_id` =".$ticid); 12 12 } 13 $internal_subject=$_REQUEST['internal_subject'];14 13 $ticket_details=$ost_wpdb->get_row("SELECT $dept_table.dept_signature,$ost_email.name,$dept_table.dept_id,$dept_table.dept_name,$dept_table.email_id,$ost_email.email FROM $ticket_table 15 14 INNER JOIN $dept_table ON $dept_table.dept_id=$ticket_table.dept_id … … 56 55 57 56 $ticket_id=$_REQUEST['ticket_id']; 58 $thread_type="R";57 //$thread_type="R"; 59 58 //$poster=$current_user->user_login; 60 59 $poster=$_REQUEST['adname']; … … 62 61 if($thread_type=="N") 63 62 { 63 $internal_subject=$_REQUEST['internal_subject']; 64 64 $admin_response=@Format::stripslashes($_REQUEST['note']); ///from post to thread-table to variable to email 65 65 } … … 87 87 $flags= 65; //ost_config table id = 65 "show_assigned_tickets" is key 88 88 //$staff_id=0; 89 //echo "Thread==>>".$ost_wpdb->last_query; 90 $ost_wpdb->insert($thread_entry, array('pid' => $pid,'thread_id' =>$thread_id, 'staff_id' => $staff_id, 'user_id' => '0','type'=>$thread_type,'flags'=>$flags,'poster' => $poster,'body' => key4ce_wpetss_forum_text($admin_response),'format'=>'html', 'ip_address' => $ipaddress, 'created' => $date, 'updated'=>$date),array('%d','%d','%d','%d','%s','%d','%s', '%s','%s','%s','%s','%s')); //echo $ost_wpdb->last_query; 89 if($thread_type=="N") 90 { 91 $ost_wpdb->insert($thread_entry, array('pid' => $pid,'thread_id' =>$thread_id, 'staff_id' => $staff_id, 'user_id' => '0','type'=>$thread_type,'flags'=>$flags,'poster' =>$poster,'title' =>$internal_subject,'body' => key4ce_wpetss_forum_text($admin_response),'format'=>'html', 'ip_address' => $ipaddress, 'created' => $date, 'updated'=>$date),array('%d','%d','%d','%d','%s','%d','%s', '%s','%s','%s','%s','%s','%s')); 92 echo $ost_wpdb->last_query; 93 exit; 94 } 95 else 96 { 97 $ost_wpdb->insert($thread_entry, array('pid' => $pid,'thread_id' =>$thread_id, 'staff_id' => $staff_id, 'user_id' => '0','type'=>$thread_type,'flags'=>$flags,'poster' => $poster,'body' => key4ce_wpetss_forum_text($admin_response),'format'=>'html', 'ip_address' => $ipaddress, 'created' => $date, 'updated'=>$date),array('%d','%d','%d','%d','%s','%d','%s', '%s','%s','%s','%s','%s')); //echo $ost_wpdb->last_query; 98 } 99 91 100 //echo "Thread==>>".$ost_wpdb->last_query; 92 101 //exit; -
key4ce-osticket-bridge/branches/1.4/admin/ost-ticketview.php
r1557711 r1561404 281 281 ?> 282 282 </b> <?php echo __("posted", 'key4ce-osticket-bridge'); ?> <time datetime="<?php echo __formatDate($datetime_format, $thread_info->created); ?>" data-toggle="tooltip" title="" data-original-title="<?php echo __formatDate($datetime_format, $thread_info->created); ?>"><?php echo __formatDate($datetime_format, $thread_info->created); ?></time> 283 <span style="max-width:400px " class="faded title truncate"></span>283 <span style="max-width:400px;margin-left:15px;" class="faded title truncate"><?php echo $type=="N"?$thread_info->title:""; ?></span> 284 284 </div> 285 285 <div class="key4ce_thread-body-right no-pjax"> … … 453 453 $admin_reply_subject=$ticketinfo->subject; 454 454 ?> 455 <input type="hidden" name="staff_id" value="<?php echo getEmailToStaffID($current_user->user_email); ?>"/> 455 456 <input type="hidden" name="ussubject" value="<?php echo $admin_reply_subject; ?>"/> 456 457 <input type="hidden" name="ustopicid" value="<?php //echo $ticketinfo->topic_id; ?>"/> -
key4ce-osticket-bridge/tags/1.4.0/admin/db-settings.php
r1557142 r1561404 396 396 $thread_entry.type as thread_type, 397 397 $thread_entry.body, 398 $thread_entry.title, 398 399 $thread_entry.poster 399 400 FROM $thread_table -
key4ce-osticket-bridge/tags/1.4.0/admin/ost-postreplymail.php
r1557711 r1561404 11 11 $thread_id = $ost_wpdb->get_var("SELECT id from $thread_table WHERE `object_id` =".$ticid); 12 12 } 13 $internal_subject=$_REQUEST['internal_subject'];14 13 $ticket_details=$ost_wpdb->get_row("SELECT $dept_table.dept_signature,$ost_email.name,$dept_table.dept_id,$dept_table.dept_name,$dept_table.email_id,$ost_email.email FROM $ticket_table 15 14 INNER JOIN $dept_table ON $dept_table.dept_id=$ticket_table.dept_id … … 56 55 57 56 $ticket_id=$_REQUEST['ticket_id']; 58 $thread_type="R";57 //$thread_type="R"; 59 58 //$poster=$current_user->user_login; 60 59 $poster=$_REQUEST['adname']; … … 62 61 if($thread_type=="N") 63 62 { 63 $internal_subject=$_REQUEST['internal_subject']; 64 64 $admin_response=@Format::stripslashes($_REQUEST['note']); ///from post to thread-table to variable to email 65 65 } … … 87 87 $flags= 65; //ost_config table id = 65 "show_assigned_tickets" is key 88 88 //$staff_id=0; 89 //echo "Thread==>>".$ost_wpdb->last_query; 90 $ost_wpdb->insert($thread_entry, array('pid' => $pid,'thread_id' =>$thread_id, 'staff_id' => $staff_id, 'user_id' => '0','type'=>$thread_type,'flags'=>$flags,'poster' => $poster,'body' => key4ce_wpetss_forum_text($admin_response),'format'=>'html', 'ip_address' => $ipaddress, 'created' => $date, 'updated'=>$date),array('%d','%d','%d','%d','%s','%d','%s', '%s','%s','%s','%s','%s')); //echo $ost_wpdb->last_query; 89 if($thread_type=="N") 90 { 91 $ost_wpdb->insert($thread_entry, array('pid' => $pid,'thread_id' =>$thread_id, 'staff_id' => $staff_id, 'user_id' => '0','type'=>$thread_type,'flags'=>$flags,'poster' =>$poster,'title' =>$internal_subject,'body' => key4ce_wpetss_forum_text($admin_response),'format'=>'html', 'ip_address' => $ipaddress, 'created' => $date, 'updated'=>$date),array('%d','%d','%d','%d','%s','%d','%s', '%s','%s','%s','%s','%s','%s')); 92 echo $ost_wpdb->last_query; 93 exit; 94 } 95 else 96 { 97 $ost_wpdb->insert($thread_entry, array('pid' => $pid,'thread_id' =>$thread_id, 'staff_id' => $staff_id, 'user_id' => '0','type'=>$thread_type,'flags'=>$flags,'poster' => $poster,'body' => key4ce_wpetss_forum_text($admin_response),'format'=>'html', 'ip_address' => $ipaddress, 'created' => $date, 'updated'=>$date),array('%d','%d','%d','%d','%s','%d','%s', '%s','%s','%s','%s','%s')); //echo $ost_wpdb->last_query; 98 } 99 91 100 //echo "Thread==>>".$ost_wpdb->last_query; 92 101 //exit; -
key4ce-osticket-bridge/tags/1.4.0/admin/ost-ticketview.php
r1557711 r1561404 281 281 ?> 282 282 </b> <?php echo __("posted", 'key4ce-osticket-bridge'); ?> <time datetime="<?php echo __formatDate($datetime_format, $thread_info->created); ?>" data-toggle="tooltip" title="" data-original-title="<?php echo __formatDate($datetime_format, $thread_info->created); ?>"><?php echo __formatDate($datetime_format, $thread_info->created); ?></time> 283 <span style="max-width:400px " class="faded title truncate"></span>283 <span style="max-width:400px;margin-left:15px;" class="faded title truncate"><?php echo $type=="N"?$thread_info->title:""; ?></span> 284 284 </div> 285 285 <div class="key4ce_thread-body-right no-pjax"> … … 453 453 $admin_reply_subject=$ticketinfo->subject; 454 454 ?> 455 <input type="hidden" name="staff_id" value="<?php echo getEmailToStaffID($current_user->user_email); ?>"/> 455 456 <input type="hidden" name="ussubject" value="<?php echo $admin_reply_subject; ?>"/> 456 457 <input type="hidden" name="ustopicid" value="<?php //echo $ticketinfo->topic_id; ?>"/> -
key4ce-osticket-bridge/trunk/admin/db-settings.php
r1557142 r1561404 396 396 $thread_entry.type as thread_type, 397 397 $thread_entry.body, 398 $thread_entry.title, 398 399 $thread_entry.poster 399 400 FROM $thread_table -
key4ce-osticket-bridge/trunk/admin/ost-postreplymail.php
r1557711 r1561404 11 11 $thread_id = $ost_wpdb->get_var("SELECT id from $thread_table WHERE `object_id` =".$ticid); 12 12 } 13 $internal_subject=$_REQUEST['internal_subject'];14 13 $ticket_details=$ost_wpdb->get_row("SELECT $dept_table.dept_signature,$ost_email.name,$dept_table.dept_id,$dept_table.dept_name,$dept_table.email_id,$ost_email.email FROM $ticket_table 15 14 INNER JOIN $dept_table ON $dept_table.dept_id=$ticket_table.dept_id … … 56 55 57 56 $ticket_id=$_REQUEST['ticket_id']; 58 $thread_type="R";57 //$thread_type="R"; 59 58 //$poster=$current_user->user_login; 60 59 $poster=$_REQUEST['adname']; … … 62 61 if($thread_type=="N") 63 62 { 63 $internal_subject=$_REQUEST['internal_subject']; 64 64 $admin_response=@Format::stripslashes($_REQUEST['note']); ///from post to thread-table to variable to email 65 65 } … … 87 87 $flags= 65; //ost_config table id = 65 "show_assigned_tickets" is key 88 88 //$staff_id=0; 89 //echo "Thread==>>".$ost_wpdb->last_query; 90 $ost_wpdb->insert($thread_entry, array('pid' => $pid,'thread_id' =>$thread_id, 'staff_id' => $staff_id, 'user_id' => '0','type'=>$thread_type,'flags'=>$flags,'poster' => $poster,'body' => key4ce_wpetss_forum_text($admin_response),'format'=>'html', 'ip_address' => $ipaddress, 'created' => $date, 'updated'=>$date),array('%d','%d','%d','%d','%s','%d','%s', '%s','%s','%s','%s','%s')); //echo $ost_wpdb->last_query; 89 if($thread_type=="N") 90 { 91 $ost_wpdb->insert($thread_entry, array('pid' => $pid,'thread_id' =>$thread_id, 'staff_id' => $staff_id, 'user_id' => '0','type'=>$thread_type,'flags'=>$flags,'poster' =>$poster,'title' =>$internal_subject,'body' => key4ce_wpetss_forum_text($admin_response),'format'=>'html', 'ip_address' => $ipaddress, 'created' => $date, 'updated'=>$date),array('%d','%d','%d','%d','%s','%d','%s', '%s','%s','%s','%s','%s','%s')); 92 echo $ost_wpdb->last_query; 93 exit; 94 } 95 else 96 { 97 $ost_wpdb->insert($thread_entry, array('pid' => $pid,'thread_id' =>$thread_id, 'staff_id' => $staff_id, 'user_id' => '0','type'=>$thread_type,'flags'=>$flags,'poster' => $poster,'body' => key4ce_wpetss_forum_text($admin_response),'format'=>'html', 'ip_address' => $ipaddress, 'created' => $date, 'updated'=>$date),array('%d','%d','%d','%d','%s','%d','%s', '%s','%s','%s','%s','%s')); //echo $ost_wpdb->last_query; 98 } 99 91 100 //echo "Thread==>>".$ost_wpdb->last_query; 92 101 //exit; -
key4ce-osticket-bridge/trunk/admin/ost-ticketview.php
r1557711 r1561404 281 281 ?> 282 282 </b> <?php echo __("posted", 'key4ce-osticket-bridge'); ?> <time datetime="<?php echo __formatDate($datetime_format, $thread_info->created); ?>" data-toggle="tooltip" title="" data-original-title="<?php echo __formatDate($datetime_format, $thread_info->created); ?>"><?php echo __formatDate($datetime_format, $thread_info->created); ?></time> 283 <span style="max-width:400px " class="faded title truncate"></span>283 <span style="max-width:400px;margin-left:15px;" class="faded title truncate"><?php echo $type=="N"?$thread_info->title:""; ?></span> 284 284 </div> 285 285 <div class="key4ce_thread-body-right no-pjax"> … … 453 453 $admin_reply_subject=$ticketinfo->subject; 454 454 ?> 455 <input type="hidden" name="staff_id" value="<?php echo getEmailToStaffID($current_user->user_email); ?>"/> 455 456 <input type="hidden" name="ussubject" value="<?php echo $admin_reply_subject; ?>"/> 456 457 <input type="hidden" name="ustopicid" value="<?php //echo $ticketinfo->topic_id; ?>"/>
Note: See TracChangeset
for help on using the changeset viewer.