Fix create new ticket. Remove unused code see BT#11081

main/ticket/new_ticket.php

@@ -53,50 +53,6 @@ $(document).on("ready", function () {
     updateCourseList(sessionId);
 });
 
-function changeType() {
-    var selected = document.getElementById("category_id").selectedIndex;
-    var id = $("#category_id").val();
-    $("#other_area").val(other_area[id]);
-    $("#email").val(email[id]);
-    if (parseInt(course_required[id]) == 0){
-        $("#divCourse").css("display", "none");
-        if( id != "CUR"){
-            $("#divEmail").css("display", "block");
-            $("#personal_email").attr("required","required");
-        }
-        $("#course_id").disabled = true;
-        $("#course_id").value = 0;
-    } else {
-        $("#divCourse").css("display", "block");
-        $("#course_id").prop("disabled", false);
-        $("#course_id").val(0);
-    }
-}
-function handleClick2(myRadio) {
-    var user_id = myRadio.value;
-    document.getElementById("user_id_request").value = user_id;
-    alert(document.getElementById("user_id_request").value);
-}
-function validate() {
-    var re  = /^([a-zA-Z0-9_.-])+@(([a-zA-Z0-9-])+.)+([a-zA-Z0-9]{2,4})+$/;
-    fckEditor1val = CKEDITOR.instances["content"].getData();
-    document.getElementById("content").value= fckEditor1val;
-    var selected = document.getElementById("category_id").selectedIndex;
-    var id = document.getElementById("category_id").options[selected].value;
-    if(parseInt(course_required[id]) == 1 && document.getElementById("course_id").value == 0) {
-        alert("' . addslashes(get_lang("ValidCourse")) . '");
-        return false;
-    } else if(id != "CUR" && parseInt(course_required[id]) != 1  && !re.test(document.getElementById("personal_email").value)) {
-        if (document.getElementById("personal_email").value != "") {
-            alert("' . addslashes(get_lang("PleaseEnterValidEmail")) . '");
-            return false;
-        }
-    } else if(fckEditor1val == "") {
-        alert("' . addslashes(get_lang("Filled")) . '");
-        return false;
-    }
-}
-
 var counter_image = 1;
 
 function remove_image_form(element_id) {
@@ -149,20 +105,7 @@ function add_image_form() {
     }
 }
 </script>
-
-<style>
-div.row div.label2 {
-    float:left;
-    width:10%;
-}
-div.row div.formw2 {
-    width:90%;
-    float:left
-}
-div.divTicket {
-    padding-top: 100px;
-}
-</style>';
+';
 $projectId = isset($_GET['project_id']) ? (int) $_GET['project_id'] : '';
 
 $types = TicketManager::get_all_tickets_categories($projectId, 'category.name ASC');
@@ -198,251 +141,6 @@ function js_array($array, $name, $key)
     return $return;
 }
 
