Completed
Pull Request — 1.11.x (#1262)
by José
41:21
created
main/webservices/http-auth.php 1 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.
main/webservices/cm_webservice_inbox.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 {
13 13
     public function unreadMessage($username, $password)
14 14
     {
15
-        if($this->verifyUserPass($username, $password) == "valid")
15
+        if ($this->verifyUserPass($username, $password) == "valid")
16 16
         {
17 17
             $table_message = Database::get_main_table(TABLE_MESSAGE);
18 18
             $user_id = UserManager::get_user_id_from_username($username);
@@ -30,14 +30,14 @@  discard block
 block discarded – undo
30 30
 
31 31
     public function get_message_id($username, $password, $from, $number_of_items)
32 32
     {
33
-        if($this->verifyUserPass($username, $password) == "valid")
33
+        if ($this->verifyUserPass($username, $password) == "valid")
34 34
         {
35 35
             $user_id = UserManager::get_user_id_from_username($username);
36 36
 
37 37
             $table_message = Database::get_main_table(TABLE_MESSAGE);
38 38
 
39
-            $sql_query = "SELECT id FROM $table_message " .
40
-                                     " WHERE user_receiver_id=".$user_id." AND msg_status IN (0,1)" .
39
+            $sql_query = "SELECT id FROM $table_message ".
40
+                                     " WHERE user_receiver_id=".$user_id." AND msg_status IN (0,1)".
41 41
                                      " ORDER BY send_date LIMIT $from,$number_of_items";
42 42
 
43 43
             $sql_result = Database::query($sql_query);
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
     public function get_message_data($username, $password, $message_id, $field)
57 57
     {
58
-        if($this->verifyUserPass($username, $password) == "valid")
58
+        if ($this->verifyUserPass($username, $password) == "valid")
59 59
         {
60 60
             $htmlcode = false;
61 61
             $user_id = UserManager::get_user_id_from_username($username);
@@ -85,14 +85,14 @@  discard block
 block discarded – undo
85 85
 
86 86
             $table_message = Database::get_main_table(TABLE_MESSAGE);
87 87
 
88
-            $sql_query = "SELECT ".$field_table." FROM $table_message " .
88
+            $sql_query = "SELECT ".$field_table." FROM $table_message ".
89 89
                                      " WHERE user_receiver_id=".$user_id." AND id=".$message_id;
90 90
 
91 91
             $sql_result = Database::query($sql_query);
92 92
             $result = Database::fetch_row($sql_result);
93 93
             return (htmlcode) ? html_entity_decode($result[0]) : $result[0];
94 94
 
95
-        }else
95
+        } else
96 96
             return get_lang('InvalidId');
97 97
 
98 98
 
@@ -100,14 +100,14 @@  discard block
 block discarded – undo
100 100
 
101 101
     public function get_message_id_sent($username, $password, $from, $number_of_items)
102 102
     {
103
-        if($this->verifyUserPass($username, $password) == "valid")
103
+        if ($this->verifyUserPass($username, $password) == "valid")
104 104
         {
105 105
             $user_id = UserManager::get_user_id_from_username($username);
106 106
 
107 107
             $table_message = Database::get_main_table(TABLE_MESSAGE);
108 108
 
109
-            $sql_query = "SELECT id FROM $table_message " .
110
-					 "WHERE user_sender_id=".$user_id." AND msg_status=".MESSAGE_STATUS_OUTBOX." " .
109
+            $sql_query = "SELECT id FROM $table_message ".
110
+					 "WHERE user_sender_id=".$user_id." AND msg_status=".MESSAGE_STATUS_OUTBOX." ".
111 111
 					 "ORDER BY send_date LIMIT $from,$number_of_items";
112 112
 
113 113
             $sql_result = Database::query($sql_query);
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 
127 127
     public function get_message_data_sent($username, $password, $id, $field)
128 128
     {
129
-        if($this->verifyUserPass($username, $password) == "valid")
129
+        if ($this->verifyUserPass($username, $password) == "valid")
130 130
         {
131 131
             $htmlcode = false;
132 132
             switch ($field)
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 
157 157
             $table_message = Database::get_main_table(TABLE_MESSAGE);
158 158
 
159
-            $sql_query = "SELECT ".$field_table." FROM $table_message " .
159
+            $sql_query = "SELECT ".$field_table." FROM $table_message ".
160 160
                                      " WHERE user_sender_id=".$user_id." AND id=".$id;
161 161
 
162 162
             $sql_result = Database::query($sql_query);
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 
165 165
             return (htmlcode) ? html_entity_decode($result[0]) : $result[0];
166 166
 
167
-        }else
167
+        } else
168 168
             return get_lang('InvalidId');
169 169
 
170 170
 
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
     public function message_send($username, $password, $receiver_user_id, $subject, $content)
174 174
     {
175 175
         //TODO: verificar data de envio. Esta divergindo de data!
176
-        if($this->verifyUserPass($username, $password) == "valid")
176
+        if ($this->verifyUserPass($username, $password) == "valid")
177 177
         {
178 178
             $group_id = intval(0);
179 179
             $parent_id = intval(0);
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
 
205 205
     }
206 206
 
207
-    protected function set_message_as_read($user_id, $message_id){
207
+    protected function set_message_as_read($user_id, $message_id) {
208 208
         $table_message = Database::get_main_table(TABLE_MESSAGE);
209 209
         $query = "UPDATE $table_message SET msg_status = '".MESSAGE_STATUS_NEW."' WHERE user_receiver_id=".$user_id." AND id='".$message_id."';";
210 210
         $result = Database::query($query);
Please login to merge, or discard this patch.
main/webservices/example_fill_users_fields.php 1 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.
main/document/webcam_clip.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -32,9 +32,9 @@  discard block
 block discarded – undo
32 32
 $dir = $document_data['path'];
33 33
 
34 34
 //make some vars
35
-$webcamdir=$dir;
36
-if($webcamdir=="/"){
37
- $webcamdir="";
35
+$webcamdir = $dir;
36
+if ($webcamdir == "/") {
37
+ $webcamdir = "";
38 38
 }
39 39
 
40 40
 
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 $groupId = api_get_group_id();
69 69
 
70 70
 if (!empty($groupId)) {
71
-	$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
71
+	$interbreadcrumb[] = array("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
72 72
 	$noPHP_SELF = true;
73 73
 	$group = GroupManager :: get_group_properties($groupId);
74 74
 	$path = explode('/', $dir);
@@ -77,14 +77,14 @@  discard block
 block discarded – undo
77 77
 	}
78 78
 }
79 79
 
80
-$interbreadcrumb[] = array ("url" => "./document.php?id=".$document_id."&".api_get_cidreq(), "name" => get_lang('Documents'));
80
+$interbreadcrumb[] = array("url" => "./document.php?id=".$document_id."&".api_get_cidreq(), "name" => get_lang('Documents'));
81 81
 
82 82
 if (!$is_allowed_in_course) {
83 83
 	api_not_allowed(true);
84 84
 }
85 85
 
86 86
 if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
87
-	DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) {
87
+	DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir), api_get_session_id()))) {
88 88
 	api_not_allowed(true);
89 89
 }
90 90
 
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 // Interbreadcrumb for the current directory root path
103 103
 $counter = 0;
104 104
 if (isset($document_data['parents'])) {
105
-    foreach($document_data['parents'] as $document_sub_data) {
105
+    foreach ($document_data['parents'] as $document_sub_data) {
106 106
         //fixing double group folder in breadcrumb
107 107
         if (api_get_group_id()) {
108 108
             if ($counter == 0) {
@@ -116,12 +116,12 @@  discard block
 block discarded – undo
116 116
 }
117 117
 
118 118
 //make some vars
119
-$webcamuserid=api_get_user_id();
119
+$webcamuserid = api_get_user_id();
120 120
 
121 121
 Display :: display_header($nameTools, 'Doc');
122 122
 echo '<div class="actions">';
123 123
 echo '<a href="document.php?id='.$document_id.'">'.
124
-	Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
124
+	Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
125 125
 echo '</div>';
126 126
 ?>
127 127
 
Please login to merge, or discard this patch.
main/document/download.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@
 block discarded – undo
95 95
     }
96 96
 
97 97
     if (!api_is_allowed_to_edit() && !$is_visible) {
98
-        Display::display_error_message(get_lang('ProtectedDocument'));//api_not_allowed backbutton won't work.
98
+        Display::display_error_message(get_lang('ProtectedDocument')); //api_not_allowed backbutton won't work.
99 99
         exit; // You shouldn't be here anyway.
100 100
     }
101 101
     // Launch event
Please login to merge, or discard this patch.
main/document/webcam_receiver.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 # Save the audio to a URL-accessible directory for playback.
14 14
 parse_str($_SERVER['QUERY_STRING'], $params);
15 15
 
16
-if(isset($params['webcamname']) && isset($params['webcamdir']) && isset($params['webcamuserid'])) {
16
+if (isset($params['webcamname']) && isset($params['webcamdir']) && isset($params['webcamuserid'])) {
17 17
 	$webcamname = $params['webcamname'];
18 18
 	$webcamdir = $params['webcamdir'];
19 19
 	$webcamuserid = $params['webcamuserid'];
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 	die();
24 24
 }
25 25
 
26
-if ($webcamuserid!= api_get_user_id() || api_get_user_id()==0 || $webcamuserid==0) {
26
+if ($webcamuserid != api_get_user_id() || api_get_user_id() == 0 || $webcamuserid == 0) {
27 27
 	api_not_allowed();
28 28
 	die();
29 29
 }
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 $ext = explode('.', $webcamname);
42 42
 $ext = strtolower($ext[sizeof($ext) - 1]);
43 43
 
44
-if($ext!= 'jpg'){
44
+if ($ext != 'jpg') {
45 45
 	die();
46 46
 }
47 47
 
@@ -53,15 +53,15 @@  discard block
 block discarded – undo
53 53
 $groupId = api_get_group_id();
54 54
 
55 55
 //Avoid duplicates
56
-$webcamname_to_save=$webcamname;
57
-$title_to_save=str_replace('_',' ',$webcamname);
58
-$webcamname_noex=basename($webcamname, ".jpg");
59
-if (file_exists($saveDir.'/'.$webcamname_noex.'.'.$ext)){
56
+$webcamname_to_save = $webcamname;
57
+$title_to_save = str_replace('_', ' ', $webcamname);
58
+$webcamname_noex = basename($webcamname, ".jpg");
59
+if (file_exists($saveDir.'/'.$webcamname_noex.'.'.$ext)) {
60 60
 		$i = 1;
61 61
 		while (file_exists($saveDir.'/'.$webcamname_noex.'_'.$i.'.'.$ext)) $i++;
62
-		$webcamname_to_save = $webcamname_noex . '_' . $i . '.'.$ext;
63
-		$title_to_save = $webcamname_noex . '_' . $i . '.'.$ext;
64
-		$title_to_save = str_replace('_',' ',$title_to_save);
62
+		$webcamname_to_save = $webcamname_noex.'_'.$i.'.'.$ext;
63
+		$title_to_save = $webcamname_noex.'_'.$i.'.'.$ext;
64
+		$title_to_save = str_replace('_', ' ', $title_to_save);
65 65
 }
66 66
 
67 67
 $documentPath = $saveDir.'/'.$webcamname_to_save;
@@ -78,5 +78,5 @@  discard block
 block discarded – undo
78 78
 	$doc_id = add_document($_course, $webcamdir.'/'.$webcamname_to_save, 'file', filesize($documentPath), $title_to_save);
79 79
 	api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
80 80
 ///
81
-$url = 'http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']) . '/' . $documentPath;
81
+$url = 'http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['REQUEST_URI']).'/'.$documentPath;
82 82
 print get_lang('ClipSent');
Please login to merge, or discard this patch.