Completed
Push — 1.11.x ( 69878b...1da93a )
by José
64:32 queued 39:16
created
src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Project.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@
 block discarded – undo
89 89
         return [
90 90
             ['Save', 'NewPage', 'Templates', '-', 'PasteFromWord'],
91 91
             ['Undo', 'Redo'],
92
-            ['Link', 'Image', 'Video', 'Flash', 'Audio', 'Table',  'Asciimath'],
92
+            ['Link', 'Image', 'Video', 'Flash', 'Audio', 'Table', 'Asciimath'],
93 93
             ['BulletedList', 'NumberedList', 'HorizontalRule'],
94 94
             ['JustifyLeft', 'JustifyCenter', 'JustifyBlock'],
95 95
             ['Format', 'Font', 'FontSize', 'Bold', 'Italic', 'TextColor'],
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/ProjectComment.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@
 block discarded – undo
89 89
         return [
90 90
             ['Save', 'NewPage', 'Templates', '-', 'PasteFromWord'],
91 91
             ['Undo', 'Redo'],
92
-            ['Link', 'Image', 'Video', 'Flash', 'Audio', 'Table',  'Asciimath'],
92
+            ['Link', 'Image', 'Video', 'Flash', 'Audio', 'Table', 'Asciimath'],
93 93
             ['BulletedList', 'NumberedList', 'HorizontalRule'],
94 94
             ['JustifyLeft', 'JustifyCenter', 'JustifyBlock'],
95 95
             ['Format', 'Font', 'FontSize', 'Bold', 'Italic', 'TextColor'],
Please login to merge, or discard this patch.
main/coursecopy/recycle_course.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 $result = $objExercise->read($exercise_id);
18 18
 
19 19
 if (!$result) {
20
-	api_not_allowed(true);
20
+    api_not_allowed(true);
21 21
 }
22 22
 
23 23
 $interbreadcrumb[] = array(
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
 
7 7
 // Setting the global file that gets the general configuration, the databases, the languages, ...
8 8
 require_once '../inc/global.inc.php';
9
-$current_course_tool  = TOOL_COURSE_MAINTENANCE;
9
+$current_course_tool = TOOL_COURSE_MAINTENANCE;
10 10
 api_protect_course_script(true);
11 11
 
12 12
 // Notice for unauthorized people.
Please login to merge, or discard this patch.
main/upload/index.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 $result = $objExercise->read($exercise_id);
18 18
 
19 19
 if (!$result) {
20
-	api_not_allowed(true);
20
+    api_not_allowed(true);
21 21
 }
22 22
 
23 23
 $interbreadcrumb[] = array(
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,9 +38,9 @@
 block discarded – undo
38 38
 	api_not_allowed(true);
39 39
 }
40 40
 
41
-$courseDir = $_course['path'] . "/document";
41
+$courseDir = $_course['path']."/document";
42 42
 $sys_course_path = api_get_path(SYS_COURSE_PATH);
43
-$base_work_dir = $sys_course_path . $courseDir;
43
+$base_work_dir = $sys_course_path.$courseDir;
44 44
 $noPHP_SELF = true;
45 45
 $max_filled_space = DocumentManager::get_course_quota();
46 46
 
Please login to merge, or discard this patch.
main/auth/external_login/login.ldap.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,8 +39,8 @@
 block discarded – undo
39 39
 
40 40
 use ChamiloSession as Session;
41 41
 
42
-require_once dirname(__FILE__) . '/ldap.inc.php';
43
-require_once dirname(__FILE__) . '/functions.inc.php';
42
+require_once dirname(__FILE__).'/ldap.inc.php';
43
+require_once dirname(__FILE__).'/functions.inc.php';
44 44
 
45 45
 $ldap_user = extldap_authenticate($login, $password);
46 46
 if ($ldap_user !== false) {
Please login to merge, or discard this patch.
main/auth/lostPassword.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 $result = $objExercise->read($exercise_id);
18 18
 
19 19
 if (!$result) {
20
-	api_not_allowed(true);
20
+    api_not_allowed(true);
21 21
 }
22 22
 
23 23
 $interbreadcrumb[] = array(
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
     Display::addFlash(
48 48
         Display::return_message($messageText, 'info', false)
49 49
     );
50
-    header('Location: ' . api_get_path(WEB_PATH));
50
+    header('Location: '.api_get_path(WEB_PATH));
51 51
     exit;
52 52
 }
53 53
 
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
         Display::addFlash(
75 75
             Display::return_message($messageText, 'error', false)
76 76
         );
77
-        header('Location: ' . api_get_self());
77
+        header('Location: '.api_get_self());
78 78
         exit;
79 79
     }
80 80
 
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
         Display::addFlash(
95 95
             Display::return_message($messageText, 'info', false)
96 96
         );
97
-        header('Location: ' . api_get_path(WEB_PATH));
97
+        header('Location: '.api_get_path(WEB_PATH));
98 98
         exit;
99 99
     }
100 100
 
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
         Display::addFlash(
103 103
             Display::return_message(get_lang('CouldNotResetPassword'), 'info', false)
104 104
         );
105
-        header('Location: ' . api_get_path(WEB_PATH));
105
+        header('Location: '.api_get_path(WEB_PATH));
106 106
         exit;
107 107
     }
108 108
 
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
             exit;
122 122
         }