-/**
- *
- */
-function show_form_send_ticket()
-{
-    global $types;
-
-    $userId = api_get_user_id();
-
-    // Category List
-    $categoryList = array();
-    foreach ($types as $type) {
-        $categoryList[$type['category_id']] = $type['name'].': '.$type['description'];
-    }
-
-    // Status List
-    $statusAttributes = array(
-        'style' => 'display: none;',
-        'id' => 'status_id',
-        'for' => 'status_id'
-    );
-
-    $statusList = TicketManager::getStatusList();
-
-    // Source List
-    $sourceList = array();
-    $sourceAttributes = array(
-        'style' => 'display: none;',
-        'id' => 'source_id',
-        'for' => 'source_id'
-    );
-    $sourceList[TicketManager::SOURCE_PLATFORM] = get_lang('SrcPlatform');
-    if (api_is_platform_admin()) {
-        $sourceAttributes = array(
-            'id' => 'source_id',
-            'for' => 'source_id'
-        );
-        $sourceList[TicketManager::SOURCE_EMAIL] = get_lang('SrcEmail');
-        $sourceList[TicketManager::SOURCE_PHONE] = get_lang('SrcPhone');
-        $sourceList[TicketManager::SOURCE_PRESENTIAL] = get_lang('SrcPresential');
-    }
-
-    // Priority List
-    $priorityList = TicketManager::getPriorityList();
-
-    $projectId = isset($_GET['project_id']) ? (int) $_GET['project_id'] : 0;
-    $form = new FormValidator(
-        'send_ticket',
-        'POST',
-        api_get_self().'?project_id='.$projectId,
-        '',
-        array(
-            'enctype' => 'multipart/form-data',
-            'onsubmit' => 'return validate()'
-        )
-    );
-
-    $form->addElement(
-        'hidden',
-        'user_id_request',
-        '',
-        array(
-            'id' => 'user_id_request'
-        )
-    );
-
-    $form->addElement(
-        'hidden',
-        'project_id',
-        $projectId
-    );
-
-    $form->addElement(
-        'hidden',
-        'other_area',
-        '',
-        array(
-            'id' => 'other_area'
-        )
-    );
-
-    $form->addElement(
-        'hidden',
-        'email',
-        '',
-        array(
-            'id' => 'email'
-        )
-    );
-
-    $form->addSelect(
-        'category_id',
-        get_lang('Category'),
-        $categoryList,
-        array(
-            'onchange' => 'changeType()',
-            'id' => 'category_id',
-            'for' => 'category_id',
-            'style' => 'width: 562px;'
-        )
-    );
-
-    $form->addElement(
-        'text',
-        'subject',
-        get_lang('Subject'),
-        array(
-            'id' => 'subject'
-        )
-    );
-
-    $form->addHtmlEditor(
-        'content',
-        get_lang('Message'),
-        false,
-        false,
-        array(
-            'ToolbarSet' => 'Profile',
-            'Height' => '250'
-        )
-    );
-
-    if (api_is_platform_admin()) {
-        $form->addSelectAjax(
-            'user_id',
-            get_lang('Assign'),
-            null,
-            ['url' => api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?a=get_user_like']
-        );
-    }
-
-    $form->addElement(
-        'text',
-        'personal_email',
-        get_lang('PersonalEmail'),
-        array(
-            'id' => 'personal_email'
-        )
-    );
-
-    $form->addLabel(
-        '',
-        Display::div(
-            '',
-            array(
-                'id' => 'user_request'
-            )
-        )
-    );
-
-    $form->addElement(
-        'select',
-        'status_id',
-        get_lang('Status'),
-        $statusList,
-        $statusAttributes
-    );
-
-    $form->addElement(
-        'select',
-        'priority_id',
-        get_lang('Priority'),
-        $priorityList,
-        array(
-            'id' => 'priority_id',
-            'for' => 'priority_id'
-        )
-    );
-
-    $form->addElement(
-        'select',
-        'source_id',
-        get_lang('Source'),
-        $sourceList,
-        $sourceAttributes
-    );
-
-    $form->addElement(
-        'text',
-        'phone',
-        get_lang('Phone') . ' (' . get_lang('Optional') . ')',
-        array(
-            'id' => 'phone'
-        )
-    );
-
-    $sessionList = SessionManager::get_sessions_by_user($userId);
-    $sessionListToSelect = array(get_lang('Select'));
-    //Course List
-    foreach ($sessionList as $sessionInfo) {
-        $sessionListToSelect[$sessionInfo['session_id']] = $sessionInfo['session_name'];
-    }
-
-    $form->addSelect('session_id', get_lang('Session'), $sessionListToSelect, ['id' => 'session_id']);
-
-    $form->addSelect('course_id', get_lang('Course'), [], ['id' => 'course_id']);
-
-
-    $courseInfo = api_get_course_info();
-    $params = [];
-
-    if (!empty($courseInfo)) {
-        $params = [
-            'course_id' => $courseInfo['real_id']
-        ];
-
-        $sessionInfo = api_get_session_info(api_get_session_id());
-        if (!empty($sessionInfo)) {
-            $params['session_id'] = $sessionInfo['id'];
-        }
-    }
-
-    $form->setDefaults($params);
-
-    $form->addElement('file', 'attach_1', get_lang('FilesAttachment'));
-    $form->addLabel('', '<span id="filepaths"><div id="filepath_1"></div></span>');
-
-    $form->addLabel('',
-        '<span id="link-more-attach">
-         <span class="btn btn-success" onclick="return add_image_form()">' . get_lang('AddOneMoreFile') . '</span>
-         </span>
-         ('.sprintf(get_lang('MaximunFileSizeX'), format_file_size(api_get_setting('message_max_upload_filesize'))).')
-    ');
-
-    $form->addElement('html', '<br/>');
-    $form->addElement(
-        'button',
-        'compose',
-        get_lang('SendMessage'),
-        null,
-        null,
-        null,
-        'btn btn-primary',
-        array(
-            'id' => 'btnsubmit'
-        )
-    );
-
-    $form->addRule('content', get_lang('ThisFieldIsRequired'), 'required');
-    $form->addRule('category_id', get_lang('ThisFieldIsRequired'), 'required');
-    $form->addRule('subject', get_lang('ThisFieldIsRequired'), 'required');
-
-    $form->display();
-}
-
 /**
  *
  */
@@ -484,131 +182,261 @@ function save_ticket()
         header('Location:' . api_get_path(WEB_CODE_PATH).'ticket/tickets.php');
         exit;
     } else {
-        Display::display_header(get_lang('ComposeMessage'));
-        Display::display_error_message(get_lang('ThereWasAnErrorRegisteringTheTicket'));
+        Display::addFlash(Display::return_message(get_lang('ThereWasAnErrorRegisteringTheTicket')));
     }
 }
 
