Completed
Pull Request — 1.11.x (#1599)
by José
28:19
created
main/auth/set_temp_password.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
 $cidReset = true;
12 12
 require_once '../inc/global.inc.php';
13 13
 $this_section = SECTION_COURSES;
14
-$course_id = isset($_GET['course_id'])  ? intval($_GET['course_id']) : null;
14
+$course_id = isset($_GET['course_id']) ? intval($_GET['course_id']) : null;
15 15
 $session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : null;
16 16
 $user_id = api_get_user_id();
17 17
 
Please login to merge, or discard this patch.
main/auth/cas/logout.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,5 +9,5 @@
 block discarded – undo
9 9
 require_once('authcas.php');
10 10
 global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
11 11
 
12
-phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri);
12
+phpCAS::client($cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri);
13 13
 phpCAS::logout();
Please login to merge, or discard this patch.
main/auth/cas/logincas.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
         $firstpage = $_GET['firstpage'];
40 40
         setcookie("GotoCourse", $firstpage);
41 41
     }
42
-    if (!is_object($PHPCAS_CLIENT) ) {
42
+    if (!is_object($PHPCAS_CLIENT)) {
43 43
         phpCAS::client(
44 44
             $cas_auth_ver,
45 45
             $cas_auth_server,
Please login to merge, or discard this patch.
main/auth/courses.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
                 $limit
204 204
             );
205 205
         } else {
206
-            header('Location: ' . api_get_self());
206
+            header('Location: '.api_get_self());
207 207
         }
208 208
         break;
209 209
     case 'display_random_courses':
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
                 $continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData);
279 279
 
280 280
                 if (!$continueWithSubscription) {
281
-                    header('Location: ' .  api_get_path(WEB_CODE_PATH) . 'auth/courses.php');
281
+                    header('Location: '.api_get_path(WEB_CODE_PATH).'auth/courses.php');
282 282
                     exit;
283 283
                 }
284 284
             }
@@ -296,16 +296,16 @@  discard block
 block discarded – undo
296 296
 
297 297
             if ($count <= 0) {
298 298
                 // no course in session -> return to catalog
299
-                $url = api_get_path(WEB_CODE_PATH) . 'auth/courses.php';
299
+                $url = api_get_path(WEB_CODE_PATH).'auth/courses.php';
300 300
             } elseif ($count == 1) {
301 301
                 // only one course, so redirect directly to this course
302 302
                 foreach ($coursesList as $course) {
303
-                    $url = api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . intval($_GET['session_id']);
303
+                    $url = api_get_path(WEB_COURSE_PATH).$course['directory'].'/index.php?id_session='.intval($_GET['session_id']);
304 304
                 }
305 305
             } else {
306
-                $url = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . intval($_GET['session_id']);
306
+                $url = api_get_path(WEB_CODE_PATH).'session/index.php?session_id='.intval($_GET['session_id']);
307 307
             }
308
-            header('Location: ' . $url);
308
+            header('Location: '.$url);
309 309
             exit;
310 310
         }
311 311
         //else show error message?
Please login to merge, or discard this patch.
main/auth/gotocourse.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
 
42 42
     $msg .= '<div class="well_login">';
43 43
     $msg .= $form->return_form();
44
-    $msg .='</div>';
44
+    $msg .= '</div>';
45 45
     if (api_is_cas_activated()) {
46 46
         $msg .= "</div>";
47 47
     }
Please login to merge, or discard this patch.
main/auth/conditional_login/complete_phone_number.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2,9 +2,9 @@  discard block
 block discarded – undo
2 2
 /* For licensing terms, see /license.txt */
3 3
 
4 4
 require_once dirname(__FILE__).'/../../inc/global.inc.php';
5
-$url =  api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php';
5
+$url = api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php';
6 6
 
7
-if (! isset($_SESSION['conditional_login']['uid']))
7
+if (!isset($_SESSION['conditional_login']['uid']))
8 8
   die("Not Authorised");
