Completed
Pull Request — 1.11.x (#1615)
by José
26:50
created
main/webservices/soap_user.php 1 patch
Indentation   +165 added lines, -165 removed lines patch added patch discarded remove patch
@@ -14,223 +14,223 @@
 block discarded – undo
14 14
 $s = WSSoapServer::singleton();
15 15
 
16 16
 $s->wsdl->addComplexType(
17
-	'user_id',
18
-	'complexType',
19
-	'struct',
20
-	'all',
21
-	'',
22
-	array(
23
-		'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'),
24
-		'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string')
25
-	)
17
+    'user_id',
18
+    'complexType',
19
+    'struct',
20
+    'all',
21
+    '',
22
+    array(
23
+        'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'),
24
+        'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string')
25
+    )
26 26
 );
27 27
 
28 28
 $s->wsdl->addComplexType(
29
-	'user_result',
30
-	'complexType',
31
-	'struct',
32
-	'all',
33
-	'',
34
-	array(
35
-		'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
36
-		'result' => array('name' => 'result', 'type' => 'tns:result')
37
-	)
29
+    'user_result',
30
+    'complexType',
31
+    'struct',
32
+    'all',
33
+    '',
34
+    array(
35
+        'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
36
+        'result' => array('name' => 'result', 'type' => 'tns:result')
37
+    )
38 38
 );
39 39
 
40 40
 $s->wsdl->addComplexType(
41
-	'user_result_array',
42
-	'complexType',
43
-	'array',
44
-	'',
45
-	'SOAP-ENC:Array',
46
-	array(),
47
-	array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_result[]')),
48
-	'tns:user_result'
41
+    'user_result_array',
42
+    'complexType',
43
+    'array',
44
+    '',
45
+    'SOAP-ENC:Array',
46
+    array(),
47
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_result[]')),
48
+    'tns:user_result'
49 49
 );
50 50
 
51 51
 $s->register(
52
-	'WSUser.DisableUser',
53
-	array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string')
52
+    'WSUser.DisableUser',
53
+    array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string')
54 54
 );
55 55
 
56 56
 $s->register(
57
-	'WSUser.DisableUsers',
58
-	array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'),
59
-	array('return' => 'tns:user_result_array')
57
+    'WSUser.DisableUsers',
58
+    array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'),
59
+    array('return' => 'tns:user_result_array')
60 60
 );
61 61
 
62 62
 $s->register(
63
-	'WSUser.EnableUser',
64
-	array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string')
63
+    'WSUser.EnableUser',
64
+    array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string')
65 65
 );
66 66
 
67 67
 $s->register(
68
-	'WSUser.EnableUsers',
69
-	array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'),
70
-	array('return' => 'tns:user_result_array')
68
+    'WSUser.EnableUsers',
69
+    array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'),
70
+    array('return' => 'tns:user_result_array')
71 71
 );
72 72
 
73 73
 $s->register(
74
-	'WSUser.DeleteUser',
75
-	array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string')
74
+    'WSUser.DeleteUser',
75
+    array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string')
76 76
 );
77 77
 
78 78
 $s->register(
79
-	'WSUser.DeleteUsers',
80
-	array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'),
81
-	array('return' => 'tns:user_result_array')
79
+    'WSUser.DeleteUsers',
80
+    array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'),
81
+    array('return' => 'tns:user_result_array')
82 82
 );
83 83
 
84 84
 $s->register(
85
-	'WSUser.CreateUser',
86
-	array(
87
-		'secret_key' => 'xsd:string',
88
-		'firstname' => 'xsd:string',
89
-		'lastname' => 'xsd:string',
90
-		'status' => 'xsd:int',
91
-		'loginname' => 'xsd:string',
92
-		'password' => 'xsd:string',
93
-		'encrypt_method' => 'xsd:string',
94
-		'user_id_field_name' => 'xsd:string',
95
-		'user_id_value' => 'xsd:string',
96
-		'visibility' => 'xsd:int',
97
-		'email' => 'xsd:string',
98
-		'language' => 'xsd:string',
99
-		'phone' => 'xsd:string',
100
-		'expiration_date' => 'xsd:string',
101
-		'extras' => 'tns:extra_field'
102
-	),
103
-	array('return' => 'xsd:int')
85
+    'WSUser.CreateUser',
86
+    array(
87
+        'secret_key' => 'xsd:string',
88
+        'firstname' => 'xsd:string',
89
+        'lastname' => 'xsd:string',
90
+        'status' => 'xsd:int',
91
+        'loginname' => 'xsd:string',
92
+        'password' => 'xsd:string',
93
+        'encrypt_method' => 'xsd:string',
94
+        'user_id_field_name' => 'xsd:string',
95
+        'user_id_value' => 'xsd:string',
96
+        'visibility' => 'xsd:int',
97
+        'email' => 'xsd:string',
98
+        'language' => 'xsd:string',
99
+        'phone' => 'xsd:string',
100
+        'expiration_date' => 'xsd:string',
101
+        'extras' => 'tns:extra_field'
102
+    ),
103
+    array('return' => 'xsd:int')
104 104
 );
