Completed
Pull Request — 1.11.x (#1700)
by José
28:48
created
main/lp/lp_edit_item.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 }
100 100
 
101 101
 if (!empty($gradebook) && $gradebook == 'view') {
102
-    $interbreadcrumb[] = array (
102
+    $interbreadcrumb[] = array(
103 103
         'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
104 104
         'name' => get_lang('ToolGradebook')
105 105
     );
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 $show_learn_path = true;
113 113
 $lp_theme_css = $_SESSION['oLP']->get_theme();
114 114
 
115
-Display::display_header(get_lang('Edit'),'Path');
115
+Display::display_header(get_lang('Edit'), 'Path');
116 116
 $suredel = trim(get_lang('AreYouSureToDeleteJS'));
117 117
 
118 118
 ?>
@@ -165,8 +165,8 @@  discard block
 block discarded – undo
165 165
 $path_item = isset($_GET['path_item']) ? $_GET['path_item'] : 0;
166 166
 $path_item = Database::escape_string($path_item);
167 167
 $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
168
-$sql_doc = "SELECT path FROM " . $tbl_doc . "
169
-            WHERE c_id = $course_id AND id = '". $path_item."' ";
168
+$sql_doc = "SELECT path FROM ".$tbl_doc."
169
+            WHERE c_id = $course_id AND id = '".$path_item."' ";
170 170
 
171 171
 $res_doc = Database::query($sql_doc);
172 172
 $path_file = Database::result($res_doc, 0, 0);
Please login to merge, or discard this patch.
main/lp/lp_impress.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
     api_get_group_id()
37 37
 );
38 38
 if (!api_is_allowed_to_edit(null, true) && intval($visibility) == 0 ) {
39
-     api_not_allowed();
39
+        api_not_allowed();
40 40
 }
41 41
 
42 42
 if (empty($_SESSION['oLP'])) {
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@
 block discarded – undo
81 81
         //just showing the src in a iframe ...
82 82
         $html .= '<h2>'.$toc['title'].'</h2>';
83 83
         $html .= '<iframe border="0" frameborder="0" style="width:100%;height:600px" src="' . $src . '"></iframe>';
84
-    }else{
84
+    } else{
85 85
         $html .= "<div class='impress-title'>";
86 86
         $html .= '<h1>'.$toc['title'].'</h1>';
87 87
         $html .= "</div>";
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
     null,
36 36
     api_get_group_id()
37 37
 );
38
-if (!api_is_allowed_to_edit(null, true) && intval($visibility) == 0 ) {
38
+if (!api_is_allowed_to_edit(null, true) && intval($visibility) == 0) {
39 39
      api_not_allowed();
40 40
 }
41 41
 
@@ -73,22 +73,22 @@  discard block
 block discarded – undo
73 73
 $html = '';
74 74
 $step = 1;
75 75
 foreach ($list as $toc) {
76
-    $x = 1000*$step;
76
+    $x = 1000 * $step;
77 77
     $html .= '<div id="step-'.$step.'" class="step slide" data-x="'.$x.'" data-y="-1500"  >';
78 78
     $html .= '<div class="impress-content">';
79 79
     $src = $_SESSION['oLP']->get_link('http', $toc['id']);
80 80
     if ($toc['type'] !== 'dir') {
81 81
         //just showing the src in a iframe ...
82 82
         $html .= '<h2>'.$toc['title'].'</h2>';
83
-        $html .= '<iframe border="0" frameborder="0" style="width:100%;height:600px" src="' . $src . '"></iframe>';
84
-    }else{
83
+        $html .= '<iframe border="0" frameborder="0" style="width:100%;height:600px" src="'.$src.'"></iframe>';
84
+    } else {
85 85
         $html .= "<div class='impress-title'>";
86 86
         $html .= '<h1>'.$toc['title'].'</h1>';
87 87
         $html .= "</div>";
88 88
     }
89 89
     $html .= "</div>";
90 90
     $html .= "</div>";
91
-    $step ++;
91
+    $step++;
92 92
 }
93 93
 
94 94
 //Setting the template
Please login to merge, or discard this patch.
main/lp/lp_ajax_save_objectives.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -28,10 +28,10 @@
 block discarded – undo
28 28
         error_log('In xajax_save_objectives('.$lp_id.','.$user_id.','.$view_id.','.$item_id.',"'.(count($objectives) > 0 ? count($objectives) : '').'")', 0);
29 29
     }
30 30
     $mylp = learnpath::getLpFromSession(api_get_course_id(), $lp_id, $user_id);
31
-    $mylpi =& $mylp->items[$item_id];
32
-    if (is_array($objectives) && count($objectives)>0){
33
-        foreach ($objectives as $index=>$objective){
34
-            $mylpi->add_objective($index,$objectives[$index]);
31
+    $mylpi = & $mylp->items[$item_id];
32
+    if (is_array($objectives) && count($objectives) > 0) {
33
+        foreach ($objectives as $index=>$objective) {
34
+            $mylpi->add_objective($index, $objectives[$index]);
35 35
         }
36 36
         $mylpi->write_objectives_to_db();
37 37
     }
Please login to merge, or discard this patch.
main/lp/openoffice_text_document.class.php 3 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
         $intro_content = api_substr($content, 0, api_strpos($content, $matches[0][0]));
118 118
         $items_to_create[get_lang('Introduction')] = $intro_content;
119 119
 
120
-        for ($i = 0; $i<count($matches[0]); $i++) {
120
+        for ($i = 0; $i < count($matches[0]); $i++) {
121 121
 
122 122
             if (empty($matches[1][$i]))
123 123
                 continue;
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
 
175 175
         $first_item = 0;
176 176
 
177
-        foreach($pages as $key => $page_content) {
177
+        foreach ($pages as $key => $page_content) {
178 178
             // For every pages, we create a new file.
179 179
 
180 180
             $key += 1;
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
                     foreach ($specific_fields as $specific_field) {
214 214
                         if (isset($_REQUEST[$specific_field['code']])) {
215 215
                             $sterms = trim($_REQUEST[$specific_field['code']]);
216
-                            $all_specific_terms .= ' '. $sterms;
216
+                            $all_specific_terms .= ' '.$sterms;
217 217
                             if (!empty($sterms)) {
218 218
                                 $sterms = explode(',', $sterms);
219 219
                                 foreach ($sterms as $sterm) {
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
                             }
223 223
                         }
224 224
                     }
225
-                    $page_content = $all_specific_terms .' '. $page_content;
225
+                    $page_content = $all_specific_terms.' '.$page_content;
226 226
                     $ic_slide->addValue('content', $page_content);
227 227
                     // Add a comment to say terms separated by commas.
228 228
                     $courseid = api_get_course_id();
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
                         SE_COURSE_ID => $courseid,
234 234
                         SE_TOOL_ID => TOOL_LEARNPATH,
235 235
                         SE_DATA => array('lp_id' => $lp_id, 'lp_item' => $previous, 'document_id' => $document_id),
236
-                        SE_USER => (int)api_get_user_id(),
236
+                        SE_USER => (int) api_get_user_id(),
237 237
                     );
238 238
                     $ic_slide->xapian_data = serialize($xapian_data);
239 239
                     $di->addChunk($ic_slide);
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
             $content = '<body><div style="width:'.$max_width.'">'.$content;
277 277
         }
278 278
 
279
-        $content = preg_replace('|</body>|i','</div>\\0', $content, -1, $count);
279
+        $content = preg_replace('|</body>|i', '</div>\\0', $content, -1, $count);
280 280
         if ($count < 1) {
281 281
             $content = $content.'</div></body>';
282 282
         }
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
                 }
305 305
 
306 306
             } elseif ($img_width > $max_width - 10) {
307
-                $picture_resized = str_ireplace('width='.$img_width, 'width="'.($max_width-10).'"', $images[0][$key]);
307
+                $picture_resized = str_ireplace('width='.$img_width, 'width="'.($max_width - 10).'"', $images[0][$key]);
308 308
                 $content = str_replace($images[0][$key], $picture_resized, $content);
309 309
             }
310 310
         }
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -119,8 +119,9 @@
 block discarded – undo
119 119
 
120 120
         for ($i = 0; $i<count($matches[0]); $i++) {
121 121
 
122
-            if (empty($matches[1][$i]))
123
-                continue;
122
+            if (empty($matches[1][$i])) {
123
+                            continue;
124
+            }
124 125
 
125 126
             $content = api_strstr($content, $matches[0][$i]);
126 127
             if ($i + 1 !== count($matches[0])) {
Please login to merge, or discard this patch.
Doc Comments   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
     /**
39 39
      * Gets html pages and compose them into a learning path
40 40
      * @param	array	The files that will compose the generated learning path. Unused so far.
41
-     * @return	boolean	False if file does not exit. Nothing otherwise.
41
+     * @return	false|null	False if file does not exit. Nothing otherwise.
42 42
      */
43 43
     public function make_lp($files = array())
44 44
     {
@@ -92,6 +92,7 @@  discard block
 block discarded – undo
92 92
      * Manages dir/chapter splitting
93 93
      * @param	string	Chapter header
94 94
      * @param	string	Content
95
+     * @param string $content
95 96
      * @return	void
96 97
      */
97 98
     function dealPerChapter($header, $content)
@@ -181,6 +182,7 @@  discard block
 block discarded – undo
181 182
      * Manages page splitting
182 183
      * @param	string	Page header
183 184
      * @param	string	Page body
185
+     * @param string $body
184 186
      * @return	void
185 187
      */
186 188
     function dealPerPage($header, $body)
Please login to merge, or discard this patch.
main/lp/lp_add_audio.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -16,8 +16,8 @@  discard block
 block discarded – undo
16 16
 
17 17
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
18 18
 
19
-$isStudentView = isset($_REQUEST['isStudentView']) ? (int)$_REQUEST['isStudentView'] : null;
20
-$learnpath_id = (int)$_REQUEST['lp_id'];
19
+$isStudentView = isset($_REQUEST['isStudentView']) ? (int) $_REQUEST['isStudentView'] : null;
20
+$learnpath_id = (int) $_REQUEST['lp_id'];
21 21
 $submit = isset($_POST['submit_button']) ? $_POST['submit_button'] : null;
22 22
 
23 23
 $type = isset($_GET['type']) ? $_GET['type'] : null;
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 }
42 42
 
43 43
 if (!empty($gradebook) && $gradebook == 'view') {
44
-    $interbreadcrumb[] = array (
44
+    $interbreadcrumb[] = array(
45 45
         'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
46 46
         'name' => get_lang('ToolGradebook')
47 47
     );
@@ -65,12 +65,12 @@  discard block
 block discarded – undo
65 65
         );
66 66
         break;
67 67
     default:
68
-        $interbreadcrumb[]= array('url' => '#', 'name' => get_lang('NewStep'));
68
+        $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('NewStep'));
69 69
         break;
70 70
 }
71 71
 
72 72
 if ($action == 'add_item' && $type == 'document') {
73
-    $interbreadcrumb[]= array ('url' => '#', 'name' => get_lang('NewDocumentCreated'));
73
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('NewDocumentCreated'));
74 74
 }
75 75
 
76 76
 // Theme calls.
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 $form = new FormValidator(
87 87
     'add_audio',
88 88
     'post',
89
-    api_get_self() . '?action=add_audio&id=' . $lp_item_id . '&' . api_get_cidreq().'&lp_id='.$learnpath_id,
89
+    api_get_self().'?action=add_audio&id='.$lp_item_id.'&'.api_get_cidreq().'&lp_id='.$learnpath_id,
90 90
     null,
91 91
     array('enctype' => 'multipart/form-data')
92 92
 );
@@ -100,8 +100,8 @@  discard block
 block discarded – undo
100 100
     $urlFile = api_get_path(WEB_COURSE_PATH).$courseInfo['path'].'/document/audio/'.$lp_item->audio.'?'.api_get_cidreq();
101 101
 
102 102
     if (!file_exists($file)) {
103
-        $file = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document'.$lpPathInfo['dir'] . '/' . $lp_item->audio;
104
-        $urlFile = api_get_path(WEB_COURSE_PATH).$courseInfo['path'].'/document'.$lpPathInfo['dir'] . '/' . $lp_item->audio.'?'.api_get_cidreq();
103
+        $file = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document'.$lpPathInfo['dir'].'/'.$lp_item->audio;
104
+        $urlFile = api_get_path(WEB_COURSE_PATH).$courseInfo['path'].'/document'.$lpPathInfo['dir'].'/'.$lp_item->audio.'?'.api_get_cidreq();
105 105
     }
106 106
 }
107 107
 
@@ -117,10 +117,10 @@  discard block
 block discarded – undo
117 117
 
118 118
 $page .= '<div id="doc_form" class="col-md-8">';
119 119
 
120
-$htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'rtc/RecordRTC.js"></script>';
121
-$htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_PATH) . 'wami-recorder/recorder.js"></script>';
122
-$htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_PATH) . 'wami-recorder/gui.js"></script>';
123
-$htmlHeadXtra[] = '<script type="text/javascript" src="' . api_get_path(WEB_LIBRARY_PATH) . 'swfobject/swfobject.js"></script>';
120
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'rtc/RecordRTC.js"></script>';
121
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'wami-recorder/recorder.js"></script>';
122
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'wami-recorder/gui.js"></script>';
123
+$htmlHeadXtra[] = '<script type="text/javascript" src="'.api_get_path(WEB_LIBRARY_PATH).'swfobject/swfobject.js"></script>';
124 124
 
