Changeset 51

Timestamp:

02/13/2010 07:02:20 AM (3 years ago)

Author:

someotherguy

Message:

Email templates management complete.

Location:

trunk/Upload

Files:

• admin/admin/ad_settings.php (modified) (14 diffs)
• admin/look/ad_emails.php (modified) (8 diffs)
• admin/manage/ad_users.php (modified) (7 diffs)
• images/tiburon/icon_mail_pencil.png (added)
• images/tiburon/icon_tag.png (added)
• includes/classes/class_asession.php (modified) (1 diff)
• includes/classes/class_email.php (modified) (9 diffs)
• includes/functions/func_emails.php (modified) (2 diffs)
• includes/functions/func_users.php (modified) (2 diffs)
• language/en/ad_lang_emails.php (modified) (2 diffs)
• language/en/ad_lang_settings.php (modified) (1 diff)
• language/en/ad_lang_users.php (modified) (1 diff)
• language/en/lang_email_content.php (modified) (14 diffs)

trunk/Upload/admin/admin/ad_settings.php

@@ -21 +21 @@
 
 class ad_settings {
-        
+
         private $output = "";
 
@@ -33 +33 @@
 
                 $this->trellis->load_lang('settings');
-                
+
                 $this->trellis->skin->set_active_link( 1 );
 
@@ -61 +61 @@
                 # Do Output
                 #=============================
-                
+
                 if ( $alert )
                 {
@@ -70 +70 @@
                 {
                         $this->output .= $this->trellis->skin->tinymce_js( 'signature' );
-                        
+
                         $sig_html = 1;
                 }
@@ -77 +77 @@
                         $sig_html = 0;
                 }
-                
+
                 $this->trellis->load_functions('drop_downs');
-                
+
                 $this->output .= "<div id='ticketroll'>
                                                 ". $this->trellis->skin->start_form( "<! HD_URL !>/admin.php?section=admin&amp;page=settings&amp;act=doedit", 'edit_settings', 'post' ) ."
@@ -88 +88 @@
                                                 ". $this->trellis->skin->group_table_row( '{lang.dst}', $this->trellis->skin->custom_radio( 'time_dst', array( 0 => '{lang.inactive}', 1 => '{lang.active}', 2 => '{lang.auto}' ), $this->trellis->user['time_dst'] ), 'a' ) ."
                                                 ". $this->trellis->skin->group_table_row( '{lang.language}', "<select name='lang' id='lang'>". $this->trellis->func->drop_downs->lang_drop( $this->trellis->user['lang'] ) ."</select>", 'a' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.rich_text_editor}', $this->trellis->skin->enabled_disabled_radio( 'rte_enable', $this->trellis->user['rte_enable'] ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.rich_text_editor}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'rte_enable', 'value' => $this->trellis->user['rte_enable'] ) ), 'a' ) ."
                                                 ". $this->trellis->skin->group_table_sub( '{lang.ticket_column_layout}' );
-                
+
                 $columns = unserialize( $this->trellis->user['columns_tm'] );
-                
+
                 $lang_columns = array(
                                                           'id'                  => '{lang.id}',
@@ -108 +108 @@
                                                           'status'              => '{lang.status}',
                                                           );
-                
+
                 foreach( $this->trellis->cache->data['dfields'] as $cf )
                 {
                         if ( $cf['type'] != 'checkbox' ) $lang_columns[ 'cfd'. $cf['id'] ] = $cf['name'];
                 }
-                
+
                 foreach( $this->trellis->cache->data['pfields'] as $cf )
                 {
                         if ( $cf['type'] != 'checkbox' ) $lang_columns[ 'cfp'. $cf['id'] ] = $cf['name'];
                 }
-                
+
                 $columns_current = '';
                 $columns_available = '';
                 $cc_empty = '';
                 $ca_empty = '';
-                
+
                 if ( empty( $columns ) )
                 {
@@ -133 +133 @@
                         {
                                 ( $this->trellis->user['sort_tm'] == $key ) ? $stm_radio = " checked='yes'" : $stm_radio = "";
-                                
+
                                 $columns_current .= "<li id='c_". $key ."'>". $lang_columns[ $key ] ."<input type='text' id='cw_". $key ."' name='cw_". $key ."' value='". $width ."' size='3' style='float:right;margin-left:10px;text-align:right' /><input type='radio' id='sort_tm_". $key ."' name='sort_tm' value='". $key ."'". $stm_radio ." style='float:right;margin-top:5px;margin-left:10px;' /></li>";
-                                
+
                                 unset( $lang_columns[ $key ] );
                         }
                 }
-                
+
                 if ( empty( $lang_columns ) )
                 {
@@ -151 +151 @@
                         }
                 }
-                                                
+
                 $column_layout .= "<div style='width:49%;float:left'>
                                                         <fieldset>
@@ -166 +166 @@
                                                         </fieldset>
                                                         </div>";
-                                                
+
                 $this->output .= $this->trellis->skin->group_table_full_row( $column_layout ) ."
                                                 ". $this->trellis->skin->group_table_row( '{lang.default_sort_order}', $this->trellis->skin->custom_radio( array( 'name' => 'order_tm', 'options' => array( 0 => '{lang.ascending}', 1 => '{lang.descending}' ), 'value' => $this->trellis->user['order_tm'] ) ), 'a' ) ."
                                                 ". $this->trellis->skin->group_table_sub( '{lang.staff_email_preferences}' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.email_notifications}', $this->trellis->skin->enabled_disabled_radio( 'email_staff_enable', $this->trellis->user['email_staff_enable'] ), 'a' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.email_ticket}', $this->trellis->skin->enabled_disabled_radio( 'email_staff_ticket', $this->trellis->user['email_staff_ticket'] ), 'a' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.email_reply}', $this->trellis->skin->enabled_disabled_radio( 'email_staff_reply', $this->trellis->user['email_staff_reply'] ), 'a' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.email_assign}', $this->trellis->skin->enabled_disabled_radio( 'email_staff_assign', $this->trellis->user['email_staff_assign'] ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_notifications}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_enable', 'value' => $this->trellis->user['email_staff_enable'], 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['enable'], 'for' => 1, 'msg' => '{lang.warn_email_enable}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_ticket}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_ticket', 'value' => $this->trellis->user['email_staff_ticket'], 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['ticket'], 'for' => 1, 'msg' => '{lang.warn_email_ticket}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_reply}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_reply', 'value' => $this->trellis->user['email_staff_reply'], 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['reply'], 'for' => 1, 'msg' => '{lang.warn_email_reply}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_assign}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_assign', 'value' => $this->trellis->user['email_staff_assign'], 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['assign'], 'for' => 1, 'msg' => '{lang.warn_email_assign}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_escalate}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_escalate', 'value' => $this->trellis->user['email_staff_escalate'], 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['escalate'], 'for' => 1, 'msg' => '{lang.warn_email_escalate}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_hold}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_hold', 'value' => $this->trellis->user['email_staff_hold'], 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['hold'], 'for' => 1, 'msg' => '{lang.warn_email_hold}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_move_to}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_move_to', 'value' => $this->trellis->user['email_staff_move_to'], 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['move_to'], 'for' => 1, 'msg' => '{lang.warn_email_move_to}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_move_away}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_move_away', 'value' => $this->trellis->user['email_staff_move_away'], 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['move_away'], 'for' => 1, 'msg' => '{lang.warn_email_move_away}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_close}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_close', 'value' => $this->trellis->user['email_staff_close'], 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['close'], 'for' => 1, 'msg' => '{lang.warn_email_close}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_reopen}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_reopen', 'value' => $this->trellis->user['email_staff_reopen'], 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['reopen'], 'for' => 1, 'msg' => '{lang.warn_email_reopen}' ) ) ), 'a' ) ."
                                                 ". $this->trellis->skin->group_table_row( '{lang.receive_for}', $this->trellis->skin->checkbox( array( 'name' => 'esn_unassigned', 'title' => '{lang.unassigned_tickets}', 'value' => $this->trellis->user['esn_unassigned'] ) ) ."<br />". $this->trellis->skin->checkbox( array( 'name' => 'esn_assigned', 'title' => '{lang.assigned_tickets}', 'value' => $this->trellis->user['esn_assigned'] ) ) ."<br />". $this->trellis->skin->checkbox( array( 'name' => 'esn_assigned_to_me', 'title' => '{lang.tickets_assigned_to_me}', 'value' => $this->trellis->user['esn_assigned_to_me'] ) ), 'a' ) ."
                                                 ". $this->trellis->skin->group_table_sub( '{lang.email_preferences}' ) ."
@@ -183 +189 @@
                                                 ". $this->trellis->skin->end_form( $this->trellis->skin->submit_button( 'edit', '{lang.button_edit_settings}' ) ) ."
                                                 </div>";
-                
+
                 $this->trellis->skin->end_group( 'a' );
