Minor - Fix php errors, format code

pull/3924/head
Julio Montoya 4 years ago
parent a5532d080c
commit 6a53db6c57
  1. 6
      psalm.xml
  2. 2
      public/main/inc/lib/SkillModel.php
  3. 5
      public/main/inc/lib/link.lib.php
  4. 1
      public/main/inc/lib/message.lib.php
  5. 19
      public/main/inc/lib/usermanager.lib.php
  6. 140
      public/main/inc/lib/userportal.lib.php

@ -25,7 +25,6 @@
<directory name="public/main/create_course"/>
<!-- <directory name="public/main/cron"/>-->
<directory name="public/main/dashboard"/>
<!-- <directory name="public/main/document"/>-->
<!-- <directory name="public/main/dropbox"/>-->
<!-- <directory name="public/main/exercise"/>-->
<file name="public/main/exercise/oral_expression.class.php"/>
@ -41,7 +40,6 @@
<directory name="public/main/link" />
<!-- <directory name="public/main/lp" />-->
<directory name="public/main/messages" />
<!-- <directory name="public/main/mySpace" />-->
<directory name="public/main/notebook" />
<directory name="public/main/session" />
@ -74,6 +72,8 @@
<!-- <file name="public/main/inc/lib/course_home.lib.php"/>-->
<file name="public/main/inc/lib/course_request.lib.php"/>
<file name="public/main/inc/lib/display.lib.php"/>
<!-- <file name="public/main/inc/lib/document.lib.php"/>-->
<!-- <file name="public/main/inc/lib/CoursesAndSessionsCatalog.class.php"/>-->
<file name="public/main/inc/lib/dashboard.lib.php"/>
<!-- <file name="public/main/inc/lib/database.lib.php"/>-->
@ -135,7 +135,7 @@
<file name="public/main/inc/lib/template.lib.php"/>
<file name="public/main/inc/lib/text.lib.php"/>
<file name="public/main/inc/lib/thematic.lib.php"/>
<!-- <file name="public/main/inc/lib/TicketManager.php"/>-->
<file name="public/main/inc/lib/TicketManager.php"/>
<file name="public/main/inc/lib/timeline.lib.php"/>
<file name="public/main/inc/lib/UnserializeApi.php"/>
<!-- <file name="public/main/inc/lib/tracking.lib.php"/>-->