105 105
 
106 106
 $s->wsdl->addComplexType(
107
-	'user_create',
108
-	'complexType',
109
-	'struct',
110
-	'all',
111
-	'',
112
-	array(
113
-		'firstname' => array('name' => 'firstname', 'type' => 'xsd:string'),
114
-		'lastname' => array('name' => 'lastname', 'type' => 'xsd:string'),
115
-		'status' => array('name' => 'status', 'type' => 'xsd:int'),
116
-		'loginname' => array('name' => 'loginname', 'type' => 'xsd:string'),
117
-		'password' => array('name' => 'password', 'type' => 'xsd:string'),
118
-		'encrypt_method' => array('name' => 'encrypt_method', 'type' => 'xsd:string'),
119
-		'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'),
120
-		'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
121
-		'visibility' => array('name' => 'visibility', 'type' => 'xsd:int'),
122
-		'email' => array('name' => 'email', 'type' => 'xsd:string'),
123
-		'language' => array('name' => 'language', 'type' => 'xsd:string'),
124
-		'phone' => array('name' => 'phone', 'type' => 'xsd:string'),
125
-		'expiration_date' => array('name' => 'expiration_date', 'type' => 'xsd:string'),
126
-		'extras' => array('name' => 'extras', 'type' => 'tns:extra_field')
127
-	)
107
+    'user_create',
108
+    'complexType',
109
+    'struct',
110
+    'all',
111
+    '',
112
+    array(
113
+        'firstname' => array('name' => 'firstname', 'type' => 'xsd:string'),
114
+        'lastname' => array('name' => 'lastname', 'type' => 'xsd:string'),
115
+        'status' => array('name' => 'status', 'type' => 'xsd:int'),
116
+        'loginname' => array('name' => 'loginname', 'type' => 'xsd:string'),
117
+        'password' => array('name' => 'password', 'type' => 'xsd:string'),
118
+        'encrypt_method' => array('name' => 'encrypt_method', 'type' => 'xsd:string'),
119
+        'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'),
120
+        'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
121
+        'visibility' => array('name' => 'visibility', 'type' => 'xsd:int'),
122
+        'email' => array('name' => 'email', 'type' => 'xsd:string'),
123
+        'language' => array('name' => 'language', 'type' => 'xsd:string'),
124
+        'phone' => array('name' => 'phone', 'type' => 'xsd:string'),
125
+        'expiration_date' => array('name' => 'expiration_date', 'type' => 'xsd:string'),
126
+        'extras' => array('name' => 'extras', 'type' => 'tns:extra_field')
127
+    )
128 128
 );
129 129
 
130 130
 $s->wsdl->addComplexType(
131
-	'user_create_result',
132
-	'complexType',
133
-	'struct',
134
-	'all',
135
-	'',
136
-	array(
137
-		'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
138
-		'user_id_generated' => array('name' => 'user_id_generated', 'type' => 'xsd:int'),
139
-		'result' => array('name' => 'result', 'type' => 'tns:result')
140
-	)
131
+    'user_create_result',
132
+    'complexType',
133
+    'struct',
134
+    'all',
135
+    '',
136
+    array(
137
+        'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
138
+        'user_id_generated' => array('name' => 'user_id_generated', 'type' => 'xsd:int'),
139
+        'result' => array('name' => 'result', 'type' => 'tns:result')
140
+    )
141 141
 );
142 142
 
143 143
 $s->wsdl->addComplexType(
144
-	'user_create_result_array',
145
-	'complexType',
146
-	'array',
147
-	'',
148
-	'SOAP-ENC:Array',
149
-	array(),
150
-	array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_create_result[]')),
151
-	'tns:user_create_result'
144
+    'user_create_result_array',
145
+    'complexType',
146
+    'array',
147
+    '',
148
+    'SOAP-ENC:Array',
149
+    array(),
150
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_create_result[]')),
151
+    'tns:user_create_result'
152 152
 );
153 153
 
154 154
 $s->register(
155
-	'WSUser.CreateUsers',
156
-	array(
157
-		'secret_key' => 'xsd:string',
158
-		'users' => 'tns:user_create[]'
159
-	),
160
-	array('return' => 'tns:user_create_result_array')
155
+    'WSUser.CreateUsers',
156
+    array(
157
+        'secret_key' => 'xsd:string',
158
+        'users' => 'tns:user_create[]'
159
+    ),
160
+    array('return' => 'tns:user_create_result_array')
161 161
 );