-        
+
                 $this->output .= "<script type='text/javascript'>
                                                 $('#columns_current, #columns_available').sortable({
@@ -193 +199 @@
                                                 $('#cc_serialized').val( $('#columns_current').sortable('serialize') );
                                                 </script>";
-                
+
                 $this->trellis->skin->add_sidebar_general( '{lang.hey_you_title}', '{lang.hey_you_msg}' );
 
@@ -230 +236 @@
 
                 $this->trellis->db->execute();
-                
+
                 $db_array_old = $db_array;
 
                 $db_array = array(
-                                                  'email_staff_enable'  => $this->trellis->input['email_staff_enable'],
-                                                  'email_staff_ticket'  => $this->trellis->input['email_staff_ticket'],
-                                                  'email_staff_reply'   => $this->trellis->input['email_staff_reply'],
-                                                  'email_staff_assign'  => $this->trellis->input['email_staff_assign'],
-                                                  'esn_unassigned'              => $this->trellis->input['esn_unassigned'],
-                                                  'esn_assigned'                => $this->trellis->input['esn_assigned'],
-                                                  'esn_assigned_to_me'  => $this->trellis->input['esn_assigned_to_me'],
-                                                  'sort_tm'                             => $this->trellis->input['sort_tm'],
-                                                  'order_tm'                    => $this->trellis->input['order_tm'],
+                                                  'email_staff_enable'      => $this->trellis->input['email_staff_enable'],
+                                                  'email_staff_ticket'      => $this->trellis->input['email_staff_ticket'],
+                                                  'email_staff_reply'       => $this->trellis->input['email_staff_reply'],
+                                                  'email_staff_assign'      => $this->trellis->input['email_staff_assign'],
+                                                  'email_staff_escalate'        => $this->trellis->input['email_staff_escalate'],
+                                                  'email_staff_hold'        => $this->trellis->input['email_staff_hold'],
+                                                  'email_staff_move_to'     => $this->trellis->input['email_staff_move_to'],
+                                                  'email_staff_move_away'       => $this->trellis->input['email_staff_move_away'],
+                                                  'email_staff_close'       => $this->trellis->input['email_staff_close'],
+                                                  'email_staff_reopen'      => $this->trellis->input['email_staff_reopen'],
+                                                  'esn_unassigned'                  => $this->trellis->input['esn_unassigned'],
+                                                  'esn_assigned'                    => $this->trellis->input['esn_assigned'],
+                                                  'esn_assigned_to_me'      => $this->trellis->input['esn_assigned_to_me'],
+                                                  'sort_tm'                                 => $this->trellis->input['sort_tm'],
+                                                  'order_tm'                        => $this->trellis->input['order_tm'],
                                                   );
-                
+
                 parse_str( str_replace( '&amp;', '&', $this->trellis->input['cc_serialized'] ), $order );
-                
+
                 if ( ! empty( $order['c'] ) )
                 {
                         $columns = array();
-                        
+
                         foreach( $order['c'] as $column )
                         {
                                 $columns[ $column ] = $this->trellis->input[ 'cw_'. $column ];
                         }
-                        
+
                         $db_array['columns_tm'] = serialize( $columns );
                 }
@@ -269 +281 @@
 
                 $this->trellis->log( 'admin', "ACP Settings Updated &#039;". $this->trellis->user['name'] ."&#039;", 1, $this->trellis->user['id'] );
-                
+
                 $this->trellis->user = array_merge( $this->trellis->user, $db_array );
                 $this->trellis->user = array_merge( $this->trellis->user, $db_array_old );
-                
+
                 #=============================
                 # Do Output

trunk/Upload/admin/look/ad_emails.php

@@ -127 +127 @@
                     {
                             $email_rows .= "<tr>
-                                                                <td class='bluecellthin-light'><strong>{lang.email_{$key}}</strong></td>
-                                                                <td class='bluecellthin-dark'>{lang.email_{$key}_desc}</td>
-                                                                <td class='bluecellthin-light' align='center'><a href='<! HD_URL !>/admin.php?section=look&amp;page=emails&amp;act=edit&amp;lang={$this->trellis->input['lang']}'&amp;key={$key}&amp;type=text'>{lang.edit_plaintext}</a></td>
-                                                                <td class='bluecellthin-light' align='center'><a href='<! HD_URL !>/admin.php?section=look&amp;page=emails&amp;act=edit&amp;lang={$this->trellis->input['lang']}'&amp;key={$key}&amp;type=html'>{lang.edit_html}</a></td>
+                                                                <td class='bluecellthin-light'><a href='<! HD_URL !>/admin.php?section=look&amp;page=emails&amp;act=edit&amp;lang={$this->trellis->input['lang']}&amp;key={$key}'><strong>{lang.email_{$key}}</strong></a></td>
+                                                                <td class='bluecellthin-dark'><a href='<! HD_URL !>/admin.php?section=look&amp;page=emails&amp;act=edit&amp;lang={$this->trellis->input['lang']}&amp;key={$key}'>{lang.email_{$key}_desc}</a></td>
+                                                                <td class='bluecellthin-light' align='center'><a href='<! HD_URL !>/admin.php?section=look&amp;page=emails&amp;act=edit&amp;lang={$this->trellis->input['lang']}&amp;key={$key}'><img src='<! IMG_DIR !>/button_edit.gif' alt='{lang.edit}' /></a></td>
                                                         </tr>";
                     }
@@ -151 +150 @@
                                                 ". $this->trellis->skin->start_group_table( '{lang.emails_list}' ) ."
                                                 <tr>
-                                                        <th class='bluecellthin-th' width='20%' align='left'>{lang.name}</th>
-                                                        <th class='bluecellthin-th' width='45%' align='left'>{lang.description}</th>
-                                                        <th class='bluecellthin-th' width='14%' align='center'>{lang.edit}</th>
-                                                        <th class='bluecellthin-th' width='11%' align='center'>{lang.edit}</th>
+                                                        <th class='bluecellthin-th' width='28%' align='left'>{lang.name}</th>
+                                                        <th class='bluecellthin-th' width='57%' align='left'>{lang.description}</th>
+                                                        <th class='bluecellthin-th' width='5%' align='center'>{lang.edit}</th>
                                                 </tr>
                                                 ". $email_rows ."
@@ -175 +173 @@
 
         #=======================================
-        # @ Edit Reply Template
-        #=======================================
-
-        private function edit_rtemplate($error='')
+        # @ Edit Email Template
+        #=======================================
+
+        private function edit_email($error='')
         {
                 $this->trellis->load_functions('emails');
@@ -186 +184 @@
                 #=============================
 
-                $this->trellis->check_perm( 'manage', 'rtemplates', 'edit' );
-
-                #=============================
-                # Grab Reply Template
-                #=============================
-
-                if ( ! $rt = $this->trellis->func->rtemplates->get_single_by_id( array( 'id', 'name', 'description', 'content_html', 'content_plaintext' ), $this->trellis->input['id'] ) ) $this->trellis->skin->error('no_rtemplate');
-
-                #=============================
-                # Do Output
-                #=============================
+                $this->trellis->check_perm( 'manage', 'emails', 'edit' );
+
+                #=============================
+                # Grab Email Template
+                #=============================
+
+                if ( ! $e = $this->trellis->func->emails->get_single( $this->trellis->input['lang'], $this->trellis->input['key'] ) ) $this->trellis->skin->error('no_email');
+
+                #=============================
+                # Do Output
+                #=============================
+
+                if ( ! is_writable( HD_PATH .'language/'. $this->trellis->input['lang'] .'/lang_email_content.php' ) ) $error = 'not_writable';
 
                 if ( $error )
@@ -207 +207 @@
 
                 $this->output .= "<div id='ticketroll'>
-                                                ". $this->trellis->skin->start_form( "<! HD_URL !>/admin.php?section=manage&amp;page=rtemplates&amp;act=doedit&amp;id={$rt['id']}", 'edit_rtemplate', 'post' ) ."
-                                                ". $this->trellis->skin->start_group_table( '{lang.editing_rtemplate} '. $rt['name'], 'a' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.name}', $this->trellis->skin->textfield( 'name', $rt['name'] ), 'a', '16%', '84%' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.description}', $this->trellis->skin->textarea( array( 'name' => 'description', 'value' => $rt['description'], 'cols' => 60, 'rows' => 2 ) ), 'a' ) ."
+                                                ". $this->trellis->skin->start_form( "<! HD_URL !>/admin.php?section=look&amp;page=emails&amp;act=doedit&amp;lang={$this->trellis->input['lang']}&amp;key={$this->trellis->input['key']}", 'edit_email', 'post' ) ."
+                                                ". $this->trellis->skin->start_group_table( '{lang.editing_email} {lang.email_'. $this->trellis->input['key'] .'}', 'a' );
+
+                $this->output .= $this->trellis->skin->group_table_full_row( '{lang.email_'. $this->trellis->input['key'] .'_desc}', 'a' );
+
+
+
+                if ( $this->trellis->input['key'] != 'header' && $this->trellis->input['key'] != 'footer' ) $this->output .= $this->trellis->skin->group_table_row( '{lang.subject}', $this->trellis->skin->textfield( 'subject', $e['subject'] ), 'a', '16%', '84%' );
+
+                $this->output .= $this->trellis->skin->group_table_sub( '{lang.html_content}' ) ."
+                                                ". $this->trellis->skin->group_table_full_row( $this->trellis->skin->textarea( array( 'name' => 'content_html', 'value' => $e['html'], 'cols' => 80, 'rows' => 10, 'width' => '98%', 'height' => '280px' ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_sub( '{lang.text_content}' ) ."
+                                                ". $this->trellis->skin->group_table_full_row( $this->trellis->skin->textarea( array( 'name' => 'content_text', 'value' => $e['plaintext'], 'cols' => 80, 'rows' => 10, 'width' => '98%', 'height' => '250px' ) ), 'a' ) ."
                                                 ". $this->trellis->skin->end_group_table( 'a' ) ."
-                                                ". $this->trellis->skin->group_sub( '{lang.html_content}' ) ."
-                                                <div class='option1'>". $this->trellis->skin->textarea( array( 'name' => 'content_html', 'value' => $rt['content_html'], 'cols' => 80, 'rows' => 8, 'width' => '98%', 'height' => '200px' ) ) ."</div>
-                                                ". $this->trellis->skin->group_sub( '{lang.plaintext_content}' ) ."
-                                                <div class='option2'>". $this->trellis->skin->textarea( array( 'name' => 'content_plaintext', 'value' => $rt['content_plaintext'], 'cols' => 80, 'rows' => 7, 'width' => '98%', 'height' => '180px' ) ) ."</div>
-                                                ". $this->trellis->skin->end_form( $this->trellis->skin->submit_button( 'edit', '{lang.button_edit_rtemplate}' ) ) ."
+                                                ". $this->trellis->skin->end_form( $this->trellis->skin->submit_button( 'edit', '{lang.button_edit_email}' ) ) ."
                                                 </div>";
 
                 $validate_fields = array(
-                                                                 'name' => array( array( 'type' => 'presence', 'params' => array( 'fail_msg' => '{lang.lv_no_name}' ) ) ),
+                                                                 'subject'      => array( array( 'type' => 'presence', 'params' => array( 'fail_msg' => '{lang.lv_no_subject}' ) ) ),
                                                                  );
 
@@ -226 +231 @@
 
                 $menu_items = array(
-                                                        array( 'arrow_back', '{lang.menu_back}', '<! HD_URL !>/admin.php?section=manage&amp;page=rtemplates' ),
-                                                        array( 'circle_plus', '{lang.menu_add}', '<! HD_URL !>/admin.php?section=manage&amp;page=rtemplates&amp;act=add' ),
-                                                        array( 'settings', '{lang.menu_settings}', '<! HD_URL !>/admin.php?section=tools&amp;page=settings&amp;act=edit&amp;group=ticket' ),
+                                                        array( 'arrow_back', '{lang.menu_back}', '<! HD_URL !>/admin.php?section=look&amp;page=email' ),
+                                                        array( 'tag', '{lang.menu_template_tags}', '#' ),
+                                                        array( 'mails_arrow', '{lang.menu_mass_email}', '<! HD_URL !>/admin.php?section=tools&amp;page=email&amp;act=mass' ),
+                                                        array( 'settings', '{lang.menu_settings}', '<! HD_URL !>/admin.php?section=tools&amp;page=settings&amp;act=edit&amp;group=email' ),
                                                         );
 
-                $this->trellis->skin->add_sidebar_menu( '{lang.menu_rtemplates_options}', $menu_items );
+                $this->trellis->skin->add_sidebar_menu( '{lang.menu_email_options}', $menu_items );
                 $this->trellis->skin->add_sidebar_help( '{lang.random_title}', '{lang.random_text}' );
 
@@ -240 +246 @@
 
         #=======================================
-        # @ Do Edit Reply Template
+        # @ Do Edit Email Template
         #=======================================
 
         private function do_edit()
         {
+            $this->trellis->load_functions('emails');
+
                 #=============================
                 # Security Checks
                 #=============================
 
-                $this->trellis->check_perm( 'manage', 'rtemplates', 'edit' );
-
-                if ( ! $this->trellis->input['name'] ) $this->edit_rtemplate('no_name');
+                $this->trellis->check_perm( 'manage', 'emails', 'edit' );
+
+                if ( ! $this->trellis->input['subject'] && $this->trellis->input['key'] != 'header' && $this->trellis->input['key'] != 'footer' ) $this->edit_email('no_subject');
+                if ( ! $this->trellis->input['content_html'] ) $this->edit_email('no_content_html');
+                if ( ! $this->trellis->input['content_text'] ) $this->edit_email('no_content_text');
 
                 #=============================
@@ -257 +267 @@
                 #=============================
 
-                $db_array = array(
-                                                  'name'                                => $this->trellis->input['name'],
-                                                  'description'                 => $this->trellis->input['description'],
-                                                  'content_html'                => $this->trellis->input['content_html'],
-                                                  'content_plaintext'   => $this->trellis->input['content_plaintext'],
-                                                  );
-
-                $this->trellis->func->rtemplates->edit( $db_array, $this->trellis->input['id'] );
-
-                $this->trellis->log( 'admin', "Reply Template Updated &#039;". $this->trellis->input['name'] ."&#039;", 1, $this->trellis->input['id'] );
-
-                #=============================
-                # Rebuild Cache
-                #=============================
-
-                $this->trellis->load_functions('rebuild');
-
-                $this->trellis->func->rebuild->rtemplates_cache();
-
-                #=============================
-                # Do Output
-                #=============================
-
-                $this->list_rtemplates( NULL, 'rtemplate_updated' );
+                if ( ! $this->trellis->func->emails->edit( $this->trellis->input['lang'], $this->trellis->input['key'], $this->trellis->input['subject'], $this->trellis->input['content_html'], $this->trellis->input['content_text'] ) ) $this->edit_email('not_writable');
+
+                $this->trellis->log( 'admin', "Email Templates Updated &#039;". $this->trellis->input['lang'] ."&#039;", 1, $this->trellis->input['lang'] );
+
+                #=============================
+                # Do Output
+                #=============================
+
+                $this->list_emails( array( 'alert' => 'email_updated' ) );
         }
 

trunk/Upload/admin/manage/ad_users.php

@@ -311 +311 @@
                                                 ". $this->trellis->skin->group_table_row( '{lang.language}', "<select name='lang' id='lang'>". $this->trellis->func->drop_downs->lang_drop( $this->trellis->input['lang'] ) ."</select>", 'a' ) ."
                                                 ". $this->trellis->skin->group_table_row( '{lang.skin}', "<select name='skin' id='skin'>". $this->trellis->func->drop_downs->skin_drop( $this->trellis->input['skin'] ) ."</select>", 'a' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.rich_text_editor}', $this->trellis->skin->enabled_disabled_radio( 'rte_enable', 1 ), 'a' );
+                                                ". $this->trellis->skin->group_table_row( '{lang.rich_text_editor}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'rte_enable', 'value' => 1 ) ), 'a' );
 
                 if ( $cfields = $this->trellis->func->cpfields->grab( 0, 1 ) )
@@ -352 +352 @@
 
                 $this->output .= $this->trellis->skin->group_table_sub( '{lang.user_email_preferences}' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.email_notifications}', $this->trellis->skin->enabled_disabled_radio( 'email_enable', 1 ), 'a' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.email_ticket}', $this->trellis->skin->enabled_disabled_radio( 'email_ticket', 1 ), 'a' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.email_reply}', $this->trellis->skin->enabled_disabled_radio( 'email_action', 1 ), 'a' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.email_news}', $this->trellis->skin->enabled_disabled_radio( 'email_news', 1 ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_notifications}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_enable', 'value' => 1, 'alert' => array( 'check' => $this->trellis->cache->data['settings']['eunotify']['enable'], 'for' => 1, 'msg' => '{lang.warn_email_user_enable}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_user_ticket}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_ticket', 'value' => 1 ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_user_action}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_action', 'value' => 1 ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_news}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_news', 'value' => 1 ) ), 'a' ) ."
                                                 ". $this->trellis->skin->group_table_sub( '{lang.staff_email_preferences}' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.email_notifications}', $this->trellis->skin->enabled_disabled_radio( 'email_staff_enable', 1 ), 'a' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.email_ticket}', $this->trellis->skin->enabled_disabled_radio( 'email_staff_ticket', 1 ), 'a' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.email_reply}', $this->trellis->skin->enabled_disabled_radio( 'email_staff_reply', 1 ), 'a' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.email_assign}', $this->trellis->skin->enabled_disabled_radio( 'email_staff_assign', 1 ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_notifications}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_enable', 'value' => 1, 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['enable'], 'for' => 1, 'msg' => '{lang.warn_email_enable}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_ticket}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_ticket', 'value' => 1, 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['ticket'], 'for' => 1, 'msg' => '{lang.warn_email_ticket}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_reply}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_reply', 'value' => 1, 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['reply'], 'for' => 1, 'msg' => '{lang.warn_email_reply}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_assign}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_assign', 'value' => 1, 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['assign'], 'for' => 1, 'msg' => '{lang.warn_email_assign}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_escalate}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_escalate', 'value' => 1, 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['escalate'], 'for' => 1, 'msg' => '{lang.warn_email_escalate}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_hold}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_hold', 'value' => 1, 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['hold'], 'for' => 1, 'msg' => '{lang.warn_email_hold}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_move_to}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_move_to', 'value' => 1, 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['move_to'], 'for' => 1, 'msg' => '{lang.warn_email_move_to}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_move_away}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_move_away', 'value' => 1, 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['move_away'], 'for' => 1, 'msg' => '{lang.warn_email_move_away}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_close}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_close', 'value' => 1, 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['close'], 'for' => 1, 'msg' => '{lang.warn_email_close}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_reopen}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_reopen', 'value' => 1, 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['reopen'], 'for' => 1, 'msg' => '{lang.warn_email_reopen}' ) ) ), 'a' ) ."
                                                 ". $this->trellis->skin->group_table_row( '{lang.receive_for}', $this->trellis->skin->checkbox( array( 'name' => 'esn_unassigned', 'title' => '{lang.unassigned_tickets}', 'value' => 1 ) ) ."<br />". $this->trellis->skin->checkbox( array( 'name' => 'esn_assigned', 'title' => '{lang.assigned_tickets}', 'value' => 1 ) ) ."<br />". $this->trellis->skin->checkbox( array( 'name' => 'esn_assigned_to_me', 'title' => '{lang.tickets_assigned_to_me}', 'value' => 1 ) ), 'a' ) ."
                                                 ". $this->trellis->skin->group_table_sub( '{lang.email_preferences}' ) ."