-/**
- * Get the total number of users on the platform
- * @return int  The number of users
- * @see SortableTable#get_total_number_of_items()
- */
-function get_number_of_users()
-{
-    $user_table = Database :: get_main_table(TABLE_MAIN_USER);
-    $sql = "SELECT COUNT(u.user_id) AS total_number_of_items FROM $user_table u";
-    if ((api_is_platform_admin() || api_is_session_admin()) && api_get_multiple_access_url()) {
-        $access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-        $sql.= " INNER JOIN $access_url_rel_user_table url_rel_user ON (u.user_id=url_rel_user.user_id)";
-    }
-    if (isset($_GET['keyword'])) {
-        $keyword = Database::escape_string(trim($_GET['keyword']));
-        $sql .= " WHERE (u.firstname LIKE '%$keyword%' OR
-                  u.lastname LIKE '%$keyword%'  OR
-                  concat(u.firstname,' ',u.lastname) LIKE '%$keyword%'  OR
-                  concat(u.lastname,' ',u.firstname) LIKE '%$keyword%' OR
-                  u.username LIKE '%$keyword%' OR
-                  u.email LIKE '%$keyword%'  OR
-                  u.official_code LIKE '%$keyword%') ";
-    }
-    $res = Database::query($sql);
-    $obj = Database::fetch_object($res);
+$interbreadcrumb[] = array(
+    'url' => api_get_path(WEB_CODE_PATH).'ticket/tickets.php',
+    'name' => get_lang('MyTickets')
+);
 
-    return $obj->total_number_of_items;
-}
+$userId = api_get_user_id();
 
