Просмотр исходного кода

Minor - flint fixes, format code

Julio Montoya 6 лет назад
Родитель
Сommit
d8916b20ef

+ 1 - 1
main/announcements/announcements.php

@@ -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;

+ 0 - 1
main/course_info/about.php

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

+ 0 - 3
main/forum/editthread.php

@@ -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(

+ 0 - 2
main/forum/forumqualify.php

@@ -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

+ 0 - 1
main/inc/ajax/session.ajax.php

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

+ 1 - 1
main/inc/lib/usermanager.lib.php

@@ -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;
 

+ 14 - 11
main/social/groups.php

@@ -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>';
         }
     }

+ 2 - 2
main/social/home.php

@@ -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),

+ 4 - 4
main/social/invitations.php

@@ -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">';

+ 1 - 1
main/social/my_skills_report.php

@@ -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(

+ 0 - 1
main/social/vcard_export.php

@@ -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'])) {

+ 0 - 1
src/Chamilo/UserBundle/Repository/UserRepository.php

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