@@ -445 +451 @@
                 if ( $staff )
                 {
-                        $us = $this->trellis->func->users->get_single_by_id_staff( array( 'email_staff_enable', 'email_staff_ticket', 'email_staff_reply', 'email_staff_assign', 'esn_unassigned', 'esn_assigned', 'esn_assigned_to_me' ), $u['id'] );
+                        $us = $this->trellis->func->users->get_single_by_id_staff( array( 'email_staff_enable', 'email_staff_ticket', 'email_staff_reply', 'email_staff_assign', 'email_staff_escalate', 'email_staff_hold', 'email_staff_move_to', 'email_staff_move_away', 'email_staff_close', 'email_staff_reopen', 'esn_unassigned', 'esn_assigned', 'esn_assigned_to_me' ), $u['id'] );
 
                         if ( is_array( $us ) ) $u = array_merge( $us, $u );
@@ -498 +504 @@
                                                 ". $this->trellis->skin->group_table_row( '{lang.language}', "<select name='lang' id='lang'>". $this->trellis->func->drop_downs->lang_drop( $lang ) ."</select>", 'a' ) ."
                                                 ". $this->trellis->skin->group_table_row( '{lang.skin}', "<select name='skin' id='skin'>". $this->trellis->func->drop_downs->skin_drop( $skin ) ."</select>", 'a' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.rich_text_editor}', $this->trellis->skin->enabled_disabled_radio( 'rte_enable', $u['rte_enable'] ), 'a' );
+                                                ". $this->trellis->skin->group_table_row( '{lang.rich_text_editor}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'rte_enable', 'value' => $u['rte_enable'] ) ), 'a' );
 
                 if ( $cfields = $this->trellis->func->cpfields->grab( 0, 1 ) )
@@ -541 +547 @@
 
                 $this->output .= $this->trellis->skin->group_table_sub( '{lang.user_email_preferences}' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.email_notifications}', $this->trellis->skin->enabled_disabled_radio( 'email_enable', $u['email_enable'] ), 'a' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.email_ticket}', $this->trellis->skin->enabled_disabled_radio( 'email_ticket', $u['email_ticket'] ), 'a' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.email_reply}', $this->trellis->skin->enabled_disabled_radio( 'email_action', $u['email_action'] ), 'a' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.email_news}', $this->trellis->skin->enabled_disabled_radio( 'email_news', $u['email_news'] ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_notifications}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_enable', 'value' => $u['email_enable'], 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['enable'], 'for' => 1, 'msg' => '{lang.warn_email_user_enable}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_user_ticket}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_ticket', 'value' => $u['email_ticket'] ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_user_action}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_action', 'value' => $u['email_action'] ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_news}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_news', 'value' => $u['email_news'] ) ), 'a' ) ."
                                                 ". $this->trellis->skin->group_table_sub( '{lang.staff_email_preferences}' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.email_notifications}', $this->trellis->skin->enabled_disabled_radio( 'email_staff_enable', $u['email_staff_enable'] ), 'a' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.email_ticket}', $this->trellis->skin->enabled_disabled_radio( 'email_staff_ticket', $u['email_staff_ticket'] ), 'a' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.email_reply}', $this->trellis->skin->enabled_disabled_radio( 'email_staff_reply', $u['email_staff_reply'] ), 'a' ) ."
-                                                ". $this->trellis->skin->group_table_row( '{lang.email_assign}', $this->trellis->skin->enabled_disabled_radio( 'email_staff_assign', $u['email_staff_assign'] ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_notifications}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_enable', 'value' => $u['email_staff_enable'], 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['enable'], 'for' => 1, 'msg' => '{lang.warn_email_enable}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_ticket}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_ticket', 'value' => $u['email_staff_ticket'], 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['ticket'], 'for' => 1, 'msg' => '{lang.warn_email_ticket}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_reply}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_reply', 'value' => $u['email_staff_reply'], 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['reply'], 'for' => 1, 'msg' => '{lang.warn_email_reply}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_assign}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_assign', 'value' => $u['email_staff_assign'], 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['assign'], 'for' => 1, 'msg' => '{lang.warn_email_assign}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_escalate}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_escalate', 'value' => $u['email_staff_escalate'], 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['escalate'], 'for' => 1, 'msg' => '{lang.warn_email_escalate}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_hold}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_hold', 'value' => $u['email_staff_hold'], 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['hold'], 'for' => 1, 'msg' => '{lang.warn_email_hold}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_move_to}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_move_to', 'value' => $u['email_staff_move_to'], 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['move_to'], 'for' => 1, 'msg' => '{lang.warn_email_move_to}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_move_away}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_move_away', 'value' => $u['email_staff_move_away'], 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['move_away'], 'for' => 1, 'msg' => '{lang.warn_email_move_away}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_close}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_close', 'value' => $u['email_staff_close'], 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['close'], 'for' => 1, 'msg' => '{lang.warn_email_close}' ) ) ), 'a' ) ."
+                                                ". $this->trellis->skin->group_table_row( '{lang.email_reopen}', $this->trellis->skin->enabled_disabled_radio( array( 'name' => 'email_staff_reopen', 'value' => $u['email_staff_reopen'], 'alert' => array( 'check' => $this->trellis->cache->data['settings']['esnotify']['reopen'], 'for' => 1, 'msg' => '{lang.warn_email_reopen}' ) ) ), 'a' ) ."
                                                 ". $this->trellis->skin->group_table_row( '{lang.receive_for}', $this->trellis->skin->checkbox( array( 'name' => 'esn_unassigned', 'title' => '{lang.unassigned_tickets}', 'value' => $u['esn_unassigned'] ) ) ."<br />". $this->trellis->skin->checkbox( array( 'name' => 'esn_assigned', 'title' => '{lang.assigned_tickets}', 'value' => $u['esn_assigned'] ) ) ."<br />". $this->trellis->skin->checkbox( array( 'name' => 'esn_assigned_to_me', 'title' => '{lang.tickets_assigned_to_me}', 'value' => $u['esn_assigned_to_me'] ) ), 'a' ) ."
                                                 ". $this->trellis->skin->group_table_sub( '{lang.email_preferences}' ) ."
@@ -760 +772 @@
 
                 $db_array = array(
-                                                  'name'                                => $this->trellis->input['name'],
-                                                  'email'                               => $this->trellis->input['email'],
-                                                  'password'                    => $this->trellis->input['password'],
-                                                  'ugroup'                              => $this->trellis->input['ugroup'],
-                                                  'ugroup_sub'                  => $ugroup_sub,
-                                                  'title'                               => $this->trellis->input['title'],
-                                                  'joined'                              => time(),
-                                                  'sig_auto'                    => 1,
-                                                  'lang'                                => $this->trellis->input['lang'],
-                                                  'skin'                                => $this->trellis->input['skin'],
-                                                  'time_zone'                   => $this->trellis->input['time_zone'],
-                                                  'time_dst'                    => $this->trellis->input['time_dst'],
-                                                  'rte_enable'                  => $this->trellis->input['rte_enable'],
-                                                  'email_enable'                => $this->trellis->input['email_enable'],
-                                                  'email_ticket'                => $this->trellis->input['email_ticket'],
-                                                  'email_action'                        => $this->trellis->input['email_action'],
-                                                  'email_news'                  => $this->trellis->input['email_news'],
-                                                  'email_staff_enable'  => $this->trellis->input['email_staff_enable'],
-                                                  'email_staff_ticket'  => $this->trellis->input['email_staff_ticket'],
-                                                  'email_staff_reply'   => $this->trellis->input['email_staff_reply'],
-                                                  'email_staff_assign'  => $this->trellis->input['email_staff_assign'],
-                                                  'esn_unassigned'              => $this->trellis->input['esn_unassigned'],
-                                                  'esn_assigned'                => $this->trellis->input['esn_assigned'],
-                                                  'esn_assigned_to_me'  => $this->trellis->input['esn_assigned_to_me'],
-                                                  'email_type'                  => $this->trellis->input['email_type'],
-                                                  'val_email'                   => 1,
-                                                  'val_admin'                   => 1,
-                                                  'ipadd'                               => $this->trellis->input['ip_address'],
+                                                  'name'                                    => $this->trellis->input['name'],
+                                                  'email'                                   => $this->trellis->input['email'],
+                                                  'password'                        => $this->trellis->input['password'],
+                                                  'ugroup'                                  => $this->trellis->input['ugroup'],
+                                                  'ugroup_sub'                      => $ugroup_sub,
+                                                  'title'                                   => $this->trellis->input['title'],
+                                                  'joined'                                  => time(),
+                                                  'sig_auto'                        => 1,
+                                                  'lang'                                    => $this->trellis->input['lang'],
+                                                  'skin'                                    => $this->trellis->input['skin'],
+                                                  'time_zone'                       => $this->trellis->input['time_zone'],
+                                                  'time_dst'                        => $this->trellis->input['time_dst'],
+                                                  'rte_enable'                      => $this->trellis->input['rte_enable'],
+                                                  'email_enable'                    => $this->trellis->input['email_enable'],
+                                                  'email_ticket'                    => $this->trellis->input['email_ticket'],
+                                                  'email_action'                => $this->trellis->input['email_action'],
+                                                  'email_news'                      => $this->trellis->input['email_news'],
+                                                  'email_staff_enable'      => $this->trellis->input['email_staff_enable'],
+                                                  'email_staff_ticket'      => $this->trellis->input['email_staff_ticket'],
+                                                  'email_staff_reply'       => $this->trellis->input['email_staff_reply'],
+                                                  'email_staff_assign'      => $this->trellis->input['email_staff_assign'],
+                                                  'email_staff_escalate'        => $this->trellis->input['email_staff_escalate'],
+                                                  'email_staff_hold'        => $this->trellis->input['email_staff_hold'],
+                                                  'email_staff_move_to'     => $this->trellis->input['email_staff_move_to'],
+                                                  'email_staff_move_away'       => $this->trellis->input['email_staff_move_away'],
+                                                  'email_staff_close'       => $this->trellis->input['email_staff_close'],
+                                                  'email_staff_reopen'      => $this->trellis->input['email_staff_reopen'],
+                                                  'esn_unassigned'                  => $this->trellis->input['esn_unassigned'],
+                                                  'esn_assigned'                    => $this->trellis->input['esn_assigned'],
+                                                  'esn_assigned_to_me'      => $this->trellis->input['esn_assigned_to_me'],
+                                                  'email_type'                      => $this->trellis->input['email_type'],
+                                                  'val_email'                       => 1,
+                                                  'val_admin'                       => 1,
+                                                  'ipadd'                                   => $this->trellis->input['ip_address'],
                                                   );
 