@ -34,7 +34,7 @@ class SkillModel extends Model
'icon',
'criteria',
];
public $required = ['name'];
public array $required = ['name'];
/** Array of colours by depth, for the coffee wheel. Each depth has 4 col */
/*var $colours = array(

@ -37,12 +37,9 @@ class Link extends Model
'target',
'session_id',
];
public $required = ['url', 'title'];
public array $required = ['url', 'title'];
private $course;
/**
* Link constructor.
*/
public function __construct()
{
$this->table = Database::get_course_table(TABLE_LINK);

@ -791,6 +791,7 @@ class MessageManager
$em = Database::getManager();
$repo = $em->getRepository(Message::class);
$criteria = ['id' => $id, 'userReceiver' => $user_receiver_id];
/** @var Message $message */
$message = $repo->findOneBy($criteria);
if (null === $message || ($message && MESSAGE_STATUS_OUTBOX === $message->getMsgType())) {

@ -4134,25 +4134,6 @@ class UserManager
return $js.$form->returnForm();
}
/**
* Shows the user menu.
*/
public static function show_menu()
{
echo '<div class="actions">';
echo '<a href="/main/auth/profile.php">'.
Display::return_icon('profile.png').' '.get_lang('Profile').'</a>';
echo '<a href="/main/messages/inbox.php">'.
Display::return_icon('inbox.png').' '.get_lang('Inbox').'</a>';
echo '<a href="/main/messages/outbox.php">'.
Display::return_icon('outbox.png').' '.get_lang('Outbox').'</a>';
echo '<span style="float:right; padding-top:7px;">'.
'<a href="/main/auth/profile.php?show=1">'.
Display::return_icon('edit.gif').' '.get_lang('Configuration').'</a>';
echo '</span>';
echo '</div>';
}
/**
* Allow to register contact to social network.
*

@ -734,146 +734,6 @@ class IndexManager
return $html;
}
/**
* @return array
*/
public function return_profile_block()
{
$userInfo = api_get_user_info();
$userId = api_get_user_id();
if (empty($userId)) {
return;
}
$items = [];
$userGroup = new UserGroupModel();
// @todo Add a platform setting to add the user image.
if ('true' === api_get_setting('allow_message_tool')) {
// New messages.
//$number_of_new_messages = MessageManager::getCountNewMessages();
// New contact invitations.
$number_of_new_messages_of_friend = SocialManager::get_message_number_invitation_by_user_id(
$userId
);
// New group invitations sent by a moderator.
$group_pending_invitations = $userGroup->get_groups_by_user(
$userId,
GROUP_USER_PERMISSION_PENDING_INVITATION,
false
);
$group_pending_invitations = count($group_pending_invitations);
$total_invitations = $number_of_new_messages_of_friend + $group_pending_invitations;
$cant_msg = Display::badge($number_of_new_messages);
$items[] = [
'class' => 'inbox-message-social',
'icon' => Display::return_icon('inbox.png', get_lang('Inbox')),
'link' => api_get_path(WEB_CODE_PATH).'messages/inbox.php',
'title' => get_lang('Inbox').$cant_msg,
];
$items[] = [
'class' => 'new-message-social',
'icon' => Display::return_icon('new-message.png', get_lang('Compose')),
'link' => api_get_path(WEB_CODE_PATH).'messages/new_message.php',
'title' => get_lang('Compose'),
];
if ('true' == api_get_setting('allow_social_tool')) {
$total_invitations = Display::badge($total_invitations);
$items[] = [
'class' => 'invitations-social',
'icon' => Display::return_icon('invitations.png', get_lang('Pending invitations')),
'link' => api_get_path(WEB_CODE_PATH).'social/invitations.php',
'title' => get_lang('Pending invitations').$total_invitations,
];
}
}
$items[] = [
'class' => 'personal-data',
'icon' => Display::return_icon('database.png', get_lang('Personal data')),
'link' => api_get_path(WEB_CODE_PATH).'social/personal_data.php',
'title' => get_lang('Personal data'),
];
if (api_get_configuration_value('allow_my_files_link_in_homepage')) {
if ('false' !== api_get_setting('allow_my_files')) {
$items[] = [
'class' => 'myfiles-social',
'icon' => Display::return_icon('sn-files.png', get_lang('Files')),
'link' => api_get_path(WEB_CODE_PATH).'social/myfiles.php',
'title' => get_lang('My files'),
];
}
}
$items[] = [
'class' => 'profile-social',
'icon' => Display::return_icon('edit-profile.png', get_lang('Edit profile')),
'link' => Display::getProfileEditionLink($userId),
'title' => get_lang('Edit profile'),
];
if (api_get_configuration_value('show_link_request_hrm_user') &&
api_is_drh()
) {
$label = get_lang('Request linking to student');
$items[] = [
'icon' => Display::return_icon('new_group.png', $label),
'link' => api_get_path(WEB_CODE_PATH).'social/require_user_linking.php',
'title' => $label,
];
}
if (api_get_configuration_value('show_my_lps_page')) {
$items[] = [
'icon' => Display::return_icon('learnpath.png', get_lang('MyLps')),
'link' => api_get_path(WEB_CODE_PATH).'lp/my_list.php',
'title' => get_lang('MyLps'),
];
}
if (bbb::showGlobalConferenceLink($userInfo)) {
$bbb = new bbb('', '', true, api_get_user_id());
$url = $bbb->getListingUrl();
$items[] = [
'class' => 'video-conference',
'icon' => Display::return_icon(
'bbb.png',
get_lang('Videoconference')
),
'link' => $url,
'title' => get_lang('Videoconference'),
];
}
if ('true' === api_get_plugin_setting('zoom', 'tool_enable')) {
$zoomPlugin = new ZoomPlugin();
$blocks = $zoomPlugin->getProfileBlockItems();
foreach ($blocks as $item) {
$items[] = $item;
}
}
if (
true === api_get_configuration_value('whispeak_auth_enabled') &&
!WhispeakAuthPlugin::checkUserIsEnrolled($userId)
) {
$itemTitle = get_plugin_lang('EnrollmentTitle', WhispeakAuthPlugin::class);
$items[] = [
'class' => 'whispeak-enrollment',
'icon' => Display::return_icon('addworkuser.png', $itemTitle),
'link' => WhispeakAuthPlugin::getEnrollmentUrl(),
'title' => $itemTitle,
];
}
return $items;
}
/**
* @return array
*/

Loading…
Cancel
Save