diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php index a3b0225d6f..978b604a6f 100755 --- a/main/inc/lib/display.lib.php +++ b/main/inc/lib/display.lib.php @@ -418,7 +418,7 @@ class Display * @param bool Whether to XSS-filter or not * @return string Message wrapped into an HTML div */ - public static function return_message($message, $type='normal', $filter = true) + public static function return_message($message, $type = 'normal', $filter = true) { if ($filter) { $message = api_htmlentities($message, ENT_QUOTES, api_is_xml_http_request() ? 'UTF-8' : api_get_system_encoding()); @@ -712,9 +712,9 @@ class Display /** * Returns the htmlcode for a tag (h3, h1, div, a, button), etc * - * @param string $image the filename of the file (in the main/img/ folder - * @param string $alt_text the alt text (probably a language variable) - * @param array additional attributes (for instance height, width, onclick, ...) + * @param string $tag the tag name + * @param string $content the tag's content + * @param array $additional_attributes (for instance height, width, onclick, ...) * @author Julio Montoya 2010 */ public static function tag($tag, $content, $additional_attributes = array()) { diff --git a/main/inc/lib/formvalidator/FormValidator.class.php b/main/inc/lib/formvalidator/FormValidator.class.php index 713eac0eca..ba44e940c2 100755 --- a/main/inc/lib/formvalidator/FormValidator.class.php +++ b/main/inc/lib/formvalidator/FormValidator.class.php @@ -339,7 +339,6 @@ EOT; * A rule is attached to check for unwanted HTML * @param string $name * @param string $label The label for the form-element - * @param string $name The element name * @param boolean $required (optional) Is the form-element required (default=true) * @param boolean $full_page (optional) When it is true, the editor loads completed html code for a full page. * @param array $editor_config (optional) Configuration settings for the online editor. diff --git a/plugin/ticket/database.php b/plugin/ticket/database.php index 9d3dce07c8..d778e5bc8a 100644 --- a/plugin/ticket/database.php +++ b/plugin/ticket/database.php @@ -170,11 +170,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; diff --git a/plugin/ticket/lang/english.php b/plugin/ticket/lang/english.php index 055a980171..907906cba5 100644 --- a/plugin/ticket/lang/english.php +++ b/plugin/ticket/lang/english.php @@ -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"; @@ -81,4 +81,6 @@ $strings['TicketWasThisAnswerSatisfying'] = "Was this answer satisfactory?"; $strings['TicketDetail'] = "Ticket details"; $strings['AreYouSure'] = "Are you sure?"; $strings['allow_student_add'] = "Allow students to generate tickets"; -?> +$strings['PleaseBeforeRegisterATicketSelectOneUser'] = "Please select a user before you register a ticket."; +$strings['RequestConfirmation'] = "Request confirmation"; + diff --git a/plugin/ticket/lang/french.php b/plugin/ticket/lang/french.php index 97a5d169b0..e22a32bff4 100644 --- a/plugin/ticket/lang/french.php +++ b/plugin/ticket/lang/french.php @@ -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"; @@ -81,4 +81,6 @@ $strings['TicketWasThisAnswerSatisfying'] = "La réponse au ticket est-elle sati $strings['TicketDetail'] = "Détails du ticket"; $strings['AreYouSure'] = "Êtes-vous certain?"; $strings['allow_student_add'] = "Permettre à l'étudiant de générer des tickets"; -?> +$strings['PleaseBeforeRegisterATicketSelectOneUser'] = "Veuillez sélectionner un utilisateur avant d'enregistrer un ticket."; +$strings['RequestConfirmation'] = "Demander confirmation"; + diff --git a/plugin/ticket/lang/spanish.php b/plugin/ticket/lang/spanish.php index 9d3377b5c5..c810bb306b 100755 --- a/plugin/ticket/lang/spanish.php +++ b/plugin/ticket/lang/spanish.php @@ -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"; @@ -86,3 +86,6 @@ $strings['TicketDetail'] = "Detalle del Ticket"; $strings['AreYouSure'] = "¿Está seguro?"; $strings['allow_student_add'] = "Permitir al studiante generar Tickets"; +$strings['PleaseBeforeRegisterATicketSelectOneUser'] = "Por favor, antes de registrar un Ticket seleccione un usuario."; +$strings['RequestConfirmation'] = "Solicitar confirmación"; + diff --git a/plugin/ticket/src/course_user_list.php b/plugin/ticket/src/course_user_list.php index a909c1fe64..4b4b2eca4e 100644 --- a/plugin/ticket/src/course_user_list.php +++ b/plugin/ticket/src/course_user_list.php @@ -11,25 +11,38 @@ $language_file = array('registration'); require_once '../config.php'; $plugin = TicketPlugin::create(); -$user_id = intval($_GET['user_id']); -$user_info = api_get_user_info($user_id); -$courses_list = CourseManager::get_courses_list_by_user_id($user_id, false, true); -?> -