Completed
Pull Request — 1.11.x (#1293)
by José
387:57 queued 349:55
created
main/user/session_list.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -56,15 +56,15 @@  discard block
 block discarded – undo
56 56
     );
57 57
 
58 58
     //Column config
59
-    $column_model   = array(
60
-        array('name'=>'name',           'index'=>'name',          'width'=>'160',  'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"),
61
-        array('name'=>'nbr_courses',    'index'=>'nbr_courses',   'width'=>'30',   'align'=>'left', 'search' => 'true'),
62
-        array('name'=>'nbr_users',      'index'=>'nbr_users',     'width'=>'30',   'align'=>'left', 'search' => 'true'),
63
-        array('name'=>'category_name',  'index'=>'category_name', 'width'=>'70',   'align'=>'left', 'search' => 'true'),
64
-        array('name'=>'access_start_date',     'index'=>'access_start_date',    'width'=>'40',   'align'=>'left', 'search' => 'true'),
65
-        array('name'=>'access_end_date',       'index'=>'access_end_date',      'width'=>'40',   'align'=>'left', 'search' => 'true'),
66
-        array('name'=>'coach_name',     'index'=>'coach_name',    'width'=>'80',   'align'=>'left', 'search' => 'false'),
67
-        array('name'=>'status',         'index'=>'session_active','width'=>'40',   'align'=>'left', 'search' => 'true', 'stype'=>'select',
59
+    $column_model = array(
60
+        array('name'=>'name', 'index'=>'name', 'width'=>'160', 'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"),
61
+        array('name'=>'nbr_courses', 'index'=>'nbr_courses', 'width'=>'30', 'align'=>'left', 'search' => 'true'),
62
+        array('name'=>'nbr_users', 'index'=>'nbr_users', 'width'=>'30', 'align'=>'left', 'search' => 'true'),
63
+        array('name'=>'category_name', 'index'=>'category_name', 'width'=>'70', 'align'=>'left', 'search' => 'true'),
64
+        array('name'=>'access_start_date', 'index'=>'access_start_date', 'width'=>'40', 'align'=>'left', 'search' => 'true'),
65
+        array('name'=>'access_end_date', 'index'=>'access_end_date', 'width'=>'40', 'align'=>'left', 'search' => 'true'),
66
+        array('name'=>'coach_name', 'index'=>'coach_name', 'width'=>'80', 'align'=>'left', 'search' => 'false'),
67
+        array('name'=>'status', 'index'=>'session_active', 'width'=>'40', 'align'=>'left', 'search' => 'true', 'stype'=>'select',
68 68
           //for the bottom bar
69 69
             'searchoptions' => array(
70 70
                 'defaultValue' => '1',
@@ -72,8 +72,8 @@  discard block
 block discarded – undo
72 72
             ),
73 73
           //for the top bar
74 74
           'editoptions' => array('value' => ':'.get_lang('All').';1:'.get_lang('Active').';0:'.get_lang('Inactive'))),
75
-        array('name'=>'visibility',     'index'=>'visibility',      'width'=>'40',   'align'=>'left', 'search' => 'false'),
76
-        array('name'=>'actions',        'index'=>'actions',         'width'=>'100',  'align'=>'left','formatter'=>'action_formatter','sortable'=>'false', 'search' => 'false')
75
+        array('name'=>'visibility', 'index'=>'visibility', 'width'=>'40', 'align'=>'left', 'search' => 'false'),
76
+        array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left', 'formatter'=>'action_formatter', 'sortable'=>'false', 'search' => 'false')
77 77
     );
78 78
     //Autowidth
79 79
     $extra_params['autowidth'] = 'true';
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 
86 86
     //With this function we can add actions to the jgrid (edit, delete, etc)
87 87
     $action_links = 'function action_formatter(cellvalue, options, rowObject) {
88
-         return \'&nbsp;<a href="add_users_to_session.php?page=session_list.php&id_session=\'+options.rowId+\'">'.Display::return_icon('user_subscribe_session.png',get_lang('SubscribeUsersToSession'),'',ICON_SIZE_SMALL).'</a>'.
88
+         return \'&nbsp;<a href="add_users_to_session.php?page=session_list.php&id_session=\'+options.rowId+\'">'.Display::return_icon('user_subscribe_session.png', get_lang('SubscribeUsersToSession'), '', ICON_SIZE_SMALL).'</a>'.
89 89
          '\';
90 90
     }';
91 91
     ?>
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 
107 107
     $(function() {
108 108
         <?php
109
-            echo Display::grid_js('sessions', $url,$columns,$column_model,$extra_params, array(), $action_links,true);
109
+            echo Display::grid_js('sessions', $url, $columns, $column_model, $extra_params, array(), $action_links, true);
110 110
         ?>
111 111
 
112 112
         setSearchSelect("status");
@@ -148,9 +148,9 @@  discard block
 block discarded – undo
148 148
     <?php if (api_is_platform_admin()) {?>
149 149
         <div class="actions">
150 150
         <?php
151
-        echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_add.php">'.Display::return_icon('new_session.png',get_lang('AddSession'),'',ICON_SIZE_MEDIUM).'</a>';
152
-        echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/add_many_session_to_category.php">'.Display::return_icon('session_to_category.png',get_lang('AddSessionsInCategories'),'',ICON_SIZE_MEDIUM).'</a>';
153
-        echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_category_list.php">'.Display::return_icon('folder.png',get_lang('ListSessionCategory'),'',ICON_SIZE_MEDIUM).'</a>';
151
+        echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_add.php">'.Display::return_icon('new_session.png', get_lang('AddSession'), '', ICON_SIZE_MEDIUM).'</a>';
152
+        echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/add_many_session_to_category.php">'.Display::return_icon('session_to_category.png', get_lang('AddSessionsInCategories'), '', ICON_SIZE_MEDIUM).'</a>';
153
+        echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_category_list.php">'.Display::return_icon('folder.png', get_lang('ListSessionCategory'), '', ICON_SIZE_MEDIUM).'</a>';
154 154
         echo '</div>';
155 155
     }
156 156
 } else {
Please login to merge, or discard this patch.
main/user/class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@
 block discarded – undo
146 146
 $(function() {
147 147
 <?php
148 148
     // grid definition see the $usergroup>display() function
149
-    echo Display::grid_js('usergroups',  $url, $columns, $columnModel, $extraParams, array(), '', true);
149
+    echo Display::grid_js('usergroups', $url, $columns, $columnModel, $extraParams, array(), '', true);
150 150
 ?>
151 151
 });
152 152
 </script>
Please login to merge, or discard this patch.
main/user/classes.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,9 +12,9 @@
 block discarded – undo
12 12
 
13 13
 $this_section = SECTION_COURSES;
14 14
 
15
-$interbreadcrumb[]= array ('url' =>'classes.php','name' => get_lang('Classes'));
15
+$interbreadcrumb[] = array('url' =>'classes.php', 'name' => get_lang('Classes'));
16 16
 if (isset($_GET['id'])) {
17
-    $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Groups'));
17
+    $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('Groups'));
18 18
 }
19 19
 
20 20
 Display :: display_header($tool_name, 'Classes');
Please login to merge, or discard this patch.
main/user/user_import.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
 
16 16
 $tool_name = get_lang('ImportUsersToACourse');
17 17
 
18
-$interbreadcrumb[] = array ("url" => "user.php", "name" => get_lang("Users"));
19
-$interbreadcrumb[] = array ("url" => "#", "name" => get_lang("ImportUsersToACourse"));
18
+$interbreadcrumb[] = array("url" => "user.php", "name" => get_lang("Users"));
19
+$interbreadcrumb[] = array("url" => "#", "name" => get_lang("ImportUsersToACourse"));
20 20
 
21 21
 $form = new FormValidator('user_import', 'post', 'user_import.php');
22 22
 $form->addElement('header', $tool_name);
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
     if (isset($_FILES['import_file']['size']) && $_FILES['import_file']['size'] !== 0) {
43 43
         $unsubscribe_users = isset($_POST['unsubscribe_users']) ? true : false;
44 44
         //@todo : csvToArray deprecated
45
-        $users  = Import::csvToArray($_FILES['import_file']['tmp_name']);
45
+        $users = Import::csvToArray($_FILES['import_file']['tmp_name']);
46 46
         $invalid_users  = array();
47 47
         $clean_users    = array();
48 48
 
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
                         $user_ids = array();
80 80
                         foreach ($current_user_list as $user) {
81 81
                             if (!CourseManager::is_course_teacher($user['user_id'], $course_code)) {
82
-                                $user_ids[]= $user['user_id'];
82
+                                $user_ids[] = $user['user_id'];
83 83
                             }
84 84
                         }
85 85
                         CourseManager::unsubscribe_user($user_ids, $course_code, $session_id);
@@ -92,12 +92,12 @@  discard block
 block discarded – undo
92 92
                     if (empty($session_id)) {
93 93
                         //just to make sure
94 94
                         if (CourseManager :: is_user_subscribed_in_course($userId, $course_code)) {
95
-                            $user_to_show[]= $userInfo['complete_name'];
95
+                            $user_to_show[] = $userInfo['complete_name'];
96 96
                         }
97 97
                     } else {
98 98
                         //just to make sure
99 99
                         if (CourseManager::is_user_subscribed_in_course($userId, $course_code, true, $session_id)) {
100
-                            $user_to_show[]= $userInfo['complete_name'];
100
+                            $user_to_show[] = $userInfo['complete_name'];
101 101
                         }
102 102
                     }
103 103
                 }
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
                 $message = get_lang('CheckUsersWithId');
106 106
                 $type = 'warning';
107 107
                 foreach ($invalid_users as $invalid_user) {
108
-                    $user_to_show[]= $invalid_user;
108
+                    $user_to_show[] = $invalid_user;
109 109
                 }
110 110
             }
111 111
         }
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
             Display::display_warning_message($message.':  <br />'.$userMessage, false);
131 131
         }
132 132
     } else {
133
-        $empty_line_msg = ($empty_line == 0) ? get_lang('ErrorsWhenImportingFile'): get_lang('ErrorsWhenImportingFile').': '.get_lang('EmptyHeaderLine');
133
+        $empty_line_msg = ($empty_line == 0) ? get_lang('ErrorsWhenImportingFile') : get_lang('ErrorsWhenImportingFile').': '.get_lang('EmptyHeaderLine');
134 134
         Display::display_error_message($empty_line_msg);
135 135
     }
