Browse Source

Fix PHP warnings, user MessageManager instead of custom emails.

- Fix extension error when using ajax.
jmontoyaa 7 years ago
parent
commit
3d6b045c19
2 changed files with 33 additions and 17 deletions
  1. 3 5
      main/work/upload.php
  2. 30 12
      main/work/work.lib.php

+ 3 - 5
main/work/upload.php

@@ -1,8 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-use ChamiloSession as Session;
-
 require_once __DIR__.'/../inc/global.inc.php';
 $current_course_tool = TOOL_STUDENTPUBLICATION;
 
@@ -85,8 +83,8 @@ $form = new FormValidator(
 
 setWorkUploadForm($form, $workInfo['allow_text_assignment']);
 
-$form->addElement('hidden', 'id', $work_id);
-$form->addElement('hidden', 'sec_token', $token);
+$form->addHidden('id', $work_id);
+$form->addHidden('sec_token', $token);
 
 $allowRedirect = api_get_configuration_value('allow_redirect_to_main_page_after_work_upload');
 $urlToRedirect = '';
@@ -134,7 +132,7 @@ $url = api_get_path(WEB_AJAX_PATH).'work.ajax.php?'.api_get_cidreq().'&a=upload_
 
 $htmlHeadXtra[] = api_get_jquery_libraries_js(array('jquery-ui', 'jquery-upload'));
 $htmlHeadXtra[] = to_javascript_work();
-Display :: display_header(null);
+Display::display_header(null);
 
 // Only text
 if ($workInfo['allow_text_assignment'] == 1) {

+ 30 - 12
main/work/work.lib.php

@@ -3843,11 +3843,10 @@ function uploadWork($my_folder_data, $_course, $isCorrection = false, $workInfo
  */
 function sendAlertToUsers($workId, $courseInfo, $session_id)
 {
-    $user_list = array();
-    //$workData = get_work_assignment_by_id($workId, $courseInfo['real_id']);
+    $user_list = [];
     $workData = get_work_data_by_id($workId, $courseInfo['real_id'], $session_id);
-    //last value is to check this is not "just" an edit
-    //YW Tis part serve to send a e-mail to the tutors when a new file is sent
+    // last value is to check this is not "just" an edit
+    // YW Tis part serve to send a e-mail to the tutors when a new file is sent
     $send = api_get_course_setting('email_alert_manager_on_new_doc');
 
     if ($send == SEND_EMAIL_EVERYONE || $send == SEND_EMAIL_TEACHERS) {
@@ -3906,13 +3905,22 @@ function sendAlertToUsers($workId, $courseInfo, $session_id)
             $to_user_id = $user_data['user_id'];
             $user_info = api_get_user_info($to_user_id);
             $message = get_lang('SendMailBody')."\n".get_lang('CourseName')." : ".$courseInfo['name']."\n";
-            $message .= get_lang('UserName')." : ".api_get_person_name($user_info['firstname'], $user_info['lastname'])."\n";
+            $message .= get_lang('UserName')." : ".$user_info['complete_name']."\n";
             $message .= get_lang('DateSent')." : ".api_format_date(api_get_local_time())."\n";
             $url = api_get_path(WEB_CODE_PATH)."work/work.php?cidReq=".$courseInfo['code']."&id_session=".$session_id."&id=".$workData['id'];
             $message .= get_lang('WorkName')." : ".$workData['title']."\n\n".'<a href="'.$url.'">'.get_lang('DownloadLink')."</a>\n";
             //$message .= $url;
-            MessageManager::send_message_simple($to_user_id, $subject, $message);
-            api_mail_html(
+            MessageManager::send_message_simple(
+                $to_user_id,
+                $subject,
+                $message,
+                0,
+                false,
+                false,
+                [],
+                false
+            );
+            /*api_mail_html(
                 api_get_person_name(
                     $user_info['firstname'].' '.$user_info['lastname'],
                     null,
@@ -3923,7 +3931,7 @@ function sendAlertToUsers($workId, $courseInfo, $session_id)
                 $message,
                 $senderName,
                 $senderEmail
-            );
+            );*/
         }
     }
 }
@@ -3972,11 +3980,21 @@ function processWorkForm(
     $work_table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
 
     $courseId = $courseInfo['real_id'];
-    $groupId = intval($groupId);
-    $sessionId = intval($sessionId);
-    $userId = intval($userId);
+    $groupId = (int) $groupId;
+    $sessionId = (int) $sessionId;
+    $userId = (int) $userId;
+
+    $extension = '';
+    if (isset($values['extension'])) {
+        $extension = $values['extension'];
+    } else {
+        $fileInfo = pathinfo($values['title']);
+        if (isset($fileInfo['extension']) && !empty($fileInfo['extension'])) {
+            $extension = '.'.$fileInfo['extension'];
+        }
+    }
 
-    $title = $values['title'].$values['extension'];
+    $title = $values['title'].$extension;
     $description = $values['description'];
     $contains_file = isset($values['contains_file']) && !empty($values['contains_file']) ? intval($values['contains_file']) : 0;