125 125
 $tpl = new Template(null);
126 126
 $tpl->assign('unique_file_id', api_get_unique_id());
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
         Display::getMediaPlayer($file, array('url' => $urlFile)).
142 142
         "</div>";
143 143
     $form->addElement('label', get_lang('Listen'), $audioPlayer);
144
-    $url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?lp_id='.$_SESSION['oLP']->get_id().'&action=add_audio&id='.$lp_item_id.'&delete_file=1&'.api_get_cidreq();
144
+    $url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?lp_id='.$_SESSION['oLP']->get_id().'&action=add_audio&id='.$lp_item_id.'&delete_file=1&'.api_get_cidreq();
145 145
     $form->addElement('label', null, Display::url(get_lang('RemoveAudio'), $url, array('class' => 'btn btn-danger')));
146 146
 } else {
147 147
     $form->addElement('file', 'file');
Please login to merge, or discard this patch.
main/lp/lp_ajax_switch_item_toc.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -124,22 +124,22 @@
 block discarded – undo
124 124
     $coreExit = $myLPI->get_core_exit();
125 125
 
126 126
     $return .=
127
-        "olms.lms_lp_id=".$lpId.";" .
128
-        "olms.lms_item_id=".$newItemId.";" .
129
-        "olms.lms_old_item_id=".$oldItemId.";" .
130
-        "olms.lms_initialized=0;" .
131
-        "olms.lms_view_id=".$viewId.";" .
132
-        "olms.lms_user_id=".$userId.";" .
133
-        "olms.next_item=".$newItemId.";" . // This one is very important to replace possible literal strings.
134
-        "olms.lms_next_item=".$nextItemId.";" .
135
-        "olms.lms_previous_item=".$previousItemId.";" .
136
-        "olms.lms_item_type = '".$itemType."';" .
137
-        "olms.lms_item_credit = '".$credit."';" .
138
-        "olms.lms_item_lesson_mode = '".$lessonMode."';" .
139
-        "olms.lms_item_launch_data = '".$launchData."';" .
140
-        "olms.lms_item_interactions_count = '".$interactionsCount."';" .
141
-        "olms.lms_item_objectives_count = '".$objectivesCount."';" .
142
-        "olms.lms_item_core_exit = '".$coreExit."';" .
127
+        "olms.lms_lp_id=".$lpId.";".
128
+        "olms.lms_item_id=".$newItemId.";".
129
+        "olms.lms_old_item_id=".$oldItemId.";".
130
+        "olms.lms_initialized=0;".
131
+        "olms.lms_view_id=".$viewId.";".
132
+        "olms.lms_user_id=".$userId.";".
133
+        "olms.next_item=".$newItemId.";".// This one is very important to replace possible literal strings.
134
+        "olms.lms_next_item=".$nextItemId.";".
135
+        "olms.lms_previous_item=".$previousItemId.";".
136
+        "olms.lms_item_type = '".$itemType."';".
137
+        "olms.lms_item_credit = '".$credit."';".
138
+        "olms.lms_item_lesson_mode = '".$lessonMode."';".
139
+        "olms.lms_item_launch_data = '".$launchData."';".
140
+        "olms.lms_item_interactions_count = '".$interactionsCount."';".
141
+        "olms.lms_item_objectives_count = '".$objectivesCount."';".
142
+        "olms.lms_item_core_exit = '".$coreExit."';".
143 143
         "olms.asset_timer = 0;";
144 144
 
145 145
     $return .= "update_toc('unhighlight','".$currentItem."');".
Please login to merge, or discard this patch.
main/upload/form.document.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
12 12
  */
13 13
 $noPHP_SELF = false;
14 14
 $nameTools = get_lang('FileUpload');
15
-$interbreadcrumb[]= array ("url"=>"../lp/lp_controller.php?action=list", "name"=> get_lang(TOOL_DOCUMENT));
16
-Display::display_header($nameTools,"Doc");
15
+$interbreadcrumb[] = array("url"=>"../lp/lp_controller.php?action=list", "name"=> get_lang(TOOL_DOCUMENT));
16
+Display::display_header($nameTools, "Doc");
17 17
 //show the title
18 18
 api_display_tool_title($nameTools.$add_group_to_title);
19 19
 ?>
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 <div id="dynamic_div" style="display:block;margin-left:40%;margin-top:10px;height:50px;">
22 22
 </div>
23 23
 <div id="upload_form_div" name="form_div" style="display:block;">
24
-	<form method="POST" action="upload.php" id="upload_form" enctype="multipart/form-data" onsubmit="javascript: myUpload.start('dynamic_div','progressbar_green.gif','<?php echo(get_lang('Uploading', ''));?>','upload_form_div');">
24
+	<form method="POST" action="upload.php" id="upload_form" enctype="multipart/form-data" onsubmit="javascript: myUpload.start('dynamic_div','progressbar_green.gif','<?php echo(get_lang('Uploading', '')); ?>','upload_form_div');">
25 25
 		<input type="hidden" name="curdirpath" value="<?php echo $path; ?>">
26 26
 		<input type="hidden" name="tool" value="<?php echo $my_tool; ?>">
27 27
 		<input type="file" name="user_file">
Please login to merge, or discard this patch.
main/gamification/my_progress.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
     $UserIsSubscribedToSession = SessionManager::isUserSubscribedAsStudent($lastSessionId, $user->getId());
43 43
 
44 44
     if (!empty($lastSessionId) && $UserIsSubscribedToSession) {
45
-        $urlWithSession = api_get_self() . '?' . http_build_query([
45
+        $urlWithSession = api_get_self().'?'.http_build_query([
46 46
             'session_id' => $lastCourseAccess->getSessionId()
47 47
         ]);
48 48
 
@@ -116,13 +116,13 @@  discard block
 block discarded – undo
116 116
         foreach ($learningPathList->list as $learningPathId => $learningPath) {
117 117
             $courseData['stats'][] = [
118 118
                 $learningPath['lp_name'],
119
-                'lp/lp_controller.php?' . http_build_query([
119
+                'lp/lp_controller.php?'.http_build_query([
120 120
                     'action' => 'stats',
121 121
                     'cidReq' => $course->getCode(),
122 122
                     'id_session' => $currentSession->getId(),
123 123
                     'gidReq' => 0,
124 124
                     'lp_id' => $learningPathId
125
-                ]) . api_get_cidreq()
125
+                ]).api_get_cidreq()
126 126
             ];
127 127
         }
128 128
 
Please login to merge, or discard this patch.
main/search/index.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
 $this_section =  SECTION_COURSES;
11 11
 
12 12
 if (extension_loaded('xapian')) {
13
-	require '../lp/lp_list_search.php';
13
+    require '../lp/lp_list_search.php';
14 14
 } else {
15 15
     Display::display_header(get_lang('Search'));
16 16
     Display::display_error_message(get_lang('SearchXapianModuleNotInstalled'));
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
  */
8 8
 
9 9
 require_once __DIR__.'/../inc/global.inc.php';
10
-$this_section =  SECTION_COURSES;
10
+$this_section = SECTION_COURSES;
11 11
 
12 12
 if (extension_loaded('xapian')) {
13 13
 	require '../lp/lp_list_search.php';
Please login to merge, or discard this patch.