Rename some variables - refs #6715

1.9.x
Francis Gonzales 12 years ago
parent 3f6495d04f
commit 46e1f02e72
  1. 10
      plugin/ticket/database.php
  2. 10
      plugin/ticket/lang/english.php
  3. 10
      plugin/ticket/lang/french.php
  4. 10
      plugin/ticket/lang/spanish.php
  5. 13
      plugin/ticket/src/new_ticket.php
  6. 2
      plugin/ticket/src/report.php
  7. 14
      plugin/ticket/src/ticket_details.php

@ -171,11 +171,11 @@ $sql = "CREATE TABLE IF NOT EXISTS ".$table." (
Database::query($sql);
//Default status
$defaultStatus = array(
'NAT' => $objPlugin->get_lang('StsNew'),
'PND' => $objPlugin->get_lang('StsPending'),
'XCF' => $objPlugin->get_lang('StsUnconfirmed'),
'CLS' => $objPlugin->get_lang('StsClose'),
'REE' => $objPlugin->get_lang('StsForwarded')
'NAT' => $objPlugin->get_lang('StatusNew'),
'PND' => $objPlugin->get_lang('StatusPending'),
'XCF' => $objPlugin->get_lang('StatusUnconfirmed'),
'CLS' => $objPlugin->get_lang('StatusClose'),
'REE' => $objPlugin->get_lang('StatusForwarded')
);
$i = 1;

@ -37,11 +37,11 @@ $strings['Optional'] = "Optional";
$strings['ErrorRegisterMessage'] = "The ticket could not be created";
$strings['Source'] = "Source";
$strings['DeniedAccess'] = "Unauthorized access.";
$strings['StsNew'] = "New";
$strings['StsPending'] = "Pending";
$strings['StsUnconfirmed'] = "Unconfirmed";
$strings['StsClose'] = "Closed";
$strings['StsForwarded'] = "Resent";
$strings['StatusNew'] = "New";
$strings['StatusPending'] = "Pending";
$strings['StatusUnconfirmed'] = "Unconfirmed";
$strings['StatusClose'] = "Closed";
$strings['StatusForwarded'] = "Resent";
$strings['Priority'] = "Priority";
$strings['PriorityHigh'] = "High";
$strings['PriorityNormal'] = "Normal";

@ -37,11 +37,11 @@ $strings['Optional'] = "Optionnel";
$strings['ErrorRegisterMessage'] = "Le ticket n'a pas pu être enregistré";
$strings['Source'] = "Source";
$strings['DeniedAccess'] = "Accès non autorisé.";
$strings['StsNew'] = "Nouveau";
$strings['StsPending'] = "En attente";
$strings['StsUnconfirmed'] = "À confirmer";
$strings['StsClose'] = "Fermé";
$strings['StsForwarded'] = "Réenvoyé";
$strings['StatusNew'] = "Nouveau";
$strings['StatusPending'] = "En attente";
$strings['StatusUnconfirmed'] = "À confirmer";
$strings['StatusClose'] = "Fermé";
$strings['StatusForwarded'] = "Réenvoyé";
$strings['Priority'] = "Priorité";
$strings['PriorityHigh'] = "Haute";
$strings['PriorityNormal'] = "Normale";

@ -39,11 +39,11 @@ $strings['ErrorRegisterMessage'] = "No se pudo registrar su ticket";
$strings['Source'] = "Fuente";
$strings['DeniedAccess'] = "Acceso denegado.";
// Status Tickets
$strings['StsNew'] = "Nuevo";
$strings['StsPending'] = "Pendiente";
$strings['StsUnconfirmed'] = "Por Confirmar";
$strings['StsClose'] = "Cerrado";
$strings['StsForwarded'] = "Reenviado";
$strings['StatusNew'] = "Nuevo";
$strings['StatusPending'] = "Pendiente";
$strings['StatusUnconfirmed'] = "Por Confirmar";
$strings['StatusClose'] = "Cerrado";
$strings['StatusForwarded'] = "Reenviado";
// Priority
$strings['Priority'] = "Prioridad";
$strings['PriorityHigh'] = "Alta";