162 162
 
163 163
 $s->register(
164
-	'WSUser.EditUser',
165
-	array(
166
-		'secret_key' => 'xsd:string',
167
-		'user_id_field_name' => 'xsd:string',
168
-		'user_id_value' => 'xsd:string',
169
-		'firstname' => 'xsd:string',
170
-		'lastname' => 'xsd:string',
171
-		'status' => 'xsd:int',
172
-		'loginname' => 'xsd:string',
173
-		'password' => 'xsd:string',
174
-		'encrypt_method' => 'xsd:string',
175
-		'email' => 'xsd:string',
176
-		'language' => 'xsd:string',
177
-		'phone' => 'xsd:string',
178
-		'expiration_date' => 'xsd:string',
179
-		'extras' => 'tns:extra_field'
180
-	)
164
+    'WSUser.EditUser',
165
+    array(
166
+        'secret_key' => 'xsd:string',
167
+        'user_id_field_name' => 'xsd:string',
168
+        'user_id_value' => 'xsd:string',
169
+        'firstname' => 'xsd:string',
170
+        'lastname' => 'xsd:string',
171
+        'status' => 'xsd:int',
172
+        'loginname' => 'xsd:string',
173
+        'password' => 'xsd:string',
174
+        'encrypt_method' => 'xsd:string',
175
+        'email' => 'xsd:string',
176
+        'language' => 'xsd:string',
177
+        'phone' => 'xsd:string',
178
+        'expiration_date' => 'xsd:string',
179
+        'extras' => 'tns:extra_field'
180
+    )
181 181
 );
182 182
 
183 183
 $s->wsdl->addComplexType(
184
-	'user_edit',
185
-	'complexType',
186
-	'struct',
187
-	'all',
188
-	'',
189
-	array(
190
-		'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'),
191
-		'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
192
-		'firstname' => array('name' => 'firstname', 'type' => 'xsd:string'),
193
-		'lastname' => array('name' => 'lastname', 'type' => 'xsd:string'),
194
-		'status' => array('name' => 'status', 'type' => 'xsd:int'),
195
-		'loginname' => array('name' => 'loginname', 'type' => 'xsd:string'),
196
-		'password' => array('name' => 'password', 'type' => 'xsd:string'),
197
-		'encrypt_method' => array('name' => 'encrypt_method', 'type' => 'xsd:string'),
198
-		'email' => array('name' => 'email', 'type' => 'xsd:string'),
199
-		'language' => array('name' => 'language', 'type' => 'xsd:string'),
200
-		'phone' => array('name' => 'phone', 'type' => 'xsd:string'),
201
-		'expiration_date' => array('name' => 'expiration_date', 'type' => 'xsd:string'),
202
-		'extras' => array('name' => 'extras', 'type' => 'tns:extra_field')
203
-	)
184
+    'user_edit',
185
+    'complexType',
186
+    'struct',
187
+    'all',
188
+    '',
189
+    array(
190
+        'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'),
191
+        'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
192
+        'firstname' => array('name' => 'firstname', 'type' => 'xsd:string'),
193
+        'lastname' => array('name' => 'lastname', 'type' => 'xsd:string'),
194
+        'status' => array('name' => 'status', 'type' => 'xsd:int'),
195
+        'loginname' => array('name' => 'loginname', 'type' => 'xsd:string'),
196
+        'password' => array('name' => 'password', 'type' => 'xsd:string'),
197
+        'encrypt_method' => array('name' => 'encrypt_method', 'type' => 'xsd:string'),
198
+        'email' => array('name' => 'email', 'type' => 'xsd:string'),
199
+        'language' => array('name' => 'language', 'type' => 'xsd:string'),
200
+        'phone' => array('name' => 'phone', 'type' => 'xsd:string'),
201
+        'expiration_date' => array('name' => 'expiration_date', 'type' => 'xsd:string'),
202
+        'extras' => array('name' => 'extras', 'type' => 'tns:extra_field')
203
+    )
204 204
 );
205 205
 
206 206
 $s->wsdl->addComplexType(
207
-	'user_edit_result',
208
-	'complexType',
209
-	'struct',
210
-	'all',
211
-	'',
212
-	array(
213
-		'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
214
-		'result' => array('name' => 'result', 'type' => 'tns:result')
215
-	)
207
+    'user_edit_result',
208
+    'complexType',
209
+    'struct',
210
+    'all',
211
+    '',
212
+    array(
213
+        'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
214
+        'result' => array('name' => 'result', 'type' => 'tns:result')
215
+    )
216 216
 );
217 217
 
