diff --git a/main/inc/lib/AnnouncementManager.php b/main/inc/lib/AnnouncementManager.php index 768d358730..9fe001d706 100755 --- a/main/inc/lib/AnnouncementManager.php +++ b/main/inc/lib/AnnouncementManager.php @@ -1412,7 +1412,7 @@ class AnnouncementManager 'comment' => $file_comment, 'path' => $new_file_name, 'announcement_id' => $announcement_id, - 'size' => intval($file['size']), + 'size' => (int) $file['size'], ]; $insertId = Database::insert($table, $params); diff --git a/main/inc/lib/course_request.lib.php b/main/inc/lib/course_request.lib.php index 33d409fdaf..cdd7728445 100755 --- a/main/inc/lib/course_request.lib.php +++ b/main/inc/lib/course_request.lib.php @@ -611,11 +611,20 @@ class CourseRequestManager $email_body .= get_lang('Email', null, $email_language).': '.api_get_setting('emailAdministrator', null, $email_language)."\n"; $email_body .= "\n".get_lang('CourseRequestLegalNote', null, $email_language)."\n"; - $sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS); + $sender_name = api_get_person_name( + api_get_setting('administratorName'), + api_get_setting('administratorSurname'), + null, + PERSON_NAME_EMAIL_ADDRESS + ); $sender_email = api_get_setting('emailAdministrator'); - $recipient_name = api_get_person_name($user_info['firstname'], $user_info['lastname'], null, PERSON_NAME_EMAIL_ADDRESS); + $recipient_name = api_get_person_name( + $user_info['firstname'], + $user_info['lastname'], + null, + PERSON_NAME_EMAIL_ADDRESS + ); $recipient_email = $user_info['mail']; - $extra_headers = 'Bcc: '.$sender_email; $additionalParameters = [ 'smsType' => SmsPlugin::COURSE_OPENING_REQUEST_CODE_REJECTED, @@ -697,9 +706,13 @@ class CourseRequestManager PERSON_NAME_EMAIL_ADDRESS ); $sender_email = api_get_setting('emailAdministrator'); - $recipient_name = api_get_person_name($user_info['firstname'], $user_info['lastname'], null, PERSON_NAME_EMAIL_ADDRESS); + $recipient_name = api_get_person_name( + $user_info['firstname'], + $user_info['lastname'], + null, + PERSON_NAME_EMAIL_ADDRESS + ); $recipient_email = $user_info['mail']; - $extra_headers = 'Bcc: '.$sender_email; $additionalParameters = [ 'smsType' => SmsPlugin::COURSE_OPENING_REQUEST_CODE, diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php index 32bb17e93f..bdb6a40796 100755 --- a/main/inc/lib/message.lib.php +++ b/main/inc/lib/message.lib.php @@ -480,7 +480,6 @@ class MessageManager $parent_id = (int) $parent_id; $editMessageId = (int) $editMessageId; $topic_id = (int) $topic_id; - $status = empty($status) ? MESSAGE_STATUS_UNREAD : (int) $status; if (!empty($receiver_user_id)) { diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index e8ce9cf03c..354e331812 100755 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -315,27 +315,16 @@ class SessionManager $sessionFieldValue = new ExtraFieldValue('session'); $sessionFieldValue->saveFieldValues($extraFields); - /* - Sends a message to the user_id = 1 - - $user_info = api_get_user_info(1); - $complete_name = $user_info['firstname'].' '.$user_info['lastname']; - $subject = api_get_setting('siteName').' - '.get_lang('ANewSessionWasCreated'); - $message = get_lang('ANewSessionWasCreated')."
".get_lang('NameOfTheSession').' : '.$name; - api_mail_html($complete_name, $user_info['email'], $subject, $message); - * - */ // Adding to the correct URL UrlManager::add_session_to_url($session_id, $accessUrlId); // add event to system log - $user_id = api_get_user_id(); Event::addEvent( LOG_SESSION_CREATE, LOG_SESSION_ID, $session_id, api_get_utc_datetime(), - $user_id + api_get_user_id() ); } diff --git a/src/Chamilo/CoreBundle/Entity/Session.php b/src/Chamilo/CoreBundle/Entity/Session.php index cb765ba937..a3d10dc780 100644 --- a/src/Chamilo/CoreBundle/Entity/Session.php +++ b/src/Chamilo/CoreBundle/Entity/Session.php @@ -53,7 +53,7 @@ class Session protected $courses; /** - * @var ArrayCollection + * @var ArrayCollection|SessionRelUser[] * @ORM\OneToMany(targetEntity="SessionRelUser", mappedBy="session", cascade={"persist"}, orphanRemoval=true) */ protected $users;