136 136
 }
Please login to merge, or discard this patch.
plugin/openmeetings/lang/english.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 $strings['VideoConferenceAddedToTheCalendar']   = "Videoconference added to the calendar";
21 21
 $strings['VideoConferenceAddedToTheLinkTool']   = "Videoconference added to the link tool";
22 22
 
23
-$strings['GoToTheVideoConference']   = "Go to the videoconference";
23
+$strings['GoToTheVideoConference'] = "Go to the videoconference";
24 24
 
25 25
 $strings['Records']             = "Recording";
26 26
 $strings['Meeting']             = "Meeting";
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 $strings['EnterConference']     = "Enter the videoconference";
32 32
 $strings['RecordList']          = "Recording list";
33 33
 $strings['ServerIsNotRunning']  = "Videoconference server is not running";
34
-$strings['ServerIsNotConfigured']  = "Videoconference server is not configured";
34
+$strings['ServerIsNotConfigured'] = "Videoconference server is not configured";
35 35
 
36 36
 $strings['XUsersOnLine']        = "%s user(s) online";
37 37
 
Please login to merge, or discard this patch.
plugin/openmeetings/lang/french.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 $strings['VideoConferenceAddedToTheCalendar']   = "Vidéoconférence ajoutée au calendrier";
14 14
 $strings['VideoConferenceAddedToTheLinkTool']   = "Vidéoconférence ajoutée comme lien. Vous pouvez éditer et publier le lien sur la page principale du cours depuis l'outil liens.";