@@ -895 +913 @@
 
                 $db_array = array(
-                                                  'name'                                => $this->trellis->input['name'],
-                                                  'email'                               => $this->trellis->input['email'],
-                                                  'ugroup'                              => $this->trellis->input['ugroup'],
-                                                  'ugroup_sub'                  => $ugroup_sub,
-                                                  'title'                               => $this->trellis->input['title'],
-                                                  'lang'                                => $this->trellis->input['lang'],
-                                                  'skin'                                => $this->trellis->input['skin'],
-                                                  'time_zone'                   => $this->trellis->input['time_zone'],
-                                                  'time_dst'                    => $this->trellis->input['time_dst'],
-                                                  'rte_enable'                  => $this->trellis->input['rte_enable'],
-                                                  'email_enable'                => $this->trellis->input['email_enable'],
-                                                  'email_ticket'                => $this->trellis->input['email_ticket'],
+                                                  'name'                                    => $this->trellis->input['name'],
+                                                  'email'                                   => $this->trellis->input['email'],
+                                                  'ugroup'                                  => $this->trellis->input['ugroup'],
+                                                  'ugroup_sub'                      => $ugroup_sub,
+                                                  'title'                                   => $this->trellis->input['title'],
+                                                  'lang'                                    => $this->trellis->input['lang'],
+                                                  'skin'                                    => $this->trellis->input['skin'],
+                                                  'time_zone'                       => $this->trellis->input['time_zone'],
+                                                  'time_dst'                        => $this->trellis->input['time_dst'],
+                                                  'rte_enable'                      => $this->trellis->input['rte_enable'],
+                                                  'email_enable'                    => $this->trellis->input['email_enable'],
+                                                  'email_ticket'                    => $this->trellis->input['email_ticket'],
                                                   'email_action'                        => $this->trellis->input['email_action'],
-                                                  'email_news'                  => $this->trellis->input['email_news'],
-                                                  'email_staff_enable'  => $this->trellis->input['email_staff_enable'],
-                                                  'email_staff_ticket'  => $this->trellis->input['email_staff_ticket'],
-                                                  'email_staff_reply'   => $this->trellis->input['email_staff_reply'],
-                                                  'email_staff_assign'  => $this->trellis->input['email_staff_assign'],
-                                                  'esn_unassigned'              => $this->trellis->input['esn_unassigned'],
-                                                  'esn_assigned'                => $this->trellis->input['esn_assigned'],
-                                                  'esn_assigned_to_me'  => $this->trellis->input['esn_assigned_to_me'],
-                                                  'email_type'                  => $this->trellis->input['email_type'],
+                                                  'email_news'                      => $this->trellis->input['email_news'],
+                                                  'email_staff_enable'      => $this->trellis->input['email_staff_enable'],
+                                                  'email_staff_ticket'      => $this->trellis->input['email_staff_ticket'],
+                                                  'email_staff_reply'       => $this->trellis->input['email_staff_reply'],
+                                                  'email_staff_assign'      => $this->trellis->input['email_staff_assign'],
+                                                  'email_staff_escalate'        => $this->trellis->input['email_staff_escalate'],
+                                                  'email_staff_hold'        => $this->trellis->input['email_staff_hold'],
+                                                  'email_staff_move_to'     => $this->trellis->input['email_staff_move_to'],
+                                                  'email_staff_move_away'       => $this->trellis->input['email_staff_move_away'],
+                                                  'email_staff_close'       => $this->trellis->input['email_staff_close'],
+                                                  'email_staff_reopen'      => $this->trellis->input['email_staff_reopen'],
+                                                  'esn_unassigned'                  => $this->trellis->input['esn_unassigned'],
+                                                  'esn_assigned'                    => $this->trellis->input['esn_assigned'],
+                                                  'esn_assigned_to_me'      => $this->trellis->input['esn_assigned_to_me'],
+                                                  'email_type'                      => $this->trellis->input['email_type'],
                                                   );
 

trunk/Upload/includes/classes/class_asession.php

@@ -60 +60 @@
                                                                                                          'select'       => array( 's' => 'all',
                                                                                                                                                   'u' => array( 'id', 'name', 'email', 'login_key', 'ugroup', 'title', 'joined', 'signature', 'sig_html', 'sig_auto', 'rss_key', 'lang', 'skin', 'time_zone', 'time_dst', 'rte_enable', 'email_type' ),
-                                                                                                                                                  'us' => array( 'email_staff_enable', 'email_staff_ticket', 'email_staff_reply', 'email_staff_assign', 'esn_unassigned', 'esn_assigned', 'esn_assigned_to_me', 'columns_tm', 'sort_tm', 'order_tm', 'dfilters_status', 'dfilters_depart', 'dfilters_priority' ),
+                                                                                                                                                  'us' => array( 'email_staff_enable', 'email_staff_ticket', 'email_staff_reply', 'email_staff_assign', 'email_staff_escalate', 'email_staff_hold', 'email_staff_move_to', 'email_staff_move_away', 'email_staff_close', 'email_staff_reopen', 'esn_unassigned', 'esn_assigned', 'esn_assigned_to_me', 'columns_tm', 'sort_tm', 'order_tm', 'dfilters_status', 'dfilters_depart', 'dfilters_priority' ),
                                                                                                                                                   'g' => 'all',
                                                                                                                                                  ),

trunk/Upload/includes/classes/class_email.php

@@ -258 +258 @@
             if ( is_numeric( $params['to'] ) )
             {
-                $this->to_send[ ++$this->to_send_id ] = array( 'id' => $params['to'], 'name' => $params['name'], 'msg' => $params['msg'], 'from' => $params['from'], 'replace' => $params['replace'], 'lang' => $params['lang'], 'preference' => $params['preference'], 'type' => $params['type'] );
+                $this->to_send[ ++$this->to_send_id ] = array( 'id' => $params['to'], 'name' => $params['name'], 'msg' => $params['msg'], 'from' => $params['from'], 'replace' => $params['replace'], 'lang' => $params['lang'], 'override' => $params['override'], 'format' => $params['format'], 'type' => $params['type'] );
             }
         else
             {
-                $this->to_send[ ++$this->to_send_id ] = array( 'email' => $params['to'], 'name' => $params['name'], 'msg' => $params['msg'], 'from' => $params['from'], 'replace' => $params['replace'], 'lang' => $params['lang'], 'preference' => $params['preference'], 'type' => $params['type'] );
+                $this->to_send[ ++$this->to_send_id ] = array( 'email' => $params['to'], 'name' => $params['name'], 'msg' => $params['msg'], 'from' => $params['from'], 'replace' => $params['replace'], 'lang' => $params['lang'], 'override' => $params['override'], 'format' => $params['format'], 'type' => $params['type'] );
             }
 
@@ -280 +280 @@
 
         #=======================================
-        # @ User Notification
-        #=======================================
-
-        public function user_notification($params=array())
-        {
-            if ( ! $this->trellis->cache->data['settings']['eunotify']['enable'] ) return false;
-        if ( ! $params['id'] && ! $this->trellis->cache->data['settings']['eunotify']['guest'] ) return false;
-
-        return $this->send_email( $params );
-        }
-
-        #=======================================
-        # @ Staff Notification
-        #=======================================
-
-        public function staff_notification($params=array())
-        {
-            if ( ! $this->trellis->cache->data['settings']['esnotify']['enable'] ) return false;
-
-        return $this->send_email( $params );
+        # @ Get User
+        #=======================================
+
+        public function get_user($id)
+        {
+            #* probably not the fastest because we are always pulling all email type fields and staff fields
+
+            return $this->trellis->db->get_single( array(
+                                                                                                 'select'       => array(
+                                                                                                                                         'u'    => array( 'id', 'name', 'email', 'lang', 'email_enable', 'email_ticket', 'email_action', 'email_news', 'email_type' ),
+                                                                                                                                         'us'   => array( 'email_staff_enable', 'email_staff_ticket', 'email_staff_reply', 'email_staff_assign', 'email_staff_escalate', 'email_staff_hold', 'email_staff_move_to', 'email_staff_move_away', 'email_staff_close', 'email_staff_reopen' ),
+                                                                                                                                         ),
+                                                                                                 'from'     => array( 'u' => 'users' ),
+                                                                                                 'join'     => array( array( 'from' => array( 'us' => 'users_staff' ), 'where' => array( 'u' => 'id', '=', 'us' => 'uid' ) ) ),
+                                                                                                 'where'        => array( array( 'u' => 'id' ), '=', $id ),
+                                              ), 'id' );
+        }
+
+        #=======================================
+        # @ Get Users
+        #=======================================
+
+        public function get_users($ids)
+        {
+            #* probably not the fastest because we are always pulling all email type fields and staff fields
+
+            return $this->trellis->db->get( array(
+                                                                                  'select'      => array(
+                                                                                                                        'u'         => array( 'id', 'name', 'email', 'lang', 'email_enable', 'email_ticket', 'email_action', 'email_news', 'email_type' ),
+                                                                                                                        'us'    => array( 'email_staff_enable', 'email_staff_ticket', 'email_staff_reply', 'email_staff_assign', 'email_staff_escalate', 'email_staff_hold', 'email_staff_move_to', 'email_staff_move_away', 'email_staff_close', 'email_staff_reopen' ),
+                                                                ),
+                                                                                  'from'        => array( 'u' => 'users' ),
+                                                                                  'join'        => array( array( 'from' => array( 'us' => 'users_staff' ), 'where' => array( 'u' => 'id', '=', 'us' => 'uid' ) ) ),
+                                              'where'   => array( array( 'u' => 'id' ), 'in', $ids ),
+                                       ), 'id' );
         }
 
@@ -317 +332 @@
                 #=============================
 
-            #*
-            #* we need to properly check their preference. allow function to take in a paramater that gives the notification type.
-            #* then check the notification type against the user preference in the database. also respect email_enable.
-            #*
-
-            #*
-            #* add new notifications types to my acp settings and add / edit use. be sure to include setting warning.
-            #*
-
             $lookup_ids = array();
 
@@ -341 +347 @@
             if ( count( $lookup_ids ) == 1 )
             {
-                if ( ! $u = $this->trellis->func->users->get_single( array( 'id', 'name', 'email', 'lang', 'email_enable', 'email_type' ), array( 'id', '=', $lookup_ids[0] ) ) ) trigger_error( "Email - User not found: ". $lookup_ids[0], E_USER_NOTICE );
+                if ( ! $u = $this->get_user( $lookup_ids[0] ) ) trigger_error( "Email - User not found: ". current( $lookup_ids ), E_USER_NOTICE );
 
                 $users[ $u['id'] ] = $u;
@@ -347 +353 @@
             else
             {
-                if ( ! $users = $this->trellis->func->users->get( array( 'select' => array( 'id', 'name', 'email', 'lang', 'email_enable', 'email_type' ), 'where' => array( 'id', 'in', $lookup_ids ) ) ) ) trigger_error( "Email - No users found.", E_USER_NOTICE );
+                if ( ! $users = $this->get_users( $lookup_ids ) ) trigger_error( "Email - No users found.", E_USER_NOTICE );
             }
         }
@@ -358 +364 @@
         {
             if ( ! $data['lang'] && $data['id'] ) $data['lang'] = $users[ $data['id'] ]['lang'];
-            if ( ! $data['type'] && $data['id'] ) $this->to_send[ $id ]['type'] = $users[ $data['id'] ]['email_type'];
+            if ( ! $data['format'] && $data['id'] ) $this->to_send[ $id ]['format'] = $users[ $data['id'] ]['email_type'];
 
             if ( ! $data['lang'] || ! $this->trellis->cache->data['langs'][ $data['lang'] ] ) $data['lang'] = $this->trellis->cache->data['misc']['default_lang'];
 
-            if ( $this->to_send[ $id ]['type'] == 1 )
-            {
-                $this->to_send[ $id ]['type'] = 'html';
-            }
-            elseif ( $this->to_send[ $id ]['type'] == 2 )
-            {
-                $this->to_send[ $id ]['type'] = 'text';
-            }
-
-            if ( ! $this->to_send[ $id ]['type'] ) $this->to_send[ $id ]['type'] = 'html';
+            if ( $this->to_send[ $id ]['format'] == 1 )
+            {
+                $this->to_send[ $id ]['format'] = 'html';
+            }
+            elseif ( $this->to_send[ $id ]['format'] == 2 )
+            {
+                $this->to_send[ $id ]['format'] = 'text';
+            }
+
+            if ( ! $this->to_send[ $id ]['format'] ) $this->to_send[ $id ]['format'] = 'html'; // Default to HTML
 
             if ( ! $data['name'] && $data['id'] ) $this->to_send[ $id ]['name'] = $users[ $data['id'] ]['name'];
             if ( ! $data['email'] && $data['id'] ) $this->to_send[ $id ]['email'] = $users[ $data['id'] ]['email'];
-            if ( ! $data['preference'] && $data['id'] ) $this->to_send[ $id ]['preference'] = $users[ $data['id'] ]['email_enable'];
-
-            #if ( isset( $this->to_send[ $id ]['preference'] ) && $this->to_send[ $id ]['preference'] ) $languages[ $data['lang'] ][] = $id;
-            $languages[ $data['lang'] ][] = $id;
+
+            // Check Preferences / Permissions
+
+            $type_staff = strpos( $data['type'], 'staff_' );
+
+            ( $type_staff ) ? $this->to_send[ $id ]['preference'] = $this->trellis->cache->data['settings']['esnotify']['enable'] : $this->to_send[ $id ]['preference'] = $this->trellis->cache->data['settings']['eunotify']['enable'];
+
+            if ( $data['id'] && $this->to_send[ $id ]['preference'] )
+            {
+                ( $type_staff === 0 ) ? $this->to_send[ $id ]['preference'] = $users[ $data['id'] ]['email_staff_enable'] : $this->to_send[ $id ]['preference'] = $users[ $data['id'] ]['email_enable'];
+            }
+
+            if ( $data['type'] && $this->to_send[ $id ]['preference'] ) $this->to_send[ $id ]['preference'] = $users[ $data['id'] ][ 'email_'. $data['type'] ];
+
+            if ( ! $data['id'] && $this->trellis->cache->data['settings']['eunotify']['guest'] ) $this->to_send[ $id ]['preference'] = 1; // Set Guest Preference
+
+            if ( $this->to_send[ $id ]['preference'] || $data['override'] ) $languages[ $data['lang'] ][] = $id;
         }
 
@@ -407 +426 @@
                 }
 