218 218
 $s->wsdl->addComplexType(
219
-	'user_edit_result_array',
220
-	'complexType',
221
-	'array',
222
-	'',
223
-	'SOAP-ENC:Array',
224
-	array(),
225
-	array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_edit_result[]')),
226
-	'tns:user_edit_result'
219
+    'user_edit_result_array',
220
+    'complexType',
221
+    'array',
222
+    '',
223
+    'SOAP-ENC:Array',
224
+    array(),
225
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_edit_result[]')),
226
+    'tns:user_edit_result'
227 227
 );
228 228
 
229 229
 $s->register(
230
-	'WSUser.EditUsers',
231
-	array(
232
-		'secret_key' => 'xsd:string',
233
-		'users' => 'tns:user_edit[]'
234
-	),
235
-	array('return' => 'tns:user_edit_result_array')
230
+    'WSUser.EditUsers',
231
+    array(
232
+        'secret_key' => 'xsd:string',
233
+        'users' => 'tns:user_edit[]'
234
+    ),
235
+    array('return' => 'tns:user_edit_result_array')
236 236
 );
Please login to merge, or discard this patch.
main/inc/ajax/skill.ajax.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
                     //$gradebook['name'] = $gradebook['name'];
56 56
                     //$gradebook_list[]  = $gradebook;
57 57
                 } else {
58
-                  //  $gradebook['name'] = $gradebook_list[$gradebook['parent_id']]['name'].' > '.$gradebook['name'];
58
+                    //  $gradebook['name'] = $gradebook_list[$gradebook['parent_id']]['name'].' > '.$gradebook['name'];
59 59
                     //$gradebook_list[]  = $gradebook;
60 60
                 }
61 61
             }
Please login to merge, or discard this patch.
main/session/add_students_to_session.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -70,13 +70,13 @@
 block discarded – undo
70 70
         <tr>
71 71
             <td align="center">
72 72
                 <?php
73
-                 echo Display::select(
74
-                     'sessions[]',
75
-                     $sessionList,
76
-                     '',
77
-                     array('style'=>'width:100%', 'multiple'=>'multiple', 'id'=>'sessions', 'size'=>'15px'),
78
-                     false
79
-                 );
73
+                    echo Display::select(
74
+                        'sessions[]',
75
+                        $sessionList,
76
+                        '',
77
+                        array('style'=>'width:100%', 'multiple'=>'multiple', 'id'=>'sessions', 'size'=>'15px'),
78
+                        false
79
+                    );
80 80
                 ?>
81 81
             </td>
82 82
             <td align="center">
Please login to merge, or discard this patch.
main/cron/lang/check_parse_lang.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -17,25 +17,25 @@
 block discarded – undo
17 17
 $list = SubLanguageManager::get_lang_folder_files_list($path);
18 18
 $langs = scandir(api_get_path(SYS_LANG_PATH));
19 19
 foreach ($langs as $lang) {
20
-  $dir = api_get_path(SYS_LANG_PATH).$lang;
21
-  if (is_dir($dir) && substr($lang,0,1) != '.' && !empty($lang)) {
20
+    $dir = api_get_path(SYS_LANG_PATH).$lang;
21
+    if (is_dir($dir) && substr($lang,0,1) != '.' && !empty($lang)) {
22 22
     echo "$lang...";
23 23
     $ok = true;
24 24
     foreach ($list as $entry) {
25
-      $file = $dir.'/'.$entry;
26
-      $out = array();
27
-      if (is_file($file)) {
25
+        $file = $dir.'/'.$entry;
26
+        $out = array();
27
+        if (is_file($file)) {
28 28
         //$terms = array_merge($terms,SubLanguageManager::get_all_language_variable_in_file($file,true));
29 29
         @exec('php5 -l '.$file,$out);
30 30
         if (substr($out[0],0,2)!='No') {
31
-          echo $out[0]."\n";
32
-          $ok = false;
31
+            echo $out[0]."\n";
32
+            $ok = false;
33
+        }
33 34
         }
34
-      }
35 35
     }
36 36
     if ($ok) {
37
-      echo "OK\n";
37
+        echo "OK\n";
38
+    }
38 39
     }
39
-  }
40 40
 }
41 41
 echo "Done\n";
Please login to merge, or discard this patch.
main/inc/lib/specific_fields_manager.lib.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -237,10 +237,10 @@
 block discarded – undo
237 237
  * @param   int     Internal ID used in specific tool table
238 238
  */