15 15
 
16
-$strings['GoToTheVideoConference']   = "Entrer dans la salle de conférence";
16
+$strings['GoToTheVideoConference'] = "Entrer dans la salle de conférence";
17 17
 
18 18
 $strings['Records']             = "Enregistrement";
19 19
 $strings['Meeting']             = "Salle de conférence";
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 $strings['EnterConference']     = "Entrer dans la salle de conférence";
25 25
 $strings['RecordList']          = "Liste des enregistrements";
26 26
 $strings['ServerIsNotRunning']  = "Le serveur de vidéoconférence ne fonctionne pas";
27
-$strings['ServerIsNotConfigured']  = "Le serveur de vidéoconférence n'est pas configuré correctement";
27
+$strings['ServerIsNotConfigured'] = "Le serveur de vidéoconférence n'est pas configuré correctement";
28 28
 
29 29
 $strings['XUsersOnLine']        = "%s utilisateurs dans la salle";
30 30
 
Please login to merge, or discard this patch.
plugin/openmeetings/lang/spanish.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 $strings['VideoConferenceAddedToTheCalendar']   = "Videoconferencia añadida al calendario";
14 14
 $strings['VideoConferenceAddedToTheLinkTool']   = "Videoconferencia añadida como enlace. Puede editar y publicar el enlace en la página principal del curso desde la herramienta de enlace.";
15 15
 
16
-$strings['GoToTheVideoConference']   = "Ir a la videoconferencia";
16
+$strings['GoToTheVideoConference'] = "Ir a la videoconferencia";
17 17
 
18 18
 $strings['Records']             = "Grabación";
19 19
 $strings['Meeting']             = "Sala de conferencia";
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 $strings['EnterConference']     = "Entrar a la videoconferencia";
25 25
 $strings['RecordList']          = "Lista de grabaciones";
26 26
 $strings['ServerIsNotRunning']  = "El servidor de videoconferencia no está funcionando";
27
-$strings['ServerIsNotConfigured']  = "El servidor de videoconferencia no está configurado correctamente";
27
+$strings['ServerIsNotConfigured'] = "El servidor de videoconferencia no está configurado correctamente";
28 28
 
29 29
 $strings['XUsersOnLine']        = "%s usuario(s) en la sala";
30 30
 
Please login to merge, or discard this patch.
plugin/createdrupaluser/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,6 +5,6 @@
 block discarded – undo
5 5
  * @author Imanol Losada Oriol <[email protected]>
6 6
  * @package chamilo.plugin.skype
7 7
  */
8
-require_once __DIR__ . '/config.php';
8
+require_once __DIR__.'/config.php';
9 9
 
10 10
 Skype::create()->install();
Please login to merge, or discard this patch.
plugin/createdrupaluser/config.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,4 +6,4 @@
 block discarded – undo
6 6
  * @package chamilo.plugin.skype
7 7
  */
8 8
 
9
-require_once api_get_path(SYS_PATH) . 'main/inc/global.inc.php';
9
+require_once api_get_path(SYS_PATH).'main/inc/global.inc.php';
Please login to merge, or discard this patch.