123 123
 
124
-        header('Location: ' . api_get_path(WEB_PATH));
124
+        header('Location: '.api_get_path(WEB_PATH));
125 125
         exit;
126 126
     }
127 127
 
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
     Display::addFlash(
139 139
         Display::return_message($messageText, 'info', false)
140 140
     );
141
-    header('Location: ' . api_get_path(WEB_PATH));
141
+    header('Location: '.api_get_path(WEB_PATH));
142 142
     exit;
143 143
 }
144 144
 
Please login to merge, or discard this patch.
main/auth/shibboleth/lib/scaffolder/template/model.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
  * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html
24 24
  * @author Laurent Opprecht <[email protected]>
25 25
  */
26
-class <?php echo $prefix . $class_name ?>
26
+class <?php echo $prefix.$class_name ?>
27 27
 
28 28
 {
29 29
 
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
         return self::store()->create_object($data);
52 52
     }   
53 53
 
54
-<?php foreach($fields as $field){?>
54
+<?php foreach ($fields as $field) {?>
55 55
     public $<?php echo $field->name; ?> = <?php echo $field->def ? $field->def : 'null'; ?>;    
56 56
 <?php }?> 
57 57
     
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
  * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html
74 74
  * @author Laurent Opprecht <[email protected]>
75 75
  */
76
-class <?php echo $prefix . $class_name ?>Store extends Store
76
+class <?php echo $prefix.$class_name ?>Store extends Store
77 77
 {
78 78
 
79 79
     /**
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
     
93 93
     public function __construct()
94 94
     {
95
-        parent::__construct('<?php echo $table_name;?>', '<?php echo $class_name;?>', '<?php echo $id_name;?>');
95
+        parent::__construct('<?php echo $table_name; ?>', '<?php echo $class_name; ?>', '<?php echo $id_name; ?>');
96 96
     }
97 97
     
98 98
     /**
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
     {
115 115
         return parent::create_object($data);
116 116
     }    
117
-<?php foreach($keys as $key){?>
117
+<?php foreach ($keys as $key) {?>
118 118
     
119 119
     /**
120 120
      *
Please login to merge, or discard this patch.
main/admin/access_url_edit_users_to_url.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -261,7 +261,7 @@
 block discarded – undo
261 261
     ?>
262 262
     <option value="<?php echo $enreg['user_id']; ?>"><?php echo $enreg['username'].' - '.api_get_person_name($enreg['firstname'], $enreg['lastname']); ?></option>
263 263
     <?php
264
-     }
264
+        }
265 265
     unset($nosessionUsersList);
266 266
     ?>
267 267
     </select>
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 function send() {
60 60
 	if (document.formulaire.access_url_id.value!=0) {
61 61
 		document.formulaire.form_sent.value=0;
62
-		document.formulaire.add_type.value=\'' . $add_type . '\';
62
+		document.formulaire.add_type.value=\'' . $add_type.'\';
63 63
 		document.formulaire.submit();
64 64
 	}
65 65
 }
@@ -95,17 +95,17 @@  discard block
 block discarded – undo
95 95
             $result = UrlManager::update_urls_rel_user($UserList, $access_url_id);
96 96
             $url_info = UrlManager::get_url_data_from_id($access_url_id);
97 97
             if (!empty($result)) {
98
-                $message .= 'URL: ' . $url_info['url'] . '<br />';
98
+                $message .= 'URL: '.$url_info['url'].'<br />';
99 99
             }
100 100
 
101 101
             if (!empty($result['users_added'])) {
102
-                $message .= '<h4>' . get_lang('UsersAdded') . ':</h4>';
102
+                $message .= '<h4>'.get_lang('UsersAdded').':</h4>';
103 103
                 $i = 1;
104 104
                 $user_added_list = array();
105 105
                 foreach ($result['users_added'] as $user) {
106 106
                     $user_info = api_get_user_info($user);
107 107
                     if (!empty($user_info)) {
108
-                        $user_added_list[] = $i . '. ' . api_get_person_name($user_info['firstname'], $user_info['lastname'], null, null, null, null, $user_info['username']);
108
+                        $user_added_list[] = $i.'. '.api_get_person_name($user_info['firstname'], $user_info['lastname'], null, null, null, null, $user_info['username']);
109 109
                         $i++;
110 110
                     }
111 111
                 }
@@ -115,13 +115,13 @@  discard block
 block discarded – undo
115 115
             }
116 116
 
117 117
             if (!empty($result['users_deleted'])) {
118
-                $message .= '<br /><h4>' . get_lang('UsersDeleted') . ': </h4>';
118
+                $message .= '<br /><h4>'.get_lang('UsersDeleted').': </h4>';
119 119
                 $user_deleted_list = array();
120 120
                 $i = 1;
121 121
                 foreach ($result['users_deleted'] as $user) {
122 122
                     $user_info = api_get_user_info($user);
123 123
                     if (!empty($user_info)) {
124
-                        $user_deleted_list [] = $i . '. ' . api_get_person_name($user_info['firstname'], $user_info['lastname']);
124
+                        $user_deleted_list [] = $i.'. '.api_get_person_name($user_info['firstname'], $user_info['lastname']);
125 125
                         $i++;
126 126
                     }
127 127
                 }
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 echo '<div class="actions">';
143 143
 echo Display::url(
144 144
     Display::return_icon('view_more_stats.gif', get_lang('AddUserToURL'), ''),
145
-    api_get_path(WEB_CODE_PATH) . 'admin/access_url_add_users_to_url.php'
145
+    api_get_path(WEB_CODE_PATH).'admin/access_url_add_users_to_url.php'
146 146
 );
147 147
 echo '</div>';
148 148
 
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
     }
168 168
 
169 169
     $sql = "SELECT u.user_id, lastname, firstname, username
170
-	  	  	FROM $tbl_user u WHERE status <> " . ANONYMOUS . " " .
170
+	  	  	FROM $tbl_user u WHERE status <> ".ANONYMOUS." ".
171 171
             $order_clause;
172 172
     $result = Database::query($sql);
173 173
     $Users = Database::store_result($result);
@@ -180,11 +180,11 @@  discard block
 block discarded – undo
180 180
 }
181 181
 
182 182
 if ($add_type == 'multiple') {
183
-    $link_add_type_unique = '<a href="' . api_get_self() . '?add_type=unique&access_url_id=' . $access_url_id . '">' . get_lang('SessionAddTypeUnique') . '</a>';
183
+    $link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeUnique').'</a>';
184 184
     $link_add_type_multiple = get_lang('SessionAddTypeMultiple');
185 185
 } else {
186 186
     $link_add_type_unique = get_lang('SessionAddTypeUnique');
187
-    $link_add_type_multiple = '<a href="' . api_get_self() . '?add_type=multiple&access_url_id=' . $access_url_id . '">' . get_lang('SessionAddTypeMultiple') . '</a>';
187
+    $link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeMultiple').'</a>';
188 188
 }
189 189
 $url_list = UrlManager::get_url_data();
190 190
 ?>
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;" <?php if ($ajax_search) {
197 197
     echo ' onsubmit="valide();"';
198 198
 } ?> >
199
-    <?php echo get_lang('SelectUrl') . ' : '; ?>
199
+    <?php echo get_lang('SelectUrl').' : '; ?>
200 200
 <select name="access_url_id" onchange="javascript:send();">
201 201
 <option value="0"> <?php echo get_lang('SelectUrl') ?></option>
202 202
         <?php
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
     <td>
233 233
     <h3>
234 234
     <?php
235
-        $total_users = count($nosessionUsersList) +  count($sessionUsersList);
235
+        $total_users = count($nosessionUsersList) + count($sessionUsersList);
236 236
         echo get_lang('TotalAvailableUsers').' '.$total_users;
237 237
     ?>
238 238
     </h3>
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
   <td align="center"><b><?php echo get_lang('UserListInPlatform') ?> : <?php echo count($nosessionUsersList); ?></b>
243 243
   </td>
244 244
   <td></td>
245
-  <td align="center"><b><?php echo get_lang('UserListIn') . ' ' . $url_selected; ?> : <?php echo count($sessionUsersList); ?></b></td>
245
+  <td align="center"><b><?php echo get_lang('UserListIn').' '.$url_selected; ?> : <?php echo count($sessionUsersList); ?></b></td>
246 246
 </tr>
247 247
 <tr>
248 248
   <td align="center">
@@ -302,9 +302,9 @@  discard block
 block discarded – undo
302 302
 		<br />
303 303
         <?php
304 304
         if (isset($_GET['add'])) {
305
-            echo '<button class="save" type="button" onclick="valide()" >' . get_lang('AddUsersToURL') . '</button>';
305
+            echo '<button class="save" type="button" onclick="valide()" >'.get_lang('AddUsersToURL').'</button>';
306 306
         } else {
307
-            echo '<button class="save" type="button" onclick="valide()" >' . get_lang('EditUsersToURL') . '</button>';
307
+            echo '<button class="save" type="button" onclick="valide()" >'.get_lang('EditUsersToURL').'</button>';
308 308
         }
309 309
         ?>
310 310
 	</td>
Please login to merge, or discard this patch.
main/admin/cli.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
 $this_section = SECTION_PLATFORM_ADMIN;
12 12
 // User permissions
13 13
 api_protect_admin_script();
14
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
14
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
15 15
 Display :: display_header(get_lang('SystemStatus'));
16 16
 $diag = new Diagnoser();
17 17
 $diag->show_html();
Please login to merge, or discard this patch.
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -28,15 +28,15 @@
 block discarded – undo
28 28
 switch ($_GET["cmd"]) {
29 29
     case "clear_stapi":
30 30
       echo "Are you sure you are willing to erease all storage api data (no backup)? <a href='cli.php?cmd=clear_stapi_confirm' >Yes</a>";
31
-      break;
31
+        break;
32 32
     case "clear_stapi_confirm":
33 33
       Database::query("delete from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES));
34
-      Database::query("delete from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES_STACK));
35
-      echo "Done";
36
-      break;
34
+        Database::query("delete from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES_STACK));
35
+        echo "Done";
36
+        break;
37 37
     default:
38 38
       echo "UNKNOWN COMMAND";
39
-      break;
39
+        break;
40 40
 }
41 41
 /**
42 42
  * Footer 
Please login to merge, or discard this patch.