Completed
Pull Request — 1.11.x (#1459)
by José
164:59 queued 133:05
created
main/webservices/cm_soap_announcements.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -11,13 +11,13 @@  discard block
 block discarded – undo
11 11
 
12 12
 
13 13
 $s->register(
14
-	'WSCMAnnouncements.get_announcements_id',
15
-	array(
16
-		'username' => 'xsd:string',
17
-		'password' => 'xsd:string',
14
+    'WSCMAnnouncements.get_announcements_id',
15
+    array(
16
+        'username' => 'xsd:string',
17
+        'password' => 'xsd:string',
18 18
                 'course_code' => 'xsd:string'
19
-	),
20
-	array('return' => 'xsd:string'),
19
+    ),
20
+    array('return' => 'xsd:string'),
21 21
         'urn:WSCMService',
22 22
         '',
23 23
         '',
@@ -27,15 +27,15 @@  discard block
 block discarded – undo
27 27
 );
28 28
 
29 29
 $s->register(
30
-	'WSCMAnnouncements.get_announcement_data',
31
-	array(
32
-		'username' => 'xsd:string',
33
-		'password' => 'xsd:string',
30
+    'WSCMAnnouncements.get_announcement_data',
31
+    array(
32
+        'username' => 'xsd:string',
33
+        'password' => 'xsd:string',
34 34
                 'course_code' => 'xsd:string',
35 35
                 'announcement_id' => 'xsd:string',
36 36
                 'field' => 'xsd:string'
37
-	),
38
-	array('return' => 'xsd:string'),
37
+    ),
38
+    array('return' => 'xsd:string'),
39 39
         'urn:WSCMService',
40 40
         '',
41 41
         '',
Please login to merge, or discard this patch.
main/webservices/cm_soap_inbox.php 1 patch
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -11,12 +11,12 @@  discard block
 block discarded – undo
11 11
 
12 12
 
13 13
 $s->register(
14
-	'WSCMInbox.unreadMessage',
15
-	array(
16
-		'username' => 'xsd:string',
17
-		'password' => 'xsd:string',
18
-	),
19
-	array('return' => 'xsd:string'),
14
+    'WSCMInbox.unreadMessage',
15
+    array(
16
+        'username' => 'xsd:string',
17
+        'password' => 'xsd:string',
18
+    ),
19
+    array('return' => 'xsd:string'),
20 20
         'urn:WSCMService',
21 21
         '',
22 22
         '',
@@ -26,14 +26,14 @@  discard block
 block discarded – undo
26 26
 );
27 27
 
28 28
 $s->register(
29
-	'WSCMInbox.get_message_id',
30
-	array(
31
-		'username' => 'xsd:string',
32
-		'password' => 'xsd:string',
29
+    'WSCMInbox.get_message_id',
30
+    array(
31
+        'username' => 'xsd:string',
32
+        'password' => 'xsd:string',
33 33
                 'from' => 'xsd:string',
34 34
                 'number_of_items' => 'xsd:string'
35
-	),
36
-	array('return' => 'xsd:string'),
35
+    ),
36
+    array('return' => 'xsd:string'),
37 37
         'urn:WSCMService',
38 38
         '',
39 39
         '',
@@ -44,14 +44,14 @@  discard block
 block discarded – undo
44 44
 
45 45
 
46 46
 $s->register(
47
-	'WSCMInbox.get_message_data',
48
-	array(
49
-		'username' => 'xsd:string',
50
-		'password' => 'xsd:string',
47
+    'WSCMInbox.get_message_data',
48
+    array(
49
+        'username' => 'xsd:string',
50
+        'password' => 'xsd:string',
51 51
                 'id' => 'xsd:string',
52 52
                 'field' => 'xsd:string'
53
-	),
54
-	array('return' => 'xsd:string'),
53
+    ),
54
+    array('return' => 'xsd:string'),
55 55
         'urn:WSCMService',
56 56
         '',
57 57
         '',
@@ -61,14 +61,14 @@  discard block
 block discarded – undo
61 61
 );
62 62
 
63 63
 $s->register(
64
-	'WSCMInbox.get_message_id_sent',
65
-	array(
66
-		'username' => 'xsd:string',
67
-		'password' => 'xsd:string',
64
+    'WSCMInbox.get_message_id_sent',
65
+    array(
66
+        'username' => 'xsd:string',
67
+        'password' => 'xsd:string',
68 68
                 'from' => 'xsd:string',
69 69
                 'number_of_items' => 'xsd:string'
70
-	),
71
-	array('return' => 'xsd:string'),
70
+    ),
71
+    array('return' => 'xsd:string'),
72 72
         'urn:WSCMService',
73 73
         '',
74 74
         '',
@@ -78,14 +78,14 @@  discard block
 block discarded – undo
78 78
 );
79 79
 
80 80
 $s->register(
81
-	'WSCMInbox.get_message_data_sent',
82
-	array(
83
-		'username' => 'xsd:string',
84
-		'password' => 'xsd:string',
81
+    'WSCMInbox.get_message_data_sent',
82
+    array(
83
+        'username' => 'xsd:string',
84
+        'password' => 'xsd:string',
85 85
                 'id' => 'xsd:string',
86 86
                 'field' => 'xsd:string'
87
-	),
88
-	array('return' => 'xsd:string'),
87
+    ),
88
+    array('return' => 'xsd:string'),
89 89
         'urn:WSCMService',
90 90
         '',
91 91
         '',
@@ -95,15 +95,15 @@  discard block
 block discarded – undo
95 95
 );
96 96
 
97 97
 $s->register(
98
-	'WSCMInbox.message_send',
99
-	array(
100
-		'username' => 'xsd:string',
101
-		'password' => 'xsd:string',
98
+    'WSCMInbox.message_send',
99
+    array(
100
+        'username' => 'xsd:string',
101
+        'password' => 'xsd:string',
102 102
                 'receiver_user_id' => 'xsd:string',
103 103
                 'subject' => 'xsd:string',
104 104
                 'content' => 'xsd:string'
105
-	),
106
-	array('return' => 'xsd:string'),
105
+    ),
106
+    array('return' => 'xsd:string'),
107 107
         'urn:WSCMService',
108 108
         '',
109 109
         '',
Please login to merge, or discard this patch.
main/webservices/cm_webservice_courses.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -15,12 +15,12 @@  discard block
 block discarded – undo
15 15
 {
16 16
 
17 17
     public function get_courses_code($username, $password) {
18
-        if($this->verifyUserPass($username, $password) == "valid") {
18
+        if ($this->verifyUserPass($username, $password) == "valid") {
19 19
             $user_id = UserManager::get_user_id_from_username($username);
20 20
             $listOfCourses = UserManager::get_personal_session_course_list($user_id);
21 21
 
22 22
             $courses_id = "#";
23
-            foreach ($listOfCourses as $course){
23
+            foreach ($listOfCourses as $course) {
24 24
                 $courses_id .= $course['code']."#";
25 25
             }
26 26
             return $courses_id;
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 
32 32
     public function get_course_title($username, $password, $course_code)
33 33
     {
34
-        if($this->verifyUserPass($username, $password) == "valid")
34
+        if ($this->verifyUserPass($username, $password) == "valid")
35 35
         {
36 36
             $course_info = CourseManager::get_course_information($course_code);
37 37
             return $course_info['title'];
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,8 +35,9 @@
 block discarded – undo
35 35
         {
36 36
             $course_info = CourseManager::get_course_information($course_code);
37 37
             return $course_info['title'];
38
-        } else
39
-            return get_lang('InvalidId');
38
+        } else {
39
+                    return get_lang('InvalidId');
40
+        }
40 41
 
41 42
     }
42 43
 
Please login to merge, or discard this patch.
main/webservices/http-auth.php 3 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -26,11 +26,11 @@  discard block
 block discarded – undo
26 26
 $validResponse = md5("{$A1}:{$digestParts['nonce']}:{$digestParts['nc']}:{$digestParts['cnonce']}:{$digestParts['qop']}:{$A2}");
27 27
 
28 28
 if ($digestParts['response'] != $validResponse)
29
-  requireLogin($realm,$nonce);
29
+    requireLogin($realm,$nonce);
30 30
 else {
31
-  // We're in!
32
-  echo 'a7532ae474e5e66a0c16eddab02e02a7';
33
-  die();
31
+    // We're in!
32
+    echo 'a7532ae474e5e66a0c16eddab02e02a7';
33
+    die();
34 34
 }
35 35
 
36 36
 // This function returns the digest string
@@ -42,11 +42,11 @@  discard block
 block discarded – undo
42 42
     // most other servers
43 43
     }
44 44
     elseif (isset($_SERVER['HTTP_AUTHENTICATION'])) {
45
-      if (strpos(strtolower($_SERVER['HTTP_AUTHENTICATION']),'digest')===0)
45
+        if (strpos(strtolower($_SERVER['HTTP_AUTHENTICATION']),'digest')===0)
46 46
         $digest = substr($_SERVER['HTTP_AUTHORIZATION'], 7);
47 47
     }
48 48
     elseif (isset($_SERVER['HTTP_WWW_AUTHENTICATE'])) {
49
-      $digest = $_SERVER['HTTP_WWW_AUTHENTICATE'];
49
+        $digest = $_SERVER['HTTP_WWW_AUTHENTICATE'];
50 50
     }
51 51
     return $digest;
52 52
 
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 $digest = getDigest();
13 13
 
14 14
 // If there was no digest, show login
15
-if (is_null($digest)) requireLogin($realm,$nonce);
15
+if (is_null($digest)) requireLogin($realm, $nonce);
16 16
 
17 17
 $digestParts = digestParse($digest);
18 18
 
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 $validResponse = md5("{$A1}:{$digestParts['nonce']}:{$digestParts['nc']}:{$digestParts['cnonce']}:{$digestParts['qop']}:{$A2}");
27 27
 
28 28
 if ($digestParts['response'] != $validResponse)
29
-  requireLogin($realm,$nonce);
29
+  requireLogin($realm, $nonce);
30 30
 else {
31 31
   // We're in!
32 32
   echo 'a7532ae474e5e66a0c16eddab02e02a7';
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
     // most other servers
43 43
     }
44 44
     elseif (isset($_SERVER['HTTP_AUTHENTICATION'])) {
45
-      if (strpos(strtolower($_SERVER['HTTP_AUTHENTICATION']),'digest')===0)
45
+      if (strpos(strtolower($_SERVER['HTTP_AUTHENTICATION']), 'digest') === 0)
46 46
         $digest = substr($_SERVER['HTTP_AUTHORIZATION'], 7);
47 47
     }
48 48
     elseif (isset($_SERVER['HTTP_WWW_AUTHENTICATE'])) {
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
 }
54 54
 
55 55
 // This function forces a login prompt
56
-function requireLogin($realm,$nonce) {
57
-    header('WWW-Authenticate: Digest realm="' . $realm . '",qop="auth",nonce="' . $nonce . '",opaque="' . md5($realm) . '"');
56
+function requireLogin($realm, $nonce) {
57
+    header('WWW-Authenticate: Digest realm="'.$realm.'",qop="auth",nonce="'.$nonce.'",opaque="'.md5($realm).'"');
58 58
     header('HTTP/1.1 401');
59 59
     echo 'Authentication Canceled';
60 60
     die();
Please login to merge, or discard this patch.
Braces   +10 added lines, -9 removed lines patch added patch discarded remove patch
@@ -12,7 +12,9 @@  discard block
 block discarded – undo
12 12
 $digest = getDigest();
13 13
 
14 14
 // If there was no digest, show login
15
-if (is_null($digest)) requireLogin($realm,$nonce);
15
+if (is_null($digest)) {
16
+    requireLogin($realm,$nonce);
17
+}
16 18
 
17 19
 $digestParts = digestParse($digest);
18 20
 
@@ -25,9 +27,9 @@  discard block
 block discarded – undo
25 27
 
26 28
 $validResponse = md5("{$A1}:{$digestParts['nonce']}:{$digestParts['nc']}:{$digestParts['cnonce']}:{$digestParts['qop']}:{$A2}");
27 29
 
28
-if ($digestParts['response'] != $validResponse)
30
+if ($digestParts['response'] != $validResponse) {
29 31
   requireLogin($realm,$nonce);
30
-else {
32
+} else {
31 33
   // We're in!
32 34
   echo 'a7532ae474e5e66a0c16eddab02e02a7';
33 35
   die();
@@ -40,12 +42,11 @@  discard block
 block discarded – undo
40 42
     if (isset($_SERVER['PHP_AUTH_DIGEST'])) {
41 43
         $digest = $_SERVER['PHP_AUTH_DIGEST'];
42 44
     // most other servers
43
-    }
44
-    elseif (isset($_SERVER['HTTP_AUTHENTICATION'])) {
45
-      if (strpos(strtolower($_SERVER['HTTP_AUTHENTICATION']),'digest')===0)
46
-        $digest = substr($_SERVER['HTTP_AUTHORIZATION'], 7);
47
-    }
48
-    elseif (isset($_SERVER['HTTP_WWW_AUTHENTICATE'])) {
45
+    } elseif (isset($_SERVER['HTTP_AUTHENTICATION'])) {
46
+      if (strpos(strtolower($_SERVER['HTTP_AUTHENTICATION']),'digest')===0) {
47
+              $digest = substr($_SERVER['HTTP_AUTHORIZATION'], 7);
48
+      }
49
+    } elseif (isset($_SERVER['HTTP_WWW_AUTHENTICATE'])) {
49 50
       $digest = $_SERVER['HTTP_WWW_AUTHENTICATE'];
50 51
     }
51 52
     return $digest;
Please login to merge, or discard this patch.
main/webservices/cm_soap_user.php 1 patch
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -8,13 +8,13 @@  discard block
 block discarded – undo
8 8
 $s = WSCMSoapServer::singleton();
9 9
 
10 10
 $s->register(
11
-	'WSCMUser.find_id_user',
12
-	array(
13
-		'username' => 'xsd:string',
14
-		'password' => 'xsd:string',
11
+    'WSCMUser.find_id_user',
12
+    array(
13
+        'username' => 'xsd:string',
14
+        'password' => 'xsd:string',
15 15
                 'name' => 'xsd:string',
16
-	),
17
-	array('return' => 'xsd:string'),
16
+    ),
17
+    array('return' => 'xsd:string'),
18 18
         'urn:WSCMService',
19 19
         '',
20 20
         '',
@@ -23,14 +23,14 @@  discard block
 block discarded – undo
23 23
 );
24 24
 
25 25
 $s->register(
26
-	'WSCMUser.get_user_name',
27
-	array(
28
-		'username' => 'xsd:string',
29
-		'password' => 'xsd:string',
26
+    'WSCMUser.get_user_name',
27
+    array(
28
+        'username' => 'xsd:string',
29
+        'password' => 'xsd:string',
30 30
                 'id' => 'xsd:string',
31 31
                 'field' => 'xsd:string'
32
-	),
33
-	array('return' => 'xsd:string'),
32
+    ),
33
+    array('return' => 'xsd:string'),
34 34
         'urn:WSCMService',
35 35
         '',
36 36
         '',
@@ -39,13 +39,13 @@  discard block
 block discarded – undo
39 39
 );
40 40
 
41 41
 $s->register(
42
-	'WSCMUser.get_link_user_picture',
43
-	array(
44
-		'username' => 'xsd:string',
45
-		'password' => 'xsd:string',
42
+    'WSCMUser.get_link_user_picture',
43
+    array(
44
+        'username' => 'xsd:string',
45
+        'password' => 'xsd:string',
46 46
                 'id' => 'xsd:string'
47
-	),
48
-	array('return' => 'xsd:string'),
47
+    ),
48
+    array('return' => 'xsd:string'),
49 49
         'urn:WSCMService',
50 50
         '',
51 51
         '',
@@ -54,14 +54,14 @@  discard block
 block discarded – undo
54 54
 );
55 55
 
56 56
 $s->register(
57
-	'WSCMUser.send_invitation',
58
-	array(
59
-		'username' => 'xsd:string',
60
-		'password' => 'xsd:string',
57
+    'WSCMUser.send_invitation',
58
+    array(
59
+        'username' => 'xsd:string',
60
+        'password' => 'xsd:string',
61 61
                 'userfriend_id' => 'xsd:string',
62 62
                 'content_message' => 'xsd:string'
63
-	),
64
-	array('return' => 'xsd:string'),
63
+    ),
64
+    array('return' => 'xsd:string'),
65 65
         'urn:WSCMService',
66 66
         '',
67 67
         '',
@@ -70,13 +70,13 @@  discard block
 block discarded – undo
70 70
 );
71 71
 
72 72
 $s->register(
73
-	'WSCMUser.accept_friend',
74
-	array(
75
-		'username' => 'xsd:string',
76
-		'password' => 'xsd:string',
73
+    'WSCMUser.accept_friend',
74
+    array(
75
+        'username' => 'xsd:string',
76
+        'password' => 'xsd:string',
77 77
                 'userfriend_id' => 'xsd:string'
78
-	),
79
-	array('return' => 'xsd:string'),
78
+    ),
79
+    array('return' => 'xsd:string'),
80 80
         'urn:WSCMService',
81 81
         '',
82 82
         '',
@@ -85,13 +85,13 @@  discard block
 block discarded – undo
85 85
 );
86 86
 
87 87
 $s->register(
88
-	'WSCMUser.denied_invitation',
89
-	array(
90
-		'username' => 'xsd:string',
91
-		'password' => 'xsd:string',
88
+    'WSCMUser.denied_invitation',
89
+    array(
90
+        'username' => 'xsd:string',
91
+        'password' => 'xsd:string',
92 92
                 'userfriend_id' => 'xsd:string'
93
-	),
94
-	array('return' => 'xsd:string'),
93
+    ),
94
+    array('return' => 'xsd:string'),
95 95
         'urn:WSCMService',
96 96
         '',
97 97
         '',
Please login to merge, or discard this patch.
main/webservices/example_fill_users_fields.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
 $sql = "SELECT user_id, username FROM $tuser ORDER BY user_id";
23 23
 $res = Database::query($sql);
24 24
 while($row = Database::fetch_array($res)) {
25
-  $sql2 = "INSERT INTO $tuserfv (item_id, field_id, value)
25
+    $sql2 = "INSERT INTO $tuserfv (item_id, field_id, value)
26 26
            VALUES (".$row['user_id'].", 11,'".$row['username']."')";
27
-  $res2 = Database::query($sql2);
27
+    $res2 = Database::query($sql2);
28 28
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 $tuserfv = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
22 22
 $sql = "SELECT user_id, username FROM $tuser ORDER BY user_id";
23 23
 $res = Database::query($sql);
24
-while($row = Database::fetch_array($res)) {
24
+while ($row = Database::fetch_array($res)) {
25 25
   $sql2 = "INSERT INTO $tuserfv (item_id, field_id, value)
26 26
            VALUES (".$row['user_id'].", 11,'".$row['username']."')";
27 27
   $res2 = Database::query($sql2);
Please login to merge, or discard this patch.
main/calendar/agenda_js.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 if (isset($_REQUEST['cidReq']) && !empty($_REQUEST['cidReq'])) {
37 37
     if ($_REQUEST['cidReq'] == -1) {
38 38
         // When is out of the course tool (e.g My agenda)
39
-        header('Location: ' . api_get_self());
39
+        header('Location: '.api_get_self());
40 40
         exit;
41 41
     } else {
42 42
         $type = 'course';
Please login to merge, or discard this patch.
main/calendar/agenda_list.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
 require_once '../inc/global.inc.php';
8 8
 
9 9
 $interbreadcrumb[] = array(
10
-    'url' => api_get_path(WEB_CODE_PATH) . "calendar/agenda_js.php",
10
+    'url' => api_get_path(WEB_CODE_PATH)."calendar/agenda_js.php",
11 11
     'name' => get_lang('Agenda')
12 12
 );
13 13
 
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 
30 30
 if (!empty($currentCourseId) && $currentCourseId != -1) {
31 31
     // Agenda is inside a course tool
32
-    $url = api_get_self() . '?' . api_get_cidreq();
32
+    $url = api_get_self().'?'.api_get_cidreq();
33 33
     $this_section = SECTION_COURSES;
34 34
 } else {
35 35
     // Agenda is out of the course tool (e.g personal agenda)
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
     if (!empty($events)) {
46 46
         foreach ($events as &$event) {
47 47
             $courseId = isset($event['course_id']) ? $event['course_id'] : '';
48
-            $event['url'] = api_get_self() . '?cid=' . $courseId . '&type=' . $event['type'];
48
+            $event['url'] = api_get_self().'?cid='.$courseId.'&type='.$event['type'];
49 49
         }
50 50
     }
51 51
 }
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
                 // personal and admin do not have visibility property
77 77
             }
78 78
         }
79
-        header('Location: '. api_get_self());
79
+        header('Location: '.api_get_self());
80 80
         exit;
81 81
     }
82 82
 }
Please login to merge, or discard this patch.
main/document/edit_odf.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 $web_odf_supported_files = DocumentManager::get_web_odf_extension_list();
35 35
 
36 36
 if (in_array(strtolower($pathinfo['extension']), $web_odf_supported_files)) {
37
-    $show_web_odf  = true;
37
+    $show_web_odf = true;
38 38
 }
39 39
 
40 40
 $file_url_web = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$header_file;
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
 echo Display::display_header('');
86 86
 
87 87
 echo '<div class="actions">';
88
-echo '<a href="document.php?id='.$parent_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
89
-echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.$req_gid.'&origin=editodf">'.Display::return_icon('edit.png',get_lang('Rename').'/'.get_lang('Comments'),'',ICON_SIZE_MEDIUM).'</a>';
88
+echo '<a href="document.php?id='.$parent_id.'">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
89
+echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.$req_gid.'&origin=editodf">'.Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comments'), '', ICON_SIZE_MEDIUM).'</a>';
90 90
 echo '</div>';
91 91
 
92 92
 // echo '<div id="odf"></div>';
Please login to merge, or discard this patch.