diff --git a/api/Application.class.php b/api/Application.class.php index 1b6e75b..08b8ced 100644 --- a/api/Application.class.php +++ b/api/Application.class.php @@ -383,7 +383,7 @@ class CerberusApplication extends DevblocksApplication { * * @return a unique ticket mask as a string */ - static function generateTicketMask($pattern = "LLL-NNNNN-NNN") { + static function generateTicketMask($pattern = "Y-M-D-NNNNN") { $letters = "ABCDEFGHIJKLMNPQRSTUVWXYZ"; $numbers = "123456789"; @@ -452,7 +452,11 @@ class CerberusApplication extends DevblocksApplication { $category_id = $t_or_c_id; } else { $team_id = $t_or_c_id; - $category_id = 0; + if($t_or_c=='a') { + $category_id = -1; + } else { + $category_id = 0; + } } return array($team_id, $category_id); @@ -658,6 +662,9 @@ class CerberusLicense { class CerberusSettings { const DEFAULT_REPLY_FROM = 'default_reply_from'; + const DEFAULT_TICKET_REPLY_STATUS = 'default_ticket_reply_status'; + const DEFAULT_TICKET_OPEN_STATUS = 'default_ticket_open_status'; + const DEFAULT_TICKET_SEND_STATUS = 'default_ticket_send_status'; const DEFAULT_REPLY_PERSONAL = 'default_reply_personal'; const DEFAULT_SIGNATURE = 'default_signature'; const DEFAULT_SIGNATURE_POS = 'default_signature_pos'; @@ -683,6 +690,9 @@ class CerberusSettings { private $settings = array( // defaults self::DEFAULT_REPLY_FROM => '', + self::DEFAULT_TICKET_REPLY_STATUS => 1, + self::DEFAULT_TICKET_OPEN_STATUS => 1, + self::DEFAULT_TICKET_SEND_STATUS => 1, self::DEFAULT_REPLY_PERSONAL => '', self::DEFAULT_SIGNATURE => '', self::DEFAULT_SIGNATURE_POS => 0, diff --git a/api/DAO.class.php b/api/DAO.class.php index e993650..325a2a9 100644 --- a/api/DAO.class.php +++ b/api/DAO.class.php @@ -400,7 +400,7 @@ class DAO_Worker extends C4_ORMHelper { $sql = "SELECT a.id, a.first_name, a.last_name, a.email, a.pass, a.title, a.is_superuser, a.is_disabled, a.last_activity_date, a.last_activity ". "FROM worker a ". ((!empty($ids) ? sprintf("WHERE a.id IN (%s) ",implode(',',$ids)) : " "). - "ORDER BY a.first_name, a.last_name " + "ORDER BY a.last_name, a.first_name " ); $rs = $db->Execute($sql) or die(__CLASS__ . '('.__LINE__.')'. ':' . $db->ErrorMsg()); /* @var $rs ADORecordSet */ @@ -4460,6 +4460,7 @@ class DAO_GroupSettings { const SETTING_CLOSE_REPLY = 'close_reply'; const SETTING_CLOSE_REPLY_ENABLED = 'close_reply_enabled'; const SETTING_INBOX_IS_ASSIGNABLE = 'inbox_is_assignable'; + const SETTING_TICKET_REPLY_STATUS = 'ticket_reply_status'; static function set($group_id, $key, $value) { $db = DevblocksPlatform::getDatabaseService(); @@ -5916,13 +5917,14 @@ class DAO_MailTemplate extends DevblocksORMHelper { const TEMPLATE_TYPE = 'template_type'; const OWNER_ID = 'owner_id'; const CONTENT = 'content'; - + const TEAM_ID = 'team_id'; + public static function create($fields) { $db = DevblocksPlatform::getDatabaseService(); $id = $db->GenID('generic_seq'); - $sql = sprintf("INSERT INTO %s (id,title,description,folder,template_type,owner_id,content) ". - "VALUES (%d,'','','',0,0,'')", + $sql = sprintf("INSERT INTO %s (id,title,description,folder,template_type,owner_id,content,team_id) ". + "VALUES (%d,'','','',0,0,'',0)", self::_TABLE, $id ); @@ -5993,7 +5995,7 @@ class DAO_MailTemplate extends DevblocksORMHelper { public function getWhere($where=null) { $db = DevblocksPlatform::getDatabaseService(); - $sql = sprintf("SELECT id,title,description,folder,template_type,owner_id,content ". + $sql = sprintf("SELECT id,title,description,folder,template_type,owner_id,content,team_id ". "FROM %s ". (!empty($where) ? ("WHERE $where ") : " "). " ORDER BY folder, title ", @@ -6032,6 +6034,7 @@ class DAO_MailTemplate extends DevblocksORMHelper { $object->template_type = intval($rs->fields['template_type']); $object->owner_id = intval($rs->fields['owner_id']); $object->content = $rs->fields['content']; + $object->team_id = intval($rs->fields['team_id']); $objects[$object->id] = $object; $rs->MoveNext(); } diff --git a/api/Extension.class.php b/api/Extension.class.php index 7db5889..18001d7 100644 --- a/api/Extension.class.php +++ b/api/Extension.class.php @@ -292,6 +292,43 @@ abstract class Extension_LoginAuthenticator extends DevblocksExtension { } }; +abstract class Extension_EmailSignatureTemplate extends DevblocksExtension { + function __construct($manifest) { + $this->DevblocksExtension($manifest,1); + } + + function run($signature) {} + function render($list) {} +}; + +abstract class Extension_AutoReplyNew extends DevblocksExtension { + function __construct($manifest) { + $this->DevblocksExtension($manifest,1); + } + + function run(CerberusTicket $ticket, $properties) {} + function render($list) {} +}; + + +abstract class Extension_AutoReplyClose extends DevblocksExtension { + function __construct($manifest) { + $this->DevblocksExtension($manifest,1); + } + + function run(CerberusTicket $ticket, $properties) {} + function render($list) {} +}; + +abstract class Extension_EmailTemplate extends DevblocksExtension { + function __construct($manifest) { + $this->DevblocksExtension($manifest,1); + } + + function run($message_id, $template) {} + function render($type, $list) {} +}; + // [TODO] Convert to a controller extension abstract class CerberusCronPageExtension extends DevblocksExtension { const PARAM_ENABLED = 'enabled'; diff --git a/api/Model.class.php b/api/Model.class.php index 7ea788c..6b123bc 100644 --- a/api/Model.class.php +++ b/api/Model.class.php @@ -3796,7 +3796,7 @@ class CerberusWorker { return true; } - function getName($reverse=false) { + function getName($reverse=true) { if(!$reverse) { $name = sprintf("%s%s%s", $this->first_name, @@ -4069,48 +4069,17 @@ class Model_MailTemplate { public function getRenderedContent($message_id) { $raw = $this->content; - $replace = array(); - $with = array(); - - $replace[] = '#timestamp#'; - $with[] = date('r'); - - if(!empty($message_id)) { - $message = DAO_Ticket::getMessage($message_id); - $ticket = DAO_Ticket::getTicket($message->ticket_id); - $sender = DAO_Address::get($message->address_id); - $sender_org = DAO_ContactOrg::get($sender->contact_org_id); - - $replace[] = '#sender_first_name#'; - $replace[] = '#sender_last_name#'; - $replace[] = '#sender_org#'; - - $with[] = $sender->first_name; - $with[] = $sender->last_name; - $with[] = (!empty($sender_org)?$sender_org->name:""); - - $replace[] = '#ticket_id#'; - $replace[] = '#ticket_mask#'; - $replace[] = '#ticket_subject#'; - - $with[] = $ticket->id; - $with[] = $ticket->mask; - $with[] = $ticket->subject; - } - - if(null != ($active_worker = CerberusApplication::getActiveWorker())) { - $worker = DAO_Worker::getAgent($active_worker->id); // most recent info (not session) - - $replace[] = '#worker_first_name#'; - $replace[] = '#worker_last_name#'; - $replace[] = '#worker_title#'; - - $with[] = $worker->first_name; - $with[] = $worker->last_name; - $with[] = $worker->title; - } - - return str_replace($replace, $with, $raw); + $processEmailTemplate = DevblocksPlatform::getExtensions('cerberusweb.email.template', true); + if(!empty($processEmailTemplate)) { + foreach($processEmailTemplate as $run_template) { /* Run the run loop and update properties */ + try { + $run_template->run($message_id, &$raw); + } catch(Exception $e) { + // print_r($e); + } + } + } + return $raw; } }; diff --git a/api/app/Parser.php b/api/app/Parser.php index 936c7b0..e8cb47c 100644 --- a/api/app/Parser.php +++ b/api/app/Parser.php @@ -771,17 +771,27 @@ class CerberusParser { && !empty($autoreply) && $enumSpamTraining != CerberusTicketSpamTraining::SPAM ) { - CerberusMail::sendTicketMessage(array( - 'ticket_id' => $id, - 'message_id' => $email_id, - 'content' => str_replace( - array('#ticket_id#','#mask#','#subject#','#timestamp#', '#sender#','#sender_first#','#orig_body#'), - array($id, $sMask, $sSubject, date('r'), $fromAddressInst->email, $fromAddressInst->first_name, ltrim($message->body)), - $autoreply - ), - 'is_autoreply' => true, - 'dont_keep_copy' => true - )); + $properties = array( + 'ticket_id' => $id, + 'message_id' => $email_id, + 'content' => $autoreply, + 'is_autoreply' => true, + 'dont_keep_copy' => true, + 'send_autoreply' => true + ); + $ticket = DAO_Ticket::getTicket($id); + $processAutoReplyNew = DevblocksPlatform::getExtensions('cerberusweb.auto_reply.new', true); + if(!empty($processAutoReplyNew)) { + foreach($processAutoReplyNew as $run_filter) { /* Run the run loop and update properties */ + try { + $run_filter->run($ticket, &$properties); + } catch(Exception $e) { + // print_r($e); + } + } + } + if ((isset($properties['send_autoreply'])) && ($properties['send_autoreply']) == true) + CerberusMail::sendTicketMessage($properties); } } // end bIsNew diff --git a/framework.config.php b/framework.config.php deleted file mode 100644 index 313c351..0000000 --- a/framework.config.php +++ /dev/null @@ -1,31 +0,0 @@ -db_label|capitalize} {else} - {$change_field}  + {$translate->_($result.l_change_field)}  {/if} {elseif $column=="l_change_value"} diff --git a/plugins/cerberusweb.core/api/cron.classes.php b/plugins/cerberusweb.core/api/cron.classes.php index de4e44c..def727e 100644 --- a/plugins/cerberusweb.core/api/cron.classes.php +++ b/plugins/cerberusweb.core/api/cron.classes.php @@ -135,7 +135,9 @@ class ParseCron extends CerberusCronPageExtension { $logger->info("[Parser] Parsed! (".sprintf("%d",($time*1000))." ms) " . (!empty($ticket_id) ? ("(Ticket ID: ".$ticket_id.")") : ("(Local Delivery Rejected.)"))); - @unlink($full_filename); + If ($ticket_id != NULL) { + @unlink($full_filename); + } mailparse_msg_free($mime); // flush(); @@ -1113,6 +1115,7 @@ class Pop3Cron extends CerberusCronPageExtension { $fp = fopen($filename,'w'); if($fp) { + fwrite($fp,"Downloaded-From: $account->nickname\r\n"); fwrite($fp,$headers,strlen($headers)); fwrite($fp,"\r\n\r\n"); fwrite($fp,$body,strlen($body)); diff --git a/plugins/cerberusweb.core/api/listeners.classes.php b/plugins/cerberusweb.core/api/listeners.classes.php index 5f9039e..11bbacb 100644 --- a/plugins/cerberusweb.core/api/listeners.classes.php +++ b/plugins/cerberusweb.core/api/listeners.classes.php @@ -498,6 +498,8 @@ class ChCoreEventListener extends DevblocksEventListenerExtension { $tickets = DAO_Ticket::getTickets($ticket_ids); foreach($tickets as $ticket) { /* @var $ticket CerberusTicket */ + $properties = array(); + if(!isset($group_settings[$ticket->team_id][DAO_GroupSettings::SETTING_CLOSE_REPLY_ENABLED])) continue; if(1 == $ticket->is_deleted) @@ -505,30 +507,26 @@ class ChCoreEventListener extends DevblocksEventListenerExtension { if($group_settings[$ticket->team_id][DAO_GroupSettings::SETTING_CLOSE_REPLY_ENABLED] && !empty($group_settings[$ticket->team_id][DAO_GroupSettings::SETTING_CLOSE_REPLY])) { - if(null != ($msg_first = DAO_Ticket::getMessage($ticket->first_message_id))) { - // First sender - $ticket_sender = ''; - $ticket_sender_first = ''; - if(null != ($sender_first = DAO_Address::get($msg_first->address_id))) { - $ticket_sender = $sender_first->email; - $ticket_sender_first = $sender_first->first_name; - } - - // First body - $ticket_body = $msg_first->getContent(); - } - - CerberusMail::sendTicketMessage(array( - 'ticket_id' => $ticket->id, - 'message_id' => $ticket->first_message_id, - 'content' => str_replace( - array('#ticket_id#', '#mask#','#subject#','#timestamp#','#sender#','#sender_first#','#orig_body#'), - array($ticket->id, $ticket->mask, $ticket->subject, date('r'), $ticket_sender, $ticket_sender_first, ltrim($ticket_body)), - $group_settings[$ticket->team_id][DAO_GroupSettings::SETTING_CLOSE_REPLY] - ), - 'is_autoreply' => false, - 'dont_keep_copy' => true - )); + $properties = array( + 'ticket_id' => $ticket->id, + 'message_id' => $ticket->first_message_id, + 'content' => $group_settings[$ticket->team_id][DAO_GroupSettings::SETTING_CLOSE_REPLY], + 'is_autoreply' => false, + 'dont_keep_copy' => true, + 'send_autoreply' => true + ); + $processAutoReplyClose = DevblocksPlatform::getExtensions('cerberusweb.auto_reply.close', true); + if(!empty($processAutoReplyClose)) { + foreach($processAutoReplyClose as $run_filter) { /* Run the run loop and update properties */ + try { + $run_filter->run($ticket, &$properties); + } catch(Exception $e) { + // print_r($e); + } + } + } + if ((isset($properties['send_autoreply'])) && ($properties['send_autoreply']) == true) + CerberusMail::sendTicketMessage($properties); } } } diff --git a/plugins/cerberusweb.core/api/uri/config.php b/plugins/cerberusweb.core/api/uri/config.php index a8eb6e4..f2d5f27 100644 --- a/plugins/cerberusweb.core/api/uri/config.php +++ b/plugins/cerberusweb.core/api/uri/config.php @@ -596,9 +596,31 @@ class ChConfigurationPage extends CerberusPageExtension { $smtp_enc = $settings->get(CerberusSettings::SMTP_ENCRYPTION_TYPE,'None'); $smtp_max_sends = $settings->get(CerberusSettings::SMTP_MAX_SENDS,'20'); + $default_ticket_reply_status = $settings->get(CerberusSettings::DEFAULT_TICKET_REPLY_STATUS,1); + $tpl->assign('default_ticket_reply_status', $default_ticket_reply_status); + + $default_ticket_open_status = $settings->get(CerberusSettings::DEFAULT_TICKET_OPEN_STATUS,1); + $tpl->assign('default_ticket_open_status', $default_ticket_open_status); + + $default_ticket_send_status = $settings->get(CerberusSettings::DEFAULT_TICKET_SEND_STATUS,1); + $tpl->assign('default_ticket_send_status', $default_ticket_send_status); + $pop3_accounts = DAO_Mail::getPop3Accounts(); $tpl->assign('pop3_accounts', $pop3_accounts); + $sig_token = array('-- choose --'); + $processEmailSignatureTemplate = DevblocksPlatform::getExtensions('cerberusweb.email_signature.template', true); + if(!empty($processEmailSignatureTemplate)) { + foreach($processEmailSignatureTemplate as $render_template) { /* Run the render loop and update properties */ + try { + $render_template->render(&$sig_token); + } catch(Exception $e) { + // print_r($e); + } + } + } + $tpl->assign('sig_token', $sig_token); + $tpl->display('file:' . $this->_TPL_PATH . 'configuration/tabs/mail/index.tpl'); } @@ -1657,7 +1679,7 @@ class ChConfigurationPage extends CerberusPageExtension { DevblocksPlatform::setHttpResponse(new DevblocksHttpResponse(array('config','mail'))); } - // Form Submit + // Form Submit function saveOutgoingMailSettingsAction() { $translate = DevblocksPlatform::getTranslationService(); $worker = CerberusApplication::getActiveWorker(); @@ -1692,8 +1714,15 @@ class ChConfigurationPage extends CerberusPageExtension { @$smtp_auth_pass = ''; } + @$default_ticket_reply_status = DevblocksPlatform::importGPC($_REQUEST['default_ticket_reply_status'],'integer',1); + @$default_ticket_open_status = DevblocksPlatform::importGPC($_REQUEST['default_ticket_open_status'],'integer',1); + @$default_ticket_send_status = DevblocksPlatform::importGPC($_REQUEST['default_ticket_send_status'],'integer',1); + $settings = CerberusSettings::getInstance(); $settings->set(CerberusSettings::DEFAULT_REPLY_FROM, $default_reply_address); + $settings->set(CerberusSettings::DEFAULT_TICKET_REPLY_STATUS, $default_ticket_reply_status); + $settings->set(CerberusSettings::DEFAULT_TICKET_OPEN_STATUS, $default_ticket_open_status); + $settings->set(CerberusSettings::DEFAULT_TICKET_SEND_STATUS, $default_ticket_send_status); $settings->set(CerberusSettings::DEFAULT_REPLY_PERSONAL, $default_reply_personal); $settings->set(CerberusSettings::DEFAULT_SIGNATURE, $default_signature); $settings->set(CerberusSettings::DEFAULT_SIGNATURE_POS, $default_signature_pos); diff --git a/plugins/cerberusweb.core/api/uri/display.php b/plugins/cerberusweb.core/api/uri/display.php index e116256..559af2c 100644 --- a/plugins/cerberusweb.core/api/uri/display.php +++ b/plugins/cerberusweb.core/api/uri/display.php @@ -77,7 +77,7 @@ class ChDisplayPage extends CerberusPageExtension { } $tpl->assign('ticket', $ticket); - + // TicketToolbarItem Extensions $ticketToolbarItems = DevblocksPlatform::getExtensions('cerberusweb.ticket.toolbaritem', true); if(!empty($ticketToolbarItems)) @@ -158,6 +158,26 @@ class ChDisplayPage extends CerberusPageExtension { )) ); + if (class_exists('Extension_TimeTrackingSource',true)): + // Adds total time worked per ticket to the token list. + $db = DevblocksPlatform::getDatabaseService(); + + $sql = "SELECT sum(tte.time_actual_mins) mins "; + $sql .= "FROM timetracking_entry tte "; + $sql .= sprintf("WHERE tte.source_id = %d ", $ticket->id); + $sql .= "AND tte.source_extension_id = 'timetracking.source.ticket' "; + $sql .= "GROUP BY tte.source_id "; + + $rs = $db->Execute($sql); + + if(is_a($rs,'ADORecordSet')) { + $total_time_all = intval($rs->fields['mins']); + } else { + $total_time_all = 0; + } + endif; + + $tpl->assign('total_time_all', $total_time_all); $tpl->display('file:' . $this->_TPL_PATH . 'display/index.tpl'); } @@ -583,13 +603,19 @@ class ChDisplayPage extends CerberusPageExtension { $signature = $settings->get(CerberusSettings::DEFAULT_SIGNATURE); } - $tpl->assign('signature', str_replace( - array('#first_name#','#last_name#','#title#'), - array($worker->first_name,$worker->last_name,$worker->title), - $signature - )); + $processEmailSignatureTemplate = DevblocksPlatform::getExtensions('cerberusweb.email_signature.template', true); + if(!empty($processEmailSignatureTemplate)) { + foreach($processEmailSignatureTemplate as $run_template) { /* Run the run loop and update properties */ + try { + $run_template->run(&$signature); + } catch(Exception $e) { + // print_r($e); + } + } + } + $tpl->assign('signature', $signature); - $signature_pos = $settings->get(CerberusSettings::DEFAULT_SIGNATURE_POS,0); + $signature_pos = $settings->get(CerberusSettings::DEFAULT_SIGNATURE_POS,0); $tpl->assign('signature_pos', $signature_pos); } @@ -601,6 +627,14 @@ class ChDisplayPage extends CerberusPageExtension { )); $tpl->assign('kb_topics', $kb_topics); + $ticket_reply_status = DAO_GroupSettings::get($group_id,DAO_GroupSettings::SETTING_TICKET_REPLY_STATUS,255); + if(255==$ticket_reply_status) { + $reply_status = $settings->get(CerberusSettings::DEFAULT_TICKET_REPLY_STATUS,1); + } else { + $reply_status = $ticket_reply_status; + } + $tpl->assign('reply_status', $reply_status); + $tpl->cache_lifetime = "0"; $tpl->display('file:' . $this->_TPL_PATH . 'display/rpc/reply.tpl'); } @@ -1196,6 +1230,8 @@ class ChDisplayPage extends CerberusPageExtension { SearchFields_Task::SOURCE_EXTENSION, SearchFields_Task::DUE_DATE, SearchFields_Task::WORKER_ID, + SearchFields_Task::IS_COMPLETED, + SearchFields_Task::COMPLETED_DATE, ); $view = C4_AbstractViewLoader::getView('ticket_tasks', $defaults); @@ -1212,6 +1248,7 @@ class ChDisplayPage extends CerberusPageExtension { // Ajax function showTemplatesPanelAction() { + @$active_worker = CerberusApplication::getActiveWorker(); @$txt_name = DevblocksPlatform::importGPC($_REQUEST['txt_name'],'string',''); @$reply_id = DevblocksPlatform::importGPC($_REQUEST['reply_id'],'integer'); @$type = DevblocksPlatform::importGPC($_REQUEST['type'],'integer',0); @@ -1226,22 +1263,33 @@ class ChDisplayPage extends CerberusPageExtension { $folders = DAO_MailTemplate::getFolders($type); $tpl->assign('folders', $folders); - $where = null; + if (count($membership = $active_worker->getMemberships()) > 0) { + foreach ($membership as $mem1) { $group_list[] = $mem1->team_id; } unset($mem1); + } + $group_list_text = implode(',',$group_list); + + $where = null; if(empty($folder)) { - $where = sprintf("%s = %d", + $where = sprintf("%s = %d AND %s IN (%s,0) ", DAO_MailTemplate::TEMPLATE_TYPE, - $type + $type, + DAO_MailTemplate::TEAM_ID, + $group_list_text ); } $templates = DAO_MailTemplate::getWhere($where); $tpl->assign('templates', $templates); + @$allowed_group_list = $active_worker->getMemberships(); + $tpl->assign('allowed_group_list', $allowed_group_list); + $tpl->display('file:' . $this->_TPL_PATH . 'display/rpc/email_templates/templates_panel.tpl'); } // Ajax function showTemplateEditPanelAction() { + @$active_worker = CerberusApplication::getActiveWorker(); @$id = DevblocksPlatform::importGPC($_REQUEST['id'],'integer'); // @$txt_name = DevblocksPlatform::importGPC($_REQUEST['txt_name'],'string',''); @$reply_id = DevblocksPlatform::importGPC($_REQUEST['reply_id'],'integer'); @@ -1254,11 +1302,30 @@ class ChDisplayPage extends CerberusPageExtension { // $tpl->assign('txt_name', $txt_name); $tpl->assign('type', $type); - $folders = DAO_MailTemplate::getFolders($type); + $groups = DAO_Group::getAll(); + $tpl->assign('groups', $groups); + + @$allowed_group_list = $active_worker->getMemberships(); + $tpl->assign('allowed_group_list', $allowed_group_list); + + $folders = DAO_MailTemplate::getFolders($type); $tpl->assign('folders', $folders); $template = DAO_MailTemplate::get($id); $tpl->assign('template', $template); + + $EmailTemplateTokens = array('-- choose --'); + $processEmailTemplate = DevblocksPlatform::getExtensions('cerberusweb.email.template', true); + if(!empty($processEmailTemplate)) { + foreach($processEmailTemplate as $render_template) { /* Run the render loop and update properties */ + try { + $render_template->render($type, &$EmailTemplateTokens); + } catch(Exception $e) { + // print_r($e); + } + } + } + $tpl->assign('EmailTemplateTokens', $EmailTemplateTokens); $tpl->display('file:' . $this->_TPL_PATH . 'display/rpc/email_templates/template_edit_panel.tpl'); } @@ -1271,6 +1338,7 @@ class ChDisplayPage extends CerberusPageExtension { @$folder = DevblocksPlatform::importGPC($_REQUEST['folder'],'string',''); @$folder_new = DevblocksPlatform::importGPC($_REQUEST['folder_new'],'string',''); @$content = DevblocksPlatform::importGPC($_REQUEST['template'],'string',''); + @$group_limit = DevblocksPlatform::importGPC($_REQUEST['group_id'],'integer',0); @$type = DevblocksPlatform::importGPC($_REQUEST['type'],'integer',0); @$delete = DevblocksPlatform::importGPC($_REQUEST['do_delete'],'integer',0); @@ -1284,6 +1352,7 @@ class ChDisplayPage extends CerberusPageExtension { DAO_MailTemplate::CONTENT => $content, DAO_MailTemplate::TEMPLATE_TYPE => $type, DAO_MailTemplate::OWNER_ID => $worker->id, + DAO_MailTemplate::TEAM_ID => $group_limit, ); if(empty($id)) { // new diff --git a/plugins/cerberusweb.core/api/uri/groups.php b/plugins/cerberusweb.core/api/uri/groups.php index 7db9274..e5dfca8 100644 --- a/plugins/cerberusweb.core/api/uri/groups.php +++ b/plugins/cerberusweb.core/api/uri/groups.php @@ -26,7 +26,7 @@ class ChGroupsPage extends CerberusPageExtension { $tpl = DevblocksPlatform::getTemplateService(); $tpl->cache_lifetime = "0"; $tpl->assign('path', $this->_TPL_PATH); - + $active_worker = CerberusApplication::getActiveWorker(); $response = DevblocksPlatform::getHttpResponse(); @@ -70,17 +70,57 @@ class ChGroupsPage extends CerberusPageExtension { $group = DAO_Group::getTeam($group_id); $tpl->assign('team', $group); } - + + $sig_token = array('-- choose --'); + $processEmailSignatureTemplate = DevblocksPlatform::getExtensions('cerberusweb.email_signature.template', true); + if(!empty($processEmailSignatureTemplate)) { + foreach($processEmailSignatureTemplate as $render_template) { /* Run the render loop and update properties */ + try { + $render_template->render(&$sig_token); + } catch(Exception $e) { + // print_r($e); + } + } + } + $tpl->assign('sig_token', $sig_token); + + $autoreply_token = array('-- choose --'); + $processAutoReplyNew = DevblocksPlatform::getExtensions('cerberusweb.auto_reply.new', true); + if(!empty($processAutoReplyNew)) { + foreach($processAutoReplyNew as $render_template) { /* Run the render loop and update properties */ + try { + $render_template->render(&$autoreply_token); + } catch(Exception $e) { + // print_r($e); + } + } + } + $tpl->assign('autoreply_token', $autoreply_token); + + $closereply_token = array('-- choose --'); + $processAutoReplyClose = DevblocksPlatform::getExtensions('cerberusweb.auto_reply.close', true); + if(!empty($processAutoReplyClose)) { + foreach($processAutoReplyClose as $render_template) { /* Run the render loop and update properties */ + try { + $render_template->render(&$closereply_token); + } catch(Exception $e) { + // print_r($e); + } + } + } + $tpl->assign('closereply_token', $closereply_token); + $team_categories = DAO_Bucket::getByTeam($group_id); $tpl->assign('categories', $team_categories); - + $group_settings = DAO_GroupSettings::getSettings($group_id); $tpl->assign('group_settings', $group_settings); - @$tpl->assign('group_spam_threshold', $group_settings[DAO_GroupSettings::SETTING_SPAM_THRESHOLD]); @$tpl->assign('group_spam_action', $group_settings[DAO_GroupSettings::SETTING_SPAM_ACTION]); @$tpl->assign('group_spam_action_param', $group_settings[DAO_GroupSettings::SETTING_SPAM_ACTION_PARAM]); - + $ticket_reply_status = DAO_GroupSettings::get($group_id,DAO_GroupSettings::SETTING_TICKET_REPLY_STATUS,255); + @$tpl->assign('ticket_reply_status', $ticket_reply_status); + $tpl->display('file:' . $tpl_path . 'groups/manage/index.tpl'); } @@ -534,6 +574,7 @@ class ChGroupsPage extends CerberusPageExtension { @$spam_threshold = DevblocksPlatform::importGPC($_REQUEST['spam_threshold'],'integer',80); @$spam_action = DevblocksPlatform::importGPC($_REQUEST['spam_action'],'integer',0); @$spam_moveto = DevblocksPlatform::importGPC($_REQUEST['spam_action_moveto'],'integer',0); + @$ticket_reply_status = DevblocksPlatform::importGPC($_REQUEST['ticket_reply_status'],'integer',255); // Validate sender address if(!$validator_email->isValid($sender_address)) { @@ -553,6 +594,7 @@ class ChGroupsPage extends CerberusPageExtension { DAO_GroupSettings::set($team_id, DAO_GroupSettings::SETTING_REPLY_PERSONAL, $sender_personal); DAO_GroupSettings::set($team_id, DAO_GroupSettings::SETTING_REPLY_PERSONAL_WITH_WORKER, $sender_personal_with_worker); DAO_GroupSettings::set($team_id, DAO_GroupSettings::SETTING_SUBJECT_HAS_MASK, $subject_has_mask); + DAO_GroupSettings::set($team_id, DAO_GroupSettings::SETTING_TICKET_REPLY_STATUS, $ticket_reply_status); DAO_GroupSettings::set($team_id, DAO_GroupSettings::SETTING_SUBJECT_PREFIX, $subject_prefix); DAO_GroupSettings::set($team_id, DAO_GroupSettings::SETTING_SPAM_THRESHOLD, $spam_threshold); DAO_GroupSettings::set($team_id, DAO_GroupSettings::SETTING_SPAM_ACTION, $spam_action); diff --git a/plugins/cerberusweb.core/api/uri/tickets.php b/plugins/cerberusweb.core/api/uri/tickets.php index 8a363ff..f3a22d2 100644 --- a/plugins/cerberusweb.core/api/uri/tickets.php +++ b/plugins/cerberusweb.core/api/uri/tickets.php @@ -31,6 +31,7 @@ class ChTicketsPage extends CerberusPageExtension { $tpl = DevblocksPlatform::getTemplateService(); $tpl->assign('path', $this->_TPL_PATH); + $settings = CerberusSettings::getInstance(); $visit = CerberusApplication::getVisit(); $active_worker = $visit->getWorker(); @@ -78,6 +79,24 @@ class ChTicketsPage extends CerberusPageExtension { $visit->set('compose.last_ticket',null); // clear } + // If failed to send because there was no to field. + if($visit->exists('compose.no_to_in_ticket')) { + $no_to_in_ticket = $visit->get('compose.no_to_in_ticket'); + $tpl->assign('no_to_in_ticket', $no_to_in_ticket); + $visit->set('compose.no_to_in_ticket',null); // clear + } + + $default_ticket_send_status = $settings->get(CerberusSettings::DEFAULT_TICKET_SEND_STATUS,1); + $tpl->assign('default_ticket_send_status', $default_ticket_send_status); + + // Groups (for custom fields) + $groups = DAO_Group::getAll(); + $tpl->assign('groups', $groups); + + // Custom fields + $fields = DAO_CustomField::getBySource(ChCustomFieldSource_Ticket::ID); + $tpl->assign('ticket_fields', $fields); + $tpl->display('file:' . $this->_TPL_PATH . 'tickets/compose/index.tpl'); break; @@ -115,7 +134,25 @@ class ChTicketsPage extends CerberusPageExtension { $tpl->assign('last_ticket_mask', $ticket_mask); $visit->set('compose.last_ticket',null); // clear } + + $default_ticket_open_status = $settings->get(CerberusSettings::DEFAULT_TICKET_OPEN_STATUS,1); + $tpl->assign('default_ticket_open_status', $default_ticket_open_status); + // If failed to send because there was no to field. + if($visit->exists('compose.no_to_in_ticket')) { + $no_to_in_ticket = $visit->get('compose.no_to_in_ticket'); + $tpl->assign('no_to_in_ticket', $no_to_in_ticket); + $visit->set('compose.no_to_in_ticket',null); // clear + } + + // Groups (for custom fields) + $groups = DAO_Group::getAll(); + $tpl->assign('groups', $groups); + + // Custom fields + $fields = DAO_CustomField::getBySource(ChCustomFieldSource_Ticket::ID); + $tpl->assign('ticket_fields', $fields); + $tpl->display('file:' . $this->_TPL_PATH . 'tickets/create/index.tpl'); break; @@ -300,12 +337,14 @@ class ChTicketsPage extends CerberusPageExtension { ); // ====== Who's Online - $whos_online = DAO_Worker::getAllOnline(); - if(!empty($whos_online)) { - $tpl->assign('whos_online', $whos_online); - $tpl->assign('whos_online_count', count($whos_online)); + @$active_worker = CerberusApplication::getActiveWorker(); + if($active_worker->hasPriv('core.ticket.view.whos_online')) { + $whos_online = DAO_Worker::getAllOnline(); + if(!empty($whos_online)) { + $tpl->assign('whos_online', $whos_online); + $tpl->assign('whos_online_count', count($whos_online)); + } } - $tpl->display('file:' . $this->_TPL_PATH . 'tickets/workflow/index.tpl'); } @@ -481,12 +520,14 @@ class ChTicketsPage extends CerberusPageExtension { ); // ====== Who's Online - $whos_online = DAO_Worker::getAllOnline(); - if(!empty($whos_online)) { - $tpl->assign('whos_online', $whos_online); - $tpl->assign('whos_online_count', count($whos_online)); + @$active_worker = CerberusApplication::getActiveWorker(); + if($active_worker->hasPriv('core.ticket.view.whos_online')) { + $whos_online = DAO_Worker::getAllOnline(); + if(!empty($whos_online)) { + $tpl->assign('whos_online', $whos_online); + $tpl->assign('whos_online_count', count($whos_online)); + } } - $tpl->display('file:' . $this->_TPL_PATH . 'tickets/overview/index.tpl'); } @@ -829,25 +870,23 @@ class ChTicketsPage extends CerberusPageExtension { $settings = CerberusSettings::getInstance(); $group = DAO_Group::getTeam($group_id); - $active_worker = CerberusApplication::getActiveWorker(); - $worker = DAO_Worker::getAgent($active_worker->id); // Use the most recent info (not session) $sig = $settings->get(CerberusSettings::DEFAULT_SIGNATURE,''); if(!empty($group->signature)) { $sig = $group->signature; } - /* - * [TODO] This is the 3rd place this replace happens, we really need - * to move the signature translation into something like CerberusApplication - */ - echo sprintf("\r\n%s\r\n", - str_replace( - array('#first_name#','#last_name#','#title#'), - array($worker->first_name,$worker->last_name,$worker->title), - $sig - ) - ); + $processEmailSignatureTemplate = DevblocksPlatform::getExtensions('cerberusweb.email_signature.template', true); + if(!empty($processEmailSignatureTemplate)) { + foreach($processEmailSignatureTemplate as $run_template) { /* Run the run loop and update properties */ + try { + $run_template->run(&$sig); + } catch(Exception $e) { + // print_r($e); + } + } + } + echo sprintf("\r\n%s\r\n", $sig); } // Ajax @@ -1000,6 +1039,8 @@ class ChTicketsPage extends CerberusPageExtension { } if(empty($to)) { + $visit = CerberusApplication::getVisit(); /* @var CerberusVisit $visit */ + $visit->set('compose.no_to_in_ticket', TRUE); DevblocksPlatform::redirect(new DevblocksHttpResponse(array('tickets','compose'))); return; } @@ -1020,6 +1061,10 @@ class ChTicketsPage extends CerberusPageExtension { ); $ticket_id = CerberusMail::compose($properties); + + // Custom field saves + @$field_ids = DevblocksPlatform::importGPC($_POST['field_ids'], 'array', array()); + DAO_CustomFieldValue::handleFormPost(ChCustomFieldSource_Ticket::ID, $ticket_id, $field_ids); $ticket = DAO_Ticket::getTicket($ticket_id); @@ -1065,6 +1110,9 @@ class ChTicketsPage extends CerberusPageExtension { $fromList = imap_rfc822_parse_adrlist(rtrim($reqs,', '),''); if(empty($fromList) || !is_array($fromList)) { + $visit = CerberusApplication::getVisit(); /* @var CerberusVisit $visit */ + $visit->set('compose.no_to_in_ticket', TRUE); + DevblocksPlatform::redirect(new DevblocksHttpResponse(array('tickets','create'))); return; // abort with message } $from = array_shift($fromList); @@ -1143,6 +1191,10 @@ class ChTicketsPage extends CerberusPageExtension { $requester_addy = DAO_Address::lookupAddress($requester->mailbox . '@' . $host, true); DAO_Ticket::createRequester($requester_addy->id, $ticket_id); } + + // Custom field saves + @$field_ids = DevblocksPlatform::importGPC($_POST['field_ids'], 'array', array()); + DAO_CustomFieldValue::handleFormPost(ChCustomFieldSource_Ticket::ID, $ticket_id, $field_ids); // Worker reply $properties = array( diff --git a/plugins/cerberusweb.core/patches/4.3.1.php b/plugins/cerberusweb.core/patches/4.3.1.php index fce5d2c..cb986b0 100644 --- a/plugins/cerberusweb.core/patches/4.3.1.php +++ b/plugins/cerberusweb.core/patches/4.3.1.php @@ -68,4 +68,18 @@ if(isset($columns['CONTENT'])) { $datadict->ExecuteSQLArray($sql); } +// =========================================================================== +// Add the mail_template.team_id to mail_template so we can limit the display of templates based on group ownwership + +$columns = $datadict->MetaColumns('mail_template'); +$indexes = $datadict->MetaIndexes('mail_template',false); + +if(!isset($columns['team_id'])) { + $sql = $datadict->AddColumnSQL('mail_template', 'team_id I4 DEFAULT 0 NOTNULL'); + $datadict->ExecuteSQLArray($sql); + + $sql = $datadict->CreateIndexSQL('team_id','mail_template','team_id'); + $datadict->ExecuteSQLArray($sql); +} + return TRUE; diff --git a/plugins/cerberusweb.core/plugin.xml b/plugins/cerberusweb.core/plugin.xml index 1e5bf61..9a38be8 100644 --- a/plugins/cerberusweb.core/plugin.xml +++ b/plugins/cerberusweb.core/plugin.xml @@ -163,6 +163,7 @@ + diff --git a/plugins/cerberusweb.core/strings.xml b/plugins/cerberusweb.core/strings.xml index 7cec87f..9e9b75c 100644 --- a/plugins/cerberusweb.core/strings.xml +++ b/plugins/cerberusweb.core/strings.xml @@ -501,6 +501,9 @@ [Tickets] Can use the pile sorter on lists + + [Tickets] Allows user to see who's Online + @@ -660,6 +663,21 @@ SMTP Connection Failed: + + Default Message Status: + + + Site Wide Default + + + In Replies + + + In Open Ticket + + + In Send Mail + @@ -907,6 +925,12 @@ Invalid Ticket! + + Message failed to send! You must enter a "To:" email address + + + Message failed to send! You must enter a requester(s) email address + @@ -916,6 +940,9 @@ full headers + + Hide headers + No messages on ticket. @@ -965,6 +992,9 @@ E-mail Templates + + Limit to Group: + ---- Forwarded message ---- @@ -1013,13 +1043,13 @@ - Close this ticket (C) + Close this ticket (C) (Disabled) - Delete this ticket (X) + Delete this ticket (X) (Disabled) - Print this ticket (P) + Print this ticket (P) (Disabled) Read all messages in chronological order (A) @@ -1028,7 +1058,7 @@ Reload this ticket - Report this ticket as spam (S) + Report this ticket as spam (S) (Disabled) Unassign this ticket from yourself (U) diff --git a/plugins/cerberusweb.core/templates/configuration/tabs/mail/outgoing_settings.tpl b/plugins/cerberusweb.core/templates/configuration/tabs/mail/outgoing_settings.tpl index 7a37c4b..bbc610b 100644 --- a/plugins/cerberusweb.core/templates/configuration/tabs/mail/outgoing_settings.tpl +++ b/plugins/cerberusweb.core/templates/configuration/tabs/mail/outgoing_settings.tpl @@ -75,14 +75,7 @@
E-mail Signature Variables: - + {html_options name="sig_token" options=$sig_token onchange="insertAtCursor(this.form.default_signature,this.options[this.selectedIndex].value);this.selectedIndex=0;this.form.signature.focus();"}

@@ -94,6 +87,27 @@

+ {$translate->_('config.mail.message.status.reply')|capitalize} {$translate->_('config.mail.message.status')|capitalize}
+ + + +
+
+ + {$translate->_('config.mail.message.status.open')|capitalize} {$translate->_('config.mail.message.status')|capitalize}
+ + + +
+
+ + {$translate->_('config.mail.message.status.send')|capitalize} {$translate->_('config.mail.message.status')|capitalize}
+ + + +
+
+
diff --git a/plugins/cerberusweb.core/templates/configuration/tabs/scheduler/index.tpl b/plugins/cerberusweb.core/templates/configuration/tabs/scheduler/index.tpl index f4258c7..bc9d68b 100644 --- a/plugins/cerberusweb.core/templates/configuration/tabs/scheduler/index.tpl +++ b/plugins/cerberusweb.core/templates/configuration/tabs/scheduler/index.tpl @@ -27,16 +27,18 @@ {$job->manifest->name}
- {assign var=duration value=$job->getParam('duration',5)} - {assign var=term value=$job->getParam('term','m')} - Runs every: {$duration} - {if $term=='d'} - days - {elseif $term=='m'} - minutes - {elseif $term=='h'} - hours - {/if}
+ {if $enabled} + {assign var=duration value=$job->getParam('duration',5)} + {assign var=term value=$job->getParam('term','m')} + Runs every: {$duration} + {if $term=='d'} + days + {elseif $term=='m'} + minutes + {elseif $term=='h'} + hours + {/if}
+ {/if} Last run: {if $lastrun}{$lastrun|devblocks_date}{else}Never{/if} {if $enabled && !$locked} diff --git a/plugins/cerberusweb.core/templates/display/index.tpl b/plugins/cerberusweb.core/templates/display/index.tpl index 4029acc..2c5a30a 100644 --- a/plugins/cerberusweb.core/templates/display/index.tpl +++ b/plugins/cerberusweb.core/templates/display/index.tpl @@ -18,6 +18,9 @@ {$translate->_('common.bucket')|capitalize}: {if !empty($ticket_category_id)}{$ticket_category->name}{else}{$translate->_('common.inbox')|capitalize}{/if}   {$translate->_('ticket.mask')|capitalize}: {$ticket->mask}   {$translate->_('ticket.id')}: {$ticket->id}   + {if isset($total_time_all) } + Total Ticket Time Worked: {$total_time_all} Mins  + {/if}
{if !empty($ticket->next_worker_id)} {assign var=next_worker_id value=$ticket->next_worker_id} @@ -108,9 +111,9 @@ {if $pref_keyboard_shortcuts} {$translate->_('common.keyboard')|lower}: - {if !$ticket->is_closed && $active_worker->hasPriv('core.ticket.actions.close')}(c) {$translate->_('common.close')|lower} {/if} - {if !$ticket->spam_trained && $active_worker->hasPriv('core.ticket.actions.spam')}(s) {$translate->_('common.spam')|lower} {/if} - {if !$ticket->is_deleted && $active_worker->hasPriv('core.ticket.actions.delete')}(x) {$translate->_('common.delete')|lower} {/if} + {if !$ticket->is_closed && $active_worker->hasPriv('core.ticket.actions.close')}(c) {$translate->_('common.close')|lower} (disabled) {/if} + {if !$ticket->spam_trained && $active_worker->hasPriv('core.ticket.actions.spam')}(s) {$translate->_('common.spam')|lower} (disabled) {/if} + {if !$ticket->is_deleted && $active_worker->hasPriv('core.ticket.actions.delete')}(x) {$translate->_('common.delete')|lower} (disabled) {/if} {if empty($ticket->next_worker_id)}(t) {$translate->_('mail.take')|lower} {/if} {if $ticket->next_worker_id == $active_worker->id}(u) {$translate->_('mail.surrender')|lower} {/if} {if !$expand_all}(a) {$translate->_('display.button.read_all')|lower} {/if} @@ -221,11 +224,11 @@ CreateKeyHandler(function doShortcuts(e) { document.getElementById('btnReadAll').click(); } catch(ex){} break; - case 67: // (C) close - try { - document.getElementById('btnClose').click(); - } catch(ex){} - break; +// case 67: // (C) close +// try { +// document.getElementById('btnClose').click(); +// } catch(ex){} +// break; case 80: // (P) print try { document.getElementById('btnPrint').click(); @@ -236,11 +239,11 @@ CreateKeyHandler(function doShortcuts(e) { document.getElementById('btnReplyFirst').click(); } catch(ex){} break; - case 83: // (S) spam - try { - document.getElementById('btnSpam').click(); - } catch(ex){} - break; +// case 83: // (S) spam +// try { +// document.getElementById('btnSpam').click(); +// } catch(ex){} +// break; case 84: // (T) take/assign try { document.getElementById('btnTake').click(); @@ -251,11 +254,11 @@ CreateKeyHandler(function doShortcuts(e) { document.getElementById('btnSurrender').click(); } catch(ex){} break; - case 88: // (X) delete - try { - document.getElementById('btnDelete').click(); - } catch(ex){} - break; +// case 88: // (X) delete +// try { +// document.getElementById('btnDelete').click(); +// } catch(ex){} +// break; case 219: // [ - prev page try { document.getElementById('btnPagePrev').click(); diff --git a/plugins/cerberusweb.core/templates/display/modules/conversation/message.tpl b/plugins/cerberusweb.core/templates/display/modules/conversation/message.tpl index ddae4f0..8d1cda4 100644 --- a/plugins/cerberusweb.core/templates/display/modules/conversation/message.tpl +++ b/plugins/cerberusweb.core/templates/display/modules/conversation/message.tpl @@ -62,8 +62,14 @@ {if $expanded} {/if} diff --git a/plugins/cerberusweb.core/templates/display/rpc/email_templates/template_edit_panel.tpl b/plugins/cerberusweb.core/templates/display/rpc/email_templates/template_edit_panel.tpl index 9bf1d19..90c4ff4 100644 --- a/plugins/cerberusweb.core/templates/display/rpc/email_templates/template_edit_panel.tpl +++ b/plugins/cerberusweb.core/templates/display/rpc/email_templates/template_edit_panel.tpl @@ -34,30 +34,18 @@ Text:

-Insert Placeholder: +Insert Placeholder: + {html_options name="token" options=$EmailTemplateTokens onchange="insertAtCursor(this.form.template,selectValue(this.form.token));this.form.token.selectedIndex=0;this.form.template.focus();"}> +
+{$translate->_('display.reply.email_templates.limit_group')} + +
diff --git a/plugins/cerberusweb.core/templates/display/rpc/reply.tpl b/plugins/cerberusweb.core/templates/display/rpc/reply.tpl index 4d0058e..6a39e74 100644 --- a/plugins/cerberusweb.core/templates/display/rpc/reply.tpl +++ b/plugins/cerberusweb.core/templates/display/rpc/reply.tpl @@ -172,14 +172,14 @@ + + + +
- - - {if $active_worker->hasPriv('core.ticket.actions.close') || ($ticket->is_closed && !$ticket->is_deleted)}{/if} + + + {if $active_worker->hasPriv('core.ticket.actions.close') || ($ticket->is_closed && !$ticket->is_deleted)}{/if}

-
- {$translate->_('display.reply.next.resume')} {$translate->_('display.reply.next.resume_eg')}
+
+ {$translate->_('display.reply.next.resume')} {$translate->_('display.reply.next.resume_eg')}

{$translate->_('display.reply.next.resume_blank')}

diff --git a/plugins/cerberusweb.core/templates/groups/manage/index.tpl b/plugins/cerberusweb.core/templates/groups/manage/index.tpl index e30a3ae..7b9ed72 100644 --- a/plugins/cerberusweb.core/templates/groups/manage/index.tpl +++ b/plugins/cerberusweb.core/templates/groups/manage/index.tpl @@ -58,16 +58,15 @@

E-mail Tokens: - + + - {if !empty($default_signature)} + {if !empty($default_signature)} {/if}
@@ -82,28 +81,7 @@
E-mail Tokens: - + {html_options name="autoreply_token" options=$autoreply_token onchange="insertAtCursor(this.form.auto_reply,this.options[this.selectedIndex].value);this.selectedIndex=0;this.form.auto_reply.focus();"}

@@ -115,28 +93,21 @@ Send the following message:

E-mail Tokens: - + + {html_options name="closereply_token" options=$closereply_token onchange="insertAtCursor(this.form.close_reply,this.options[this.selectedIndex].value);this.selectedIndex=0;this.form.close_reply.focus();"}

+

{$translate->_('config.mail.message.status.reply')|capitalize} {$translate->_('config.mail.message.status')|capitalize}

+ + + + + +
+
+ diff --git a/plugins/cerberusweb.core/templates/tickets/compose/index.tpl b/plugins/cerberusweb.core/templates/tickets/compose/index.tpl index c624175..3c970cc 100644 --- a/plugins/cerberusweb.core/templates/tickets/compose/index.tpl +++ b/plugins/cerberusweb.core/templates/tickets/compose/index.tpl @@ -6,6 +6,9 @@ {if !empty($last_ticket_mask)}
Message sent!     View the message
{/if} +{if !empty($no_to_in_ticket)} +
{$translate->_('display.error.compose')}
+{/if}

Outgoing Message

@@ -109,6 +112,87 @@
+
+ + + + + +
+ {* [TODO] Display by Group *} + + {assign var=last_group_id value=-1} + {foreach from=$ticket_fields item=f key=f_id} + {assign var=field_group_id value=$f->group_id} + {if $field_group_id == 0 || $field_group_id == $ticket->team_id} + {assign var=show_submit value=1} + {if $field_group_id != $last_group_id} + + + + {/if} + + + + + {assign var=last_group_id value=$f->group_id} + {/if} + {/foreach} +

{if $f->group_id==0}Global{else}{$groups.$field_group_id->name}{/if} Fields

+ + {$f->name}: + + {if $f->type=='S'} +
+ {elseif $f->type=='U'} + + {if !empty($ticket_field_values.$f_id)}URL{else}(URL){/if} + {elseif $f->type=='N'} +
+ {elseif $f->type=='T'} +
+ {elseif $f->type=='C'} +
+ {elseif $f->type=='X'} + {foreach from=$f->options item=opt} +
+ {/foreach} + {elseif $f->type=='D'} +
+ {elseif $f->type=='M'} +
+ {$translate->_('common.tips.multi_select')} + {elseif $f->type=='E'} + + + {elseif $f->type=='W'} + {if empty($workers)} + {php}$this->assign('workers', DAO_Worker::getAllActive());{/php} + {/if} + + {/if} +
+
+
+
@@ -118,13 +202,13 @@
+ + +
- - - {if $active_worker->hasPriv('core.ticket.actions.close')}{/if} + + + {if $active_worker->hasPriv('core.ticket.actions.close')}{/if}

-
+
{$translate->_('display.reply.next.resume')} {$translate->_('display.reply.next.resume_eg')}

{$translate->_('display.reply.next.resume_blank')}
diff --git a/plugins/cerberusweb.core/templates/tickets/create/index.tpl b/plugins/cerberusweb.core/templates/tickets/create/index.tpl index 0f0f8b7..2a26bd0 100644 --- a/plugins/cerberusweb.core/templates/tickets/create/index.tpl +++ b/plugins/cerberusweb.core/templates/tickets/create/index.tpl @@ -6,6 +6,9 @@ {if !empty($last_ticket_mask)}
Message created!     View the message
{/if} +{if !empty($no_to_in_ticket)} +
{$translate->_('display.error.create')}
+{/if}

{$translate->_('mail.log_message')|capitalize}

@@ -94,6 +97,86 @@
+
+ + + + + +
+ {* [TODO] Display by Group *} + + {assign var=last_group_id value=-1} + {foreach from=$ticket_fields item=f key=f_id} + {assign var=field_group_id value=$f->group_id} + {if $field_group_id == 0 || $field_group_id == $ticket->team_id} + {assign var=show_submit value=1} + {if $field_group_id != $last_group_id} + + + + {/if} + + + + + {assign var=last_group_id value=$f->group_id} + {/if} + {/foreach} +

{if $f->group_id==0}Global{else}{$groups.$field_group_id->name}{/if} Fields

+ + {$f->name}: + + {if $f->type=='S'} +
+ {elseif $f->type=='U'} + + {if !empty($ticket_field_values.$f_id)}URL{else}(URL){/if} + {elseif $f->type=='N'} +
+ {elseif $f->type=='T'} +
+ {elseif $f->type=='C'} +
+ {elseif $f->type=='X'} + {foreach from=$f->options item=opt} +
+ {/foreach} + {elseif $f->type=='D'} +
+ {elseif $f->type=='M'} +
+ {$translate->_('common.tips.multi_select')} + {elseif $f->type=='E'} + + + {elseif $f->type=='W'} + {if empty($workers)} + {php}$this->assign('workers', DAO_Worker::getAllActive());{/php} + {/if} + + {/if} +
+
+
+
@@ -106,13 +189,13 @@ - + {foreach from=$assigned_tickets item=ticket} diff --git a/plugins/cerberusweb.templates/api/App.php b/plugins/cerberusweb.templates/api/App.php new file mode 100644 index 0000000..ae3000d --- /dev/null +++ b/plugins/cerberusweb.templates/api/App.php @@ -0,0 +1,188 @@ +DevblocksExtension($manifest,1); + } + + function run($signature) { + $active_worker = CerberusApplication::getActiveWorker(); + $worker = DAO_Worker::getAgent($active_worker->id); // Use the most recent info (not session) + + $sig = $signature; + $signature = str_replace( + array('#first_name#','#last_name#','#title#'), + array($worker->first_name,$worker->last_name,$worker->title), + $sig + ); + } + + function render($list) { + $translate = DevblocksPlatform::getTranslationService(); + + $list['Worker'] = array( + '#first_name#' => $translate->_('worker.first_name'), + '#last_name#' => $translate->_('worker.last_name'), + '#title#' => $translate->_('worker.title') + ); + return; + } +}; + +class ChCoreAutoReplyNew extends Extension_AutoReplyNew { + function __construct($manifest) { + $this->DevblocksExtension($manifest,1); + } + + function run(CerberusTicket $ticket, $properties) { + $content = $properties['content']; + $message = DAO_Ticket::getMessage($ticket->first_message_id); + $address = DAO_Ticket::getRequestersByTicket($ticket->id); + $properties['content'] = str_replace( + array('#ticket_id#','#mask#','#subject#','#timestamp#', '#sender#','#sender_first#','#orig_body#'), + array($ticket->id, $ticket->mask, $ticket->subject, date('r'), $address->email, $address->first_name, ltrim($message->body)), + $content + ); + } + + function render($list) { + $translate = DevblocksPlatform::getTranslationService(); + + $list['General'] = array('#timestamp#' => $translate->_('template.common.current_time')); + $list['First Requester'] = array( + '#sender#' => $translate->_('common.email'), + '#sender_first#' => $translate->_('address.first_name') + ); + $list['First Message'] = array('#orig_body#' => $translate->_('template.common.message_body')); + $list['Ticket'] = array( + '#mask#' => $translate->_('template.common.reference_id'), + '#ticket_id#' => $translate->_('template.common.internal_id'), + '#subject#' => $translate->_('message.header.subject') + ); + return; + } +}; + +class ChCoreAutoReplyClose extends Extension_AutoReplyClose { + function __construct($manifest) { + $this->DevblocksExtension($manifest,1); + } + + function run(CerberusTicket $ticket, $properties) { + $content = $properties['content']; + $group_settings = DAO_GroupSettings::getSettings(); + + if(null != ($msg_first = DAO_Ticket::getMessage($ticket->first_message_id))) { + // First sender + $ticket_sender = ''; + $ticket_sender_first = ''; + if(null != ($sender_first = DAO_Address::get($msg_first->address_id))) { + $ticket_sender = $sender_first->email; + $ticket_sender_first = $sender_first->first_name; + } + + // First body + $ticket_body = $msg_first->getContent(); + } + + $properties['content'] = str_replace( + array('#ticket_id#', '#mask#','#subject#','#timestamp#','#sender#','#sender_first#','#orig_body#'), + array($ticket->id, $ticket->mask, $ticket->subject, date('r'), $ticket_sender, $ticket_sender_first, ltrim($ticket_body)), + $content + ); + } + + function render($list) { + $translate = DevblocksPlatform::getTranslationService(); + + $list['General'] = array('#timestamp#' => $translate->_('template.common.current_time')); + $list['First Requester'] = array( + '#sender#' => $translate->_('common.email'), + '#sender_first#' => $translate->_('address.first_name') + ); + $list['First Message'] = array('#orig_body#' => $translate->_('template.common.message_body')); + $list['Ticket'] = array( + '#mask#' => $translate->_('template.common.reference_id'), + '#ticket_id#' => $translate->_('template.common.internal_id'), + '#subject#' => $translate->_('message.header.subject') + ); + return; + } +}; + +class ChCoreEmailTemplate extends Extension_EmailTemplate { + function __construct($manifest) { + $this->DevblocksExtension($manifest,1); + } + + function run($message_id, $template) { + $raw = $template; + $replace = array(); + $with = array(); + + $replace[] = '#timestamp#'; + $with[] = date('r'); + + if(!empty($message_id)) { + $message = DAO_Ticket::getMessage($message_id); + $ticket = DAO_Ticket::getTicket($message->ticket_id); + $sender = DAO_Address::get($message->address_id); + $sender_org = DAO_ContactOrg::get($sender->contact_org_id); + + $replace[] = '#sender_first_name#'; + $replace[] = '#sender_last_name#'; + $replace[] = '#sender_org#'; + + $with[] = $sender->first_name; + $with[] = $sender->last_name; + $with[] = (!empty($sender_org)?$sender_org->name:""); + + $replace[] = '#ticket_id#'; + $replace[] = '#ticket_mask#'; + $replace[] = '#ticket_subject#'; + + $with[] = $ticket->id; + $with[] = $ticket->mask; + $with[] = $ticket->subject; + } + + if(null != ($active_worker = CerberusApplication::getActiveWorker())) { + $worker = DAO_Worker::getAgent($active_worker->id); // most recent info (not session) + + $replace[] = '#worker_first_name#'; + $replace[] = '#worker_last_name#'; + $replace[] = '#worker_title#'; + + $with[] = $worker->first_name; + $with[] = $worker->last_name; + $with[] = $worker->title; + } + + $template = str_replace($replace, $with, $raw); + } + + function render($type, $list) { + $translate = DevblocksPlatform::getTranslationService(); + + $list['General'] = array('#timestamp#' => $translate->_('template.common.current_time')); + if (2==$type) { + $list['Sender'] = array( + '#sender_first#' => $translate->_('address.first_name'), + '#sender_last_name#' => $translate->_('address.last_name'), + '#sender_org#' => $translate->_('address.contact_org_id') + ); + $list['Ticket'] = array( + '#mask#' => $translate->_('template.common.reference_id'), + '#ticket_id#' => $translate->_('template.common.internal_id'), + '#subject#' => $translate->_('message.header.subject') + ); + } + $list['Worker'] = array( + '#first_name#' => $translate->_('worker.first_name'), + '#last_name#' => $translate->_('worker.last_name'), + '#title#' => $translate->_('worker.title') + ); + return; + } +}; + diff --git a/plugins/cerberusweb.templates/api/Plugin.php b/plugins/cerberusweb.templates/api/Plugin.php new file mode 100644 index 0000000..e96dffb --- /dev/null +++ b/plugins/cerberusweb.templates/api/Plugin.php @@ -0,0 +1,12 @@ + + + cerberusweb.templates.english + [Cerb4] Standard Templates + Pluggable Template items that allow you to replace text with variable data under templaces. + WebGroup Media, LLC. + 0 + http://wiki.cerb4.com/wiki/New_Changes#cerberusweb.templates + + + + + + cerberusweb.templates.en..translations + [Cerb4] Standard Email Signature Templates Strings + + api/Plugin.php + ChCoreTemplateTranslations + + + + + + + cerberusweb.templates.en.email_signature + Standard Email Signature Templates + + api/App.php + ChCoreEmailSignatureTemplate + + + + + + + cerberusweb.templates.en.new + Standard New Templates + + api/App.php + ChCoreAutoReplyNew + + + + + + + cerberusweb.templates.en.close + Standard Close Templates + + api/App.php + ChCoreAutoReplyClose + + + + + + + cerberusweb.templates.en.email + Standard Email Templates + + api/App.php + ChCoreEmailTemplate + + + + + + + + \ No newline at end of file diff --git a/plugins/cerberusweb.templates/strings.xml b/plugins/cerberusweb.templates/strings.xml new file mode 100644 index 0000000..c507549 --- /dev/null +++ b/plugins/cerberusweb.templates/strings.xml @@ -0,0 +1,32 @@ + + + +
+ + + + Current Time + + + + Message Body + + + + Reference ID + + + + Internal ID + + + + + + + + + diff --git a/plugins/cerberusweb.timetracking/api/App.php b/plugins/cerberusweb.timetracking/api/App.php index f0426aa..4805f4c 100644 --- a/plugins/cerberusweb.timetracking/api/App.php +++ b/plugins/cerberusweb.timetracking/api/App.php @@ -1,7 +1,7 @@ Execute(sprintf("DELETE FROM timetracking_entry WHERE id IN (%s)", $ids_list)); - - // Custom fields - DAO_CustomFieldValue::deleteBySourceIds(ChCustomFieldSource_TimeEntry::ID, $ids); + + // Custom fields + DAO_CustomFieldValue::deleteBySourceIds(ChCustomFieldSource_TimeEntry::ID, $ids); return true; } @@ -260,12 +260,12 @@ class DAO_TimeTrackingEntry extends C4_ORMHelper { * @return array */ static function search($columns, $params, $limit=10, $page=0, $sortBy=null, $sortAsc=null, $withCounts=true) { - $db = DevblocksPlatform::getDatabaseService(); - $fields = SearchFields_TimeTrackingEntry::getFields(); - - // Sanitize - if(!isset($fields[$sortBy])) - $sortBy=null; + $db = DevblocksPlatform::getDatabaseService(); + $fields = SearchFields_TimeTrackingEntry::getFields(); + + // Sanitize + if(!isset($fields[$sortBy])) + $sortBy=null; list($tables,$wheres) = parent::_parseSearchParams($params, $columns, $fields,$sortBy); $start = ($page * $limit); // [JAS]: 1-based [TODO] clean up + document @@ -300,7 +300,7 @@ class DAO_TimeTrackingEntry extends C4_ORMHelper { // [JAS]: Dynamic table joins // (isset($tables['o']) ? "LEFT JOIN contact_org o ON (o.id=tt.debit_org_id)" : " "). // (isset($tables['mc']) ? "INNER JOIN message_content mc ON (mc.message_id=m.id)" : " "). - + // Custom field joins list($select_sql, $join_sql, $has_multiple_values) = self::_appendSelectJoinSqlForCustomFieldTables( $tables, @@ -314,7 +314,7 @@ class DAO_TimeTrackingEntry extends C4_ORMHelper { (!empty($wheres) ? sprintf("WHERE %s ",implode(' AND ',$wheres)) : ""); $sort_sql = (!empty($sortBy) ? sprintf("ORDER BY %s %s ",$sortBy,($sortAsc || is_null($sortAsc))?"ASC":"DESC") : " "); - + $sql = $select_sql. $join_sql. @@ -339,12 +339,12 @@ class DAO_TimeTrackingEntry extends C4_ORMHelper { // [JAS]: Count all $total = -1; - if($withCounts) { + if($withCounts) { $count_sql = ($has_multiple_values ? "SELECT COUNT(DISTINCT tt.id) " : "SELECT COUNT(tt.id) "). $join_sql. $where_sql; - $total = $db->GetOne($count_sql); + $total = $db->GetOne($count_sql); } return array($results,$total); @@ -400,19 +400,19 @@ class SearchFields_TimeTrackingEntry { self::SOURCE_ID => new DevblocksSearchField(self::SOURCE_ID, 'tt', 'source_id', null, $translate->_('timetracking_entry.source_id')), self::ORG_NAME => new DevblocksSearchField(self::ORG_NAME, 'o', 'name', null, $translate->_('contact_org.name')), - ); - - // Custom Fields - $fields = DAO_CustomField::getBySource(ChCustomFieldSource_TimeEntry::ID); - if(is_array($fields)) - foreach($fields as $field_id => $field) { - $key = 'cf_'.$field_id; - $columns[$key] = new DevblocksSearchField($key,$key,'field_value',null,$field->name); - } + ); + + // Custom Fields + $fields = DAO_CustomField::getBySource(ChCustomFieldSource_TimeEntry::ID); + if(is_array($fields)) + foreach($fields as $field_id => $field) { + $key = 'cf_'.$field_id; + $columns[$key] = new DevblocksSearchField($key,$key,'field_value',null,$field->name); + } // Sort by label (translation-conscious) uasort($columns, create_function('$a, $b', "return strcasecmp(\$a->db_label,\$b->db_label);\n")); - + return $columns; } }; @@ -439,7 +439,7 @@ class C4_TimeTrackingEntryView extends C4_AbstractView { } function getData() { - $objects = DAO_TimeTrackingEntry::search( + $objects = DAO_TimeTrackingEntry::search( $this->view_columns, $this->params, $this->renderLimit, @@ -450,8 +450,8 @@ class C4_TimeTrackingEntryView extends C4_AbstractView { return $objects; } - function render() { - $this->_sanitize(); + function render() { + $this->_sanitize(); $tpl = DevblocksPlatform::getTemplateService(); $tpl->assign('id', $this->id); @@ -465,10 +465,10 @@ class C4_TimeTrackingEntryView extends C4_AbstractView { $sources = DAO_TimeTrackingEntry::getSources(); $tpl->assign('sources', $sources); - - // Custom fields - $custom_fields = DAO_CustomField::getBySource(ChCustomFieldSource_TimeEntry::ID); - $tpl->assign('custom_fields', $custom_fields); + + // Custom fields + $custom_fields = DAO_CustomField::getBySource(ChCustomFieldSource_TimeEntry::ID); + $tpl->assign('custom_fields', $custom_fields); $tpl->cache_lifetime = "0"; $tpl->assign('view_fields', $this->getColumns()); @@ -478,7 +478,7 @@ class C4_TimeTrackingEntryView extends C4_AbstractView { function renderCriteria($field) { $tpl = DevblocksPlatform::getTemplateService(); $tpl->assign('id', $this->id); - + switch($field) { case SearchFields_TimeTrackingEntry::NOTES: case SearchFields_TimeTrackingEntry::ORG_NAME: @@ -511,15 +511,15 @@ class C4_TimeTrackingEntryView extends C4_AbstractView { $tpl->assign('sources', $sources); $tpl->display('file:' . DEVBLOCKS_PLUGIN_PATH . 'cerberusweb.timetracking/templates/timetracking/criteria/source.tpl'); - break; - default: - // Custom Fields - if('cf_' == substr($field,0,3)) { - $this->_renderCriteriaCustomField($tpl, substr($field,3)); - } else { - echo ' '; - } - break; + break; + default: + // Custom Fields + if('cf_' == substr($field,0,3)) { + $this->_renderCriteriaCustomField($tpl, substr($field,3)); + } else { + echo ' '; + } + break; } } @@ -649,13 +649,13 @@ class C4_TimeTrackingEntryView extends C4_AbstractView { case SearchFields_TimeTrackingEntry::SOURCE_EXTENSION_ID: @$source_ids = DevblocksPlatform::importGPC($_REQUEST['source_ids'],'array',array()); $criteria = new DevblocksSearchCriteria($field,$oper,$source_ids); - break; - default: - // Custom Fields - if(substr($field,0,3)=='cf_') { - $criteria = $this->_doSetCriteriaCustomField($field, substr($field,3)); - } - break; + break; + default: + // Custom Fields + if(substr($field,0,3)=='cf_') { + $criteria = $this->_doSetCriteriaCustomField($field, substr($field,3)); + } + break; } if(!empty($criteria)) { @@ -663,67 +663,67 @@ class C4_TimeTrackingEntryView extends C4_AbstractView { $this->renderPage = 0; } } - - function doBulkUpdate($filter, $do, $ids=array()) { - @set_time_limit(0); - - $change_fields = array(); - $custom_fields = array(); - - // Make sure we have actions - if(empty($do)) - return; - - // Make sure we have checked items if we want a checked list - if(0 == strcasecmp($filter,"checks") && empty($ids)) - return; - - if(is_array($do)) - foreach($do as $k => $v) { - switch($k) { -// case 'xxxx': -// $change_fields[DAO_TimeTrackingEntry::XXX] = $v; -// break; - default: - // Custom fields - if(substr($k,0,3)=="cf_") { - $custom_fields[substr($k,3)] = $v; - } - break; - } - } - - $pg = 0; - - if(empty($ids)) - do { - list($objects,$null) = DAO_TimeTrackingEntry::search( - array(), - $this->params, - 100, - $pg++, - SearchFields_TimeTrackingEntry::ID, - true, - false - ); - - $ids = array_merge($ids, array_keys($objects)); - - } while(!empty($objects)); - - $batch_total = count($ids); - for($x=0;$x<=$batch_total;$x+=100) { - $batch_ids = array_slice($ids,$x,100); - DAO_TimeTrackingEntry::update($batch_ids, $change_fields); - - // Custom Fields - self::_doBulkSetCustomFields(ChCustomFieldSource_TimeEntry::ID, $custom_fields, $batch_ids); - - unset($batch_ids); - } - - unset($ids); - } + + function doBulkUpdate($filter, $do, $ids=array()) { + @set_time_limit(0); + + $change_fields = array(); + $custom_fields = array(); + + // Make sure we have actions + if(empty($do)) + return; + + // Make sure we have checked items if we want a checked list + if(0 == strcasecmp($filter,"checks") && empty($ids)) + return; + + if(is_array($do)) + foreach($do as $k => $v) { + switch($k) { +// case 'xxxx': +// $change_fields[DAO_TimeTrackingEntry::XXX] = $v; +// break; + default: + // Custom fields + if(substr($k,0,3)=="cf_") { + $custom_fields[substr($k,3)] = $v; + } + break; + } + } + + $pg = 0; + + if(empty($ids)) + do { + list($objects,$null) = DAO_TimeTrackingEntry::search( + array(), + $this->params, + 100, + $pg++, + SearchFields_TimeTrackingEntry::ID, + true, + false + ); + + $ids = array_merge($ids, array_keys($objects)); + + } while(!empty($objects)); + + $batch_total = count($ids); + for($x=0;$x<=$batch_total;$x+=100) { + $batch_ids = array_slice($ids,$x,100); + DAO_TimeTrackingEntry::update($batch_ids, $change_fields); + + // Custom Fields + self::_doBulkSetCustomFields(ChCustomFieldSource_TimeEntry::ID, $custom_fields, $batch_ids); + + unset($batch_ids); + } + + unset($ids); + } }; @@ -1055,17 +1055,17 @@ class ChTimeTrackingAjaxController extends DevblocksControllerExtension { $tpl->assign('billable_activities', $billable_activities); $nonbillable_activities = DAO_TimeTrackingActivity::getWhere(sprintf("%s=0",DAO_TimeTrackingActivity::RATE)); $tpl->assign('nonbillable_activities', $nonbillable_activities); - - // Custom fields - $custom_fields = DAO_CustomField::getBySource(ChCustomFieldSource_TimeEntry::ID); - $tpl->assign('custom_fields', $custom_fields); - - $custom_field_values = DAO_CustomFieldValue::getValuesBySourceIds(ChCustomFieldSource_TimeEntry::ID, $id); - if(isset($custom_field_values[$id])) - $tpl->assign('custom_field_values', $custom_field_values[$id]); - - $types = Model_CustomField::getTypes(); - $tpl->assign('types', $types); + + // Custom fields + $custom_fields = DAO_CustomField::getBySource(ChCustomFieldSource_TimeEntry::ID); + $tpl->assign('custom_fields', $custom_fields); + + $custom_field_values = DAO_CustomFieldValue::getValuesBySourceIds(ChCustomFieldSource_TimeEntry::ID, $id); + if(isset($custom_field_values[$id])) + $tpl->assign('custom_field_values', $custom_field_values[$id]); + + $types = Model_CustomField::getTypes(); + $tpl->assign('types', $types); $tpl->display('file:' . $tpl_path . 'timetracking/rpc/time_entry_panel.tpl'); } @@ -1087,11 +1087,17 @@ class ChTimeTrackingAjaxController extends DevblocksControllerExtension { @$activity_id = DevblocksPlatform::importGPC($_POST['activity_id'],'integer',0); @$time_actual_mins = DevblocksPlatform::importGPC($_POST['time_actual_mins'],'integer',0); - @$notes = DevblocksPlatform::importGPC($_POST['notes'],'string',''); + @$notes_long = DevblocksPlatform::importGPC($_POST['notes'],'string',''); @$org_str = DevblocksPlatform::importGPC($_POST['org'],'string',''); @$source_extension_id = DevblocksPlatform::importGPC($_POST['source_extension_id'],'string',''); @$source_id = DevblocksPlatform::importGPC($_POST['source_id'],'integer',0); + if (strlen($notes_long) > 255) { + @$notes=substr($notes_long,0,255); + } else { + @$notes=$notes_long; + } + // Translate org string into org id, if exists $org_id = 0; if(!empty($org_str)) { @@ -1101,9 +1107,9 @@ class ChTimeTrackingAjaxController extends DevblocksControllerExtension { // Delete entries if(!empty($id) && !empty($do_delete)) { if(null != ($entry = DAO_TimeTrackingEntry::get($id))) { - // Check privs - if(($active_worker->hasPriv('timetracking.actions.create') && $active_worker->id==$entry->worker_id) - || $active_worker->hasPriv('timetracking.actions.update_all')) + // Check privs + if(($active_worker->hasPriv('timetracking.actions.create') && $active_worker->id==$entry->worker_id) + || $active_worker->hasPriv('timetracking.actions.update_all')) DAO_TimeTrackingEntry::delete($id); } @@ -1126,122 +1132,167 @@ class ChTimeTrackingAjaxController extends DevblocksControllerExtension { $fields[DAO_TimeTrackingEntry::WORKER_ID] = intval($active_worker->id); } - if(empty($id)) { // create - $id = DAO_TimeTrackingEntry::create($fields); - - // Procedurally create a comment - $translate = DevblocksPlatform::getTranslationService(); - switch($source_extension_id) { - // If ticket, add a comment about the timeslip to the ticket - case 'timetracking.source.ticket': - $ticket_id = intval($source_id); - - if(null != ($worker_address = DAO_Address::lookupAddress($active_worker->email, false))) { - if(!empty($activity_id)) { - $activity = DAO_TimeTrackingActivity::get($activity_id); - } - - if(!empty($org_id)) - $org = DAO_ContactOrg::get($org_id); - - $comment = sprintf( - "== %s ==\n". - "%s %s\n". - "%s %d\n". - "%s %s (%s)\n". - "%s %s\n". - "%s %s\n", - $translate->_('timetracking.ui.timetracking'), - $translate->_('timetracking.ui.worker'), - $active_worker->getName(), - $translate->_('timetracking.ui.comment.time_spent'), - $time_actual_mins, - $translate->_('timetracking.ui.comment.activity'), - (!empty($activity) ? $activity->name : ''), - ((!empty($activity) && $activity->rate > 0.00) ? $translate->_('timetracking.ui.billable') : $translate->_('timetracking.ui.non_billable')), - $translate->_('timetracking.ui.comment.organization'), - (!empty($org) ? $org->name : $translate->_('timetracking.ui.comment.not_set')), - $translate->_('timetracking.ui.comment.notes'), - $notes - ); - //timetracking.ui.billable timetracking.ui.non_billable - $fields = array( - DAO_TicketComment::ADDRESS_ID => intval($worker_address->id), - DAO_TicketComment::COMMENT => $comment, - DAO_TicketComment::CREATED => time(), - DAO_TicketComment::TICKET_ID => intval($ticket_id), - ); - DAO_TicketComment::create($fields); - } - break; - } + if(empty($id)) { // create + $id = DAO_TimeTrackingEntry::create($fields); + + // Procedurally create a comment + $translate = DevblocksPlatform::getTranslationService(); + switch($source_extension_id) { + // If ticket, add a comment about the timeslip to the ticket + case 'timetracking.source.ticket': + $ticket_id = intval($source_id); + + if(null != ($worker_address = DAO_Address::lookupAddress($active_worker->email, false))) { + if(!empty($activity_id)) { + $activity = DAO_TimeTrackingActivity::get($activity_id); + } + + if(!empty($org_id)) + $org = DAO_ContactOrg::get($org_id); + + $comment = sprintf( + "== %s ==\n". + "%s %s\n". + "%s %d\n". + "%s %s (%s)\n". + "%s %s\n". + "%s %s\n", + $translate->_('timetracking.ui.timetracking'), + $translate->_('timetracking.ui.worker'), + $active_worker->getName(), + $translate->_('timetracking.ui.comment.time_spent'), + $time_actual_mins, + $translate->_('timetracking.ui.comment.activity'), + (!empty($activity) ? $activity->name : ''), + ((!empty($activity) && $activity->rate > 0.00) ? $translate->_('timetracking.ui.billable') : $translate->_('timetracking.ui.non_billable')), + $translate->_('timetracking.ui.comment.organization'), + (!empty($org) ? $org->name : $translate->_('timetracking.ui.comment.not_set')), + $translate->_('timetracking.ui.comment.notes'), + $notes + ); + //timetracking.ui.billable timetracking.ui.non_billable + $fields = array( + DAO_TicketComment::ADDRESS_ID => intval($worker_address->id), + DAO_TicketComment::COMMENT => $comment, + DAO_TicketComment::CREATED => time(), + DAO_TicketComment::TICKET_ID => intval($ticket_id), + ); + DAO_TicketComment::create($fields); + } + break; + } } else { // modify DAO_TimeTrackingEntry::update($id, $fields); } - - // Custom field saves - @$field_ids = DevblocksPlatform::importGPC($_POST['field_ids'], 'array', array()); - DAO_CustomFieldValue::handleFormPost(ChCustomFieldSource_TimeEntry::ID, $id, $field_ids); + + // Custom field saves + @$field_ids = DevblocksPlatform::importGPC($_POST['field_ids'], 'array', array()); + DAO_CustomFieldValue::handleFormPost(ChCustomFieldSource_TimeEntry::ID, $id, $field_ids); } function clearEntryAction() { $this->_destroyTimer(); - } - - function showBulkPanelAction() { - @$id_csv = DevblocksPlatform::importGPC($_REQUEST['ids']); - @$view_id = DevblocksPlatform::importGPC($_REQUEST['view_id']); - - $tpl = DevblocksPlatform::getTemplateService(); - $path = dirname(dirname(__FILE__)) . '/templates/'; - $tpl->assign('path', $path); - $tpl->assign('view_id', $view_id); - - if(!empty($id_csv)) { - $ids = DevblocksPlatform::parseCsvString($id_csv); - $tpl->assign('ids', implode(',', $ids)); - } - - // Custom Fields - $custom_fields = DAO_CustomField::getBySource(ChCustomFieldSource_TimeEntry::ID); - $tpl->assign('custom_fields', $custom_fields); - - $tpl->cache_lifetime = "0"; - $tpl->display('file:' . $path . 'timetracking/time/bulk.tpl'); - } - - function doBulkUpdateAction() { - // Checked rows - @$ids_str = DevblocksPlatform::importGPC($_REQUEST['ids'],'string'); - $ids = DevblocksPlatform::parseCsvString($ids_str); - - // Filter: whole list or check - @$filter = DevblocksPlatform::importGPC($_REQUEST['filter'],'string',''); - - // View - @$view_id = DevblocksPlatform::importGPC($_REQUEST['view_id'],'string'); - $view = C4_AbstractViewLoader::getView($view_id); - - // Time Tracking fields -// @$list_id = trim(DevblocksPlatform::importGPC($_POST['list_id'],'integer',0)); - - $do = array(); - - // Do: ... -// if(0 != strlen($list_id)) -// $do['list_id'] = $list_id; - - // Do: Custom fields - $do = DAO_CustomFieldValue::handleBulkPost($do); - - $view->doBulkUpdate($filter, $do, $ids); - - $view->render(); - return; - } - + } + + function showBulkPanelAction() { + @$id_csv = DevblocksPlatform::importGPC($_REQUEST['ids']); + @$view_id = DevblocksPlatform::importGPC($_REQUEST['view_id']); + + $tpl = DevblocksPlatform::getTemplateService(); + $path = dirname(dirname(__FILE__)) . '/templates/'; + $tpl->assign('path', $path); + $tpl->assign('view_id', $view_id); + + if(!empty($id_csv)) { + $ids = DevblocksPlatform::parseCsvString($id_csv); + $tpl->assign('ids', implode(',', $ids)); + } + + // Custom Fields + $custom_fields = DAO_CustomField::getBySource(ChCustomFieldSource_TimeEntry::ID); + $tpl->assign('custom_fields', $custom_fields); + + $tpl->cache_lifetime = "0"; + $tpl->display('file:' . $path . 'timetracking/time/bulk.tpl'); + } + + function doBulkUpdateAction() { + // Checked rows + @$ids_str = DevblocksPlatform::importGPC($_REQUEST['ids'],'string'); + $ids = DevblocksPlatform::parseCsvString($ids_str); + + // Filter: whole list or check + @$filter = DevblocksPlatform::importGPC($_REQUEST['filter'],'string',''); + + // View + @$view_id = DevblocksPlatform::importGPC($_REQUEST['view_id'],'string'); + $view = C4_AbstractViewLoader::getView($view_id); + + // Time Tracking fields +// @$list_id = trim(DevblocksPlatform::importGPC($_POST['list_id'],'integer',0)); + + $do = array(); + + // Do: ... +// if(0 != strlen($list_id)) +// $do['list_id'] = $list_id; + + // Do: Custom fields + $do = DAO_CustomFieldValue::handleBulkPost($do); + + $view->doBulkUpdate($filter, $do, $ids); + + $view->render(); + return; + } + +}; + +if (class_exists('Extension_AutoReplyClose')): +class ChTimeTrackingAutoReplyClose extends Extension_AutoReplyClose { + function __construct($manifest) { + $this->DevblocksExtension($manifest,1); + } + + function run(CerberusTicket $ticket, $properties) { + $content = $properties['content']; + $total_time_all = 0; + + // Adds total time worked per ticket to the token list. + $db = DevblocksPlatform::getDatabaseService(); + + $sql = "SELECT sum(tte.time_actual_mins) mins "; + $sql .= "FROM timetracking_entry tte "; + $sql .= sprintf("WHERE tte.source_id = %d ", $ticket->id); + $sql .= "AND tte.source_extension_id = 'timetracking.source.ticket' "; + $sql .= "GROUP BY tte.source_id "; + + $rs = $db->Execute($sql); + + if(is_a($rs,'ADORecordSet')) { + $total_time_all = intval($rs->fields['mins']); + } + + $properties['content'] = str_replace( + array('#time_tracker_total_min#'), + array($total_time_all), + $content + ); + } + + function render($list) { + $translate = DevblocksPlatform::getTranslationService(); + + $list['TimeTracker'] = + array( + '#time_tracker_total_min#' => $translate->_('timetracking.ui.template.total.time.all.min') + ); + return; + } }; +endif; + if (class_exists('Extension_ActivityTab')): class TimeTrackingActivityTab extends Extension_ActivityTab { @@ -1305,11 +1356,11 @@ class ChTimeTrackingConfigActivityTab extends Extension_ConfigTab { @$name = DevblocksPlatform::importGPC($_REQUEST['name'],'string',''); @$rate = floatval(DevblocksPlatform::importGPC($_REQUEST['rate'],'string','')); @$do_delete = DevblocksPlatform::importGPC($_REQUEST['do_delete'],'integer',0); - - if(DEMO_MODE) { - DevblocksPlatform::setHttpResponse(new DevblocksHttpResponse(array('config','timetracking.activities'))); - return; - } + + if(DEMO_MODE) { + DevblocksPlatform::setHttpResponse(new DevblocksHttpResponse(array('config','timetracking.activities'))); + return; + } if(empty($id)) { // Add $fields = array( diff --git a/plugins/cerberusweb.timetracking/plugin.xml b/plugins/cerberusweb.timetracking/plugin.xml index 41dd228..76fd192 100644 --- a/plugins/cerberusweb.timetracking/plugin.xml +++ b/plugins/cerberusweb.timetracking/plugin.xml @@ -1,11 +1,11 @@ - cerberusweb.timetracking + cerberusweb.timetracking [Cerb4] Time Tracking - Track time spent on various helpdesk activities (replying to tickets, etc). This adds a Track Time button to Display Ticket and Organizations, and a Time Tracking tab to the Activity page. + Track time spent on various helpdesk activities (replying to tickets, etc). This adds a Track Time button to Display Ticket and Organizations, and a Time Tracking tab to the Activity page. WebGroup Media, LLC. 0 - http://wiki.cerb4.com/wiki/ + http://wiki.cerb4.com/wiki/ @@ -14,15 +14,15 @@ - - - - - - - - - + + + + + + + + + @@ -49,21 +49,21 @@ - - + + - + --> @@ -122,7 +122,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -191,7 +191,7 @@ - + @@ -220,20 +220,31 @@ - - - - - timetracking.fields.source.time_entry - Time Tracking - - api/App.php - ChCustomFieldSource_TimeEntry - - - - + + + + timetracking.fields.source.time_entry + Time Tracking + + api/App.php + ChCustomFieldSource_TimeEntry + + + + + + + timetracking.auto_reply.close + Time Tracking Email Auto Close Templates + + api/App.php + ChTimeTrackingAutoReplyClose + + + + + - - - [Time Tracking] Can track time - - - [Time Tracking] Can manage everyone's time slips - - - [Report Group] Can view the 'Time Tracking Reports' group - - - [Time Tracking] Can export time tracking lists to CSV/XML - + + + + + [Time Tracking] Can track time + + + [Time Tracking] Can manage everyone's time slips + + + [Report Group] Can view the 'Time Tracking Reports' group + + + [Time Tracking] Can export time tracking lists to CSV/XML + @@ -92,7 +92,7 @@ Note: - (description of work performed) + (description of work performed) (255 Character Limit) Reference: @@ -187,6 +187,16 @@ (e.g. 65.00) + + + + Total time tracked for worker + + + + Total time tracked in min + + diff --git a/plugins/cerberusweb.timetracking/templates/timetracking/rpc/time_entry_panel.tpl b/plugins/cerberusweb.timetracking/templates/timetracking/rpc/time_entry_panel.tpl index f5903ca..8b2cbb7 100644 --- a/plugins/cerberusweb.timetracking/templates/timetracking/rpc/time_entry_panel.tpl +++ b/plugins/cerberusweb.timetracking/templates/timetracking/rpc/time_entry_panel.tpl @@ -5,8 +5,8 @@

{$translate->_('timetracking.ui.timetracking')}

- -
+ +
- - - {if $active_worker->hasPriv('core.ticket.actions.close')}{/if} + + + {if $active_worker->hasPriv('core.ticket.actions.close')}{/if}

-
+
{$translate->_('display.reply.next.resume')} {$translate->_('display.reply.next.resume_eg')}

{$translate->_('display.reply.next.resume_blank')}
@@ -195,4 +278,4 @@ YAHOO.util.Event.addListener(window,'load',function(e) { ajax.cbEmailMultiplePeek(null); }); {/literal} - \ No newline at end of file + diff --git a/plugins/cerberusweb.reports/templates/reports/worker/ticket_assignment/html.tpl b/plugins/cerberusweb.reports/templates/reports/worker/ticket_assignment/html.tpl index 4961a8e..9afbba9 100644 --- a/plugins/cerberusweb.reports/templates/reports/worker/ticket_assignment/html.tpl +++ b/plugins/cerberusweb.reports/templates/reports/worker/ticket_assignment/html.tpl @@ -7,7 +7,7 @@

{$workers.$worker_id->first_name} {$workers.$worker_id->last_name}

{$workers.$worker_id->last_name} {$workers.$worker_id->first_name}
@@ -38,7 +38,8 @@
{$translate->_('timetracking.ui.entry_panel.note')} {$translate->_('timetracking.ui.entry_panel.note_hint')}
-
+ +

{$translate->_('timetracking.ui.entry_panel.debit_time_client')} {$translate->_('timetracking.ui.entry_panel.debit_time_client_hint')}
@@ -47,10 +48,10 @@

-
- -{include file="file:$core_tpl/internal/custom_fields/bulk/form.tpl" bulk=false} -
+
+ +{include file="file:$core_tpl/internal/custom_fields/bulk/form.tpl" bulk=false} +
{if !empty($source)} {$translate->_('timetracking.ui.entry_panel.reference')}
@@ -59,12 +60,12 @@ {$source->getLinkText($model->source_id)}

{/if} - - - -{if ($active_worker->hasPriv('timetracking.actions.create') && (empty($model->id) || $active_worker->id==$model->worker_id)) - || $active_worker->hasPriv('timetracking.actions.update_all') - } + + + +{if ($active_worker->hasPriv('timetracking.actions.create') && (empty($model->id) || $active_worker->id==$model->worker_id)) + || $active_worker->hasPriv('timetracking.actions.update_all') + } {if empty($model->id)} @@ -73,8 +74,8 @@ - {/if} -{else} -
You do not have permission to modify this record.
+ {/if} +{else} +
You do not have permission to modify this record.
{/if} \ No newline at end of file