chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - flint fixes, format code

Browse Source
pull/2588/merge
Julio Montoya 8 years ago
parent 6519cbd4ac
commit d8916b20ef
12 changed files with 23 additions and 29 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      main/announcements/announcements.php
  2. 1
      main/course_info/about.php
  3. 3
      main/forum/editthread.php
  4. 2
      main/forum/forumqualify.php
  5. 1
      main/inc/ajax/session.ajax.php
  6. 2
      main/inc/lib/usermanager.lib.php
  7. 25
      main/social/groups.php
  8. 4
      main/social/home.php
  9. 8
      main/social/invitations.php
  10. 2
      main/social/my_skills_report.php
  11. 1
      main/social/vcard_export.php
  12. 1
      src/Chamilo/UserBundle/Repository/UserRepository.php

2
main/announcements/announcements.php
Unescape View File

@ -395,7 +395,7 @@ switch ($action) {
}
$interbreadcrumb[] = [
'url' => api_get_path(WEB_CODE_PATH).'announcements/announcements.php?'.api_get_cidreq(),
'name'=> $nameTools,
'name' => $nameTools,
];
$nameTools = $form_name;

1
main/course_info/about.php
Unescape View File

@ -14,7 +14,6 @@ use Chamilo\CourseBundle\Entity\CCourseDescription;
*
* @package chamilo.course
*/
$cidReset = true;
require_once __DIR__.'/../inc/global.inc.php';

3
main/forum/editthread.php
Unescape View File