-/**
- * Get the users to display on the current page (fill the sortable-table)
- * @param   int     offset of first user to recover
- * @param   int     Number of users to get
- * @param   int     Column to sort on
- * @param   string  Order (ASC,DESC)
- * @return  array   A list of users with their data
- * @see SortableTable#get_table_data($from)
- */
-function get_user_data($from, $number_of_items, $column, $direction)
-{
-    $user_table = Database :: get_main_table(TABLE_MAIN_USER);
+// Category List
+$categoryList = array();
+foreach ($types as $type) {
+    $categoryList[$type['category_id']] = $type['name'].': '.$type['description'];
+}
 
-    if (api_is_western_name_order()) {
-        $col34 = "u.firstname AS col3,
-                  u.lastname AS col4,";
-    } else {
-        $col34 = "u.lastname AS col3,
-                  u.firstname AS col4,";
-    }
+// Status List
+$statusAttributes = array(
+    'style' => 'display: none;',
+    'id' => 'status_id',
+    'for' => 'status_id'
+);
 
-    $sql = "SELECT
-                u.user_id AS col0,
-                u.official_code AS col2,
-                $col34
-                u.username AS col5,
-                u.email AS col6,
-                u.status AS col7,
-                u.active AS col8,
-                u.user_id AS col9 ,
-                u.expiration_date AS exp
-            FROM $user_table u ";
-
-    if (isset($_GET['keyword'])) {
-        $keyword = Database::escape_string(trim($_GET['keyword']));
-        $sql .= " WHERE (u.firstname LIKE '%$keyword%' OR
-                  u.lastname LIKE '%$keyword%' OR
-                  concat(u.firstname,' ',u.lastname) LIKE '%$keyword%' OR
-                  concat(u.lastname,' ',u.firstname) LIKE '%$keyword%' OR
-                  u.username LIKE '%$keyword%'  OR
-                  u.official_code LIKE '%$keyword%' OR
-                  u.email LIKE '%$keyword%' )";
-    }
-    if (!in_array($direction, array('ASC', 'DESC'))) {
-        $direction = 'ASC';
-    }
-    $column = intval($column);
-    $from = intval($from);
-    $number_of_items = intval($number_of_items);
-
-    $sql .= " ORDER BY col$column $direction ";
-    $sql .= " LIMIT $from, $number_of_items";
-
-    $res = Database::query($sql);
-
-    $users = array();
-    while ($user = Database::fetch_row($res)) {
-        $user_id = $user[0];
-        $userPicture = UserManager::getUserPicture($user_id);
-        $photo = '<img src="' . $userPicture. '" alt="' . api_get_person_name($user[2], $user[3]) . '" title="' . api_get_person_name($user[2], $user[3]) . '" />';
-        $users[] = array(
-            $photo,
-            $user_id,
-            $user[2],
-            $user[3],
-            $user[4],
-            $user[5]
-        );
-    }
+$statusList = TicketManager::getStatusList();
 
-    return $users;
+// Source List
+$sourceList = array();
+$sourceAttributes = array(
+    'style' => 'display: none;',
+    'id' => 'source_id',
+    'for' => 'source_id'
+);
+$sourceList[TicketManager::SOURCE_PLATFORM] = get_lang('SrcPlatform');
+if (api_is_platform_admin()) {
+    $sourceAttributes = array(
+        'id' => 'source_id',
+        'for' => 'source_id'
+    );
+    $sourceList[TicketManager::SOURCE_EMAIL] = get_lang('SrcEmail');
+    $sourceList[TicketManager::SOURCE_PHONE] = get_lang('SrcPhone');
+    $sourceList[TicketManager::SOURCE_PRESENTIAL] = get_lang('SrcPresential');
 }
 