9 9
 ?>
10 10
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
   </body>
21 21
 </html>
22 22
 <?php
23
-if (isset($_POST['submit'])){
23
+if (isset($_POST['submit'])) {
24 24
     $u = api_get_user_info($_SESSION['conditional_login']['uid']);
25 25
     $u['phone'] = $_POST['phone_number'];
26 26
     $password = null; // we don't want to change the password
Please login to merge, or discard this patch.
main/auth/my_progress.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -54,16 +54,16 @@  discard block
 block discarded – undo
54 54
         }
55 55
         $course_info = api_get_course_info_by_id($result['c_id']);
56 56
         $course_image = '<img src="'.$course_info['course_image_large'].'">';
57
-        $dates .= '<li><a href="#'.$login.'">' . api_convert_and_format_date($login, DATE_FORMAT_SHORT) . '</a></li>';
57
+        $dates .= '<li><a href="#'.$login.'">'.api_convert_and_format_date($login, DATE_FORMAT_SHORT).'</a></li>';
58 58
         $issues .= '<li id ="'.$login.'">';
59 59
         $issues .= '<div class="img-course">'.$course_image.'</div>';
60 60
         
61 61
         $issues .= '<div class="text-course">';
62
-        $issues .= '<p>' . sprintf(
62
+        $issues .= '<p>'.sprintf(
63 63
                 get_lang('YouHaveEnteredTheCourseXInY'),
64
-                '" '. $courseInfo['name'] .' "',
64
+                '" '.$courseInfo['name'].' "',
65 65
                 api_convert_and_format_date($login, DATE_TIME_FORMAT_LONG) 
66
-                ) . '</p>';
66
+                ).'</p>';
67 67
         $issues .= '</div>'; 
68 68
         $issues .= '</li>';
69 69
         $count++;
@@ -82,8 +82,8 @@  discard block
 block discarded – undo
82 82
     $content .= '<div class="row">';
83 83
     $content .= '<div class="col-md-12">';
84 84
     $content .= '<div id="my_timeline">';
85
-    $content .= '<ul id="dates">' . $dates . '</ul>';
86
-    $content .= '<ul id="issues">' . $issues . '</ul>';
85
+    $content .= '<ul id="dates">'.$dates.'</ul>';
86
+    $content .= '<ul id="issues">'.$issues.'</ul>';
87 87
     $content .= '<div id="grad_left"></div>';
88 88
     $content .= '<div id="grad_right"></div>';
89 89
     $content .= '<a href="#" id="prev"></a>';
Please login to merge, or discard this patch.
main/auth/external_login/updateUser.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
 
8 8
 use ChamiloSession as Session;
9 9
 
10
-require_once(dirname(__FILE__) . '/functions.inc.php');
10
+require_once(dirname(__FILE__).'/functions.inc.php');
11 11
 
12 12
 //MAIN CODE
13 13
 //$uData variable is set in local.inc.php
@@ -36,6 +36,6 @@  discard block
 block discarded – undo
36 36
     //User cannot login
37 37
     $loginFailed = true;
38 38
     Session::erase('_uid');
39
-    header('Location: ' . api_get_path(WEB_PATH) . 'index.php?loginFailed=1&error=user_password_incorrect');
39
+    header('Location: '.api_get_path(WEB_PATH).'index.php?loginFailed=1&error=user_password_incorrect');
40 40
     exit;
41 41
 }
Please login to merge, or discard this patch.
main/auth/external_login/newUser.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
 
11 11
 use ChamiloSession as Session;
12 12
 
13
-require_once(dirname(__FILE__) . '/functions.inc.php');
13
+require_once(dirname(__FILE__).'/functions.inc.php');
14 14
 
15 15
 //MAIN CODE
16 16
 //$login and $password variables are setted in main/inc/local.inc.php
Please login to merge, or discard this patch.