@ -220,17 +220,17 @@ function show_form_send_ticket()
'id' => 'status_id',
'for' => 'status_id'
);
$statusList[NEWTCK] = $plugin->get_lang('StsNew');
$statusList[NEWTCK] = $plugin->get_lang('StatusNew');
if (api_is_platform_admin()) {
$statusAttributes = array(
'id' => 'status_id',
'for' => 'status_id',
'style' => 'width: 562px;'
);
$statusList[PENDING] = $plugin->get_lang('StsPending');
$statusList[UNCONFIRMED] = $plugin->get_lang('StsUnconfirmed');
$statusList[CLOSE] = $plugin->get_lang('StsClose');
$statusList[REENVIADO] = $plugin->get_lang('StsForwarded');
$statusList[PENDING] = $plugin->get_lang('StatusPending');
$statusList[UNCONFIRMED] = $plugin->get_lang('StatusUnconfirmed');
$statusList[CLOSE] = $plugin->get_lang('StatusClose');
$statusList[REENVIADO] = $plugin->get_lang('StatusForwarded');
}
//End Status List
@ -399,7 +399,6 @@ function show_form_send_ticket()
)
);
$form->addElement('html', '<span id="filepaths">');
$form->addElement('html', '<div id="filepath_1">');
$form->addElement('file', 'attach_1', get_lang('FilesAttachment'));
@ -590,7 +589,7 @@ if (!isset($_POST['compose'])) {
</form>
</div>';
echo '<div class="users-list">';
$order = (api_is_western_name_order() xor api_sort_by_first_name()) ? 3 : 2;
$order = (api_is_western_name_order() || api_sort_by_first_name()) ? 3 : 2;
$table = new SortableTable(
'users', 'get_number_of_users',
'get_user_data', $order, 10

@ -254,7 +254,7 @@ echo '<div class="actions">
<div class="clear">&nbsp;</div>
</form></div>';
if (isset($_GET['keyword'])) {
$table = new SortableTable('users', 'get_number_of_users', 'get_user_data', (api_is_western_name_order() xor api_sort_by_first_name()) ? 3 : 2);
$table = new SortableTable('users', 'get_number_of_users', 'get_user_data', (api_is_western_name_order() || api_sort_by_first_name()) ? 3 : 2);
$table->set_header(0, '', false, 'width="18px"');
$table->set_header(0, get_lang('Photo'), false);
$table->set_header(1, get_lang('OfficialCode'));

@ -35,10 +35,10 @@ $(document).ready(function(){
width: 600,
modal: true,
buttons: {
Asignar: function(){
$("#genesis").submit()
' . get_lang('Accept') . ': function(){
$("#frmResponsable").submit()
},
Close: function() {
' . ucfirst(get_lang('Close')) . ': function() {
$(this).dialog("close");
}
}
@ -206,7 +206,7 @@ if (isset($_POST['response'])) {
} else if (!is_null($response) && $ticket['ticket']['status_id'] == 'XCF') {
TicketManager::update_ticket_status('PND', $_GET['ticket_id'], $user_id);
$ticket['ticket']['status_id'] = 'PND';
$ticket['ticket']['status'] = $plugin->get_lang('StsPending');
$ticket['ticket']['status'] = $plugin->get_lang('StatusPending');
}
}
}
@ -319,7 +319,7 @@ if (!isset($_POST['compose'])) {
}
$select_admins .= "</select>";
echo '<div id="dialog-form" title="' . $plugin->get_lang('AssignTicket') . '" >';
echo '<form id="genesis" method="POST" action="ticket_details.php?ticket_id=' . $ticket['ticket']['ticket_id'] . '">
echo '<form id="frmResponsable" method="POST" action="ticket_details.php?ticket_id=' . $ticket['ticket']['ticket_id'] . '">
<input type="hidden" name ="action" id="action" value="assign"/>
<div>
<div class="label">' . get_lang('Responsable') . ':</div>
@ -360,7 +360,7 @@ if (!isset($_POST['compose'])) {
}
echo "</div>";
echo "</div>";
$subject = "RE: " . $message['subject'];
$subject = get_lang('ReplyShort') .": " . $message['subject'];
$user_admin = api_is_platform_admin();
if ($ticket['ticket']['status_id'] != 'REE' AND $ticket['ticket']['status_id'] != 'CLS') {
if (!$isAdmin && $ticket['ticket']['status_id'] != 'XCF') {
@ -396,7 +396,7 @@ function show_form_send_message()
'send_ticket',
'POST',
api_get_self() . '?ticket_id=' . $ticket['ticket']['ticket_id'],
"",
'',
array(
'enctype' => 'multipart/form-data',
'onsubmit' => 'return validate()',

Loading…
Cancel
Save