-                if ( $this->to_send[ $id ]['type'] == 'html' && ! $lang[ $msg .'_html' ] )
+                if ( $this->to_send[ $id ]['format'] == 'html' && ! $lang[ $msg .'_html' ] )
                 {
                     trigger_error( "Email - Language message missing: ". $msg .'_html', E_USER_NOTICE );
@@ -414 +433 @@
                 }
 
-                $message_text = $lang['header'] . $lang[ $msg ] . $lang['footer'];
-                $message_html = $lang['header_html'] . $lang[ $msg .'_html' ] . $lang['footer_html'];
+                $message_text = $this->trellis->prepare_output( $lang['header'] ."\n\n". $lang[ $msg ] ."\n\n". $lang['footer'], array( 'html' => 1, 'entity' => 1 ) );
+                $message_html = $this->trellis->prepare_output( $lang['header_html'] .'<br /> <br />'. $lang[ $msg .'_html' ] .'<br /> <br />'. $lang['footer_html'], array( 'html' => 1, 'entity' => 1 ) );
 
                 $this->create_message( $id );
@@ -427 +446 @@
                 $this->add_to( $this->to_send[ $id ]['email'], $this->to_send[ $id ]['name'] );
 
-                if ( $this->trellis->cache->data['settings']['email']['html'] && $this->to_send[ $id ]['type'] == 'html' )
+                if ( $this->trellis->cache->data['settings']['email']['html'] && $this->to_send[ $id ]['format'] == 'html' )
                 {
                     $this->set_body( $message_html, 'text/html' );

trunk/Upload/includes/functions/func_emails.php

@@ -30 +30 @@
         public function &get($language)
         {
-                $return = array();
-
-                require_once HD_PATH .'language/'. $language .'/lang_email_content.php';
+                require HD_PATH .'language/'. $language .'/lang_email_content.php';
 
                 return $lang;
@@ -41 +39 @@
         #=======================================
 
-        public function get_single($select, $where='')
+        public function get_single($language, $key)
         {
-                $this->trellis->db->construct( array(
-                                                                                                   'select'     => $select,
-                                                                                                   'from'       => 'reply_templates',
-                                                                                                   'where'      => $where,
-                                                                                                   'limit'      => array( 0, 1 ),
-                                                                                        )          );
+                require HD_PATH .'language/'. $language .'/lang_email_content.php';
 
-                $this->trellis->db->execute();
+                if ( ! isset( $lang[ $key ] ) ) return false;
 
-                if ( ! $this->trellis->db->get_num_rows() ) return false;
+                return array( 'subject' => $lang[ $key .'_sub' ], 'plaintext' => $lang[ $key ], 'html' => $lang[ $key .'_html' ] );
+        }
 
-                return $this->trellis->db->fetch_row();
+        #=======================================
+        # @ Edit
+        #=======================================
+
+        public function edit($language, $key, $subject, $html, $plaintext)
+        {
+                require HD_PATH .'language/'. $language .'/lang_email_content.php';
+
+                if ( ! isset( $lang[ $key ] ) ) return false;
+
+                if ( $key != 'header' && $key != 'footer' ) $lang[ $key .'_sub' ] = $subject;
+
+                $lang[ $key .'_html' ] = $html;
+                $lang[ $key ] = $plaintext;
+
+                if ( ! $handle = fopen( HD_PATH .'language/'. $language .'/lang_email_content.php', 'wb' ) ) return false;
+
+                $file_start = "<?php\n\n/*\n#======================================================\n";
+                $file_start .= "|    | Trellis Desk Language File\n";
+                $file_start .= "|    | lang_email_content.php\n";
+                $file_start .= "#======================================================\n*/\n\n";
+
+        fwrite( $handle, $file_start );
+
+        foreach( $lang as $k => $l )
+        {
+            if ( substr( $k, -4, 4) == '_sub' )
+                        {
+                                fwrite( $handle, "\$lang['". $k ."'] = \"". $lang[ $k ] ."\";\n\n" );
+                        }
+                        else
+                        {
+                                fwrite( $handle, "\$lang['". $k ."'] = <<<EOF\n". $lang[ $k ] ."\nEOF;\n\n" );
+                        }
+        }
+
+        fwrite( $handle, "?>" );
+
+        @fclose( $handle );
+
+                return true;
         }
 

trunk/Upload/includes/functions/func_users.php

@@ -267 +267 @@
                                                         'email_staff_reply'             => 'int',
                                                         'email_staff_assign'    => 'int',
+                                                        'email_staff_escalate'  => 'int',
+                                                        'email_staff_hold'              => 'int',
+                                                        'email_staff_move_to'   => 'int',
+                                                        'email_staff_move_away' => 'int',
+                                                        'email_staff_close'             => 'int',
+                                                        'email_staff_reopen'    => 'int',
                                                         'esn_unassigned'                => 'int',
                                                         'esn_assigned'                  => 'int',
@@ -373 +379 @@
                                                         'email_staff_reply'             => 'int',
                                                         'email_staff_assign'    => 'int',
+                                                        'email_staff_escalate'  => 'int',
+                                                        'email_staff_hold'              => 'int',
+                                                        'email_staff_move_to'   => 'int',
+                                                        'email_staff_move_away' => 'int',
+                                                        'email_staff_close'             => 'int',
+                                                        'email_staff_reopen'    => 'int',
                                                         'esn_unassigned'                => 'int',
                                                         'esn_assigned'                  => 'int',

trunk/Upload/language/en/ad_lang_emails.php

@@ -17 +17 @@
 'menu_back' => '<strong>Back</strong> to languages list',
 'menu_settings' => 'Email <strong>settings</strong>',
-'alert_category_updated' => 'The category has been successfully updated.',
+'alert_email_updated' => 'The email template has been successfully updated.',
+'error_not_writable' => 'Please update the file permissions on lang_email_content.php to allow Trellis Desk to write to the file.',
+'error_no_subject' => 'Please enter a subject.',
+'error_content_html' => 'Please enter HTML content.',
+'error_content_text' => 'Please enter plain text content.',
 'menu_email_options' => 'Email Options',
+'menu_template_tags' => 'Template Tags',
 'select_lang_instructions' => 'Select a language to edit email templates.',
-'edit_plaintext' => 'Edit Plain Text',
-'edit_html' => 'Edit HTML',
+'html_content' => 'HTML Content',
+'text_content' => 'Plain Text Content',
 
 'email_header' => 'Header',
@@ -49 +54 @@
 'email_ticket_move_to_staff' => 'Ticket Move To (Staff)',
 'email_ticket_move_away_staff' => 'Ticket Move Away (Staff)',
-'email_ticket_close' => 'Header',
-'email_ticket_close_staff' => 'Header',
-'email_ticket_reopen' => 'Header',
-'email_ticket_reopen_staff' => 'Header',
+'email_ticket_close' => 'Ticket Close',
+'email_ticket_close_staff' => 'Ticket Close (Staff)',
+'email_ticket_reopen' => 'Ticket Reopen',
+'email_ticket_reopen_staff' => 'Ticket Reopen (Staff)',
 'email_ticket_new_rejected' => 'Ticket Rejected',
 'email_ticket_reply_rejected' => 'Reply Rejected',

trunk/Upload/language/en/ad_lang_settings.php

@@ -18 +18 @@
 'hey_you_msg' => 'Since you\'re reading this paragraph right now, it\'s safe to say that you are a Trellis Desk user. And we want to hear what you, the user, thinks about our software! Please visit the <a href="http://trac.assembla.com/trellisdesk" target="_blank">ACCORD5 bug tracker</a> where you can report bugs or suggest any features you\'d like to see in future versions of Trellis Desk. Or, if you\'re not feeling that adventurous, just drop us a message at <a href="mailto:info@accord5.com">info@accord5.com</a>. We really want to hear what you think about Trellis Desk!',
 'email_notifications' => 'Email Notifications',
-'email_ticket' => 'New Ticket Notifications',
-'email_reply' => 'New Reply Notifications',
+'email_ticket' => 'Ticket Notifications',
+'email_reply' => 'Reply Notifications',
 'email_assign' => 'Assign Notifications',
 'email_escalate' => 'Escalate Notifications',

trunk/Upload/language/en/ad_lang_users.php

@@ -57 +57 @@
 'skin' => 'Skin',
 'rich_text_editor' => 'Rich Text Editor',
+'email_user_ticket' => 'Ticket Notifications',
+'email_user_action' => 'Action Notifications',
 'email_notifications' => 'Email Notifications',
-'email_ticket' => 'New Ticket Notifications',
-'email_action' => 'New Reply Notifications',
+'email_ticket' => 'Ticket Notifications',
+'email_reply' => 'Reply Notifications',
 'email_news' => 'News Notifications',
 'email_assign' => 'Assign Notifications',
+'email_escalate' => 'Escalate Notifications',
+'email_hold' => 'Hold Notifications',
+'email_move_to' => 'Move To Notifications',
+'email_move_away' => 'Move Away Notifications',
+'email_close' => 'Close Notifications',
+'email_reopen' => 'Reopen Notifications',
 'email_type' => 'Email Format',
 'email_preferences' => 'Email Preferences',

trunk/Upload/language/en/lang_email_content.php

@@ -10 +10 @@
 $lang['header'] = <<<EOF
 Dear {USER_NAME},
-
-
 EOF;
 
 $lang['header_html'] = <<<EOF
-Dear {USER_NAME},<br />
-<br />
-
+Dear {USER_NAME},
 EOF;
 
 $lang['footer'] = <<<EOF
-
-
 Regards,
 
 The {HD_NAME} team.
-
 {HD_URL}
 EOF;
 
 $lang['footer_html'] = <<<EOF
-<br />
-<br />
-Regards,<br />
-<br />
-The {HD_NAME} team.<br />
-<br />
-<a href='{HD_URL}'>{HD_URL}</a>
-EOF;
-
-$lang['user_new_val_email_sub'] = "Verify Your New Account";
+Regards,&lt;br /&gt;&lt;br /&gt;The {HD_NAME} team.&lt;br /&gt;&lt;a href=&quot;{HD_URL}&quot;&gt;{HD_URL}
+EOF;
+
+$lang['user_new_val_email_sub'] = "Verify Your Email";
 
 $lang['user_new_val_email'] = <<<EOF
-Welcome to {HD_NAME}.  You have requested a new account at our help desk system.  In order to activate your account, you must verify this email address by clicking the validation link below.
-
----------------------------
-
-Validation Link: {VAL_LINK}
-
----------------------------
+Welcome to {HD_NAME}.  You have created a new user account at our help desk system.  In order to activate your account, you must verify this email address by clicking the verification link below.
+
+---------------------------
+
+Verification Link: {LINK}
+
+---------------------------
+
+Once you have verified this email address, you will be able to log in.
 EOF;
 
 $lang['user_new_val_email_html'] = <<<EOF
-Welcome to {HD_NAME}.  You have requested a new account at our help desk system.  In order to activate your account, you must verify this email address by clicking the validation link below.<br />
-<br />
----------------------------<br />
-<br />
-Validation Link: <a href='{VAL_LINK}'>{VAL_LINK}</a><br />
-<br />
----------------------------
-EOF;
-
-$lang['user_new_val_admin_sub'] = "Your New Account";
+Welcome to {HD_NAME}.&amp;nbsp; You have created a new user account at our help desk system.&amp;nbsp; In order to activate your account, you must verify this email address by clicking the verification link below.&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;Verification Link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;Once you have verified this email address, you will be able to log in.
+EOF;
+
+$lang['user_new_val_admin_sub'] = "New User Account Pending";
 
 $lang['user_new_val_admin'] = <<<EOF
-You have requested a new account at our help desk system.  Before you can begin using your account, an administrator must manually approve your account.  You will receive an email when your account is approved.
+Welcome to {HD_NAME}.  You have created a new user account at our help desk system.  Before you can begin using your account, an administrator must manually approve your account.  You will receive an email when your account is approved.
 EOF;
 
 $lang['user_new_val_admin_html'] = <<<EOF
-You have requested a new account at our help desk system.  Before you can begin using your account, an administrator must manually approve your account.  You will receive an email when your account is approved.
-EOF;
-
-$lang['user_new_val_both_sub'] = "Verify Your New Account";
+Welcome to {HD_NAME}.&amp;nbsp; You have created a new user account at our help  desk system.&amp;nbsp; Before you can begin using your account, an administrator must manually approve your account.&amp;nbsp; You will receive an email when your account is approved.
+EOF;
+
+$lang['user_new_val_admin_staff_sub'] = "New Registration: {USER_NAME}";
+
+$lang['user_new_val_admin_staff'] = <<<EOF
+A new user has registered as is awaiting approval.
+
+---------------------------
+
+User: {UNAME}
+Email: {UEMAIL}
+
+---------------------------
+
+You can manage users awaiting approval using this link: {LINK}
+EOF;
+
+$lang['user_new_val_admin_staff_html'] = <<<EOF
+A new user has registered as is awaiting approval.&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;User: {UNAME}&lt;br /&gt;Email: {UEMAIL}&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;You can manage users awaiting approval using this link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;
+EOF;
+
+$lang['user_new_val_both_sub'] = "Verify Your Email";
 
 $lang['user_new_val_both'] = <<<EOF
-Welcome to {HD_NAME}.  You have requested a new account at our help desk system.  In order to activate your account, you must verify this email address by clicking the validation link below.  Additionally, an administrator must manually approve your account.
-
----------------------------
-
-Validation Link: {VAL_LINK}
-
----------------------------
-
-Remember, in additional to verifying your email address, an administrator must also manually approve your account.  An email will be sent to notify you when your account is approved.
+Welcome to {HD_NAME}.  You have created a new user account at our help desk system.  In order to activate your account, you must verify this email address by clicking the validation link below.  Additionally, an administrator must also manually approve your account.
+
+---------------------------
+
+Validation Link: {LINK}
+
+---------------------------
+
+You will receive an email when an administrator approves your account.
 EOF;
 
 $lang['user_new_val_both_html'] = <<<EOF
-Welcome to {HD_NAME}.  You have requested a new account at our help desk system.  In order to activate your account, you must verify this email address by clicking the validation link below.  Additionally, an administrator must manually approve your account.<br />
-<br />
----------------------------<br />
-<br />
-Validation Link: <a href='{VAL_LINK}'>{VAL_LINK}</a><br />
-<br />
----------------------------<br />
-<br />
-Remember, in additional to verifying your email address, an administrator must also manually approve your account.  An email will be sent to notify you when your account is approved.
-EOF;
-
-$lang['user_almost_activated_sub'] = "Account Waiting Approval";
+Welcome to {HD_NAME}.&amp;nbsp; You have created a new user account at our help  desk system.&amp;nbsp; In order to activate your account, you must verify this  email address by clicking the validation link below.&amp;nbsp; Additionally, an administrator must also manually approve your account.&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;Validation  Link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;You will receive an email when an administrator approves your account.
+EOF;
+
+$lang['user_almost_activated_sub'] = "Account Awaiting Email Verification";
 
 $lang['user_almost_activated'] = <<<EOF
-Your email address has been successfully verified.  But before you can begin using your account, an administrator must manually approve your account.  You will receive an email when your account is approved.
+Your user account has been approved by an administrator.  But before you can begin using your account, you must first click the email verification link in the email that was earlier sent to your email address.
 EOF;
 
 $lang['user_almost_activated_html'] = <<<EOF
-Your email address has been successfully verified.  But before you can begin using your account, an administrator must manually approve your account.  You will receive an email when your account is approved.
-EOF;
-
-$lang['user_almost_approved_sub'] = "Account Waiting Email Validation";
+Your user account has been approved by an administrator.&amp;nbsp; But before you can begin using your account, you must first click the email verification link in the email that was earlier sent to your email address.
+EOF;
+
+$lang['user_almost_approved_sub'] = "Account Awaiting Admin Approval";
 
 $lang['user_almost_approved'] = <<<EOF
-Your account has been successfully approved by an administrator.  But before you can begin using your account, you must first click the validation link in the email that has been dispatched to your email address.
+Your email address has been verified.  But before you can begin using your account, an administrator must manually approve your user account.  You will receive an email when your account is approved.
 EOF;
 
 $lang['user_almost_approved_html'] = <<<EOF
-Your account has been successfully approved by an administrator.  But before you can begin using your account, you must first click the validation link in the email that has been dispatched to your email address.
-EOF;
-
-$lang['user_new_val_admin_staff_sub'] = "New Registration: {USER_NAME}";
-
-$lang['user_new_val_admin_staff'] = <<<EOF
-A new user has registered as is awaiting admin validation.  Below are the user details.
-
----------------------------
-
-User: {USER_NAME}
-Email: {USER_EMAIL}
-
----------------------------
-
-You can manage users awaiting validation using this link: {APPROVE_LINK}
-EOF;
-
-$lang['user_new_val_admin_staff_html'] = <<<EOF
-A new user has registered as is awaiting admin validation.  Below are the user details.<br />
-<br />
----------------------------<br />
-<br />
-User: {USER_NAME}<br />
-Email: {USER_EMAIL}<br />
-<br />
----------------------------<br />
-<br />
-You can manage users awaiting validation using this link: <a href='{APPROVE_LINK}'>{APPROVE_LINK}</a>
-EOF;
-
-$lang['acc_activated_sub'] = "Account Activated";
+Your email address has been verified.&amp;nbsp; But before you can begin using your account, an administrator must manually approve your user account.&amp;nbsp; You will receive an email when your account is approved.
+EOF;
+
+$lang['acc_activated_sub'] = "Email Verified";
 
 $lang['acc_activated'] = <<<EOF
-Your account has been successfully activated.  You may now login.
+Your email address has been verified and your user account has been activated.  You may now log in.
 EOF;
 
 $lang['acc_activated_html'] = <<<EOF
-Your account has been successfully activated.  You may now login.
+Your email address has been verified and your user account has been activated.&amp;nbsp; You may now log in.
 EOF;
 
@@ -159 +125 @@
 
 $lang['acc_approved'] = <<<EOF
-Your account has been successfully approved by an administrator.  You may now login.
+Your user account has been approved by an administrator.  You may now login.
 EOF;
 
 $lang['acc_approved_html'] = <<<EOF
-Your account has been successfully approved by an administrator.  You may now login.
+Your user account has been approved by an administrator.&amp;nbsp; You may now login.
 EOF;
 
@@ -169 +135 @@
 
 $lang['change_email_val'] = <<<EOF
-You have requested for your email to be changed to this address.  In order to complete the change, you must verify this email by clicking the validation link below.
-
----------------------------
-
-{VAL_LINK}
+You have requested for your email to be changed to this address.  In order to update your email, you must verify this address by clicking the verification link below.
+
+---------------------------
+
+Verification Link: {LINK}
 
 ---------------------------
@@ -179 +145 @@
 
 $lang['change_email_val_html'] = <<<EOF
-You have requested for your email to be changed to this address.  In order to complete the change, you must verify this email by clicking the validation link below.<br />
-<br />
----------------------------<br />
-<br />
-<a href='{VAL_LINK}'>{VAL_LINK}</a><br />
-<br />
----------------------------
-EOF;
-
-$lang['reset_pass_val_sub'] = "Reset Your Password";
+You have requested for your email to be changed to this address.&amp;nbsp; In order to update your email, you must verify this address by clicking the verification link below.&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;Verification Link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;&lt;br /&gt;&lt;br /&gt;---------------------------
+EOF;
+
+$lang['reset_pass_val_sub'] = "Reset Password";
 
 $lang['reset_pass_val'] = <<<EOF
-You have requested to reset your password at {HD_NAME}.  In order to reset your password, click the validation link below.  If you did not request to reset your password, please disregard this email.
-
----------------------------
-
-Validation Link: {VAL_LINK}
+You have requested to reset your password at {HD_NAME}.  To reset your password, click the verification link below.  If you did not request to reset your password, please disregard this email.
+
+---------------------------
+
+Verification Link: {LINK}
+
+---------------------------
 EOF;
 
 $lang['reset_pass_val_html'] = <<<EOF
-You have requested to reset your password at {HD_NAME}.  In order to reset your password, click the validation link below.  If you did not request to reset your password, please disregard this email.<br />
-<br />
----------------------------<br />
-<br />
-Validation Link: <a href='{VAL_LINK}'>{VAL_LINK}</a>
+You have requested to reset your password at {HD_NAME}.&amp;nbsp; To reset your password, click the verification link below.&amp;nbsp; If you did not request to reset your password, please disregard this email.&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;Verification Link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;&lt;br /&gt; &lt;br /&gt;---------------------------
 EOF;
 
@@ -209 +167 @@
 
 $lang['ticket_new'] = <<<EOF
-You have submitted a new ticket.  Our staff will review the ticket shortly and reply accordingly.  Below are the ticket details.
+You have submitted a new ticket.  Our staff will review your ticket shortly and reply accordingly.
 
 ---------------------------
@@ -224 +182 @@
 
 $lang['ticket_new_html'] = <<<EOF
-You have submitted a new ticket.  Our staff will review the ticket shortly and reply accordingly.  Below are the ticket details.<br />
-<br />
----------------------------<br />
-<br />
-Ticket ID: {TICKET_ID}<br />
-Subject: {SUBJECT}<br />
-Department: {DEPARTMENT}<br />
-Priority: {PRIORITY}<br />
-<br />
----------------------------<br />
-<br />
-You can view your ticket using this link: <a href='{TICKET_LINK}'>{TICKET_LINK}</a>
+You have submitted a new ticket.&amp;nbsp; Our staff will review your ticket shortly and reply accordingly.&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;Ticket ID: {TICKET_ID}&lt;br /&gt;Subject: {SUBJECT}&lt;br /&gt;Department: {DEPARTMENT}&lt;br /&gt;Priority: {PRIORITY}&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;You can view your ticket using this link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;
 EOF;
 
@@ -241 +188 @@
 
 $lang['ticket_new_staff'] = <<<EOF
-A new ticket has been created in your department.  Below are the ticket details.
-
----------------------------
-
-Ticket ID: {TICKET_ID}
-User: {MEMBER}
+A new ticket has been created.
+
+---------------------------
+
+Ticket ID: {TICKET_ID}
+User: {UNAME}
 Subject: {SUBJECT}
 Department: {DEPARTMENT}
@@ -257 +204 @@
 ---------------------------
 
-You can manage this ticket using this link: {TICKET_LINK}
+You can manage this ticket using this link: {LINK}
 EOF;
 
 $lang['ticket_new_staff_html'] = <<<EOF
-A new ticket has been created in your department.  Below are the ticket details.<br />
-<br />
----------------------------<br />
-<br />
-Ticket ID: {TICKET_ID}<br />
-User: {MEMBER}<br />
-Subject: {SUBJECT}<br />
-Department: {DEPARTMENT}<br />
-Priority: {PRIORITY}<br />
-<br />
----------------------------<br />
-<br />
-{MESSAGE}<br />
-<br />
----------------------------<br />
-<br />
-You can manage this ticket using this link: <a href='{TICKET_LINK}'>{TICKET_LINK}</a>
+A new ticket has been created.&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;Ticket ID: {TICKET_ID}&lt;br /&gt;User: {UNAME}&lt;br /&gt;Subject: {SUBJECT}&lt;br /&gt;Department: {DEPARTMENT}&lt;br /&gt;Priority: {PRIORITY}&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;{MESSAGE}&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;You can manage this ticket using this link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;
 EOF;
 
@@ -283 +214 @@
 
 $lang['ticket_new_guest'] = <<<EOF
-You have submitted a new guest ticket.  Our staff will review the ticket shortly and reply accordingly.  Below are the ticket details.
-
----------------------------
-
-Ticket ID: {TICKET_ID}
-Subject: {SUBJECT}
-Department: {DEPARTMENT}
-Priority: {PRIORITY}
-
-Ticket Key: {TICKET_KEY}
-
----------------------------
-
-You can view your ticket using this link: {TICKET_LINK}
+You have submitted a new guest ticket.  Our staff will review your ticket shortly and reply accordingly.
+
+---------------------------
+
+Ticket ID: {TICKET_ID}
+Subject: {SUBJECT}
+Department: {DEPARTMENT}
+Priority: {PRIORITY}
+
+Ticket Key: {KEY}
+
+---------------------------
+
+You can view your ticket using this link: {LINK}
 EOF;
 
 $lang['ticket_new_guest_html'] = <<<EOF
-You have submitted a new guest ticket.  Our staff will review the ticket shortly and reply accordingly.  Below are the ticket details.<br />
-<br />
----------------------------<br />
-<br />
-Ticket ID: {TICKET_ID}<br />
-Subject: {SUBJECT}<br />
-Department: {DEPARTMENT}<br />
-Priority: {PRIORITY}<br />
-<br />
-Ticket Key: {TICKET_KEY}<br />
-<br />
----------------------------<br />
-<br />
-You can view your ticket using this link: <a href='{TICKET_LINK}'>{TICKET_LINK}</a>
+You have submitted a new guest ticket.&amp;nbsp; Our staff will review your ticket shortly and reply accordingly.&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;Ticket ID: {TICKET_ID}&lt;br /&gt;Subject: {SUBJECT}&lt;br /&gt;Department: {DEPARTMENT}&lt;br /&gt;Priority: {PRIORITY}&lt;br /&gt;&lt;br /&gt;Ticket Key: {KEY}&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;You can view your ticket using this link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;
 EOF;
 
@@ -319 +237 @@
 
 $lang['ticket_new_guest_staff'] = <<<EOF
-A new guest ticket has been created in your department.  Below are the ticket details.
-
----------------------------
-
-Ticket ID: {TICKET_ID}
-User: {MEMBER} (Guest)
+A new guest ticket has been created.
+
+---------------------------
+
+Ticket ID: {TICKET_ID}
+User: {UNAME} &#40;Guest&#41;
 Subject: {SUBJECT}
 Department: {DEPARTMENT}
@@ -335 +253 @@
 ---------------------------
 
-You can manage this ticket using this link: {TICKET_LINK}
+You can manage this ticket using this link: {LINK}
 EOF;
 
 $lang['ticket_new_guest_staff_html'] = <<<EOF
-A new guest ticket has been created in your department.  Below are the ticket details.<br />
-<br />
----------------------------<br />
-<br />
-Ticket ID: {TICKET_ID}<br />
-User: {MEMBER} (Guest)<br />
-Subject: {SUBJECT}<br />
-Department: {DEPARTMENT}<br />
-Priority: {PRIORITY}<br />
-<br />
----------------------------<br />
-<br />
-{MESSAGE}<br />
-<br />
----------------------------<br />
-<br />
-You can manage this ticket using this link: <a href='{TICKET_LINK}'>{TICKET_LINK}</a>
-EOF;
-
-$lang['ticket_escl_sub'] = "Ticket ID #{TICKET_ID} Escalated";
-
-$lang['ticket_escl'] = <<<EOF
-One of your tickets has been escalated.  Our managers will be reviewing your ticket shortly.  Below are the ticket details.
-
----------------------------
-
-Ticket ID: {TICKET_ID}
-Subject: {SUBJECT}
-Department: {DEPARTMENT}
-Priority: {PRIORITY}
-
----------------------------
-
-You can view your ticket using this link: {TICKET_LINK}
-EOF;
-
-$lang['ticket_escl_html'] = <<<EOF
-One of your tickets has been escalated.  Our managers will be reviewing your ticket shortly.  Below are the ticket details.<br />
-<br />
----------------------------<br />
-<br />
-Ticket ID: {TICKET_ID}<br />
-Subject: {SUBJECT}<br />
-Department: {DEPARTMENT}<br />
-Priority: {PRIORITY}<br />
-<br />
----------------------------<br />
-<br />
-You can view your ticket using this link: <a href='{TICKET_LINK}'>{TICKET_LINK}</a>
+A new guest ticket has been created.&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;Ticket ID: {TICKET_ID}&lt;br /&gt;User: {UNAME} &#40;Guest&#41;&lt;br /&gt;Subject: {SUBJECT}&lt;br /&gt;Department: {DEPARTMENT}&lt;br /&gt;Priority: {PRIORITY}&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;{MESSAGE}&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;You can manage this ticket using this link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;
+EOF;
+
+$lang['ticket_reply_sub'] = "Ticket ID #{TICKET_ID} Reply";
+
+$lang['ticket_reply'] = <<<EOF
+A reply has been made to your ticket.
+
+---------------------------
+
+{REPLY}
+
+---------------------------
+
+Ticket ID: {TICKET_ID}
+Subject: {SUBJECT}
+Department: {DEPARTMENT}
+Priority: {PRIORITY}
+
+---------------------------
+
+You can view your ticket using this link: {LINK}
+EOF;
+
+$lang['ticket_reply_html'] = <<<EOF
+A reply has been made to your ticket.&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;{REPLY}&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;Ticket ID: {TICKET_ID}&lt;br /&gt;Subject: {SUBJECT}&lt;br /&gt;Department: {DEPARTMENT}&lt;br /&gt;Priority: {PRIORITY}&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;You can view your ticket using this link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;
+EOF;
+
+$lang['ticket_reply_staff_sub'] = "Ticket ID #{TICKET_ID} Reply";
+
+$lang['ticket_reply_staff'] = <<<EOF
+A reply has been made to a ticket.
+
+---------------------------
+
+{REPLY}
+
+---------------------------
+
+Ticket ID: {TICKET_ID}
+Subject: {SUBJECT}
+User: {UNAME}
+Department: {DEPARTMENT}
+Priority: {PRIORITY}
+
+---------------------------
+
+You can manage this ticket using this link: {LINK}
+EOF;
+
+$lang['ticket_reply_staff_html'] = <<<EOF
+A reply has been made to a ticket.&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;{REPLY}&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;Ticket  ID: {TICKET_ID}&lt;br /&gt;Subject: {SUBJECT}&lt;br /&gt;User: {UNAME}&lt;br /&gt;Department: {DEPARTMENT}&lt;br /&gt;Priority:  {PRIORITY}&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;You can manage this  ticket using this link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;
+EOF;
+
+$lang['ticket_assign_staff_sub'] = "Ticket ID #{TICKET_ID} Assigned";
+
+$lang['ticket_assign_staff'] = <<<EOF
+You have been assigned a ticket.
+
+---------------------------
+
+Ticket ID: {TICKET_ID}
+Subject: {SUBJECT}
+User: {UNAME}
+Department: {DEPARTMENT}
+Priority: {PRIORITY}
+
+---------------------------
+
+{MESSAGE}
+
+---------------------------
+
+You can manage this ticket using this link: {LINK}
+EOF;
+
+$lang['ticket_assign_staff_html'] = <<<EOF
+You have been assigned a ticket.&lt;br /&gt; &lt;br /&gt; ---------------------------&lt;br /&gt; &lt;br /&gt; Ticket  ID: {TICKET_ID}&lt;br /&gt; Subject: {SUBJECT}&lt;br /&gt; User: {UNAME}&lt;br /&gt; Department: {DEPARTMENT}&lt;br /&gt; Priority:  {PRIORITY}&lt;br /&gt; &lt;br /&gt; ---------------------------&lt;br /&gt; &lt;br /&gt; {MESSAGE}&lt;br /&gt; &lt;br /&gt; ---------------------------&lt;br /&gt; &lt;br /&gt; You can manage this  ticket using this link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;
+EOF;
+
+$lang['ticket_escalate_sub'] = "Ticket ID #{TICKET_ID} Escalated";
+
+$lang['ticket_escalate'] = <<<EOF
+Your ticket has been escalated.  Our managers will be reviewing your ticket shortly.
+
+---------------------------
+
+Ticket ID: {TICKET_ID}
+Subject: {SUBJECT}
+Department: {DEPARTMENT}
+Priority: {PRIORITY}
+
+---------------------------
+
+You can view your ticket using this link: {LINK}
+EOF;
+
+$lang['ticket_escalate_html'] = <<<EOF
+Your ticket has been escalated.&amp;nbsp; Our managers will be reviewing your ticket shortly.&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;Ticket ID: {TICKET_ID}&lt;br /&gt;Subject: {SUBJECT}&lt;br /&gt;Department: {DEPARTMENT}&lt;br /&gt;Priority: {PRIORITY}&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;You can view your ticket using this link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;
+EOF;
+
+$lang['ticket_escalate_staff_sub'] = "Ticket ID #{TICKET_ID} Escalated";
+
+$lang['ticket_escalate_staff'] = <<<EOF
+A ticket has been escalated.
+
+---------------------------
+
+Ticket ID: {TICKET_ID}
+Subject: {SUBJECT}
+User: {UNAME}
+Department: {DEPARTMENT}
+Priority: {PRIORITY}
+
+---------------------------
+
+{MESSAGE}
+
+---------------------------
+
+You can manage this ticket using this link: {LINK}
+EOF;
+
+$lang['ticket_escalate_staff_html'] = <<<EOF
+A ticket has been escalated.&lt;br /&gt; &lt;br /&gt; ---------------------------&lt;br /&gt; &lt;br /&gt; Ticket  ID: {TICKET_ID}&lt;br /&gt; Subject: {SUBJECT}&lt;br /&gt; User: {UNAME}&lt;br /&gt; Department: {DEPARTMENT}&lt;br /&gt; Priority:  {PRIORITY}&lt;br /&gt; &lt;br /&gt; ---------------------------&lt;br /&gt; &lt;br /&gt; {MESSAGE}&lt;br /&gt; &lt;br /&gt; ---------------------------&lt;br /&gt; &lt;br /&gt; You can manage this  ticket using  this link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;
+EOF;
+
+$lang['ticket_hold_sub'] = "Ticket ID #{TICKET_ID} On Hold";
+
+$lang['ticket_hold'] = <<<EOF
+Your ticket has been put on hold.
+
+---------------------------
+
+Ticket ID: {TICKET_ID}
+Subject: {SUBJECT}
+Department: {DEPARTMENT}
+Priority: {PRIORITY}
+
+---------------------------
+
+You can view your ticket using this link: {LINK}
+EOF;
+
+$lang['ticket_hold_html'] = <<<EOF
+Your ticket has been put on hold.&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;Ticket ID: {TICKET_ID}&lt;br /&gt;Subject: {SUBJECT}&lt;br /&gt;Department: {DEPARTMENT}&lt;br /&gt;Priority: {PRIORITY}&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;You can view your ticket using this link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;
+EOF;
+
+$lang['ticket_hold_staff_sub'] = "Ticket ID #{TICKET_ID} On Hold";
+
+$lang['ticket_hold_staff'] = <<<EOF
+A ticket has been put on hold.
+
+---------------------------
+
+Ticket ID: {TICKET_ID}
+Subject: {SUBJECT}
+User: {UNAME}
+Department: {DEPARTMENT}
+Priority: {PRIORITY}
+
+---------------------------
+
+You can manage this ticket using this link: {LINK}
+EOF;
+
+$lang['ticket_hold_staff_html'] = <<<EOF
+A ticket has been put on hold.&lt;br /&gt; &lt;br /&gt; ---------------------------&lt;br /&gt; &lt;br /&gt; Ticket  ID: {TICKET_ID}&lt;br /&gt; Subject: {SUBJECT}&lt;br /&gt; User: {UNAME}&lt;br /&gt; Department: {DEPARTMENT}&lt;br /&gt; Priority:  {PRIORITY}&lt;br /&gt; &lt;br /&gt; ---------------------------&lt;br /&gt; &lt;br /&gt; You can manage this  ticket using  this link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;
+EOF;
+
+$lang['ticket_move_sub'] = "Ticket ID #{TICKET_ID} Moved";
+
+$lang['ticket_move'] = <<<EOF
+Your ticket has been moved to the department: {NEW_DEPART}
+
+---------------------------
+
+Ticket ID: {TICKET_ID}
+Subject: {SUBJECT}
+Old Department: {OLD_DEPART}
+New Department: {NEW_DEPART}
+Priority: {PRIORITY}
+
+---------------------------
+
+You can view your ticket using this link: {LINK}
+EOF;
+
+$lang['ticket_move_html'] = <<<EOF
+Your ticket has been moved to the department: {NEW_DEPART}&lt;br /&gt; &lt;br /&gt; ---------------------------&lt;br /&gt; &lt;br /&gt; Ticket ID: {TICKET_ID}&lt;br /&gt; Subject: {SUBJECT}&lt;br /&gt; Old Department: {OLD_DEPART}&lt;br /&gt;New Department: {NEW_DEPART}&lt;br /&gt; Priority: {PRIORITY}&lt;br /&gt; &lt;br /&gt; ---------------------------&lt;br /&gt; &lt;br /&gt; You can view your ticket using this link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;
+EOF;
+
+$lang['ticket_move_to_staff_sub'] = "Ticket ID #{TICKET_ID} Moved";
+
+$lang['ticket_move_to_staff'] = <<<EOF
+A ticket has been moved to your department.
+
+---------------------------
+
+Ticket ID: {TICKET_ID}
+Subject: {SUBJECT}
+User: {UNAME}
+Department: {DEPARTMENT}
+Priority: {PRIORITY}
+
+---------------------------
+
+{MESSAGE}
+
+---------------------------
+
+You can manage this ticket using this link: {LINK}
+EOF;
+
+$lang['ticket_move_to_staff_html'] = <<<EOF
+A ticket has been moved to your department.&lt;br /&gt; &lt;br /&gt; ---------------------------&lt;br /&gt; &lt;br /&gt; Ticket  ID: {TICKET_ID}&lt;br /&gt; Subject: {SUBJECT}&lt;br /&gt; User: {UNAME}&lt;br /&gt; Department: {DEPARTMENT}&lt;br /&gt; Priority:  {PRIORITY}&lt;br /&gt; &lt;br /&gt; ---------------------------&lt;br /&gt; &lt;br /&gt; {MESSAGE}&lt;br /&gt; &lt;br /&gt; ---------------------------&lt;br /&gt; &lt;br /&gt; You can manage this  ticket using   this link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;
+EOF;
+
+$lang['ticket_move_away_staff_sub'] = "Ticket ID #{TICKET_ID} Moved";
+
+$lang['ticket_move_away_staff'] = <<<EOF
+A ticket has been moved from your department.
+
+---------------------------
+
+Ticket ID: {TICKET_ID}
+Subject: {SUBJECT}
+User: {UNAME}
+Department: {DEPARTMENT}
+Priority: {PRIORITY}
+
+---------------------------
+
+{MESSAGE}
+
+---------------------------
+
+You can manage this ticket using this link: {LINK}
+EOF;
+
+$lang['ticket_move_away_staff_html'] = <<<EOF
+A ticket has been moved from your department.&lt;br /&gt; &lt;br /&gt; ---------------------------&lt;br /&gt; &lt;br /&gt; Ticket  ID: {TICKET_ID}&lt;br /&gt; Subject: {SUBJECT}&lt;br /&gt; User: {UNAME}&lt;br /&gt; Department: {DEPARTMENT}&lt;br /&gt; Priority:  {PRIORITY}&lt;br /&gt; &lt;br /&gt; ---------------------------&lt;br /&gt; &lt;br /&gt; {MESSAGE}&lt;br /&gt; &lt;br /&gt; ---------------------------&lt;br /&gt; &lt;br /&gt; You can manage this  ticket using   this link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;
 EOF;
 
@@ -393 +504 @@
 
 $lang['ticket_close'] = <<<EOF
-One of your tickets has been closed.  Below are the ticket details.
-
----------------------------
-
-Ticket ID: {TICKET_ID}
-Subject: {SUBJECT}
-Department: {DEPARTMENT}
-Priority: {PRIORITY}
-
----------------------------
-
-You can view your ticket using this link: {TICKET_LINK}
-
-If there is anything we can do to be of assistance, please let us know.
+Your ticket has been closed.
+
+---------------------------
+
+Ticket ID: {TICKET_ID}
+Subject: {SUBJECT}
+Department: {DEPARTMENT}
+Priority: {PRIORITY}
+
+---------------------------
+
+You can view your ticket using this link: {LINK}
+
+If there is anything else we can do, please submit a new ticket.
 EOF;
 
 $lang['ticket_close_html'] = <<<EOF
-One of your tickets has been closed.  Below are the ticket details.<br />
-<br />
----------------------------<br />
-<br />
-Ticket ID: {TICKET_ID}<br />
-Subject: {SUBJECT}<br />
-Department: {DEPARTMENT}<br />
-Priority: {PRIORITY}<br />
-<br />
----------------------------<br />
-<br />
-You can view your ticket using this link: <a href='{TICKET_LINK}'>{TICKET_LINK}</a><br />
-<br />
-If there is anything we can do to be of assistance, please let us know.
-EOF;
-
-$lang['ticket_move_sub'] = "Ticket ID #{TICKET_ID} Moved";
-
-$lang['ticket_move'] = <<<EOF
-One of your tickets has been moved to a new department.  Below are the ticket details.
-
----------------------------
-
-Ticket ID: {TICKET_ID}
-Subject: {SUBJECT}
-Old Department: {OLD_DEPARTMENT}
-New Department: {NEW_DEPARTMENT}
-Priority: {PRIORITY}
-
----------------------------
-
-You can view your ticket using this link: {TICKET_LINK}
-
-If there is anything we can do to be of assistance, please let us know.
-EOF;
-
-$lang['ticket_move_html'] = <<<EOF
-One of your tickets has been moved to a new department.  Below are the ticket details.<br />
-<br />
----------------------------<br />
-<br />
-Ticket ID: {TICKET_ID}<br />
-Subject: {SUBJECT}<br />
-Old Department: {OLD_DEPARTMENT}<br />
-New Department: {NEW_DEPARTMENT}<br />
-Priority: {PRIORITY}<br />
-<br />
----------------------------<br />
-<br />
-You can view your ticket using this link: <a href='{TICKET_LINK}'>{TICKET_LINK}</a><br />
-<br />
-If there is anything we can do to be of assistance, please let us know.
-EOF;
-
-$lang['ticket_reply_sub'] = "Ticket ID #{TICKET_ID} Reply";
-
-$lang['ticket_reply'] = <<<EOF
-A reply has been made to your ticket.  Below are the ticket details.
-
----------------------------
-
-{REPLY}
-
----------------------------
-
-Ticket ID: {TICKET_ID}
-Subject: {SUBJECT}
-Department: {DEPARTMENT}
-Priority: {PRIORITY}
-
----------------------------
-
-You can view your ticket using this link: {TICKET_LINK}
-
-If there is anything we can do to be of assistance, please let us know.
-EOF;
-
-$lang['ticket_reply_html'] = <<<EOF
-A reply has been made to your ticket.  Below are the ticket details.<br />
-<br />
----------------------------<br />
-<br />
-{REPLY}<br />
-<br />
----------------------------<br />
-<br />
-Ticket ID: {TICKET_ID}<br />
-Subject: {SUBJECT}<br />
-Department: {DEPARTMENT}<br />
-Priority: {PRIORITY}<br />
-<br />
----------------------------<br />
-<br />
-You can view your ticket using this link: <a href='{TICKET_LINK}'>{TICKET_LINK}</a><br />
-<br />
-If there is anything we can do to be of assistance, please let us know.
-EOF;
-
-$lang['staff_reply_ticket_sub'] = "Ticket ID #{TICKET_ID} Reply";
-
-$lang['staff_reply_ticket'] = <<<EOF
-A reply has been made to a ticket in your department.  Below are the ticket details.
-
----------------------------
-
-{REPLY}
-
----------------------------
-
-Ticket ID: {TICKET_ID}
-User: {MEMBER}
-Subject: {SUBJECT}
-Department: {DEPARTMENT}
-Priority: {PRIORITY}
-
----------------------------
-
-You can manage this ticket using this link: {TICKET_LINK}
-EOF;
-
-$lang['staff_reply_ticket_html'] = <<<EOF
-A reply has been made to a ticket in your department.  Below are the ticket details.<br />
-<br />
----------------------------<br />
-<br />
-{REPLY}<br />
-<br />
----------------------------<br />
-<br />
-Ticket ID: {TICKET_ID}<br />
-User: {MEMBER}<br />
-Subject: {SUBJECT}<br />
-Department: {DEPARTMENT}<br />
-Priority: {PRIORITY}<br />
-<br />
----------------------------<br />
-<br />
-You can manage this ticket using this link: <a href='{TICKET_LINK}'>{TICKET_LINK}</a>
-EOF;
-
-$lang['announcement_sub'] = "{TITLE}";
-
-$lang['announcement'] = <<<EOF
-A new announcement has been made titled '{TITLE}'.
+Your ticket has been closed.&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;Ticket  ID: {TICKET_ID}&lt;br /&gt;Subject: {SUBJECT}&lt;br /&gt;Department: {DEPARTMENT}&lt;br /&gt;Priority:  {PRIORITY}&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;You can view your  ticket using this link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;&lt;br /&gt;&lt;br /&gt;If there is anything else we can do, please submit a new ticket.
+EOF;
+
+$lang['ticket_close_staff_sub'] = "Ticket ID #{TICKET_ID} Closed";
+
+$lang['ticket_close_staff'] = <<<EOF
+A ticket has been closed.
+
+---------------------------
+
+Ticket ID: {TICKET_ID}
+Subject: {SUBJECT}
+User: {UNAME}
+Department: {DEPARTMENT}
+Priority: {PRIORITY}
+
+---------------------------
+
+You can manage this ticket using this link: {LINK}
+EOF;
+
+$lang['ticket_close_staff_html'] = <<<EOF
+A ticket has been closed.&lt;br /&gt; &lt;br /&gt; ---------------------------&lt;br /&gt; &lt;br /&gt; Ticket  ID: {TICKET_ID}&lt;br /&gt; Subject: {SUBJECT}&lt;br /&gt; User: {UNAME}&lt;br /&gt; Department: {DEPARTMENT}&lt;br /&gt; Priority:  {PRIORITY}&lt;br /&gt; &lt;br /&gt; ---------------------------&lt;br /&gt; &lt;br /&gt; You can manage this  ticket using   this link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;
+EOF;
+
+$lang['ticket_reopen_sub'] = "Ticket ID #{TICKET_ID} Reopened";
+
+$lang['ticket_reopen'] = <<<EOF
+Your ticket has been reopened.  Our staff will review your ticket shortly and reply accordingly.
+
+---------------------------
+
+Ticket ID: {TICKET_ID}
+Subject: {SUBJECT}
+Department: {DEPARTMENT}
+Priority: {PRIORITY}
+
+---------------------------
+
+You can view your ticket using this link: {LINK}
+EOF;
+
+$lang['ticket_reopen_html'] = <<<EOF
+Your ticket has been reopened.&amp;nbsp; Our staff will review your ticket shortly and reply accordingly.&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;Ticket  ID: {TICKET_ID}&lt;br /&gt;Subject: {SUBJECT}&lt;br /&gt;Department: {DEPARTMENT}&lt;br /&gt;Priority:  {PRIORITY}&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;You can view your  ticket using this link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;
+EOF;
+
+$lang['ticket_reopen_staff_sub'] = "Ticket ID #{TICKET_ID} Reopened";
+
+$lang['ticket_reopen_staff'] = <<<EOF
+A ticket has been reopened.
+
+---------------------------
+
+Ticket ID: {TICKET_ID}
+Subject: {SUBJECT}
+Department: {DEPARTMENT}
+Priority: {PRIORITY}
+
+---------------------------
+
+{MESSAGE}
+
+---------------------------
+
+You can manage this ticket using this link: {LINK}
+EOF;
+
+$lang['ticket_reopen_staff_html'] = <<<EOF
+A ticket has been reopened.&lt;br /&gt; &lt;br /&gt; ---------------------------&lt;br /&gt; &lt;br /&gt; Ticket ID: {TICKET_ID}&lt;br /&gt; Subject:  {SUBJECT}&lt;br /&gt; Department: {DEPARTMENT}&lt;br /&gt; Priority: {PRIORITY}&lt;br /&gt; &lt;br /&gt; ---------------------------&lt;br /&gt;&lt;br /&gt;{MESSAGE}&lt;br /&gt; &lt;br /&gt; ---------------------------&lt;br /&gt; &lt;br /&gt; You can manage this ticket using this  link: &lt;a href=&quot;{LINK}&quot;&gt;{LINK}&lt;/a&gt;
+EOF;
+
+$lang['ticket_new_rejected_sub'] = "New Ticket Failed";
+
+$lang['ticket_new_rejected'] = <<<EOF
+We were unable to accept your email and create a ticket because you do not have permission to create tickets in this department.
+
+If you feel this message is an error, please contact an administrator.
+EOF;
+
+$lang['ticket_new_rejected_html'] = <<<EOF
+We were unable to accept your email and create a ticket because you do not have permission to create tickets in this department.&lt;br /&gt;&lt;br /&gt;If you feel this message is an error, please contact an administrator.
+EOF;
+
+$lang['ticket_reply_rejected_sub'] = "Reply Failed";
+
+$lang['ticket_reply_rejected'] = <<<EOF
+We were unable to accept your email and create a reply because you do not have permission to reply to this ticket.
+
+If you feel this message is an error, please contact an administrator.
+EOF;
+
+$lang['ticket_reply_rejected_html'] = <<<EOF
+We were unable to accept your email and create a reply because you do  not have permission to reply to this ticket.&lt;br /&gt; &lt;br /&gt; If you feel this message is an error, please contact an administrator.
+EOF;
+
+$lang['news_sub'] = "News: {TITLE}";
+
+$lang['news'] = <<<EOF
+News Item: {TITLE}
 
 ---------------------------
@@ -561 +627 @@
 ---------------------------
 
-You have received this email because you selected to receive email notifications for new announcements in your profile.  If you would like to discontinue these emails, login and update your account preferences.
-EOF;
-
-$lang['announcement_html'] = <<<EOF
-A new announcement has been made titled '{TITLE}'.<br />
-<br />
----------------------------<br />
-<br />
-{CONTENT}<br />
-<br />
----------------------------<br />
-<br />
-You have received this email because you selected to receive email notifications for new announcements in your profile.  If you would like to discontinue these emails, login and update your account preferences.
-EOF;
-
-$lang['ticket_pipe_rejected_sub'] = "Ticket Not Accepted";
-
-$lang['ticket_pipe_rejected'] = <<<EOF
-We were unable to accept your email and create a ticket because you do not have permission to create tickets in this department.
-
-If you feel this message is an error, please contact an administrator.
-EOF;
-
-$lang['ticket_pipe_rejected_html'] = <<<EOF
-We were unable to accept your email and create a ticket because you do not have permission to create tickets in this department.<br />
-<br />
-If you feel this message is an error, please contact an administrator.
+You have received this email because you selected to receive email notifications for news items in your profile.  If you would like to discontinue these emails, log in and update your preferences.
+EOF;
+
+$lang['news_html'] = <<<EOF
+News Item: {TITLE}&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;{CONTENT}&lt;br /&gt;&lt;br /&gt;---------------------------&lt;br /&gt;&lt;br /&gt;You have received this email because you selected to receive email notifications for news items in your profile.&amp;nbsp; If you would like to discontinue these emails, log in and update your preferences.
 EOF;
 
@@ -597 +641 @@
 
 $lang['test_html'] = <<<EOF
-This is a <strong>test</strong> message from Trellis Desk.  If you have received this message, it is likely that your outgoing emails from Trellis Desk are working.
+This is a &lt;strong&gt;test&lt;/strong&gt; message from Trellis Desk.  If you have received this message, it is likely that your outgoing emails from Trellis Desk are working.
 EOF;