239 239
 function delete_all_values_for_item($course_id, $tool_id, $ref_id) {
240
-  $table_sf_values = Database :: get_main_table(TABLE_MAIN_SPECIFIC_FIELD_VALUES);
241
-  $sql = 'DELETE FROM %s WHERE course_code = \'%s\' AND tool_id = \'%s\' AND ref_id = %s';
242
-  $sql = sprintf($sql, $table_sf_values, $course_id, $tool_id, $ref_id);
243
-  Database::query($sql);
240
+    $table_sf_values = Database :: get_main_table(TABLE_MAIN_SPECIFIC_FIELD_VALUES);
241
+    $sql = 'DELETE FROM %s WHERE course_code = \'%s\' AND tool_id = \'%s\' AND ref_id = %s';
242
+    $sql = sprintf($sql, $table_sf_values, $course_id, $tool_id, $ref_id);
243
+    Database::query($sql);
244 244
 }
245 245
 
246 246
 /**
Please login to merge, or discard this patch.
main/inc/lib/access_url_edit_courses_to_url_functions.lib.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -38,17 +38,17 @@
 block discarded – undo
38 38
             $needle = Database::escape_string($needle);
39 39
             // search courses where username or firstname or lastname begins likes $needle
40 40
             $sql = 'SELECT code, title FROM '.$tbl_course.' u '.
41
-                   ' WHERE (title LIKE "'.$needle.'%" '.
42
-                   ' OR code LIKE "'.$needle.'%" '.
43
-                   ' ) '.
44
-                   ' ORDER BY title, code '.
45
-                   ' LIMIT 11';
41
+                    ' WHERE (title LIKE "'.$needle.'%" '.
42
+                    ' OR code LIKE "'.$needle.'%" '.
43
+                    ' ) '.
44
+                    ' ORDER BY title, code '.
45
+                    ' LIMIT 11';
46 46
             $rs = Database::query($sql);
47 47
             $i=0;
48 48
             while ($course = Database :: fetch_array($rs)) {
49 49
                 $i++;
50 50
                 if ($i<=10) {
51
-                     $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($course['code']).'\',\''.addslashes($course['title']).' ('.addslashes($course['code']).')'.'\')">'.$course['title'].' ('.$course['code'].')</a><br />';
51
+                        $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($course['code']).'\',\''.addslashes($course['title']).' ('.addslashes($course['code']).')'.'\')">'.$course['title'].' ('.$course['code'].')</a><br />';
52 52
                 } else {
53 53
                     $return .= '...<br />';
54 54
                 }
Please login to merge, or discard this patch.
src/Chamilo/ThemeBundle/DependencyInjection/ChamiloAdminThemeExtension.php 1 patch
Indentation   +124 added lines, -124 removed lines patch added patch discarded remove patch
@@ -61,134 +61,134 @@
 block discarded – undo
61 61
 
62 62
         if (isset($bundles['AsseticBundle']) && 0) {
63 63
             $container->prependExtensionConfig(
64
-                      'assetic',
65
-                          array(
66
-                              'bundles' => array(
64
+                        'assetic',
65
+                            array(
66
+                                'bundles' => array(
67 67
                                 'ChamiloThemeBundle'
68 68
                                 ),
69
-                              'assets' => array(
70
-                                  'common_js'              => array(
71
-                                      'inputs' => array(
72
-                                          $jsAssets . 'public/vendor/jquery/dist/jquery.js',
73
-                                          $jsAssets . 'public/vendor/jquery-ui/jquery-ui.js',
74
-                                          $jsAssets . 'public/vendor/underscore/underscore.js',
75
-                                          $jsAssets . 'public/vendor/backbone/backbone.js',
76
-                                          $jsAssets . 'public/vendor/marionette/lib/backbone.marionette.js',
77
-                                          $jsAssets . 'public/vendor/bootstrap/dist/js/bootstrap.min.js',
78
-                                          $jsAssets . 'public/vendor/bootbox/bootbox.js',
79
-                                          $jsAssets . 'public/js/dialogs.js',
80
-                                          $jsAssets . 'public/js/namespace.js',
81
-                                      ),
82
-                                  ),
83
-                                  'tools_js'               => array(
84
-                                      'inputs' => array(
85
-                                          '@common_js',
86
-                                          $jsAssets . 'public/vendor/momentjs/moment.js',
87
-                                          $jsAssets . 'public/vendor/holderjs/holder.js',
88
-                                          $jsAssets . 'public/vendor/spinjs/spin.js',
89
-                                      ),
90
-                                  ),
91
-                                  'admin_lte_js'           => array(
92
-                                      'inputs' => array(
93
-                                          $lteJs . 'plugins/bootstrap-slider/bootstrap-slider.js',
94
-                                          $lteJs . 'plugins/datatables/jquery.dataTables.js',
95
-                                          $lteJs . 'plugins/datatables/dataTables.bootstrap.js',
96
-                                          $lteJs . 'plugins/slimScroll/jquery.slimscroll.js',
97
-                                          $jsAssets . 'public/js/adminLTE.js',
98
-                                      )
99
-                                  ),
100
-                                  'admin_lte_css'          => array(
101
-                                      'inputs' => array(
69
+                                'assets' => array(
70
+                                    'common_js'              => array(
71
+                                        'inputs' => array(
72
+                                            $jsAssets . 'public/vendor/jquery/dist/jquery.js',
73
+                                            $jsAssets . 'public/vendor/jquery-ui/jquery-ui.js',
74
+                                            $jsAssets . 'public/vendor/underscore/underscore.js',
75
+                                            $jsAssets . 'public/vendor/backbone/backbone.js',
76
+                                            $jsAssets . 'public/vendor/marionette/lib/backbone.marionette.js',
77
+                                            $jsAssets . 'public/vendor/bootstrap/dist/js/bootstrap.min.js',
78
+                                            $jsAssets . 'public/vendor/bootbox/bootbox.js',
79
+                                            $jsAssets . 'public/js/dialogs.js',
80
+                                            $jsAssets . 'public/js/namespace.js',
81
+                                        ),
82
+                                    ),
83
+                                    'tools_js'               => array(
84
+                                        'inputs' => array(
85
+                                            '@common_js',
86
+                                            $jsAssets . 'public/vendor/momentjs/moment.js',
87
+                                            $jsAssets . 'public/vendor/holderjs/holder.js',
88
+                                            $jsAssets . 'public/vendor/spinjs/spin.js',
89
+                                        ),
90
+                                    ),
91
+                                    'admin_lte_js'           => array(
92
+                                        'inputs' => array(
93
+                                            $lteJs . 'plugins/bootstrap-slider/bootstrap-slider.js',
94
+                                            $lteJs . 'plugins/datatables/jquery.dataTables.js',
95
+                                            $lteJs . 'plugins/datatables/dataTables.bootstrap.js',
96
+                                            $lteJs . 'plugins/slimScroll/jquery.slimscroll.js',
97
+                                            $jsAssets . 'public/js/adminLTE.js',
98
+                                        )
99
+                                    ),
100
+                                    'admin_lte_css'          => array(
101
+                                        'inputs' => array(
102 102
 
103 103
                                         //  $lteCss . 'jQueryUI/jquery-ui-1.10.3.custom.css',
104
-                                         $cssAssets . 'vendor/bootstrap/dist/css/bootstrap.min.css',
105
-                                          $lteCss . 'bootstrap-slider/slider.css',
106
-                                          $lteCss . 'datatables/dataTables.bootstrap.css',
107
-                                          $cssAssets . 'vendor/fontawesome/css/font-awesome.min.css',
108
-                                          $cssAssets . 'vendor/ionicons/css/ionicons.min.css',
109
-                                          $lteCss . 'AdminLTE.css',
110
-                                          //$lteFont . 'fontawesome-webfont.eot',
111
-                                          // $lteFont . 'ionicons.eot',
112
-                                      )
113
-                                  ),
114
-                                  'admin_lte_forms_js'     => array(
115
-                                      'inputs' => array(
116
-                                          $lteJs . 'plugins/colorpicker/bootstrap-colorpicker.js',
117
-                                          $lteJs . 'plugins/daterangepicker/daterangepicker.js',
118
-                                          $lteJs . 'plugins/timepicker/bootstrap-timepicker.js',
119
-                                          $lteJs . 'plugins/input-mask/jquery.inputmask.js',
120
-                                          //   $lteJs.'plugins/input-mask/*',
121
-                                      )
122
-                                  ),
123
-                                  'admin_lte_forms_css'    => array(
124
-                                      'inputs' => array(
125
-                                          $lteCss . 'colorpicker/bootstrap-colorpicker.css',
126
-                                          $lteCss . 'daterangepicker/daterangepicker-bs3.css',
127
-                                          $lteCss . 'timepicker/bootstrap-timepicker.css',
128
-                                      )
129
-                                  ),
130
-                                  'admin_lte_wysiwyg'      => array(
131
-                                      'inputs' => array(
132
-                                          $lteJs . 'plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.js',
133
-                                      )
134
-                                  ),
135
-                                  'admin_lte_wysiwyg_css'  => array(
136
-                                      'inputs' => array(
137
-                                          $lteCss . 'bootstrap-wysihtml5/bootstrap3-wysihtml5.css',
138
-                                      )
139
-                                  ),
140
-                                  'admin_lte_morris'       => array(
141
-                                      'inputs' => array(
142
-                                          $lteJs . 'plugins/morris/morris.js',
143
-                                      )
144
-                                  ),
145
-                                  'admin_lte_morris_css'   => array(
146
-                                      'inputs' => array(
147
-                                          $lteCss . 'morris/morris.css',
148
-                                      )
149
-                                  ),
150
-                                  'admin_lte_flot'         => array(
151
-                                      'inputs' => array(
152
-                                          $lteJs . 'plugins/flot/*',
153
-                                      )
154
-                                  ),
155
-                                  'admin_lte_calendar'     => array(
156
-                                      'inputs' => array(
157
-                                          $jsAssets . 'public/vendor/fullcalendar/dist/fullcalendar.min.js',
158
-                                      )
159
-                                  ),
160
-                                  'admin_lte_calendar_css' => array(
161
-                                      'inputs' => array(
162
-                                          $lteCss . 'fullcalendar/fullcalendar.css',
163
-                                      )
164
-                                  ),
165
-                                  'avatar_img'             => array(
166
-                                      'inputs' => array(
167
-                                          '@ChamiloThemeBundle/Resources/public/img/avatar.png'
168
-                                      )
169
-                                  ),
170
-                                  'admin_lte_all'          => array(
171
-                                      'inputs' => array(
172
-                                          '@tools_js',
173
-                                          '@admin_lte_forms_js',
174
-                                          '@admin_lte_wysiwyg',
175
-                                          '@admin_lte_morris',
176
-                                          '@admin_lte_calendar',
177
-                                          '@admin_lte_js',
178
-                                          //  '@admin_lte_flot',
179
-                                      )
180
-                                  ),
181
-                                  'admin_lte_all_css'      => array(
182
-                                      'inputs' => array(
183
-                                          '@admin_lte_calendar_css',
184
-                                          '@admin_lte_morris_css',
185
-                                          '@admin_lte_wysiwyg_css',
186
-                                          '@admin_lte_forms_css',
187
-                                          '@admin_lte_css'
188
-                                      )
189
-                                  ),
190
-                              )
191
-                          )
104
+                                            $cssAssets . 'vendor/bootstrap/dist/css/bootstrap.min.css',
105
+                                            $lteCss . 'bootstrap-slider/slider.css',
106
+                                            $lteCss . 'datatables/dataTables.bootstrap.css',
107
+                                            $cssAssets . 'vendor/fontawesome/css/font-awesome.min.css',
108
+                                            $cssAssets . 'vendor/ionicons/css/ionicons.min.css',
109
+                                            $lteCss . 'AdminLTE.css',
110
+                                            //$lteFont . 'fontawesome-webfont.eot',
111
+                                            // $lteFont . 'ionicons.eot',
112
+                                        )
113
+                                    ),
114
+                                    'admin_lte_forms_js'     => array(
115
+                                        'inputs' => array(
116
+                                            $lteJs . 'plugins/colorpicker/bootstrap-colorpicker.js',
117
+                                            $lteJs . 'plugins/daterangepicker/daterangepicker.js',
118
+                                            $lteJs . 'plugins/timepicker/bootstrap-timepicker.js',
119
+                                            $lteJs . 'plugins/input-mask/jquery.inputmask.js',
120
+                                            //   $lteJs.'plugins/input-mask/*',
121
+                                        )
122
+                                    ),
123
+                                    'admin_lte_forms_css'    => array(
124
+                                        'inputs' => array(
125
+                                            $lteCss . 'colorpicker/bootstrap-colorpicker.css',
126
+                                            $lteCss . 'daterangepicker/daterangepicker-bs3.css',
127
+                                            $lteCss . 'timepicker/bootstrap-timepicker.css',
128
+                                        )
129
+                                    ),
130
+                                    'admin_lte_wysiwyg'      => array(
131
+                                        'inputs' => array(
132
+                                            $lteJs . 'plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.js',
133
+                                        )
134
+                                    ),
135
+                                    'admin_lte_wysiwyg_css'  => array(
136
+                                        'inputs' => array(
137
+                                            $lteCss . 'bootstrap-wysihtml5/bootstrap3-wysihtml5.css',
138
+                                        )
139
+                                    ),
140
+                                    'admin_lte_morris'       => array(
141
+                                        'inputs' => array(
142
+                                            $lteJs . 'plugins/morris/morris.js',
143
+                                        )
144
+                                    ),
145
+                                    'admin_lte_morris_css'   => array(
146
+                                        'inputs' => array(
147
+                                            $lteCss . 'morris/morris.css',
148
+                                        )
149
+                                    ),
150
+                                    'admin_lte_flot'         => array(
151
+                                        'inputs' => array(
152
+                                            $lteJs . 'plugins/flot/*',
153
+                                        )
154
+                                    ),
155
+                                    'admin_lte_calendar'     => array(
156
+                                        'inputs' => array(
157
+                                            $jsAssets . 'public/vendor/fullcalendar/dist/fullcalendar.min.js',
158
+                                        )
159
+                                    ),
160
+                                    'admin_lte_calendar_css' => array(
161
+                                        'inputs' => array(
162
+                                            $lteCss . 'fullcalendar/fullcalendar.css',
163
+                                        )
164
+                                    ),
165
+                                    'avatar_img'             => array(
166
+                                        'inputs' => array(
167
+                                            '@ChamiloThemeBundle/Resources/public/img/avatar.png'
168
+                                        )
169
+                                    ),
170
+                                    'admin_lte_all'          => array(
171
+                                        'inputs' => array(
172
+                                            '@tools_js',
173
+                                            '@admin_lte_forms_js',
174
+                                            '@admin_lte_wysiwyg',
175
+                                            '@admin_lte_morris',
176
+                                            '@admin_lte_calendar',
177
+                                            '@admin_lte_js',
178
+                                            //  '@admin_lte_flot',
179
+                                        )
180
+                                    ),
181
+                                    'admin_lte_all_css'      => array(
182
+                                        'inputs' => array(
183
+                                            '@admin_lte_calendar_css',
184
+                                            '@admin_lte_morris_css',
185
+                                            '@admin_lte_wysiwyg_css',
186
+                                            '@admin_lte_forms_css',
187
+                                            '@admin_lte_css'
188
+                                        )
189
+                                    ),
190
+                                )
191
+                            )
192 192
             );
193 193
 
194 194
         }
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Admin/UserGroupAdmin.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
             ->add('users', 'sonata_type_collection', array(
29 29
                     'cascade_validation' => true,
30 30
                 ), array(
31
-                   // 'allow_delete' => true,
31
+                    // 'allow_delete' => true,
32 32
                     'by_reference' => false,
33 33
                     'edit'              => 'inline',
34 34
                     'inline'            => 'table',
Please login to merge, or discard this patch.
main/session/session_category_add.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -29,29 +29,29 @@  discard block
 block discarded – undo
29 29
 $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
30 30
 
31 31
 if (isset($_POST['formSent']) && $_POST['formSent']) {
32
-	$formSent = 1;
33
-	$name = $_POST['name'];
34
-	$year_start = $_POST['year_start'];
35
-	$month_start = $_POST['month_start'];
36
-	$day_start = $_POST['day_start'];
37
-	$year_end = $_POST['year_end'];
38
-	$month_end = $_POST['month_end'];
39
-	$day_end = $_POST['day_end'];
40
-	$return = SessionManager::create_category_session(
41
-		$name,
42
-		$year_start,
43
-		$month_start,
44
-		$day_start,
45
-		$year_end,
46
-		$month_end,
47
-		$day_end
48
-	);
49
-
50
-	if ($return == strval(intval($return))) {
51
-		Display::addFlash(Display::return_message(get_lang('SessionCategoryAdded')));
52
-		header('Location: session_category_list.php');
53
-		exit();
54
-	}
32
+    $formSent = 1;
33
+    $name = $_POST['name'];
34
+    $year_start = $_POST['year_start'];
35
+    $month_start = $_POST['month_start'];
36
+    $day_start = $_POST['day_start'];
37
+    $year_end = $_POST['year_end'];
38
+    $month_end = $_POST['month_end'];
39
+    $day_end = $_POST['day_end'];
40
+    $return = SessionManager::create_category_session(
41
+        $name,
42
+        $year_start,
43
+        $month_start,
44
+        $day_start,
45
+        $year_end,
46
+        $month_end,
47
+        $day_end
48
+    );
49
+
50
+    if ($return == strval(intval($return))) {
51
+        Display::addFlash(Display::return_message(get_lang('SessionCategoryAdded')));
52
+        header('Location: session_category_list.php');
53
+        exit();
54
+    }
55 55
 }
56 56
 $thisYear = date('Y');
57 57
 $thisMonth = date('m');
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 //display the header
62 62
 Display::display_header($tool_name);
63 63
 if (!empty($return)) {
64
-	Display::display_error_message($return,false);
64
+    Display::display_error_message($return,false);
65 65
 }
66 66
 ?>
67 67
 <div class="row">
@@ -139,12 +139,12 @@  discard block
 block discarded – undo
139 139
                     /
140 140
                       <select name="year_start">
141 141
                       <?php
142
-                      for ($i=$thisYear-5;$i <= ($thisYear+5);$i++) {
143
-                      ?>
142
+                        for ($i=$thisYear-5;$i <= ($thisYear+5);$i++) {
143
+                        ?>
144 144
                               <option value="<?php echo $i; ?>" <?php if((!$formSent && $thisYear == $i) || ($formSent && $year_start == $i)) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
145 145
                       <?php
146
-                      }
147
-                      ?>
146
+                        }
147
+                        ?>
148 148
                         </select>
149 149
                 </div>
150 150
                 <div class="col-md-3"></div>
Please login to merge, or discard this patch.