@ -253,9 +253,7 @@ if ($form->validate()) {
$values = $form->exportValues();
Security::clear_token();
updateThread($values);
Skill::saveSkills($form, ITEM_TYPE_FORUM_THREAD, $threadId);
header('Location: '.$redirectUrl);
exit;
}
@ -265,7 +263,6 @@ $form->setDefaults(isset($defaults) ? $defaults : null);
$token = Security::get_token();
$form->addElement('hidden', 'sec_token');
$form->setConstants(['sec_token' => $token]);
$originIsLearnPath = $origin == 'learnpath';
$view = new Template(

2
main/forum/forumqualify.php
Unescape View File

@ -267,9 +267,7 @@ if (isset($rows)) {
echo "<tr>";
echo "<td rowspan=\"3\" class=\"$leftclass\">";
echo '<br /><b>'.api_convert_and_format_date($row['post_date'], DATE_TIME_FORMAT_LONG).'</b><br />';
echo "</td>";
// The post title

1
main/inc/ajax/session.ajax.php
Unescape View File

@ -1,7 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
use Chamilo\UserBundle\Repository\UserRepository;
use Chamilo\UserBundle\Entity\User;
/**

2
main/inc/lib/usermanager.lib.php
Unescape View File

@ -5,8 +5,8 @@ use Chamilo\CoreBundle\Entity\ExtraField as EntityExtraField;
use Chamilo\CoreBundle\Entity\Repository\AccessUrlRepository;
use Chamilo\CoreBundle\Entity\SkillRelUser;
use Chamilo\CoreBundle\Entity\SkillRelUserComment;
use Chamilo\UserBundle\Repository\UserRepository;
use Chamilo\UserBundle\Entity\User;
use Chamilo\UserBundle\Repository\UserRepository;
use ChamiloSession as Session;
use Symfony\Component\Security\Core\Encoder\EncoderFactory;

25
main/social/groups.php
Unescape View File

@ -172,13 +172,11 @@ foreach ($results as $result) {
$html .= '<div class="members-groups">'.$members.'</div>';
if ($result['description'] != '') {
$html .= '<div class="description-groups">'.cut($result['description'], 100, true).'</div>';
} else {
$html .= '';
}
//Avoiding my groups
// Avoiding my groups
if (!in_array($id, $my_group_list)) {
$html .= '<a class="btn btn-primary" href="group_view.php?id='.$id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a> ';
$html .= '<a class="btn btn-primary" href="group_view.php?id='.$id.'&action=join&u='.api_get_user_id().'">'.
get_lang('JoinGroup').'</a> ';
}
$html .= '<div class="group-actions" >'.$join_url.'</div>';
@ -237,9 +235,10 @@ if (is_array($results) && count($results) > 0) {
} else {
$html .= '';
}
//Avoiding my groups
// Avoiding my groups
if (!in_array($id, $my_group_list)) {
$html .= '<a class="btn btn-primary" href="group_view.php?id='.$id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a> ';
$html .= '<a class="btn btn-primary" href="group_view.php?id='.$id.'&action=join&u='.api_get_user_id().'">'.
get_lang('JoinGroup').'</a> ';
}
$html .= '<div class="group-actions" >'.$join_url.'</div>';
@ -270,11 +269,13 @@ if (isset($_GET['view']) && in_array($_GET['view'], $allowed_views)) {
);
}
if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
$create_group_item = '<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
$create_group_item =
'<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
get_lang('CreateASocialGroup').'</a>';
} else {
if (api_is_allowed_to_edit(null, true)) {
$create_group_item = '<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
$create_group_item =
'<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
get_lang('CreateASocialGroup').'</a>';
}
}
@ -322,11 +323,13 @@ if (isset($_GET['view']) && in_array($_GET['view'], $allowed_views)) {
$my_group_content = '<span class="muted">'.get_lang('GroupNone').'</span>';
}
if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
$create_group_item = '<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
$create_group_item =
'<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
get_lang('CreateASocialGroup').'</a>';
} else {
if (api_is_allowed_to_edit(null, true)) {
$create_group_item = '<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
$create_group_item =
'<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
get_lang('CreateASocialGroup').'</a>';
}
}

4
main/social/home.php
Unescape View File

@ -66,7 +66,6 @@ if (api_get_setting('profile', 'picture') == 'true') {
$_FILES['picture']['tmp_name']
)) {
$table_user = Database::get_main_table(TABLE_MAIN_USER);
$sql = "UPDATE $table_user
SET
picture_uri = '$new_picture'
@ -168,7 +167,8 @@ foreach ($results as $result) {
GROUP_IMAGE_SIZE_BIG
);
$result['picture_uri'] = '<img class="img-responsive" src="'.$picture['file'].'" />';
$group_actions = '<div class="group-more"><a class="btn btn-default" href="groups.php?#tab_browse-3">'.get_lang('SeeMore').'</a></div>';
$group_actions = '<div class="group-more"><a class="btn btn-default" href="groups.php?#tab_browse-3">'.
get_lang('SeeMore').'</a></div>';
$group_info = '<div class="description"><p>'.cut($result['description'], 120, true)."</p></div>";
$groups_pop[] = [
Display::url($result['picture_uri'], $group_url),

8
main/social/invitations.php
Unescape View File

@ -123,7 +123,8 @@ if ($number_loop != 0) {
$date = api_convert_and_format_date($invitation['send_date'], DATE_TIME_FORMAT_LONG);
$invitationHtml .= '<div class="row">';
$invitationHtml .= '<div class="col-md-2">';
$invitationHtml .= '<a href="profile.php?u='.$sender_user_id.'"><img class="img-responsive img-rounded" src="'.$userPicture.'"/></a>';
$invitationHtml .= '<a href="profile.php?u='.$sender_user_id.'">';
$invitationHtml .= '<img class="img-responsive img-rounded" src="'.$userPicture.'"/></a>';
$invitationHtml .= '</div>';
$invitationHtml .= '<div class="col-md-10">';
@ -170,9 +171,7 @@ if (count($list_get_invitation_sent) > 0) {
foreach ($list_get_invitation_sent as $invitation) {
$sender_user_id = $invitation['user_receiver_id'];
$user_info = api_get_user_info($sender_user_id);
$invitationSentHtml .= '<div id="id_'.$sender_user_id.'" class="well">';
$title = Security::remove_XSS($invitation['title'], STUDENT, true);
$content = Security::remove_XSS($invitation['content'], STUDENT, true);
$date = api_convert_and_format_date($invitation['send_date'], DATE_TIME_FORMAT_LONG);
@ -203,7 +202,8 @@ if (count($pending_invitations) > 0) {
);
$img = '<img class="img-responsive" src="'.$picture['file'].'" />';
$invitation['picture_uri'] = '<a href="group_view.php?id='.$invitation['id'].'">'.$img.'</a>';
$invitation['name'] = '<a href="group_view.php?id='.$invitation['id'].'">'.cut($invitation['name'], 120, true).'</a>';
$invitation['name'] = '<a href="group_view.php?id='.$invitation['id'].'">'.
cut($invitation['name'], 120, true).'</a>';
$invitation['description'] = cut($invitation['description'], 220, true);
$new_invitation[] = $invitation;
$waitingInvitation .= '<div class="panel-invitations"><div class="row">';

2
main/social/my_skills_report.php
Unescape View File

@ -83,7 +83,7 @@ if ($isStudent) {
'course_name' => $resultData['title'],
];
$imageSysPath = sprintf("%s%s/course-pic.png", api_get_path(SYS_COURSE_PATH), $resultData['directory']);
$imageSysPath = sprintf('%s%s/course-pic.png', api_get_path(SYS_COURSE_PATH), $resultData['directory']);
if (file_exists($imageSysPath)) {
$thumbSysPath = sprintf(

1
main/social/vcard_export.php
Unescape View File

@ -13,7 +13,6 @@ use JeroenDesloovere\VCard\VCard;
require_once __DIR__.'/../inc/global.inc.php';
api_block_anonymous_users();
api_protect_admin_script();
if (isset($_REQUEST['userId'])) {

1
src/Chamilo/UserBundle/Repository/UserRepository.php
Unescape View File

@ -260,7 +260,6 @@ class UserRepository extends EntityRepository
return $query->execute();
}*/
/**
* Get the sessions admins for a user.
*

Write Preview
Loading…
Cancel
Save