-$interbreadcrumb[] = array(
-    'url' => api_get_path(WEB_CODE_PATH).'ticket/tickets.php',
-    'name' => get_lang('MyTickets')
+// Priority List
+$priorityList = TicketManager::getPriorityList();
+
+$projectId = isset($_GET['project_id']) ? (int) $_GET['project_id'] : 0;
+
+$form = new FormValidator(
+    'send_ticket',
+    'POST',
+    api_get_self().'?project_id='.$projectId,
+    '',
+    array(
+        'enctype' => 'multipart/form-data',
+    )
 );
 
-if (!isset($_POST['compose'])) {
-    Display::display_header(get_lang('ComposeMessage'));
+$form->addElement(
+    'hidden',
+    'user_id_request',
+    '',
+    array(
+        'id' => 'user_id_request'
+    )
+);
+
+$form->addElement(
+    'hidden',
+    'project_id',
+    $projectId
+);
 
-    echo '<div class="actions">';
-    echo Display::url(
-        Display::return_icon('back.png', get_lang('Tickets'), [], ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . 'ticket/tickets.php'
+$form->addElement(
+    'hidden',
+    'other_area',
+    '',
+    array(
+        'id' => 'other_area'
+    )
+);
+
+$form->addElement(
+    'hidden',
+    'email',
+    '',
+    array(
+        'id' => 'email'
+    )
+);
+
+$form->addSelect(
+    'category_id',
+    get_lang('Category'),
+    $categoryList,
+    array(
+        'id' => 'category_id',
+        'for' => 'category_id',
+        'style' => 'width: 562px;'
+    )
+);
+
+$form->addElement(
+    'text',
+    'subject',
+    get_lang('Subject'),
+    array(
+        'id' => 'subject'
+    )
+);
+
+$form->addHtmlEditor(
+    'content',
+    get_lang('Message'),
+    false,
+    false,
+    array(
+        'ToolbarSet' => 'Profile',
+        'Height' => '250'
+    )
+);
+
+if (api_is_platform_admin()) {
+    $form->addSelectAjax(
+        'user_id',
+        get_lang('Assign'),
+        null,
+        ['url' => api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?a=get_user_like']
     );
-    echo '</div>';
+}
+
+$form->addElement(
+    'text',
+    'personal_email',
+    get_lang('PersonalEmail'),
+    array(
+        'id' => 'personal_email'
+    )
+);
+
+$form->addLabel(
+    '',
+    Display::div(
+        '',
+        array(
+            'id' => 'user_request'
+        )
+    )
+);
+
+$form->addElement(
+    'select',
+    'status_id',
+    get_lang('Status'),
+    $statusList,
+    $statusAttributes
+);
+
+$form->addElement(
+    'select',
+    'priority_id',
+    get_lang('Priority'),
+    $priorityList,
+    array(
+        'id' => 'priority_id',
+        'for' => 'priority_id'
+    )
+);
+
+$form->addElement(
+    'select',
+    'source_id',
+    get_lang('Source'),
+    $sourceList,
+    $sourceAttributes
+);
+
+$form->addElement(
+    'text',
+    'phone',
+    get_lang('Phone') . ' (' . get_lang('Optional') . ')',
+    array(
+        'id' => 'phone'
+    )
+);
+
+$sessionList = SessionManager::get_sessions_by_user($userId);
+$sessionListToSelect = array(get_lang('Select'));
+//Course List
+foreach ($sessionList as $sessionInfo) {
+    $sessionListToSelect[$sessionInfo['session_id']] = $sessionInfo['session_name'];
+}
+
+$form->addSelect('session_id', get_lang('Session'), $sessionListToSelect, ['id' => 'session_id']);
+$form->addSelect('course_id', get_lang('Course'), [], ['id' => 'course_id']);
+
+$courseInfo = api_get_course_info();
+$params = [];
+
+if (!empty($courseInfo)) {
+    $params = [
+        'course_id' => $courseInfo['real_id']
+    ];
+
+    $sessionInfo = api_get_session_info(api_get_session_id());
+    if (!empty($sessionInfo)) {
+        $params['session_id'] = $sessionInfo['id'];
+    }
+}
+
+$form->setDefaults($params);
 
-    show_form_send_ticket();
-} else {
+$form->addElement('file', 'attach_1', get_lang('FilesAttachment'));
+$form->addLabel('', '<span id="filepaths"><div id="filepath_1"></div></span>');
+
+$form->addLabel(
+    '',
+    '<span id="link-more-attach">
+         <span class="btn btn-success" onclick="return add_image_form()">' . get_lang('AddOneMoreFile') . '</span>
+         </span>
+         ('.sprintf(get_lang('MaximunFileSizeX'), format_file_size(api_get_setting('message_max_upload_filesize'))).')
+    '
+);
+
+$form->addElement('html', '<br/>');
+$form->addElement(
+    'button',
+    'compose',
+    get_lang('SendMessage'),
+    null,
+    null,
+    null,
+    'btn btn-primary',
+    array(
+        'id' => 'btnsubmit'
+    )
+);
+
+$form->addRule('content', get_lang('ThisFieldIsRequired'), 'required');
+$form->addRule('category_id', get_lang('ThisFieldIsRequired'), 'required');
+$form->addRule('subject', get_lang('ThisFieldIsRequired'), 'required');
+
+if ($form->validate()) {
     save_ticket();
 }
 
+Display::display_header(get_lang('ComposeMessage'));
+
+echo '<div class="actions">';
+echo Display::url(
+    Display::return_icon('back.png', get_lang('Tickets'), [], ICON_SIZE_MEDIUM),
+    api_get_path(WEB_CODE_PATH) . 'ticket/tickets.php'
+);
+echo '</div>';
+
+$form->display();
 Display::display_footer();